diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 2957a508416..b01262dd396 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -40,7 +40,7 @@ jobs:
         run: pip3 install --upgrade pip wheel
 
       - name: "Install BuildingsPy"
-        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@50ac74d8e4fd067179bb38bc23140c2c9254c94c
+        run: pip3 install git+https://github.com/lbl-srg/BuildingsPy@v5.1.0
 
       - name: Check for UTF-8 BOM
         run : |
@@ -55,9 +55,11 @@ jobs:
       - name: "Test experiment setup"
         run : ../bin/runUnitTests.py --validate-experiment-setup
 
-      - name: "Test if package.order are correct"
+      - name: "Test if package.order are correct, and revert order in UsersGuide"
         run : |
               python -c 'import buildingspy.development.refactor as r; r.write_package_order(".", recursive=True)'
+              git checkout UsersGuide/ReleaseNotes/package.order
+              git checkout UsersGuide/package.order
               git diff --exit-code .
 
       - name: "Verify files for invalid strings"
diff --git a/.travis.yml b/.travis.yml
index 1867982851e..512929cb5d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ services:
 env:
   global:
     - DOCKER_REPONAME=lbnlblum
-    - BUILDINGSPY_VERSION=BuildingsPy@v5.0.0
+    - BUILDINGSPY_VERSION=BuildingsPy@v5.1.0
     - OMC_VERSION=ubuntu-2204-omc:1.22.1-1
     - OPTIMICA_VERSION=travis-ubuntu-2204-optimica:1.48.2
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2024x-x86_64
@@ -41,77 +41,77 @@ env:
     - MODELICA_JSON_HOME=${TRAVIS_BUILD_DIR}/modelica-json
 
   jobs:
-    # - TEST_ARG="make test-cdl-conformance"
-    # - TEST_ARG="make test-energyplus-validations test-dymola-spawn-spaces test-openmodelica-spawn-spaces test-openmodelica-cdl" #target test-optimica-spawn-fmu removed as it requires a local installation of OCT
-    # - TEST_ARG="make test-bestest"
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Air,Examples}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
+    - TEST_ARG="make test-cdl-conformance"
+    - TEST_ARG="make test-energyplus-validations test-dymola-spawn-spaces test-openmodelica-spawn-spaces test-openmodelica-cdl" #target test-optimica-spawn-fmu removed as it requires a local installation of OCT
+    - TEST_ARG="make test-bestest"
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Air,Examples}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Air,Examples}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.EnergyPlus_9_6_0\""
     - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
     - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.{BaseClasses,Constructions,Examples}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.BESTEST\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.BESTEST\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.BESTEST\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
-    # - 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.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}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Examples,FMI}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Examples,FMI}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Examples,FMI}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.FixedResistances\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.FixedResistances\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.FixedResistances\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Electrical\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Electrical\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Electrical\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.HeatTransfer\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.HeatTransfer\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.HeatTransfer\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Utilities\""
-    # - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Utilities\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Utilities\""
-    # - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Templates\""
-    # - TEST_ARG="make test-openmodelica  PACKAGE=\"Buildings.Templates\""
-    # - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Templates\""
-    # - TEST_ARG="make test-templates-optimica"
-    # - TEST_ARG="make test-templates-dymola"
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.BESTEST\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.BESTEST\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.BESTEST\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.Validation.{Initialization,LBNL_71T,TestConditionalConstructions}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.Detailed.FLEXLAB\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.ThermalZones.{ISO13790,ReducedOrder}\""
+    - 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.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}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Examples,FMI}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Examples,FMI}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Examples,FMI}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.FixedResistances\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.FixedResistances\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.FixedResistances\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{Geothermal,HeatExchangers,HeatPumps,Humidifiers,HydronicConfigurations,Interfaces}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Fluid.{MassExchangers,MixingVolumes,Movers,Sensors,SolarCollectors,Sources,Storage,Utilities}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Electrical\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Electrical\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Electrical\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.HeatTransfer\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.HeatTransfer\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.HeatTransfer\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.{Obsolete,Occupants,Media}\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Utilities\""
+    - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Utilities\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Utilities\""
+    - TEST_ARG="make test-dymola    PACKAGE=\"Buildings.Templates\""
+    - TEST_ARG="make test-openmodelica  PACKAGE=\"Buildings.Templates\""
+    - TEST_ARG="make test-optimica  PACKAGE=\"Buildings.Templates\""
+    - TEST_ARG="make test-templates-optimica"
+    - TEST_ARG="make test-templates-dymola"
 
 before_install:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
@@ -167,7 +167,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/.copiedFiles.txt b/Buildings/.copiedFiles.txt
index 0e38c1e9059..506ec78b27f 100644
--- a/Buildings/.copiedFiles.txt
+++ b/Buildings/.copiedFiles.txt
@@ -1930,6 +1930,7 @@ Buildings/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Bei
 Buildings/Resources/Data/Fluid/Geothermal/Borefields/HeatTransfer/Validation/Cimmino_Bernier_2015_SmallScale.txt
 Buildings/Resources/Data/Utilities/IO/Files/Examples/CSVReader/Data.txt
 Buildings/Resources/Data/schedule.txt
+Buildings/Resources/Data/scheduleWindows.txt
 Buildings/Resources/Documentation/userGuide/source/_static/lbl-logo.png
 Buildings/Resources/Images/Airflow/Multizone/BaseClasses/windPressureLowRise.odp
 Buildings/Resources/Images/Airflow/Multizone/BaseClasses/windPressureLowRise.png
@@ -2784,6 +2785,7 @@ Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/CSVWriter.mos
 Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/JSONWriter.mos
 Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/WeeklySchedule.mos
 Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Examples/WeeklySchedule7to19.mos
+Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mos
 Buildings/Resources/Scripts/Dymola/Utilities/IO/SignalExchange/Examples/FirstOrder.mos
 Buildings/Resources/Scripts/Dymola/Utilities/IO/SignalExchange/Examples/WeatherStation.mos
 Buildings/Resources/Scripts/Dymola/Utilities/Math/Examples/Average.mos
@@ -3034,6 +3036,9 @@ Buildings/Utilities/IO/Files/Examples/WeeklySchedule7to19.mo
 Buildings/Utilities/IO/Files/Examples/package.mo
 Buildings/Utilities/IO/Files/Examples/package.order
 Buildings/Utilities/IO/Files/JSONWriter.mo
+Buildings/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mo
+Buildings/Utilities/IO/Files/Validation/package.mo
+Buildings/Utilities/IO/Files/Validation/package.order
 Buildings/Utilities/IO/Files/WeeklySchedule.mo
 Buildings/Utilities/IO/Files/package.mo
 Buildings/Utilities/IO/Files/package.order
diff --git a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
index 015dbfbb345..587ba098fe7 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/BaseClasses/ControllerChillerDXHeatingEconomizer.mo
@@ -212,11 +212,6 @@ model ControllerChillerDXHeatingEconomizer
     annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
   Buildings.Controls.OBC.CDL.Reals.Switch swiFan "Switch fan on"
     annotation (Placement(transformation(extent={{70,120},{90,140}})));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis hysHea(
-    final uLow=0.01,
-    final uHigh=0.05)
-    "Hysteresis for heating"
-    annotation (Placement(transformation(extent={{-30,120},{-10,140}})));
   Buildings.Controls.OBC.CDL.Logical.MultiOr orFan(nin=3)
     "Switch fan on if heating, cooling, or occupied"
     annotation (Placement(transformation(extent={{40,94},{60,114}})));
@@ -226,6 +221,9 @@ model ControllerChillerDXHeatingEconomizer
     "Chiller on signal based on room temperature"
     annotation (Placement(transformation(extent={{20,-80},{40,-60}})));
 
+  Controls.OBC.CDL.Reals.Greater heaOnTRoo(h=0.5)
+    "Heater on signal based on room temperature"
+    annotation (Placement(transformation(extent={{-60,120},{-40,140}})));
 protected
   Modelica.Blocks.Sources.Constant TSetSupChiConst(
     final k=TSupChi_nominal)
@@ -271,21 +269,17 @@ equation
           138},{68,138}}, color={0,0,127}));
   connect(swiFan.y, yFan) annotation (Line(points={{92,130},{96,130},{96,90},{
           110,90}}, color={0,0,127}));
-  connect(conSup.yHea, hysHea.u) annotation (Line(points={{-39,86},{-34,86},{
-          -34,130},{-32,130}}, color={0,0,127}));
   connect(swiFan.u2, orFan.y)   annotation (Line(points={{68,130},{64,130},{64,104},{62,104}},
           color={255,0,255}));
-  connect(hysHea.y, orFan.u[1]) annotation (Line(points={{-8,130},{24,130},{24,
-          108.667},{38,108.667}},
-                        color={255,0,255}));
   connect(conEco.TMixSet, conCooVal.u_s) annotation (Line(points={{39,78},{-10,
           78},{-10,-20},{-2,-20}}, color={0,0,127}));
   connect(and1.y, chiOn) annotation (Line(points={{91,-30},{96,-30},{96,-54},{110,
           -54}},     color={255,0,255}));
   connect(conEco.yCoiSta, and1.u1) annotation (Line(points={{61,62},{64,62},{64,
           -30},{68,-30}}, color={255,0,255}));
-  connect(uOcc, orFan.u[2]) annotation (Line(points={{-120,0},{-14,0},{-14,104},
-          {38,104}},    color={255,0,255}));
+  connect(uOcc, orFan.u[1]) annotation (Line(points={{-120,0},{-14,0},{-14,
+          101.667},{38,101.667}},
+                        color={255,0,255}));
   connect(TMix, conEco.TMix) annotation (Line(points={{-120,30},{-26,30},{-26,75},
           {39,75}}, color={0,0,127}));
   connect(TOut, conEco.TOut) annotation (Line(points={{-120,-40},{-66,-40},{-66,
@@ -303,8 +297,14 @@ equation
   connect(chiOnTRoo.y, conEco.cooSta) annotation (Line(points={{42,-70},{50,-70},
           {50,40},{34,40},{34,62},{39,62}}, color={255,0,255}));
 
-  connect(chiOnTRoo.y, orFan.u[3]) annotation (Line(points={{42,-70},{50,-70},{
-          50,40},{34,40},{34,99.3333},{38,99.3333}}, color={255,0,255}));
+  connect(chiOnTRoo.y, orFan.u[2]) annotation (Line(points={{42,-70},{50,-70},{
+          50,40},{34,40},{34,104},{38,104}},         color={255,0,255}));
+  connect(heaOnTRoo.y, orFan.u[3]) annotation (Line(points={{-38,130},{20,130},
+          {20,106.333},{38,106.333}}, color={255,0,255}));
+  connect(heaOnTRoo.u2, TRoo) annotation (Line(points={{-62,122},{-86,122},{-86,
+          -80},{-120,-80}}, color={0,0,127}));
+  connect(TSetRooHea, heaOnTRoo.u1) annotation (Line(points={{-120,120},{-80,
+          120},{-80,130},{-62,130}}, color={0,0,127}));
   annotation (
   defaultComponentName="conChiDXHeaEco",
   Icon(graphics={Line(points={{-100,-100},{0,2},{-100,100}}, color=
@@ -316,6 +316,11 @@ heating coil and a cooling coil.
 </html>", revisions="<html>
 <ul>
 <li>
+March 28, 2024, by David Blum:<br/>
+Adjust heating hysteresis to avoid chattering.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3735\">issue 3735</a>.
+</li>
+<li>
 November 20, 2020, by David Blum:<br/>
 Turn fan on when setup cooling required.
 This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2265\">issue 2265</a>.
diff --git a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
index 72c890697f1..52712bb4618 100644
--- a/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
+++ b/Buildings/Air/Systems/SingleZone/VAV/ChillerDXHeatingEconomizer.mo
@@ -144,7 +144,7 @@ model ChillerDXHeatingEconomizer
     "Heating efficiency"
     annotation (Placement(transformation(extent={{120,100},{140,120}})));
   Buildings.Fluid.Sources.Outside out(
-    final C=fill(0.0004, 1),
+    final C=fill(0.0004, MediumA.nC),
     final nPorts=3,
     redeclare package Medium = MediumA)
     "Boundary conditions for outside air"
@@ -357,7 +357,6 @@ protected
             fillPattern=FillPattern.Solid),
           Line(points={{62,0},{-98,0}}, color={0,0,0}),
           Rectangle(
-            visible=use_inputFilter,
             extent={{28,-10},{46,10}},
             lineColor={0,0,0},
             fillColor={135,135,135},
@@ -635,6 +634,10 @@ feedback control of damper positions. The cooling coil is a dry coil model.
 </html>", revisions="<html>
 <ul>
 <li>
+March 27, 2024, by Michael Wetter:<br/>
+Corrected wrong assignment of <code>out.C</code>.
+</li>
+<li>
 November 1, 2021, by Hongxiang Fu:<br/>
 Refactored the model by replacing <code>not use_powerCharacteristic</code>
 with the enumeration
@@ -661,4 +664,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end ChillerDXHeatingEconomizer;
+end ChillerDXHeatingEconomizer;
\ No newline at end of file
diff --git a/Buildings/Airflow/Multizone/Examples/CO2TransportStep.mo b/Buildings/Airflow/Multizone/Examples/CO2TransportStep.mo
index ffbd003b78a..38a40a9294e 100644
--- a/Buildings/Airflow/Multizone/Examples/CO2TransportStep.mo
+++ b/Buildings/Airflow/Multizone/Examples/CO2TransportStep.mo
@@ -5,13 +5,19 @@ model CO2TransportStep "Model with transport of CO2 through buoyancy driven flow
     volTop(nPorts=3),
     volEas(nPorts=6));
 
-  Buildings.Fluid.Sensors.TraceSubstances CO2SenTop(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.TraceSubstances CO2SenTop(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "CO2 sensor"
     annotation (Placement(transformation(extent={{20,120},{40,140}})));
-  Buildings.Fluid.Sensors.TraceSubstances CO2SenWes(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.TraceSubstances CO2SenWes(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "CO2 sensor"
     annotation (Placement(transformation(extent={{-102,10},{-82,30}})));
-  Buildings.Fluid.Sensors.TraceSubstances CO2SenEas(redeclare package Medium = Medium)
+  Buildings.Fluid.Sensors.TraceSubstances CO2SenEas(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "CO2 sensor"
     annotation (Placement(transformation(extent={{58,10},{78,30}})));
   Modelica.Blocks.Sources.Pulse pulse(
@@ -65,6 +71,12 @@ the other rooms, and eventually its concentration decays.
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1857\">IBPSA, #1857</a>.
+</li>
+<li>
 March 26, 2021 by Michael Wetter:<br/>
 Updated comments for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/515\">IBPSA, #515</a>.
@@ -78,4 +90,4 @@ and added documentation.
 </li>
 </ul>
 </html>"));
-end CO2TransportStep;
+end CO2TransportStep;
\ No newline at end of file
diff --git a/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo b/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo
index 9ce57387544..910eb0df495 100644
--- a/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo
+++ b/Buildings/Controls/DemandResponse/BaseClasses/BaselinePrediction.mo
@@ -1,10 +1,34 @@
 within Buildings.Controls.DemandResponse.BaseClasses;
 block BaselinePrediction "Predicts the baseline consumption"
-  extends Buildings.Controls.DemandResponse.BaseClasses.PartialDemandResponse(nIn=1,
-      nOut=1);
+  extends Modelica.Blocks.Icons.DiscreteBlock;
+
+  parameter Integer nSam
+    "Number of intervals in a day for which baseline is computed";
+
+  parameter Integer nPre(min=1)
+    "Number of intervals for which future load need to be predicted (set to one to only predict current time, or to nSam to predict one day)";
+
+  parameter Buildings.Controls.Predictors.Types.PredictionModel predictionModel
+    "Load prediction model";
 
   parameter Integer nHis(min=1) = 10 "Number of history terms to be stored";
 
+  Modelica.Blocks.Interfaces.RealInput ECon(unit="J")
+    "Consumed electrical energy"
+    annotation (Placement(transformation(extent={{-140,-50},{-100,-10}}),
+        iconTransformation(extent={{-120,-30},{-100,-10}})));
+  Modelica.Blocks.Interfaces.RealOutput PPre[nPre](each unit="W")
+    "Predicted power consumption for the current time interval"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
+        iconTransformation(extent={{100,-10},{120,10}})));
+
+  Modelica.Blocks.Interfaces.RealInput TOutFut[nPre-1](each unit="K")
+    if (predictionModel == Buildings.Controls.Predictors.Types.PredictionModel.WeatherRegression)
+    "Future outside air temperatures"
+    annotation (Placement(
+      transformation(extent={{-140,-110},{-100,-70}}),
+      iconTransformation(extent={{-120,-100},{-100,-80}})));
+
   Modelica.Blocks.Interfaces.RealInput TOut(unit="K", displayUnit="degC")
   if (predictionModel == Buildings.Controls.Predictors.Types.PredictionModel.WeatherRegression)
     "Outside air temperature"
@@ -41,7 +65,7 @@ equation
       color={0,0,127},
       smooth=Smooth.None));
   connect(basLin.PPre, PPre) annotation (Line(
-      points={{11,0},{40,0},{40,-80},{110,-80}},
+      points={{11,0},{110,0}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(stoHis.u, isEventDay) annotation (Line(
@@ -93,6 +117,12 @@ the current type of day, then the predicted power consumption
 </html>", revisions="<html>
 <ul>
 <li>
+March 29, 2024, by Michael Wetter:<br/>
+Refactored implementation to avoid an infinite event iteration in OpenModelica.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3754\">#3754</a>.
+</li>
+<li>
 March 20, 2014 by Michael Wetter:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo b/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo
deleted file mode 100644
index b5727be48c8..00000000000
--- a/Buildings/Controls/DemandResponse/BaseClasses/NormalOperation.mo
+++ /dev/null
@@ -1,31 +0,0 @@
-within Buildings.Controls.DemandResponse.BaseClasses;
-block NormalOperation "Normal operation"
-  extends Modelica.StateGraph.StepWithSignal(nIn=1, nOut=1);
-  Modelica.Blocks.Interfaces.RealInput PCon(unit="W")
-    "Consumed electrical power"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
-        iconTransformation(extent={{-140,-100},{-100,-60}})));
-  Modelica.Blocks.Interfaces.RealOutput PPre(unit="W")
-    "Predicted power consumption for current hour"
-    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
-
-equation
- PPre = PCon;
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics={Text(
-          extent={{-70,64},{74,-54}},
-          textColor={0,0,255},
-          textString="N")}),    Documentation(info="<html>
-<p>
-Block that outputs the currently consumed electrical power,
-which is equal to its input signal.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 20, 2014 by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end NormalOperation;
diff --git a/Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo b/Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo
deleted file mode 100644
index 9d94a02394d..00000000000
--- a/Buildings/Controls/DemandResponse/BaseClasses/PartialDemandResponse.mo
+++ /dev/null
@@ -1,42 +0,0 @@
-within Buildings.Controls.DemandResponse.BaseClasses;
-partial block PartialDemandResponse
-  "Partial block that declares common data for demand response models"
-  extends Modelica.StateGraph.Step(nIn=1, nOut=1);
-  parameter Integer nSam
-    "Number of intervals in a day for which baseline is computed";
-
-  parameter Integer nPre(min=1)
-    "Number of intervals for which future load need to be predicted (set to one to only predict current time, or to nSam to predict one day)";
-
-  parameter Buildings.Controls.Predictors.Types.PredictionModel predictionModel
-    "Load prediction model";
-
-  Modelica.Blocks.Interfaces.RealInput ECon(unit="J")
-    "Consumed electrical energy"
-    annotation (Placement(transformation(extent={{-140,-50},{-100,-10}}),
-        iconTransformation(extent={{-120,-30},{-100,-10}})));
-  Modelica.Blocks.Interfaces.RealOutput PPre[nPre](each unit="W")
-    "Predicted power consumption for the current time interval"
-    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
-
-  Modelica.Blocks.Interfaces.RealInput TOutFut[nPre-1](each unit="K")
-    if (predictionModel == Buildings.Controls.Predictors.Types.PredictionModel.WeatherRegression)
-    "Future outside air temperatures"
-    annotation (Placement(
-      transformation(extent={{-140,-110},{-100,-70}}),
-      iconTransformation(extent={{-120,-100},{-100,-80}})));
-  annotation ( Documentation(info="<html>
-<p>
-This is a partial block that declares parameters, inputs and outputs that are
-used by the blocks that compute the demand reponse client.
-</p>
-</html>",
-revisions="<html>
-<ul>
-<li>
-March 20, 2014 by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PartialDemandResponse;
diff --git a/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo b/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo
deleted file mode 100644
index a66cfb5dff0..00000000000
--- a/Buildings/Controls/DemandResponse/BaseClasses/ShedOperation.mo
+++ /dev/null
@@ -1,37 +0,0 @@
-within Buildings.Controls.DemandResponse.BaseClasses;
-block ShedOperation "Computes the consumption with the shed taken into account"
-  extends Modelica.StateGraph.Step(nIn=1, nOut=1);
-  Modelica.Blocks.Interfaces.RealInput PCon(unit="W")
-    "Consumed electrical power"
-    annotation (Placement(transformation(extent={{-120,-90},{-100,-70}}),
-        iconTransformation(extent={{-140,-110},{-100,-70}})));
-
-  Modelica.Blocks.Interfaces.RealInput yShed(min=-1, max=1, unit="1")
-    "Amount of load to shed. Set to 0.5 to shed 50% of load"
-    annotation (Placement(transformation(extent={{-120,-50},{-100,-30}}),
-        iconTransformation(extent={{-120,-30},{-100,-10}})));
-
-  Modelica.Blocks.Interfaces.RealOutput PPre(unit="W")
-    "Predicted power consumption for current hour"
-    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
-
-equation
-  PPre = yShed*PCon;
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}), graphics={Text(
-          extent={{-70,64},{74,-54}},
-          textColor={0,0,255},
-          textString="SH")}),    Documentation(info="<html>
-<p>
-This model computes the predicted load as the product of the shed
-control signal and the consumed electrical power.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 20, 2014 by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ShedOperation;
diff --git a/Buildings/Controls/DemandResponse/BaseClasses/package.order b/Buildings/Controls/DemandResponse/BaseClasses/package.order
index 254a1fc7712..1c812c9576e 100644
--- a/Buildings/Controls/DemandResponse/BaseClasses/package.order
+++ b/Buildings/Controls/DemandResponse/BaseClasses/package.order
@@ -1,4 +1 @@
 BaselinePrediction
-NormalOperation
-PartialDemandResponse
-ShedOperation
diff --git a/Buildings/Controls/DemandResponse/Client.mo b/Buildings/Controls/DemandResponse/Client.mo
index 82fb125f180..18128e756e9 100644
--- a/Buildings/Controls/DemandResponse/Client.mo
+++ b/Buildings/Controls/DemandResponse/Client.mo
@@ -1,11 +1,10 @@
 within Buildings.Controls.DemandResponse;
 model Client "Demand response client"
-  extends Modelica.Blocks.Icons.Block;
+  extends Modelica.Blocks.Icons.DiscreteBlock;
 
   final parameter Modelica.Units.SI.Time tPeriod=24*3600
     "Period, generally one day";
-  final parameter Modelica.Units.SI.Time tSample=tPeriod/nSam
-    "Sample period, generally 900 or 3600 seconds";
+
   parameter Integer nSam
     "Number of samples in a day. For 1 hour sampling, set to 24";
   parameter Integer nPre(min=1) = 1
@@ -65,162 +64,72 @@ model Client "Demand response client"
     annotation (Placement(transformation(extent={{100,40},{120,60}})));
 
 protected
-  Modelica.StateGraph.InitialStep initialStep(nIn=0, nOut=1)
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
-    annotation (Placement(transformation(extent={{60,60},{80,80}})));
-  Modelica.StateGraph.Transition transition
-    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+  OBC.CDL.Reals.Multiply she "Outputs load taking shed signal into account"
+    annotation (Placement(transformation(extent={{30,20},{50,40}})));
+  OBC.CDL.Routing.RealExtractor extIndRea
+    annotation (Placement(transformation(extent={{-10,60},{10,80}})));
+  OBC.CDL.Integers.Sources.Constant conInt(k=1)
+    "Outputs 1 to extract the first signal of the demand prediction array"
+    annotation (Placement(transformation(extent={{-32,20},{-12,40}})));
   BaseClasses.BaselinePrediction comBasLin(
     final nSam=nSam,
     final nHis=nHis,
     final nPre=nPre,
-    final predictionModel=predictionModel,
-    nIn=3,
-    nOut=1)
+    final predictionModel=predictionModel)
            "Baseline prediction"
-    annotation (Placement(transformation(extent={{20,40},{40,60}})));
-  Modelica.StateGraph.Transition t1 "State transition" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={60,20})));
-  BaseClasses.NormalOperation norOpe(nOut=2, nIn=1)
-                                             "Normal operation"
-    annotation (Placement(transformation(extent={{40,-40},{20,-20}})));
-  Modelica.StateGraph.TransitionWithSignal
-                                 t2(enableTimer=false) "State transition"
-                       annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=270,
-        origin={10,20})));
-  Modelica.StateGraph.TransitionWithSignal t3 "State transition"
-                       annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        origin={-2,-30})));
-  BaseClasses.ShedOperation she(nIn=1, nOut=1)
-                                "Operation during load shedding"
-    annotation (Placement(transformation(extent={{-10,-40},{-30,-20}})));
-  Modelica.StateGraph.TransitionWithSignal
-                                 t4(enableTimer=false) "State transition"
-                       annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=270,
-        origin={-40,10})));
-  Modelica.Blocks.Sources.SampleTrigger tri(period=tSample) "Sample trigger"
-    annotation (Placement(transformation(extent={{-90,10},{-70,30}})));
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+
   Modelica.Blocks.Logical.Switch switch
     "Switch to select normal or shedded load"
-    annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
+    annotation (Placement(transformation(extent={{68,-10},{88,10}})));
 equation
-  connect(initialStep.outPort[1], transition.inPort) annotation (Line(
-      points={{-59.5,80},{-34,80}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(transition.outPort, comBasLin.inPort[1]) annotation (Line(
-      points={{-28.5,80},{6,80},{6,50.5},{19,50.5},{19,50.6667}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(t1.inPort, comBasLin.outPort[1]) annotation (Line(
-      points={{60,24},{60,50},{40.5,50}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(t1.outPort, norOpe.inPort[1]) annotation (Line(
-      points={{60,18.5},{60,-30},{41,-30}},
-      color={0,0,0},
-      smooth=Smooth.None));
   connect(comBasLin.ECon, ECon) annotation (Line(
-      points={{19,48},{-64,48},{-64,36},{-94,36},{-94,4.44089e-16},{-110,4.44089e-16}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(comBasLin.PPre[1], norOpe.PCon) annotation (Line(
-      points={{41,42},{80,42},{80,-38},{42,-38}},
+      points={{-61,68},{-80,68},{-80,0},{-110,0}},
       color={0,0,127},
       smooth=Smooth.None));
-  connect(t2.outPort, comBasLin.inPort[2]) annotation (Line(
-      points={{10,21.5},{10,50},{19,50}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(t3.outPort, she.inPort[1]) annotation (Line(
-      points={{-3.5,-30},{-9,-30}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(t4.inPort, she.outPort[1]) annotation (Line(
-      points={{-40,6},{-40,-30},{-30.5,-30}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(t4.outPort, comBasLin.inPort[3]) annotation (Line(
-      points={{-40,11.5},{-40,50},{-20,50},{-20,49.3333},{19,49.3333}},
-      color={0,0,0},
-      smooth=Smooth.None));
 
-  connect(t4.condition, tri.y) annotation (Line(
-      points={{-52,10},{-66,10},{-66,20},{-69,20}},
-      color={255,0,255},
-      smooth=Smooth.None));
-  connect(t2.condition, tri.y) annotation (Line(
-      points={{-2,20},{-69,20}},
-      color={255,0,255},
-      smooth=Smooth.None));
-  connect(norOpe.PPre, she.PCon) annotation (Line(
-      points={{19,-38},{6,-38},{6,-39},{-8,-39}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(norOpe.active, switch.u2) annotation (Line(
-      points={{30,-41},{30,-70},{38,-70}},
-      color={255,0,255},
-      smooth=Smooth.None));
-  connect(norOpe.outPort[1], t2.inPort) annotation (Line(
-      points={{19.5,-29.75},{10,-29.75},{10,16}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(norOpe.outPort[2], t3.inPort) annotation (Line(
-      points={{19.5,-30.25},{12,-30.25},{12,-30},{2,-30}},
-      color={0,0,0},
-      smooth=Smooth.None));
-  connect(shed, t3.condition) annotation (Line(
-      points={{-110,-30},{-80,-30},{-80,-10},{-2,-10},{-2,-18}},
-      color={255,0,255},
-      smooth=Smooth.None));
-  connect(switch.u1, she.PCon) annotation (Line(
-      points={{38,-62},{10,-62},{10,-39},{-8,-39}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(switch.u3, she.PPre) annotation (Line(
-      points={{38,-78},{-40,-78},{-40,-38},{-31,-38}},
-      color={0,0,127},
-      smooth=Smooth.None));
   connect(isEventDay, comBasLin.isEventDay) annotation (Line(
-      points={{-110,40},{-90,40},{-90,54},{19,54}},
+      points={{-110,40},{-88,40},{-88,74},{-61,74}},
       color={255,0,255},
       smooth=Smooth.None));
   connect(comBasLin.TOut, TOut) annotation (Line(
-      points={{19,45},{-60,45},{-60,-70},{-110,-70}},
+      points={{-61,65},{-74,65},{-74,-70},{-110,-70}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(typeOfDay, comBasLin.typeOfDay) annotation (Line(
-      points={{-110,80},{-90,80},{-90,58},{19,58}},
+      points={{-110,80},{-86,80},{-86,78},{-61,78}},
       color={0,127,0},
       smooth=Smooth.None));
   connect(comBasLin.TOutFut, TOutFut) annotation (Line(
-      points={{19,41},{-56,41},{-56,-90},{-110,-90}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(yShed, she.yShed) annotation (Line(
-      points={{-110,-50},{-48,-50},{-48,-14},{-6,-14},{-6,-32},{-9,-32}},
+      points={{-61,61},{-72,61},{-72,-90},{-110,-90}},
       color={0,0,127},
       smooth=Smooth.None));
   // Only PPre[1] will take into account the shedded load.
   connect(switch.y, PPre) annotation (Line(
-      points={{61,-70},{90,-70},{90,0},{110,0}},
+      points={{89,0},{110,0}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(comBasLin.PPre, PPreNoShe) annotation (Line(
-      points={{41,42},{80,42},{80,50},{110,50}},
+      points={{-39,70},{-20,70},{-20,50},{110,50}},
       color={0,0,127},
       smooth=Smooth.None));
+  connect(switch.u1, she.y)
+    annotation (Line(points={{66,8},{60,8},{60,30},{52,30}}, color={0,0,127}));
+  connect(yShed, she.u2) annotation (Line(points={{-110,-50},{24,-50},{24,24},{28,
+          24}}, color={0,0,127}));
+  connect(shed, switch.u2) annotation (Line(points={{-110,-30},{-12,-30},{-12,0},
+          {66,0}}, color={255,0,255}));
+  connect(comBasLin.PPre, extIndRea.u)
+    annotation (Line(points={{-39,70},{-12,70}}, color={0,0,127}));
+  connect(conInt.y, extIndRea.index)
+    annotation (Line(points={{-10,30},{0,30},{0,58}}, color={255,127,0}));
+  connect(switch.u3, extIndRea.y) annotation (Line(points={{66,-8},{20,-8},{20,70},
+          {12,70}}, color={0,0,127}));
+  connect(extIndRea.y, she.u1) annotation (Line(points={{12,70},{20,70},{20,36},
+          {28,36}}, color={0,0,127}));
   annotation (
-    Icon(graphics={                      Text(
+    Icon(graphics={
+      Text(
           extent={{-70,54},{74,-64}},
           textColor={0,0,255},
           textString="DR")}),
@@ -264,6 +173,12 @@ Buildings.Controls.Predictors.ElectricalLoad</a>.
 </html>", revisions="<html>
 <ul>
 <li>
+March 29, 2024, by Michael Wetter:<br/>
+Refactored implementation to avoid an infinite event iteration in OpenModelica.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3754\">#3754</a>.
+</li>
+<li>
 October 29, 2014, by Michael Wetter:<br/>
 Revised implementation.
 </li>
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
index 98c08e48927..626b1578f61 100644
--- 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/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo b/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo
index 827f76740fc..63703dcb167 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/AHUs/MultiZone/VAV/SetPoints/OutdoorAirFlow/ASHRAE62_1/AHU.mo
+++ b/Buildings/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
index 8cfc690db7e..ef88eefa1ff 100644
--- 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/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo
index 0e51cd81c5f..7e5df2a4b28 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/Generic/TimeSuppression.mo
@@ -95,7 +95,7 @@ protected
   Buildings.Controls.OBC.CDL.Reals.Switch swi
     "Use setpoint different value when sample period time has passed"
     annotation (Placement(transformation(extent={{40,100},{60,120}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
     final duration=samplePeriod)
     "Hold true signal for sample period of time"
     annotation (Placement(transformation(extent={{80,-160},{100,-140}})));
diff --git a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo
index af3593a0ced..c5416895462 100644
--- a/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo
+++ b/Buildings/Controls/OBC/ASHRAE/G36/ThermalZones/Setpoints.mo
@@ -240,7 +240,7 @@ protected
     final t=300)
     "Check whether the zone has been unpopulated for 5 minutes continuously during occupied mode"
     annotation (Placement(transformation(extent={{-220,-280},{-200,-260}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
     final duration=60)
     "When the zone is unpopulated by more than threshold time and then becomes populated, hold the change by short period"
     annotation (Placement(transformation(extent={{-100,-280},{-80,-260}})));
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
index 48c362187ec..e4076afd5ea 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToInteger.mo
@@ -5,10 +5,10 @@ block BooleanToInteger
     "Output signal for true Boolean input";
   parameter Integer integerFalse=0
     "Output signal for false Boolean input";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
index 55e2827b477..5809d67b250 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/BooleanToReal.mo
@@ -5,10 +5,10 @@ block BooleanToReal
     "Output signal for true Boolean input";
   parameter Real realFalse=0.0
     "Output signal for false Boolean input";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo b/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo
index 497b3ac4ee3..8df684521e1 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/IntegerToReal.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Conversions;
 block IntegerToReal
   "Convert Integer to Real signals"
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo b/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo
index 1010beb6061..e702193fec2 100644
--- a/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo
+++ b/Buildings/Controls/OBC/CDL/Conversions/RealToInteger.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Conversions;
 block RealToInteger
   "Convert Real to Integer signal"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
index e6afe0749d8..734ce804e85 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/FirstOrderHold.mo
@@ -6,10 +6,10 @@ block FirstOrderHold
     final unit="s",
     min=1E-3)
     "Sample period of component";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Continuous input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Continuous output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
index d53a67f2456..ac9928a9d29 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/Sampler.mo
@@ -6,10 +6,10 @@ block Sampler
     final unit="s",
     min=1E-3)
     "Sample period of component";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Continuous input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Continuous output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
index 37c20407a7a..64eba774431 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMax.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Discrete;
 block TriggeredMax
   "Output the maximum, absolute value of a continuous signal at trigger instants"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector with a Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput trigger
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger
     "Connector for trigger"
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90)));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector with a Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
index f8d378af6ae..8c649359f3f 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredMovingMean.mo
@@ -4,13 +4,13 @@ block TriggeredMovingMean
   parameter Integer n(
     min=1)
     "Number of samples over which the input is averaged";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Continuous input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput trigger
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger
     "Boolean signal that triggers the block"
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90),iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={0,-120})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Discrete averaged signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo
index d3e2d771623..3523ac18c00 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/TriggeredSampler.mo
@@ -3,13 +3,13 @@ block TriggeredSampler
   "Triggered sampling of continuous signals"
   parameter Real y_start=0
     "Initial value of output signal";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector with a Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput trigger
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger
     "Signal that triggers the sampler"
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90)));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector with a Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
index 190697dfbd9..dd15269b482 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/UnitDelay.mo
@@ -8,10 +8,10 @@ block UnitDelay
     "Sample period of component";
   parameter Real y_start=0
     "Initial value of output signal";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Continuous input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Continuous output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
index ec418d4b4c8..6c9189a9fbe 100644
--- a/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
+++ b/Buildings/Controls/OBC/CDL/Discrete/ZeroOrderHold.mo
@@ -6,10 +6,10 @@ block ZeroOrderHold
     final unit="s",
     min=1E-3)
     "Sample period of component";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Continuous input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Continuous output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Abs.mo b/Buildings/Controls/OBC/CDL/Integers/Abs.mo
index b33e87704f7..95936844b3d 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Abs.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Abs.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Abs
   "Output the absolute value of the input"
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Add.mo b/Buildings/Controls/OBC/CDL/Integers/Add.mo
index 812d671f352..573e430afe9 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Add.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Add.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Add
   "Output the sum of the two inputs"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of Integer input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of Integer input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo b/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo
index b6ff918f857..f7cd31ef70e 100644
--- a/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/AddParameter.mo
@@ -2,9 +2,9 @@ within Buildings.Controls.OBC.CDL.Integers;
 block AddParameter "Output the sum of an input plus a parameter"
   parameter Integer p
     "Value to be added";
-  Interfaces.IntegerInput u "Connector of Integer input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y "Connector of Integer output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
diff --git a/Buildings/Controls/OBC/CDL/Integers/Change.mo b/Buildings/Controls/OBC/CDL/Integers/Change.mo
index 567ef291076..dd57641f82d 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Change.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Change.mo
@@ -3,16 +3,16 @@ block Change
   "Output whether the Integer input changes values, increases or decreases"
   parameter Integer pre_u_start=0
     "Start value of pre(u) at initial time";
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-  Interfaces.BooleanOutput up
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput up
     "Connector of Boolean output signal indicating input increase"
     annotation (Placement(transformation(extent={{100,40},{140,80}})));
-  Interfaces.BooleanOutput down
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput down
     "Connector of Boolean output signal indicating input decrease"
     annotation (Placement(transformation(extent={{100,-80},{140,-40}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Equal.mo b/Buildings/Controls/OBC/CDL/Integers/Equal.mo
index 6112721a8f7..3320714b50d 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Equal.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Equal.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Equal
   "Output y is true, if input u1 is equal to input u2"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of first Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of second Integer input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Greater.mo b/Buildings/Controls/OBC/CDL/Integers/Greater.mo
index 6293637d000..bb69622e7ae 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Greater.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Greater.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Greater
   "Output y is true, if input u1 is greater than input u2"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of first Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of second Integer input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
index 9857b293c10..0924fba9a44 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqual.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block GreaterEqual
   "Output y is true, if input u1 is greater or equal than input u2"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of first Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of second Integer input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
index a170947d544..b1c582d03a2 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterEqualThreshold.mo
@@ -3,10 +3,10 @@ block GreaterEqualThreshold
   "Output y is true, if input u is greater or equal than threshold"
   parameter Integer t=0
     "Comparison with respect to a threshold";
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
index 5df8b1c8187..0e3e96cfb15 100644
--- a/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/GreaterThreshold.mo
@@ -3,10 +3,10 @@ block GreaterThreshold
   "Output y is true, if input u is greater than a threshold"
   parameter Integer t=0
     "Threshold for comparison";
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Less.mo b/Buildings/Controls/OBC/CDL/Integers/Less.mo
index c5b1dc1cf54..3a7dd12bf90 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Less.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Less.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Less
   "Output y is true, if input u1 is less than input u2"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of first Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of second Integer input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo
index 888de514668..1d6fad2c9d8 100644
--- a/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/LessEqual.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block LessEqual
   "Output y is true, if input u1 is less or equal than input u2"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of first Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of second Integer input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
index 7467e814a3c..b5bb065179f 100644
--- a/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/LessEqualThreshold.mo
@@ -3,10 +3,10 @@ block LessEqualThreshold
   "Output y is true, if input u is less or equal than a threshold"
   parameter Integer t=0
     "Threshold for comparison";
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
index 4e7ec435009..a8ffcdfb71c 100644
--- a/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/LessThreshold.mo
@@ -3,10 +3,10 @@ block LessThreshold
   "Output y is true, if input u is less than a threshold"
   parameter Integer t=0
     "Threshold for comparison";
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Max.mo b/Buildings/Controls/OBC/CDL/Integers/Max.mo
index 3f12e48ba34..543759df237 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Max.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Max.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Max
   "Pass through the largest signal"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of Integer input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of Integer input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Min.mo b/Buildings/Controls/OBC/CDL/Integers/Min.mo
index 4d94420217a..784130cf638 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Min.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Min.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Min
   "Pass through the smallest signal"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of Integer input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of Integer input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo b/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo
index eddbf959511..9b9a411ca28 100644
--- a/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/MultiSum.mo
@@ -9,10 +9,10 @@ block MultiSum
     1,
     nin)
     "Input gains";
-  Interfaces.IntegerInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
     "Connector of Integer input signals"
     annotation (Placement(transformation(extent={{-140,70},{-100,-70}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Multiply.mo b/Buildings/Controls/OBC/CDL/Integers/Multiply.mo
index a061e24a143..71bd59a92e1 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Multiply.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Multiply.mo
@@ -1,12 +1,12 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Multiply "Output product of the two inputs"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of Integer input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of Integer input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo
index 7992aea89d2..9d9612150b1 100644
--- a/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/OnCounter.mo
@@ -3,13 +3,13 @@ block OnCounter
   "Increment the output if the input switches to true"
   parameter Integer y_start=0
     "Initial and reset value of y if input reset switches to true";
-  Interfaces.BooleanInput trigger
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput trigger
     "Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput reset
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset
     "Reset the counter"
     annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,origin={0,-120})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo
index c9d0f05db6c..e7dc5354d92 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Sources/Constant.mo
@@ -3,7 +3,7 @@ block Constant
   "Output constant signal of type Integer"
   parameter Integer k
     "Constant output value";
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo
index b39faa2ffc7..82a5b4f7f83 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Sources/Pulse.mo
@@ -19,7 +19,7 @@ block Pulse
     "Shift time for output";
   parameter Integer offset=0
     "Offset of output signals";
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Pulse output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo
index 3a9609d3525..1114703510e 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Sources/TimeTable.mo
@@ -11,7 +11,7 @@ block TimeTable
     final unit="s",
     min=1E-6)
     "Periodicity of table";
-  Interfaces.IntegerOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout]
     "Output of the table"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Integers/Subtract.mo b/Buildings/Controls/OBC/CDL/Integers/Subtract.mo
index 042dcea96f5..2b5b03d4a12 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Subtract.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Subtract.mo
@@ -1,12 +1,12 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Subtract "Output the difference of the two inputs"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Connector of Integer input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.IntegerInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u2
     "Connector of Integer input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Connector of Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}}),
         iconTransformation(extent={{100,-20},{140,20}})));
diff --git a/Buildings/Controls/OBC/CDL/Integers/Switch.mo b/Buildings/Controls/OBC/CDL/Integers/Switch.mo
index d319d1a2270..3e3270926a3 100644
--- a/Buildings/Controls/OBC/CDL/Integers/Switch.mo
+++ b/Buildings/Controls/OBC/CDL/Integers/Switch.mo
@@ -1,16 +1,16 @@
 within Buildings.Controls.OBC.CDL.Integers;
 block Switch
   "Switch between two integer signals"
-  Interfaces.IntegerInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u1
     "Integer input signal"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Boolean switch input signal, if true, y=u1, else y=u3"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerInput u3
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u3
     "Integer input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Integer output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/And.mo b/Buildings/Controls/OBC/CDL/Logical/And.mo
index 77d04d82aeb..91ea76cac43 100644
--- a/Buildings/Controls/OBC/CDL/Logical/And.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/And.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block And
   "Logical 'and': y = u1 and u2"
-  Interfaces.BooleanInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
     "Connector of first Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Connector of second Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Change.mo b/Buildings/Controls/OBC/CDL/Logical/Change.mo
index ed700868a52..891a2381aa7 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Change.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Change.mo
@@ -3,10 +3,10 @@ block Change
   "Output y is true, if the input u has a rising or falling edge (y = change(u))"
   parameter Boolean pre_u_start=false
     "Start value of pre(u) at initial time";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Edge.mo b/Buildings/Controls/OBC/CDL/Logical/Edge.mo
index 0dda7d7b360..425f3849f06 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Edge.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Edge.mo
@@ -3,10 +3,10 @@ block Edge
   "Output y is true, if the input u has a rising edge (y = edge(u))"
   parameter Boolean pre_u_start=false
     "Start value of pre(u) at initial time";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
index 57c25da19b6..0e73242c655 100644
--- a/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/FallingEdge.mo
@@ -3,10 +3,10 @@ block FallingEdge
   "Output y is true, if the input u has a falling edge (y = edge(not u))"
   parameter Boolean pre_u_start=false
     "Start value of pre(u) at initial time";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Latch.mo b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
index 2c2a70f75c6..2c4ce673505 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Latch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Latch.mo
@@ -1,49 +1,20 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Latch
-  "Maintains a true signal until change condition"
-  Interfaces.BooleanInput u
+  "Maintains a true signal until cleared"
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Latch input"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput clr
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput clr
     "Clear input"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-initial equation
-  pre(y)=false;
-  pre(u)=false;
-  pre(clr)=false;
-
 equation
   when initial() then
-    //scenario = 1;
-    y=if clr then
-        false
-      else
-        u;
-  elsewhen
-          (not clr) and change(u) and
-                                     (pre(u) == false) then
-    //scenario = 2;
-    y=not clr;
-  elsewhen
-          (not clr) and change(u) and
-                                     (pre(u) == true) then
-    //scenario = 3;
-    y=if clr then
-        false
-      else
-        pre(y);
-  elsewhen change(clr) and
-                          (pre(clr) == true) and
-                                                (not u) then
-    //scenario = 4;
-    y=false;
-  elsewhen clr then
-    //scenario = 5;
-    y=false;
+    y=not clr and u;
+  elsewhen {clr, u} then
+    y=not clr and u;
   end when;
   annotation (
     defaultComponentName="lat",
@@ -122,10 +93,10 @@ equation
     Documentation(
       info="<html>
 <p>
-Block that generates a <code>true</code> output when the latch input <code>u</code> 
-rises from <code>false</code> to <code>true</code>, provided that the clear input 
+Block that generates a <code>true</code> output when the latch input <code>u</code>
+rises from <code>false</code> to <code>true</code>, provided that the clear input
 <code>clr</code> is <code>false</code> or also became at the same time <code>false</code>.
-The output remains <code>true</code> until the clear input <code>clr</code> rises 
+The output remains <code>true</code> until the clear input <code>clr</code> rises
 from <code>false</code> to <code>true</code>.
 </p>
 <p>
@@ -134,8 +105,8 @@ switches to <code>false</code> (if it was <code>true</code>) and it remains <cod
 regardless of the value of the latch input <code>u</code>.
 </p>
 <p>
-At initial time, if <code>clr = false</code>, then the output will be 
-<code>y = u</code>. Otherwise it will be <code>y=false</code> 
+At initial time, if <code>clr = false</code>, then the output will be
+<code>y = u</code>. Otherwise it will be <code>y=false</code>
 (because the clear input <code>clr</code> is <code>true</code>).
 </p>
 
@@ -148,6 +119,11 @@ At initial time, if <code>clr = false</code>, then the output will be
       revisions="<html>
 <ul>
 <li>
+April 15, 2024, by Antoine Gautier:<br/>
+Simplified the implementation.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3796\">issue 3796</a>.
+</li>
+<li>
 October 13, 2020, by Jianjun Hu:<br/>
 Removed the parameter <code>pre_y_start</code>, and made the initial output to be
 equal to latch input when the clear input is <code>false</code>.<br/>
@@ -159,7 +135,7 @@ Simplified implementation, and made model work with OpenModelica.
 </li>
 <li>
 April 4, 2019, by Jianjun Hu:<br/>
-Corrected implementation that causes wrong output at initial stage. 
+Corrected implementation that causes wrong output at initial stage.
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
 </li>
 <li>
diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
index ed4e154d0c8..2d550637fe6 100644
--- a/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/MultiAnd.mo
@@ -5,10 +5,10 @@ block MultiAnd
     min=0)=0
     "Number of input connections"
     annotation (Dialog(connectorSizing=true),HideResult=true);
-  Interfaces.BooleanInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin]
     "Connector of Boolean input signals"
     annotation (Placement(transformation(extent={{-140,70},{-100,-70}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
index 0baa2e6e6c3..952e30b4628 100644
--- a/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/MultiOr.mo
@@ -5,10 +5,10 @@ block MultiOr
     min=0)=0
     "Number of input connections"
     annotation (Dialog(connectorSizing=true),HideResult=true);
-  Interfaces.BooleanInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin]
     "Connector of Boolean input signals"
     annotation (Placement(transformation(extent={{-140,70},{-100,-70}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -71,7 +71,7 @@ equation
     Documentation(
       info="<html>
 <p>
-Block that outputs <code>y = true</code> if any element in the input 
+Block that outputs <code>y = true</code> if any element in the input
 vector <code>u</code> is <code>true</code>.
 If no connection to the input connector <code>u</code> is present,
 the output is <code>y=false</code>.
diff --git a/Buildings/Controls/OBC/CDL/Logical/Nand.mo b/Buildings/Controls/OBC/CDL/Logical/Nand.mo
index 6bc90e0b873..596b7f36a5f 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Nand.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Nand.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Nand
   "Logical 'nand': y = not (u1 and u2)"
-  Interfaces.BooleanInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
     "Connector of first Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Connector of second Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Nor.mo b/Buildings/Controls/OBC/CDL/Logical/Nor.mo
index 63ab1097a05..86aa7a2478b 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Nor.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Nor.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Nor
   "Logical 'nor': y = not (u1 or u2)"
-  Interfaces.BooleanInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
     "Connector of first Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Connector of second Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Not.mo b/Buildings/Controls/OBC/CDL/Logical/Not.mo
index 91848627db4..5ec83472322 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Not.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Not.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Not
   "Logical not"
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Or.mo b/Buildings/Controls/OBC/CDL/Logical/Or.mo
index 00f591962d2..4ecd8c68238 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Or.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Or.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Or
   "Logical 'or': y = u1 or u2"
-  Interfaces.BooleanInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
     "Connector of first Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Connector of second Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Pre.mo b/Buildings/Controls/OBC/CDL/Logical/Pre.mo
index caf35d3f862..5c0d14945e1 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Pre.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Pre.mo
@@ -3,10 +3,10 @@ block Pre
   "Breaks algebraic loops by an infinitesimal small time delay (y = pre(u): event iteration continues until u = pre(u))"
   parameter Boolean pre_u_start=false
     "Start value of pre(u) at initial time";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo
index f5f1a168861..6274e6e9249 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Constant.mo
@@ -3,7 +3,7 @@ block Constant
   "Output constant signal of type Boolean"
   parameter Boolean k
     "Constant output value";
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
index 7ed10731274..d947528a833 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/Pulse.mo
@@ -15,7 +15,7 @@ block Pulse
     final quantity="Time",
     final unit="s")=0
     "Shift time for output";
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
index c0399c3d756..44b1b4edacc 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/SampleTrigger.mo
@@ -10,7 +10,7 @@ block SampleTrigger
     final quantity="Time",
     final unit="s")=0
     "Shift time for output";
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo
index bb5bfc2d07f..6759618579e 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Sources/TimeTable.mo
@@ -10,7 +10,7 @@ block TimeTable
     final quantity="Time",
     final unit="s")
     "Periodicity of table";
-  Interfaces.BooleanOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout]
     "Output of the table"
     annotation (Placement(transformation(extent={{120,-20},{160,20}}),iconTransformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Switch.mo b/Buildings/Controls/OBC/CDL/Logical/Switch.mo
index b429da31a44..9ce83261a95 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Switch.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Switch.mo
@@ -1,16 +1,16 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Switch
   "Switch between two boolean signals"
-  Interfaces.BooleanInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
     "Boolean input signal"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Boolean switch input signal, if true, y=u1, else y=u3"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput u3
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u3
     "Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Booelan output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
index de2c5b99b0c..86c45bc13cb 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Toggle.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Toggle
   "Toggles output value whenever its input turns true"
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Toggle input"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput clr
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput clr
     "Clear input"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -121,9 +121,9 @@ equation
     Documentation(
       info="<html>
 <p>
-Block that generates a <code>true</code> output when toggle input <code>u</code> 
+Block that generates a <code>true</code> output when toggle input <code>u</code>
 rises from <code>false</code> to <code>true</code>, provided that the clear input
-<code>clr</code> is <code>false</code> or also became at the same time 
+<code>clr</code> is <code>false</code> or also became at the same time
 <code>false</code>. The output remains <code>true</code> until
 </p>
 <ul>
@@ -141,8 +141,8 @@ regardless of the value of the toggle input <code>u</code>.
 </p>
 
 <p>
-At initial time, if <code>clr = false</code>, then the output will be 
-<code>y = u</code>. Otherwise it will be <code>y=false</code> 
+At initial time, if <code>clr = false</code>, then the output will be
+<code>y = u</code>. Otherwise it will be <code>y=false</code>
 (because the clear input <code>clr</code> is <code>true</code>).
 </p>
 
@@ -166,7 +166,7 @@ Simplified implementation, and made model work with OpenModelica.
 </li>
 <li>
 April 4, 2019, by Jianjun Hu:<br/>
-Corrected implementation that causes wrong output at initial stage. 
+Corrected implementation that causes wrong output at initial stage.
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
 </li>
 <li>
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo
index 4c1a539ad7a..78acc0a7128 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/TrueDelay.mo
@@ -7,10 +7,10 @@ block TrueDelay
     "Delay time";
   parameter Boolean delayOnInit=false
     "Set to true to delay initial true input";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
index a8ad1065a5f..703593ea794 100644
--- a/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/TrueFalseHold.mo
@@ -9,10 +9,10 @@ block TrueFalseHold
     final quantity="Time",
     final unit="s")=trueHoldDuration
     "false hold duration";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Boolean input signal"
     annotation (Placement(transformation(extent={{-220,-20},{-180,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Boolean output signal"
     annotation (Placement(transformation(extent={{160,-20},{200,20}}),iconTransformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo b/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo
new file mode 100644
index 00000000000..41afc4f2819
--- /dev/null
+++ b/Buildings/Controls/OBC/CDL/Logical/TrueHold.mo
@@ -0,0 +1,195 @@
+within Buildings.Controls.OBC.CDL.Logical;
+block TrueHold
+  "Block that holds a true signal for at least a requested duration"
+  parameter Real duration(
+    final quantity="Time",
+    final unit="s")
+    "Time duration of the true output signal hold";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
+    "Boolean input signal"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
+    "Boolean output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+
+protected
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    "Root of state graph"
+    annotation (Placement(transformation(extent={{70,68},{90,88}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueDelay onDelay(
+    final delayTime=duration)
+    "Delay for the on signal"
+    annotation (Placement(transformation(extent={{10,10},{30,30}})));
+  Modelica.StateGraph.InitialStep initialStep(nIn=1, nOut=1)
+    "Initial step"
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+  Modelica.StateGraph.StepWithSignal outputTrue(nIn=1, nOut=1)
+    "Holds the output at true"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Modelica.StateGraph.TransitionWithSignal toOutputTrue
+    "Transition that activates sending a true output signal"
+    annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
+  Modelica.StateGraph.TransitionWithSignal toInitial
+    "Transition that activates the initial state"
+    annotation (Placement(transformation(extent={{30,50},{50,70}})));
+
+equation
+  connect(initialStep.outPort[1],toOutputTrue.inPort)
+    annotation (Line(points={{-59.5,60},{-44,60}},color={0,0,0}));
+  connect(outputTrue.active,y)
+    annotation (Line(points={{0,49},{0,0},{120,0}},color={255,0,255}));
+  connect(toOutputTrue.condition,u)
+    annotation (Line(points={{-40,48},{-40,0},{-120,0}},color={255,0,255}));
+  connect(toInitial.outPort,initialStep.inPort[1])
+    annotation (Line(points={{41.5,60},{52,60},{52,86},{-90,86},{-90,60},{-81,60}},color={0,0,0}));
+  connect(outputTrue.active,onDelay.u)
+    annotation (Line(points={{0,49},{0,20},{8,20}},color={255,0,255}));
+  connect(toOutputTrue.outPort,outputTrue.inPort[1])
+    annotation (Line(points={{-38.5,60},{-11,60}},color={0,0,0}));
+  connect(outputTrue.outPort[1],toInitial.inPort)
+    annotation (Line(points={{10.5,60},{36,60}},color={0,0,0}));
+  connect(onDelay.y,toInitial.condition)
+    annotation (Line(points={{32,20},{40,20},{40,48}},color={255,0,255}));
+  annotation (
+    defaultComponentName="truHol",
+    Icon(
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          fillColor={210,210,210},
+          lineThickness=5.0,
+          fillPattern=FillPattern.Solid,
+          borderPattern=BorderPattern.Raised),
+        Line(
+          points={{-72,18},{-48,18},{-48,62},{52,62},{52,18},{80,18}},
+          color={255,0,255}),
+        Line(
+          points={{-68,-46},{-48,-46},{-48,-2},{22,-2},{22,-46},{78,-46}}),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255}),
+        Text(
+          extent={{-90,-62},{96,-90}},
+          textColor={0,0,255},
+          textString="%duration"),
+        Ellipse(
+          extent={{71,7},{85,-7}},
+          lineColor=DynamicSelect({235,235,235},
+            if y then
+              {0,255,0}
+            else
+              {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},
+            if y then
+              {0,255,0}
+            else
+              {235,235,235}),
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-83,7},{-69,-7}},
+          lineColor=DynamicSelect({235,235,235},
+            if u then
+              {0,255,0}
+            else
+              {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},
+            if u then
+              {0,255,0}
+            else
+              {235,235,235}),
+          fillPattern=FillPattern.Solid)}),
+    Documentation(
+      info="<html>
+<p>
+Block that holds a <code>true</code> input signal for at least a defined time period.
+</p>
+<p>
+At initialization, the output <code>y</code> is equal to the input <code>u</code>.
+If the input <code>u</code> becomes <code>true</code>, or is <code>true</code>
+during intialization, a timer starts
+and the Boolean output <code>y</code> stays <code>true</code> for the time
+period provided by the parameter <code>duration</code>.
+When this time is elapsed, the input is checked again. If
+it is <code>true</code>, then the timer is restarted and the output remains
+<code>true</code> for another <code>duration</code> seconds.
+If the input <code>u</code> is <code>false</code> after
+<code>holdTime</code> seconds, then the ouput is switched to <code>false</code>,
+until the input becomes <code>true</code> again.
+</p>
+<p>
+The figure below shows the state chart of the implementation. Note that the
+transition are done in zero time.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.png\"
+alt=\"Input and output of the block\"/>
+</p>
+<p>
+The figure below shows an example with a hold time of <i>3600</i> seconds
+and a pulse width period <i>9000</i> seconds that starts at <i>t=200</i> seconds.
+</p>
+
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold.png\"
+alt=\"Input and output of the block\"/>
+</p>
+
+<p>
+The figure below shows an example with a hold time of <i>60</i> seconds
+and a pulse width period <i>3600</i> seconds that starts at <i>t=0</i> seconds.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold1.png\"
+alt=\"Input and output of the block\"/>
+</p>
+<p>
+The next two figures show the same experiment, except that the input <code>u</code>
+has been negated. The figure below has again a hold time of <i>3600</i> seconds
+and a pulse width period <i>9000</i> seconds that starts at <i>t=200</i> seconds.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold2.png\"
+alt=\"Input and output of the block\"/>
+</p>
+<p>
+The figure below has again a hold time of <i>60</i> seconds
+and a pulse width period <i>3600</i> seconds that starts at <i>t=0</i> seconds.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold3.png\"
+alt=\"Input and output of the block\"/>
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by Michael Wetter:<br/>
+Renamed block from <code>TrueHoldWithReset</code> to <code>TrueHold</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3689\">issue 3689</a>.
+</li>
+<li>
+November 12, 2020, by Michael Wetter:<br/>
+Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2243\">issue 2243</a>.
+</li>
+<li>
+September 18, 2017, by Michael Wetter:<br/>
+Improved event handling.
+</li>
+<li>
+June 13, 2017, by Michael Wetter:<br/>
+Reimplemented model using a state graph to avoid having to test for equality within tolerance.
+This implementation is also easier to understand.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/789\">issue 789</a>.
+</li>
+<li>
+May 24, 2017, by Milica Grahovac:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end TrueHold;
diff --git a/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo b/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo
deleted file mode 100644
index 73e8196079a..00000000000
--- a/Buildings/Controls/OBC/CDL/Logical/TrueHoldWithReset.mo
+++ /dev/null
@@ -1,189 +0,0 @@
-within Buildings.Controls.OBC.CDL.Logical;
-block TrueHoldWithReset
-  "Block that holds a true signal for at least a requested duration"
-  parameter Real duration(
-    final quantity="Time",
-    final unit="s")
-    "Time duration of the true output signal hold";
-  Interfaces.BooleanInput u
-    "Boolean input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
-    "Boolean output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
-protected
-  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
-    "Root of state graph"
-    annotation (Placement(transformation(extent={{70,68},{90,88}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueDelay onDelay(
-    final delayTime=duration)
-    "Delay for the on signal"
-    annotation (Placement(transformation(extent={{10,10},{30,30}})));
-  Modelica.StateGraph.InitialStep initialStep(nIn=1, nOut=1)
-    "Initial step"
-    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
-  Modelica.StateGraph.StepWithSignal outputTrue(nIn=1, nOut=1)
-    "Holds the output at true"
-    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-  Modelica.StateGraph.TransitionWithSignal toOutputTrue
-    "Transition that activates sending a true output signal"
-    annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
-  Modelica.StateGraph.TransitionWithSignal toInitial
-    "Transition that activates the initial state"
-    annotation (Placement(transformation(extent={{30,50},{50,70}})));
-
-equation
-  connect(initialStep.outPort[1],toOutputTrue.inPort)
-    annotation (Line(points={{-59.5,60},{-44,60}},color={0,0,0}));
-  connect(outputTrue.active,y)
-    annotation (Line(points={{0,49},{0,0},{120,0}},color={255,0,255}));
-  connect(toOutputTrue.condition,u)
-    annotation (Line(points={{-40,48},{-40,0},{-120,0}},color={255,0,255}));
-  connect(toInitial.outPort,initialStep.inPort[1])
-    annotation (Line(points={{41.5,60},{52,60},{52,86},{-90,86},{-90,60},{-81,60}},color={0,0,0}));
-  connect(outputTrue.active,onDelay.u)
-    annotation (Line(points={{0,49},{0,20},{8,20}},color={255,0,255}));
-  connect(toOutputTrue.outPort,outputTrue.inPort[1])
-    annotation (Line(points={{-38.5,60},{-11,60}},color={0,0,0}));
-  connect(outputTrue.outPort[1],toInitial.inPort)
-    annotation (Line(points={{10.5,60},{36,60}},color={0,0,0}));
-  connect(onDelay.y,toInitial.condition)
-    annotation (Line(points={{32,20},{40,20},{40,48}},color={255,0,255}));
-  annotation (
-    defaultComponentName="truHol",
-    Icon(
-      graphics={
-        Rectangle(
-          extent={{-100,100},{100,-100}},
-          fillColor={210,210,210},
-          lineThickness=5.0,
-          fillPattern=FillPattern.Solid,
-          borderPattern=BorderPattern.Raised),
-        Line(
-          points={{-72,18},{-48,18},{-48,62},{52,62},{52,18},{80,18}},
-          color={255,0,255}),
-        Line(
-          points={{-68,-46},{-48,-46},{-48,-2},{22,-2},{22,-46},{78,-46}}),
-        Text(
-          extent={{-150,150},{150,110}},
-          textString="%name",
-          textColor={0,0,255}),
-        Text(
-          extent={{-90,-62},{96,-90}},
-          textColor={0,0,255},
-          textString="%duration"),
-        Ellipse(
-          extent={{71,7},{85,-7}},
-          lineColor=DynamicSelect({235,235,235},
-            if y then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillColor=DynamicSelect({235,235,235},
-            if y then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-83,7},{-69,-7}},
-          lineColor=DynamicSelect({235,235,235},
-            if u then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillColor=DynamicSelect({235,235,235},
-            if u then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillPattern=FillPattern.Solid)}),
-    Documentation(
-      info="<html>
-<p>
-Block that holds a <code>true</code> input signal for at least a defined time period.
-</p>
-<p>
-At initialization, the output <code>y</code> is equal to the input <code>u</code>.
-If the input <code>u</code> becomes <code>true</code>, or is <code>true</code>
-during intialization, a timer starts
-and the Boolean output <code>y</code> stays <code>true</code> for the time
-period provided by the parameter <code>duration</code>.
-When this time is elapsed, the input is checked again. If
-it is <code>true</code>, then the timer is restarted and the output remains
-<code>true</code> for another <code>duration</code> seconds.
-If the input <code>u</code> is <code>false</code> after
-<code>holdTime</code> seconds, then the ouput is switched to <code>false</code>,
-until the input becomes <code>true</code> again.
-</p>
-<p>
-The figure below shows the state chart of the implementation. Note that the
-transition are done in zero time.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png\"
-alt=\"Input and output of the block\"/>
-</p>
-<p>
-The figure below shows an example with a hold time of <i>3600</i> seconds
-and a pulse width period <i>9000</i> seconds that starts at <i>t=200</i> seconds.
-</p>
-
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset.png\"
-alt=\"Input and output of the block\"/>
-</p>
-
-<p>
-The figure below shows an example with a hold time of <i>60</i> seconds
-and a pulse width period <i>3600</i> seconds that starts at <i>t=0</i> seconds.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset1.png\"
-alt=\"Input and output of the block\"/>
-</p>
-<p>
-The next two figures show the same experiment, except that the input <code>u</code>
-has been negated. The figure below has again a hold time of <i>3600</i> seconds
-and a pulse width period <i>9000</i> seconds that starts at <i>t=200</i> seconds.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset2.png\"
-alt=\"Input and output of the block\"/>
-</p>
-<p>
-The figure below has again a hold time of <i>60</i> seconds
-and a pulse width period <i>3600</i> seconds that starts at <i>t=0</i> seconds.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset3.png\"
-alt=\"Input and output of the block\"/>
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-November 12, 2020, by Michael Wetter:<br/>
-Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2243\">issue 2243</a>.
-</li>
-<li>
-September 18, 2017, by Michael Wetter:<br/>
-Improved event handling.
-</li>
-<li>
-June 13, 2017, by Michael Wetter:<br/>
-Reimplemented model using a state graph to avoid having to test for equality within tolerance.
-This implementation is also easier to understand.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/789\">issue 789</a>.
-</li>
-<li>
-May 24, 2017, by Milica Grahovac:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end TrueHoldWithReset;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHold.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
new file mode 100644
index 00000000000..e538c448110
--- /dev/null
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHold.mo
@@ -0,0 +1,101 @@
+within Buildings.Controls.OBC.CDL.Logical.Validation;
+model TrueHold
+  "Validation model for the TrueHold block"
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
+    period=9000,
+    shift=300)
+    "Boolean pulse input signal"
+    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
+    duration=3600)
+    "Block that holds a signal on for a requested time period"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
+    period=3600)
+    "Boolean pulse input signal"
+    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol1(
+    duration=600)
+    "Block that holds a signal on for a requested time period"
+    annotation (Placement(transformation(extent={{20,20},{40,40}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul2(
+    period=9000,
+    shift=300)
+    "Boolean pulse input signal"
+    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol2(
+    duration=3600)
+    "Block that holds a signal on for a requested time period"
+    annotation (Placement(transformation(extent={{20,-20},{40,0}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul3(
+    period=3600)
+    "Boolean pulse input signal"
+    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol3(
+    duration=600)
+    "Block that holds a signal on for a requested time period"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not2
+    "Negation of input signal"
+    annotation (Placement(transformation(extent={{-10,-20},{10,0}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not3
+    "Negation of input signal"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+
+equation
+  connect(booPul.y,truHol.u)
+    annotation (Line(points={{-18,80},{-18,80},{18,80}},color={255,0,255}));
+  connect(booPul1.y,truHol1.u)
+    annotation (Line(points={{-18,30},{18,30}},color={255,0,255}));
+  connect(booPul2.y,not2.u)
+    annotation (Line(points={{-18,-10},{-12,-10}},color={255,0,255}));
+  connect(not2.y,truHol2.u)
+    annotation (Line(points={{12,-10},{18,-10}},color={255,0,255}));
+  connect(booPul3.y,not3.u)
+    annotation (Line(points={{-18,-60},{-12,-60}},color={255,0,255}));
+  connect(not3.y,truHol3.u)
+    annotation (Line(points={{12,-60},{18,-60}},color={255,0,255}));
+  annotation (
+    experiment(
+      StopTime=15000.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+Validation test for the block
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.TrueHold\">
+Buildings.Controls.OBC.CDL.Logical.TrueHold</a>.
+</p>
+<p>
+The validation uses different instances to validate different hold durations, different lengths
+of the input pulse, and different initial values for the input signal.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+June 14, 2017, by Michael Wetter:<br/>
+Added more tests for different initial signals and different hold values.
+</li>
+<li>
+May 24, 2017, by Milica Grahovac:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end TrueHold;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo b/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo
deleted file mode 100644
index 06527716b60..00000000000
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mo
+++ /dev/null
@@ -1,101 +0,0 @@
-within Buildings.Controls.OBC.CDL.Logical.Validation;
-model TrueHoldWithReset
-  "Validation model for the TrueHoldWithReset block"
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
-    period=9000,
-    shift=300)
-    "Boolean pulse input signal"
-    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(
-    duration=3600)
-    "Block that holds a signal on for a requested time period"
-    annotation (Placement(transformation(extent={{20,70},{40,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
-    period=3600)
-    "Boolean pulse input signal"
-    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol1(
-    duration=600)
-    "Block that holds a signal on for a requested time period"
-    annotation (Placement(transformation(extent={{20,20},{40,40}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul2(
-    period=9000,
-    shift=300)
-    "Boolean pulse input signal"
-    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol2(
-    duration=3600)
-    "Block that holds a signal on for a requested time period"
-    annotation (Placement(transformation(extent={{20,-20},{40,0}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul3(
-    period=3600)
-    "Boolean pulse input signal"
-    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol3(
-    duration=600)
-    "Block that holds a signal on for a requested time period"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not2
-    "Negation of input signal"
-    annotation (Placement(transformation(extent={{-10,-20},{10,0}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not3
-    "Negation of input signal"
-    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
-
-equation
-  connect(booPul.y,truHol.u)
-    annotation (Line(points={{-18,80},{-18,80},{18,80}},color={255,0,255}));
-  connect(booPul1.y,truHol1.u)
-    annotation (Line(points={{-18,30},{18,30}},color={255,0,255}));
-  connect(booPul2.y,not2.u)
-    annotation (Line(points={{-18,-10},{-12,-10}},color={255,0,255}));
-  connect(not2.y,truHol2.u)
-    annotation (Line(points={{12,-10},{18,-10}},color={255,0,255}));
-  connect(booPul3.y,not3.u)
-    annotation (Line(points={{-18,-60},{-12,-60}},color={255,0,255}));
-  connect(not3.y,truHol3.u)
-    annotation (Line(points={{12,-60},{18,-60}},color={255,0,255}));
-  annotation (
-    experiment(
-      StopTime=15000.0,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mos" "Simulate and plot"),
-    Documentation(
-      info="<html>
-<p>
-Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset\">
-Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset</a>.
-</p>
-<p>
-The validation uses different instances to validate different hold durations, different lengths
-of the input pulse, and different initial values for the input signal.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-June 14, 2017, by Michael Wetter:<br/>
-Added more tests for different initial signals and different hold values.
-</li>
-<li>
-May 24, 2017, by Milica Grahovac:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Icon(
-      graphics={
-        Ellipse(
-          lineColor={75,138,73},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          extent={{-100,-100},{100,100}}),
-        Polygon(
-          lineColor={0,0,255},
-          fillColor={75,138,73},
-          pattern=LinePattern.None,
-          fillPattern=FillPattern.Solid,
-          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
-end TrueHoldWithReset;
diff --git a/Buildings/Controls/OBC/CDL/Logical/Validation/package.order b/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
index ca408a83863..2b04f094ee7 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/Validation/package.order
@@ -18,7 +18,7 @@ TimerNegativeStartTime
 Toggle
 TrueDelay
 TrueFalseHold
-TrueHoldWithReset
+TrueHold
 VariablePulse
 VariablePulseMinHold
 Xor
diff --git a/Buildings/Controls/OBC/CDL/Logical/Xor.mo b/Buildings/Controls/OBC/CDL/Logical/Xor.mo
index 1fcff2f14b1..28bb8fe2b3d 100644
--- a/Buildings/Controls/OBC/CDL/Logical/Xor.mo
+++ b/Buildings/Controls/OBC/CDL/Logical/Xor.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Logical;
 block Xor
   "Logical 'xor': y = u1 xor u2"
-  Interfaces.BooleanInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
     "Connector of first Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Connector of second Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Connector of Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Logical/package.order b/Buildings/Controls/OBC/CDL/Logical/package.order
index c8ee34aeeb2..4eaa2076d39 100644
--- a/Buildings/Controls/OBC/CDL/Logical/package.order
+++ b/Buildings/Controls/OBC/CDL/Logical/package.order
@@ -17,7 +17,7 @@ TimerAccumulating
 Toggle
 TrueDelay
 TrueFalseHold
-TrueHoldWithReset
+TrueHold
 VariablePulse
 Xor
 Sources
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
index 8e8c87faa9f..a0245c665a8 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
+++ b/Buildings/Controls/OBC/CDL/Psychrometrics/DewPoint_TDryBulPhi.mo
@@ -1,19 +1,19 @@
 within Buildings.Controls.OBC.CDL.Psychrometrics;
 block DewPoint_TDryBulPhi
   "Block to compute the dew point temperature based on relative humidity"
-  Interfaces.RealInput TDryBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100)
     "Dry bulb temperature"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput phi(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(
     final min=0,
     final max=1,
     unit="1")
     "Relative air humidity"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput TDewPoi(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TDewPoi(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100)
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo
index 883f03d319b..65b76d220ca 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo
+++ b/Buildings/Controls/OBC/CDL/Psychrometrics/SpecificEnthalpy_TDryBulPhi.mo
@@ -5,18 +5,18 @@ block SpecificEnthalpy_TDryBulPhi
     final quantity="Pressure",
     final unit="Pa")=101325
     "Atmospheric pressure";
-  Interfaces.RealInput TDryBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100)
     "Dry bulb temperature"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}}),iconTransformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput phi(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(
     final min=0,
     final max=1)
     "Relative air humidity"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput h(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput h(
     final quantity="SpecificEnergy",
     final unit="J/kg")
     "Specific enthalpy"
diff --git a/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo b/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo
index b02628b20db..62683845492 100644
--- a/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo
+++ b/Buildings/Controls/OBC/CDL/Psychrometrics/WetBulb_TDryBulPhi.mo
@@ -1,18 +1,18 @@
 within Buildings.Controls.OBC.CDL.Psychrometrics;
 block WetBulb_TDryBulPhi
   "Block to compute the wet bulb temperature based on relative humidity"
-  Interfaces.RealInput TDryBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TDryBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100)
     "Dry bulb temperature"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}}),iconTransformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput phi(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput phi(
     final min=0,
     final max=1)
     "Relative air humidity"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput TWetBul(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TWetBul(
     final quantity="ThermodynamicTemperature",
     final unit="K",
     final min=100)
diff --git a/Buildings/Controls/OBC/CDL/Reals/Abs.mo b/Buildings/Controls/OBC/CDL/Reals/Abs.mo
index ce1a9cd8f98..f19c4325fd7 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Abs.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Abs.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Abs
   "Output the absolute value of the input"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Acos.mo b/Buildings/Controls/OBC/CDL/Reals/Acos.mo
index 76b2657afbf..e8e4882689e 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Acos.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Acos.mo
@@ -1,9 +1,9 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Acos "Output the arc cosine of the input"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad")
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 equation
diff --git a/Buildings/Controls/OBC/CDL/Reals/Add.mo b/Buildings/Controls/OBC/CDL/Reals/Add.mo
index 8d06ccfa3c8..a470cf622d8 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Add.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Add.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Add
   "Output the sum of the two inputs"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo b/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo
index 55d72c8402f..fdfe8dc8bf2 100644
--- a/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/AddParameter.mo
@@ -3,9 +3,9 @@ block AddParameter
   "Output the sum of an input plus a parameter"
   parameter Real p
     "Value to be added";
-  Interfaces.RealInput u "Connector of Real input signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y "Connector of Real output signal"
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
 equation
diff --git a/Buildings/Controls/OBC/CDL/Reals/Asin.mo b/Buildings/Controls/OBC/CDL/Reals/Asin.mo
index 8d7c6f14cfd..401b9f8bb1f 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Asin.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Asin.mo
@@ -1,9 +1,9 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Asin "Output the arc sine of the input"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad")
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 equation
diff --git a/Buildings/Controls/OBC/CDL/Reals/Atan.mo b/Buildings/Controls/OBC/CDL/Reals/Atan.mo
index d4717d7345e..4cb61bf2e7b 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Atan.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Atan.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Atan
   "Output the arc tangent of the input"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad")
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Atan2.mo b/Buildings/Controls/OBC/CDL/Reals/Atan2.mo
index df3c3e227ca..857a754ba68 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Atan2.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Atan2.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Atan2
   "Output atan(u1/u2) of the inputs u1 and u2"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(unit="rad")
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Average.mo b/Buildings/Controls/OBC/CDL/Reals/Average.mo
index 65da68559a9..99ce40d2b95 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Average.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Average.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Average
   "Output the average of its two inputs"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}}),iconTransformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Cos.mo b/Buildings/Controls/OBC/CDL/Reals/Cos.mo
index a755ce9b6d2..07d2b923017 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Cos.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Cos.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Cos
   "Output the cosine of the input"
-  Interfaces.RealInput u(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u(unit="rad")
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Divide.mo b/Buildings/Controls/OBC/CDL/Reals/Divide.mo
index c1712cc2298..5add4d67214 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Divide.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Divide.mo
@@ -1,12 +1,12 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Divide "Output first input divided by second input"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector for dividend"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector for divisor"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector for quotient"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Exp.mo b/Buildings/Controls/OBC/CDL/Reals/Exp.mo
index a547924b093..cfac5725c32 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Exp.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Exp.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Exp
   "Output the exponential (base e) of the input"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Greater.mo b/Buildings/Controls/OBC/CDL/Reals/Greater.mo
index ffa00faf6f7..2b66ddaad0f 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Greater.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Greater.mo
@@ -8,13 +8,13 @@ block Greater
   parameter Boolean pre_y_start=false
     "Value of pre(y) at initial time"
     annotation (Dialog(tab="Advanced"));
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Input u1"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Input u2"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output y"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -32,13 +32,13 @@ protected
     annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
   block GreaterNoHysteresis
     "Greater block without hysteresis"
-    Interfaces.RealInput u1
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
       "Input u1"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.RealInput u2
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
       "Input u2"
       annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -69,13 +69,13 @@ protected
     parameter Boolean pre_y_start=false
       "Value of pre(y) at initial time"
       annotation (Dialog(tab="Advanced"));
-    Interfaces.RealInput u1
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
       "Input u1"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.RealInput u2
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
       "Input u2"
       annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo
index bc239f17f49..4ece4286607 100644
--- a/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/GreaterThreshold.mo
@@ -10,10 +10,10 @@ block GreaterThreshold
   parameter Boolean pre_y_start=false
     "Value of pre(y) at initial time"
     annotation (Dialog(tab="Advanced"));
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Input"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -35,10 +35,10 @@ protected
     "Greater block without hysteresis"
     parameter Real t=0
       "Threshold for comparison";
-    Interfaces.RealInput u
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u
       "Input u"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -71,10 +71,10 @@ protected
     parameter Boolean pre_y_start=false
       "Value of pre(y) at initial time"
       annotation (Dialog(tab="Advanced"));
-    Interfaces.RealInput u
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u
       "Input u"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo
index fc8ba95c9bc..a5abdce0f39 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Hysteresis.mo
@@ -7,10 +7,10 @@ block Hysteresis
     "if y=false and u>uHigh, switch to y=true";
   parameter Boolean pre_y_start=false
     "Value of pre(y) at initial time";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Boolean output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Less.mo b/Buildings/Controls/OBC/CDL/Reals/Less.mo
index 29553c0eb6a..dd512be5f96 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Less.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Less.mo
@@ -8,13 +8,13 @@ block Less
   parameter Boolean pre_y_start=false
     "Value of pre(y) at initial time"
     annotation (Dialog(tab="Advanced"));
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Input u1"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Input u2"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output y"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -32,13 +32,13 @@ protected
     annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
   block LessNoHysteresis
     "Less block without hysteresis"
-    Interfaces.RealInput u1
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
       "Input u1"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.RealInput u2
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
       "Input u2"
       annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -69,13 +69,13 @@ protected
     parameter Boolean pre_y_start=false
       "Value of pre(y) at initial time"
       annotation (Dialog(tab="Advanced"));
-    Interfaces.RealInput u1
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
       "Input u1"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.RealInput u2
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
       "Input u2"
       annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo
index 6e94a5320b8..46e088ff434 100644
--- a/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/LessThreshold.mo
@@ -10,10 +10,10 @@ block LessThreshold
   parameter Boolean pre_y_start=false
     "Value of pre(y) at initial time"
     annotation (Dialog(tab="Advanced"));
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Input"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Output"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -35,10 +35,10 @@ protected
     "Less block without hysteresis"
     parameter Real t=0
       "Threshold for comparison";
-    Interfaces.RealInput u
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u
       "Input u"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
@@ -71,10 +71,10 @@ protected
     parameter Boolean pre_y_start=false
       "Value of pre(y) at initial time"
       annotation (Dialog(tab="Advanced"));
-    Interfaces.RealInput u
+    Buildings.Controls.OBC.CDL.Interfaces.RealInput u
       "Input u"
       annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-    Interfaces.BooleanOutput y
+    Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
       "Output y"
       annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo b/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo
index 2786b55475c..095a5431b7b 100644
--- a/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/LimitSlewRate.mo
@@ -15,10 +15,10 @@ block LimitSlewRate "Limit the increase or decrease rate of input"
     "Derivative time constant";
   parameter Boolean enable=true
     "Set to false to disable rate limiter";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Limiter.mo b/Buildings/Controls/OBC/CDL/Reals/Limiter.mo
index b324495cf3b..bf1f6d39e4c 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Limiter.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Limiter.mo
@@ -5,10 +5,10 @@ block Limiter
     "Upper limit of input signal";
   parameter Real uMin
     "Lower limit of input signal";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Line.mo b/Buildings/Controls/OBC/CDL/Reals/Line.mo
index 12e8e87a267..eb2b0379543 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Line.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Line.mo
@@ -7,22 +7,22 @@ block Line
   parameter Boolean limitAbove=true
     "If true, limit input u to be no larger than x2"
     annotation (Evaluate=true);
-  Interfaces.RealInput x1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput x1
     "Support point x1, with x1 < x2"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Interfaces.RealInput f1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput f1
     "Support point f(x1)"
     annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
-  Interfaces.RealInput x2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput x2
     "Support point x2, with x2 > x1"
     annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
-  Interfaces.RealInput f2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput f2
     "Support point f(x2)"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Independent variable"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "f(x) along the line specified by (x1, f1) and (x2, f2)"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Log.mo b/Buildings/Controls/OBC/CDL/Reals/Log.mo
index 8212bd9196a..067120d2c49 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Log.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Log.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Log
   "Output the natural (base e) logarithm of the input (input > 0 required)"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Log10.mo b/Buildings/Controls/OBC/CDL/Reals/Log10.mo
index acb5333c3e2..ae0b9445553 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Log10.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Log10.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Log10
   "Output the base 10 logarithm of the input (input > 0 required)"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo
index 90be5697063..fdd50af6d83 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MatrixGain.mo
@@ -5,10 +5,10 @@ block MatrixGain
     1,0;
     0,1]
     "Gain matrix which is multiplied with the input";
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout]
     "Connector of Real output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo
index d6f6b1560c2..c8f060d9713 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MatrixMax.mo
@@ -9,10 +9,10 @@ block MatrixMax
   parameter Integer nCol(
     final min=1)
     "Number of columns in input matrix";
-  Interfaces.RealInput u[nRow,nCol]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nRow,nCol]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[
     if rowMax then
       size(
         u,
diff --git a/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo b/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo
index cfe998dce73..a595c3b800b 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MatrixMin.mo
@@ -9,10 +9,10 @@ block MatrixMin
   parameter Integer nCol(
     final min=1)
     "Number of columns in input matrix";
-  Interfaces.RealInput u[nRow,nCol]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nRow,nCol]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[
     if rowMin then
       size(
         u,
diff --git a/Buildings/Controls/OBC/CDL/Reals/Max.mo b/Buildings/Controls/OBC/CDL/Reals/Max.mo
index 87d65efb369..b72f20c4110 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Max.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Max.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Max
   "Pass through the largest signal"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Min.mo b/Buildings/Controls/OBC/CDL/Reals/Min.mo
index ad1ac1690d4..9bf9dac9573 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Min.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Min.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Min
   "Pass through the smallest signal"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Modulo.mo b/Buildings/Controls/OBC/CDL/Reals/Modulo.mo
index d6e2d8d59cb..ff576ccddbf 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Modulo.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Modulo.mo
@@ -1,13 +1,13 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Modulo
   "Output the remainder of first input divided by second input (~=0)"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo b/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo
index a24d2632c44..93da7e5aa23 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MovingAverage.mo
@@ -5,10 +5,10 @@ block MovingAverage "Block to output moving average"
     final unit="s",
     min=1E-5)
     "Time horizon over which the input is averaged";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo b/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo
index 78cf8fcaf63..9c8eb96dad5 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MultiMax.mo
@@ -5,10 +5,10 @@ block MultiMax
     min=0)=0
     "Number of input connections"
     annotation (Dialog(connectorSizing=true),HideResult=true);
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,20},{-100,-20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo b/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo
index 8205c09f9b0..c93821a66a0 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MultiMin.mo
@@ -5,10 +5,10 @@ block MultiMin
     min=0)=0
     "Number of input connections"
     annotation (Dialog(connectorSizing=true),HideResult=true);
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,20},{-100,-20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo b/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo
index a52c7817e52..e566dffb02a 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MultiSum.mo
@@ -9,10 +9,10 @@ block MultiSum
     1,
     nin)
     "Input gains";
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,20},{-100,-20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Multiply.mo b/Buildings/Controls/OBC/CDL/Reals/Multiply.mo
index 76b7e6a6b39..4b1d5b61c08 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Multiply.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Multiply.mo
@@ -1,12 +1,12 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Multiply "Output product of the two inputs"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo b/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo
index 795b6e2e43b..554d13a774b 100644
--- a/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/MultiplyByParameter.mo
@@ -3,10 +3,10 @@ block MultiplyByParameter
   "Output the product of a gain value with the input signal"
   parameter Real k
     "Gain value multiplied with input signal";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Input signal connector"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Output signal connector"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Round.mo b/Buildings/Controls/OBC/CDL/Reals/Round.mo
index 7fa2ff02887..0ed5fdd40ba 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Round.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Round.mo
@@ -3,10 +3,10 @@ block Round
   "Round real number to given digits"
   parameter Integer n
     "Number of digits being round to";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sin.mo b/Buildings/Controls/OBC/CDL/Reals/Sin.mo
index b1ce423a2df..10f680e00ad 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sin.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sin.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Sin
   "Output the sine of the input"
-  Interfaces.RealInput u(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u(unit="rad")
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sort.mo b/Buildings/Controls/OBC/CDL/Reals/Sort.mo
index 371d9802bf5..0894cf6d076 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sort.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sort.mo
@@ -7,17 +7,21 @@ block Sort
     annotation (Dialog(connectorSizing=true),HideResult=true);
   parameter Boolean ascending=true
     "Set to true if ascending order, otherwise order is descending";
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nin]
     "Connector of Real output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yIdx[nin]
+    "Indices of the sorted vector with respect to the original vector"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
 equation
-  y=Modelica.Math.Vectors.sort(
+  (y, yIdx)=Modelica.Math.Vectors.sort(
     u,
     ascending=ascending);
+
   annotation (
     defaultComponentName="sort",
     Icon(
@@ -42,10 +46,12 @@ equation
       info="<html>
 <p>
 Block that sorts the elements of the input signal <i>u</i>.
-If the parameter <code>ascending = true</code>, then the output signal satisfies
+If the parameter <code>ascending = true</code>, then the output signal <i>y</i> satisfies
 <i>y<sub>i</sub> &lt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
 Otherwise, it satisfies
 <i>y<sub>i</sub> &gt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
+The output signal <i>yIdx</i> contains the indices of the sorted elements,
+with respect to the input vector <i>u</i>.
 </p>
 <h4>Usage</h4>
 <p>
@@ -62,10 +68,14 @@ In real controllers, measurement noise may cause the output to change frequently
 This block may for example be used in a variable air volume flow
 controller to access the position of the dampers that are most open.
 </p>
-</html>",
-      revisions="<html>
+</html>", revisions="<html>
 <ul>
 <li>
+April 18, 2024, by Jianjun Hu:<br/>
+Added an output variable with the indices of the sorted elements.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3809\">issue 3809</a>.
+</li>
+<li>
 March 2, 2020, by Michael Wetter:<br/>
 Changed icon to display dynamically the output value.
 </li>
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo
index 902254b2dc3..1b5e429b753 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sources/CalendarTime.mo
@@ -13,24 +13,24 @@ model CalendarTime
     final unit="s")=0
     "Offset that is added to 'time', may be used for computing time in different time zone"
     annotation (Dialog(tab="Advanced"));
-  discrete Interfaces.IntegerOutput year
+  discrete Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput year
     "Year"
     annotation (Placement(transformation(extent={{100,-40},{120,-20}}),iconTransformation(extent={{100,-40},{120,-20}})));
-  discrete Interfaces.IntegerOutput month
+  discrete Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput month
     "Month of the year"
     annotation (Placement(transformation(extent={{100,-10},{120,10}}),iconTransformation(extent={{100,-10},{120,10}})));
-  Interfaces.IntegerOutput day(
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput day(
     fixed=false)
     "Day of the month"
     annotation (Placement(transformation(extent={{100,20},{120,40}}),iconTransformation(extent={{100,20},{120,40}})));
-  Interfaces.IntegerOutput hour(
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput hour(
     fixed=false)
     "Hour of the day"
     annotation (Placement(transformation(extent={{100,50},{120,70}}),iconTransformation(extent={{100,50},{120,70}})));
-  Interfaces.RealOutput minute
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput minute
     "Minute of the hour"
     annotation (Placement(transformation(extent={{100,80},{120,100}}),iconTransformation(extent={{100,80},{120,100}})));
-  Interfaces.IntegerOutput weekDay(
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput weekDay(
     fixed=false)
     "Integer output representing week day (monday = 1, sunday = 7)"
     annotation (Placement(transformation(extent={{100,-70},{120,-50}}),iconTransformation(extent={{100,-70},{120,-50}})));
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo
index c94c56a7c00..f9c841e1e2f 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sources/CivilTime.mo
@@ -1,6 +1,6 @@
 within Buildings.Controls.OBC.CDL.Reals.Sources;
 block CivilTime "Civil time"
-  Interfaces.RealOutput y(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(
     final unit="s")
     "Civil time"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo
index 1c936f09c7a..9fe238fad87 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Constant.mo
@@ -3,7 +3,7 @@ block Constant
   "Output constant signal of type Real"
   parameter Real k
     "Constant output value";
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo
index e60cee12bf4..bbb8c39c8e9 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Pulse.mo
@@ -19,7 +19,7 @@ block Pulse
     "Shift time for output";
   parameter Real offset=0.0
     "Offset of output signals";
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Pulse output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo
index 4288ffefb1c..7233e15b349 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sources/Ramp.mo
@@ -14,7 +14,7 @@ block Ramp
     final quantity="Time",
     final unit="s")=0
     "Output = offset for time < startTime";
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo b/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo
index f9ea8c44bc1..12bb45a0f37 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sources/TimeTable.mo
@@ -14,7 +14,7 @@ block TimeTable
   parameter Real timeScale(
     final unit="1")=1
     "Time scale of first table column. Set to 3600 if time in table is in hours";
-  Interfaces.RealOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout]
     "Output of the table"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo b/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo
index 59da51e357f..ef7beaaf041 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Sqrt.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Sqrt
   "Output the square root of the input (input >= 0 required)"
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Subtract.mo b/Buildings/Controls/OBC/CDL/Reals/Subtract.mo
index b30a2853a57..ac94b679f69 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Subtract.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Subtract.mo
@@ -1,12 +1,12 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Subtract "Output the difference of the two inputs"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Connector of Real input signal 1"
     annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Interfaces.RealInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u2
     "Connector of Real input signal 2"
     annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Switch.mo b/Buildings/Controls/OBC/CDL/Reals/Switch.mo
index 5a6be85162c..ca62cdfe98b 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Switch.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Switch.mo
@@ -1,16 +1,16 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Switch
   "Switch between two Real signals"
-  Interfaces.RealInput u1
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u1
     "Real input signal"
     annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Interfaces.BooleanInput u2
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u2
     "Boolean switch input signal, if true, y=u1, else y=u3"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealInput u3
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u3
     "Real input signal"
     annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Reals/Tan.mo b/Buildings/Controls/OBC/CDL/Reals/Tan.mo
index d124116616e..ca4a3dd30d4 100644
--- a/Buildings/Controls/OBC/CDL/Reals/Tan.mo
+++ b/Buildings/Controls/OBC/CDL/Reals/Tan.mo
@@ -1,10 +1,10 @@
 within Buildings.Controls.OBC.CDL.Reals;
 block Tan
   "Output the tangent of the input"
-  Interfaces.RealInput u(unit="rad")
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u(unit="rad")
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo
index efca767728e..57047426dc7 100644
--- a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractSignal.mo
@@ -7,10 +7,10 @@ block BooleanExtractSignal
     "Number of outputs";
   parameter Integer extract[nout]=1:nout
     "Extracting vector";
-  Interfaces.BooleanInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin]
     "Boolean input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout]
     "Boolean signals extracted from the input vector with the extraction scheme specified by the integer vector"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo
index 6aba8917530..f77be4786ce 100644
--- a/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/BooleanExtractor.mo
@@ -3,13 +3,13 @@ block BooleanExtractor
   "Extract scalar signal out of boolean signal vector dependent on integer input index"
   parameter Integer nin=1
     "Number of inputs";
-  Interfaces.IntegerInput index
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput index
     "Index of input vector element to be extracted out"
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90)));
-  Interfaces.BooleanInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin]
     "Boolean input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
     "Boolean signal extracted from input vector, u[index]"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo
index e1d7e41b9c0..68a6aef20b7 100644
--- a/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/BooleanScalarReplicator.mo
@@ -3,10 +3,10 @@ block BooleanScalarReplicator
   "Boolean signal replicator"
   parameter Integer nout=1
     "Number of outputs";
-  Interfaces.BooleanInput u
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout]
     "Connector of Boolean output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo
index eafd0cdf34f..1550bf4327d 100644
--- a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorFilter.mo
@@ -5,10 +5,10 @@ block BooleanVectorFilter
   parameter Integer nout "Size of output vector";
   parameter Boolean msk[nin]=fill(true,nin) "Array mask";
 
-  Interfaces.BooleanInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin]
     "Connector of Boolean input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout]
     "Connector of Boolean output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo
index 6c49f3e2257..b9435dbcb36 100644
--- a/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/BooleanVectorReplicator.mo
@@ -2,10 +2,10 @@ within Buildings.Controls.OBC.CDL.Routing;
 block BooleanVectorReplicator "Boolean vector signal replicator"
   parameter Integer nin=1 "Size of input vector";
   parameter Integer nout=1 "Number of row in output";
-  Interfaces.BooleanInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u[nin]
     "Connector of Boolean vector input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.BooleanOutput y[nout, nin]
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[nout, nin]
     "Connector of Boolean matrix output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo
index 18fce10b2ba..dfc82f7e772 100644
--- a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractSignal.mo
@@ -7,10 +7,10 @@ block IntegerExtractSignal
     "Number of outputs";
   parameter Integer extract[nout]=1:nout
     "Extracting vector";
-  Interfaces.IntegerInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
     "Integer input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout]
     "Integer signals extracted from the input vector with the extraction scheme specified by the integer vector"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo
index 0a8cc9c4fc3..d2ed3317074 100644
--- a/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/IntegerExtractor.mo
@@ -3,13 +3,13 @@ block IntegerExtractor
   "Extract scalar signal out of integer signal vector dependent on integer input index"
   parameter Integer nin=1
     "Number of inputs";
-  Interfaces.IntegerInput index
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput index
     "Index of input vector element to be extracted out"
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90)));
-  Interfaces.IntegerInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
     "Integer input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
     "Integer signal extracted from input vector, u[index]"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo
index e3c0b9cbf89..026395cd0a1 100644
--- a/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/IntegerScalarReplicator.mo
@@ -3,10 +3,10 @@ block IntegerScalarReplicator
   "Integer signal replicator"
   parameter Integer nout=1
     "Number of outputs";
-  Interfaces.IntegerInput u
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout]
     "Connector of Integer output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo
index 2dc5450169c..ae10a4ec3db 100644
--- a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorFilter.mo
@@ -5,10 +5,10 @@ block IntegerVectorFilter
   parameter Integer nout "Size of output vector";
   parameter Boolean msk[nin]=fill(true,nin) "Array mask";
 
-  Interfaces.IntegerInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
     "Connector of Integer input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout]
     "Connector of Integer output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo
index 42b73409658..cb87a2178ec 100644
--- a/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/IntegerVectorReplicator.mo
@@ -2,10 +2,10 @@ within Buildings.Controls.OBC.CDL.Routing;
 block IntegerVectorReplicator "Integer vector signal replicator"
   parameter Integer nin=1 "Size of input vector";
   parameter Integer nout=1 "Number of row in output";
-  Interfaces.IntegerInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
     "Connector of Integer vector input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.IntegerOutput y[nout, nin]
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y[nout, nin]
     "Connector of Integer matrix output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo b/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo
index 7007035b3cc..f267ccd1aa2 100644
--- a/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/RealExtractSignal.mo
@@ -7,10 +7,10 @@ block RealExtractSignal
     "Number of outputs";
   parameter Integer extract[nout]=1:nout
     "Extracting vector";
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Real input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout]
     "Real signals extracted from the input vector with the extraction scheme specified by the integer vector"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo b/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo
index 164219e3c52..9285caa0906 100644
--- a/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/RealExtractor.mo
@@ -3,13 +3,13 @@ block RealExtractor
   "Extract scalar signal out of real signal vector dependent on integer input index"
   parameter Integer nin=1
     "Number of inputs";
-  Interfaces.IntegerInput index
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput index
     "Index of input vector element to be extracted out"
     annotation (Placement(transformation(origin={0,-120},extent={{-20,-20},{20,20}},rotation=90)));
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Real input signals"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
     "Real signal extracted from input vector, u[index]"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo
index 0934c62693c..3e93e00164b 100644
--- a/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/RealScalarReplicator.mo
@@ -3,10 +3,10 @@ block RealScalarReplicator
   "Real signal replicator"
   parameter Integer nout=1
     "Number of outputs";
-  Interfaces.RealInput u
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout]
     "Connector of Real output signal"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo b/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo
index 80f5c4e61c5..a02d0806373 100644
--- a/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/RealVectorFilter.mo
@@ -5,10 +5,10 @@ block RealVectorFilter
   parameter Integer nout "Size of output vector";
   parameter Boolean msk[nin]=fill(true,nin) "Array mask";
 
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[nout]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout]
     "Connector of Real output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo b/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo
index d4cb6e22939..ed50d4e496f 100644
--- a/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo
+++ b/Buildings/Controls/OBC/CDL/Routing/RealVectorReplicator.mo
@@ -2,10 +2,10 @@ within Buildings.Controls.OBC.CDL.Routing;
 block RealVectorReplicator "Real vector signal replicator"
   parameter Integer nin=1 "Size of input vector";
   parameter Integer nout=1 "Number of row in output";
-  Interfaces.RealInput u[nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
     "Connector of Real vector input signal"
     annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Interfaces.RealOutput y[nout, nin]
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nout, nin]
     "Connector of Real matrix output signals"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
 
diff --git a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo
index d818b1d7771..7713a1f7351 100644
--- a/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo
+++ b/Buildings/Controls/OBC/CDL/Utilities/SunRiseSet.mo
@@ -16,19 +16,19 @@ block SunRiseSet
     final unit="s",
     displayUnit="h")
     "Time zone";
-  Interfaces.RealOutput nextSunRise(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput nextSunRise(
     final quantity="Time",
     final unit="s",
     displayUnit="h")
     "Time of next sunrise"
     annotation (Placement(transformation(extent={{100,40},{140,80}})));
-  Interfaces.RealOutput nextSunSet(
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput nextSunSet(
     final quantity="Time",
     final unit="s",
     displayUnit="h")
     "Time of next sunset"
     annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-  Interfaces.BooleanOutput sunUp
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput sunUp
     "Output true if the sun is up"
     annotation (Placement(transformation(extent={{100,-80},{140,-40}})));
 
diff --git a/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo b/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
index 7c3b2d0ed36..d10af2c51a5 100644
--- a/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
+++ b/Buildings/Controls/OBC/Utilities/BaseClasses/OptimalStartCalculation.mo
@@ -108,7 +108,7 @@ protected
     final k=tOptMax)
     "Maximum optimal start time"
     annotation (Placement(transformation(extent={{210,-40},{230,-20}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
     final duration=tOptMax+11*3600)
     "Hold the start time for timer"
     annotation (Placement(transformation(extent={{-240,0},{-220,20}})));
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo b/Buildings/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
similarity index 95%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
rename to Buildings/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
index ead9da25671..f5d261dad68 100644
--- a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialSaturatedControlVolume.mo
+++ b/Buildings/DHC/BaseClasses/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/Buildings/Experimental/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo b/Buildings/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
similarity index 99%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
rename to Buildings/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
index 78626e29652..dfdf54e0ff1 100644
--- a/Buildings/Experimental/DHC/BaseClasses/Steam/PartialTwoPortTwoMedium.mo
+++ b/Buildings/DHC/BaseClasses/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/Buildings/DHC/BaseClasses/Steam/package.mo b/Buildings/DHC/BaseClasses/Steam/package.mo
new file mode 100644
index 00000000000..3468baf6b61
--- /dev/null
+++ b/Buildings/DHC/BaseClasses/Steam/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.BaseClasses;
+package Steam "Package for steam systems using the split-medium approach."
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains base class models for steam systems.
+These models use the split-medium approach to allow various
+water/steam models to be coupled with a numerically-efficient
+liquid water model. This can greatly improve the computing performance
+by decoupling the energy and mass balance equations.
+</p>
+</html>"));
+end Steam;
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/package.order b/Buildings/DHC/BaseClasses/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/BaseClasses/Steam/package.order
rename to Buildings/DHC/BaseClasses/Steam/package.order
diff --git a/Buildings/DHC/BaseClasses/package.mo b/Buildings/DHC/BaseClasses/package.mo
new file mode 100644
index 00000000000..ef8d84f29b9
--- /dev/null
+++ b/Buildings/DHC/BaseClasses/package.mo
@@ -0,0 +1,11 @@
+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.DHC\">
+Buildings.DHC</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/BaseClasses/package.order b/Buildings/DHC/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/BaseClasses/package.order
rename to Buildings/DHC/BaseClasses/package.order
diff --git a/Buildings/DHC/ETS/BaseClasses/CollectorDistributor.mo b/Buildings/DHC/ETS/BaseClasses/CollectorDistributor.mo
new file mode 100644
index 00000000000..06001e53a2f
--- /dev/null
+++ b/Buildings/DHC/ETS/BaseClasses/CollectorDistributor.mo
@@ -0,0 +1,50 @@
+within Buildings.DHC.ETS.BaseClasses;
+model CollectorDistributor
+  "Model of a collector/distributor with zero pressure drop between connections"
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+    mDis_flow_nominal=sum(
+      mCon_flow_nominal),
+    final mDisCon_flow_nominal=fill(
+      mDis_flow_nominal,
+      nCon),
+    final mEnd_flow_nominal=mDis_flow_nominal,
+    final allowFlowReversal=true,
+    final iConDpSen=-1,
+    redeclare Connection2PipeLossless con[nCon],
+    redeclare model Model_pipDis=Fluid.FixedResistances.LosslessPipe);
+  annotation (
+    defaultComponentName="colDis",
+    Documentation(
+      info="<html>
+<p>
+This model represents a collector/distributor which connects
+<code>nCon</code> hydronic circuits in parallel.
+The pressure drop between each connection is assumed negligible
+compared to the pressure drop in each circuit, and is set to zero
+in the model.
+By default,
+</p>
+<ul>
+<li>
+there is no bypass flow (which can be added later by connecting
+the ports <code>port_bDisSup</code> and <code>port_aDisRet</code>),
+</li>
+<li>
+the nominal distribution mass flow rate
+<code>mDis_flow_nominal</code> is equal to the sum
+of the nominal mass flow rate in each circuit.
+However, this parameter assigment is not final and it can be set
+for instance to a higher value to represent a primary overflow
+in a supply through loop.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end CollectorDistributor;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Connection2PipeLossless.mo b/Buildings/DHC/ETS/BaseClasses/Connection2PipeLossless.mo
similarity index 82%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Connection2PipeLossless.mo
rename to Buildings/DHC/ETS/BaseClasses/Connection2PipeLossless.mo
index def989054f5..546a83cde97 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Connection2PipeLossless.mo
+++ b/Buildings/DHC/ETS/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/Buildings/DHC/ETS/BaseClasses/Junction.mo b/Buildings/DHC/ETS/BaseClasses/Junction.mo
new file mode 100644
index 00000000000..fb153384a95
--- /dev/null
+++ b/Buildings/DHC/ETS/BaseClasses/Junction.mo
@@ -0,0 +1,24 @@
+within Buildings.DHC.ETS.BaseClasses;
+model Junction
+  "Fluid junction with zero pressure drop"
+  extends Fluid.FixedResistances.Junction(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    final dp_nominal=fill(
+      0,
+      3),
+    final from_dp=false);
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+This is a model of a fluid junction with zero pressure drop.
+By default the model is configured in steady-state.
+</p>
+</html>"));
+end Junction;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialDirect.mo b/Buildings/DHC/ETS/BaseClasses/PartialDirect.mo
similarity index 86%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialDirect.mo
rename to Buildings/DHC/ETS/BaseClasses/PartialDirect.mo
index 2e2fd63f2f6..18e662568d5 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialDirect.mo
+++ b/Buildings/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,
@@ -61,7 +61,8 @@ model PartialDirect
      final unit="K",
      displayUnit="degC")
     "Setpoint for the district return temperature (min for cooling, max for heating)"
-    annotation (Placement(transformation(extent={{-338,-20},{-298,20}})));
+    annotation (Placement(transformation(extent={{-340,-20},{-300,20}}),
+        iconTransformation(extent={{-340,-20},{-300,20}})));
   Modelica.Blocks.Interfaces.RealOutput Q_flow(
     final quantity="HeatFlowRate",
     final unit="W",
@@ -76,8 +77,8 @@ model PartialDirect
     displayUnit="kW.h")
     "Measured energy consumption at the ETS"
      annotation (Placement(transformation(
-          extent={{300,-180},{340,-140}}), iconTransformation(extent={{300,-130},
-            {340,-90}})));
+          extent={{300,-180},{340,-140}}), iconTransformation(extent={{300,-180},
+            {340,-140}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTDisSup(
     redeclare final package Medium=MediumSer,
     final m_flow_nominal=mBui_flow_nominal)
@@ -167,50 +168,43 @@ protected
     "Specific heat capacity of the fluid";
 equation
   connect(senTDisSup.port_b, senMasFlo.port_a)
-    annotation (Line(points={{-160,-280},{-120,-280}}, color={0,127,255}));
+    annotation (Line(points={{-160,-280},{-120,-280}},color={0,127,255}));
   connect(senMasFlo.port_b, jun.port_1)
-    annotation (Line(points={{-100,-280},{-60,-280}}, color={0,127,255}));
+    annotation (Line(points={{-100,-280},{-60,-280}},color={0,127,255}));
   connect(senTBuiRet.port_b, spl.port_1)
-    annotation (Line(points={{-200,200},{-60,200}}, color={0,127,255}));
+    annotation (Line(points={{-200,200},{-60,200}},color={0,127,255}));
   connect(spl.port_2, conVal.port_a)
-    annotation (Line(points={{-40,200},{-10,200}}, color={0,127,255}));
+    annotation (Line(points={{-40,200},{-10,200}},color={0,127,255}));
   connect(senMasFlo.m_flow, pro.u2)
-    annotation (Line(points={{-110,-269},{-110,-192},
-          {90,-192},{90,-116},{118,-116}}, color={0,0,127}));
+    annotation (Line(points={{-110,-269},{-110,-192},{90,-192},{90,-116},{118,-116}},color={0,0,127}));
   connect(pro.y, cp.u)
-    annotation (Line(points={{141,-110},{178,-110}}, color={0,0,127}));
+    annotation (Line(points={{141,-110},{178,-110}},color={0,0,127}));
   connect(cp.y, Q_flow)
-    annotation (Line(points={{201,-110},{248,-110},{248,-120},{320,-120}},
-                                                     color={0,0,127}));
+    annotation (Line(points={{201,-110},{248,-110},{248,-120},{320,-120}},color={0,0,127}));
   connect(cp.y, int.u)
-    annotation (Line(points={{201,-110},{248,-110},{248,-160},{258,-160}},
-                       color={0,0,127}));
+    annotation (Line(points={{201,-110},{248,-110},{248,-160},{258,-160}},color={0,0,127}));
   connect(int.y, Q)
-    annotation (Line(points={{281,-160},{320,-160}}, color={0,0,127}));
+    annotation (Line(points={{281,-160},{320,-160}},color={0,0,127}));
   connect(dTDis.y, pro.u1)
     annotation (Line(points={{101,-104},{118,-104}},color={0,0,127}));
   connect(conVal.port_b, senTDisRet.port_a)
-    annotation (Line(points={{10,200},{30,200}}, color={0,127,255}));
+    annotation (Line(points={{10,200},{30,200}},color={0,127,255}));
   connect(senTDisRet.T,dTDis. u1)
-    annotation (Line(points={{40,211},{40,226},{60,226},{60,-98},{78,-98}},
-                                                          color={0,0,127}));
+    annotation (Line(points={{40,211},{40,226},{60,226},{60,-98},{78,-98}},color={0,0,127}));
   connect(senTDisSup.T,dTDis. u2)
-    annotation (Line(points={{-170,-269},{-172,-269},{-172,-184},{60,-184},{60,-110},
-          {78,-110}},                                            color={0,0,127}));
+    annotation (Line(points={{-170,-269},{-172,-269},{-172,-184},{60,-184},{60,-110},{78,-110}},color={0,0,127}));
   connect(TDisRetSet, con.u_s)
-    annotation (Line(points={{-318,0},{-272,0},{-272,250},{-222,250}},
-                                                                     color={0,0,127}));
+    annotation (Line(points={{-320,0},{-272,0},{-272,250},{-222,250}},color={0,0,127}));
   connect(senTBuiRet.T, con.u_m)
     annotation (Line(points={{-210,211},{-210,238}},color={0,0,127}));
   connect(jun.port_2, senTBuiSup.port_a)
-    annotation (Line(points={{-40,-280},{220,-280},{220,200},{230,200}}, color={0,127,255}));
+    annotation (Line(points={{-40,-280},{220,-280},{220,200},{230,200}},color={0,127,255}));
   connect(spl.port_3, cheVal.port_a)
     annotation (Line(points={{-50,190},{-50,0}}, color={0,127,255}));
   connect(cheVal.port_b, jun.port_3)
     annotation (Line(points={{-50,-20},{-50,-270}}, color={0,127,255}));
   connect(con.y, conVal.y)
-    annotation (Line(points={{-198,250},{0,250},{0,212}},
-                                                        color={0,0,127}));
+    annotation (Line(points={{-198,250},{0,250},{0,212}},color={0,0,127}));
  annotation (
     defaultComponentName="etsCoo",
     Documentation(info="<html>
@@ -224,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
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo b/Buildings/DHC/ETS/BaseClasses/PartialETS.mo
similarity index 85%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo
rename to Buildings/DHC/ETS/BaseClasses/PartialETS.mo
index 547b3984f36..7add4da4181 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialETS.mo
+++ b/Buildings/DHC/ETS/BaseClasses/PartialETS.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 partial model PartialETS
   "Partial class for modeling an energy transfer station"
-  import TypDisSys=Buildings.Experimental.DHC.Types.DistrictSystemType
+  import TypDisSys=Buildings.DHC.Types.DistrictSystemType
     "District system type enumeration";
   replaceable package MediumSer=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
@@ -10,12 +10,12 @@ partial model PartialETS
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Service side medium at heating inlet"
     annotation(Dialog(enable=
-      typ == TypDisSys.CombinedGeneration1 or
-      typ == TypDisSys.HeatingGeneration1));
+      typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+      typ == Buildings.DHC.Types.DistrictSystemType.HeatingGeneration1));
   replaceable package MediumBui=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
     "Building side medium";
-  parameter TypDisSys typ = TypDisSys.CombinedGeneration2to4
+  parameter TypDisSys typ = Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
     "Type of district system"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   parameter Integer nPorts_aHeaWat=0
@@ -136,7 +136,7 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service supply line"
     annotation (
       Placement(transformation(extent={{-310,-210},{-290,-190}}),
@@ -145,7 +145,7 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service return line"
     annotation (
       Placement(transformation(extent={{290,-210},{310,-190}}),
@@ -154,8 +154,8 @@ partial model PartialETS
     redeclare package Medium = MediumSerHea_a,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSerHea_a.h_default, nominal=MediumSerHea_a.h_default))
- if typ <> TypDisSys.Cooling and
-    typ <> TypDisSys.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service supply line"
     annotation (Placement(
       transformation(extent={{-310,-250},{-290,-230}}), iconTransformation(
@@ -164,8 +164,8 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ <> TypDisSys.Cooling and
-    typ <> TypDisSys.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service return line"
     annotation (Placement(
         transformation(extent={{290,-250},{310,-230}}), iconTransformation(
@@ -174,18 +174,18 @@ partial model PartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration1 or
-    typ == TypDisSys.CombinedGeneration2to4 or
-    typ == TypDisSys.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service supply line"
     annotation (Placement(transformation(extent={{-310,-290},{-290,-270}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_bSerCoo(
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration1 or
-    typ == TypDisSys.CombinedGeneration2to4 or
-    typ == TypDisSys.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service return line"
     annotation (Placement(
       transformation(extent={{290,-290},{310,-270}}), iconTransformation(
@@ -264,8 +264,8 @@ and optional in-building primary systems.
 The connectors to the service lines are configured based on an enumeration
 defining the type of district system (<code>CombinedGeneration2to4</code>
 by default), see
-<a href=\"modelica://Buildings.Experimental.DHC.Types.DistrictSystemType\">
-Buildings.Experimental.DHC.Types.DistrictSystemType</a>.
+<a href=\"modelica://Buildings.DHC.Types.DistrictSystemType\">
+Buildings.DHC.Types.DistrictSystemType</a>.
 In case of a heating service line, the model allows for using two
 different media at the inlet port <code>port_aSerHea</code> and at the oulet
 port <code>port_bSerHea</code> to represent a steam supply and condensate
@@ -322,36 +322,36 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{20,-288},{300,-272}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Rectangle(
           extent={{-300,-208},{-100,-192}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{100,-208},{300,-192}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-25,-8},{25,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={108,-167},
           rotation=90),
         Rectangle(
@@ -360,28 +360,23 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={-108,-167},
           rotation=90),
-        Rectangle(
-          extent={{-140,140},{140,-142}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid),
         Rectangle(
           extent={{58,-248},{300,-232}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-45,-8},{45,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5,
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={66,-187},
           rotation=90),
         Rectangle(
@@ -390,7 +385,7 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5,
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={-66,-187},
           rotation=90),
         Rectangle(
@@ -399,8 +394,8 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling,
           origin={28,-207},
           rotation=90),
         Rectangle(
@@ -409,16 +404,16 @@ First implementation.
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Rectangle(
           extent={{-65,-8},{65,8}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling,
           origin={-30,-207},
           rotation=90),
         Rectangle(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialIndirect.mo b/Buildings/DHC/ETS/BaseClasses/PartialIndirect.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialIndirect.mo
rename to Buildings/DHC/ETS/BaseClasses/PartialIndirect.mo
index f52b750f626..9c42d57a0f3 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/PartialIndirect.mo
+++ b/Buildings/DHC/ETS/BaseClasses/PartialIndirect.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model PartialIndirect
   "Partial indirect energy transfer station for district energy systems"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
+    Buildings.DHC.ETS.BaseClasses.PartialETS(
     final have_weaBus=false,
     final have_hotWat=false,
     final have_eleHea=false,
@@ -101,7 +101,7 @@ model PartialIndirect
     displayUnit="kW.h")
     "Measured energy consumption at the ETS"
      annotation (Placement(transformation(extent={{300,-180},{340,-140}}),
-     iconTransformation(extent={{300,-130},{340,-90}})));
+     iconTransformation(extent={{300,-180},{340,-140}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTDisSup(
     redeclare final package Medium=MediumSer,
     final m_flow_nominal=mDis_flow_nominal)
@@ -241,7 +241,7 @@ As shown in the figure below, the building pumping design (constant/variable)
 is specified on the building side and not within the ETS.
 </p>
 <p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
 </p>
 <h4>Reference</h4>
 <p>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Pump_m_flow.mo b/Buildings/DHC/ETS/BaseClasses/Pump_m_flow.mo
similarity index 94%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Pump_m_flow.mo
rename to Buildings/DHC/ETS/BaseClasses/Pump_m_flow.mo
index 06208c91522..103416cff2e 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Pump_m_flow.mo
+++ b/Buildings/DHC/ETS/BaseClasses/Pump_m_flow.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model Pump_m_flow
   "Pump with prescribed mass flow rate"
   extends Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow(
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/StratifiedTank.mo b/Buildings/DHC/ETS/BaseClasses/StratifiedTank.mo
similarity index 99%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/StratifiedTank.mo
rename to Buildings/DHC/ETS/BaseClasses/StratifiedTank.mo
index dcf81623762..85fd9fac20d 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/StratifiedTank.mo
+++ b/Buildings/DHC/ETS/BaseClasses/StratifiedTank.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 model StratifiedTank
   "Stratified buffer tank model"
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mo b/Buildings/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mo
new file mode 100644
index 00000000000..cac0b08ff44
--- /dev/null
+++ b/Buildings/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mo
@@ -0,0 +1,723 @@
+within Buildings.DHC.ETS.BaseClasses.Validation;
+model CollectorDistributor
+  "Validation of collector distributor model"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Source side medium";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate";
+  Fluid.Movers.FlowControlled_m_flow sou1(
+    redeclare package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=273.15+40,
+    m_flow_nominal=m_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true)
+    "Primary supply"
+    annotation (Placement(transformation(extent={{-170,330},{-150,350}})));
+  Fluid.Movers.FlowControlled_m_flow sou2_1(
+    redeclare package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=273.15+30,
+    m_flow_nominal=m_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true)
+    "Secondary pump"
+    annotation (Placement(transformation(extent={{190,290},{170,310}})));
+  Fluid.Sources.Boundary_pT bou1(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=2)
+    "Boundary pressure"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-190,320})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m1(
+    height=1.1,
+    duration=1000,
+    startTime=0)
+    "Primary flow"
+    annotation (Placement(transformation(extent={{-240,370},{-220,390}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T1(
+    k=40+273.15)
+    "Primary supply temperature"
+    annotation (Placement(transformation(extent={{-240,270},{-220,290}})));
+  Fluid.Sensors.TemperatureTwoPort senT2_1Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,340})));
+  Fluid.Sensors.TemperatureTwoPort senT1_1Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-100,340})));
+  Fluid.Sensors.TemperatureTwoPort senT1_1Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,300})));
+  Fluid.Sensors.TemperatureTwoPort senT2_1Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,300})));
+  Fluid.Sensors.MassFlowRate senMasFlo1_1(
+    redeclare final package Medium=Medium)
+    "Primary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{-140,330},{-120,350}})));
+  Fluid.Sensors.MassFlowRate senMasFlo2_1(
+    redeclare final package Medium=Medium)
+    "Secondary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{130,330},{150,350}})));
+  Fluid.MixingVolumes.MixingVolume vol2_1(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=273.15+30,
+    final prescribedHeatFlowRate=true,
+    redeclare final package Medium=Medium,
+    V=1,
+    final mSenFac=1,
+    final m_flow_nominal=m_flow_nominal,
+    nPorts=2)
+    "Volume for fluid stream"
+    annotation (Placement(transformation(extent={{209,300},{229,280}})));
+  Fluid.HeatExchangers.HeaterCooler_u coo(
+    redeclare final package Medium=Medium,
+    dp_nominal=1,
+    m_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1E5)
+    "Heat exchange with water stream"
+    annotation (Placement(transformation(extent={{100,290},{80,310}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_1Ret(
+    k=30+273.15)
+    "First secondary return temperature"
+    annotation (Placement(transformation(extent={{60,370},{80,390}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat1(
+    k=0.1,
+    Ti=10,
+    yMax=1,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    yMin=0,
+    reverseActing=false)
+    "PI controller for chilled water supply"
+    annotation (Placement(transformation(extent={{90,370},{110,390}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m2_1(
+    height=0.5,
+    duration=1000,
+    offset=0.5,
+    startTime=2000)
+    "First secondary flow signal"
+    annotation (Placement(transformation(extent={{220,370},{200,390}})));
+  Fluid.Movers.FlowControlled_m_flow sou2_2(
+    redeclare package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=273.15+30,
+    m_flow_nominal=m_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true)
+    "Secondary pump"
+    annotation (Placement(transformation(extent={{190,150},{170,170}})));
+  Fluid.Sensors.TemperatureTwoPort senT2_2Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,200})));
+  Fluid.Sensors.TemperatureTwoPort senT2_2Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,160})));
+  Fluid.Sensors.MassFlowRate senMasFlo2_2(
+    redeclare final package Medium=Medium)
+    "Secondary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{130,190},{150,210}})));
+  Fluid.MixingVolumes.MixingVolume vol2(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=273.15+30,
+    final prescribedHeatFlowRate=true,
+    redeclare final package Medium=Medium,
+    V=1,
+    final mSenFac=1,
+    final m_flow_nominal=m_flow_nominal,
+    nPorts=2)
+    "Volume for fluid stream"
+    annotation (Placement(transformation(extent={{209,160},{229,140}})));
+  Fluid.HeatExchangers.HeaterCooler_u coo1(
+    redeclare final package Medium=Medium,
+    dp_nominal=1,
+    m_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1E5)
+    "Heat exchange with water stream"
+    annotation (Placement(transformation(extent={{100,150},{80,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_2Ret(
+    k=35+273.15)
+    "Second secondary return temperature"
+    annotation (Placement(transformation(extent={{60,230},{80,250}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat2(
+    k=0.1,
+    Ti=10,
+    yMax=1,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    yMin=0,
+    reverseActing=false)
+    "PI controller for chilled water supply"
+    annotation (Placement(transformation(extent={{90,230},{110,250}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant m2_2(
+    k=0.5)
+    "Second secondary mass flow rate signal"
+    annotation (Placement(transformation(extent={{220,230},{200,250}})));
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colDis(
+    redeclare final package Medium=Medium,
+    mCon_flow_nominal=fill(
+      m_flow_nominal,
+      2),
+    nCon=2)
+    "Collector/distributor"
+    annotation (Placement(transformation(extent={{-60,310},{-20,330}})));
+  Fluid.Movers.FlowControlled_m_flow sou2(
+    redeclare package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=273.15+40,
+    m_flow_nominal=m_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
+    dp_nominal=50E3)
+    "Primary supply"
+    annotation (Placement(transformation(extent={{-170,50},{-150,70}})));
+  Fluid.Sources.Boundary_pT bou2(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=2)
+    "Boundary pressure"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-190,40})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2(
+    k=40+273.15)
+    "Primary supply temperature"
+    annotation (Placement(transformation(extent={{-240,-10},{-220,10}})));
+  Fluid.Sensors.TemperatureTwoPort senT2_3Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,60})));
+  Fluid.Sensors.TemperatureTwoPort senT1_2Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-100,60})));
+  Fluid.Sensors.TemperatureTwoPort senT1_2Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,20})));
+  Fluid.Sensors.TemperatureTwoPort senT2_3Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,20})));
+  Fluid.Sensors.MassFlowRate senMasFlo1_2(
+    redeclare final package Medium=Medium)
+    "Primary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{-140,50},{-120,70}})));
+  Fluid.Sensors.MassFlowRate senMasFlo2_3(
+    redeclare final package Medium=Medium)
+    "Secondary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{130,50},{150,70}})));
+  Fluid.MixingVolumes.MixingVolume vol2_2(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=273.15+30,
+    final prescribedHeatFlowRate=true,
+    redeclare final package Medium=Medium,
+    V=1,
+    final mSenFac=1,
+    final m_flow_nominal=m_flow_nominal,
+    nPorts=2)
+    "Volume for fluid stream"
+    annotation (Placement(transformation(extent={{209,20},{229,0}})));
+  Fluid.HeatExchangers.HeaterCooler_u coo2(
+    redeclare final package Medium=Medium,
+    dp_nominal=1,
+    m_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1E5)
+    "Heat exchange with water stream"
+    annotation (Placement(transformation(extent={{100,10},{80,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_1Ret1(
+    k=30+273.15)
+    "First secondary return temperature"
+    annotation (Placement(transformation(extent={{60,90},{80,110}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat3(
+    k=0.1,
+    Ti=10,
+    yMax=1,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    yMin=0,
+    reverseActing=false)
+    "PI controller for chilled water supply"
+    annotation (Placement(transformation(extent={{90,90},{110,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m2_3(
+    height=0.5,
+    duration=1000,
+    offset=0.5,
+    startTime=2000)
+    "First secondary flow signal"
+    annotation (Placement(transformation(extent={{220,90},{200,110}})));
+  Fluid.Sensors.TemperatureTwoPort senT2_4Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,-80})));
+  Fluid.Sensors.TemperatureTwoPort senT2_4Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-120})));
+  Fluid.Sensors.MassFlowRate senMasFlo2_4(
+    redeclare final package Medium=Medium)
+    "Secondary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{130,-90},{150,-70}})));
+  Fluid.MixingVolumes.MixingVolume vol1(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=273.15+30,
+    final prescribedHeatFlowRate=true,
+    redeclare final package Medium=Medium,
+    V=1,
+    final mSenFac=1,
+    final m_flow_nominal=m_flow_nominal,
+    nPorts=2)
+    "Volume for fluid stream"
+    annotation (Placement(transformation(extent={{209,-120},{229,-140}})));
+  Fluid.HeatExchangers.HeaterCooler_u coo3(
+    redeclare final package Medium=Medium,
+    dp_nominal=1,
+    m_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1E5)
+    "Heat exchange with water stream"
+    annotation (Placement(transformation(extent={{100,-130},{80,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_2Ret1(
+    k=35+273.15)
+    "Second secondary return temperature"
+    annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat4(
+    k=0.1,
+    Ti=10,
+    yMax=1,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    yMin=0,
+    reverseActing=false)
+    "PI controller for chilled water supply"
+    annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant m2_4(
+    k=0.5)
+    "Second secondary mass flow rate signal"
+    annotation (Placement(transformation(extent={{220,-50},{200,-30}})));
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colDis1(
+    redeclare final package Medium=Medium,
+    mCon_flow_nominal=fill(
+      m_flow_nominal,
+      2),
+    nCon=2)
+    "Collector/distributor"
+    annotation (Placement(transformation(extent={{-60,30},{-20,50}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage val2_1(
+    redeclare package Medium=Medium,
+    m_flow_nominal=m_flow_nominal,
+    dpValve_nominal=3000,
+    dpFixed_nominal=7000)
+    "Secondary control valve"
+    annotation (Placement(transformation(extent={{190,10},{170,30}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage val2_2(
+    redeclare package Medium=Medium,
+    m_flow_nominal=m_flow_nominal,
+    dpValve_nominal=3000,
+    dpFixed_nominal=7000)
+    "Secondary control valve"
+    annotation (Placement(transformation(extent={{190,-130},{170,-110}})));
+  Fluid.Movers.FlowControlled_m_flow sou2_3(
+    redeclare package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=273.15+30,
+    m_flow_nominal=m_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true)
+    "Secondary pump"
+    annotation (Placement(transformation(extent={{190,-270},{170,-250}})));
+  Fluid.Sources.Boundary_pT bou3(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=2)
+    "Boundary pressure"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-190,-240})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T3(
+    k=40+273.15)
+    "Primary supply temperature"
+    annotation (Placement(transformation(extent={{-240,-290},{-220,-270}})));
+  Fluid.Sensors.TemperatureTwoPort senT2_5Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,-220})));
+  Fluid.Sensors.TemperatureTwoPort senT1_3Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-100,-220})));
+  Fluid.Sensors.TemperatureTwoPort senT1_3Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,-260})));
+  Fluid.Sensors.TemperatureTwoPort senT2_5Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-260})));
+  Fluid.Sensors.MassFlowRate senMasFlo1_3(
+    redeclare final package Medium=Medium)
+    "Primary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{-140,-230},{-120,-210}})));
+  Fluid.Sensors.MassFlowRate senMasFlo2_5(
+    redeclare final package Medium=Medium)
+    "Secondary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{130,-230},{150,-210}})));
+  Fluid.MixingVolumes.MixingVolume vol2_3(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=273.15+30,
+    final prescribedHeatFlowRate=true,
+    redeclare final package Medium=Medium,
+    V=1,
+    final mSenFac=1,
+    final m_flow_nominal=m_flow_nominal,
+    nPorts=2)
+    "Volume for fluid stream"
+    annotation (Placement(transformation(extent={{209,-260},{229,-280}})));
+  Fluid.HeatExchangers.HeaterCooler_u coo4(
+    redeclare final package Medium=Medium,
+    dp_nominal=1,
+    m_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1E5)
+    "Heat exchange with water stream"
+    annotation (Placement(transformation(extent={{100,-270},{80,-250}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_1Ret2(
+    k=30+273.15)
+    "First secondary return temperature"
+    annotation (Placement(transformation(extent={{60,-190},{80,-170}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat5(
+    k=0.1,
+    Ti=10,
+    yMax=1,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    yMin=0,
+    reverseActing=false)
+    "PI controller for chilled water supply"
+    annotation (Placement(transformation(extent={{90,-190},{110,-170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m2_5(
+    height=0.5,
+    duration=1000,
+    offset=0.5,
+    startTime=2000)
+    "First secondary flow signal"
+    annotation (Placement(transformation(extent={{220,-190},{200,-170}})));
+  Fluid.Movers.FlowControlled_m_flow sou2_4(
+    redeclare package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=273.15+30,
+    m_flow_nominal=m_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true)
+    "Secondary pump"
+    annotation (Placement(transformation(extent={{190,-410},{170,-390}})));
+  Fluid.Sensors.TemperatureTwoPort senT2_6Sup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,-360})));
+  Fluid.Sensors.TemperatureTwoPort senT2_6Ret(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-400})));
+  Fluid.Sensors.MassFlowRate senMasFlo2_6(
+    redeclare final package Medium=Medium)
+    "Secondary mass flow rate (measured)"
+    annotation (Placement(transformation(extent={{130,-370},{150,-350}})));
+  Fluid.MixingVolumes.MixingVolume vol3(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    T_start=273.15+30,
+    final prescribedHeatFlowRate=true,
+    redeclare final package Medium=Medium,
+    V=1,
+    final mSenFac=1,
+    final m_flow_nominal=m_flow_nominal,
+    nPorts=2)
+    "Volume for fluid stream"
+    annotation (Placement(transformation(extent={{209,-400},{229,-420}})));
+  Fluid.HeatExchangers.HeaterCooler_u coo5(
+    redeclare final package Medium=Medium,
+    dp_nominal=1,
+    m_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1E5)
+    "Heat exchange with water stream"
+    annotation (Placement(transformation(extent={{100,-410},{80,-390}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_2Ret2(
+    k=35+273.15)
+    "Second secondary return temperature"
+    annotation (Placement(transformation(extent={{60,-330},{80,-310}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat6(
+    k=0.1,
+    Ti=10,
+    yMax=1,
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    yMin=0,
+    reverseActing=false)
+    "PI controller for chilled water supply"
+    annotation (Placement(transformation(extent={{90,-330},{110,-310}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant m2_6(
+    k=0.5)
+    "Second secondary mass flow rate signal"
+    annotation (Placement(transformation(extent={{220,-330},{200,-310}})));
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colDis2(
+    redeclare final package Medium=Medium,
+    mCon_flow_nominal=fill(
+      m_flow_nominal,
+      2),
+    nCon=2)
+    "Collector/distributor"
+    annotation (Placement(transformation(extent={{-60,-250},{-20,-230}})));
+equation
+  connect(m1.y,sou1.m_flow_in)
+    annotation (Line(points={{-218,380},{-160,380},{-160,352}},color={0,0,127}));
+  connect(senMasFlo1_1.port_b,senT1_1Sup.port_a)
+    annotation (Line(points={{-120,340},{-110,340}},color={0,127,255}));
+  connect(senT2_1Sup.port_b,senMasFlo2_1.port_a)
+    annotation (Line(points={{70,340},{130,340}},color={0,127,255}));
+  connect(sou1.port_b,senMasFlo1_1.port_a)
+    annotation (Line(points={{-150,340},{-140,340}},color={0,127,255}));
+  connect(coo.port_b,senT2_1Ret.port_a)
+    annotation (Line(points={{80,300},{70,300}},color={0,127,255}));
+  connect(T2_1Ret.y,conTChiWat1.u_s)
+    annotation (Line(points={{82,380},{74,380},{74,384},{76,384},{76,380},{88,380}},color={0,0,127}));
+  connect(conTChiWat1.y,coo.u)
+    annotation (Line(points={{112,380},{120,380},{120,306},{102,306}},color={0,0,127}));
+  connect(senT2_1Ret.T,conTChiWat1.u_m)
+    annotation (Line(points={{60,311},{60,320},{100,320},{100,368}},color={0,0,127}));
+  connect(vol2_1.ports[1],sou2_1.port_a)
+    annotation (Line(points={{217,300},{190,300}},color={0,127,255}));
+  connect(senMasFlo2_1.port_b,vol2_1.ports[2])
+    annotation (Line(points={{150,340},{221,340},{221,300}},color={0,127,255}));
+  connect(m2_1.y,sou2_1.m_flow_in)
+    annotation (Line(points={{198,380},{180,380},{180,312}},color={0,0,127}));
+  connect(bou1.ports[1],sou1.port_a)
+    annotation (Line(points={{-180,322},{-180,340},{-170,340}},color={0,127,255}));
+  connect(T1.y,bou1.T_in)
+    annotation (Line(points={{-218,280},{-212,280},{-212,324},{-202,324}},color={0,0,127}));
+  connect(senT2_2Sup.port_b,senMasFlo2_2.port_a)
+    annotation (Line(points={{70,200},{130,200}},color={0,127,255}));
+  connect(coo1.port_b,senT2_2Ret.port_a)
+    annotation (Line(points={{80,160},{70,160}},color={0,127,255}));
+  connect(T2_2Ret.y,conTChiWat2.u_s)
+    annotation (Line(points={{82,240},{78,240},{78,244},{80,244},{80,240},{88,240}},color={0,0,127}));
+  connect(conTChiWat2.y,coo1.u)
+    annotation (Line(points={{112,240},{120,240},{120,166},{102,166}},color={0,0,127}));
+  connect(senT2_2Ret.T,conTChiWat2.u_m)
+    annotation (Line(points={{60,171},{60,180},{100,180},{100,228}},color={0,0,127}));
+  connect(vol2.ports[1],sou2_2.port_a)
+    annotation (Line(points={{217,160},{190,160}},color={0,127,255}));
+  connect(senMasFlo2_2.port_b,vol2.ports[2])
+    annotation (Line(points={{150,200},{221,200},{221,160}},color={0,127,255}));
+  connect(sou2_2.port_b,coo1.port_a)
+    annotation (Line(points={{170,160},{100,160}},color={0,127,255}));
+  connect(senT1_1Ret.port_b,bou1.ports[2])
+    annotation (Line(points={{-110,300},{-180,300},{-180,318}},color={0,127,255}));
+  connect(sou2_1.port_b,coo.port_a)
+    annotation (Line(points={{170,300},{100,300}},color={0,127,255}));
+  connect(m2_2.y,sou2_2.m_flow_in)
+    annotation (Line(points={{198,240},{180,240},{180,172}},color={0,0,127}));
+  connect(senT1_1Sup.port_b,colDis.port_aDisSup)
+    annotation (Line(points={{-90,340},{-80,340},{-80,320},{-60,320}},color={0,127,255}));
+  connect(senT1_1Ret.port_a,colDis.port_bDisRet)
+    annotation (Line(points={{-90,300},{-80,300},{-80,314},{-60,314}},color={0,127,255}));
+  connect(colDis.ports_bCon[1],senT2_1Sup.port_a)
+    annotation (Line(points={{-48,330},{-40,330},{-40,360},{44,360},{44,340},{50,340}},color={0,127,255}));
+  connect(colDis.ports_bCon[2],senT2_2Sup.port_a)
+    annotation (Line(points={{-56,330},{-56,356},{40,356},{40,200},{50,200}},color={0,127,255}));
+  connect(senT2_1Ret.port_b,colDis.ports_aCon[1])
+    annotation (Line(points={{50,300},{24,300},{24,340},{-14,340},{-14,330},{-24,330}},color={0,127,255}));
+  connect(senT2_2Ret.port_b,colDis.ports_aCon[2])
+    annotation (Line(points={{50,160},{20,160},{20,336},{-32,336},{-32,330}},color={0,127,255}));
+  connect(colDis.port_bDisSup,colDis.port_aDisRet)
+    annotation (Line(points={{-20,320},{0,320},{0,314},{-20,314}},color={0,127,255}));
+  connect(senMasFlo1_2.port_b,senT1_2Sup.port_a)
+    annotation (Line(points={{-120,60},{-110,60}},color={0,127,255}));
+  connect(senT2_3Sup.port_b,senMasFlo2_3.port_a)
+    annotation (Line(points={{70,60},{130,60}},color={0,127,255}));
+  connect(sou2.port_b,senMasFlo1_2.port_a)
+    annotation (Line(points={{-150,60},{-140,60}},color={0,127,255}));
+  connect(coo2.port_b,senT2_3Ret.port_a)
+    annotation (Line(points={{80,20},{70,20}},color={0,127,255}));
+  connect(T2_1Ret1.y,conTChiWat3.u_s)
+    annotation (Line(points={{82,100},{74,100},{74,104},{76,104},{76,100},{88,100}},color={0,0,127}));
+  connect(conTChiWat3.y,coo2.u)
+    annotation (Line(points={{112,100},{120,100},{120,26},{102,26}},color={0,0,127}));
+  connect(senT2_3Ret.T,conTChiWat3.u_m)
+    annotation (Line(points={{60,31},{60,40},{100,40},{100,88}},color={0,0,127}));
+  connect(senMasFlo2_3.port_b,vol2_2.ports[1])
+    annotation (Line(points={{150,60},{217,60},{217,20}},color={0,127,255}));
+  connect(bou2.ports[1],sou2.port_a)
+    annotation (Line(points={{-180,42},{-180,60},{-170,60}},color={0,127,255}));
+  connect(T2.y,bou2.T_in)
+    annotation (Line(points={{-218,0},{-212,0},{-212,44},{-202,44}},color={0,0,127}));
+  connect(senT2_4Sup.port_b,senMasFlo2_4.port_a)
+    annotation (Line(points={{70,-80},{130,-80}},color={0,127,255}));
+  connect(coo3.port_b,senT2_4Ret.port_a)
+    annotation (Line(points={{80,-120},{70,-120}},color={0,127,255}));
+  connect(T2_2Ret1.y,conTChiWat4.u_s)
+    annotation (Line(points={{82,-40},{78,-40},{78,-36},{80,-36},{80,-40},{88,-40}},color={0,0,127}));
+  connect(conTChiWat4.y,coo3.u)
+    annotation (Line(points={{112,-40},{120,-40},{120,-114},{102,-114}},color={0,0,127}));
+  connect(senT2_4Ret.T,conTChiWat4.u_m)
+    annotation (Line(points={{60,-109},{60,-100},{100,-100},{100,-52}},color={0,0,127}));
+  connect(senMasFlo2_4.port_b,vol1.ports[1])
+    annotation (Line(points={{150,-80},{217,-80},{217,-120}},color={0,127,255}));
+  connect(senT1_2Ret.port_b,bou2.ports[2])
+    annotation (Line(points={{-110,20},{-180,20},{-180,38}},color={0,127,255}));
+  connect(senT1_2Sup.port_b,colDis1.port_aDisSup)
+    annotation (Line(points={{-90,60},{-80,60},{-80,40},{-60,40}},color={0,127,255}));
+  connect(senT1_2Ret.port_a,colDis1.port_bDisRet)
+    annotation (Line(points={{-90,20},{-80,20},{-80,34},{-60,34}},color={0,127,255}));
+  connect(colDis1.ports_bCon[1],senT2_3Sup.port_a)
+    annotation (Line(points={{-48,50},{-40,50},{-40,80},{44,80},{44,60},{50,60}},color={0,127,255}));
+  connect(colDis1.ports_bCon[2],senT2_4Sup.port_a)
+    annotation (Line(points={{-56,50},{-56,76},{40,76},{40,-80},{50,-80}},color={0,127,255}));
+  connect(senT2_3Ret.port_b,colDis1.ports_aCon[1])
+    annotation (Line(points={{50,20},{24,20},{24,60},{-14,60},{-14,50},{-24,50}},color={0,127,255}));
+  connect(senT2_4Ret.port_b,colDis1.ports_aCon[2])
+    annotation (Line(points={{50,-120},{20,-120},{20,56},{-32,56},{-32,50}},color={0,127,255}));
+  connect(vol2_2.ports[2],val2_1.port_a)
+    annotation (Line(points={{221,20},{190,20}},color={0,127,255}));
+  connect(val2_1.port_b,coo2.port_a)
+    annotation (Line(points={{170,20},{100,20}},color={0,127,255}));
+  connect(m2_3.y,val2_1.y)
+    annotation (Line(points={{198,100},{180,100},{180,32}},color={0,0,127}));
+  connect(vol1.ports[2],val2_2.port_a)
+    annotation (Line(points={{221,-120},{190,-120}},color={0,127,255}));
+  connect(val2_2.port_b,coo3.port_a)
+    annotation (Line(points={{170,-120},{100,-120}},color={0,127,255}));
+  connect(m2_4.y,val2_2.y)
+    annotation (Line(points={{198,-40},{180,-40},{180,-108}},color={0,0,127}));
+  connect(senMasFlo1_3.port_b,senT1_3Sup.port_a)
+    annotation (Line(points={{-120,-220},{-110,-220}},color={0,127,255}));
+  connect(senT2_5Sup.port_b,senMasFlo2_5.port_a)
+    annotation (Line(points={{70,-220},{130,-220}},color={0,127,255}));
+  connect(coo4.port_b,senT2_5Ret.port_a)
+    annotation (Line(points={{80,-260},{70,-260}},color={0,127,255}));
+  connect(T2_1Ret2.y,conTChiWat5.u_s)
+    annotation (Line(points={{82,-180},{74,-180},{74,-176},{76,-176},{76,-180},{88,-180}},color={0,0,127}));
+  connect(conTChiWat5.y,coo4.u)
+    annotation (Line(points={{112,-180},{120,-180},{120,-254},{102,-254}},color={0,0,127}));
+  connect(senT2_5Ret.T,conTChiWat5.u_m)
+    annotation (Line(points={{60,-249},{60,-240},{100,-240},{100,-192}},color={0,0,127}));
+  connect(vol2_3.ports[1],sou2_3.port_a)
+    annotation (Line(points={{217,-260},{190,-260}},color={0,127,255}));
+  connect(senMasFlo2_5.port_b,vol2_3.ports[2])
+    annotation (Line(points={{150,-220},{221,-220},{221,-260}},color={0,127,255}));
+  connect(m2_5.y,sou2_3.m_flow_in)
+    annotation (Line(points={{198,-180},{180,-180},{180,-248}},color={0,0,127}));
+  connect(T3.y,bou3.T_in)
+    annotation (Line(points={{-218,-280},{-212,-280},{-212,-236},{-202,-236}},color={0,0,127}));
+  connect(senT2_6Sup.port_b,senMasFlo2_6.port_a)
+    annotation (Line(points={{70,-360},{130,-360}},color={0,127,255}));
+  connect(coo5.port_b,senT2_6Ret.port_a)
+    annotation (Line(points={{80,-400},{70,-400}},color={0,127,255}));
+  connect(T2_2Ret2.y,conTChiWat6.u_s)
+    annotation (Line(points={{82,-320},{78,-320},{78,-316},{80,-316},{80,-320},{88,-320}},color={0,0,127}));
+  connect(conTChiWat6.y,coo5.u)
+    annotation (Line(points={{112,-320},{120,-320},{120,-394},{102,-394}},color={0,0,127}));
+  connect(senT2_6Ret.T,conTChiWat6.u_m)
+    annotation (Line(points={{60,-389},{60,-380},{100,-380},{100,-332}},color={0,0,127}));
+  connect(vol3.ports[1],sou2_4.port_a)
+    annotation (Line(points={{217,-400},{190,-400}},color={0,127,255}));
+  connect(senMasFlo2_6.port_b,vol3.ports[2])
+    annotation (Line(points={{150,-360},{221,-360},{221,-400}},color={0,127,255}));
+  connect(sou2_4.port_b,coo5.port_a)
+    annotation (Line(points={{170,-400},{100,-400}},color={0,127,255}));
+  connect(sou2_3.port_b,coo4.port_a)
+    annotation (Line(points={{170,-260},{100,-260}},color={0,127,255}));
+  connect(m2_6.y,sou2_4.m_flow_in)
+    annotation (Line(points={{198,-320},{180,-320},{180,-388}},color={0,0,127}));
+  connect(colDis2.ports_bCon[1],senT2_5Sup.port_a)
+    annotation (Line(points={{-48,-230},{-40,-230},{-40,-200},{44,-200},{44,-220},{50,-220}},color={0,127,255}));
+  connect(colDis2.ports_bCon[2],senT2_6Sup.port_a)
+    annotation (Line(points={{-56,-230},{-56,-204},{40,-204},{40,-360},{50,-360}},color={0,127,255}));
+  connect(senT2_5Ret.port_b,colDis2.ports_aCon[1])
+    annotation (Line(points={{50,-260},{24,-260},{24,-220},{-14,-220},{-14,-230},{-24,-230}},color={0,127,255}));
+  connect(senT2_6Ret.port_b,colDis2.ports_aCon[2])
+    annotation (Line(points={{50,-400},{20,-400},{20,-224},{-32,-224},{-32,-230}},color={0,127,255}));
+  connect(bou3.ports[1],senMasFlo1_3.port_a)
+    annotation (Line(points={{-180,-238},{-180,-220},{-140,-220}},color={0,127,255}));
+  connect(senT1_3Sup.port_b,colDis2.port_aDisSup)
+    annotation (Line(points={{-90,-220},{-80,-220},{-80,-240},{-60,-240}},color={0,127,255}));
+  connect(senT1_3Ret.port_a,colDis2.port_bDisRet)
+    annotation (Line(points={{-90,-260},{-80,-260},{-80,-246},{-60,-246}},color={0,127,255}));
+  connect(m1.y,sou2.m_flow_in)
+    annotation (Line(points={{-218,380},{-140,380},{-140,80},{-160,80},{-160,72}},color={0,0,127}));
+  connect(bou3.ports[2],senT1_3Ret.port_b)
+    annotation (Line(points={{-180,-242},{-180,-260},{-110,-260}},color={0,127,255}));
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses.CollectorDistributor\">
+Buildings.DHC.ETS.BaseClasses.CollectorDistributor</a>
+in a configuration where the model is used to connect
+</p>
+<ol>
+<li>
+an active primary circuit which mass flow rate varies from 0 to 1.1 times
+<code>m_flow_nominal</code> and two active secondary circuits,
+one with a mass flow rate varying from 0.5 to 1 times
+<code>m_flow_nominal</code>,
+another with a constant mass flow rate, equal to 0.5 times
+<code>m_flow_nominal</code>: this case illustrates a typical supply-through
+loop and the supply temperature drop in one secondary circuit resulting
+from flow recirculation when the sum of the secondary mass flow rates
+exceeds the primary mass flow rate;
+</li>
+<li>
+an active primary circuit which mass flow rate varies from 0 to 1.1 times
+<code>m_flow_nominal</code> (similar to the previous case) and
+two passive secondary circuits, with no recirculation loop at the
+end of the distribution line,
+</li>
+<li>
+a passive primary circuit and two active secondary circuits,
+both with a varying mass flow rate, with no recirculation loop at the
+end of the distribution line.
+</li>
+</ol>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+November 15, 2022, by Michael Wetter:<br/>
+Set pump head.
+</li>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-260,-440},{260,440}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos" "Simulate and plot"),
+    experiment(
+      StopTime=5000,
+      Tolerance=1e-06));
+end CollectorDistributor;
diff --git a/Buildings/DHC/ETS/BaseClasses/Validation/package.mo b/Buildings/DHC/ETS/BaseClasses/Validation/package.mo
new file mode 100644
index 00000000000..1b04d16b978
--- /dev/null
+++ b/Buildings/DHC/ETS/BaseClasses/Validation/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.BaseClasses;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses\">
+Buildings.DHC.ETS.BaseClasses</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.order b/Buildings/DHC/ETS/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.order
rename to Buildings/DHC/ETS/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/computeCoordinates.mo b/Buildings/DHC/ETS/BaseClasses/computeCoordinates.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/computeCoordinates.mo
rename to Buildings/DHC/ETS/BaseClasses/computeCoordinates.mo
index 39c2f5801d4..7c8f559fbba 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/computeCoordinates.mo
+++ b/Buildings/DHC/ETS/BaseClasses/computeCoordinates.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
+within Buildings.DHC.ETS.BaseClasses;
 function computeCoordinates
   "Coordinates of evenly distributed boreholes given the number of boreholes"
   extends Modelica.Icons.Function;
diff --git a/Buildings/DHC/ETS/BaseClasses/package.mo b/Buildings/DHC/ETS/BaseClasses/package.mo
new file mode 100644
index 00000000000..242ce21eaaa
--- /dev/null
+++ b/Buildings/DHC/ETS/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.ETS;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.ETS\">
+Buildings.DHC.ETS</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.order b/Buildings/DHC/ETS/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.order
rename to Buildings/DHC/ETS/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo b/Buildings/DHC/ETS/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
similarity index 95%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
rename to Buildings/DHC/ETS/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
index 2992db9f957..87dbb79c7b4 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
+++ b/Buildings/DHC/ETS/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses;
+within Buildings.DHC.ETS.Combined.BaseClasses;
 model PartialHeatPumpHeatExchanger
   "Partial model of a substation with heat pump and compressor-less cooling"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+    Buildings.DHC.ETS.BaseClasses.PartialETS(
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
     final have_weaBus=false,
     final have_chiWat=true,
     final have_heaWat=true,
@@ -187,7 +187,7 @@ model PartialHeatPumpHeatExchanger
     final energyDynamics=mixingVolumeEnergyDynamics)
     "Mixing volume to break algebraic loops and to emulate the delay of the substation"
     annotation (Placement(transformation(extent={{250,-360},{270,-380}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1HexChi(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum1HexChi(
     redeclare final package Medium = MediumSer,
     final m_flow_nominal=m1HexChi_flow_nominal,
     final allowFlowReversal=allowFlowReversalSer,
@@ -241,7 +241,7 @@ model PartialHeatPumpHeatExchanger
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=
         m1HexChi_flow_nominal)
     annotation (Placement(transformation(extent={{-108,-210},{-88,-190}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PIDWithEnable conTChiWat(
+  Buildings.DHC.ETS.Combined.Controls.PIDWithEnable conTChiWat(
     k=0.05,
     Ti=120,
     yMax=1,
@@ -290,20 +290,20 @@ model PartialHeatPumpHeatExchanger
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={140,-280})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox
+  Buildings.DHC.ETS.Combined.Subsystems.SwitchBox
     swiFlo(
     redeclare final package Medium = MediumSer,
     final m_flow_nominal=mSerWat_flow_nominal,
     dpValve_nominal=1e-4)                      "Flow switch box"
     annotation (Placement(transformation(extent={{-10,-390},{10,-370}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction bypHeaWatSup(
+  Buildings.DHC.ETS.BaseClasses.Junction bypHeaWatSup(
     redeclare final package Medium = MediumBui, final m_flow_nominal=proHeaWat.mCon_flow_nominal
         *{1,-1,-1}) "Bypass heating water (supply)" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={100,260})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction bypHeaWatRet(
+  Buildings.DHC.ETS.BaseClasses.Junction bypHeaWatRet(
     redeclare final package Medium = MediumBui, final m_flow_nominal=proHeaWat.mCon_flow_nominal
         *{1,-1,1})
     "Bypass heating water (return)"
@@ -315,7 +315,7 @@ model PartialHeatPumpHeatExchanger
   Buildings.Controls.OBC.CDL.Logical.TrueFalseHold enaHea(
     trueHoldDuration=15*60) "Enable heating"
     annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump proHeaWat(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPump proHeaWat(
     redeclare final package Medium1 = MediumBui,
     redeclare final package Medium2 = MediumSer,
     dT_nominal=dT_nominal,
@@ -378,7 +378,7 @@ model PartialHeatPumpHeatExchanger
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter capFloHHW(
     final k=cpBui_default) if have_varFloEva or have_varFloCon "Capacity flow rate"
     annotation (Placement(transformation(extent={{-220,310},{-200,330}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PrimaryVariableFlow conFloConHHW(
+  Buildings.DHC.ETS.Combined.Controls.PrimaryVariableFlow conFloConHHW(
     final Q_flow_nominal=QHeaWat_flow_nominal,
     final dT_nominal=dT_nominal,
     final ratFloMin=ratFloMin,
@@ -555,8 +555,8 @@ to radiant cooling systems, for instance at 19&deg;C.
 </ul>
 <p>
 The space heating heating function is provided by a water-to-water heat pump
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
 </p>
 <ul>
 <li>
@@ -565,20 +565,20 @@ with a variable mass flow rate to maintain a difference between supply and
 return water of <code>dT_nominal</code>,
 with a lower limit of mass flow specified by the ratio <code>ratFloMin</code>.
 The control logic is implemented and described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PrimaryVariableFlow\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.PrimaryVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.PrimaryVariableFlow\">
+Buildings.DHC.ETS.Combined.Controls.PrimaryVariableFlow</a>.
 The model can also represent a constant flow condenser loop
 by setting <code>have_varFloCon</code> to <code>false</code>.
 </li>
 <li>
 The evaporator loop is controlled according to the documentation in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
 Evaporator water is supplied by mixing flow directly from the district line with
 flow leaving the district side of the cooling heat exchanger.
 The hydronic arrangement modeled in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.SwitchBox\">
+Buildings.DHC.ETS.Combined.Subsystems.SwitchBox</a>
 ensures that the resulting fluid stream in the district line always flows
 in the same direction.
 </li>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.mo b/Buildings/DHC/ETS/Combined/BaseClasses/PartialParallel.mo
similarity index 89%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.mo
rename to Buildings/DHC/ETS/Combined/BaseClasses/PartialParallel.mo
index 85485d752e8..8d8074ec025 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.mo
+++ b/Buildings/DHC/ETS/Combined/BaseClasses/PartialParallel.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses;
+within Buildings.DHC.ETS.Combined.BaseClasses;
 model PartialParallel
   "Partial ETS model with district heat exchanger and parallel connection of production systems"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5,
+  extends Buildings.DHC.ETS.BaseClasses.PartialETS(
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
     final have_heaWat=true,
     final have_chiWat=true,
     final have_pum=true,
@@ -10,8 +10,8 @@ model PartialParallel
     have_eleHea=false,
     have_weaBus=false);
 
-  parameter Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon=
-      Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.Pump
+  parameter Buildings.DHC.ETS.Types.ConnectionConfiguration conCon=
+      Buildings.DHC.ETS.Types.ConnectionConfiguration.Pump
     "District connection configuration" annotation (Evaluate=true);
   parameter Integer nSysHea
     "Number of heating systems"
@@ -93,8 +93,8 @@ model PartialParallel
     "Chilled water supply temperature set point"
     annotation (Placement(transformation(extent={{-340,-80},{-300,-40}}),iconTransformation(extent={{-380,-140},{-300,-60}})));
   // COMPONENTS
-  replaceable Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory conSup
-    constrainedby Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory(
+  replaceable Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory conSup
+    constrainedby Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory(
       final nSouAmb=nSouAmb)
     "Supervisory controller"
     annotation (Placement(transformation(extent={{-260,12},{-240,32}})));
@@ -110,7 +110,7 @@ model PartialParallel
     final m_flow_nominal=colAmbWat.mDis_flow_nominal,
     use_inputFilter=false) "Condenser to ambient loop isolation valve"
     annotation (Placement(transformation(extent={{-70,-130},{-50,-110}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger hex(
+  Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger hex(
     redeclare final package Medium1=MediumSer,
     redeclare final package Medium2=MediumBui,
     final allowFlowReversal1=allowFlowReversalSer,
@@ -126,7 +126,7 @@ model PartialParallel
     final spePum1Min=spePum1HexMin,
     final spePum2Min=spePum2HexMin) "District heat exchanger"
     annotation (Placement(transformation(extent={{-10,-244},{10,-264}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.StratifiedTank tanChiWat(
+  Buildings.DHC.ETS.BaseClasses.StratifiedTank tanChiWat(
     redeclare final package Medium = MediumBui,
     final m_flow_nominal=colChiWat.mDis_flow_nominal,
     final VTan=VTanChiWat,
@@ -134,7 +134,7 @@ model PartialParallel
     final dIns=dInsTanChiWat,
     final nSeg=nSegTan) "Chilled water tank"
     annotation (Placement(transformation(extent={{180,96},{200,116}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.StratifiedTank tanHeaWat(
+  Buildings.DHC.ETS.BaseClasses.StratifiedTank tanHeaWat(
     redeclare final package Medium = MediumBui,
     final m_flow_nominal=colHeaWat.mDis_flow_nominal,
     final VTan=VTanHeaWat,
@@ -142,7 +142,7 @@ model PartialParallel
     final dIns=dInsTanHeaWat,
     final nSeg=nSegTan) "Heating water tank"
     annotation (Placement(transformation(extent={{-220,96},{-200,116}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colChiWat(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colChiWat(
     redeclare final package Medium = MediumBui,
     final nCon=1 + nSysCoo,
     mCon_flow_nominal={colAmbWat.mDis_flow_nominal})
@@ -151,7 +151,7 @@ model PartialParallel
         extent={{-20,10},{20,-10}},
         rotation=180,
         origin={120,-34})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colHeaWat(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colHeaWat(
     redeclare final package Medium = MediumBui,
     final nCon=1 + nSysHea,
     mCon_flow_nominal={colAmbWat.mDis_flow_nominal})
@@ -160,7 +160,7 @@ model PartialParallel
         extent={{20,10},{-20,-10}},
         rotation=180,
         origin={-120,-34})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colAmbWat(
+  Buildings.DHC.ETS.BaseClasses.CollectorDistributor colAmbWat(
     redeclare final package Medium = MediumBui,
     final nCon=nSouAmb,
     mCon_flow_nominal={hex.m2_flow_nominal})
@@ -190,7 +190,7 @@ model PartialParallel
         origin={190,-34})));
 protected
   parameter Boolean have_val1Hex=
-    conCon == DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
+    conCon == DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
     "True in case of control valve on district side, false in case of a pump";
 equation
   connect(hex.PPum,totPPum.u[1])
@@ -286,8 +286,8 @@ of systems serving as ambient sources (including the district heat exchanger).
 <li>
 The connection to the district loop is realized with a heat exchanger, according
 to the operating principles described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger</a>.
 </li>
 <li>
 The connection of the heating water and chilled water production systems
@@ -297,8 +297,8 @@ to the systems serving as ambient sources is realized in parallel.
 A replaceable partial class is used to represent a supervisory controller, which
 must be replaced by a control block providing at least the control signals
 listed in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory\">
+Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory</a>.
 </li>
 </ul>
 <p>
@@ -335,7 +335,7 @@ being hydronically connected.
 </p>
 <p>
 <img alt=\"Sequence chart\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.png\"/>
 </p>
 </html>",
 revisions="<html>
diff --git a/Buildings/DHC/ETS/Combined/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/BaseClasses/package.mo
new file mode 100644
index 00000000000..15e067e7c04
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/BaseClasses/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.Combined;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined\">
+Buildings.DHC.ETS.Combined</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/BaseClasses/package.order
diff --git a/Buildings/DHC/ETS/Combined/ChillerBorefield.mo b/Buildings/DHC/ETS/Combined/ChillerBorefield.mo
new file mode 100644
index 00000000000..5e1d4bc2e1e
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/ChillerBorefield.mo
@@ -0,0 +1,642 @@
+within Buildings.DHC.ETS.Combined;
+model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller and optional borefield"
+  extends Buildings.DHC.ETS.Combined.BaseClasses.PartialParallel(
+    final have_eleCoo=true,
+    final have_fan=false,
+    redeclare replaceable Buildings.DHC.ETS.Combined.Controls.Supervisory conSup
+      constrainedby Buildings.DHC.ETS.Combined.Controls.Supervisory(
+        final controllerType=controllerType,
+        final kHot=kHot,
+        final kCol=kCol,
+        final TiHot=TiHot,
+        final TiCol=TiCol,
+        final THeaWatSupSetMin=THeaWatSupSetMin,
+        final TChiWatSupSetMin=TChiWatSupSetMin),
+    nSysHea=1,
+    nSouAmb=
+      if have_borFie then
+        2
+      else
+        1,
+    VTanHeaWat=datChi.PLRMin*datChi.mCon_flow_nominal*5*60/1000,
+    VTanChiWat=datChi.PLRMin*datChi.mEva_flow_nominal*5*60/1000,
+    colChiWat(
+      mCon_flow_nominal={colAmbWat.mDis_flow_nominal,datChi.mEva_flow_nominal}),
+    colHeaWat(
+      mCon_flow_nominal={colAmbWat.mDis_flow_nominal,datChi.mCon_flow_nominal}),
+    colAmbWat(
+      mCon_flow_nominal=
+        if have_borFie then
+          {hex.m2_flow_nominal,datBorFie.conDat.mBorFie_flow_nominal}
+        else
+          {hex.m2_flow_nominal}),
+    totPPum(
+      nin=3),
+    totPHea(
+      nin=1),
+    totPCoo(
+      nin=1),
+    nPorts_bChiWat=1,
+    nPorts_aHeaWat=1,
+    nPorts_aChiWat=1,
+    nPorts_bHeaWat=1);
+  parameter Boolean have_borFie=false
+    "Set to true in case a borefield is used in addition of the district HX"
+    annotation (Evaluate=true);
+  parameter Boolean have_WSE=false
+    "Set to true in case a waterside economizer is used"
+    annotation (Evaluate=true);
+  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
+    "Nominal pressure drop accross condenser"
+    annotation (Dialog(group="Chiller"));
+  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
+    "Nominal pressure drop accross evaporator"
+    annotation (Dialog(group="Chiller"));
+  replaceable parameter Fluid.Chillers.Data.ElectricEIR.Generic datChi
+    "Chiller performance data"
+    annotation (Dialog(group="Chiller"),choicesAllMatching=true,
+    Placement(transformation(extent={{20,222},{40,242}})));
+  parameter Modelica.Units.SI.PressureDifference dp1WSE_nominal(displayUnit=
+        "Pa") = 40E3
+    "Nominal pressure drop across heat exchanger on district side"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.PressureDifference dp2WSE_nominal(displayUnit=
+        "Pa") = 40E3
+    "Nominal pressure drop across heat exchanger on building side"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.HeatFlowRate QWSE_flow_nominal=0
+    "Nominal heat flow rate through heat exchanger (<=0)"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.Temperature T_a1WSE_nominal=279.15
+    "Nominal water inlet temperature on district side"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.Temperature T_b1WSE_nominal=284.15
+    "Nominal water outlet temperature on district side"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.Temperature T_a2WSE_nominal=288.15
+    "Nominal water inlet temperature on building side"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.Temperature T_b2WSE_nominal=281.15
+    "Nominal water outlet temperature on building side"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Real y1WSEMin(unit="1")=0.05
+    "Minimum pump flow rate or valve opening for temperature measurement (fractional)"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  final parameter Modelica.Units.SI.MassFlowRate m1WSE_flow_nominal=abs(
+      QWSE_flow_nominal/4200/(T_b1WSE_nominal - T_a1WSE_nominal))
+    "WSE primary mass flow rate"
+    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
+  parameter Modelica.Units.SI.Temperature TBorWatEntMax=313.15
+    "Maximum value of borefield water entering temperature"
+    annotation (Dialog(group="Borefield", enable=have_borFie));
+  parameter Real spePumBorMin(unit="1")=0.1
+    "Borefield pump minimum speed"
+    annotation (Dialog(group="Borefield",enable=have_borFie));
+  parameter Modelica.Units.SI.Pressure dpBorFie_nominal(displayUnit="Pa") = 5E4
+    "Pressure losses for the entire borefield (control valve excluded)"
+    annotation (Dialog(group="Borefield", enable=have_borFie));
+  replaceable parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie
+    constrainedby Fluid.Geothermal.Borefields.Data.Borefield.Template
+    "Borefield parameters"
+    annotation (Dialog(group="Borefield",enable=have_borFie),
+    choicesAllMatching=true,Placement(transformation(extent={{140,222},{160,242}})));
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller"
+    annotation (Dialog(group="Supervisory controller"));
+  parameter Real kHot(
+    min=0)=0.05
+    "Gain of controller on hot side"
+    annotation (Dialog(group="Supervisory controller"));
+  parameter Real kCol(
+    min=0)=0.1
+    "Gain of controller on cold side"
+    annotation (Dialog(group="Supervisory controller"));
+  parameter Modelica.Units.SI.Time TiHot(min=Buildings.Controls.OBC.CDL.Constants.small)
+     = 300 "Time constant of integrator block on hot side" annotation (Dialog(
+        group="Supervisory controller", enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Time TiCol(min=Buildings.Controls.OBC.CDL.Constants.small)
+     = 120 "Time constant of integrator block on cold side" annotation (Dialog(
+        group="Supervisory controller", enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Temperature THeaWatSupSetMin(displayUnit="degC")
+     = datChi.TConEntMin + 5
+    "Minimum value of heating water supply temperature set point"
+    annotation (Dialog(group="Supervisory controller"));
+  parameter Modelica.Units.SI.Temperature TChiWatSupSetMin(displayUnit="degC")
+     = datChi.TEvaLvgMin
+    "Minimum value of chilled water supply temperature set point"
+    annotation (Dialog(group="Supervisory controller"));
+
+  replaceable
+    Buildings.DHC.ETS.Combined.Subsystems.Chiller
+    chi(
+    redeclare final package Medium = MediumBui,
+    final dpCon_nominal=dpCon_nominal,
+    final dpEva_nominal=dpEva_nominal,
+    final dat=datChi) "Chiller" annotation (Dialog(group="Chiller"), Placement(
+        transformation(extent={{-10,-16},{10,4}})));
+  replaceable
+    Buildings.DHC.ETS.Combined.Subsystems.Borefield
+    borFie(
+    redeclare final package Medium = MediumBui,
+    final datBorFie=datBorFie,
+    final TBorWatEntMax=TBorWatEntMax,
+    final spePumBorMin=spePumBorMin,
+    final dp_nominal=dpBorFie_nominal) if have_borFie "Borefield" annotation (
+      Dialog(group="Borefield", enable=have_borFie), Placement(transformation(
+          extent={{-80,-230},{-60,-210}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerPPum(
+    final k=0) if not have_borFie
+    "Zero power"
+    annotation (Placement(transformation(extent={{220,-90},{240,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerPHea(
+    final k=0)
+    "Zero power"
+    annotation (Placement(transformation(extent={{220,50},{240,70}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloHeaWat(
+    redeclare final package Medium1 = MediumBui,
+    final m_flow_nominal=colHeaWat.mDis_flow_nominal)
+    "Variation of enthalpy flow rate"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={-274,130})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dHHeaWat_flow(final unit="W")
+    "Heating water distributed energy flow rate"
+    annotation (Placement(transformation(extent={{300,140},{340,180}}),
+      iconTransformation(extent={{-40,-40},{40,40}},
+        rotation=-90,
+        origin={240,-340})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dHChiWat_flow(final unit="W")
+    "Chilled water distributed energy flow rate"
+    annotation (Placement(transformation(extent={{300,100},{340,140}}),
+      iconTransformation(extent={{-40,-40},{40,40}},
+        rotation=-90,
+        origin={280,-340})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloChiWat(
+    redeclare final package Medium1 = MediumBui,
+    final m_flow_nominal=colChiWat.mDis_flow_nominal)
+    "Variation of enthalpy flow rate"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={274,130})));
+  Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer
+    WSE(
+    redeclare final package Medium1 = MediumSer,
+    redeclare final package Medium2 = MediumBui,
+    final allowFlowReversal1=allowFlowReversalSer,
+    final allowFlowReversal2=allowFlowReversalBui,
+    final conCon=conCon,
+    final dp1Hex_nominal=dp1WSE_nominal,
+    final dp2Hex_nominal=dp2WSE_nominal,
+    final Q_flow_nominal=QWSE_flow_nominal,
+    final T_a1_nominal=T_a1WSE_nominal,
+    final T_b1_nominal=T_b1WSE_nominal,
+    final T_a2_nominal=T_a2WSE_nominal,
+    final T_b2_nominal=T_b2WSE_nominal,
+    final y1Min=y1WSEMin) if have_WSE "Waterside economizer"
+    annotation (Placement(transformation(extent={{220,116},{240,136}})));
+  Buildings.DHC.ETS.BaseClasses.Junction splWSE(
+    redeclare final package Medium = MediumSer,
+    final m_flow_nominal={
+      hex.m1_flow_nominal + m1WSE_flow_nominal,
+      -hex.m1_flow_nominal,
+      -m1WSE_flow_nominal})
+    "Flow splitter for WSE"
+    annotation (Placement(transformation(extent={{-230,-270},{-210,-250}})));
+  Buildings.DHC.ETS.BaseClasses.Junction mixWSE(
+    redeclare final package Medium = MediumSer,
+    final m_flow_nominal={
+      hex.m1_flow_nominal,
+      -hex.m1_flow_nominal - m1WSE_flow_nominal,
+      m1WSE_flow_nominal})
+    "Flow mixer for WSE"
+    annotation (Placement(transformation(extent={{244,-250},{264,-270}})));
+
+equation
+  if not have_WSE then
+    connect(tanChiWat.port_aTop, dHFloChiWat.port_b2)
+    annotation (Line(points={{200,112},{268,112},{268,120}}, color={0,127,255}));
+  end if;
+
+  connect(chi.port_bHeaWat,colHeaWat.ports_aCon[2])
+    annotation (Line(points={{10,0},{20,0},{20,10},{-108,10},{-108,-24}},color={0,127,255}));
+  connect(chi.port_aHeaWat,colHeaWat.ports_bCon[2])
+    annotation (Line(points={{-10,0},{-132,0},{-132,-24}},color={0,127,255}));
+  connect(chi.port_bChiWat,colChiWat.ports_aCon[2])
+    annotation (Line(points={{-10,-12},{-20,-12},{-20,-20},{108,-20},{108,-24}},color={0,127,255}));
+  connect(colChiWat.ports_bCon[2],chi.port_aChiWat)
+    annotation (Line(points={{132,-24},{132,-12},{10,-12}},color={0,127,255}));
+  connect(conSup.TChiWatSupSet,chi.TChiWatSupSet)
+    annotation (Line(points={{-238,17},{-26,17},{-26,-8},{-12,-8}},color={0,0,127}));
+  connect(chi.PPum,totPPum.u[2])
+    annotation (Line(points={{12,-8},{30,-8},{30,-58},{258,-58},{258,-60}},color={0,0,127}));
+  connect(colAmbWat.ports_aCon[2],borFie.port_b)
+    annotation (Line(points={{12,-116},{14,-116},{14,-220},{-60,-220}},color={0,127,255}));
+  connect(colAmbWat.ports_bCon[2],borFie.port_a)
+    annotation (Line(points={{-12,-116},{-14,-116},{-14,-140},{-100,-140},{-100,-220},{-80,-220}},color={0,127,255}));
+  connect(conSup.yAmb[1],borFie.u)
+    annotation (Line(points={{-238,25},{-200,25},{-200,-212},{-82,-212}},color={0,0,127}));
+  connect(valIsoCon.y_actual,borFie.yValIso_actual[1])
+    annotation (Line(points={{-55,-113},{-40,-113},{-40,-198},{-90,-198},{-90,
+          -216.5},{-82,-216.5}},                                                                color={0,0,127}));
+  connect(valIsoEva.y_actual,borFie.yValIso_actual[2])
+    annotation (Line(points={{55,-113},{40,-113},{40,-200},{-88,-200},{-88,
+          -215.5},{-82,-215.5}},                                                             color={0,0,127}));
+  connect(borFie.PPum,totPPum.u[3])
+    annotation (Line(points={{-58,-216},{250,-216},{250,-62},{258,-62},{258,-60}},color={0,0,127}));
+  connect(zerPPum.y,totPPum.u[3])
+    annotation (Line(points={{242,-80},{248,-80},{248,-60},{258,-60}},          color={0,0,127}));
+  connect(zerPHea.y,totPHea.u[1])
+    annotation (Line(points={{242,60},{258,60}},color={0,0,127}));
+  connect(chi.PChi,totPCoo.u[1])
+    annotation (Line(points={{12,-4},{30,-4},{30,20},{258,20}},color={0,0,127}));
+  connect(uHea,conSup.uHea)
+    annotation (Line(points={{-320,100},{-290,100},{-290,31},{-262,31}},color={255,0,255}));
+  connect(conSup.yHea,chi.uHea)
+    annotation (Line(points={{-238,31},{-20,31},{-20,-2},{-12,-2}},color={255,0,255}));
+  connect(conSup.yCoo,chi.uCoo)
+    annotation (Line(points={{-238,29},{-22,29},{-22,-4},{-12,-4}},color={255,0,255}));
+  connect(valIsoCon.y_actual,conSup.yValIsoCon_actual)
+    annotation (Line(points={{-55,-113},{-40,-113},{-40,-60},{-266,-60},{-266,15},
+          {-262,15}},                                                                        color={0,0,127}));
+  connect(valIsoEva.y_actual,conSup.yValIsoEva_actual)
+    annotation (Line(points={{55,-113},{40,-113},{40,-64},{-270,-64},{-270,13},{
+          -262,13}},                                                                      color={0,0,127}));
+  connect(dHFloHeaWat.dH_flow,dHHeaWat_flow)
+    annotation (Line(points={{-271,142},{-271,160},{320,160}},           color={0,0,127}));
+  connect(dHFloChiWat.dH_flow,dHChiWat_flow)
+    annotation (Line(points={{277,142},{292,142},{292,120},{320,120}},color={0,0,127}));
+  connect(dHFloChiWat.port_a1, tanChiWat.port_bBot)
+    annotation (Line(points={{280,120},{280,100},{200,100}},           color={0,127,255}));
+  connect(dHFloChiWat.port_b1, ports_bChiWat[1])
+    annotation (Line(points={{280,140},{280,200},{300,200}},                               color={0,127,255}));
+  connect(tanHeaWat.port_bTop, dHFloHeaWat.port_a1)
+    annotation (Line(points={{-220,112},{-268,112},{-268,120}},
+                                                     color={0,127,255}));
+  connect(tanHeaWat.port_aBot, dHFloHeaWat.port_b2)
+    annotation (Line(points={{-220,100},{-280,100},{-280,120}},
+                                                     color={0,127,255}));
+  connect(dHFloHeaWat.port_a2, ports_aHeaWat[1])
+    annotation (Line(points={{-280,140},{-280,260},{-300,260}},            color={0,127,255}));
+  connect(ports_aChiWat[1], dHFloChiWat.port_a2)
+    annotation (Line(points={{-300,200},{268,200},{268,140}},             color={0,127,255}));
+  connect(dHFloHeaWat.port_b1, ports_bHeaWat[1])
+    annotation (Line(points={{-268,140},{-268,260},{300,260}},            color={0,127,255}));
+  connect(splWSE.port_2, hex.port_a1) annotation (Line(points={{-210,-260},{-10,
+          -260}},                                                                       color={0,127,255}));
+  connect(dHFloChiWat.port_b2, WSE.port_a2)
+    annotation (Line(points={{268,120},{240,120}},                     color={0,127,255}));
+  connect(WSE.port_b2, tanChiWat.port_aTop) annotation (Line(points={{220,120},{206,120},{206,112},{200,112}},
+                                                                                           color={0,127,255}));
+  connect(mixWSE.port_2, port_bSerAmb)
+    annotation (Line(points={{264,-260},{280,-260},{280,-200},{300,-200}}, color={0,127,255}));
+  connect(splWSE.port_3, WSE.port_a1)
+    annotation (Line(points={{-220,-270},{-220,-280},{210,-280},{210,132},{220,132}}, color={0,127,255}));
+  connect(WSE.port_b1, mixWSE.port_3) annotation (Line(points={{240,132},{254,132},{254,-250}}, color={0,127,255}));
+  connect(hex.port_b1, mixWSE.port_1) annotation (Line(points={{10,-260},{244,-260}}, color={0,127,255}));
+  connect(conSup.yCoo, WSE.uCoo) annotation (Line(points={{-238,29},{140,29},{140,
+          126},{218,126}},                                                                         color={255,0,255}));
+  connect(valIsoEva.y_actual, WSE.yValIsoEva_actual)
+    annotation (Line(points={{55,-113},{40,-113},{40,123},{218,123}}, color={0,0,127}));
+  connect(port_aSerAmb, splWSE.port_1) annotation (Line(points={{-300,-200},{
+          -280,-200},{-280,-260},{-230,-260}}, color={0,127,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-300,-300},{300,300}}),
+      graphics={
+        Line(
+          points={{86,92}},
+          color={28,108,200},
+          pattern=LinePattern.Dash)}),
+    defaultComponentName="ets",
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+April 30, 2021, by Michael Wetter:<br/>
+Reformulated replaceable class to avoid access of components that are not in the constraining type.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2471\">issue #2471</a>.
+</li>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model represents an energy transfer station as illustrated in the schematics
+below.
+</p>
+<ul>
+<li>
+The heating and cooling functions are provided by a heat recovery chiller, see
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Chiller\">
+Buildings.DHC.ETS.Combined.Subsystems.Chiller</a>
+for the operating principles and modeling assumptions.
+The condenser and evaporator loops are equipped with constant speed pumps.
+</li>
+<li>
+The supervisory controller ensures the load balancing between the condenser side
+and the evaporator side of the chiller by controlling in sequence an optional
+geothermal borefield (priority system), the district heat exchanger (second
+priority system), and ultimately the chiller, by resetting down the chilled
+water supply temperature, see
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>
+for a detailed description.
+The borefield and district heat exchanger loops are equipped with
+variable speed pumps modulated by the supervisory controller.
+</li>
+</ul>
+<p>
+Note that the heating and cooling enable signals (<code>uHea</code> and <code>uCoo</code>)
+connected to this model should be switched to <code>false</code> when the
+building has no corresponding demand (e.g., based on the requests yielded by
+the terminal unit controllers, in conjunction with a schedule).
+This will significantly improve the system performance as it is a
+necessary condition for the chiller to be operated at a lower lift, see
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Reset\">
+Buildings.DHC.ETS.Combined.Controls.Reset</a>.
+<br/>
+</p>
+<p align=\"center\">
+<img alt=\"System schematics\"
+src=\"modelica://Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.png\"/>
+</p>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-234,62},{-92,-64}},
+          lineColor={0,0,0},
+          fillColor={234,210,210},
+          fillPattern=FillPattern.Solid,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-222,-4},{-166,-60}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-216,-10},{-172,-54}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-222,56},{-166,0}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-216,50},{-172,6}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-160,56},{-104,0}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-154,50},{-110,6}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-162,-4},{-106,-60}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Ellipse(
+          extent={{-156,-10},{-112,-54}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward,
+          visible=have_borFie),
+        Rectangle(
+          extent={{24,-42},{52,-14}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-64,32},{-62,22}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1.5,5.5},{1.5,-5.5}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          origin={-7.5,22.5},
+          rotation=90),
+        Rectangle(
+          extent={{116,-46},{144,-18}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          visible=have_WSE),
+        Rectangle(
+          extent={{118,-44},{146,-16}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          visible=have_WSE),
+        Rectangle(
+          extent={{-68,78},{72,-82}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-42,50},{-38,10}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-54,68},{60,50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-40,0},{-50,10},{-30,10},{-40,0}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-40,0},{-50,-12},{-30,-12},{-40,0}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-42,-12},{-38,-52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{40,50},{44,-52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-54,-52},{60,-70}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{20,22},{64,-20}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{42,22},{24,-10},{60,-10},{42,22}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-42,50},{-38,10}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-54,68},{60,50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-40,0},{-50,10},{-30,10},{-40,0}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-40,0},{-50,-12},{-30,-12},{-40,0}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-42,-12},{-38,-52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{40,50},{44,-52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-54,-52},{60,-70}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{20,22},{64,-20}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{42,22},{24,-10},{60,-10},{42,22}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{100,76},{240,-84}},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          visible=have_WSE),  Rectangle(
+          extent={{100,74},{240,-84}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          visible=have_WSE),  Rectangle(
+          extent={{100,74},{240,-86}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          visible=have_WSE),
+        Rectangle(
+          extent={{108,56},{120,-62}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_WSE),
+        Rectangle(
+          extent={{120,56},{136,-62}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0},
+          visible=have_WSE),
+        Rectangle(
+          extent={{148,56},{164,-62}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0},
+          visible=have_WSE),
+        Rectangle(
+          extent={{136,56},{148,-62}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_WSE),
+        Rectangle(
+          extent={{176,56},{192,-62}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0},
+          visible=have_WSE),
+        Rectangle(
+          extent={{164,56},{176,-62}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_WSE),
+        Rectangle(
+          extent={{204,56},{220,-62}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0},
+          visible=have_WSE),
+        Rectangle(
+          extent={{192,56},{204,-62}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_WSE),
+        Rectangle(
+          extent={{220,56},{232,-62}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_WSE),
+        Rectangle(extent={{-256,140},{264,-142}}, lineColor={95,95,95})}));
+end ChillerBorefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/PartialSupervisory.mo b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo
similarity index 98%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/PartialSupervisory.mo
rename to Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo
index 12524b78e3b..f1c042b7d70 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/PartialSupervisory.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/PartialSupervisory.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses;
+within Buildings.DHC.ETS.Combined.Controls.BaseClasses;
 partial block PartialSupervisory
   "Partial model for supervisory controller"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.mo
new file mode 100644
index 00000000000..6b3a7b1599d
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.ETS.Combined.Controls;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls\">
+Buildings.DHC.ETS.Combined.Controls</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/Controls/BaseClasses/package.order
diff --git a/Buildings/DHC/ETS/Combined/Controls/Borefield.mo b/Buildings/DHC/ETS/Combined/Controls/Borefield.mo
new file mode 100644
index 00000000000..df5e7f482a6
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/Borefield.mo
@@ -0,0 +1,204 @@
+within Buildings.DHC.ETS.Combined.Controls;
+model Borefield
+  "Borefield controller"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.Units.SI.Temperature TBorWatEntMax(displayUnit="degC")
+    "Maximum value of borefield water entering temperature";
+  parameter Real spePumBorMin(
+    final unit="1")=0.1
+    "Borefield pump minimum speed";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
+    "Isolation valves return position (fractional)"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+    iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    "Control signal from supervisory"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
+    iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPum(
+    final unit="kg/s")
+    "Control signal for borefield pump"
+    annotation (Placement(transformation(extent={{100,40},{140,80}}),
+    iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValMix(
+    final unit="1")
+    "Control signal for borefield mixing valve"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+    iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TBorWatEnt(
+    final unit="K",
+    displayUnit="degC")
+    "Borefield water entering temperature"
+    annotation (Placement(transformation(extent={{-140,-120},{-100,-80}}),
+    iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conMix(
+    final yMin=0,
+    final yMax=1,
+    final reverseActing=true,
+    y_reset=0,
+    k=0.1,
+    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    Ti(
+      displayUnit="s")=120)
+    "Mixing valve controller"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTBorWatEnt(
+    y(final unit="K",
+      displayUnit="degC"),
+    final k=TBorWatEntMax)
+    "Maximum value of borefield water entering temperature"
+    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold opeVal(
+    final t=0.9,
+    final h=0.1)
+    "True if at least one isolation valve is open"
+    annotation (Placement(transformation(extent={{-50,-58},{-30,-38}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiMax multiMax1(
+    final nin=2)
+    "Maximum opening"
+    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaSup(
+    final t=0.05,
+    final h=0.025)
+    "Borefield enabled from supervisory"
+    annotation (Placement(transformation(extent={{-50,-30},{-30,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch runBor
+    "Enable borefield system pump"
+    annotation (Placement(transformation(extent={{70,50},{90,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant limVal(
+    final k=0.3)
+    "Control signal value for full opening of the valve"
+    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant speMin(
+    final k=spePumBorMin)
+    "Minimum pump speed"
+    annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
+  Buildings.Controls.OBC.CDL.Logical.And enaBor
+    "Borefield enable signal"
+    annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
+  Buildings.Controls.OBC.CDL.Reals.Line mapSpe
+    "Mapping function for pump speed"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
+    final k=1)
+    "One"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    final k=0)
+    "Zero"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Line mapVal
+    "Mapping function for valve opening"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Min min1
+    "Minimum"
+    annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
+equation
+  connect(multiMax1.y,opeVal.u)
+    annotation (Line(points={{-68,-40},{-60,-40},{-60,-48},{-52,-48}},color={0,0,127}));
+  connect(yValIso_actual,multiMax1.u)
+    annotation (Line(points={{-120,-40},{-92,-40}},color={0,0,127}));
+  connect(u,enaSup.u)
+    annotation (Line(points={{-120,60},{-80,60},{-80,-20},{-52,-20}},color={0,0,127}));
+  connect(enaSup.y,enaBor.u1)
+    annotation (Line(points={{-28,-20},{-20,-20},{-20,-30},{-12,-30}},color={255,0,255}));
+  connect(opeVal.y,enaBor.u2)
+    annotation (Line(points={{-28,-48},{-20,-48},{-20,-38},{-12,-38}},color={255,0,255}));
+  connect(enaBor.y,conMix.trigger)
+    annotation (Line(points={{12,-30},{20,-30},{20,-96},{-6,-96},{-6,-92}},color={255,0,255}));
+  connect(maxTBorWatEnt.y,conMix.u_s)
+    annotation (Line(points={{-28,-80},{-12,-80}},color={0,0,127}));
+  connect(runBor.y,yPum)
+    annotation (Line(points={{92,60},{120,60}},color={0,0,127}));
+  connect(TBorWatEnt,conMix.u_m)
+    annotation (Line(points={{-120,-100},{0,-100},{0,-92}},color={0,0,127}));
+  connect(enaBor.y,runBor.u2)
+    annotation (Line(points={{12,-30},{20,-30},{20,20},{64,20},{64,60},{68,60}},color={255,0,255}));
+  connect(mapSpe.y,runBor.u1)
+    annotation (Line(points={{42,80},{60,80},{60,68},{68,68}},color={0,0,127}));
+  connect(u,mapSpe.u)
+    annotation (Line(points={{-120,60},{0,60},{0,80},{18,80}},color={0,0,127}));
+  connect(speMin.y,mapSpe.f1)
+    annotation (Line(points={{-18,84},{18,84}},color={0,0,127}));
+  connect(min1.y,yValMix)
+    annotation (Line(points={{92,-60},{120,-60}},color={0,0,127}));
+  connect(conMix.y,min1.u2)
+    annotation (Line(points={{12,-80},{60,-80},{60,-66},{68,-66}},color={0,0,127}));
+  connect(mapVal.y,min1.u1)
+    annotation (Line(points={{42,40},{60,40},{60,-54},{68,-54}},color={0,0,127}));
+  connect(one.y,mapSpe.x2)
+    annotation (Line(points={{2,0},{12,0},{12,76},{18,76}},color={0,0,127}));
+  connect(one.y,mapSpe.f2)
+    annotation (Line(points={{2,0},{12,0},{12,72},{18,72}},color={0,0,127}));
+  connect(one.y,mapVal.f2)
+    annotation (Line(points={{2,0},{12,0},{12,32},{18,32}},color={0,0,127}));
+  connect(zer.y,mapVal.x1)
+    annotation (Line(points={{-38,40},{-10,40},{-10,48},{18,48}},color={0,0,127}));
+  connect(limVal.y,mapVal.x2)
+    annotation (Line(points={{-18,20},{6,20},{6,36},{18,36}},color={0,0,127}));
+  connect(u,mapVal.u)
+    annotation (Line(points={{-120,60},{0,60},{0,40},{18,40}},color={0,0,127}));
+  connect(limVal.y,mapSpe.x1)
+    annotation (Line(points={{-18,20},{6,20},{6,88},{18,88}},color={0,0,127}));
+  connect(zer.y,mapVal.f1)
+    annotation (Line(points={{-38,40},{-10,40},{-10,44},{18,44}},color={0,0,127}));
+  connect(zer.y,runBor.u3)
+    annotation (Line(points={{-38,40},{-10,40},{-10,52},{68,52}},color={0,0,127}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-120},{100,120}})),
+    defaultComponentName="con",
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This block implements the control logic for the borefield system.
+The main control signal <code>u</code> is yielded by the hot side
+or cold side controller, see for instance
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideHot\">
+Buildings.DHC.ETS.Combined.Controls.SideHot</a>.
+</p>
+<p>
+The system is enabled when
+</p>
+<ul>
+<li>
+the main control signal is greater than zero,
+</li>
+<li>
+the return position of at least one isolation valve is greater than 90%.
+</li>
+</ul>
+<p>
+When the system is enabled,
+</p>
+<ul>
+<li>
+the input signal is mapped to modulate in sequence the mixing valve
+(from full bypass to closed bypass for a control signal varying between
+0% and 30%) and the pump speed (from the minimum to the maximum value
+for a control signal varying between 30% and 100%),
+</li>
+<li>
+a PI loop tracks the maximum inlet temperature, the minimum between this
+loop output and the previously mapped signal being used to modulate the
+valve.
+</li>
+</ul>
+<p>
+Note that the first control signal for the valve is needed to stabilize
+the control of the system when the mass flow rate required to meet
+the heat or cold rejection demand is below the flow rate corresponding
+to the minimum pump speed.
+</p>
+</html>"));
+end Borefield;
diff --git a/Buildings/DHC/ETS/Combined/Controls/Chiller.mo b/Buildings/DHC/ETS/Combined/Controls/Chiller.mo
new file mode 100644
index 00000000000..17a247107b5
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/Chiller.mo
@@ -0,0 +1,140 @@
+within Buildings.DHC.ETS.Combined.Controls;
+model Chiller
+  "Chiller controller"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.Units.SI.Temperature TConWatEntMin(displayUnit="degC")
+    "Minimum value of condenser water entering temperature";
+  parameter Modelica.Units.SI.Temperature TEvaWatEntMax(displayUnit="degC")
+    "Maximum value of evaporator water entering temperature";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-200,20},{-160,60}}),
+    iconTransformation(extent={{-140,10},{-100,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHea
+    "Heating enable signal"
+    annotation (Placement(transformation(extent={{-200,60},{-160,100}}),
+    iconTransformation(extent={{-140,50},{-100,90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatEnt(
+    final unit="K",
+    displayUnit="degC")
+    "Condenser water entering temperature"
+    annotation (Placement(transformation(extent={{-200,-100},{-160,-60}}),
+    iconTransformation(extent={{-140,-90},{-100,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEvaWatEnt(
+    final unit="K",
+    displayUnit="degC")
+    "Evaporator water entering temperature"
+    annotation (Placement(transformation(extent={{-200,-40},{-160,0}}),
+    iconTransformation(extent={{-140,-50},{-100,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValCon
+    "Condenser mixing valve control signal"
+    annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
+    iconTransformation(extent={{100,-90},{140,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEva
+    "Evaporator mixing valve control signal"
+    annotation (Placement(transformation(extent={{160,-20},{200,20}}),
+    iconTransformation(extent={{100,-50},{140,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yChi
+    "Chiller enable signal"
+    annotation (Placement(transformation(extent={{160,40},{200,80}}),
+    iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Logical.Or heaOrCoo
+    "Heating or cooling enabled"
+    annotation (Placement(transformation(extent={{-120,50},{-100,70}})));
+  PIDWithEnable conValEva(
+    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    final yMax=1,
+    final yMin=0,
+    y_reset=0,
+    k=0.1,
+    Ti(
+      displayUnit="s")=60,
+    final reverseActing=true)
+    "Evaporator three-way valve control"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+  PIDWithEnable conValCon(
+    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    final yMax=1,
+    final yMin=0,
+    y_reset=0,
+    k=0.1,
+    Ti(
+      displayUnit="s")=60,
+    final reverseActing=false)
+    "Condenser three-way valve control"
+    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTEvaWatEnt(
+    y(final unit="K",
+      displayUnit="degC"),
+    final k=TEvaWatEntMax)
+    "Maximum value of evaporator water entering temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant minTConWatEnt(
+    y(final unit="K",
+      displayUnit="degC"),
+    final k=TConWatEntMin)
+    "Minimum value of condenser water entering temperature"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+equation
+  connect(TEvaWatEnt,conValEva.u_m)
+    annotation (Line(points={{-180,-20},{60,-20},{60,-12}},color={0,0,127}));
+  connect(TConWatEnt,conValCon.u_m)
+    annotation (Line(points={{-180,-80},{60,-80},{60,-72}},color={0,0,127}));
+  connect(heaOrCoo.y,yChi)
+    annotation (Line(points={{-98,60},{180,60}},color={255,0,255}));
+  connect(uHea,heaOrCoo.u1)
+    annotation (Line(points={{-180,80},{-140,80},{-140,60},{-122,60}},color={255,0,255}));
+  connect(uCoo,heaOrCoo.u2)
+    annotation (Line(points={{-180,40},{-140,40},{-140,52},{-122,52}},color={255,0,255}));
+  connect(maxTEvaWatEnt.y,conValEva.u_s)
+    annotation (Line(points={{12,0},{48,0}},color={0,0,127}));
+  connect(minTConWatEnt.y,conValCon.u_s)
+    annotation (Line(points={{12,-60},{48,-60}},color={0,0,127}));
+  connect(conValEva.y,yValEva)
+    annotation (Line(points={{72,0},{180,0}},color={0,0,127}));
+  connect(heaOrCoo.y,conValEva.uEna)
+    annotation (Line(points={{-98,60},{-40,60},{-40,-16},{56,-16},{56,-12}},color={255,0,255}));
+  connect(heaOrCoo.y,conValCon.uEna)
+    annotation (Line(points={{-98,60},{-40,60},{-40,-76},{56,-76},{56,-72}},color={255,0,255}));
+  connect(conValCon.y,yValCon)
+    annotation (Line(points={{72,-60},{180,-60}},color={0,0,127}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-160,-120},{160,120}})),
+    defaultComponentName="con",
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This is a controller for the chiller system, which includes the dedicated
+condenser and evaporator pumps.
+</p>
+<p>
+The system is enabled if any of the input control signals <code>uHea</code>
+or <code>uCoo</code> is <code>true</code>.
+When enabled,
+</p>
+<ul>
+<li>
+the condenser and evaporator pumps are operated at constant speed,
+</li>
+<li>
+the condenser (resp. evaporator) mixing valve is modulated with a PI
+loop controlling the minimum (resp. maximum) inlet temperature.
+</li>
+</ul>
+</html>"));
+end Chiller;
diff --git a/Buildings/DHC/ETS/Combined/Controls/HeatExchanger.mo b/Buildings/DHC/ETS/Combined/Controls/HeatExchanger.mo
new file mode 100644
index 00000000000..62f430841a3
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/HeatExchanger.mo
@@ -0,0 +1,209 @@
+within Buildings.DHC.ETS.Combined.Controls;
+model HeatExchanger
+  "District heat exchanger controller"
+  extends Modelica.Blocks.Icons.Block;
+  parameter DHC.ETS.Types.ConnectionConfiguration conCon
+    "District connection configuration" annotation (Evaluate=true);
+  parameter Real spePum1Min(
+    final unit="1",
+    min=0)=0.1
+    "Heat exchanger primary pump minimum speed (fractional)"
+    annotation (Dialog(enable=not have_val1));
+  parameter Real spePum2Min(
+    final unit="1",
+    min=0.01)=0.1
+    "Heat exchanger secondary pump minimum speed (fractional)";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso[2]
+    "Isolation valves return position (index 1 for condenser)"
+    annotation (Placement(transformation(extent={{-260,-60},{-220,-20}}),
+                                                                       iconTransformation(extent={{-140,-70},{-100,-30}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y1(final unit="1")
+    "District heat exchanger primary control signal" annotation (Placement(
+        transformation(extent={{220,20},{260,60}}), iconTransformation(extent={
+            {100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPum2(
+    final unit="1")
+    "District heat exchanger secondary pump control signal"
+    annotation (Placement(transformation(extent={{220,-20},{260,20}}),
+                                                                     iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yVal2(
+    final unit="1")
+    "District heat exchanger secondary valve control signal"
+    annotation (Placement(transformation(extent={{220,-80},{260,-40}}),iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.Max max1
+    "Maximum between control signal and minimum speed or opening"
+    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiOff1
+    "Output zero if not enabled"
+    annotation (Placement(transformation(extent={{160,-70},{180,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant min1(
+    final k=if have_val1 then 0 else spePum1Min)
+    "Minimum pump speed or actuator opening"
+    annotation (Placement(transformation(extent={{40,-90},{60,-70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    "Control signal for secondary side (from supervisory)"
+    annotation (Placement(transformation(extent={{-260,20},{-220,60}}),  iconTransformation(extent={{-140,30},{-100,70}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(
+    final t=0.01,
+    final h=0.005)
+    "Check for heat or cold rejection demand"
+    annotation (Placement(transformation(extent={{-170,30},{-150,50}})));
+  Buildings.Controls.OBC.CDL.Logical.And and2
+    "At least one valve is open and HX circuit is enabled"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold heaRej(
+    final t=0.9,
+    final h=0.1)
+    "Heat rejection if condenser isolation valve is open"
+    annotation (Placement(transformation(extent={{-170,-10},{-150,10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cooRej(
+    final t=0.9,
+    final h=0.1)
+    "Cold rejection if evaporator isolation valve is open"
+    annotation (Placement(transformation(extent={{-170,-50},{-150,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or1
+    "At least one valve is open "
+    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant speMin(
+    final k=spePum2Min)
+    "Minimum pump speed"
+    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiOff2
+    "Output zero if not enabled"
+    annotation (Placement(transformation(extent={{160,50},{180,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Line mapSpe
+    "Mapping function for pump speed"
+    annotation (Placement(transformation(extent={{90,50},{110,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
+    final k=1)
+    "One"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    final k=0)
+    "Zero"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant hal(
+    final k=0.3)
+    "Control signal value for full opening of the valve"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Line mapVal
+    "Mapping function for valve opening"
+    annotation (Placement(transformation(extent={{90,10},{110,30}})));
+protected
+  parameter Boolean have_val1=conCon ==
+    DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
+    "True in case of control valve on district side, false in case of a pump";
+equation
+  connect(swiOff1.y, y1) annotation (Line(points={{182,-60},{200,-60},{200,40},
+          {240,40}}, color={0,0,127}));
+  connect(max1.y,swiOff1.u1)
+    annotation (Line(points={{112,-60},{126,-60},{126,-52},{158,-52}},color={0,0,127}));
+  connect(u,greThr.u)
+    annotation (Line(points={{-240,40},{-172,40}},  color={0,0,127}));
+  connect(greThr.y,and2.u1)
+    annotation (Line(points={{-148,40},{-80,40},{-80,0},{-62,0}},    color={255,0,255}));
+  connect(and2.y,swiOff1.u2)
+    annotation (Line(points={{-38,0},{140,0},{140,-60},{158,-60}},  color={255,0,255}));
+  connect(cooRej.y,or1.u2)
+    annotation (Line(points={{-148,-40},{-120,-40},{-120,-28},{-112,-28}},
+                                                                      color={255,0,255}));
+  connect(heaRej.y,or1.u1)
+    annotation (Line(points={{-148,0},{-120,0},{-120,-20},{-112,-20}},color={255,0,255}));
+  connect(or1.y,and2.u2)
+    annotation (Line(points={{-88,-20},{-80,-20},{-80,-8},{-62,-8}},
+                                                                  color={255,0,255}));
+  connect(min1.y,max1.u2)
+    annotation (Line(points={{62,-80},{80,-80},{80,-66},{88,-66}},  color={0,0,127}));
+  connect(swiOff2.y,yPum2)
+    annotation (Line(points={{182,60},{190,60},{190,0},{240,0}},      color={0,0,127}));
+  connect(one.y,mapSpe.x2)
+    annotation (Line(points={{62,20},{70,20},{70,56},{88,56}},    color={0,0,127}));
+  connect(one.y,mapSpe.f2)
+    annotation (Line(points={{62,20},{70,20},{70,52},{88,52}},    color={0,0,127}));
+  connect(u,mapSpe.u)
+    annotation (Line(points={{-240,40},{-180,40},{-180,60},{88,60}},    color={0,0,127}));
+  connect(speMin.y,mapSpe.f1)
+    annotation (Line(points={{12,80},{70,80},{70,64},{88,64}},    color={0,0,127}));
+  connect(mapSpe.y,swiOff2.u1)
+    annotation (Line(points={{112,60},{120,60},{120,68},{158,68}},    color={0,0,127}));
+  connect(zer.y,swiOff2.u3)
+    annotation (Line(points={{12,-40},{120,-40},{120,52},{158,52}},color={0,0,127}));
+  connect(zer.y,swiOff1.u3)
+    annotation (Line(points={{12,-40},{120,-40},{120,-68},{158,-68}},
+                                                                   color={0,0,127}));
+  connect(hal.y,mapSpe.x1)
+    annotation (Line(points={{12,20},{20,20},{20,68},{88,68}},    color={0,0,127}));
+  connect(u,mapVal.u)
+    annotation (Line(points={{-240,40},{-180,40},{-180,60},{84,60},{84,20},{88,20}},      color={0,0,127}));
+  connect(zer.y,mapVal.x1)
+    annotation (Line(points={{12,-40},{80,-40},{80,28},{88,28}},color={0,0,127}));
+  connect(zer.y,mapVal.f1)
+    annotation (Line(points={{12,-40},{80,-40},{80,24},{88,24}},color={0,0,127}));
+  connect(one.y,mapVal.f2)
+    annotation (Line(points={{62,20},{70,20},{70,12},{88,12}},  color={0,0,127}));
+  connect(hal.y,mapVal.x2)
+    annotation (Line(points={{12,20},{20,20},{20,4},{84,4},{84,16},{88,16}},    color={0,0,127}));
+  connect(mapVal.y,yVal2)
+    annotation (Line(points={{112,20},{210,20},{210,-60},{240,-60}},  color={0,0,127}));
+  connect(and2.y,swiOff2.u2)
+    annotation (Line(points={{-38,0},{-20,0},{-20,40},{130,40},{130,60},{158,60}},      color={255,0,255}));
+  connect(u, max1.u1)
+    annotation (Line(points={{-240,40},{-200,40},{-200,-60},{80,-60},{80,-54},{
+          88,-54}},                                                                        color={0,0,127}));
+  connect(yValIso[1], heaRej.u)
+    annotation (Line(points={{-240,-50},{-238,-40},{-180,-40},{-180,0},{-172,0}}, color={0,0,127}));
+  connect(yValIso[2], cooRej.u) annotation (Line(points={{-240,-30},{-240,-40},{-172,-40}}, color={0,0,127}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-220,-120},{220,120}})),
+    defaultComponentName="con",
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 14, 2021, by Antoine Gautier:<br/>
+Updated the control logic.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2561\">issue #2561</a>.
+</li>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This block implements the control logic for the district heat exchanger,
+which realizes the interface between the building system and the district system.
+</p>
+<p>
+The input signal <code>u</code> is yielded by the supervisory controller, see
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>.
+The primary and secondary circuits are enabled to operate if this input signal
+is greater than zero and the return position of at least one isolation valve
+is greater than 90%.
+When enabled,
+</p>
+<ul>
+<li>
+the secondary circuit is controlled based on the input signal <code>u</code>,
+which is mapped to modulate in sequence the mixing valve
+(from full bypass to closed bypass for a control signal varying between
+0% and 30%) and the pump speed (from the minimum to the maximum value
+for a control signal varying between 30% and 100%),
+</li>
+<li>
+the primary pump speed (or valve opening) is directly modulated with
+the input signal <code>u</code>.
+</li>
+</ul>
+<p>
+Note that the valve on the secondary side is needed to stabilize the control
+of the system when the secondary mass flow rate required to meet the heat or
+cold rejection demand is below the flow rate corresponding to the minimum pump speed.
+</p>
+</html>"));
+end HeatExchanger;
diff --git a/Buildings/DHC/ETS/Combined/Controls/PIDWithEnable.mo b/Buildings/DHC/ETS/Combined/Controls/PIDWithEnable.mo
new file mode 100644
index 00000000000..092ac4c3d8e
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/PIDWithEnable.mo
@@ -0,0 +1,114 @@
+within Buildings.DHC.ETS.Combined.Controls;
+block PIDWithEnable
+  "PID controller with enable signal"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller";
+  parameter Real k(
+    min=0)=1
+    "Gain of controller";
+  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)
+     = 0.5 "Time constant of integrator block" annotation (Dialog(enable=
+          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Time Td(min=0) = 0.1
+    "Time constant of derivative block" annotation (Dialog(enable=
+          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real r(
+    min=100*Modelica.Constants.eps)=1
+    "Typical range of control error, used for scaling the control error";
+  parameter Real yMin=0
+    "Lower limit of output";
+  parameter Real yMax=1
+    "Upper limit of output";
+  parameter Boolean reverseActing=true
+    "Set to true for reverse acting, or false for direct acting control action";
+  parameter Real y_reset=yMin
+    "Value to which the controller output is reset if the boolean trigger has a rising edge";
+  parameter Real y_neutral=y_reset
+    "Value to which the controller output is reset when the controller is disabled";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u_s
+    "Connector of setpoint input signal"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u_m
+    "Connector of measurement input signal"
+    annotation (Placement(transformation(origin={0,-120},extent={{20,-20},{-20,20}},rotation=270),iconTransformation(extent={{20,-20},{-20,20}},rotation=270,origin={0,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
+    "Connector of actuator output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEna
+    "Enable signal"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,origin={-60,-120}),iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={-40,-120})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
+    final k=k,
+    final Ti=Ti,
+    final Td=Td,
+    final r=r,
+    final controllerType=controllerType,
+    final yMin=yMin,
+    final yMax=yMax,
+    final reverseActing=reverseActing,
+    final y_reset=y_reset)
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi1
+    annotation (Placement(transformation(extent={{72,-10},{92,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant valDis(
+    final k=y_neutral)
+    "Value when disabled"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+equation
+  connect(conPID.u_s,swi.y)
+    annotation (Line(points={{-12,0},{-18,0}},color={0,0,127}));
+  connect(uEna,swi.u2)
+    annotation (Line(points={{-60,-120},{-60,-21.5625},{-60,0},{-42,0}},color={255,0,255}));
+  connect(u_s,swi.u1)
+    annotation (Line(points={{-120,0},{-80,0},{-80,8},{-42,8}},color={0,0,127}));
+  connect(u_m,swi.u3)
+    annotation (Line(points={{0,-120},{0,-80},{-50,-80},{-50,-8},{-42,-8}},color={0,0,127}));
+  connect(uEna,conPID.trigger)
+    annotation (Line(points={{-60,-120},{-60,-20},{-6,-20},{-6,-12}},color={255,0,255}));
+  connect(u_m,conPID.u_m)
+    annotation (Line(points={{0,-120},{0,-12}},color={0,0,127}));
+  connect(conPID.y,swi1.u1)
+    annotation (Line(points={{12,0},{40,0},{40,8},{70,8}},color={0,0,127}));
+  connect(swi1.y,y)
+    annotation (Line(points={{94,0},{120,0}},color={0,0,127}));
+  connect(uEna,swi1.u2)
+    annotation (Line(points={{-60,-120},{-60,-20},{60,-20},{60,0},{70,0}},color={255,0,255}));
+  connect(valDis.y,swi1.u3)
+    annotation (Line(points={{52,-40},{64,-40},{64,-8},{70,-8}},color={0,0,127}));
+  annotation (
+    defaultComponentName="conPID",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+This is an update of
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.PIDWithReset\">
+Buildings.Controls.OBC.CDL.Reals.PIDWithReset</a>
+with an additional Boolean input representing an enable signal.
+</p>
+<ul>
+<li>
+When enabled, the controller output is identical to
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.PIDWithReset\">
+Buildings.Controls.OBC.CDL.Reals.PIDWithReset</a>
+(and the controller integral term is reset to <code>yMin</code> at
+enabling time).
+</li>
+<li>
+When disabled, the controller output is zero (and the set point
+is replaced by the measurement signal to avoid any
+time integration of the control error).
+</li>
+</ul>
+</html>"));
+end PIDWithEnable;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PredictLeavingTemperature.mo b/Buildings/DHC/ETS/Combined/Controls/PredictLeavingTemperature.mo
similarity index 87%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PredictLeavingTemperature.mo
rename to Buildings/DHC/ETS/Combined/Controls/PredictLeavingTemperature.mo
index d035fca2fbd..70e4802c708 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PredictLeavingTemperature.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/PredictLeavingTemperature.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model PredictLeavingTemperature
   "Block that predicts heat exchanger leaving water temperature"
   extends Modelica.Blocks.Icons.Block;
@@ -44,8 +44,8 @@ First implementation.
 <p>
 This block computes the predicted heat exchanger leaving water temperature
 as used in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer\">
+Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer</a>.
 </p>
 <p>
 The predicted heat exchanger approach is computed as
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PrimaryVariableFlow.mo b/Buildings/DHC/ETS/Combined/Controls/PrimaryVariableFlow.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PrimaryVariableFlow.mo
rename to Buildings/DHC/ETS/Combined/Controls/PrimaryVariableFlow.mo
index 913a88705d3..de689ec580b 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PrimaryVariableFlow.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/PrimaryVariableFlow.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 block PrimaryVariableFlow
   "Ideal control of condenser or evaporator variable flow rate"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Reset.mo b/Buildings/DHC/ETS/Combined/Controls/Reset.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Reset.mo
rename to Buildings/DHC/ETS/Combined/Controls/Reset.mo
index 086b397a0d3..9e6425f9d7b 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Reset.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/Reset.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model Reset
   "Supervisory supply temperature reset"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo b/Buildings/DHC/ETS/Combined/Controls/SideCold.mo
similarity index 97%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
rename to Buildings/DHC/ETS/Combined/Controls/SideCold.mo
index a87f673ab1d..cd00497262c 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideCold.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/SideCold.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model SideCold
   "Control block for cold side"
   extends Modelica.Blocks.Icons.Block;
@@ -202,8 +202,8 @@ First implementation.
       info="<html>
 <p>
 This block serves as the controller for the cold side of the ETS in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>.
 It computes the following control signals.
 </p>
 <ul>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo b/Buildings/DHC/ETS/Combined/Controls/SideHot.mo
similarity index 96%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
rename to Buildings/DHC/ETS/Combined/Controls/SideHot.mo
index 50b09c42f3d..027efc2971a 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SideHot.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/SideHot.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 block SideHot
   "Control block for hot side"
   extends Modelica.Blocks.Icons.Block;
@@ -206,8 +206,8 @@ First implementation.
       info="<html>
 <p>
 This block serves as the controller for the hot side of the ETS in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Supervisory\">
+Buildings.DHC.ETS.Combined.Controls.Supervisory</a>.
 It computes the following control signals.
 </p>
 <ul>
@@ -250,8 +250,8 @@ When enabled, the controller maintains the temperature at the top of the
 heating water tank at the heating water supply temperature set point.
 The controller yields a signal between <code>0</code> and <code>nSouAmb+1</code>
 which is connected to
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideCold\">
+Buildings.DHC.ETS.Combined.Controls.SideCold</a>
 where it is used to control in sequence the systems serving as ambient sources
 and ultimately to reset down the chilled water supply temperature.
 </li>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Supervisory.mo b/Buildings/DHC/ETS/Combined/Controls/Supervisory.mo
similarity index 86%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Supervisory.mo
rename to Buildings/DHC/ETS/Combined/Controls/Supervisory.mo
index dad98a8f770..db5e916bf61 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Supervisory.mo
+++ b/Buildings/DHC/ETS/Combined/Controls/Supervisory.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
+within Buildings.DHC.ETS.Combined.Controls;
 model Supervisory
   "Supervisory controller"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.BaseClasses.PartialSupervisory;
+  extends Buildings.DHC.ETS.Combined.Controls.BaseClasses.PartialSupervisory;
   parameter Buildings.Controls.OBC.CDL.Types.SimpleController
     controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI
     "Type of controller"
@@ -119,8 +119,8 @@ First implementation.
       info="<html>
 <p>
 This block implements the supervisory control functions of the ETS model
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>.
 </p>
 <ul>
 <li>
@@ -138,12 +138,12 @@ case the system performance is improved due to a lower chiller lift.
 </li>
 <li>
 The controller resets the heating water supply temperature based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Reset\">
+Buildings.DHC.ETS.Combined.Controls.Reset</a>.
 Note that this resetting logic is meant to operate the chiller at low lift.
 The chilled water supply temperature may be also reset down by
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideCold\">
+Buildings.DHC.ETS.Combined.Controls.SideCold</a>
 to maintain the heating water supply temperature set point.
 This second resetting logic is required for the heating function of the unit,
 but it has a negative impact on the lift.
@@ -151,11 +151,11 @@ but it has a negative impact on the lift.
 <li>
 Eventually the systems serving as ambient sources are controlled based on the
 maximum of the control signals <code>yAmb</code> yielded by
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot</a>
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideHot\">
+Buildings.DHC.ETS.Combined.Controls.SideHot</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideCold</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SideCold\">
+Buildings.DHC.ETS.Combined.Controls.SideCold</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/DHC/ETS/Combined/Controls/SwitchBox.mo b/Buildings/DHC/ETS/Combined/Controls/SwitchBox.mo
new file mode 100644
index 00000000000..98be9bb629e
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/SwitchBox.mo
@@ -0,0 +1,99 @@
+within Buildings.DHC.ETS.Combined.Controls;
+block SwitchBox "Controller for flow switch box"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate, used for scaling to avoid chattering"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real trueHoldDuration(
+    final quantity="Time",
+    final unit="s")
+    "true hold duration";
+  parameter Real falseHoldDuration(
+    final quantity="Time",
+    final unit="s") = trueHoldDuration
+    "false hold duration";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mPos_flow(final unit="kg/s")
+    "Service water mass flow rate in positive direction"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mRev_flow(final unit="kg/s")
+    "Service water mass flow rate in reverse direction"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(final unit="1")
+    "Control output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold posDom(final t, h=0.001*m_flow_nominal)
+    "Output true in case of dominating positive flow"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Modelica.Blocks.Logical.Switch swi "Switch to select the mode"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Modelica.Blocks.Sources.Constant posModOn(final k=1)
+    "Output signal in case of dominating positive flow"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
+    final trueHoldDuration=trueHoldDuration,
+    final falseHoldDuration=falseHoldDuration)
+    "True/false hold to remove the risk of chattering"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Modelica.Blocks.Sources.Constant revModOn(final k=0)
+    "Output signal in case of dominating reverse flow"
+    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
+protected
+  Buildings.Controls.OBC.CDL.Reals.Subtract sub
+    "Differences in mass flow rates"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+equation
+  connect(posModOn.y, swi.u1)
+    annotation (Line(points={{21,80},{40,80},{40,8},{58,8}}, color={0,0,127}));
+  connect(swi.y, y) annotation (Line(points={{81,0},{120,0}}, color={0,0,127}));
+  connect(posDom.y, truFalHol.u)
+    annotation (Line(points={{-18,0},{-2,0}},
+                                            color={255,0,255}));
+  connect(truFalHol.y, swi.u2)
+    annotation (Line(points={{22,0},{58,0}}, color={255,0,255}));
+  connect(revModOn.y, swi.u3) annotation (Line(points={{21,-80},{40,-80},{40,-8},
+          {58,-8}}, color={0,0,127}));
+  connect(posDom.u, sub.y)
+    annotation (Line(points={{-42,0},{-58,0}}, color={0,0,127}));
+  connect(mPos_flow, sub.u1) annotation (Line(points={{-120,80},{-90,80},{-90,6},
+          {-82,6}}, color={0,0,127}));
+  connect(mRev_flow, sub.u2) annotation (Line(points={{-120,-80},{-90,-80},{-90,
+          -6},{-82,-6}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+This block implements a control logic preventing flow reversal in the
+service line, for instance with the hydronic configuration of
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>.
+The block requires two input signals representing the mass flow rate contributing
+to a positive flow direction <code>mPos_flow</code> and the mass flow contributing
+to a reverse flow direction <code>mRev_flow</code>.
+The output signal <code>y</code> switches to maintain <code>mPos_flow ≥ mRev_flow</code>
+with a temporization avoiding short cycling.
+Due to the temporization, the mass flow rate may transiently change direction as
+illustrated in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox\">
+Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 28, 2024, by Michael Wetter:<br/>
+Added hysteresis to avoid chattering if signals are near zero and have numerical noise.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+Refactored with CDL connectors.
+</li>
+<li>
+January 23, 2020, by Michael Wetter:<br/>
+Added <a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.TrueFalseHold\">
+Buildings.Controls.OBC.CDL.Logical.TrueFalseHold</a>
+to avoid the risk of chattering.
+</li>
+<li>
+January 12, 2020, by Michael Wetter:<br/>
+Added documentation.
+</li>
+</ul>
+</html>"));
+end SwitchBox;
diff --git a/Buildings/DHC/ETS/Combined/Controls/WatersideEconomizer.mo b/Buildings/DHC/ETS/Combined/Controls/WatersideEconomizer.mo
new file mode 100644
index 00000000000..08f48eedd1c
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/WatersideEconomizer.mo
@@ -0,0 +1,312 @@
+within Buildings.DHC.ETS.Combined.Controls;
+model WatersideEconomizer
+  "Waterside economizer controller"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal
+    "Heat exchanger secondary mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_a1_nominal
+    "Nominal water inlet temperature on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_b2_nominal
+    "Nominal water outlet temperature on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real y1Min(final unit="1")=0.05
+    "Minimum pump flow rate or valve opening for temperature measurement (fractional)"
+    annotation (Dialog(group="Controls"));
+  parameter Modelica.Units.SI.TemperatureDifference dTEna=1
+    "Minimum delta-T above predicted heat exchanger leaving water temperature to enable WSE"
+    annotation (Dialog(group="Controls"));
+  parameter Modelica.Units.SI.TemperatureDifference dTDis=0.5
+    "Minimum delta-T across heat exchanger before disabling WSE"
+    annotation (Dialog(group="Controls"));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput T1WatEnt(
+    final unit="K",
+    displayUnit="degC") "Heat exchanger primary water entering temperature"
+    annotation (Placement(transformation(extent={{-220,-60},{-180,-20}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput m2_flow(
+    final unit="kg/s")
+    "Heat exchanger secondary mass flow rate" annotation (
+      Placement(transformation(extent={{-220,80},{-180,120}}),
+        iconTransformation(extent={{-140,30},{-100,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput T2WatLvg(
+    final unit="K", displayUnit="degC")
+    "Heat exchanger secondary water leaving temperature"
+    annotation (Placement(transformation(extent={{-220,-140},{-180,-100}}),
+                     iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput T2WatEnt(
+    final unit="K", displayUnit="degC")
+    "Heat exchanger secondary water entering temperature"
+    annotation (Placement(transformation(extent={{-220,-100},{-180,-60}}),
+                    iconTransformation(extent={{-140,-30},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y1(final unit="1")
+    "Primary control signal (pump or valve)" annotation (Placement(
+        transformation(extent={{180,80},{220,120}}), iconTransformation(extent=
+            {{100,30},{140,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yVal2(
+    final unit="1")
+    "Secondary valve control signal"
+    annotation (Placement(transformation(extent={{180,-60},{220,-20}}),
+      iconTransformation(extent={{100,-70},{140,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addDelTem(
+    final p=dTEna)
+    "Add threshold for enabling WSE"
+    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+  Modelica.StateGraph.InitialStepWithSignal iniSta(nIn=1, nOut=1)
+                                                   "Initial state "
+    annotation (Placement(transformation(extent={{-30,30},{-10,50}})));
+  Modelica.StateGraph.TransitionWithSignal ena "Transition to enabled state"
+    annotation (Placement(transformation(extent={{10,30},{30,50}})));
+  Modelica.StateGraph.StepWithSignal actSta(nIn=1, nOut=1)
+                                            "Active WSE"
+    annotation (Placement(transformation(extent={{50,30},{70,50}})));
+  Modelica.StateGraph.TransitionWithSignal dis "Transition to disabled state"
+    annotation (Placement(transformation(extent={{90,30},{110,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract delT1 "Add delta-T"
+    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold delTemDis(t=dTDis)
+    "Compare to threshold for disabling WSE"
+    annotation (Placement(transformation(extent={{-50,-110},{-30,-90}})));
+  PredictLeavingTemperature calTemLvg(
+    final dTApp_nominal=abs(T_a1_nominal - T_b2_nominal),
+    final m2_flow_nominal=m2_flow_nominal)
+    "Compute predicted leaving water temperature"
+    annotation (Placement(transformation(extent={{-140,-50},{-120,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Less delTemDis1
+    "Compare to threshold for enabling WSE"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=1,
+    final realFalse=0)
+    "Convert to real signal (close bypass valve when WSE enabled)"
+    annotation (Placement(transformation(extent={{140,-50},{160,-30}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot "Root of state graph"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant min1(
+    final k=y1Min)
+    "Minimum signal"
+    annotation (Placement(transformation(extent={{-10,130},{10,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Line lin
+    "Linear variation bounded by minimum and 1"
+    annotation (Placement(transformation(extent={{60,90},{80,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiOff1
+    "Output zero if cooling not enabled or isolation valve open (cold rejection)"
+    annotation (Placement(transformation(extent={{100,150},{120,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Zero"
+    annotation (Placement(transformation(extent={{60,130},{80,150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-220,140},{-180,180}}),
+    iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd(nin=4)
+    "Enable if cooling enabled and temperature criterion verified"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr or1(nin=3)
+    "Cooling disabled or temperature criterion verified"
+    annotation (Placement(transformation(extent={{0,-110},{20,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not2 "Cooling disabled"
+    annotation (Placement(transformation(extent={{-50,-80},{-30,-60}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer tim(t=1200)
+    "True when WSE active for more than t" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={50,-70})));
+  Buildings.Controls.OBC.CDL.Logical.Timer tim1(t=1200)
+    "True when WSE inactive for more than t"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90)));
+  Buildings.Controls.OBC.CDL.Logical.And and2
+    "Cooling disabled or temperature criterion verified"
+    annotation (Placement(transformation(extent={{70,-102},{90,-82}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold isValIsoEvaClo(
+    final t=1E-6, h=0.5E-6)
+    "True if valve closed"
+    annotation (Placement(transformation(extent={{-140,-170},{-120,-150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIsoEva_actual(final unit="1")
+    "Return position of evaporator to ambient loop isolation valve"
+    annotation (Placement(transformation(extent={{-220,-180},{-180,-140}}),
+    iconTransformation(extent={{-140,-90},{-100,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1 "True if valve open"
+    annotation (Placement(transformation(extent={{-50,-150},{-30,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1 "Cooling disabled or temperature criterion verified"
+    annotation (Placement(transformation(extent={{-90,150},{-70,170}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter nor2(
+    k=1/m2_flow_nominal) "Normalize"
+    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiOff2
+    "Switch between enabled and disabled mode"
+    annotation (Placement(transformation(extent={{140,90},{160,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(final k=1) "One"
+    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
+equation
+  connect(T2WatEnt, delT1.u1)
+    annotation (Line(points={{-200,-80},{-160,-80},{-160,-94},{-142,-94}}, color={0,0,127}));
+  connect(T2WatLvg, delT1.u2)
+    annotation (Line(points={{-200,-120},{-160,-120},{-160,-106},{-142,-106}},
+                                                                             color={0,0,127}));
+  connect(delT1.y, delTemDis.u) annotation (Line(points={{-118,-100},{-52,-100}},color={0,0,127}));
+  connect(T1WatEnt, calTemLvg.T1WatEnt)
+    annotation (Line(points={{-200,-40},{-160,-40},{-160,-45},{-142,-45}},
+                                                                     color={0,0,127}));
+  connect(calTemLvg.T2WatLvg, addDelTem.u) annotation (Line(points={{-118,-40},{-92,-40}}, color={0,0,127}));
+  connect(addDelTem.y, delTemDis1.u1) annotation (Line(points={{-68,-40},{-52,-40}}, color={0,0,127}));
+  connect(T2WatEnt, delTemDis1.u2)
+    annotation (Line(points={{-200,-80},{-60,-80},{-60,-48},{-52,-48}}, color={0,0,127}));
+  connect(iniSta.outPort[1], ena.inPort) annotation (Line(points={{-9.5,40},{16,40}},   color={0,0,0}));
+  connect(ena.outPort, actSta.inPort[1]) annotation (Line(points={{21.5,40},{49,40}}, color={0,0,0}));
+  connect(actSta.outPort[1], dis.inPort) annotation (Line(points={{70.5,40},{96,40}}, color={0,0,0}));
+  connect(dis.outPort, iniSta.inPort[1])
+    annotation (Line(points={{101.5,40},{120,40},{120,60},{-40,60},{-40,40},{-31,40}}, color={0,0,0}));
+  connect(booToRea.y, yVal2) annotation (Line(points={{162,-40},{200,-40}}, color={0,0,127}));
+  connect(zer.y, swiOff1.u3) annotation (Line(points={{82,140},{90,140},{90,152},
+          {98,152}},                                                                    color={0,0,127}));
+  connect(mulAnd.y, ena.condition) annotation (Line(points={{22,-40},{30,-40},{
+          30,18},{20,18},{20,28}},                                                      color={255,0,255}));
+  connect(uCoo, not2.u) annotation (Line(points={{-200,160},{-170,160},{-170,-70},{-52,-70}},   color={255,0,255}));
+  connect(actSta.active, booToRea.u) annotation (Line(points={{60,29},{60,-40},{138,-40}}, color={255,0,255}));
+  connect(delTemDis1.y, mulAnd.u[1])
+    annotation (Line(points={{-28,-40},{-2,-40},{-2,-42.625}},                   color={255,0,255}));
+  connect(iniSta.active, tim1.u) annotation (Line(points={{-20,29},{-20,20},{
+          2.22045e-15,20},{2.22045e-15,12}},                                  color={255,0,255}));
+  connect(tim1.passed, mulAnd.u[2])
+    annotation (Line(points={{-8,-12},{-8,-36},{-2,-36},{-2,-38.25}},  color={255,0,255}));
+  connect(uCoo, mulAnd.u[3]) annotation (Line(points={{-200,160},{-170,160},{-170,
+          0},{-20,0},{-20,-38},{-2,-38},{-2,-41.75}},
+                          color={255,0,255}));
+  connect(actSta.active, tim.u) annotation (Line(points={{60,29},{60,-40},{50,-40},{50,-58}},
+                                                                            color={255,0,255}));
+  connect(tim.passed, and2.u1) annotation (Line(points={{42,-82},{42,-92},{68,-92}},    color={255,0,255}));
+  connect(or1.y, and2.u2) annotation (Line(points={{22,-100},{68,-100}},                     color={255,0,255}));
+  connect(and2.y, dis.condition) annotation (Line(points={{92,-92},{100,-92},{100,28}}, color={255,0,255}));
+  connect(m2_flow, calTemLvg.m2_flow) annotation (Line(points={{-200,100},{-160,
+          100},{-160,-35},{-142,-35}}, color={0,0,127}));
+  connect(yValIsoEva_actual,isValIsoEvaClo.u)
+    annotation (Line(points={{-200,-160},{-142,-160}},color={0,0,127}));
+  connect(isValIsoEvaClo.y, mulAnd.u[4])
+    annotation (Line(points={{-118,-160},{-100,-160},{-100,-20},{-24,-20},{-24,-42},
+          {-2,-42},{-2,-45.25}}, color={255,0,255}));
+  connect(isValIsoEvaClo.y, not1.u)
+    annotation (Line(points={{-118,-160},{-60,-160},{-60,-140},{-52,-140}}, color={255,0,255}));
+  connect(delTemDis.y, or1.u[1])
+    annotation (Line(points={{-28,-100},{-2,-100},{-2,-102.333}},                 color={255,0,255}));
+  connect(not2.y, or1.u[2]) annotation (Line(points={{-28,-70},{-20,-70},{-20,
+          -96},{-2,-96},{-2,-100}}, color={255,0,255}));
+  connect(not1.y, or1.u[3])
+    annotation (Line(points={{-28,-140},{-20,-140},{-20,-104},{-2,-104},{-2,
+          -97.6667}},                                                             color={255,0,255}));
+  connect(uCoo, and1.u1) annotation (Line(points={{-200,160},{-92,160}}, color={255,0,255}));
+  connect(and1.y, swiOff1.u2) annotation (Line(points={{-68,160},{98,160}},                   color={255,0,255}));
+  connect(isValIsoEvaClo.y, and1.u2)
+    annotation (Line(points={{-118,-160},{-100,-160},{-100,152},{-92,152}}, color={255,0,255}));
+  connect(m2_flow, nor2.u)
+    annotation (Line(points={{-200,100},{-142,100}}, color={0,0,127}));
+  connect(min1.y, swiOff1.u1) annotation (Line(points={{12,140},{40,140},{40,
+          168},{98,168}}, color={0,0,127}));
+  connect(swiOff2.y, y1)
+    annotation (Line(points={{162,100},{200,100}}, color={0,0,127}));
+  connect(swiOff1.y, swiOff2.u1) annotation (Line(points={{122,160},{130,160},{
+          130,108},{138,108}}, color={0,0,127}));
+  connect(iniSta.active, swiOff2.u2) annotation (Line(points={{-20,29},{-20,20},
+          {130,20},{130,100},{138,100}}, color={255,0,255}));
+  connect(lin.y, swiOff2.u3) annotation (Line(points={{82,100},{120,100},{120,
+          92},{138,92}}, color={0,0,127}));
+  connect(nor2.y, lin.u)
+    annotation (Line(points={{-118,100},{58,100}}, color={0,0,127}));
+  connect(one.y, lin.x2) annotation (Line(points={{12,80},{40,80},{40,96},{58,
+          96}}, color={0,0,127}));
+  connect(one.y, lin.f2) annotation (Line(points={{12,80},{50,80},{50,92},{58,
+          92}}, color={0,0,127}));
+  connect(zer.y, lin.x1) annotation (Line(points={{82,140},{90,140},{90,120},{
+          50,120},{50,108},{58,108}}, color={0,0,127}));
+  connect(min1.y, lin.f1) annotation (Line(points={{12,140},{40,140},{40,104},{
+          58,104}}, color={0,0,127}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-180,-180},{180,180}})),
+    defaultComponentName="conWSE",
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 14, 2021, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This block implements the control logic for the waterside economizer.
+</p>
+<p>
+The system is enabled if
+</p>
+<ul>
+<li>
+it has been disabled for more than 20 minutes, and
+</li>
+<li>
+the \"cooling enabled\" input signal is <code>true</code>, and
+</li>
+<li>
+the evaporator isolation valve is closed (i.e., the system is not in cold
+rejection mode), and
+</li>
+<li>
+the predicted leaving water temperature is lower than the entering water
+temperature minus <code>dTEna</code>.
+</li>
+</ul>
+<p>
+The system is disabled if
+</p>
+<ul>
+<li>
+it has been enabled for more than 20 minutes, and
+</li>
+<li>
+the \"cooling enabled\" input signal is <code>false</code>, or
+</li>
+<li>
+the evaporator isolation valve is open, or
+</li>
+<li>
+the leaving water temperature is higher than the entering water
+temperature minus <code>dTDis</code>.
+</li>
+</ul>
+<p>
+When the system is enabled
+</p>
+<ul>
+<li>
+the primary side is controlled so that the primary flow rate
+varies linearly with the secondary flow rate,
+</li>
+<li>
+the bypass valve on the secondary side is fully closed.
+</li>
+</ul>
+<p>
+When the system is disabled
+</p>
+<ul>
+<li>
+if the \"cooling enabled\" input signal is <code>true</code> and
+the evaporator isolation valve is closed,
+the primary pump (resp. valve) is operated at its minimum speed
+(resp. opening), otherwise it is switched off (resp. fully closed):
+this is needed to yield a representative measurement of the
+service water entering temperature,
+</li>
+<li>
+the bypass valve on the secondary side is fully open.
+</li>
+</ul>
+</html>"));
+end WatersideEconomizer;
diff --git a/Buildings/DHC/ETS/Combined/Controls/package.mo b/Buildings/DHC/ETS/Combined/Controls/package.mo
new file mode 100644
index 00000000000..475537ca087
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Controls/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.Combined;
+package Controls "Package of control blocks for fifth generation DHC ETS"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains control blocks for energy transfer stations in
+fifth generation district heating and cooling systems.
+</p>
+</html>"));
+end Controls;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.order b/Buildings/DHC/ETS/Combined/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.order
rename to Buildings/DHC/ETS/Combined/Controls/package.order
diff --git a/Buildings/DHC/ETS/Combined/Examples/ChillerBorefield.mo b/Buildings/DHC/ETS/Combined/Examples/ChillerBorefield.mo
new file mode 100644
index 00000000000..269a84272e3
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Examples/ChillerBorefield.mo
@@ -0,0 +1,49 @@
+within Buildings.DHC.ETS.Combined.Examples;
+model ChillerBorefield
+  "Example of the ETS model with heat recovery chiller and borefield"
+  extends ChillerOnly(
+    ets(
+      have_borFie=true,
+      datBorFie=datBorFie));
+  parameter Integer nBorHol=64
+    "Number of boreholes (must be a square number)";
+  parameter Modelica.Units.SI.Distance dxy=6
+    "Distance in x-axis (and y-axis) between borehole axes";
+  final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
+    Buildings.DHC.ETS.BaseClasses.computeCoordinates(nBorHol, dxy)
+    "Coordinates of boreholes";
+  parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
+    conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
+      cooBor=cooBor,
+      dp_nominal=0))
+    "Borefield design data"
+    annotation (Placement(transformation(extent={{60,180},{80,200}})));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos" "Simulate and plot"),
+    experiment(
+      StartTime=6.5E6,
+      StopTime=7E6,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
+in a system configuration including a geothermal borefield.
+See
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Examples.ChillerOnly\">
+Buildings.DHC.ETS.Combined.Examples.ChillerOnly</a>
+for the description of the main modeling assumptions.
+</p>
+</html>"));
+end ChillerBorefield;
diff --git a/Buildings/DHC/ETS/Combined/Examples/ChillerOnly.mo b/Buildings/DHC/ETS/Combined/Examples/ChillerOnly.mo
new file mode 100644
index 00000000000..e0f4821484f
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Examples/ChillerOnly.mo
@@ -0,0 +1,97 @@
+within Buildings.DHC.ETS.Combined.Examples;
+model ChillerOnly
+  "Example of the ETS model with heat recovery chiller"
+  extends Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield(
+    TDisWatSup(
+      table=[
+        0,11;
+        1,12;
+        2,13;
+        3,14;
+        4,15;
+        5,16;
+        6,17;
+        7,18;
+        8,20;
+        9,18;
+        10,16;
+        11,13;
+        12,11],
+      timeScale=2592000),
+    loa(
+      tableOnFile=true,
+      fileName=Modelica.Utilities.Files.loadResource(
+        filNam),
+      timeScale=1),
+    QCoo_flow_nominal=Buildings.DHC.Loads.BaseClasses.getPeakLoad(
+      string="#Peak space cooling load",
+      filNam=Modelica.Utilities.Files.loadResource(filNam)),
+    QHea_flow_nominal=Buildings.DHC.Loads.BaseClasses.getPeakLoad(
+      string="#Peak space heating load",
+      filNam=Modelica.Utilities.Files.loadResource(filNam)));
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"
+    "File name with thermal loads as time series";
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaNorHea(
+    final k=1/ets.QHeaWat_flow_nominal)
+    "Normalize by nominal" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-278,60})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaNorCoo(
+    final k=1/ets.QChiWat_flow_nominal) "Normalize by nominal" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={298,60})));
+equation
+  connect(loa.y[2],loaNorHea.u)
+    annotation (Line(points={{-309,160},{-300,160},{-300,60},{-290,60}},color={0,0,127}));
+  connect(loa.y[1],loaNorCoo.u)
+    annotation (Line(points={{-309,160},{320,160},{320,60},{310,60}},color={0,0,127}));
+  connect(loaNorHea.y,heaLoaNor.u)
+    annotation (Line(points={{-266,60},{-252,60}},color={0,0,127}));
+  connect(loaNorCoo.y,loaCooNor.u)
+    annotation (Line(points={{286,60},{272,60}},color={0,0,127}));
+  connect(TDisWatSup.y[1],disWat.T_in)
+    annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos" "Simulate and plot"),
+    experiment(
+      StartTime=6.5E6,
+      StopTime=7E6,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
+in a system configuration with no geothermal borefield.
+</p>
+<ul>
+<li>
+A load profile based on a whole building energy simulation is used to
+represent realistic operating conditions.
+</li>
+<li>
+The district water supply temperature varies on a monthly basis, with
+a minimum in January and a maximum in August.
+</li>
+<li>
+The other modeling assumptions are described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield\">
+Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
+</li>
+</ul>
+</html>"));
+end ChillerOnly;
diff --git a/Buildings/DHC/ETS/Combined/Examples/package.mo b/Buildings/DHC/ETS/Combined/Examples/package.mo
new file mode 100644
index 00000000000..e34a35a5a13
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Examples/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.ETS.Combined;
+package Examples "Example models integrating multiple components"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.ETS.Combined\">
+Buildings.DHC.ETS.Combined</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.order b/Buildings/DHC/ETS/Combined/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.order
rename to Buildings/DHC/ETS/Combined/Examples/package.order
diff --git a/Buildings/DHC/ETS/Combined/HeatPumpHeatExchanger.mo b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchanger.mo
new file mode 100644
index 00000000000..775816b8516
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchanger.mo
@@ -0,0 +1,343 @@
+within Buildings.DHC.ETS.Combined;
+model HeatPumpHeatExchanger
+  "Model of a substation with heat pump for heating, heat pump for domestic hot water, and compressor-less cooling"
+  extends
+    Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
+      volMix_a(nPorts=4),
+      volMix_b(nPorts=4));
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPump proHotWat(
+    redeclare final package Medium1 = MediumBui,
+    redeclare final package Medium2 = MediumSer,
+    final COP_nominal=COPHotWat_nominal,
+    final TCon_nominal=THotWatSup_nominal,
+    final TEva_nominal=TDisWatMin - dT_nominal,
+    dT_nominal=dT_nominal,
+    final Q1_flow_nominal=QHotWat_flow_nominal,
+    final allowFlowReversal1=allowFlowReversalBui,
+    final allowFlowReversal2=allowFlowReversalSer,
+    final dp1_nominal=dp_nominal,
+    final dp2_nominal=dp_nominal) if have_hotWat
+    "Subsystem for hot water production"
+    annotation (Placement(transformation(extent={{-10,24},{10,44}})));
+  Buildings.Fluid.Sources.Boundary_pT      souColWat(
+    redeclare final package Medium = MediumBui,
+    use_T_in=true,
+    nPorts=1) if have_hotWat
+    "Source for cold water"
+    annotation (Placement(transformation(extent={{-48,-50},{-28,-30}})));
+  Buildings.Fluid.Sources.Boundary_pT sinSHW(redeclare final package Medium = MediumBui,
+      nPorts=1)
+               if have_hotWat
+    "Sink for service hot water" annotation (Placement(
+      transformation(
+      extent={{10,-10},{-10,10}},
+      rotation=180,
+      origin={-60,60})));
+  Buildings.Controls.OBC.CDL.Reals.Divide div1 if have_hotWat
+    "Compute mass flow rate from load"
+    annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai(final k=
+        cpBui_default) if have_hotWat "Times Cp"
+    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract delT if have_hotWat
+    "Compute DeltaT needed on condenser side"
+    annotation (Placement(transformation(extent={{-150,-20},{-130,0}})));
+equation
+  connect(souColWat.ports[1], proHotWat.port_a1) annotation (Line(points={{-28,-40},
+          {-20,-40},{-20,40},{-10,40}}, color={0,127,255}));
+  connect(sinSHW.ports[1], proHotWat.port_b1) annotation (Line(points={{-50,60},
+          {14,60},{14,40},{10,40}},    color={0,127,255}));
+  connect(THotWatSupSet, proHotWat.TSupSet) annotation (Line(points={{-320,-40},
+          {-160,-40},{-160,36},{-86,36},{-86,37},{-12,37}},
+                                          color={0,0,127}));
+  connect(enaSHW.y, proHotWat.uEna) annotation (Line(points={{-118,80},{-114,80},
+          {-114,43},{-12,43}}, color={255,0,255}));
+  connect(proHotWat.PPum, PPumHeaTot.u[2]) annotation (Line(points={{12,34},{176,
+          34},{176,420},{188,420},{188,420.5}},
+                                              color={0,0,127}));
+  connect(proHotWat.mEva_flow, masFloHeaTot.u[2]) annotation (Line(points={{12,31},
+          {218,31},{218,-139.5},{268,-139.5}},
+                                           color={0,0,127}));
+  connect(proHotWat.mEva_flow, masFloHea.u2) annotation (Line(points={{12,31},{18,
+          31},{18,-240},{-6,-240},{-6,-252}}, color={0,0,127}));
+  connect(proHotWat.PHea, PHeaTot.u[2]) annotation (Line(points={{12,37},{240,
+          37},{240,80},{256,80},{256,80.5},{268,80.5}},
+                              color={0,0,127}));
+  connect(TColWat, souColWat.T_in) annotation (Line(points={{-320,-80},{-60,-80},
+          {-60,-36},{-50,-36}}, color={0,0,127}));
+  connect(proHotWat.port_a2, volMix_a.ports[4]) annotation (Line(points={{10,28},
+          {14,28},{14,20},{-260,20},{-260,-360}}, color={0,127,255}));
+  connect(proHotWat.port_b2, volMix_b.ports[4])
+    annotation (Line(points={{-10,28},{-14,28},{-14,0},{260,0},{260,-360}},
+                                                           color={0,127,255}));
+  connect(gai.y,div1. u2) annotation (Line(points={{-98,-10},{-80,-10},{-80,-30},
+          {-120,-30},{-120,-56},{-102,-56}},          color={0,0,127}));
+  connect(QReqHotWat_flow,div1. u1) annotation (Line(points={{-320,-120},{-290,-120},{
+          -290,-44},{-102,-44}},
+                            color={0,0,127}));
+  connect(delT.y,gai. u)
+    annotation (Line(points={{-128,-10},{-122,-10}}, color={0,0,127}));
+  connect(TColWat,delT. u2) annotation (Line(points={{-320,-80},{-156,-80},{
+          -156,-16},{-152,-16}},
+                            color={0,0,127}));
+  connect(THotWatSupSet,delT. u1) annotation (Line(points={{-320,-40},{-160,-40},
+          {-160,-4},{-152,-4}},
+                            color={0,0,127}));
+  connect(div1.y, proHotWat.m1_flow) annotation (Line(points={{-78,-50},{-70,
+          -50},{-70,34},{-12,34}}, color={0,0,127}));
+  annotation (
+  Documentation(info="<html>
+<p>
+This model uses the base energy transfer station defined in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
+</p>
+<h4>Domestic Hot Water</h4>
+<p>
+Domestic hot water is produced using a dedicated water-to-water heat pump
+on-demand with no storage.
+</p>
+<p>
+Heating is enabled based on the input signal <code>uSHW</code>
+which is held for <i>15</i> minutes, meaning that,
+when enabled, the mode remains active for at least <i>15</i> minutes and,
+when disabled, the mode cannot be enabled again for at least <i>15</i> minutes.
+The enable signal should be computed externally based
+on a schedule (to lock out the system during off-hours), ideally in conjunction
+with the number of requests or any other signal representative of the load.
+</p>
+<p>
+When enabled,
+</p>
+<ul>
+<li>
+The heat pump and the evaporator and condenser hydronics are controlled
+based on the principles described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
+</li>
+<li>
+The condensor water mass flow rate is computed based on the domestic hot water
+heating load (input <code>QReqHotWat_flow</code>) where the temperature of water is boosted from the
+domestic cold water temperature (input <code>TColWat</code>) to the desired domestic hot water
+distribution temperature (parameter <code>THotWatSup_nominal</code>), according
+to the following equation:
+<p align=\"center\" style=\"font-style:italic;\">
+<code>QReqHotWat_flow</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
+</p>
+</li>
+</ul>
+</html>",
+  revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+September 13, 2023, by David Blum:<br/>
+Extended from partial base class.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
+issue 3063</a>.
+</li>
+<li>
+May 17, 2023, by David Blum:<br/>
+Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
+Corrected calculation of heat pump evaporator mass flow control.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
+issue 3379</a>.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+Refactored with subsystem models and partial ETS base class.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1769\">
+issue 1769</a>.
+</li>
+<li>
+December 12, 2017, by Michael Wetter:<br/>
+Removed call to <code>Modelica.Utilities.Files.loadResource</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1097\">issue 1097</a>.
+</li>
+</ul>
+</html>"), Icon(graphics={
+        Rectangle(
+          extent={{52,-38},{80,-10}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-166,82},{-26,-78}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-140,54},{-136,14}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-152,72},{-38,54}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-138,4},{-148,14},{-128,14},{-138,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-138,4},{-148,-8},{-128,-8},{-138,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-140,-8},{-136,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-58,54},{-54,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-152,-48},{-38,-66}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-78,26},{-34,-16}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-56,26},{-74,-6},{-38,-6},{-56,26}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-140,54},{-136,14}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-152,72},{-38,54}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-138,4},{-148,14},{-128,14},{-138,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-138,4},{-148,-8},{-128,-8},{-138,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-140,-8},{-136,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-58,54},{-54,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-152,-48},{-38,-66}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-78,26},{-34,-16}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-56,26},{-74,-6},{-38,-6},{-56,26}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{34,82},{174,-78}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+                              Rectangle(
+          extent={{34,80},{174,-78}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+                              Rectangle(
+          extent={{34,80},{174,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{42,62},{54,-56}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{54,62},{70,-56}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{82,62},{98,-56}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{70,62},{82,-56}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{110,62},{126,-56}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{98,62},{110,-56}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{138,62},{154,-56}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{126,62},{138,-56}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{154,62},{166,-56}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(extent={{-256,140},{264,-142}}, lineColor={95,95,95})}));
+end HeatPumpHeatExchanger;
diff --git a/Buildings/DHC/ETS/Combined/HeatPumpHeatExchangerDHWTank.mo b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchangerDHWTank.mo
new file mode 100644
index 00000000000..4cddedd3774
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/HeatPumpHeatExchangerDHWTank.mo
@@ -0,0 +1,413 @@
+within Buildings.DHC.ETS.Combined;
+model HeatPumpHeatExchangerDHWTank
+  "Model of a substation with heat pump for heating, heat pump with storage tank for domestic hot water, and compressor-less cooling"
+  extends
+    Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
+    volMix_b(nPorts=4),
+    volMix_a(nPorts=4));
+  Buildings.Fluid.Sources.Boundary_pT souDCW(
+    redeclare final package Medium = MediumBui,
+    use_T_in=true,
+    nPorts=1)  if have_hotWat "Source for domestic cold water"
+                                 annotation (Placement(
+      transformation(
+      extent={{10,-10},{-10,10}},
+      rotation=180,
+      origin={-52,-56})));
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank proHotWat(
+    redeclare final package Medium1 = MediumBui,
+    redeclare final package Medium2 = MediumSer,
+    final COP_nominal=COPHotWat_nominal,
+    TCon_nominal=THotWatSup_nominal,
+    TEva_nominal=TDisWatMin - dT_nominal,
+    QHotWat_flow_nominal=QHotWat_flow_nominal,
+    dT_nominal=dT_nominal,
+    final allowFlowReversal1=allowFlowReversalBui,
+    final allowFlowReversal2=allowFlowReversalSer,
+    dp1_nominal=6000,
+    dp2_nominal=6000,
+    datWatHea=datWatHea) if have_hotWat
+    "Subsystem for hot water production"
+    annotation (Placement(transformation(extent={{30,24},{50,44}})));
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+    datWatHea "Performance data"
+    annotation (Placement(transformation(extent={{36,48},{48,60}})));
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(
+    redeclare package Medium = MediumBui,
+    mMix_flow_nominal=QHotWat_flow_nominal/cpBui_default/(THotWatSup_nominal - TColWat_nominal))
+     if have_hotWat
+     "Thermostatic mixing valve"
+    annotation (Placement(transformation(extent={{-20,50},{-40,72}})));
+  Buildings.DHC.ETS.BaseClasses.Junction dcwSpl(
+      redeclare final package Medium = MediumBui, final m_flow_nominal=
+        datWatHea.mDom_flow_nominal*{1,-1,-1})
+                                             "Splitter for domestic cold water"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-10,0})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai(
+    k=1/QHotWat_flow_nominal) if have_hotWat
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+equation
+
+  connect(proHotWat.port_b2, volMix_b.ports[4])
+    annotation (Line(points={{30,28},{28,28},{28,0},{260,0},{260,-360}},
+                                                           color={0,127,255}));
+  connect(proHotWat.PHea, PHeaTot.u[2]) annotation (Line(points={{52,37},{66,37},
+          {66,38},{268,38},{268,80.5}},
+        color={0,0,127}));
+  connect(proHotWat.PPum, PPumHeaTot.u[2]) annotation (Line(points={{52,34},{
+          176,34},{176,420.5},{188,420.5}},
+                                    color={0,0,127}));
+  connect(proHotWat.mEva_flow, masFloHeaTot.u[2]) annotation (Line(points={{52,31},
+          {68,31},{68,30},{256,30},{256,-139.5},{268,-139.5}},
+                                                           color={0,0,127}));
+  connect(proHotWat.mEva_flow, masFloHea.u2) annotation (Line(points={{52,31},{
+          58,31},{58,-242},{-6,-242},{-6,-252}},
+                                              color={0,0,127}));
+  connect(proHotWat.port_a2, volMix_a.ports[4]) annotation (Line(points={{50,28},
+          {54,28},{54,20},{-260,20},{-260,-360}},             color={0,127,255}));
+  connect(souDCW.ports[1], dcwSpl.port_1) annotation (Line(points={{-42,-56},{
+          -10,-56},{-10,-10}},color={0,127,255}));
+  connect(dcwSpl.port_3, proHotWat.port_a1)
+    annotation (Line(points={{0,-6.66134e-16},{10,-6.66134e-16},{10,40},{30,40}},
+                                                           color={0,127,255}));
+  connect(dcwSpl.port_2, theMixVal.port_col) annotation (Line(points={{-10,10},
+          {-10,52.2},{-20,52.2}}, color={0,127,255}));
+  connect(proHotWat.port_b1, theMixVal.port_hot) annotation (Line(points={{50,40},
+          {60,40},{60,80},{0,80},{0,56.6},{-20,56.6}},
+                                           color={0,127,255}));
+  connect(souDCW.T_in, TColWat) annotation (Line(points={{-64,-60},{-156,-60},{
+          -156,-80},{-320,-80}}, color={0,0,127}));
+  connect(THotWatSupSet, theMixVal.TMixSet) annotation (Line(points={{-320,-40},
+          {-32,-40},{-32,32},{-6,32},{-6,64},{-14,64},{-14,63.2},{-19,63.2}},
+                                                            color={0,0,127}));
+  connect(QReqHotWat_flow, gai.u) annotation (Line(points={{-320,-120},{-288,-120},
+          {-288,60},{-82,60}},
+                         color={0,0,127}));
+  connect(gai.y, theMixVal.yMixSet) annotation (Line(points={{-58,60},{-48,60},
+          {-48,78},{-6,78},{-6,70},{-12,70},{-12,69.8},{-19,69.8}},
+                                                  color={0,0,127}));
+  connect(enaSHW.y, proHotWat.uEna) annotation (Line(points={{-118,80},{-108,80},
+          {-108,43},{28,43}}, color={255,0,255}));
+  annotation (
+  Documentation(info="<html>
+<p>
+This model uses the base energy transfer station defined in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
+</p>
+<h4>Domestic Hot Water</h4>
+<p>
+Domestic hot water is produced using a dedicated water-to-water heat pump
+with storage tank.
+</p>
+<p>
+Heating is enabled based on the input signal <code>uSHW</code>
+which is held for <i>15</i> minutes, meaning that,
+when enabled, the mode remains active for at least <i>15</i> minutes and,
+when disabled, the mode cannot be enabled again for at least <i>15</i> minutes.
+The enable signal should be computed externally based
+on a schedule (to lock out the system during off-hours), ideally in conjunction
+with the number of requests or any other signal representative of the load.
+</p>
+<p>
+When enabled,
+</p>
+<ul>
+<li>
+The heat pump and the evaporator and condenser hydronics are controlled
+based on the principles described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
+</li>
+<li>
+The mass flow rate of water leaving the domestic hot water heat exchanger is computed based on the domestic hot water
+heating load (input <code>QReqHotWat_flow</code>) combined with the operation of a thermostatic
+mixing valve used to mix down the temperature of hot water leaving the domestic hot water heat exchanger
+to the temperature distributed to fixtures (parameter <code>THotWatSup_nominal</code>)
+using domestic cold water at the cold water temperature (input <code>TColWat</code>).
+The desired water flow rate leaving the thermostatic mixing valve
+is determined according to the following equation:
+<p align=\"center\" style=\"font-style:italic;\">
+<code>QReqHotWat_flow</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
+</p>
+</li>
+</ul>
+</html>",
+  revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+September 13, 2023, by David Blum:<br/>
+First implementation, extended from partial base class.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
+issue 3063</a>.
+</li>
+</ul>
+</html>"), Icon(graphics={
+        Rectangle(
+          extent={{-70,36},{-68,26}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1.5,5.5},{1.5,-5.5}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          origin={-13.5,26.5},
+          rotation=90),
+        Rectangle(
+          extent={{110,-42},{138,-14}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{112,-40},{140,-12}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-74,82},{66,-78}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-48,54},{-44,14}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,72},{54,54}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-46,4},{-56,14},{-36,14},{-46,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-46,4},{-56,-8},{-36,-8},{-46,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-48,-8},{-44,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{34,54},{38,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,-48},{54,-66}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{14,26},{58,-16}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{36,26},{18,-6},{54,-6},{36,26}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-48,54},{-44,14}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,72},{54,54}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-46,4},{-56,14},{-36,14},{-46,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-46,4},{-56,-8},{-36,-8},{-46,4}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-48,-8},{-44,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{34,54},{38,-48}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,-48},{54,-66}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{14,26},{58,-16}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{36,26},{18,-6},{54,-6},{36,26}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{94,80},{234,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+                              Rectangle(
+          extent={{94,78},{234,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+                              Rectangle(
+          extent={{94,78},{234,-82}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{102,60},{114,-58}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{114,60},{130,-58}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{142,60},{158,-58}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{130,60},{142,-58}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{170,60},{186,-58}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{158,60},{170,-58}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{198,60},{214,-58}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{186,60},{198,-58}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{214,60},{226,-58}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-190,60},{-110,20}},
+          lineColor={255,0,0},
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-190,-20},{-110,-60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-190,20},{-110,-20}},
+          lineColor={255,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.CrossDiag),
+        Rectangle(
+          extent={{-160,10},{-140,-10}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={255,255,255}),
+        Rectangle(
+          extent={{-100,68},{-110,-66}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,255,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-190,66},{-200,-68}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,255,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-198,68},{-100,60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,255,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-198,-60},{-100,-68}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,255,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-190,20},{-110,-20}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-190,68},{-200,-66}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,255,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-100,68},{-110,-66}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,255,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(extent={{-256,140},{264,-142}}, lineColor={95,95,95})}));
+end HeatPumpHeatExchangerDHWTank;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/PartialHeatPump.mo b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
new file mode 100644
index 00000000000..640992f133c
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
@@ -0,0 +1,336 @@
+within Buildings.DHC.ETS.Combined.Subsystems.BaseClasses;
+model PartialHeatPump
+  "Partial base class for subsystems containing a heat pump"
+  replaceable package Medium1=Modelica.Media.Interfaces.PartialMedium
+    "Medium model on condenser side"
+    annotation (choices(choice(redeclare package Medium=Buildings.Media.Water "Water"),
+    choice(redeclare package Medium =
+      Buildings.Media.Antifreeze.PropyleneGlycolWater (property_T=293.15,X_a=0.40)
+    "Propylene glycol water, 40% mass fraction")));
+  replaceable package Medium2=Modelica.Media.Interfaces.PartialMedium
+    "Medium model on evaporator side"
+    annotation (choices(choice(redeclare package Medium=Buildings.Media.Water "Water"),
+    choice(redeclare package Medium =
+      Buildings.Media.Antifreeze.PropyleneGlycolWater (property_T=293.15,X_a=0.40)
+    "Propylene glycol water, 40% mass fraction")));
+  parameter Real COP_nominal(final unit="1")
+    "Heat pump COP"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TCon_nominal
+    "Condenser outlet temperature used to compute COP_nominal"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TEva_nominal
+    "Evaporator outlet temperature used to compute COP_nominal"
+    annotation (Dialog(group="Nominal condition"));
+
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0) = 5
+    "Water temperature drop/increase accross load and source-side HX (always positive)"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal = heaPum.m1_flow_nominal
+    "Condenser mass flow rate";
+  final parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal = heaPum.m2_flow_nominal
+    "Evaporator mass flow rate";
+
+  parameter Boolean allowFlowReversal1=false
+    "Set to true to allow flow reversal on condenser side"
+    annotation (Dialog(tab="Assumptions"), Evaluate=true);
+  parameter Boolean allowFlowReversal2=false
+    "Set to true to allow flow reversal on evaporator side"
+    annotation (Dialog(tab="Assumptions"), Evaluate=true);
+  parameter Modelica.Units.SI.Pressure dp1_nominal(displayUnit="Pa")
+    "Pressure difference over condenser"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Pressure dp2_nominal(displayUnit="Pa")
+    "Pressure difference over evaporator"
+    annotation (Dialog(group="Nominal condition"));
+  // IO CONNECTORS
+  Modelica.Fluid.Interfaces.FluidPort_a port_a2(
+    redeclare final package Medium = Medium2,
+    m_flow(min=if allowFlowReversal2 then -Modelica.Constants.inf else 0),
+    h_outflow(start=Medium2.h_default, nominal=Medium2.h_default))
+    "Fluid port for entering evaporator water" annotation (Placement(
+        transformation(extent={{190,-70},{210,-50}}), iconTransformation(extent=
+           {{90,-70},{110,-50}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b2(
+    redeclare final package Medium = Medium2,
+    m_flow(max=if allowFlowReversal2 then +Modelica.Constants.inf else 0),
+    h_outflow(start=Medium2.h_default, nominal=Medium2.h_default))
+    "Fluid port for leaving evaporator water" annotation (Placement(
+        transformation(extent={{-210,-70},{-190,-50}}),
+                                                    iconTransformation(extent={{-110,
+            -70},{-90,-50}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_a1(
+    redeclare final package Medium = Medium1,
+    m_flow(min=if allowFlowReversal1 then -Modelica.Constants.inf else 0),
+    h_outflow(start=Medium1.h_default, nominal=Medium1.h_default))
+    "Fluid port for cold domestic water"      annotation (Placement(
+        transformation(extent={{-210,50},{-190,70}}),   iconTransformation(
+          extent={{-110,50},{-90,70}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b1(
+    redeclare final package Medium = Medium1,
+    m_flow(max=if allowFlowReversal1 then +Modelica.Constants.inf else 0),
+    h_outflow(start=Medium1.h_default, nominal=Medium1.h_default))
+    "Fluid port for heated domestic hot water"
+                                             annotation (Placement(
+        transformation(extent={{190,50},{210,70}}),   iconTransformation(extent={{90,50},
+            {110,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PHea(
+    final unit="W") "Heat pump power"
+    annotation (Placement(transformation(extent={{200,20},{240,60}}),
+    iconTransformation(extent={{100,10},{140,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
+    final unit="W") "Pump power"
+    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
+    iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mEva_flow(final unit="kg/s")
+    "Evaporator water mass flow rate"
+    annotation (Placement(transformation(
+      extent={{200,-60},{240,-20}}), iconTransformation(extent={{100,-50},{
+        140,-10}})));
+  // COMPONENTS
+  Buildings.Fluid.HeatPumps.Carnot_TCon heaPum(
+    redeclare package Medium1 = Medium1,
+    redeclare package Medium2 = Medium2,
+    allowFlowReversal1=false,
+    allowFlowReversal2=false,
+    dTEva_nominal=-dT_nominal,
+    dTCon_nominal=dT_nominal,
+    use_eta_Carnot_nominal=false,
+    COP_nominal=COP_nominal,
+    TCon_nominal=TCon_nominal,
+    TEva_nominal=TEva_nominal,
+    final dp1_nominal=dp1_nominal,
+    final dp2_nominal=dp2_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Domestic hot water heat pump"
+    annotation (Placement(transformation(extent={{-80,-82},{-60,-62}})));
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow
+                                     pumCon(
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    redeclare package Medium = Medium2,
+    m_flow_nominal=mCon_flow_nominal,
+    riseTime=10,
+    dp_nominal=dp1_nominal)
+                 "Pump for heat pump condenser"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+        rotation=270,
+        origin={-26,0})));
+
+  Buildings.Fluid.Movers.Preconfigured.SpeedControlled_y pumEva(
+    redeclare final package Medium = Medium2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    final allowFlowReversal=allowFlowReversal2,
+    addPowerToMedium=false,
+    use_inputFilter=false,
+    m_flow_nominal=mEva_flow_nominal,
+    dp_nominal=dp2_nominal + 6000)
+    "Heat pump evaporator water pump"
+    annotation (Placement(transformation(extent={{8,-88},{-12,-68}})));
+
+  Modelica.Blocks.Math.Add addPPum "Electricity use for pumps"
+    annotation (Placement(transformation(extent={{140,70},{160,90}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal floEva
+                           "Evaporator mass flow rate"
+    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valHeaPumEva(
+    redeclare package Medium = Medium2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    m_flow_nominal=mEva_flow_nominal,
+    dpValve_nominal=6000) "Valve at heat pump evaporator"
+    annotation (Placement(transformation(extent={{80,-70},{60,-50}})));
+  Fluid.Sensors.TemperatureTwoPort senTEvaRet(
+    redeclare final package Medium = Medium2,
+    final allowFlowReversal=allowFlowReversal1,
+    final m_flow_nominal=mEva_flow_nominal,
+    tau=0)
+    "Evaporator return temperature sensor" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-110,-80})));
+  Fluid.Sensors.TemperatureTwoPort senTDisSup(
+    redeclare final package Medium = Medium2,
+    final allowFlowReversal=allowFlowReversal1,
+    final m_flow_nominal=mEva_flow_nominal,
+    tau=0)
+    "District supply temperature sensor" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={110,-60})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dT_supRet
+    "Temperature difference over heat pump connection"
+    annotation (Placement(transformation(extent={{80,-20},{100,0}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTSet(k=dT_nominal)
+    "Set point for temperature difference over heat pump"
+    annotation (Placement(transformation(extent={{80,10},{100,30}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPI(
+    k=0.1,
+    Ti=120,                                                  xi_start=0.2,
+    reverseActing=false)
+    "Controller to ensure dT_nominal over heat pump connection"
+    annotation (Placement(transformation(extent={{120,10},{140,30}})));
+  Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium2)
+    "Mass flow rate drawn from ETS"
+    annotation (Placement(transformation(extent={{160,-70},{140,-50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEna(start=false)
+    "Enable signal"
+    annotation (
+      Placement(transformation(extent={{-240,100},{-200,140}}),
+        iconTransformation(extent={{-140,70},{-100,110}})));
+  Buildings.DHC.ETS.BaseClasses.Junction
+    junction(redeclare package Medium = Medium2, m_flow_nominal={
+        mEva_flow_nominal,-mEva_flow_nominal,mEva_flow_nominal})
+    annotation (Placement(transformation(extent={{-130,-90},{-150,-70}})));
+equation
+  connect(heaPum.port_b1,pumCon. port_a) annotation (Line(points={{-60,-66},{
+          -26,-66},{-26,-10}},
+                           color={0,127,255}));
+  connect(heaPum.P, PHea) annotation (Line(points={{-59,-72},{-20,-72},{-20,-20},
+          {22,-20},{22,40},{220,40}},
+                color={0,0,127}));
+  connect(senTDisSup.T, dT_supRet.u1) annotation (Line(points={{110,-49},{110,
+          -32},{34,-32},{34,-4},{78,-4}},
+                                       color={0,0,127}));
+  connect(valHeaPumEva.port_1, senTDisSup.port_b)
+    annotation (Line(points={{80,-60},{100,-60}}, color={0,127,255}));
+  connect(conPI.u_s, dTSet.y)
+    annotation (Line(points={{118,20},{102,20}},
+                                               color={0,0,127}));
+  connect(dT_supRet.y, conPI.u_m)
+    annotation (Line(points={{102,-10},{130,-10},{130,8}},   color={0,0,127}));
+  connect(conPI.y, valHeaPumEva.y) annotation (Line(points={{142,20},{148,20},{
+          148,-26},{70,-26},{70,-48}},
+                                   color={0,0,127}));
+  connect(senTDisSup.port_a, senMasFlo.port_b)
+    annotation (Line(points={{120,-60},{140,-60}}, color={0,127,255}));
+  connect(senMasFlo.port_a, port_a2)
+    annotation (Line(points={{160,-60},{200,-60}}, color={0,127,255}));
+  connect(senMasFlo.m_flow, mEva_flow)
+    annotation (Line(points={{150,-49},{150,-40},{220,-40}}, color={0,0,127}));
+  connect(pumCon.P, addPPum.u1) annotation (Line(points={{-17,11},{-16,11},{-16,
+          86},{138,86}}, color={0,0,127}));
+  connect(addPPum.u2, pumEva.P) annotation (Line(points={{138,74},{-180,74},{
+          -180,-44},{-13,-44},{-13,-69}},
+                          color={0,0,127}));
+  connect(heaPum.port_b2, senTEvaRet.port_a) annotation (Line(points={{-80,-78},
+          {-90,-78},{-90,-80},{-100,-80}}, color={0,127,255}));
+  connect(senTEvaRet.T, dT_supRet.u2) annotation (Line(points={{-110,-69},{-110,
+          -16},{78,-16}}, color={0,0,127}));
+  connect(heaPum.port_a2, pumEva.port_b)
+    annotation (Line(points={{-60,-78},{-12,-78}}, color={0,127,255}));
+  connect(junction.port_2, port_b2) annotation (Line(points={{-150,-80},{-180,
+          -80},{-180,-60},{-200,-60}}, color={0,127,255}));
+  connect(junction.port_1, senTEvaRet.port_b)
+    annotation (Line(points={{-130,-80},{-120,-80}}, color={0,127,255}));
+  connect(valHeaPumEva.port_2, pumEva.port_a) annotation (Line(points={{60,-60},
+          {40,-60},{40,-78},{8,-78}}, color={0,127,255}));
+  connect(junction.port_3, valHeaPumEva.port_3) annotation (Line(points={{-140,
+          -90},{-140,-100},{70,-100},{70,-70}}, color={0,127,255}));
+  connect(floEva.y, pumEva.y)
+    annotation (Line(points={{-58,120},{-2,120},{-2,-66}}, color={0,0,127}));
+  annotation (
+  defaultComponentName="heaPum",
+  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-32,40},{40,-38}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-18,-20},{28,-28}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-12,2},{-16,-6},{-8,-6},{-12,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-12,2},{-16,10},{-8,10},{-12,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{18,20},{22,-20}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{12,8},{30,-10}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{20,8},{12,-4},{30,-4},{20,8}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-14,-6},{-10,-20}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-14,20},{-10,10}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-20,28},{26,20}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}), Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-200,-140},{200,140}})),
+    Documentation(info="<html>
+<p>
+This model represents a water-to-water heat pump, as described in
+<a href=\"modelica://Buildings.Fluid.HeatPumps.Carnot_TCon\">
+Buildings.Fluid.HeatPumps.Carnot_TCon</a>, the condenser pump, and the
+evaporator side hydronics and control.
+
+<h4>Evaporator Controls</h4>
+<p>
+The system is enabled when the input control signal <code>uEna</code> switches to
+<code>true</code>.
+When enabled,
+</p>
+<ul>
+<li>
+the evaporator pump is commanded on and supplies the nominal mass flow rate,
+</li>
+<li>
+a three-way diverging valve is used to bypass flow through the evaporator and
+is controlled by a PI controller to maintain <code>dT_nominal</code> across
+the district supply and return flows.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+February 15, 2024, by Ettore Zanetti:<br/>
+Made heat pump model dynamic and added junction.
+</li>
+<li>
+November 15, 2023, by David Blum:<br/>
+Changed to partial base class with evaporator hydronics and control.
+</li>
+<li>
+November 16, 2022, by Michael Wetter:<br/>
+Set <code>pumEva.dp_nominal</code> to correct value.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialHeatPump;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.mo
new file mode 100644
index 00000000000..63aa6d2605f
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+package BaseClasses "Contains base classes for Subsystems"
+  extends Modelica.Icons.BasesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains base class models for the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems\">
+Buildings.DHC.ETS.Combined.Subsystems</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/Subsystems/BaseClasses/package.order
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Borefield.mo b/Buildings/DHC/ETS/Combined/Subsystems/Borefield.mo
new file mode 100644
index 00000000000..a48efdfe462
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Borefield.mo
@@ -0,0 +1,235 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model Borefield
+  "Base subsystem with geothermal borefield"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    final m_flow_nominal=datBorFie.conDat.mBorFie_flow_nominal);
+  replaceable model BorefieldType=Fluid.Geothermal.Borefields.OneUTube
+    constrainedby Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield(
+      redeclare package Medium=Medium,
+      allowFlowReversal=allowFlowReversal,
+      borFieDat=datBorFie,
+      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Wall heat transfer"
+    annotation (choicesAllMatching=true);
+  replaceable parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
+    conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example())
+    constrainedby Fluid.Geothermal.Borefields.Data.Borefield.Template(
+      conDat(
+        dp_nominal=0))
+    "Borefield parameters"
+    annotation (choicesAllMatching=true,Placement(transformation(extent={{0,60},{20,80}})));
+  parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")
+    "Pressure losses for the entire borefield (control valve excluded)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Pressure dpValBorFie_nominal=dp_nominal/2
+    "Nominal pressure drop of control valve";
+  parameter Modelica.Units.SI.Temperature TBorWatEntMax(displayUnit="degC")
+    "Maximum value of borefield water entering temperature";
+  parameter Real spePumBorMin=0.1
+    "Borefield pump minimum speed";
+  // IO VARIABLES
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
+    "Isolation valves return position (fractional)"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+    iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    "Control signal from supervisory"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+    iconTransformation(extent={{-140,60},{-100,100}})));
+  // COMPONENTS
+  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear val(
+    redeclare final package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    from_dp=false,
+    use_inputFilter=false,
+    final m_flow_nominal=m_flow_nominal,
+    final dpValve_nominal=dpValBorFie_nominal,
+    final dpFixed_nominal=fill(
+      dp_nominal,
+      2))
+    "Mixing valve controlling entering temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-80,0})));
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dpValBorFie_nominal+dp_nominal)
+    "Pump with prescribed mass flow rate"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-40,0})));
+  Fluid.Sensors.TemperatureTwoPort senTEnt(
+    final tau=
+      if allowFlowReversal then
+        1
+      else
+        0,
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal)
+    "Entering temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,0})));
+  BorefieldType borFie
+    "Geothermal borefield"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={22,0})));
+  Buildings.DHC.ETS.BaseClasses.Junction spl(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=m_flow_nominal .* {1,-1,-1})
+    "Flow splitter"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={80,0})));
+  Fluid.Sensors.TemperatureTwoPort senTLvg(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal)
+    "Leaving temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={50,0})));
+  Buildings.DHC.ETS.Combined.Controls.Borefield con(
+    final TBorWatEntMax=TBorWatEntMax,
+    final spePumBorMin=spePumBorMin)
+    "Controller"
+    annotation (Placement(transformation(extent={{-80,64},{-60,84}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
+    final unit="W")
+    "Pump power"
+    annotation (Placement(transformation(extent={{100,20},{140,60}}),iconTransformation(extent={{100,20},{140,60}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
+        m_flow_nominal) "Scale to nominal mass flow rate" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-40,50})));
+initial equation
+  assert(
+    abs(
+      datBorFie.conDat.dp_nominal) < Modelica.Constants.eps,
+    "In "+getInstanceName()+": dp_nominal in the parameter record should be set to zero as the nominal
+    pressure drop is lumped in the valve model. Use the exposed parameter
+    dp_nominal instead.",
+    level=AssertionLevel.warning);
+equation
+  connect(pum.port_b,senTEnt.port_a)
+    annotation (Line(points={{-30,0},{-20,0}},color={0,127,255}));
+  connect(senTEnt.port_b,borFie.port_a)
+    annotation (Line(points={{0,0},{12,0}},color={0,127,255}));
+  connect(port_b,spl.port_2)
+    annotation (Line(points={{100,0},{90,0}},color={0,127,255}));
+  connect(spl.port_1,senTLvg.port_b)
+    annotation (Line(points={{70,0},{60,0}},color={0,127,255}));
+  connect(borFie.port_b,senTLvg.port_a)
+    annotation (Line(points={{32,0},{40,0}},color={0,127,255}));
+  connect(spl.port_3,val.port_3)
+    annotation (Line(points={{80,-10},{80,-40},{-80,-40},{-80,-10}},color={0,127,255}));
+  connect(u,con.u)
+    annotation (Line(points={{-120,80},{-82,80}},color={0,0,127}));
+  connect(yValIso_actual,con.yValIso_actual)
+    annotation (Line(points={{-120,40},{-90,40},{-90,74},{-82,74}},color={0,0,127}));
+  connect(con.yValMix,val.y)
+    annotation (Line(points={{-58,68},{-56,68},{-56,60},{-80,60},{-80,12}},color={0,0,127}));
+  connect(port_a,val.port_1)
+    annotation (Line(points={{-100,0},{-90,0}},color={0,127,255}));
+  connect(val.port_2,pum.port_a)
+    annotation (Line(points={{-70,0},{-50,0}},color={0,127,255}));
+  connect(senTEnt.T,con.TBorWatEnt)
+    annotation (Line(points={{-10,11},{-10,30},{-86,30},{-86,68},{-82,68}},color={0,0,127}));
+  connect(pum.P,PPum)
+    annotation (Line(points={{-29,9},{-20,9},{-20,40},{120,40}},color={0,0,127}));
+  connect(con.yPum,gai1.u)
+    annotation (Line(points={{-58,80},{-40,80},{-40,62}},color={0,0,127}));
+  connect(gai1.y,pum.m_flow_in)
+    annotation (Line(points={{-40,38},{-40,12}},color={0,0,127}));
+  annotation (
+    defaultComponentName="borFie",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-68,62},{74,-64}},
+          lineColor={0,0,0},
+          fillColor={234,210,210},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-56,-4},{0,-60}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{-50,-10},{-6,-54}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{-56,56},{0,0}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{-50,50},{-6,6}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{6,56},{62,0}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{12,50},{56,6}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{4,-4},{60,-60}},
+          lineColor={0,0,0},
+          fillColor={223,188,190},
+          fillPattern=FillPattern.Forward),
+        Ellipse(
+          extent={{10,-10},{54,-54}},
+          lineColor={0,0,0},
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Forward),
+        Rectangle(
+          extent={{-1,16},{1,-16}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-84,-1},
+          rotation=90),
+        Rectangle(
+          extent={{-1,13},{1,-13}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={87,-1},
+          rotation=90)}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Documentation(
+      info="<html>
+<p>
+This is a model for a borefield system with a variable speed pump
+and a mixing valve modulated to maintain a maximum inlet temperature.
+</p>
+<p>
+The system is controlled based on the logic described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Borefield\">
+Buildings.DHC.ETS.Combined.Controls.Borefield</a>.
+The pump flow rate is considered proportional to the pump speed
+under the assumption of a constant flow resistance in the borefield loop.
+This assumption is justified by the connection of the loop to the buffer tanks,
+and by the additional assumption that the bypass branch of the mixing valve
+is balanced with the direct branch.
+</p>
+<p>
+(The parameter <code>from_dp</code> of the valve model is set to false to
+simplify the system of algebraic equations, which, in this specific case,
+alleviates non-convergence issues.)
+</p>
+</html>"));
+end Borefield;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Chiller.mo b/Buildings/DHC/ETS/Combined/Subsystems/Chiller.mo
new file mode 100644
index 00000000000..08db3f17039
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Chiller.mo
@@ -0,0 +1,450 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model Chiller
+  "Base subsystem with heat recovery chiller"
+  replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
+    "Medium model"
+    annotation (choices(choice(redeclare package Medium=Buildings.Media.Water "Water"),
+    choice(redeclare package Medium =
+            Buildings.Media.Antifreeze.PropyleneGlycolWater (property_T=293.15,X_a=0.40)
+    "Propylene glycol water, 40% mass fraction")));
+  parameter Boolean allowFlowReversal=false
+    "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
+    annotation (Dialog(tab="Assumptions"),Evaluate=true);
+  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.Generic dat
+    "Chiller performance data"
+    annotation (choicesAllMatching=true,Placement(transformation(extent={{60,160},{80,180}})));
+  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
+    "Nominal pressure drop accross condenser"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
+    "Nominal pressure drop accross evaporator"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Pressure dpValCon_nominal=dpCon_nominal/2
+    "Nominal pressure drop accross control valve on condenser side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Pressure dpValEva_nominal=dpEva_nominal/2
+    "Nominal pressure drop accross control valve on evaporator side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TConWatEntMin(displayUnit="degC")=
+    dat.TConEntMin "Minimum value of condenser water entering temperature"
+    annotation (Dialog(group="Controls"));
+  parameter Modelica.Units.SI.Temperature TEvaWatEntMax(displayUnit="degC")=
+    dat.TEvaLvgMax - dat.QEva_flow_nominal/cp_default/dat.mEva_flow_nominal
+    "Maximum value of evaporator water entering temperature"
+    annotation (Dialog(group="Controls"));
+  // IO CONNECTORS
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHea
+    "Heating enable signal"
+    annotation (Placement(transformation(extent={{-240,168},{-200,208}}),
+    iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-240,148},{-200,188}}),
+    iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Chilled water supply temperature set point (may be reset down)"
+    annotation (Placement(transformation(extent={{-240,120},{-200,160}}),
+    iconTransformation(extent={{-140,-40},{-100,0}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aChiWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      min=
+        if allowFlowReversal then
+          -Modelica.Constants.inf
+        else
+          0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "Fluid port for chilled water return"
+    annotation (Placement(transformation(extent={{190,-70},{210,-50}}),
+    iconTransformation(extent={{90,-70},{110,-50}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bChiWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      max=
+        if allowFlowReversal then
+          +Modelica.Constants.inf
+        else
+          0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "Fluid port for chilled water supply"
+    annotation (Placement(transformation(extent={{-210,-70},{-190,-50}}),
+    iconTransformation(extent={{-110,-70},{-90,-50}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aHeaWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      min=
+        if allowFlowReversal then
+          -Modelica.Constants.inf
+        else
+          0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "Fluid port for heating water return"
+    annotation (Placement(transformation(extent={{-210,50},{-190,70}}),
+    iconTransformation(extent={{-110,50},{-90,70}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bHeaWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      max=
+        if allowFlowReversal then
+          +Modelica.Constants.inf
+        else
+          0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "Fluid port for heating water supply"
+    annotation (Placement(transformation(extent={{190,50},{210,70}}),
+    iconTransformation(extent={{90,50},{110,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PChi(
+    final unit="W")
+    "Chiller power"
+    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
+    iconTransformation(extent={{100,0},{140,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
+    final unit="W")
+    "Pump power"
+    annotation (Placement(transformation(extent={{200,-160},{240,-120}}),
+    iconTransformation(extent={{100,-40},{140,0}})));
+  // COMPONENTS
+  Fluid.Chillers.ElectricEIR chi(
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=Medium,
+    final allowFlowReversal1=allowFlowReversal,
+    final allowFlowReversal2=allowFlowReversal,
+    final dp1_nominal=0,
+    final dp2_nominal=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    final per=dat)
+    "Water cooled chiller (ports indexed 1 are on condenser side)"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumCon(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=dat.mCon_flow_nominal,
+    final dp_nominal=dpCon_nominal+dpValCon_nominal)
+    "Condenser pump"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumEva(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=dat.mEva_flow_nominal,
+    final dp_nominal=dpEva_nominal+dpValEva_nominal)
+    "Evaporator pump"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,-60})));
+  Buildings.DHC.ETS.Combined.Controls.Chiller con(
+    final TConWatEntMin=TConWatEntMin,
+    final TEvaWatEntMax=TEvaWatEntMax)
+    "Controller"
+    annotation (Placement(transformation(extent={{-70,130},{-50,150}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTConLvg(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=dat.mCon_flow_nominal)
+    "Condenser water leaving temperature"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=270,origin={20,20})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTConEnt(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=dat.mCon_flow_nominal)
+    "Condenser water entering temperature"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=-90,origin={-20,40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTEvaEnt(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=dat.mEva_flow_nominal)
+    "Evaporator water entering temperature"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=270,origin={20,-40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTEvaLvg(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=dat.mEva_flow_nominal)
+    "Evaporator water leaving temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=90,origin={-20,-20})));
+  Buildings.DHC.ETS.BaseClasses.Junction splEva(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=dat.mEva_flow_nominal .* {1,-1,-1})
+    "Flow splitter for the evaporator water circuit"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-140,-60})));
+  Buildings.DHC.ETS.BaseClasses.Junction splConMix(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=dat.mCon_flow_nominal .* {1,-1,-1})
+    "Flow splitter"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=0,origin={120,60})));
+  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valEva(
+    redeclare final package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    from_dp=false,
+    use_inputFilter=false,
+    final m_flow_nominal=dat.mEva_flow_nominal,
+    final dpValve_nominal=dpValEva_nominal,
+    final dpFixed_nominal=fill(
+      dpEva_nominal,
+      2))
+    "Control valve for maximum evaporator water entering temperature"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=180,origin={120,-60})));
+  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valCon(
+    redeclare final package Medium=Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    from_dp=false,
+    use_inputFilter=false,
+    final m_flow_nominal=dat.mCon_flow_nominal,
+    final dpValve_nominal=dpValCon_nominal,
+    final dpFixed_nominal=fill(
+      dpCon_nominal,
+      2))
+    "Control valve for minimum condenser water entering temperature"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=0,origin={-140,60})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
+    "Constant speed primary pumps control signal"
+    annotation (Placement(transformation(extent={{-60,170},{-80,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Add add2
+    annotation (Placement(transformation(extent={{160,-150},{180,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=dat.mCon_flow_nominal)
+    "Scale to nominal mass flow rate" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-100,114})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=dat.mEva_flow_nominal)
+    "Scale to nominal mass flow rate" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-100,-22})));
+protected
+  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+    T=Medium.T_default,
+    p=Medium.p_default,
+    X=Medium.X_default[1:Medium.nXi])
+    "Medium state at default properties";
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
+      Medium.specificHeatCapacityCp(sta_default)
+    "Specific heat capacity of the fluid";
+equation
+  connect(splConMix.port_3,valCon.port_3)
+    annotation (Line(points={{120,70},{120,80},{-140,80},{-140,70}},color={0,127,255}));
+  connect(valCon.port_2,pumCon.port_a)
+    annotation (Line(points={{-130,60},{-110,60}},color={0,127,255}));
+  connect(pumEva.port_b,splEva.port_1)
+    annotation (Line(points={{-110,-60},{-130,-60}},color={0,127,255}));
+  connect(splEva.port_3,valEva.port_3)
+    annotation (Line(points={{-140,-70},{-140,-80},{120,-80},{120,-70}},color={0,127,255}));
+  connect(con.yValEva,valEva.y)
+    annotation (Line(points={{-48,137},{-32,137},{-32,120},{160,120},{160,-40},{120,-40},{120,-48}},color={0,0,127}));
+  connect(con.yValCon,valCon.y)
+    annotation (Line(points={{-48,133},{-44,133},{-44,90},{-160,90},{-160,40},{-140,40},{-140,48}},color={0,0,127}));
+  connect(con.yChi,chi.on)
+    annotation (Line(points={{-48,146},{-36,146},{-36,3},{-12,3}},color={255,0,255}));
+  connect(uHea,con.uHea)
+    annotation (Line(points={{-220,188},{-180,188},{-180,147},{-72,147}},color={255,0,255}));
+  connect(uCoo,con.uCoo)
+    annotation (Line(points={{-220,168},{-186,168},{-186,143},{-72,143}},color={255,0,255}));
+  connect(senTConEnt.T,con.TConWatEnt)
+    annotation (Line(points={{-31,40},{-78,40},{-78,133},{-72,133}},color={0,0,127}));
+  connect(senTEvaEnt.T,con.TEvaWatEnt)
+    annotation (Line(points={{9,-40},{-80,-40},{-80,137},{-72,137}},color={0,0,127}));
+  connect(splConMix.port_2,port_bHeaWat)
+    annotation (Line(points={{130,60},{200,60}},color={0,127,255}));
+  connect(splEva.port_2,port_bChiWat)
+    annotation (Line(points={{-150,-60},{-200,-60}},color={0,127,255}));
+  connect(port_aHeaWat,valCon.port_1)
+    annotation (Line(points={{-200,60},{-150,60}},color={0,127,255}));
+  connect(port_aChiWat,valEva.port_1)
+    annotation (Line(points={{200,-60},{130,-60}},color={0,127,255}));
+  connect(valEva.port_2,senTEvaEnt.port_a)
+    annotation (Line(points={{110,-60},{20,-60},{20,-50}},color={0,127,255}));
+  connect(senTEvaLvg.port_b,pumEva.port_a)
+    annotation (Line(points={{-20,-30},{-20,-60},{-90,-60}},color={0,127,255}));
+  connect(senTEvaLvg.port_a,chi.port_b2)
+    annotation (Line(points={{-20,-10},{-20,-6},{-10,-6}},color={0,127,255}));
+  connect(senTEvaEnt.port_b,chi.port_a2)
+    annotation (Line(points={{20,-30},{20,-6},{10,-6}},color={0,127,255}));
+  connect(chi.port_b1,senTConLvg.port_a)
+    annotation (Line(points={{10,6},{20,6},{20,10}},color={0,127,255}));
+  connect(senTConLvg.port_b,splConMix.port_1)
+    annotation (Line(points={{20,30},{20,60},{110,60}},color={0,127,255}));
+  connect(pumCon.port_b,senTConEnt.port_a)
+    annotation (Line(points={{-90,60},{-20,60},{-20,50}},color={0,127,255}));
+  connect(senTConEnt.port_b,chi.port_a1)
+    annotation (Line(points={{-20,30},{-20,6},{-10,6}},color={0,127,255}));
+  connect(chi.P,PChi)
+    annotation (Line(points={{11,9},{14,9},{14,0},{220,0}},color={0,0,127}));
+  connect(add2.y,PPum)
+    annotation (Line(points={{182,-140},{220,-140}},color={0,0,127}));
+  connect(pumEva.P,add2.u2)
+    annotation (Line(points={{-111,-51},{-120,-51},{-120,-140},{140,-140},{140,-146},{158,-146}},color={0,0,127}));
+  connect(pumCon.P,add2.u1)
+    annotation (Line(points={{-89,69},{-60,69},{-60,-134},{158,-134}},color={0,0,127}));
+  connect(con.yChi,booToRea.u)
+    annotation (Line(points={{-48,146},{-36,146},{-36,180},{-58,180}},color={255,0,255}));
+  connect(booToRea.y,gai2.u)
+    annotation (Line(points={{-82,180},{-120,180},{-120,0},{-100,0},{-100,-10}},color={0,0,127}));
+  connect(gai2.y,pumEva.m_flow_in)
+    annotation (Line(points={{-100,-34},{-100,-48}},color={0,0,127}));
+  connect(gai1.y,pumCon.m_flow_in)
+    annotation (Line(points={{-100,102},{-100,72}},color={0,0,127}));
+  connect(booToRea.y,gai1.u)
+    annotation (Line(points={{-82,180},{-100,180},{-100,126}},color={0,0,127}));
+  connect(TChiWatSupSet,chi.TSet)
+    annotation (Line(points={{-220,140},{-188,140},{-188,-3},{-12,-3}},color={0,0,127}));
+  annotation (
+    defaultComponentName="chi",
+    Icon(
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-149,-110},{151,-150}},
+          textColor={0,0,255},
+          textString="%name"),
+        Rectangle(
+          extent={{-34,38},{38,-40}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-20,-22},{26,-30}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-14,0},{-18,-8},{-10,-8},{-14,0}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-14,0},{-18,8},{-10,8},{-14,0}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{16,18},{20,-22}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{10,6},{28,-12}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{18,6},{10,-6},{28,-6},{18,6}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-16,-8},{-12,-22}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-16,18},{-12,8}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-22,26},{24,18}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{90,-60},{16,-62}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{16,-40},{18,-62}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-16,-40},{-14,-62}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid,
+          origin={-56,-61},
+          rotation=90),
+        Rectangle(
+          extent={{-16,60},{-14,38}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{16,60},{18,38}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-56,59},
+          rotation=90),
+        Rectangle(
+          extent={{90,60},{16,58}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid)}),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-200},{200,200}})),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon and fix port orientation to align with convention.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This is a model for a chiller system with constant speed evaporator and
+condenser pumps, and mixing valves modulated to maintain a minimum
+condenser inlet temperature (resp. maximum evaporator inlet temperature).
+</p>
+<p>
+The system is controlled based on the logic described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.Chiller\">
+Buildings.DHC.ETS.Combined.Controls.Chiller</a>.
+The pump flow rate is considered proportional to the pump speed
+under the assumption of a constant flow resistance for both the condenser
+and the evaporator loops. This assumption is justified
+by the connection of the loops to the buffer tanks, and the additional
+assumption that the bypass branch of the mixing valves is balanced
+with the direct branch.
+</p>
+</html>"));
+end Chiller;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/HeatExchanger.mo b/Buildings/DHC/ETS/Combined/Subsystems/HeatExchanger.mo
new file mode 100644
index 00000000000..ac225f0e421
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/HeatExchanger.mo
@@ -0,0 +1,386 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model HeatExchanger
+  "Base subsystem with district heat exchanger"
+  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
+    final m1_flow_nominal=abs(Q_flow_nominal/4200/(T_b1_nominal - T_a1_nominal)),
+    final m2_flow_nominal=abs(Q_flow_nominal/4200/(T_b2_nominal - T_a2_nominal)));
+  parameter DHC.ETS.Types.ConnectionConfiguration conCon
+    "District connection configuration" annotation (Evaluate=true);
+  parameter Modelica.Units.SI.PressureDifference dp1Hex_nominal(displayUnit=
+        "Pa") "Nominal pressure drop across heat exchanger on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dp2Hex_nominal(displayUnit=
+        "Pa") "Nominal pressure drop across heat exchanger on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpVal1_nominal(displayUnit=
+        "Pa") = dp1Hex_nominal/2
+    "Nominal pressure drop of primary control valve"
+    annotation (Dialog(enable=have_val1, group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpVal2_nominal(displayUnit=
+        "Pa") = dp2Hex_nominal/2
+    "Nominal pressure drop of secondary control valve"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
+    "Nominal heat flow rate (from district to building)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_a1_nominal
+    "Nominal water inlet temperature on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_b1_nominal
+    "Nominal water outlet temperature on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_a2_nominal
+    "Nominal water inlet temperature on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_b2_nominal
+    "Nominal water outlet temperature on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real spePum1Min(unit="1")=0.1
+    "Heat exchanger primary pump minimum speed (fractional)"
+    annotation (Dialog(group="Controls",enable=not have_val1));
+  parameter Real spePum2Min(unit="1")=0.1
+    "Heat exchanger secondary pump minimum speed (fractional)"
+    annotation (Dialog(group="Controls"));
+  // IO CONNECTORS
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
+    "Isolation valves return position (index 1 for condenser)"
+    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
+    iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    "Control signal for secondary side (from supervisory)"
+    annotation (Placement(transformation(extent={{-140,120},{-100,160}}),
+    iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
+    final unit="W")
+    "Power drawn by pump motors"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+    iconTransformation(extent={{100,-20},{140,20}})));
+  // COMPONENTS
+  Buildings.DHC.ETS.Combined.Controls.HeatExchanger con(
+    final conCon=conCon,
+    final spePum1Min=spePum1Min,
+    final spePum2Min=spePum2Min)
+    "District heat exchanger loop controller"
+    annotation (Placement(transformation(extent={{-70,150},{-50,170}})));
+  Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU hex(
+    redeclare final package Medium1 = Medium1,
+    redeclare final package Medium2 = Medium2,
+    final use_Q_flow_nominal=true,
+    configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow,
+    final allowFlowReversal1=allowFlowReversal1,
+    final allowFlowReversal2=allowFlowReversal2,
+    final dp1_nominal=if have_val1 then 0 else dp1Hex_nominal,
+    final dp2_nominal=0,
+    final m1_flow_nominal=m1_flow_nominal,
+    final m2_flow_nominal=m2_flow_nominal,
+    final Q_flow_nominal=Q_flow_nominal,
+    final T_a1_nominal=T_a1_nominal,
+    final T_a2_nominal=T_a2_nominal)
+    "Heat exchanger" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=180,
+        origin={0,0})));
+
+  DHC.ETS.BaseClasses.Pump_m_flow pum1(
+    redeclare final package Medium = Medium1,
+    final m_flow_nominal=m1_flow_nominal,
+    final dp_nominal=dp1Hex_nominal,
+    final allowFlowReversal=allowFlowReversal1) if not have_val1
+    "District heat exchanger primary pump" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=180,
+        origin={-60,80})));
+  DHC.ETS.BaseClasses.Pump_m_flow pum2(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=m2_flow_nominal,
+    final dp_nominal=dp2Hex_nominal + dpVal2_nominal,
+    final allowFlowReversal=allowFlowReversal2)
+    "Secondary pump" annotation (
+      Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=180,
+        origin={40,-60})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatEnt(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=m2_flow_nominal,
+    final allowFlowReversal=allowFlowReversal2)
+    "Heat exchanger secondary water entering temperature" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={20,-40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatLvg(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=m2_flow_nominal,
+    final allowFlowReversal=allowFlowReversal2)
+    "Heat exchanger secondary water leaving temperature" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-20,-20})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=
+        m2_flow_nominal) "Scale to nominal mass flow rate" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={40,118})));
+  Fluid.Actuators.Valves.TwoWayPressureIndependent val1(
+    redeclare final package Medium = Medium1,
+    final m_flow_nominal=m1_flow_nominal,
+    from_dp=true,
+    final dpValve_nominal=dpVal1_nominal,
+    use_inputFilter=false,
+    final dpFixed_nominal=dp1Hex_nominal) if have_val1
+    "Heat exchanger primary control valve"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
+        m1_flow_nominal) if not have_val1 "Scale to nominal mass flow rate"
+    annotation (Placement(transformation(extent={{-12,110},{-32,130}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum totPPum(
+    final nin=
+      if have_val1 then
+        1
+      else
+        2)
+    "Total pump power"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear val2(
+    redeclare final package Medium = Medium2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    from_dp=false,
+    use_inputFilter=false,
+    final m_flow_nominal=m2_flow_nominal,
+    final dpValve_nominal=dpVal2_nominal,
+    final dpFixed_nominal=fill(dp2Hex_nominal, 2))
+    "Control valve" annotation (
+      Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={80,-60})));
+  DHC.ETS.BaseClasses.Junction spl(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=m2_flow_nominal .* {1,-1,-1})
+    "Flow splitter" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-60,-60})));
+protected
+  parameter Boolean have_val1=
+    conCon == DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
+    "True in case of control valve on district side, false in case of a pump";
+equation
+  if have_val1 then
+    connect(port_a1, hex.port_a1)
+      annotation (Line(points={{-100,60},{-20,60},{-20,6},{-10,6}}, color={0,127,255}));
+  else
+    connect(hex.port_b1, port_b1)
+      annotation (Line(points={{10,6},{20,6},{20,60},{100,60}}, color={0,127,255}));
+  end if;
+  connect(gai2.y,pum2.m_flow_in)
+    annotation (Line(points={{40,106},{40,-48}},color={0,0,127}));
+  connect(port_a1,pum1.port_a)
+    annotation (Line(points={{-100,60},{-90,60},{-90,80},{-70,80}},color={0,127,255}));
+  connect(val1.port_b,port_b1)
+    annotation (Line(points={{90,80},{94,80},{94,60},{100,60}},color={0,127,255}));
+  connect(pum2.port_b,senT2WatEnt.port_a)
+    annotation (Line(points={{30,-60},{20,-60},{20,-50}},color={0,127,255}));
+  connect(senT2WatEnt.port_b,hex.port_a2)
+    annotation (Line(points={{20,-30},{20,-6},{10,-6}},color={0,127,255}));
+  connect(con.y1, val1.y)
+    annotation (Line(points={{-48,166},{80,166},{80,92}}, color={0,0,127}));
+  connect(con.y1, gai1.u) annotation (Line(points={{-48,166},{0,166},{0,120},{-10,
+          120}}, color={0,0,127}));
+  connect(gai1.y,pum1.m_flow_in)
+    annotation (Line(points={{-34,120},{-60,120},{-60,92}},color={0,0,127}));
+  connect(pum1.P,totPPum.u[2])
+    annotation (Line(points={{-49,89},{60,89},{60,0},{68,0}},color={0,0,127}));
+  connect(pum2.P,totPPum.u[1])
+    annotation (Line(points={{29,-51},{28,-51},{28,0},{68,0}},color={0,0,127}));
+  connect(totPPum.y,PPum)
+    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
+  connect(yValIso_actual,con.yValIso)
+    annotation (Line(points={{-120,100},{-92,100},{-92,155},{-72,155}},color={0,0,127}));
+  connect(con.yPum2,gai2.u)
+    annotation (Line(points={{-48,160},{40,160},{40,130}},color={0,0,127}));
+  connect(u,con.u)
+    annotation (Line(points={{-120,140},{-96,140},{-96,165},{-72,165}},color={0,0,127}));
+  connect(hex.port_b2,senT2WatLvg.port_a)
+    annotation (Line(points={{-10,-6},{-20,-6},{-20,-10}},color={0,127,255}));
+  connect(val2.port_2,pum2.port_a)
+    annotation (Line(points={{70,-60},{50,-60}},color={0,127,255}));
+  connect(port_a2,val2.port_1)
+    annotation (Line(points={{100,-60},{90,-60}},color={0,127,255}));
+  connect(spl.port_1,senT2WatLvg.port_b)
+    annotation (Line(points={{-50,-60},{-20,-60},{-20,-30}},color={0,127,255}));
+  connect(spl.port_2,port_b2)
+    annotation (Line(points={{-70,-60},{-100,-60}},color={0,127,255}));
+  connect(spl.port_3,val2.port_3)
+    annotation (Line(points={{-60,-70},{-60,-80},{80,-80},{80,-70}},color={0,127,255}));
+  connect(con.yVal2,val2.y)
+    annotation (Line(points={{-48,154},{64,154},{64,-40},{80,-40},{80,-48}},color={0,0,127}));
+  connect(hex.port_b1, val1.port_a) annotation (Line(points={{10,6},{20,6},{20,80},{70,80}}, color={0,127,255}));
+  connect(pum1.port_b, hex.port_a1) annotation (Line(points={{-50,80},{-20,80},{-20,6},{-10,6}}, color={0,127,255}));
+  annotation (
+    defaultComponentName="hex",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-34,38},{36,-42}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-26,32},{-22,-36}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-22,32},{-14,-36}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-10,32},{0,-36}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-14,32},{-10,-36}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{4,32},{12,-36}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{0,32},{4,-36}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{16,32},{24,-36}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{12,32},{16,-36}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{24,32},{28,-36}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-58,59},
+          rotation=90),
+        Rectangle(
+          extent={{-18,60},{-16,38}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={58,59},
+          rotation=90),
+        Rectangle(
+          extent={{16,60},{18,38}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={58,-61},
+          rotation=90),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-58,-61},
+          rotation=90),
+        Rectangle(
+          extent={{-18,-42},{-16,-62}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{16,-42},{18,-62}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-160},{100,180}})),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+July 14, 2021, by Antoine Gautier:<br/>
+Refactored after updating the control logic, changed the primary control valve to pressure-independent.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2561\">issue #2561</a>.
+</li>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This is a model for a district heat exchanger system with a variable speed
+pump on the secondary side, and a variable speed pump (in case of a passive
+network) or a two-way modulating valve (in case of an active network)
+on the primary side.
+</p>
+<p>
+The system is controlled based on the logic described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.HeatExchanger\">
+Buildings.DHC.ETS.Combined.Controls.HeatExchanger</a>.
+The pump flow rate is considered proportional to the pump speed
+under the assumption of a constant flow resistance in both the primary and
+the secondary loops.
+</p>
+</html>"));
+end HeatExchanger;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/HeatPump.mo b/Buildings/DHC/ETS/Combined/Subsystems/HeatPump.mo
new file mode 100644
index 00000000000..9a9715a6c8e
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/HeatPump.mo
@@ -0,0 +1,168 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model HeatPump "Base subsystem with water-to-water heat pump"
+  extends
+    Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump(
+        heaPum(QCon_flow_nominal=Q1_flow_nominal));
+  parameter Boolean have_varFloCon = true
+    "Set to true for a variable condenser flow"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.HeatFlowRate Q1_flow_nominal(min=0)
+    "Heating heat flow rate" annotation (Dialog(group="Nominal condition"));
+  // IO CONNECTORS
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Supply temperature set point"
+    annotation (Placement(transformation(extent={{-240,-40},{-200,0}}),
+      iconTransformation(extent={{-140,10},{-100,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput m1_flow(
+    final unit="kg/s") if have_varFloCon
+    "Condenser mass flow rate"
+    annotation (Placement(transformation(extent={{-240,60},{-200,100}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  // COMPONENTS
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant floConNom(
+    final k=mCon_flow_nominal) if not have_varFloCon
+    "Nominal flow rate"
+    annotation (Placement(transformation(extent={{-178,80},{-158,100}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
+    annotation (Placement(transformation(extent={{-180,110},{-160,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply floCon
+    "Zero flow rate if not enabled"
+    annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
+equation
+  connect(booToRea.y, floCon.u1) annotation (Line(points={{-158,120},{-140,120},
+          {-140,106},{-122,106}}, color={0,0,127}));
+  connect(m1_flow, floCon.u2) annotation (Line(points={{-220,80},{-188,80},{
+          -188,70},{-140,70},{-140,94},{-122,94}},
+                            color={0,0,127}));
+  connect(floConNom.y, floCon.u2) annotation (Line(points={{-156,90},{-140,90},
+          {-140,94},{-122,94}},  color={0,0,127}));
+  connect(port_a1, heaPum.port_a1) annotation (Line(points={{-200,60},{-100,60},
+          {-100,-66},{-80,-66}},      color={0,127,255}));
+  connect(pumCon.port_b, port_b1) annotation (Line(points={{-26,10},{-26,60},{
+          200,60}},            color={0,127,255}));
+  connect(TSupSet, heaPum.TSet) annotation (Line(points={{-220,-20},{-90,-20},{
+          -90,-63},{-82,-63}},   color={0,0,127}));
+  connect(floCon.y, pumCon.m_flow_in)
+    annotation (Line(points={{-98,100},{12,100},{12,0},{-14,0},{-14,
+          -2.22045e-15}},                                   color={0,0,127}));
+  connect(conPI.trigger, floEva.u) annotation (Line(points={{124,8},{124,-2},{
+          110,-2},{110,136},{-90,136},{-90,120},{-82,120}},
+                                                          color={255,0,255}));
+  connect(addPPum.y, PPum) annotation (Line(points={{161,80},{174,80},{174,0},{
+          220,0}}, color={0,0,127}));
+  connect(uEna, booToRea.u)
+    annotation (Line(points={{-220,120},{-182,120}}, color={255,0,255}));
+  connect(uEna, floEva.u) annotation (Line(points={{-220,120},{-190,120},{-190,
+          136},{-90,136},{-90,120},{-82,120}}, color={255,0,255}));
+  annotation (
+  defaultComponentName="heaPum",
+  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{92,-58},{18,-60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{18,-38},{20,-60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-14,-38},{-12,-60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-54,-59},
+          rotation=90),
+        Rectangle(
+          extent={{-14,62},{-12,40}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{18,62},{20,40}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid,
+          origin={-54,61},
+          rotation=90),
+        Rectangle(
+          extent={{92,62},{18,60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid)}), Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-200,-140},{200,140}})),
+    Documentation(info="<html>
+<p>
+This model represents a water-to-water heat pump, an evaporator water pump,
+and a condenser water pump.
+The heat pump model is described in
+<a href=\"modelica://Buildings.Fluid.HeatPumps.Carnot_TCon\">
+Buildings.Fluid.HeatPumps.Carnot_TCon</a>.
+By default, a variable speed condenser pump is considered, but a constant speed
+pump may also be represented by setting <code>have_varFloCon</code> to <code>false</code>.
+The evaporator hydronics and control are described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
+</p>
+<h4>Condenser Controls</h4>
+<p>
+The system is enabled when the input control signal <code>uEna</code> switches to
+<code>true</code>.
+When enabled, on the condenser side,
+</p>
+<ul>
+<li>
+the condenser water pumps are commanded on and supply either
+the condenser mass flow rate set point provided as an input in the case of the variable speed condenser pump,
+or the nominal mass flow rate in the case of the constant speed condenser pump,
+</li>
+<li>
+the heat pump controller—idealized in this model—tracks the
+supply temperature set point at the condenser outlet.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+November 15, 2023, by David Blum:<br/>
+Changed to extend partial base class with added condenser hydronics and control.
+</li>
+<li>
+May 3, 2023, by David Blum:<br/>
+Assigned <code>dp_nominal</code> to condenser pump.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
+issue 3379</a>.
+</li>
+<li>
+November 16, 2022, by Michael Wetter:<br/>
+Set <code>pumEva.dp_nominal</code> to correct value.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HeatPump;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.mo b/Buildings/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.mo
new file mode 100644
index 00000000000..a9776fbcb36
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.mo
@@ -0,0 +1,381 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model HeatPumpDHWTank
+  "Base subsystem with water-to-water heat pump with storage tank for domestic hot water"
+  extends
+    Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump(
+      heaPum(
+        QCon_flow_nominal=QHotWat_flow_nominal,
+        QCon_flow_max=QHotWat_flow_nominal));
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+    datWatHea "Performance data"
+    annotation (Placement(transformation(extent={{140,100},{160,120}})));
+  parameter Modelica.Units.SI.HeatFlowRate QHotWat_flow_nominal(min=0)
+    "Nominal capacity of heat pump condenser for hot water production system (>=0)"
+    annotation (Dialog(group="Nominal condition"));
+  // IO CONNECTORS
+  // COMPONENTS
+
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal floCon(realTrue=
+        mCon_flow_nominal) "Condenser mass flow rate"
+    annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
+  Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger heaPumTan(
+    redeclare package MediumDom = Medium1,
+    redeclare package MediumHea = Medium2,                      final dat=
+        datWatHea)
+    "Heat pump with storage tank for domestic hot water"
+    annotation (Placement(transformation(extent={{-80,10},{-60,30}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THotSouSet(k=datWatHea.TDom_nominal)
+    "Set point of water in hot water tank"
+    annotation (Placement(transformation(extent={{-180,10},{-160,30}})));
+  Buildings.Fluid.Sources.Boundary_pT preRef(
+    redeclare package Medium = Medium2,
+    p(displayUnit="bar"),
+    nPorts=1) "Reference pressure for loop" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-60,-20})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemHeaPumRet(
+    redeclare package Medium = Medium1,
+    m_flow_nominal=mCon_flow_nominal,
+    tau=0)
+    annotation (Placement(transformation(extent={{-140,-60},{-120,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter
+                                      addPar(p=dT_nominal)
+                                                  "dT for heater"
+    annotation (Placement(transformation(extent={{-120,-40},{-100,-20}})));
+  Modelica.Blocks.Math.Add addPPum1
+                                   "Electricity use for pumps"
+    annotation (Placement(transformation(extent={{170,-8},{190,12}})));
+  Buildings.Controls.OBC.CDL.Logical.And and2
+    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
+equation
+  connect(THotSouSet.y, heaPumTan.TDomSet) annotation (Line(points={{-158,20},{
+          -81,20}},                color={0,0,127}));
+  connect(preRef.ports[1], heaPumTan.port_bHea) annotation (Line(points={{-70,-20},
+          {-92,-20},{-92,14},{-80,14}}, color={0,127,255}));
+  connect(heaPumTan.port_bHea, senTemHeaPumRet.port_a) annotation (Line(points={{-80,14},
+          {-120,14},{-120,0},{-140,0},{-140,-50}},          color={0,127,255}));
+  connect(senTemHeaPumRet.T, addPar.u) annotation (Line(points={{-130,-39},{
+          -130,-30},{-122,-30}},
+                            color={0,0,127}));
+  connect(floCon.y, pumCon.m_flow_in)
+    annotation (Line(points={{-58,90},{-4,90},{-4,0},{-14,0},{-14,-3.55271e-15}},
+                                                            color={0,0,127}));
+  connect(heaPumTan.port_aHea, pumCon.port_b)
+    annotation (Line(points={{-60,14},{-26,14},{-26,10}},
+                                                 color={0,127,255}));
+  connect(senTemHeaPumRet.port_b, heaPum.port_a1)
+    annotation (Line(points={{-120,-50},{-100,-50},{-100,-66},{-80,-66}},
+                                                    color={0,127,255}));
+  connect(addPPum.y, addPPum1.u1)
+    annotation (Line(points={{161,80},{168,80},{168,8}}, color={0,0,127}));
+  connect(heaPumTan.PEle, addPPum1.u2) annotation (Line(points={{-59,20},{-50,
+          20},{-50,56},{164,56},{164,-4},{168,-4}}, color={0,0,127}));
+  connect(addPPum1.y, PPum)
+    annotation (Line(points={{191,2},{191,0},{220,0}}, color={0,0,127}));
+  connect(addPar.y, heaPum.TSet) annotation (Line(points={{-98,-30},{-92,-30},{
+          -92,-63},{-82,-63}}, color={0,0,127}));
+  connect(heaPumTan.port_bDom, port_b1) annotation (Line(points={{-60,26},{-54,
+          26},{-54,60},{200,60}},  color={0,127,255}));
+  connect(port_a1, heaPumTan.port_aDom) annotation (Line(points={{-200,60},{
+          -120,60},{-120,26},{-80,26}},  color={0,127,255}));
+  connect(uEna, and2.u1)
+    annotation (Line(points={{-220,120},{-142,120}}, color={255,0,255}));
+  connect(heaPumTan.charge, and2.u2) annotation (Line(points={{-58,11},{-56,11},
+          {-56,12},{-54,12},{-54,0},{-100,0},{-100,80},{-160,80},{-160,112},{
+          -142,112}}, color={255,0,255}));
+  connect(and2.y, floEva.u)
+    annotation (Line(points={{-118,120},{-82,120}}, color={255,0,255}));
+  connect(and2.y, floCon.u) annotation (Line(points={{-118,120},{-100,120},{
+          -100,90},{-82,90}}, color={255,0,255}));
+  connect(and2.y, conPI.trigger) annotation (Line(points={{-118,120},{-100,120},
+          {-100,106},{110,106},{110,0},{124,0},{124,8}}, color={255,0,255}));
+  annotation (
+  defaultComponentName="heaPum",
+  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-12,0},{60,-78}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{2,-60},{48,-68}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{8,-38},{4,-46},{12,-46},{8,-38}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{8,-38},{4,-30},{12,-30},{8,-38}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{38,-20},{42,-60}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{32,-32},{50,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{40,-32},{32,-44},{50,-44},{40,-32}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{6,-46},{10,-60}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{6,-20},{10,-30}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{0,-12},{46,-20}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,54},{-40,28}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-46,68},{-44,54}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,9},{1,-9}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-37,67},
+          rotation=90),
+        Rectangle(
+          extent={{-46,28},{-44,18}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,9},{1,-9}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-37,19},
+          rotation=90),
+        Rectangle(
+          extent={{-1.5,13.5},{1.5,-13.5}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-3.5,18.5},
+          rotation=90),
+        Rectangle(
+          extent={{-1.5,29.5},{1.5,-29.5}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={12.5,66.5},
+          rotation=90),
+        Rectangle(
+          extent={{-30,70},{2,14}},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-30,70},{2,42}},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{8,20},{10,0}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{42,68},{40,0}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={255,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,84},{-54,54}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,28},{-54,18}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{96,-60},{74,-62}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{8,-78},{10,-88}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,30},{1,-30}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          origin={-20,-87},
+          rotation=90),
+        Rectangle(
+          extent={{-50,-60},{-48,-88}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,22},{1,-22}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          origin={-70,-59},
+          rotation=90),
+        Rectangle(
+          extent={{40,-78},{42,-88}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,17},{1,-17}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          origin={57,-87},
+          rotation=90),
+        Rectangle(
+          extent={{72,-60},{74,-88}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,64},{1,-64}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid,
+          origin={8,83},
+          rotation=90),
+        Rectangle(
+          extent={{70,84},{72,60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{92,62},{70,60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,10},{1,-10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid,
+          origin={-64,19},
+          rotation=90),
+        Rectangle(
+          extent={{-74,62},{-72,20}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-72,62},{-90,60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid)}), Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-200,-140},{200,140}})),
+    Documentation(info="<html>
+<p>
+Model of a water-to-water heat pump with temperature control on evaporator side, with the heat pump
+being connected to a domestic hot water tank with fresh water stations.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.png\"
+  alt=\"Heat pump with domestic hot water tank\"/>
+</p>
+<p>
+The heat pump model with storage tank is described in
+<a href=\"modelica://Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
+Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
+The evaporator hydronics and control are described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
+</p>
+<h4>Condenser Controls</h4>
+<p>
+The system is enabled when the tank charge control signal switches to
+<code>true</code>.
+When enabled,
+</p>
+<ul>
+<li>
+the condenser pump is commanded on and supplies the nominal mass flow rate
+to the tank and domestic hot water system,
+</li>
+<li>
+the heat pump evaporator supplies a constant temperature increase from the return to
+the supply equal to <code>dT_nominal</code>.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+November 28, 2023, by David Blum:<br/>
+First implementation, extended from partial base class with added
+condenser hydronics and control.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
+issue 3063</a>.
+</li>
+</ul>
+</html>"));
+end HeatPumpDHWTank;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/SwitchBox.mo b/Buildings/DHC/ETS/Combined/Subsystems/SwitchBox.mo
new file mode 100644
index 00000000000..54908273e6b
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/SwitchBox.mo
@@ -0,0 +1,283 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model SwitchBox
+  "Model for mass flow rate redirection with three-port two-position directional valves"
+  replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
+    "Medium model";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpValve_nominal(
+    min=0,
+    displayUnit="Pa") = 5000 "Valve pressure drop at nominal conditions"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real trueHoldDuration(
+    final unit="s") = 60
+    "true hold duration";
+  parameter Real falseHoldDuration(
+    final unit="s") = trueHoldDuration
+    "false hold duration";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
+    Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance (except for the pump always modeled in steady state)"
+    annotation(Evaluate=true, Dialog(tab="Dynamics", group="Conservation equations"));
+  // IO CONECTORS
+  Modelica.Fluid.Interfaces.FluidPort_b port_bSup(
+    redeclare package Medium = Medium)
+    "Supply line outlet port"
+    annotation (Placement(transformation(
+      extent={{-30,90},{-10,110}}),
+      iconTransformation(extent={{-70,90},{-50,110}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bRet(
+    redeclare final package Medium = Medium)
+    "Return line outlet port"
+    annotation (Placement(transformation(extent={{10,-110},{30,-90}}),
+      iconTransformation(extent={{50,-110},{70,-90}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aSup(
+    redeclare final package Medium = Medium)
+    "Supply line inlet port"
+    annotation (Placement(transformation(extent={{-30,-110},{-10,-90}}),
+      iconTransformation(extent={{-70,-110},{-50,-90}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aRet(
+    redeclare final package Medium = Medium)
+    "Return line inlet port"
+    annotation (Placement(transformation(extent={{10,90},{30,110}}),
+      iconTransformation(extent={{50,90},{70,110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mRev_flow(final unit="kg/s")
+    "Service water mass flow rate in reverse direction"
+    annotation (Placement(
+      transformation(extent={{-140,-60},{-100,-20}}),
+        iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mPos_flow(final unit="kg/s")
+    "Service water mass flow rate in positive direction"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+    iconTransformation(extent=
+           {{-140,20},{-100,60}})));
+  // COMPONENTS
+  Buildings.DHC.ETS.BaseClasses.Junction splSup(
+    redeclare final package Medium = Medium,
+    m_flow_nominal={1,1,1}*m_flow_nominal)
+    "Flow splitter"
+    annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=-90,
+        origin={-20,40})));
+  Buildings.DHC.ETS.BaseClasses.Junction splRet(
+    redeclare final package Medium = Medium,
+    m_flow_nominal={1,1,1}*m_flow_nominal)
+    "Flow splitter"
+    annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={20,0})));
+  Buildings.DHC.ETS.Combined.Controls.SwitchBox con(
+    final m_flow_nominal=m_flow_nominal,
+    final trueHoldDuration=trueHoldDuration,
+    final falseHoldDuration=falseHoldDuration)
+    "Switch box controller"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valSup(
+    redeclare package Medium = Medium,
+    dpValve_nominal=dpValve_nominal,
+    use_inputFilter=false,
+    m_flow_nominal=m_flow_nominal,
+    linearized={true,true},
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+    "Directional valve"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}}, origin={-20,0},
+     rotation=-90)));
+  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valRet(
+    redeclare package Medium = Medium,
+    dpValve_nominal=dpValve_nominal,
+    use_inputFilter=false,
+    m_flow_nominal=m_flow_nominal,
+    linearized={true,true},
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+    "Directional valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={20,-40},
+      rotation=-90)));
+equation
+  connect(port_bSup, splSup.port_2)
+    annotation (Line(points={{-20,100},{-20,50}}, color={0,127,255}));
+  connect(mRev_flow, con.mRev_flow) annotation (Line(points={{-120,-40},{-80,-40},
+          {-80,-8},{-72,-8}}, color={0,0,127}));
+  connect(splRet.port_1, port_aRet)
+    annotation (Line(points={{20,10},{20,100}}, color={0,127,255}));
+  connect(valSup.port_1, splSup.port_1)
+    annotation (Line(points={{-20,10},{-20,30}}, color={0,127,255}));
+  connect(valSup.port_3, splRet.port_3)
+    annotation (Line(points={{-10,0},{10,0}}, color={0,127,255}));
+  connect(splRet.port_2, valRet.port_1)
+    annotation (Line(points={{20,-10},{20,-30}}, color={0,127,255}));
+  connect(splSup.port_3, valRet.port_3) annotation (Line(points={{-10,40},{0,40},
+          {0,-40},{10,-40}}, color={0,127,255}));
+  connect(valRet.port_2, port_bRet)
+    annotation (Line(points={{20,-50},{20,-100}}, color={0,127,255}));
+  connect(valSup.port_2, port_aSup) annotation (Line(points={{-20,-10},{-20,-100}},
+                      color={0,127,255}));
+  connect(con.y, valRet.y) annotation (Line(points={{-48,0},{-40,0},{-40,-20},{60,
+          -20},{60,-40},{32,-40}},
+                     color={0,0,127}));
+  connect(mPos_flow, con.mPos_flow) annotation (Line(points={{-120,40},{-80,40},
+          {-80,8},{-72,8}}, color={0,0,127}));
+  connect(con.y, valSup.y)
+    annotation (Line(points={{-48,0},{-32,0}}, color={0,0,127}));
+  annotation (
+  defaultComponentName="swiFlo",
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+    {100,100}}), graphics={Rectangle(extent={{-100,100},{100,-100}},
+    lineColor={0,0,127}, fillColor={255,255,255},
+  fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-35,1},{35,-1}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-61,55},
+          rotation=90),
+        Polygon(
+          points={{-10,-10},{-10,10},{10,0},{-10,-10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-60,-10},
+          rotation=90),
+        Polygon(
+          points={{-10,-10},{-10,10},{10,0},{-10,-10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-60,10},
+          rotation=-90),
+        Polygon(
+          points={{-40,-10},{-40,10},{-60,0},{-40,-10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{38,-48},{38,-28},{58,-38},{38,-48}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-10,-10},{-10,10},{10,0},{-10,-10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={58,-28},
+          rotation=-90),
+        Polygon(
+          points={{-10,-10},{-10,10},{10,0},{-10,-10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={58,-48},
+          rotation=90),
+        Rectangle(
+          extent={{-54,1},{54,-1}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={59,36},
+          rotation=90),
+        Rectangle(
+          extent={{-16,1},{16,-1}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={59,-74},
+          rotation=90),
+        Rectangle(
+          extent={{-35,1},{35,-1}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-61,-55},
+          rotation=90),
+        Rectangle(
+          extent={{-1,50},{1,-50}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={10,1},
+          rotation=90),
+        Rectangle(
+          extent={{-1,29},{1,-29}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-31,61},
+          rotation=90),
+        Rectangle(
+          extent={{-1,21},{1,-21}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={17,-39},
+          rotation=90),
+        Rectangle(
+          extent={{-50,1},{50,-1}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          origin={-3,12},
+          rotation=90),
+        Line(
+          points={{-90,66},{-52,64}},
+          color={0,0,127},
+          pattern=LinePattern.None),
+        Line(points={{-72,0},{-72,-70},{82,-70},{82,-34},{58,-34}}, color={0,0,127}),
+        Rectangle(
+          extent={{-96,10},{-76,-10}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(points={{-76,0},{-60,0}}, color={0,0,127}),
+        Line(points={{-100,40},{-86,40},{-86,10}}, color={0,0,127}),
+        Line(points={{-100,-40},{-86,-40}}, color={0,0,127}),
+        Line(points={{-86,-40},{-86,-10}}, color={0,0,127})}),Diagram(
+  coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+    Documentation(info="<html>
+<p>
+This model represents a hydronic arrangement avoid flow reversal in the service line,
+for instance when connecting an energy transfer station such as the one modeled in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>.
+For that intent, two three-port two-position directional valves are used. The valves are
+actuated based on the logic described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.SwitchBox\">
+Buildings.DHC.ETS.Combined.Controls.SwitchBox</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+Refactored with three-way valves instead of pumps.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1769\">
+issue 1769</a>.
+</li>
+<li>
+January 16, 2020, by Michael Wetter:<br/>
+Added documentation.
+</li>
+</ul>
+</html>"));
+end SwitchBox;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/Borefield.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Borefield.mo
new file mode 100644
index 00000000000..ad2bda591a3
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Borefield.mo
@@ -0,0 +1,111 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model Borefield
+  "Validation of the base subsystem model with geothermal borefield"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  parameter Integer nBorHol=100
+    "Number of boreholes (must be a square number)";
+  parameter Modelica.Units.SI.Distance dxy=6
+    "Distance in x-axis (and y-axis) between borehole axes";
+  final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
+      Buildings.DHC.ETS.BaseClasses.computeCoordinates(
+      nBorHol, dxy) "Coordinates of boreholes";
+  Buildings.DHC.ETS.Combined.Subsystems.Borefield borFie(
+    redeclare final package Medium=Medium,
+    final datBorFie=datBorFie,
+    dp_nominal=5E4,
+    TBorWatEntMax=313.15)
+    "Subsystem with heat recovery chiller"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Fluid.Sources.Boundary_pT conWat(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=2)
+    "Condenser water boundary conditions"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-40,-2})));
+  Fluid.Sensors.TemperatureTwoPort senTInl(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=borFie.pum.m_flow_nominal)
+    "Water inlet temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-10,20})));
+  Fluid.Sensors.TemperatureTwoPort senTOut(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=borFie.pum.m_flow_nominal)
+    "Water outlet temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,-20})));
+  parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
+    conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
+      cooBor=cooBor,
+      dp_nominal=0))
+    "Borefield design data"
+    annotation (Placement(transformation(extent={{60,60},{80,80}})));
+  Modelica.Blocks.Sources.TimeTable TInlVal(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,2;
+      2,2;
+      3,15;
+      7,15;
+      9,35;
+      10,45;
+      11,30;
+      20,30],
+    timeScale=1000,
+    offset=273.15)
+    "Inlet temperature values"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    k=0)
+    "Zero"
+    annotation (Placement(transformation(extent={{-110,30},{-90,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp u(
+    duration=1000,
+    startTime=2500)
+    "Control signal"
+    annotation (Placement(transformation(extent={{-110,70},{-90,90}})));
+equation
+  connect(senTInl.port_b,conWat.ports[1])
+    annotation (Line(points={{-20,20},{-30,20},{-30,0}},color={0,127,255}));
+  connect(conWat.ports[2],senTOut.port_a)
+    annotation (Line(points={{-30,-4},{-30,-20},{-20,-20}},color={0,127,255}));
+  connect(senTInl.port_a,borFie.port_a)
+    annotation (Line(points={{0,20},{20,20},{20,0},{40,0}},color={0,127,255}));
+  connect(borFie.port_b,senTOut.port_b)
+    annotation (Line(points={{60,0},{80,0},{80,-20},{0,-20}},color={0,127,255}));
+  connect(TInlVal.y,conWat.T_in)
+    annotation (Line(points={{-89,0},{-70,0},{-70,2},{-52,2}},color={0,0,127}));
+  connect(zer.y,borFie.yValIso_actual[2])
+    annotation (Line(points={{-88,40},{30,40},{30,5},{38,5}},color={0,0,127}));
+  connect(u.y,borFie.u)
+    annotation (Line(points={{-88,80},{32,80},{32,8},{38,8}},color={0,0,127}));
+  connect(u.y,borFie.yValIso_actual[1])
+    annotation (Line(points={{-88,80},{32,80},{32,3},{38,3}},color={0,0,127}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-120,-100},{100,100}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos" "Simulate and plot"),
+    experiment(
+      StopTime=20000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Borefield\">
+Buildings.DHC.ETS.Combined.Subsystems.Borefield</a>.
+</p>
+</html>"));
+end Borefield;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/Chiller.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Chiller.mo
new file mode 100644
index 00000000000..fbe9d73fe1c
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/Chiller.mo
@@ -0,0 +1,161 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model Chiller
+  "Validation of the base subsystem model with heat recovery chiller"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  parameter Fluid.Chillers.Data.ElectricEIR.Generic datChi(
+    QEva_flow_nominal=-1E6,
+    COP_nominal=3,
+    PLRMax=1,
+    PLRMinUnl=0.3,
+    PLRMin=0.3,
+    etaMotor=1,
+    mEva_flow_nominal=30,
+    mCon_flow_nominal=30,
+    TEvaLvg_nominal=280.15,
+    capFunT={1,0,0,0,0,0},
+    EIRFunT={1,0,0,0,0,0},
+    EIRFunPLR={1,0,0},
+    TEvaLvgMin=276.15,
+    TEvaLvgMax=288.15,
+    TConEnt_nominal=313.15,
+    TConEntMin=303.15,
+    TConEntMax=333.15)
+    "Chiller performance data"
+    annotation (Placement(transformation(extent={{20,100},{40,120}})));
+  Buildings.DHC.ETS.Combined.Subsystems.Chiller chi(
+    redeclare final package Medium=Medium,
+    final dat=datChi,
+    dpCon_nominal=15E3,
+    dpEva_nominal=15E3)
+    "Subsystem with heat recovery chiller"
+    annotation (Placement(transformation(extent={{-10,-72},{10,-52}})));
+  Fluid.Sources.Boundary_pT evaWat(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=2)
+    "Evaporator water boundary conditions"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,-62})));
+  Fluid.Sources.Boundary_pT conWat(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=2)
+    "Condenser water boundary conditions"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,-62})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
+    k=7+273.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Chilled water supply temperature set point"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  Fluid.Sensors.TemperatureTwoPort senTHeaWatSup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=datChi.mCon_flow_nominal)
+    "Heating water supply temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-80,-40})));
+  Fluid.Sensors.TemperatureTwoPort senTChiWatSup(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=datChi.mEva_flow_nominal)
+    "Chilled water supply temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={70,-40})));
+  Fluid.Sensors.TemperatureTwoPort senTHeaWatRet(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=datChi.mCon_flow_nominal)
+    "Heating water return temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-80,-80})));
+  Fluid.Sensors.TemperatureTwoPort senTChiWatRet(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=datChi.mEva_flow_nominal)
+    "Chilled water return temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={70,-80})));
+  Modelica.Blocks.Sources.BooleanExpression uHea(
+    y=time < 4000)
+    "Heating enable signal"
+    annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
+  Modelica.Blocks.Sources.BooleanExpression uCoo(
+    y=time >= 1000)
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-120,70},{-100,90}})));
+  Modelica.Blocks.Sources.TimeTable THeaWatRet(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,44;
+      2,44;
+      3,34;
+      4.5,34;
+      5,14;
+      10,14],
+    timeScale=1000,
+    offset=273.15)
+    "Heating water return temperature values"
+    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
+  Modelica.Blocks.Sources.TimeTable TChiWatRet(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,9;
+      1,9;
+      2,14;
+      3,14;
+      4,11;
+      5,11],
+    timeScale=1000,
+    offset=273.15)
+    "Chilled water return temperature values"
+    annotation (Placement(transformation(extent={{160,-70},{140,-50}})));
+equation
+  connect(chi.port_bHeaWat,senTHeaWatSup.port_a)
+    annotation (Line(points={{10,-56},{20,-56},{20,-40},{-70,-40}},color={0,127,255}));
+  connect(senTHeaWatSup.port_b,conWat.ports[1])
+    annotation (Line(points={{-90,-40},{-100,-40},{-100,-63}},color={0,127,255}));
+  connect(evaWat.ports[1],senTChiWatSup.port_b)
+    annotation (Line(points={{100,-63},{100,-40},{80,-40}},color={0,127,255}));
+  connect(senTChiWatSup.port_a,chi.port_bChiWat)
+    annotation (Line(points={{60,-40},{40,-40},{40,-68},{-10,-68}},color={0,127,255}));
+  connect(conWat.ports[2],senTHeaWatRet.port_a)
+    annotation (Line(points={{-100,-61},{-100,-80},{-90,-80}},color={0,127,255}));
+  connect(senTHeaWatRet.port_b,chi.port_aHeaWat)
+    annotation (Line(points={{-70,-80},{-40,-80},{-40,-56},{-10,-56}},color={0,127,255}));
+  connect(chi.port_aChiWat,senTChiWatRet.port_b)
+    annotation (Line(points={{10,-68},{-20,-68},{-20,-80},{60,-80}},color={0,127,255}));
+  connect(senTChiWatRet.port_a,evaWat.ports[2])
+    annotation (Line(points={{80,-80},{100,-80},{100,-61}},color={0,127,255}));
+  connect(uCoo.y,chi.uCoo)
+    annotation (Line(points={{-99,80},{-24,80},{-24,-60},{-12,-60}},color={255,0,255}));
+  connect(uHea.y,chi.uHea)
+    annotation (Line(points={{-99,100},{-20,100},{-20,-58},{-12,-58}},color={255,0,255}));
+  connect(TChiWatSupSet.y,chi.TChiWatSupSet)
+    annotation (Line(points={{-98,0},{-34,0},{-34,-64},{-12,-64}},color={0,0,127}));
+  connect(THeaWatRet.y,conWat.T_in)
+    annotation (Line(points={{-169,-60},{-140,-60},{-140,-58},{-122,-58}},color={0,0,127}));
+  connect(TChiWatRet.y,evaWat.T_in)
+    annotation (Line(points={{139,-60},{132,-60},{132,-58},{122,-58}},color={0,0,127}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-200,-140},{200,140}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos" "Simulate and plot"),
+    experiment(
+      StopTime=5000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.Chiller\">
+Buildings.DHC.ETS.Combined.Subsystems.Chiller</a>.
+</p>
+</html>"));
+end Chiller;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mo
new file mode 100644
index 00000000000..53c71261821
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mo
@@ -0,0 +1,301 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model HeatExchanger
+  "Validation of the base subsystem model with district heat exchanger"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  Buildings.Fluid.Sources.Boundary_pT bou1Pum(
+    redeclare package Medium = Medium,
+    use_T_in=true,
+    nPorts=2) "Primary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={150,-82})));
+  Buildings.Fluid.Sources.Boundary_pT bou2(
+    redeclare package Medium = Medium,
+    use_T_in=true,
+    nPorts=4) "Secondary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-70,-20})));
+  Modelica.Blocks.Sources.BooleanExpression uHeaRej(
+    y=time >= 3000) "Heat rejection enable signal"
+    annotation (Placement(transformation(extent={{-190,90},{-170,110}})));
+  Modelica.Blocks.Sources.BooleanExpression uEnaColRej(
+    y=time >= 1000 and time < 3000)
+    "Cold rejection enable signal"
+    annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
+  Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger hexPum(
+    redeclare final package Medium1 = Medium,
+    redeclare final package Medium2 = Medium,
+    show_T=true,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.Pump,
+    dp1Hex_nominal=20E3,
+    dp2Hex_nominal=20E3,
+    Q_flow_nominal=1E6,
+    T_a1_nominal=281.15,
+    T_b1_nominal=277.15,
+    T_a2_nominal=275.15,
+    T_b2_nominal=279.15)
+    "Heat exchanger with primary pump"
+    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi
+    "Switch secondary temperature value depending on heat/cold rejection mode"
+    annotation (Placement(transformation(extent={{-120,-90},{-100,-70}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
+    "Primary outlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={110,-100})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
+    "Primary inlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={110,-60})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
+    "Secondary outlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-30,-60})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
+    "Secondary inlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-100})));
+  Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger hexVal(
+    redeclare final package Medium1 = Medium,
+    redeclare final package Medium2 = Medium,
+    show_T=true,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.TwoWayValve,
+    dp1Hex_nominal=20E3,
+    dp2Hex_nominal=20E3,
+    Q_flow_nominal=1E6,
+    T_a1_nominal=281.15,
+    T_b1_nominal=277.15,
+    T_a2_nominal=275.15,
+    T_b2_nominal=279.15)
+    "Heat exchanger with primary control valve"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+
+  Buildings.Fluid.Sources.Boundary_pT bou1InlVal(
+    redeclare package Medium = Medium,
+    p=Medium.p_default + 30E3,
+    use_T_in=true,
+    nPorts=1) "Primary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={152,20})));
+  Buildings.Fluid.Sources.Boundary_pT bou1OutVal(redeclare package Medium =
+        Medium, nPorts=1) "Primary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={150,-20})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
+    "Primary inlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={110,20})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
+    "Primary outlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={110,-20})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
+    "Secondary outlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-30,20})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
+    "Secondary inlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-20})));
+  Buildings.Controls.OBC.CDL.Logical.Or or2
+    "Compute enable signal for heat/cold rejection"
+    annotation (Placement(transformation(extent={{-120,70},{-100,90}})));
+  Modelica.Blocks.Sources.RealExpression yValIsoCon(
+    y=if time >= 2500 then
+        1
+      else
+        0)
+    "Condenser loop isolation valve opening"
+    annotation (Placement(transformation(extent={{-190,50},{-170,70}})));
+  Modelica.Blocks.Sources.RealExpression yValIsoEva(
+    y=if time >= 500 then
+        1
+      else
+        0)
+    "Evaporator loop isolation valve opening"
+    annotation (Placement(transformation(extent={{-190,30},{-170,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin1(
+    amplitude=0.5,
+    freqHz=1e-3,
+    offset=0.5)
+    "Control signal"
+    annotation (Placement(transformation(extent={{-80,130},{-60,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Activate heat/cold rejection"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    k=0) "Zero"
+    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+  Modelica.Blocks.Sources.TimeTable TColVal(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,6;
+      2,6;
+      3,16;
+      4.5,16;
+      5,6;
+      10,6],
+    timeScale=1000,
+    offset=273.15) "Cold side temperature values"
+    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
+  Modelica.Blocks.Sources.TimeTable THotVal(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,45;
+      2,45;
+      3,55;
+      4.5,55;
+      5,25;
+      10,25],
+    timeScale=1000,
+    offset=273.15)
+    "Hot side temperature values"
+    annotation (Placement(transformation(extent={{-190,-110},{-170,-90}})));
+  Modelica.Blocks.Sources.TimeTable TSerWat(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,8;
+      1,8;
+      2,13;
+      3,18;
+      4,6;
+      5,18],
+    timeScale=1000,
+    offset=273.15) "Service water temperature values"
+    annotation (Placement(transformation(extent={{210,-90},{190,-70}})));
+equation
+  connect(swi.y, bou2.T_in) annotation (Line(points={{-98,-80},{-90,-80},{-90,
+          -16},{-82,-16}}, color={0,0,127}));
+  connect(uEnaColRej.y,swi.u2)
+    annotation (Line(points={{-169,80},{-140,80},{-140,20},{-120,20},{-120,-60},
+          {-130,-60},{-130,-80},{-122,-80}},                                                                        color={255,0,255}));
+  connect(hexPum.port_b1,senT1OutPum.port_a)
+    annotation (Line(points={{50,-74},{80,-74},{80,-100},{100,-100}},
+                                                                  color={0,127,255}));
+  connect(senT1OutPum.port_b, bou1Pum.ports[1]) annotation (Line(points={{120,
+          -100},{140,-100},{140,-83}},
+                                 color={0,127,255}));
+  connect(hexPum.port_a1,senT1InlPum.port_b)
+    annotation (Line(points={{30,-74},{20,-74},{20,-60},{100,-60}},  color={0,127,255}));
+  connect(senT1InlPum.port_a, bou1Pum.ports[2]) annotation (Line(points={{120,-60},
+          {140,-60},{140,-81}}, color={0,127,255}));
+  connect(hexPum.port_b2,senT2OutPum.port_a)
+    annotation (Line(points={{30,-86},{0,-86},{0,-60},{-20,-60}},     color={0,127,255}));
+  connect(senT2OutPum.port_b, bou2.ports[1]) annotation (Line(points={{-40,-60},
+          {-50,-60},{-50,-24},{-60,-24},{-60,-21.5}},
+                                                    color={0,127,255}));
+  connect(bou2.ports[2], senT2InlPum.port_a) annotation (Line(points={{-60,
+          -20.5},{-60,-100},{-40,-100}},
+                                  color={0,127,255}));
+  connect(senT2InlPum.port_b,hexPum.port_a2)
+    annotation (Line(points={{-20,-100},{60,-100},{60,-86},{50,-86}},
+                                                                   color={0,127,255}));
+  connect(hexVal.port_a1,senT1InlVal.port_b)
+    annotation (Line(points={{30,6},{20,6},{20,20},{100,20}},    color={0,127,255}));
+  connect(senT1InlVal.port_a, bou1InlVal.ports[1])
+    annotation (Line(points={{120,20},{142,20}}, color={0,127,255}));
+  connect(bou1OutVal.ports[1], senT1OutVal.port_b)
+    annotation (Line(points={{140,-20},{120,-20}}, color={0,127,255}));
+  connect(senT1OutVal.port_a,hexVal.port_b1)
+    annotation (Line(points={{100,-20},{70,-20},{70,6},{50,6}},
+                                                            color={0,127,255}));
+  connect(hexVal.port_a2,senT2InlVal.port_b)
+    annotation (Line(points={{50,-6},{60,-6},{60,-20},{-20,-20}},
+                                                             color={0,127,255}));
+  connect(senT2OutVal.port_a,hexVal.port_b2)
+    annotation (Line(points={{-20,20},{0,20},{0,-6},{30,-6}},     color={0,127,255}));
+  connect(uEnaColRej.y,or2.u2)
+    annotation (Line(points={{-169,80},{-140,80},{-140,72},{-122,72}},  color={255,0,255}));
+  connect(uHeaRej.y,or2.u1)
+    annotation (Line(points={{-169,100},{-130,100},{-130,80},{-122,80}},  color={255,0,255}));
+  connect(yValIsoCon.y,hexVal.yValIso_actual[1])
+    annotation (Line(points={{-169,60},{8,60},{8,-2.5},{28,-2.5}}, color={0,0,127}));
+  connect(yValIsoCon.y,hexPum.yValIso_actual[1])
+    annotation (Line(points={{-169,60},{8,60},{8,-82.5},{28,-82.5}}, color={0,0,127}));
+  connect(yValIsoEva.y,hexVal.yValIso_actual[2])
+    annotation (Line(points={{-169,40},{4,40},{4,-1.5},{28,-1.5}}, color={0,0,127}));
+  connect(yValIsoEva.y,hexPum.yValIso_actual[2])
+    annotation (Line(points={{-169,40},{4,40},{4,-81.5},{28,-81.5}}, color={0,0,127}));
+  connect(or2.y,swi1.u2)
+    annotation (Line(points={{-98,80},{-22,80}},   color={255,0,255}));
+  connect(sin1.y,swi1.u1)
+    annotation (Line(points={{-58,140},{-40,140},{-40,88},{-22,88}},  color={0,0,127}));
+  connect(zer.y,swi1.u3)
+    annotation (Line(points={{-58,100},{-50,100},{-50,72},{-22,72}},color={0,0,127}));
+  connect(swi1.y,hexVal.u)
+    annotation (Line(points={{2,80},{12,80},{12,2},{28,2}},         color={0,0,127}));
+  connect(swi1.y,hexPum.u)
+    annotation (Line(points={{2,80},{12,80},{12,-78},{28,-78}},       color={0,0,127}));
+  connect(TColVal.y,swi.u1)
+    annotation (Line(points={{-169,-60},{-140,-60},{-140,-72},{-122,-72}},color={0,0,127}));
+  connect(THotVal.y,swi.u3)
+    annotation (Line(points={{-169,-100},{-140,-100},{-140,-88},{-122,-88}},
+                                                                          color={0,0,127}));
+  connect(TSerWat.y, bou1Pum.T_in) annotation (Line(points={{189,-80},{180,-80},
+          {180,-78},{162,-78}}, color={0,0,127}));
+  connect(TSerWat.y, bou1InlVal.T_in) annotation (Line(points={{189,-80},{180,-80},
+          {180,24},{164,24}}, color={0,0,127}));
+  connect(senT2OutVal.port_b, bou2.ports[3])
+    annotation (Line(points={{-40,20},{-60,20},{-60,-19.5}},
+                                                           color={0,127,255}));
+  connect(bou2.ports[4], senT2InlVal.port_a) annotation (Line(points={{-60,
+          -18.5},{-60,-20},{-40,-20}},
+                                color={0,127,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-220,-160},{220,160}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos" "Simulate and plot"),
+    experiment(
+      StopTime=5000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatExchanger</a>
+in a configuration where the primary flow rate is modulated by means of a
+two-way valve (see <code>hexVal</code>), and in a configuration where the
+primary flow rate is modulated by means of a variable speed pump
+(see <code>hexPum</code>).
+</p>
+</html>"));
+end HeatExchanger;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mo
new file mode 100644
index 00000000000..583ac9e5e47
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mo
@@ -0,0 +1,131 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model HeatPump
+  "Validation of the base subsystem model with heat pump"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condenser outlet temperature";
+  parameter Modelica.Units.SI.Temperature TAmb_nominal = 273.15+15 "Nominal ambient loop temperature to evaporator";
+  parameter Modelica.Units.SI.Power QLoa_nominal = 1000 "Nominal load";
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPump
+    heaPum(
+    redeclare package Medium1 = Medium,
+    redeclare package Medium2 = Medium,
+    COP_nominal=2.3,
+    TCon_nominal=TCon_nominal,
+    TEva_nominal(displayUnit="K") = TAmb_nominal - heaPum.dT_nominal,
+    dp1_nominal=6000,
+    dp2_nominal=6000,
+    Q1_flow_nominal=QLoa_nominal)
+    annotation (Placement(transformation(extent={{-10,-12},{10,8}})));
+  Fluid.Sources.Boundary_pT supAmb(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar"),
+    T=TAmb_nominal,
+    nPorts=1) "Ambient water supply" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={60,-60})));
+  Fluid.Sources.Boundary_pT sinAmb(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar"),
+    nPorts=1) "Sink for ambient water" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={60,10})));
+  Fluid.Sources.Boundary_pT souLoa(
+    redeclare final package Medium = Medium,
+    T=TCon_nominal - heaPum.dT_nominal,
+    nPorts=1) "Source for load (return from load)"
+                                 annotation (Placement(
+      transformation(
+      extent={{10,-10},{-10,10}},
+      rotation=180,
+      origin={-110,-52})));
+
+  Modelica.Blocks.Sources.Sine sin(f=1/(86400/2)) "Load signal"
+    annotation (Placement(transformation(extent={{-120,80},{-100,100}})));
+  Modelica.Blocks.Nonlinear.Limiter limiter(uMax=1, uMin=0)
+    annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
+  Modelica.Blocks.Math.Gain gain(k=QLoa_nominal/(4200*5))
+    annotation (Placement(transformation(extent={{-48,80},{-28,100}})));
+  Modelica.Blocks.Sources.Step TSetCon(
+    height=-2,
+    offset=TCon_nominal,
+    startTime=86400/2) "Set point of condenser outlet"
+    annotation (Placement(transformation(extent={{-120,20},{-100,40}})));
+  Fluid.Sources.Boundary_pT sinLoa(redeclare final package Medium = Medium,
+      nPorts=1) "Sink for load" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=180,
+        origin={-110,0})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaHea(t=1e-4)
+    "Threshold comparison to enable heating"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  Fluid.Sensors.TemperatureTwoPort senTLoaSup(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=QLoa_nominal/(4200*5),
+    tau=0) "Load supply temperature sensor"
+                                         annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-70,0})));
+  Fluid.Sensors.MassFlowRate senMasFloAmb(redeclare package Medium = Medium)
+    "Mass flow rate sensor for ambient loop"
+    annotation (Placement(transformation(extent={{40,-70},{20,-50}})));
+equation
+  connect(sinAmb.ports[1], heaPum.port_b2) annotation (Line(points={{50,10},{22,
+          10},{22,4},{10,4}}, color={0,127,255}));
+  connect(sin.y, limiter.u)
+    annotation (Line(points={{-99,90},{-82,90}}, color={0,0,127}));
+  connect(limiter.y, gain.u)
+    annotation (Line(points={{-59,90},{-50,90}}, color={0,0,127}));
+  connect(heaPum.m1_flow, gain.y) annotation (Line(points={{-12,-2},{-27,-2},{-27,
+          90}},          color={0,0,127}));
+  connect(TSetCon.y, heaPum.TSupSet) annotation (Line(points={{-99,30},{-22,30},
+          {-22,1},{-12,1}}, color={0,0,127}));
+  connect(souLoa.ports[1], heaPum.port_a1) annotation (Line(points={{-100,-52},{
+          -20,-52},{-20,-8},{-10,-8}}, color={0,127,255}));
+  connect(enaHea.y, heaPum.uEna) annotation (Line(points={{-58,50},{-18,50},{-18,
+          8},{-12,8},{-12,7}}, color={255,0,255}));
+  connect(limiter.y, enaHea.u) annotation (Line(points={{-59,90},{-56,90},{-56,68},
+          {-92,68},{-92,50},{-82,50}}, color={0,0,127}));
+  connect(sinLoa.ports[1], senTLoaSup.port_b) annotation (Line(points={{-100,
+          -8.88178e-16},{-90,-8.88178e-16},{-90,0},{-80,0}}, color={0,127,255}));
+  connect(senTLoaSup.port_a, heaPum.port_b1) annotation (Line(points={{-60,0},{
+          -40,0},{-40,4},{-10,4}}, color={0,127,255}));
+  connect(heaPum.port_a2, senMasFloAmb.port_b)
+    annotation (Line(points={{10,-8},{20,-8},{20,-60}}, color={0,127,255}));
+  connect(senMasFloAmb.port_a, supAmb.ports[1])
+    annotation (Line(points={{40,-60},{50,-60}}, color={0,127,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-120,-100},{100,100}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos" "Simulate and plot"),
+    experiment(
+      StopTime=172800,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+November 15, 2023, by David Blum:<br/>
+Update for new heat pump subsystem model.
+</li>
+<li>
+November 1, 2020, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
+</p>
+</html>"));
+end HeatPump;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
new file mode 100644
index 00000000000..187bdc530f8
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
@@ -0,0 +1,139 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model HeatPumpDHWTank
+  "Validation of the base subsystem model with domestic hot water tank and heat pump"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal = 5
+    "Nominal temperature difference across heat pump condensor and district supply/return water";
+  parameter Modelica.Units.SI.Temperature TDisSup_nominal = 273.15 + 15
+    "Nominal district supply water temperature";
+  Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank
+    heaPum(
+    redeclare package Medium1 = Medium,
+    redeclare package Medium2 = Medium,
+    datWatHea=datWatHea,
+    COP_nominal=2.3,
+    TCon_nominal=datWatHea.TDom_nominal + datWatHea.dTHexApp_nominal +
+        dT_nominal,
+    TEva_nominal(displayUnit="K") = TDisSup_nominal - dT_nominal,
+    QHotWat_flow_nominal=datWatHea.QHex_flow_nominal,
+    dT_nominal=dT_nominal,
+    dp1_nominal=6000,
+    dp2_nominal=6000)
+    annotation (Placement(transformation(extent={{-10,-12},{10,8}})));
+  Fluid.Sources.Boundary_pT           supAmbWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar"),
+    use_T_in=true,
+    T=280.15,
+    nPorts=1) "Ambient water supply"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-60})));
+  Fluid.Sources.Boundary_pT           sinAmbWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar"),
+    nPorts=1) "Sink for ambient water"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,10})));
+  Fluid.Sensors.MassFlowRate           senMasFlo(redeclare package Medium =
+        Medium)
+    "Mass flow rate sensor"
+    annotation (Placement(transformation(extent={{40,-70},{20,-50}})));
+  Modelica.Blocks.Sources.Constant TDisSup(k = TDisSup_nominal)
+    "District supply temperature"
+    annotation (Placement(transformation(extent={{100,-60},{80,-40}})));
+  Fluid.Sources.Boundary_pT souDCW(
+    redeclare final package Medium = Medium,
+    T=283.15,
+    nPorts=1) "Source for domestic cold water"
+                                 annotation (Placement(
+      transformation(
+      extent={{10,-10},{-10,10}},
+      rotation=180,
+      origin={-70,-30})));
+  Buildings.DHC.ETS.BaseClasses.Junction dcwSpl(
+      redeclare final package Medium = Medium, final m_flow_nominal=6000*{1,-1,
+        -1})                                 "Splitter for domestic cold water"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-32,-10})));
+  Modelica.Blocks.Sources.CombiTimeTable sch(
+    tableOnFile=true,
+    tableName="tab1",
+    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
+    smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
+    "Domestic hot water fixture draw fraction schedule"
+    annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
+
+  Modelica.Blocks.Sources.Constant conTSetMix(k(
+      final unit="K",
+      displayUnit="degC") = 308.15)
+    "Temperature setpoint for mixed water supply to fixture"
+    annotation (Placement(transformation(extent={{-120,20},{-100,40}})));
+  Loads.HotWater.ThermostaticMixingValve
+                          theMixVal(redeclare package Medium = Medium,
+      mMix_flow_nominal=1.2*datWatHea.mDom_flow_nominal)
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+  parameter Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+    datWatHea(VTan=0.1892706, mDom_flow_nominal=6.52944E-06*1000)
+    "Data for heat pump water heater with tank"
+    annotation (Placement(transformation(extent={{-10,22},{10,42}})));
+  Modelica.Blocks.Sources.BooleanConstant on "Enable"
+    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
+equation
+  connect(TDisSup.y,supAmbWat. T_in)
+    annotation (Line(points={{79,-50},{76,-50},{76,-56},{72,-56}},
+                                                 color={0,0,127}));
+  connect(supAmbWat.ports[1], senMasFlo.port_a)
+    annotation (Line(points={{50,-60},{40,-60}}, color={0,127,255}));
+  connect(senMasFlo.port_b, heaPum.port_a2) annotation (Line(points={{20,-60},{16,
+          -60},{16,-8},{10,-8}}, color={0,127,255}));
+  connect(sinAmbWat.ports[1], heaPum.port_b2) annotation (Line(points={{50,10},
+          {22,10},{22,-8},{-10,-8}},
+                                 color={0,127,255}));
+  connect(dcwSpl.port_1, souDCW.ports[1]) annotation (Line(points={{-32,-20},{-32,
+          -30},{-60,-30}}, color={0,127,255}));
+  connect(dcwSpl.port_3, heaPum.port_a1)
+    annotation (Line(points={{-22,-10},{-22,4},{-10,4}},   color={0,127,255}));
+  connect(sch.y[1], theMixVal.yMixSet) annotation (Line(points={{-99,70},{-80,70},
+          {-80,78},{-61,78}}, color={0,0,127}));
+  connect(conTSetMix.y, theMixVal.TMixSet) annotation (Line(points={{-99,30},{-76,
+          30},{-76,72},{-61,72}}, color={0,0,127}));
+  connect(dcwSpl.port_2, theMixVal.port_col) annotation (Line(points={{-32,0},{-32,
+          38},{-68,38},{-68,62},{-60,62}}, color={0,127,255}));
+  connect(theMixVal.port_hot, heaPum.port_b1) annotation (Line(points={{-60,66},
+          {-72,66},{-72,4},{10,4}},  color={0,127,255}));
+  connect(on.y, heaPum.uEna) annotation (Line(points={{-99,-10},{-60,-10},{-60,
+          7},{-12,7}}, color={255,0,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-120,-100},{100,100}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos" "Simulate and plot"),
+    experiment(
+      StopTime=172800,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+November 28, 2023, by David Blum:<br/>
+Update for new heat pump with storage tank subsystem model.
+</li>
+<li>
+October 31, 2020, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
+</p>
+</html>"));
+end HeatPumpDHWTank;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mo
new file mode 100644
index 00000000000..700488d0513
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mo
@@ -0,0 +1,119 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model SwitchBox "Validation of flow switch box"
+  extends Modelica.Icons.Example;
+
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal water mass flow rate";
+  Fluid.Delays.DelayFirstOrder volSup(
+    redeclare final package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
+    final m_flow_nominal=m_flow_nominal,
+    tau=60,
+    nPorts=3) "Mixing volume supply" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-70,0})));
+  Fluid.Delays.DelayFirstOrder volRet(
+    redeclare final package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
+    final m_flow_nominal=m_flow_nominal,
+    tau=60,
+    nPorts=3) "Mixing volume return" annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={70,0})));
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum1(
+    redeclare package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal)
+    "Chilled water HX secondary pump"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pum2(
+    redeclare package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal)
+    "Chilled water HX secondary pump"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.DHC.ETS.Combined.Subsystems.SwitchBox
+    floSwiBox(final m_flow_nominal=m_flow_nominal, redeclare final package
+      Medium = Medium,
+    trueHoldDuration=300)
+                       "Flow switch box"
+    annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
+  Fluid.Sensors.MassFlowRate senMasFlo(
+    redeclare final package Medium = Medium) "District water mass flow rate"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={0,-100})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant setMasFlo1(k=0.5)
+    "Set point for mass flow rate (normalized)"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+  Fluid.Sources.Boundary_pT disWatBou(redeclare package Medium = Medium,
+      nPorts=2) "District water boundary conditions" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-70,-90})));
+  Modelica.Blocks.Sources.CombiTimeTable setMasFlo2(
+    tableName="tab1",
+    table=[0,0; 0.6,1; 0.7,0; 1,1],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    columns={2},
+    timeScale=1000) "Set point for mass flow rate (normalized)"
+    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=
+        m_flow_nominal) "Scale with nominal mass flow rate"
+    annotation (Placement(transformation(extent={{-46,70},{-26,90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
+        m_flow_nominal) "Scale with nominal mass flow rate"
+    annotation (Placement(transformation(extent={{-46,30},{-26,50}})));
+equation
+  connect(pum1.port_b, volSup.ports[1]) annotation (Line(points={{-10,0},{-60,0},
+          {-60,-1.33333}}, color={0,127,255}));
+  connect(volSup.ports[2], pum2.port_a) annotation (Line(points={{-60,-4.44089e-16},
+          {-60,60},{-10,60}}, color={0,127,255}));
+  connect(pum2.port_b, volRet.ports[1]) annotation (Line(points={{10,60},{60,60},
+          {60,-1.33333}}, color={0,127,255}));
+  connect(volRet.ports[2], pum1.port_a) annotation (Line(points={{60,8.88178e-16},
+          {60,0},{10,0}}, color={0,127,255}));
+  connect(floSwiBox.port_bSup, volSup.ports[3]) annotation (Line(points={{-6,-40},
+          {-6,-20},{-60,-20},{-60,1.33333}}, color={0,127,255}));
+  connect(floSwiBox.port_aRet, volRet.ports[3]) annotation (Line(points={{6,-40},
+          {6,-20},{60,-20},{60,1.33333}}, color={0,127,255}));
+  connect(floSwiBox.port_bRet, senMasFlo.port_a) annotation (Line(points={{6,-60},
+          {6,-80},{60,-80},{60,-100},{10,-100}},
+                                       color={0,127,255}));
+  connect(senMasFlo.port_b, disWatBou.ports[1]) annotation (Line(points={{-10,
+          -100},{-60,-100},{-60,-91}},
+                                     color={0,127,255}));
+  connect(disWatBou.ports[2], floSwiBox.port_aSup) annotation (Line(points={{-60,-89},
+          {-60,-80},{-6,-80},{-6,-60}},
+                                    color={0,127,255}));
+  connect(pum1.m_flow_actual, floSwiBox.mRev_flow) annotation (Line(points={{-11,
+          5},{-20,5},{-20,-54},{-12,-54}}, color={0,0,127}));
+  connect(setMasFlo2.y[1], gai2.u)
+    annotation (Line(points={{-69,80},{-48,80}}, color={0,0,127}));
+  connect(gai2.y, pum2.m_flow_in)
+    annotation (Line(points={{-24,80},{0,80},{0,72}}, color={0,0,127}));
+  connect(setMasFlo1.y, gai1.u)
+    annotation (Line(points={{-68,40},{-48,40}}, color={0,0,127}));
+  connect(gai1.y, pum1.m_flow_in)
+    annotation (Line(points={{-24,40},{0,40},{0,12}}, color={0,0,127}));
+  connect(pum2.m_flow_actual, floSwiBox.mPos_flow) annotation (Line(points={{11,
+          65},{20,65},{20,-28},{-16,-28},{-16,-46},{-12,-46}}, color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}})),
+    Documentation(info="<html>
+<p>
+This model validates that
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.SwitchBox\">
+Buildings.DHC.ETS.Combined.Subsystems.SwitchBox</a>
+maintains a positive flow rate in the district line outside of the temporization
+period set by the controller.
+</p>
+</html>"),
+  experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+    file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos"
+    "Simulate and plot"));
+end SwitchBox;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mo
new file mode 100644
index 00000000000..4f6d7f19681
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mo
@@ -0,0 +1,274 @@
+within Buildings.DHC.ETS.Combined.Subsystems.Validation;
+model WatersideEconomizer
+  "Validation of the base subsystem model with waterside economizer"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  Buildings.Fluid.Sources.Boundary_pT bou1Pum(
+    redeclare package Medium = Medium,
+    use_T_in=true,
+    nPorts=2) "Primary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={140,-62})));
+  Buildings.Fluid.Movers.FlowControlled_dp pum2Pum(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=hexPum.m2_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
+    dp_nominal=25E4) "CHW pump" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-70,-40})));
+  Modelica.Blocks.Sources.BooleanExpression uCoo(y=time >= 1000)
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-200,70},{-180,90}})));
+  Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer hexPum(
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=Medium,
+    show_T=true,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.Pump,
+    dp1Hex_nominal=3E4,
+    dp2Hex_nominal=3E4,
+    Q_flow_nominal=-1E6,
+    T_a1_nominal=281.15,
+    T_b1_nominal=291.15,
+    T_a2_nominal=293.15,
+    T_b2_nominal=283.15)
+    "Heat exchanger with primary pump"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
+    "Primary outlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={100,-80})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
+    "Primary inlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={100,-40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
+    "Secondary outlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-40,-40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlPum(redeclare final
+      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
+    "Secondary inlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-40,-80})));
+  Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer hexVal(
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=Medium,
+    show_T=true,
+    conCon=Buildings.DHC.ETS.Types.ConnectionConfiguration.TwoWayValve,
+    dp1Hex_nominal=3E4,
+    dp2Hex_nominal=3E4,
+    Q_flow_nominal=-1E6,
+    T_a1_nominal=281.15,
+    T_b1_nominal=291.15,
+    T_a2_nominal=293.15,
+    T_b2_nominal=283.15)
+    "Heat exchanger with primary control valve"
+    annotation (Placement(transformation(extent={{20,10},{40,30}})));
+  Buildings.Fluid.Sources.Boundary_pT bou1InlVal(
+    redeclare package Medium = Medium,
+    p=Medium.p_default + 45E3,
+    use_T_in=true,
+    nPorts=1) "Primary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={140,40})));
+  Buildings.Fluid.Sources.Boundary_pT bou1OutVal(redeclare package Medium =
+        Medium, nPorts=1) "Primary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={140,0})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
+    "Primary inlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={100,40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
+    "Primary outlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={100,0})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
+    "Secondary outlet temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-40,40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlVal(redeclare final
+      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
+    "Secondary inlet temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-40,0})));
+  Buildings.Fluid.Sensors.RelativePressure senRelPre(redeclare final package
+      Medium = Medium) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={80,20})));
+  Modelica.Blocks.Sources.TimeTable TChiWatRet(
+    y(final unit="K", displayUnit="degC"),
+    table=[0,10; 2,15; 3,16; 4.5,16; 5,13; 10,9],
+    timeScale=1000,
+    offset=273.15) "Chilled water return temperature values"
+    annotation (Placement(transformation(extent={{-200,10},{-180,30}})));
+  Modelica.Blocks.Sources.TimeTable TSerWat(
+    y(final unit="K",
+      displayUnit="degC"),
+    table=[
+      0,8;
+      1,8;
+      2,13;
+      3,18;
+      4,6;
+      5,18],
+    timeScale=1000,
+    offset=273.15) "Service water temperature values"
+    annotation (Placement(transformation(extent={{200,-70},{180,-50}})));
+  Buildings.Fluid.Sources.Boundary_pT bou2(
+    redeclare package Medium = Medium,
+    use_T_in=true,
+    nPorts=4) "Secondary boundary conditions" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-150,0})));
+  Buildings.Fluid.FixedResistances.PressureDrop resPum(
+    redeclare package Medium = Medium,
+    m_flow_nominal=hexPum.m2_flow_nominal,
+    dp_nominal=20E4) "Pipe flow resistance"
+    annotation (Placement(transformation(extent={{-100,-50},{-120,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp     dpSet(
+    height=15E4,
+    duration=1000,
+    offset=10E4,
+    startTime=1500)                                                    "Differential pressure set point"
+    annotation (Placement(transformation(extent={{-200,-40},{-180,-20}})));
+  Buildings.Fluid.Movers.FlowControlled_dp pum2Val(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=hexPum.m2_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
+    dp_nominal=25E4) "CHW pump" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-70,40})));
+  Buildings.Fluid.FixedResistances.PressureDrop resVal(
+    redeclare package Medium = Medium,
+    m_flow_nominal=hexPum.m2_flow_nominal,
+    dp_nominal=20E4) "Pipe flow resistance"
+    annotation (Placement(transformation(extent={{-100,30},{-120,50}})));
+  Modelica.Blocks.Sources.RealExpression yEva(y=0) "Isolation valve signal"
+    annotation (Placement(transformation(extent={{-200,50},{-180,70}})));
+equation
+  connect(hexPum.port_b1,senT1OutPum.port_a)
+    annotation (Line(points={{40,-54},{70,-54},{70,-80},{90,-80}},color={0,127,255}));
+  connect(senT1OutPum.port_b, bou1Pum.ports[1]) annotation (Line(points={{110,-80},
+          {130,-80},{130,-63}}, color={0,127,255}));
+  connect(hexPum.port_a1,senT1InlPum.port_b)
+    annotation (Line(points={{20,-54},{10,-54},{10,-40},{90,-40}},   color={0,127,255}));
+  connect(senT1InlPum.port_a, bou1Pum.ports[2]) annotation (Line(points={{110,-40},
+          {130,-40},{130,-61}}, color={0,127,255}));
+  connect(hexPum.port_b2,senT2OutPum.port_a)
+    annotation (Line(points={{20,-66},{-10,-66},{-10,-40},{-30,-40}}, color={0,127,255}));
+  connect(senT2InlPum.port_b,hexPum.port_a2)
+    annotation (Line(points={{-30,-80},{50,-80},{50,-66},{40,-66}},color={0,127,255}));
+  connect(hexVal.port_a1,senT1InlVal.port_b)
+    annotation (Line(points={{20,26},{10,26},{10,40},{90,40}},   color={0,127,255}));
+  connect(senT1InlVal.port_a, bou1InlVal.ports[1])
+    annotation (Line(points={{110,40},{130,40}}, color={0,127,255}));
+  connect(bou1OutVal.ports[1], senT1OutVal.port_b)
+    annotation (Line(points={{130,0},{110,0}}, color={0,127,255}));
+  connect(senT1OutVal.port_a,hexVal.port_b1)
+    annotation (Line(points={{90,0},{60,0},{60,26},{40,26}},color={0,127,255}));
+  connect(hexVal.port_a2,senT2InlVal.port_b)
+    annotation (Line(points={{40,14},{50,14},{50,0},{-30,0}},color={0,127,255}));
+  connect(senT2OutVal.port_a,hexVal.port_b2)
+    annotation (Line(points={{-30,40},{-10,40},{-10,14},{20,14}}, color={0,127,255}));
+  connect(hexVal.port_a1,senRelPre.port_a)
+    annotation (Line(points={{20,26},{10,26},{10,40},{80,40},{80,30}},   color={0,127,255}));
+  connect(senRelPre.port_b,senT1OutVal.port_a)
+    annotation (Line(points={{80,10},{80,0},{90,0}},color={0,127,255}));
+  connect(TSerWat.y, bou1Pum.T_in) annotation (Line(points={{179,-60},{170,-60},
+          {170,-58},{152,-58}}, color={0,0,127}));
+  connect(TSerWat.y, bou1InlVal.T_in) annotation (Line(points={{179,-60},{170,-60},
+          {170,44},{152,44}}, color={0,0,127}));
+  connect(uCoo.y, hexVal.uCoo) annotation (Line(points={{-179,80},{0,80},{0,20},{18,20}},      color={255,0,255}));
+  connect(uCoo.y, hexPum.uCoo) annotation (Line(points={{-179,80},{0,80},{0,-60},{18,-60}},      color={255,0,255}));
+  connect(bou2.ports[1], senT2InlVal.port_a) annotation (Line(points={{-140,
+          -1.5},{-120,-1.5},{-120,0},{-50,0}},
+                                      color={0,127,255}));
+  connect(TChiWatRet.y, bou2.T_in) annotation (Line(points={{-179,20},{-172,20},
+          {-172,4},{-162,4}}, color={0,0,127}));
+  connect(pum2Pum.port_a, senT2OutPum.port_b)
+    annotation (Line(points={{-60,-40},{-50,-40}}, color={0,127,255}));
+  connect(resPum.port_a, pum2Pum.port_b)
+    annotation (Line(points={{-100,-40},{-80,-40}}, color={0,127,255}));
+  connect(dpSet.y, pum2Pum.dp_in) annotation (Line(points={{-178,-30},{-90,-30},
+          {-90,-20},{-70,-20},{-70,-28}}, color={0,0,127}));
+  connect(senT2OutVal.port_b, pum2Val.port_a)
+    annotation (Line(points={{-50,40},{-60,40}}, color={0,127,255}));
+  connect(pum2Val.port_b, resVal.port_a)
+    annotation (Line(points={{-80,40},{-100,40}}, color={0,127,255}));
+  connect(dpSet.y, pum2Val.dp_in) annotation (Line(points={{-178,-30},{-90,-30},
+          {-90,60},{-70,60},{-70,52}}, color={0,0,127}));
+  connect(resVal.port_b, bou2.ports[2]) annotation (Line(points={{-120,40},{
+          -140,40},{-140,-0.5}},
+                              color={0,127,255}));
+  connect(yEva.y, hexVal.yValIsoEva_actual) annotation (Line(points={{-179,60},
+          {-6,60},{-6,17},{18,17}}, color={0,0,127}));
+  connect(yEva.y, hexPum.yValIsoEva_actual) annotation (Line(points={{-179,60},
+          {-6.07143,60},{-6.07143,17.1429},{-6,17.1429},{-6,-63},{18,-63}},
+        color={0,0,127}));
+  connect(bou2.ports[3], resPum.port_b) annotation (Line(points={{-140,0.5},{
+          -140,-2},{-130,-2},{-130,-40},{-120,-40}}, color={0,127,255}));
+  connect(senT2InlPum.port_a, bou2.ports[4]) annotation (Line(points={{-50,-80},
+          {-140,-80},{-140,1.5}},color={0,127,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-220,-120},{220,120}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=5000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer\">
+Buildings.DHC.ETS.Combined.Subsystems.WatersideEconomizer</a>
+in a configuration where the primary flow rate is modulated by means of a
+two-way valve (see <code>hexVal</code>), and in a configuration where the
+primary flow rate is modulated by means of a variable speed pump
+(see <code>hexPum</code>).
+</p>
+</html>"));
+end WatersideEconomizer;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.mo b/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.mo
new file mode 100644
index 00000000000..1c5514e32f2
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems\">
+Buildings.DHC.ETS.Combined.Subsystems</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.order b/Buildings/DHC/ETS/Combined/Subsystems/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.order
rename to Buildings/DHC/ETS/Combined/Subsystems/Validation/package.order
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/WatersideEconomizer.mo b/Buildings/DHC/ETS/Combined/Subsystems/WatersideEconomizer.mo
new file mode 100644
index 00000000000..f40caadf7c4
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/WatersideEconomizer.mo
@@ -0,0 +1,372 @@
+within Buildings.DHC.ETS.Combined.Subsystems;
+model WatersideEconomizer
+  "Base subsystem with waterside economizer"
+  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
+    final m1_flow_nominal=abs(Q_flow_nominal/4200/(T_b1_nominal - T_a1_nominal)),
+    final m2_flow_nominal=abs(Q_flow_nominal/4200/(T_b2_nominal - T_a2_nominal)));
+  parameter DHC.ETS.Types.ConnectionConfiguration conCon
+    "District connection configuration" annotation (Evaluate=true);
+  parameter Modelica.Units.SI.PressureDifference dp1Hex_nominal(displayUnit=
+        "Pa") "Nominal pressure drop across heat exchanger on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dp2Hex_nominal(displayUnit=
+        "Pa") "Nominal pressure drop across heat exchanger on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpVal1_nominal(displayUnit=
+        "Pa") = if have_val1 then dp1Hex_nominal/2 else 0
+    "Nominal pressure drop of primary control valve"
+    annotation (Dialog(enable=have_val1, group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpVal2_nominal(displayUnit=
+        "Pa") = dp2Hex_nominal/10
+    "Nominal pressure drop of heat exchanger bypass valve"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
+    "Nominal heat flow rate (from district to building)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_a1_nominal
+    "Nominal water inlet temperature on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_b1_nominal
+    "Nominal water outlet temperature on district side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_a2_nominal
+    "Nominal water inlet temperature on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature T_b2_nominal
+    "Nominal water outlet temperature on building side"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real y1Min(final unit="1")=0.05
+    "Minimum pump flow rate or valve opening for temperature measurement (fractional)"
+    annotation (Dialog(group="Controls"));
+  parameter Modelica.Units.SI.TemperatureDifference dTEna=1
+    "Minimum delta-T above predicted heat exchanger leaving water temperature to enable WSE"
+    annotation (Dialog(group="Controls"));
+  parameter Modelica.Units.SI.TemperatureDifference dTDis=0.5
+    "Minimum delta-T across heat exchanger before disabling WSE"
+    annotation (Dialog(group="Controls"));
+  parameter Real k(
+    min=0)=1
+    "Gain of controller"
+    annotation (Dialog(group="Controls"));
+  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)=
+       60 "Time constant of integrator block"
+    annotation (Dialog(group="Controls"));
+  // IO CONNECTORS
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
+    final unit="W") if not have_val1
+    "Power drawn by pump motors"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+    iconTransformation(extent={{100,-20},{140,20}})));
+  // COMPONENTS
+  Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer conWSE(
+    final m2_flow_nominal=m2_flow_nominal,
+    final y1Min=y1Min,
+    final T_a1_nominal=T_a1_nominal,
+    final T_b2_nominal=T_b2_nominal,
+    final dTEna=dTEna,
+    final dTDis=dTDis)
+    "District heat exchanger loop controller"
+    annotation (Placement(transformation(extent={{30,150},{50,170}})));
+  Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU hex(
+    redeclare final package Medium1 = Medium1,
+    redeclare final package Medium2 = Medium2,
+    final use_Q_flow_nominal=true,
+    configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow,
+    final allowFlowReversal1=allowFlowReversal1,
+    final allowFlowReversal2=allowFlowReversal2,
+    final dp1_nominal=if have_val1 then 0 else dp1Hex_nominal,
+    final dp2_nominal=0,
+    final m1_flow_nominal=m1_flow_nominal,
+    final m2_flow_nominal=m2_flow_nominal,
+    final Q_flow_nominal=Q_flow_nominal,
+    final T_a1_nominal=T_a1_nominal,
+    final T_a2_nominal=T_a2_nominal)
+    "Heat exchanger" annotation (Placement(
+        transformation(extent={{10,10},{-10,-10}}, rotation=180)));
+  DHC.ETS.BaseClasses.Pump_m_flow pum1(
+    redeclare final package Medium = Medium1,
+    final m_flow_nominal=m1_flow_nominal,
+    final dp_nominal=dp1Hex_nominal,
+    final allowFlowReversal=allowFlowReversal1) if not have_val1
+    "District heat exchanger primary pump" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=180,
+        origin={-60,80})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatEnt(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=m2_flow_nominal,
+    final allowFlowReversal=allowFlowReversal2)
+    "Heat exchanger secondary water entering temperature" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={40,-60})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatLvg(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=m2_flow_nominal,
+    final allowFlowReversal=allowFlowReversal2)
+    "Heat exchanger secondary water leaving temperature"
+    annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-40,-60})));
+  Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent val1(
+    redeclare final package Medium = Medium1,
+    final m_flow_nominal=m1_flow_nominal,
+    from_dp=true,
+    final dpValve_nominal=dpVal1_nominal,
+    final dpFixed_nominal=dp1Hex_nominal,
+    use_inputFilter=false) if have_val1
+    "Heat exchanger primary control valve"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
+        m1_flow_nominal) if not have_val1 "Scale to nominal mass flow rate"
+    annotation (Placement(transformation(extent={{10,100},{-10,120}})));
+  Buildings.Fluid.Actuators.Valves.ThreeWayLinear val2(
+    redeclare final package Medium = Medium2,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    use_inputFilter=false,
+    final m_flow_nominal=m2_flow_nominal,
+    final dpValve_nominal=dpVal2_nominal,
+    final dpFixed_nominal={dp2Hex_nominal,0},
+    fraK=1) "Heat exchanger secondary control valve" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={20,-40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senT1WatEnt(
+    redeclare final package Medium = Medium1,
+    final m_flow_nominal=m1_flow_nominal,
+    final allowFlowReversal=allowFlowReversal1)
+    "Heat exchanger primary water entering temperature" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-20,40})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-140,140},{-100,180}}),
+    iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIsoEva_actual(final unit="1")
+    "Return position of evaporator to ambient loop isolation valve"
+    annotation (Placement(transformation(extent={{-140,110},{-100,150}}),
+    iconTransformation(extent={{-140,-50},{-100,-10}})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo2(redeclare final package
+      Medium = Medium2, final allowFlowReversal=allowFlowReversal2)
+    "Heat exchanger secondary mass flow rate" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-80,-60})));
+protected
+  parameter Boolean have_val1=
+    conCon ==Buildings.DHC.ETS.Types.ConnectionConfiguration.TwoWayValve
+    "True in case of control valve on district side, false in case of a pump";
+equation
+  if not have_val1 then
+    connect(hex.port_b1, port_b1) annotation (Line(points={{10,6},{20,6},{20,60},
+            {100,60}}, color={0,127,255}));
+  else
+    connect(port_a1, senT1WatEnt.port_a) annotation (Line(points={{-100,60},{-20,60},{-20,50}}, color={0,127,255}));
+  end if;
+  connect(port_a1,pum1.port_a)
+    annotation (Line(points={{-100,60},{-90,60},{-90,80},{-70,80}},color={0,127,255}));
+  connect(val1.port_b,port_b1)
+    annotation (Line(points={{90,80},{94,80},{94,60},{100,60}},color={0,127,255}));
+  connect(conWSE.y1, val1.y) annotation (Line(points={{52,165},{80,165},{80,92}},  color={0,0,127}));
+  connect(conWSE.y1, gai1.u) annotation (Line(points={{52,165},{80,165},{80,110},
+          {12,110}},                                                                           color={0,0,127}));
+  connect(gai1.y,pum1.m_flow_in)
+    annotation (Line(points={{-12,110},{-60,110},{-60,92}},color={0,0,127}));
+  connect(PPum, pum1.P) annotation (Line(points={{120,0},{44,0},{44,89},{-49,89}}, color={0,0,127}));
+  connect(conWSE.yVal2, val2.y)
+    annotation (Line(points={{52,155},{60,155},{60,-40},{32,-40}},        color={0,0,127}));
+  connect(port_a2, senT2WatEnt.port_a) annotation (Line(points={{100,-60},{50,-60}}, color={0,127,255}));
+  connect(hex.port_b2, senT2WatLvg.port_a)
+    annotation (Line(points={{-10,-6},{-20,-6},{-20,-60},{-30,-60}}, color={0,127,255}));
+  connect(senT1WatEnt.port_b, hex.port_a1) annotation (Line(points={{-20,30},
+          {-20,6},{-10,6}},                                                                       color={0,127,255}));
+  connect(senT1WatEnt.port_a, pum1.port_b)
+    annotation (Line(points={{-20,50},{-20,80},{-50,80}}, color={0,127,255}));
+  connect(hex.port_b1, val1.port_a) annotation (Line(points={{10,6},{20,6},{
+          20,80},{70,80}},                                                                      color={0,127,255}));
+  connect(uCoo, conWSE.uCoo) annotation (Line(points={{-120,160},{-40,160},{-40,168},{28,168}}, color={255,0,255}));
+  connect(senT1WatEnt.T, conWSE.T1WatEnt)
+    annotation (Line(points={{-31,40},{-38,40},{-38,162},{28,162}}, color={0,0,127}));
+  connect(conWSE.T2WatEnt, senT2WatEnt.T)
+    annotation (Line(points={{28,159},{20,159},{20,140},{40,140},{40,-49},{40,-49}}, color={0,0,127}));
+  connect(senT2WatLvg.T, conWSE.T2WatLvg)
+    annotation (Line(points={{-40,-49},{-40,156},{28,156}}, color={0,0,127}));
+  connect(yValIsoEva_actual, conWSE.yValIsoEva_actual)
+    annotation (Line(points={{-120,130},{24,130},{24,153},{28,153}}, color={0,0,127}));
+  connect(val2.port_3, senT2WatLvg.port_a)
+    annotation (Line(points={{10,-40},{-20,-40},{-20,-60},{-30,-60}}, color={0,127,255}));
+  connect(val2.port_1, hex.port_a2)
+    annotation (Line(points={{20,-30},{20,-6},{10,-6}}, color={0,127,255}));
+  connect(val2.port_2, senT2WatEnt.port_b)
+    annotation (Line(points={{20,-50},{20,-60},{30,-60}}, color={0,127,255}));
+  connect(port_b2, senMasFlo2.port_b)
+    annotation (Line(points={{-100,-60},{-90,-60}}, color={0,127,255}));
+  connect(senMasFlo2.port_a, senT2WatLvg.port_b)
+    annotation (Line(points={{-70,-60},{-50,-60}}, color={0,127,255}));
+  connect(senMasFlo2.m_flow, conWSE.m2_flow)
+    annotation (Line(points={{-80,-49},{-80,165},{28,165}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="hex",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-34,40},{36,-40}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-26,34},{-22,-34}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-22,34},{-14,-34}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-10,34},{0,-34}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-14,34},{-10,-34}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{4,34},{12,-34}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{0,34},{4,-34}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{16,34},{24,-34}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{12,34},{16,-34}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{24,34},{28,-34}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-58,61},
+          rotation=90),
+        Rectangle(
+          extent={{-18,62},{-16,40}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={58,61},
+          rotation=90),
+        Rectangle(
+          extent={{16,62},{18,40}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={58,-59},
+          rotation=90),
+        Rectangle(
+          extent={{-1,42},{1,-42}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-58,-59},
+          rotation=90),
+        Rectangle(
+          extent={{-18,-40},{-16,-60}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{16,-40},{18,-60}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-160},{100,180}})),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+July 14, 2021, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This is a model for a waterside economizer for sidestream integration (in
+series with the chillers).
+The primary side is typically connected to the service line.
+The primary flow rate is modulated either with a variable speed pump or
+with a two-way valve.
+The secondary side is typically connected to the chilled water return,
+using a three-port two-position directional control valve.
+</p>
+<p>
+The system is controlled based on the logic described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer\">
+Buildings.DHC.ETS.Combined.Controls.WatersideEconomizer</a>.
+</p>
+</html>"));
+end WatersideEconomizer;
diff --git a/Buildings/DHC/ETS/Combined/Subsystems/package.mo b/Buildings/DHC/ETS/Combined/Subsystems/package.mo
new file mode 100644
index 00000000000..b2bfddf9fb3
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Subsystems/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.Combined;
+package Subsystems "Package of models for subsystems of fifth generation DHC ETS"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for subsystems composing energy transfer stations in
+fifth generation district heating and cooling systems.
+</p>
+</html>"));
+end Subsystems;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.order b/Buildings/DHC/ETS/Combined/Subsystems/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.order
rename to Buildings/DHC/ETS/Combined/Subsystems/package.order
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/PartialChillerBorefield.mo b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
similarity index 93%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
rename to Buildings/DHC/ETS/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
index bc8a2595885..83fce3652f2 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
+++ b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/PartialChillerBorefield.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses;
+within Buildings.DHC.ETS.Combined.Validation.BaseClasses;
 partial model PartialChillerBorefield
   "Partial validation of the ETS model with heat recovery chiller and optional borefield"
   extends Modelica.Icons.Example;
@@ -58,7 +58,7 @@ partial model PartialChillerBorefield
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={90,40})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield ets(
+  Buildings.DHC.ETS.Combined.ChillerBorefield ets(
     redeclare package MediumSer = Medium,
     redeclare package MediumBui = Medium,
     QChiWat_flow_nominal=QCoo_flow_nominal,
@@ -100,7 +100,7 @@ partial model PartialChillerBorefield
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-110,-140})));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumChiWat(
+  DHC.ETS.BaseClasses.Pump_m_flow pumChiWat(
     redeclare package Medium = Medium,
     final m_flow_nominal=mChiWat_flow_nominal,
     dp_nominal=100E3) "Chilled water distribution pump"
@@ -111,7 +111,7 @@ partial model PartialChillerBorefield
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
         mHeaWat_flow_nominal) "Scale to nominal mass flow rate"
     annotation (Placement(transformation(extent={{40,90},{20,110}})));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumHeaWat(
+  DHC.ETS.BaseClasses.Pump_m_flow pumHeaWat(
     redeclare package Medium = Medium,
     final m_flow_nominal=mHeaWat_flow_nominal,
     dp_nominal=100E3) "Heating water distribution pump"
@@ -278,17 +278,17 @@ equation
   connect(loaHea.port,volHeaWat.heatPort)
     annotation (Line(points={{-120,60},{-112,60},{-112,10},{-111,10}},color={191,0,0}));
   connect(pumChiWat.port_b,volChiWat.ports[1])
-    annotation (Line(points={{130,40},{139,40},{139,2}},color={0,127,255}));
+    annotation (Line(points={{130,40},{139,40},{139,1}},color={0,127,255}));
   connect(volChiWat.ports[2],senTChiWatRet.port_a)
-    annotation (Line(points={{139,-2},{139,0},{100,0}},color={0,127,255}));
+    annotation (Line(points={{139,-1},{139,0},{100,0}},color={0,127,255}));
   connect(senTHeaWatSup.port_b,volHeaWat.ports[1])
-    annotation (Line(points={{-70,40},{-101,40},{-101,2}},color={0,127,255}));
+    annotation (Line(points={{-70,40},{-101,40},{-101,1}},color={0,127,255}));
   connect(gai4.y,loaCoo.Q_flow)
     annotation (Line(points={{198,60},{182,60}},color={0,0,127}));
   connect(loaCoo.port,volChiWat.heatPort)
     annotation (Line(points={{162,60},{149,60},{149,10}},color={191,0,0}));
   connect(volHeaWat.ports[2],senTHeaWatRet.port_a)
-    annotation (Line(points={{-101,-2},{-101,-28},{-70,-28}},color={0,127,255}));
+    annotation (Line(points={{-101,-1},{-101,-28},{-70,-28}},color={0,127,255}));
   connect(heaLoaNor.y,gai3.u)
     annotation (Line(points={{-229,60},{-182,60}},color={0,0,127}));
   connect(heaLoaNor.y,uHea.u)
@@ -308,9 +308,9 @@ equation
   connect(uHea.y,ets.uHea)
     annotation (Line(points={{-178,-20},{-120,-20},{-120,-46},{-14,-46}},color={255,0,255}));
   connect(disWat.ports[1],senTDisWatSup.port_a)
-    annotation (Line(points={{-100,-138},{-100,-74},{-70,-74}},color={0,127,255}));
-  connect(senTDisWatSup.port_b, ets.port_aSerAmb) annotation (Line(points={{-50,-74},
-          {-10,-74}},                          color={0,127,255}));
+    annotation (Line(points={{-100,-141},{-100,-74},{-70,-74}},color={0,127,255}));
+  connect(senTDisWatSup.port_b, ets.port_aSerAmb)
+   annotation (Line(points={{-50,-74},{-10,-74}},color={0,127,255}));
   connect(ets.ports_bChiWat[1],senTChiWatSup.port_a)
     annotation (Line(points={{50,-38},{70,-38},{70,40},{80,40}},color={0,127,255}));
   connect(ets.ports_bHeaWat[1],pumHeaWat.port_a)
@@ -319,12 +319,12 @@ equation
     annotation (Line(points={{-50,-28},{-10,-28}},color={0,127,255}));
   connect(senTChiWatRet.port_b,ets.ports_aChiWat[1])
     annotation (Line(points={{80,0},{-40,0},{-40,-38},{-10,-38}},color={0,127,255}));
-  connect(ets.PCoo, EChi.u) annotation (Line(points={{54,-50},{60,-50},{60,-60},{298,-60}},
-                      color={0,0,127}));
+  connect(ets.PCoo, EChi.u)
+    annotation (Line(points={{54,-50},{60,-50},{60,-60},{298,-60}},color={0,0,127}));
   connect(ets.port_bSerAmb, senTDisWatRet.port_a)
     annotation (Line(points={{50,-74},{90,-74}}, color={0,127,255}));
-  connect(senTDisWatRet.port_b, disWat.ports[2]) annotation (Line(points={{110,
-          -74},{160,-74},{160,-180},{-100,-180},{-100,-142}}, color={0,127,255}));
+  connect(senTDisWatRet.port_b, disWat.ports[2])
+   annotation (Line(points={{110,-74},{160,-74},{160,-180},{-100,-180},{-100,-139}},color={0,127,255}));
   annotation (
     Diagram(
       coordinateSystem(
diff --git a/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo
new file mode 100644
index 00000000000..e7d6e515e3c
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS.Combined.Validation;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation\">
+Buildings.DHC.ETS.Combined.Validation</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.order b/Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.order
rename to Buildings/DHC/ETS/Combined/Validation/BaseClasses/package.order
diff --git a/Buildings/DHC/ETS/Combined/Validation/ChillerBorefield.mo b/Buildings/DHC/ETS/Combined/Validation/ChillerBorefield.mo
new file mode 100644
index 00000000000..a86a42b464c
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Validation/ChillerBorefield.mo
@@ -0,0 +1,48 @@
+within Buildings.DHC.ETS.Combined.Validation;
+model ChillerBorefield
+  "Validation of the ETS model with heat recovery chiller and borefield"
+  extends ChillerOnly(
+    ets(
+      have_borFie=true,
+      datBorFie=datBorFie));
+  parameter Integer nBorHol=64
+    "Number of boreholes (must be a square number)";
+  parameter Modelica.Units.SI.Distance dxy=6
+    "Distance in x-axis (and y-axis) between borehole axes";
+  final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
+      Buildings.DHC.ETS.BaseClasses.computeCoordinates(nBorHol, dxy)
+    "Coordinates of boreholes";
+  parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
+    conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
+      dp_nominal=0,
+      cooBor=cooBor))
+    "Borefield design data"
+    annotation (Placement(transformation(extent={{60,180},{80,200}})));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos" "Simulate and plot"),
+    experiment(
+      StopTime=360000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
+in a system configuration including a geothermal borefield.
+See
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.ChillerOnly\">
+Buildings.DHC.ETS.Combined.Validation.ChillerOnly</a>
+for the description of the main modeling assumptions.
+</p>
+</html>"));
+end ChillerBorefield;
diff --git a/Buildings/DHC/ETS/Combined/Validation/ChillerOnly.mo b/Buildings/DHC/ETS/Combined/Validation/ChillerOnly.mo
new file mode 100644
index 00000000000..b8e5b1d39b5
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Validation/ChillerOnly.mo
@@ -0,0 +1,65 @@
+within Buildings.DHC.ETS.Combined.Validation;
+model ChillerOnly
+  "Validation of the ETS model with heat recovery chiller"
+  extends Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield;
+  Modelica.Blocks.Sources.CombiTimeTable TDisWatSup(
+    tableName="tab1",
+    table=[
+      0,11;
+      49,11;
+      50,20;
+      100,20],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    timeScale=3600,
+    offset={273.15},
+    columns={2},
+    smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1)
+    "District water supply temperature"
+    annotation (Placement(transformation(extent={{-330,-150},{-310,-130}})));
+equation
+  connect(TDisWatSup.y[1],disWat.T_in)
+    annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
+  connect(loa.y[2],heaLoaNor.u)
+    annotation (Line(points={{-309,160},{-300,160},{-300,60},{-252,60}},color={0,0,127}));
+  connect(loa.y[1],loaCooNor.u)
+    annotation (Line(points={{-309,160},{280,160},{280,60},{272,60}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos" "Simulate and plot"),
+    experiment(
+      StopTime=360000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
+in a system configuration with no geothermal borefield.
+</p>
+<ul>
+<li>
+A fictitious load profile is used, consisting in the succession of five load
+patterns.
+</li>
+<li>
+Each load pattern is simulated with two values of the district water supply
+temperature, corresponding to typical extreme values over a whole year
+ of operation.
+</li>
+<li>
+The other modeling assumptions are described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield\">
+Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
+</li>
+</ul>
+</html>"));
+end ChillerOnly;
diff --git a/Buildings/DHC/ETS/Combined/Validation/ChillerWSE.mo b/Buildings/DHC/ETS/Combined/Validation/ChillerWSE.mo
new file mode 100644
index 00000000000..172de677256
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Validation/ChillerWSE.mo
@@ -0,0 +1,68 @@
+within Buildings.DHC.ETS.Combined.Validation;
+model ChillerWSE
+  "Validation of the ETS model with heat recovery chiller and waterside economizer"
+  extends ChillerOnly(
+    ets(
+      have_WSE=true), TChiWatSupSet(k=12 + 273.15));
+  Modelica.Blocks.Sources.CombiTimeTable TDisWatSup(
+    tableName="tab1",
+    table=[
+      0,11;
+      49,11;
+      50,20;
+      100,20],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    timeScale=3600,
+    offset={273.15},
+    columns={2},
+    smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1)
+    "District water supply temperature"
+    annotation (Placement(transformation(extent={{-330,-150},{-310,-130}})));
+equation
+  connect(TDisWatSup.y[1],disWat.T_in)
+    annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
+  connect(loa.y[2],heaLoaNor.u)
+    annotation (Line(points={{-309,160},{-300,160},{-300,60},{-252,60}},color={0,0,127}));
+  connect(loa.y[1],loaCooNor.u)
+    annotation (Line(points={{-309,160},{280,160},{280,60},{272,60}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=360000,
+      Tolerance=1e-06),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+July 31, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">
+Buildings.DHC.ETS.Combined.ChillerBorefield</a>
+in a system configuration with no geothermal borefield.
+</p>
+<ul>
+<li>
+A fictitious load profile is used, consisting in the succession of five load
+patterns.
+</li>
+<li>
+Each load pattern is simulated with two values of the district water supply
+temperature, corresponding to typical extreme values over a whole year
+ of operation.
+</li>
+<li>
+The other modeling assumptions are described in
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield\">
+Buildings.DHC.ETS.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
+</li>
+</ul>
+</html>"));
+end ChillerWSE;
diff --git a/Buildings/DHC/ETS/Combined/Validation/package.mo b/Buildings/DHC/ETS/Combined/Validation/package.mo
new file mode 100644
index 00000000000..f71dbd516c1
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/Validation/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.ETS.Combined;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.DHC.ETS.Combined\">
+Buildings.DHC.ETS.Combined</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.order b/Buildings/DHC/ETS/Combined/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.order
rename to Buildings/DHC/ETS/Combined/Validation/package.order
diff --git a/Buildings/DHC/ETS/Combined/package.mo b/Buildings/DHC/ETS/Combined/package.mo
new file mode 100644
index 00000000000..5fe43202392
--- /dev/null
+++ b/Buildings/DHC/ETS/Combined/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.ETS;
+package Combined "Package of models for DHC energy transfer stations"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for energy transfer stations used in
+district heating and cooling systems.
+</p>
+</html>"));
+end Combined;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.order b/Buildings/DHC/ETS/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.order
rename to Buildings/DHC/ETS/Combined/package.order
diff --git a/Buildings/DHC/ETS/Cooling/Direct.mo b/Buildings/DHC/ETS/Cooling/Direct.mo
new file mode 100644
index 00000000000..bc10ac4284c
--- /dev/null
+++ b/Buildings/DHC/ETS/Cooling/Direct.mo
@@ -0,0 +1,183 @@
+within Buildings.DHC.ETS.Cooling;
+model Direct "Direct cooling ETS model for district energy systems with in-building
+  pumping and deltaT control"
+  extends
+    Buildings.DHC.ETS.BaseClasses.PartialDirect(
+      final typ=Buildings.DHC.Types.DistrictSystemType.Cooling,
+      final have_chiWat=true,
+      final have_heaWat=false,
+      con(reverseActing=false),
+      nPorts_aChiWat=1,
+      nPorts_bChiWat=1);
+equation
+  connect(port_aSerCoo, senTDisSup.port_a)
+    annotation (Line(points={{-300,-280},{-180,-280}}, color={0,127,255}));
+  connect(ports_aChiWat[1], senTBuiRet.port_a)
+    annotation (Line(points={{-300,200},{-220,200}}, color={0,127,255}));
+  connect(senTDisRet.port_b, port_bSerCoo) annotation (Line(points={{50,200},{160,
+          200},{160,-240},{260,-240},{260,-280},{300,-280}}, color={0,127,255}));
+  connect(senTBuiSup.port_b, ports_bChiWat[1])
+    annotation (Line(points={{250,200},{300,200}}, color={0,127,255}));
+ annotation (
+    defaultComponentName="etsCoo",
+    Documentation(info="<html>
+<p>
+Direct cooling energy transfer station (ETS) model with in-building pumping and
+deltaT control. The design is based on a typical district cooling ETS described
+in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Cooling Guide</a>.
+As shown in the figure below, the district and building piping are hydronically
+coupled. The control valve ensures that the return temperature to the district
+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/DHC/ETS/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
+</p>
+<h4>
+Reference
+</h4>
+<p>American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2019).
+Chapter 5: End User Interface. In <i>District Cooling Guide</i>, Second Edition and
+<i>Owner's Guide for Buildings Served by District Cooling</i>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon and fix port orientation to align with convention.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+May 5, 2023, by David Blum:<br/>
+Removed assignment of check valve <code>allowFlowReversal=false</code>.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3389\">#3389</a>.
+</li>
+<li>
+April 7, 2023, by David Blum:<br/>
+Change to extend from <code>Buildings.DHC.ETS.BaseClasses.PartialDirect</code>.
+</li>
+<li>
+January 11, 2023, by Michael Wetter:<br/>
+Changed controls to use CDL. Changed PID to PI as default for controller.
+</li>
+<li>
+January 2, 2023, by Kathryn Hinkelman:<br/>
+Set pressure drops at junctions to 0 and removed parameter <code>dp_nominal</code>
+</li>
+<li>
+December 28, 2022, by Kathryn Hinkelman:<br/>
+Simplified the control implementation for the district return stream. Improved default control parameters.
+</li>
+<li>
+December 23, 2022, by Kathryn Hinkelman:<br/>
+Removed extraneous <code>m*_flow_nominal</code> parameters because
+<code>mBui_flow_nominal</code> can be used across all components.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+<li>
+November 11, 2022, by Michael Wetter:<br/>
+Changed check valve to use version of <code>Buildings</code> library, and hence no outer <code>system</code> is needed.
+</li>
+<li>March 20, 2022, by Chengnan Shi:<br/>Update with base class partial model and standard PI control.</li>
+<li>Novermber 13, 2019, by Kathryn Hinkelman:<br/>First implementation. </li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-71,-8},{71,8}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-30,-73},
+          rotation=90),
+        Rectangle(
+          extent={{-8,30},{8,-30}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-82,112},
+          rotation=90),
+        Rectangle(
+          extent={{-52,-8},{52,8}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={28,-90},
+          rotation=90),
+        Rectangle(
+          extent={{7,106},{-7,-106}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-4,5},
+          rotation=90),
+        Rectangle(
+          extent={{-71,-8},{71,8}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={104,69},
+          rotation=90),
+        Rectangle(
+          extent={{-37,-7},{37,7}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={29,83},
+          rotation=90),
+        Rectangle(
+          extent={{-32,-8},{32,8}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-104,108},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-22,112},
+          rotation=360),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-42,112},
+          rotation=180),
+        Rectangle(
+          extent={{-8,24},{8,-24}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={12,112},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-104,66},
+          rotation=90),
+        Rectangle(
+          extent={{-29,-8},{29,8}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-104,27},
+          rotation=90)}));
+end Direct;
diff --git a/Buildings/DHC/ETS/Cooling/Examples/Direct.mo b/Buildings/DHC/ETS/Cooling/Examples/Direct.mo
new file mode 100644
index 00000000000..609665a51ae
--- /dev/null
+++ b/Buildings/DHC/ETS/Cooling/Examples/Direct.mo
@@ -0,0 +1,163 @@
+within Buildings.DHC.ETS.Cooling.Examples;
+model Direct "Example model for direct cooling energy transfer station
+  with in-building pumping and controlled district return temperature"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Water medium";
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=-18000
+    "Nominal cooling load (negative for cooling)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=-Q_flow_nominal/(cp*(18-7))
+    "Nominal mass flow rate of building cooling supply"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
+    Medium.setState_pTX(
+      Medium.p_default,
+      Medium.T_default,
+      Medium.X_default))
+    "Default specific heat capacity of medium";
+  Buildings.DHC.ETS.Cooling.Direct cooETS(
+    mBui_flow_nominal=mBui_flow_nominal,
+    QChiWat_flow_nominal=Q_flow_nominal,
+    dpConVal_nominal=50,
+    dpCheVal_nominal=6000,
+    nPorts_bChiWat=1,
+    nPorts_aChiWat=1) "Energy transfer station"
+    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
+  Modelica.Blocks.Sources.Constant TSetDisRet_min(k=273.15 + 16)
+    "Minimum setpoint temperature for district return"
+    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
+  Buildings.Fluid.Sources.Boundary_pT sinDis(
+    redeclare package Medium = Medium,
+    p=340000,
+    nPorts=1)
+    "District-side sink"
+    annotation (Placement(transformation(extent={{80,-80},{60,-60}})));
+  Buildings.Fluid.Sources.Boundary_pT souDis(
+    redeclare package Medium = Medium,
+    p=350000,
+    use_T_in=true,
+    T=280.15,
+    nPorts=1)
+    "District-side source"
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+  Modelica.Blocks.Sources.RealExpression TDisSupNoi(
+    y=(273.15 + 7) + 2*sin(time*4*3.14/86400))
+    "Sinusoidal noise signal for district supply temperature"
+    annotation (Placement(transformation(extent={{-120,-76},{-100,-56}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow pum(
+    redeclare replaceable package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=mBui_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
+    constantMassFlowRate=mBui_flow_nominal)
+    "Building primary pump"
+    annotation (Placement(transformation(extent={{40,20},{60,40}})));
+  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
+    redeclare package Medium = Medium,
+    allowFlowReversal=false,
+    m_flow_nominal=mBui_flow_nominal,
+    show_T=true,
+    from_dp=false,
+    dp_nominal=100,
+    linearizeFlowResistance=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1)
+    "Aggregate building cooling load"
+    annotation (Placement(transformation(extent={{20,40},{0,60}})));
+  Modelica.Blocks.Sources.Ramp ram(
+    height=1,
+    duration(displayUnit="h") = 3600,
+    startTime(displayUnit="h"))
+    "Ramp load from zero"
+    annotation (Placement(transformation(extent={{-120,80},{-100,100}})));
+  Modelica.Blocks.Sources.CombiTimeTable QCoo(
+    table=[
+    0,-100E3;
+    6,-80E3;
+    6,-50E3;
+    12,-20E3;
+    18,-150E3;
+    24,-100E3],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    timeScale=3600)
+    "Cooling demand"
+    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
+  Modelica.Blocks.Math.Product pro
+    "Multiplier to ramp load from zero"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+  Modelica.Blocks.Math.Gain gai(k=-1/(cp*(16 - 7)))
+    "Multiplier gain for calculating m_flow"
+    annotation (Placement(transformation(extent={{0,80},{20,100}})));
+equation
+  connect(TSetDisRet_min.y,cooETS.TDisRetSet)
+    annotation (Line(points={{-99,-10},{-0.6,-10}}, color={0,0,127}));
+  connect(TDisSupNoi.y, souDis.T_in)
+    annotation (Line(points={{-99,-66},{-62,-66}}, color={0,0,127}));
+  connect(souDis.ports[1], cooETS.port_aSerCoo)
+    annotation (Line(points={{-40,-70},{-20,-70},{-20,-19.3333},{0,-19.3333}},
+      color={0,127,255}));
+  connect(cooETS.port_bSerCoo, sinDis.ports[1])
+    annotation (Line(points={{20,-19.3333},{40,-19.3333},{40,-70},{60,-70}},
+      color={0,127,255}));
+  connect(cooETS.ports_bChiWat[1], pum.port_a)
+    annotation (Line(points={{20,-4.66667},{30,-4.66667},{30,30},{40,30}},
+      color={0,127,255}));
+  connect(pum.port_b, loa.port_a)
+    annotation (Line(points={{60,30},{80,30},{80,50},{20,50}},
+      color={0,127,255}));
+  connect(loa.port_b, cooETS.ports_aChiWat[1])
+    annotation (Line(points={{0,50},{-40,50},{-40,-4.66667},{0,-4.66667}},
+      color={0,127,255}));
+  connect(ram.y, pro.u1)
+    annotation (Line(points={{-99,90},{-92,90},{-92,76},{-82,76}},
+      color={0,0,127}));
+  connect(QCoo.y[1], pro.u2)
+    annotation (Line(points={{-99,50},{-92,50},{-92,64},{-82,64}},
+      color={0,0,127}));
+  connect(pro.y, loa.u)
+    annotation (Line(points={{-59,70},{32,70},{32,56},{22,56}},
+      color={0,0,127}));
+  connect(pro.y, gai.u)
+    annotation (Line(points={{-59,70},{-40,70},{-40,90},{-2,90}},
+      color={0,0,127}));
+  connect(gai.y, pum.m_flow_in)
+    annotation (Line(points={{21,90},{50,90},{50,42}}, color={0,0,127}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-160,-120},{160,120}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos" "Simulate and plot"),
+    experiment(
+      StartTime=0,
+      StopTime=86400,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>This model provides an example for the direct cooling energy transfer station
+model, which contains in-building pumping and controls the district return
+temperature. The building's primary variable speed pump is modulated depending
+on the total cooling load and prescribed deltaT. Variation in the district
+supply temperature is modeled as a sinusoidal signal to test the response of system.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+December 23, 2022, by Kathryn Hinkelman:<br/>
+Removed extraneous <code>m*_flow_nominal</code> parameters because
+<code>mBui_flow_nominal</code> can be used across all components.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+<li>November 15, 2022, by Kathryn Hinkelman:<br/>
+Corrected pressure balance across bypass leg and system.
+</li>
+<li>March 20, 2022, by Chengnan Shi:<br/>First implementation.</li>
+</ul>
+</html>"));
+end Direct;
diff --git a/Buildings/DHC/ETS/Cooling/Examples/Indirect.mo b/Buildings/DHC/ETS/Cooling/Examples/Indirect.mo
new file mode 100644
index 00000000000..43b8c32917c
--- /dev/null
+++ b/Buildings/DHC/ETS/Cooling/Examples/Indirect.mo
@@ -0,0 +1,168 @@
+within Buildings.DHC.ETS.Cooling.Examples;
+model Indirect "Example model for indirect cooling energy transfer station
+  with a closed chilled water loop on the building side"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Water medium";
+  parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal = -19000
+    "Cooling design flow rate";
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal = 16-7
+    "Design temperature difference";
+  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=-QCoo_flow_nominal/dT_nominal/cp
+    "Nominal mass flow rate of building cooling supply"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
+    Medium.setState_pTX(
+      Medium.p_default,
+      Medium.T_default,
+      Medium.X_default))
+    "Default specific heat capacity of medium";
+  Buildings.DHC.ETS.Cooling.Indirect cooETS(
+    QChiWat_flow_nominal=QCoo_flow_nominal,
+    mDis_flow_nominal=mBui_flow_nominal,
+    mBui_flow_nominal=mBui_flow_nominal,
+    dpConVal_nominal=9000,
+    dp1_nominal=9000,
+    dp2_nominal=9000,
+    Q_flow_nominal=QCoo_flow_nominal,
+    T_a1_nominal=278.15,
+    T_a2_nominal=289.15,
+    k=0.1,
+    Ti=40,
+    yMax=1,
+    yMin=0.01,
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    nPorts_bChiWat=1,
+    nPorts_aChiWat=1) "Direct cooling energy transfer station"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+  Buildings.Fluid.Sources.Boundary_pT souDis(
+    redeclare package Medium = Medium,
+    p(displayUnit="Pa") = 300000 + 2*9000,
+    use_T_in=false,
+    T=278.15,
+    nPorts=1)
+    "District (primary) source"
+    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
+  Buildings.Fluid.Sources.Boundary_pT sinDis(
+    redeclare package Medium = Medium,
+    T=287.15,
+    nPorts=1)
+    "District (primary) sink"
+    annotation (Placement(transformation(extent={{100,-80},{80,-60}})));
+  Modelica.Blocks.Sources.Constant TSetCHWS(
+    k=273.15+7)
+    "Setpoint temperature for building chilled water supply"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
+    redeclare package Medium = Medium,
+    allowFlowReversal=false,
+    m_flow_nominal=mBui_flow_nominal,
+    show_T=true,
+    from_dp=false,
+    dp_nominal=6000,
+    linearizeFlowResistance=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
+    Q_flow_nominal=-1)
+    "Aggregate building cooling load"
+    annotation (Placement(transformation(extent={{40,40},{20,60}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow pumBui(
+    redeclare replaceable package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    allowFlowReversal=false,
+    m_flow_nominal=mBui_flow_nominal,
+    nominalValuesDefineDefaultPressureCurve=true,
+    dp_nominal=6000+9000)
+    "Building-side (secondary) pump"
+    annotation (Placement(transformation(extent={{80,40},{60,60}})));
+  Modelica.Blocks.Sources.CombiTimeTable QCoo(
+    table=[
+      0,-10E3;
+      6,-8E3;
+      6,-5E3;
+      12,-2E3;
+      18,-15E3;
+      24,-10E3],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    timeScale=3600)
+    "Cooling demand"
+    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
+  Modelica.Blocks.Math.Product pro
+    "Multiplier to ramp load from zero"
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+  Modelica.Blocks.Sources.Ramp ram(
+    height=1,
+    duration(displayUnit="h")=18000,
+    startTime(displayUnit="h")=3600) "Ramp load from zero"
+    annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
+  Modelica.Blocks.Math.Gain gai(
+    k=-1/(cp*dT_nominal))
+    "Multiplier gain for calculating m_flow"
+    annotation (Placement(transformation(extent={{-40,100},{-20,120}})));
+  Buildings.Fluid.Sources.Boundary_pT souBui(
+    redeclare package Medium = Medium,
+    nPorts=1)
+    "Building (secondary) source"
+    annotation (Placement(transformation(extent={{128,64},{108,84}})));
+equation
+  connect(cooETS.ports_bChiWat[1], pumBui.port_a) annotation (Line(points={{40,
+          -24.6667},{100,-24.6667},{100,50},{80,50}},
+                                            color={0,127,255}));
+  connect(pumBui.port_b, loa.port_a)
+    annotation (Line(points={{60,50},{40,50}}, color={0,127,255}));
+  connect(loa.port_b, cooETS.ports_aChiWat[1]) annotation (Line(points={{20,50},
+          {-20,50},{-20,-24.6667},{20,-24.6667}},
+                                            color={0,127,255}));
+  connect(QCoo.y[1], gai.u)
+    annotation (Line(points={{-79,110},{-42,110}}, color={0,0,127}));
+  connect(gai.y, pumBui.m_flow_in)
+    annotation (Line(points={{-19,110},{70,110},{70,62}}, color={0,0,127}));
+  connect(ram.y, pro.u2) annotation (Line(points={{-79,70},{-60,70},{-60,64},{-42,
+          64}}, color={0,0,127}));
+  connect(QCoo.y[1], pro.u1) annotation (Line(points={{-79,110},{-60,110},{-60,76},
+          {-42,76}}, color={0,0,127}));
+  connect(pro.y, loa.u) annotation (Line(points={{-19,70},{50,70},{50,56},{42,56}},
+        color={0,0,127}));
+  connect(souDis.ports[1], cooETS.port_aSerCoo) annotation (Line(points={{-20,-70},
+          {0,-70},{0,-39.3333},{20,-39.3333}}, color={0,127,255}));
+  connect(cooETS.port_bSerCoo, sinDis.ports[1]) annotation (Line(points={{40,
+          -39.3333},{60,-39.3333},{60,-70},{80,-70}},
+                                            color={0,127,255}));
+  connect(TSetCHWS.y,cooETS.TBuiSupSet)
+    annotation (Line(points={{-59,-30},{19.3333,-30}}, color={0,0,127}));
+  connect(pumBui.port_a, souBui.ports[1]) annotation (Line(points={{80,50},{94,50},
+          {94,74},{108,74}}, color={0,127,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-140,-140},{140,140}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos" "Simulate and plot"),
+    experiment(
+      StartTime=0,
+      StopTime=86400,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This model provides an example for the indirect cooling energy transfer station model.
+The cooling load ramps up from zero and is modulated according to the QCoo table specification.
+The mass flow rate of chilled water in the building side is varied based on the building load/demand.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+January 30, 2023:<br/>
+Corrected parameterization.
+</li>
+<li>
+March 20, 2022, by Chengnan Shi:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Indirect;
diff --git a/Buildings/DHC/ETS/Cooling/Examples/package.mo b/Buildings/DHC/ETS/Cooling/Examples/package.mo
new file mode 100644
index 00000000000..bba812aea01
--- /dev/null
+++ b/Buildings/DHC/ETS/Cooling/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.ETS.Cooling;
+package Examples
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(revisions="<html>
+</html>", info="<html>
+<p>This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.ETS.Cooling\">
+Buildings.DHC.ETS.Cooling</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.order b/Buildings/DHC/ETS/Cooling/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.order
rename to Buildings/DHC/ETS/Cooling/Examples/package.order
diff --git a/Buildings/DHC/ETS/Cooling/Indirect.mo b/Buildings/DHC/ETS/Cooling/Indirect.mo
new file mode 100644
index 00000000000..230fcdcdb62
--- /dev/null
+++ b/Buildings/DHC/ETS/Cooling/Indirect.mo
@@ -0,0 +1,253 @@
+within Buildings.DHC.ETS.Cooling;
+model Indirect
+  "Indirect cooling energy transfer station for district energy systems"
+  extends
+    Buildings.DHC.ETS.BaseClasses.PartialIndirect(
+      QChiWat_flow_nominal=-Q_flow_nominal,
+      final typ=Buildings.DHC.Types.DistrictSystemType.Cooling,
+      final have_chiWat=true,
+      final have_heaWat=false,
+      Q_flow_nominal(max=0),
+      nPorts_aChiWat=1,
+      nPorts_bChiWat=1,
+      con(reverseActing=false));
+equation
+  connect(senTBuiRet.port_a, ports_aChiWat[1])
+    annotation (Line(points={{-218,200},{-300,200}}, color={0,127,255}));
+  connect(senTBuiSup.port_b, ports_bChiWat[1]) annotation (Line(points={{-36,
+          -204},{-80,-204},{-80,160},{180,160},{180,200},{300,200}}, color={0,
+          127,255}));
+  connect(senTDisRet.port_b, port_bSerCoo)
+    annotation (Line(points={{200,-280},{300,-280}}, color={0,127,255}));
+  connect(port_aSerCoo, senTDisSup.port_a)
+    annotation (Line(points={{-300,-280},{-220,-280}}, color={0,127,255}));
+  annotation (
+    defaultComponentName="etsCoo",
+    Documentation(info="<html>
+<p>
+Indirect cooling energy transfer station (ETS) model that controls the
+building chilled water supply temperature by modulating a primary control valve
+on the district supply side. The design is based on a typical district cooling
+ETS described in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Cooling Guide</a>.
+As shown in the figure below, the building pumping design (constant/variable)
+is specified on the building side and not within the ETS.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
+</p>
+<h4>Reference</h4>
+<p>
+American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2019).
+Chapter 5: End User Interface. In <i>District Cooling Guide</i>, Second Edition and
+<i>Owner's Guide for Buildings Served by District Cooling</i>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon and fix port orientation to align with convention.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+May 30, 2023, by David Blum:<br/>
+Change to extend from <code>Buildings.DHC.ETS.BaseClasses.PartialDirect</code>.
+</li>
+<li>
+March 16, 2023, by David Blum:<br/>
+Fixed building supply temperature controller parameter <code>reverseActing</code>
+by changing from <code>true</code> to <code>false</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3299\">
+issue 3299</a>.
+</li>
+<li>
+January 11, 2023, by Michael Wetter:<br/>
+Changed controls to use CDL. Changed PID to PI as default for controller.
+</li>
+<li>
+March 21, 2022, by Chengnan Shi:<br/>
+Update with base class partial model.
+</li>
+<li>Novermber 13, 2019, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-36,48},{34,-32}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-28,42},{-24,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-24,42},{-16,-26}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-12,42},{-2,-26}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-16,42},{-12,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{2,42},{10,-26}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-2,42},{2,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{14,42},{22,-26}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{10,42},{14,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{22,42},{26,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-54,-8},{54,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-104,86},
+          rotation=90),
+        Rectangle(
+          extent={{-22,8},{22,-8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={28,-128},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-35},{8,35}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-71,40},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-108,-66},
+          rotation=90),
+        Rectangle(
+          extent={{-18,-8},{18,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-30,-124},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-35},{8,35}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={69,40},
+          rotation=90),
+        Rectangle(
+          extent={{-54,-8},{54,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={104,86},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-108,-86},
+          rotation=270),
+        Rectangle(
+          extent={{-8,-40},{8,40}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-76,-24},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-35},{8,35}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={69,-24},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-39},{8,39}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-77,-114},
+          rotation=90),
+        Rectangle(
+          extent={{-13,-8},{13,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-108,-109},
+          rotation=90),
+        Rectangle(
+          extent={{-13,-8},{13,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={-108,-43},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-39},{8,39}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={59,-114},
+          rotation=90),
+        Rectangle(
+          extent={{-53,-8},{53,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={0,0,255},
+          fillPattern=FillPattern.Solid,
+          origin={106,-69},
+          rotation=90)}));
+end Indirect;
diff --git a/Buildings/DHC/ETS/Cooling/package.mo b/Buildings/DHC/ETS/Cooling/package.mo
new file mode 100644
index 00000000000..92c85d838a3
--- /dev/null
+++ b/Buildings/DHC/ETS/Cooling/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.ETS;
+package Cooling "This package contains models for energy transfer stations used in district cooling systems"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models for energy transfer stations used
+in district cooling systems.
+</p>
+</html>"));
+end Cooling;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.order b/Buildings/DHC/ETS/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.order
rename to Buildings/DHC/ETS/Cooling/package.order
diff --git a/Buildings/DHC/ETS/Heating/Direct.mo b/Buildings/DHC/ETS/Heating/Direct.mo
new file mode 100644
index 00000000000..6e32e9c52c1
--- /dev/null
+++ b/Buildings/DHC/ETS/Heating/Direct.mo
@@ -0,0 +1,184 @@
+within Buildings.DHC.ETS.Heating;
+model Direct "Direct heating ETS model for district energy systems with in-building
+  pumping and deltaT control"
+  extends
+    Buildings.DHC.ETS.BaseClasses.PartialDirect(
+      final typ=Buildings.DHC.Types.DistrictSystemType.HeatingGeneration2to4,
+      final have_chiWat=false,
+      final have_heaWat=true,
+      nPorts_aHeaWat=1,
+      nPorts_bHeaWat=1);
+equation
+  connect(senTDisRet.port_b, port_bSerHea) annotation (Line(points={{50,200},{160,
+          200},{160,-240},{300,-240}}, color={0,127,255}));
+  connect(port_aSerHea, senTDisSup.port_a) annotation (Line(points={{-300,-240},
+          {-220,-240},{-220,-280},{-180,-280}}, color={0,127,255}));
+  connect(ports_aHeaWat[1], senTBuiRet.port_a) annotation (Line(points={{-300,260},
+          {-240,260},{-240,200},{-220,200}}, color={0,127,255}));
+  connect(senTBuiSup.port_b, ports_bHeaWat[1]) annotation (Line(points={{250,200},
+          {260,200},{260,260},{300,260}}, color={0,127,255}));
+ annotation (
+    defaultComponentName="etsCoo",
+    Documentation(info="<html>
+<p>
+Direct heating energy transfer station (ETS) model with in-building pumping and
+deltaT control. The design is based on a typical district heating ETS described
+in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Heating Guide</a>.
+As shown in the figure below, the district and building piping are hydronically
+coupled. The control valve ensures that the return temperature to the district
+heating network is at or below the maximum specified value. This configuration
+naturally results in a fluctuating building supply tempearture.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png\" alt=\"DC ETS Direct\"/>
+</p>
+<h4>
+Reference
+</h4>
+<p>
+American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2013).
+Chapter 5: Consumer Interconnection. In <i>District Heating Guide</i>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon and fix port orientation to align with convention.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+January 8, 2024, by David Blum:<br/>
+Correct documentation to describe heating.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
+issue 3628</a>.
+</li>
+<li>
+April 7, 2023, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-27,-8},{27,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-66,71},
+          rotation=90),
+        Rectangle(
+          extent={{-8,67},{8,-67}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={3,-28},
+          rotation=90),
+        Rectangle(
+          extent={{-41,-8},{41,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={30,57},
+          rotation=90),
+        Rectangle(
+          extent={{-88,8},{88,-8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={66,52},
+          rotation=90),
+        Rectangle(
+          extent={{-8,26},{8,-26}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-48,90},
+          rotation=90),
+        Rectangle(
+          extent={{-21,-9},{21,9}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-49,119},
+          rotation=90),
+        Rectangle(
+          extent={{-12,-8},{12,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={30,-84},
+          rotation=90),
+        Rectangle(
+          extent={{-7,21},{7,-21}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={43,-99},
+          rotation=90),
+        Rectangle(
+          extent={{-25,8},{25,-8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={66,-117},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-18,90},
+          rotation=180),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={2,90},
+          rotation=360),
+        Rectangle(
+          extent={{-8,8},{8,-8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={20,90},
+          rotation=90),
+        Rectangle(
+          extent={{-8,16},{8,-16}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={56,132},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-66,34},
+          rotation=90),
+        Rectangle(
+          extent={{-83,-8},{83,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-66,-59},
+          rotation=90)}));
+end Direct;
diff --git a/Buildings/DHC/ETS/Heating/Examples/Direct.mo b/Buildings/DHC/ETS/Heating/Examples/Direct.mo
new file mode 100644
index 00000000000..860b9bff801
--- /dev/null
+++ b/Buildings/DHC/ETS/Heating/Examples/Direct.mo
@@ -0,0 +1,146 @@
+within Buildings.DHC.ETS.Heating.Examples;
+model Direct "Example model for direct heating energy transfer station
+  with in-building pumping and controlled district return temperature"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Water medium";
+  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=18000
+    "Nominal heating load"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=Q_flow_nominal/(cp*(50-40))
+    "Nominal mass flow rate of building heating supply"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
+    Medium.setState_pTX(
+      Medium.p_default,
+      Medium.T_default,
+      Medium.X_default))
+    "Default specific heat capacity of medium";
+  Buildings.DHC.ETS.Heating.Direct heaETS(
+    mBui_flow_nominal=mBui_flow_nominal,
+    QHeaWat_flow_nominal=Q_flow_nominal,
+    dpConVal_nominal=50,
+    dpCheVal_nominal=6000,
+    nPorts_bHeaWat=1,
+    nPorts_aHeaWat=1) "Energy transfer station"
+    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
+  Modelica.Blocks.Sources.Constant TSetDisRet_max(k=273.15 + 40)
+    "Maximum setpoint temperature for district return"
+    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
+  Buildings.Fluid.Sources.Boundary_pT sinDis(
+    redeclare package Medium = Medium,
+    p=340000,
+    nPorts=1)
+    "District-side sink"
+    annotation (Placement(transformation(extent={{80,-80},{60,-60}})));
+  Buildings.Fluid.Sources.Boundary_pT souDis(
+    redeclare package Medium = Medium,
+    p=350000,
+    use_T_in=true,
+    T=280.15,
+    nPorts=1)
+    "District-side source"
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+  Modelica.Blocks.Sources.RealExpression TDisSupNoi(y=(273.15 + 50) + 2*sin(
+        time*4*3.14/86400))
+    "Sinusoidal noise signal for district supply temperature"
+    annotation (Placement(transformation(extent={{-120,-76},{-100,-56}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow pum(
+    redeclare replaceable package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=mBui_flow_nominal,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
+    constantMassFlowRate=mBui_flow_nominal)
+    "Building primary pump"
+    annotation (Placement(transformation(extent={{40,20},{60,40}})));
+  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
+    redeclare package Medium = Medium,
+    allowFlowReversal=false,
+    m_flow_nominal=mBui_flow_nominal,
+    show_T=true,
+    from_dp=false,
+    dp_nominal=100,
+    linearizeFlowResistance=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    Q_flow_nominal=-1)
+    "Aggregate building heating load"
+    annotation (Placement(transformation(extent={{20,40},{0,60}})));
+  Modelica.Blocks.Sources.Ramp ram(
+    height=1,
+    duration(displayUnit="h") = 3600,
+    startTime(displayUnit="h"))
+    "Ramp load from zero"
+    annotation (Placement(transformation(extent={{-120,80},{-100,100}})));
+  Modelica.Blocks.Sources.CombiTimeTable QHea(
+    table=[0,100E3; 6,80E3; 6,50E3; 12,20E3; 18,150E3; 24,100E3],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    timeScale=3600) "Heating demand"
+    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
+  Modelica.Blocks.Math.Product pro
+    "Multiplier to ramp load from zero"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+  Modelica.Blocks.Math.Gain gai(k=1/(cp*(50 - 40)))
+    "Multiplier gain for calculating m_flow"
+    annotation (Placement(transformation(extent={{0,80},{20,100}})));
+equation
+  connect(TSetDisRet_max.y,heaETS.TDisRetSet)
+    annotation (Line(points={{-99,-10},{-0.6,-10}}, color={0,0,127}));
+  connect(TDisSupNoi.y, souDis.T_in)
+    annotation (Line(points={{-99,-66},{-62,-66}}, color={0,0,127}));
+  connect(pum.port_b, loa.port_a)
+    annotation (Line(points={{60,30},{80,30},{80,50},{20,50}},
+      color={0,127,255}));
+  connect(ram.y, pro.u1)
+    annotation (Line(points={{-99,90},{-92,90},{-92,76},{-82,76}},
+      color={0,0,127}));
+  connect(QHea.y[1], pro.u2)
+    annotation (Line(points={{-99,50},{-92,50},{-92,64},{-82,64}},
+      color={0,0,127}));
+  connect(pro.y, loa.u)
+    annotation (Line(points={{-59,70},{32,70},{32,56},{22,56}},
+      color={0,0,127}));
+  connect(pro.y, gai.u)
+    annotation (Line(points={{-59,70},{-40,70},{-40,90},{-2,90}},
+      color={0,0,127}));
+  connect(gai.y, pum.m_flow_in)
+    annotation (Line(points={{21,90},{50,90},{50,42}}, color={0,0,127}));
+  connect(heaETS.ports_bHeaWat[1], pum.port_a) annotation (Line(points={{20,-1.33333},
+          {34,-1.33333},{34,30},{40,30}}, color={0,127,255}));
+  connect(heaETS.ports_aHeaWat[1], loa.port_b) annotation (Line(points={{0,-1.33333},
+          {-26,-1.33333},{-26,0},{-40,0},{-40,50},{0,50}}, color={0,127,255}));
+  connect(heaETS.port_aSerHea, souDis.ports[1]) annotation (Line(points={{0,-18},
+          {-20,-18},{-20,-70},{-40,-70}}, color={0,127,255}));
+  connect(sinDis.ports[1], heaETS.port_bSerHea) annotation (Line(points={{60,-70},
+          {40,-70},{40,-18},{20,-18}}, color={0,127,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-160,-120},{160,120}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos" "Simulate and plot"),
+    experiment(
+      StartTime=0,
+      StopTime=86400,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>This model provides an example for the direct heating energy transfer station
+model, which contains in-building pumping and controls the district return
+temperature. The building's primary variable speed pump is modulated depending
+on the total heating load and prescribed deltaT. Variation in the district
+supply temperature is modeled as a sinusoidal signal to test the response of system.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+April 7, 2023, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Direct;
diff --git a/Buildings/DHC/ETS/Heating/Examples/Indirect.mo b/Buildings/DHC/ETS/Heating/Examples/Indirect.mo
new file mode 100644
index 00000000000..9cdf597c506
--- /dev/null
+++ b/Buildings/DHC/ETS/Heating/Examples/Indirect.mo
@@ -0,0 +1,153 @@
+within Buildings.DHC.ETS.Heating.Examples;
+model Indirect "Example model for indirect heating energy transfer station
+  with a closed chilled water loop on the building side"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Water medium";
+  parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal = 19000
+    "Heating design flow rate";
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal = 50-40
+    "Design temperature difference";
+  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=QHea_flow_nominal/dT_nominal/cp
+    "Nominal mass flow rate of building heating supply"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
+    Medium.setState_pTX(
+      Medium.p_default,
+      Medium.T_default,
+      Medium.X_default))
+    "Default specific heat capacity of medium";
+  Buildings.DHC.ETS.Heating.Indirect heaETS(
+    QHeaWat_flow_nominal=QHea_flow_nominal,
+    mDis_flow_nominal=mBui_flow_nominal,
+    mBui_flow_nominal=mBui_flow_nominal,
+    dpConVal_nominal=9000,
+    dp1_nominal=9000,
+    dp2_nominal=9000,
+    Q_flow_nominal=QHea_flow_nominal,
+    T_a1_nominal=328.15,
+    T_a2_nominal=313.15,
+    k=0.1,
+    Ti=40,
+    yMax=1,
+    yMin=0.01,
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    nPorts_aHeaWat=1,
+    nPorts_bHeaWat=1)
+    "Direct heating energy transfer station"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+  Buildings.Fluid.Sources.Boundary_pT souDis(
+    redeclare package Medium = Medium,
+    p(displayUnit="Pa") = 300000 + 2*9000,
+    use_T_in=false,
+    T=328.15,
+    nPorts=1)
+    "District (primary) source"
+    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
+  Buildings.Fluid.Sources.Boundary_pT sinDis(
+    redeclare package Medium = Medium,
+    T=314.15,
+    nPorts=1)
+    "District (primary) sink"
+    annotation (Placement(transformation(extent={{100,-80},{80,-60}})));
+  Modelica.Blocks.Sources.Constant TSetHWS(k=273.15 + 50)
+    "Setpoint temperature for building heating water supply"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
+    redeclare package Medium = Medium,
+    allowFlowReversal=false,
+    m_flow_nominal=mBui_flow_nominal,
+    show_T=true,
+    from_dp=false,
+    dp_nominal=6000,
+    linearizeFlowResistance=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
+    Q_flow_nominal=-1) "Aggregate building heating load"
+    annotation (Placement(transformation(extent={{40,40},{20,60}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow pumBui(
+    redeclare replaceable package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    allowFlowReversal=false,
+    m_flow_nominal=mBui_flow_nominal,
+    nominalValuesDefineDefaultPressureCurve=true,
+    dp_nominal=6000+9000)
+    "Building-side (secondary) pump"
+    annotation (Placement(transformation(extent={{80,40},{60,60}})));
+  Modelica.Blocks.Sources.CombiTimeTable QHea(
+    table=[0,10E3; 6,8E3; 6,5E3; 12,2E3; 18,15E3; 24,10E3],
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    timeScale=3600) "Heating demand"
+    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
+  Modelica.Blocks.Math.Product pro
+    "Multiplier to ramp load from zero"
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+  Modelica.Blocks.Sources.Ramp ram(
+    height=1,
+    duration(displayUnit="h")=18000,
+    startTime(displayUnit="h")=3600) "Ramp load from zero"
+    annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
+  Modelica.Blocks.Math.Gain gai(k=1/(cp*dT_nominal))
+    "Multiplier gain for calculating m_flow"
+    annotation (Placement(transformation(extent={{-40,100},{-20,120}})));
+  Buildings.Fluid.Sources.Boundary_pT souBui(
+    redeclare package Medium = Medium,
+    nPorts=1)
+    "Building (secondary) source"
+    annotation (Placement(transformation(extent={{128,64},{108,84}})));
+equation
+  connect(pumBui.port_b, loa.port_a)
+    annotation (Line(points={{60,50},{40,50}}, color={0,127,255}));
+  connect(QHea.y[1], gai.u)
+    annotation (Line(points={{-79,110},{-42,110}}, color={0,0,127}));
+  connect(gai.y, pumBui.m_flow_in)
+    annotation (Line(points={{-19,110},{70,110},{70,62}}, color={0,0,127}));
+  connect(ram.y, pro.u2) annotation (Line(points={{-79,70},{-60,70},{-60,64},{-42,
+          64}}, color={0,0,127}));
+  connect(QHea.y[1], pro.u1) annotation (Line(points={{-79,110},{-60,110},{-60,76},
+          {-42,76}}, color={0,0,127}));
+  connect(pro.y, loa.u) annotation (Line(points={{-19,70},{50,70},{50,56},{42,56}},
+        color={0,0,127}));
+  connect(pumBui.port_a, souBui.ports[1]) annotation (Line(points={{80,50},{94,50},
+          {94,74},{108,74}}, color={0,127,255}));
+  connect(TSetHWS.y,heaETS.TBuiSupSet)
+    annotation (Line(points={{-59,-30},{19.3333,-30}}, color={0,0,127}));
+  connect(souDis.ports[1], heaETS.port_aSerHea) annotation (Line(points={{-20,-70},
+          {14,-70},{14,-38},{20,-38}}, color={0,127,255}));
+  connect(sinDis.ports[1], heaETS.port_bSerHea) annotation (Line(points={{80,-70},
+          {60,-70},{60,-38},{40,-38}}, color={0,127,255}));
+  connect(loa.port_b, heaETS.ports_aHeaWat[1]) annotation (Line(points={{20,50},
+          {-20,50},{-20,-21.3333},{20,-21.3333}}, color={0,127,255}));
+  connect(heaETS.ports_bHeaWat[1], pumBui.port_a) annotation (Line(points={{40,
+          -21.3333},{62,-21.3333},{62,-22},{100,-22},{100,50},{80,50}},
+                                                              color={0,127,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-140,-140},{140,140}})),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos" "Simulate and plot"),
+    experiment(
+      StartTime=0,
+      StopTime=86400,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This model provides an example for the indirect heating energy transfer station model.
+The heating load ramps up from zero and is modulated according to the QHea table specification.
+The mass flow rate of heating water in the building side is varied based on the building load/demand.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+April 7, 2023, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Indirect;
diff --git a/Buildings/DHC/ETS/Heating/Examples/package.mo b/Buildings/DHC/ETS/Heating/Examples/package.mo
new file mode 100644
index 00000000000..ce70e5c9284
--- /dev/null
+++ b/Buildings/DHC/ETS/Heating/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.ETS.Heating;
+package Examples
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(revisions="<html>
+</html>", info="<html>
+<p>This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.ETS.Cooling\">
+Buildings.DHC.ETS.Cooling</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.order b/Buildings/DHC/ETS/Heating/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.order
rename to Buildings/DHC/ETS/Heating/Examples/package.order
diff --git a/Buildings/DHC/ETS/Heating/Indirect.mo b/Buildings/DHC/ETS/Heating/Indirect.mo
new file mode 100644
index 00000000000..f37928061b7
--- /dev/null
+++ b/Buildings/DHC/ETS/Heating/Indirect.mo
@@ -0,0 +1,206 @@
+within Buildings.DHC.ETS.Heating;
+model Indirect
+  "Indirect heating energy transfer station for district energy systems"
+  extends
+    Buildings.DHC.ETS.BaseClasses.PartialIndirect(
+      QHeaWat_flow_nominal=Q_flow_nominal,
+      final typ=Buildings.DHC.Types.DistrictSystemType.HeatingGeneration2to4,
+      final have_chiWat=false,
+      final have_heaWat=true,
+      Q_flow_nominal(min=0),
+      nPorts_aHeaWat=1,
+      nPorts_bHeaWat=1);
+equation
+  connect(ports_aHeaWat[1], senTBuiRet.port_a) annotation (Line(points={{-300,260},
+          {-240,260},{-240,200},{-218,200}}, color={0,127,255}));
+  connect(port_aSerHea, senTDisSup.port_a) annotation (Line(points={{-300,-240},
+          {-260,-240},{-260,-280},{-220,-280}}, color={0,127,255}));
+  connect(senTBuiSup.port_b, ports_bHeaWat[1]) annotation (Line(points={{-36,-204},
+          {-60,-204},{-60,180},{220,180},{220,260},{300,260}}, color={0,127,255}));
+  connect(senTDisRet.port_b, port_bSerHea) annotation (Line(points={{200,-280},
+          {242,-280},{242,-240},{300,-240}}, color={0,127,255}));
+  annotation (
+    defaultComponentName="etsCoo",
+    Documentation(info="<html>
+<p>
+Indirect heating energy transfer station (ETS) model that controls the
+building chilled water supply temperature by modulating a primary control valve
+on the district supply side. The design is based on a typical district heating
+ETS described in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Heating Guide</a>.
+As shown in the figure below, the building pumping design (constant/variable)
+is specified on the building side and not within the ETS.
+</p>
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
+</p>
+<h4>Reference</h4>
+<p>
+American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2013).
+Chapter 5: Consumer Interconnection. In <i>District Heating Guide</i>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 27, 2024, by David Blum:<br/>
+Update icon and fix port orientation to align with convention.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3606\">issue #3606</a>.
+</li>
+<li>
+January 8, 2024, by David Blum:<br/>
+Correct documentation to describe heating.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
+issue 3628</a>.
+</li>
+<li>
+April 7, 2023, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-36,48},{34,-32}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-28,42},{-24,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-24,42},{-16,-26}},
+          fillColor={162,29,33},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-12,42},{-2,-26}},
+          fillColor={162,29,33},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-16,42},{-12,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{2,42},{10,-26}},
+          fillColor={162,29,33},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-2,42},{2,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{14,42},{22,-26}},
+          fillColor={162,29,33},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{10,42},{14,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{22,42},{26,-26}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-52,-9},{52,9}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-49,88},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-15},{8,15}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={49,-24},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-12},{8,12}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-46,40},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-12},{8,12}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={46,40},
+          rotation=90),
+        Rectangle(
+          extent={{-52,-9},{52,9}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={49,88},
+          rotation=90),
+        Rectangle(
+          extent={{-22,-8},{22,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-66,-120},
+          rotation=90),
+        Rectangle(
+          extent={{-63,-8},{63,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={66,-79},
+          rotation=90),
+        Rectangle(
+          extent={{-8,-15},{8,15}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-51,-24},
+          rotation=90),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-66,-88},
+          rotation=270),
+        Polygon(
+          points={{10,-14},{10,14},{-10,0},{10,-14}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid,
+          origin={-66,-68},
+          rotation=90),
+        Rectangle(
+          extent={{-21,-8},{21,8}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          origin={-66,-37},
+          rotation=90)}));
+end Indirect;
diff --git a/Buildings/DHC/ETS/Heating/package.mo b/Buildings/DHC/ETS/Heating/package.mo
new file mode 100644
index 00000000000..6cfc44c96d9
--- /dev/null
+++ b/Buildings/DHC/ETS/Heating/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.ETS;
+package Heating "This package contains models for energy transfer stations used in district heating systems"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models for energy transfer stations used
+in district heating systems.
+</p>
+</html>"));
+end Heating;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.order b/Buildings/DHC/ETS/Heating/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.order
rename to Buildings/DHC/ETS/Heating/package.order
diff --git a/Buildings/DHC/ETS/Types.mo b/Buildings/DHC/ETS/Types.mo
new file mode 100644
index 00000000000..0418ce5ca34
--- /dev/null
+++ b/Buildings/DHC/ETS/Types.mo
@@ -0,0 +1,60 @@
+within Buildings.DHC.ETS;
+package Types
+  "Package with type definitions"
+  extends Modelica.Icons.TypesPackage;
+  type ConnectionConfiguration = enumeration(
+      TwoWayValve
+    "Two-way valve on district side",
+      Pump
+    "Pump on district side")
+    "Enumeration for the type of connection with the district network"
+    annotation (Documentation(info="<html>
+<p>
+Enumeration to define the type of connection with the district network.
+<br/>
+</p>
+<table border=\"1\" summary=\"Explanation of the enumeration\">
+<tr>
+  <th>
+  Enumeration
+  </th>
+  <th>
+  Description
+  </th>
+</tr>
+<tr>
+  <td>
+  TwoWayValve
+  </td>
+  <td>
+  Use this setting in case of an active network with a two-way valve on
+  the district side.
+  </td>
+</tr>
+<tr>
+  <td>
+  Pump
+  </td>
+  <td>
+  Use this setting in case of a passive network with a pump on the
+  district side.
+  </td>
+</tr>
+</table>
+</html>",revisions="<html>
+<ul>
+<li>
+September 2, 2020, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains type definitions.
+</p>
+</html>"));
+end Types;
diff --git a/Buildings/DHC/ETS/package.mo b/Buildings/DHC/ETS/package.mo
new file mode 100644
index 00000000000..9925b5a97ca
--- /dev/null
+++ b/Buildings/DHC/ETS/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC;
+package ETS "Package of models for energy transfer stations"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for energy transfer stations (ETS), also called
+end user interfaces or customer/consumer interfaces.
+</p>
+</html>"));
+end ETS;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/package.order b/Buildings/DHC/ETS/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/EnergyTransferStations/package.order
rename to Buildings/DHC/ETS/package.order
diff --git a/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo b/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
new file mode 100644
index 00000000000..ef9d105832e
--- /dev/null
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/Borefield.mo
@@ -0,0 +1,103 @@
+within Buildings.DHC.Examples.Combined.BaseClasses;
+model Borefield "Geothermal borefield model"
+  extends Buildings.Fluid.Geothermal.Borefields.TwoUTubes(
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    final tLoaAgg(displayUnit="h") = 3600,
+    final nSeg=5,
+    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,
+          cFil=3040,
+          dFil=1450),
+      soiDat=Buildings.Fluid.Geothermal.Borefields.Data.Soil.SandStone(
+          kSoi=2.3,
+          cSoi=1000,
+          dSoi=2600),
+      conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
+        borCon=Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel,
+        dp_nominal=35000,
+        hBor=300,
+        rBor=0.095,
+        nBor=350,
+        cooBor=cooBor,
+        dBor=1,
+        rTub=0.02,
+        kTub=0.5,
+        eTub=0.0037,
+        xC=0.05)),
+    show_T=true);
+  /*
+  Some parameters (such as nBor) cannot be propagated down to
+  borFieDat.conDat otherwise Dymola fails to expand.
+  We assign them literally within borFieDat.conDat and propagate them up here
+  to compute dependent parameters.
+  */
+  parameter Integer nBor = borFieDat.conDat.nBor
+    "Number of boreholes"
+    annotation(Evaluate=true);
+  parameter Real dxyBor = 10
+    "Distance between boreholes";
+  final parameter Modelica.Units.SI.Length cooBor[nBor,2]={dxyBor*{mod(i - 1,
+      10),floor((i - 1)/10)} for i in 1:nBor}
+    "Cartesian coordinates of the boreholes in meters";
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput Q_flow(final unit="W")
+    "Rate at which heat is extracted from soil"
+    annotation (Placement(transformation(extent={{100,-50},{120,-30}}),
+      iconTransformation(extent={{100,-64},{140,-24}})));
+equation
+  connect(gaiQ_flow.y, Q_flow) annotation (Line(points={{1,80},{14,80},{14,54},{
+          96,54},{96,-40},{110,-40}},
+                                    color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+This model represents a borefield composed of 350 boreholes,
+with the following main assumptions.
+</p>
+<ul>
+<li>
+The soil is made of sandstone.
+</li>
+<li>
+The boreholes are filled with a bentonite grout.
+</li>
+<li>
+The boreholes have a height of 300 m and a diameter of 190 mm.
+They are discretized vertically in five segments.
+</li>
+<li>
+A distance of 10 m between each borehole is considered.
+</li>
+<li>
+HDPE pipes with a diameter of 40 mm are considered, in a
+double U-tube parallel configuration.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+January 8, 2024, by David Blum:<br/>
+Moved to <code>Buildings.DHC.Examples.Combined.BaseClasses.Borefield</code>.
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
+issue 3628</a>.
+</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.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+Updated documentation.
+</li>
+<li>
+January 12, 2020, by Michael Wetter:<br/>
+Added documentation.
+</li>
+</ul>
+</html>"));
+end Borefield;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo b/Buildings/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
index 9fdcb16f0a2..288a7fa147f 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/DesignDataSeries.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
+within Buildings.DHC.Examples.Combined.BaseClasses;
 record DesignDataSeries "Record with design data for series network"
   extends Modelica.Icons.Record;
   parameter Integer nBui = 3
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo b/Buildings/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
rename to Buildings/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
index 303740b2c53..18a4b012532 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/PartialSeries.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
+within Buildings.DHC.Examples.Combined.BaseClasses;
 partial model PartialSeries "Partial model for series network"
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Water "Medium model";
@@ -22,18 +22,18 @@ partial model PartialSeries "Partial model for series network"
     "Number of buildings connected to DHC system"
     annotation (Evaluate=true);
   inner parameter
-    Buildings.Experimental.DHC.Examples.Combined.BaseClasses.DesignDataSeries
+    Buildings.DHC.Examples.Combined.BaseClasses.DesignDataSeries
     datDes(final mCon_flow_nominal=bui.ets.mSerWat_flow_nominal, lEnd=100)
                                                                  "Design data"
     annotation (Placement(transformation(extent={{-360,220},{-340,240}})));
   // COMPONENTS
-  Buildings.Experimental.DHC.Examples.Combined.BaseClasses.BoreField borFie(
+  Buildings.DHC.Examples.Combined.BaseClasses.Borefield borFie(
       redeclare final package Medium = Medium) "Bore field" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-130,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDis(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDis(
     redeclare final package Medium = Medium,
     final m_flow_nominal=datDes.mPumDis_flow_nominal,
     final allowFlowReversal=allowFlowReversalSer,
@@ -50,7 +50,7 @@ partial model PartialSeries "Partial model for series network"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={112,-98})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumSto(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumSto(
     redeclare final package Medium = Medium,
     m_flow_nominal=datDes.mSto_flow_nominal)
     "Bore field pump"
@@ -58,7 +58,7 @@ partial model PartialSeries "Partial model for series network"
       extent={{10,10},{-10,-10}},
       rotation=180,
       origin={-180,-80})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R conPla(
+  Buildings.DHC.Networks.Connections.Connection1Pipe_R conPla(
     redeclare final package Medium = Medium,
     final mDis_flow_nominal=datDes.mPipDis_flow_nominal,
     final mCon_flow_nominal=datDes.mPla_flow_nominal,
@@ -70,7 +70,7 @@ partial model PartialSeries "Partial model for series network"
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-80,-10})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R conSto(
+  Buildings.DHC.Networks.Connections.Connection1Pipe_R conSto(
     redeclare final package Medium = Medium,
     final mDis_flow_nominal=datDes.mPipDis_flow_nominal,
     final mCon_flow_nominal=datDes.mSto_flow_nominal,
@@ -82,7 +82,7 @@ partial model PartialSeries "Partial model for series network"
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-80,-90})));
-  Buildings.Experimental.DHC.Plants.Heating.SewageHeatRecovery
+  Buildings.DHC.Plants.Heating.SewageHeatRecovery
     pla(
     redeclare final package Medium = Medium,
     final mSew_flow_nominal=datDes.mPla_flow_nominal,
@@ -116,14 +116,16 @@ partial model PartialSeries "Partial model for series network"
         rotation=90,
         origin={-80,-40})));
   replaceable
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS
     bui[nBui] constrainedby
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
     bui(each final facMul=facMul),
     redeclare each final package MediumBui = Medium,
     redeclare each final package MediumSer = Medium,
     each final allowFlowReversalBui=allowFlowReversalBui,
-    each final allowFlowReversalSer=allowFlowReversalSer) "Building and ETS"
+    each final allowFlowReversalSer=allowFlowReversalSer,
+    each final TDisWatMin=datDes.TLooMin,
+    each final TDisWatMax=datDes.TLooMax) "Building and ETS"
     annotation (Placement(transformation(extent={{-10,170},{10,190}})));
  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMaxSet[nBui](
     k=bui.THeaWatSup_nominal)
@@ -169,7 +171,7 @@ partial model PartialSeries "Partial model for series network"
     annotation (Placement(transformation(extent={{220,150},{240,170}})));
  Buildings.Controls.OBC.CDL.Reals.MultiSum ETot(nin=2) "Total electric energy"
     annotation (Placement(transformation(extent={{320,150},{340,170}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.ConstraintViolation conVio(
+  Buildings.DHC.Loads.BaseClasses.ConstraintViolation conVio(
     final uMin(final unit="K", displayUnit="degC")=datDes.TLooMin,
     final uMax(final unit="K", displayUnit="degC")=datDes.TLooMax,
     final nu=3,
@@ -252,6 +254,12 @@ equation
       Documentation(revisions="<html>
 <ul>
 <li>
+March 18, 2024, by David Blum:<br/>
+Updated use of <code>datDes</code> for min and max loop temperatures.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3697\">issue 3697</a>.
+</li>
+<li>
 December 12, 2023, by Ettore Zanetti:<br/>
 Changed to preconfigured pump model,
 This is for
diff --git a/Buildings/DHC/Examples/Combined/BaseClasses/Zurich.mo b/Buildings/DHC/Examples/Combined/BaseClasses/Zurich.mo
new file mode 100644
index 00000000000..56af1b4ad69
--- /dev/null
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/Zurich.mo
@@ -0,0 +1,6 @@
+within Buildings.DHC.Examples.Combined.BaseClasses;
+record Zurich =
+  Buildings.BoundaryConditions.GroundTemperature.ClimaticConstants.Generic (
+    TSurMea=282.98,
+    TSurAmp=9.03,
+    sinPha=9132480) "Zurich";
diff --git a/Buildings/DHC/Examples/Combined/BaseClasses/package.mo b/Buildings/DHC/Examples/Combined/BaseClasses/package.mo
new file mode 100644
index 00000000000..201fdb6f360
--- /dev/null
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Examples.Combined;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Examples.Combined\">
+Buildings.DHC.Examples.Combined</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/DHC/Examples/Combined/BaseClasses/package.order b/Buildings/DHC/Examples/Combined/BaseClasses/package.order
new file mode 100644
index 00000000000..c7ee2786d7f
--- /dev/null
+++ b/Buildings/DHC/Examples/Combined/BaseClasses/package.order
@@ -0,0 +1,4 @@
+Borefield
+PartialSeries
+DesignDataSeries
+Zurich
diff --git a/Buildings/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mo b/Buildings/DHC/Examples/Combined/SeriesConstantFlow.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mo
rename to Buildings/DHC/Examples/Combined/SeriesConstantFlow.mo
index 93a6d647051..80702d4b7b5 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mo
+++ b/Buildings/DHC/Examples/Combined/SeriesConstantFlow.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Examples.Combined;
+within Buildings.DHC.Examples.Combined;
 model SeriesConstantFlow
   "Example of series connection with constant district water mass flow rate"
-  extends Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
-      Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
+  extends Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
+      Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
       datDes(
       mPumDis_flow_nominal=95,
       mPipDis_flow_nominal=95,
@@ -10,9 +10,9 @@ model SeriesConstantFlow
       epsPla=0.935),
     pumSto(dp_nominal=30000));
   parameter String filNam[nBui]={
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos"}
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos"}
     "Library paths of the files with thermal loads as time series";
   Modelica.Blocks.Sources.Constant masFloMaiPum(
     k=datDes.mPumDis_flow_nominal)
@@ -71,7 +71,7 @@ equation
   Diagram(
   coordinateSystem(preserveAspectRatio=false, extent={{-360,-260},{360,260}})),
     __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos"
+  file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos"
   "Simulate and plot"),
   experiment(
       StopTime=604800,
diff --git a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mo b/Buildings/DHC/Examples/Combined/SeriesVariableFlow.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mo
rename to Buildings/DHC/Examples/Combined/SeriesVariableFlow.mo
index e09ea523fb2..4c13ab59a87 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mo
+++ b/Buildings/DHC/Examples/Combined/SeriesVariableFlow.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Examples.Combined;
+within Buildings.DHC.Examples.Combined;
 model SeriesVariableFlow
   "Example of series connection with variable district water mass flow rate"
-  extends Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
-      Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
+  extends Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
+      Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
       datDes(
       mPumDis_flow_nominal=97.3,
       mPipDis_flow_nominal=69.5,
@@ -10,9 +10,9 @@ model SeriesVariableFlow
       epsPla=0.91),
     pumSto(dp_nominal=30000));
   parameter String filNam[nBui]={
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos"}
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos"}
     "Library paths of the files with thermal loads as time series";
   Modelica.Blocks.Sources.Constant masFloDisPla(
     k=datDes.mPla_flow_nominal)
@@ -26,7 +26,7 @@ model SeriesVariableFlow
     k=fill(15 + 273.15, nBui))
     "Cold water temperature"
     annotation (Placement(transformation(extent={{-322,150},{-302,170}})));
-  Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe conPum(
+  Buildings.DHC.Networks.Controls.MainPump1Pipe conPum(
     nMix=nBui,
     nSou=2,
     nBui=nBui,
@@ -96,7 +96,7 @@ equation
   Diagram(
   coordinateSystem(preserveAspectRatio=false, extent={{-360,-260},{360,260}})),
     __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos"
+  file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos"
   "Simulate and plot"),
   experiment(
       StopTime=604800,
@@ -124,8 +124,8 @@ Added documentation.
 </html>", info="<html>
 <p>
 This model is identical to
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow\">
-Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow</a>
+<a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesConstantFlow\">
+Buildings.DHC.Examples.Combined.SeriesConstantFlow</a>
 except for the pipe diameter and the control of the main circulation pump.
 Rather than having a constant mass flow rate, the mass flow rate is varied
 based on the mixing temperatures after each agent.
diff --git a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo b/Buildings/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
rename to Buildings/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
index 05621272660..19a484251fa 100644
--- a/Buildings/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
+++ b/Buildings/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Examples.Combined;
+within Buildings.DHC.Examples.Combined;
 model SeriesVariableFlowAgentControl
   "Example of series connection with variable district water mass flow rate with updated agent controller"
-  extends Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
-      Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
+  extends Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries(redeclare
+      Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui[nBui](final filNam=filNam),
       datDes(
       mPumDis_flow_nominal=97.3,
       mPipDis_flow_nominal=69.5,
@@ -13,9 +13,9 @@ model SeriesVariableFlowAgentControl
       epsPla=0.91),
     pumSto(dp_nominal=40000));
   parameter String filNam[nBui]={
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
-    "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos"}
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos"}
     "Library paths of the files with thermal loads as time series";
   parameter Modelica.Units.SI.Length diameter=sqrt(4*datDes.mPipDis_flow_nominal/1000/1.5/Modelica.Constants.pi)
     "Pipe diameter (without insulation)";
@@ -35,7 +35,7 @@ model SeriesVariableFlowAgentControl
     k=fill(15 + 273.15, nBui))
     "Cold water temperature"
     annotation (Placement(transformation(extent={{-344,150},{-324,170}})));
-  Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe conPum(
+  Buildings.DHC.Networks.Controls.MainPump1Pipe conPum(
     nMix=nBui,
     nSou=2,
     nBui=nBui,
@@ -79,7 +79,7 @@ model SeriesVariableFlowAgentControl
       each c=1000,
       each d=2600))
     annotation (Placement(transformation(extent={{-10,100},{12,80}})));
-  Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsew(
+  Buildings.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsew(
     yPumMin=0,
     dToff=0.5,
     k=0.8,
@@ -87,7 +87,7 @@ model SeriesVariableFlowAgentControl
     uLowHea=0.75,
     uHighHea=1.5,
     h=0.5) annotation (Placement(transformation(extent={{-280,-10},{-260,10}})));
-  Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsewSto(
+  Buildings.DHC.Networks.Controls.AgentPump1Pipe pumPlantControlNsewSto(
     yPumMin=0,
     dToff=0.45,
     k=1.1,
@@ -233,7 +233,7 @@ equation
   Diagram(
   coordinateSystem(preserveAspectRatio=false, extent={{-400,-260},{400,260}})),
     __Dymola_Commands(
-  file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos"
+  file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos"
   "Simulate and plot"),
   experiment(
       StopTime=604800,
@@ -248,8 +248,8 @@ First implementation.
 </html>", info="<html>
 <p>
 This model is an updated version of
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">
-Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">
+Buildings.DHC.Examples.Combined.SeriesVariableFlow</a>.
 In particular the following have been updated:
 </p>
 <ul>
@@ -260,8 +260,8 @@ The sewage water temperature, mass flow rate and ground temperature are not cons
 The distribution network pripes now use the plug-flow model to add transport delay and ground coupling to the distribution network.
 </li>
 <li>
-The borefield and sewagre heat exchanger circulation pumps are controlled by an agent specific controller <a href=\"modelica://Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe\">
-Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe</a>.
+The borefield and sewagre heat exchanger circulation pumps are controlled by an agent specific controller <a href=\"modelica://Buildings.DHC.Networks.Controls.AgentPump1Pipe\">
+Buildings.DHC.Networks.Controls.AgentPump1Pipe</a>.
 </li>
 </ul>
 
diff --git a/Buildings/DHC/Examples/Combined/package.mo b/Buildings/DHC/Examples/Combined/package.mo
new file mode 100644
index 00000000000..a5f9baef931
--- /dev/null
+++ b/Buildings/DHC/Examples/Combined/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Examples;
+package Combined "Package of example models for DHC systems"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains example models for
+district heating and cooling systems.
+</p>
+</html>"));
+end Combined;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/package.order b/Buildings/DHC/Examples/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/Combined/package.order
rename to Buildings/DHC/Examples/Combined/package.order
diff --git a/Buildings/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mo b/Buildings/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
similarity index 89%
rename from Buildings/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
rename to Buildings/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
index c8aa611e2d0..fa879571d2a 100644
--- a/Buildings/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
+++ b/Buildings/DHC/Examples/Cooling/ElectricChillersDirectETS.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Examples.Cooling;
+within Buildings.DHC.Examples.Cooling;
 model ElectricChillersDirectETS "Example model for district cooling system with
   an electric chiller plant and a direct controlled ETS at each building"
   extends Modelica.Icons.Example;
@@ -46,13 +46,13 @@ model ElectricChillersDirectETS "Example model for district cooling system with
     "Nominal mass flow rate in each connection line";
   // Buildings
   parameter String filNam[nLoa]={
-   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
-   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
-   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")}
+   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
+   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"),
+   Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")}
     "Library path of the file with thermal loads as time series"
     annotation (Dialog(group="Buildings"));
   final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal[nLoa](
-    each max=-Modelica.Constants.eps)={Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    each max=-Modelica.Constants.eps)={Buildings.DHC.Loads.BaseClasses.getPeakLoad(
     string="#Peak space cooling load",
     filNam=filNam[i]) for i in 1:nLoa}
     "Space cooling design load (<=0)";
@@ -60,7 +60,7 @@ model ElectricChillersDirectETS "Example model for district cooling system with
     each final min=0,
     each final start=0.5)={-QCoo_flow_nominal[i]/(cp*buiETS[i].dT_nominal) for i in 1:nLoa}
     "Nominal mass flow rate of building cooling side";
-  Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel pla(
+  Buildings.DHC.Plants.Cooling.ElectricChillerParallel pla(
     perChi=perChi,
     dTApp=3,
     perCHWPum=perCHWPum,
@@ -94,7 +94,7 @@ model ElectricChillersDirectETS "Example model for district cooling system with
   Modelica.Blocks.Sources.Constant TCHWSupSet(k=273.15+7)
     "Chilled water supply temperature setpoint"
     annotation (Placement(transformation(extent={{0,-60},{20,-40}})));
-  Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v dis(
+  Buildings.DHC.Networks.Distribution2PipePlugFlow_v dis(
     redeclare final package Medium = Medium,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -104,7 +104,7 @@ model ElectricChillersDirectETS "Example model for district cooling system with
     lDis=fill(30, nLoa),
     lEnd=30) "Distribution network for district cooling system"
     annotation (Placement(transformation(extent={{100,-20},{140,0}})));
-  Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiETS[nLoa](
+  Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiETS[nLoa](
     each yMin=0.05,
     each use_inputFilter=true,
     filNam=filNam,
@@ -187,7 +187,7 @@ equation
       coordinateSystem(
       preserveAspectRatio=false, extent={{-180,-100},{180,100}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos" "Simulate and plot"),
     experiment(
       StartTime=15724800,
       StopTime=16329600,
@@ -196,18 +196,18 @@ equation
 <p>
 This model illustrates an example of district cooling system,
 consisting of a cooling plant with parallel electric chillers
-(<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel\">
-Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel</a>),
-a two-pipe distribution network with plug flow pipes (<a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v</a>),
+(<a href=\"modelica://Buildings.DHC.Plants.Cooling.ElectricChillerParallel\">
+Buildings.DHC.Plants.Cooling.ElectricChillerParallel</a>),
+a two-pipe distribution network with plug flow pipes (<a href=\"modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\">
+Buildings.DHC.Networks.Distribution2PipePlugFlow_v</a>),
 and time series building load that have directly connected ETS
 with the chilled water return temperatures controlled above a minimum
 threshold
-(<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">
-Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS</a>).
+(<a href=\"modelica://Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">
+Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS</a>).
 This configuration is illustrated in the schematic below.
 </p>
-<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.png\" alt=\"DC Schematic\"/></p>
+<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.png\" alt=\"DC Schematic\"/></p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Buildings/DHC/Examples/Cooling/package.mo b/Buildings/DHC/Examples/Cooling/package.mo
new file mode 100644
index 00000000000..b53e28f27da
--- /dev/null
+++ b/Buildings/DHC/Examples/Cooling/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Examples;
+package Cooling "Example model for entire district cooling system"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains an example model for
+district cooling system.
+</p>
+</html>"));
+end Cooling;
diff --git a/Buildings/Experimental/DHC/Examples/Cooling/package.order b/Buildings/DHC/Examples/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/Cooling/package.order
rename to Buildings/DHC/Examples/Cooling/package.order
diff --git a/Buildings/DHC/Examples/Steam/SingleBoiler.mo b/Buildings/DHC/Examples/Steam/SingleBoiler.mo
new file mode 100644
index 00000000000..a9e9d5d392d
--- /dev/null
+++ b/Buildings/DHC/Examples/Steam/SingleBoiler.mo
@@ -0,0 +1,135 @@
+within Buildings.DHC.Examples.Steam;
+model SingleBoiler "Example model for a complete steam district heating system with a
+  central plant that contains a single boiler"
+  extends Modelica.Icons.Example;
+
+  package MediumSte = Buildings.Media.Steam (p_default=400000,
+    T_default=273.15+143.61,
+    h_default=2738100)
+    "Steam medium";
+  package MediumWat =
+    Buildings.Media.Specialized.Water.TemperatureDependentDensity (
+      p_default=101325,
+      T_default=100+273.15,
+      h_default=2738100)
+    "Water medium";
+
+  parameter Modelica.Units.SI.AbsolutePressure pSat=400000
+    "Saturation pressure, high pressure";
+  parameter Modelica.Units.SI.AbsolutePressure pLow=200000
+    "Reduced pressure, after PRV";
+  parameter Modelica.Units.SI.Temperature TSat=
+     MediumSte.saturationTemperature(pSat)
+     "Saturation temperature, at high pressure";
+
+  parameter Integer N = 3 "Number of buildings";
+  parameter Modelica.Units.SI.MassFlowRate mDis_flow_nominal=sum(bld.m_flow_nominal)*1.2
+    "Nominal mass flow rate of entire district";
+  parameter Modelica.Units.SI.HeatFlowRate QDis_flow_nominal=QBui_flow_nominal*N
+    "Nominal heat flow rate of entire district";
+  parameter Modelica.Units.SI.HeatFlowRate QBui_flow_nominal=20000
+    "Nominal heat flow rate of each building";
+  parameter Modelica.Units.SI.PressureDifference dpPip=6000
+    "Pressure drop in the condensate return pipe";
+
+  parameter Buildings.Fluid.Movers.Data.Generic perPumFW(
+   pressure(V_flow=(mDis_flow_nominal/1000)*{0,1,2},
+     dp=(pSat-101325)*{2,1,0}))
+    "Performance data for feedwater pump at the plant";
+
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=6000
+    "Pressure drop of distribution at nominal mass flow rate";
+
+  Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS bld[N](
+    redeclare final package MediumSte = MediumSte,
+    redeclare final package MediumWat = MediumWat,
+    each have_prv=true,
+    each dp_nominal=dpPip/2,
+    each final pSte_nominal=pSat,
+    each final Q_flow_nominal=QBui_flow_nominal,
+    each pLow_nominal=pLow,
+    each energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    each tableOnFile=false,
+    each QHeaLoa=
+      [0,0.8; 2,1; 10,1; 12,0.5; 20,0.5; 24,0.8]*[1,0;0,QBui_flow_nominal],
+    each smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1,
+    each timeScale(displayUnit="s") = 3600,
+    each show_T=true)
+    "Buildings"
+    annotation (Placement(transformation(extent={{60,20},{40,40}})));
+  Buildings.DHC.Networks.Steam.DistributionCondensatePipe dis(
+    redeclare final package MediumSup = MediumSte,
+    redeclare final package MediumRet = MediumWat,
+    final dp_nominal=dp_nominal,
+    final nCon=N,
+    final mDis_flow_nominal=mDis_flow_nominal,
+    final mCon_flow_nominal=bld.m_flow_nominal)
+    "Distribution network"
+    annotation (Placement(transformation(extent={{0,-20},{40,0}})));
+  Buildings.DHC.Plants.Steam.SingleBoiler pla(
+    redeclare final package Medium = MediumWat,
+    redeclare final package MediumHea_b = MediumSte,
+    final m_flow_nominal=mDis_flow_nominal,
+    final pSteSet=pSat,
+    final Q_flow_nominal=QDis_flow_nominal,
+    final per=perPumFW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    kBoi=600,
+    TiBoi(displayUnit="min") = 120,
+    kPum=200,
+    TiPum=1000)
+    "Plant"
+    annotation (Placement(transformation(extent={{-50,20},{-30,40}})));
+equation
+  connect(dis.ports_bCon, bld.port_a)
+    annotation (Line(points={{8,0},{8,30},{40,30}},      color={0,127,255}));
+  connect(bld.port_b, dis.ports_aCon)
+    annotation (Line(points={{40,24},{32,24},{32,0}},  color={0,127,255}));
+  connect(pla.port_bSerHea, dis.port_aDisSup)
+    annotation (Line(points={{-30,30},{-20,30},{-20,-10},{0,-10}},
+                                                 color={0,127,255}));
+  connect(dis.port_bDisRet, pla.port_aSerHea) annotation (Line(points={{0,-16},{
+          -60,-16},{-60,30},{-50,30}},                   color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+      __Dymola_Commands(file=
+    "modelica://Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos"
+    "Simulate and plot"),
+    experiment(
+      StopTime=86400,
+      Tolerance=1e-06),
+    Documentation(revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Added publication references.
+</li>
+<li>
+March 3, 2022 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This example model demonstrates a complete system simulation for
+steam district heating systems. The central plant features a single boiler.
+For the distribution network, pressure losses on the condensate return
+pipes are included, while the steam pipes are assumed to be lossless.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>"));
+end SingleBoiler;
diff --git a/Buildings/DHC/Examples/Steam/package.mo b/Buildings/DHC/Examples/Steam/package.mo
new file mode 100644
index 00000000000..94d8252504a
--- /dev/null
+++ b/Buildings/DHC/Examples/Steam/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Examples;
+package Steam "Package of example models for steam district heating systems"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains example models for
+steam-based district heating systems.
+</p>
+</html>"));
+end Steam;
diff --git a/Buildings/Experimental/DHC/Examples/Steam/package.order b/Buildings/DHC/Examples/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/Steam/package.order
rename to Buildings/DHC/Examples/Steam/package.order
diff --git a/Buildings/DHC/Examples/package.mo b/Buildings/DHC/Examples/package.mo
new file mode 100644
index 00000000000..0dfbe902030
--- /dev/null
+++ b/Buildings/DHC/Examples/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC;
+package Examples "Collection of cases study"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains district heating and cooling case studies to show how the
+developed models can be used for design and operation.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Examples/package.order b/Buildings/DHC/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Examples/package.order
rename to Buildings/DHC/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ1Valve.mo b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ1Valve.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ1Valve.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingRCZ1Valve.mo
index 7ee7aa50325..66ba13d1fbb 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ1Valve.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ1Valve.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingRCZ1Valve
   "One-zone RC building model with distribution pumps and mixing valves"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_heaWat=true,
     final have_chiWat=true,
@@ -151,7 +151,7 @@ model BuildingRCZ1Valve
   Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(
     nin=2)
     annotation (Placement(transformation(extent={{240,70},{260,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4Pipe terUni(
+  Buildings.DHC.Loads.BaseClasses.FanCoil4Pipe terUni(
     redeclare package Medium1=Medium,
     redeclare package Medium2=Medium2,
     QHea_flow_nominal=1000,
@@ -166,7 +166,7 @@ model BuildingRCZ1Valve
     mLoaCoo_flow_nominal=1)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-160,-58},{-140,-38}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mHeaWat_flow_nominal,
     have_pum=true,
@@ -176,10 +176,10 @@ model BuildingRCZ1Valve
     nPorts_b1=1)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mChiWat_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
     have_val=true,
     dp_nominal=100000,
@@ -322,15 +322,15 @@ This is a simplified one-zone building model based on a one-element
 reduced order room model.
 The corresponding heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of fluid ports.
 </p>
 <p>
 The heating and chilled water distribution to the terminal units is modeled
 with an instance of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 including a mixing valve to control the supply temperature.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ6.mo b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ6.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingRCZ6.mo
index d8439e73bb8..f5376cd2ee7 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingRCZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingRCZ6.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingRCZ6
   "Six-zone RC building model based on URBANopt GeoJSON export, with distribution pumps"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_weaBus=true,
     final have_heaWat=true,
@@ -43,22 +43,22 @@ model BuildingRCZ6
       each displayUnit="degC"))
     "Maximum temperature set point"
     annotation (Placement(transformation(extent={{-290,190},{-270,210}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office office
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office office
     annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Floor floor
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Floor floor
     annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Storage storage
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Storage storage
     annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Meeting meeting
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Meeting meeting
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Restroom restroom
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Restroom restroom
     annotation (Placement(transformation(extent={{60,-20},{80,0}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.ICT iCT
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.ICT iCT
     annotation (Placement(transformation(extent={{100,-20},{120,0}})));
   Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(
     nin=2)
     annotation (Placement(transformation(extent={{240,70},{260,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4PipeHeatPorts terUni[nZon](
+  Buildings.DHC.Loads.BaseClasses.FanCoil4PipeHeatPorts terUni[nZon](
     redeclare each final package Medium1=Medium,
     redeclare each final package Medium2=Medium2,
     final facMul=facMulTerUni,
@@ -74,7 +74,7 @@ model BuildingRCZ6
     each mLoaCoo_flow_nominal=5)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-200,-60},{-180,-40}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mHeaWat_flow_nominal .* terUni.facMul),
@@ -84,11 +84,11 @@ model BuildingRCZ6
     nPorts_b1=nZon)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mChiWat_flow_nominal .* terUni.facMul),
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
     dp_nominal=100000,
     nPorts_a1=nZon,
@@ -183,8 +183,8 @@ model.
 It was generated from translating a GeoJSON model specified within the URBANopt UI.
 The heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of heat ports.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ1.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ1.mo
index 5646bffddc5..89d4c3efa8b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ1.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ1.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingSpawnZ1
   "One-zone EnergyPlus building model"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_heaWat=true,
     final have_chiWat=true,
@@ -59,7 +59,7 @@ model BuildingSpawnZ1
       displayUnit="degC"))
     "Maximum temperature set point"
     annotation (Placement(transformation(extent={{-280,210},{-260,230}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4Pipe terUni(
+  Buildings.DHC.Loads.BaseClasses.FanCoil4Pipe terUni(
     redeclare package Medium1=Medium,
     redeclare package Medium2=Medium2,
     QHea_flow_nominal=2000,
@@ -74,7 +74,7 @@ model BuildingSpawnZ1
     mLoaCoo_flow_nominal=1)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-160,-60},{-140,-40}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mHeaWat_flow_nominal,
     dp_nominal=100000,
@@ -82,10 +82,10 @@ model BuildingSpawnZ1
     nPorts_b1=nZon)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=terUni.mChiWat_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     dp_nominal=100000,
     nPorts_a1=nZon,
     nPorts_b1=nZon)
@@ -154,8 +154,8 @@ This is a simplified one-zone building model based on EnergyPlus
 building envelope model.
 The heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of fluid ports.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ6.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ6.mo
index 143e66fc7d0..fe2aad4d55c 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingSpawnZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingSpawnZ6.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingSpawnZ6
   "Six-zone EnergyPlus building model based on URBANopt GeoJSON export, with distribution pumps"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     final have_heaWat=true,
     final have_chiWat=true,
@@ -112,7 +112,7 @@ model BuildingSpawnZ6
   Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum3(
     nin=2)
     annotation (Placement(transformation(extent={{230,70},{250,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.FanCoil4Pipe terUni[nZon](
+  Buildings.DHC.Loads.BaseClasses.FanCoil4Pipe terUni[nZon](
     redeclare each final package Medium1=Medium,
     redeclare each final package Medium2=Medium2,
     final facMul=facMulTerUni,
@@ -128,7 +128,7 @@ model BuildingSpawnZ6
     final mLoaCoo_flow_nominal=mLoa_flow_nominal)
     "Terminal unit"
     annotation (Placement(transformation(extent={{-140,-2},{-116,22}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mHeaWat_flow_nominal .* terUni.facMul),
@@ -138,11 +138,11 @@ model BuildingSpawnZ6
     nPorts_b1=nZon)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{-200,-190},{-180,-170}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare package Medium=Medium,
     m_flow_nominal=sum(
       terUni.mChiWat_flow_nominal .* terUni.facMul),
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
     dp_nominal=100000,
     nPorts_a1=nZon,
@@ -257,8 +257,8 @@ building envelope model.
 It was generated from translating a GeoJSON model specified within the URBANopt UI.
 The heating and cooling loads are computed with a four-pipe
 fan coil unit model derived from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and connected to the room model by means of fluid ports. The <code>Attic</code> zone
 is unconditionned, with a free floating temperature.
 </p>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingTimeSeries.mo b/Buildings/DHC/Loads/BaseClasses/BuildingTimeSeries.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingTimeSeries.mo
rename to Buildings/DHC/Loads/BaseClasses/BuildingTimeSeries.mo
index 2f684578dc4..c0bdeb56456 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/BuildingTimeSeries.mo
+++ b/Buildings/DHC/Loads/BaseClasses/BuildingTimeSeries.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model BuildingTimeSeries
   "Building model with heating and/or cooling loads provided as time series"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding(
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding(
     redeclare package Medium=Buildings.Media.Water,
     have_heaWat=true,
     have_chiWat=true,
@@ -94,7 +94,7 @@ model BuildingTimeSeries
 
   parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(max=0)=
     if have_chiWat then
-    Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+    Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
     "#Peak space cooling load",
     filNam=Modelica.Utilities.Files.loadResource(filNam))
     else 0
@@ -102,7 +102,7 @@ model BuildingTimeSeries
     annotation (Dialog(group="Nominal condition", enable=have_chiWat));
   parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=0)=
     if have_heaWat then
-    Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+    Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
     "#Peak space heating load",
     filNam=Modelica.Utilities.Files.loadResource(filNam))
     else 0
@@ -167,10 +167,10 @@ model BuildingTimeSeries
     if have_chiWat
     "Maximum temperature set point"
     annotation (Placement(transformation(extent={{-280,210},{-260,230}})));
-  replaceable Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea(
+  replaceable Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea(
     final k=k,
     final Ti=Ti) if have_heaWat
-  constrainedby Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  constrainedby Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare final package Medium1=Medium,
     redeclare final package Medium2=Medium2,
     final allowFlowReversal=allowFlowReversal,
@@ -183,38 +183,38 @@ model BuildingTimeSeries
     final T_aLoaHea_nominal=T_aLoaHea_nominal)
     "Heating terminal unit"
     annotation (Placement(transformation(extent={{70,-22},{90,-2}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal,
     m_flow_nominal=mHeaWat_flow_nominal,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
     dp_nominal=100000,
     nPorts_a1=1,
     nPorts_b1=1) if have_heaWat
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{120,-70},{140,-50}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloCoo(
     redeclare final package Medium=Medium,
     final allowFlowReversal=allowFlowReversal,
     m_flow_nominal=mChiWat_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChilledWater,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantHead,
     dp_nominal=100000,
     nPorts_b1=1,
     nPorts_a1=1) if have_chiWat
     "Chilled water distribution system"
     annotation (Placement(transformation(extent={{120,-270},{140,-250}})));
   replaceable
-    Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeCooling
+    Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeCooling
     terUniCoo(
     final k=k,
     final Ti=Ti,
     final QEnv_flow_nominal=if have_heaWat then QHea_flow_nominal/facMulHea else -QCoo_flow_nominal/facMulCoo)
       if have_chiWat
     constrainedby
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+    Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare final package Medium1 = Medium,
     redeclare final package Medium2 = Medium2,
     final allowFlowReversal=allowFlowReversal,
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo b/Buildings/DHC/Loads/BaseClasses/ConstraintViolation.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo
rename to Buildings/DHC/Loads/BaseClasses/ConstraintViolation.mo
index 8f7361ba8cc..050e31a832b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/ConstraintViolation.mo
+++ b/Buildings/DHC/Loads/BaseClasses/ConstraintViolation.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 block ConstraintViolation
   "Block that outputs the fraction of time when a constraint is violated"
 
diff --git a/Buildings/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo b/Buildings/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
new file mode 100644
index 00000000000..952a8d259e5
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
@@ -0,0 +1,198 @@
+within Buildings.DHC.Loads.BaseClasses.Controls;
+block MixingValveControl
+  "Mixing valve controller"
+  extends Modelica.Blocks.Icons.Block;
+  import Type_dis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType
+    "Types of distribution system";
+  parameter Type_dis typDis=Type_dis.HeatingWater
+    "Type of distribution system"
+    annotation (Evaluate=true);
+  parameter Real k(
+    final min=0,
+    final unit="1")=0.1
+    "Gain of controller";
+  parameter Modelica.Units.SI.Time Ti(final min=Modelica.Constants.small) = 10
+    "Time constant of integrator block";
+  // IO CONNECTORS
+  Modelica.Blocks.Interfaces.RealInput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Supply temperature set point"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={-120,-40}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,40})));
+  Modelica.Blocks.Interfaces.IntegerInput modChaOve if typDis == Type_dis.ChangeOver
+    "Operating mode in change-over (1 for heating, 2 for cooling)"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={-120,80}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,80})));
+  Modelica.Blocks.Interfaces.RealInput TSupMes(
+    final unit="K",
+    displayUnit="degC")
+    "Supply temperature (measured)"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={-120,-80}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,-40})));
+  Modelica.Blocks.Interfaces.RealOutput yVal(
+    final unit="1")
+    "Valve control signal"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={120,0}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={110,0})));
+  // COMPONENTS
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    k=0)
+    "Zero constant"
+    annotation (Placement(transformation(extent={{-70,10},{-50,30}})));
+  Modelica.Blocks.Math.IntegerToBoolean toBoo(
+    threshold=2) if typDis == Type_dis.ChangeOver
+    "Conversion to boolean (true if cooling mode)"
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset resConTSup(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    final k=k,
+    final Ti=Ti,
+    final yMax=1,
+    final yMin=-1,
+    final reverseActing=true,
+    final y_reset=0) if typDis == Type_dis.ChangeOver
+    "PI controller tracking supply temperature"
+    annotation (Placement(transformation(extent={{-70,-70},{-50,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.PID conTSup(
+    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
+    final k=k,
+    final Ti=Ti,
+    final yMax=1,
+    final yMin=-1,
+    final reverseActing=true) if typDis <> Type_dis.ChangeOver
+    "PI controller tracking supply temperature"
+    annotation (Placement(transformation(extent={{-70,-30},{-50,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Min negPar
+    "Negative part of control signal"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Max posPar
+    "Positive part of control signal"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter opp(k=-1)
+    "Opposite value"
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi
+    "Logical switch"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Modelica.Blocks.Sources.BooleanExpression fixMod(
+    final y=typDis == Type_dis.ChilledWater) if typDis <> Type_dis.ChangeOver
+    "Fixed operating mode"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Change cha if typDis == Type_dis.ChangeOver
+    "Evaluate the integer input u to check if its value changes"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+equation
+  connect(modChaOve,toBoo.u)
+    annotation (Line(points={{-120,80},{-90,80},{-90,40},{-12,40}},color={255,127,0}));
+  connect(toBoo.y,swi.u2)
+    annotation (Line(points={{11,40},{30,40},{30,0},{68,0}},color={255,0,255}));
+  connect(fixMod.y,swi.u2)
+    annotation (Line(points={{11,0},{68,0}},color={255,0,255}));
+  connect(resConTSup.y,posPar.u2)
+    annotation (Line(points={{-48,-60},{-20,-60},{-20,-86},{-12,-86}},color={0,0,127}));
+  connect(zer.y,posPar.u1)
+    annotation (Line(points={{-48,20},{-40,20},{-40,-74},{-12,-74}},color={0,0,127}));
+  connect(zer.y,negPar.u1)
+    annotation (Line(points={{-48,20},{-40,20},{-40,-34},{-12,-34}},color={0,0,127}));
+  connect(resConTSup.y,negPar.u2)
+    annotation (Line(points={{-48,-60},{-20,-60},{-20,-46},{-12,-46}},color={0,0,127}));
+  connect(negPar.y,opp.u)
+    annotation (Line(points={{12,-40},{18,-40}},color={0,0,127}));
+  connect(resConTSup.u_s,TSupSet)
+    annotation (Line(points={{-72,-60},{-90,-60},{-90,-40},{-120,-40}},color={0,0,127}));
+  connect(TSupMes,resConTSup.u_m)
+    annotation (Line(points={{-120,-80},{-60,-80},{-60,-72}},color={0,0,127}));
+  connect(swi.y,yVal)
+    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
+  connect(modChaOve,cha.u)
+    annotation (Line(points={{-120,80},{-82,80}},color={255,127,0}));
+  connect(cha.y,resConTSup.trigger)
+    annotation (Line(points={{-58,80},{-40,80},{-40,60},{-80,60},{-80,-76},{-66,-76},{-66,-72}},color={255,0,255}));
+  connect(opp.y,swi.u1)
+    annotation (Line(points={{42,-40},{50,-40},{50,8},{68,8}},color={0,0,127}));
+  connect(posPar.y,swi.u3)
+    annotation (Line(points={{12,-80},{60,-80},{60,-8},{68,-8}},color={0,0,127}));
+  connect(TSupSet,conTSup.u_s)
+    annotation (Line(points={{-120,-40},{-90,-40},{-90,-20},{-72,-20}},color={0,0,127}));
+  connect(TSupMes,conTSup.u_m)
+    annotation (Line(points={{-120,-80},{-84,-80},{-84,-40},{-60,-40},{-60,-32}},color={0,0,127}));
+  connect(conTSup.y,negPar.u2)
+    annotation (Line(points={{-48,-20},{-20,-20},{-20,-46},{-12,-46}},color={0,0,127}));
+  connect(conTSup.y,posPar.u2)
+    annotation (Line(points={{-48,-20},{-20,-20},{-20,-86},{-12,-86}},color={0,0,127}));
+  annotation (
+    defaultComponentName="conVal",
+    Documentation(
+      info="
+<html>
+<p>
+This model implements a generic controller for a three-way mixing valve.
+Three operating modes are supported:
+</p>
+<ul>
+<li>
+Heating: the controller tracks a minimum supply temperature.
+</li>
+<li>
+Cooling: the controller tracks a maximum supply temperature.
+</li>
+<li>
+Change-over: the controller tracks either a minimum or a maximum
+supplied temperature depending on the actual value of the integer input
+<code>modChaOve</code> (1 for heating, 2 for cooling).
+The model instantiates only one PI block to limit the number of state
+variables in large models. Therefore the PI gain
+is independent from the change-over mode: the reverse action is modeled
+by taking the opposite value of the PI block output. Eventually the
+integral part is reset whenever the change-over mode is switched.
+</li>
+</ul>
+<p>
+See
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl\">
+Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl</a>
+for a simulation with change-over.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+February 21, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false),
+      graphics={
+        Text(
+          extent={{-90,96},{-10,66}},
+          textColor={244,125,35},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Left,
+          visible=typDis == Type_dis.ChangeOver,
+          textString="modChaOve"),
+        Text(
+          extent={{-90,54},{-22,26}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Left,
+          textString="TSupSet"),
+        Text(
+          extent={{-90,-26},{-16,-52}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Left,
+          textString="TSupMes"),
+        Text(
+          extent={{50,12},{88,-14}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Right,
+          textString="yVal")}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)));
+end MixingValveControl;
diff --git a/Buildings/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
new file mode 100644
index 00000000000..32feac5c4f2
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
@@ -0,0 +1,207 @@
+within Buildings.DHC.Loads.BaseClasses.Controls.Validation;
+model MixingValveControl
+  "Validation of mixing valve control in change-over mode"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Source side medium";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Mass flow rate at nominal conditions";
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFlo(
+    redeclare package Medium=Medium,
+    m_flow_nominal=m_flow_nominal,
+    typDis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType.ChangeOver,
+    have_pum=true,
+    have_val=true,
+    dp_nominal=100000,
+    nPorts_a1=1,
+    nPorts_b1=1)
+    "Secondary distribution system"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.Fluid.Sources.Boundary_pT souPri(
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=1)
+    "Primary supply stream"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,20})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TPriHea(
+    k=313.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Heating water primary supply temperature"
+    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TPriChi(
+    k=280.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Chilled water primary supply temperature"
+    annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TPri(
+    y(final unit="K",
+      displayUnit="degC"))
+    "Actual primary supply temperature"
+    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetSecHea(
+    k=303.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Heating water secondary supply temperature set point"
+    annotation (Placement(transformation(extent={{-140,-70},{-120,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetSecChi(
+    k=291.15)
+    "Chilled water secondary supply temperature set point"
+    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TSetSecAct(
+    y(final unit="K",
+      displayUnit="degC"))
+    "Actual secondary supply temperature set point"
+    annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
+  Buildings.Fluid.Sources.MassFlowSource_T souSec(
+    use_m_flow_in=true,
+    redeclare package Medium=Medium,
+    use_T_in=true,
+    nPorts=1)
+    "Secondary return stream"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,60})));
+  Buildings.Fluid.Sources.Boundary_pT sinSec(
+    redeclare package Medium=Medium,
+    nPorts=1)
+    "Sink for secondary stream"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,100})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTSecHea(
+    k=-5)
+    "Secondary temperature difference between supply and return"
+    annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTSecSup(
+    redeclare package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{70,90},{90,110}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTSecRet(
+    redeclare package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Secondary return temperature (measured)"
+    annotation (Placement(transformation(extent={{90,50},{70,70}})));
+  Buildings.Fluid.Sources.Boundary_pT sinPri(
+    redeclare package Medium=Medium,
+    nPorts=1)
+    "Sink for primary stream"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,20})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Pulse mSec_flow(
+    amplitude=m_flow_nominal,
+    period=200,
+    offset=0)
+    "Secondary mass flow rate"
+    annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Add add
+    "Computation of secondary return temperature"
+    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTPriSup(
+    redeclare package Medium=Medium,
+    m_flow_nominal=m_flow_nominal)
+    "Primary supply temperature (measured)"
+    annotation (Placement(transformation(extent={{8,10},{28,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch dTSec(
+    y(final unit="K",
+      displayUnit="degC"))
+    "Actual secondary delta T"
+    annotation (Placement(transformation(extent={{20,-130},{40,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTSecCoo(
+    k=5)
+    "Secondary temperature difference between supply and return"
+    annotation (Placement(transformation(extent={{-20,-150},{0,-130}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger modInd(
+    final integerTrue=1,
+    final integerFalse=2)
+    "Mode index, 1 for heating, 2 for cooling"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse modCha(
+    period=1000)
+    "Boolean pulse for changing mode"
+    annotation (Placement(transformation(extent={{-140,-10},{-120,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not mod
+    "Operating mode, true for heating, false for cooling"
+    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
+equation
+  connect(TPri.y,souPri.T_in)
+    annotation (Line(points={{-38,80},{-32,80},{-32,24},{-22,24}},color={0,0,127}));
+  connect(TSetSecAct.y,disFlo.TSupSet)
+    annotation (Line(points={{-38,-80},{32,-80},{32,12},{39,12}},color={0,0,127}));
+  connect(disFlo.ports_b1[1],senTSecSup.port_a)
+    annotation (Line(points={{40,26},{36,26},{36,100},{70,100}},color={0,127,255}));
+  connect(souSec.ports[1],senTSecRet.port_a)
+    annotation (Line(points={{100,60},{90,60}},color={0,127,255}));
+  connect(senTSecRet.port_b,disFlo.ports_a1[1])
+    annotation (Line(points={{70,60},{64,60},{64,26},{60,26}},color={0,127,255}));
+  connect(disFlo.port_b,sinPri.ports[1])
+    annotation (Line(points={{60,20},{100,20}},color={0,127,255}));
+  connect(senTSecSup.port_b,sinSec.ports[1])
+    annotation (Line(points={{90,100},{100,100}},color={0,127,255}));
+  connect(mSec_flow.y,disFlo.mReq_flow[1])
+    annotation (Line(points={{-118,160},{32,160},{32,16},{39,16}},color={0,0,127}));
+  connect(mSec_flow.y,souSec.m_flow_in)
+    annotation (Line(points={{-118,160},{140,160},{140,68},{122,68}},color={0,0,127}));
+  connect(add.y,souSec.T_in)
+    annotation (Line(points={{122,-80},{140,-80},{140,64},{122,64}},color={0,0,127}));
+  connect(souPri.ports[1],senTPriSup.port_a)
+    annotation (Line(points={{0,20},{8,20}},color={0,127,255}));
+  connect(senTPriSup.port_b,disFlo.port_a)
+    annotation (Line(points={{28,20},{40,20}},color={0,127,255}));
+  connect(TSetSecChi.y,TSetSecAct.u3)
+    annotation (Line(points={{-118,-100},{-100,-100},{-100,-88},{-62,-88}},color={0,0,127}));
+  connect(TSetSecHea.y,TSetSecAct.u1)
+    annotation (Line(points={{-118,-60},{-100,-60},{-100,-72},{-62,-72}},color={0,0,127}));
+  connect(TPriChi.y,TPri.u3)
+    annotation (Line(points={{-118,80},{-80,80},{-80,72},{-62,72}},color={0,0,127}));
+  connect(TPriHea.y,TPri.u1)
+    annotation (Line(points={{-118,120},{-80,120},{-80,88},{-62,88}},color={0,0,127}));
+  connect(TSetSecAct.y,add.u1)
+    annotation (Line(points={{-38,-80},{32,-80},{32,-74},{98,-74}},color={0,0,127}));
+  connect(dTSec.y,add.u2)
+    annotation (Line(points={{42,-120},{80,-120},{80,-86},{98,-86}},color={0,0,127}));
+  connect(dTSecHea.y,dTSec.u1)
+    annotation (Line(points={{2,-100},{10,-100},{10,-112},{18,-112}},color={0,0,127}));
+  connect(dTSecCoo.y,dTSec.u3)
+    annotation (Line(points={{2,-140},{10,-140},{10,-128},{18,-128}},color={0,0,127}));
+  connect(modCha.y,mod.u)
+    annotation (Line(points={{-118,0},{-102,0}},color={255,0,255}));
+  connect(mod.y,TPri.u2)
+    annotation (Line(points={{-78,0},{-70,0},{-70,80},{-62,80}},color={255,0,255}));
+  connect(mod.y,TSetSecAct.u2)
+    annotation (Line(points={{-78,0},{-70,0},{-70,-80},{-62,-80}},color={255,0,255}));
+  connect(mod.y,modInd.u)
+    annotation (Line(points={{-78,0},{-62,0}},color={255,0,255}));
+  connect(modInd.y,disFlo.modChaOve)
+    annotation (Line(points={{-38,0},{36,0},{36,14},{39,14}},color={255,127,0}));
+  connect(mod.y,dTSec.u2)
+    annotation (Line(points={{-78,0},{-70,0},{-70,-120},{18,-120}},color={255,0,255}));
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Controls.MixingValveControl\">
+Buildings.DHC.Loads.BaseClasses.Controls.MixingValveControl</a>
+(as part of
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>)
+in change-over mode.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+February 21, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-180,-200},{180,200}})),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos" "Simulate and plot"));
+end MixingValveControl;
diff --git a/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.mo b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.mo
new file mode 100644
index 00000000000..03b0d714577
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Loads.BaseClasses.Controls;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Controls\">
+Buildings.DHC.Loads.BaseClasses.Controls</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.order b/Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.order
rename to Buildings/DHC/Loads/BaseClasses/Controls/Validation/package.order
diff --git a/Buildings/DHC/Loads/BaseClasses/Controls/package.mo b/Buildings/DHC/Loads/BaseClasses/Controls/package.mo
new file mode 100644
index 00000000000..f7fb7ea3c9b
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Controls/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Loads.BaseClasses;
+package Controls "Package of control sequences for DHC systems"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains control sequences used in district heating and
+cooling systems.
+</p>
+</html>"));
+end Controls;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.order b/Buildings/DHC/Loads/BaseClasses/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.order
rename to Buildings/DHC/Loads/BaseClasses/Controls/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
index e481b5c4da3..47412f4bd27 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Floor.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Floor
   "This is the simulation model of Floor within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Floor
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
index cd4ae274283..76d9e873c82 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/ICT.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model ICT
   "This is the simulation model of ICT within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model ICT
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
index 53dca071d28..9161fe5749f 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Meeting.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Meeting
   "This is the simulation model of Meeting within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Meeting
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
index 20e08a4bd46..fdcb81915aa 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Office.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Office
   "This is the simulation model of Office within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Office
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
index ae3041ec40b..174d779aaf2 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Restroom.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Restroom
   "This is the simulation model of Restroom within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Restroom
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
index 6e7c0e8861f..c755088d610 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/Storage.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding;
 model Storage
   "This is the simulation model of Storage within building OfficeBuilding"
   Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez HDifTil[6](
@@ -108,7 +108,7 @@ model Storage
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
     tableName="Internals",
     fileName=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt"),
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt"),
     columns={2,3,4})
     "Table with profiles for persons (radiative and convective) and machines (convective)"
     annotation (Placement(transformation(extent={{6,-60},{22,-44}})));
diff --git a/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
new file mode 100644
index 00000000000..49ec61d370d
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC;
+package OfficeBuilding "Package with RC building zone models"
+  extends Modelica.Icons.Package;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains RC building zone models programmatically generated from
+a GeoJSON file.
+</p>
+</html>"));
+end OfficeBuilding;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.order
diff --git a/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
new file mode 100644
index 00000000000..06ba8e03b86
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses;
+package GeojsonExportRC "Package with RC building zone models"
+  extends Modelica.Icons.Package;
+
+  annotation (
+    Documentation(
+      info="
+<html>
+<p>
+This package contains RC building zone models programmatically generated from
+a GeoJSON file.
+</p>
+</html>"));
+end GeojsonExportRC;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order
rename to Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.order
diff --git a/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
new file mode 100644
index 00000000000..871f988089c
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Loads.BaseClasses.Examples;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples\">
+Buildings.DHC.Loads.BaseClasses.Examples</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
new file mode 100644
index 00000000000..bdab1ef46ae
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
@@ -0,0 +1 @@
+GeojsonExportRC
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
index 7af8f947bc0..fb80ed7f96b 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingRCZ1Valve
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model CouplingRCZ1Valve
     annotation (Placement(transformation(extent={{60,100},{40,120}})));
   package Medium1=Buildings.Media.Water
     "Source side medium";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingRCZ1Valve bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingRCZ1Valve bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -71,13 +71,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -103,5 +103,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-140,-20},{160,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos" "Simulate and plot"));
 end CouplingRCZ1Valve;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
index 5105b9c850a..1a37da52d71 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingRCZ6
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model CouplingRCZ6
       "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
     "Weather data reader"
     annotation (Placement(transformation(extent={{60,20},{40,40}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingRCZ6 bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingRCZ6 bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -70,13 +70,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -102,7 +102,7 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-100},{160,60}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos" "Simulate and plot"),
     experiment(
       StopTime=604800,
       Tolerance=1e-06));
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
index 19421bc0135..badf98affc9 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingSpawnZ1
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
   package Medium1=Buildings.Media.Water
     "Source side medium";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingSpawnZ1 bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingSpawnZ1 bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -76,13 +76,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -107,5 +107,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-100,-140},{160,80}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos" "Simulate and plot"));
 end CouplingSpawnZ1;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
index 1f9b42bfd43..a4feebdcf11 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mo
@@ -1,10 +1,10 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingSpawnZ6
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
   package Medium1=Buildings.Media.Water
     "Source side medium";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingSpawnZ6 bui(
+  Buildings.DHC.Loads.BaseClasses.BuildingSpawnZ6 bui(
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -64,13 +64,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -107,5 +107,5 @@ First implementation.
           textColor={28,108,200},
           textString="")}),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos" "Simulate and plot"));
 end CouplingSpawnZ6;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
index a47aa48c0f8..1a1e7186a25 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingTimeSeries
   "Example illustrating the coupling of a building model to heating water and chilled water loops"
   extends Modelica.Icons.Example;
@@ -6,8 +6,8 @@ model CouplingTimeSeries
     "Source side medium";
   parameter Modelica.Units.SI.Time perAve=600
     "Period for time averaged variables";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
+  Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
     nPorts_aHeaWat=1,
     nPorts_aChiWat=1,
     nPorts_bHeaWat=1,
@@ -116,13 +116,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -154,5 +154,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-160,-140},{160,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos" "Simulate and plot"));
 end CouplingTimeSeries;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
rename to Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
index 8ea1a82bc5e..218bff632df 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
+within Buildings.DHC.Loads.BaseClasses.Examples;
 model CouplingTimeSeriesSingleLoop
   "Example illustrating the coupling of a building model to heating water or chilled water loops"
   extends Modelica.Icons.Example;
@@ -6,9 +6,9 @@ model CouplingTimeSeriesSingleLoop
     "Source side medium";
   parameter Modelica.Units.SI.Time perAve=600
     "Period for time averaged variables";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries buiCoo(
+  Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries buiCoo(
     have_heaWat=false,
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
     nPorts_aChiWat=1,
     nPorts_bChiWat=1)
     "Building wint cooling only"
@@ -42,9 +42,9 @@ model CouplingTimeSeriesSingleLoop
     y(unit="J"))
     "Actual energy used for cooling"
     annotation (Placement(transformation(extent={{80,60},{100,80}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries buiHea(
+  Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries buiHea(
     have_chiWat=false,
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos",
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos",
     nPorts_aChiWat=1,
     nPorts_bChiWat=1,
     nPorts_aHeaWat=1,
@@ -118,13 +118,13 @@ equation
       info="<html>
 <p>
 This example illustrates the use of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>,
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 and
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 in a configuration with
 </p>
 <ul>
@@ -161,5 +161,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-160,-140},{160,140}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos" "Simulate and plot"));
 end CouplingTimeSeriesSingleLoop;
diff --git a/Buildings/DHC/Loads/BaseClasses/Examples/package.mo b/Buildings/DHC/Loads/BaseClasses/Examples/package.mo
new file mode 100644
index 00000000000..6acc989368f
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Examples/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Loads.BaseClasses;
+package Examples "Example models integrating multiple components"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.Loads\">
+Buildings.DHC.Loads</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.order b/Buildings/DHC/Loads/BaseClasses/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.order
rename to Buildings/DHC/Loads/BaseClasses/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4Pipe.mo b/Buildings/DHC/Loads/BaseClasses/FanCoil4Pipe.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4Pipe.mo
rename to Buildings/DHC/Loads/BaseClasses/FanCoil4Pipe.mo
index 9ef61c071e1..5505ec477c3 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4Pipe.mo
+++ b/Buildings/DHC/Loads/BaseClasses/FanCoil4Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model FanCoil4Pipe
   "Model of a sensible only four-pipe fan coil unit computing a required water mass flow rate"
   extends PartialFanCoil4Pipe(
@@ -21,8 +21,8 @@ equation
 This is a simplified model of a sensible only four-pipe fan coil unit for heating and cooling.
 It is intended to be coupled to a room model by means of fluid ports.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe\">
+Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe</a>
 for a description of the modeling principles.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4PipeHeatPorts.mo b/Buildings/DHC/Loads/BaseClasses/FanCoil4PipeHeatPorts.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4PipeHeatPorts.mo
rename to Buildings/DHC/Loads/BaseClasses/FanCoil4PipeHeatPorts.mo
index 6cf2f590f64..0e7acdc0a37 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/FanCoil4PipeHeatPorts.mo
+++ b/Buildings/DHC/Loads/BaseClasses/FanCoil4PipeHeatPorts.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model FanCoil4PipeHeatPorts
   "Model of a sensible only four-pipe fan coil unit computing a required water mass flow rate"
   extends PartialFanCoil4Pipe(
@@ -72,8 +72,8 @@ equation
 This is a simplified model of a sensible only four-pipe fan coil unit for heating and cooling.
 It is intended to be coupled to a room model by means of heat ports.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.PartialFanCoil4Pipe</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe\">
+Buildings.DHC.Loads.BaseClasses.PartialFanCoil4Pipe</a>
 for a description of the modeling principles.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/FlowDistribution.mo b/Buildings/DHC/Loads/BaseClasses/FlowDistribution.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/FlowDistribution.mo
rename to Buildings/DHC/Loads/BaseClasses/FlowDistribution.mo
index c75092d6ef3..37048a028d8 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/FlowDistribution.mo
+++ b/Buildings/DHC/Loads/BaseClasses/FlowDistribution.mo
@@ -1,12 +1,12 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 model FlowDistribution
   "Model of a building hydraulic distribution system"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
     redeclare replaceable package Medium=Buildings.Media.Water,
     allowFlowReversal=false);
-  import Type_dis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType
+  import Type_dis=Buildings.DHC.Loads.BaseClasses.Types.DistributionType
     "Types of distribution system";
-  import Type_ctr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType
+  import Type_ctr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType
     "Types of distribution pump control";
   parameter Integer nPorts_a1=0
     "Number of terminal units return ports"
@@ -256,7 +256,7 @@ model FlowDistribution
     final nout=nUni)
     "Repeat input to output an array"
     annotation (Placement(transformation(extent={{20,150},{40,170}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Controls.MixingValveControl conVal(
+  Buildings.DHC.Loads.BaseClasses.Controls.MixingValveControl conVal(
     final typDis=typDis) if have_val
     "Mixing valve controller"
     annotation (Placement(transformation(extent={{-48,-106},{-28,-86}})));
@@ -427,13 +427,13 @@ equation
 This model represents a two-pipe hydraulic distribution system serving multiple
 terminal units.
 It is primarily intended to be used in conjunction with models that extend
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
 The typical model structure for a whole building connected to an energy
 transfer station (or a dedicated plant) is illustrated in the schematics in
 the info section of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>.
 </p>
 <p>
 The pipe network modeling is decoupled between a main distribution
@@ -493,8 +493,8 @@ The impact on the computational performance is illustrated
 <h4>Pump head computation</h4>
 <p>
 The pump head is computed as follows (see also
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl\">
+Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl</a>
 for a comparison with an explicit modeling of the piping network).
 </p>
 <ul>
@@ -578,7 +578,7 @@ sensor must be set to zero.
 </ul>
 <p>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/FlowDistribution1.png\"/>
 </p>
 <h4>Energy and mass dynamics</h4>
 <p>
@@ -611,12 +611,12 @@ turn out to be detrimental to computational performance.
 <p>
 The figure below compares the computational performance of this model
 (labelled <code>simple</code>, see model
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>)
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>)
 with an explicit modeling of the distribution network and
 the terminal unit actuators (labelled <code>detailed</code>, see model
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
 The models are simulated with the solver CVODE from Sundials.
 The impact of a varying number of connected loads, <code>nLoa</code>, is
 assessed on
@@ -638,7 +638,7 @@ also plotted for the model labelled <code>simple</code>, resp. <code>detailed</c
 </p>
 <p>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/FlowDistribution2.png\"/>
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo b/Buildings/DHC/Loads/BaseClasses/PartialBuilding.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialBuilding.mo
index b34bf925dc9..114feed658f 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuilding.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialBuilding.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialBuilding
   "Partial class for building model"
   replaceable package Medium=Buildings.Media.Water
@@ -230,11 +230,11 @@ equation
 Partial model to be used for modeling the thermal loads on an energy
 transfer station or a dedicated plant.
 Models extending this class are typically used in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 and models extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>
 as described in the schematics here under.
 The fluid ports represent the connection between the production system and
 the building distribution system.
@@ -254,13 +254,13 @@ multiple identical buildings served by the same energy transfer station.
 <h4>Examples</h4>
 <p>
 See various use cases in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples\">
+Buildings.DHC.Loads.BaseClasses.Examples</a>.
 </p>
 <p>
 <br/>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/PartialBuilding.png\"/>
 </p>
 </html>",
 revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo b/Buildings/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
index 2d091d80bf0..77fa03d94d9 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialBuildingWithPartialETS.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialBuildingWithPartialETS
   "Partial model of a building with an energy transfer station"
-  import TypDisSys=Buildings.Experimental.DHC.Types.DistrictSystemType
+  import TypDisSys=Buildings.DHC.Types.DistrictSystemType
     "District system type enumeration";
   replaceable package MediumSer=Buildings.Media.Water
     constrainedby Modelica.Media.Interfaces.PartialMedium
@@ -101,7 +101,7 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service supply line"
     annotation (
       Placement(transformation(extent={{-310,-210},{-290,-190}}),
@@ -110,7 +110,7 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration5
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for ambient water service return line"
     annotation (
       Placement(transformation(extent={{290,-210},{310,-190}}),
@@ -119,8 +119,8 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSerHea_a,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSerHea_a.h_default, nominal=MediumSerHea_a.h_default))
- if typ <> TypDisSys.Cooling and
-    typ <> TypDisSys.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service supply line"
     annotation (Placement(
       transformation(extent={{-310,-250},{-290,-230}}), iconTransformation(
@@ -129,8 +129,8 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ <> TypDisSys.Cooling and
-    typ <> TypDisSys.CombinedGeneration5
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Fluid connector for heating service return line"
     annotation (Placement(
         transformation(extent={{290,-250},{310,-230}}), iconTransformation(
@@ -139,9 +139,9 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(min=if allowFlowReversalSer then -Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration1 or
-    typ == TypDisSys.CombinedGeneration2to4 or
-    typ == TypDisSys.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service supply line"
     annotation (Placement(transformation(extent={{-310,-290},{-290,-270}}),
        iconTransformation(extent={{-110,-90},{-90,-70}})));
@@ -149,9 +149,9 @@ partial model PartialBuildingWithPartialETS
     redeclare package Medium = MediumSer,
     m_flow(max=if allowFlowReversalSer then +Modelica.Constants.inf else 0),
     h_outflow(start=MediumSer.h_default, nominal=MediumSer.h_default))
- if typ == TypDisSys.CombinedGeneration1 or
-    typ == TypDisSys.CombinedGeneration2to4 or
-    typ == TypDisSys.Cooling
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling
     "Fluid connector for cooling service return line"
     annotation (Placement(
       transformation(extent={{290,-290},{310,-270}}), iconTransformation(
@@ -199,7 +199,7 @@ partial model PartialBuildingWithPartialETS
         rotation=90,
         origin={90,120})));
   // COMPONENTS
-  replaceable Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding bui(
+  replaceable Buildings.DHC.Loads.BaseClasses.PartialBuilding bui(
     redeclare final package Medium=MediumBui,
     final nPorts_aHeaWat=nPorts_heaWat,
     final nPorts_bHeaWat=nPorts_heaWat,
@@ -208,7 +208,7 @@ partial model PartialBuildingWithPartialETS
     final allowFlowReversal=allowFlowReversalBui)
     "Building model "
     annotation (Placement(transformation(extent={{-30,8},{30,68}})));
-  replaceable Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS ets(
+  replaceable Buildings.DHC.ETS.BaseClasses.PartialETS ets(
     redeclare final package MediumBui=MediumBui,
     redeclare final package MediumSer=MediumSer,
     redeclare final package MediumSerHea_a=MediumSerHea_a,
@@ -262,43 +262,43 @@ partial model PartialBuildingWithPartialETS
     redeclare final package Medium = MediumSer,
     final k=1/facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == TypDisSys.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{-280,-210},{-260,-190}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerAmbOut(
     redeclare final package Medium = MediumSer,
     final k=facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == TypDisSys.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{260,-210},{280,-190}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerHeaInl(
     redeclare final package Medium = MediumSerHea_a,
     final k=1/facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ <> TypDisSys.Cooling and
-    typ <> TypDisSys.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{-280,-250},{-260,-230}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerHeaOut(
     redeclare final package Medium = MediumSer,
     final k=facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ <> TypDisSys.Cooling and
-    typ <> TypDisSys.CombinedGeneration5 "Mass flow rate multiplier"
+ if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5 "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{260,-250},{280,-230}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerCooInl(
     redeclare final package Medium = MediumSer,
     final k=1/facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == TypDisSys.CombinedGeneration1 or
-    typ == TypDisSys.CombinedGeneration2to4 or
-    typ == TypDisSys.Cooling "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{-280,-290},{-260,-270}})));
   Fluid.BaseClasses.MassFlowRateMultiplier mulSerCooOut(
     redeclare final package Medium = MediumSer,
     final k=facMul,
     final allowFlowReversal=allowFlowReversalSer)
- if typ == TypDisSys.CombinedGeneration1 or
-    typ == TypDisSys.CombinedGeneration2to4 or
-    typ == TypDisSys.Cooling "Mass flow rate multiplier"
+ if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+    typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+    typ == Buildings.DHC.Types.DistrictSystemType.Cooling "Mass flow rate multiplier"
     annotation (Placement(transformation(extent={{260,-290},{280,-270}})));
   Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter mulQFue_flow[nFue](
       u(each final unit="W"), each final k=facMul) if nFue > 0 "Scaling"
@@ -428,15 +428,15 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-100,-86},{-22,-74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Polygon(
           points={{0,74},{-40,54},{40,54},{0,74}},
           lineColor={95,95,95},
@@ -477,14 +477,14 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-11,6},{11,-6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={66,-17},
           rotation=-90),
         Rectangle(
@@ -493,14 +493,14 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-11,6},{11,-6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5,
           origin={-66,-17},
           rotation=-90),
         Rectangle(
@@ -509,29 +509,29 @@ equation
           pattern=LinePattern.None,
           fillColor={0,255,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration5),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{40,-34},{100,-46}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-100,-34},{-40,-46}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={255,0,0},
           fillPattern=FillPattern.Solid,
-          visible=typ <> TypDisSys.Cooling and typ <> TypDisSys.CombinedGeneration5),
+          visible=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5),
         Rectangle(
           extent={{-14,-6},{14,6}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling,
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling,
           origin={-28,-60},
           rotation=90),
         Rectangle(
@@ -542,16 +542,16 @@ equation
           fillPattern=FillPattern.Solid,
           origin={28,-60},
           rotation=90,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling),
         Rectangle(
           extent={{22,-86},{100,-74}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid,
-          visible=typ == TypDisSys.CombinedGeneration1 or typ == TypDisSys.CombinedGeneration2to4
-               or typ == TypDisSys.Cooling)}),
+          visible=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+               or typ == Buildings.DHC.Types.DistrictSystemType.Cooling)}),
     Diagram(
       coordinateSystem(
         preserveAspectRatio=false,
@@ -564,13 +564,13 @@ Partial model to be used for modeling
 <li>
 an energy transfer station and the optional in-building primary systems,
 based on a model extending
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS</a>, and
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses.PartialETS\">
+Buildings.DHC.ETS.BaseClasses.PartialETS</a>, and
 </li>
 <li>
 the served building, based on a model extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>.
 </li>
 </ul>
 <p>
@@ -605,7 +605,7 @@ served by the same service line.
 <p>
 <br/>
 <img alt=\"image\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Loads/PartialBuildingWithPartialETS.png\"/>
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/PartialFanCoil4Pipe.mo b/Buildings/DHC/Loads/BaseClasses/PartialFanCoil4Pipe.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/PartialFanCoil4Pipe.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialFanCoil4Pipe.mo
index 85797e5d8ca..2c7eb6558ab 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/PartialFanCoil4Pipe.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialFanCoil4Pipe.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialFanCoil4Pipe
   "Partial model of a sensible only four-pipe fan coil unit computing a required water mass flow rate"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaWat=true,
@@ -145,8 +145,8 @@ equation
 This is a simplified partial model of a sensible only four-pipe fan coil unit
 for heating and cooling.
 It is intended to be used in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>,
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>,
 and hence it computes the water mass flow rate required to meet the temperature
 set point.
 </p>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialTerminalUnit.mo b/Buildings/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
rename to Buildings/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
index a9e2fcce411..05624dd200a 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
+++ b/Buildings/DHC/Loads/BaseClasses/PartialTerminalUnit.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 partial model PartialTerminalUnit
   "Partial model for HVAC terminal unit"
   replaceable package Medium1=Buildings.Media.Water
@@ -424,14 +424,14 @@ Partial model to be used for modeling an HVAC terminal unit.
 </p>
 <p>
 The models inheriting from this class are typically used in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>. They must
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>. They must
 compute a so-called required mass flow rate defined as the heating or chilled
 water mass flow rate needed to meet the load.
 It can be approximated using a control loop to avoid inverting a heat
 exchanger model as illustrated in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples\">
+Buildings.DHC.Loads.BaseClasses.Examples</a>.
 </p>
 <p>
 The model connectivity can be modified to address various use cases:
@@ -439,8 +439,8 @@ The model connectivity can be modified to address various use cases:
 <ul>
 <li>
 On the source side (typically connected to
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>):
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>):
 <ul>
 <li>
 Fluid ports for chilled water and heating water can be conditionally
@@ -464,12 +464,12 @@ can be conditionally instantiated by setting <code>have_heaPor</code> to true.
 Real input connectors can be conditionally instantiated by setting
 <code>have_QReq_flow</code> to true. Those connectors can be used to provide
 heating and cooling loads as time series, see
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries\">
+Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries</a>
 for an illustration of that use case.
 The impact on the room air temperature of an unmet load can be assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </li>
 </ul>
 </li>
@@ -482,22 +482,22 @@ an infinite capacity.
 <h4>Connection with the flow distribution model</h4>
 <p>
 When connecting the model to
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>:
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>:
 </p>
 <ul>
 <li>
 The nominal pressure drop on the source side (heating or chilled water) is
 irrelevant as the computation of the pump head relies on a specific algorithm
 described in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>.
 </li>
 <li>
 The parameter <code>allowFlowReversal</code> must be set to <code>false</code> (default)
 in consistency with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>.
 This requirement only applies to the source side.
 On the load side one is free to use whatever option suitable for the modeling needs.
 Note that typically for an air flow network connected to the outdoor air
@@ -542,8 +542,8 @@ Both multiplier factors are of type real (as opposed to integer) to allow
 for instance modeling a set of terminal units based on manufacturer data,
 while still being able to size the full set based on a peak load.
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling\">
+Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling</a>
 for an illustration of the use case when heating and cooling loads are
 provided as time series.
 </p>
diff --git a/Buildings/DHC/Loads/BaseClasses/SimpleRoomODE.mo b/Buildings/DHC/Loads/BaseClasses/SimpleRoomODE.mo
new file mode 100644
index 00000000000..b3b19514943
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/SimpleRoomODE.mo
@@ -0,0 +1,163 @@
+within Buildings.DHC.Loads.BaseClasses;
+model SimpleRoomODE
+  "Simplified model for assessing room air temperature variations around a set point"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.Units.SI.TemperatureDifference dTEnv_nominal
+    "Design temperature difference at which envelope heat loss is QEnv_flow_nominal"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TAir_start(displayUnit="degC")
+    "Initial air temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate QEnv_flow_nominal(min=0)
+    "Envelope heat loss at temperature difference of dTEnv_nominal (with no internal gains, no solar radiation)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Boolean steadyStateInitial=false
+    "true initializes T with dT(0)/dt=0, false initializes T with T(0)=TIndHea_nominal"
+    annotation (Dialog(group="Initialization"),Evaluate=true);
+  parameter Modelica.Units.SI.Time tau=1800
+    "Time constant of the indoor temperature";
+  Modelica.Blocks.Interfaces.RealInput TSet(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    displayUnit="degC")
+    "Temperature set point for heating or cooling"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),iconTransformation(extent={{-140,60},{-100,100}})));
+  Modelica.Blocks.Interfaces.RealInput QReq_flow(
+    final quantity="HeatFlowRate",
+    final unit="W")
+    "Required heat flow rate to meet temperature set point (>=0 for heating)"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
+  Modelica.Blocks.Interfaces.RealInput QAct_flow(
+    final quantity="HeatFlowRate",
+    final unit="W")
+    "Actual heating or cooling heat flow rate (>=0 for heating)"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Modelica.Blocks.Interfaces.RealOutput TAir(
+    final quantity="ThermodynamicTemperature",
+    final unit="K",
+    displayUnit="degC")
+    "Room air temperature"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+protected
+  parameter Modelica.Units.SI.ThermalConductance G=abs(QEnv_flow_nominal/dTEnv_nominal)
+    "Lumped thermal conductance representing all temperature dependent heat transfer mechanisms";
+initial equation
+  if steadyStateInitial then
+    der(
+      TAir)=0;
+  else
+    TAir=TAir_start;
+  end if;
+equation
+  der(
+    TAir)*tau=(QAct_flow-QReq_flow)/G+TSet-TAir;
+  assert(
+    TAir >= 273.15,
+    "In "+getInstanceName()+": The computed indoor temperature is below 0°C.");
+  annotation (
+    defaultComponentName="roo",
+    Documentation(
+      info="<html>
+<p>
+This is a first order ODE model assessing the indoor air temperature variations
+around a set point, based on the difference between the required and actual
+heating or cooling heat flow rate and a minimum set of parameters at nominal conditions.
+</p>
+<p>
+The lumped thermal conductance <i>G</i> representing all heat transfer mechanisms
+that depend on the temperature difference with the outside (transmission,
+infiltration and ventilation) is assessed from the steady-state energy balance
+at heating nominal conditions as
+</p>
+<p style=\"font-style:italic;\">
+0 = Q&#775;<sub>heating, nom</sub> + G (T<sub>out, heating, nom</sub> - T<sub>ind, heating, nom</sub>).
+</p>
+<p>
+Note that for model representativeness, it is important
+for Q&#775;<sub>heating, nom</sub> to be evaluated in close to steady-state conditions
+with no internal heat gains and no solar heat gains.
+</p>
+<p>
+The lumped thermal conductance <i>G</i> is then considered constant for all operating conditions.
+</p>
+<p>
+The required heating or cooling heat flow rate (i.e. the space load)
+<i>Q&#775;<sub>heat_cool, req</sub></i> corresponds to
+a steady-state control error equal to zero,
+</p>
+<p style=\"font-style:italic;\">
+0 = Q&#775;<sub>heat_cool, req</sub> +
+G (T<sub>out</sub> - T<sub>ind, set</sub>) +
+Q&#775;<sub>various</sub>,
+</p>
+<p>
+where <i>Q&#775;<sub>various</sub></i> represents the miscellaneous heat gains.
+The indoor temperature variation rate due to an unmet load is given by
+</p>
+<p style=\"font-style:italic;\">
+C &part;T<sub>ind</sub> / &part;t = Q&#775;<sub>heat_cool, act</sub> +
+G (T<sub>out</sub> - T<sub>ind</sub>) + Q&#775;<sub>various</sub>,
+</p>
+<p>
+where
+<i>Q&#775;<sub>heat_cool, act</sub></i> is the actual heating or cooling heat flow rate and
+<i>C</i> is the thermal capacitance of the indoor volume.
+The two previous equations yield
+</p>
+<p style=\"font-style:italic;\">
+&tau; &part;T<sub>ind</sub> / &part;t = (Q&#775;<sub>heat_cool, act</sub> - Q&#775;<sub>heat_cool, req</sub>) / G
+- T<sub>ind</sub> + T<sub>ind, set</sub>,
+</p>
+<p>
+where <i>&tau; = C / G</i> is the time constant of the indoor temperature.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+January 26, 2023, by Michael Wetter:<br/>
+Updated parameters for clarity if used for cooling.
+</li>
+
+<li>
+February 21, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false),
+      graphics={
+        Text(
+          extent={{-88,16},{-8,-14}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Left,
+          textString="QReq_flow"),
+        Text(
+          extent={{-88,94},{-52,68}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Left,
+          textString="TSet"),
+        Text(
+          extent={{-88,-64},{-8,-94}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Left,
+          textString="QAct_flow"),
+        Text(
+          extent={{50,10},{90,-8}},
+          textColor={0,0,127},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          horizontalAlignment=TextAlignment.Right,
+          textString="TAir")}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)));
+end SimpleRoomODE;
diff --git a/Buildings/DHC/Loads/BaseClasses/Types.mo b/Buildings/DHC/Loads/BaseClasses/Types.mo
new file mode 100644
index 00000000000..b6839f8b12d
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Types.mo
@@ -0,0 +1,147 @@
+within Buildings.DHC.Loads.BaseClasses;
+package Types
+  "Package with type definitions"
+  extends Modelica.Icons.TypesPackage;
+  type DistributionType = enumeration(
+      HeatingWater
+    "Heating water distribution system",
+      ChilledWater
+    "Chilled water distribution system",
+      ChangeOver
+    "Change-over distribution system")
+    "Enumeration for the type of distribution system"
+    annotation (Documentation(info="<html>
+<p>
+Enumeration to define the type of distribution system.
+<br/>
+</p>
+<table border=\"1\" summary=\"Explanation of the enumeration\">
+<tr>
+  <th>
+  Enumeration
+  </th>
+  <th>
+  Description
+  </th>
+</tr>
+<tr>
+  <td>
+  HeatingWater
+  </td>
+  <td>
+  Use this setting for a heating water distribution system.
+  </td>
+</tr>
+<tr>
+  <td>
+  ChilledWater
+  </td>
+  <td>
+  Use this setting for a chilled water distribution system.
+  </td>
+</tr>
+<tr>
+  <td>
+  ChangeOver
+  </td>
+  <td>
+  Use this setting for a change-over distribution system.
+  </td>
+</tr>
+</table>
+</html>",revisions="<html>
+<ul>
+<li>
+February 21, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+  type PumpControlType = enumeration(
+      ConstantSpeed
+    "Constant speed",
+      ConstantFlow
+    "Constant flow rate (three-way valves)",
+      ConstantHead
+    "Constant pump head",
+      LinearHead
+    "Linear relationship between pump head and mass flow rate",
+      ConstantDp
+    "Constant pressure difference at given location")
+    "Enumeration for the type of distribution pump control"
+    annotation (Documentation(info="<html>
+<p>
+Enumeration to define the type of distribution pump control.
+<br/>
+</p>
+<table border=\"1\" summary=\"Explanation of the enumeration\">
+<tr>
+  <th>
+  Enumeration
+  </th>
+  <th>
+  Description
+  </th>
+</tr>
+<tr>
+  <td>
+  ConstantSpeed
+  </td>
+  <td>
+  Use this setting for a constant speed pump.
+  </td>
+</tr>
+<tr>
+  <td>
+  ConstantFlow
+  </td>
+  <td>
+  Use this setting for a constant flow system where terminal units are
+  equipped with three-way valves and the pump operation can be
+  approximated as constant flow and constant head.
+  </td>
+</tr>
+<tr>
+  <td>
+  ConstantHead
+  </td>
+  <td>
+  Use this setting for a pump control ensuring a constant head.
+  </td>
+</tr>
+<tr>
+  <td>
+  LinearHead
+  </td>
+  <td>
+  Use this setting for a pump control ensuring a linear variation of the
+  pump head with the mass flow rate.
+  </td>
+</tr>
+<tr>
+  <td>
+  ConstantDp
+  </td>
+  <td>
+  Use this setting for a pump control ensuring a constant pressure drop
+  at a given location in the distribution system.
+  </td>
+</tr>
+</table>
+</html>",revisions="<html>
+<ul>
+<li>
+February 21, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains type definitions.
+</p>
+</html>"));
+end Types;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
index 1d257170de3..956c4d7a424 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/Building.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model Building
   "Dummy building model for validation purposes"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding;
+  extends Buildings.DHC.Loads.BaseClasses.PartialBuilding;
   parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal
     "Design heat flow rate for chilled water production (<0)"
     annotation (Dialog(group="Nominal condition", enable=have_chiWat));
@@ -87,8 +87,8 @@ equation
     Documentation(info="<html>
 <p>
 This is a minimum example of a class extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuilding</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuilding\">
+Buildings.DHC.Loads.BaseClasses.PartialBuilding</a>
 developed for testing purposes only.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
new file mode 100644
index 00000000000..16160bfaa87
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
@@ -0,0 +1,33 @@
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
+model BuildingWithETS
+  "Dummy building with ETS model for validation purposes"
+  extends
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+    redeclare ETS ets,
+    redeclare Building bui(
+      final QChiWat_flow_nominal=QChiWat_flow_nominal,
+      final QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      final m_flow_nominal=ets.m_flow_nominal));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This is a minimum example of a class extending
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
+Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
+developed for testing purposes only.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+December 14, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
similarity index 84%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
index a5273788b12..b01a97106ce 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/ETS.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model ETS
   "Dummy ETS model for validation purposes"
   extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS;
+    Buildings.DHC.ETS.BaseClasses.PartialETS;
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
     "Nominal mass flow rate";
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant souPHea(
@@ -19,26 +19,26 @@ model ETS
     annotation (Placement(transformation(extent={{260,-70},{280,-50}})));
   Fluid.Sources.Boundary_pT sinSerAmbSup(
     redeclare final package Medium = MediumSer,
-    nPorts=1) if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Sink for service supply"
     annotation (Placement(transformation(extent={{-260,-210},{-280,-190}})));
   Fluid.Sources.MassFlowSource_T souSerAmbRet(
     redeclare final package Medium = MediumSer,
     m_flow=m_flow_nominal,
-    nPorts=1) if typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Source for service return"
     annotation (Placement(transformation(extent={{260,-210},{280,-190}})));
   Fluid.Sources.Boundary_pT sinSerHeaSup(
     redeclare final package Medium = MediumSerHea_a,
-    nPorts=1) if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Sink for service supply"
     annotation (Placement(transformation(extent={{-260,-250},{-280,-230}})));
   Fluid.Sources.MassFlowSource_T souSerHeaReat(
     redeclare final package Medium = MediumSer,
     m_flow=m_flow_nominal,
-    nPorts=1) if typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-    typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+    nPorts=1) if typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+    typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
     "Source for service return"
     annotation (Placement(transformation(extent={{260,-250},{280,-230}})));
   Fluid.Sources.Boundary_pT sinHeaWat(
@@ -100,8 +100,8 @@ equation
     Documentation(info="<html>
 <p>
 This is a minimum example of a class extending
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialETS</a>
+<a href=\"modelica://Buildings.DHC.ETS.BaseClasses.PartialETS\">
+Buildings.DHC.ETS.BaseClasses.PartialETS</a>
 developed for testing purposes only.
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
index 52b56f0332d..4c7968501c3 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeCooling.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model FanCoil2PipeCooling
   "Model of a sensible only two-pipe fan coil unit for cooling,
   computing a required chilled water mass flow rate"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaPor=false,
@@ -98,7 +98,7 @@ model FanCoil2PipeCooling
     nPorts=1)
     "Source for return air"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={112,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
     final dTEnv_nominal=dTEnv_nominal,
     TAir_start=297.15,
     final QEnv_flow_nominal=QEnv_flow_nominal) "Predicted room air temperature"
@@ -197,8 +197,8 @@ takes the load as an input, and
 </li>
 <li>
 in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>:
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>:
 it therefore computes the water mass flow rate required to meet the load.
 </li>
 </ul>
@@ -218,8 +218,8 @@ the air mass flow rate, from zero to its nominal value.
 <p>
 The controller tracks the load while the impact of an unmet load on the room
 air temperature is assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
index cc75c37404d..7b8d1cee688 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeating.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model FanCoil2PipeHeating
   "Model of a two-pipe fan coil unit for heating,
   computing a required heating water mass flow rate"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaPor=false,
@@ -90,7 +90,7 @@ model FanCoil2PipeHeating
     nPorts=1)
     "Source for return air"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={112,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
     dTEnv_nominal=25,
     TAir_start=293.15,
     QEnv_flow_nominal=QHea_flow_nominal) "Predicted room air temperature"
@@ -191,8 +191,8 @@ therefore takes the load as an input, and
 </li>
 <li>
 in conjunction with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>:
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>:
 it therefore computes the water mass flow rate required to meet the load.
 </li>
 </ul>
@@ -212,8 +212,8 @@ the air mass flow rate, from zero to its nominal value.
 <p>
 The controller tracks the load while the impact of an unmet load on the room
 air temperature is assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
index f52dfdde37c..f86d586e07a 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/FanCoil2PipeHeatingValve.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses;
 model FanCoil2PipeHeatingValve
   "Model of a two-pipe fan coil unit for heating, with a two-way control valve"
-  extends Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit(
+  extends Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit(
     redeclare package Medium1=Buildings.Media.Water,
     redeclare package Medium2=Buildings.Media.Air,
     final have_heaPor=false,
@@ -83,7 +83,7 @@ model FanCoil2PipeHeatingValve
     nPorts=1)
     "Source for return air"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE TLoaODE(
     dTEnv_nominal=25,
     TAir_start=293.15,
     QEnv_flow_nominal=QHea_flow_nominal) "Predicted room air temperature"
@@ -198,8 +198,8 @@ the air mass flow rate, from zero to its nominal value.
 </ul>
 <p>
 The impact of an unmet load on the room air temperature is assessed with
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a>.
 </p>
 </html>",
       revisions="<html>
diff --git a/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
new file mode 100644
index 00000000000..c2cb3ec1522
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.BaseClasses.Validation;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation\">
+Buildings.DHC.Loads.BaseClasses.Validation</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order b/Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order
rename to Buildings/DHC/Loads/BaseClasses/Validation/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
similarity index 85%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
index 82bf3040132..cfcbb8123f2 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model BenchmarkFlowDistribution1
   "Performance benchmark of building heating water flow distribution modeling"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model BenchmarkFlowDistribution1
     "Source side medium";
   package Medium2=Buildings.Media.Air
     "Load side medium";
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -37,11 +37,11 @@ model BenchmarkFlowDistribution1
   final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=sum(ter.mHeaWat_flow_nominal)
       *facMul "Nominal mass flow rate in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps)
-     = Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
+     = Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
     "#Peak space heating load", filNam=Modelica.Utilities.Files.loadResource(
     filNam))/facMul "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disFloHea(
     redeclare package Medium=Medium1,
     m_flow_nominal=m_flow_nominal,
     have_pum=true,
@@ -50,7 +50,7 @@ model BenchmarkFlowDistribution1
     nPorts_b1=nLoa)
     "Heating water distribution system"
     annotation (Placement(transformation(extent={{40,-90},{60,-70}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
@@ -135,16 +135,16 @@ This model is part of a computational performance benchmark between
 <ul>
 <li>
 a simplified modeling of the piping network as implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
 </li>
 <li>
 an explicit modeling of the piping network (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
 </li>
 </ul>
 </html>",
@@ -167,5 +167,5 @@ First implementation.
       StopTime=2000000,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos" "Simulate and plot"));
 end BenchmarkFlowDistribution1;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
similarity index 87%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
index ac9651278bd..4589987af33 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model BenchmarkFlowDistribution2
   "Performance benchmark of building heating water flow distribution modeling"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model BenchmarkFlowDistribution2
     "Source side medium";
   package Medium2=Buildings.Media.Air
     "Load side medium";
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -39,11 +39,11 @@ model BenchmarkFlowDistribution2
        + sum(dis.con.pipDisRet.dp_nominal) + max(ter.dpSou_nominal)
     "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
       Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve ter[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve ter[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
@@ -86,7 +86,7 @@ model BenchmarkFlowDistribution2
     nPorts=2)
     "Heating water supply"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-80})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R dis(
+  Buildings.DHC.Networks.Distribution2Pipe_R dis(
     redeclare final package Medium = Medium1,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -166,16 +166,16 @@ This model is part of a computational performance benchmark between
 <ul>
 <li>
 a simplified modeling of the piping network as implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>
 (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1</a>), and
 </li>
 <li>
 an explicit modeling of the piping network (see the corresponding example
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2\">
+Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2</a>).
 </li>
 </ul>
 </html>",
@@ -198,5 +198,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos" "Simulate and plot"));
 end BenchmarkFlowDistribution2;
diff --git a/Buildings/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo b/Buildings/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
new file mode 100644
index 00000000000..eb01c629893
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
@@ -0,0 +1,483 @@
+within Buildings.DHC.Loads.BaseClasses.Validation;
+model BuildingWithETS
+  "Validation of the base class PartialBuildingWithPartialETS"
+  extends Modelica.Icons.Example;
+  import TypDisSys=Buildings.DHC.Types.DistrictSystemType
+    "District system type enumeration";
+  package MediumW=Buildings.Media.Water
+    "Water";
+  package MediumS=Modelica.Media.Water.WaterIF97_ph (
+    h_default=2770E3)
+    "Steam";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate";
+  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=1E4
+    "Nominal mass flow rate";
+  parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=-1E4
+    "Nominal mass flow rate";
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen1(
+    redeclare final package MediumSerHea_a=MediumS,
+    redeclare final package MediumSer=MediumW,
+    redeclare final package MediumBui=MediumW,
+    nPorts_heaWat=1,
+    bui(
+      final have_heaWat=true),
+    ets(
+      final typ=TypDisSys.HeatingGeneration1,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal))
+    "Building and ETS component - Heating only (steam)"
+    annotation (Placement(transformation(extent={{-160,210},{-140,230}})));
+  Fluid.Sources.MassFlowSource_T souDisSup(
+    redeclare final package Medium=MediumS,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-240,210},{-220,230}})));
+  Fluid.Sources.Boundary_pT sinDisRet(
+    redeclare final package Medium=MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-240,170},{-220,190}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
+    redeclare final package Medium1=MediumS,
+    redeclare final package Medium2=MediumW,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-200,196},{-180,216}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen1(
+    redeclare final package MediumSerHea_a=MediumS,
+    redeclare final package MediumSer=MediumW,
+    redeclare final package MediumBui=MediumW,
+    nPorts_heaWat=1,
+    nPorts_chiWat=1,
+    bui(
+      final have_heaWat=true,
+      final have_chiWat=true),
+    ets(
+      final typ=TypDisSys.CombinedGeneration1,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      final have_chiWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      QChiWat_flow_nominal=QChiWat_flow_nominal))
+    "Building and ETS component - Buildings.DHC.Loads.Combined heating (steam) and cooling"
+    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
+  Fluid.Sources.MassFlowSource_T souDisSup1(
+    redeclare final package Medium=MediumS,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-240,-10},{-220,10}})));
+  Fluid.Sources.Boundary_pT sinDisRet1(
+    redeclare final package Medium=MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-240,-50},{-220,-30}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo1(
+    redeclare final package Medium1=MediumS,
+    redeclare final package Medium2 = Media.Water,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-200,-24},{-180,-4}})));
+  Fluid.Sources.MassFlowSource_T souDisSup2(
+    redeclare final package Medium=MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-200,-50},{-180,-30}})));
+  Fluid.Sources.Boundary_pT sinDisRet2(
+    redeclare final package Medium=MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-200,-90},{-180,-70}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo2(
+    redeclare final package Medium1=MediumW,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-160,-64},{-140,-44}})));
+  Fluid.Sources.MassFlowSource_T souDisSup3(
+    redeclare final package Medium=MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-240,90},{-220,110}})));
+  Fluid.Sources.Boundary_pT sinDisRet3(
+    redeclare final package Medium=MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-240,50},{-220,70}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo3(
+    redeclare final package Medium1=MediumW,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-200,76},{-180,96}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiCoo(
+    redeclare final package MediumSer=MediumW,
+    redeclare final package MediumBui=MediumW,
+    nPorts_chiWat=1,
+    bui(
+      final have_chiWat=true),
+    ets(
+      final typ=TypDisSys.Cooling,
+      final m_flow_nominal=m_flow_nominal,
+      final have_chiWat=true,
+      QChiWat_flow_nominal=QChiWat_flow_nominal))
+    "Building and ETS component - Buildings.DHC.Loads.Cooling only"
+    annotation (Placement(transformation(extent={{-160,90},{-140,110}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen2to4(
+    redeclare final package MediumSer = MediumW,
+    redeclare final package MediumBui = MediumW,
+    nPorts_heaWat=1,
+    nPorts_chiWat=1,
+    bui(
+      final have_heaWat=true,
+      final have_chiWat=true),
+    ets(
+      final typ=TypDisSys.CombinedGeneration2to4,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      final have_chiWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      QChiWat_flow_nominal=QChiWat_flow_nominal))
+    "Building and ETS component - Buildings.DHC.Loads.Combined heating and cooling"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Fluid.Sources.MassFlowSource_T souDisSup5(
+    redeclare final package Medium = MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Fluid.Sources.Boundary_pT sinDisRet5(
+    redeclare final package Medium = MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo5(
+    redeclare final package Medium1 = MediumW,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-40,-24},{-20,-4}})));
+  Fluid.Sources.MassFlowSource_T souDisSup6(
+    redeclare final package Medium =MediumW,
+    m_flow=m_flow_nominal,                   nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+  Fluid.Sources.Boundary_pT sinDisRet6(
+    redeclare final package Medium = MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo6(
+    redeclare final package Medium1 = MediumW,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{0,-64},{20,-44}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen2to4(
+    redeclare final package MediumSer = MediumW,
+    redeclare final package MediumBui = MediumW,
+    nPorts_heaWat=1,
+    bui(
+      final have_heaWat=true),
+    ets(
+      final typ=TypDisSys.HeatingGeneration2to4,
+      final m_flow_nominal= m_flow_nominal,
+      final have_heaWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal))
+    "Building and ETS component - Heating only"
+    annotation (Placement(transformation(extent={{0,210},{20,230}})));
+  Fluid.Sources.MassFlowSource_T souDisSup7(
+    redeclare final package Medium = MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-80,210},{-60,230}})));
+  Fluid.Sources.Boundary_pT sinDisRet7(
+    redeclare final package Medium = MediumW,
+    nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-80,170},{-60,190}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo7(
+    redeclare final package Medium1 = MediumW,
+    final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-40,196},{-20,216}})));
+  Fluid.Sources.MassFlowSource_T souDisSup4(
+    redeclare final package Medium = MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
+  Fluid.Sources.Boundary_pT sinDisRet4(redeclare final package Medium = MediumW,
+      nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo4(redeclare
+      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{160,-24},{180,-4}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen5(
+    redeclare final package MediumSer = MediumW,
+    redeclare final package MediumBui = MediumW,
+    nPorts_heaWat=1,
+    nPorts_chiWat=1,
+    bui(final have_heaWat=true, final have_chiWat=true),
+    ets(
+      final typ=TypDisSys.CombinedGeneration5,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      final have_chiWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      QChiWat_flow_nominal=QChiWat_flow_nominal))
+    "Building and ETS component - Buildings.DHC.Loads.Combined heating and cooling (ambient)"
+    annotation (Placement(transformation(extent={{200,-10},{220,10}})));
+  Fluid.Sources.MassFlowSource_T souDisSup8(
+    redeclare final package Medium = MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-240,-170},{-220,-150}})));
+  Fluid.Sources.Boundary_pT sinDisRet8(redeclare final package Medium = MediumW,
+      nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-240,-210},{-220,-190}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo8(redeclare
+      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-200,-184},{-180,-164}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETS(
+    redeclare final package MediumSer = MediumW,
+    redeclare final package MediumBui = MediumW,
+    nPorts_heaWat=1,
+    nPorts_chiWat=1,
+    bui(final have_heaWat=true, final have_chiWat=true),
+    ets(
+      final typ=TypDisSys.CombinedGeneration5,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      final have_chiWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      QChiWat_flow_nominal=QChiWat_flow_nominal,
+      final have_fan=true,
+      final have_pum=true,
+      final have_eleHea=true,
+      final have_eleCoo=true))
+    "Building and ETS component - Testing ETS output connectors"
+    annotation (Placement(transformation(extent={{-160,-170},{-140,-150}})));
+  Fluid.Sources.MassFlowSource_T souDisSup9(
+    redeclare final package Medium = MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
+  Fluid.Sources.Boundary_pT sinDisRet9(redeclare final package Medium = MediumW,
+      nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{-80,-210},{-60,-190}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo9(redeclare
+      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{-40,-184},{-20,-164}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETSBui(
+    redeclare final package MediumSer = MediumW,
+    redeclare final package MediumBui = MediumW,
+    nPorts_heaWat=1,
+    nPorts_chiWat=1,
+    bui(
+      final have_heaWat=true,
+      final have_chiWat=true,
+      final have_fan=true,
+      final have_pum=true,
+      final have_eleHea=true,
+      final have_eleCoo=true),
+    ets(
+      final typ=TypDisSys.CombinedGeneration5,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      final have_chiWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      QChiWat_flow_nominal=QChiWat_flow_nominal,
+      final have_fan=true,
+      final have_pum=true,
+      final have_eleHea=true,
+      final have_eleCoo=true))
+    "Building and ETS component - Testing ETS and building output connectors"
+    annotation (Placement(transformation(extent={{0,-170},{20,-150}})));
+  Fluid.Sources.MassFlowSource_T souDisSup10(
+    redeclare final package Medium = MediumW,
+    m_flow=m_flow_nominal,
+    nPorts=1)
+    "Source for district supply"
+    annotation (Placement(transformation(extent={{100,-170},{120,-150}})));
+  Fluid.Sources.Boundary_pT sinDisRet10(redeclare final package Medium =
+        MediumW, nPorts=1)
+    "Sink for district return"
+    annotation (Placement(transformation(extent={{100,-210},{120,-190}})));
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo10(redeclare
+      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
+    "Change in enthalpy flow rate "
+    annotation (Placement(transformation(extent={{140,-184},{160,-164}})));
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesFacMul(
+    redeclare final package MediumSer = MediumW,
+    redeclare final package MediumBui = MediumW,
+    nPorts_heaWat=1,
+    nPorts_chiWat=1,
+    facMul=2,
+    bui(
+      final have_heaWat=true,
+      final have_chiWat=true,
+      final have_fan=true,
+      final have_pum=true,
+      final have_eleHea=true,
+      final have_eleCoo=true),
+    ets(
+      final typ=TypDisSys.CombinedGeneration5,
+      final m_flow_nominal=m_flow_nominal,
+      final have_heaWat=true,
+      final have_chiWat=true,
+      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+      QChiWat_flow_nominal=QChiWat_flow_nominal,
+      final have_fan=true,
+      final have_pum=true,
+      final have_eleHea=true,
+      final have_eleCoo=true))
+    "Building and ETS component - Testing scaling factor"
+    annotation (Placement(transformation(extent={{180,-170},{200,-150}})));
+equation
+  connect(souDisSup.ports[1],senDifEntFlo.port_a1)
+    annotation (Line(points={{-220,220},{-212,220},{-212,212},{-200,212}},color={0,127,255}));
+  connect(senDifEntFlo.port_b2,sinDisRet.ports[1])
+    annotation (Line(points={{-200,200},{-212,200},{-212,180},{-220,180}},color={0,127,255}));
+  connect(souDisSup1.ports[1],senDifEntFlo1.port_a1)
+    annotation (Line(points={{-220,0},{-212,0},{-212,-8},{-200,-8}},  color={0,127,255}));
+  connect(senDifEntFlo1.port_b2,sinDisRet1.ports[1])
+    annotation (Line(points={{-200,-20},{-212,-20},{-212,-40},{-220,-40}},
+                                                                      color={0,127,255}));
+  connect(souDisSup2.ports[1],senDifEntFlo2.port_a1)
+    annotation (Line(points={{-180,-40},{-170,-40},{-170,-48},{-160,-48}},
+                                                                    color={0,127,255}));
+  connect(senDifEntFlo2.port_b2,sinDisRet2.ports[1])
+    annotation (Line(points={{-160,-60},{-170,-60},{-170,-80},{-180,-80}},
+                                                                    color={0,127,255}));
+  connect(souDisSup3.ports[1],senDifEntFlo3.port_a1)
+    annotation (Line(points={{-220,100},{-210,100},{-210,92},{-200,92}},color={0,127,255}));
+  connect(sinDisRet3.ports[1],senDifEntFlo3.port_b2)
+    annotation (Line(points={{-220,60},{-210,60},{-210,80},{-200,80}},color={0,127,255}));
+  connect(senDifEntFlo.port_b1, buiHeaGen1.port_aSerHea) annotation (Line(
+        points={{-180,212},{-170,212},{-170,216},{-160,216}}, color={0,127,255}));
+  connect(senDifEntFlo.port_a2, buiHeaGen1.port_bSerHea) annotation (Line(
+        points={{-180,200},{-120,200},{-120,216},{-140,216}}, color={0,127,255}));
+  connect(senDifEntFlo1.port_b1, buiComGen1.port_aSerHea) annotation (Line(
+        points={{-180,-8},{-170,-8},{-170,-4},{-160,-4}},
+                                                        color={0,127,255}));
+  connect(buiComGen1.port_bSerHea, senDifEntFlo1.port_a2) annotation (Line(
+        points={{-140,-4},{-120,-4},{-120,-20},{-180,-20}},
+                                                       color={0,127,255}));
+  connect(senDifEntFlo2.port_b1, buiComGen1.port_aSerCoo) annotation (Line(
+        points={{-140,-48},{-120,-48},{-120,-30},{-166,-30},{-166,-8},{-160,-8}},
+                                                                       color={0,
+          127,255}));
+  connect(buiComGen1.port_bSerCoo, senDifEntFlo2.port_a2) annotation (Line(
+        points={{-140,-8},{-100,-8},{-100,-60},{-140,-60}},
+                                                      color={0,127,255}));
+  connect(senDifEntFlo3.port_b1, buiCoo.port_aSerCoo)
+    annotation (Line(points={{-180,92},{-160,92}}, color={0,127,255}));
+  connect(buiCoo.port_bSerCoo, senDifEntFlo3.port_a2) annotation (Line(points={{
+          -140,92},{-120,92},{-120,80},{-180,80}}, color={0,127,255}));
+  connect(souDisSup5.ports[1],senDifEntFlo5.port_a1)
+    annotation (Line(points={{-60,0},{-52,0},{-52,-8},{-40,-8}},      color={0,127,255}));
+  connect(senDifEntFlo5.port_b2,sinDisRet5.ports[1])
+    annotation (Line(points={{-40,-20},{-52,-20},{-52,-40},{-60,-40}},color={0,127,255}));
+  connect(souDisSup6.ports[1],senDifEntFlo6.port_a1)
+    annotation (Line(points={{-20,-40},{-10,-40},{-10,-48},{0,-48}},color={0,127,255}));
+  connect(senDifEntFlo6.port_b2,sinDisRet6.ports[1])
+    annotation (Line(points={{0,-60},{-10,-60},{-10,-80},{-20,-80}},color={0,127,255}));
+  connect(senDifEntFlo5.port_b1, buiComGen2to4.port_aSerHea) annotation (Line(
+        points={{-20,-8},{-10,-8},{-10,-4},{0,-4}}, color={0,127,255}));
+  connect(buiComGen2to4.port_bSerHea, senDifEntFlo5.port_a2) annotation (Line(
+        points={{20,-4},{40,-4},{40,-20},{-20,-20}}, color={0,127,255}));
+  connect(senDifEntFlo6.port_b1, buiComGen2to4.port_aSerCoo) annotation (Line(
+        points={{20,-48},{40,-48},{40,-30},{-6,-30},{-6,-8},{0,-8}}, color={0,127,
+          255}));
+  connect(buiComGen2to4.port_bSerCoo, senDifEntFlo6.port_a2) annotation (Line(
+        points={{20,-8},{60,-8},{60,-60},{20,-60}}, color={0,127,255}));
+  connect(souDisSup7.ports[1], senDifEntFlo7.port_a1) annotation (Line(points={{
+          -60,220},{-52,220},{-52,212},{-40,212}}, color={0,127,255}));
+  connect(senDifEntFlo7.port_b2, sinDisRet7.ports[1]) annotation (Line(points={{
+          -40,200},{-52,200},{-52,180},{-60,180}}, color={0,127,255}));
+  connect(senDifEntFlo7.port_b1, buiHeaGen2to4.port_aSerHea) annotation (Line(
+        points={{-20,212},{-10,212},{-10,216},{0,216}}, color={0,127,255}));
+  connect(senDifEntFlo7.port_a2, buiHeaGen2to4.port_bSerHea) annotation (Line(
+        points={{-20,200},{40,200},{40,216},{20,216}}, color={0,127,255}));
+  connect(souDisSup4.ports[1],senDifEntFlo4.port_a1)
+    annotation (Line(points={{140,0},{150,0},{150,-8},{160,-8}},        color={0,127,255}));
+  connect(sinDisRet4.ports[1],senDifEntFlo4.port_b2)
+    annotation (Line(points={{140,-40},{150,-40},{150,-20},{160,-20}},color={0,127,255}));
+  connect(senDifEntFlo4.port_b1,buiComGen5. port_aSerAmb) annotation (Line(
+        points={{180,-8},{190,-8},{190,0},{200,0}},     color={0,127,255}));
+  connect(buiComGen5.port_bSerAmb,senDifEntFlo4. port_a2) annotation (Line(
+        points={{220,0},{240,0},{240,-20},{180,-20}},     color={0,127,255}));
+  connect(souDisSup8.ports[1],senDifEntFlo8.port_a1)
+    annotation (Line(points={{-220,-160},{-210,-160},{-210,-168},{-200,-168}},
+                                                                        color={0,127,255}));
+  connect(sinDisRet8.ports[1],senDifEntFlo8.port_b2)
+    annotation (Line(points={{-220,-200},{-210,-200},{-210,-180},{-200,-180}},
+                                                                      color={0,127,255}));
+  connect(senDifEntFlo8.port_b1,buiTesOutETS. port_aSerAmb) annotation (Line(
+        points={{-180,-168},{-170,-168},{-170,-160},{-160,-160}}, color={0,127,255}));
+  connect(buiTesOutETS.port_bSerAmb,senDifEntFlo8. port_a2) annotation (Line(
+        points={{-140,-160},{-120,-160},{-120,-180},{-180,-180}}, color={0,127,255}));
+  connect(souDisSup9.ports[1],senDifEntFlo9.port_a1)
+    annotation (Line(points={{-60,-160},{-52,-160},{-52,-168},{-40,-168}},
+                                                                        color={0,127,255}));
+  connect(sinDisRet9.ports[1],senDifEntFlo9.port_b2)
+    annotation (Line(points={{-60,-200},{-52,-200},{-52,-180},{-40,-180}},
+                                                                      color={0,127,255}));
+  connect(senDifEntFlo9.port_b1,buiTesOutETSBui. port_aSerAmb) annotation (Line(
+        points={{-20,-168},{-12,-168},{-12,-160},{0,-160}},  color={0,127,255}));
+  connect(buiTesOutETSBui.port_bSerAmb,senDifEntFlo9. port_a2) annotation (Line(
+        points={{20,-160},{40,-160},{40,-180},{-20,-180}}, color={0,127,255}));
+  connect(souDisSup10.ports[1],senDifEntFlo10. port_a1) annotation (Line(points={{120,
+          -160},{130,-160},{130,-168},{140,-168}},      color={0,127,255}));
+  connect(sinDisRet10.ports[1],senDifEntFlo10. port_b2) annotation (Line(points={{120,
+          -200},{130,-200},{130,-180},{140,-180}},      color={0,127,255}));
+  connect(senDifEntFlo10.port_b1,buiTesFacMul. port_aSerAmb) annotation (Line(
+        points={{160,-168},{170,-168},{170,-160},{180,-160}}, color={0,127,255}));
+  connect(buiTesFacMul.port_bSerAmb,senDifEntFlo10. port_a2) annotation (Line(
+        points={{200,-160},{220,-160},{220,-180},{160,-180}}, color={0,127,255}));
+  annotation (
+    experiment(
+      Tolerance=1e-6,
+      StopTime=1.0),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos"
+      "Simulate and plot"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-260,-260},{260,260}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
+Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
+for various types of district system.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 12, 2021, by Michael Wetter:<br/>
+Changed steam medium.<br/>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2395\">#2395</a>.
+</li>
+<li>
+December 14, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo b/Buildings/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
index f9b9abafa6e..81451c4fee5 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model FlowDistributionPumpControl
   "Validation of the pump head computation in FlowDistribution"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model FlowDistributionPumpControl
     "Source side medium";
   package Medium2=Buildings.Media.Air
     "Load side medium";
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -41,11 +41,11 @@ model FlowDistributionPumpControl
   final parameter Modelica.Units.SI.PressureDifference dp_nominal=max(terUniHea.dpSou_nominal)
        + 2*nLoa*5000 "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load", filNam=
       Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Nominal condition"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terUniHea[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terUniHea[nLoa](
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
     each final facMul=facMul,
@@ -83,7 +83,7 @@ model FlowDistributionPumpControl
     nout=nLoa)
     "Repeat input to output an array"
     annotation (Placement(transformation(extent={{-128,20},{-108,40}})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R dis(
+  Buildings.DHC.Networks.Distribution2Pipe_R dis(
     redeclare final package Medium = Medium1,
     final nCon=nLoa,
     final allowFlowReversal=false,
@@ -116,11 +116,11 @@ model FlowDistributionPumpControl
     nPorts=3)
     "Heating water source"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-130,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disCstDp(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disCstDp(
     redeclare package Medium=Medium1,
     m_flow_nominal=m_flow_nominal,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantDp,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantDp,
     dp_nominal=dp_nominal,
     dpMin=dpSet,
     mUni_flow_nominal=mCon_flow_nominal,
@@ -134,7 +134,7 @@ model FlowDistributionPumpControl
     nPorts=3)
     "Sink for heating water"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={150,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea1[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea1[nLoa](
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
     each final facMul=facMul,
@@ -167,7 +167,7 @@ model FlowDistributionPumpControl
     k=1)
     "Constant one"
     annotation (Placement(transformation(extent={{-180,190},{-160,210}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea2[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniHea2[nLoa](
     redeclare each final package Medium1=Medium1,
     redeclare each final package Medium2=Medium2,
     each final facMul=facMul,
@@ -179,11 +179,11 @@ model FlowDistributionPumpControl
     each final have_speVar=false)
     "Heating terminal unit"
     annotation (Placement(transformation(extent={{-10,118},{10,138}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disCstSpe(
+  Buildings.DHC.Loads.BaseClasses.FlowDistribution disCstSpe(
     redeclare package Medium=Medium1,
     m_flow_nominal=m_flow_nominal,
     have_pum=true,
-    typCtr=Buildings.Experimental.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantSpeed,
+    typCtr=Buildings.DHC.Loads.BaseClasses.Types.PumpControlType.ConstantSpeed,
     dp_nominal=dp_nominal,
     dpMin=dpSet,
     mUni_flow_nominal=mCon_flow_nominal,
@@ -299,8 +299,8 @@ equation
       info="<html>
 <p>
 This model validates the pump head computation algorithm implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.FlowDistribution\">
+Buildings.DHC.Loads.BaseClasses.FlowDistribution</a>.
 </p>
 </html>",
       revisions="<html>
@@ -329,5 +329,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-220,-240},{200,240}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos" "Simulate and plot"));
 end FlowDistributionPumpControl;
diff --git a/Buildings/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo b/Buildings/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
new file mode 100644
index 00000000000..9a8c1f0141a
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
@@ -0,0 +1,69 @@
+within Buildings.DHC.Loads.BaseClasses.Validation;
+model GetPeakLoad
+  "Model that validates the getPeakLoad function"
+  extends Modelica.Icons.Example;
+  parameter Modelica.Units.SI.HeatFlowRate QCoo_flow=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
+      "#Peak space cooling load", filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
+    "Peak heat flow rate";
+  parameter Modelica.Units.SI.HeatFlowRate QHea_flow=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
+      "#Peak space heating load", filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
+    "Peak heat flow rate";
+  parameter Modelica.Units.SI.HeatFlowRate QWatHea_flow=
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string=
+      "#Peak water heating load", filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
+    "Peak water heating flow rate";
+equation
+  assert(
+    abs(
+      QCoo_flow-(-383165.6989)) < 1E-3,
+    "Error in reading the peak heating load. Read "+String(
+      QCoo_flow));
+  assert(
+    abs(
+      QHea_flow-893931.4335) < 1E-3,
+    "Error in reading the peak heating load. Read "+String(
+      QHea_flow));
+  assert(
+    abs(
+      QWatHea_flow-19496.90012) < 1E-3,
+    "Error in reading the peak water heating load. Read "+String(
+      QWatHea_flow));
+  annotation (
+    experiment(
+      Tolerance=1e-6,
+      StopTime=1.0),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+This model tests reading the peak loads from the load file.
+If the wrong values are read, then the simulation stops with an error.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+November 28, 2016, by Michael Wetter:<br/>
+Added call to <code>Modelica.Utilities.Files.loadResource</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/585\">#585</a>.
+</li>
+<li>
+November 8, 2016, by Michael Wetter:<br/>
+Removed test for equality of real variables.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/572\">#572</a>.
+</li>
+<li>
+December 1, 2015, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end GetPeakLoad;
diff --git a/Buildings/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo b/Buildings/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
new file mode 100644
index 00000000000..65795128f41
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
@@ -0,0 +1,201 @@
+within Buildings.DHC.Loads.BaseClasses.Validation;
+model SimpleRoomODE
+  "Validation of the model SimpleRoomODE"
+  extends Modelica.Icons.Example;
+  package Medium1=Buildings.Media.Water
+    "Source side medium";
+  package Medium2=Buildings.Media.Air
+    "Load side medium";
+  parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=112000 "Design heating heat flow rate (for TInd=TIndHea_nominal, TOut=TOutHea_nominal,
+    with no internal gains, no solar radiation)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=-200000
+    "Design cooling heat flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Time tau=1800
+    "Time constant of the indoor temperature";
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaMet
+    "ROM where the heating load is always met"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
+    TDryBul=276.15,
+    calTSky=Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.HorizontalRadiation,
+    computeWetBulbTemperature=false,
+    filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Weather data reader"
+    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
+  Buildings.Controls.Continuous.LimPID conHea(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    Ti=10)
+    annotation (Placement(transformation(extent={{30,110},{50,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant minTSet(
+    k=293.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Minimum temperature set point"
+    annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai(k=
+        QHea_flow_nominal) "Scaling"
+    annotation (Placement(transformation(extent={{60,110},{80,130}})));
+  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
+    "Prescribed heat flow rate"
+    annotation (Placement(transformation(extent={{82,130},{62,150}})));
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaUnm
+    "ROM where the heating load is not met"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(k=0.7)
+    "Scaling "
+    annotation (Placement(transformation(extent={{92,90},{112,110}})));
+  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow1
+    "Prescribed heat flow rate"
+    annotation (Placement(transformation(extent={{82,70},{62,90}})));
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeHea(
+    dTEnv_nominal=20,
+    TAir_start=293.15,
+    QEnv_flow_nominal=QHea_flow_nominal,
+    tau=tau)
+    "ODE heated room model"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTSet(
+    k=297.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Maximum temperature set point"
+    annotation (Placement(transformation(extent={{-140,-170},{-120,-150}})));
+  Buildings.Controls.Continuous.LimPID conCoo(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    Ti=10,
+    reverseActing=false)
+    "PI controller tracking the room maximum temperature"
+    annotation (Placement(transformation(extent={{30,-110},{50,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(k=
+        QCoo_flow_nominal) "Scaling"
+    annotation (Placement(transformation(extent={{60,-110},{80,-90}})));
+  Buildings.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeCoo(
+    dTEnv_nominal=20,
+    TAir_start=293.15,
+    QEnv_flow_nominal=QHea_flow_nominal,
+    tau=tau)
+    "ODE cooled room model"
+    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3(k=0.8)
+    "Scaling"
+    annotation (Placement(transformation(extent={{92,-90},{112,-70}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat1(
+    TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
+    TDryBul=293.15,
+    calTSky=Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.HorizontalRadiation,
+    computeWetBulbTemperature=false,
+    filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Weather data reader"
+    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooMet
+    "ROM where the cooling load is always met"
+    annotation (Placement(transformation(extent={{-10,-130},{10,-110}})));
+  Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooUnm
+    "ROM where the cooling load is not met"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow2
+    "Prescribed heat flow rate"
+    annotation (Placement(transformation(extent={{80,-70},{60,-50}})));
+  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow3
+    "Prescribed heat flow rate"
+    annotation (Placement(transformation(extent={{82,-150},{62,-130}})));
+equation
+  connect(weaDat.weaBus,romHeaMet.weaBus)
+    annotation (Line(points={{-120,100},{0,100},{0,99.8},{-6,99.8}},color={255,204,51},thickness=0.5));
+  connect(romHeaMet.TAir,conHea.u_m)
+    annotation (Line(points={{11,100},{40,100},{40,108}},color={0,0,127}));
+  connect(conHea.y,gai.u)
+    annotation (Line(points={{51,120},{58,120}},color={0,0,127}));
+  connect(gai.y,prescribedHeatFlow.Q_flow)
+    annotation (Line(points={{82,120},{126,120},{126,140},{82,140}},color={0,0,127}));
+  connect(prescribedHeatFlow.port,romHeaMet.port_a)
+    annotation (Line(points={{62,140},{0,140},{0,110}},color={191,0,0}));
+  connect(conCoo.y,gai2.u)
+    annotation (Line(points={{51,-100},{58,-100}},color={0,0,127}));
+  connect(gai1.y,prescribedHeatFlow1.Q_flow)
+    annotation (Line(points={{114,100},{120,100},{120,80},{82,80}},color={0,0,127}));
+  connect(gai1.y,rooOdeHea.QAct_flow)
+    annotation (Line(points={{114,100},{120,100},{120,6},{-14,6},{-14,12},{-12,12}},color={0,0,127}));
+  connect(gai2.y,rooOdeCoo.QReq_flow)
+    annotation (Line(points={{82,-100},{126,-100},{126,-34},{-20,-34},{-20,-20},{-12,-20}},color={0,0,127}));
+  connect(prescribedHeatFlow1.port,romHeaUnm.port_a)
+    annotation (Line(points={{62,80},{0,80},{0,70}},color={191,0,0}));
+  connect(gai2.y,gai3.u)
+    annotation (Line(points={{82,-100},{86,-100},{86,-80},{90,-80}},color={0,0,127}));
+  connect(gai3.y,rooOdeCoo.QAct_flow)
+    annotation (Line(points={{114,-80},{120,-80},{120,-40},{-14,-40},{-14,-28},{-12,-28}},color={0,0,127}));
+  connect(weaDat.weaBus,romHeaUnm.weaBus)
+    annotation (Line(points={{-120,100},{-20,100},{-20,59.8},{-6,59.8}},color={255,204,51},thickness=0.5));
+  connect(weaDat1.weaBus,romCooMet.weaBus)
+    annotation (Line(points={{-120,-100},{-20,-100},{-20,-120.2},{-6,-120.2}},color={255,204,51},thickness=0.5));
+  connect(weaDat1.weaBus,romCooUnm.weaBus)
+    annotation (Line(points={{-120,-100},{-20,-100},{-20,-80.2},{-6,-80.2}},color={255,204,51},thickness=0.5));
+  connect(romCooMet.TAir,conCoo.u_m)
+    annotation (Line(points={{11,-120},{40,-120},{40,-112}},color={0,0,127}));
+  connect(gai.y,gai1.u)
+    annotation (Line(points={{82,120},{86,120},{86,100},{90,100}},color={0,0,127}));
+  connect(gai.y,rooOdeHea.QReq_flow)
+    annotation (Line(points={{82,120},{126,120},{126,0},{-20,0},{-20,20},{-12,20}},color={0,0,127}));
+  connect(gai3.y,prescribedHeatFlow2.Q_flow)
+    annotation (Line(points={{114,-80},{120,-80},{120,-60},{80,-60}},color={0,0,127}));
+  connect(prescribedHeatFlow2.port,romCooUnm.port_a)
+    annotation (Line(points={{60,-60},{0,-60},{0,-70}},color={191,0,0}));
+  connect(gai2.y,prescribedHeatFlow3.Q_flow)
+    annotation (Line(points={{82,-100},{120,-100},{120,-140},{82,-140}},color={0,0,127}));
+  connect(prescribedHeatFlow3.port,romCooMet.port_a)
+    annotation (Line(points={{62,-140},{0,-140},{0,-110}},color={191,0,0}));
+  connect(minTSet.y,conHea.u_s)
+    annotation (Line(points={{-118,160},{20,160},{20,120},{28,120}},color={0,0,127}));
+  connect(minTSet.y,rooOdeHea.TSet)
+    annotation (Line(points={{-118,160},{-40,160},{-40,28},{-12,28}},color={0,0,127}));
+  connect(maxTSet.y,conCoo.u_s)
+    annotation (Line(points={{-118,-160},{20,-160},{20,-100},{28,-100}},color={0,0,127}));
+  connect(maxTSet.y,rooOdeCoo.TSet)
+    annotation (Line(points={{-118,-160},{-40,-160},{-40,-12},{-12,-12}},color={0,0,127}));
+  annotation (
+    experiment(
+      StopTime=1209600,
+      Tolerance=1e-06),
+    Documentation(
+      info="
+<html>
+<p>
+This example validates
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.SimpleRoomODE\">
+Buildings.DHC.Loads.BaseClasses.SimpleRoomODE</a> by comparison with
+<a href=\"modelica://Buildings.ThermalZones.ReducedOrder.RC.TwoElements\">
+Buildings.ThermalZones.ReducedOrder.RC.TwoElements</a>.
+<p>
+A first instance of the reduced order model is used to assess the heating and
+cooling loads. A second instance is used to assess the indoor air temperature
+variation when the rate at which heating or cooling is provided is lower than
+the load. That second instance is used as a reference for the validation.
+</p>
+<p>
+Eventually the validation is performed with two sets of ambient conditions,
+one requiring heating, and the second requiring cooling.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+January 26, 2023, by Michael Wetter:<br/>
+Updated parameter names.
+</li>
+<li>
+February 21, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos" "Simulate and plot"),
+    Diagram(
+      coordinateSystem(
+        extent={{-180,-200},{180,200}})));
+end SimpleRoomODE;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo b/Buildings/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
rename to Buildings/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
index d12c1ee69ea..6c4d606d873 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
+within Buildings.DHC.Loads.BaseClasses.Validation;
 model TerminalUnitScaling
   "Validation of the scaling factor of the terminal unit model"
   extends Modelica.Icons.Example;
@@ -58,7 +58,7 @@ model TerminalUnitScaling
     nPorts=3)
     "Sink for heating water"
     annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={90,0})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter(
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating ter(
     have_speVar=false,
     redeclare package Medium1 = Medium1,
     redeclare package Medium2 = Medium2,
@@ -72,7 +72,7 @@ model TerminalUnitScaling
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSet(k=293.15, y(
         final unit="K", displayUnit="degC")) "Temperature set point"
     annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
- Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMul(
+ Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMul(
     have_speVar=false,
     redeclare package Medium1=Medium1,
     redeclare package Medium2=Medium2,
@@ -97,7 +97,7 @@ model TerminalUnitScaling
     duration=500)
     "Required heat flow rate"
     annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
- Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMulZonMul(
+ Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeating terUniMulZonMul(
     facMulZon=facMul,
     have_speVar=false,
     redeclare package Medium1 = Medium1,
@@ -162,8 +162,8 @@ equation
 <p>
 This example validates the use of the unit multiplier and zone multiplier factors
 for models of terminal units inheriting from
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit\">
+Buildings.DHC.Loads.BaseClasses.PartialTerminalUnit</a>.
 </p>
 </html>",
       revisions="<html>
@@ -179,5 +179,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos" "Simulate and plot"));
 end TerminalUnitScaling;
diff --git a/Buildings/DHC/Loads/BaseClasses/Validation/package.mo b/Buildings/DHC/Loads/BaseClasses/Validation/package.mo
new file mode 100644
index 00000000000..b227b690ca1
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/Validation/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Loads.BaseClasses;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models that validate the base classes in
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses\">
+Buildings.DHC.Loads.BaseClasses</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.order b/Buildings/DHC/Loads/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.order
rename to Buildings/DHC/Loads/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/getPeakLoad.mo b/Buildings/DHC/Loads/BaseClasses/getPeakLoad.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Loads/BaseClasses/getPeakLoad.mo
rename to Buildings/DHC/Loads/BaseClasses/getPeakLoad.mo
index 3cdca0680b1..6238a4d4b92 100644
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/getPeakLoad.mo
+++ b/Buildings/DHC/Loads/BaseClasses/getPeakLoad.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
+within Buildings.DHC.Loads.BaseClasses;
 pure function getPeakLoad
   "Function that reads the peak load from the load profile"
   extends Modelica.Icons.Function;
@@ -128,8 +128,8 @@ terminates the simulation with an assertion.
 </p>
 <p>
 See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad</a>
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad\">
+Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad</a>
 for how to invoke this function.
 </p>
 </html>",
diff --git a/Buildings/DHC/Loads/BaseClasses/package.mo b/Buildings/DHC/Loads/BaseClasses/package.mo
new file mode 100644
index 00000000000..58d6109de89
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Loads;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads\">
+Buildings.DHC.Loads</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/DHC/Loads/BaseClasses/package.order b/Buildings/DHC/Loads/BaseClasses/package.order
new file mode 100644
index 00000000000..66056ef97e3
--- /dev/null
+++ b/Buildings/DHC/Loads/BaseClasses/package.order
@@ -0,0 +1,19 @@
+BuildingRCZ1Valve
+BuildingRCZ6
+BuildingSpawnZ1
+BuildingSpawnZ6
+BuildingTimeSeries
+ConstraintViolation
+FanCoil4Pipe
+FanCoil4PipeHeatPorts
+FlowDistribution
+PartialBuilding
+PartialBuildingWithPartialETS
+PartialFanCoil4Pipe
+PartialTerminalUnit
+SimpleRoomODE
+getPeakLoad
+Controls
+Types
+Examples
+Validation
diff --git a/Buildings/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo b/Buildings/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
new file mode 100644
index 00000000000..e5f1d9088cd
--- /dev/null
+++ b/Buildings/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
@@ -0,0 +1,135 @@
+within Buildings.DHC.Loads.Combined.BaseClasses;
+model PartialBuildingWithETS
+  "Partial model with ETS model and partial building model"
+  extends
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+    nPorts_heaWat=1,
+    nPorts_chiWat=1);
+  parameter Modelica.Units.SI.Temperature TDisWatMin=6 + 273.15
+    "District water minimum temperature" annotation (Dialog(group="ETS model parameters"));
+  parameter Modelica.Units.SI.Temperature TDisWatMax=17 + 273.15
+    "District water maximum temperature" annotation (Dialog(group="ETS model parameters"));
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0) = 4
+    "Water temperature drop/increase accross load and source-side HX (always positive)"
+    annotation (Dialog(group="ETS model parameters"));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=18 + 273.15
+    "Chilled water supply temperature"
+    annotation (Dialog(group="ETS model parameters"));
+  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=38 + 273.15
+    "Heating water supply temperature"
+    annotation (Dialog(group="ETS model parameters"));
+  parameter Modelica.Units.SI.Temperature THotWatSup_nominal=63 + 273.15
+    "Domestic hot water supply temperature to fixtures"
+    annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
+  parameter Modelica.Units.SI.Temperature TColWat_nominal=288.15
+    "Cold water temperature (for hot water production)"
+    annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
+  parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")=50000
+    "Pressure difference at nominal flow rate (for each flow leg)"
+    annotation (Dialog(group="ETS model parameters"));
+  parameter Real COPHeaWat_nominal(final unit="1") = 4.0
+    "COP of heat pump for heating water production"
+    annotation (Dialog(group="ETS model parameters"));
+  parameter Real COPHotWat_nominal(final unit="1") = 2.3
+    "COP of heat pump for hot water production"
+    annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
+  // IO CONNECTORS
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Chilled water supply temperature set point"
+    annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-320,80}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-120,50})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupMaxSet(
+    final unit="K",
+    displayUnit="degC")
+    "Heating water supply temperature set point - Maximum value"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-320,120}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-120,70})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupMinSet(
+    final unit="K",
+    displayUnit="degC")
+    "Heating water supply temperature set point - Minimum value"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-320,160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-120,90})));
+  // COMPONENTS
+  Buildings.Controls.OBC.CDL.Reals.Line resTHeaWatSup
+    "HW supply temperature reset"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(k=0)
+    "Zero"
+    annotation (Placement(transformation(extent={{-180,-30},{-160,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(k=1)
+    "One"
+    annotation (Placement(transformation(extent={{-180,-70},{-160,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter mulPPumETS(u(final
+        unit="W"), final k=facMul) if have_pum "Scaling"
+    annotation (Placement(transformation(extent={{270,-10},{290,10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPumETS(
+    final unit="W") if have_pum
+    "ETS pump power"
+    annotation (Placement(
+        transformation(extent={{300,-20},{340,20}}),iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={70,120})));
+equation
+  connect(TChiWatSupSet, ets.TChiWatSupSet) annotation (Line(points={{-320,80},{
+          -132,80},{-132,-62},{-34,-62}},color={0,0,127}));
+  connect(resTHeaWatSup.y, ets.THeaWatSupSet) annotation (Line(points={{-88,-40},
+          {-60,-40},{-60,-58},{-34,-58}}, color={0,0,127}));
+  connect(THeaWatSupMaxSet, resTHeaWatSup.f2) annotation (Line(points={{-320,120},
+          {-280,120},{-280,-48},{-112,-48}}, color={0,0,127}));
+  connect(THeaWatSupMinSet, resTHeaWatSup.f1) annotation (Line(points={{-320,160},
+          {-276,160},{-276,-36},{-112,-36}}, color={0,0,127}));
+  connect(one.y, resTHeaWatSup.x2) annotation (Line(points={{-158,-60},{-126,-60},
+          {-126,-44},{-112,-44}}, color={0,0,127}));
+  connect(zer.y, resTHeaWatSup.x1) annotation (Line(points={{-158,-20},{-116,-20},
+          {-116,-32},{-112,-32}}, color={0,0,127}));
+  connect(mulPPumETS.y, PPumETS)
+    annotation (Line(points={{292,0},{320,0}},   color={0,0,127}));
+  connect(ets.PPum, mulPPumETS.u) annotation (Line(points={{34,-60},{240,-60},{
+          240,0},{268,0}},   color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This model is composed of a heat pump based energy transfer station model
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
+connected to a repleacable building load model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 18, 2024, by David Blum:<br/>
+Added parameters <code>TDisWatMin</code> and <code>TDisWatMax</code>
+in lieu of using <code>datDes</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3697\">issue 3697</a>.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialBuildingWithETS;
diff --git a/Buildings/DHC/Loads/Combined/BaseClasses/package.mo b/Buildings/DHC/Loads/Combined/BaseClasses/package.mo
new file mode 100644
index 00000000000..d4501e9150d
--- /dev/null
+++ b/Buildings/DHC/Loads/Combined/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Combined;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.Combined\">
+Buildings.DHC.Loads.Combined</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.order b/Buildings/DHC/Loads/Combined/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.order
rename to Buildings/DHC/Loads/Combined/BaseClasses/package.order
diff --git a/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
new file mode 100644
index 00000000000..54fd321b5e7
--- /dev/null
+++ b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
@@ -0,0 +1,155 @@
+within Buildings.DHC.Loads.Combined;
+model BuildingTimeSeriesWithETS
+  "Model of a building with loads provided as time series, connected to an ETS"
+  extends
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
+      filNam=filNam,
+      have_hotWat=true,
+      T_aHeaWat_nominal=ets.THeaWatSup_nominal,
+      T_bHeaWat_nominal=ets.THeaWatRet_nominal,
+      T_aChiWat_nominal=ets.TChiWatSup_nominal,
+      T_bChiWat_nominal=ets.TChiWatRet_nominal),
+    redeclare
+      Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger
+      ets(
+      final dT_nominal=dT_nominal,
+      final TDisWatMin=TDisWatMin,
+      final TDisWatMax=TDisWatMax,
+      final TChiWatSup_nominal=TChiWatSup_nominal,
+      final THeaWatSup_nominal=THeaWatSup_nominal,
+      final THotWatSup_nominal=THotWatSup_nominal,
+      final TColWat_nominal=TColWat_nominal,
+      final dp_nominal=dp_nominal,
+      final COPHeaWat_nominal=COPHeaWat_nominal,
+      final COPHotWat_nominal=COPHotWat_nominal,
+      have_hotWat=true,
+      QChiWat_flow_nominal=QCoo_flow_nominal,
+      QHeaWat_flow_nominal=QHea_flow_nominal,
+      QHotWat_flow_nominal=QHot_flow_nominal));
+  parameter String filNam
+    "Library path of the file with thermal loads as time series";
+  final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(
+    max=-Modelica.Constants.eps)=
+    bui.facMul * bui.QCoo_flow_nominal
+    "Space cooling design load (<=0)"
+    annotation (Dialog(group="Design parameter"));
+  final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(
+    min=Modelica.Constants.eps)=
+    bui.facMul * bui.QHea_flow_nominal
+    "Space heating design load (>=0)"
+    annotation (Dialog(group="Design parameter"));
+  final parameter Modelica.Units.SI.HeatFlowRate QHot_flow_nominal(
+    min=Modelica.Constants.eps)=
+    bui.facMul * Buildings.DHC.Loads.BaseClasses.getPeakLoad(
+      string="#Peak water heating load",
+      filNam=Modelica.Utilities.Files.loadResource(filNam))
+    "Hot water design load (>=0)"
+    annotation (Dialog(group="Design parameter"));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THotWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Service hot water supply temperature set point"
+    annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-320,40}),  iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-120,30})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TColWat(
+    final unit="K",
+    displayUnit="degC")
+    "Cold water temperature"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={-320,0}),   iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={-80,-120})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaHeaNor(
+    k=1/QHea_flow_nominal) "Normalized heating load"
+    annotation (Placement(transformation(extent={{-200,-110},{-180,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaHeaCoo[2](each t=1e-4)
+    "Threshold comparison to enable heating and cooling"
+    annotation (Placement(transformation(extent={{-110,-130},{-90,-110}})));
+  Modelica.Blocks.Sources.BooleanConstant enaSHW(
+    final k=true) if have_hotWat
+    "SHW production enable signal"
+    annotation (Placement(transformation(extent={{0,-130},{-20,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaCooNor(k=1/
+        QCoo_flow_nominal) "Normalized cooling load"
+    annotation (Placement(transformation(extent={{-200,-150},{-180,-130}})));
+equation
+  connect(bui.QReqHotWat_flow, ets.QReqHotWat_flow) annotation (Line(points={{28,4},{28,
+          -10},{-64,-10},{-64,-74},{-34,-74}}, color={0,0,127}));
+  connect(THotWatSupSet, ets.THotWatSupSet) annotation (Line(points={{-320,40},
+          {-136,40},{-136,-66},{-34,-66}},  color={0,0,127}));
+  connect(TColWat, ets.TColWat) annotation (Line(points={{-320,0},{-148,0},{
+          -148,-70},{-34,-70}},  color={0,0,127}));
+  connect(enaHeaCoo[1].y, ets.uHea) annotation (Line(points={{-88,-120},{-40,
+          -120},{-40,-46},{-34,-46}}, color={255,0,255}));
+  connect(enaHeaCoo[2].y, ets.uCoo) annotation (Line(points={{-88,-120},{-40,
+          -120},{-40,-50},{-34,-50}}, color={255,0,255}));
+  connect(enaSHW.y, ets.uSHW) annotation (Line(points={{-21,-120},{-38,-120},{-38,
+          -54},{-34,-54}}, color={255,0,255}));
+  connect(loaHeaNor.y, enaHeaCoo[1].u) annotation (Line(points={{-178,-100},{
+          -120,-100},{-120,-120},{-112,-120}}, color={0,0,127}));
+  connect(loaCooNor.y, enaHeaCoo[2].u) annotation (Line(points={{-178,-140},{
+          -120,-140},{-120,-120},{-112,-120}}, color={0,0,127}));
+  connect(bui.QReqHea_flow, loaHeaNor.u) annotation (Line(points={{20,4},{20,-6},
+          {-218,-6},{-218,-100},{-202,-100}}, color={0,0,127}));
+  connect(bui.QReqCoo_flow, loaCooNor.u) annotation (Line(points={{24,4},{24,-4},
+          {-220,-4},{-220,-140},{-202,-140}}, color={0,0,127}));
+  connect(loaHeaNor.y, resTHeaWatSup.u) annotation (Line(points={{-178,-100},{
+          -120,-100},{-120,-40},{-112,-40}},  color={0,0,127}));
+  annotation (
+    Documentation(info="<html>
+<p>
+This model is composed of a heat pump based energy transfer station model
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
+connected to a simplified building model where the space heating, cooling
+and hot water loads are provided as time series.
+</p>
+<h4>Scaling</h4>
+<p>
+The parameter <code>bui.facMul</code> is the multiplier factor
+applied to the building loads that are provided as time series.
+It is used to represent multiple identical buildings served by
+a unique energy transfer station.
+The parameter <code>facMul</code> is the multiplier factor
+applied to the whole system composed of the building(s) and the
+energy transfer station.
+It is used to represent multiple identical ETSs served by
+the DHC system.
+So, if for instance the overall heating and cooling efficiency is
+equal to <i>1</i>, then the load on the district loop
+is the load provided as time series multiplied by <i>facMul * bui.facMul</i>.
+</p>
+<p>
+Note that the parameters <code>QCoo_flow_nominal</code>, <code>QHea_flow_nominal</code>
+and <code>QHot_flow_nominal</code> are the <i>ETS</i> design values. They include
+the building loads multiplier factor <code>bui.facMul</code> but not
+the building and ETS multiplier factor <code>facMul</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+November 21, 2022, by David Blum:<br/>
+Change <code>bui.facMulHea</code> and <code>bui.facMulCoo</code> to be default.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2302\">
+issue 2302</a>.
+</li>
+<li>
+February 23, 2021, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-300,-300},{
+            300,300}})));
+end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
rename to Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
index a0578074033..ee93ef1776d 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
+++ b/Buildings/DHC/Loads/Combined/BuildingTimeSeriesWithETSWithDHWTank.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Loads.Combined;
+within Buildings.DHC.Loads.Combined;
 model BuildingTimeSeriesWithETSWithDHWTank
   "Model of a building with loads provided as time series, connected to an ETS with domestic hot water storage tank"
   extends
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
+    Buildings.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
       filNam=filNam,
       have_hotWat=true,
       T_aHeaWat_nominal=ets.THeaWatSup_nominal,
@@ -11,11 +11,11 @@ model BuildingTimeSeriesWithETSWithDHWTank
       T_aChiWat_nominal=ets.TChiWatSup_nominal,
       T_bChiWat_nominal=ets.TChiWatRet_nominal),
     redeclare
-      Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank
+      Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank
       ets(
       final dT_nominal=dT_nominal,
-      final TDisWatMin=datDes.TLooMin,
-      final TDisWatMax=datDes.TLooMax,
+      final TDisWatMin=TDisWatMin,
+      final TDisWatMax=TDisWatMax,
       final TChiWatSup_nominal=TChiWatSup_nominal,
       final THeaWatSup_nominal=THeaWatSup_nominal,
       final THotWatSup_nominal=THotWatSup_nominal,
@@ -42,7 +42,7 @@ model BuildingTimeSeriesWithETSWithDHWTank
     annotation (Dialog(group="Design parameter"));
   final parameter Modelica.Units.SI.HeatFlowRate QHot_flow_nominal(
     min=Modelica.Constants.eps)=
-    bui.facMul * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
+    bui.facMul * Buildings.DHC.Loads.BaseClasses.getPeakLoad(
       string="#Peak water heating load",
       filNam=Modelica.Utilities.Files.loadResource(filNam))
     "Hot water design load (>=0)"
@@ -113,16 +113,23 @@ equation
     Documentation(info="<html>
 <p>
 This model is the same as
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
-Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
+<a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
+Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
 except that it implements an ETS that uses a heat pump with hot water
 storage tank for production of domestic hot water.  That ETS model is
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank</a>.
+<a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank\">
+Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank</a>.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+March 18, 2024, by David Blum:<br/>
+Added parameters <code>TDisWatMin</code> and <code>TDisWatMax</code>
+in lieu of using <code>datDes</code>.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3697\">issue 3697</a>.
+</li>
+<li>
 September 13, 2022, by David Blum:<br/>
 First implementation.
 This is for
diff --git a/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
new file mode 100644
index 00000000000..443275cfb16
--- /dev/null
+++ b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
@@ -0,0 +1,101 @@
+within Buildings.DHC.Loads.Combined.Examples;
+model BuildingTimeSeriesWithETS
+  "Example model of a building in an ambient district network with loads provided as time series and heat pump heating, free cooling, and heat pump domestic hot water"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  Buildings.Fluid.Sources.Boundary_pT supAmbWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar"),
+    use_T_in=true,
+    T=280.15,
+    nPorts=1) "Ambient water supply"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-10})));
+  Buildings.Fluid.Sources.Boundary_pT sinAmbWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar"),
+    nPorts=1) "Sink for ambient water"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-70})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
+    "Mass flow rate sensor"
+    annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
+  Modelica.Blocks.Sources.Constant TDisSup(k(
+      unit="K",
+      displayUnit="degC") = 288.15)
+    "District supply temperature"
+    annotation (Placement(transformation(extent={{-92,-16},{-72,4}})));
+  Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui(
+    redeclare package MediumSer = Medium,
+    redeclare package MediumBui = Medium,
+    bui(facMul=10),
+    allowFlowReversalSer=true,
+    THotWatSup_nominal=322.15,
+    filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos")
+    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TColWat(k=bui.ets.TColWat_nominal)
+    "Cold water temperature"
+    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THotWatSupSet(k=bui.ets.THotWatSup_nominal)
+    "Hot water supply temperature set point"
+    annotation (Placement(transformation(extent={{-90,20},{-70,40}})));
+ Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(k=bui.TChiWatSup_nominal)
+    "Chilled water supply temperature set point"
+    annotation (Placement(transformation(extent={{-90,60},{-70,80}})));
+ Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMaxSet(k=bui.THeaWatSup_nominal)
+    "Heating water supply temperature set point - Maximum value"
+    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+ Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMinSet(
+   k(final unit="K",
+     displayUnit="degC") = 301.15)
+   "Heating water supply temperature set point - Minimum value"
+    annotation (Placement(transformation(extent={{0,60},{20,80}})));
+equation
+  connect(supAmbWat.ports[1], senMasFlo.port_a)
+    annotation (Line(points={{-40,-10},{-20,-10}},
+                                                 color={0,127,255}));
+  connect(TDisSup.y,supAmbWat. T_in)
+    annotation (Line(points={{-71,-6},{-62,-6}}, color={0,0,127}));
+  connect(senMasFlo.port_b, bui.port_aSerAmb) annotation (Line(points={{0,-10},
+          {40,-10}},              color={0,127,255}));
+  connect(sinAmbWat.ports[1], bui.port_bSerAmb) annotation (Line(points={{-40,-70},
+          {70,-70},{70,-10},{60,-10}}, color={0,127,255}));
+  connect(THeaWatSupMinSet.y, bui.THeaWatSupMinSet) annotation (Line(points={{22,70},
+          {34,70},{34,0},{38,0},{38,-1}},                 color={0,0,127}));
+  connect(THeaWatSupMaxSet.y, bui.THeaWatSupMaxSet) annotation (Line(points={{-18,70},
+          {-10,70},{-10,34},{32,34},{32,-3},{38,-3}},     color={0,0,127}));
+  connect(TChiWatSupSet.y, bui.TChiWatSupSet) annotation (Line(points={{-68,70},
+          {-52,70},{-52,32},{30,32},{30,-5},{38,-5}},
+                                                color={0,0,127}));
+  connect(THotWatSupSet.y, bui.THotWatSupSet) annotation (Line(points={{-68,30},
+          {26,30},{26,-7},{38,-7}},                color={0,0,127}));
+  connect(TColWat.y, bui.TColWat) annotation (Line(points={{2,-40},{34,-40},{34,
+          -22},{42,-22}},                      color={0,0,127}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false)),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
+    experiment(
+      StopTime=864000,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+Example model of a building in an ambient district network with loads
+provided as time series and heat pump heating, free cooling,
+and heat pump domestic hot water.  It uses
+<a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
+Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+May 3, 2023, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
rename to Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
index b6f705b2c95..c1b38bd87a9 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
+++ b/Buildings/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.Combined.Examples;
+within Buildings.DHC.Loads.Combined.Examples;
 model BuildingTimeSeriesWithETSDHWTank
     "Example model of a building in an ambient district network with loads provided as time series and heat pump heating, free cooling, and heat pump with storage tank domestic hot water"
   extends Modelica.Icons.Example;
@@ -24,14 +24,14 @@ model BuildingTimeSeriesWithETSDHWTank
       displayUnit="degC") = 288.15)
     "District supply temperature"
     annotation (Placement(transformation(extent={{-90,4},{-70,24}})));
-  Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank bui(
+  Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank bui(
     redeclare package MediumSer = Medium,
     redeclare package MediumBui = Medium,
     bui(facMul=10),
     allowFlowReversalSer=true,
     THotWatSup_nominal=313.15,
     filNam=
-        "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos",
+        "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos",
     datWatHea=datWatHea) "Building load with time series data"
     annotation (Placement(transformation(extent={{40,-20},{60,0}})));
 
@@ -50,7 +50,7 @@ model BuildingTimeSeriesWithETSDHWTank
  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMinSet(k=28 + 273.15)
     "Heating water supply temperature set point - Minimum value"
     annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger datWatHea(VTan=0.3,
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger datWatHea(VTan=0.3,
       mDom_flow_nominal=0.03,
     TDom_nominal=318.15)
     "Performance data"
@@ -85,7 +85,7 @@ equation
         coordinateSystem(
         preserveAspectRatio=false)),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos" "Simulate and plot"),
     experiment(
       StopTime=864000,
       Tolerance=1e-06),
@@ -94,8 +94,8 @@ equation
 Example model of a building in an ambient district network with loads
 provided as time series and heat pump heating, free cooling, and heat pump
 with storage tank domestic hot water
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
-Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>
+<a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
+Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/DHC/Loads/Combined/Examples/package.mo b/Buildings/DHC/Loads/Combined/Examples/package.mo
new file mode 100644
index 00000000000..136d1f825d9
--- /dev/null
+++ b/Buildings/DHC/Loads/Combined/Examples/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads.Combined;
+package Examples "This package contains example models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains an example illustrating the use of the model in
+<a href=\"modelica://Buildings.DHC.Loads.Combined\">
+Buildings.DHC.Loads.Combined</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/package.order b/Buildings/DHC/Loads/Combined/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Combined/Examples/package.order
rename to Buildings/DHC/Loads/Combined/Examples/package.order
diff --git a/Buildings/DHC/Loads/Combined/package.mo b/Buildings/DHC/Loads/Combined/package.mo
new file mode 100644
index 00000000000..6d2a01ecde1
--- /dev/null
+++ b/Buildings/DHC/Loads/Combined/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads;
+package Combined "Package with models for loads"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models of building loads that are used to
+build example models of DHC systems.
+</p>
+</html>"));
+end Combined;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/package.order b/Buildings/DHC/Loads/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Combined/package.order
rename to Buildings/DHC/Loads/Combined/package.order
diff --git a/Buildings/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo b/Buildings/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
new file mode 100644
index 00000000000..8ef09e1d5a9
--- /dev/null
+++ b/Buildings/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
@@ -0,0 +1,81 @@
+within Buildings.DHC.Loads.Cooling.BaseClasses;
+model PartialBuildingWithETS
+  "Partial model with ETS model for cooling and partial building model"
+  extends
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+      nPorts_chiWat=1,
+      redeclare Buildings.DHC.ETS.Cooling.Direct ets(
+      final mBui_flow_nominal=mBui_flow_nominal,
+      final controllerType=controllerType,
+      final k=k,
+      final Ti=Ti,
+      final Td=Td,
+      final yMax=yMax,
+      final yMin=yMin));
+
+  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal(
+    final min=0,
+    final start=0.5)
+    "Nominal mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpSup(
+    final min=0,
+    displayUnit="Pa")=5000
+    "Pressure drop in the ETS supply side";
+  parameter Modelica.Units.SI.PressureDifference dpRet(
+    final min=0,
+    displayUnit="Pa")=5000
+    "Pressure drop in the ETS return side";
+  // Controller parameters
+  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
+    "Type of controller"
+    annotation (Dialog(group="PID controller"));
+  parameter Real k(
+    final min=0,
+    final unit="1")=0.1
+    "Gain of controller"
+    annotation (Dialog(group="PID controller"));
+  parameter Modelica.Units.SI.Time Ti(
+    final min=Modelica.Constants.small)=60
+    "Time constant of integrator block"
+    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Time Td(
+    final min=0)=0.1
+    "Time constant of derivative block"
+    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real yMax(
+    final start=1)=1
+    "Upper limit of output"
+    annotation (Dialog(group="PID controller"));
+  parameter Real yMin=0
+    "Lower limit of output"
+    annotation (Dialog(group="PID controller"));
+  Modelica.Blocks.Interfaces.RealInput TDisRetSet(
+     final unit="K",
+     displayUnit="degC")
+    "Setpoint for the minimum district return temperature"
+    annotation (Placement(transformation(extent={{-340,20},{-300,-20}}),
+        iconTransformation(extent={{-120,60},{-100,80}})));
+equation
+  connect(TDisRetSet,ets.TDisRetSet)  annotation (Line(points={{-320,0},{-64,0},
+          {-64,-56},{-31.8,-56}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+This model is composed of a direct controlled energy transfer station model for cooling
+<a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">
+Buildings.DHC.ETS.Cooling.Direct</a>
+connected to a repleacable building load model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+December 23, 2022, by Kathryn Hinkelman:<br>
+Revised ETS from direct uncontrolled to direct controlled.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+</ul>
+<ul>
+<li>March 20, 2022, by Chengnan Shi:<br>First implementation. </li>
+</ul>
+</html>"));
+end PartialBuildingWithETS;
diff --git a/Buildings/DHC/Loads/Cooling/BaseClasses/package.mo b/Buildings/DHC/Loads/Cooling/BaseClasses/package.mo
new file mode 100644
index 00000000000..e9f826cacd4
--- /dev/null
+++ b/Buildings/DHC/Loads/Cooling/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Cooling;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.order b/Buildings/DHC/Loads/Cooling/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.order
rename to Buildings/DHC/Loads/Cooling/BaseClasses/package.order
diff --git a/Buildings/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
new file mode 100644
index 00000000000..ff012cc2532
--- /dev/null
+++ b/Buildings/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
@@ -0,0 +1,80 @@
+within Buildings.DHC.Loads.Cooling;
+model BuildingTimeSeriesWithETS
+  "Model of a building with loads provided as time series, connected to an ETS for cooling"
+  extends BaseClasses.PartialBuildingWithETS(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
+      final have_heaWat=false,
+      final have_chiWat=true,
+      final have_hotWat=false,
+      final filNam=filNam,
+      T_aChiWat_nominal=TChiWatSup_nominal,
+      T_bChiWat_nominal=TChiWatRet_nominal),
+      mBui_flow_nominal=-QCoo_flow_nominal/(cp*dT_nominal),
+          ets(
+      QChiWat_flow_nominal=QCoo_flow_nominal));
+
+  final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=
+    bui.facMul * bui.QCoo_flow_nominal
+    "Space cooling design load (<=0)";
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0)=9
+    "Water temperature drop/increase accross load and source-side HX (always positive)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=7 + 273.15
+    "Chilled water supply temperature"
+    annotation (Dialog(group="Nominal conditions"));
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=
+    TChiWatSup_nominal + dT_nominal
+    "Chilled water return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
+    "Type of energy balance"
+    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Boolean use_inputFilter=false
+    "= true, if pump speed is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Pump"));
+  parameter String filNam
+    "Library path of the file with thermal loads as time series";
+protected
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp=MediumSer.specificHeatCapacityCp(
+    MediumSer.setState_pTX(
+      MediumSer.p_default,
+      MediumSer.T_default,
+      MediumSer.X_default))
+    "Default specific heat capacity of medium";
+  annotation (
+  defaultComponentName="loa",
+  Documentation(info="<html>
+<p>
+This model is composed of a direct controlled energy transfer station model for cooling
+<a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">
+Buildings.DHC.ETS.Cooling.Direct</a>
+connected to a simplified building model <a href=\"modelica://Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries\">
+Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries</a>
+where the space cooling loads are provided as time series.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+January 12, 2023, by Michael Wetter:<br/>
+Removed unused parameter <code>riseTime</code>.
+</li>
+<li>
+January 2, 2023, by Kathryn Hinkelman:<br/>
+Propagated energy dynamics and a filter for the (variable) secondary pumps.
+</li>
+<li>
+December 23, 2022, by Kathryn Hinkelman:<br>
+Revised ETS from direct uncontrolled to direct controlled.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+<li>
+December 21, 2022 by Kathryn Hinkelman:<br>
+Removed in-building pumping because of coupling with the direct/uncontrolled ETS.<br>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+</ul>
+<ul>
+<li>March 20, 2022 by Chengnan Shi:<br>First implementation. </li>
+</ul>
+</html>"));
+end BuildingTimeSeriesWithETS;
diff --git a/Buildings/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
new file mode 100644
index 00000000000..626f03ad82b
--- /dev/null
+++ b/Buildings/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
@@ -0,0 +1,76 @@
+within Buildings.DHC.Loads.Cooling.Examples;
+model BuildingTimeSeriesWithETS
+  "Example model of a building with loads provided as time series and
+  connected to an ETS for cooling"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiWitETS(
+    filNam=
+      "modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
+  "Building Time Series load coupled with ETS"
+    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
+  Buildings.Fluid.Sources.Boundary_pT supChiWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar") = 350000,
+    use_T_in=true,
+    T=280.15,
+    nPorts=1)
+    "Chilled water supply"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,10})));
+  Buildings.Fluid.Sources.Boundary_pT sinChiWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar") = 340000,
+    nPorts=1)
+    "Sink for chilled water"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-50})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
+    "Mass flow rate sensor"
+    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
+  Modelica.Blocks.Sources.Constant TDisRetSet(k=273.15 + 16)
+    "Setpoint for district return temperature"
+    annotation (Placement(transformation(extent={{0,40},{20,60}})));
+  Modelica.Blocks.Sources.Constant TDisSup(k(
+      unit="K",
+      displayUnit="degC") = 280.15)
+    "District supply temperature"
+    annotation (Placement(transformation(extent={{-90,4},{-70,24}})));
+equation
+  connect(supChiWat.ports[1], senMasFlo.port_a)
+    annotation (Line(points={{-40,10},{-20,10}}, color={0,127,255}));
+  connect(senMasFlo.port_b, buiWitETS.port_aSerCoo) annotation (Line(points={{0,
+          10},{20,10},{20,-18},{40,-18}}, color={0,127,255}));
+  connect(buiWitETS.port_bSerCoo, sinChiWat.ports[1]) annotation (Line(points={
+          {60,-18},{80,-18},{80,-50},{-40,-50}}, color={0,127,255}));
+  connect(TDisSup.y, supChiWat.T_in)
+    annotation (Line(points={{-69,14},{-62,14}}, color={0,0,127}));
+  connect(TDisRetSet.y,buiWitETS.TDisRetSet)  annotation (Line(points={{21,50},
+          {30,50},{30,-3},{39,-3}}, color={0,0,127}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false)),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
+    experiment(
+      StartTime=2592000,
+      StopTime=3628800,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This model provides an example for a building with loads provided
+as time series and connected to a direct ETS for cooling with the
+return chilled water temperature controlled above a minimum threshold.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 20, 2022, by Chengnan Shi:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingTimeSeriesWithETS;
diff --git a/Buildings/DHC/Loads/Cooling/Examples/package.mo b/Buildings/DHC/Loads/Cooling/Examples/package.mo
new file mode 100644
index 00000000000..2a7c239728c
--- /dev/null
+++ b/Buildings/DHC/Loads/Cooling/Examples/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads.Cooling;
+package Examples
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(info="<html>
+<p>This package contains an example illustrating the use of the model in
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.order b/Buildings/DHC/Loads/Cooling/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Cooling/Examples/package.order
rename to Buildings/DHC/Loads/Cooling/Examples/package.order
diff --git a/Buildings/DHC/Loads/Cooling/package.mo b/Buildings/DHC/Loads/Cooling/package.mo
new file mode 100644
index 00000000000..2a4deb6eb1c
--- /dev/null
+++ b/Buildings/DHC/Loads/Cooling/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads;
+package Cooling "This package contains models for energy transfer stations used in district cooling system."
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models of building loads that are used to
+build example models of district cooling systems.
+</p>
+</html>"));
+end Cooling;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/package.order b/Buildings/DHC/Loads/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Cooling/package.order
rename to Buildings/DHC/Loads/Cooling/package.order
diff --git a/Buildings/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo b/Buildings/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
new file mode 100644
index 00000000000..3ba01fb64cf
--- /dev/null
+++ b/Buildings/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
@@ -0,0 +1,81 @@
+within Buildings.DHC.Loads.Heating.BaseClasses;
+model PartialBuildingWithETS
+  "Partial model with ETS model for heating and partial building model"
+  extends
+    Buildings.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
+      nPorts_heaWat=1,
+      redeclare Buildings.DHC.ETS.Heating.Direct ets(
+      final mBui_flow_nominal=mBui_flow_nominal,
+      final controllerType=controllerType,
+      final k=k,
+      final Ti=Ti,
+      final Td=Td,
+      final yMax=yMax,
+      final yMin=yMin));
+
+  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal(
+    final min=0,
+    final start=0.5)
+    "Nominal mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpSup(
+    final min=0,
+    displayUnit="Pa")=5000
+    "Pressure drop in the ETS supply side";
+  parameter Modelica.Units.SI.PressureDifference dpRet(
+    final min=0,
+    displayUnit="Pa")=5000
+    "Pressure drop in the ETS return side";
+  // Controller parameters
+  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
+    "Type of controller"
+    annotation (Dialog(group="PID controller"));
+  parameter Real k(
+    final min=0,
+    final unit="1")=0.1
+    "Gain of controller"
+    annotation (Dialog(group="PID controller"));
+  parameter Modelica.Units.SI.Time Ti(
+    final min=Modelica.Constants.small)=60
+    "Time constant of integrator block"
+    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Time Td(
+    final min=0)=0.1
+    "Time constant of derivative block"
+    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real yMax(
+    final start=1)=1
+    "Upper limit of output"
+    annotation (Dialog(group="PID controller"));
+  parameter Real yMin=0
+    "Lower limit of output"
+    annotation (Dialog(group="PID controller"));
+  Modelica.Blocks.Interfaces.RealInput TDisRetSet(
+     final unit="K",
+     displayUnit="degC")
+    "Setpoint for the maximum district return temperature"
+    annotation (Placement(transformation(extent={{-340,20},{-300,-20}}),
+        iconTransformation(extent={{-120,60},{-100,80}})));
+equation
+  connect(TDisRetSet,ets.TDisRetSet)  annotation (Line(points={{-320,0},{-64,0},
+          {-64,-56},{-31.8,-56}}, color={0,0,127}));
+  annotation (Documentation(info="<html>
+<p>
+This model is composed of a direct controlled energy transfer station model for cooling
+<a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">
+Buildings.DHC.ETS.Cooling.Direct</a>
+connected to a repleacable building load model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+December 23, 2022, by Kathryn Hinkelman:<br>
+Revised ETS from direct uncontrolled to direct controlled.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+</ul>
+<ul>
+<li>March 20, 2022, by Chengnan Shi:<br>First implementation. </li>
+</ul>
+</html>"));
+end PartialBuildingWithETS;
diff --git a/Buildings/DHC/Loads/Heating/BaseClasses/package.mo b/Buildings/DHC/Loads/Heating/BaseClasses/package.mo
new file mode 100644
index 00000000000..886e2acd58b
--- /dev/null
+++ b/Buildings/DHC/Loads/Heating/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Heating;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.order b/Buildings/DHC/Loads/Heating/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.order
rename to Buildings/DHC/Loads/Heating/BaseClasses/package.order
diff --git a/Buildings/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
new file mode 100644
index 00000000000..d84d7b2d584
--- /dev/null
+++ b/Buildings/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
@@ -0,0 +1,80 @@
+within Buildings.DHC.Loads.Heating;
+model BuildingTimeSeriesWithETS
+  "Model of a building with loads provided as time series, connected to an ETS for heating"
+  extends BaseClasses.PartialBuildingWithETS(
+    redeclare Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries bui(
+      final have_heaWat=true,
+      final have_chiWat=false,
+      final have_hotWat=false,
+      final filNam=filNam,
+      T_aHeaWat_nominal=THeaWatSup_nominal,
+      T_bHeaWat_nominal=THeaWatRet_nominal),
+      mBui_flow_nominal=QHea_flow_nominal/(cp*dT_nominal),
+          ets(
+      QHeaWat_flow_nominal=QHea_flow_nominal));
+
+  final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
+    bui.facMul * bui.QHea_flow_nominal
+    "Space heating design load (>=0)";
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0)=10
+    "Water temperature drop/increase accross load and source-side HX (always positive)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=50 + 273.15
+    "Heating water supply temperature"
+    annotation (Dialog(group="Nominal conditions"));
+  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
+    THeaWatSup_nominal - dT_nominal
+    "Heating water return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
+    "Type of energy balance"
+    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Boolean use_inputFilter=false
+    "= true, if pump speed is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Pump"));
+  parameter String filNam
+    "Library path of the file with thermal loads as time series";
+protected
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp=MediumSer.specificHeatCapacityCp(
+    MediumSer.setState_pTX(
+      MediumSer.p_default,
+      MediumSer.T_default,
+      MediumSer.X_default))
+    "Default specific heat capacity of medium";
+  annotation (
+  defaultComponentName="loa",
+  Documentation(info="<html>
+<p>
+This model is composed of a direct controlled energy transfer station model for heating
+<a href=\"modelica://Buildings.DHC.ETS.Heating/Direct\">
+Buildings.DHC.ETS.Heating.Direct</a>
+connected to a simplified building model <a href=\"modelica://Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries\">
+Buildings.DHC.Loads.BaseClasses.BuildingTimeSeries</a>
+where the space heating loads are provided as time series.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+January 12, 2023, by Michael Wetter:<br/>
+Removed unused parameter <code>riseTime</code>.
+</li>
+<li>
+January 2, 2023, by Kathryn Hinkelman:<br/>
+Propagated energy dynamics and a filter for the (variable) secondary pumps.
+</li>
+<li>
+December 23, 2022, by Kathryn Hinkelman:<br>
+Revised ETS from direct uncontrolled to direct controlled.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+<li>
+December 21, 2022 by Kathryn Hinkelman:<br>
+Removed in-building pumping because of coupling with the direct/uncontrolled ETS.<br>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
+</li>
+</ul>
+<ul>
+<li>March 20, 2022 by Chengnan Shi:<br>First implementation. </li>
+</ul>
+</html>"));
+end BuildingTimeSeriesWithETS;
diff --git a/Buildings/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
new file mode 100644
index 00000000000..ecda51f157b
--- /dev/null
+++ b/Buildings/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
@@ -0,0 +1,71 @@
+within Buildings.DHC.Loads.Heating.Examples;
+model BuildingTimeSeriesWithETS
+  "Example model of a building with loads provided as time series and
+  connected to an ETS for cooling"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model";
+  Buildings.DHC.Loads.Heating.BuildingTimeSeriesWithETS buiWitETS(filNam="modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
+    "Building Time Series load coupled with ETS"
+    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
+  Buildings.Fluid.Sources.Boundary_pT supHeaWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar") = 350000,
+    use_T_in=true,
+    nPorts=1) "Heating water supply"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,10})));
+  Buildings.Fluid.Sources.Boundary_pT sinHeaWat(
+    redeclare package Medium = Medium,
+    p(displayUnit="bar") = 340000,
+    nPorts=1) "Sink for heating water"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-50})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
+    "Mass flow rate sensor"
+    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
+  Modelica.Blocks.Sources.Constant TDisRetSet(k=273.15 + 45)
+    "Setpoint for district return temperature"
+    annotation (Placement(transformation(extent={{0,40},{20,60}})));
+  Modelica.Blocks.Sources.Constant TDisSup(k(
+      unit="K",
+      displayUnit="degC") = 323.15)
+    "District supply temperature"
+    annotation (Placement(transformation(extent={{-90,4},{-70,24}})));
+equation
+  connect(supHeaWat.ports[1], senMasFlo.port_a)
+    annotation (Line(points={{-40,10},{-20,10}}, color={0,127,255}));
+  connect(TDisSup.y,supHeaWat. T_in)
+    annotation (Line(points={{-69,14},{-62,14}}, color={0,0,127}));
+  connect(TDisRetSet.y,buiWitETS.TDisRetSet)  annotation (Line(points={{21,50},
+          {30,50},{30,-3},{39,-3}}, color={0,0,127}));
+  connect(senMasFlo.port_b, buiWitETS.port_aSerHea) annotation (Line(points={{0,
+          10},{20,10},{20,-14},{40,-14}}, color={0,127,255}));
+  connect(buiWitETS.port_bSerHea, sinHeaWat.ports[1]) annotation (Line(points={{
+          60,-14},{80,-14},{80,-50},{-40,-50}}, color={0,127,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+        coordinateSystem(
+        preserveAspectRatio=false)),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
+    experiment(
+      StartTime=2592000,
+      StopTime=3628800,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This model provides an example for a building with loads provided
+as time series and connected to a direct ETS for heating with the
+return heating water temperature controlled below a maximum threshold.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 20, 2022, by Chengnan Shi:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingTimeSeriesWithETS;
diff --git a/Buildings/DHC/Loads/Heating/Examples/package.mo b/Buildings/DHC/Loads/Heating/Examples/package.mo
new file mode 100644
index 00000000000..702b4a873c2
--- /dev/null
+++ b/Buildings/DHC/Loads/Heating/Examples/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads.Heating;
+package Examples
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(info="<html>
+<p>This package contains an example illustrating the use of the model in
+<a href=\"modelica://Buildings.DHC.Loads.Cooling\">
+Buildings.DHC.Loads.Cooling</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/Examples/package.order b/Buildings/DHC/Loads/Heating/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Heating/Examples/package.order
rename to Buildings/DHC/Loads/Heating/Examples/package.order
diff --git a/Buildings/DHC/Loads/Heating/package.mo b/Buildings/DHC/Loads/Heating/package.mo
new file mode 100644
index 00000000000..6b1ec5583c5
--- /dev/null
+++ b/Buildings/DHC/Loads/Heating/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads;
+package Heating "This package contains models for loads used in district heating systems."
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models of building loads that are used to
+build example models of district heating systems.
+</p>
+</html>"));
+end Heating;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/package.order b/Buildings/DHC/Loads/Heating/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Heating/package.order
rename to Buildings/DHC/Loads/Heating/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
index 255f9d091a2..acab8625d2f 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/HeatExchangerPumpController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 block HeatExchangerPumpController
   "Controller for pump of storage tank with external heat exchanger"
   parameter Modelica.Units.SI.MassFlowRate mDom_flow_nominal
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
index 1a327853d09..16844c1ca8a 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/PartialFourPortDHW.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 partial model PartialFourPortDHW
   "A partial model for domestic water heating"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
index 0cb20c93238..89f883e06cc 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/TankChargingController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 block TankChargingController
   "Controller to enable or disable storage tank charging"
 
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankValveController.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
rename to Buildings/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
index 832a45a09c7..7b5b7d4af7f 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/TankValveController.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.BaseClasses;
+within Buildings.DHC.Loads.HotWater.BaseClasses;
 block TankValveController
   "Controller to divert the water to the middle or bottom of the tank"
 
diff --git a/Buildings/DHC/Loads/HotWater/BaseClasses/package.mo b/Buildings/DHC/Loads/HotWater/BaseClasses/package.mo
new file mode 100644
index 00000000000..7c736b09f77
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.HotWater;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Loads.HotWater\">
+Buildings.DHC.Loads.Heating.DHW</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.order b/Buildings/DHC/Loads/HotWater/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.order
rename to Buildings/DHC/Loads/HotWater/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo b/Buildings/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
rename to Buildings/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
index 15d8253b69c..ad5bf9a853f 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
+++ b/Buildings/DHC/Loads/HotWater/Data/GenericDomesticHotWaterWithHeatExchanger.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.Data;
+within Buildings.DHC.Loads.HotWater.Data;
 record GenericDomesticHotWaterWithHeatExchanger
   "Equipment specifications for a heating water tank with external heat exchanger to heat domestic hot water"
   extends Modelica.Icons.Record;
diff --git a/Buildings/DHC/Loads/HotWater/Data/package.mo b/Buildings/DHC/Loads/HotWater/Data/package.mo
new file mode 100644
index 00000000000..0e7e943c7f9
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/Data/package.mo
@@ -0,0 +1,9 @@
+within Buildings.DHC.Loads.HotWater;
+package Data "Package for data related to hot water generation"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+Package for data related to hot water generation.
+</p>
+</html>"));
+end Data;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/package.order b/Buildings/DHC/Loads/HotWater/Data/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/Data/package.order
rename to Buildings/DHC/Loads/HotWater/Data/package.order
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo b/Buildings/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
rename to Buildings/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
index 0fcafb4f048..496c1a3f09e 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
+++ b/Buildings/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 model DirectHeatExchangerWithElectricHeat
   "A model for generating hot water using a district heat exchanger and supplemental electric resistance"
   extends
-    Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW;
+    Buildings.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW;
   parameter Modelica.Units.SI.Efficiency eps(min=0,max=1) = 0.8 "Heat exchanger effectiveness";
   parameter Boolean have_eleHea = true "True if has auxiliary electric heater";
   parameter Modelica.Units.SI.HeatFlowRate QMax_flow(min=0) = Modelica.Constants.inf "Maximum heat flow rate for electric heater (positive)"
@@ -97,7 +97,7 @@ the temperature of produced hot water to setpoint, if the district supply
 water is not hot enough.
 </p>
 <p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png\"/>
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png\"/>
 </p>
 <p>
 It is based on Fig. 5 in <i>Evaluations of different domestic hot water
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo b/Buildings/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
rename to Buildings/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
index 7f20683972c..320cb079285 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
+++ b/Buildings/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater.Examples;
+within Buildings.DHC.Loads.HotWater.Examples;
 model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
   "Example model for direct heat exchanger with auxiliary electric heater"
   extends Modelica.Icons.Example;
@@ -11,7 +11,7 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},
         rotation=90,
         origin={0,-50})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
       package                                                                                   Medium = Medium,
       mMix_flow_nominal=1) "Ideal thermostatic mixing valve"
     annotation (Placement(transformation(extent={{-10,-12},{10,8}})));
@@ -42,7 +42,7 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
       displayUnit="degC") = 308.15)
     "Temperature setpoint for mixed water supply to fixture"
     annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
-  Buildings.Experimental.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat gen(
+  Buildings.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat gen(
     redeclare package MediumDom = Medium,
     redeclare package MediumHea = Medium,
     mDom_flow_nominal=1,
@@ -52,13 +52,13 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
   Modelica.Blocks.Sources.CombiTimeTable sch(
     tableOnFile=true,
     tableName="tab1",
-    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
+    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
     smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
     extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     "Domestic hot water fixture draw fraction schedule"
     annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
 
-  Buildings.Experimental.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat genNoEle(
+  Buildings.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat genNoEle(
     redeclare package MediumDom = Medium,
     redeclare package MediumHea = Medium,
     have_eleHea=false,
@@ -66,7 +66,7 @@ model HeaterAndFixtureDirectHeatExchangerWithElectricHeat
     mHea_flow_nominal=1)
     "Hot water generated by heat exchanger without auxiliary heat"
     annotation (Placement(transformation(extent={{32,-12},{52,8}})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixValNoEle(redeclare
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixValNoEle(redeclare
       package                                                                                        Medium = Medium,
       mMix_flow_nominal=1) "Ideal thermostatic mixing valve"
     annotation (Placement(transformation(extent={{70,-12},{90,8}})));
@@ -116,7 +116,7 @@ equation
   connect(genNoEle.port_aDom, sinDis.ports[3]) annotation (Line(points={{32,4},{
           24,4},{24,-28},{-71.3333,-28},{-71.3333,-40}}, color={0,127,255}));
   annotation (__Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos" "Simulate and plot"),
       Documentation(info="<html>
 <p>
 Example model of a fresh water station that heats up domestic hot water.
diff --git a/Buildings/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo b/Buildings/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
new file mode 100644
index 00000000000..7c312148ec4
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
@@ -0,0 +1,138 @@
+within Buildings.DHC.Loads.HotWater.Examples;
+model StorageTankWithExternalHeatExchanger
+  "Example model for storage tank with external heat exchanger"
+  extends Modelica.Icons.Example;
+  package Medium = Buildings.Media.Water "Medium model";
+  parameter Modelica.Units.SI.Temperature TCol = 273.15+10 "Temperature of domestic cold water supply";
+  parameter Modelica.Units.SI.MassFlowRate mHea_flow_nominal = datWatHea.QHex_flow_nominal/4200/(55 - 50) "Tank heater water loop nominal mass flow";
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+    datWatHea(VTan=0.1892706, mDom_flow_nominal=6.52944E-06*1000)
+    "Data for heat pump water heater with tank"
+    annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
+
+  Modelica.Blocks.Sources.CombiTimeTable sch(
+    tableOnFile=true,
+    tableName="tab1",
+    fileName=Modelica.Utilities.Files.loadResource(
+        "modelica://Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
+    smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
+    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
+    "Domestic hot water fixture draw fraction schedule"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+
+  Buildings.Fluid.Sources.Boundary_pT souCol(
+    nPorts=2,
+    redeclare package Medium = Medium,
+    T(displayUnit="degC") = 283.15) "Source of domestic cold water"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-32,-50})));
+  Modelica.Blocks.Sources.Constant conTSetMix(k(
+      final unit="K",
+      displayUnit="degC") = 308.15)
+    "Temperature setpoint for mixed water supply to fixture"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger
+    domHotWatTan(redeclare package MediumDom = Medium, redeclare package
+      MediumHea = Medium,
+    dat=datWatHea)        "Storage tank with external heat exchanger"
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
+  Buildings.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
+      package                                                                                   Medium = Medium,
+      mMix_flow_nominal=1.2*datWatHea.mDom_flow_nominal)
+    annotation (Placement(transformation(extent={{40,60},{60,80}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(realTrue=
+        mHea_flow_nominal)
+    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
+  Modelica.Blocks.Sources.Constant conTSetHot(k(
+      final unit="K",
+      displayUnit="degC") = 313.15)
+    "Temperature setpoint for hot water supply to fixture"
+    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
+  Buildings.Fluid.HeatExchangers.Heater_T hea(
+    redeclare package Medium = Medium,
+    m_flow_nominal=mHea_flow_nominal,
+    dp_nominal=0)
+    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow mov(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    nominalValuesDefineDefaultPressureCurve=true,
+    m_flow_nominal=mHea_flow_nominal)
+    annotation (Placement(transformation(extent={{70,14},{50,34}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTem(
+    redeclare package Medium = Medium,
+    m_flow_nominal=mHea_flow_nominal,
+    tau=0) annotation (Placement(transformation(extent={{10,-50},{30,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(p=5) "dT for heater"
+    annotation (Placement(transformation(extent={{14,-24},{24,-14}})));
+  Buildings.Fluid.Sources.Boundary_pT preRef(
+    nPorts=1,
+    redeclare package Medium = Medium,
+    T(displayUnit="degC")) "Reference pressure" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={80,-60})));
+equation
+  connect(theMixVal.yMixSet, sch.y[1]) annotation (Line(points={{39,78},{-50,78},
+          {-50,70},{-59,70}}, color={0,0,127}));
+  connect(conTSetMix.y, theMixVal.TMixSet) annotation (Line(points={{-59,40},{
+          -10,40},{-10,72},{39,72}},
+                                 color={0,0,127}));
+  connect(domHotWatTan.port_bDom, theMixVal.port_hot) annotation (Line(points={{
+          20,36},{32,36},{32,66},{40,66}}, color={0,127,255}));
+  connect(souCol.ports[1], domHotWatTan.port_aDom)
+    annotation (Line(points={{-31,-40},{-31,36},{0,36}}, color={0,127,255}));
+  connect(souCol.ports[2], theMixVal.port_col)
+    annotation (Line(points={{-33,-40},{-33,62},{40,62}}, color={0,127,255}));
+  connect(booToRea.u, domHotWatTan.charge) annotation (Line(points={{38,-10},{32,
+          -10},{32,21},{22,21}}, color={255,0,255}));
+  connect(domHotWatTan.TDomSet, conTSetHot.y) annotation (Line(points={{-1,30},{
+          -20,30},{-20,10},{-59,10}}, color={0,0,127}));
+  connect(mov.port_b, domHotWatTan.port_aHea)
+    annotation (Line(points={{50,24},{20,24}}, color={0,127,255}));
+  connect(hea.port_b, mov.port_a) annotation (Line(points={{60,-40},{80,-40},{80,
+          24},{70,24}}, color={0,127,255}));
+  connect(booToRea.y, mov.m_flow_in) annotation (Line(points={{62,-10},{90,-10},
+          {90,46},{60,46},{60,36}}, color={0,0,127}));
+  connect(domHotWatTan.port_bHea, senTem.port_a) annotation (Line(points={{0,24},
+          {-10,24},{-10,-40},{10,-40}}, color={0,127,255}));
+  connect(senTem.port_b, hea.port_a)
+    annotation (Line(points={{30,-40},{40,-40}}, color={0,127,255}));
+  connect(addPar.y, hea.TSet) annotation (Line(points={{25,-19},{32,-19},{32,-32},
+          {38,-32}}, color={0,0,127}));
+  connect(senTem.T, addPar.u) annotation (Line(points={{20,-29},{14,-29},{14,-28},
+          {6,-28},{6,-19},{13,-19}}, color={0,0,127}));
+  connect(hea.port_b, preRef.ports[1])
+    annotation (Line(points={{60,-40},{80,-40},{80,-50}}, color={0,127,255}));
+  annotation (Diagram(graphics={
+        Text(
+          extent={{-140,160},{160,120}},
+          textString="%name",
+          textColor={0,0,255})}),
+          __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos" "Simulate and plot"),
+Documentation(info="<html>
+<p>
+Example model of a fresh water station that heats up domestic hot water.
+Input is a load profile which is sent to a model that computes the hot and cold water draw.
+If the tank needs to be recharged, then tank water is circulated through a heater
+with a prescribed temperature lift.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+November 15, 2023, by David Blum:<br/>
+Add heater with constant dT as heat source.
+</li>
+<li>
+October 5, 2023, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    experiment(
+      StopTime=172800,
+      Tolerance=1e-06));
+end StorageTankWithExternalHeatExchanger;
diff --git a/Buildings/DHC/Loads/HotWater/Examples/package.mo b/Buildings/DHC/Loads/HotWater/Examples/package.mo
new file mode 100644
index 00000000000..9e178aea677
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/Examples/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Loads.HotWater;
+package Examples "Example implementations of district-integrated DHW models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains a collection of domestic hot water (DHW) models
+to demonstrate how these models might be used in district heating systems.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.order b/Buildings/DHC/Loads/HotWater/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/Examples/package.order
rename to Buildings/DHC/Loads/HotWater/Examples/package.order
diff --git a/Buildings/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo b/Buildings/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
new file mode 100644
index 00000000000..bd6236c6f31
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
@@ -0,0 +1,445 @@
+within Buildings.DHC.Loads.HotWater;
+model StorageTankWithExternalHeatExchanger
+  "A model of a storage tank with external heat exchanger to produce hot water"
+  extends
+    Buildings.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW(
+    final allowFlowReversalHea=false);
+
+  parameter Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
+    dat "Performance data"
+    annotation (Placement(transformation(extent={{60,80},{80,100}})));
+
+  parameter Real k=0.1 "Proportional gain of circulation pump controller";
+  parameter Real Ti=60 "Integrator time constant of circulation pump controller";
+
+  parameter Modelica.Media.Interfaces.Types.Temperature TTan_start=323.15
+    "Start value of tank temperature"
+    annotation(Dialog(tab="Initialization"));
+  final parameter Real eps =
+    dat.QHex_flow_nominal / CMin_flow_nominal / ( dat.TDom_nominal + dat.dTHexApp_nominal - dat.TCol_nominal)
+    "Heat exchanger effectiveness"
+    annotation(Dialog(tab="Advanced"));
+  Buildings.Fluid.Movers.Preconfigured.FlowControlled_dp pumHex(
+    redeclare package Medium = MediumHea,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    use_inputFilter=false,
+    riseTime=10,
+    m_flow_nominal=dat.mHex_flow_nominal,
+    dp_nominal=dat.dpHexHea_nominal) "Pump with head as input" annotation (
+      Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=270,
+        origin={-40,0})));
+
+  Buildings.Fluid.Storage.Stratified tan(
+    redeclare package Medium = MediumHea,
+    kIns=dat.kIns,
+    final T_start=TTan_start,
+    hTan=dat.hTan,
+    dIns=dat.dIns,
+    VTan=dat.VTan,
+    nSeg=dat.nSeg,
+    m_flow_nominal=dat.mHex_flow_nominal)
+    "Heating water tank"
+    annotation (Placement(transformation(extent={{30,-18},{10,2}})));
+  Modelica.Blocks.Interfaces.RealOutput PEle(unit="W")
+    "Electric power required for pumping equipment"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
+        iconTransformation(extent={{100,-10},{120,10}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemHot(
+    redeclare package Medium =  MediumDom,
+    final allowFlowReversal=allowFlowReversalDom,
+    m_flow_nominal=dat.mDom_flow_nominal)
+    "Temperature sensor for hot water supply"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+
+  Buildings.Fluid.HeatExchangers.ConstantEffectiveness hex(
+    redeclare package Medium1 = MediumDom,
+    redeclare package Medium2 = MediumHea,
+    final allowFlowReversal1=allowFlowReversalDom,
+    m1_flow_nominal=dat.mDom_flow_nominal,
+    m2_flow_nominal=dat.mHex_flow_nominal,
+    dp1_nominal=dat.dpHexHea_nominal,
+    from_dp2=true,
+    dp2_nominal=dat.dpHexDom_nominal,
+    eps=eps)
+    annotation (Placement(transformation(extent={{-60,44},{-40,64}})));
+  Buildings.Fluid.FixedResistances.Junction junTop(
+    redeclare package Medium = MediumHea,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    m_flow_nominal=dat.mHex_flow_nominal*{1,1,1},
+    dp_nominal=zeros(3)) "Flow junction at top of tank"
+    annotation (Placement(transformation(extent={{10,20},{30,40}})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = MediumDom)
+    "Mass flow rate of domestic hot water"
+    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TTanTop(
+    T(displayUnit="degC"))
+    "Fluid temperature at the top of the tank"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TTanBot(
+    T(displayUnit="degC"))
+    "Fluid temperature at the bottom of the tank"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+
+  Buildings.DHC.Loads.HotWater.BaseClasses.HeatExchangerPumpController conPum(final mDom_flow_nominal=dat.mDom_flow_nominal,
+      final dpPum_nominal=dat.dpHexHea_nominal)
+    "Controller for pump of heat exchanger"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.DHC.Loads.HotWater.BaseClasses.TankChargingController conCha "Controller for tank charge signal"
+    annotation (Placement(transformation(extent={{72,-90},{92,-70}})));
+
+  Buildings.Fluid.Actuators.Valves.ThreeWayLinear divVal(
+    redeclare package Medium = MediumHea,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    use_inputFilter=false,
+    m_flow_nominal=dat.mHex_flow_nominal,
+    dpValve_nominal=1000) "Diversion valve to reduce mixing in tank"
+    annotation (Placement(transformation(extent={{30,-40},{10,-60}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTemRet(
+    redeclare package Medium = MediumHea,
+    final allowFlowReversal=allowFlowReversalDom,
+    m_flow_nominal=dat.mHex_flow_nominal)
+    "Temperature sensor for return heating water from heat exchanger"
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+  Buildings.DHC.Loads.HotWater.BaseClasses.TankValveController conVal "Diversion valve controller"
+    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
+
+  Buildings.Controls.OBC.CDL.Reals.AddParameter dTHexApp(p=dat.dTHexApp_nominal)
+    "Offset for heat exchanger approach temperature"
+    annotation (Placement(transformation(extent={{34,-84},{54,-64}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput charge
+    "Output true if tank needs to be charged, false if it is sufficiently charged"
+    annotation (Placement(transformation(extent={{100,-100},{140,-60}}),
+        iconTransformation(extent={{100,-110},{140,-70}})));
+protected
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpHea_default =
+    MediumHea.specificHeatCapacityCp(MediumHea.setState_pTX(
+      MediumHea.p_default,
+      MediumHea.T_default,
+      MediumHea.X_default))
+    "Specific heat capacity of heating medium at default medium state";
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpDom_default =
+    MediumDom.specificHeatCapacityCp(MediumDom.setState_pTX(
+      MediumDom.p_default,
+      MediumDom.T_default,
+      MediumDom.X_default))
+    "Specific heat capacity of domestic hot water medium at default medium state";
+  parameter Modelica.Units.SI.ThermalConductance CMin_flow_nominal =
+    min(dat.mHex_flow_nominal*cpHea_default, dat.mDom_flow_nominal*cpDom_default)
+    "Minimum heat capacity flow rate";
+initial equation
+  assert(eps < 1, "In " + getInstanceName() + ": Heat exchanger effectivness must be below 1, received eps = " + String(eps) + ". Check sizing.");
+
+equation
+  connect(tan.port_a, junTop.port_3)
+    annotation (Line(points={{20,2},{20,20}},
+                                            color={0,127,255}));
+  connect(pumHex.P, PEle) annotation (Line(points={{-49,-11},{-50,-11},{-50,-32},
+          {86,-32},{86,0},{110,0}},     color={0,0,127}));
+  connect(junTop.port_2, port_aHea) annotation (Line(points={{30,30},{84,30},{84,
+          -60},{100,-60}},     color={0,127,255}));
+  connect(hex.port_b1, senMasFlo.port_a)
+    annotation (Line(points={{-40,60},{-20,60}}, color={0,127,255}));
+  connect(senMasFlo.port_b, senTemHot.port_a)
+    annotation (Line(points={{0,60},{20,60}},    color={0,127,255}));
+  connect(TTanTop.port, tan.heaPorVol[1])
+    annotation (Line(points={{40,10},{22,10},{22,-8},{20,-8}},
+                                                color={191,0,0}));
+  connect(senMasFlo.m_flow, conPum.mDom_flow) annotation (Line(points={{-10,71},
+          {-10,74},{-86,74},{-86,6},{-82,6}}, color={0,0,127}));
+  connect(senTemHot.T, conPum.TDom) annotation (Line(points={{30,71},{30,80},{-88,
+          80},{-88,-6},{-81,-6}}, color={0,0,127}));
+  connect(conPum.TDomSet, TDomSet) annotation (Line(points={{-81,0},{-92,0},{-92,
+          0},{-110,0}}, color={0,0,127}));
+  connect(conCha.TTanTop, TTanTop.T) annotation (Line(points={{70,-80},{66,-80},
+          {66,10},{61,10}},   color={0,0,127}));
+  connect(conCha.charge, charge) annotation (Line(points={{94,-80},{120,-80}},
+                           color={255,0,255}));
+  connect(senTemHot.port_b, port_bDom)
+    annotation (Line(points={{40,60},{100,60}}, color={0,127,255}));
+  connect(conPum.dpPumHex, pumHex.dp_in)
+    annotation (Line(points={{-58,0},{-52,0}}, color={0,0,127}));
+
+  connect(port_aDom, hex.port_a1)
+    annotation (Line(points={{-100,60},{-60,60}}, color={0,127,255}));
+  connect(junTop.port_1, hex.port_a2) annotation (Line(points={{10,30},{-30,30},
+          {-30,48},{-40,48}}, color={0,127,255}));
+  connect(hex.port_b2, pumHex.port_a) annotation (Line(points={{-60,48},{-72,48},
+          {-72,20},{-40,20},{-40,10}}, color={0,127,255}));
+  connect(senTemRet.port_b, divVal.port_2)
+    annotation (Line(points={{0,-50},{10,-50}}, color={0,127,255}));
+  connect(divVal.port_1, tan.fluPorVol[integer(dat.nSeg/2)]) annotation (Line(
+        points={{30,-50},{34,-50},{34,-8},{25,-8}}, color={0,127,255}));
+  connect(senTemRet.T, conVal.TRet) annotation (Line(points={{-10,-39},{-10,-36},
+          {-26,-36},{-26,-80},{-21,-80}}, color={0,0,127}));
+  connect(conVal.y, divVal.y)
+    annotation (Line(points={{2,-80},{20,-80},{20,-62}}, color={0,0,127}));
+  connect(TTanBot.port, tan.heaPorVol[dat.nSeg]) annotation (Line(points={{40,-20},
+          {22,-20},{22,-8},{20,-8}}, color={191,0,0}));
+  connect(conCha.TTanTopSet, dTHexApp.y)
+    annotation (Line(points={{71,-72},{64,-72},{64,-74},{56,-74}},
+                                                 color={0,0,127}));
+  connect(dTHexApp.u, TDomSet) annotation (Line(points={{32,-74},{26,-74},{26,
+          -96},{-90,-96},{-90,0},{-110,0}}, color={0,0,127}));
+  connect(divVal.port_3, tan.fluPorVol[dat.nSeg]) annotation (Line(points={{20,-40},
+          {20,-36},{32,-36},{32,-8},{25,-8}}, color={0,127,255}));
+  connect(tan.port_b, port_bHea) annotation (Line(points={{20,-18},{20,-26},{-80,
+          -26},{-80,-60},{-100,-60}}, color={0,127,255}));
+  connect(pumHex.port_b, senTemRet.port_a) annotation (Line(points={{-40,-10},{-40,
+          -50},{-20,-50}}, color={0,127,255}));
+  connect(TTanBot.T, conCha.TTanBot) annotation (Line(points={{61,-20},{62,-20},
+          {62,-88},{70,-88}}, color={0,0,127}));
+  annotation (
+  defaultComponentName="domHotWatTan",
+  Documentation(info="<html>
+<p>
+This model implements a heating hot water tank with external heat exchanger that heats domestic hot water.
+</p>
+<p>
+The storage tank model is described in
+<a href=\"modelica://Buildings.Fluid.Storage.StratifiedEnhancedInternalHex\">
+Buildings.Fluid.Storage.StratifiedEnhancedInternalHex</a>.
+The heat pump and storage tank system should be parameterized altogether using
+<a href=\"modelica://Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger\">
+Buildings.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger</a>.
+</p>
+<p align=\"center\">
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png\"/>
+</p>
+<p>
+It is based on Fig. 3 in <i>Evaluations of different domestic hot water
+preparing methods with ultra-low-temperature district heating</i> by X. Yang,
+H. Li, and S. Svendsen at <a href=\"https:/doi.org/10.1016/j.energy.2016.04.109\">
+doi.org/10.1016/j.energy.2016.04.109</a>, as well as the
+<i>Advanced Energy Design Guide for Multifamily Buildings-Achieving Zero Energy</i>
+published by ASHRAE in 2022 at <a href=\"https://www.ashrae.org/technical-resources/aedgs/zero-energy-aedg-free-download\">
+https://www.ashrae.org/technical-resources/aedgs/zero-energy-aedg-free-download</a>.
+</p>
+<p>
+For a model that connects this hot water system to a heat pump, see
+<a href=\"modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+October 5, 2023, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Polygon(
+          points={{-140,86},{-140,86}},
+          lineColor={95,95,95},
+          lineThickness=1,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.CrossDiag),
+        Rectangle(
+          extent={{60,40},{0,-78}},
+          lineColor={0,0,0},
+          lineThickness=0.5),
+        Rectangle(
+          extent={{-30,40},{-50,0}},
+          lineColor={0,0,0},
+          lineThickness=0.5),
+        Rectangle(
+          extent={{-100,64},{-60,58}},
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-44,64},{100,58}},
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-60,-10},{-44,-16}},
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-40,2},{40,-2}},
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-60,24},
+          rotation=90),
+        Rectangle(
+          extent={{-6,2},{6,-2}},
+          fillColor={0,140,72},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-46,-6},
+          rotation=90),
+        Rectangle(
+          extent={{76,-58},{98,-62}},
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-58,2},{58,-2}},
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={22,50},
+          rotation=180),
+        Rectangle(
+          extent={{-56.5,2.5},{56.5,-2.5}},
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={77.5,-4.5},
+          rotation=270),
+        Rectangle(
+          extent={{-6,2},{6,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-6,-60},
+          rotation=180),
+        Rectangle(
+          extent={{-6,2},{6,-2}},
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={32,46},
+          rotation=270),
+        Rectangle(
+          extent={{-6,2},{6,-2}},
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-34,46},
+          rotation=270),
+        Rectangle(
+          extent={{-15,2},{15,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-85,-60},
+          rotation=180),
+        Rectangle(
+          extent={{-6,2},{6,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-26,-44},
+          rotation=360),
+        Rectangle(
+          extent={{-23,2},{23,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-34,-23},
+          rotation=270),
+        Rectangle(
+          extent={{-12,2},{12,-2}},
+          fillColor={102,44,145},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-44,52},
+          rotation=90),
+        Text(
+          extent={{-116,36},{-66,0}},
+          textColor={0,0,127},
+          textString="TDomSet"),
+        Rectangle(
+          extent={{-5,2},{5,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-10,-55},
+          rotation=270),
+        Rectangle(
+          extent={{-6,2},{6,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-6,-12},
+          rotation=180),
+        Polygon(
+          points={{-13,-3},{-5,3},{-5,-9},{-13,-3}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-7,-57},
+          rotation=270),
+        Polygon(
+          points={{-15,-3},{-7,3},{-7,-9},{-15,-3}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-13,-29},
+          rotation=90),
+        Polygon(
+          points={{-15,-3},{-5,3},{-5,-9},{-15,-3}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-25,-47},
+          rotation=180),
+        Rectangle(
+          extent={{-12,2},{12,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-10,-24},
+          rotation=270),
+        Ellipse(
+          extent={{-42,-20},{-26,-34}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-15,-3},{-7,5},{-7,-11},{-15,-3}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          origin={-37,-19},
+          rotation=90),
+        Text(
+         extent={{72,42},{-14,12}},
+          textColor={0,0,0},
+          textString=DynamicSelect("", String(TTanTop.T-273.15, format=".1f"))),
+        Text(
+         extent={{74,-46},{-12,-76}},
+          textColor={0,0,0},
+          textString=DynamicSelect("", String(TTanBot.T-273.15, format=".1f"))),
+        Ellipse(
+          extent={{81,-83},{95,-97}},
+          lineColor=DynamicSelect({235,235,235},
+            if charge then
+              {0,255,0}
+            else
+              {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},
+            if charge then
+              {0,255,0}
+            else
+              {235,235,235}),
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-16,2},{16,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-72,-76},
+          rotation=270),
+        Rectangle(
+          extent={{-54,2},{54,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={-20,-90},
+          rotation=180),
+        Rectangle(
+          extent={{-7,2},{7,-2}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          origin={32,-85},
+          rotation=270)}),
+        Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end StorageTankWithExternalHeatExchanger;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/ThermostaticMixingValve.mo b/Buildings/DHC/Loads/HotWater/ThermostaticMixingValve.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Loads/HotWater/ThermostaticMixingValve.mo
rename to Buildings/DHC/Loads/HotWater/ThermostaticMixingValve.mo
index 1996100dbd3..ac71e20887d 100644
--- a/Buildings/Experimental/DHC/Loads/HotWater/ThermostaticMixingValve.mo
+++ b/Buildings/DHC/Loads/HotWater/ThermostaticMixingValve.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
+within Buildings.DHC.Loads.HotWater;
 model ThermostaticMixingValve
   "A model for a thermostatic mixing valve"
   replaceable package Medium = Buildings.Media.Water "Water media model";
diff --git a/Buildings/DHC/Loads/HotWater/package.mo b/Buildings/DHC/Loads/HotWater/package.mo
new file mode 100644
index 00000000000..fd5ba1295fa
--- /dev/null
+++ b/Buildings/DHC/Loads/HotWater/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.Loads;
+package HotWater "Package of models for domestic hot water generation and loads served by district networks"
+   extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models for building domestic hot water loads served by a district heating network.
+These loads are typically charactersized as being from fixtures in kitchens,
+bathrooms, and laundry, and typically require a higher temperature water than
+space heating.
+</p>
+</html>"));
+end HotWater;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/package.order b/Buildings/DHC/Loads/HotWater/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/HotWater/package.order
rename to Buildings/DHC/Loads/HotWater/package.order
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo b/Buildings/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
new file mode 100644
index 00000000000..0cf8ea24253
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
@@ -0,0 +1,63 @@
+within Buildings.DHC.Loads.Steam.BaseClasses;
+model ControlVolumeCondensation
+  "Control volume model exhibiting the condensation process of water"
+  extends
+    Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
+      redeclare final package Medium_a=MediumSte,
+      redeclare final package Medium_b=MediumWat);
+equation
+  // boundary conditions at the ports
+  port_a.m_flow = mSte_flow;
+  port_a.h_outflow = hSte;
+  port_b.m_flow = mWat_flow;
+  port_b.h_outflow = hWat;
+
+annotation (defaultComponentName="vol",
+    Icon(coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}), graphics={
+      Line(
+        points={{38,40},{-2,20},{38,-20},{-2,-40}},
+        color={0,0,255},
+        smooth=Smooth.Bezier),
+      Line(
+        points={{-2,40},{-42,20},{-2,-20},{-42,-40}},
+        color={0,0,255},
+        smooth=Smooth.Bezier)}),
+    Documentation(revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Added publication references.
+</li>
+<li>
+February 26, 2022 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model represents a condensation process of water with
+liquid and vapor phases in equilibrium and at a saturated state.
+Further information regarding the model formulation and assumptions
+are in the base class
+<a href=\"modelica://Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
+Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
+
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>"));
+end ControlVolumeCondensation;
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
new file mode 100644
index 00000000000..e30f7271de4
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
@@ -0,0 +1,100 @@
+within Buildings.DHC.Loads.Steam.BaseClasses.Examples;
+model ControlVolumeCondensation
+  "Example model for heat transfer with the condensation control volume"
+  extends Modelica.Icons.Example;
+
+package MediumSte = Buildings.Media.Steam (
+  T_default=273.15+180,
+  p_default=1e6)
+    "Steam medium - Medium model for port_a (inlet)";
+package MediumWat =
+      Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium - Medium model for port_b (outlet)";
+
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volDyn(
+    V=1,
+    redeclare package MediumWat = MediumWat,
+    redeclare package MediumSte = MediumSte,
+    m_flow_nominal=0.01,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    allowFlowReversal=true) "Dynamic volume"
+    annotation (Placement(transformation(extent={{20,0},{40,-20}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volSte(
+    V=1,
+    redeclare package MediumWat = MediumWat,
+    redeclare package MediumSte = MediumSte,
+    m_flow_nominal=0.01,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    allowFlowReversal=true) "Steady volume"
+    annotation (Placement(transformation(extent={{20,-40},{40,-60}})));
+  Modelica.Fluid.Sources.MassFlowSource_T sou(
+    redeclare package Medium = MediumSte,
+    use_m_flow_in=true,
+    T=453.15,
+    nPorts=1) "Flow source"
+    annotation (Placement(transformation(extent={{-18,-20},{2,0}})));
+  Modelica.Fluid.Sources.MassFlowSource_T sou1(
+    redeclare package Medium = MediumSte,
+    use_m_flow_in=true,
+    T=453.15,
+    nPorts=1) "Flow source"
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+  Modelica.Fluid.Sources.FixedBoundary bou(
+    redeclare package Medium = MediumWat,
+    p=volDyn.p_start,
+    T=293.15,
+    nPorts=2) "Boundary condition"
+    annotation (Placement(transformation(extent={{80,-22},{60,-2}})));
+  Modelica.Blocks.Sources.Ramp ramp(
+    duration=1,
+    offset=2,
+    height=-1) "Ramp signal"
+    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
+  Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo
+    "Heat flow sensor"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+  Modelica.Blocks.Sources.Constant const(k=-10000) "Heat loss"
+    annotation (Placement(transformation(extent={{-90,40},{-70,60}})));
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
+    "Prescribed heat flow rate"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+equation
+  connect(sou.ports[1], volDyn.port_a)
+    annotation (Line(points={{2,-10},{20,-10}}, color={0,127,255}));
+  connect(volDyn.port_b, bou.ports[1])
+    annotation (Line(points={{40,-10},{60,-10}}, color={0,127,255}));
+  connect(preHeaFlo.port,heaFlo. port_a) annotation (Line(
+      points={{-40,50},{-20,50}},
+      color={191,0,0}));
+  connect(preHeaFlo.Q_flow,const. y) annotation (Line(
+      points={{-60,50},{-69,50}},
+      color={0,0,127}));
+  connect(heaFlo.port_b, volDyn.heatPort)
+    annotation (Line(points={{0,50},{30,50},{30,0}}, color={191,0,0}));
+  connect(sou1.ports[1], volSte.port_a)
+    annotation (Line(points={{0,-50},{20,-50}}, color={0,127,255}));
+  connect(ramp.y, sou.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},{-40,-2},{-18,-2}},
+                             color={0,0,127}));
+  connect(ramp.y, sou1.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},
+          {-40,-42},{-20,-42}}, color={0,0,127}));
+  connect(volSte.port_b, bou.ports[2]) annotation (Line(points={{40,-50},{50,
+          -50},{50,-14},{60,-14}}, color={0,127,255}));
+  annotation (Documentation(
+        info="<html>
+<p>
+This model demonstrates the use of the control volume with condensation.
+The dynamic volume includes heat conduction to the ambient while the
+steady volume heat balance is only dependent on the mass flow rate.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 26, 2022 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+experiment(Tolerance=1E-6, StopTime=1.0),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos"
+        "Simulate and plot"));
+end ControlVolumeCondensation;
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
new file mode 100644
index 00000000000..65b815dbc61
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
@@ -0,0 +1,91 @@
+within Buildings.DHC.Loads.Steam.BaseClasses.Examples;
+model SteamTrap "Example model to demonstrate the steam trap"
+  extends Modelica.Icons.Example;
+
+  package MediumWat = Buildings.Media.Water "Water medium";
+
+  parameter Modelica.Units.SI.Temperature TSatHig=273.15+110
+     "High pressure saturation temperature";
+  parameter Modelica.Units.SI.Temperature TSatLow=273.15+100
+     "Low pressure saturation temperature";
+  parameter Modelica.Units.SI.AbsolutePressure pSat=143380
+     "Saturation pressure";
+  parameter Modelica.Units.SI.PressureDifference dp=pSat-101325
+    "Prescribed pressure change";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=10
+    "Nominal mass flow rate";
+
+  Modelica.Blocks.Sources.Ramp ram(
+    height=m_flow_nominal,
+    duration(displayUnit="min") = 60,
+    startTime(displayUnit="min") = 60)
+    "Ramp"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+  Buildings.Fluid.Sources.Boundary_pT sou(
+    redeclare package Medium = MediumWat,
+    p=pSat,
+    T=TSatHig,
+    nPorts=1)
+    "Source"
+    annotation (Placement(transformation(extent={{-90,0},{-70,20}})));
+  Buildings.Fluid.Sources.Boundary_pT sin(
+    redeclare package Medium = MediumWat,
+    p=pSat - dp,
+    T=TSatLow,
+    nPorts=1)
+    "Sink"
+    annotation (Placement(transformation(extent={{90,0},{70,20}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
+    redeclare package Medium = MediumWat,
+    m_flow_nominal=m_flow_nominal,
+    show_T=true)
+    "Steam trap"
+    annotation (Placement(transformation(extent={{-30,0},{-10,20}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow pum(
+    redeclare package Medium = MediumWat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=m_flow_nominal,
+    nominalValuesDefineDefaultPressureCurve=true)
+    "Pump"
+    annotation (Placement(transformation(extent={{40,0},{60,20}})));
+  Fluid.Sensors.SpecificEnthalpyTwoPort hIn(
+    redeclare package Medium = MediumWat,
+    m_flow_nominal=m_flow_nominal)
+    "Inflowing specific enthalpy"
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Fluid.Sensors.SpecificEnthalpyTwoPort hOut(
+    redeclare package Medium = MediumWat,
+    m_flow_nominal=m_flow_nominal)
+    "Outflowing specific enthalpy"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
+equation
+  connect(pum.port_b, sin.ports[1])
+    annotation (Line(points={{60,10},{70,10}}, color={0,127,255}));
+  connect(ram.y, pum.m_flow_in)
+    annotation (Line(points={{-59,70},{50,70},{50,22}}, color={0,0,127}));
+  connect(sou.ports[1], hIn.port_a)
+    annotation (Line(points={{-70,10},{-60,10}}, color={0,127,255}));
+  connect(hIn.port_b, steTra.port_a)
+    annotation (Line(points={{-40,10},{-30,10}}, color={0,127,255}));
+  connect(steTra.port_b, hOut.port_a)
+    annotation (Line(points={{-10,10},{0,10}}, color={0,127,255}));
+  connect(hOut.port_b, pum.port_a)
+    annotation (Line(points={{20,10},{40,10}}, color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+  experiment(Tolerance=1e-6, StopTime=180.0),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos"
+        "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+This example model demonstrates the performance of the steam trap with a ramped mass flow rate.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SteamTrap;
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
new file mode 100644
index 00000000000..6b4fa755921
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
@@ -0,0 +1,90 @@
+within Buildings.DHC.Loads.Steam.BaseClasses.Examples;
+model ValveSelfActing
+  "Example model for self-acting steam valve with a noisy inlet pressure input"
+  extends Modelica.Icons.Example;
+  package MediumSte = Buildings.Media.Steam(p_default=400000,
+    T_default=273.15+143.61,
+    h_default=2738100) "Medium model";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate";
+
+  Buildings.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
+    redeclare final package Medium = MediumSte,
+    m_flow_nominal=m_flow_nominal,
+    show_T=true,
+    pb_nominal=300000,
+    dp_start(displayUnit="Pa"))
+     "Self acting pressure reducing valve"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  Buildings.Fluid.Sources.Boundary_pT sou(
+    redeclare final package Medium = MediumSte,
+    use_p_in=true,
+    p(displayUnit="Pa"),
+    T(displayUnit="K") = MediumSte.saturationTemperature(sou.p),
+    nPorts=1) "Source"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort speEntIn(
+    redeclare final package Medium = MediumSte,
+    m_flow_nominal=m_flow_nominal)
+    "Upstream specific enthalpy"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort speEntOut(
+    redeclare final package Medium = MediumSte,
+    m_flow_nominal=m_flow_nominal)
+    "Downstream specific enthalpy"
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+  Modelica.Blocks.Noise.UniformNoise pInSig(
+    samplePeriod(displayUnit="s") = 1,
+    y_min=500000 + 200000,
+    y_max=500000 - 200000) "Noisy signal for inlet pressure"
+    annotation (Placement(transformation(extent={{-60,40},{-80,60}})));
+  Fluid.Sources.Boundary_pT sin(
+    redeclare final package Medium = MediumSte,
+    p=200000,
+    T=MediumSte.saturationTemperature(sin.p),
+    nPorts=1) "Sink"
+    annotation (Placement(transformation(extent={{100,-10},{80,10}})));
+  Fluid.FixedResistances.PressureDrop res(
+    redeclare final package Medium = MediumSte,
+    m_flow_nominal=m_flow_nominal,
+    dp_nominal=1000) "Pressure drop"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  inner Modelica.Blocks.Noise.GlobalSeed globalSeed
+    "Setting for sublibrary noise"
+    annotation (Placement(transformation(extent={{80,-60},{100,-40}})));
+equation
+  connect(sou.ports[1], speEntIn.port_a)
+    annotation (Line(points={{-60,0},{-50,0}}, color={0,127,255}));
+  connect(speEntIn.port_b, prv.port_a)
+    annotation (Line(points={{-30,0},{-20,0}},
+                                             color={0,127,255}));
+  connect(prv.port_b, speEntOut.port_a)
+    annotation (Line(points={{0,0},{10,0}},  color={0,127,255}));
+  connect(pInSig.y, sou.p_in) annotation (Line(points={{-81,50},{-90,50},{-90,8},
+          {-82,8}}, color={0,0,127}));
+  connect(sin.ports[1], res.port_b)
+    annotation (Line(points={{80,0},{60,0}}, color={0,127,255}));
+  connect(res.port_a, speEntOut.port_b)
+    annotation (Line(points={{40,0},{30,0}}, color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
+    Diagram(coordinateSystem(preserveAspectRatio=false)),
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos"
+    "Simulate and plot"),
+    experiment(StopTime=15, Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This example model demonstrates the performance of self-acting steam pressure
+regulator with a noisy/varying inlet pressure signal. The inlet pressure
+conditions are selected to demonstrate how the downstream pressure is maintained
+at the setpoint, unless the inlet pressure drops below the setpoint
+(pressure drop is then zero).
+</p>
+</html>",revisions="<html>
+<ul>
+<li>
+March 2, 2022 by Saranya Anbarasu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ValveSelfActing;
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.mo b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.mo
new file mode 100644
index 00000000000..a7b6c382acb
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Steam.BaseClasses;
+package Examples "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains examples for the use of models that can be found in
+<a href=\"modelica://Buildings.DHC.Loads.Steam.BaseClasses\">
+Buildings.DHC.Loads.Steam.BaseClasses</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.order b/Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.order
rename to Buildings/DHC/Loads/Steam/BaseClasses/Examples/package.order
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/SteamTrap.mo b/Buildings/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
new file mode 100644
index 00000000000..c8764cb4014
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
@@ -0,0 +1,101 @@
+within Buildings.DHC.Loads.Steam.BaseClasses;
+model SteamTrap "Steam trap with isenthalpic expansion from high to atmospheric
+  pressure, followed by a isobaric condensation process as flashed steam
+  is brought back to a liquid state"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+      redeclare replaceable package Medium=Buildings.Media.Water);
+
+  constant Modelica.Units.SI.AbsolutePressure pAtm=101325
+     "Atmospheric pressure discharge state";
+  constant Modelica.Units.SI.Temperature TSat=
+    Buildings.Media.Steam.saturationTemperature(pAtm)
+    "Saturation temperature at atmospheric pressure";
+
+  Modelica.Blocks.Interfaces.RealOutput QLos_flow(unit="W")
+    "Heat transfer loss rate"
+    annotation (Placement(transformation(extent={{100,60},{120,80}})));
+
+  Medium.SpecificEnthalpy dh
+    "Change in enthalpy";
+equation
+  // Pressure setpoints
+  port_b.p = pAtm;
+
+  // Flashed steam condenses
+  port_b.h_outflow = Medium.specificEnthalpy(
+    state=Medium.setState_pTX(
+      p=pAtm,
+      T=TSat,
+      X=inStream(port_a.Xi_outflow)));
+  dh = port_b.h_outflow - inStream(port_a.h_outflow);
+
+  // Return reverse flow as the inStream value
+  port_a.h_outflow = inStream(port_a.h_outflow);
+
+  // Steady state conservation of mass
+  port_a.m_flow + port_b.m_flow = 0;
+
+  // Steady state conservation of energy
+  port_a.m_flow*dh = QLos_flow;
+
+  annotation (
+    defaultComponentName="tra",
+    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-80,80},{80,-80}},
+          lineColor={0,0,0},
+          lineThickness=0.5,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-40,-40},{40,40}},
+          lineColor={0,0,0},
+          lineThickness=1),
+        Ellipse(
+          extent={{-40,40},{40,-40}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          startAngle=-45,
+          endAngle=135,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+                                 Diagram(coordinateSystem(preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+The steam trap ensures that only liquid condensate leaves
+the component, while any flashed steam is returned to a liquid
+state before discharge. The model assumes a steady state isenthalpic
+thermodynamic process that transforms water from an upstream
+high pressure state to atmospheric pressure, followed by an
+isobaric condensation process as flashed steam vapor is returned to
+a liquid state. This implementation is consistent with
+physical valves that vent to the atmosphere.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Added publication references.
+</li>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SteamTrap;
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo b/Buildings/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
new file mode 100644
index 00000000000..315f043435d
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
@@ -0,0 +1,161 @@
+within Buildings.DHC.Loads.Steam.BaseClasses;
+model ValveSelfActing "Ideal pressure reducing valve for steam heating systems"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    final allowFlowReversal=false);
+  parameter Modelica.Units.SI.Pressure pb_nominal(
+    displayUnit="Pa",
+    min=101325)
+    "Nominal outlet pressure"
+    annotation (Dialog(group="Nominal condition"));
+
+  parameter Modelica.Units.SI.PressureDifference dp_start(displayUnit="Pa")=pb_nominal
+    "Guess value of dp = port_a.p - port_b.p"
+    annotation (Dialog(tab="Advanced"));
+
+  Buildings.Fluid.Sensors.Pressure pUp(redeclare final package Medium = Medium)
+    "Pressure sensor"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Utilities.Math.SmoothMax dpSet(final deltaX=0.5) "Pressure drop setpoint"
+    annotation (Placement(transformation(extent={{20,40},{40,60}})));
+
+protected
+  Buildings.Fluid.Movers.BaseClasses.IdealSource ideSou(
+    redeclare final package Medium = Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final dp_start=dp_start,
+    m_flow_start=m_flow_nominal,
+    final m_flow_small=m_flow_small,
+    final show_T=show_T,
+    final control_m_flow=false,
+    final control_dp=true) "Ideal source controlling dp"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Modelica.Blocks.Sources.RealExpression pbSet(final y=pb_nominal)
+    "Downstream pressure setpoint"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Zero"
+    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dpReq "Calculating dp required"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+
+equation
+  assert(dpReq.y > 0, "pb_nominal is set higher than the upstream pressure in "
+  + getInstanceName() + ", which results in a negative pressure drop.
+  This is not typical of real systems and should be verified.", AssertionLevel.warning);
+
+  connect(ideSou.port_b, port_b)
+    annotation (Line(points={{60,0},{100,0}}, color={0,127,255}));
+  connect(pUp.port, ideSou.port_a)
+    annotation (Line(points={{-80,50},{-80,0},{40,0}}, color={0,127,255}));
+  connect(zer.y, dpSet.u1) annotation (Line(points={{-38,80},{12,80},{12,56},{
+          18,56}},
+                color={0,0,127}));
+  connect(dpSet.y, ideSou.dp_in)
+    annotation (Line(points={{41,50},{56,50},{56,8}}, color={0,0,127}));
+  connect(port_a, ideSou.port_a)
+    annotation (Line(points={{-100,0},{40,0}}, color={0,127,255}));
+  connect(pUp.p, dpReq.u1) annotation (Line(points={{-69,60},{-28,60},{-28,56},{
+          -22,56}}, color={0,0,127}));
+  connect(pbSet.y, dpReq.u2) annotation (Line(points={{-39,40},{-28,40},{-28,44},
+          {-22,44}}, color={0,0,127}));
+  connect(dpReq.y, dpSet.u2) annotation (Line(points={{2,50},{10,50},{10,44},{
+          18,44}}, color={0,0,127}));
+    annotation (
+    defaultComponentName="prv",
+    Documentation(info="<html>
+<p>
+This is the model of self-acting control valve that automatically adjusts
+the diameter of valve  orifice to reduce the unregulated inlet pressure to a
+constant, reduced outlet pressure.
+</p>
+<h4>Implementation</h4>
+<p>
+To simplify the complex relationships of the valve opening (<code>y_actual</code>),
+mass flow rate (<code>m_flow</code>), and change in pressure (<code>dp</code>)
+for compressible medium (such as steam), this model is implemented using an ideal source
+<a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.IdealSource\">
+Buildings.Fluid.Movers.BaseClasses.IdealSource</a>, that allows the pressure drop
+to be prescribed independently of mass flow rate.
+</p>
+<p>
+The model maintains <code>dp</code> based on the user specified downstream pressure
+value (<code>pb_nominal</code>), except for instances where the upstream pressure
+falls below <code>pb_nominal</code>. In these instances, the valve exibits no
+pressure drop (<code>dpSet = 0</code>) and asserts a warning.
+This model assumes that <code>dp</code> across the valve is independent of
+<code>m_flow</code>. This generally leads to a simplier set of equations.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Added publication references.
+</li>
+<li>
+March 2, 2022 by Saranya Anbarasu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-52,40},{68,-40}},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-100,40},{100,-40}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={192,192,192}),
+        Rectangle(
+          extent={{-100,22},{100,-24}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={0,127,255}),
+        Rectangle(
+          extent={{-52,40},{68,-40}},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Ellipse(
+          extent={{-32,80},{30,34}},
+          lineColor={0,0,0},
+          fillColor={160,160,160},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-32,56},{34,8}},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Polygon(
+          points={{0,0},{-76,60},{-76,-60},{0,0}},
+          lineColor={0,0,0},
+          fillColor=DynamicSelect({0,0,0}, max(0, min(1, dpSet.y/pb_nominal))*{255,255,255}),
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{0,0},{76,60},{76,-60},{0,0}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(points={{-32,56},{30,56}}, color={0,0,0}),
+        Line(points={{0,0},{0,56}}, color={0,0,0}),
+        Line(points={{0,80},{0,100}}, color={0,0,0}),
+        Line(points={{0,100},{56,100}}, color={0,0,0}),
+        Line(points={{56,100},{0,0}}, color={0,0,0})}));
+end ValveSelfActing;
diff --git a/Buildings/DHC/Loads/Steam/BaseClasses/package.mo b/Buildings/DHC/Loads/Steam/BaseClasses/package.mo
new file mode 100644
index 00000000000..d00290061dd
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Steam;
+package BaseClasses "Package with base classes for Buildings.DHC.Loads.Steam"
+  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.DHC.Loads.Steam\">
+Buildings.DHC.Loads.Steam</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.order b/Buildings/DHC/Loads/Steam/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.order
rename to Buildings/DHC/Loads/Steam/BaseClasses/package.order
diff --git a/Buildings/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo b/Buildings/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
new file mode 100644
index 00000000000..e1a628dd8db
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
@@ -0,0 +1,374 @@
+within Buildings.DHC.Loads.Steam;
+model BuildingTimeSeriesAtETS
+  "Steam heating building interconnection with the district piping only
+  and the load at the ETS provided as a time series."
+  replaceable package MediumSte = Buildings.Media.Steam constrainedby
+    Modelica.Media.Interfaces.PartialMedium
+     "Steam medium";
+  replaceable package MediumWat =
+   Buildings.Media.Specialized.Water.TemperatureDependentDensity
+   constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Water medium";
+
+  constant Boolean allowFlowReversal = false
+    "= false to simplify equations, assuming, but not enforcing, no flow reversal. Set to false because the flow rate is prescribed."
+    annotation(Dialog(tab="Assumptions"), Evaluate=true);
+
+  parameter Boolean have_prv = false
+    "Set to true if the building has a pressure reducing valve (PRV) station";
+  // Nominal conditions
+  parameter Modelica.Units.SI.Power Q_flow_nominal
+    "Nominal heat flow rate"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
+    "Pressure drop at nominal mass flow rate"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.AbsolutePressure pSte_nominal=MediumSte.p_default
+    "Nominal pressure of steam entering the building"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.AbsolutePressure pLow_nominal=0.8*MediumSte.p_default
+    "Nominal low pressure setpoint, downstream of PRV (if present)"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TSte_nominal=
+     MediumSte.saturationTemperature(pSte_nominal)
+     "Nominal temperature of steam entering the building"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TLow_nominal=
+     MediumSte.temperature(
+       MediumSte.setState_phX(
+         p=pLow_nominal,
+         h=MediumSte.specificEnthalpy(MediumSte.setState_pTX(
+            p=pSte_nominal,
+            T=TSte_nominal,
+            X=MediumSte.X_default)),
+         X=MediumSte.X_default))
+     "Nominal temperature of steam entering heat exchanger, if PRV present"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal=
+    MediumSte.specificEnthalpy(MediumSte.setState_pTX(
+        p=if have_prv then pLow_nominal else pSte_nominal,
+        T=if have_prv then TLow_nominal else TSte_nominal,
+        X=MediumSte.X_default)) -
+      MediumWat.specificEnthalpy(MediumWat.setState_pTX(
+        p=if have_prv then pLow_nominal else pSte_nominal,
+        T=if have_prv then TLow_nominal else TSte_nominal,
+        X=MediumWat.X_default))
+    "Nominal change in enthalpy across the heat exchanger"
+    annotation(Dialog(group = "Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
+    Q_flow_nominal/dh_nominal
+    "Nominal mass flow rate"
+    annotation(Dialog(group = "Nominal condition"));
+
+  parameter Modelica.Units.SI.Volume V=1
+    "Total volume of the steam side of the heat exchanger";
+
+  // Assumptions
+  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="Equations"));
+
+  // Initialization
+  parameter MediumSte.AbsolutePressure p_start=MediumSte.p_default
+    "Start value of pressure"
+    annotation(Dialog(tab = "Initialization"));
+  parameter MediumSte.Temperature T_start=MediumSte.T_default
+    "Start value of temperature"
+    annotation(Dialog(tab = "Initialization"));
+  parameter Modelica.Units.SI.MassFlowRate m_flow_start=0
+    "Initial value of mass flow rate"
+    annotation(Dialog(tab = "Initialization"));
+
+  // Buildings.DHC.Loads.Heating load time series
+  parameter Boolean tableOnFile=false
+    "= true, if table is defined on file or in function usertab"
+    annotation (Dialog(tab = "Load Profile", group="Table data definition"));
+  parameter Real QHeaLoa[:, :] = fill(0.0, 0, 2)
+    "Table matrix (time = first column; e.g., table=[0, 0; 1, 1; 2, 4])"
+    annotation (Dialog(tab = "Load Profile", group="Table data definition",enable=not tableOnFile));
+  parameter String tableName="NoName"
+    "Table name on file or in function usertab (see docu)"
+    annotation (Dialog(tab = "Load Profile", group="Table data definition",enable=tableOnFile));
+  parameter String fileName="NoName" "File where matrix is stored"
+    annotation (Dialog(
+      tab = "Load Profile",
+      group="Table data definition",
+      enable=tableOnFile,
+      loadSelector(filter="Text files (*.txt);;MATLAB MAT-files (*.mat)",
+          caption="Open file in which table is present")));
+  parameter Integer columns[:]=2:size(QHeaLoa, 2)
+    "Columns of table to be interpolated"
+    annotation (Dialog(tab = "Load Profile", group="Table data interpretation"));
+  parameter Modelica.Blocks.Types.Smoothness smoothness=
+    Modelica.Blocks.Types.Smoothness.LinearSegments
+    "Smoothness of table interpolation"
+    annotation (Dialog(tab = "Load Profile", group="Table data interpretation"));
+  parameter Modelica.Units.SI.Time timeScale(
+    min=Modelica.Constants.eps)=1 "Time scale of first table column"
+    annotation (Dialog(tab = "Load Profile", group="Table data interpretation"), Evaluate=true);
+
+  // Diagnostics
+   parameter Boolean show_T = false
+    "= true, if actual temperature at port is computed"
+    annotation(Dialog(tab="Advanced",group="Diagnostics"));
+
+  MediumSte.ThermodynamicState sta_a=
+      MediumSte.setState_phX(port_a.p,
+                          noEvent(actualStream(port_a.h_outflow)),
+                          noEvent(actualStream(port_a.Xi_outflow))) if show_T
+    "Medium properties in port_a";
+
+  MediumWat.ThermodynamicState sta_b=
+      MediumWat.setState_phX(port_b.p,
+                          noEvent(actualStream(port_b.h_outflow)),
+                          noEvent(actualStream(port_b.Xi_outflow))) if show_T
+    "Medium properties in port_b";
+
+  // Advanced
+  parameter Modelica.Units.SI.Density rho_a_default=
+    MediumSte.density(MediumSte.setState_pTX(
+      p=pSte_nominal,T=TSte_nominal,X=MediumSte.X_default))
+    "Default steam density"
+    annotation(Dialog(tab="Advanced",group="Nominal condition"));
+  parameter Modelica.Units.SI.Density rho_b_default=
+    MediumWat.density(MediumWat.setState_pTX(
+      p=101325,T=273.15+90,X=MediumWat.X_default))
+    "Default water density"
+    annotation(Dialog(tab="Advanced",group="Nominal condition"));
+
+  Modelica.Blocks.Interfaces.RealOutput Q_flow(
+    final quantity="HeatFlowRate",
+    final unit="W",
+    displayUnit="kW")
+    "Total heat transfer rate"
+    annotation (Placement(transformation(extent={{100,70},{120,90}})));
+  Modelica.Blocks.Interfaces.RealOutput EHea(
+    final quantity="HeatFlow",
+    final unit="J",
+    displayUnit="kWh")
+    "Total heating energy"
+    annotation (Placement(transformation(extent={{100,40},{120,60}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_a(
+    redeclare final package Medium = MediumSte)
+    "Inlet port"
+    annotation (Placement(transformation(extent={{90,-10},{110,10}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b(
+    redeclare final package Medium = MediumWat)
+    "Outlet port"
+    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
+  Modelica.Blocks.Sources.CombiTimeTable QHea(
+    final tableOnFile=tableOnFile,
+    final table=QHeaLoa,
+    final tableName=tableName,
+    final fileName=fileName,
+    final columns=columns,
+    final smoothness=smoothness,
+    final extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
+    final timeScale=timeScale)
+    "Heating demand"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Modelica.Blocks.Continuous.Integrator IntEHea(y(unit="J"))
+    "Integrator for heating energy of building"
+    annotation (Placement(transformation(extent={{60,40},{80,60}})));
+  Buildings.Fluid.Movers.FlowControlled_m_flow pumCNR(
+    redeclare final package Medium = MediumWat,
+    final energyDynamics=energyDynamics,
+    p_start=steTra.pAtm,
+    T_start=steTra.TSat,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T,
+    addPowerToMedium=false,
+    nominalValuesDefineDefaultPressureCurve=true,
+    init=Modelica.Blocks.Types.Init.InitialOutput,
+    final m_flow_start=m_flow_start)
+    "Condensate return pump"
+    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
+    redeclare final package MediumSte = MediumSte,
+    redeclare final package MediumWat = MediumWat,
+    final allowFlowReversal=allowFlowReversal,
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    final p_start=if have_prv then pLow_nominal else pSte_nominal,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T,
+    final V=V)
+    "Steam side of the heat exchanger, modeled as a steady state control volume"
+    annotation (Placement(transformation(extent={{-60,-50},{-40,-70}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
+    redeclare final package Medium = MediumWat,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T)
+    "Steam trap"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort hIn(
+    redeclare final package Medium = MediumSte,
+    final m_flow_nominal=m_flow_nominal)
+    "Enthalpy in"
+    annotation (Placement(transformation(extent={{0,10},{-20,-10}})));
+  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort hOut(
+    redeclare final package Medium = MediumWat,
+    final m_flow_nominal=m_flow_nominal)
+    "Enthalpy out"
+    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
+  Modelica.Blocks.Math.Add dh(final k2=-1)
+    "Change in enthalpy with building-side fluid"
+    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
+  Modelica.Blocks.Math.Division m_flow "Mass flow"
+    annotation (Placement(transformation(extent={{32,-34},{52,-14}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
+    redeclare final package Medium = MediumSte,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T,
+    final pb_nominal=pLow_nominal) if have_prv
+    "Optional pressure reducing valve"
+    annotation (Placement(transformation(extent={{60,10},{40,30}})));
+equation
+  connect(Q_flow, Q_flow) annotation (Line(points={{110,80},{107,80},{107,80},{
+          110,80}}, color={0,0,127}));
+  connect(IntEHea.y, EHea) annotation (Line(points={{81,50},{96,50},{96,50},{
+          110,50}}, color={0,0,127}));
+  connect(QHea.y[1], Q_flow) annotation (Line(points={{-59,80},{110,80}},
+                    color={0,0,127}));
+  connect(IntEHea.u, Q_flow) annotation (Line(points={{58,50},{20,50},{20,80},{110,
+          80}}, color={0,0,127}));
+  connect(pumCNR.port_b, port_b)
+    annotation (Line(points={{70,-60},{100,-60}}, color={0,127,255}));
+  connect(steTra.port_b, pumCNR.port_a)
+    annotation (Line(points={{40,-60},{50,-60}}, color={0,127,255}));
+  connect(hIn.port_b, vol.port_a) annotation (Line(points={{-20,0},{-80,0},{-80,
+          -60},{-60,-60}}, color={0,127,255}));
+  connect(vol.port_b, hOut.port_a)
+    annotation (Line(points={{-40,-60},{-20,-60}}, color={0,127,255}));
+  connect(hOut.port_b, steTra.port_a)
+    annotation (Line(points={{0,-60},{20,-60}}, color={0,127,255}));
+  connect(dh.y, m_flow.u2)
+    annotation (Line(points={{21,-30},{30,-30}}, color={0,0,127}));
+  connect(QHea.y[1], m_flow.u1) annotation (Line(points={{-59,80},{20,80},{20,-18},
+          {30,-18}},      color={0,0,127}));
+  connect(m_flow.y, pumCNR.m_flow_in)
+    annotation (Line(points={{53,-24},{60,-24},{60,-48}}, color={0,0,127}));
+  connect(hIn.h_out, dh.u1)
+    annotation (Line(points={{-10,-11},{-10,-24},{-2,-24}}, color={0,0,127}));
+  connect(hOut.h_out, dh.u2)
+    annotation (Line(points={{-10,-49},{-10,-36},{-2,-36}}, color={0,0,127}));
+  connect(port_a, prv.port_a) annotation (Line(points={{100,0},{70,0},{70,20},{60,
+          20}}, color={0,127,255}));
+  if have_prv then
+    connect(prv.port_b, hIn.port_a)
+     annotation (Line(points={{40,20},{30,20},{30,0},{0,0}}, color={0,127,255}));
+  else
+  connect(port_a, hIn.port_a)
+    annotation (Line(points={{100,0},{0,0}}, color={0,127,255}));
+  end if;
+
+  annotation (
+    defaultComponentName="bui",
+    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+      Polygon(
+        points={{20,-70},{60,-85},{20,-100},{20,-70}},
+        lineColor={0,128,255},
+        fillColor={0,128,255},
+        fillPattern=FillPattern.Solid,
+        visible=not allowFlowReversal),
+      Line(
+        points={{55,-85},{-60,-85}},
+        color={0,128,255},
+        visible=not allowFlowReversal),
+      Rectangle(
+        extent={{-100,-100},{100,100}},
+        lineColor={0,0,127},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+      Polygon(
+        points={{0,80},{-78,38},{80,38},{0,80}},
+        lineColor={95,95,95},
+        smooth=Smooth.None,
+        fillPattern=FillPattern.Solid,
+        fillColor={95,95,95}),
+      Rectangle(
+          extent={{-64,38},{64,-70}},
+          lineColor={150,150,150},
+          fillPattern=FillPattern.Sphere,
+          fillColor={255,0,0}),
+      Rectangle(
+        extent={{-42,-4},{-14,24}},
+        lineColor={255,255,255},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+      Rectangle(
+        extent={{16,-4},{44,24}},
+        lineColor={255,255,255},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+      Rectangle(
+        extent={{16,-54},{44,-26}},
+        lineColor={255,255,255},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+      Rectangle(
+        extent={{-42,-54},{-14,-26}},
+        lineColor={255,255,255},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+      Text(
+        extent={{-149,-114},{151,-154}},
+        textxColor={0,0,255},
+        textString="%name")}),
+      Diagram(coordinateSystem(preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This model is intended for existing steam district heating systems
+where the heating load at the energy transfer station (ETS) is
+availble as a time series data input. Thus, the building-side piping and equipement
+is not included in this model, as depicted below.
+</p>
+<p>
+<img src=\"modelica://Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png\" alt=\"steamBuilding\"/>.
+</p>
+<h4> Implementation</h4>
+<p>
+With the time series input, this model is configured such that the control
+volume (representing the steam side of the heat exchanger) has steady state
+energy and mass balances. The steam trap also has steady state balances by
+design. Meanwhile, the condensate return pump allows either dynamic or steady
+state balances. The mass flow rate at the pump is prescribed ideally such that
+the heat flow rate input from the time series is rejected at the control volume
+based on the physical laws.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Added publication references.
+</li>
+<li>
+March 28, 2022, by Kathryn Hinkelman:<br/>
+Removed <code>massDynamics</code>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1542\">issue 1542</a>.
+</li>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingTimeSeriesAtETS;
diff --git a/Buildings/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo b/Buildings/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
new file mode 100644
index 00000000000..20e5f0af089
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
@@ -0,0 +1,80 @@
+within Buildings.DHC.Loads.Steam.Examples;
+model BuildingTimeSeriesAtETS
+  "Example model for time series load with external read-in file."
+  extends Modelica.Icons.Example;
+
+  package MediumSte = Buildings.Media.Steam (p_default=400000,
+    T_default=273.15+143.61,
+    h_default=2738100) "Steam medium";
+  package MediumWat =
+    Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium";
+
+  parameter Modelica.Units.SI.AbsolutePressure pSat=400000
+    "Saturation pressure";
+  parameter Modelica.Units.SI.Temperature TSat=
+     MediumSte.saturationTemperature(pSat)
+     "Saturation temperature";
+  parameter Modelica.Units.SI.Power Q_flow_nominal= 2e4
+    "Nominal heat flow rate";
+
+  Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui(
+    redeclare package MediumSte = MediumSte,
+    redeclare package MediumWat = MediumWat,
+    have_prv=true,
+    pLow_nominal=200000,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    dp_nominal=3000,
+    tableOnFile=false,
+    final Q_flow_nominal=Q_flow_nominal,
+    final pSte_nominal=pSat,
+    QHeaLoa=[0,Q_flow_nominal*0.2; 6,Q_flow_nominal; 16,Q_flow_nominal*0.1; 24,Q_flow_nominal*0.2],
+    columns={2},
+    smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
+    timeScale(displayUnit="h") = 3600,
+    show_T=true)
+    "Building model with time series load at the ETS"
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Buildings.Fluid.Sources.Boundary_pT souSte(
+    redeclare final package Medium = MediumSte,
+    p(displayUnit="Pa") = pSat,
+    T=TSat,
+    nPorts=1)
+    "Steam source"
+    annotation (Placement(transformation(extent={{42,30},{22,50}})));
+  Buildings.Fluid.Sources.Boundary_pT watSin(
+    redeclare final package Medium = MediumWat,
+    p=101325,
+    nPorts=1)
+    "Water sink"
+    annotation (Placement(transformation(extent={{42,-6},{22,14}})));
+equation
+  connect(souSte.ports[1], bui.port_a)
+    annotation (Line(points={{22,40},{10,40},{10,10},{-40,10}},
+                                              color={0,127,255}));
+  connect(bui.port_b, watSin.ports[1]) annotation (Line(points={{-40,4},{22,4}},
+                           color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+  experiment(
+      StartTime=1728000,
+      StopTime=1814400,
+      Tolerance=1e-06),
+__Dymola_Commands(file=
+  "modelica://Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos"
+  "Simulate and plot"),
+    Documentation(info="<html>
+<p>
+Example model for the steam building model with heat flow
+rate prescribed as a time series at the district-side
+of the energy transfer station (ETS).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BuildingTimeSeriesAtETS;
diff --git a/Buildings/DHC/Loads/Steam/Examples/package.mo b/Buildings/DHC/Loads/Steam/Examples/package.mo
new file mode 100644
index 00000000000..809a0959715
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Loads.Steam;
+package Examples "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.Loads.Steam\">
+Buildings.DHC.Loads.Steam</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/Examples/package.order b/Buildings/DHC/Loads/Steam/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/Examples/package.order
rename to Buildings/DHC/Loads/Steam/Examples/package.order
diff --git a/Buildings/DHC/Loads/Steam/package.mo b/Buildings/DHC/Loads/Steam/package.mo
new file mode 100644
index 00000000000..15e849f5d10
--- /dev/null
+++ b/Buildings/DHC/Loads/Steam/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Loads;
+package Steam "Package with models for loads involving steam systems"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models of building loads that are used to
+build example models of steam district heating systems.
+</p>
+</html>"));
+end Steam;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/package.order b/Buildings/DHC/Loads/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/Steam/package.order
rename to Buildings/DHC/Loads/Steam/package.order
diff --git a/Buildings/DHC/Loads/package.mo b/Buildings/DHC/Loads/package.mo
new file mode 100644
index 00000000000..8f487f287cd
--- /dev/null
+++ b/Buildings/DHC/Loads/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC;
+package Loads "Models for computing thermal loads served by the DES"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for the thermal and domestic hot water demand
+prediction in buildings.
+</p>
+</html>"));
+end Loads;
diff --git a/Buildings/Experimental/DHC/Loads/package.order b/Buildings/DHC/Loads/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Loads/package.order
rename to Buildings/DHC/Loads/package.order
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo b/Buildings/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
rename to Buildings/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
index 359730e1c10..e2a14186d12 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
+++ b/Buildings/DHC/Networks/BaseClasses/DifferenceEnthalpyFlowRate.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 model DifferenceEnthalpyFlowRate
   "Sensor outputting the difference between two enthalpy flow rates"
   extends Fluid.Interfaces.PartialFourPortInterface(
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
index cd5cffd8428..33a723555b6 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialConnection1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialConnection1Pipe
   "Partial model for connecting an agent to a one-pipe distribution network"
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
index b56eb3d0b6e..d0b06b23544 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialConnection2Pipe
   "Partial model for connecting an agent to a two-pipe distribution network"
   extends
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
+    Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
     redeclare final package MediumSup=Medium,
     redeclare final package MediumRet=Medium);
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
index 35f5ad1adb8..b87def2fcaf 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialConnection2Pipe2Medium.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialConnection2Pipe2Medium "Partial model for connecting an
   agent to a two-pipe distribution network with two medium declarations"
   replaceable package MediumSup = Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution.mo
index fc395fa94f1..f2a29f7627a 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution
   "Partial model for distribution network"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Medium(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Medium(
     redeclare final package MediumSup=Medium,
     redeclare final package MediumRet=Medium);
   replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
index af3422efed5..9f4524d26cf 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution1Pipe
   "Partial model for one-pipe distribution network"
   extends PartialDistribution;
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
index 6ca954a5b07..fcf3e3b810a 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Medium.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution2Medium
   "Partial model for distribution network with two medium declarations"
   replaceable package MediumSup =
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
index c21a52f1a8b..87184fd2562 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution2Pipe
   "Partial model for two-pipe distribution network"
   extends PartialDistribution;
@@ -84,7 +84,7 @@ partial model PartialDistribution2Pipe
     annotation (Placement(transformation(extent={{100,40},{140,80}}),
       iconTransformation(extent={{200,30},{240,70}})));
   // COMPONENTS
-  replaceable Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe con[nCon](
+  replaceable Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe con[nCon](
     redeclare each final package Medium=Medium,
     each final show_entFlo=show_entFlo,
     final mDis_flow_nominal=mDisCon_flow_nominal,
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
rename to Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
index 6ede40196c5..aa61107f22d 100644
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
+++ b/Buildings/DHC/Networks/BaseClasses/PartialDistribution2Pipe2Medium.mo
@@ -1,8 +1,8 @@
-within Buildings.Experimental.DHC.Networks.BaseClasses;
+within Buildings.DHC.Networks.BaseClasses;
 partial model PartialDistribution2Pipe2Medium
   "Partial model for a two-pipe distribution network with two medium declarations"
   extends
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Medium;
+    Buildings.DHC.Networks.BaseClasses.PartialDistribution2Medium;
   replaceable model Model_pipDis =
       Buildings.Fluid.Interfaces.PartialTwoPortInterface
       constrainedby Buildings.Fluid.Interfaces.PartialTwoPortInterface(
@@ -63,9 +63,9 @@ partial model PartialDistribution2Pipe2Medium
     annotation (Placement(transformation(extent={{90,-70},{110,-50}}),iconTransformation(extent={{180,-80},{220,-40}})));
   // COMPONENTS
   replaceable
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium
+    Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium
     con[nCon]
-    constrainedby Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
+    constrainedby Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
     redeclare each final package MediumSup = MediumSup,
     redeclare each final package MediumRet = MediumRet,
     final mDis_flow_nominal=mDisCon_flow_nominal,
diff --git a/Buildings/DHC/Networks/BaseClasses/package.mo b/Buildings/DHC/Networks/BaseClasses/package.mo
new file mode 100644
index 00000000000..ddbed0ebd09
--- /dev/null
+++ b/Buildings/DHC/Networks/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Networks;
+package BaseClasses "Package with base classes that are used by multiple models"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Networks\">
+Buildings.DHC.Networks</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/package.order b/Buildings/DHC/Networks/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/BaseClasses/package.order
rename to Buildings/DHC/Networks/BaseClasses/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo b/Buildings/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
index 7fbb34fe012..5ebf4ffa853 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Connections/Connection1PipePlugFlow_v.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection1PipePlugFlow_v
   "Model for connecting an agent to the DHC system"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection1Pipe(
     tau=5*60,
     redeclare replaceable model Model_pipDis = Buildings.Fluid.FixedResistances.PlugFlowPipe(
       final length=lDis,
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection1Pipe_R.mo b/Buildings/DHC/Networks/Connections/Connection1Pipe_R.mo
similarity index 79%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection1Pipe_R.mo
rename to Buildings/DHC/Networks/Connections/Connection1Pipe_R.mo
index 78659a2b65e..43876532727 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection1Pipe_R.mo
+++ b/Buildings/DHC/Networks/Connections/Connection1Pipe_R.mo
@@ -1,6 +1,6 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection1Pipe_R "Model for connecting an agent to the DHC system"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection1Pipe(
     tau=5*60,
     redeclare replaceable model Model_pipDis = Pipes.PipeAutosize(
         roughness = 7e-6,
@@ -38,8 +38,8 @@ First implementation.
 This model represents the supply and return lines to connect an
 agent (e.g., an energy transfer station) to a one-pipe main distribution
 system. The instances of the pipe model are autosized based on the pressure drop per pipe length
-at nominal flow rate based on the model <a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
+at nominal flow rate based on the model <a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
 </p>
 </html>"));
 end Connection1Pipe_R;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo b/Buildings/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
index 326d2756dc6..4132fa02fd6 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Connections/Connection2PipePlugFlow_v.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection2PipePlugFlow_v
   "Model for connecting an agent to a two-pipe distribution network, using plug flow pipe models in the main line"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe(
     redeclare model Model_pipDisSup = Buildings.Fluid.FixedResistances.PlugFlowPipe(
       final length = lDis,
       final dIns = dIns,
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Connection2Pipe_R.mo b/Buildings/DHC/Networks/Connections/Connection2Pipe_R.mo
similarity index 82%
rename from Buildings/Experimental/DHC/Networks/Connections/Connection2Pipe_R.mo
rename to Buildings/DHC/Networks/Connections/Connection2Pipe_R.mo
index e8dae112605..b5c58dbf392 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Connection2Pipe_R.mo
+++ b/Buildings/DHC/Networks/Connections/Connection2Pipe_R.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks.Connections;
+within Buildings.DHC.Networks.Connections;
 model Connection2Pipe_R
   "Model for connecting an agent to the DHC system"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe(
     tau=5*60,
     redeclare replaceable model Model_pipDisSup = Pipes.PipeAutosize(
         roughness = 7e-6,
@@ -47,8 +47,8 @@ First implementation.
 This model represents the supply and return lines to connect an
 agent (e.g., an energy transfer station) to a two-pipe main distribution
 system. The instances of the pipe model are autosized based on the pressure drop per pipe length
-at nominal flow rate based on the model <a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
+at nominal flow rate based on the model <a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a> for the distribution line. The connection to the building as the length is typically relatively short so a losssless pipe is considered.
 </p>
 </html>"));
 end Connection2Pipe_R;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mo b/Buildings/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
similarity index 83%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
rename to Buildings/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
index 877fd804f9d..c99964f2068 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
+++ b/Buildings/DHC/Networks/Connections/Examples/Connection1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Connections.Examples;
+within Buildings.DHC.Networks.Connections.Examples;
 model Connection1PipeExample
   "Example model that showcases Connection1Pipe_R and Connection1PipePlugFlow_v models"
   extends Modelica.Icons.Example;
@@ -13,7 +13,7 @@ model Connection1PipeExample
     "Nominal mass flow rate in the connection line";
   parameter Modelica.Units.SI.Length lDis = 100
     "Length of the distribution pipe before the connection";
-  Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R connection1Pipe_R(
+  Buildings.DHC.Networks.Connections.Connection1Pipe_R connection1Pipe_R(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
     mCon_flow_nominal=mCon_flow_nominal,
@@ -25,7 +25,7 @@ model Connection1PipeExample
     nPorts=1) annotation (Placement(transformation(extent={{-20,0},{0,20}})));
   Modelica.Blocks.Sources.Constant mDis_flow_nominal_exp(k=mDis_flow_nominal)
     annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPipe_R(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Distribution network pump" annotation (
@@ -34,7 +34,7 @@ model Connection1PipeExample
         rotation=180,
         origin={32,16})));
 
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPipe_R(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -42,7 +42,7 @@ model Connection1PipeExample
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={30,80})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v
+  Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v
     connection1PipeplugFlow(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
@@ -56,7 +56,7 @@ model Connection1PipeExample
     p=300000,
     nPorts=1)
     annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPlugFlow(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal = mDis_flow_nominal) "Distribution network pump" annotation (
@@ -64,7 +64,7 @@ model Connection1PipeExample
         extent={{-10,10},{10,-10}},
         rotation=180,
         origin={32,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPlugFlow(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -120,17 +120,17 @@ equation
         points={{30,-8},{30,-4},{60,-4},{60,98},{30,98},{30,92}}, color={0,0,
           127}));
   annotation (__Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos" "Simulate and plot"),
     experiment(
       StopTime=3600,
       Tolerance=1e-06),
     Documentation(info="<html>
 <p>
 Example model of two one-pipe connection models that could be used i.e for building a reservoir network to connect one agent in series.  It uses 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R</a> and 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution pipe and release it to the same pipe.
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection1Pipe_R</a> and 
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution pipe and release it to the same pipe.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mo b/Buildings/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
similarity index 86%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
rename to Buildings/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
index 70e395fb9c0..a0e6b303a51 100644
--- a/Buildings/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
+++ b/Buildings/DHC/Networks/Connections/Examples/Connection2PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Connections.Examples;
+within Buildings.DHC.Networks.Connections.Examples;
 model Connection2PipeExample
   "Example model that showcases Connection2Pipe_R and Connection2PipePlugFlow_v models"
   extends Modelica.Icons.Example;
@@ -17,7 +17,7 @@ model Connection2PipeExample
     "Nominal mass flow rate in the connection line";
   parameter Modelica.Units.SI.Length lDis=100
     "Length of the distribution pipe before the connection";
-  Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R connection2Pipe_R(
+  Buildings.DHC.Networks.Connections.Connection2Pipe_R connection2Pipe_R(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
     mCon_flow_nominal=mCon_flow_nominal,
@@ -31,7 +31,7 @@ model Connection2PipeExample
     nPorts=1) annotation (Placement(transformation(extent={{-50,10},{-30,30}})));
   Modelica.Blocks.Sources.Constant mDis_flow_nominal_exp(k=mDis_flow_nominal)
     annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPipe_R(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Distribution network pump" annotation (
@@ -40,7 +40,7 @@ model Connection2PipeExample
         rotation=180,
         origin={-10,20})));
 
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPipe_R(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPipe_R(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -48,7 +48,7 @@ model Connection2PipeExample
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={30,82})));
-  Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v
+  Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v
     connection2PipeplugFlow(
     redeclare package Medium = MediumW,
     mDis_flow_nominal=mDis_flow_nominal,
@@ -62,7 +62,7 @@ model Connection2PipeExample
     p=300000,
     nPorts=1)
     annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDisPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDisPlugFlow(
     dp_nominal=100000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Distribution network pump" annotation (
@@ -70,7 +70,7 @@ model Connection2PipeExample
         extent={{-10,10},{10,-10}},
         rotation=180,
         origin={-12,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumConPlugFlow(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPlugFlow(
     dp_nominal=5000,
     redeclare final package Medium = MediumW,
     m_flow_nominal=mDis_flow_nominal) "Agent connection pump" annotation (
@@ -153,17 +153,17 @@ equation
   connect(bouDisPipe_R.ports[1], connection2Pipe_R.port_aDisSup) annotation (
       Line(points={{-30,20},{-24,20},{-24,50},{20,50}}, color={0,127,255}));
   annotation (__Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos" "Simulate and plot"),
     experiment(
       StopTime=3600,
       Tolerance=1e-06),
     Documentation(info="<html>
 <p>
 Example model of two two-pipe connection models that could be used i.e for building a bi-directional network to connect one agent in series.  It uses 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R</a> and 
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution supply pipe and release it in the return pipe.
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection2Pipe_R</a> and 
+<a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v</a>. The agent, in this example just a pump, will draw water from the distribution supply pipe and release it in the return pipe.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/DHC/Networks/Connections/Examples/package.mo b/Buildings/DHC/Networks/Connections/Examples/package.mo
new file mode 100644
index 00000000000..0323c15dd0a
--- /dev/null
+++ b/Buildings/DHC/Networks/Connections/Examples/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Networks.Connections;
+package Examples "This package contains example models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains an example illustrating the use of the model in
+<a href=\"modelica://Buildings.DHC.Loads.Combined\">
+Buildings.DHC.Loads.Combined</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/package.order b/Buildings/DHC/Networks/Connections/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Connections/Examples/package.order
rename to Buildings/DHC/Networks/Connections/Examples/package.order
diff --git a/Buildings/DHC/Networks/Connections/package.mo b/Buildings/DHC/Networks/Connections/package.mo
new file mode 100644
index 00000000000..bdb6a2ce169
--- /dev/null
+++ b/Buildings/DHC/Networks/Connections/package.mo
@@ -0,0 +1,9 @@
+within Buildings.DHC.Networks;
+package Connections "Package containing various configurations for connecting network participants to a distribution network"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains hydronic connection models that allow an agent to connect to the distribution network.
+</p>
+</html>"));
+end Connections;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/package.order b/Buildings/DHC/Networks/Connections/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Connections/package.order
rename to Buildings/DHC/Networks/Connections/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo b/Buildings/DHC/Networks/Controls/AgentPump1Pipe.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo
rename to Buildings/DHC/Networks/Controls/AgentPump1Pipe.mo
index 56b23f6b73f..b7808b77a7e 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/AgentPump1Pipe.mo
+++ b/Buildings/DHC/Networks/Controls/AgentPump1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls;
+within Buildings.DHC.Networks.Controls;
 block AgentPump1Pipe
   "Ambient network storage and plants agent pump control, developed for reservoir network"
    parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType =
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo b/Buildings/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
similarity index 84%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
rename to Buildings/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
index 05890a1b754..356f9117428 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
+++ b/Buildings/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls.Examples;
+within Buildings.DHC.Networks.Controls.Examples;
 model AgentPump1PipeExample
     extends Modelica.Icons.Example;
     parameter Modelica.Units.SI.Temperature TSou(displayUnit="degC") = 283.15
@@ -7,7 +7,7 @@ model AgentPump1PipeExample
   table=[0,TSou; 900,TSou + 3; 2700, TSou - 3; 3600,TSou],
   extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     annotation (Placement(transformation(extent={{-80,58},{-60,78}})));
-  Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe AgentPump(
+  Buildings.DHC.Networks.Controls.AgentPump1Pipe AgentPump(
     yPumMin=0,
     dToff=0.5,
     k=1,
@@ -40,7 +40,7 @@ equation
                                    color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos"
     "Simulate and plot"),
     experiment(StopTime=3600,Tolerance=1e-06),
     Documentation(revisions="<html>
@@ -53,8 +53,8 @@ First implementation.
 </html>", info="<html>
 <p>
 This model is used to test the controller
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe\">Buildings.Experimental.DHC.Networks.Controls.AgentPump</a>.
-For a practical application of the model check <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowUpdate</a>.
+<a href=\"modelica://Buildings.DHC.Networks.Controls.AgentPump1Pipe\">Buildings.DHC.Networks.Controls.AgentPump</a>.
+For a practical application of the model check <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">Buildings.DHC.Examples.Combined.SeriesVariableFlowUpdate</a>.
 </p>
 </html>"));
 end AgentPump1PipeExample;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo b/Buildings/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
rename to Buildings/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
index f89d8d2caee..dc8758b428e 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
+++ b/Buildings/DHC/Networks/Controls/Examples/MainPump1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls.Examples;
+within Buildings.DHC.Networks.Controls.Examples;
 model MainPump1PipeExample
     extends Modelica.Icons.Example;
     parameter Modelica.Units.SI.Temperature TSou(displayUnit="degC") = 284.65
@@ -11,7 +11,7 @@ model MainPump1PipeExample
   table=[0,TSou; 900,TSou + 4; 2700,TSou - 4; 3600,TSou],
   extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
     annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
-  MainPump1Pipe conPum(
+  Buildings.DHC.Networks.Controls.MainPump1Pipe conPum(
     nMix=1,
     nSou=1,
     nBui=1,
@@ -34,7 +34,7 @@ equation
                               color={0,0,127}));
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos"
   "Simulate and plot"),
     experiment(StopTime=3600,Tolerance=1e-06),
     Documentation(revisions="<html>
@@ -47,7 +47,7 @@ First implementation.
 </html>", info="<html>
 <p>
 This model is used to test the controller
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe\">Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe</a>.For a practical application of the model check <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.Networks.Controls.MainPump1Pipe\">Buildings.DHC.Networks.Controls.MainPump1Pipe</a>.For a practical application of the model check <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">Buildings.DHC.Examples.Combined.SeriesVariableFlow</a>.
 </p>
 </html>"));
 end MainPump1PipeExample;
diff --git a/Buildings/DHC/Networks/Controls/Examples/package.mo b/Buildings/DHC/Networks/Controls/Examples/package.mo
new file mode 100644
index 00000000000..ee876d8fd64
--- /dev/null
+++ b/Buildings/DHC/Networks/Controls/Examples/package.mo
@@ -0,0 +1,4 @@
+within Buildings.DHC.Networks.Controls;
+package Examples "District controller example models"
+  extends Modelica.Icons.ExamplesPackage;
+end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/package.order b/Buildings/DHC/Networks/Controls/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Controls/Examples/package.order
rename to Buildings/DHC/Networks/Controls/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Controls/MainPump1Pipe.mo b/Buildings/DHC/Networks/Controls/MainPump1Pipe.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/Controls/MainPump1Pipe.mo
rename to Buildings/DHC/Networks/Controls/MainPump1Pipe.mo
index 6f24b7cc0f0..64b92d74467 100644
--- a/Buildings/Experimental/DHC/Networks/Controls/MainPump1Pipe.mo
+++ b/Buildings/DHC/Networks/Controls/MainPump1Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Controls;
+within Buildings.DHC.Networks.Controls;
 model MainPump1Pipe
   "Main pump controller for 1 pipe networks, developed for reservoir network main circulation loop"
   parameter Integer nMix(min=1) "Number of mixing points after the substations";
@@ -349,7 +349,7 @@ Therefore, the pump speeds are calculated as shown in the figure below.
 <p>
 <br/>
 <img alt=\"Image of the control that adjusts the pump speed\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Networks/Controls/MainPump.png\"/>
 <br/>
 </p>
 <p>
@@ -377,8 +377,8 @@ by checking that the cooling demand for each energy transfer station via
 </p>
 <p>
 For a typical usage of this controller, see
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">
-Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow</a>.
+<a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">
+Buildings.DHC.Examples.Combined.SeriesVariableFlow</a>.
 </p>
 </html>"));
 end MainPump1Pipe;
diff --git a/Buildings/DHC/Networks/Controls/package.mo b/Buildings/DHC/Networks/Controls/package.mo
new file mode 100644
index 00000000000..3479d034cf5
--- /dev/null
+++ b/Buildings/DHC/Networks/Controls/package.mo
@@ -0,0 +1,47 @@
+within Buildings.DHC.Networks;
+package Controls "Package of control blocks for distribution systems"
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for control of distribution networks.
+</p>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100,-100},{100,100}},
+          radius=25.0),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100,-100},{100,100}},
+          radius=25.0),
+      Rectangle(
+        origin={0,35.1488},
+        fillColor={255,255,255},
+        extent={{-30.0,-20.1488},{30.0,20.1488}}),
+      Rectangle(
+        origin={0,-34.8512},
+        fillColor={255,255,255},
+        extent={{-30.0,-20.1488},{30.0,20.1488}}),
+      Line(
+        origin={-51.25,0},
+        points={{21.25,-35.0},{-13.75,-35.0},{-13.75,35.0},{6.25,35.0}}),
+      Polygon(
+        origin={-40,35},
+        pattern=LinePattern.None,
+        fillPattern=FillPattern.Solid,
+        points={{10.0,0.0},{-5.0,5.0},{-5.0,-5.0}}),
+      Line(
+        origin={51.25,0},
+        points={{-21.25,35.0},{13.75,35.0},{13.75,-35.0},{-6.25,-35.0}}),
+      Polygon(
+        origin={40,-35},
+        pattern=LinePattern.None,
+        fillPattern=FillPattern.Solid,
+        points={{-10.0,0.0},{5.0,5.0},{5.0,-5.0}})}));
+end Controls;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/package.order b/Buildings/DHC/Networks/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Controls/package.order
rename to Buildings/DHC/Networks/Controls/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Distribution1PipePlugFlow_v.mo b/Buildings/DHC/Networks/Distribution1PipePlugFlow_v.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Networks/Distribution1PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Distribution1PipePlugFlow_v.mo
index af7b2125bc5..fbadda34687 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution1PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Distribution1PipePlugFlow_v.mo
@@ -1,9 +1,9 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution1PipePlugFlow_v
   "Model of a one-pipe distribution network with plug flow pipes in the main line with hydraulic diameter calculated from nominal velocity"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
     tau=5*60,
-    redeclare Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v
+    redeclare Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v
       con[nCon](
       each final dIns=dIns,
       each final kIns=kIns,
@@ -58,8 +58,8 @@ equation
 <p>
 This model represents a one-pipe distribution network using a connection model with a plug flow pipe
 model (pressure drop, heat transfer, transport delays) in the main line whose hydraulic diameters
-are calculated based on nominal velocity at nominal flow rate  <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow</a>. The same pipe model at the end of
+are calculated based on nominal velocity at nominal flow rate  <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection1PipePlugFlow</a>. The same pipe model at the end of
 the distribution line (after the last connection).
 </p>
 </html>", revisions="<html>
diff --git a/Buildings/Experimental/DHC/Networks/Distribution1Pipe_R.mo b/Buildings/DHC/Networks/Distribution1Pipe_R.mo
similarity index 80%
rename from Buildings/Experimental/DHC/Networks/Distribution1Pipe_R.mo
rename to Buildings/DHC/Networks/Distribution1Pipe_R.mo
index 5fa70c35d9e..0415da03c8f 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution1Pipe_R.mo
+++ b/Buildings/DHC/Networks/Distribution1Pipe_R.mo
@@ -1,14 +1,14 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution1Pipe_R
   "Model of a one-pipe distribution network with hydraulic diameter of main line pipes calculated from pressure drop per length"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution1Pipe(
     tau=5*60,
-    redeclare Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R
+    redeclare Buildings.DHC.Networks.Connections.Connection1Pipe_R
       con[nCon](
       each final dp_length_nominal=dp_length_nominal,
       final lDis=lDis,
       final dhDis=dhDis),
-    redeclare model Model_pipDis = Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize(
+    redeclare model Model_pipDis = Buildings.DHC.Networks.Pipes.PipeAutosize(
         final dp_length_nominal=dp_length_nominal,
         final dh(fixed=true) = dhEnd,
         final length=lEnd),
@@ -34,8 +34,8 @@ model Distribution1Pipe_R
   annotation (Documentation(info="<html>
 <p>
 This is a model of a one-pipe distribution network using a connection model with pipes in the main line whose hydraulic diameters 
-are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R</a>. The same pipe model is also used
+are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection1Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection1Pipe_R</a>. The same pipe model is also used
 at the end of the distribution line (after the last connection) only on the supply side.
 </p>
 <h4>Modeling considerations</h4>
@@ -43,8 +43,8 @@ at the end of the distribution line (after the last connection) only on the supp
 Note that <code>dhDis</code> needs to be vectorized, even if the same value
 is computed for each array element in case of a one-pipe network.
 This is because the pipe diameter is computed at initialization by the model
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a>
+<a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a>
 which is instantiated for each connection.
 So the initialization system of equations would be overdetermined if using
 a parameter binding with a scalar variable.
diff --git a/Buildings/Experimental/DHC/Networks/Distribution2PipePlugFlow_v.mo b/Buildings/DHC/Networks/Distribution2PipePlugFlow_v.mo
similarity index 92%
rename from Buildings/Experimental/DHC/Networks/Distribution2PipePlugFlow_v.mo
rename to Buildings/DHC/Networks/Distribution2PipePlugFlow_v.mo
index 5af200759da..0d5eb0401ec 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution2PipePlugFlow_v.mo
+++ b/Buildings/DHC/Networks/Distribution2PipePlugFlow_v.mo
@@ -1,7 +1,7 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution2PipePlugFlow_v
   "Model of a two-pipe distribution network using plug flow pipe models in the main lines with hydraulic diameter calculated from nominal velocity"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
       redeclare Connections.Connection2PipePlugFlow_v con[nCon](
       final lDis=lDis,
       each final dIns=dIns,
@@ -68,8 +68,8 @@ equation
 <p>
 This is a model of a two-pipe distribution network using a connection model with a plug flow pipe
 model (pressure drop, heat transfer, transport delays) in the main lines whose hydraulic diameters
-are calculated based on nominal velocity at nominal flow rate <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow</a>. The same pipe model is also used
+are calculated based on nominal velocity at nominal flow rate <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
+Buildings.DHC.Networks.Connections.Connection2PipePlugFlow</a>. The same pipe model is also used
 at the end of the distribution line (after the last connection) only on the supply side.
 </p>
 </html>",
diff --git a/Buildings/Experimental/DHC/Networks/Distribution2Pipe_R.mo b/Buildings/DHC/Networks/Distribution2Pipe_R.mo
similarity index 81%
rename from Buildings/Experimental/DHC/Networks/Distribution2Pipe_R.mo
rename to Buildings/DHC/Networks/Distribution2Pipe_R.mo
index 9aefa16c25d..01bad36994d 100644
--- a/Buildings/Experimental/DHC/Networks/Distribution2Pipe_R.mo
+++ b/Buildings/DHC/Networks/Distribution2Pipe_R.mo
@@ -1,15 +1,15 @@
-within Buildings.Experimental.DHC.Networks;
+within Buildings.DHC.Networks;
 model Distribution2Pipe_R
   "Model of a two-pipe distribution network with hydraulic diameter of main line pipes calculated from pressure drop per length"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
     tau=5*60,
-    redeclare Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R
+    redeclare Buildings.DHC.Networks.Connections.Connection2Pipe_R
       con[nCon](
       each final dp_length_nominal=dp_length_nominal,
       final lDis=lDis,
       final dhDis=dhDis,
       final dhDisRet=dhDisRet),
-    redeclare model Model_pipDis = Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize(
+    redeclare model Model_pipDis = Buildings.DHC.Networks.Pipes.PipeAutosize(
         roughness=7e-6,
         fac=1.5,
         final dp_length_nominal=dp_length_nominal,
@@ -41,8 +41,8 @@ model Distribution2Pipe_R
   annotation (Documentation(info="<html>
 <p>
 This is a model of a two-pipe distribution network using a connection model with pipes in the main lines whose hydraulic diameters 
-are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R\">
-Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R</a>. The same pipe model is also used
+are calculated at initialization based on the pressure drop per pipe length at nominal flow rate <a href=\"modelica://Buildings.DHC.Networks.Connections.Connection2Pipe_R\">
+Buildings.DHC.Networks.Connections.Connection2Pipe_R</a>. The same pipe model is also used
 at the end of the distribution line (after the last connection) only on the supply side.
 </p>
 <h4>Modeling considerations</h4>
@@ -50,8 +50,8 @@ at the end of the distribution line (after the last connection) only on the supp
 Note that <code>dhDis</code> needs to be vectorized, even if the same value
 is computed for each array element in case of a one-pipe network.
 This is because the pipe diameter is computed at initialization by the model
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a>
+<a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Pipes.PipeAutosize</a>
 which is instantiated for each connection.
 So the initialization system of equations would be overdetermined if using
 a parameter binding with a scalar variable.
diff --git a/Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo b/Buildings/DHC/Networks/Examples/Distribution1PipeExample.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo
rename to Buildings/DHC/Networks/Examples/Distribution1PipeExample.mo
index 865201ebb8f..2048b273fbe 100644
--- a/Buildings/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mo
+++ b/Buildings/DHC/Networks/Examples/Distribution1PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Examples;
+within Buildings.DHC.Networks.Examples;
 model Distribution1PipeExample
   "Example of distribution network with 1 pipe for Distribution1Pipe_R and Distribution1PipePlugFlow_v"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model Distribution1PipeExample
     "Source side medium";
   package Medium2 = Buildings.Media.Air
     "Load side medium";
-  parameter String filNam = "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam = "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa=5
     "Number of served loads"
@@ -39,11 +39,11 @@ model Distribution1PipeExample
   sum(disAutoSize.con.pipDis.dp_nominal) + max(terAutoSize.dpSou_nominal)
     "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal =
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
       filNam = Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
     terAutoSize[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
@@ -87,7 +87,7 @@ model Distribution1PipeExample
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-70,10})));
-  Buildings.Experimental.DHC.Networks.Distribution1Pipe_R disAutoSize(
+  Buildings.DHC.Networks.Distribution1Pipe_R disAutoSize(
     redeclare final package Medium = Medium1,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -112,7 +112,7 @@ model Distribution1PipeExample
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(k=max(
         terAutoSize.T_aHeaWat_nominal)) "Supply temperature"
     annotation (Placement(transformation(extent={{-120,0},{-100,20}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
     redeclare each final package Medium2 = Medium2,
@@ -122,7 +122,7 @@ model Distribution1PipeExample
     each final T_bHeaWat_nominal=T_bHeaWat_nominal,
     each final T_aLoaHea_nominal=T_aLoaHea_nominal) "Heating terminal unit"
     annotation (Placement(transformation(extent={{30,-16},{50,4}})));
-  Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v disPlugFlow(
+  Buildings.DHC.Networks.Distribution1PipePlugFlow_v disPlugFlow(
     nCon=nLoa,
     redeclare final package Medium = Medium1,
     allowFlowReversal=false,
@@ -158,7 +158,7 @@ model Distribution1PipeExample
         extent={{-11,10},{11,-10}},
         rotation=0,
         origin={41,-100})));
-  EnergyTransferStations.BaseClasses.Pump_m_flow pumConAutoSize[nLoa](
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConAutoSize[nLoa](
     each dp_nominal=5000,
     redeclare final package Medium = Medium1,
     each m_flow_nominal=mLoaHea_flow_nominal) "Distribution network pump"
@@ -172,7 +172,7 @@ model Distribution1PipeExample
   Modelica.Blocks.Sources.RealExpression mFlowConAutosize(
   y=terAutoSize[1].val.y_actual*mLoaHea_flow_nominal)
     annotation (Placement(transformation(extent={{120,50},{100,70}})));
-  EnergyTransferStations.BaseClasses.Pump_m_flow pumConPlugFlow[nLoa](
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumConPlugFlow[nLoa](
     each dp_nominal=5000,
     redeclare final package Medium = Medium1,
     each m_flow_nominal=mLoaHea_flow_nominal) "Distribution network pump"
@@ -263,12 +263,12 @@ equation
       info="<html>
 <p>
 Example model of two one-pipe distribution models that could be used i.e for building a reservoir network to connect several agents in series.
-It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1Pipe_R\">
-Buildings.Experimental.DHC.Networks.Distribution1Pipe_R</a> and <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v\">
-Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v</a>. The distribution models create a vector of <code>nLoa</code> connection models
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\"> Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector
-of <code>nLoa</code> agents made up by time series heating loads <a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the distribution pipe and release
+It showcases <a href=\"modelica://Buildings.DHC.Networks.Distribution1Pipe_R\">
+Buildings.DHC.Networks.Distribution1Pipe_R</a> and <a href=\"modelica://Buildings.DHC.Networks.Distribution1PipePlugFlow_v\">
+Buildings.DHC.Networks.Distribution1PipePlugFlow_v</a>. The distribution models create a vector of <code>nLoa</code> connection models
+<a href=\"modelica://Buildings.DHC.Networks.Connections\"> Buildings.DHC.Networks.Connections</a> that are connected to a vector
+of <code>nLoa</code> agents made up by time series heating loads <a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
+Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the distribution pipe and release
 it to the same pipe.
 </p>
 </html>",
@@ -288,5 +288,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos" "Simulate and plot"));
 end Distribution1PipeExample;
diff --git a/Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo b/Buildings/DHC/Networks/Examples/Distribution2PipeExample.mo
similarity index 88%
rename from Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo
rename to Buildings/DHC/Networks/Examples/Distribution2PipeExample.mo
index 81b6cf1d4ec..e0973449a29 100644
--- a/Buildings/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mo
+++ b/Buildings/DHC/Networks/Examples/Distribution2PipeExample.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Examples;
+within Buildings.DHC.Networks.Examples;
 model Distribution2PipeExample
   "Example of distribution network with 2 pipes for Distribution2Pipe_R and Distribution2PipePlugFlow_v"
   extends Modelica.Icons.Example;
@@ -6,7 +6,7 @@ model Distribution2PipeExample
     "Source side medium";
   package Medium2 = Buildings.Media.Air
     "Load side medium";
-  parameter String filNam = "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos"
+  parameter String filNam = "modelica://Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos"
     "File name with thermal loads as time series";
   parameter Integer nLoa = 5
     "Number of served loads"
@@ -41,11 +41,11 @@ model Distribution2PipeExample
        + max(terAutoSize.dpSou_nominal)
     "Nominal pressure drop in the distribution line";
   final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
+      Buildings.DHC.Loads.BaseClasses.getPeakLoad(string="#Peak space heating load",
       filNam = Modelica.Utilities.Files.loadResource(filNam))/facMul
     "Design heating heat flow rate (>=0)"
     annotation (Dialog(group="Design parameter"));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve
     terAutoSize[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
@@ -89,7 +89,7 @@ model Distribution2PipeExample
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-50,10})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R disAutoSize(
+  Buildings.DHC.Networks.Distribution2Pipe_R disAutoSize(
     redeclare final package Medium = Medium1,
     nCon=nLoa,
     allowFlowReversal=false,
@@ -115,7 +115,7 @@ model Distribution2PipeExample
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(
   k=max(terAutoSize.T_aHeaWat_nominal)) "Supply temperature"
     annotation (Placement(transformation(extent={{-100,0},{-80,20}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
+  Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve terPlugFlow[nLoa](
     each final facMul=facMul,
     redeclare each final package Medium1 = Medium1,
     redeclare each final package Medium2 = Medium2,
@@ -125,7 +125,7 @@ model Distribution2PipeExample
     each final T_bHeaWat_nominal=T_bHeaWat_nominal,
     each final T_aLoaHea_nominal=T_aLoaHea_nominal) "Heating terminal unit"
     annotation (Placement(transformation(extent={{50,-20},{70,0}})));
-  Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v disPlugFlow(
+  Buildings.DHC.Networks.Distribution2PipePlugFlow_v disPlugFlow(
     nCon=nLoa,
     redeclare final package Medium = Medium1,
     allowFlowReversal=false,
@@ -233,12 +233,12 @@ equation
       info="<html>
 <p>
 Example model of two two-pipe distribution models that can be used i.e. for building a bi-directional network to connect several agents in series.
-It showcases <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2Pipe_R\"> Buildings.Experimental.DHC.Networks.Distribution2Pipe_R</a>
-and <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\"> Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v</a>.
- The distribution models create a vector of <code>nLoa</code> connection models <a href=\"modelica://Buildings.Experimental.DHC.Networks.Connections\">
-Buildings.Experimental.DHC.Networks.Connections</a> that are connected to a vector of <code>nLoa</code> agents made up by time series heating loads
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the supply distribution pipe
+It showcases <a href=\"modelica://Buildings.DHC.Networks.Distribution2Pipe_R\"> Buildings.DHC.Networks.Distribution2Pipe_R</a>
+and <a href=\"modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\"> Buildings.DHC.Networks.Distribution2PipePlugFlow_v</a>.
+ The distribution models create a vector of <code>nLoa</code> connection models <a href=\"modelica://Buildings.DHC.Networks.Connections\">
+Buildings.DHC.Networks.Connections</a> that are connected to a vector of <code>nLoa</code> agents made up by time series heating loads
+<a href=\"modelica://Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve\">
+Buildings.DHC.Loads.BaseClasses.Validation.BaseClasses.FanCoil2PipeHeatingValve</a>. Each agent will draw water from the supply distribution pipe
 and release it in the return pipe.
 </p>
 </html>",
@@ -261,5 +261,5 @@ First implementation.
         preserveAspectRatio=false,
         extent={{-120,-120},{120,120}})),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos" "Simulate and plot"));
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos" "Simulate and plot"));
 end Distribution2PipeExample;
diff --git a/Buildings/DHC/Networks/Examples/package.mo b/Buildings/DHC/Networks/Examples/package.mo
new file mode 100644
index 00000000000..2cdffcc2bbb
--- /dev/null
+++ b/Buildings/DHC/Networks/Examples/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Networks;
+package Examples "This package contains example models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains an example illustrating the use of the model in
+<a href=\"modelica://Buildings.DHC.Networks\">
+Buildings.DHC.Networks</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Examples/package.order b/Buildings/DHC/Networks/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Examples/package.order
rename to Buildings/DHC/Networks/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/PipeAutosize.mo b/Buildings/DHC/Networks/Pipes/PipeAutosize.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Networks/Pipes/PipeAutosize.mo
rename to Buildings/DHC/Networks/Pipes/PipeAutosize.mo
index 5ae886627e5..a061c8fc9f3 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/PipeAutosize.mo
+++ b/Buildings/DHC/Networks/Pipes/PipeAutosize.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Pipes;
+within Buildings.DHC.Networks.Pipes;
 model PipeAutosize "Pipe model parameterized with pressure drop per pipe length"
   extends Buildings.Fluid.FixedResistances.PressureDrop(
     final deltaM = eta_default*dh/4*Modelica.Constants.pi*ReC/m_flow_nominal_pos,
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/PipeStandard.mo b/Buildings/DHC/Networks/Pipes/PipeStandard.mo
similarity index 95%
rename from Buildings/Experimental/DHC/Networks/Pipes/PipeStandard.mo
rename to Buildings/DHC/Networks/Pipes/PipeStandard.mo
index 82a20879bbc..dcfed819bd4 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/PipeStandard.mo
+++ b/Buildings/DHC/Networks/Pipes/PipeStandard.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Pipes;
+within Buildings.DHC.Networks.Pipes;
 model PipeStandard "Pipe model parameterized with hydraulic diameter"
   extends Buildings.Fluid.FixedResistances.HydraulicDiameter(
     dp(nominal = 1E5),
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/Validation/Pipe.mo b/Buildings/DHC/Networks/Pipes/Validation/Pipe.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Networks/Pipes/Validation/Pipe.mo
rename to Buildings/DHC/Networks/Pipes/Validation/Pipe.mo
index 67e935fd4f1..97a140dada4 100644
--- a/Buildings/Experimental/DHC/Networks/Pipes/Validation/Pipe.mo
+++ b/Buildings/DHC/Networks/Pipes/Validation/Pipe.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Networks.Pipes.Validation;
+within Buildings.DHC.Networks.Pipes.Validation;
 model Pipe "Validates the PipeAutosize model initialization"
   extends Modelica.Icons.Example;
   package Medium = Buildings.Media.Water "Medium model";
@@ -12,7 +12,7 @@ model Pipe "Validates the PipeAutosize model initialization"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={50,0})));
-  Buildings.Experimental.DHC.Networks.Pipes.PipeStandard pipSta1(
+  Buildings.DHC.Networks.Pipes.PipeStandard pipSta1(
     redeclare final package Medium = Medium,
     m_flow_nominal=m1_flow_nominal,
     dh=0.00548,
@@ -28,7 +28,7 @@ model Pipe "Validates the PipeAutosize model initialization"
     m_flow=m2_flow_nominal,
     nPorts=1) "Source of water flow for autosized pipe 2"
     annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
-  Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize pipAut2(
+  Buildings.DHC.Networks.Pipes.PipeAutosize pipAut2(
     redeclare final package Medium = Medium,
     m_flow_nominal=m2_flow_nominal,
     dp_length_nominal=dp2_length_nominal,
@@ -75,8 +75,8 @@ equation
     annotation (Line(points={{10,-60},{40,-60},{40,-1.5}}, color={0,127,255}));
   annotation (Documentation(info="<html>
 <p>
-Validation model for <a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize</a>
+Validation model for <a href=\"modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize</a>
 for range of flow rates and pressure drops per unit length.
 </p>
 </html>", revisions="<html>
@@ -93,7 +93,7 @@ This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\
 </li>
 </ul>
 </html>"),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos"
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos"
         "Simulate and plot"),
 experiment(
       StopTime=1,
diff --git a/Buildings/DHC/Networks/Pipes/Validation/package.mo b/Buildings/DHC/Networks/Pipes/Validation/package.mo
new file mode 100644
index 00000000000..0ecb66dec17
--- /dev/null
+++ b/Buildings/DHC/Networks/Pipes/Validation/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Networks.Pipes;
+package Validation "Validation models for Pipes"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation cases for the BaseClasses found in
+<a href=\"modelica://Buildings.DHC.Networks.Pipes\">
+Buildings.DHC.Networks.Pipes</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.order b/Buildings/DHC/Networks/Pipes/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Pipes/Validation/package.order
rename to Buildings/DHC/Networks/Pipes/Validation/package.order
diff --git a/Buildings/DHC/Networks/Pipes/package.mo b/Buildings/DHC/Networks/Pipes/package.mo
new file mode 100644
index 00000000000..ecadf6ca8cc
--- /dev/null
+++ b/Buildings/DHC/Networks/Pipes/package.mo
@@ -0,0 +1,7 @@
+within Buildings.DHC.Networks;
+package Pipes "Package containing pipe models used within district network modeling"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (Documentation(info="<html>
+This package contains pipe models specific for distribution networks.
+</html>"));
+end Pipes;
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/package.order b/Buildings/DHC/Networks/Pipes/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Pipes/package.order
rename to Buildings/DHC/Networks/Pipes/package.order
diff --git a/Buildings/DHC/Networks/Steam/ConnectionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/ConnectionCondensatePipe.mo
new file mode 100644
index 00000000000..1d39c395729
--- /dev/null
+++ b/Buildings/DHC/Networks/Steam/ConnectionCondensatePipe.mo
@@ -0,0 +1,88 @@
+within Buildings.DHC.Networks.Steam;
+model ConnectionCondensatePipe
+  "Connection for a steam district heating network featuring the condensate return pipe"
+  extends
+    Buildings.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
+    redeclare final model Model_pipDisRet =
+        Buildings.Fluid.FixedResistances.PressureDrop (
+          final dp_nominal=dp_nominal),
+    redeclare model Model_pipDisSup =
+        Buildings.Fluid.FixedResistances.LosslessPipe);
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
+    "Pressure drop at nominal mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  Buildings.Fluid.FixedResistances.PressureDrop pipConRet(
+    redeclare package Medium = MediumRet,
+    m_flow_nominal=mCon_flow_nominal,
+    final dp_nominal=dp_nominal)
+    "Connection return pipe"
+    annotation (Placement(transformation(
+      extent={{10,-10},{-10,10}},rotation=90,origin={20,-10})));
+equation
+  connect(port_aCon, pipConRet.port_a)
+    annotation (Line(points={{20,120},{20,0}}, color={0,127,255}));
+  connect(pipConRet.port_b, junConRet.port_3)
+    annotation (Line(points={{20,-20},{20,-70}}, color={0,127,255}));
+  connect(port_bCon, junConSup.port_3)
+    annotation (Line(points={{-20,120},{-20,-30}}, color={0,127,255}));
+  connect(pipDisSup.port_b, junConSup.port_1)
+    annotation (Line(points={{-60,-40},{-30,-40}}, color={0,127,255}));
+  connect(pipDisRet.port_a, junConRet.port_2)
+    annotation (Line(points={{-60,-80},{10,-80}}, color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{48,76},{72,24}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-76,-48},{-20,-72}},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0})}),
+        Diagram(
+          coordinateSystem(preserveAspectRatio=false)),
+          defaultComponentName="con",
+    Documentation(info="<html>
+<p>
+This network connection model contains one pipe declaration
+for the condensate pipe, featuring a fixed hydraulic resistance.
+This model is intended for steam heating systems that utilize
+a split-medium approach with two separate medium declarations
+between liquid and vapor states.
+</p>
+<p>
+In this model, it is assumed that there are no mass losses in
+the network connection. Further, heat transfer with the external
+environment and transport delays are also not included.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Updated publication references.
+</li>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ConnectionCondensatePipe;
diff --git a/Buildings/DHC/Networks/Steam/DistributionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/DistributionCondensatePipe.mo
new file mode 100644
index 00000000000..9a1160bae1e
--- /dev/null
+++ b/Buildings/DHC/Networks/Steam/DistributionCondensatePipe.mo
@@ -0,0 +1,63 @@
+within Buildings.DHC.Networks.Steam;
+model DistributionCondensatePipe
+  "Model of a steam distribution network using fixed resistance pipe model for condensate returns"
+  extends Buildings.DHC.Networks.BaseClasses.PartialDistribution2Pipe2Medium(
+    redeclare ConnectionCondensatePipe con[nCon](
+      each final dp_nominal=dp_nominal),
+    redeclare model Model_pipDis=Buildings.Fluid.FixedResistances.LosslessPipe);
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
+    "Pressure drop at nominal mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  annotation (
+  defaultComponentName="dis",
+    Documentation(
+      info="<html>
+<p>
+This is a model of a distribution network for steam heating systems.
+The model utilizes a split-medium approach with two separate medium
+declarations between liquid (condensate return) and vapor (steam
+supply) states. The piping network features:
+</p>
+<ul>
+<li>
+a connection model with fixed hydraulic resistance and no heat loss
+in the condensate return pipe segments;
+</li>
+<li>
+a dummy pipe model with no hydraulic resistance and no heat loss for
+the steam supply pipes; and
+</li>
+<li>
+a dummy pipe model with no hydraulic resistance and no heat loss for the end of
+the distribution line (after the last connection).
+</li>
+</ul>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Updated publication references.
+</li>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end DistributionCondensatePipe;
diff --git a/Buildings/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
new file mode 100644
index 00000000000..d5c5b3c19f4
--- /dev/null
+++ b/Buildings/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
@@ -0,0 +1,98 @@
+within Buildings.DHC.Networks.Steam.Examples;
+model ConnectionCondensatePipe "Example model for the steam heating connection block"
+  extends Modelica.Icons.Example;
+
+  package MediumSte = Buildings.Media.Steam "Steam medium";
+  package MediumWat =
+      Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium";
+
+  parameter Modelica.Units.SI.AbsolutePressure pSat = 150000
+    "Saturation pressure";
+  parameter Modelica.Units.SI.Temperature TSat = MediumSte.saturationTemperature(pSat)
+     "Saturation temperature";
+  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal = MediumSte.specificEnthalpy(
+  MediumSte.setState_pTX(p=pSat,T=TSat,X=MediumSte.X_default)) -
+  MediumWat.specificEnthalpy(MediumWat.setState_pTX(p=pSat,T=TSat,X=MediumWat.X_default))
+    "Nominal change in enthalpy due to vaporization";
+  parameter Modelica.Units.SI.Power Q_flow_nominal = 200E3
+    "Nominal heat flow rate";
+  parameter Real QHeaLoa[:, :] = [0, 200E3; 6, 200E3; 6, 50E3; 18, 50E3; 18, 75E3; 24, 75E3]
+    "Heating load profile for the building";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 6000
+    "Pressure drop at nominal mass flow rate";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/dh_nominal
+    "Nominal mass flow rate";
+
+  Modelica.Blocks.Sources.Ramp ram(duration=60, startTime=60) "Ramp signal"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  Fluid.Sources.MassFlowSource_T souWat(
+    redeclare package Medium = MediumWat,
+    use_m_flow_in=true,
+    nPorts=1)
+    "Water source"
+    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
+  Fluid.Sources.MassFlowSource_T souSte(
+    redeclare package Medium = MediumSte,
+    use_m_flow_in=true,
+    nPorts=1)
+    "Steam source"
+    annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
+  Buildings.Fluid.Sources.Boundary_pT sinWat(
+    redeclare package Medium = MediumWat,
+    p(displayUnit="Pa") = 101325,
+    nPorts=1)
+    "Water condensate sink"
+    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
+  Fluid.Sources.Boundary_pT sinSte(
+    redeclare package Medium = MediumSte,
+    p=pSat,
+    T=TSat,
+    nPorts=1)
+    "Steam sink"
+    annotation (Placement(transformation(extent={{80,20},{60,40}})));
+  Buildings.DHC.Networks.Steam.ConnectionCondensatePipe con(
+    redeclare package MediumSup = MediumSte,
+    redeclare package MediumRet = MediumWat,
+    mDis_flow_nominal=m_flow_nominal,
+    mCon_flow_nominal=m_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    dp_nominal=1500)
+    "Connection block for steam systems"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+
+equation
+  connect(con.port_bDisRet, sinWat.ports[1]) annotation (Line(points={{20,-36},
+          {0,-36},{0,-70},{-20,-70}},
+                                   color={0,127,255}));
+  connect(con.port_bCon, sinSte.ports[1])
+    annotation (Line(points={{30,-20},{30,30},{60,30}}, color={0,127,255}));
+  connect(souSte.ports[1], con.port_aDisSup)
+    annotation (Line(points={{-20,-30},{20,-30}}, color={0,127,255}));
+  connect(souWat.ports[1], con.port_aCon)
+    annotation (Line(points={{60,-10},{36,-10},{36,-20}}, color={0,127,255}));
+  connect(ram.y, souSte.m_flow_in) annotation (Line(points={{-59,50},{-50,50},{
+          -50,-22},{-42,-22}}, color={0,0,127}));
+  connect(ram.y, souWat.m_flow_in) annotation (Line(points={{-59,50},{90,50},{
+          90,-2},{82,-2}}, color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
+    Diagram(coordinateSystem(preserveAspectRatio=false)),
+    experiment(StopTime=86400, Tolerance=1e-6),
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos"
+        "Simulate and plot"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model demonstrates the performance of the
+connection block for steam heating systems with a
+ramp input for the mass flow rate at the building
+interconnection.
+</p>
+</html>"));
+end ConnectionCondensatePipe;
diff --git a/Buildings/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo b/Buildings/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
new file mode 100644
index 00000000000..597c2d726f1
--- /dev/null
+++ b/Buildings/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
@@ -0,0 +1,101 @@
+within Buildings.DHC.Networks.Steam.Examples;
+model DistributionCondensatePipe
+  "Example model for the steam heating distribution network"
+  extends Modelica.Icons.Example;
+
+  package MediumSte = Buildings.Media.Steam "Steam medium";
+  package MediumWat =
+      Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium";
+
+  parameter Modelica.Units.SI.AbsolutePressure pSat = 150000
+    "Saturation pressure";
+  parameter Modelica.Units.SI.Temperature TSat = MediumSte.saturationTemperature(pSat)
+     "Saturation temperature";
+  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal = MediumSte.specificEnthalpy(
+  MediumSte.setState_pTX(p=pSat,T=TSat,X=MediumSte.X_default)) -
+  MediumWat.specificEnthalpy(MediumWat.setState_pTX(p=pSat,T=TSat,X=MediumWat.X_default))
+    "Nominal change in enthalpy due to vaporization";
+  parameter Modelica.Units.SI.Power Q1_flow_nominal=200E3
+    "Nominal heat flow rate, building 1";
+  parameter Modelica.Units.SI.Power Q2_flow_nominal=300E3
+    "Nominal heat flow rate, building 2";
+  parameter Real QHeaLoa1[:, :]= [0, 200E3; 6, 200E3; 6, 50E3; 18, 50E3; 18, 75E3; 24, 75E3]
+    "Heating load profile for the building 1";
+  parameter Real QHeaLoa2[:, :]= [0, 100E3; 6, 200E3; 6, 200E3; 10, 300E3; 18, 300E3; 24, 100E3]
+    "Heating load profile for the building 2";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=6000
+    "Pressure drop at nominal mass flow rate";
+  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
+    Q1_flow_nominal/dh_nominal
+    "Nominal mass flow rate, building 1";
+  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
+    Q2_flow_nominal/dh_nominal
+    "Nominal mass flow rate, building 2";
+
+  Buildings.Fluid.Sources.Boundary_pT souSte(
+    redeclare package Medium = MediumSte,
+    p=pSat,
+    T=TSat,
+    nPorts=1)
+    "Steam source"
+    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
+  Buildings.Fluid.Sources.Boundary_pT sinWat(
+    redeclare package Medium = MediumWat,
+    p(displayUnit="Pa") = 101325,
+    nPorts=1)
+    "Water condensate sink"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+  Buildings.DHC.Networks.Steam.DistributionCondensatePipe dis(
+    redeclare package MediumSup = MediumSte,
+    redeclare package MediumRet = MediumWat,
+    nCon=2,
+    mDis_flow_nominal=m1_flow_nominal + m2_flow_nominal,
+    mCon_flow_nominal={m1_flow_nominal,m2_flow_nominal},
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    dp_nominal=dp_nominal)
+    annotation (Placement(transformation(extent={{-20,0},{20,20}})));
+  Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui[2](
+    redeclare package MediumSte = MediumSte,
+    redeclare package MediumWat = MediumWat,
+    each pSte_nominal=pSat,
+    each TSte_nominal=TSat,
+    each dh_nominal=dh_nominal,
+    Q_flow_nominal={Q1_flow_nominal,Q2_flow_nominal},
+    each dp_nominal=dp_nominal,
+    each energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    QHeaLoa={QHeaLoa1,QHeaLoa2},
+    each timeScale(displayUnit="s") = 3600)
+    "Building vector consisting of 2 buildings"
+    annotation (Placement(transformation(extent={{60,40},{40,60}})));
+
+equation
+  connect(souSte.ports[1], dis.port_aDisSup)
+    annotation (Line(points={{-60,10},{-20,10}}, color={0,127,255}));
+  connect(sinWat.ports[1], dis.port_bDisRet) annotation (Line(points={{-60,-30},
+          {-40,-30},{-40,4},{-20,4}},   color={0,127,255}));
+  connect(dis.ports_bCon, bui.port_a)
+    annotation (Line(points={{-12,20},{-12,50},{40,50}}, color={0,127,255}));
+  connect(bui.port_b, dis.ports_aCon)
+    annotation (Line(points={{40,44},{12,44},{12,20}}, color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
+    Diagram(coordinateSystem(preserveAspectRatio=false)),
+    experiment(StopTime=86400, Tolerance=1e-6),
+    __Dymola_Commands(file=
+      "modelica://Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos"
+      "Simulate and plot"),
+    Documentation(revisions="<html>
+<ul>
+<li>
+March 2, 2022, by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model demonstrates the performance of the distribution
+network block for steam heating systems with two connected
+buildings with unique heating load profiles.
+</p>
+</html>"));
+end DistributionCondensatePipe;
diff --git a/Buildings/DHC/Networks/Steam/Examples/package.mo b/Buildings/DHC/Networks/Steam/Examples/package.mo
new file mode 100644
index 00000000000..7c9c2521a58
--- /dev/null
+++ b/Buildings/DHC/Networks/Steam/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Networks.Steam;
+package Examples "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.Networks.Steam\">
+Buildings.DHC.Networks.Steam</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/package.order b/Buildings/DHC/Networks/Steam/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Steam/Examples/package.order
rename to Buildings/DHC/Networks/Steam/Examples/package.order
diff --git a/Buildings/DHC/Networks/Steam/package.mo b/Buildings/DHC/Networks/Steam/package.mo
new file mode 100644
index 00000000000..f1f113237b7
--- /dev/null
+++ b/Buildings/DHC/Networks/Steam/package.mo
@@ -0,0 +1,10 @@
+within Buildings.DHC.Networks;
+package Steam "Collection of models for distribution networks involving steam"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models for steam heating distribution networks.
+</p>
+</html>"));
+end Steam;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/package.order b/Buildings/DHC/Networks/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/Steam/package.order
rename to Buildings/DHC/Networks/Steam/package.order
diff --git a/Buildings/DHC/Networks/package.mo b/Buildings/DHC/Networks/package.mo
new file mode 100644
index 00000000000..c57aff4ef7f
--- /dev/null
+++ b/Buildings/DHC/Networks/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC;
+package Networks "Package of models for district energy distribution networks"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for elements that form district energy distribution
+networks.
+</p>
+</html>"));
+end Networks;
diff --git a/Buildings/Experimental/DHC/Networks/package.order b/Buildings/DHC/Networks/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Networks/package.order
rename to Buildings/DHC/Networks/package.order
diff --git a/Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo b/Buildings/DHC/Plants/BaseClasses/PartialPlant.mo
similarity index 90%
rename from Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo
rename to Buildings/DHC/Plants/BaseClasses/PartialPlant.mo
index 1ba525525fe..4b6db67a2b6 100644
--- a/Buildings/Experimental/DHC/Plants/BaseClasses/PartialPlant.mo
+++ b/Buildings/DHC/Plants/BaseClasses/PartialPlant.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.BaseClasses;
+within Buildings.DHC.Plants.BaseClasses;
 partial model PartialPlant
   "Partial class for modeling a plant"
   replaceable package Medium=Buildings.Media.Water
@@ -10,8 +10,8 @@ partial model PartialPlant
     annotation(Dialog(enable=
       typ == TypDisSys.CombinedGeneration1 or
       typ == TypDisSys.HeatingGeneration1));
-  parameter Buildings.Experimental.DHC.Types.DistrictSystemType
-  typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4
+  parameter Buildings.DHC.Types.DistrictSystemType
+  typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4
     "Type of district system"
     annotation (Evaluate=true, Dialog(group="Configuration"));
   parameter Boolean have_fan=false
@@ -123,14 +123,14 @@ partial model PartialPlant
       Placement(transformation(extent={{380,100},{420,140}}),
         iconTransformation(extent={{300,80},{380,160}})));
 protected
-  final parameter Boolean have_hea=typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling and
-  typ <> Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+  final parameter Boolean have_hea=typ <> Buildings.DHC.Types.DistrictSystemType.Cooling and
+  typ <> Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
   "Boolean flag to enable fluid connectors for heating service line";
-  final parameter Boolean have_coo=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration1 or
-  typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
-  typ == Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling
+  final parameter Boolean have_coo=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration1 or
+  typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4 or
+  typ == Buildings.DHC.Types.DistrictSystemType.Cooling
   "Boolean flag to enable fluid connectors for cooling service line";
-  final parameter Boolean have_serAmb=typ == Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5
+  final parameter Boolean have_serAmb=typ == Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5
   "Boolean flag to enable fluid connector for ambient water service line";
   annotation (
     defaultComponentName="pla",
@@ -142,8 +142,8 @@ Partial class to be used for modeling a plant.
 <p>
 The connectors to the service lines are configured based on an enumeration
 defining the type of district system, see
-<a href=\"modelica://Buildings.Experimental.DHC.Types.DistrictSystemType\">
-Buildings.Experimental.DHC.Types.DistrictSystemType</a>.
+<a href=\"modelica://Buildings.DHC.Types.DistrictSystemType\">
+Buildings.DHC.Types.DistrictSystemType</a>.
 In case of a heating service line, the model allows for using two
 different media at the supply port <code>port_bSerHea</code> and at the return
 <code>port_aSerHea</code> to represent a steam supply and condensate
diff --git a/Buildings/DHC/Plants/BaseClasses/package.mo b/Buildings/DHC/Plants/BaseClasses/package.mo
new file mode 100644
index 00000000000..6adf245fa26
--- /dev/null
+++ b/Buildings/DHC/Plants/BaseClasses/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Plants;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains base classes that are used to construct the classes in
+<a href=\"modelica://Buildings.DHC.Plants\">
+Buildings.DHC.Plants</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/BaseClasses/package.order b/Buildings/DHC/Plants/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/BaseClasses/package.order
rename to Buildings/DHC/Plants/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Combined/AllElectricCWStorage.mo b/Buildings/DHC/Plants/Combined/AllElectricCWStorage.mo
new file mode 100644
index 00000000000..ae3f3f597b9
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/AllElectricCWStorage.mo
@@ -0,0 +1,1642 @@
+within Buildings.DHC.Plants.Combined;
+model AllElectricCWStorage
+  "All-electric CHW and HW plant with CW storage"
+  extends BaseClasses.PartialPlant(
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration2to4,
+    final have_weaBus=true,
+    final have_fan=true,
+    final have_pum=true,
+    final have_eleHea=true,
+    final have_eleCoo=true);
+
+  replaceable package MediumAir=Buildings.Media.Air
+    "Air medium";
+  replaceable package MediumConWatCoo=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium model for cooling tower circuit"
+    annotation (choices(
+      choice(redeclare package Medium=Buildings.Media.Water "Water"),
+      choice(redeclare package Medium =
+            Buildings.Media.Antifreeze.PropyleneGlycolWater (
+        property_T=293.15,X_a=0.40)
+        "Propylene glycol water, 40% mass fraction")));
+
+  // CHW loop and cooling-only chillers
+  parameter Integer nChi(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"),
+      Evaluate=true);
+  parameter Integer nPumChiWat(final min=1, start=1)=max(nChi, nChiHea)
+    "Number of CHW pumps operating at design conditions"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"),
+      Evaluate=true);
+  final parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_nominal(
+    final min=0)=datChi.mEva_flow_nominal
+    "Design chiller CHW mass flow rate (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_min(
+    final min=0)=0.6 * mChiWatChi_flow_nominal
+    "Chiller CHW minimum mass flow rate (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWatChi_flow_nominal(
+    final min=0)=datChi.mCon_flow_nominal
+    "Design chiller CW mass flow rate (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpChiWatSet_max(
+    final min=0,
+    displayUnit="Pa")
+    "Design (maximum) CHW differential pressure setpoint"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpEvaChi_nominal(
+    final min=0,
+    displayUnit="Pa")=5E4
+    "Design evaporator pressure drop (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpConChi_nominal(
+    final min=0,
+    displayUnit="Pa")=5E4
+    "Design condenser pressure drop (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpPumChiWat_nominal(
+    final min=0,
+    displayUnit="Pa")=1.1 * (dpChiWatSet_max + max(
+      dpEvaChi_nominal + chi.valEva.dpValve_nominal,
+      dpEvaChiHea_nominal + max(chiHea.valEva.dpValve_nominal) + sum(chiHea.valEvaSwi.dpValve_nominal)))
+    "Design head of CHW pump(each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+
+  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChi
+    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
+    "Chiller parameters (each unit)"
+    annotation (
+      Dialog(group="CHW loop and cooling-only chillers"),
+      Placement(transformation(extent={{80,340},{100,360}})));
+
+  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
+    max(chi.TChiWatSup_nominal, chiHea.TChiWatSup_nominal)
+    "Design (minimum) CHW supply temperature"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=
+    TChiWatSup_nominal - QChiWat_flow_nominal / mChiWat_flow_nominal / cp_default
+    "Design (maximum) CHW return temperature"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  // Plant capacity computed with HRCs in direct heat recovery mode, see
+  // Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant.
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
+    chi.QChiWat_flow_nominal + chiHea.QChiWat_flow_nominal
+    "Design plant cooling heat flow rate (all units)";
+  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
+    final min=0)=
+    nChi * mChiWatChi_flow_nominal + nChiHea * mChiWatChiHea_flow_nominal
+    "Design CHW mass flow rate (all units)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+
+  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_min=10
+    "Minimum chiller lift at minimum load"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_nominal=
+    TTanSet[1, 2] + 5 - TChiWatSup_nominal
+    "Design chiller lift"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+
+  // HW loop and heat recovery chillers
+  parameter Integer nChiHea(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="HW loop and heat recovery chillers"),
+      Evaluate=true);
+  parameter Integer nPumHeaWat(final min=1, start=1) = nChiHea
+    "Number of HW pumps operating at design conditions"
+    annotation (Dialog(group="HW loop and heat recovery chillers"),
+      Evaluate=true);
+  final parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_nominal=
+    datChiHea.mEva_flow_nominal
+    "Design HRC CHW mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_min(
+    final min=0)=0.6 * mChiWatChiHea_flow_nominal
+    "HRC CHW minimum mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mHeaWatChiHea_flow_min(
+    final min=0)=0.6 * mConWatChiHea_flow_nominal
+    "HRC HW minimum mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWatChiHea_flow_nominal=
+    datChiHea.mCon_flow_nominal
+    "Design HRC CW mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpHeaWatSet_max(
+    final min=0,
+    displayUnit="Pa")
+    "Design (maximum) HW differential pressure setpoint"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpEvaChiHea_nominal(
+    final min=0,
+    displayUnit="Pa")=5E4
+    "Design evaporator  pressure drop (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpConChiHea_nominal(
+    final min=0,
+    displayUnit="Pa")=5E4
+    "Design condenser pressure drop (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+
+  parameter Modelica.Units.SI.PressureDifference dpPumHeaWat_nominal(
+    final min=0,
+    displayUnit="Pa")=1.1 * (dpHeaWatSet_max +
+      dpConChiHea_nominal + max(chiHea.valCon.dpValve_nominal) +
+      sum(chiHea.valConSwi.dpValve_nominal))
+    "Design head of HW pump(each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+
+  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChiHea
+    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
+    "HRC parameters (each unit)"
+    annotation (
+      Dialog(group="HW loop and heat recovery chillers"),
+      Placement(transformation(extent={{120,340},{140,360}})));
+
+  final parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=
+    chiHea.THeaWatSup_nominal
+    "Design (maximum) HW supply temperature"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
+    THeaWatSup_nominal - QHeaWat_flow_nominal / mHeaWat_flow_nominal / cp_default
+    "Design (minimum) HW return temperature"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+
+  // TCasHeaEnt_nominal computed in second cycle of TES tank.
+  final parameter Modelica.Units.SI.Temperature TCasHeaEnt_nominal=
+    TTanSet[2, 2]
+    "Design evaporator entering temperature in cascading heating mode"
+    annotation(Evaluate=true);
+  // TCasCooEnt_nominal computed in Heat Rejection mode.
+  final parameter Modelica.Units.SI.Temperature TCasCooEnt_nominal=
+    TConWatCooSup_nominal + dTHexCoo_nominal
+    "Design condenser entering temperature in cascading cooling mode"
+    annotation(Evaluate=true);
+  final parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=
+    chiHea.QHeaWat_flow_nominal
+    "Design heating heat flow rate (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal=
+    chiHea.mConWat_flow_nominal
+    "Design HW mass flow rate (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+
+  // CW loop, TES tank and heat pumps
+  parameter Integer nHeaPum(final min=1, start=1)
+    "Number of heat pumps operating at design conditions"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+      Evaluate=true);
+  parameter Integer nPumConWatCon(final min=1, start=1)=max(nChi, nChiHea)
+    "Number of CW pumps serving condenser barrels at design conditions"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+      Evaluate=true);
+  parameter Integer nPumConWatEva(final min=1, start=1)=nChiHea
+    "Number of CW pumps serving evaporator barrels at design conditions"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.PressureDifference dpConWatConSet_max(
+    final min=0,
+    displayUnit="Pa")=max(
+     dpConChi_nominal + chi.valCon.dpValve_nominal,
+     dpConChiHea_nominal + max(chiHea.valCon.dpValve_nominal) + sum(chiHea.valConSwi.dpValve_nominal))
+    "Design (maximum) CW condenser loop differential pressure setpoint"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.PressureDifference dpConWatEvaSet_max(
+    final min=0,
+    displayUnit="Pa")=
+    dpEvaChiHea_nominal + max(chiHea.valEva.dpValve_nominal) + sum(chiHea.valEvaSwi.dpValve_nominal)
+    "Design (maximum) CW evaporator loop differential pressure setpoint"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.PressureDifference dpPumConWatCon_nominal(
+    final min=0,
+    displayUnit="Pa")=1.1 * (dpConWatConSet_max + max(dpHexCoo_nominal, dpTan_nominal))
+    "Design head of CW pump serving condenser barrels (each unit)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.PressureDifference dpPumConWatEva_nominal(
+    final min=0,
+    displayUnit="Pa")=1.1 * (dpConWatEvaSet_max + dpTan_nominal)
+    "Design head of CW pump serving evaporator barrels (each unit)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWatCon_flow_nominal(
+    final min=0)=chi.mConWat_flow_nominal + chiHea.mConWat_flow_nominal
+    "Design total CW mass flow rate through condenser barrels (all units)";
+  final parameter Modelica.Units.SI.MassFlowRate mConWatEva_flow_nominal(
+    final min=0)=chiHea.mChiWat_flow_nominal
+    "Design total CW mass flow rate through evaporator barrels (all units)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.Volume VTan=
+    -chiHea.QEvaCasHea_flow_nominal * 3 * 3600 / (max(TTanSet) - min(TTanSet)) /
+    cp_default / rho_default
+    "Tank volume"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.Length hTan = (16 * VTan / Modelica.Constants.pi)^(1/3)
+    "Height of tank (without insulation)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  // Default considering 1 m high thermmocline and 1 m high section below and above diffusers.
+  // Thermocline only useless during last tank cycle, hence the scale factor.
+  parameter Real fraUslTan(final unit="1", final min=0, final max=1, start=0.1) =
+    ((max(TTanSet[2]) - min(TTanSet)) / (max(TTanSet) - min(TTanSet)) * 1 + 1) / hTan
+    "Useless fraction of TES"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.Length dInsTan
+    "Thickness of insulation"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.ThermalConductivity kInsTan=0.04
+    "Specific heat conductivity of insulation"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Integer nSegTan(min=2) = 10
+    "Number of volume segments"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps", tab="Advanced"));
+  parameter Modelica.Units.SI.Temperature TTanSet[2, 2] = {
+    {15 + 273.15, 25 + 273.15},
+    {TChiWatSup_nominal, 15 + 273.15}}
+    "Tank temperature setpoints: 2 cycles with 2 setpoints"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  // Default TES tank pressure drop without PSV, otherwise ~ 20E3
+  parameter Modelica.Units.SI.PressureDifference dpTan_nominal(displayUnit="Pa")=1E3
+    "Design pressure drop through TES tank"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"));
+  replaceable parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic datHeaPum
+    "Heat pump parameters (each unit)"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+    Placement(transformation(extent={{160,340},{180,360}})));
+
+  // Buildings.DHC.Plants.Cooling tower loop
+  parameter Integer nCoo(final min=1, start=1)
+    "Number of cooling tower cells operating at design conditions"
+    annotation (Dialog(group="Cooling tower loop"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.MassFlowRate mConWatCoo_flow_nominal(
+    final min=0)=mConWatCon_flow_nominal
+    "Design CT CW mass flow rate (all units)"
+    annotation(Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.PressureDifference dpConWatCooFri_nominal(
+    displayUnit="Pa",
+    start=1E4,
+    final min=0)
+    "Design CW flow-friction losses through tower and piping only (without elevation head or valve)"
+    annotation (Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.MassFlowRate mAirCooUni_flow_nominal(
+    final min=0,
+    start=mConWatCoo_flow_nominal / nCoo / 1.45)
+    "Design CT air mass flow rate (each unit)"
+    annotation (Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.Temperature TWetBulCooEnt_nominal(
+    final min=273.15)
+    "Design CT entering air wetbulb temperature"
+    annotation (Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.Temperature TConWatCooRet_nominal(
+    final min=273.15)=TConWatCooSup_nominal +
+    abs(QHexCoo_flow_nominal) / mConWatCoo_flow_nominal / cpConWatCoo_default
+    "Design CT CW return temperature (tower entering)"
+    annotation (Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.Temperature TConWatCooSup_nominal(
+    final min=273.15)=TWetBulCooEnt_nominal + 3
+    "Design CT CW supply temperature (tower leaving)"
+    annotation (Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.Power PFanCoo_nominal(
+    final min=0,
+    start=340 * mConWatCoo_flow_nominal / nCoo)
+    "CT fan power (each unit)"
+    annotation (Dialog(group="Cooling tower loop"));
+
+  parameter Integer nPumConWatCoo(final min=1, start=1)=nCoo
+    "Number of CW pumps serving cooling towers at design conditions"
+    annotation (Dialog(group="Cooling tower loop"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.PressureDifference dpPumConWatCoo_nominal=
+    1.1 * (dpHexCoo_nominal + dpConWatCooFri_nominal)
+    "Design head of CW pump serving cooling towers (each unit)"
+    annotation (Dialog(group="Cooling tower loop"));
+
+  parameter Modelica.Units.SI.TemperatureDifference dTHexCoo_nominal=2
+    "Design heat exchanger approach"
+    annotation (Dialog(group="Cooling tower loop"));
+  parameter Modelica.Units.SI.PressureDifference dpHexCoo_nominal=3E4
+    "Design pressure drop through heat exchanger (same on both sides)"
+    annotation (Dialog(group="Cooling tower loop"));
+
+  // HX sized with all HRCs in cascading cooling mode.
+  parameter Modelica.Units.SI.HeatFlowRate QHexCoo_flow_nominal=
+    -(chi.QConWat_flow_nominal + chiHea.QConCasCoo_flow_nominal)
+    "Design cooling heat flow rate of heat exchanger (<0)"
+    annotation (Dialog(group="Cooling tower loop"));
+
+  // Assumptions
+  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 use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
+    "= true, if control signal is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Filtered signal for actuators and movers"));
+
+  // Outside connectors
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-420,260},{-380,300}}),
+        iconTransformation(extent={{-380,240},{-300,320}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    "Heating enable signal"
+    annotation (Placement(transformation(extent={{-420,240},{-380,280}}),
+        iconTransformation(extent={{-380,200},{-300,280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-420,200},{-380,240}}),
+        iconTransformation(extent={{-380,160},{-300,240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatSet(
+    final unit="Pa",
+    final min=0)
+    "CHW differential pressure setpoint (for local dp sensor)"
+    annotation (Placement(transformation(extent={{-420,140},{-380,180}}),
+        iconTransformation(extent={{-380,80},{-300,160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-420,180},{-380,220}}),
+        iconTransformation(extent={{-380,120},{-300,200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatSet(
+    final unit="Pa",
+    final min=0)
+    "HW differential pressure setpoint (for local dp sensor)"
+    annotation (Placement(transformation(extent={{-420,120},{-380,160}}),
+        iconTransformation(extent={{-380,40},{-300,120}})));
+
+  // Components - CHW loop and cooling-only chillers
+  Subsystems.ChillerGroup chi(
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=Medium,
+    final dat=datChi,
+    final nUni=nChi,
+    final dpEva_nominal=dpEvaChi_nominal,
+    final dpCon_nominal=dpConChi_nominal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal1=allowFlowReversal,
+    final allowFlowReversal2=allowFlowReversal)
+    "Cooling-only chillers"
+    annotation (Placement(transformation(extent={{50,76},{70,96}})));
+  Subsystems.MultiplePumpsSpeed pumChiWat(
+    redeclare final package Medium=Medium,
+    final nPum=nPumChiWat,
+    final have_var=true,
+    final have_valve=true,
+    final mPum_flow_nominal=mChiWat_flow_nominal / nPumChiWat,
+    final dpPum_nominal=dpPumChiWat_nominal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "Primary CHW pumps"
+    annotation (Placement(transformation(extent={{170,190},{190,210}})));
+  Fluid.FixedResistances.Junction junChiWatSup(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mChiWat_flow_nominal * {1, -1, -1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal
+      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal
+      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal
+      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={240,200})));
+  Fluid.FixedResistances.Junction junChiWatRet(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mChiWat_flow_nominal * {1, -1, 1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal
+      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal
+      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal
+      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+       else Modelica.Fluid.Types.PortFlowDirection.Entering)
+   "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={240,80})));
+  Fluid.FixedResistances.Junction junChiWatChiHeaRet(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mChiWat_flow_nominal * {1,-1,-1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={120,80})));
+  Fluid.FixedResistances.Junction junChiWatChiHeaSup(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mChiWat_flow_nominal*{1,-1,1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={140,200})));
+  // PICV model sized at design flow (instead of minimum flow) for convenience.
+  Fluid.Actuators.Valves.TwoWayLinear valChiWatMinByp(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=max(mChiWatChi_flow_min, mChiWatChiHea_flow_min),
+    from_dp=true,
+    linearized=true,
+    dpValve_nominal=1E3,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "CHW minimum flow bypass valve"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={240,140})));
+  Fluid.Sensors.RelativePressure dpChiWat(
+    redeclare final package Medium=Medium)
+    "CHW differential pressure (local sensor hardwired to plant controller)"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={300,140})));
+  Fluid.Sensors.TemperatureTwoPort TChiWatPriRet(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final allowFlowReversal=allowFlowReversal) "Primary CHW return temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={220,80})));
+  Fluid.Sensors.MassFlowRate mChiWatPri_flow(
+    redeclare final package Medium =Medium,
+    final allowFlowReversal=allowFlowReversal) "Primary CHW mass flow rate"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={180,80})));
+  Fluid.Sensors.TemperatureTwoPort TChiWatSup(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "CHW supply temperature"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={210,200})));
+
+  // Components - HW loop and heat recovery chillers
+  Subsystems.ChillerHeatRecoveryGroup chiHea(
+    redeclare final package Medium = Medium,
+    final dat=datChiHea,
+    final nUni=nChiHea,
+    final TCasCooEnt_nominal=TCasCooEnt_nominal,
+    final TCasHeaEnt_nominal=TCasHeaEnt_nominal,
+    final dpEva_nominal=dpEvaChiHea_nominal,
+    final dpCon_nominal=dpConChiHea_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final use_inputFilter=use_inputFilter,
+    final energyDynamics=energyDynamics)
+    "Heat recovery chillers"
+    annotation (Placement(transformation(extent={{50,-158},{70,-138}})));
+
+  Subsystems.MultiplePumpsSpeed pumHeaWat(
+    redeclare final package Medium=Medium,
+    final nPum=nPumHeaWat,
+    final have_var=true,
+    final have_valve=true,
+    final mPum_flow_nominal=mHeaWat_flow_nominal/nPumHeaWat,
+    final dpPum_nominal=dpPumHeaWat_nominal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "Primary HW pumps"
+    annotation (Placement(transformation(extent={{170,-150},{190,-130}})));
+  Fluid.FixedResistances.Junction junHeaWatSup(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mHeaWat_flow_nominal * {1,-1,-1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={240,-140})));
+  Fluid.FixedResistances.Junction junHeaWatRet(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mHeaWat_flow_nominal * {1,-1,1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+       else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={240,-260})));
+  // PICV model sized at design flow (instead of minimum flow) for convenience.
+  Fluid.Actuators.Valves.TwoWayLinear valHeaWatMinByp(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mHeaWatChiHea_flow_min,
+    from_dp=true,
+    linearized=true,
+    dpValve_nominal=1E3,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal) "HW minimum flow bypass valve"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={240,-200})));
+  Fluid.Sensors.RelativePressure dpHeaWat(
+    redeclare final package Medium =Medium)
+    "HW differential pressure (local sensor hardwired to plant controller)"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={300,-200})));
+  Fluid.Sensors.TemperatureTwoPort THeaWatPriRet(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "Primary HW return temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={200,-260})));
+  Fluid.Sensors.TemperatureTwoPort THeaWatSup(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "HW supply temperature"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={210,-140})));
+  Fluid.Sensors.MassFlowRate mHeaWatPri_flow(
+    redeclare final package Medium =Medium,
+    final allowFlowReversal=allowFlowReversal)
+    "Primary HW mass flow rate" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={180,-260})));
+
+  // Components - CW loop and heat pumps
+  Subsystems.MultiplePumpsSpeed pumConWatCon(
+    redeclare final package Medium = Medium,
+    final nPum=nPumConWatCon,
+    final have_var=true,
+    final have_valve=true,
+    final mPum_flow_nominal=mConWatCon_flow_nominal / nPumConWatCon,
+    final dpPum_nominal=dpPumConWatCon_nominal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "CW pumps serving condenser barrels"
+    annotation (Placement(transformation(extent={{-90,-350},{-70,-330}})));
+  Subsystems.MultiplePumpsSpeed pumConWatEva(
+    redeclare final package Medium = Medium,
+    final nPum=nPumConWatEva,
+    final have_var=true,
+    final have_valve=true,
+    final mPum_flow_nominal=mConWatEva_flow_nominal / nPumConWatEva,
+    final dpPum_nominal=dpPumConWatEva_nominal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "CW pumps serving evaporator barrels"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Fluid.FixedResistances.Junction junConWatEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,-1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=0,
+        origin={20,-340})));
+  Fluid.Storage.Stratified tan(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final VTan=VTan,
+    final hTan=hTan,
+    final dIns=dInsTan,
+    final kIns=kInsTan,
+    final nSeg=nSegTan)
+    "TES tank"
+    annotation (Placement(transformation(extent={{-130,-190},{-110,-170}})));
+  Fluid.Sources.Boundary_pT bouConWat(
+    redeclare final package Medium = Medium,
+    final p=hTan * rho_default * Modelica.Constants.g_n,
+    final nPorts=1)
+    "CW pressure boundary condition prescribed by tank operating level"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={-110,-210})));
+  Fluid.FixedResistances.Junction junConWatTanEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,-1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=Modelica.Fluid.Types.PortFlowDirection.Bidirectional)
+    "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={-160,-40})));
+  Fluid.FixedResistances.Junction junConWatLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={80,40})));
+  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TTan[nSegTan](
+    T(each displayUnit="degC"))
+    "TES tank temperature sensor gateway"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={-120,-140})));
+  HeatTransfer.Sources.PrescribedTemperature out "Outdoor temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-100,-140})));
+  Fluid.FixedResistances.Junction junConWatHeaPumEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,-1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={-80,40})));
+  Fluid.FixedResistances.Junction junConWatHeaPumLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering)
+    "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={-120,40})));
+  Subsystems.HeatPumpGroup heaPum(
+    redeclare final package Medium = Medium,
+    redeclare final package MediumAir = MediumAir,
+    final nUni=nHeaPum,
+    final dat=datHeaPum,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "Heat pumps"
+    annotation (Placement(transformation(extent={{-90,150},{-110,170}})));
+  Fluid.FixedResistances.Junction junConWatTanLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={-120,-280})));
+  Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU hexCoo(
+    redeclare final package Medium1=MediumConWatCoo,
+    redeclare final package Medium2=Medium,
+    final m1_flow_nominal=mConWatCoo_flow_nominal,
+    final m2_flow_nominal=mConWatCon_flow_nominal,
+    final dp1_nominal=0,
+    final dp2_nominal=0,
+    final Q_flow_nominal=QHexCoo_flow_nominal,
+    final T_a1_nominal=TConWatCooSup_nominal,
+    final T_a2_nominal=TConWatCooRet_nominal + dTHexCoo_nominal,
+    final allowFlowReversal1=allowFlowReversal,
+    final allowFlowReversal2=allowFlowReversal,
+    final configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow)
+    "Heat exchanger with cooling tower circuit"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-206,-170})));
+  Subsystems.CoolingTowerGroup coo(
+    redeclare final package Medium=Medium,
+    final nUni=nCoo,
+    final mConWatUni_flow_nominal=mConWatCoo_flow_nominal / nCoo,
+    final dpConWatFriUni_nominal=dpConWatCooFri_nominal + dpHexCoo_nominal,
+    final mAirUni_flow_nominal=mAirCooUni_flow_nominal,
+    final TWetBulEnt_nominal=TWetBulCooEnt_nominal,
+    final TConWatRet_nominal=TConWatCooRet_nominal,
+    final TConWatSup_nominal=TConWatCooSup_nominal,
+    final PFanUni_nominal=PFanCoo_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal)
+    "Cooling towers"
+    annotation (Placement(transformation(extent={{-250,-90},{-270,-70}})));
+  Fluid.Actuators.Valves.ThreeWayLinear valBypTan(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final energyDynamics=energyDynamics,
+    dpValve_nominal=1E3,
+    dpFixed_nominal={dpTan_nominal,dpHexCoo_nominal})
+    "TES tank bypass valve"
+    annotation (Placement(
+        transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={-160,-100})));
+  Fluid.Sources.Boundary_pT bouConWatCoo(
+    redeclare final package Medium = Medium,
+    final p=130000,
+    nPorts=1)
+    "CW pressure boundary condition prescribed by CT elevation head"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={-300,-250})));
+  Subsystems.MultiplePumpsSpeed pumConWatCoo(
+    redeclare final package Medium = Medium,
+    final nPum=nPumConWatCoo,
+    final have_var=true,
+    have_valve=false,
+    final mPum_flow_nominal=mConWatCoo_flow_nominal / nPumConWatCoo,
+    final dpPum_nominal=dpPumConWatCoo_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal) "Cooling tower pumps"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-250,-220})));
+  Fluid.Sensors.TemperatureTwoPort TConWatEvaEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatEva_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "HRC evaporator entering CW temperature"
+    annotation (Placement(transformation(
+          extent={{-10,10},{10,-10}}, rotation=-90,
+        origin={80,-60})));
+
+  // Controls
+  Buildings.DHC.Plants.Combined.Controls.Controller ctl(
+    final nChi=nChi,
+    final nPumChiWat=nPumChiWat,
+    final QHeaPum_flow_nominal=datHeaPum.hea.Q_flow*nHeaPum,
+    final dTLifChi_min=dTLifChi_min,
+    final dTLifChi_nominal=dTLifChi_nominal,
+    final nChiHea=nChiHea,
+    final nPumHeaWat=nPumHeaWat,
+    final nHeaPum=nHeaPum,
+    final nPumConWatCon=nPumConWatCon,
+    final nPumConWatEva=nPumConWatEva,
+    final TTanSet=TTanSet,
+    final nCoo=nCoo,
+    final nPumConWatCoo=nPumConWatCoo,
+    final THeaWatSup_nominal=THeaWatSup_nominal,
+    final TChiWatSup_nominal=TChiWatSup_nominal,
+    final mChiWat_flow_nominal=mChiWat_flow_nominal,
+    final mHeaWat_flow_nominal=mHeaWat_flow_nominal,
+    final mConWatCon_flow_nominal=mConWatCon_flow_nominal,
+    final mConWatEva_flow_nominal=mConWatEva_flow_nominal,
+    final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
+    final mChiWatChi_flow_min=mChiWatChi_flow_min,
+    final mConWatChi_flow_nominal=mConWatChi_flow_nominal,
+    final mChiWatChiHea_flow_nominal=mChiWatChiHea_flow_nominal,
+    final mChiWatChiHea_flow_min=mChiWatChiHea_flow_min,
+    final mConWatChiHea_flow_nominal=mConWatChiHea_flow_nominal,
+    final mHeaWatChiHea_flow_min=mHeaWatChiHea_flow_min,
+    final dpChiWatSet_max=dpChiWatSet_max,
+    final dpHeaWatSet_max=dpHeaWatSet_max,
+    final dpConWatConSet_max=dpConWatConSet_max,
+    final dpConWatEvaSet_max=dpConWatEvaSet_max,
+    final dpEvaChi_nominal=dpEvaChi_nominal,
+    final dpValEvaChi_nominal=chi.valEva.dpValve_nominal,
+    final dpEvaChiHea_nominal=dpEvaChiHea_nominal,
+    final dpValEvaChiHea_nominal=max(chiHea.valEva.dpValve_nominal),
+    final QChiWatChi_flow_nominal=chi.QChiWat_flow_nominal,
+    final QChiWatCasCoo_flow_nominal=chiHea.QChiWatCasCoo_flow_nominal,
+    final QChiWatCasCoo_flow_nominal_approx=chiHea.QChiWat_flow_nominal,
+    final QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+    final cp_default=cp_default,
+    final fraUslTan=fraUslTan,
+    final dTHexCoo_nominal=dTHexCoo_nominal,
+    final nTTan=nSegTan)
+    "Controller"
+    annotation (Placement(transformation(extent={{-342,246},{-298,322}})));
+
+  // Miscellaneous
+  Modelica.Blocks.Sources.RealExpression sumPHea(
+    final y=heaPum.P + sum({
+      if ctl.y1CooChiHea[i] or ctl.y1HeaCooChiHea[i] then 0 else chiHea.chi[i].P
+      for i in 1:nChiHea}))
+    "Sum up power drawn from all subsystems"
+    annotation (Placement(transformation(extent={{340,270},{360,290}})));
+  Modelica.Blocks.Sources.RealExpression sumPCoo(
+    final y=chi.P + sum({
+      if ctl.y1CooChiHea[i] or ctl.y1HeaCooChiHea[i] then chiHea.chi[i].P else 0
+      for i in 1:nChiHea}))
+    "Sum up power drawn from all subsystems"
+    annotation (Placement(transformation(extent={{340,230},{360,250}})));
+  Modelica.Blocks.Sources.RealExpression sumPFan(y=coo.P)
+    "Sum up power drawn from all subsystems"
+    annotation (Placement(transformation(extent={{340,190},{360,210}})));
+  Modelica.Blocks.Sources.RealExpression sumPPum(
+    final y=pumChiWat.P + pumHeaWat.P + pumConWatCon.P + pumConWatEva.P + pumConWatCoo.P + heaPum.PPum)
+    "Sum up power drawn from all subsystems"
+    annotation (Placement(transformation(extent={{340,150},{360,170}})));
+
+  Fluid.Sensors.RelativePressure dpConWatEva(redeclare final package Medium =
+        Medium) "CW evaporator loop differential pressure " annotation (
+      Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={0,-70})));
+  Fluid.Sensors.RelativePressure dpConWatCon(redeclare final package Medium =
+        Medium) "CW condenser loop differential pressure " annotation (
+      Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={-20,-310})));
+  Fluid.Sensors.MassFlowRate mConWatEva_flow(redeclare final package Medium =
+        Medium, final allowFlowReversal=allowFlowReversal)
+    "CW evaporator loop mass flow rate" annotation (Placement(transformation(
+        extent={{40,-50},{60,-30}},
+        rotation=0)));
+  Fluid.Sensors.MassFlowRate mConWatCon_flow(redeclare final package Medium =
+        Medium, final allowFlowReversal=allowFlowReversal)
+    "CW condenser loop mass flow rate" annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={-120,-320})));
+  Fluid.Sensors.MassFlowRate mConWatOutTan_flow(redeclare final package Medium =
+        Medium, final allowFlowReversal=allowFlowReversal)
+    "Mass flow rate out of lower port of TES tank (>0 when charging)"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={-80,-240})));
+  Fluid.Sensors.TemperatureTwoPort TConWatConChiLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "Chiller and HRC leaving CW temperature" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-50,40})));
+  Fluid.Sensors.TemperatureTwoPort TConWatConChiEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "Chiller and HRC entering CW temperature" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={0,-340})));
+  Fluid.Sensors.TemperatureTwoPort TConWatCooSup(
+    redeclare final package Medium = MediumConWatCoo,
+    final m_flow_nominal=mConWatCoo_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "Cooling tower loop CW supply temperature" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=-90,
+        origin={-212,-204})));
+  Fluid.Sensors.TemperatureTwoPort TConWatCooRet(
+    redeclare final package Medium = MediumConWatCoo,
+    final m_flow_nominal=mConWatCoo_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "Cooling tower loop CW return temperature" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=-90,
+        origin={-212,-136})));
+  Fluid.Sensors.TemperatureTwoPort TConWatHexCooEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal) "HX entering CW temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-200,-140})));
+  Fluid.Sensors.TemperatureTwoPort TConWatHexCooLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal) "HX leaving CW temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-200,-200})));
+  Fluid.Actuators.Valves.ThreeWayLinear valConWatEvaMix(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatEva_flow_nominal,
+    final energyDynamics=energyDynamics,
+    dpValve_nominal=1E3,
+    final dpFixed_nominal=fill(0, 2)) "HRC evaporator CW mixing valve"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-120,-40})));
+  Fluid.FixedResistances.Junction junConWatEvaLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatEva_flow_nominal*{1,-1,-1},
+    final dp_nominal=fill(0, 3),
+    final energyDynamics=energyDynamics,
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Fluid junction" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=0,
+        origin={0,-146})));
+  Fluid.Sensors.TemperatureTwoPort TConWatConRet(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal)
+    "Condenser loop CW return temperature" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-160,20})));
+  Fluid.Sensors.TemperatureTwoPort TConWatHeaPumEnt(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal) "HP entering CW temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={-80,90})));
+  Fluid.Sensors.TemperatureTwoPort TConWatHeaPumLvg(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    final allowFlowReversal=allowFlowReversal) "HP leaving CW temperature"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-120,90})));
+protected
+  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+    T=Medium.T_default,
+    p=Medium.p_default,
+    X=Medium.X_default)
+    "Medium state at default properties";
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
+    Medium.specificHeatCapacityCp(sta_default)
+    "Specific heat capacity of the fluid";
+  final parameter Modelica.Units.SI.Density rho_default=
+    Medium.density(sta_default)
+    "Density of the fluid";
+  final parameter MediumConWatCoo.ThermodynamicState staConWatCoo_default=
+    MediumConWatCoo.setState_pTX(
+    T=MediumConWatCoo.T_default,
+    p=MediumConWatCoo.p_default,
+    X=MediumConWatCoo.X_default)
+    "Medium state at default properties";
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cpConWatCoo_default=
+    MediumConWatCoo.specificHeatCapacityCp(staConWatCoo_default)
+    "Specific heat capacity of the fluid";
+public
+  Fluid.Sensors.MassFlowRate mConWatHexCoo_flow(redeclare final package Medium =
+        Medium, final allowFlowReversal=allowFlowReversal)
+    "CW mass flow rate through secondary (plant) side of HX" annotation (
+      Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={-200,-240})));
+  Fluid.Actuators.Valves.TwoWayLinear valConWatByp(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatCon_flow_nominal,
+    from_dp=true,
+    linearized=true,
+    dpValve_nominal=1E3,
+    final use_inputFilter=use_inputFilter,
+    final allowFlowReversal=allowFlowReversal)
+    "CW chiller bypass valve" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-40,-120})));
+equation
+  connect(junChiWatSup.port_2, port_bSerCoo)
+    annotation (Line(points={{250,200},{320,200},{320,-40},{380,-40}},
+                                                   color={0,127,255}));
+  connect(junChiWatSup.port_3, valChiWatMinByp.port_a)
+    annotation (Line(points={{240,190},{240,150}}, color={0,127,255}));
+  connect(valChiWatMinByp.port_b, junChiWatRet.port_3)
+    annotation (Line(points={{240,130},{240,90}}, color={0,127,255}));
+  connect(junChiWatSup.port_2, dpChiWat.port_a) annotation (Line(points={{250,200},
+          {300,200},{300,150}}, color={0,127,255}));
+  connect(TChiWatPriRet.port_a, junChiWatRet.port_2)
+    annotation (Line(points={{230,80},{230,80}}, color={0,127,255}));
+  connect(port_aSerCoo, junChiWatRet.port_1) annotation (Line(points={{-380,-40},
+          {-340,-40},{-340,8},{300,8},{300,80},{250,80}},
+                                        color={0,127,255}));
+  connect(dpChiWat.port_b, junChiWatRet.port_1)
+    annotation (Line(points={{300,130},{300,80},{250,80}}, color={0,127,255}));
+  connect(junHeaWatSup.port_3, valHeaWatMinByp.port_a)
+    annotation (Line(points={{240,-150},{240,-190}},color={0,127,255}));
+  connect(valHeaWatMinByp.port_b, junHeaWatRet.port_3)
+    annotation (Line(points={{240,-210},{240,-250}}, color={0,127,255}));
+  connect(THeaWatPriRet.port_a, junHeaWatRet.port_2)
+    annotation (Line(points={{210,-260},{230,-260}}, color={0,127,255}));
+  connect(dpHeaWat.port_b, junHeaWatRet.port_1) annotation (Line(points={{300,
+          -210},{300,-260},{250,-260}},
+                                  color={0,127,255}));
+  connect(junHeaWatSup.port_2, port_bSerHea) annotation (Line(points={{250,-140},
+          {340,-140},{340,0},{380,0}},color={0,127,255}));
+  connect(ctl.y1Chi, chi.y1) annotation (Line(points={{-296,313},{28,313},{28,
+          95},{48,95}},        color={255,0,255}));
+  connect(ctl.yValConChi, chi.yValCon) annotation (Line(points={{-296,309},{30,
+          309},{30,100},{54,100},{54,98}},           color={0,0,127}));
+  connect(TChiWatSupSet, chi.TSet) annotation (Line(points={{-400,220},{40,220},
+          {40,77},{48,77}},     color={0,0,127}));
+  connect(ctl.y1PumChiWat, pumChiWat.y1) annotation (Line(points={{-296,307},{
+          166,307},{166,208},{168,208}},
+                                    color={255,0,255}));
+  connect(ctl.y1PumHeaWat, pumHeaWat.y1) annotation (Line(points={{-296,282},{
+          160,282},{160,-132},{168,-132}},
+                                    color={255,0,255}));
+  connect(ctl.yValChiWatMinByp, valChiWatMinByp.y) annotation (Line(points={{-296,
+          303},{40,303},{40,180},{260,180},{260,140},{252,140}},
+                                                 color={0,0,127}));
+  connect(ctl.yValHeaWatMinByp, valHeaWatMinByp.y) annotation (Line(points={{-296,
+          278},{264,278},{264,-200},{252,-200}},   color={0,0,127}));
+  connect(THeaWatPriRet.port_b, mHeaWatPri_flow.port_a)
+    annotation (Line(points={{190,-260},{190,-260}}, color={0,127,255}));
+  connect(TChiWatPriRet.port_b, mChiWatPri_flow.port_a)
+    annotation (Line(points={{210,80},{190,80}}, color={0,127,255}));
+  connect(ctl.y1PumConWatEva, pumConWatEva.y1) annotation (Line(points={{-296,
+          271},{38,271},{38,-26},{-82,-26},{-82,-32}},
+                                               color={255,0,255}));
+  connect(ctl.yPumConWatEva, pumConWatEva.y) annotation (Line(points={{-296,269},
+          {34,269},{34,-24},{-84,-24},{-84,-36},{-82,-36}},
+                                               color={0,0,127}));
+  connect(sumPHea.y, PHea)
+    annotation (Line(points={{361,280},{400,280}}, color={0,0,127}));
+  connect(sumPCoo.y, PCoo) annotation (Line(points={{361,240},{400,240}},
+                                 color={0,0,127}));
+  connect(sumPFan.y, PFan)
+    annotation (Line(points={{361,200},{400,200}}, color={0,0,127}));
+  connect(sumPPum.y, PPum) annotation (Line(points={{361,160},{400,160}},
+                           color={0,0,127}));
+  connect(junHeaWatSup.port_2, dpHeaWat.port_a) annotation (Line(points={{250,
+          -140},{300,-140},{300,-190}},
+                                 color={0,127,255}));
+  connect(pumChiWat.port_b, TChiWatSup.port_a)
+    annotation (Line(points={{190,200},{200,200}}, color={0,127,255}));
+  connect(TChiWatSup.port_b, junChiWatSup.port_1)
+    annotation (Line(points={{220,200},{230,200}}, color={0,127,255}));
+  connect(tan.heaPorVol, TTan.port)
+    annotation (Line(points={{-120,-180},{-120,-150}},color={191,0,0}));
+  connect(out.port, tan.heaPorTop) annotation (Line(points={{-100,-150},{-100,
+          -160},{-118,-160},{-118,-172.6}},
+                         color={191,0,0}));
+  connect(out.port, tan.heaPorSid) annotation (Line(points={{-100,-150},{-100,
+          -160},{-114.4,-160},{-114.4,-180}},
+                          color={191,0,0}));
+  connect(out.port, tan.heaPorBot) annotation (Line(points={{-100,-150},{-100,
+          -187.4},{-118,-187.4}},       color={191,0,0}));
+  connect(pumHeaWat.port_b, THeaWatSup.port_a)
+    annotation (Line(points={{190,-140},{200,-140}},
+                                                   color={0,127,255}));
+  connect(THeaWatSup.port_b, junHeaWatSup.port_1)
+    annotation (Line(points={{220,-140},{230,-140}},
+                                                   color={0,127,255}));
+  connect(junConWatHeaPumEnt.port_2, junConWatHeaPumLvg.port_1)
+    annotation (Line(points={{-90,40},{-110,40}},  color={0,127,255}));
+  connect(weaBus.TDryBul, out.T) annotation (Line(
+      points={{0,380},{0,120},{-100,120},{-100,-128}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(weaBus, heaPum.weaBus) annotation (Line(
+      points={{0,380},{0,180},{-100,180},{-100,170}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(ctl.y1HeaPum, heaPum.y1) annotation (Line(points={{-296,266},{-42,266},
+          {-42,166},{-88,166}},        color={255,0,255}));
+  connect(ctl.THeaPumSet, heaPum.TSet) annotation (Line(points={{-296,264},{-44,
+          264},{-44,154},{-88,154}},        color={0,0,127}));
+  connect(bouConWat.ports[1], tan.port_b)
+    annotation (Line(points={{-110,-200},{-110,-180}}, color={0,127,255}));
+  connect(ctl.yPumChiWat, pumChiWat.y) annotation (Line(points={{-296,305},{162,
+          305},{162,204},{168,204}},   color={0,0,127}));
+  connect(ctl.yPumHeaWat, pumHeaWat.y) annotation (Line(points={{-296,280},{158,
+          280},{158,-136},{168,-136}}, color={0,0,127}));
+  connect(mChiWatPri_flow.port_b,junChiWatChiHeaRet. port_1)
+    annotation (Line(points={{170,80},{130,80}},         color={0,127,255}));
+  connect(junChiWatChiHeaRet.port_2, chi.port_a2)
+    annotation (Line(points={{110,80},{70,80}},           color={0,127,255}));
+  connect(port_aSerHea, junHeaWatRet.port_1) annotation (Line(points={{-380,0},
+          {310,0},{310,-260},{250,-260}},                        color={0,127,255}));
+  connect(junConWatTanEnt.port_2, valBypTan.port_2)
+    annotation (Line(points={{-160,-50},{-160,-90}}, color={0,127,255}));
+  connect(valBypTan.port_1, tan.port_a) annotation (Line(points={{-160,-110},{
+          -160,-180},{-130,-180}},
+                              color={0,127,255}));
+  connect(ctl.yValBypTan, valBypTan.y) annotation (Line(points={{-296,252},{
+          -180,252},{-180,-86},{-146,-86},{-146,-100},{-148,-100}},
+                                            color={0,0,127}));
+  connect(bouConWatCoo.ports[1], pumConWatCoo.port_a)
+    annotation (Line(points={{-300,-240},{-300,-220},{-260,-220}},
+                                                       color={0,127,255}));
+  connect(coo.port_b, pumConWatCoo.port_a) annotation (Line(points={{-270,-80},
+          {-300,-80},{-300,-220},{-260,-220}},
+                                            color={0,127,255}));
+  connect(weaBus, coo.weaBus) annotation (Line(
+      points={{0,380},{0,120},{-260,120},{-260,-70}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(ctl.yCoo, coo.y) annotation (Line(points={{-296,255},{-222,255},{-222,
+          -86},{-248,-86}},                     color={0,0,127}));
+  connect(ctl.y1PumConWatCoo, pumConWatCoo.y1) annotation (Line(points={{-296,
+          261},{-278,261},{-278,-212},{-262,-212}},
+        color={255,0,255}));
+  connect(chi.port_b1, junConWatLvg.port_3)
+    annotation (Line(points={{70,92},{80,92},{80,50}},   color={0,127,255}));
+  connect(chiHea.port_b1, pumHeaWat.port_a)
+    annotation (Line(points={{70,-140},{170,-140}},
+                                                  color={0,127,255}));
+  connect(mHeaWatPri_flow.port_b, chiHea.port_a1) annotation (Line(points={{170,
+          -260},{44,-260},{44,-140},{50,-140}},color={0,127,255}));
+  connect(junChiWatChiHeaRet.port_3, chiHea.port_a4) annotation (Line(points={{120,70},
+          {120,-156},{70,-156}},            color={0,127,255}));
+  connect(junConWatEnt.port_2, chiHea.port_a3) annotation (Line(points={{30,-340},
+          {40,-340},{40,-151.2},{50,-151.2}},color={0,127,255}));
+  connect(chiHea.port_b3, junConWatLvg.port_1) annotation (Line(points={{70,
+          -151.1},{100,-151.1},{100,40},{90,40}},
+                                       color={0,127,255}));
+  connect(ctl.yValEvaChiHea, chiHea.yValEva) annotation (Line(points={{-296,292},
+          {32,292},{32,-162},{52,-162},{52,-160}},          color={0,0,127}));
+  connect(ctl.y1CooChiHea, chiHea.y1Coo) annotation (Line(points={{-296,298},{
+          36,298},{36,-146},{48,-146},{48,-148}}, color={255,0,255}));
+  connect(ctl.y1ChiHea, chiHea.y1) annotation (Line(points={{-296,300},{38,300},
+          {38,-142},{48,-142}},       color={255,0,255}));
+  connect(ctl.yValConChiHea, chiHea.yValCon) annotation (Line(points={{-296,290},
+          {32,290},{32,-122},{52,-122},{52,-136}},     color={0,0,127}));
+  connect(ctl.TChiHeaSet, chiHea.TSet) annotation (Line(points={{-296,294},{30,
+          294},{30,-154},{48,-154}},                          color={0,0,127}));
+  connect(ctl.yValEvaChi, chi.yValEva) annotation (Line(points={{-296,311},{32,
+          311},{32,72},{54.2,72},{54.2,74}},          color={0,0,127}));
+  connect(junChiWatChiHeaSup.port_2, pumChiWat.port_a)
+    annotation (Line(points={{150,200},{170,200}},color={0,127,255}));
+  connect(chi.port_b2, junChiWatChiHeaSup.port_1) annotation (Line(points={{50,80},
+          {44,80},{44,200},{130,200}},      color={0,127,255}));
+  connect(chiHea.port_b4, junChiWatChiHeaSup.port_3) annotation (Line(points={{50,
+          -156.5},{50,-156},{48,-156},{48,-170},{140,-170},{140,190}},
+                                                             color={0,127,255}));
+  connect(TConWatEvaEnt.port_b, chiHea.port_a2) annotation (Line(points={{80,-70},
+          {80,-145},{70,-145}},      color={0,127,255}));
+  connect(TChiWatSupSet, ctl.TChiWatSupSet) annotation (Line(points={{-400,220},
+          {-356,220},{-356,316},{-344,316}},     color={0,0,127}));
+  connect(dpChiWatSet, ctl.dpChiWatSet) annotation (Line(points={{-400,160},{
+          -360,160},{-360,312},{-344,312}},     color={0,0,127}));
+  connect(THeaWatSupSet, ctl.THeaWatSupSet) annotation (Line(points={{-400,200},
+          {-360,200},{-360,314},{-344,314}},     color={0,0,127}));
+  connect(dpHeaWatSet, ctl.dpHeaWatSet) annotation (Line(points={{-400,140},{
+          -356,140},{-356,310},{-344,310}},     color={0,0,127}));
+  connect(u1Coo, ctl.u1Coo) annotation (Line(points={{-400,280},{-372,280},{
+          -372,320},{-344,320}},     color={255,0,255}));
+  connect(u1Hea, ctl.u1Hea) annotation (Line(points={{-400,260},{-362,260},{
+          -362,318},{-344,318}},     color={255,0,255}));
+  connect(mChiWatPri_flow.m_flow, ctl.mChiWatPri_flow) annotation (Line(points={{180,91},
+          {180,132},{-354,132},{-354,266},{-344,266}},              color={0,0,127}));
+  connect(dpChiWat.p_rel, ctl.dpChiWat) annotation (Line(points={{291,140},{280,
+          140},{280,124},{-372,124},{-372,254},{-344,254}},     color={0,0,127}));
+  connect(mHeaWatPri_flow.m_flow, ctl.mHeaWatPri_flow) annotation (Line(points={{180,
+          -271},{180,-294},{-366,-294},{-366,264},{-344,264}},          color={0,
+          0,127}));
+  connect(dpHeaWat.p_rel, ctl.dpHeaWat) annotation (Line(points={{291,-200},{
+          280,-200},{280,62},{-366,62},{-366,252},{-344,252}},     color={0,0,127}));
+  connect(pumConWatEva.port_b, dpConWatEva.port_a) annotation (Line(points={{-60,-40},
+          {1.77636e-15,-40},{1.77636e-15,-60}},
+                                     color={0,127,255}));
+  connect(pumConWatEva.port_b, mConWatEva_flow.port_a)
+    annotation (Line(points={{-60,-40},{40,-40}},   color={0,127,255}));
+  connect(mConWatEva_flow.port_b, TConWatEvaEnt.port_a)
+    annotation (Line(points={{60,-40},{80,-40},{80,-50}}, color={0,127,255}));
+  connect(junConWatTanLvg.port_2, mConWatCon_flow.port_a)
+    annotation (Line(points={{-120,-290},{-120,-310}}, color={0,127,255}));
+  connect(mConWatCon_flow.port_b, pumConWatCon.port_a) annotation (Line(points={{-120,
+          -330},{-120,-340},{-90,-340}},         color={0,127,255}));
+  connect(mConWatCon_flow.m_flow, ctl.mConWatCon_flow) annotation (Line(points={{-131,
+          -320},{-360,-320},{-360,262},{-344,262}},            color={0,0,127}));
+  connect(mConWatEva_flow.m_flow, ctl.mConWatEva_flow) annotation (Line(points={{50,-29},
+          {50,66},{-364,66},{-364,260},{-344,260}},            color={0,0,127}));
+  connect(dpConWatEva.p_rel, ctl.dpConWatEva) annotation (Line(points={{9,-70},
+          {22,-70},{22,64},{-352,64},{-352,248},{-344,248}},           color={0,
+          0,127}));
+  connect(dpConWatCon.p_rel, ctl.dpConWatCon) annotation (Line(points={{-29,
+          -310},{-368,-310},{-368,250},{-344,250}},
+                                                 color={0,0,127}));
+  connect(TChiWatPriRet.T, ctl.TChiWatPriRet) annotation (Line(points={{220,91},
+          {220,130},{-348,130},{-348,306},{-344,306}},     color={0,0,127}));
+  connect(THeaWatPriRet.T, ctl.THeaWatPriRet) annotation (Line(points={{200,
+          -249},{200,64},{-368,64},{-368,290},{-344,290}},
+        color={0,0,127}));
+  connect(TTan.T, ctl.TTan) annotation (Line(points={{-120,-129},{-120,-120},{
+          -374,-120},{-374,288},{-344,288}},              color={0,0,127}));
+  connect(tan.port_b, mConWatOutTan_flow.port_a) annotation (Line(points={{-110,
+          -180},{-80,-180},{-80,-230}},   color={0,127,255}));
+  connect(mConWatHexCoo_flow.m_flow, ctl.mConWatHexCoo_flow) annotation (Line(
+        points={{-211,-240},{-230,-240},{-230,-202},{-358,-202},{-358,258},{
+          -344,258}},
+        color={0,0,127}));
+  connect(mConWatOutTan_flow.m_flow, ctl.mConWatOutTan_flow) annotation (Line(
+        points={{-91,-240},{-100,-240},{-100,-298},{-362,-298},{-362,-74},{
+          -349.818,-74},{-349.818,256},{-344,256}},          color={0,0,127}));
+  connect(junConWatEnt.port_3, chi.port_a1) annotation (Line(points={{20,-330},
+          {20,92},{50,92}},   color={0,127,255}));
+  connect(chi.mCon_flow, ctl.mConChi_flow) annotation (Line(points={{68,98},{68,
+          124},{-344,124},{-344,272}},                color={0,0,127}));
+  connect(chi.mEva_flow, ctl.mEvaChi_flow) annotation (Line(points={{68,74},{68,
+          68},{-346,68},{-346,274},{-344,274}},     color={0,0,127}));
+  connect(chiHea.mCon_flow, ctl.mConChiHea_flow) annotation (Line(points={{69,-136},
+          {69,54},{-366,54},{-366,268},{-344,268}},                   color={0,
+          0,127}));
+  connect(chiHea.mEva_flow, ctl.mEvaChiHea_flow) annotation (Line(points={{68,-160},
+          {68,-168},{24,-168},{24,52},{-352,52},{-352,270},{-344,270}},
+                 color={0,0,127}));
+  connect(ctl.yValConSwiChiHea, chiHea.yValConSwi) annotation (Line(points={{-296,
+          286},{28,286},{28,-120},{54,-120},{54,-136}},         color={0,0,127}));
+  connect(ctl.yValEvaSwiHea, chiHea.yValEvaSwi) annotation (Line(points={{-296,
+          288},{30,288},{30,-164},{54,-164},{54,-160}},
+        color={0,0,127}));
+  connect(TChiWatSup.T, ctl.TChiWatSup) annotation (Line(points={{210,211},{210,
+          218},{-346,218},{-346,308},{-344,308}},     color={0,0,127}));
+  connect(chiHea.TEvaLvg, ctl.TEvaLvgChiHea) annotation (Line(points={{66,-160},
+          {66,-166},{26,-166},{26,52},{-372,52},{-372,296},{-344,296}},
+        color={0,0,127}));
+  connect(junConWatLvg.port_2, TConWatConChiLvg.port_a)
+    annotation (Line(points={{70,40},{-40,40}}, color={0,127,255}));
+  connect(TConWatConChiLvg.port_b, junConWatHeaPumEnt.port_1)
+    annotation (Line(points={{-60,40},{-70,40}}, color={0,127,255}));
+  connect(THeaWatSup.T, ctl.THeaWatSup) annotation (Line(points={{210,-129},{
+          210,128},{-346,128},{-346,292},{-344,292}},         color={0,0,127}));
+  connect(TConWatConChiEnt.port_b, junConWatEnt.port_1)
+    annotation (Line(points={{10,-340},{10,-340}},   color={0,127,255}));
+  connect(pumConWatCoo.port_b, TConWatCooSup.port_a) annotation (Line(points={{-240,
+          -220},{-212,-220},{-212,-214}},      color={0,127,255}));
+  connect(TConWatCooSup.port_b, hexCoo.port_a1)
+    annotation (Line(points={{-212,-194},{-212,-180}}, color={0,127,255}));
+  connect(hexCoo.port_b1, TConWatCooRet.port_a)
+    annotation (Line(points={{-212,-160},{-212,-146}},color={0,127,255}));
+  connect(TConWatCooRet.port_b, coo.port_a) annotation (Line(points={{-212,-126},
+          {-212,-80},{-250,-80}},
+                              color={0,127,255}));
+  connect(valBypTan.port_3, TConWatHexCooEnt.port_a) annotation (Line(points={{-170,
+          -100},{-200,-100},{-200,-130}},   color={0,127,255}));
+  connect(TConWatHexCooEnt.port_b, hexCoo.port_a2)
+    annotation (Line(points={{-200,-150},{-200,-160}}, color={0,127,255}));
+  connect(hexCoo.port_b2, TConWatHexCooLvg.port_a)
+    annotation (Line(points={{-200,-180},{-200,-190}}, color={0,127,255}));
+  connect(TConWatHexCooLvg.port_b, mConWatHexCoo_flow.port_a) annotation (Line(
+        points={{-200,-210},{-200,-230}},             color={0,127,255}));
+  connect(TConWatConChiLvg.T, ctl.TConWatConChiLvg) annotation (Line(points={{-50,51},
+          {-50,62},{-352,62},{-352,284},{-344,284}},                 color={0,0,
+          127}));
+  connect(TConWatConChiEnt.T, ctl.TConWatConChiEnt) annotation (Line(points={{0,-329},
+          {0,-292},{-364,-292},{-364,286},{-344,286}},
+        color={0,0,127}));
+  connect(TConWatCooSup.T, ctl.TConWatCooSup) annotation (Line(points={{-223,
+          -204},{-356,-204},{-356,282},{-344,282}},       color={0,0,127}));
+  connect(TConWatCooRet.T, ctl.TConWatCooRet) annotation (Line(points={{-223,
+          -136},{-350,-136},{-350,280},{-344,280}},
+                                                 color={0,0,127}));
+  connect(TConWatHexCooEnt.T, ctl.TConWatHexCooEnt) annotation (Line(points={{-211,
+          -140},{-350,-140},{-350,278},{-344,278}},           color={0,0,127}));
+  connect(TConWatHexCooLvg.T, ctl.TConWatHexCooLvg) annotation (Line(points={{-211,
+          -200},{-354,-200},{-354,276},{-344,276}},             color={0,0,127}));
+  connect(ctl.yPumConWatCoo, pumConWatCoo.y) annotation (Line(points={{-296,259},
+          {-280,259},{-280,-216},{-262,-216}},
+        color={0,0,127}));
+  connect(chiHea.TConLvg, ctl.TConLvgChiHea) annotation (Line(points={{67,-136},
+          {67,58},{-370,58},{-370,298},{-344,298}},
+        color={0,0,127}));
+  connect(chiHea.TConEnt, ctl.TConEntChiHea) annotation (Line(points={{65,-136},
+          {65,56},{-362,56},{-362,300},{-344,300}},                     color={
+          0,0,127}));
+  connect(junConWatTanEnt.port_3, valConWatEvaMix.port_1)
+    annotation (Line(points={{-150,-40},{-130,-40}},
+                                                 color={0,127,255}));
+  connect(valConWatEvaMix.port_2, pumConWatEva.port_a)
+    annotation (Line(points={{-110,-40},{-80,-40}},
+                                                 color={0,127,255}));
+  connect(junConWatEvaLvg.port_3, valConWatEvaMix.port_3) annotation (Line(
+        points={{0,-136},{0,-100},{-120,-100},{-120,-50}},  color={0,127,255}));
+  connect(junConWatEvaLvg.port_3, dpConWatEva.port_b)
+    annotation (Line(points={{0,-136},{0,-80},{-1.77636e-15,-80}},
+                                                   color={0,127,255}));
+  connect(chiHea.port_b2, junConWatEvaLvg.port_1) annotation (Line(points={{50,-145},
+          {50,-146},{10,-146}},      color={0,127,255}));
+  connect(junConWatEvaLvg.port_2, junConWatTanLvg.port_3) annotation (Line(
+        points={{-10,-146},{-30,-146},{-30,-280},{-110,-280}},
+                                                   color={0,127,255}));
+  connect(TConWatEvaEnt.T, ctl.TConWatEvaEnt) annotation (Line(points={{69,-60},
+          {64,-60},{64,60},{-358,60},{-358,302},{-344,302}},           color={0,
+          0,127}));
+  connect(ctl.yValConWatEvaMix, valConWatEvaMix.y) annotation (Line(points={{-296,
+          284},{26,284},{26,-20},{-120,-20},{-120,-28}},           color={0,0,
+          127}));
+  connect(junConWatHeaPumLvg.port_2, TConWatConRet.port_a)
+    annotation (Line(points={{-130,40},{-160,40},{-160,30}},
+                                                   color={0,127,255}));
+  connect(TConWatConRet.port_b, junConWatTanEnt.port_1)
+    annotation (Line(points={{-160,10},{-160,-30}},color={0,127,255}));
+  connect(TConWatConRet.T, ctl.TConWatConRet) annotation (Line(points={{-171,20},
+          {-178,20},{-178,54},{-362,54},{-362,194},{-354,194},{-354,304},{-344,
+          304}},
+        color={0,0,127}));
+  connect(chi.TConLvg, ctl.TConLvgChi) annotation (Line(points={{66,98},{66,134},
+          {-348,134},{-348,294},{-344,294}},            color={0,0,127}));
+  connect(junConWatHeaPumEnt.port_3, TConWatHeaPumEnt.port_a)
+    annotation (Line(points={{-80,50},{-80,80}},   color={0,127,255}));
+  connect(TConWatHeaPumEnt.port_b, heaPum.port_a) annotation (Line(points={{-80,100},
+          {-80,160},{-90,160}},       color={0,127,255}));
+  connect(heaPum.port_b, TConWatHeaPumLvg.port_a) annotation (Line(points={{-110,
+          160},{-120,160},{-120,100}},color={0,127,255}));
+  connect(TConWatHeaPumLvg.port_b, junConWatHeaPumLvg.port_3)
+    annotation (Line(points={{-120,80},{-120,50}}, color={0,127,255}));
+  connect(ctl.y1Coo, coo.y1) annotation (Line(points={{-296,257},{-220,257},{
+          -220,-74},{-248,-74}},
+                             color={255,0,255}));
+  connect(mConWatHexCoo_flow.port_b, junConWatTanLvg.port_1) annotation (Line(
+        points={{-200,-250},{-200,-260},{-120,-260},{-120,-270}},
+                                                                color={0,127,
+          255}));
+  connect(mConWatOutTan_flow.port_b, junConWatTanLvg.port_1)
+    annotation (Line(points={{-80,-250},{-80,-260},{-120,-260},{-120,-270}},
+                                                     color={0,127,255}));
+  connect(ctl.yPumConWatCon, pumConWatCon.y) annotation (Line(points={{-296,273},
+          {-276,273},{-276,-336},{-92,-336}}, color={0,0,127}));
+  connect(ctl.y1PumConWatCon, pumConWatCon.y1) annotation (Line(points={{-296,
+          275},{-284,275},{-284,254},{-274,254},{-274,-332},{-92,-332}}, color=
+          {255,0,255}));
+  connect(pumConWatCon.port_b, valConWatByp.port_b) annotation (Line(points={{
+          -70,-340},{-40,-340},{-40,-130}}, color={0,127,255}));
+  connect(ctl.yValConWatByp, valConWatByp.y) annotation (Line(points={{-296,248},
+          {28,248},{28,-120},{-28,-120}}, color={0,0,127}));
+  connect(pumConWatCon.port_b, TConWatConChiEnt.port_a)
+    annotation (Line(points={{-70,-340},{-10,-340}}, color={0,127,255}));
+  connect(pumConWatCon.port_b, dpConWatCon.port_a) annotation (Line(points={{
+          -70,-340},{-20,-340},{-20,-320}}, color={0,127,255}));
+  connect(valConWatByp.port_a, TConWatConChiLvg.port_a)
+    annotation (Line(points={{-40,-110},{-40,40}}, color={0,127,255}));
+  connect(dpConWatCon.port_b, TConWatConChiLvg.port_a) annotation (Line(points=
+          {{-20,-300},{-20,40},{-40,40}}, color={0,127,255}));
+annotation (
+  defaultComponentName="pla", Documentation(info="<html>
+<p>
+This model represents a combined heating and cooling plant where chilled
+water is produced by cooling-only chillers and heat recovery chillers,
+hot water is produced by heat recovery chillers, and a thermal energy storage
+tank is integrated in the condenser water circuit to maximize heat recovery
+(\"Tank Charge/Discharge\" operating mode).
+Cooling towers allow rejecting excess heat from the condenser loop
+(\"Heat Rejection\" operating mode).
+Air-source heat pumps allow injecting heat into the condenser loop
+(\"Charge Assist\" operating mode).
+</p>
+<p>
+This model has been developed based on the publication by <a href=\"#Gill2021\">B. Gill (2021)</a>
+and further discussions with Taylor Engineers.
+</p>
+<h4>Abbreviations and naming conventions</h4>
+<p>
+The following abbreviations are used in the documentation of this
+model and of its components.<br/>
+</p>
+<table summary=\"log levels\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><th>Abbreviation</th><th>Description</th></tr>
+<tr><td>AI</td><td>Analog input (integer or real)</td></tr>
+<tr><td>AO</td><td>Analog output (integer or real)</td></tr>
+<tr><td>CHW</td><td>Chilled water</td></tr>
+<tr><td>CT</td><td>Cooling tower</td></tr>
+<tr><td>CW</td><td>Condenser water</td></tr>
+<tr><td>CWC</td><td>Condenser water circuit serving chiller and HRC condenser barrel</td></tr>
+<tr><td>CWE</td><td>Condenser water circuit serving HRC evaporator barrel</td></tr>
+<tr><td>DI</td><td>Digital input (Boolean)</td></tr>
+<tr><td>DO</td><td>Digital output (Boolean)</td></tr>
+<tr><td>HP</td><td>Heat pump</td></tr>
+<tr><td>HR</td><td>Heat recovery</td></tr>
+<tr><td>HRC</td><td>Heat recovery chiller</td></tr>
+<tr><td>HW</td><td>Hot water</td></tr>
+<tr><td>VFD</td><td>Variable frequency drive</td></tr>
+</table>
+<p>
+To clearly distinguish cooling-only chillers from heat recovery chillers,
+the term \"chiller\" is used systematically to refer to cooling-only chillers
+whereas the abbreviation \"HRC\" is used systematically to refer to heat recovery chillers.
+</p>
+<p>
+Each HRC can operate under the following modes.
+In <b>cascading heating</b> mode, the condenser barrel is connected to the
+HW loop and the evaporator barrel is connected to the CW loop (CWE circuit).
+The onboard controller controls the HRC to track a HW
+supply temperature setpoint at condenser outlet.
+In <b>cascading cooling</b> mode, the condenser barrel is connected to the CW
+loop (CWC circuit) and the evaporator barrel is connected to the CHW
+loop. The onboard controller controls the HRC to track a CHW
+supply temperature setpoint at evaporator outlet.
+In <b>direct heat recovery</b> mode, the condenser barrel is connected to the HW
+loop and the evaporator barrel is connected to the CHW
+loop. The onboard controller controls the HRC to track a HW
+supply temperature setpoint at condenser outlet while the plant supervisory
+controller maintains the CHW supply temperature at setpoint by
+modulating the evaporator flow rate or the condenser entering temperature.
+</p>
+<h4>System schematic</h4>
+<p>
+The schematic below represents a configuration of the system with two chillers
+and three HRCs.
+The equipment tags correspond to the component names in the plant model.
+The control points used by each control function are represented at the intersection
+of the gray area that describes the function and the four bus lines corresponding
+to the different control point categories (AI, DI, AO, DO).
+For the sake of clarity, control logic that is duplicated between multiple
+units (for instance the chiller isolation valve control) is only illustrated for
+one unit.
+The detailed description of each control function is available in the documentation
+of
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.Controller\">
+Buildings.DHC.Plants.Combined.Controls.Controller</a>.
+For an overview of the different operating modes and the design principles of such
+a system, the user may refer to the article by <a href=\"#Gill2021\">B. Gill (2021)</a>.
+</p>
+<p align=\"left\">
+<img alt=\"System schematic\"
+src=\"modelica://Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.png\"/>
+</p>
+<h4>Control points</h4>
+<h5>Cooling and heating Enable signals</h5>
+<p>
+The cooling and heating Enable signals <code>u1Coo</code> and <code>u1Hea</code>
+shall be computed outside of the plant model, for instance based on a time schedule.
+</p>
+<h5>CHW and HW supply temperature and differential pressure setpoint</h5>
+<p>
+Those setpoints are provided as control inputs.
+Ideally, a reset logic based on consumer valve requests should be implemented to adapt
+those setpoints to the demand.
+</p>
+<h4>Details</h4>
+<h5>Sizing considerations</h5>
+<p>
+Sizing the TES tank and the heat pumps is a joint optimization problem
+under the constraint that on a design heating day, heating loads can be
+met using both the recovered heat and the heat added to the tank by
+the heat pumps.
+As stated by <a href=\"#Gill2021\">B. Gill (2021)</a>, increasing the tank
+capacity generally improves plant efficiency by providing more opportunity
+for heat recovery. Tank capacity should therefore be maximized under the limit
+corresponding to the amount of heat that can be recovered over the day.
+</p>
+<p>
+The model is configured by default with a tank that is sized to store
+the heat needed to operate the HRCs during <i>3&nbsp;</i>h at peak heating
+load with a <i>&Delta;T</i> covering the two temperature cycles specified
+with the parameter <code>TTanSet</code> (heels and thermocline neglected).
+This default can be overwritten.
+</p>
+<h5>TES tank</h5>
+<p>
+The tank is assumed to be integrated without pressure separation, i.e.,
+the operating level of the tank sets the system pressure and no pressure
+sustaining valve or discharge pump is included.
+The operating level is approximated as equal to the tank height.
+A default height to diameter ratio of <i>2</i> is also taken into
+account
+(designers tend to favor a height to diameter ratio above <i>1.5</i>
+in order to minimize the volume of the thermocline which is
+considered useless).
+No high limit is considered for the tank mass flow rate.
+</p>
+<h5>CHW and HW minimum flow bypass valve</h5>
+<p>
+As per standard practice, the bypass valve is sized for the highest
+chiller minimum flow.
+The bypass valve model is configured with
+a pressure drop varying linearly with the flow rate, as opposed
+to a quadratic dependency usually considered for a turbulent flow
+regime.
+This is because the whole plant model contains large nonlinear systems
+of equations, and this configuration limits the risk of solver failure
+while reducing the time to solution.
+This has no significant impact on the operating point of the circulation pumps
+due to the control loop that modulates the valve opening to generate
+enough pressure differential at the chiller boundaries to allow for
+minimum flow circulation.
+So whatever the modeling assumptions for the bypass valve, the
+control loop ensures that the valve creates the adequate pressure drop
+and bypass flow, which will simply be reached at a different valve opening
+with the above simplification.
+</p>
+<h5>Cooling tower circuit</h5>
+<p>
+The design heat flow rate used to size the cooling towers and the intermediary
+heat exchanger corresponds to the heat flow rate rejected by all HRCs operating in
+cascading cooling mode and all chillers operating at design conditions.
+The cooling towers are sized with a default approach of <i>3&nbsp;</i>K to the
+design wetbulb temperature.
+The intermediary heat exchanger is sized with a default approach of <i>2&nbsp;</i>K.
+</p>
+<h5>Chiller and HRC performance data</h5>
+<p>
+The chiller performance data should cover the CW temperature levels
+reached when the plant is operating in Heat Rejection mode.
+The parameter <code>TCasConEnt_nominal</code> (set with a final assignment)
+provides the maximum CW supply (condenser entering) temperature in this
+operating mode.
+The HRC performance data should cover the HRC lift envelope,
+that is when the HRC is operating in direct heat recovery mode,
+producing CHW and HW at their setpoint value at full load.
+</p>
+<h4>References</h4>
+<p>
+<a name=\"Gill2021\"/>
+Brandon Gill, P.E., Taylor Engineers, Alameda, CA, USA.<br/>
+<a href=\"https://tayloreng.egnyte.com/dl/hHl2ZkZRDC/ASHRAE_Journal_-_Solving_the_Large_Building_All-Electric_Heating_Problem.pdf_\">
+Solving the large building all-electric heating problem</a>.<br/>
+ASHRAE Journal, October 2021.
+</p>
+
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AllElectricCWStorage;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
index e4dd0ccd5af..c2141b471ef 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/CoolingTowerLoop.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block CoolingTowerLoop "Cooling tower loop control"
 
   parameter Modelica.Units.SI.MassFlowRate mConWatHexCoo_flow_nominal
@@ -24,8 +24,8 @@ block CoolingTowerLoop "Cooling tower loop control"
     "Tower pump speed needed to maintain minimum tower flow (each pump stage)";
 
   Buildings.Controls.OBC.CDL.Interfaces.IntegerInput mode(
-    final min=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
-    final max=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final min=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
+    final max=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Condenser loop operating mode"
     annotation (Placement(transformation(extent={{-220,240},{-180,280}}),
         iconTransformation(extent={{-140,140},{-100,180}})));
@@ -114,7 +114,7 @@ block CoolingTowerLoop "Cooling tower loop control"
         rotation=0,
         origin={-20,260})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modRej(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Heat rejection mode index"
     annotation (Placement(transformation(extent={{-150,230},{-130,250}})));
   Buildings.Controls.OBC.CDL.Integers.Equal isModRej "Heat rejection mode"
@@ -182,12 +182,12 @@ block CoolingTowerLoop "Cooling tower loop control"
   Buildings.Controls.OBC.CDL.Reals.AddParameter addApp(final p=
         dTHexCoo_nominal) "Add HX approach"
     annotation (Placement(transformation(extent={{-40,-210},{-20,-190}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlPum1(
+  ETS.Combined.Controls.PIDWithEnable ctlPum1(
     k=0.01,
     Ti=60,
     final reverseActing=false) "Pump control loop #1"
     annotation (Placement(transformation(extent={{-10,-210},{10,-190}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlPum2(
+  ETS.Combined.Controls.PIDWithEnable ctlPum2(
     k=0.01,
     Ti=60,
     final reverseActing=false)
@@ -221,7 +221,7 @@ block CoolingTowerLoop "Cooling tower loop control"
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant yFan[2](final k={0.7,1.0})
     "y-value for maximum fan speed reset"
     annotation (Placement(transformation(extent={{30,120},{50,140}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlFan(
+  ETS.Combined.Controls.PIDWithEnable ctlFan(
     k=0.05,
     Ti=60,
     final reverseActing=false) "Fan control loop"
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
index 1cd733cbc7e..761b8e5e1ff 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/DirectHeatRecovery.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block DirectHeatRecovery
   "Block controlling HRC in direct heat recovery mode"
 
@@ -74,7 +74,7 @@ block DirectHeatRecovery
   Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
     final nout=nChiHea) "Replicate"
     annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctl[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable ctl[nChiHea](
     each final k=k,
     each final Ti=Ti,
     each final reverseActing=false,
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
index f67871ec513..0213d92efca 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/IntegerArrayHold.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block IntegerArrayHold
   "Block that holds the value of an integer array for a given time"
   parameter Integer nin=0
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
index bef6d3d628a..86a0ffbc524 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeCondenserLoop.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block ModeCondenserLoop
   "Block that determines the condenser loop mode"
 
@@ -35,8 +35,8 @@ block ModeCondenserLoop
         transformation(extent={{-240,0},{-200,40}}),      iconTransformation(
           extent={{-140,-20},{-100,20}})));
   Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput mode(
-    final min=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
-    final max=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final min=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
+    final max=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Condenser loop operating mode"
     annotation (Placement(transformation(extent={{200,-20},{240,20}}),
         iconTransformation(extent={{100,-20},{140,20}})));
@@ -139,15 +139,15 @@ block ModeCondenserLoop
   Buildings.Controls.OBC.CDL.Logical.Latch enaRej "Enable heat rejection mode"
     annotation (Placement(transformation(extent={{80,90},{100,110}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modTan(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
     "Tank Charge/Discharge mode"
     annotation (Placement(transformation(extent={{110,50},{130,70}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modRej(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Heat rejection mode"
     annotation (Placement(transformation(extent={{108,130},{128,150}})));
   Buildings.Controls.OBC.CDL.Integers.Sources.Constant modCha(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
     "Charge assist mode"
     annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
   Buildings.Controls.OBC.CDL.Integers.Switch intSwi
@@ -407,8 +407,8 @@ where <i>&Delta;t</i> is the time period in seconds.
 <h4>Operating modes</h4>
 <p>
 Three operating modes are defined within
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop\">
+Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop</a>.
 </p>
 <h5>Charge Assist</h5>
 <p>
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
index d6857bdee4b..7c1b5aba837 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ModeHeatRecoveryChiller.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block ModeHeatRecoveryChiller
   "Block that computes the cascading cooling and direct HR switchover signals"
 
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
new file mode 100644
index 00000000000..e71634d2cd4
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
@@ -0,0 +1,657 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
+block PartialController "Interface class for plant controller"
+
+  parameter Integer nChi(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"),
+      Evaluate=true);
+  parameter Integer nPumChiWat(final min=1, start=1)
+    "Number of CHW pumps operating at design conditions"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal
+    "Design (minimum) CHW supply temperature"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+
+  parameter Integer nChiHea(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="HW loop and heat recovery chillers"),
+      Evaluate=true);
+  parameter Integer nPumHeaWat(final min=1, start=1)
+    "Number of HW pumps operating at design conditions"
+    annotation (Dialog(group="HW loop and heat recovery chillers"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal
+    "Design (maximum) HW supply temperature"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+
+  parameter Integer nHeaPum(final min=1, start=1)
+    "Number of heat pumps operating at design conditions"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+      Evaluate=true);
+  parameter Integer nPumConWatCon(final min=1, start=1)
+    "Number of CW pumps serving condenser barrels at design conditions"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+      Evaluate=true);
+  parameter Integer nPumConWatEva(final min=1, start=1)
+    "Number of CW pumps serving evaporator barrels at design conditions"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
+      Evaluate=true);
+
+  parameter Integer nCoo(final min=1, start=1)
+    "Number of cooling tower cells operating at design conditions"
+    annotation (Dialog(group="Cooling tower loop"),
+      Evaluate=true);
+  parameter Integer nPumConWatCoo(final min=1, start=1)
+    "Number of CW pumps serving cooling towers at design conditions"
+    annotation (Dialog(group="Cooling tower loop"),
+      Evaluate=true);
+
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatChi_flow_nominal
+    "Cooling design heat flow rate of cooling-only chillers (all units)"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.HeatFlowRate QHeaPum_flow_nominal
+    "Heating design heat flow rate of heat pumps (all units)"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Real PLRStaTra(final unit="1", final min=0, final max=1) = 0.85
+    "Part load ratio triggering stage transition";
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal
+    "Cooling design heat flow rate of HRC in cascading cooling mode (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal_approx
+    "Cooling design heat flow rate of HRC in cascading cooling mode (all units), approximate for scaling"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
+    QChiWatChi_flow_nominal+QChiWatCasCoo_flow_nominal
+    "Plant cooling design heat flow rate (all units)";
+  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal
+    "Heating design heat flow rate (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
+    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "Specific heat capacity of the fluid";
+
+  parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
+    final min=0)
+    "CHW design mass flow rate (all units)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpChiWatSet_max(
+    final min=0,
+    displayUnit="Pa")
+    "Design (maximum) CHW differential pressure setpoint"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal
+    "HW design mass flow rate (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpHeaWatSet_max(
+    final min=0,
+    displayUnit="Pa")
+    "Design (maximum) HW differential pressure setpoint"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mConWatCon_flow_nominal(
+    final min=0)
+    "Design total CW mass flow rate through condenser barrels (all units)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.MassFlowRate mConWatEva_flow_nominal(
+    final min=0)
+    "Design total CW mass flow rate through evaporator barrels (all units)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+
+  parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_nominal
+    "Chiller CHW design mass flow rate (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_min
+    "Chiller CHW minimum mass flow rate (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mConWatChi_flow_nominal
+    "Chiller CW design mass flow rate (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_nominal
+    "HRC CHW design mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_min
+    "HRC CHW minimum mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mConWatChiHea_flow_nominal
+    "HRC CW design mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.MassFlowRate mHeaWatChiHea_flow_min
+    "Chiller HW minimum mass flow rate (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+
+  parameter Modelica.Units.SI.PressureDifference dpEvaChi_nominal(
+    final min=0,
+    displayUnit="Pa")
+    "Chiller evaporator design pressure drop (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpValEvaChi_nominal(
+    final min=0,
+    displayUnit="Pa")
+    "Chiller evaporator isolation valve design pressure drop (each unit)"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpEvaChiHea_nominal(
+    final min=0,
+    displayUnit="Pa")
+    "Design chiller evaporator  pressure drop (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.PressureDifference dpValEvaChiHea_nominal(
+    final min=0,
+    displayUnit="Pa")
+    "HRC evaporator isolation valve design pressure drop (each unit)"
+    annotation(Dialog(group="HW loop and heat recovery chillers"));
+
+  parameter Modelica.Units.SI.PressureDifference dpConWatConSet_max(
+    final min=0,
+    displayUnit="Pa")
+    "Design (maximum) CW condenser loop differential pressure setpoint"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Modelica.Units.SI.PressureDifference dpConWatEvaSet_max(
+    final min=0,
+    displayUnit="Pa")
+    "Design (maximum) CW evaporator loop differential pressure setpoint"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+
+  parameter Modelica.Units.SI.Temperature TTanSet[2, 2]
+    "Tank temperature setpoints: 2 cycles with 2 setpoints"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Real fraUslTan(final unit="1", final min=0, final max=1)
+    "Useless fraction of TES"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+  parameter Integer nTTan(final min=0)=0
+    "Number of tank temperature points"
+    annotation (Dialog(group="CW loop, TES tank and heat pumps", connectorSizing=true),HideResult=true);
+  parameter Real ratFraChaTanLim[5](each final unit="1/h")=
+    {-0.3, -0.2, -0.15, -0.10, -0.08}
+    "Rate of change of tank charge fraction (over 10, 30, 120, 240, and 360') that triggers Charge Assist (<0)"
+    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
+
+  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_min
+    "Minimum chiller lift at minimum load"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_nominal
+    "Design chiller lift"
+    annotation(Dialog(group="CHW loop and cooling-only chillers"));
+
+  parameter Modelica.Units.SI.TemperatureDifference dTHexCoo_nominal
+    "Design heat exchanger approach"
+    annotation (Dialog(group="Cooling tower loop"));
+
+  parameter Modelica.Units.SI.Time riseTimePum=30
+    "Pump rise time of the filter (time to reach 99.6 % of the speed)"
+    annotation (
+      Dialog(
+      tab="Dynamics",
+      group="Filtered speed"));
+  parameter Modelica.Units.SI.Time riseTimeVal=120
+    "Pump rise time of the filter (time to reach 99.6 % of the opening)"
+    annotation (
+      Dialog(
+      tab="Dynamics",
+      group="Filtered opening"));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-300,420},{-260,460}}),
+        iconTransformation(extent={{-260,340},{-220,380}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    "Heating enable signal"
+    annotation (Placement(transformation(extent={{-300,380},{-260,420}}),
+        iconTransformation(extent={{-260,320},{-220,360}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(final unit="K",
+      displayUnit="degC") "CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-300,340},{-260,380}}),
+        iconTransformation(extent={{-260,300},{-220,340}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(final unit="K",
+      displayUnit="degC")
+    "HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-300,320},{-260,360}}),
+        iconTransformation(extent={{-260,280},{-220,320}})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEvaChi[nChi]
+    "Cooling-only chiller evaporator isolation valve commanded position"
+    annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,320}),iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,270})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConChi[nChi](
+    each final unit="1")
+    "Cooling-only chiller condenser isolation valve commanded position"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,300}),iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,250})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Chi[nChi]
+    "Cooling-only chiller On/Off command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,340}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,290})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWat[nPumChiWat]
+    "CHW pump Start command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,260}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,230})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWat(
+    final unit="1")
+    "CHW pump speed signal"
+    annotation (Placement(
+        transformation(extent={{260,220},{300,260}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,210})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEvaChiHea[nChiHea](
+    each final unit="1") "HRC evaporator isolation valve commanded position"
+    annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,80}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,80})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ChiHea[nChiHea]
+    "HRC On/Off command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,160})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1CooChiHea[nChiHea]
+    "HRC cooling mode switchover command: true for cooling, false for heating"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,140}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,140})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConChiHea[nChiHea](
+    each final unit="1") "HRC condenser isolation valve commanded position"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,60}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,60})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWat[nPumHeaWat]
+    "HW pump Start command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,-20}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-20})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWat(
+    final unit="1")
+    "HW pump speed signal"
+    annotation (Placement(
+        transformation(extent={{260,-60},{300,-20}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-40})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValChiWatMinByp(
+    final unit="1")
+    "CHW minimum flow bypass valve control signal"
+    annotation (Placement(
+        transformation(extent={{260,180},{300,220}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,190})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValHeaWatMinByp(
+    final unit="1") "HW minimum flow bypass valve control signal"
+    annotation (Placement(
+        transformation(extent={{260,-100},{300,-60}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-60})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumConWatCon[nPumConWatCon]
+    "CW pump serving condenser barrels Start command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,-120}),iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-90})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumConWatCon(
+    final unit="1")
+    "CW pump serving condenser barrels Speed command"
+    annotation (Placement(
+        transformation(extent={{260,-160},{300,-120}},rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-110})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumConWatEva[nPumConWatEva]
+    "CW pump serving evaporator barrels Start command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,-160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-130})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumConWatEva(
+    final unit="1")
+    "CW pump serving evaporator barrels Speed command"
+    annotation (Placement(
+        transformation(extent={{260,-200},{300,-160}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-150})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaPum[nHeaPum]
+    "Heat pump On/Off command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,-220}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-180})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput THeaPumSet(
+    final unit="K", displayUnit="degC") "Heat pump supply temperature setpoint"
+    annotation (Placement(
+        transformation(extent={{260,-260},{300,-220}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-200})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValBypTan(
+    final unit="1") "TES tank bypass valve commanded position"
+    annotation (Placement(
+        transformation(extent={{260,-300},{300,-260}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-320})));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Coo[nCoo]
+    "Cooling tower Start command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,-360}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-270})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCoo(
+    final unit="1") "Cooling tower fan speed command"
+                                      annotation (Placement(transformation(
+          extent={{260,-400},{300,-360}}, rotation=0), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-290})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumConWatCoo[
+    nPumConWatCoo] "Cooling tower pump Start command"
+    annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,-320}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-230})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TChiHeaSet[nChiHea](
+    each final unit="K", each displayUnit="degC")
+    "HRC supply temperature setpoint"
+    annotation (Placement(transformation(extent={{260,80},{300,120}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,100})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaCooChiHea[nChiHea]
+    "HRC direct heat recovery switchover command: true for direct HR, false for cascading"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,120}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatSet(final unit="Pa",
+      final min=0) "CHW differential pressure setpoint (for local dp sensor)"
+    annotation (Placement(transformation(extent={{-300,300},{-260,340}}),
+        iconTransformation(extent={{-260,260},{-220,300}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatSet(final unit="Pa",
+      final min=0)
+    "HW differential pressure setpoint (for local dp sensor)"
+    annotation (Placement(transformation(extent={{-300,280},{-260,320}}),
+        iconTransformation(extent={{-260,240},{-220,280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWat(final unit="Pa")
+    "CHW differential pressure (from local dp sensor)"
+    annotation (Placement(transformation(extent={{-300,-360},{-260,-320}}),
+        iconTransformation(extent={{-260,-320},{-220,-280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWat(final unit="Pa")
+    "HW differential pressure (from local dp sensor)"
+    annotation (Placement(transformation(extent={{-300,-380},{-260,-340}}),
+        iconTransformation(extent={{-260,-340},{-220,-300}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mChiWatPri_flow(final unit=
+        "kg/s") "Primary CHW mass flow rate"
+    annotation (Placement(
+        transformation(extent={{-300,-200},{-260,-160}}),
+                                                       iconTransformation(
+          extent={{-260,-200},{-220,-160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mHeaWatPri_flow(final unit=
+        "kg/s") "Primary HW mass flow rate" annotation (Placement(
+        transformation(extent={{-300,-220},{-260,-180}}),
+                                                      iconTransformation(extent={{-260,
+            -220},{-220,-180}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpConWatCon(final unit="Pa")
+    "CW condenser loop differential pressure" annotation (Placement(
+        transformation(extent={{-300,-400},{-260,-360}}), iconTransformation(
+          extent={{-260,-360},{-220,-320}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpConWatEva(final unit="Pa")
+    "CW evaporator loop differential pressure" annotation (Placement(
+        transformation(extent={{-300,-420},{-260,-380}}), iconTransformation(
+          extent={{-260,-380},{-220,-340}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatCon_flow(final unit=
+        "kg/s") "CW condenser loop mass flow rate" annotation (Placement(
+        transformation(extent={{-300,-260},{-260,-220}}),
+                                                     iconTransformation(extent={{-260,
+            -240},{-220,-200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatEva_flow(final unit=
+        "kg/s") "CW evaporator loop mass flow rate" annotation (Placement(
+        transformation(extent={{-300,-280},{-260,-240}}),
+                                                      iconTransformation(extent={{-260,
+            -260},{-220,-220}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(final unit="K",
+      displayUnit="degC") "CHW supply temperature " annotation (
+      Placement(transformation(extent={{-300,240},{-260,280}}),
+        iconTransformation(extent={{-260,220},{-220,260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriRet(final unit="K",
+      displayUnit="degC") "Primary CHW return temperature " annotation (
+      Placement(transformation(extent={{-300,220},{-260,260}}),
+        iconTransformation(extent={{-260,200},{-220,240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriRet(final unit="K",
+      displayUnit="degC") "Primary HW return temperature " annotation (
+      Placement(transformation(extent={{-300,60},{-260,100}}),
+        iconTransformation(extent={{-260,40},{-220,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TTan[nTTan](
+    each final unit="K",
+    each  displayUnit="degC")
+    "TES tank temperature" annotation (Placement(
+        transformation(extent={{-300,40},{-260,80}}),     iconTransformation(
+          extent={{-260,20},{-220,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatHexCoo_flow(final unit
+      ="kg/s") "CW mass flow rate through secondary (plant) side of HX"
+    annotation (Placement(transformation(extent={{-300,-300},{-260,-260}}),
+        iconTransformation(extent={{-260,-280},{-220,-240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatOutTan_flow(final unit
+      ="kg/s")
+    "Mass flow rate out of lower port of TES tank (>0 when charging)"
+    annotation (Placement(transformation(extent={{-300,-320},{-260,-280}}),
+        iconTransformation(extent={{-260,-300},{-220,-260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mEvaChi_flow[nChi](
+    each final unit="kg/s")
+    "Chiller evaporator barrel mass flow rate" annotation (Placement(
+        transformation(extent={{-300,-120},{-260,-80}}),
+                                                       iconTransformation(
+          extent={{-260,-120},{-220,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConChi_flow[nChi](
+    each final unit="kg/s")
+    "Chiller condenser barrel mass flow rate" annotation (Placement(
+        transformation(extent={{-300,-140},{-260,-100}}),
+                                                      iconTransformation(extent={{-260,
+            -140},{-220,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mEvaChiHea_flow[nChiHea](
+    each final unit="kg/s")
+    "HRC evaporator barrel mass flow rate" annotation (
+      Placement(transformation(extent={{-300,-160},{-260,-120}}),
+        iconTransformation(extent={{-260,-160},{-220,-120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConChiHea_flow[nChiHea](
+    each final unit="kg/s")
+    "HRC condenser barrel mass flow rate" annotation (
+      Placement(transformation(extent={{-300,-180},{-260,-140}}),
+        iconTransformation(extent={{-260,-180},{-220,-140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEvaSwiHea[nChiHea](
+    each final unit="1")
+    "HRC evaporator switchover valve commanded position"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,40}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,40})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConSwiChiHea[nChiHea](
+    each final unit="1")
+    "HRC condenser switchover valve commanded position"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,20}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,20})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEvaLvgChiHea[nChiHea](
+    each final unit="K", each displayUnit="degC")
+    "HRC evaporator barrel leaving temperature"
+    annotation (Placement(transformation(extent={{-300,120},{-260,160}}),
+        iconTransformation(extent={{-260,100},{-220,140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSup(
+    final unit="K",
+    displayUnit="degC") "HW supply temperature " annotation (Placement(
+        transformation(extent={{-300,80},{-260,120}}),iconTransformation(extent={{-260,60},
+            {-220,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumConWatCoo
+    "Cooling tower pump speed command" annotation (Placement(transformation(
+          extent={{260,-360},{300,-320}}), iconTransformation(extent={{220,-270},
+            {260,-230}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatConChiEnt(final unit=
+        "K", displayUnit="degC") "Chiller and HRC entering CW temperature"
+    annotation (Placement(transformation(extent={{-300,20},{-260,60}}),
+        iconTransformation(extent={{-260,0},{-220,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatConChiLvg(final unit=
+        "K", displayUnit="degC") "Chiller and HRC leaving CW temperature"
+    annotation (Placement(transformation(extent={{-300,0},{-260,40}}),
+        iconTransformation(extent={{-260,-20},{-220,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatCooSup(final unit="K",
+      displayUnit="degC") "Cooling tower loop CW supply temperature"
+    annotation (Placement(transformation(extent={{-300,-20},{-260,20}}),
+        iconTransformation(extent={{-260,-40},{-220,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatCooRet(final unit="K",
+      displayUnit="degC") "Cooling tower loop CW return temperature"
+    annotation (Placement(transformation(extent={{-300,-40},{-260,0}}),
+        iconTransformation(extent={{-260,-60},{-220,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatHexCooEnt(final unit="K",
+      displayUnit="degC")        "HX entering CW temperature" annotation (
+      Placement(transformation(extent={{-300,-60},{-260,-20}}),
+        iconTransformation(extent={{-260,-80},{-220,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatHexCooLvg(final unit="K",
+      displayUnit="degC")        "HX leaving CW temperature" annotation (
+      Placement(transformation(extent={{-300,-80},{-260,-40}}),
+        iconTransformation(extent={{-260,-100},{-220,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConEntChiHea[nChiHea](each final
+            unit="K", each displayUnit="degC")
+    "HRC condenser barrel entering temperature" annotation (Placement(
+        transformation(extent={{-300,160},{-260,200}}), iconTransformation(
+          extent={{-260,140},{-220,180}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConLvgChiHea[nChiHea](each final
+            unit="K", each displayUnit="degC")
+    "HRC condenser barrel leaving temperature" annotation (Placement(
+        transformation(extent={{-300,140},{-260,180}}), iconTransformation(
+          extent={{-260,120},{-220,160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatEvaEnt(final unit="K",
+      displayUnit="degC") "HRC evaporator entering CW temperature " annotation (
+     Placement(transformation(extent={{-300,180},{-260,220}}),
+        iconTransformation(extent={{-260,160},{-220,200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConWatEvaMix
+    "HRC evaporator CW mixing valve commanded position" annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={280,0}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,0})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatConRet(final unit
+      ="K", displayUnit="degC") "Condenser loop CW return temperature"
+    annotation (Placement(transformation(extent={{-300,200},{-260,240}}),
+        iconTransformation(extent={{-260,180},{-220,220}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConLvgChi[nChi](each final
+      unit="K", each displayUnit="degC")
+    "Chiller condenser barrel leaving temperature" annotation (Placement(
+        transformation(extent={{-300,100},{-260,140}}), iconTransformation(
+          extent={{-260,80},{-220,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConWatByp(final unit="1")
+    "CW chiller bypass valve control signal" annotation (Placement(
+        transformation(extent={{260,-440},{300,-400}}, rotation=0),
+        iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={240,-360})));
+  annotation (Diagram(coordinateSystem(extent={{-260,-460},{260,460}})), Icon(
+        coordinateSystem(extent={{-220,-380},{220,380}}),
+        graphics={                      Text(
+        extent={{-150,430},{150,390}},
+        textString="%name",
+        textColor={0,0,255}),
+        Rectangle(
+          extent={{-220,-380},{220,380}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}),
+    Documentation(info="<html>
+<p>
+This block serves as an interface class for the plant controller.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialController;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
new file mode 100644
index 00000000000..5dbeb4395bf
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
@@ -0,0 +1,246 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
+block StageIndex
+  "Block that computes the stage index out of staging signals"
+
+  parameter Integer nSta(start=1)
+    "Number of stages"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.Time tSta=0
+    "Minimum runtime of each stage"
+    annotation(Evaluate=true);
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
+    "Enable signal"
+    annotation (Placement(
+        transformation(extent={{-220,40},{-180,80}}),iconTransformation(extent={{-140,40},
+            {-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Up
+    "Staging up signal"
+    annotation (Placement(
+        transformation(extent={{-220,-100},{-180,-60}}),iconTransformation(extent={{-140,
+            -20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Dow
+    "Staging down signal"
+    annotation (Placement(
+        transformation(extent={{-220,-140},{-180,-100}}),
+        iconTransformation(extent={{-140,
+            -78},{-100,-38}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput idxSta
+    "Stage index"
+    annotation (Placement(transformation(extent={{180,-20},{220,20}}),
+        iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput preIdxSta
+    "Left limit (in discrete-time) of stage index"
+    annotation (Placement(
+        transformation(extent={{180,-60},{220,-20}}), iconTransformation(extent={{100,-80},
+            {140,-40}})));
+
+  Modelica.StateGraph.InitialStepWithSignal sta0(
+    final nOut=1,
+    final nIn=nSta+1)
+    "Stage 0: no unit"
+    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
+  Modelica.StateGraph.StepWithSignal sta[nSta](
+    each final nIn=2, each final nOut=3)
+    "Stage i"
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
+  Modelica.StateGraph.TransitionWithSignal enaLea(
+    final enableTimer=false) "Transition enabling lead unit"
+    annotation (Placement(transformation(extent={{-42,30},{-22,50}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot "State graph root"
+    annotation (Placement(transformation(extent={{-10,128},{10,148}})));
+  Modelica.StateGraph.TransitionWithSignal enaLag[nSta](
+    each final enableTimer=false)
+    "Transition enabling lag unit"
+    annotation (Placement(transformation(extent={{90,30},{110,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer tim[nSta](each final t=tSta)
+    "Timer for minimum runtime"
+    annotation (Placement(transformation(extent={{10,-50},{30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer tim0(final t=tSta)
+    "Timer for minimum runtime"
+    annotation (Placement(transformation(extent={{-100,0},{-80,20}})));
+  Buildings.Controls.OBC.CDL.Logical.And and2 "Timer for minimum runtime"
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Buildings.Controls.OBC.CDL.Logical.And andUp[nSta]
+    "Runtime criterion met AND staging up order"
+    annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep(
+    final nout=nSta)
+    "Replicate"
+    annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.And andDow[nSta]
+    "Runtime criterion met AND staging down order"
+    annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep1(
+    final nout=nSta) "Replicate"
+    annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
+  Modelica.StateGraph.TransitionWithSignal disLag[nSta](
+    each final enableTimer=false)
+    "Transition disabling lag unit"
+    annotation (Placement(transformation(extent={{110,10},{130,30}})));
+  Modelica.StateGraph.TransitionWithSignal disAll[nSta](
+    each final enableTimer=false)
+    "Transition disabling all units"
+    annotation (Placement(transformation(extent={{70,50},{90,70}})));
+  Buildings.Controls.OBC.CDL.Logical.And andNotEna[nSta]
+    "Runtime criterion met AND enable signal false"
+    annotation (Placement(transformation(extent={{50,-50},{70,-30}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep2(
+    final nout=nSta)
+    "Replicate"
+    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1 "True if enable signal false"
+    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
+  Modelica.Blocks.Sources.IntegerExpression calIdxSta(final y=
+        Modelica.Math.BooleanVectors.firstTrueIndex(sta.active))
+    "Compute stage index"
+    annotation (Placement(transformation(extent={{140,-10},{160,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Edge edg
+    "Transition to stage 1 at enable time"
+    annotation (Placement(transformation(extent={{-130,70},{-110,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or2
+    "Transition to stage 1 at enable time or staging up order"
+    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
+  Modelica.Blocks.Sources.IntegerExpression calPre(final y=pre(idxSta))
+    "Compute left limit of stage index"
+    annotation (Placement(transformation(extent={{140,-50},{160,-30}})));
+
+  Buildings.Controls.OBC.CDL.Logical.And upAndEna "Stage up only if enabled"
+    annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.And dowOrDis "Stage down if disabled"
+    annotation (Placement(transformation(extent={{-160,-130},{-140,-110}})));
+initial equation
+  preIdxSta=0;
+equation
+  for i in 1:(nSta - 1) loop
+  connect(enaLag[i].outPort, sta[i+1].inPort[1]) annotation (Line(points={{101.5,
+            40},{110,40},{110,80},{-20,80},{-20,39.75},{-11,39.75}},
+                                                               color={0,0,0}));
+  connect(disLag[i+1].outPort, sta[i].inPort[2]) annotation (Line(points={{121.5,
+            20},{130,20},{130,80},{-20,80},{-20,40.25},{-11,40.25}}, color={0,0,0}));
+  end for;
+  connect(enaLag[nSta].outPort, sta[nSta].inPort[2])
+    annotation (Line(points={{101.5,40},{110,40},{110,80},{-20,80},{-20,40.25},{
+          -11,40.25}},                                       color={0,0,0}));
+  connect(disAll.outPort, sta0.inPort[1:nSta])
+    annotation (Line(points={{81.5,60},{90,60},{90,100},{-140,100},{-140,40},{
+          -121,40}},                                color={0,0,0}));
+  connect(sta0.outPort[1], enaLea.inPort)
+    annotation (Line(points={{-99.5,40},{-36,40}}, color={0,0,0}));
+  connect(enaLea.outPort, sta[1].inPort[1])
+    annotation (Line(points={{-30.5,40},{-24,40},{-24,39.75},{-11,39.75}},color={0,0,0}));
+
+  connect(disLag[1].outPort, sta0.inPort[nSta+1]) annotation (Line(points={{121.5,
+          20},{130,20},{130,100},{-140,100},{-140,40},{-121,40}},
+                                                            color={0,0,0}));
+  connect(sta.outPort[1], disAll.inPort) annotation (Line(points={{10.5,39.8333},
+          {20,39.8333},{20,60},{76,60}},
+                            color={0,0,0}));
+  connect(sta.outPort[2], enaLag.inPort) annotation (Line(points={{10.5,40},{96,
+          40}},                         color={0,0,0}));
+  connect(sta.outPort[3], disLag.inPort) annotation (Line(points={{10.5,40.1667},
+          {20,40.1667},{20,20},{116,20}},
+                                        color={0,0,0}));
+
+  connect(sta.active, tim.u)
+    annotation (Line(points={{0,29},{0,-40},{8,-40}}, color={255,0,255}));
+  connect(sta0.active, tim0.u) annotation (Line(points={{-110,29},{-110,10},{
+          -102,10}},
+                color={255,0,255}));
+  connect(tim0.passed, and2.u2)
+    annotation (Line(points={{-78,2},{-62,2}}, color={255,0,255}));
+  connect(and2.y, enaLea.condition)
+    annotation (Line(points={{-38,10},{-32,10},{-32,28}}, color={255,0,255}));
+  connect(rep.y, andUp.u2) annotation (Line(points={{-38,-80},{34,-80},{34,-88},
+          {48,-88}}, color={255,0,255}));
+  connect(andUp.y, enaLag.condition)
+    annotation (Line(points={{72,-80},{100,-80},{100,28}}, color={255,0,255}));
+  connect(tim.passed, andDow.u1) annotation (Line(points={{32,-48},{40,-48},{40,
+          -120},{48,-120}}, color={255,0,255}));
+  connect(rep1.y, andDow.u2) annotation (Line(points={{-38,-120},{36,-120},{36,-128},
+          {48,-128}}, color={255,0,255}));
+  connect(tim.passed, andUp.u1) annotation (Line(points={{32,-48},{40,-48},{40,-80},
+          {48,-80}}, color={255,0,255}));
+  connect(andDow.y, disLag.condition) annotation (Line(points={{72,-120},{120,-120},
+          {120,8}}, color={255,0,255}));
+  connect(u1, not1.u) annotation (Line(points={{-200,60},{-170,60},{-170,-40},{
+          -102,-40}},
+                 color={255,0,255}));
+  connect(not1.y, rep2.u)
+    annotation (Line(points={{-78,-40},{-62,-40}}, color={255,0,255}));
+  connect(rep2.y, andNotEna.u1) annotation (Line(points={{-38,-40},{-20,-40},{-20,
+          -20},{40,-20},{40,-40},{48,-40}}, color={255,0,255}));
+  connect(tim.passed, andNotEna.u2)
+    annotation (Line(points={{32,-48},{48,-48}}, color={255,0,255}));
+  connect(andNotEna.y, disAll.condition)
+    annotation (Line(points={{72,-40},{80,-40},{80,48}}, color={255,0,255}));
+
+  connect(calIdxSta.y, idxSta)
+    annotation (Line(points={{161,0},{200,0}},color={255,127,0}));
+  connect(u1, edg.u) annotation (Line(points={{-200,60},{-170,60},{-170,80},{
+          -132,80}},
+                color={255,0,255}));
+  connect(edg.y, or2.u1)
+    annotation (Line(points={{-108,80},{-102,80}},
+                                                 color={255,0,255}));
+  connect(or2.y, and2.u1) annotation (Line(points={{-78,80},{-70,80},{-70,10},{
+          -62,10}},               color={255,0,255}));
+  connect(calPre.y, preIdxSta)
+    annotation (Line(points={{161,-40},{200,-40}}, color={255,127,0}));
+  connect(u1, upAndEna.u2) annotation (Line(points={{-200,60},{-170,60},{-170,
+          -88},{-162,-88}}, color={255,0,255}));
+  connect(u1Up, upAndEna.u1)
+    annotation (Line(points={{-200,-80},{-162,-80}}, color={255,0,255}));
+  connect(upAndEna.y, rep.u)
+    annotation (Line(points={{-138,-80},{-62,-80}}, color={255,0,255}));
+  connect(dowOrDis.y, rep1.u)
+    annotation (Line(points={{-138,-120},{-62,-120}}, color={255,0,255}));
+  connect(u1Dow, dowOrDis.u1)
+    annotation (Line(points={{-200,-120},{-162,-120}}, color={255,0,255}));
+  connect(u1, dowOrDis.u2) annotation (Line(points={{-200,60},{-170,60},{-170,
+          -128},{-162,-128}}, color={255,0,255}));
+  connect(upAndEna.y, or2.u2) annotation (Line(points={{-138,-80},{-130,-80},{
+          -130,60},{-106,60},{-106,72},{-102,72}},
+                                                color={255,0,255}));
+  annotation (
+  defaultComponentName="sta",
+  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          textColor={0,0,255},
+          extent={{-150,110},{150,150}},
+          textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false,
+          extent={{-180,-180},{180,180}})),
+    Documentation(info="<html>
+<p>
+This block is used to compute the stage index of the plant or
+of multiple lead/lag units such as pump groups.
+</p>
+<p>
+At initial time, stage <code>#0</code> is active.
+The transition to stage <code>#1</code> is triggered when stage <code>#0</code> has been active
+for the minimum runtime and when either the Enable signal <code>u1</code>
+has a rising edge or when the stage up signal <code>u1Up</code> is <code>true</code>.
+</p>
+<p>
+From stage <code>#i</code>, the transition to stage <code>#i+1</code> (resp. <code>i-1</code>) is triggered
+when stage <code>#i</code> has been active for the minimum runtime and when the
+stage up signal <code>u1Up</code> (resp. stage down signal <code>u1Dow</code>)
+is <code>true</code>.
+From stage <code>#i</code>, the transition to stage <code>#0</code> is triggered
+when stage <code>#i</code> has been active for the minimum runtime and the Enable signal
+<code>u1</code> is <code>false</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StageIndex;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
new file mode 100644
index 00000000000..84917c63de1
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
@@ -0,0 +1,655 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
+block StagingPlant
+  "Block that computes plant stage and command signals for chillers and HRC"
+
+  parameter Integer nChi(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatChi_flow_nominal
+    "Cooling design heat flow rate of cooling-only chillers (all units)"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Integer nChiHea(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="HW loop and heat recovery chillers"),
+      Evaluate=true);
+  parameter Real PLRStaTra(unit="1") = 0.85
+    "Part load ratio triggering stage transition";
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal
+    "Cooling design heat flow rate of HRC in cascading cooling mode (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal_approx
+    "Cooling design heat flow rate of HRC in cascading cooling mode (all units), approximate for scaling"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal
+    "Heating design heat flow rate (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
+    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "Specific heat capacity of the fluid";
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mChiWatPri_flow(
+    final unit="kg/s")
+    "Primary CHW mass flow rate"
+    annotation (Placement(transformation(extent={{-280,80},{-240,120}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
+    final unit="K", displayUnit="degC") "CHW supply temperature setpoint"
+    annotation (Placement(transformation(
+          extent={{-280,60},{-240,100}}), iconTransformation(extent={{-140,60},
+            {-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriRet(final unit="K",
+      displayUnit="degC") "Primary CHW return temperature" annotation (
+      Placement(transformation(extent={{-280,20},{-240,60}}),
+        iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput mHeaWatPri_flow(final unit="kg/s")
+    "Primary HW mass flow rate" annotation (Placement(transformation(extent={{-280,
+            -100},{-240,-60}}),iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(
+    final unit="K", displayUnit="degC")
+    "HW supply temperature setpoint" annotation (Placement(transformation(
+          extent={{-280,-140},{-240,-100}}),
+                                        iconTransformation(extent={{-140,-80},{
+            -100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriRet(final unit="K",
+      displayUnit="degC") "Primary HW return temperature" annotation (Placement(
+        transformation(extent={{-280,-180},{-240,-140}}), iconTransformation(
+          extent={{-140,-120},{-100,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(final unit="K",
+      displayUnit="degC") "CHW supply temperature" annotation (Placement(
+        transformation(extent={{-280,180},{-240,220}}), iconTransformation(
+          extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWat(final unit="Pa")
+    "CHW loop differential pressure"
+                                   annotation (
+      Placement(transformation(extent={{-280,240},{-240,280}}),
+        iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatSet(final unit="Pa")
+    "CHW loop differential pressure setpoint"
+                                            annotation (
+     Placement(transformation(extent={{-280,260},{-240,300}}),
+        iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSup(final unit="K",
+      displayUnit="degC") "HW supply temperature" annotation (Placement(
+        transformation(extent={{-280,-240},{-240,-200}}), iconTransformation(
+          extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWat(final unit="Pa")
+    "HW loop differential pressure" annotation (Placement(transformation(extent
+          ={{-280,-300},{-240,-260}}), iconTransformation(extent={{-140,-160},{
+            -100,-120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatSet(final unit="Pa")
+    "HW loop differential pressure setpoint" annotation (Placement(
+        transformation(extent={{-280,-280},{-240,-240}}), iconTransformation(
+          extent={{-140,-140},{-100,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput QCooReq_flow(final unit="W")
+    "Plant required cooling capacity (>0)" annotation (
+      Placement(transformation(extent={{240,160},{280,200}}),
+        iconTransformation(extent={{100,120},{140,160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
+    "Cooling enable signal"
+    annotation (Placement(transformation(extent={{-280,140},{-240,180}}),
+        iconTransformation(extent={{-140,122},{-100,162}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    "Heating enable signal"
+    annotation (Placement(transformation(extent={{-280,120},{-240,160}}),
+        iconTransformation(extent={{-140,102},{-100,142}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Chi[nChi]
+    "Chiller On/Off command"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={260,120}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={120,80})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1CooChiHea[nChiHea]
+    "HRC cooling mode switchover command: true for cooling, false for heating"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={260,40}),  iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={120,-80})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ChiHea[nChiHea]
+    "HRC On/Off command" annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={260,-100}),iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={120,-20})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaCooChiHea[nChiHea]
+    "HRC cooling mode switchover command: true for cooling, false for heating"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={260,-40}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={120,-140})));
+
+  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve(delta=300)
+    "Moving average"
+    annotation (Placement(transformation(extent={{-150,110},{-130,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply loaChiWat
+    "Compute total chiller load (>0)"
+    annotation (Placement(transformation(extent={{-180,110},{-160,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dTChiWatPos
+    "Compute deltaT (>0)"
+    annotation (Placement(transformation(extent={{-210,70},{-190,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply loaHeaWat
+    "Compute total chiller load"
+    annotation (Placement(transformation(extent={{-180,-130},{-160,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract dTHeaWat "Compute deltaT"
+    annotation (Placement(transformation(extent={{-220,-150},{-200,-130}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(final nout=
+        nChi) "Replicate"
+    annotation (Placement(transformation(extent={{180,110},{200,130}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold cmdChi[nChi](final
+      t={i for i in 1:nChi})
+    "Compute chiller On/Off command from number of units to be commanded On"
+    annotation (Placement(transformation(extent={{210,110},{230,130}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter timCp(final k = cp_default)
+  "Scale" annotation (Placement(transformation(extent={{-210,130},{-190,150}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter timCp1(final k = cp_default)
+   "Scale" annotation (Placement(transformation(extent={{-220,-90},{-200,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve1(delta=300)
+    "Moving average" annotation (Placement(transformation(extent={{-150,-130},{-130,-110}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep5(final nout = nChiHea)
+    "Replicate" annotation (Placement(transformation(extent={{180,-110},{200,-90}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold cmdChiHea[nChiHea](
+      final t={i for i in 1:nChiHea})
+    "Compute chiller On/Off command from number of units to be commanded On" annotation (Placement(transformation(extent={{210,-110},{230,-90}})));
+  Buildings.Controls.OBC.CDL.Integers.Subtract numChiHeaCoo
+    "Number of HRC required in direct HR mode" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={10,-20})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant numChiHea(final k = nChiHea)
+  "Number of HRC" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+
+  Buildings.Controls.OBC.CDL.Integers.Add nChiHeaAndCooUnb
+    "Number of HRC required to meet heating and cooling load - Unbounded" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-70,0})));
+  Buildings.Controls.OBC.CDL.Integers.Subtract numChiCasCoo
+    "Number of HRC required in cascading cooling" annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller modHeaCoo(final nChiHea=nChiHea)
+    "Compute the cascading cooling and direct HR switchover signals" annotation (Placement(transformation(extent={{180,-10},{200,10}})));
+
+  Buildings.Controls.OBC.CDL.Integers.Min nChiHeaHeaAndCoo
+    "Number of HRC required to meet heating and cooling load - Bounded by number of HRC" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-40})));
+
+  Buildings.Controls.OBC.CDL.Reals.Subtract errTChiWatSup
+    "Compute tracking error" annotation (Placement(transformation(extent={{-200,200},{-180,220}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract errDpChiWat
+    "Compute tracking error" annotation (Placement(transformation(extent={{-200,250},{-180,270}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold cmpErrLim(t=-1, h=1E-4)
+    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,200},{-150,220}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cmpErrLim1(t=1.5E4, h=1E-1)
+    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,250},{-150,270}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim(t=15*60)
+    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,200},{-90,220}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim1(t=15*60)
+    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,250},{-90,270}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or2 "Failsafe condition to stage up" annotation (Placement(transformation(extent={{-70,220},{-50,240}})));
+  Buildings.Controls.OBC.CDL.Logical.And and2
+    "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,250},{-120,270}})));
+  Buildings.Controls.OBC.CDL.Logical.And and3
+    "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,200},{-120,220}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex staCoo(final nSta=nChi + nChiHea, tSta=15*60)
+    "Compute cooling stage" annotation (Placement(transformation(extent={{50,144},{70,164}})));
+  Modelica.Blocks.Sources.RealExpression capCoo(final y=abs(PLRStaTra*(min(nChi,
+        staCoo.preIdxSta)/nChi*QChiWatChi_flow_nominal + max(0, staCoo.preIdxSta
+         - nChi)/nChiHea*QChiWatCasCoo_flow_nominal)))
+    "Total capacity at current stage (>0) times stage-up PLR limit" annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Greater cmpOPLRLimUp(h=-1E-4*(
+        QChiWatChi_flow_nominal + QChiWatCasCoo_flow_nominal_approx)/2)
+    "Check OPLR limit" annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim(t=15*60)
+    "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-40,110},{-20,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or1
+    "Failsafe condition or efficiency condition to stage up" annotation (Placement(transformation(extent={{0,130},{20,150}})));
+  Buildings.Controls.OBC.CDL.Integers.Min numOpeChi
+    "Number of operating chillers" annotation (Placement(transformation(extent={{90,110},{110,130}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant numChi(final k=nChi)
+    "Number of chillers" annotation (Placement(transformation(extent={{50,90},{70,110}})));
+  Buildings.Controls.OBC.CDL.Integers.Subtract numOpeCooChiHea
+    "Number of HRC required for cooling" annotation (Placement(transformation(extent={{-120,10},{-100,30}})));
+  Modelica.Blocks.Sources.RealExpression capHea(final y=PLRStaTra*staHea.preIdxSta
+        /nChiHea*QHeaWat_flow_nominal)
+    "Total capacity at current stage times stage-up PLR limit" annotation (Placement(transformation(extent={{-120,-150},{-100,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Greater cmpOPLRLimUp1(h=1E-1)
+    "Check OPLR limit" annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim1(t=15*60)
+    "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-50,-130},{-30,-110}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex staHea(final nSta=nChiHea, tSta=15*60) "Compute heating stage" annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
+  Modelica.Blocks.Sources.RealExpression capHeaLow(final y=PLRStaTra*max(0,
+        staHea.preIdxSta - 1)/nChiHea*QHeaWat_flow_nominal)
+    "Total capacity at next lower stage times stage-down PLR limit" annotation (Placement(transformation(extent={{-120,-178},{-100,-158}})));
+  Buildings.Controls.OBC.CDL.Reals.Less cmpOPLRLimDow(h=1E-1)
+  "Check OPLR limit" annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim2(t=15*60)
+    "Timer for OPLR exceeding limit"  annotation (Placement(transformation(extent={{-50,-170},{-30,-150}})));
+  Modelica.Blocks.Sources.RealExpression capCooLow(final y=abs(PLRStaTra*(min(
+        nChi, max(0, staCoo.preIdxSta - 1))/nChi*QChiWatChi_flow_nominal + max(
+        0, staCoo.preIdxSta - 1 - nChi)/nChiHea*QChiWatCasCoo_flow_nominal)))
+    "Total capacity at next lower stage (>0) times stage-down PLR limit" annotation (Placement(transformation(extent={{-120,62},{-100,82}})));
+  Buildings.Controls.OBC.CDL.Reals.Less cmpOPLRLimDow1(h=-1E-4*(
+        QChiWatChi_flow_nominal + QChiWatCasCoo_flow_nominal_approx)/2)
+    "Check OPLR limit" annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim3(t=15*60)
+    "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notFail
+    "Failsafe conditions are not true" annotation (Placement(transformation(extent={{-40,190},{-20,210}})));
+  Buildings.Controls.OBC.CDL.Logical.And dowAndNotFail
+    "No stage up failsafe condition and efficiency condition to stage down" annotation (Placement(transformation(extent={{0,90},{20,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract errTChiWatSup1
+    "Compute tracking error" annotation (Placement(transformation(extent={{-200,-230},{-180,-210}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract errDpHeaWat
+    "Compute tracking error" annotation (Placement(transformation(extent={{-200,-290},{-180,-270}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold   cmpErrLim2(t=+1, h=1E-4)
+    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,-230},{-150,-210}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cmpErrLim3(t=1.5E4, h=1E-1)
+    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,-290},{-150,-270}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim2(t=15*60)
+    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,-230},{-90,-210}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim3(t=15*60)
+    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,-290},{-90,-270}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or3 "Failsafe condition to stage up" annotation (Placement(transformation(extent={{-70,-270},{-50,-250}})));
+  Buildings.Controls.OBC.CDL.Logical.And and1 "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,-290},{-120,-270}})));
+  Buildings.Controls.OBC.CDL.Logical.And and4 "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,-230},{-120,-210}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notFail1
+    "Failsafe conditions are not true" annotation (Placement(transformation(extent={{-30,-230},{-10,-210}})));
+  Buildings.Controls.OBC.CDL.Logical.Or or4
+    "Failsafe condition or efficiency condition to stage up" annotation (Placement(transformation(extent={{10,-130},{30,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.And dowAndNotFail1
+    "No stage up failsafe condition and efficiency condition to stage down" annotation (Placement(transformation(extent={{10,-170},{30,-150}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.IntegerArrayHold hol(holdDuration=15*60, nin=4)
+    "Minimum plant stage runtime (needed because cooling and heating stage runtimes are handled separately)" annotation (Placement(transformation(extent={{130,-10},{150,10}})));
+
+equation
+  connect(dTChiWatPos.y, loaChiWat.u2) annotation (Line(points={{-188,80},{-186,
+          80},{-186,114},{-182,114}},
+                                    color={0,0,127}));
+  connect(dTHeaWat.y, loaHeaWat.u2) annotation (Line(points={{-198,-140},{-186,
+          -140},{-186,-126},{-182,-126}},
+                                  color={0,0,127}));
+  connect(THeaWatSupSet, dTHeaWat.u1) annotation (Line(points={{-260,-120},{
+          -230,-120},{-230,-134},{-222,-134}},    color={0,0,127}));
+  connect(THeaWatPriRet, dTHeaWat.u2) annotation (Line(points={{-260,-160},{
+          -226,-160},{-226,-146},{-222,-146}},
+                                          color={0,0,127}));
+  connect(rep.y, cmdChi.u)
+    annotation (Line(points={{202,120},{208,120}},
+                                                 color={255,127,0}));
+  connect(mChiWatPri_flow, timCp.u)
+    annotation (Line(points={{-260,100},{-220,100},{-220,140},{-212,140}},
+                                                     color={0,0,127}));
+  connect(timCp.y, loaChiWat.u1) annotation (Line(points={{-188,140},{-186,140},
+          {-186,126},{-182,126}}, color={0,0,127}));
+  connect(mHeaWatPri_flow, timCp1.u)
+    annotation (Line(points={{-260,-80},{-222,-80}}, color={0,0,127}));
+  connect(timCp1.y, loaHeaWat.u1) annotation (Line(points={{-198,-80},{-186,-80},
+          {-186,-114},{-182,-114}},
+                                  color={0,0,127}));
+  connect(loaChiWat.y, movAve.u)
+    annotation (Line(points={{-158,120},{-152,120}}, color={0,0,127}));
+  connect(loaHeaWat.y, movAve1.u)
+    annotation (Line(points={{-158,-120},{-152,-120}},
+                                                     color={0,0,127}));
+  connect(rep5.y, cmdChiHea.u)
+    annotation (Line(points={{202,-100},{208,-100}},
+                                                 color={255,127,0}));
+  connect(cmdChiHea.y, y1ChiHea)
+    annotation (Line(points={{232,-100},{260,-100}}, color={255,0,255}));
+  connect(modHeaCoo.y1HeaCoo, y1HeaCooChiHea) annotation (Line(points={{202,-6},
+          {220,-6},{220,-40},{260,-40}},  color={255,0,255}));
+  connect(numChiHea.y, nChiHeaHeaAndCoo.u2)
+    annotation (Line(points={{-58,-40},{-50,-40},{-50,-46},{-42,-46}},
+                                                 color={255,127,0}));
+  connect(nChiHeaAndCooUnb.y, nChiHeaHeaAndCoo.u1) annotation (Line(points={{-58,0},
+          {-50,0},{-50,-34},{-42,-34}},     color={255,127,0}));
+  connect(nChiHeaAndCooUnb.y, numChiHeaCoo.u1)
+    annotation (Line(points={{-58,0},{-20,0},{-20,-14},{-2,-14}},
+                                                 color={255,127,0}));
+  connect(nChiHeaHeaAndCoo.y, numChiHeaCoo.u2) annotation (Line(points={{-18,-40},
+          {-10,-40},{-10,-26},{-2,-26}},
+                                       color={255,127,0}));
+  connect(modHeaCoo.y1Coo, y1CooChiHea) annotation (Line(points={{202,6},{220,6},
+          {220,40},{260,40}},      color={255,0,255}));
+  connect(numChiHeaCoo.y, numChiCasCoo.u2) annotation (Line(points={{22,-20},{
+          30,-20},{30,14},{38,14}},            color={255,127,0}));
+  connect(TChiWatSupSet, errTChiWatSup.u1) annotation (Line(points={{-260,80},{
+          -230,80},{-230,180},{-204,180},{-204,216},{-202,216}},
+                                                          color={0,0,127}));
+  connect(dpChiWatSet, errDpChiWat.u1) annotation (Line(points={{-260,280},{
+          -206,280},{-206,266},{-202,266}},
+                                       color={0,0,127}));
+  connect(errTChiWatSup.y, cmpErrLim.u)
+    annotation (Line(points={{-178,210},{-172,210}}, color={0,0,127}));
+  connect(errDpChiWat.y, cmpErrLim1.u)
+    annotation (Line(points={{-178,260},{-172,260}}, color={0,0,127}));
+  connect(timErrExcLim1.passed, or2.u1) annotation (Line(points={{-88,252},{-80,
+          252},{-80,230},{-72,230}},   color={255,0,255}));
+  connect(timErrExcLim.passed, or2.u2) annotation (Line(points={{-88,202},{-80,
+          202},{-80,222},{-72,222}},   color={255,0,255}));
+  connect(cmpErrLim1.y, and2.u1)
+    annotation (Line(points={{-148,260},{-142,260}}, color={255,0,255}));
+  connect(and2.y, timErrExcLim1.u)
+    annotation (Line(points={{-118,260},{-112,260}}, color={255,0,255}));
+  connect(cmpErrLim.y, and3.u1) annotation (Line(points={{-148,210},{-142,210}},
+                                  color={255,0,255}));
+  connect(and3.y, timErrExcLim.u)
+    annotation (Line(points={{-118,210},{-112,210}}, color={255,0,255}));
+  connect(u1Coo, and3.u2) annotation (Line(points={{-260,160},{-146,160},{-146,
+          202},{-142,202}}, color={255,0,255}));
+  connect(u1Coo, and2.u2) annotation (Line(points={{-260,160},{-146,160},{-146,
+          252},{-142,252}}, color={255,0,255}));
+  connect(cmdChi.y, y1Chi)
+    annotation (Line(points={{232,120},{260,120}},
+                                                 color={255,0,255}));
+  connect(u1Coo, staCoo.u1)
+    annotation (Line(points={{-260,160},{48,160}},  color={255,0,255}));
+  connect(cmpOPLRLimUp.y, timOPLRExcLim.u)
+    annotation (Line(points={{-58,120},{-42,120}},
+                                                 color={255,0,255}));
+  connect(or2.y, or1.u1) annotation (Line(points={{-48,230},{-6,230},{-6,140},{
+          -2,140}},  color={255,0,255}));
+  connect(or1.y, staCoo.u1Up) annotation (Line(points={{22,140},{24,140},{24,
+          154},{48,154}}, color={255,0,255}));
+  connect(timOPLRExcLim.passed, or1.u2) annotation (Line(points={{-18,112},{-14,
+          112},{-14,132},{-2,132}},
+                                 color={255,0,255}));
+  connect(numChi.y, numOpeChi.u2) annotation (Line(points={{72,100},{84,100},{
+          84,114},{88,114}},
+                        color={255,127,0}));
+  connect(staCoo.idxSta, numOpeChi.u1) annotation (Line(points={{72,154},{80,
+          154},{80,126},{88,126}},
+                                 color={255,127,0}));
+  connect(staCoo.idxSta, numOpeCooChiHea.u1) annotation (Line(points={{72,154},
+          {80,154},{80,60},{-132,60},{-132,26},{-122,26}},   color={255,127,0}));
+  connect(numOpeChi.y, numOpeCooChiHea.u2) annotation (Line(points={{112,120},{
+          120,120},{120,54},{-126,54},{-126,14},{-122,14}},  color={255,127,0}));
+  connect(numOpeCooChiHea.y, nChiHeaAndCooUnb.u1) annotation (Line(points={{-98,20},
+          {-90,20},{-90,6},{-82,6}},           color={255,127,0}));
+  connect(cmpOPLRLimUp1.y, timOPLRExcLim1.u)
+    annotation (Line(points={{-58,-120},{-52,-120}}, color={255,0,255}));
+  connect(u1Hea, staHea.u1) annotation (Line(points={{-260,140},{-234,140},{
+          -234,-100},{40,-100},{40,-114},{48,-114}},   color={255,0,255}));
+  connect(cmpOPLRLimDow.y, timOPLRExcLim2.u)
+    annotation (Line(points={{-58,-160},{-52,-160}}, color={255,0,255}));
+  connect(cmpOPLRLimDow1.y, timOPLRExcLim3.u)
+    annotation (Line(points={{-58,80},{-42,80}}, color={255,0,255}));
+  connect(or2.y, notFail.u) annotation (Line(points={{-48,230},{-46,230},{-46,
+          200},{-42,200}}, color={255,0,255}));
+  connect(dowAndNotFail.y, staCoo.u1Dow) annotation (Line(points={{22,100},{26,
+          100},{26,148.2},{48,148.2}},color={255,0,255}));
+  connect(timOPLRExcLim3.passed, dowAndNotFail.u2) annotation (Line(points={{-18,72},
+          {-10,72},{-10,92},{-2,92}},         color={255,0,255}));
+  connect(notFail.y, dowAndNotFail.u1) annotation (Line(points={{-18,200},{-10,
+          200},{-10,100},{-2,100}},
+                                  color={255,0,255}));
+  connect(staHea.idxSta, nChiHeaAndCooUnb.u2) annotation (Line(points={{72,-120},
+          {80,-120},{80,-80},{-100,-80},{-100,-6},{-82,-6}},   color={255,127,0}));
+  connect(numOpeCooChiHea.y, numChiCasCoo.u1) annotation (Line(points={{-98,20},
+          {30,20},{30,26},{38,26}},    color={255,127,0}));
+  connect(movAve.y, cmpOPLRLimUp.u1)
+    annotation (Line(points={{-128,120},{-82,120}},
+                                                  color={0,0,127}));
+  connect(capCoo.y, cmpOPLRLimUp.u2) annotation (Line(points={{-99,100},{-94,
+          100},{-94,112},{-82,112}},
+                              color={0,0,127}));
+  connect(movAve.y, cmpOPLRLimDow1.u1) annotation (Line(points={{-128,120},{-90,
+          120},{-90,80},{-82,80}},color={0,0,127}));
+  connect(capCooLow.y, cmpOPLRLimDow1.u2)
+    annotation (Line(points={{-99,72},{-82,72}}, color={0,0,127}));
+  connect(capHea.y, cmpOPLRLimUp1.u2) annotation (Line(points={{-99,-140},{-94,
+          -140},{-94,-128},{-82,-128}}, color={0,0,127}));
+  connect(movAve1.y, cmpOPLRLimUp1.u1)
+    annotation (Line(points={{-128,-120},{-82,-120}}, color={0,0,127}));
+  connect(capHeaLow.y, cmpOPLRLimDow.u2) annotation (Line(points={{-99,-168},{
+          -82,-168}},                       color={0,0,127}));
+  connect(movAve1.y, cmpOPLRLimDow.u1) annotation (Line(points={{-128,-120},{
+          -90,-120},{-90,-160},{-82,-160}}, color={0,0,127}));
+  connect(TChiWatSupSet, dTChiWatPos.u2) annotation (Line(points={{-260,80},{
+          -230,80},{-230,74},{-212,74}}, color={0,0,127}));
+  connect(TChiWatPriRet, dTChiWatPos.u1) annotation (Line(points={{-260,40},{
+          -220,40},{-220,86},{-212,86}},color={0,0,127}));
+  connect(dpHeaWatSet, errDpHeaWat.u1) annotation (Line(points={{-260,-260},{
+          -206,-260},{-206,-274},{-202,-274}}, color={0,0,127}));
+  connect(errTChiWatSup1.y, cmpErrLim2.u)
+    annotation (Line(points={{-178,-220},{-172,-220}}, color={0,0,127}));
+  connect(errDpHeaWat.y, cmpErrLim3.u)
+    annotation (Line(points={{-178,-280},{-172,-280}}, color={0,0,127}));
+  connect(cmpErrLim3.y,and1. u1)
+    annotation (Line(points={{-148,-280},{-142,-280}},
+                                                     color={255,0,255}));
+  connect(and1.y,timErrExcLim3. u)
+    annotation (Line(points={{-118,-280},{-112,-280}},
+                                                     color={255,0,255}));
+  connect(cmpErrLim2.y, and4.u1)
+    annotation (Line(points={{-148,-220},{-142,-220}}, color={255,0,255}));
+  connect(and4.y, timErrExcLim2.u)
+    annotation (Line(points={{-118,-220},{-112,-220}}, color={255,0,255}));
+  connect(or3.y, notFail1.u) annotation (Line(points={{-48,-260},{-40,-260},{
+          -40,-220},{-32,-220}}, color={255,0,255}));
+  connect(THeaWatSupSet, errTChiWatSup1.u1) annotation (Line(points={{-260,-120},
+          {-230,-120},{-230,-200},{-206,-200},{-206,-214},{-202,-214}}, color={
+          0,0,127}));
+  connect(timErrExcLim2.passed, or3.u1) annotation (Line(points={{-88,-228},{
+          -80,-228},{-80,-260},{-72,-260}}, color={255,0,255}));
+  connect(timErrExcLim3.passed, or3.u2) annotation (Line(points={{-88,-288},{
+          -80,-288},{-80,-268},{-72,-268}}, color={255,0,255}));
+  connect(u1Hea, and4.u2) annotation (Line(points={{-260,140},{-234,140},{-234,
+          -240},{-144,-240},{-144,-228},{-142,-228}}, color={255,0,255}));
+  connect(u1Hea, and1.u2) annotation (Line(points={{-260,140},{-234,140},{-234,
+          -240},{-144,-240},{-144,-288},{-142,-288}}, color={255,0,255}));
+  connect(timOPLRExcLim1.passed, or4.u1) annotation (Line(points={{-28,-128},{
+          -20,-128},{-20,-120},{8,-120}}, color={255,0,255}));
+  connect(or3.y, or4.u2) annotation (Line(points={{-48,-260},{0,-260},{0,-128},
+          {8,-128}}, color={255,0,255}));
+  connect(timOPLRExcLim2.passed, dowAndNotFail1.u1) annotation (Line(points={{
+          -28,-168},{-20,-168},{-20,-160},{8,-160}}, color={255,0,255}));
+  connect(notFail1.y, dowAndNotFail1.u2) annotation (Line(points={{-8,-220},{4,
+          -220},{4,-168},{8,-168}}, color={255,0,255}));
+  connect(dowAndNotFail1.y, staHea.u1Dow) annotation (Line(points={{32,-160},{
+          40,-160},{40,-125.8},{48,-125.8}}, color={255,0,255}));
+  connect(or4.y, staHea.u1Up)
+    annotation (Line(points={{32,-120},{48,-120}}, color={255,0,255}));
+  connect(numOpeChi.y, hol.u[1]) annotation (Line(points={{112,120},{120,120},{
+          120,-0.75},{128,-0.75}}, color={255,127,0}));
+  connect(numChiCasCoo.y, hol.u[2]) annotation (Line(points={{62,20},{116,20},{
+          116,-0.25},{128,-0.25}}, color={255,127,0}));
+  connect(numChiHeaCoo.y, hol.u[3]) annotation (Line(points={{22,-20},{116,-20},
+          {116,0.25},{128,0.25}},
+                             color={255,127,0}));
+  connect(nChiHeaHeaAndCoo.y, hol.u[4]) annotation (Line(points={{-18,-40},{120,
+          -40},{120,-2},{128,-2},{128,0.75}},
+                                       color={255,127,0}));
+  connect(hol.y[1], rep.u) annotation (Line(points={{152,0},{160,0},{160,120},{
+          178,120}}, color={255,127,0}));
+  connect(hol.y[2], modHeaCoo.nCasCoo) annotation (Line(points={{152,0},{160,0},
+          {160,6},{178,6}},   color={255,127,0}));
+  connect(hol.y[3], modHeaCoo.nHeaCoo) annotation (Line(points={{152,0},{160,0},
+          {160,-6},{178,-6}},
+                            color={255,127,0}));
+  connect(hol.y[4], rep5.u) annotation (Line(points={{152,0},{160,0},{160,-100},
+          {178,-100}},color={255,127,0}));
+  connect(movAve.y, QCooReq_flow) annotation (Line(points={{-128,120},{-100,120},
+          {-100,180},{260,180}}, color={0,0,127}));
+  connect(dpChiWat, errDpChiWat.u2) annotation (Line(points={{-260,260},{-220,
+          260},{-220,254},{-202,254}}, color={0,0,127}));
+  connect(TChiWatSup, errTChiWatSup.u2) annotation (Line(points={{-260,200},{
+          -220,200},{-220,204},{-202,204}}, color={0,0,127}));
+  connect(THeaWatSup, errTChiWatSup1.u2) annotation (Line(points={{-260,-220},{
+          -220,-220},{-220,-226},{-202,-226}}, color={0,0,127}));
+  connect(dpHeaWat, errDpHeaWat.u2) annotation (Line(points={{-260,-280},{-220,
+          -280},{-220,-286},{-202,-286}}, color={0,0,127}));
+  annotation (
+  defaultComponentName="staPla",
+  Documentation(info="<html>
+<p>
+This block implements the staging logic for the chillers and HRCs.
+The units are staged in part based on an efficiency condition
+using the operative part load ratio.
+The units are also staged based on failsafe conditions using the CHW and HW
+supply temperature and differential pressure.
+</p>
+<p>
+For the sake of simplicity, equipment rotation (i.e. the possibility at a given
+stage that either one unit or another unit can be operating) is not taken into account.
+</p>
+<h4>Plant stages</h4>
+<p>
+At cooling (resp. heating) stage <code>#i</code>, a number <code>i</code>
+of units are operating in cooling (resp. heating) mode.
+The cooling (resp. heating) stage <code>#0</code> (no unit operating in
+that given mode) is active whenever the plant is disabled based on the cooling
+and heating Enable condition (see below) or when the plant is enabled
+and has been staged down due to the efficiency or failsafe conditions.
+The plant stage is given by the couple (cooling stage, heating stage).
+The minimum runtime of each plant stage is set to <i>15&nbsp;</i>min.
+</p>
+<h5>Direct heat recovery mode</h5>
+<p>
+All HRCs are allowed to operate in direct heat recovery mode, that is when
+their condenser is indexed to the HW loop and their evaporator is indexed to the
+CHW loop.
+Switching a HRC to operate in direct heat recovery mode is done on
+a load requirement basis. This means that HRCs are first switched over
+to cascading heating or cascading cooling mode. Only when all HRCs are operating
+and when a new stage up event is initiated, an additional HRC is then switched
+to operate in direct heat recovery mode.
+As described in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller</a>
+the HRC with the highest index that is not operating operating in cascading
+cooling mode is the next to be switched into direct heat recovery mode.
+</p>
+<p>
+For example, considering a plant with two chillers and three HRCs, the table below shows
+the plant stages derived from this logic.
+In this table, the chiller with index <code>#i</code> is denoted <code>CHI#i</code>,
+the HRC with index <code>#i</code> is denoted <code>HRC#i</code>,
+the units enumerated before (resp. after) the semicolon sign (<code>:</code>) operate
+in cooling (resp. heating) mode, the units marked with a star (<code>*</code>) operate
+in direct heat recovery mode.
+</p>
+<table border=\"1\" summary=\"Explanation of the enumeration\">
+<tr><th>Heating stage &darr; Buildings.DHC.Plants.Cooling stage &rarr;</th>
+<td>0</td>
+<td>1</td>
+<td>2</td>
+<td>3</td>
+<td>4</td>
+<td>5</td>
+</tr>
+<tr><td>0</td>
+<td>N/A:<br/>N/A</td>
+<td>CHI1:<br/>N/A</td>
+<td>CHI1 &amp; CHI2:<br/>N/A</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>N/A</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2:<br/>N/A</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2 &amp; HRC1:<br/>N/A</td>
+</tr>
+<tr><td>1</td>
+<td>N/A:<br/>HRC1</td>
+<td>CHI1:<br/>HRC1</td>
+<td>CHI1 &amp; CHI2:<br/>HRC1</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2:<br/>HRC1</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2:<br/>HRC1*</td>
+</tr>
+<tr><td>2</td>
+<td>N/A:<br/>HRC1 &amp; HRC2</td>
+<td>CHI1:<br/>HRC1 &amp; HRC2</td>
+<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1 &amp; HRC2</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1 &amp; HRC2*</td>
+<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1* &amp; HRC2*</td>
+</tr>
+<tr><td>3</td>
+<td>N/A:<br/>HRC1 &amp; HRC2 &amp; HRC3</td>
+<td>CHI1:<br/>HRC1 &amp; HRC2 &amp; HRC3</td>
+<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2 &amp; HRC3</td>
+<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2 &amp; HRC3*</td>
+<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2* &amp; HRC3*</td>
+<td>CHI1 &amp; CHI2:<br/>HRC1* &amp; HRC2* &amp; HRC3*</td>
+</tr>
+</table>
+<h4>Cooling and heating Enable condition</h4>
+<p>
+The cooling and heating Enable signals <code>u1Coo</code> and <code>u1Hea</code>
+shall be computed outside of the plant model,
+at least based on a time schedule and ideally in conjunction
+with a signal representative of the demand such as the requests yielded by
+the consumer control valves.
+Based on those signals, the cooling (resp. heating) stage <code>#1</code> is
+activated whenever the cooling (resp. heating) Enable signal switches
+to <code>true</code> and when cooling (resp. heating) has been disabled
+for at least <i>15&nbsp;</i>min.
+</p>
+<h4>Operative part load ratio</h4>
+<p>
+The efficiency condition is based on the operative part load ratio
+which is computed as the ratio of the required capacity
+relative to design capacity of a given stage, which is the sum of the design capacity
+of each unit active in a given stage.
+The required capacity is calculated based on the primary mass flow rate and the
+temperature difference between supply and primary return, and averaged over a
+<i>5</i>-minute moving window.
+<h4>Cooling and heating staging</h4>
+<p>
+A stage up event is initiated if any of the following conditions is true.
+</p>
+<ul>
+<li>
+Efficiency condition: the operative part load ratio of the current stage
+exceeds the value of the parameter <i>PLRStaTra</i> for <i>15&nbsp;</i>min.
+</li>
+<li>
+Failsafe conditions: the CHW (resp. HW) supply temperature is <i>1&nbsp;</i>K
+higher (resp. lower) than setpoint for <i>15</i>&nbsp;min, or
+the CHW (resp. HW) differential pressure is <i>1.5E4&nbsp;</i>Pa lower than
+setpoint for <i>15&nbsp;</i>min.
+</li>
+</ul>
+<p>
+A stage down event is initiated if both of the following conditions are true.
+</p>
+<ul>
+<li>
+Efficiency condition: the operative part load ratio of the next lower stage
+falls below the value of the parameter <i>PLRStaTra</i> for <i>15&nbsp;</i>min.
+</li>
+<li>
+Failsafe conditions: the failsafe stage up conditions are not true.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-240,-320},{240,320}})),
+    Icon(coordinateSystem(extent={{-100,-160},{100,160}}), graphics={
+        Text(
+          textColor={0,0,255},
+          extent={{-150,170},{150,210}},
+          textString="%name"),
+        Rectangle(
+          extent={{-100,-160},{100,160}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}));
+end StagingPlant;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
new file mode 100644
index 00000000000..89fd7216c6e
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
@@ -0,0 +1,266 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
+block StagingPump "Pump staging"
+
+  parameter Boolean have_flowCriterion=true
+    "Set to true for flow criterion in conjunction with speed criterion"
+    annotation(Evaluate=true);
+  parameter Integer nPum(
+    final min=1,
+    start=1)
+    "Number of pumps"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Loop design mass flow rate (all pumps)"
+    annotation(Dialog(group="Nominal condition", enable=have_flowCriterion));
+  parameter Real yDow=0.30
+    "Low speed limit for staging down";
+  parameter Real yUp=0.99
+    "High speed limit for staging up";
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1Ena
+    "Lead pump Enable signal (e.g. based on isolation valve opening command)"
+    annotation (Placement(transformation(extent={{-240,140},{-200,180}}),
+        iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput m_flow(final unit="kg/s")
+    if have_flowCriterion
+    "Mass flow rate as measured by the loop flow meter"
+    annotation (Placement(
+        transformation(extent={{-240,60},{-200,100}}),iconTransformation(extent={{-140,
+            -20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(final unit="1")
+    "Commanded speed"
+    annotation (Placement(transformation(extent={{-240,-20},{-200,20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nPum]
+    "Start signal (VFD Run or motor starter contact)"
+    annotation (Placement(
+        transformation(extent={{200,-20},{240,20}}), iconTransformation(extent={{100,40},
+            {140,80}})));
+
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cmp(final t=yUp, h=1e-3)
+    "Compare"
+    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timSpe(t=5*60)
+    "True delay"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter ratFlo(
+    final k=1/m_flow_nominal) if have_flowCriterion
+    "Ratio of current flow rate to design value"
+    annotation (Placement(transformation(extent={{-148,70},{-128,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Greater cmp2(h=1e-3)
+    if have_flowCriterion
+    "Compare"
+    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addOff(p=-0.03)
+    if have_flowCriterion
+    "Add offset"
+    annotation (Placement(transformation(extent={{-80,130},{-100,150}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timFlo(t=10*60)
+    if have_flowCriterion
+    "Check if true for a given time"
+    annotation (Placement(transformation(extent={{-72,90},{-52,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Or up
+    "Check if flow or speed criterion passed for staging up"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Less cmp3(h=1e-3)
+    if have_flowCriterion
+    "Compare"
+    annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timFlo1(t=10*60)
+    if have_flowCriterion
+    "Check if true for a given time"
+    annotation (Placement(transformation(extent={{-72,50},{-52,70}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold  cmp4(final t=yDow, h=1e-3)
+    "Compare"
+    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timSpe1(t=5*60) "True delay"
+    annotation (Placement(transformation(extent={{-70,-50},{-50,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Or  dow
+    "Check if flow or speed criterion passed for staging down"
+    annotation (Placement(transformation(extent={{-30,-50},{-10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter ratOpeDsg(
+    final k=1/nPum)
+    "Ratio of number of operating pumps to number of operating pumps at design conditions"
+    annotation (Placement(transformation(extent={{-40,130},{-60,150}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold cvtBoo[nPum](
+    final t={i for i in 1:nPum})
+    "Compute pump Start command from number of pumps to be commanded On"
+    annotation (Placement(transformation(extent={{160,-10},{180,10}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(
+    final nout=nPum) "Replicate"
+    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex staLag(final nSta=max(1, nPum - 1), tSta=30)
+    if nPum>1
+    "Stage lag pumps (minimum runtime allowing for pump start time)"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.IntegerToReal cvtInt "Convert"
+    annotation (Placement(transformation(extent={{50,130},{30,150}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addOffLowSta(
+    final p=-1/nPum) if have_flowCriterion
+    "Add offset for lower stage"
+    annotation (Placement(transformation(extent={{-150,30},{-130,50}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger leaEna
+    "Return 1 if lead pump enabled"
+    annotation (Placement(transformation(extent={{30,30},{50,50}})));
+  Buildings.Controls.OBC.CDL.Integers.Add num "Number of pumps enabled"
+    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Add numPre "Number of pumps enabled"
+    annotation (Placement(transformation(extent={{80,50},{100,70}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant zer(final k=0)
+    if nPum==1
+    "Constant"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant fal(final k=false)
+    if not have_flowCriterion
+    "Constant"
+    annotation (Placement(transformation(extent={{-70,-90},{-50,-70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput nPumEna
+    "Number of pumps that are enabled" annotation (Placement(transformation(
+          extent={{200,-80},{240,-40}}), iconTransformation(extent={{100,-80},{
+            140,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Any
+    "Return true if any pump enabled (left limit to avoid direct feedback)"
+    annotation (Placement(transformation(extent={{200,-140},{240,-100}}),
+        iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold anyEna(final t=1)
+    "Return true if any pump is enabled"
+    annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre pre1
+    "Left limit of signal avoiding direct feedback"
+    annotation (Placement(transformation(extent={{160,-130},{180,-110}})));
+equation
+  connect(y, cmp.u)
+    annotation (Line(points={{-220,0},{-102,0}},     color={0,0,127}));
+  connect(cmp.y, timSpe.u)
+    annotation (Line(points={{-78,0},{-72,0}},       color={255,0,255}));
+  connect(ratFlo.y, cmp2.u1)
+    annotation (Line(points={{-126,80},{-120,80},{-120,100},{-102,100}},
+                                                 color={0,0,127}));
+  connect(addOff.y, cmp2.u2) annotation (Line(points={{-102,140},{-110,140},{
+          -110,92},{-102,92}},            color={0,0,127}));
+  connect(timFlo.passed, up.u1) annotation (Line(points={{-50,92},{-36,92},{-36,
+          0},{-32,0}},     color={255,0,255}));
+  connect(ratFlo.y, cmp3.u1) annotation (Line(points={{-126,80},{-120,80},{-120,
+          60},{-102,60}}, color={0,0,127}));
+  connect(y, cmp4.u) annotation (Line(points={{-220,0},{-160,0},{-160,-40},{-102,
+          -40}},       color={0,0,127}));
+  connect(cmp4.y, timSpe1.u)
+    annotation (Line(points={{-78,-40},{-72,-40}},   color={255,0,255}));
+  connect(timFlo1.passed,dow. u1) annotation (Line(points={{-50,52},{-40,52},{
+          -40,-40},{-32,-40}},                   color={255,0,255}));
+  connect(addOff.u, ratOpeDsg.y)
+    annotation (Line(points={{-78,140},{-62,140}}, color={0,0,127}));
+  connect(rep.y, cvtBoo.u)
+    annotation (Line(points={{142,0},{158,0}}, color={255,127,0}));
+  connect(cmp2.y, timFlo.u)
+    annotation (Line(points={{-78,100},{-74,100}},
+                                                 color={255,0,255}));
+  connect(cmp3.y, timFlo1.u)
+    annotation (Line(points={{-78,60},{-74,60}}, color={255,0,255}));
+  connect(timSpe.passed, up.u2) annotation (Line(points={{-48,-8},{-32,-8}},
+                               color={255,0,255}));
+  connect(timSpe1.passed,dow. u2) annotation (Line(points={{-48,-48},{-40,-48},
+          {-40,-48},{-32,-48}},color={255,0,255}));
+  connect(y1Ena, staLag.u1) annotation (Line(points={{-220,160},{0,160},{0,6},{
+          28,6}},
+               color={255,0,255}));
+  connect(cvtInt.y, ratOpeDsg.u)
+    annotation (Line(points={{28,140},{-38,140}}, color={0,0,127}));
+  connect(cvtBoo.y, y1)
+    annotation (Line(points={{182,0},{220,0}}, color={255,0,255}));
+  connect(addOff.y, addOffLowSta.u) annotation (Line(points={{-102,140},{-160,
+          140},{-160,40},{-152,40}}, color={0,0,127}));
+  connect(addOffLowSta.y, cmp3.u2) annotation (Line(points={{-128,40},{-116,40},
+          {-116,52},{-102,52}}, color={0,0,127}));
+  connect(y1Ena, leaEna.u) annotation (Line(points={{-220,160},{0,160},{0,40},{
+          28,40}},
+                color={255,0,255}));
+  connect(dow.y, staLag.u1Dow) annotation (Line(points={{-8,-40},{0,-40},{0,
+          -5.8},{28,-5.8}},
+                      color={255,0,255}));
+  connect(num.y, rep.u)
+    annotation (Line(points={{102,0},{118,0}},
+                                             color={255,127,0}));
+  connect(staLag.idxSta, num.u2) annotation (Line(points={{52,0},{60,0},{60,-6},
+          {78,-6}}, color={255,127,0}));
+  connect(leaEna.y, num.u1) annotation (Line(points={{52,40},{60,40},{60,6},{78,
+          6}}, color={255,127,0}));
+  connect(numPre.y, cvtInt.u) annotation (Line(points={{102,60},{120,60},{120,
+          140},{52,140}},
+                     color={255,127,0}));
+  connect(leaEna.y, numPre.u1) annotation (Line(points={{52,40},{60,40},{60,66},
+          {78,66}}, color={255,127,0}));
+  connect(staLag.preIdxSta, numPre.u2) annotation (Line(points={{52,-6},{56,-6},
+          {56,54},{78,54}}, color={255,127,0}));
+  connect(zer.y, num.u2) annotation (Line(points={{52,-40},{68,-40},{68,-6},{78,
+          -6}}, color={255,127,0}));
+  connect(zer.y, numPre.u2) annotation (Line(points={{52,-40},{68,-40},{68,54},
+          {78,54}},color={255,127,0}));
+  connect(up.y, staLag.u1Up)
+    annotation (Line(points={{-8,0},{28,0}}, color={255,0,255}));
+  connect(fal.y, dow.u1) annotation (Line(points={{-48,-80},{-36,-80},{-36,-40},
+          {-32,-40}}, color={255,0,255}));
+  connect(fal.y, up.u1) annotation (Line(points={{-48,-80},{-36,-80},{-36,0},{-32,
+          0}}, color={255,0,255}));
+  connect(num.y, nPumEna) annotation (Line(points={{102,0},{110,0},{110,-60},{
+          220,-60}}, color={255,127,0}));
+  connect(anyEna.y, pre1.u)
+    annotation (Line(points={{142,-120},{158,-120}}, color={255,0,255}));
+  connect(pre1.y, y1Any)
+    annotation (Line(points={{182,-120},{220,-120}}, color={255,0,255}));
+  connect(num.y, anyEna.u) annotation (Line(points={{102,0},{110,0},{110,-120},
+          {118,-120}}, color={255,127,0}));
+  connect(m_flow, ratFlo.u)
+    annotation (Line(points={{-220,80},{-150,80}}, color={0,0,127}));
+  annotation (
+  defaultComponentName="staPum",
+  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Text(
+          textColor={0,0,255},
+          extent={{-150,110},{150,150}},
+          textString="%name"),
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}),          Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-200,-200},{200,
+            200}})),
+    Documentation(info="<html>
+<p>
+This block implements the logic for staging the lag pump of
+a multiple-pump group.
+<p>
+The first staging criterion is optional and is based on <i>ratFlo</i>,
+the ratio of current flow rate to design flow rate.
+The lag pump is enabled whenever any of the following is true.
+</p>
+<ul>
+<li>The pump speed command is higher than <code>yUp</code> for <i>5</i>&nbsp;min.
+</li>
+<li>Optionally if <code>have_flowCriterion</code> is set to <code>true</code>, the ratio <i>ratFlo</i>
+is higher than <i>n / nPum - 0.03</i> for <i>10</i>&nbsp;min, where <i>n</i> is the number
+of operating pumps and <i>nPum</i> is the number of pumps operating at design conditions.
+</li>
+</ul>
+<p>
+The lag pump is disabled whenever any of the following is true.
+</p>
+<ul>
+<li>The lead pump is disabled.
+</li>
+<li>The pump speed command is lower than <code>yDow</code> for <i>5</i>&nbsp;min.
+</li>
+<li>Optionally if <code>have_flowCriterion</code> is set to <code>true</code>, the ratio <i>ratFlo</i>
+is higher than <i>(n - 1) / nPum - 0.03</i> for <i>10</i>&nbsp;min.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StagingPump;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
index aa2e51b8ff1..664ee6aee6d 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/TankCycle.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block TankCycle "Block that determines the tank cycle flag"
 
   parameter Modelica.Units.SI.MassFlowRate mConWatHexCoo_flow_nominal
@@ -103,7 +103,7 @@ block TankCycle "Block that determines the tank cycle flag"
   Buildings.Controls.OBC.CDL.Logical.Not criFlo2
     "Flow criterion for second tank cycle"
     annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
-  IntegerArrayHold hol(holdDuration=30*60, nin=1) "Hold for minimum runtime"
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.IntegerArrayHold hol(holdDuration=30*60, nin=1) "Hold for minimum runtime"
     annotation (Placement(transformation(extent={{136,-10},{156,10}})));
 initial equation
   pre(idxCycTan)=idxIni.y;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
new file mode 100644
index 00000000000..1fe120fcaca
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
@@ -0,0 +1,43 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation;
+model StageIndex
+  extends Modelica.Icons.Example;
+
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex
+    sta(nSta=3, tSta=60) "Staging"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
+    table=[0,0,0,0; 1,1,0,0; 2,1,1,1; 3,0,1,1; 4,1,0,0; 5,1,0,1; 6,1,1,0; 7,1,0,
+        1],
+    timeScale=100,
+    period=1000) "Source signal"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+equation
+  connect(booTimTab.y[1], sta.u1) annotation (Line(points={{-38,0},{-20,0},{-20,
+          6},{-12,6}}, color={255,0,255}));
+  connect(booTimTab.y[2], sta.u1Up)
+    annotation (Line(points={{-38,0},{-12,0}}, color={255,0,255}));
+  connect(booTimTab.y[3], sta.u1Dow) annotation (Line(points={{-38,0},{-20,0},{-20,
+          -5.8},{-12,-5.8}}, color={255,0,255}));
+
+annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+    Documentation(info="<html>
+<p>
+This is a validation model for the block
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StageIndex</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StageIndex;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
new file mode 100644
index 00000000000..c6b7dbe16d4
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
@@ -0,0 +1,137 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation;
+model StagingPlant "Validation of plant staging block"
+  extends Modelica.Icons.Example;
+
+  parameter Integer nChi(final min=1, start=1)=2
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"),
+      Evaluate=true);
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatChi_flow_nominal=-4.4E6
+    "Cooling design heat flow rate of cooling-only chillers (all units)"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"));
+  parameter Integer nChiHea(final min=1, start=1)=3
+    "Number of units operating at design conditions"
+    annotation (Dialog(group="HW loop and heat recovery chillers"),
+      Evaluate=true);
+  parameter Real PLRStaTra(final unit="1", final min=0, final max=1) = 0.85
+    "Part load ratio triggering stage transition";
+  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal=-6E6
+    "Cooling design heat flow rate of HRC in cascading cooling mode (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=6.4E6
+    "Heating design heat flow rate (all units)"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+  final parameter Modelica.Units.SI.HeatFlowRate mChiWat_flow_nominal=
+    abs(QChiWatChi_flow_nominal+QChiWatCasCoo_flow_nominal) /
+    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq /
+    5
+    "CHW design mass flow rate"
+    annotation (Dialog(group="CHW loop and cooling-only chillers"));
+  final parameter Modelica.Units.SI.HeatFlowRate mHeaWat_flow_nominal=
+    QHeaWat_flow_nominal /
+    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq /
+    10
+    "HW design mass flow rate"
+    annotation (Dialog(group="HW loop and heat recovery chillers"));
+
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant
+    staChi(
+    final nChi=nChi,
+    final nChiHea=nChiHea,
+    final QChiWatChi_flow_nominal=QChiWatChi_flow_nominal,
+    final QChiWatCasCoo_flow_nominal=QChiWatCasCoo_flow_nominal,
+    QChiWatCasCoo_flow_nominal_approx=QChiWatCasCoo_flow_nominal,
+    final QHeaWat_flow_nominal=QHeaWat_flow_nominal) "Chiller staging block"
+    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(table=[0,0,0; 1,
+        0,0; 4,0.3,0.1; 5,1,0.1; 10,0.1,0.1; 13,1,0.3; 16,0.3,1;20,0.1,0.1; 24,0.1,0.3; 25,
+        0.1,1; 30,0,0],
+    timeScale=1000) "Source signal"
+    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
+  Modelica.Blocks.Sources.BooleanExpression u1(y=time > 0)
+    "Enable signal"
+    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(k=7 + 273.15)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatPriRet(k=12 + 273.15)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(k=60 + 273.15)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatPriRet(k=50 + 273.15)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-100,-90},{-80,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter sca(final k=
+        mChiWat_flow_nominal) "Scale signal"
+    annotation (Placement(transformation(extent={{12,30},{32,50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter sca1(final k=
+        mHeaWat_flow_nominal) "Scale signal"
+    annotation (Placement(transformation(extent={{12,-10},{32,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpSet(k=20E4)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
+equation
+  connect(u1.y, staChi.u1Coo) annotation (Line(points={{-79,80},{60,80},{60,
+          8.875},{78,8.875}},
+               color={255,0,255}));
+  connect(u1.y, staChi.u1Hea) annotation (Line(points={{-79,80},{60,80},{60,
+          7.625},{78,7.625}},
+               color={255,0,255}));
+  connect(TChiWatSupSet.y, staChi.TChiWatSupSet) annotation (Line(points={{-38,-20},
+          {40,-20},{40,5},{78,5}},
+                                 color={0,0,127}));
+  connect(THeaWatPriRet.y, staChi.THeaWatPriRet) annotation (Line(points={{-78,-80},
+          {50,-80},{50,-6.25},{78,-6.25}},
+                                     color={0,0,127}));
+  connect(THeaWatSupSet.y, staChi.THeaWatSupSet) annotation (Line(points={{-38,-60},
+          {48,-60},{48,-3.75},{78,-3.75}},
+                                   color={0,0,127}));
+  connect(TChiWatPriRet.y, staChi.TChiWatPriRet) annotation (Line(points={{-78,-40},
+          {42,-40},{42,2.5},{78,2.5}},
+                                   color={0,0,127}));
+  connect(sca.y, staChi.mChiWatPri_flow)
+    annotation (Line(points={{34,40},{40,40},{40,6.25},{78,6.25}},
+                                                           color={0,0,127}));
+  connect(sca1.y, staChi.mHeaWatPri_flow) annotation (Line(points={{34,0},{38,0},
+          {38,-2.5},{78,-2.5}}, color={0,0,127}));
+  connect(TChiWatSupSet.y, staChi.TChiWatSup) annotation (Line(points={{-38,-20},
+          {40,-20},{40,3.75},{78,3.75}},       color={0,0,127}));
+  connect(dpSet.y, staChi.dpChiWat) annotation (Line(points={{-38,-100},{46,
+          -100},{46,0},{78,0}}, color={0,0,127}));
+  connect(dpSet.y, staChi.dpChiWatSet) annotation (Line(points={{-38,-100},{46,
+          -100},{46,1.25},{78,1.25}}, color={0,0,127}));
+  connect(dpSet.y, staChi.dpHeaWatSet) annotation (Line(points={{-38,-100},{
+          45.8824,-100},{45.8824,-7.5},{78,-7.5}}, color={0,0,127}));
+  connect(dpSet.y, staChi.dpHeaWat) annotation (Line(points={{-38,-100},{
+          45.8824,-100},{45.8824,-8.75},{78,-8.75}}, color={0,0,127}));
+  connect(THeaWatSupSet.y, staChi.THeaWatSup) annotation (Line(points={{-38,-60},
+          {47.8431,-60},{47.8431,-5},{78,-5}}, color={0,0,127}));
+  connect(ratFlo.y[1], sca.u) annotation (Line(points={{-78,20},{0,20},{0,40},{
+          10,40}}, color={0,0,127}));
+  connect(ratFlo.y[2], sca1.u)
+    annotation (Line(points={{-78,20},{0,20},{0,0},{10,0}}, color={0,0,127}));
+          annotation (
+              __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=30000,
+      Tolerance=1e-06),
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
+    Documentation(info="<html>
+<p>
+This is a validation model for the plant staging logic implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StagingPlant;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
new file mode 100644
index 00000000000..9ea1e52f94a
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
@@ -0,0 +1,73 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation;
+model StagingPump "Validation of pump staging block"
+  extends Modelica.Icons.Example;
+
+  parameter Integer nPum(
+    final min=1,
+    start=1)=3
+    "Number of pumps"
+    annotation(Evaluate=true);
+  parameter Integer nChi(
+    final min=1,
+    start=1)=1
+    "Number of chillers served by the pumps"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    annotation(Dialog(group="Nominal condition"));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable floSpe(
+    table=[
+      0,0,0;
+      1,0,0;
+      4,(nPum - 1)/nPum*m_flow_nominal,1;
+      5,m_flow_nominal,0.9;
+      10,0,0.1],
+    timeScale=500)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump
+    staDet(
+    final nPum=nPum,
+    final m_flow_nominal=m_flow_nominal)
+    "Pump staging block - Detailed version"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yVal(k=1)
+    "Source signal"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isOpe(t=0.1,
+    h=5E-2) "Check if valve open"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+equation
+  connect(floSpe.y[1],staDet. m_flow) annotation (Line(points={{-58,40},{30,40},
+          {30,0},{38,0}},     color={0,0,127}));
+  connect(floSpe.y[2],staDet. y)
+    annotation (Line(points={{-58,40},{30,40},{30,-6},{38,-6}},
+                                                 color={0,0,127}));
+  connect(yVal.y, isOpe.u)
+    annotation (Line(points={{-58,0},{-42,0}}, color={0,0,127}));
+  connect(isOpe.y,staDet.y1Ena)
+    annotation (Line(points={{-18,0},{0,0},{0,6},{38,6}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=5000,
+      Tolerance=1e-06),
+  Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This is a validation model for the pump staging logic implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StagingPump;
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
new file mode 100644
index 00000000000..bf8d36d2681
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
@@ -0,0 +1,10 @@
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
index 2515e8a6f23..84ebbd4349c 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/ValveCondenserEvaporator.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
+within Buildings.DHC.Plants.Combined.Controls.BaseClasses;
 block ValveCondenserEvaporator
   "Controller for chiller and HRC condenser and evaporator valves"
 
@@ -76,8 +76,8 @@ block ValveCondenserEvaporator
     "Index of active tank cycle"
     annotation (Placement(transformation(extent={{-280,80},{-240,120}}),
     iconTransformation(extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput mode(final min=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
-      final max=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput mode(final min=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge,
+      final max=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
     "Condenser loop operating mode"
     annotation (Placement(transformation(extent={{-280,160},{-240,200}}),
         iconTransformation(extent={{-140,80},{-100,120}})));
@@ -322,7 +322,7 @@ block ValveCondenserEvaporator
         "1") "HW minimum flow bypass valve control signal" annotation (
       Placement(transformation(extent={{240,400},{280,440}}),
         iconTransformation(extent={{100,40},{140,80}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valEvaChi[nChi](
+  ETS.Combined.Controls.PIDWithEnable valEvaChi[nChi](
     each k=k,
     each Ti=Ti,
     each final yMin=yMin,
@@ -332,7 +332,7 @@ block ValveCondenserEvaporator
     each final y_neutral=y_neutral)
     "Chiller evaporator isolation valve control when HRC in direct HR"
     annotation (Placement(transformation(extent={{-110,390},{-90,410}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valConChi[nChi](
+  ETS.Combined.Controls.PIDWithEnable valConChi[nChi](
     each k=k,
     each Ti=Ti,
     each final yMin=yMin,
@@ -341,7 +341,7 @@ block ValveCondenserEvaporator
     each final y_reset=y_reset,
     each final y_neutral=y_neutral) "Chiller condenser isolation valve control"
     annotation (Placement(transformation(extent={{70,350},{90,370}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valEvaChiHea[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable valEvaChiHea[nChiHea](
     each k=4*k,
     each Ti=Ti/3,
     each final yMin=yMin,
@@ -350,7 +350,7 @@ block ValveCondenserEvaporator
     each final y_reset=y_reset,
     each final y_neutral=y_neutral) "HRC evaporator isolation valve control"
     annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valConChiHea[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable valConChiHea[nChiHea](
     each k=k,
     each Ti=Ti,
     each final yMin=yMin,
@@ -540,7 +540,7 @@ block ValveCondenserEvaporator
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-130,-380})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valConSwi(
+  ETS.Combined.Controls.PIDWithEnable valConSwi(
     u_s(unit="K", displayUnit="degC"),
     u_m(unit="K", displayUnit="degC"),
     k=k,
@@ -591,7 +591,7 @@ block ValveCondenserEvaporator
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-70,-360})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConWatEvaLvg[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable ctlTConWatEvaLvg[nChiHea](
     u_s(each final unit="K", each displayUnit="degC"),
     u_m(each final unit="K", each displayUnit="degC"),
     each final k=k/2,
@@ -639,7 +639,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Reals.Switch selFloSet[nChiHea]
     "Select HRC evaporator flow setpoint based on operating mode"
     annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConWatEvaEnt(
+  ETS.Combined.Controls.PIDWithEnable ctlTConWatEvaEnt(
     u_s(final unit="K", displayUnit="degC"),
     u_m(final unit="K", displayUnit="degC"),
     k=k,
@@ -678,7 +678,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Routing.RealExtractor TConWatConRetSet(final nin=2)
     "Extract value at given index"
     annotation (Placement(transformation(extent={{-170,90},{-150,110}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConWatConRet(
+  ETS.Combined.Controls.PIDWithEnable ctlTConWatConRet(
     u_s(final unit="K", displayUnit="degC"),
     u_m(final unit="K", displayUnit="degC"),
     k=k,
@@ -693,7 +693,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Integers.Equal isChaAss
     "Check if charge assist mode is active"
     annotation (Placement(transformation(extent={{-170,150},{-150,170}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
     "Charge assist mode index"
     annotation (Placement(transformation(extent={{-210,150},{-190,170}})));
   Buildings.Controls.OBC.CDL.Reals.Line floCon[nChi + nChiHea]
@@ -718,7 +718,7 @@ block ValveCondenserEvaporator
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={30,-40})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctlTConLvgChi[nChi +
+  ETS.Combined.Controls.PIDWithEnable ctlTConLvgChi[nChi +
     nChiHea](
     u_s(each final unit="K", each displayUnit="degC"),
     u_m(each final unit="K", each displayUnit="degC"),
@@ -731,7 +731,7 @@ block ValveCondenserEvaporator
     each final y_neutral=0) "Condenser leaving temperature control"
     annotation (Placement(transformation(extent={{-70,250},{-50,270}})));
 
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant tanCha(final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant tanCha(final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.tankCharge)
     "Tank charge/discharge mode index"
     annotation (Placement(transformation(extent={{-210,190},{-190,210}})));
   Buildings.Controls.OBC.CDL.Integers.Equal isTanCha
@@ -762,7 +762,7 @@ block ValveCondenserEvaporator
   Buildings.Controls.OBC.CDL.Reals.Switch swiFloSet1[nChi + nChiHea]
     "Switch condenser flow setpoint based on condenser loop operating mode"
     annotation (Placement(transformation(extent={{-10,230},{10,250}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valChiWatMinByp[nChi +
+  ETS.Combined.Controls.PIDWithEnable valChiWatMinByp[nChi +
     nChiHea](
     each k=0.01,
     each Ti=Ti,
@@ -772,7 +772,7 @@ block ValveCondenserEvaporator
     each final y_reset=0,
     each final y_neutral=0) "CHW minimum flow bypass valve control"
     annotation (Placement(transformation(extent={{144,450},{164,470}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable valHeaWatMinByp[nChiHea](
+  ETS.Combined.Controls.PIDWithEnable valHeaWatMinByp[nChiHea](
     each k=0.01,
     each Ti=Ti,
     each final yMin=0,
@@ -1384,8 +1384,8 @@ The loop is biased to launch from <i>100&nbsp;%</i>.
 <h5>Chiller evaporator flow setpoint</h5>
 <p>
 The setpoint is computed based on the logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
 </p>
 <h4>Chiller condenser isolation valve</h4>
 <p>
@@ -1445,8 +1445,8 @@ The loop is biased to launch from <i>100&nbsp;%</i>.
 <p>Otherwise, the valve is commanded to a closed position.</p>
 <h5>HRC evaporator flow setpoint</h5>
 <p>In direct heat recovery mode, the setpoint is reset based on the logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.</p>
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.</p>
 <p>In cascading heating mode, the setpoint is reset with a control loop
 that maintains the evaporator leaving temperature at target setpoint
 equal to the lowest temperature setpoint of the active tank cycle.
@@ -1492,8 +1492,8 @@ interconnection with the condenser loop (highest index) and which is operating
 in direct heat recovery mode is modulated with a control loop tracking
 the condenser entering temperature.
 The condenser entering temperature setpoint is reset based on the logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery</a>.
 This allows false loading the HRC that is controlled to meet the HW supply
 temperature setpoint in direct heat recovery mode, and thus meeting
 the CHW supply temperature setpoint simultaneously.
diff --git a/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.mo b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.mo
new file mode 100644
index 00000000000..0731a651898
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.Plants.Combined.Controls;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct
+the main plant controller.
+Those include an interface class for the controller as well
+as blocks that implement the sequence of operation for each
+component of the plant.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.order b/Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.order
rename to Buildings/DHC/Plants/Combined/Controls/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Combined/Controls/Controller.mo b/Buildings/DHC/Plants/Combined/Controls/Controller.mo
new file mode 100644
index 00000000000..f5bafb216af
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/Controller.mo
@@ -0,0 +1,547 @@
+within Buildings.DHC.Plants.Combined.Controls;
+block Controller "Plant controller"
+  extends BaseClasses.PartialController;
+
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator repHeaPum(
+    final nout=nHeaPum) "Replicate signal"
+    annotation (Placement(transformation(extent={{220,-230},{240,-210}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal cvtValBypTan
+    "Convert DO to AO"
+    annotation (Placement(transformation(extent={{-40,-290},{-20,-270}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TChiHeaSupSet[nChiHea]
+    "Switch supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
+  BaseClasses.StagingPump staPumChiWat(
+    final nPum=nPumChiWat,
+    final m_flow_nominal=mChiWat_flow_nominal)
+    "CHW pump staging"
+    annotation (Placement(transformation(extent={{120,230},{140,250}})));
+  ETS.Combined.Controls.PIDWithEnable pumChiWat(
+    k=0.1,
+    Ti=60,
+    r=dpChiWatSet_max,
+    y_reset=1,
+    y_neutral=0)
+    "Pump speed controller"
+    annotation (Placement(transformation(extent={{190,230},{210,250}})));
+  ETS.Combined.Controls.PIDWithEnable pumHeaWat(
+    k=0.1,
+    Ti=60,
+    r=dpHeaWatSet_max,
+    y_reset=1,
+    y_neutral=0)
+    "Pump speed controller"
+    annotation (Placement(transformation(extent={{190,-50},{210,-30}})));
+  BaseClasses.StagingPump staPumHeaWat(
+    final nPum=nPumHeaWat,
+    final m_flow_nominal=mHeaWat_flow_nominal)
+    "HW pump staging"
+    annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
+  BaseClasses.StagingPump staPumConWatCon(
+    final nPum=nPumConWatCon,
+    final m_flow_nominal=mConWatCon_flow_nominal)
+    "CW pump staging"
+    annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
+  ETS.Combined.Controls.PIDWithEnable pumConWatCon(
+    k=0.1,
+    Ti=60,
+    final r=dpConWatConSet_max,
+    y_reset=1,
+    y_neutral=0)
+    "Pump speed controller"
+    annotation (Placement(transformation(extent={{190,-130},{210,-110}})));
+  ETS.Combined.Controls.PIDWithEnable pumConWatEva(
+    k=0.1,
+    Ti=60,
+    final r=dpConWatEvaSet_max,
+    y_reset=1,
+    y_neutral=0)
+    "Pump speed controller"
+    annotation (Placement(transformation(extent={{190,-190},{210,-170}})));
+  BaseClasses.StagingPump staPumConWatEva(
+    final nPum=nPumConWatEva,
+    final m_flow_nominal=mConWatEva_flow_nominal)
+    "CW pump staging"
+    annotation (Placement(transformation(extent={{120,-190},{140,-170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpConNom(final k=
+        dpConWatConSet_max) "Constant"
+    annotation (Placement(transformation(extent={{160,-130},{180,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpEvaNom(final k=
+        dpConWatEvaSet_max) "Constant"
+    annotation (Placement(transformation(extent={{160,-190},{180,-170}})));
+  BaseClasses.StagingPlant staPla(
+    final nChi=nChi,
+    final QChiWatChi_flow_nominal=QChiWatChi_flow_nominal,
+    final nChiHea=nChiHea,
+    final QChiWatCasCoo_flow_nominal=QChiWatCasCoo_flow_nominal,
+    final QChiWatCasCoo_flow_nominal_approx=QChiWatCasCoo_flow_nominal_approx,
+    final QHeaWat_flow_nominal=QHeaWat_flow_nominal,
+    final cp_default=cp_default) "Plant staging"
+    annotation (Placement(transformation(extent={{-210,140},{-190,172}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTSet(nout=nChiHea)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTSet1(nout=nChiHea)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
+  BaseClasses.ModeCondenserLoop modConLoo(
+    final mConWatHexCoo_flow_nominal=mConWatCon_flow_nominal,
+    final QHeaPum_flow_nominal=QHeaPum_flow_nominal,
+    final TTanSet=TTanSet,
+    final fraUslTan=fraUslTan,
+    final ratFraChaTanLim=ratFraChaTanLim,
+    final cp_default=cp_default,
+    nTTan=nTTan) "Condenser loop operating mode"
+    annotation (Placement(transformation(extent={{-170,-170},{-150,-150}})));
+  BaseClasses.TankCycle cycTan(
+    mConWatHexCoo_flow_nominal=mConWatCon_flow_nominal,
+                               final TTanSet=TTanSet, nTTan=nTTan)
+    "Determine tank cycle"
+    annotation (Placement(transformation(extent={{-170,-110},{-150,-90}})));
+  Buildings.Controls.OBC.CDL.Integers.Equal isModChaAss
+    "Return true if charge assist mode is active"
+    annotation (Placement(transformation(extent={{-120,-190},{-100,-170}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
+    "Charge assist mode index"
+    annotation (Placement(transformation(extent={{-170,-198},{-150,-178}})));
+  Buildings.Controls.OBC.CDL.Logical.And assAndPum
+    "Charge assist mode and any CW pump On"
+    annotation (Placement(transformation(extent={{186,-210},{206,-230}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaPumSetVal[2](
+    final k={max(TTanSet[i]) + 3 for i in 1:2})
+    "HP supply temperature setpoint for each tank cycle"
+    annotation (Placement(transformation(extent={{-170,-230},{-150,-210}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractor extIndRea(final nin=2)
+    "Extract active setpoint"
+    annotation (Placement(transformation(extent={{-120,-230},{-100,-210}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant heaRej(
+    final k=Buildings.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
+    "Heat rejection mode index"
+    annotation (Placement(transformation(extent={{-170,-290},{-150,-270}})));
+  Buildings.Controls.OBC.CDL.Integers.Equal isModHeaRej
+    "Return true if heat rejection mode is active"
+    annotation (Placement(transformation(extent={{-120,-290},{-100,-270}})));
+  Buildings.Controls.OBC.CDL.Logical.Not isModNotHeaRej
+    "Return true if heat rejection mode is NOT active"
+    annotation (Placement(transformation(extent={{-80,-290},{-60,-270}})));
+  BaseClasses.ValveCondenserEvaporator valConEva(
+    final nChi=nChi,
+    final nChiHea=nChiHea,
+    final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
+    final mChiWatChi_flow_min=mChiWatChi_flow_min,
+    final mConWatChi_flow_nominal=mConWatChi_flow_nominal,
+    final dpEvaChi_nominal=dpEvaChi_nominal,
+    final dpValEvaChi_nominal=dpValEvaChi_nominal,
+    final mChiWatChiHea_flow_nominal=mChiWatChiHea_flow_nominal,
+    final mChiWatChiHea_flow_min=mChiWatChiHea_flow_min,
+    final mConWatChiHea_flow_nominal=mConWatChiHea_flow_nominal,
+    final mHeaWatChiHea_flow_min=mHeaWatChiHea_flow_min,
+    final dpEvaChiHea_nominal=dpEvaChiHea_nominal,
+    final dpValEvaChiHea_nominal=dpValEvaChiHea_nominal,
+    final TTanSet=TTanSet)
+    "Controller for chiller and HRC condenser and evaporator valves"
+    annotation (Placement(transformation(extent={{-60,20},{-40,60}})));
+  Buildings.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery dirHeaCoo(
+    final nChi=nChi,
+    final nChiHea=nChiHea,
+    final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
+    final mChiWatChi_flow_min=mChiWatChi_flow_min,
+    final mChiWatChiHea_flow_nominal=mChiWatChiHea_flow_nominal,
+    final mChiWatChiHea_flow_min=mChiWatChiHea_flow_min)
+    "Control logic for HRC in direct HR mode"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  BaseClasses.CoolingTowerLoop coo(
+    final mConWatHexCoo_flow_nominal=mConWatCon_flow_nominal,
+    final nCoo=nCoo,
+    final nPumConWatCoo=nPumConWatCoo,
+    final QChiWat_flow_nominal=QChiWat_flow_nominal,
+    final dTLifChi_min=dTLifChi_min,
+    final dTLifChi_nominal=dTLifChi_nominal,
+    final TTanSet=TTanSet,
+    final dTHexCoo_nominal=dTHexCoo_nominal) "Cooling tower loop"
+    annotation (Placement(transformation(extent={{40,-364},{60,-328}})));
+  Buildings.Controls.OBC.CDL.Logical.Or u1CooOrHea
+    "Plant Enable signal: either cooling or heating is enabled"
+    annotation (Placement(transformation(extent={{-160,430},{-140,450}})));
+equation
+  connect(repHeaPum.y, y1HeaPum)
+    annotation (Line(points={{242,-220},{280,-220}},color={255,0,255}));
+  connect(cvtValBypTan.y, yValBypTan) annotation (Line(points={{-18,-280},{280,-280}},
+                                        color={0,0,127}));
+  connect(staPumChiWat.y1, y1PumChiWat) annotation (Line(points={{142,246},{180,
+          246},{180,260},{280,260}},
+                                color={255,0,255}));
+  connect(pumChiWat.y, yPumChiWat)
+    annotation (Line(points={{212,240},{280,240}}, color={0,0,127}));
+  connect(dpChiWatSet, pumChiWat.u_s) annotation (Line(points={{-280,320},{-10,
+          320},{-10,260},{176,260},{176,240},{188,240}},
+                                     color={0,0,127}));
+  connect(staPumHeaWat.y1, y1PumHeaWat)
+    annotation (Line(points={{142,-34},{180,-34},{180,-20},{280,-20}},
+                                                color={255,0,255}));
+  connect(pumHeaWat.y, yPumHeaWat)
+    annotation (Line(points={{212,-40},{280,-40}}, color={0,0,127}));
+  connect(dpHeaWatSet, pumHeaWat.u_s) annotation (Line(points={{-280,300},{4,
+          300},{4,-20},{160,-20},{160,-40},{188,-40}},
+                                      color={0,0,127}));
+  connect(pumConWatEva.y, yPumConWatEva)
+    annotation (Line(points={{212,-180},{280,-180}}, color={0,0,127}));
+  connect(pumConWatCon.y, yPumConWatCon) annotation (Line(points={{212,-120},{220,
+          -120},{220,-140},{280,-140}},     color={0,0,127}));
+  connect(staPumConWatCon.y1, y1PumConWatCon) annotation (Line(points={{142,-114},
+          {150,-114},{150,-100},{240,-100},{240,-120},{280,-120}},
+                                          color={255,0,255}));
+  connect(staPumConWatEva.y1, y1PumConWatEva)
+    annotation (Line(points={{142,-174},{150,-174},{150,-160},{280,-160}},
+                                                    color={255,0,255}));
+  connect(dpHeaWat, pumHeaWat.u_m) annotation (Line(points={{-280,-360},{-234,-360},
+          {-234,-64},{200,-64},{200,-52}}, color={0,0,127}));
+  connect(mHeaWatPri_flow, staPumHeaWat.m_flow) annotation (Line(points={{-280,
+          -200},{-242,-200},{-242,-40},{118,-40}},
+                                        color={0,0,127}));
+  connect(dpChiWat, pumChiWat.u_m) annotation (Line(points={{-280,-340},{-226,
+          -340},{-226,208},{200,208},{200,228}},
+                                           color={0,0,127}));
+  connect(mConWatEva_flow, staPumConWatEva.m_flow) annotation (Line(points={{-280,
+          -260},{-252,-260},{-252,-140},{60,-140},{60,-180},{118,-180}},
+                                                  color={0,0,127}));
+  connect(mConWatCon_flow, staPumConWatCon.m_flow) annotation (Line(points={{-280,
+          -240},{-244,-240},{-244,-120},{118,-120}},
+                                               color={0,0,127}));
+  connect(mChiWatPri_flow, staPumChiWat.m_flow) annotation (Line(points={{-280,-180},
+          {-238,-180},{-238,240},{118,240}},    color={0,0,127}));
+  connect(dpConNom.y, pumConWatCon.u_s) annotation (Line(points={{182,-120},{188,
+          -120}},                      color={0,0,127}));
+  connect(dpEvaNom.y, pumConWatEva.u_s)
+    annotation (Line(points={{182,-180},{188,-180}}, color={0,0,127}));
+  connect(mHeaWatPri_flow, staPla.mHeaWatPri_flow) annotation (Line(points={{-280,
+          -200},{-236,-200},{-236,152},{-212,152}},    color={0,0,127}));
+  connect(THeaWatSupSet, staPla.THeaWatSupSet) annotation (Line(points={{-280,
+          340},{-250,340},{-250,150},{-212,150}}, color={0,0,127}));
+  connect(mChiWatPri_flow, staPla.mChiWatPri_flow) annotation (Line(points={{-280,
+          -180},{-238,-180},{-238,166},{-212,166}},color={0,0,127}));
+  connect(u1Coo, staPla.u1Coo) annotation (Line(points={{-280,440},{-236,440},{
+          -236,170.2},{-212,170.2}},                   color={255,0,255}));
+  connect(u1Hea, staPla.u1Hea) annotation (Line(points={{-280,400},{-240,400},{
+          -240,168.2},{-212,168.2}},                   color={255,0,255}));
+  connect(TChiWatSupSet, staPla.TChiWatSupSet) annotation (Line(points={{-280,
+          360},{-242,360},{-242,164},{-212,164}}, color={0,0,127}));
+  connect(TChiWatPriRet, staPla.TChiWatPriRet) annotation (Line(points={{-280,
+          240},{-242,240},{-242,160},{-212,160}},
+                                                color={0,0,127}));
+  connect(THeaWatPriRet, staPla.THeaWatPriRet) annotation (Line(points={{-280,80},
+          {-242,80},{-242,146},{-212,146}},     color={0,0,127}));
+  connect(repTSet1.y, TChiHeaSupSet.u3) annotation (Line(points={{-118,80},{
+          -106,80},{-106,92},{-102,92}}, color={0,0,127}));
+  connect(repTSet.y, TChiHeaSupSet.u1) annotation (Line(points={{-118,120},{
+          -106,120},{-106,108},{-102,108}}, color={0,0,127}));
+  connect(staPla.y1CooChiHea, TChiHeaSupSet.u2) annotation (Line(points={{-188,148},
+          {-110,148},{-110,100},{-102,100}},      color={255,0,255}));
+  connect(TChiHeaSupSet.y, TChiHeaSet)
+    annotation (Line(points={{-78,100},{280,100}}, color={0,0,127}));
+  connect(TChiWatSupSet, repTSet.u) annotation (Line(points={{-280,360},{-254,
+          360},{-254,120},{-142,120}}, color={0,0,127}));
+  connect(THeaWatSupSet, repTSet1.u) annotation (Line(points={{-280,340},{-250,
+          340},{-250,80},{-142,80}}, color={0,0,127}));
+  connect(mConWatHexCoo_flow, modConLoo.mConWatHexCoo_flow) annotation (Line(
+        points={{-280,-280},{-248,-280},{-248,-152},{-172,-152}},
+                                                                color={0,0,127}));
+  connect(mConWatOutTan_flow, modConLoo.mConWatOutTan_flow) annotation (Line(
+        points={{-280,-300},{-234,-300},{-234,-156},{-172,-156}},
+                                                                color={0,0,127}));
+  connect(TTan, modConLoo.TTan) annotation (Line(points={{-280,60},{-180,60},{
+          -180,-160},{-172,-160}},
+                                 color={0,0,127}));
+  connect(TTan, cycTan.TTan) annotation (Line(points={{-280,60},{-180,60},{-180,
+          -106},{-172,-106}},
+                          color={0,0,127}));
+  connect(mConWatOutTan_flow, cycTan.mConWatOutTan_flow) annotation (Line(
+        points={{-280,-300},{-226,-300},{-226,-94},{-172,-94}},
+                                                            color={0,0,127}));
+  connect(chaAss.y, isModChaAss.u2) annotation (Line(points={{-148,-188},{-122,
+          -188}},                         color={255,127,0}));
+  connect(modConLoo.mode, isModChaAss.u1) annotation (Line(points={{-148,-160},
+          {-144,-160},{-144,-180},{-122,-180}},
+                                              color={255,127,0}));
+  connect(assAndPum.y, repHeaPum.u)
+    annotation (Line(points={{208,-220},{218,-220}}, color={255,0,255}));
+  connect(isModChaAss.y, assAndPum.u1)
+    annotation (Line(points={{-98,-180},{-80,-180},{-80,-220},{184,-220}},
+                                                     color={255,0,255}));
+  connect(THeaPumSetVal.y, extIndRea.u)
+    annotation (Line(points={{-148,-220},{-122,-220}}, color={0,0,127}));
+  connect(extIndRea.y, THeaPumSet) annotation (Line(points={{-98,-220},{-80,
+          -220},{-80,-240},{280,-240}},            color={0,0,127}));
+  connect(cycTan.idxCycTan, extIndRea.index) annotation (Line(points={{-148,
+          -100},{-140,-100},{-140,-240},{-110,-240},{-110,-232}},
+                                                         color={255,127,0}));
+  connect(heaRej.y, isModHeaRej.u1)
+    annotation (Line(points={{-148,-280},{-122,-280}}, color={255,127,0}));
+  connect(modConLoo.mode, isModHeaRej.u2) annotation (Line(points={{-148,-160},{
+          -144,-160},{-144,-288},{-122,-288}},color={255,127,0}));
+  connect(isModNotHeaRej.y, cvtValBypTan.u)
+    annotation (Line(points={{-58,-280},{-42,-280}}, color={255,0,255}));
+  connect(isModHeaRej.y, isModNotHeaRej.u)
+    annotation (Line(points={{-98,-280},{-82,-280}}, color={255,0,255}));
+  connect(mEvaChi_flow,valConEva. mEvaChi_flow) annotation (Line(points={{-280,
+          -100},{-212,-100},{-212,42},{-62,42}}, color={0,0,127}));
+  connect(mConChi_flow,valConEva. mConChi_flow) annotation (Line(points={{-280,
+          -120},{-256,-120},{-256,40},{-62,40}},     color={0,0,127}));
+  connect(mEvaChiHea_flow,valConEva. mEvaChiHea_flow) annotation (Line(points={{-280,
+          -140},{-254,-140},{-254,38},{-62,38}},           color={0,0,127}));
+  connect(mConChiHea_flow,valConEva. mConChiHea_flow) annotation (Line(points={{-280,
+          -160},{-252,-160},{-252,36},{-62,36}},           color={0,0,127}));
+  connect(staPla.y1Chi,valConEva. u1Chi) annotation (Line(points={{-188,164},{
+          -164,164},{-164,58},{-62,58}},
+                                    color={255,0,255}));
+  connect(staPla.y1ChiHea,valConEva. u1ChiHea) annotation (Line(points={{-188,
+          154},{-166,154},{-166,56},{-62,56}}, color={255,0,255}));
+  connect(staPla.y1CooChiHea,valConEva. u1CooChiHea) annotation (Line(points={{-188,
+          148},{-168,148},{-168,54},{-62,54}},      color={255,0,255}));
+  connect(staPla.y1HeaCooChiHea,valConEva. u1HeaCooChiHea) annotation (Line(
+        points={{-188,142},{-170,142},{-170,52},{-62,52}}, color={255,0,255}));
+  connect(valConEva.yValEvaChi, yValEvaChi) annotation (Line(points={{-38,42},{
+          0,42},{0,320},{280,320}}, color={0,0,127}));
+  connect(valConEva.yValConChi, yValConChi) annotation (Line(points={{-38,40},{
+          2,40},{2,300},{280,300}}, color={0,0,127}));
+  connect(valConEva.yValConSwiChiHea, yValConSwiChiHea)
+    annotation (Line(points={{-38,32},{260,32},{260,20},{280,20}},
+                                                 color={0,0,127}));
+  connect(valConEva.yValEvaSwiChiHea, yValEvaSwiHea) annotation (Line(points={{-38,34},
+          {240,34},{240,40},{280,40}},         color={0,0,127}));
+  connect(valConEva.yValConChiHea, yValConChiHea) annotation (Line(points={{-38,36},
+          {238,36},{238,60},{280,60}},     color={0,0,127}));
+  connect(valConEva.yValEvaChiHea, yValEvaChiHea) annotation (Line(points={{-38,38},
+          {236,38},{236,80},{280,80}},     color={0,0,127}));
+  connect(dpConWatEva, pumConWatEva.u_m) annotation (Line(points={{-280,-400},{-240,
+          -400},{-240,-204},{200,-204},{200,-192}},      color={0,0,127}));
+  connect(dpConWatCon, pumConWatCon.u_m) annotation (Line(points={{-280,-380},{-242,
+          -380},{-242,-144},{200,-144},{200,-132}},      color={0,0,127}));
+  connect(cycTan.idxCycTan,valConEva. idxCycTan) annotation (Line(points={{-148,
+          -100},{-140,-100},{-140,48},{-62,48}},     color={255,127,0}));
+  connect(modConLoo.mode,valConEva. mode) annotation (Line(points={{-148,-160},
+          {-144,-160},{-144,50},{-62,50}},     color={255,127,0}));
+  connect(TChiWatSup, staPla.TChiWatSup) annotation (Line(points={{-280,260},{
+          -246,260},{-246,162},{-212,162}},         color={0,0,127}));
+  connect(dpChiWatSet, staPla.dpChiWatSet) annotation (Line(points={{-280,320},
+          {-246,320},{-246,158},{-212,158}},         color={0,0,127}));
+  connect(dpChiWat, staPla.dpChiWat) annotation (Line(points={{-280,-340},{-238,
+          -340},{-238,156},{-212,156}},         color={0,0,127}));
+  connect(valConEva.y1PumChiWat, staPumChiWat.y1Ena) annotation (Line(points={{-38,58},
+          {-4,58},{-4,246},{118,246}},        color={255,0,255}));
+  connect(pumChiWat.y, staPumChiWat.y) annotation (Line(points={{212,240},{220,240},
+          {220,220},{110,220},{110,234},{118,234}},   color={0,0,127}));
+  connect(pumHeaWat.y, staPumHeaWat.y) annotation (Line(points={{212,-40},{220,
+          -40},{220,-60},{110,-60},{110,-46},{118,-46}},
+                                                  color={0,0,127}));
+  connect(valConEva.y1PumHeaWat, staPumHeaWat.y1Ena) annotation (Line(points={{-38,56},
+          {74,56},{74,-34},{118,-34}},    color={255,0,255}));
+  connect(pumConWatCon.y, staPumConWatCon.y) annotation (Line(points={{212,-120},
+          {220,-120},{220,-140},{114,-140},{114,-126},{118,-126}},
+                                                            color={0,0,127}));
+  connect(pumConWatEva.y, staPumConWatEva.y) annotation (Line(points={{212,-180},
+          {220,-180},{220,-200},{114,-200},{114,-186},{118,-186}},
+                                                                color={0,0,127}));
+  connect(valConEva.y1PumConWatEva, staPumConWatEva.y1Ena) annotation (Line(
+        points={{-38,52},{-4,52},{-4,-174},{118,-174}},color={255,0,255}));
+  connect(valConEva.y1PumConWatCon, staPumConWatCon.y1Ena) annotation (Line(
+        points={{-38,54},{-2,54},{-2,-114},{118,-114}},
+                                                     color={255,0,255}));
+  connect(staPla.y1Chi, y1Chi) annotation (Line(points={{-188,164},{-6,164},{-6,
+          340},{280,340}}, color={255,0,255}));
+  connect(staPla.y1ChiHea, y1ChiHea) annotation (Line(points={{-188,154},{6,154},
+          {6,160},{280,160}}, color={255,0,255}));
+  connect(staPla.y1CooChiHea, y1CooChiHea) annotation (Line(points={{-188,148},{
+          6,148},{6,140},{280,140}},   color={255,0,255}));
+  connect(staPla.y1HeaCooChiHea, y1HeaCooChiHea) annotation (Line(points={{-188,
+          142},{4,142},{4,120},{280,120}},   color={255,0,255}));
+  connect(staPla.y1ChiHea, dirHeaCoo.y1) annotation (Line(points={{-188,154},{
+          -166,154},{-166,8},{-122,8}},         color={255,0,255}));
+  connect(staPla.y1HeaCooChiHea, dirHeaCoo.y1HeaCoo) annotation (Line(points={{-188,
+          142},{-170,142},{-170,4},{-126,4},{-126,4},{-122,4}},     color={255,
+          0,255}));
+  connect(TChiWatSupSet, dirHeaCoo.TChiWatSupSet) annotation (Line(points={{-280,
+          360},{-254,360},{-254,0},{-122,0}},          color={0,0,127}));
+  connect(TEvaLvgChiHea, dirHeaCoo.TEvaLvg) annotation (Line(points={{-280,140},
+          {-232,140},{-232,-4},{-122,-4}},      color={0,0,127}));
+  connect(THeaWatPriRet, dirHeaCoo.THeaWatPriRet) annotation (Line(points={{-280,80},
+          {-242,80},{-242,-8},{-122,-8}},                color={0,0,127}));
+  connect(dirHeaCoo.mEvaChiSet_flow,valConEva. mEvaChiSet_flow) annotation (
+      Line(points={{-98,6},{-92,6},{-92,46},{-62,46}},         color={0,0,127}));
+  connect(dirHeaCoo.mEvaChiHeaSet_flow,valConEva. mEvaChiHeaSet_flow)
+    annotation (Line(points={{-98,0},{-88,0},{-88,44},{-62,44}},     color={0,0,
+          127}));
+  connect(dpHeaWatSet, staPla.dpHeaWatSet) annotation (Line(points={{-280,300},
+          {-240,300},{-240,144},{-212,144}},color={0,0,127}));
+  connect(dpHeaWat, staPla.dpHeaWat) annotation (Line(points={{-280,-360},{-234,
+          -360},{-234,142},{-212,142}}, color={0,0,127}));
+  connect(THeaWatSup, staPla.THeaWatSup) annotation (Line(points={{-280,100},{-230,
+          100},{-230,148},{-212,148}},color={0,0,127}));
+  connect(coo.y1PumConWatCoo, y1PumConWatCoo) annotation (Line(points={{62,-334},
+          {240,-334},{240,-320},{280,-320}}, color={255,0,255}));
+  connect(coo.yPumConWatCoo, yPumConWatCoo) annotation (Line(points={{62,-340},
+          {280,-340}},                      color={0,0,127}));
+  connect(coo.y1Coo, y1Coo) annotation (Line(points={{62,-352},{240,-352},{240,
+          -360},{280,-360}},
+                       color={255,0,255}));
+  connect(coo.yCoo, yCoo) annotation (Line(points={{62,-358},{236,-358},{236,
+          -380},{280,-380}},
+                       color={0,0,127}));
+  connect(cycTan.idxCycTan, coo.idxCycTan) annotation (Line(points={{-148,-100},
+          {0,-100},{0,-332},{38,-332}}, color={255,127,0}));
+  connect(modConLoo.mode, coo.mode) annotation (Line(points={{-148,-160},{2,
+          -160},{2,-330},{38,-330}},
+                               color={255,127,0}));
+  connect(TChiWatSupSet, coo.TChiWatSupSet) annotation (Line(points={{-280,360},
+          {-2,360},{-2,-336},{38,-336}}, color={0,0,127}));
+  connect(TConWatConChiEnt, coo.TConWatConChiEnt) annotation (Line(points={{-280,40},
+          {-252,40},{-252,-338},{38,-338}},     color={0,0,127}));
+  connect(TConWatConChiLvg, coo.TConWatConChiLvg) annotation (Line(points={{-280,20},
+          {-248,20},{-248,-340},{38,-340}},     color={0,0,127}));
+  connect(TConWatCooSup, coo.TConWatCooSup) annotation (Line(points={{-280,0},{
+          -250,0},{-250,-343.8},{38,-343.8}},
+                                         color={0,0,127}));
+  connect(TConWatCooRet, coo.TConWatCooRet) annotation (Line(points={{-280,-20},
+          {-244,-20},{-244,-345.8},{38,-345.8}},                       color={0,
+          0,127}));
+  connect(TConWatHexCooEnt, coo.TConWatHexCooEnt) annotation (Line(points={{-280,
+          -40},{-248,-40},{-248,-347.8},{38,-347.8}}, color={0,0,127}));
+  connect(TConWatHexCooLvg, coo.TConWatHexCooLvg) annotation (Line(points={{-280,
+          -60},{-236,-60},{-236,-349.8},{38,-349.8}}, color={0,0,127}));
+  connect(staPla.QCooReq_flow, coo.QCooReq_flow) annotation (Line(points={{-188,
+          170},{-8,170},{-8,-354},{38,-354}}, color={0,0,127}));
+  connect(mConWatHexCoo_flow, coo.mConWatHexCoo_flow) annotation (Line(points={{-280,
+          -280},{-232,-280},{-232,-358},{38,-358}},      color={0,0,127}));
+  connect(cvtValBypTan.y, coo.yValBypTan) annotation (Line(points={{-18,-280},{
+          -6,-280},{-6,-362},{38,-362}},
+                                      color={0,0,127}));
+  connect(dirHeaCoo.TConEntChiHeaSet,valConEva. TConEntChiHeaSet) annotation (
+      Line(points={{-98,-6},{-84,-6},{-84,34},{-62,34}},             color={0,0,
+          127}));
+  connect(TConEntChiHea,valConEva. TConEntChiHea) annotation (Line(points={{-280,
+          180},{-220,180},{-220,32},{-62,32}},              color={0,0,127}));
+  connect(staPumConWatCon.y1Any, pumConWatCon.uEna) annotation (Line(points={{142,
+          -120},{154,-120},{154,-136},{196,-136},{196,-132}}, color={255,0,255}));
+  connect(staPumConWatEva.y1Any, pumConWatEva.uEna) annotation (Line(points={{142,
+          -180},{150,-180},{150,-198},{196,-198},{196,-192}}, color={255,0,255}));
+  connect(staPumConWatCon.y1Any, assAndPum.u2) annotation (Line(points={{142,-120},
+          {154,-120},{154,-212},{184,-212}}, color={255,0,255}));
+  connect(staPumHeaWat.y1Any, pumHeaWat.uEna) annotation (Line(points={{142,-40},
+          {152,-40},{152,-56},{196,-56},{196,-52}}, color={255,0,255}));
+  connect(staPumChiWat.y1Any, pumChiWat.uEna) annotation (Line(points={{142,240},
+          {170,240},{170,224},{196,224},{196,228}}, color={255,0,255}));
+  connect(valConEva.yValConWatEvaMix, yValConWatEvaMix) annotation (Line(points={{-38,30},
+          {240,30},{240,0},{280,0}},                  color={0,0,127}));
+  connect(TEvaLvgChiHea, valConEva.TEvaLvgChiHea) annotation (Line(points={{-280,
+          140},{-244,140},{-244,26},{-62,26}},              color={0,0,127}));
+  connect(TConWatEvaEnt, valConEva.TConWatEvaEnt) annotation (Line(points={{-280,
+          200},{-256,200},{-256,22},{-62,22}},      color={0,0,127}));
+  connect(TConLvgChiHea, valConEva.TConLvgChiHea) annotation (Line(points={{-280,
+          160},{-250,160},{-250,30},{-62,30}},      color={0,0,127}));
+  connect(TConLvgChi, valConEva.TConLvgChi) annotation (Line(points={{-280,120},
+          {-258,120},{-258,28},{-62,28}}, color={0,0,127}));
+  connect(TConWatConRet, valConEva.TConWatConRet) annotation (Line(points={{-280,
+          220},{-242,220},{-242,24},{-62,24}},      color={0,0,127}));
+  connect(valConEva.yValChiWatMinByp, yValChiWatMinByp) annotation (Line(points={{-38,48},
+          {6,48},{6,200},{280,200}},          color={0,0,127}));
+  connect(valConEva.yValHeaWatMinByp, yValHeaWatMinByp) annotation (Line(points={{-38,46},
+          {6,46},{6,-80},{280,-80}},          color={0,0,127}));
+  connect(valConEva.yValConWatByp, yValConWatByp) annotation (Line(points={{-38,26},
+          {4,26},{4,-420},{280,-420}},     color={0,0,127}));
+  connect(mConWatCon_flow, modConLoo.mConWatCon_flow) annotation (Line(points={
+          {-280,-240},{-232,-240},{-232,-164},{-172,-164}}, color={0,0,127}));
+  connect(TConWatConChiLvg, modConLoo.TConWatConChiLvg) annotation (Line(points
+        ={{-280,20},{-246,20},{-246,-166},{-172,-166}}, color={0,0,127}));
+  connect(TConWatConRet, modConLoo.TConWatConRet) annotation (Line(points={{
+          -280,220},{-232,220},{-232,-168},{-172,-168}}, color={0,0,127}));
+  connect(u1Coo, u1CooOrHea.u1)
+    annotation (Line(points={{-280,440},{-162,440}}, color={255,0,255}));
+  connect(u1Hea, u1CooOrHea.u2) annotation (Line(points={{-280,400},{-180,400},
+          {-180,432},{-162,432}}, color={255,0,255}));
+  connect(u1CooOrHea.y, valConEva.u1CooOrHea) annotation (Line(points={{-138,
+          440},{-57.8,440},{-57.8,62}}, color={255,0,255}));
+annotation (
+  defaultComponentName="ctl", Documentation(info="<html>
+<p>
+This block implements the following control functions.
+</p>
+<ul>
+<li>
+Plant heating and cooling staging and HRC operating mode selection,
+see description in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
+</li>
+<li>
+CW loop operating mode selection, see description in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop</a>.
+</li>
+<li>
+TES tank cycle flag selection, see description in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.TankCycle\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.TankCycle</a>.
+</li>
+<li>
+Load balancing, temperature and flow setpoint tracking for chillers and HRCs
+depending on active operating modes, see description in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
+</li>
+<li>
+Cooling tower pumps and cooling tower fans control, see description in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop</a>.
+</li>
+<li>
+Air-to-water heat pump control, see below.
+</li>
+<li>
+CHW, HW, CWE and CWC pumps, see below.
+</li>
+</ul>
+<h4>Heat pumps</h4>
+<p>
+Heat pumps are enabled whenever Charge Assist mode is active and any
+CWC pump is enabled. Heat pumps are disabled otherwise.
+</p>
+<p>
+The supply temperature setpoint is <i>3&nbsp;</i>K plus the highest
+setpoint of the active tank cycle.
+Note that no limitation of the setpoint value per HP manufacturer specification
+is taken into account.
+</p>
+<h4>CHW, HW, CWE and CWC pumps</h4>
+<p>
+The lead pump is enabled based on the logic described in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
+</p>
+<p>
+Pumps are staged based on the logic described in
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
+Buildings.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
+</p>
+<p>
+When any pump is enabled, the pump speed is modulated by a PI controller tracking
+a differential pressure setpoint at the boundaries of the circuit served by the pump.
+The control loop is biased to launch from <i>100&nbsp;%</i> (maximum speed).
+All pumps within the same group receive the same speed command signal.
+</p>
+<p>
+The differential pressure setpoint for the CHW and HW loops is provided as a control input.
+Ideally, a reset logic based on consumer valve requests should be implemented to adapt
+those setpoints to the demand.
+For the sake of simplicity, the differential pressure setpoint for the CWC and CWE loops
+is a fixed parameter (design pressure drop).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Controller;
diff --git a/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo b/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
new file mode 100644
index 00000000000..a5967a5e3c1
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Plants.Combined.Controls;
+package ModeCondenserLoop "Condenser loop operating modes"
+
+  constant Integer tankCharge = 1 "Tank Charge/Discharge";
+  constant Integer chargeAssist = 2  "Charge Assist";
+  constant Integer heatRejection = 3 "Heat Rejection";
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains constant definitions representing
+the operating modes of the condenser water loop.
+</p>
+</html>"));
+end ModeCondenserLoop;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order b/Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order
rename to Buildings/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.order
diff --git a/Buildings/DHC/Plants/Combined/Controls/package.mo b/Buildings/DHC/Plants/Combined/Controls/package.mo
new file mode 100644
index 00000000000..dc6d548a029
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Controls/package.mo
@@ -0,0 +1,10 @@
+within Buildings.DHC.Plants.Combined;
+package Controls "Package of control blocks for combined plants"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains control blocks for combined heating and cooling plants.
+</p>
+</html>"));
+end Controls;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/package.order b/Buildings/DHC/Plants/Combined/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Controls/package.order
rename to Buildings/DHC/Plants/Combined/Controls/package.order
diff --git a/Buildings/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo b/Buildings/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
new file mode 100644
index 00000000000..21cafc9f764
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
@@ -0,0 +1,285 @@
+within Buildings.DHC.Plants.Combined.Examples;
+model AllElectricCWStorage
+  "Validation of all-electric plant model with buildings loads"
+  extends Modelica.Icons.Example;
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Main medium (common to CHW, HW and CW)";
+  replaceable package MediumConWatCoo=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium in cooler circuit";
+
+  parameter String filNam[2]={"modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos",
+                              "modelica://Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"}
+    "Path to file with timeseries loads";
+  parameter Modelica.Units.SI.Temperature TSetDisSupHea = 273.15+60 "District heating supply temperature set point";
+  parameter Modelica.Units.SI.Temperature TSetDisSupCoo = 273.15+6 "District cooling supply temperature set point";
+
+  replaceable parameter
+    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD datChi(
+      EIRFunT={0.0101739374, 0.0607200115, 0.0003348647, 0.003162578, 0.0002388594, -0.0014121289},
+      capFunT={0.0387084662, 0.2305017927, 0.0004779504, 0.0178244359, -8.48808e-05, -0.0032406711},
+      EIRFunPLR={0.4304252832, -0.0144718912, 5.12039e-05, -0.7562386674, 0.5661683373,
+        0.0406987748, 3.0278e-06, -0.3413411197, -0.000469572, 0.0055009208},
+    QEva_flow_nominal=sum(loaCoo.QCoo_flow_nominal)/pla.nChi,
+      COP_nominal=2.5,
+    mEva_flow_nominal=-datChi.QEva_flow_nominal/5/4186,
+      mCon_flow_nominal=-datChi.QEva_flow_nominal * (1 + 1/datChi.COP_nominal) / 10 / 4186,
+    TEvaLvg_nominal=TSetDisSupCoo,
+    TEvaLvgMin=277.15,
+    TEvaLvgMax=308.15,
+    TConLvg_nominal=TSetDisSupHea,
+    TConLvgMin=296.15,
+    TConLvgMax=336.15)
+    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
+    "Chiller parameters (each unit)"
+    annotation (
+      Dialog(group="CHW loop and cooling-only chillers"),
+      Placement(transformation(extent={{140,200},{160,220}})));
+  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChiHea = datChi
+    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
+    "Chiller parameters (each unit)"
+    annotation (
+      Dialog(group="HW loop and heat recovery chillers"),
+      Placement(transformation(extent={{170,200},{190,220}})));
+  replaceable parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic datHeaPum(
+    dpHeaLoa_nominal=50000,
+    dpHeaSou_nominal=100,
+    hea(
+      mLoa_flow=datHeaPum.hea.Q_flow/10/4186,
+      mSou_flow=1E-4*datHeaPum.hea.Q_flow,
+      Q_flow=sum(loaHea.QHea_flow_nominal)/pla.nHeaPum,
+      P=datHeaPum.hea.Q_flow/2.2,
+      coeQ={-5.64420084,1.95212447,9.96663913,0.23316322,-5.64420084},
+      coeP={-3.96682255,6.8419453,1.99606939,0.01393387,-3.96682255},
+      TRefLoa=298.15,
+      TRefSou=253.15),
+    coo(
+      mLoa_flow=0,
+      mSou_flow=0,
+      Q_flow=-1,
+      P=0,
+      coeQ=fill(0, 5),
+      coeP=fill(0, 5),
+      TRefLoa=273.15,
+      TRefSou=273.15))
+    "Heat pump parameters (each unit)"
+    annotation (Placement(transformation(extent={{200,200},{220,220}})));
+
+  // Assumptions
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
+    Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
+
+  Buildings.DHC.Plants.Combined.AllElectricCWStorage pla(
+    redeclare final package Medium = Medium,
+    redeclare package MediumHea_b = Medium,
+    redeclare final package MediumConWatCoo = MediumConWatCoo,
+    allowFlowReversal=true,
+    dpConWatCooFri_nominal=1E4,
+    mAirCooUni_flow_nominal=pla.mConWatCoo_flow_nominal/pla.nCoo/1.45,
+    TWetBulCooEnt_nominal=297.05,
+    PFanCoo_nominal=340*pla.mConWatCoo_flow_nominal/pla.nCoo,
+    chi(show_T=true),
+    chiHea(show_T=true),
+    heaPum(show_T=true),
+    final datChi=datChi,
+    final datChiHea=datChiHea,
+    final datHeaPum=datHeaPum,
+    nChi=2,
+    dpChiWatSet_max=(sum(disCoo.lDis) + disCoo.lEnd)*disCoo.dp_length_nominal,
+    nChiHea=2,
+    dpHeaWatSet_max=(sum(disHea.lDis) + disHea.lEnd)*disHea.dp_length_nominal,
+    nHeaPum=2,
+    dInsTan=0.05,
+    nCoo=3,
+    final energyDynamics=energyDynamics)
+    "CHW and HW plant"
+    annotation (Placement(transformation(extent={{-30,-30},{30,30}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(final k=pla.TChiWatSup_nominal,
+    y(final unit="K", displayUnit="degC"))
+                   "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-220,10},{-200,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(final k=pla.THeaWatSup_nominal,
+    y(final unit="K", displayUnit="degC"))
+                   "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-190,-10},{-170,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpHeaWatSet_max(
+    k=pla.dpHeaWatSet_max,
+    y(final unit="Pa")) "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpChiWatSet_max(
+    k=pla.dpChiWatSet_max,
+    y(final unit="Pa")) "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-220,-50},{-200,-30}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
+        Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Outdoor conditions"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-210,120})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet[2](each k=pla.TChiWatRet_nominal)
+    "Source signal for CHW return temperature"
+    annotation (Placement(transformation(extent={{-190,-110},{-170,-90}})));
+  Loads.Heating.BuildingTimeSeriesWithETS loaHea[2](
+    each THeaWatSup_nominal=pla.THeaWatSup_nominal,
+    filNam=filNam)                     "Building heating load"
+    annotation (Placement(transformation(extent={{10,100},{-10,120}})));
+    // dpCheVal_nominal to avoid too hot water in building waterr supply due to problem of temperature drop in Dymola
+  Loads.Cooling.BuildingTimeSeriesWithETS loaCoo[2](
+    each TChiWatSup_nominal=pla.TChiWatSup_nominal,
+    filNam=filNam,
+    each bui(w_aLoaCoo_nominal=0.015)) "Building cooling load"
+    annotation (Placement(transformation(extent={{10,-130},{-10,-110}})));
+    // dpCheVal_nominal to avoid freezing in building waterr supply due to problem of temperature drop in Dymola
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet[2](each k=pla.THeaWatRet_nominal)
+    "Source signal for HW return temperature"
+    annotation (Placement(transformation(extent={{-190,40},{-170,60}})));
+  Buildings.Controls.OBC.CDL.Logical.Not
+                               onPla "On signal for the plant"
+    annotation (Placement(transformation(extent={{-64,146},{-44,166}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer
+                                 tim(t=3600)
+    annotation (Placement(transformation(extent={{-104,154},{-84,174}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold offHea(t=1e-4)
+    "Threshold comparison to disable the plant"
+    annotation (Placement(transformation(extent={{-144,154},{-124,174}})));
+  Modelica.Blocks.Math.Gain norQFloHea(k=1/sum(loaHea.QHea_flow_nominal))
+    "Normalized Q_flow"
+    annotation (Placement(transformation(extent={{-184,154},{-164,174}})));
+  Buildings.Controls.OBC.CDL.Logical.Not
+                               onPla1
+                                     "On signal for the plant"
+    annotation (Placement(transformation(extent={{-26,-198},{-6,-178}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer
+                                 tim1(t=3600)
+    annotation (Placement(transformation(extent={{-66,-190},{-46,-170}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold offCoo1(t=1e-4)
+    "Threshold comparison to disable the plant"
+    annotation (Placement(transformation(extent={{-106,-190},{-86,-170}})));
+  Modelica.Blocks.Math.Gain norQFloCoo(k=1/sum(loaCoo.QCoo_flow_nominal))
+    "Normalized Q_flow"
+    annotation (Placement(transformation(extent={{-146,-190},{-126,-170}})));
+  Buildings.DHC.Networks.Distribution2Pipe_R disHea(
+    redeclare final package Medium = Medium,
+    nCon=2,
+    allowFlowReversal=false,
+    mDis_flow_nominal=sum(loaHea.mBui_flow_nominal),
+    mCon_flow_nominal={loaHea[1].mBui_flow_nominal,loaHea[2].mBui_flow_nominal},
+
+    mEnd_flow_nominal=sum(loaHea.mBui_flow_nominal),
+    lDis={800,200},
+    lEnd=200) "Distribution network for district heating system"
+    annotation (Placement(transformation(extent={{20,62},{-20,82}})));
+
+  Buildings.DHC.Networks.Distribution2Pipe_R disCoo(
+    redeclare final package Medium = Medium,
+    nCon=2,
+    allowFlowReversal=false,
+    mDis_flow_nominal=sum(loaCoo.mBui_flow_nominal),
+    mCon_flow_nominal={loaCoo[1].mBui_flow_nominal,loaCoo[2].mBui_flow_nominal},
+
+    mEnd_flow_nominal=sum(loaCoo.mBui_flow_nominal),
+    lDis={80,20},
+    lEnd=20) "Distribution network for district cooling system"
+    annotation (Placement(transformation(extent={{20,-60},{-20,-80}})));
+
+  Modelica.Blocks.Math.Sum QTotHea_flow(nin=2)
+    "Total heating flow rate for all buildings "
+    annotation (Placement(transformation(extent={{-60,120},{-80,140}})));
+  Modelica.Blocks.Math.Sum QTotCoo_flow(nin=2)
+    "Total cooling flow rate for all buildings "
+    annotation (Placement(transformation(extent={{-82,-150},{-102,-130}})));
+equation
+  connect(TChiWatSupSet.y, pla.TChiWatSupSet) annotation (Line(points={{-198,20},
+          {-34,20}},                   color={0,0,127}));
+  connect(THeaWatSupSet.y, pla.THeaWatSupSet) annotation (Line(points={{-168,0},
+          {-74,0},{-74,16},{-34,16}},   color={0,0,127}));
+  connect(dpChiWatSet_max.y, pla.dpChiWatSet) annotation (Line(points={{-198,-40},
+          {-70,-40},{-70,12},{-34,12}},color={0,0,127}));
+  connect(dpHeaWatSet_max.y, pla.dpHeaWatSet) annotation (Line(points={{-168,-60},
+          {-66,-60},{-66,8},{-34,8}},   color={0,0,127}));
+
+  connect(weaDat.weaBus, pla.weaBus) annotation (Line(
+      points={{-200,120},{-100,120},{-100,40},{0,40},{0,30}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(norQFloHea.y,offHea. u)
+    annotation (Line(points={{-163,164},{-146,164}}, color={0,0,127}));
+  connect(offHea.y, tim.u)
+    annotation (Line(points={{-122,164},{-106,164}}, color={255,0,255}));
+  connect(tim.passed, onPla.u)
+    annotation (Line(points={{-82,156},{-66,156}}, color={255,0,255}));
+  connect(onPla.y, pla.u1Hea) annotation (Line(points={{-42,156},{-38,156},{-38,
+          24},{-34,24}},                     color={255,0,255}));
+  connect(tim1.passed, onPla1.u)
+    annotation (Line(points={{-44,-188},{-40,-188},{-40,-190},{-36,-190},{-36,-188},
+          {-28,-188}},                               color={255,0,255}));
+  connect(offCoo1.y, tim1.u)
+    annotation (Line(points={{-84,-180},{-80,-180},{-80,-182},{-76,-182},{-76,-180},
+          {-68,-180}},                               color={255,0,255}));
+  connect(norQFloCoo.y, offCoo1.u)
+    annotation (Line(points={{-125,-180},{-120,-180},{-120,-182},{-116,-182},{-116,
+          -180},{-108,-180}},                          color={0,0,127}));
+  connect(onPla1.y, pla.u1Coo) annotation (Line(points={{-4,-188},{8,-188},{8,-150},
+          {-54,-150},{-54,28},{-34,28}}, color={255,0,255}));
+  connect(pla.port_bSerHea, disHea.port_aDisSup) annotation (Line(points={{30,0},
+          {40,0},{40,72},{20,72}}, color={0,127,255}));
+  connect(disHea.port_bDisRet, pla.port_aSerHea) annotation (Line(points={{20,66},
+          {30,66},{30,50},{-40,50},{-40,0},{-30,0}}, color={0,127,255}));
+  connect(disCoo.port_aDisSup, pla.port_bSerCoo) annotation (Line(points={{20,-70},
+          {40,-70},{40,-4},{30,-4}}, color={0,127,255}));
+  connect(disCoo.port_bDisRet, pla.port_aSerCoo) annotation (Line(points={{20,-64},
+          {30,-64},{30,-46},{-40,-46},{-40,-4},{-30,-4}}, color={0,127,255}));
+  connect(disCoo.ports_aCon, loaCoo.port_bSerCoo) annotation (Line(points={{-12,
+          -80},{-12,-92},{-32,-92},{-32,-128},{-10,-128}}, color={0,127,255}));
+  connect(disCoo.ports_bCon, loaCoo.port_aSerCoo) annotation (Line(points={{12,-80},
+          {12,-92},{30,-92},{30,-128},{10,-128}}, color={0,127,255}));
+  connect(disHea.ports_bCon, loaHea.port_aSerHea) annotation (Line(points={{12,82},
+          {12,92},{32,92},{32,106},{10,106}}, color={0,127,255}));
+  connect(loaHea.port_bSerHea, disHea.ports_aCon) annotation (Line(points={{-10,
+          106},{-32,106},{-32,90},{-12,90},{-12,82}}, color={0,127,255}));
+  connect(QTotHea_flow.y, norQFloHea.u) annotation (Line(points={{-81,130},{-194,
+          130},{-194,164},{-186,164}}, color={0,0,127}));
+  connect(loaCoo.QCoo_flow, QTotCoo_flow.u) annotation (Line(points={{-7,-132},{
+          -8,-132},{-8,-140},{-80,-140}}, color={0,0,127}));
+  connect(QTotCoo_flow.y, norQFloCoo.u) annotation (Line(points={{-103,-140},{-160,
+          -140},{-160,-180},{-148,-180}}, color={0,0,127}));
+  connect(loaHea.QHea_flow, QTotHea_flow.u) annotation (Line(points={{-5,98},{-4,
+          98},{-4,94},{-50,94},{-50,130},{-58,130}}, color={0,0,127}));
+  connect(TChiWatRet.y,loaCoo.TDisRetSet)  annotation (Line(points={{-168,-100},
+          {20,-100},{20,-113},{11,-113}}, color={0,0,127}));
+  connect(THeaWatRet.y,loaHea.TDisRetSet)  annotation (Line(points={{-168,50},{-44,
+          50},{-44,126},{20,126},{20,117},{11,117}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos"
+      "Simulate and plot"),
+    experiment(
+      StartTime=3024000,
+      StopTime=3456000,
+      Tolerance=1e-06),
+  Diagram(coordinateSystem(extent={{-240,-240},{240,240}})),
+    Documentation(info="<html>
+<p>
+This model uses
+<a href=\"modelica://Buildings.DHC.Plants.Combined.AllElectricCWStorage\">
+Buildings.DHC.Plants.Combined.AllElectricCWStorage</a>
+to provide heating and cooling to two identical buildings with heating and cooling
+loads provided as time series.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 7, 2023, by David Blum:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AllElectricCWStorage;
diff --git a/Buildings/DHC/Plants/Combined/Examples/package.mo b/Buildings/DHC/Plants/Combined/Examples/package.mo
new file mode 100644
index 00000000000..e90ff70af1d
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Examples/package.mo
@@ -0,0 +1,4 @@
+within Buildings.DHC.Plants.Combined;
+package Examples "This package holds example models using plants providing district heating and cooling"
+  extends Modelica.Icons.ExamplesPackage;
+end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Examples/package.order b/Buildings/DHC/Plants/Combined/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Examples/package.order
rename to Buildings/DHC/Plants/Combined/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
index bda0dfb66aa..b621f03bb63 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/MultipleValves.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses;
+within Buildings.DHC.Plants.Combined.Subsystems.BaseClasses;
 model MultipleValves
   "Parallel arrangement of identical two-way modulating valves"
   extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations(
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
new file mode 100644
index 00000000000..e7ea3930c7f
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
@@ -0,0 +1,265 @@
+within Buildings.DHC.Plants.Combined.Subsystems.BaseClasses;
+partial model PartialMultiplePumps
+  "Base class for modeling multiple identical pumps in parallel"
+  extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations(
+    final massDynamics=energyDynamics,
+    final mSenFac=1);
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    final m_flow_nominal(final min=Modelica.Constants.small)=nPum * mPum_flow_nominal,
+    show_T=false,
+    port_a(
+      h_outflow(start=h_outflow_start)),
+    port_b(
+      h_outflow(start=h_outflow_start),
+      p(start=p_start),
+      final m_flow(max = if allowFlowReversal then +Modelica.Constants.inf else 0)));
+
+  parameter Integer nPum(
+    final min=1,
+    start=1)
+    "Number of pumps"
+    annotation(Evaluate=true);
+  parameter Boolean have_var = true
+    "Set to true for variable speed pumps, false for constant speed"
+    annotation(Evaluate=true);
+  parameter Boolean have_valve = true
+    "Set to true for inline check valve"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.MassFlowRate mPum_flow_nominal
+    "Design mass flow rate (each pump)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpPum_nominal(
+    displayUnit="Pa")
+    "Design head (each pump)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpValve_nominal(
+    displayUnit="Pa")=10000
+    "Pressure drop of check valve fully open"
+    annotation(Dialog(group="Nominal condition", enable=have_valve));
+  replaceable parameter Fluid.Movers.Data.Generic per
+    constrainedby Buildings.Fluid.Movers.Data.Generic(
+      pressure(
+        V_flow={0, 1, 2} * mPum_flow_nominal / rho_default,
+        dp={1.14, 1, 0.42} * dpPum_nominal),
+      motorCooledByFluid=false) "Pump parameters"
+    annotation (Placement(transformation(extent={{-10,-98},{10,-78}})));
+
+  parameter Modelica.Units.SI.Time tau=1
+    "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Nominal condition",
+      enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
+
+  // Classes used to implement the filtered speed
+  parameter Boolean use_inputFilter=true
+    "= true, if speed is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Filtered speed"));
+  parameter Modelica.Units.SI.Time riseTime=30
+    "Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
+      Dialog(
+      tab="Dynamics",
+      group="Filtered speed",
+      enable=use_inputFilter));
+  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization (no init/steady state/initial state/initial output)"
+    annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nPum]
+    "Start signal (VFD Run or motor starter contact)"
+    annotation (Placement(
+        transformation(extent={{-140,80},{-100,120}}), iconTransformation(
+          extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(final unit="W")
+    "Total power (all pumps)"
+    annotation (Placement(transformation(extent={{100,20},{140,60}}),
+        iconTransformation(extent={{100,20},{140,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1_actual[nPum]
+    "Pump status"
+    annotation (Placement(transformation(extent={{100,80},{140,
+            120}}), iconTransformation(extent={{100,60},{140,100}})));
+
+  Fluid.BaseClasses.MassFlowRateMultiplier mulOut(
+    redeclare final package Medium=Medium,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulInl(
+    redeclare final package Medium=Medium,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  replaceable Fluid.Movers.SpeedControlled_y pum
+    constrainedby Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine(
+    redeclare final package Medium=Medium,
+    final tau=tau,
+    final show_T=show_T,
+    final allowFlowReversal=allowFlowReversal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final riseTime=riseTime,
+    final init=init,
+    final per=per,
+    addPowerToMedium=false) "Pump"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nPum)
+    "Convert command signal"
+    annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
+
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
+    "Convert to real"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={10,100})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mul "Compute total power"
+    annotation (Placement(transformation(extent={{60,30},{80,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply inp
+    "Compute pump input signal" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={0,40})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant cst
+               if not have_var "Constant setpoint"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isOpe(t=1E-2, h=0.5E-2)
+    "Evaluate if pump is operating"
+    annotation (Placement(transformation(extent={{30,-70},{50,-50}})));
+  Fluid.FixedResistances.CheckValve cheVal(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=mPum_flow_nominal,
+    final dpValve_nominal=dpValve_nominal,
+    final show_T=show_T,
+    final allowFlowReversal=allowFlowReversal) if have_valve
+    "Check valve (optional)"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PassThroughFluid pas(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal) if not have_valve
+    "Direct fluid pass-through (case without check valve)"
+    annotation (Placement(transformation(extent={{30,-30},{50,-10}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep(
+    final nout=nPum)
+    "Replicate"
+    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preY1[nPum]
+    "Left limit of signal avoiding direct feedback of status to controller"
+    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+protected
+  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default)
+    "State of the medium at the medium default properties";
+  parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
+    "Density at the medium default properties";
+  final parameter Medium.ThermodynamicState sta_start=Medium.setState_pTX(
+    T=T_start,
+    p=p_start,
+    X=X_start)
+    "Medium state at start values";
+  final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start=
+    Medium.specificEnthalpy(sta_start)
+    "Start value for outflowing enthalpy";
+equation
+  connect(mulOut.port_b, port_b)
+    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
+  connect(port_a, mulInl.port_a)
+    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
+  connect(mulOut.uInv, mulInl.u) annotation (Line(points={{81,6},{88,6},{88,-26},
+          {-90,-26},{-90,6},{-82,6}},color={0,0,127}));
+  connect(mulInl.port_b, pum.port_a)
+    annotation (Line(points={{-60,0},{-10,0}}, color={0,127,255}));
+  connect(com.nUniOnBou, mulOut.u) annotation (Line(points={{-28,94},{-20,94},{
+          -20,80},{54,80},{54,6},{58,6}},
+                      color={0,0,127}));
+  connect(com.y1One, booToRea.u)
+    annotation (Line(points={{-28,106},{-10,106},{-10,100},{-2,100}},
+                                                   color={255,0,255}));
+  connect(mul.y, P)
+    annotation (Line(points={{82,40},{120,40}}, color={0,0,127}));
+  connect(com.nUniOn, mul.u1) annotation (Line(points={{-28,100},{-18,100},{-18,
+          82},{56,82},{56,46},{58,46}},
+                    color={0,0,127}));
+  connect(pum.P, mul.u2) annotation (Line(points={{11,9},{20,9},{20,34},{58,34}},
+                color={0,0,127}));
+  connect(pum.port_b, cheVal.port_a)
+    annotation (Line(points={{10,0},{30,0}}, color={0,127,255}));
+  connect(cheVal.port_b, mulOut.port_a)
+    annotation (Line(points={{50,0},{60,0}}, color={0,127,255}));
+  connect(cst.y, inp.u1) annotation (Line(points={{-58,30},{-40,30},{-40,60},{
+          -6,60},{-6,52}},
+                color={0,0,127}));
+  connect(booToRea.y, inp.u2) annotation (Line(points={{22,100},{40,100},{40,60},
+          {6,60},{6,52}},
+                     color={0,0,127}));
+  connect(pum.port_b, pas.port_a)
+    annotation (Line(points={{10,0},{30,0},{30,-20}}, color={0,127,255}));
+  connect(pas.port_b, mulOut.port_a)
+    annotation (Line(points={{50,-20},{50,0},{60,0}}, color={0,127,255}));
+  connect(pum.y_actual, isOpe.u) annotation (Line(points={{11,7},{20,7},{20,-60},
+          {28,-60}}, color={0,0,127}));
+  connect(isOpe.y, rep.u)
+    annotation (Line(points={{52,-60},{58,-60}}, color={255,0,255}));
+  connect(y1, preY1.u) annotation (Line(points={{-120,100},{-82,100}},
+                                     color={255,0,255}));
+  connect(preY1.y, com.y1)
+    annotation (Line(points={{-58,100},{-52,100}}, color={255,0,255}));
+  connect(rep.y, y1_actual) annotation (Line(points={{82,-60},{92,-60},{92,100},
+          {120,100}}, color={255,0,255}));
+  annotation (
+    defaultComponentName="pum",
+    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
+            100}}),                                   graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-100,16},{100,-16}},
+          lineColor={0,0,0},
+          fillColor={0,127,255},
+          fillPattern=FillPattern.HorizontalCylinder),
+        Ellipse(
+          extent={{-58,58},{58,-58}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={0,100,199}),
+        Ellipse(
+          extent={{4,16},{36,-16}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          visible=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState,
+          fillColor={0,100,199}),
+        Polygon(
+          points={{0,50},{0,-50},{54,0},{0,50}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={255,255,255})}),                            Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-100,-120},{100,120}})),
+    Documentation(info="<html>
+<p>
+This base class represents multiple identical pumps that are piped in parallel.
+An optional check valve in series with each pump is included.
+This class is used to construct the various multiple-pump models within
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems\">
+Buildings.DHC.Plants.Combined.Subsystems</a>.
+</p>
+<h4>Details</h4>
+<p>
+In a parallel arrangement, all operating units have the same operating point.
+This allows modeling the multiple pumps with a single instance of any
+class derived from
+<a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine\">
+Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</a>.
+Hydronics are resolved with mass flow rate multiplier components.
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialMultiplePumps;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
similarity index 91%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
index 8288d1ec6c7..5d9d958beba 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/PassThroughFluid.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses;
+within Buildings.DHC.Plants.Combined.Subsystems.BaseClasses;
 model PassThroughFluid "Direct fluid pass-through"
   extends Buildings.Fluid.Interfaces.PartialTwoPort;
 
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
new file mode 100644
index 00000000000..2e9580168ba
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used
+to construct subsystem models.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order b/Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/ChillerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
new file mode 100644
index 00000000000..a34c2240e33
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
@@ -0,0 +1,545 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model ChillerGroup
+  "Model of multiple identical chillers in parallel"
+  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
+    final m1_flow_nominal = mConWat_flow_nominal,
+    final m2_flow_nominal = mChiWat_flow_nominal);
+
+  parameter Integer nUni(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation(Evaluate=true);
+  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
+    dat.TEvaLvg_nominal
+    "Design (minimum) CHW supply temperature";
+  final parameter Modelica.Units.SI.Temperature TConWatLvg_nominal=
+    dat.TConLvg_nominal
+    "Design (maximum) CW leaving temperature";
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWatUni_flow_nominal=
+    dat.QEva_flow_nominal
+    "Design cooling heat flow rate (each unit, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QConWatUni_flow_nominal=
+    -dat.QEva_flow_nominal * (1 + 1 / dat.COP_nominal * dat.etaMotor)
+    "Design CW heat flow rate (each unit, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
+    nUni * QChiWatUni_flow_nominal
+    "Design cooling heat flow rate (all units, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QConWat_flow_nominal=
+    nUni * QConWatUni_flow_nominal
+    "Design CW heat flow rate (all units, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mChiWatUni_flow_nominal(
+    final min=0)=dat.mEva_flow_nominal
+    "Design chiller CHW mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWatUni_flow_nominal(
+    final min=0)=dat.mCon_flow_nominal
+    "Design chiller CW mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
+    final min=0)=nUni * mChiWatUni_flow_nominal
+    "Design CHW mass flow rate (all units)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWat_flow_nominal(
+    final min=0)=nUni * mConWatUni_flow_nominal
+    "Design CW mass flow rate (all units)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
+    "Design chiller evaporator pressure drop (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
+    "Chiller condenser design pressure drop (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+
+  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic dat
+    "Chiller parameters (each unit)"
+    annotation (Placement(transformation(extent={{-10,-134},{10,-114}})));
+
+  // Assumptions
+  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 use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
+    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Filtered opening"));
+  parameter Modelica.Units.SI.Time riseTime=120
+    "Rise time of the filter (time to reach 99.6 % of an opening step)"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Filtered opening",
+      enable=use_inputFilter));
+  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization (no init/steady state/initial state/initial output)"
+    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
+  parameter Real y_start=1 "Initial position of actuator"
+    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
+    "Chiller On/Off command"
+    annotation (Placement(transformation(extent={{-140,
+            100},{-100,140}}), iconTransformation(extent={{-140,70},{-100,110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSet(
+    final unit="K", displayUnit="degC")
+    "Supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-140,-110},{-100,-70}}),
+      iconTransformation(extent={{-140,-110},{-100, -70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
+    final unit="W")
+    "Power drawn"
+    annotation (Placement(transformation(extent={{100,0},{140,40}}),
+      iconTransformation(extent={{100,70},{140,110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValCon[nUni](
+    each final unit="1", each final min=0, each final max=1)
+    "Chiller condenser isolation valve commanded position"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={0,178}),  iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={-60,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValEva[nUni](
+    each final unit="1", each final min=0, each final max=1)
+    "Chiller evaporator isolation valve commanded position"
+    annotation (
+      Placement(transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={0,-180}),   iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={-58,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConLvg[nUni](each final
+      unit="K", each displayUnit="degC")
+    "Chiller condenser leaving temperature" annotation (Placement(
+        transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={40,180}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={60,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mCon_flow[nUni](
+    each final unit="kg/s")
+    "Chiller condenser barrel mass flow rate" annotation (
+      Placement(transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={60,180}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={80,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TEvaLvg[nUni](each final
+      unit="K", each displayUnit="degC")
+    "Chiller evaporator leaving temperature" annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={40,-180}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={60,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mEva_flow[nUni](
+    each final unit="kg/s")
+    "Chiller evaporator barrel mass flow rate" annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={60,-180}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={80,-120})));
+
+  Fluid.Chillers.ElectricReformulatedEIR chi(
+    PLR1(start=0),
+    final per=dat,
+    redeclare final package Medium1=Medium1,
+    redeclare final package Medium2=Medium2,
+    final have_switchover=false,
+    final dp1_nominal=0,
+    final dp2_nominal=0,
+    final allowFlowReversal1=allowFlowReversal1,
+    final allowFlowReversal2=allowFlowReversal2,
+    final energyDynamics=energyDynamics,
+    final show_T=show_T) "Chiller"
+    annotation (Placement(transformation(extent={{-4,-10},{16,10}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulConInl(
+    redeclare final package Medium = Medium1,
+    final allowFlowReversal=allowFlowReversal1,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulConOut(
+    redeclare final package Medium = Medium1,
+    final allowFlowReversal=allowFlowReversal1,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{30,50},{50,70}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulEvaInl(
+    redeclare final package Medium = Medium2,
+    final allowFlowReversal=allowFlowReversal2,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{50,-70},{30,-50}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulEvaOut(
+    redeclare final package Medium = Medium2,
+    final allowFlowReversal=allowFlowReversal2,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{-30,-70},{-50,-50}})));
+  Buildings.Templates.Components.Controls.MultipleCommands com(
+    final nUni=nUni)
+    "Convert command signals"
+    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  BaseClasses.MultipleValves valEva(
+    redeclare final package Medium = Medium2,
+    redeclare final Buildings.Fluid.Actuators.Valves.TwoWayLinear val,
+    linearized=true,
+    final nUni=nUni,
+    final mUni_flow_nominal=mChiWatUni_flow_nominal,
+    final dpFixed_nominal=dpEva_nominal,
+    dpValve_nominal=1E3,
+    final allowFlowReversal=allowFlowReversal2,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final riseTime=riseTime,
+    final init=init,
+    final y_start=y_start,
+    final show_T=show_T)
+    "Chiller evaporator isolation valves"
+    annotation (Placement(transformation(extent={{-70,-50},{-90,-70}})));
+  BaseClasses.MultipleValves valCon(
+    redeclare final package Medium = Medium1,
+    redeclare final Buildings.Fluid.Actuators.Valves.TwoWayLinear val,
+    linearized=true,
+    final nUni=nUni,
+    final mUni_flow_nominal=mConWatUni_flow_nominal,
+    final dpFixed_nominal=dpCon_nominal,
+    dpValve_nominal=1E3,
+    final allowFlowReversal=allowFlowReversal1,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final riseTime=riseTime,
+    final init=init,
+    final y_start=y_start,
+    final show_T=show_T)
+    "Chiller condenser isolation valves"
+    annotation (Placement(transformation(extent={{70,50},{90,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
+    annotation (Placement(transformation(extent={{70,30},{90,10}})));
+  Fluid.Sensors.TemperatureTwoPort temConLvg(
+    redeclare final package Medium = Medium1,
+    final m_flow_nominal=mConWatUni_flow_nominal,
+    final allowFlowReversal=allowFlowReversal1)
+    "Chiller condenser leaving temperature" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={20,20})));
+  Fluid.Sensors.TemperatureTwoPort temEvaLvg(
+    redeclare final package Medium = Medium2,
+    final m_flow_nominal=mChiWatUni_flow_nominal,
+    final allowFlowReversal=allowFlowReversal2)
+    "Chiller evaporator leaving temperature" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={-20,-20})));
+  Fluid.Sensors.MassFlowRate floCon(
+    redeclare final package Medium =Medium1,
+    final allowFlowReversal=allowFlowReversal1)
+    "Chiller condenser barrel mass flow rate"
+    annotation (Placement(
+        transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={20,40})));
+  Fluid.Sensors.MassFlowRate floEva(
+    redeclare final package Medium =Medium2,
+    final allowFlowReversal=allowFlowReversal2)
+    "Chiller evaporator barrel mass flow rate"
+    annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={-20,-40})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(nout=nUni)
+    "Replicate" annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={40,140})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep1(nout=nUni)
+    "Replicate" annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={60,140})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep2(nout=nUni)
+    "Replicate" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={60,-140})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep3(nout=nUni)
+    "Replicate" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={40,-140})));
+equation
+  connect(mulEvaInl.port_b,chi. port_a2)
+    annotation (Line(points={{30,-60},{20,-60},{20,-6},{16,-6}},
+    color={0,127,255}));
+  connect(TSet,chi. TSet) annotation (Line(points={{-120,-90},{-10,-90},{-10,-3},
+          {-6,-3}},  color={0,0,127}));
+  connect(mulConOut.uInv, mulConInl.u) annotation (Line(points={{51,66},{54,66},
+          {54,80},{-54,80},{-54,66},{-52,66}}, color={0,0,127}));
+  connect(mulEvaOut.uInv, mulEvaInl.u) annotation (Line(points={{-51,-54},{-54,-54},
+          {-54,-80},{56,-80},{56,-54},{52,-54}}, color={0,0,127}));
+  connect(port_a1, mulConInl.port_a)
+    annotation (Line(points={{-100,60},{-50,60}}, color={0,127,255}));
+  connect(port_a2, mulEvaInl.port_a)
+    annotation (Line(points={{100,-60},{50,-60}}, color={0,127,255}));
+  connect(port_b2, valEva.port_b)
+    annotation (Line(points={{-100,-60},{-90,-60}}, color={0,127,255}));
+  connect(mulEvaOut.port_b, valEva.port_a)
+    annotation (Line(points={{-50,-60},{-70,-60}}, color={0,127,255}));
+  connect(y1, com.y1) annotation (Line(points={{-120,120},{-82,120}},
+                     color={255,0,255}));
+  connect(chi.P, mulP.u1) annotation (Line(points={{17,9},{60,9},{60,14},{68,14}},
+                 color={0,0,127}));
+  connect(com.nUniOn, mulP.u2) annotation (Line(points={{-58,120},{56,120},{56,
+          26},{68,26}},     color={0,0,127}));
+  connect(yValCon, valCon.y) annotation (Line(points={{0,178},{0,122},{64,122},
+          {64,66},{68,66}}, color={0,0,127}));
+  connect(yValEva, valEva.y) annotation (Line(points={{0,-180},{0,-140},{-60,
+          -140},{-60,-66},{-68,-66}}, color={0,0,127}));
+
+  connect(mulConInl.port_b,chi. port_a1) annotation (Line(points={{-30,60},{-20,
+          60},{-20,6},{-4,6}},  color={0,127,255}));
+  connect(mulP.y, P)
+    annotation (Line(points={{92,20},{120,20}}, color={0,0,127}));
+  connect(com.nUniOnBou, mulConOut.u) annotation (Line(points={{-58,114},{20,114},
+          {20,66},{28,66}},      color={0,0,127}));
+  connect(mulConInl.uInv, mulEvaOut.u) annotation (Line(points={{-29,66},{-24,66},
+          {-24,-54},{-28,-54}},     color={0,0,127}));
+  connect(com.y1One,chi. on) annotation (Line(points={{-58,126},{-10,126},{-10,3},
+          {-6,3}},                  color={255,0,255}));
+  connect(valCon.port_b, port_b1)
+    annotation (Line(points={{90,60},{100,60}}, color={0,127,255}));
+  connect(mulConOut.port_b, valCon.port_a)
+    annotation (Line(points={{50,60},{70,60}}, color={0,127,255}));
+  connect(temEvaLvg.port_a, chi.port_b2)
+    annotation (Line(points={{-20,-10},{-20,-6},{-4,-6}}, color={0,127,255}));
+  connect(chi.port_b1, temConLvg.port_a)
+    annotation (Line(points={{16,6},{20,6},{20,10}}, color={0,127,255}));
+  connect(temConLvg.port_b, floCon.port_a)
+    annotation (Line(points={{20,30},{20,30}}, color={0,127,255}));
+  connect(floCon.port_b, mulConOut.port_a)
+    annotation (Line(points={{20,50},{20,60},{30,60}}, color={0,127,255}));
+  connect(temEvaLvg.port_b, floEva.port_a)
+    annotation (Line(points={{-20,-30},{-20,-30}}, color={0,127,255}));
+  connect(floEva.port_b, mulEvaOut.port_a) annotation (Line(points={{-20,-50},{
+          -20,-60},{-30,-60}}, color={0,127,255}));
+  connect(rep.y, TConLvg)
+    annotation (Line(points={{40,152},{40,180}}, color={0,0,127}));
+  connect(rep1.y, mCon_flow)
+    annotation (Line(points={{60,152},{60,180}}, color={0,0,127}));
+  connect(floCon.m_flow, rep1.u)
+    annotation (Line(points={{31,40},{60,40},{60,128}}, color={0,0,127}));
+  connect(temConLvg.T, rep.u) annotation (Line(points={{9,20},{0,20},{0,100},{
+          40,100},{40,128}}, color={0,0,127}));
+  connect(rep3.y, TEvaLvg)
+    annotation (Line(points={{40,-152},{40,-180},{40,-180}}, color={0,0,127}));
+  connect(rep2.y, mEva_flow) annotation (Line(points={{60,-152},{60,-158},{60,
+          -158},{60,-180}}, color={0,0,127}));
+  connect(floEva.m_flow, rep2.u)
+    annotation (Line(points={{-9,-40},{60,-40},{60,-128}}, color={0,0,127}));
+  connect(temEvaLvg.T, rep3.u) annotation (Line(points={{-9,-20},{24,-20},{24,-120},
+          {40,-120},{40,-128}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="chi",
+    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-70,80},{70,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,52},{-40,12}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,70},{58,52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,12},{-32,12},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,-10},{-40,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{38,52},{42,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,-50},{58,-68}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{18,24},{62,-18}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{40,24},{22,-8},{58,-8},{40,24}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,52},{-40,12}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,70},{58,52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,12},{-32,12},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,-10},{-40,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{38,52},{42,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,-50},{58,-68}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{18,24},{62,-18}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{40,24},{22,-8},{58,-8},{40,24}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}),                      Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-100,-160},{100,160}})),
+    Documentation(info="<html>
+<p>
+This model represents a set of identical water-cooled compression chillers
+that are piped in parallel.
+Modulating isolation valves are included on condenser and evaporator side.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+On/Off command <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+CHW supply temperature setpoint <code>TSet</code>:
+AO signal common to all units, with a dimensionality of zero
+</li>
+<li>
+Condenser and evaporator isolation valve commanded position <code>yVal(Con|Eva)</code>:
+AO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Condenser and evaporator leaving temperature <code>T(Con|Eva)Lvg</code>:
+AI signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Condenser and evaporator mass flow rate <code>m(Con|Eva)_flow</code>:
+AI signal dedicated to each unit, with a dimensionality of one
+</li>
+</ul>
+<h4>Details</h4>
+<h5>Modeling approach</h5>
+<p>
+In a parallel arrangement, all operating units have the same operating point,
+<i>provided that the isolation valves are commanded to the same position</i>.
+This allows modeling the heat transfer through the condenser and evaporator
+barrel with a single instance of
+<a href=\"modelica://Buildings.Fluid.Chillers.ElectricReformulatedEIR\">
+Buildings.Fluid.Chillers.ElectricReformulatedEIR</a>.
+Hydronics are resolved with mass flow rate multiplier components in
+conjunction with instances of
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves</a>
+which represent the parallel network of valves and fixed resistances.
+</p>
+<h5>Actuators</h5>
+<p>
+By default, linear valve models are used. Those are configured with
+a pressure drop varying linearly with the flow rate, as opposed
+to the quadratic dependency usually considered for a turbulent flow
+regime.
+This is because the whole plant model contains large nonlinear systems
+of equations and this configuration limits the risk of solver failure
+while reducing the time to solution.
+This has no significant impact on the operating point of the circulation pumps
+when a control loop is used to modulate the valve opening and maintain
+the flow rate or the leaving temperature at setpoint.
+Then, whatever the modeling assumptions for the valve, the
+control loop ensures that the valve creates the adequate pressure drop
+and flow, which will simply be reached at a different valve opening
+with the above simplification.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ChillerGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
new file mode 100644
index 00000000000..ad33a442439
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
@@ -0,0 +1,779 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model ChillerHeatRecoveryGroup
+  "Model of multiple identical heat recovery chillers in parallel"
+  extends Buildings.Fluid.Interfaces.PartialEightPortInterface(
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=Medium,
+    redeclare final package Medium3=Medium,
+    redeclare final package Medium4=Medium,
+    final m1_flow_nominal = mConWat_flow_nominal,
+    final m2_flow_nominal = mChiWat_flow_nominal,
+    final m3_flow_nominal = mConWat_flow_nominal,
+    final m4_flow_nominal = mChiWat_flow_nominal,
+    final allowFlowReversal1=allowFlowReversal,
+    final allowFlowReversal2=allowFlowReversal,
+    final allowFlowReversal3=allowFlowReversal,
+    final allowFlowReversal4=allowFlowReversal);
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium model for all four fluid circuits"
+    annotation (choices(
+      choice(redeclare package Medium=Buildings.Media.Water "Water"),
+      choice(redeclare package Medium =
+            Buildings.Media.Antifreeze.PropyleneGlycolWater (
+        property_T=293.15,X_a=0.40)
+        "Propylene glycol water, 40% mass fraction")));
+
+  parameter Integer nUni(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.Temperature TCasHeaEnt_nominal=298.15
+    "Design evaporator entering temperature in cascading heating mode";
+  parameter Modelica.Units.SI.Temperature TCasCooEnt_nominal=288.15
+    "Design condenser entering temperature in cascading cooling mode";
+  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
+    dat.TEvaLvg_nominal
+    "Design (minimum) CHW supply temperature";
+  final parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=
+    dat.TConLvg_nominal
+    "Design (maximum) HW supply temperature";
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWatUni_flow_nominal=
+    dat.QEva_flow_nominal
+    "Design cooling heat flow rate (each unit, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QHeaWatUni_flow_nominal=
+    -dat.QEva_flow_nominal * (1 + 1 / dat.COP_nominal * dat.etaMotor)
+    "Design heating heat flow rate in direct heat recovery mode (each unit, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.Efficiency COPCasHea_nominal(fixed=false)
+    "Coefficient of performance in cascading heating mode";
+  final parameter Modelica.Units.SI.Efficiency COPCasCoo_nominal(fixed=false)
+    "Coefficient of performance in cascading cooling mode";
+  final parameter Modelica.Units.SI.Temperature TCasHeaLvg_nominal(fixed=false)
+    "Design value of evaporator leaving temperature in cascading heating mode";
+  final parameter Modelica.Units.SI.Temperature TCasCooLvg_nominal(fixed=false)
+    "Design value of condenser leaving temperature in cascading cooling mode";
+  final parameter Modelica.Units.SI.HeatFlowRate QEvaCasHeaUni_flow_nominal(
+    fixed=false,
+    start=QChiWatUni_flow_nominal * (1 + 2E-2 * (TCasHeaEnt_nominal -
+      (dat.TEvaLvg_nominal - QChiWatUni_flow_nominal / mChiWatUni_flow_nominal / cpCas))))
+    "Design evaporator heat flow rate in cascading heating mode (each unit, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCooUni_flow_nominal(
+    fixed=false,
+    start=QChiWatUni_flow_nominal * (1 - 2E-2 * (TCasCooEnt_nominal -
+      (dat.TConLvg_nominal - QHeaWatUni_flow_nominal / mConWatUni_flow_nominal / cpCas))))
+    "Design cooling heat flow rate in cascading cooling mode (each unit, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QHeaWatCasHeaUni_flow_nominal=
+    -QEvaCasHeaUni_flow_nominal * (1 + 1 / COPCasHea_nominal * dat.etaMotor)
+    "Design heating heat flow rate in cascading heating mode (each unit, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QConCasCooUni_flow_nominal=
+    -QChiWatCasCooUni_flow_nominal * (1 + 1 / COPCasCoo_nominal * dat.etaMotor)
+    "Design condenser heat flow rate in cascading cooling mode (each unit, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
+    nUni * QChiWatUni_flow_nominal
+    "Design cooling heat flow rate (all units, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=
+    nUni * QHeaWatUni_flow_nominal
+    "Design heating heat flow rate (all units, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QEvaCasHea_flow_nominal=
+    nUni * QEvaCasHeaUni_flow_nominal
+    "Design evaporator heat flow rate in cascading heating mode (all units, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal=
+    nUni * QChiWatCasCooUni_flow_nominal
+    "Design cooling heat flow rate in cascading cooling mode (all units, <0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QHeaWatCasHea_flow_nominal=
+    nUni * QHeaWatCasHeaUni_flow_nominal
+    "Design heating heat flow rate in cascading heating mode (all units, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.HeatFlowRate QConCasCoo_flow_nominal=
+    nUni * QConCasCooUni_flow_nominal
+    "Design condenser heat flow rate in cascading cooling mode (all units, >0)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mChiWatUni_flow_nominal(
+    final min=0)=dat.mEva_flow_nominal
+    "Design CHW mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWatUni_flow_nominal(
+    final min=0)=dat.mCon_flow_nominal
+    "Design CW mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
+    final min=0)=nUni * mChiWatUni_flow_nominal
+    "Design CHW mass flow rate (all units)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWat_flow_nominal(
+    final min=0)=nUni * mConWatUni_flow_nominal
+    "Design CW mass flow rate (all units)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
+    "Design evaporator pressure drop (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
+    "Design condenser pressure drop (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+
+  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic dat
+    "Chiller parameters (each unit)"
+    annotation (Placement(transformation(extent={{-90,-120},{-70,-100}})));
+
+  // Assumptions
+  parameter Boolean allowFlowReversal = true
+    "= false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation(Dialog(tab="Assumptions"), Evaluate=true);
+
+  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 use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
+    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Filtered opening"));
+  parameter Modelica.Units.SI.Time riseTime=120
+    "Rise time of the filter (time to reach 99.6 % of an opening step)"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Filtered opening",
+      enable=use_inputFilter));
+  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization (no init/steady state/initial state/initial output)"
+    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
+  parameter Real y_start=1 "Initial position of actuator"
+    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
+    "Chiller On/Off command"
+    annotation (Placement(transformation(extent={{-140,100},{-100,140}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1Coo[nUni]
+    "Cooling switchover command: true for cooling, false for heating"
+    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
+      iconTransformation(extent={{-20,-20},{20,20}}, rotation=0,  origin={-120,0})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSet[nUni](
+    each final unit="K", each displayUnit="degC")
+    "Supply temperature setpoint"
+    annotation (Placement(
+      transformation(extent={{-140,-20},{-100,20}}),   iconTransformation(
+        extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValConSwi[nUni](
+    each final unit="1",
+    each final min=0,
+    each final max=1) "Chiller condenser switchover valve commanded position"
+    annotation (Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={-40,160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={-60,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValEvaSwi[nUni](
+    each final unit="1",
+    each final min=0,
+    each final max=1) "Chiller evaporator switchover valve commanded position"
+    annotation (Placement(transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={0,-160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={-60,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
+    final unit="W") "Power drawn"
+    annotation (Placement(transformation(extent={{100,100},{140,140}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValCon[nUni](
+    each final unit="1", each final min=0, each final max=1)
+    "Chiller condenser isolation valve commanded position"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={0,160}),  iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={-80,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValEva[nUni](
+    each final unit="1", each final min=0, each final max=1)
+    "Chiller evaporator isolation valve commanded position"
+    annotation (
+      Placement(transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={-40,-160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={-80,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mEva_flow[nUni](each final
+      unit="kg/s") "Chiller evaporator barrel mass flow rate" annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={60,-160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={80,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TEvaLvg[nUni](
+    each final unit="K", each displayUnit="degC")
+    "Chiller evaporator leaving temperature" annotation (Placement(
+        transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={40,-160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=-90,
+        origin={60,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mCon_flow[nUni](
+    each final unit="kg/s")
+    "Chiller condenser barrel mass flow rate" annotation (
+      Placement(transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={60,160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={90,120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConLvg[nUni](
+    each final unit="K", each displayUnit="degC")
+    "Chiller condenser leaving temperature" annotation (Placement(
+        transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={40,160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={70,120})));
+
+  Fluid.Chillers.ElectricReformulatedEIR chi[nUni](
+    PLR1(each start=0),
+    each final per=dat,
+    redeclare each final package Medium1 = Medium,
+    redeclare final package Medium2 = Medium,
+    each final have_switchover=true,
+    each final dp1_nominal=0,
+    each final dp2_nominal=0,
+    each final allowFlowReversal1=allowFlowReversal,
+    each final allowFlowReversal2=allowFlowReversal,
+    each final energyDynamics=energyDynamics,
+    each final show_T=show_T) "Chiller"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Fluid.Actuators.Valves.TwoWayLinear valCon[nUni](
+    redeclare each final package Medium = Medium,
+    each linearized=true,
+    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
+    each final m_flow_nominal=mConWatUni_flow_nominal,
+    each dpValve_nominal=1E3,
+    each final dpFixed_nominal=dpCon_nominal,
+    each final allowFlowReversal=allowFlowReversal,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start) "Condenser isolation valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={20,80})));
+  Fluid.Actuators.Valves.TwoWayLinear valEva[nUni](
+    redeclare each final package Medium = Medium,
+    each linearized=true,
+    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
+    each final m_flow_nominal=mChiWatUni_flow_nominal,
+    each dpValve_nominal=1E3,
+    each final dpFixed_nominal=dpEva_nominal,
+    each final allowFlowReversal=allowFlowReversal,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start) "Evaporator isolation valve"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={-20,-80})));
+  Fluid.FixedResistances.Junction junConWatEvaOut[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mChiWatUni_flow_nominal*{1,-1,1},
+    each final dp_nominal=fill(1E3, 3),
+    each final energyDynamics=energyDynamics,
+    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-80,-60})));
+  Fluid.FixedResistances.Junction junConWatEvaInl[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mChiWatUni_flow_nominal*{1,-1,-1},
+    each final dp_nominal=fill(1E3, 3),
+    each final energyDynamics=energyDynamics,
+    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={60,-6})));
+  Fluid.Sensors.TemperatureTwoPort temEvaLvg[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mChiWatUni_flow_nominal,
+    each final allowFlowReversal=allowFlowReversal)
+    "Chiller evaporator leaving temperature" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={-20,-20})));
+  Fluid.FixedResistances.Junction junHeaWatConInl[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mConWatUni_flow_nominal*{1,-1,-1},
+    each final dp_nominal=fill(1E3, 3),
+    each final energyDynamics=energyDynamics,
+    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-60,60})));
+  Fluid.FixedResistances.Junction junHeaWatConOut[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mConWatUni_flow_nominal*{1,-1,1},
+    each final dp_nominal=fill(1E3, 3),
+    each final energyDynamics=energyDynamics,
+    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
+    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
+    annotation (Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={80,60})));
+  Fluid.Sensors.TemperatureTwoPort temConEnt[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mConWatUni_flow_nominal,
+    each final allowFlowReversal=allowFlowReversal)
+    "Chiller condenser entering temperature" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-20,20})));
+  Fluid.Sensors.TemperatureTwoPort temConLvg[nUni](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=mConWatUni_flow_nominal,
+    each final allowFlowReversal=allowFlowReversal)
+    "Chiller condenser leaving temperature" annotation (Placement(
+        transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={20,20})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(nin=nUni)
+    "Sum up power of all units"
+    annotation (Placement(transformation(extent={{70,110},{90,130}})));
+  Fluid.Sensors.MassFlowRate floEva[nUni](
+    redeclare each final package Medium =Medium,
+    each final allowFlowReversal=allowFlowReversal)
+    "Chiller evaporator barrel mass flow rate" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={-20,-50})));
+  Fluid.Sensors.MassFlowRate floCon[nUni](
+    redeclare each final package Medium =Medium,
+    each final allowFlowReversal=allowFlowReversal)
+    "Chiller condenser barrel mass flow rate" annotation (Placement(
+        transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={20,50})));
+  Fluid.Actuators.Valves.TwoWayLinear valConSwi[nUni](
+    redeclare each final package Medium = Medium,
+    each linearized=true,
+    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
+    each final m_flow_nominal=mConWatUni_flow_nominal,
+    each dpValve_nominal=1E3,
+    each final dpFixed_nominal=0,
+    each final allowFlowReversal=true,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start) "Condenser switchover valve" annotation (
+      Placement(transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=90,
+        origin={-60,20})));
+  Fluid.Actuators.Valves.TwoWayLinear valEvaSwi[nUni](
+    redeclare each final package Medium = Medium,
+    each linearized=true,
+    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
+    each final m_flow_nominal=mChiWatUni_flow_nominal,
+    each dpValve_nominal=1E3,
+    each final dpFixed_nominal=0,
+    each final allowFlowReversal=true,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start) "Evaporator switchover valve" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={60,-40})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConEnt[nUni](each final
+      unit="K", each displayUnit="degC")
+    "Chiller condenser entering temperature" annotation (Placement(
+        transformation(
+        extent={{20,-20},{-20,20}},
+        rotation=-90,
+        origin={20,160}), iconTransformation(
+        extent={{-20,-20},{20,20}},
+        rotation=90,
+        origin={50,120})));
+protected
+  parameter Medium.ThermodynamicState staCas=Medium.setState_pTX(
+    T=(TCasHeaEnt_nominal + TCasCooEnt_nominal) / 2,
+    p=Medium.p_default,
+    X=Medium.X_default)
+    "State of source medium in cascading mode (at mean source temperature)";
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpCas=
+    Medium.specificHeatCapacityCp(state=staCas)
+    "Heat capacity of source medium in cascading mode";
+initial equation
+  TCasHeaLvg_nominal = TCasHeaEnt_nominal +
+    QEvaCasHeaUni_flow_nominal / cpCas / mConWatUni_flow_nominal;
+  TCasCooLvg_nominal = TCasCooEnt_nominal +
+    QConCasCooUni_flow_nominal / cpCas / mConWatUni_flow_nominal;
+  QEvaCasHeaUni_flow_nominal = dat.QEva_flow_nominal *
+    Buildings.Utilities.Math.Functions.biquadratic(
+      a=dat.capFunT,
+      x1=Modelica.Units.Conversions.to_degC(TCasHeaLvg_nominal),
+      x2=Modelica.Units.Conversions.to_degC(THeaWatSup_nominal));
+  QChiWatCasCooUni_flow_nominal = dat.QEva_flow_nominal *
+    Buildings.Utilities.Math.Functions.biquadratic(
+      a=dat.capFunT,
+      x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
+      x2=Modelica.Units.Conversions.to_degC(TCasCooLvg_nominal));
+  COPCasHea_nominal = dat.COP_nominal /
+    Buildings.Utilities.Math.Functions.biquadratic(
+      a=dat.EIRFunT,
+      x1=Modelica.Units.Conversions.to_degC(TCasCooLvg_nominal),
+      x2=Modelica.Units.Conversions.to_degC(THeaWatSup_nominal));
+  COPCasCoo_nominal = dat.COP_nominal /
+    Buildings.Utilities.Math.Functions.biquadratic(
+      a=dat.EIRFunT,
+      x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
+      x2=Modelica.Units.Conversions.to_degC(TCasCooLvg_nominal));
+equation
+  if nUni > 1 then
+    connect(junHeaWatConOut[1:nUni - 1].port_1, junHeaWatConOut[2:nUni].port_2)
+      annotation (Line(points={{80,50},{66,50},{66,70},{80,70}}, color={0,127,255}));
+    connect(valEvaSwi[1:nUni - 1].port_a, junConWatEvaInl[2:nUni].port_2)
+      annotation (Line(points={{60,-50},{40,-50},{40,4},{60,4}}, color={0,127,255}));
+    connect(valConSwi[1:nUni - 1].port_a, junHeaWatConInl[2:nUni].port_2)
+      annotation (Line(points={{-60,10},{-44,10},{-44,70},{-60,70}}, color={0,127,
+            255}));
+    connect(junConWatEvaOut[1:nUni - 1].port_1, junConWatEvaOut[2:nUni].port_2)
+      annotation (Line(points={{-80,-70},{-60,-70},{-60,-50},{-80,-50}}, color={0,
+            127,255}));
+  end if;
+  connect(port_a4, valEvaSwi[nUni].port_a)
+    annotation (Line(points={{100,-80},{60,-80},{60,-50}}, color={0,127,255}));
+  connect(yValConSwi, valConSwi.y)
+    annotation (Line(points={{-40,160},{-40,20},{-48,20}}, color={0,0,127}));
+
+  connect(y1, chi.on) annotation (Line(points={{-120,120},{-16,120},{-16,3},{-12,
+          3}}, color={255,0,255}));
+  connect(TSet, chi.TSet) annotation (Line(points={{-120,0},{-20,0},{-20,-3},{-12,
+          -3}},      color={0,0,127}));
+  connect(y1Coo, chi.coo)
+    annotation (Line(points={{-120,100},{-8,100},{-8,14}}, color={255,0,255}));
+  connect(yValCon, valCon.y) annotation (Line(points={{0,160},{0,80},{8,80}},
+                   color={0,0,127}));
+  connect(chi.port_b2, temEvaLvg.port_a)
+    annotation (Line(points={{-10,-6},{-20,-6},{-20,-10}}, color={0,127,255}));
+  connect(yValEva, valEva.y) annotation (Line(points={{-40,-160},{-40,-120},{-4,
+          -120},{-4,-80},{-8,-80}},
+                             color={0,0,127}));
+  connect(temConEnt.port_b, chi.port_a1)
+    annotation (Line(points={{-20,10},{-20,6},{-10,6}}, color={0,127,255}));
+  connect(chi.port_b1, temConLvg.port_a)
+    annotation (Line(points={{10,6},{20,6},{20,10}}, color={0,127,255}));
+  connect(valCon.port_b, junHeaWatConOut.port_3)
+    annotation (Line(points={{20,90},{20,100},{60,100},{60,60},{70,60}},
+                                                       color={0,127,255}));
+  connect(valEva.port_b,junConWatEvaOut. port_3) annotation (Line(points={{-20,-90},
+          {-20,-100},{-40,-100},{-40,-60},{-70,-60}},
+                                color={0,127,255}));
+  connect(chi.P, mulSum.u) annotation (Line(points={{11,9},{64,9},{64,120},{68,120}},
+        color={0,0,127}));
+  connect(temEvaLvg.port_b, floEva.port_a)
+    annotation (Line(points={{-20,-30},{-20,-40}}, color={0,127,255}));
+  connect(floEva.port_b, valEva.port_a)
+    annotation (Line(points={{-20,-60},{-20,-70}}, color={0,127,255}));
+  connect(mulSum.y, P)
+    annotation (Line(points={{92,120},{120,120}}, color={0,0,127}));
+  connect(floEva.m_flow, mEva_flow)
+    annotation (Line(points={{-9,-50},{2,-50},{2,-118},{60,-118},{60,-160}},
+                                                           color={0,0,127}));
+  connect(temEvaLvg.T, TEvaLvg) annotation (Line(points={{-9,-20},{-2,-20},{-2,-120},
+          {40,-120},{40,-160}}, color={0,0,127}));
+  connect(temConLvg.port_b, floCon.port_a)
+    annotation (Line(points={{20,30},{20,40}}, color={0,127,255}));
+  connect(floCon.port_b, valCon.port_a)
+    annotation (Line(points={{20,60},{20,70}}, color={0,127,255}));
+  connect(temConLvg.T, TConLvg)
+    annotation (Line(points={{31,20},{40,20},{40,160}}, color={0,0,127}));
+  connect(floCon.m_flow, mCon_flow) annotation (Line(points={{31,50},{62,50},{
+          62,140},{60,140},{60,160}}, color={0,0,127}));
+  connect(junConWatEvaInl.port_3, chi.port_a2) annotation (Line(points={{50,-6},
+          {10,-6}},                  color={0,127,255}));
+  connect(yValEvaSwi, valEvaSwi.y)
+    annotation (Line(points={{0,-160},{0,-40},{48,-40}}, color={0,0,127}));
+  connect(junHeaWatConInl.port_3, temConEnt.port_a)
+    annotation (Line(points={{-50,60},{-20,60},{-20,30}}, color={0,127,255}));
+
+  connect(port_a1, junHeaWatConInl[1].port_2)
+    annotation (Line(points={{-100,80},{-60,80},{-60,70}}, color={0,127,255}));
+  connect(valConSwi.port_b, junHeaWatConInl.port_1)
+    annotation (Line(points={{-60,30},{-60,50}}, color={0,127,255}));
+  connect(junHeaWatConOut[1].port_2, port_b1)
+    annotation (Line(points={{80,70},{80,80},{100,80}}, color={0,127,255}));
+  connect(valEvaSwi.port_b, junConWatEvaInl.port_1)
+    annotation (Line(points={{60,-30},{60,-16}}, color={0,127,255}));
+  connect(port_a2, junConWatEvaInl[1].port_2)
+    annotation (Line(points={{100,30},{60,30},{60,4}}, color={0,127,255}));
+  connect(junHeaWatConOut[nUni].port_1, port_b3)
+    annotation (Line(points={{80,50},{80,-30},{100,-30}}, color={0,127,255}));
+  connect(junConWatEvaOut[1].port_2, port_b2) annotation (Line(points={{-80,-50},
+          {-80,30},{-100,30}}, color={0,127,255}));
+  connect(junConWatEvaOut[nUni].port_1, port_b4) annotation (Line(points={{-80,-70},
+          {-80,-80},{-100,-80}}, color={0,127,255}));
+  connect(valConSwi[nUni].port_a, port_a3) annotation (Line(points={{-60,10},{
+          -60,-32},{-100,-32}},
+                            color={0,127,255}));
+
+  connect(temConEnt.T, TConEnt) annotation (Line(points={{-31,20},{-32,20},{-32,
+          130},{20,130},{20,160}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="chi",
+    Icon(coordinateSystem(preserveAspectRatio=false),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-70,80},{70,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,52},{-40,12}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,70},{58,52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,12},{-32,12},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,-10},{-40,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{38,52},{42,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,-50},{58,-68}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{18,24},{62,-18}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{40,24},{22,-8},{58,-8},{40,24}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,52},{-40,12}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,70},{58,52}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,12},{-32,12},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,-10},{-40,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{38,52},{42,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,-50},{58,-68}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{18,24},{62,-18}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{40,24},{22,-8},{58,-8},{40,24}},
+          lineColor={0,0,0},
+          smooth=Smooth.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}),                      Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-100,-140},{100,140}})),
+    Documentation(info="<html>
+<p>
+This model represents a set of identical heat recovery chillers
+that are piped in parallel.
+Modulating isolation valves and modulating switchover valves are included
+on condenser and evaporator side.
+The switchover valves allow indexing the condenser (resp. the evaporator)
+either to the CWC loop or to the HW loop (resp. to the CWE loop or to
+the CHW loop). Modulating valves are used to allow for sequences of
+operation that bleed CWE into the HW return flow to modulate the
+condenser entering temperature.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+On/Off command <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Cooling switchover command <code>y1Coo</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Supply temperature setpoint <code>TSet</code>:
+AO signal dedicated to each unit, with a dimensionality of one</br>
+The signal corresponds either to the HW supply temperature setpoint when
+the unit operates in heating mode, or to the CHW supply temperature setpoint when
+the unit operates in cooling mode.
+</li>
+<li>
+Condenser and evaporator isolation valve commanded position <code>yVal(Con|Eva)</code>:
+AO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Condenser and evaporator switchover valve commanded position <code>yVal(Con|Eva)Swi</code>:
+AO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Condenser and evaporator leaving temperature <code>T(Con|Eva)Lvg</code>:
+AI signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Condenser entering temperature <code>TConEnt</code>:
+AI signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Condenser and evaporator mass flow rate <code>m(Con|Eva)_flow</code>:
+AI signal dedicated to each unit, with a dimensionality of one
+</li>
+</ul>
+<h4>
+Details
+</h4>
+<h5>
+HRC performance data
+</h5>
+<p>
+The performance data should cover the HRC lift envelope,
+that is when the HRC is operating in direct heat recovery mode,
+producing CHW and HW at their setpoint value at full load.
+In this case, and to allow for cascading heat recovery where
+a third fluid circuit is used to generate a cascade of thermodynamic cycles,
+two additional parameters <code>TCasEntCoo_nominal</code> and
+<code>TCasEntHea_nominal</code> are exposed to specify the
+<i>entering</i> temperature of the third fluid circuit when
+the HRC is operating in cooling mode and in heating mode,
+respectively.
+In cooling mode the third fluid circuit is connected to the
+condenser barrel.
+In heating mode, the third fluid circuit is connected to the
+evaporator barrel.
+The parameters <code>TCasEnt*_nominal</code> are then used to assess the
+design capacity in heating and cooling mode, respectively.
+</p>
+<h5>
+Actuators
+</h5>
+<p>
+By default, linear valve models are used. Those are configured with
+a pressure drop varying linearly with the flow rate, as opposed
+to the quadratic dependency usually considered for a turbulent flow
+regime.
+This is because the whole plant model contains large nonlinear systems
+of equations and this configuration limits the risk of solver failure
+while reducing the time to solution.
+This has no significant impact on the operating point of the circulation pumps
+when a control loop is used to modulate the valve opening and maintain
+the flow rate or the leaving temperature at setpoint.
+Then, whatever the modeling assumptions for the valve, the
+control loop ensures that the valve creates the adequate pressure drop
+and flow, which will simply be reached at a different valve opening
+with the above simplification.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ChillerHeatRecoveryGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
new file mode 100644
index 00000000000..fcdf0446189
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
@@ -0,0 +1,262 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model CoolingTowerGroup "Model of multiple identical cooling towers in parallel"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    final m_flow_nominal(final min=Modelica.Constants.small)=mConWat_flow_nominal);
+
+  parameter Integer nUni(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.MassFlowRate mConWatUni_flow_nominal(
+    final min=0)
+    "CW design mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mConWat_flow_nominal(
+    final min=0)=nUni * mConWatUni_flow_nominal
+    "CW design mass flow rate (all units)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpConWatFriUni_nominal(
+      displayUnit="Pa")
+    "CW flow-friction losses through tower and piping only (without elevation head or valve)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mAirUni_flow_nominal(
+    final min=0,
+    start=mConWatUni_flow_nominal / 1.45)
+    "Air mass flow rate (each unit)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TWetBulEnt_nominal(
+    final min=273.15)
+    "Entering air wetbulb temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TConWatRet_nominal(
+    final min=273.15)
+    "CW return temperature (tower entering)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TConWatSup_nominal(
+    final min=273.15)
+    "CW supply temperature (tower leaving)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Power PFanUni_nominal(
+    final min=0,
+    start=340 * mConWatUni_flow_nominal)
+    "Fan power (each unit)"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real yFan_min(unit="1")=0.1
+    "CT fan minimum speed";
+
+  // Assumptions
+  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 Modelica.Units.SI.Time tau=30
+    "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Nominal condition",
+      enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
+    "Cooling tower Start command"
+    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
+                         iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(
+    final unit="1", final min=0)
+    "Cooling tower speed (common to all tower cells)"
+    annotation (Placement(
+        transformation(extent={{-140,40},{-100,80}}),   iconTransformation(
+          extent={{-140,-80},{-100,-40}})));
+  BoundaryConditions.WeatherData.Bus weaBus
+    "Bus with weather data"
+    annotation (Placement(transformation(extent={{90,-50},{110,-30}}),
+        iconTransformation(extent={{-20,80},{20,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(final unit="W")
+    "Power drawn by tower fans"
+    annotation (Placement(transformation(extent={{100,60},{140,100}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConWatSup(
+    final unit="K", displayUnit="degC")
+    "CW supply temperature (tower leaving)"
+    annotation (Placement(
+        transformation(extent={{100,20},{140,60}}), iconTransformation(extent={{100,20},
+            {140,60}})));
+
+  Fluid.BaseClasses.MassFlowRateMultiplier mulInl(
+    redeclare final package Medium = Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final use_input=false,
+    final k=1/nUni)       "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulOut(
+    redeclare final package Medium = Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final use_input=false,
+    final k=nUni)         "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
+    "Convert command signals"
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
+    annotation (Placement(transformation(extent={{60,90},{80,70}})));
+
+  Fluid.HeatExchangers.CoolingTowers.Merkel coo(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mConWatUni_flow_nominal,
+    final dp_nominal=dpConWatFriUni_nominal,
+    final yMin=yFan_min,
+    final ratWatAir_nominal=mConWatUni_flow_nominal/mAirUni_flow_nominal,
+    final TAirInWB_nominal=TWetBulEnt_nominal,
+    final TWatIn_nominal=TConWatRet_nominal,
+    final TWatOut_nominal=TConWatSup_nominal,
+    final PFan_nominal=PFanUni_nominal,
+    final tau=tau,
+    final allowFlowReversal=allowFlowReversal,
+    final show_T=show_T,
+    final energyDynamics=energyDynamics)
+    "Cooling tower"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Pre preY1[nUni]
+    "Left limit of signal avoiding direct feedback of status to controller"
+    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
+    "Convert to real"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-14,80})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply inp
+    "Compute pump input signal"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-20,30})));
+equation
+  connect(com.nUniOn, mulP.u2) annotation (Line(points={{-38,100},{40,100},{40,
+          86},{58,86}},     color={0,0,127}));
+
+  connect(mulP.y, P)
+    annotation (Line(points={{82,80},{120,80}}, color={0,0,127}));
+  connect(mulOut.port_b, port_b)
+    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
+  connect(mulInl.port_b, coo.port_a)
+    annotation (Line(points={{-60,0},{-10,0}},
+                                             color={0,127,255}));
+  connect(coo.port_b, mulOut.port_a)
+    annotation (Line(points={{10,0},{60,0}}, color={0,127,255}));
+  connect(weaBus.TWetBul, coo.TAir) annotation (Line(
+      points={{100,-40},{-20,-40},{-20,4},{-12,4}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{-6,3},{-6,3}},
+      horizontalAlignment=TextAlignment.Right));
+  connect(coo.PFan, mulP.u1)
+    annotation (Line(points={{11,8},{40,8},{40,74},{58,74}}, color={0,0,127}));
+  connect(coo.TLvg, TConWatSup) annotation (Line(points={{11,-6},{50,-6},{50,40},
+          {120,40}}, color={0,0,127}));
+  connect(y1, preY1.u)
+    annotation (Line(points={{-120,100},{-92,100}},
+                                                  color={255,0,255}));
+  connect(preY1.y, com.y1)
+    annotation (Line(points={{-68,100},{-62,100}},
+                                                 color={255,0,255}));
+  connect(com.y1One, booToRea.u) annotation (Line(points={{-38,106},{-14,106},{
+          -14,92}}, color={255,0,255}));
+  connect(inp.y, coo.y)
+    annotation (Line(points={{-20,18},{-20,8},{-12,8}}, color={0,0,127}));
+  connect(y, inp.u1)
+    annotation (Line(points={{-120,60},{-26,60},{-26,42}}, color={0,0,127}));
+  connect(booToRea.y, inp.u2)
+    annotation (Line(points={{-14,68},{-14,42}}, color={0,0,127}));
+  connect(port_a, mulInl.port_a)
+    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
+  annotation (
+    defaultComponentName="coo",
+    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-70,80},{70,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Text(
+         extent={{190,-12},{70,-62}},
+          textColor={0,0,0},
+          textString=DynamicSelect("", String(TLvg-273.15, format=".1f"))),
+        Ellipse(
+          extent={{-54,56},{0,44}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{0,56},{54,44}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{0,56},{54,44}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-54,56},{0,44}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}),
+    Diagram(coordinateSystem(extent={{-100,-120},{100,120}})),
+    Documentation(info="<html>
+<p>
+This model represents a set of identical cooling towers
+that are piped in parallel.
+No actuated isolation valves are included.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Start command (VFD Run) <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Speed command <code>y</code>:
+AO signal common to all units, with a dimensionality of zero
+</li>
+<li>
+CW supply temperature <code>TConWatSup</code>:
+AI signal common to all units, with a dimensionality of zero
+</li>
+</ul>
+<h4>Details</h4>
+<h5>Modeling approach</h5>
+<p>
+In a parallel arrangement, all operating units have the same operating point.
+This allows modeling the heat transfer from outdoor air to condenser water
+with a single instance of
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel\">
+Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel</a>.
+Hydronics are resolved with mass flow rate multiplier components.
+Note that the elevation head of open-circuit cooling towers is not modeled,
+which is an inherent limitation of the cooling tower component model.
+</p>
+<p>
+The fan cycling On and Off is implicitly modeled
+in the cooling tower component which uses a low limit of the control signal
+to switch to a free convection regime at zero fan power.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end CoolingTowerGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
new file mode 100644
index 00000000000..ae759dfc105
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
@@ -0,0 +1,371 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model HeatPumpGroup
+  "Model of multiple identical air-source heat pumps in parallel"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    final m_flow_nominal(final min=Modelica.Constants.small)=mHeaWat_flow_nominal);
+
+  replaceable package MediumAir=Buildings.Media.Air
+    "Air medium";
+
+  parameter Integer nUni(final min=1, start=1)
+    "Number of units operating at design conditions"
+    annotation(Evaluate=true);
+  final parameter Modelica.Units.SI.HeatFlowRate capUni_nominal(
+    final min=0)=dat.hea.Q_flow
+    "Heat pump design capacity (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWatUni_flow_nominal(
+    final min=0)=dat.hea.mLoa_flow
+    "HW design mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mAirUni_flow_nominal(
+    final min=0)=dat.hea.mSou_flow
+    "Air design mass flow rate (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal(
+    final min=0)=nUni * mHeaWatUni_flow_nominal
+    "HW design mass flow rate (all units)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpPumHeaWatUni_nominal(
+    final min=0,
+    displayUnit="Pa")=dat.dpHeaLoa_nominal
+    "HW pump design head (each unit)"
+    annotation(Dialog(group="Nominal condition"));
+
+  replaceable parameter Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic dat
+    "Heat pump parameters (each unit)"
+    annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
+  replaceable parameter Fluid.Movers.Data.Generic datPum
+    constrainedby Fluid.Movers.Data.Generic(
+      pressure(V_flow={0,1,2}*mHeaWatUni_flow_nominal/rho_nominal,
+      dp={1.14,1,0.42}*dpPumHeaWatUni_nominal),
+      motorCooledByFluid=false)
+    "Condenser pump parameters (each unit)"
+    annotation (Placement(transformation(extent={{20,-110},{40,-90}})));
+
+  // Assumptions
+  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 Modelica.Units.SI.Time tau=30
+    "Time constant of fluid volume for nominal HW flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Nominal condition",
+      enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
+
+  // Pump speed filter parameters
+  parameter Boolean use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
+    "= true, if signal is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Filtered pump speed"));
+  parameter Modelica.Units.SI.Time riseTime=30
+    "Rise time of the filter (time to reach 99.6 % of the speed)"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Filtered pump speed",
+      enable=use_inputFilter));
+  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization (no init/steady state/initial state/initial output)"
+    annotation(Dialog(tab="Dynamics", group="Filtered pump speed",enable=use_inputFilter));
+  parameter Real y_start=1 "Initial position of actuator"
+    annotation(Dialog(tab="Dynamics", group="Filtered pump speed",enable=use_inputFilter));
+
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
+    "Heat pump On/Off command"
+    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
+                         iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSet(
+    final unit="K", displayUnit="degC")
+    "Supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  BoundaryConditions.WeatherData.Bus weaBus
+    "Bus with weather data"
+    annotation (Placement(transformation(extent={{90,-50},{110,-30}}),
+        iconTransformation(extent={{-20,80},{20,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
+    final unit="W")
+    "Power drawn by HW pumps"
+    annotation (Placement(transformation(extent={{100,40},{140,80}}),
+                     iconTransformation(extent={{100,20},{140,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
+    final unit="W")
+    "Power drawn by heat pumps"
+    annotation (Placement(transformation(extent={{100,80},{140,120}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+
+  Fluid.BaseClasses.MassFlowRateMultiplier mulConInl(
+    redeclare final package Medium = Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Fluid.BaseClasses.MassFlowRateMultiplier mulConOut(
+    redeclare final package Medium = Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final use_input=true)
+    "Flow rate multiplier"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
+    "Convert command signals"
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
+    annotation (Placement(transformation(extent={{70,110},{90,90}})));
+  Fluid.HeatPumps.EquationFitReversible heaPum(
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=MediumAir,
+    final per=dat,
+    final tau1=tau,
+    final show_T=show_T,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal1=allowFlowReversal,
+    final allowFlowReversal2=false)
+    "Heat pump"
+    annotation (Placement(transformation(extent={{-10,-16},{10,4}})));
+  Fluid.Movers.SpeedControlled_y pum(
+    redeclare final package Medium = Medium,
+    inputType=Buildings.Fluid.Types.InputType.Continuous,
+    final tau=tau,
+    final show_T=show_T,
+    final allowFlowReversal=allowFlowReversal,
+    final energyDynamics=energyDynamics,
+    final use_inputFilter=use_inputFilter,
+    final riseTime=riseTime,
+    final init=init,
+    final per=datPum,
+    addPowerToMedium=false) "HW pump"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Fluid.Sources.MassFlowSource_WeatherData airSou(
+    redeclare final package Medium=MediumAir,
+    final use_m_flow_in=true,
+    final nPorts=1)
+    "Air flow source"
+    annotation (Placement(transformation(extent={{42,-50},{22,-30}})));
+  Fluid.Sources.Boundary_pT airSin(
+    redeclare final package Medium=MediumAir,
+    final nPorts=1)
+    "Air flow sink"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter comFan(
+    final k=mAirUni_flow_nominal)
+    "Convert On/Off command to air flow setpoint"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={46,30})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply mulP1 "Scale power"
+    annotation (Placement(transformation(extent={{70,70},{90,50}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Pre preY1[nUni]
+    "Left limit of signal avoiding direct feedback of status to controller"
+    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
+    "Convert to real"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-20,80})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply inp
+    "Compute pump input signal" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={-40,30})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant cst(final k=1)
+    "Constant"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt
+    "Convert to integer"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-14,30})));
+protected
+  parameter Medium.ThermodynamicState sta_nominal=Medium.setState_pTX(
+    T=dat.hea.TRefLoa,
+    p=3E5,
+    X=Medium.X_default)
+    "State of the medium at the medium default properties";
+  parameter Modelica.Units.SI.Density rho_nominal=Medium.density(sta_nominal)
+    "Density at the medium default properties";
+equation
+  connect(mulConOut.uInv, mulConInl.u) annotation (Line(points={{81,6},{86,6},{86,
+          -20},{-86,-20},{-86,6},{-82,6}},     color={0,0,127}));
+  connect(com.nUniOn, mulP.u2) annotation (Line(points={{-38,100},{60,100},{60,
+          106},{68,106}},   color={0,0,127}));
+
+  connect(mulP.y, P)
+    annotation (Line(points={{92,100},{120,100}},
+                                                color={0,0,127}));
+  connect(com.nUniOnBou, mulConOut.u) annotation (Line(points={{-38,94},{16,94},
+          {16,6},{58,6}},        color={0,0,127}));
+  connect(pum.port_b, heaPum.port_a1)
+    annotation (Line(points={{-30,0},{-10,0}}, color={0,127,255}));
+  connect(heaPum.port_b1, mulConOut.port_a) annotation (Line(points={{10,0},{60,
+          0}},                 color={0,127,255}));
+  connect(mulConInl.port_b, pum.port_a) annotation (Line(points={{-60,0},{-50,0}},
+                            color={0,127,255}));
+  connect(mulConOut.port_b, port_b)
+    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
+  connect(heaPum.P, mulP.u1) annotation (Line(points={{11,-6.2},{18,-6.2},{18,
+          94},{68,94}},
+                    color={0,0,127}));
+  connect(port_a, mulConInl.port_a)
+    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
+  connect(airSou.ports[1], heaPum.port_a2) annotation (Line(points={{22,-40},{
+          16,-40},{16,-12},{10,-12}},
+                                   color={0,127,255}));
+  connect(airSin.ports[1], heaPum.port_b2) annotation (Line(points={{-30,-40},{-20,
+          -40},{-20,-12},{-10,-12}}, color={0,127,255}));
+  connect(TSet, heaPum.TSet) annotation (Line(points={{-120,-60},{-16,-60},{-16,
+          3},{-11.4,3}}, color={0,0,127}));
+  connect(comFan.y, airSou.m_flow_in) annotation (Line(points={{46,18},{46,-32},
+          {42,-32}},         color={0,0,127}));
+  connect(weaBus, airSou.weaBus) annotation (Line(
+      points={{100,-40},{42,-40},{42,-39.8}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(mulP1.y, PPum)
+    annotation (Line(points={{92,60},{120,60}}, color={0,0,127}));
+  connect(pum.P, mulP1.u1) annotation (Line(points={{-29,9},{60,9},{60,54},{68,
+          54}}, color={0,0,127}));
+  connect(com.nUniOn, mulP1.u2) annotation (Line(points={{-38,100},{60,100},{60,
+          66},{68,66}},
+                    color={0,0,127}));
+  connect(y1, preY1.u)
+    annotation (Line(points={{-120,100},{-92,100}}, color={255,0,255}));
+  connect(preY1.y, com.y1)
+    annotation (Line(points={{-68,100},{-62,100}}, color={255,0,255}));
+  connect(com.y1One, booToRea.u) annotation (Line(points={{-38,106},{-20,106},{
+          -20,92}},      color={255,0,255}));
+  connect(inp.y, pum.y)
+    annotation (Line(points={{-40,18},{-40,12}}, color={0,0,127}));
+  connect(booToRea.y, comFan.u)
+    annotation (Line(points={{-20,68},{-20,60},{46,60},{46,42}},
+                                                      color={0,0,127}));
+  connect(booToRea.y, inp.u2) annotation (Line(points={{-20,68},{-20,60},{-34,
+          60},{-34,42}}, color={0,0,127}));
+  connect(cst.y, inp.u1)
+    annotation (Line(points={{-68,60},{-46,60},{-46,42}}, color={0,0,127}));
+  connect(booToRea.y, reaToInt.u) annotation (Line(points={{-20,68},{-20,60},{
+          -14,60},{-14,42}}, color={0,0,127}));
+  connect(reaToInt.y, heaPum.uMod)
+    annotation (Line(points={{-14,18},{-14,-6},{-11,-6}}, color={255,127,0}));
+  annotation (
+    defaultComponentName="heaPum",
+    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-70,80},{70,-80}},
+          lineColor={0,0,0},
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid,
+          lineThickness=0.5),
+        Rectangle(
+          extent={{-56,68},{58,50}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-56,-52},{58,-70}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-42,0},{-52,-12},{-32,-12},{-42,0}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid,
+          lineThickness=0.5),
+        Polygon(
+          points={{-42,0},{-52,10},{-32,10},{-42,0}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid,
+          lineThickness=0.5),
+        Rectangle(
+          extent={{-44,50},{-40,10}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-44,-12},{-40,-52}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{38,50},{42,-52}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{18,22},{62,-20}},
+          lineColor={0,0,0},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid,
+          lineThickness=0.5),
+        Polygon(
+          points={{40,22},{22,-10},{58,-10},{40,22}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+    Diagram(coordinateSystem(extent={{-100,-120},{100,120}})),
+    Documentation(info="<html>
+<p>
+This model represents a set of identical air-to-water heat pumps
+that are piped in parallel.
+Dedicated constant-speed condenser pumps are included.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+On/Off command <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Supply temperature setpoint <code>TSet</code>:
+AO signal common to all units, with a dimensionality of zero
+</li>
+<li>
+CW supply temperature <code>TConWatSup</code>:
+AI signal common to all units, with a dimensionality of zero
+</li>
+</ul>
+<h4>Details</h4>
+<h5>Modeling approach</h5>
+<p>
+In a parallel arrangement, all operating units have the same operating point.
+This allows modeling the heat transfer from outdoor air to condenser water
+with a single instance of
+<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
+Buildings.Fluid.HeatPumps.EquationFitReversible</a>.
+Hydronics are resolved with mass flow rate multiplier components.
+<p>
+The model
+<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
+Buildings.Fluid.HeatPumps.EquationFitReversible</a>
+does not capture the sensitivity of the heat pump performance
+to the HW supply temperature setpoint.
+This means that a varying HW supply temperature setpoint
+has no impact on the heat pump <i>COP</i> (all other variables
+such as the HW return temperature being kept invariant).
+This is a limitation of the model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HeatPumpGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
new file mode 100644
index 00000000000..bfe2f374309
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
@@ -0,0 +1,69 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model MultiplePumpsDp
+  "Model of multiple identical pumps in parallel with dp-controlled pump model"
+  extends BaseClasses.PartialMultiplePumps(
+    final have_var=have_varSet,
+    redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum(
+      final m_flow_nominal=mPum_flow_nominal,
+      final dp_nominal=dpPum_nominal),
+    cst(final k=dpPum_nominal));
+
+  parameter Boolean have_varSet = true
+    "Set to true for variable setpoint, false for constant setpoint (design value)"
+    annotation(Evaluate=true);
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dp_in(
+    final unit="Pa",
+    final min=0)
+    if have_var
+    "Differential pressure setpoint"
+    annotation (
+    Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+equation
+  connect(dp_in, inp.u1) annotation (Line(points={{-120,60},{-6,60},{-6,52}},
+                    color={0,0,127}));
+  connect(inp.y, pum.dp_in)
+    annotation (Line(points={{-8.88178e-16,28},{0,28},{0,12}},
+                                                     color={0,0,127}));
+  annotation (
+    defaultComponentName="pum", Documentation(info="<html>
+<p>
+This model represents a set of identical dp-controlled
+variable speed pumps that are piped in parallel.
+An optional check valve in series with each pump is included.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Start command (VFD Run) <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+(Optionally if <code>have_varSet</code> is <code>true</code>) Differential pressure setpoint <code>dp_in</code>:
+AO signal common to all units, with a dimensionality of zero
+</li>
+<li>
+Pump status <code>y1_actual</code>:
+DI signal dedicated to each unit, with a dimensionality of one
+</li>
+</ul>
+<h4>Details</h4>
+<p>
+See the base class
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
+for a description of the modeling approach.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiplePumpsDp;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
new file mode 100644
index 00000000000..f2b1edacc85
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
@@ -0,0 +1,77 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model MultiplePumpsFlow
+  "Model of multiple identical pumps in parallel with flow-controlled pump model"
+  extends BaseClasses.PartialMultiplePumps(
+    final have_var=have_varSet,
+    redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum(
+      final m_flow_nominal=mPum_flow_nominal,
+      final dp_nominal=dpPum_nominal),
+    cst(final k=mPum_flow_nominal));
+
+  parameter Boolean have_varSet = true
+    "Set to true for variable setpoint, false for constant setpoint (design value)"
+    annotation(Evaluate=true);
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput m_flow_in(
+    final unit="kg/s",
+    final min=0)
+    if have_var
+    "Mass flow rate setpoint (total over all pumps)"
+    annotation (
+    Placement(transformation(extent={{-140,40},{-100,80}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Divide div1
+    "Divide total flow setpoint by number of pumps commanded On"
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+equation
+  connect(m_flow_in, div1.u1) annotation (Line(points={{-120,60},{-90,60},{-90,66},
+          {-82,66}}, color={0,0,127}));
+  connect(com.nUniOnBou, div1.u2) annotation (Line(points={{-28,94},{-20,94},{
+          -20,80},{-86,80},{-86,54},{-82,54}}, color={0,0,127}));
+  connect(div1.y, inp.u1) annotation (Line(points={{-58,60},{-6,60},{-6,52}},
+                color={0,0,127}));
+  connect(inp.y, pum.m_flow_in)
+    annotation (Line(points={{-8.88178e-16,28},{0,28},{0,12}},
+                                                     color={0,0,127}));
+  annotation (
+    defaultComponentName="pum", Documentation(info="<html>
+<p>
+This model represents a set of identical flow-controlled
+variable speed pumps that are piped in parallel.
+An optional check valve in series with each pump is included.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Start command (VFD Run) <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+(Optionally if <code>have_varSet</code> is <code>true</code>) Mass flow rate setpoint <code>m_flow_in</code>:
+AO signal with a dimensionality of zero</br>
+The setpoint corresponds to the <i>total</i> flow rate of all units.
+</li>
+<li>
+Pump status <code>y1_actual</code>:
+DI signal dedicated to each unit, with a dimensionality of one
+</li>
+</ul>
+<h4>Details</h4>
+<p>
+See the base class
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
+for a description of the modeling approach.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiplePumpsFlow;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
new file mode 100644
index 00000000000..39b173edc5c
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
@@ -0,0 +1,67 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+model MultiplePumpsSpeed
+  "Model of multiple identical pumps in parallel with speed-controlled pump model"
+  extends
+    Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
+    redeclare final Buildings.Fluid.Movers.SpeedControlled_y pum,
+    cst(final k=1));
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(
+    final unit="1",
+    final min=0,
+    final max=1)
+    if have_var
+    "Pump speed (common to all pumps)"
+    annotation (
+     Placement(transformation(extent={{-140,40},{-100,80}}), iconTransformation(
+          extent={{-140,20},{-100,60}})));
+
+equation
+  connect(y, inp.u1) annotation (Line(points={{-120,60},{-6,60},{-6,52}},
+        color={0,0,127}));
+  connect(inp.y, pum.y)
+    annotation (Line(points={{-8.88178e-16,28},{0,28},{0,12}},
+                                                     color={0,0,127}));
+  annotation (
+    defaultComponentName="pum", Documentation(info="<html>
+<p>
+This model represents a set of identical speed-controlled
+pumps that are piped in parallel.
+The model may be configured to represent either constant speed
+pumps or variable speed pumps.
+An optional check valve in series with each pump is included.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Start command (VFD Run for variable speed pumps or Starter contact for constant speed pumps) <code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+(Optionally if <code>have_var</code> is <code>true</code>) Speed command <code>y</code>:
+AO signal common to all units, with a dimensionality of zero
+</li>
+<li>
+Pump status <code>y1_actual</code>:
+DI signal dedicated to each unit, with a dimensionality of one
+</li>
+</ul>
+<h4>Details</h4>
+<p>
+See the base class
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
+Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
+for a description of the modeling approach.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiplePumpsSpeed;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
new file mode 100644
index 00000000000..f3879b52704
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
@@ -0,0 +1,204 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation.BaseClasses;
+partial model PartialMultiplePumps
+  "Base class for validating the multiple pumps model"
+  extends Modelica.Icons.Example;
+
+  package Medium = Buildings.Media.Water
+    "Medium model for hot water";
+
+  parameter Integer nPum(
+    final min=1)=2
+    "Number of pumps"
+    annotation(Evaluate=true);
+  parameter Modelica.Units.SI.MassFlowRate mPum_flow_nominal=1
+    "Pump mass flow rate (each pump)"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpPum_nominal = 1E5
+    "Pump head (each pump)"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
+    nPum * mPum_flow_nominal
+    "Circuit mass flow rate at design conditions";
+  parameter Modelica.Units.SI.Pressure p_min = 2E5
+    "Circuit minimum pressure";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = dpPum_nominal
+    "Circuit total pressure drop at design conditions";
+
+  Fluid.Sources.Boundary_pT bou(
+    redeclare final package Medium = Medium,
+    final p=p_min,
+    nPorts=2)
+    "Pressure boundary condition"
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+  replaceable Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum
+    constrainedby
+    Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
+    redeclare final package Medium = Medium,
+    final nPum=nPum,
+    final mPum_flow_nominal=mPum_flow_nominal,
+    final dpPum_nominal=dpPum_nominal,
+    use_inputFilter=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Multiple pumps in parallel - Speed controlled"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+
+  Fluid.Sensors.RelativePressure senRelPre(redeclare package Medium = Medium)
+    "Differential pressure sensor" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={40,60})));
+  Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
+    "Mass flow rate sensor" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={20,30})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ope(
+    height=0.8,
+    duration=300,
+    offset=0.2,
+    startTime=200)
+    "Valve opening signal"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage val(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal,
+    dpValve_nominal=5000,
+    dpFixed_nominal=dp_nominal - val.dpValve_nominal)
+    "Modulating valve"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Pum(
+    table=[0,0,0; 1,0,0; 1,1,0; 4,1,1; 4,1,1; 10,1,1],
+    timeScale=100,
+    period=1000) "Pump Start signal"
+    annotation (Placement(transformation(extent={{-120,110},{-100,130}})));
+  replaceable Fluid.Movers.SpeedControlled_y pum1
+    constrainedby Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine(
+    redeclare final package Medium = Medium,
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    use_inputFilter=false,
+    final per=pum.per,
+    addPowerToMedium=false)
+    "Pump"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Fluid.FixedResistances.CheckValve cheVal1(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mPum_flow_nominal,
+    final dpValve_nominal=pum.dpValve_nominal)
+    "Check valve"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  replaceable Fluid.Movers.SpeedControlled_y pum2
+    constrainedby Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine(
+    redeclare final package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    use_inputFilter=false,
+    final per=pum.per,
+    addPowerToMedium=false)
+    "Pump"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  Fluid.FixedResistances.CheckValve cheVal2(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=mPum_flow_nominal,
+    final dpValve_nominal=pum.dpValve_nominal)
+    "Check valve"
+    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage val1(
+    redeclare package Medium = Medium,
+    m_flow_nominal=m_flow_nominal,
+    dpValve_nominal=5000,
+    dpFixed_nominal=dp_nominal - val.dpValve_nominal)
+    "Modulating valve"
+    annotation (Placement(transformation(extent={{10,-130},{-10,-110}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[2]
+    "Convert to real"
+    annotation (Placement(transformation(extent={{80,110},{100,130}})));
+  Fluid.Sensors.RelativePressure senRelPre1(redeclare package Medium = Medium)
+    "Differential pressure sensor" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={90,-80})));
+  Fluid.Sensors.MassFlowRate senMasFlo1(redeclare package Medium = Medium)
+    "Mass flow rate sensor" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={60,-100})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply inp1
+    "Compute pump input signal" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={120,2})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply inp2
+    "Compute pump input signal" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={120,-42})));
+equation
+  connect(bou.ports[1], pum.port_a)
+    annotation (Line(points={{-60,59},{-60,60},{-10,60}}, color={0,127,255}));
+  connect(val.port_b, pum.port_a) annotation (Line(points={{-10,0},{-20,0},{-20,
+          60},{-10,60}}, color={0,127,255}));
+  connect(pum.port_b, senRelPre.port_a)
+    annotation (Line(points={{10,60},{30,60}}, color={0,127,255}));
+  connect(ope.y, val.y) annotation (Line(points={{-98,0},{-40,0},{-40,20},{0,20},
+          {0,12}}, color={0,0,127}));
+  connect(y1Pum.y, pum.y1) annotation (Line(points={{-98,120},{-14,120},{-14,68},
+          {-12,68}},         color={255,0,255}));
+  connect(pum.port_b, senMasFlo.port_a)
+    annotation (Line(points={{10,60},{20,60},{20,40}}, color={0,127,255}));
+  connect(senMasFlo.port_b, val.port_a)
+    annotation (Line(points={{20,20},{20,0},{10,0}}, color={0,127,255}));
+  connect(senRelPre.port_b, pum.port_a) annotation (Line(points={{50,60},{60,60},
+          {60,74},{-10,74},{-10,60}}, color={0,127,255}));
+  connect(pum1.port_b, cheVal1.port_a)
+    annotation (Line(points={{10,-40},{30,-40}}, color={0,127,255}));
+  connect(pum2.port_b, cheVal2.port_a)
+    annotation (Line(points={{10,-80},{30,-80}}, color={0,127,255}));
+  connect(val1.port_b, pum2.port_a) annotation (Line(points={{-10,-120},{-40,-120},
+          {-40,-80},{-10,-80}}, color={0,127,255}));
+  connect(val1.port_b, pum1.port_a) annotation (Line(points={{-10,-120},{-40,-120},
+          {-40,-40},{-10,-40}}, color={0,127,255}));
+  connect(val1.port_b, bou.ports[2]) annotation (Line(points={{-10,-120},{-60,-120},
+          {-60,61}}, color={0,127,255}));
+  connect(y1Pum.y, booToRea.u)
+    annotation (Line(points={{-98,120},{78,120}}, color={255,0,255}));
+  connect(cheVal2.port_b, senMasFlo1.port_a)
+    annotation (Line(points={{50,-80},{60,-80},{60,-90}}, color={0,127,255}));
+  connect(senMasFlo1.port_b, val1.port_a) annotation (Line(points={{60,-110},{60,
+          -120},{10,-120}}, color={0,127,255}));
+  connect(cheVal1.port_b, senMasFlo1.port_a)
+    annotation (Line(points={{50,-40},{60,-40},{60,-90}}, color={0,127,255}));
+  connect(senRelPre1.port_a, senMasFlo1.port_a)
+    annotation (Line(points={{80,-80},{60,-80},{60,-90}}, color={0,127,255}));
+  connect(senRelPre1.port_b, pum2.port_a) annotation (Line(points={{100,-80},{120,
+          -80},{120,-130},{-40,-130},{-40,-80},{-10,-80}}, color={0,127,255}));
+  connect(booToRea[1].y, inp1.u2)
+    annotation (Line(points={{102,120},{126,120},{126,14}}, color={0,0,127}));
+  connect(ope.y, val1.y) annotation (Line(points={{-98,0},{-80,0},{-80,-100},{0,
+          -100},{0,-108}}, color={0,0,127}));
+  connect(booToRea[2].y, inp2.u2) annotation (Line(points={{102,120},{134,120},{
+          134,-20},{126,-20},{126,-30}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+  Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
+    Documentation(info="<html>
+<p>
+This base class is used to construct validation models
+for the various multiple-pump models within
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems\">
+Buildings.DHC.Plants.Combined.Subsystems</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialMultiplePumps;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
new file mode 100644
index 00000000000..2d491cef76f
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used
+for validation purposes.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order b/Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
new file mode 100644
index 00000000000..7b12d666abf
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
@@ -0,0 +1,125 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model ChillerGroup "Validation of chiller group model"
+  extends Modelica.Icons.Example;
+
+  replaceable package MediumChiWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW medium";
+  replaceable package MediumConWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CW medium";
+
+  parameter
+    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD
+    dat "Chiller parameters"
+    annotation (Placement(transformation(extent={{90,92},{110,112}})));
+
+  Buildings.DHC.Plants.Combined.Subsystems.ChillerGroup chi(
+    redeclare final package Medium1 = MediumConWat,
+    redeclare final package Medium2 = MediumChiWat,
+    show_T=true,
+    nUni=2,
+    dpEva_nominal=3E5,
+    dpCon_nominal=3E5,
+    final dat=dat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Chiller group"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  Fluid.Sources.Boundary_pT retChiWat(
+    redeclare final package Medium = MediumChiWat,
+    p=supChiWat.p + chi.dpEva_nominal + chi.valEva.dpValve_nominal,
+    T=288.15,
+    nPorts=1)
+    "Boundary conditions for CHW"
+    annotation (
+      Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={20,-102})));
+
+  Fluid.Sources.Boundary_pT supConWat(
+    redeclare final package Medium = MediumConWat,
+    p=retConWat.p + chi.dpCon_nominal + chi.valCon.dpValve_nominal,
+    nPorts=1) "Boundary conditions for CW" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-20,100})));
+
+  Fluid.Sources.Boundary_pT retConWat(
+    redeclare final package Medium = MediumConWat,
+    p=200000,
+    nPorts=1) "Boundary conditions for CW" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={20,100})));
+  Fluid.Sources.Boundary_pT supChiWat(
+    redeclare final package Medium = MediumChiWat,
+    p=200000,
+    nPorts=1) "Boundary conditions for CHW"
+    annotation (
+      Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={-20,-102})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TChiWatSupSet(
+    y(displayUnit="degC", unit="K"),
+    height=+5,
+    duration=1000,
+    offset=dat.TEvaLvg_nominal) "CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[0,1,1; 0.5,1,1; 0.5,1,0; 0.8,1,0; 0.8,0,0; 1,0,0],
+    timeScale=1000,
+    period=1000) "Chiller On/Off command"
+    annotation (Placement(transformation(extent={{-110,70},{-90,90}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[chi.nUni]
+    "Convert DO to AO" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-60,80})));
+equation
+  connect(chi.port_b1, retConWat.ports[1])
+    annotation (Line(points={{10,6},{20,6},{20,90}}, color={0,127,255}));
+  connect(supConWat.ports[1], chi.port_a1)
+    annotation (Line(points={{-20,90},{-20,6},{-10,6}}, color={0,127,255}));
+  connect(retChiWat.ports[1], chi.port_a2)
+    annotation (Line(points={{20,-92},{20,-6},{10,-6}}, color={0,127,255}));
+  connect(supChiWat.ports[1], chi.port_b2)
+    annotation (Line(points={{-20,-92},{-20,-6},{-10,-6}}, color={0,127,255}));
+  connect(TChiWatSupSet.y, chi.TSet) annotation (Line(points={{-88,-40},{-16,
+          -40},{-16,-9},{-12,-9}}, color={0,0,127}));
+  connect(y1.y, chi.y1) annotation (Line(points={{-88,80},{-80,80},{-80,9},{-12,
+          9}}, color={255,0,255}));
+  connect(y1.y, booToRea.u)
+    annotation (Line(points={{-88,80},{-72,80}}, color={255,0,255}));
+  connect(booToRea.y, chi.yValCon)
+    annotation (Line(points={{-48,80},{-6,80},{-6,12}}, color={0,0,127}));
+  connect(booToRea.y, chi.yValEva) annotation (Line(points={{-48,80},{-40,80},{
+          -40,-20},{-5.8,-20},{-5.8,-12}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.ChillerGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.ChillerGroup</a>
+in a configuration with two chillers.
+The chillers are initially On and they are switched Off one after the other
+as they receive an increasing CHW supply temperature setpoint.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ChillerGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
new file mode 100644
index 00000000000..c578c4b6b68
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
@@ -0,0 +1,476 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model ChillerHeatRecoveryGroup
+  "Validation of heat recovery chiller group model"
+  extends Modelica.Icons.Example;
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium model";
+  final parameter Integer nChiHea(final min=1, start=1)=2
+    "Number of HRCs operating at design conditions"
+    annotation(Evaluate=true);
+  parameter
+    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD dat(
+      EIRFunT={0.0101739374, 0.0607200115, 0.0003348647, 0.003162578, 0.0002388594, -0.0014121289},
+      capFunT={0.0387084662, 0.2305017927, 0.0004779504, 0.0178244359, -8.48808e-05, -0.0032406711},
+      EIRFunPLR={0.4304252832, -0.0144718912, 5.12039e-05, -0.7562386674, 0.5661683373,
+        0.0406987748, 3.0278e-06, -0.3413411197, -0.000469572, 0.0055009208},
+      QEva_flow_nominal=-1E6,
+      COP_nominal=2.5,
+      mEva_flow_nominal=20,
+      mCon_flow_nominal=22,
+      TEvaLvg_nominal=279.15,
+      TEvaLvgMin=277.15,
+      TEvaLvgMax=308.15,
+      TConLvg_nominal=333.15,
+      TConLvgMin=296.15,
+      TConLvgMax=336.15)
+    "Chiller parameters (each unit)"
+    annotation (
+      Dialog(group="CHW loop and cooling-only chillers"),
+      Placement(transformation(extent={{140,200},{160,220}})));
+
+  Buildings.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup
+    chi(
+    redeclare final package Medium = Medium,
+    show_T=true,
+    final nUni=nChiHea,
+    dpEva_nominal=3E5,
+    dpCon_nominal=3E5,
+    final dat=dat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Chiller group"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+
+  Fluid.Sources.Boundary_pT bouChiWat(
+    redeclare final package Medium = Medium,
+    p=300000,
+    nPorts=1) "Pressure boundary condition for CHW"
+    annotation (
+      Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={120,-190})));
+
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[0,1,1; 0.8,1,1; 0.8,1,0; 0.9,1,0; 0.9,0,0; 1,0,0],
+    timeScale=2000,
+    period=2000) "Chiller On/Off command"
+    annotation (Placement(transformation(extent={{-240,170},{-220,190}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Coo(
+    table=[0,0,0; 0.2,0,0; 0.2,0,1; 0.6,0,1; 0.6,1,1; 1,1,1],
+    timeScale=2000,
+    period=2000)
+    "Cooling mode switchover command"
+    annotation (Placement(transformation(extent={{-240,90},{-220,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1HeaCoo(
+    table=[0,0,0; 0.4,0,0; 0.4,1,0; 0.6,1,0; 0.6,0,0; 1,0,0],
+    timeScale=2000,
+    period=2000)
+    "Direct heat recovery switchover command"
+    annotation (Placement(transformation(extent={{-240,50},{-220,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSet[nChiHea](
+      each final k=chi.TChiWatSup_nominal, y(each final unit="K", each
+        displayUnit="degC")) "Supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-240,-190},{-220,-170}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[chi.nUni]
+    "Convert DO to AO" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-130,200})));
+  Fluid.Sensors.TemperatureTwoPort THeaWatSup(
+    redeclare final package Medium =
+               Medium, final m_flow_nominal=chi.mConWat_flow_nominal)
+    "HW supply temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={100,20})));
+  Fluid.Sensors.MassFlowRate floHeaWat(redeclare final package Medium =
+        Medium) "HW flow" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={130,80})));
+  Fluid.Sensors.MassFlowRate floChiWat(redeclare final package Medium =
+        Medium) "CHW flow" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={160,-100})));
+  Fluid.Sensors.TemperatureTwoPort TChiWatSup(redeclare final package Medium =
+               Medium, final m_flow_nominal=chi.mChiWat_flow_nominal)
+    "CHW supply temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={40,-80})));
+  Buildings.Controls.OBC.CDL.Logical.Or cooOrDir[nChiHea]
+    "Return true if cooling OR direct HR" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-160,-60})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal yValConSwi[nChiHea]
+    "HRC condenser switchover valve commanded position"
+                                           annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={0,-20})));
+  Buildings.Controls.OBC.CDL.Logical.Not hea[nChiHea] "Return true if heating"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-160,20})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nChiHea]
+    "Convert"
+    annotation (Placement(transformation(extent={{-140,10},{-120,30}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum numHea(nin=nChiHea)
+    "Number of HRC connected to HW loop"
+    annotation (Placement(transformation(extent={{-110,10},{-90,30}})));
+  Buildings.Controls.OBC.CDL.Integers.Less intLes[nChiHea]
+    "Return true if switchover valve to be open"
+    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant idx[nChiHea](final k={i
+        for i in 1:nChiHea}) "HRC index"
+    annotation (Placement(transformation(extent={{-240,-30},{-220,-10}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(final nout=
+        nChiHea) "Replicate"
+    annotation (Placement(transformation(extent={{-150,-50},{-130,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Or mul[nChiHea]
+    "Return true if cooling OR direct HR" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-20})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal yValEvaSwi[nChiHea]
+    "HRC evaporator switchover valve commanded position" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={0,-60})));
+  Buildings.Controls.OBC.CDL.Logical.Not heaAndCas[nChiHea]
+    "Return true if cascading heating" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-160,-100})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1[nChiHea]
+    "Convert"
+    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum numHeaAndCas(nin=nChiHea)
+    "Number of HRC in cascading heating"
+    annotation (Placement(transformation(extent={{-110,-110},{-90,-90}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep1(final nout=
+        nChiHea) "Replicate"
+    annotation (Placement(transformation(extent={{-150,-170},{-130,-150}})));
+  Buildings.Controls.OBC.CDL.Integers.Less intLes1
+                                                 [nChiHea]
+    "Return true if switchover valve to be open"
+    annotation (Placement(transformation(extent={{-110,-150},{-90,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.Or mul1
+                                           [nChiHea]
+    "Return true if cooling OR direct HR" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-60})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TChiHeaSupSet[nChiHea]
+    "Switch supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-168,-210},{-148,-190}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSet[nChiHea](
+      each final k=chi.THeaWatSup_nominal, y(each final unit="K", each
+        displayUnit="degC")) "Supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-240,-230},{-220,-210}})));
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumChiWat(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nPum=1,
+    have_var=false,
+    have_valve=true,
+    final mPum_flow_nominal=chi.mChiWat_flow_nominal,
+    final dpPum_nominal=chi.dpEva_nominal)
+    "CHW pumps"
+    annotation (Placement(transformation(extent={{120,-150},{140,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr y1PumConWatCon(nin=2)
+    "Start pump if any HRC in cascading cooling" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,140})));
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumHeaWat(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nPum=1,
+    have_var=false,
+    have_valve=true,
+    final mPum_flow_nominal=chi.mConWat_flow_nominal,
+    final dpPum_nominal=chi.dpCon_nominal)
+    "HW pumps" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={130,20})));
+  Buildings.Controls.OBC.CDL.Logical.And onAndHea[nChiHea]
+    "Return true if On and heating" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-100,60})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr y1PumHeaWat(nin=2)
+    "Start pump if any HRC On and in heating" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,60})));
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatCon(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nPum=1,
+    have_var=false,
+    have_valve=true,
+    final mPum_flow_nominal=chi.mConWat_flow_nominal,
+    final dpPum_nominal=chi.dpCon_nominal)
+    "CW pumps serving condenser barrels" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={130,160})));
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatEva(
+    redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    nPum=1,
+    have_var=false,
+    have_valve=true,
+    final mPum_flow_nominal=chi.mChiWat_flow_nominal,
+    final dpPum_nominal=chi.dpEva_nominal)
+    "CW pumps serving evaporator barrels"
+    annotation (Placement(transformation(extent={{120,-70},{140,-50}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold y1PumConWatEva(t=1)
+    "Return true if CW to be operating"
+    annotation (Placement(transformation(extent={{-40,-110},{-20,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr y1PumChiWat(nin=2)
+    "Start pump if any HRC in cooling or direct HR mode" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,-160})));
+  Fluid.HeatExchangers.SensibleCooler_T disHeaWat(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=THeaWatRet.k,
+    final dp_nominal=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    tau=300,
+    T_start=chi.THeaWatSup_nominal - 12)
+    "Distribution system approximated by prescribed temperature"
+    annotation (Placement(transformation(extent={{100,70},{80,90}})));
+  Fluid.HeatExchangers.Heater_T disConWatEva(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=chi.mChiWat_flow_nominal,
+    final dp_nominal=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    tau=300,
+    T_start=TConWatEvaSup.k)
+    "Distribution system approximated by prescribed temperature"
+    annotation (Placement(transformation(extent={{80,-70},{100,-50}})));
+  Fluid.HeatExchangers.SensibleCooler_T disConWatCon(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=TConWatConSup.k,
+    final dp_nominal=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    tau=300,
+    T_start=chi.TCasCooEnt_nominal)
+    "Distribution system approximated by prescribed temperature"
+    annotation (Placement(transformation(extent={{100,150},{80,170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(
+    final k=chi.THeaWatSup_nominal - 12,
+    y(final unit="K", displayUnit="degC"))
+    "Return temperature"
+    annotation (Placement(transformation(extent={{220,90},{200,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TConWatConSup(final k=
+        chi.TCasCooEnt_nominal, y(final unit="K", displayUnit="degC"))
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{220,170},{200,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TConWatEvaSup(final k=
+        chi.TCasHeaEnt_nominal, y(final unit="K", displayUnit="degC"))
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{220,-30},{200,-10}})));
+  Fluid.HeatExchangers.Heater_T disChiWat(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=TChiWatRet.k,
+    final dp_nominal=0,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    tau=300,
+    T_start=chi.TChiWatSup_nominal)
+    "Distribution system approximated by prescribed temperature"
+    annotation (Placement(transformation(extent={{80,-150},{100,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(
+    final k=chi.TChiWatSup_nominal + 6, y(final unit="K", displayUnit="degC"))
+    "Return temperature"
+    annotation (Placement(transformation(extent={{220,-130},{200,-110}})));
+  Fluid.Sources.Boundary_pT bouHeaWat(
+    redeclare final package Medium = Medium,
+    p=300000,
+    nPorts=1) "Pressure boundary condition for HW" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={210,40})));
+equation
+  connect(y1.y, chi.y1)
+    annotation (Line(points={{-218,180},{26,180},{26,6},{48,6}},
+                                               color={255,0,255}));
+  connect(y1Coo.y, chi.y1Coo)
+    annotation (Line(points={{-218,100},{14,100},{14,0},{48,0}},
+                                                        color={255,0,255}));
+  connect(y1.y, booToRea.u) annotation (Line(points={{-218,180},{-160,180},{-160,
+          200},{-142,200}},
+                     color={255,0,255}));
+  connect(booToRea.y, chi.yValEva) annotation (Line(points={{-118,200},{20,200},
+          {20,-16},{52,-16},{52,-12}},
+                       color={0,0,127}));
+  connect(chi.port_b1, THeaWatSup.port_a)
+    annotation (Line(points={{70,8},{80,8},{80,20},{90,20}},
+                                             color={0,127,255}));
+  connect(floChiWat.port_b, chi.port_a4)
+    annotation (Line(points={{160,-90},{160,-8},{70,-8}},
+                                                        color={0,127,255}));
+  connect(TChiWatSup.port_a, chi.port_b4) annotation (Line(points={{40,-70},{40,
+          -8.5},{50,-8.5}},  color={0,127,255}));
+  connect(y1Coo.y, cooOrDir.u1) annotation (Line(points={{-218,100},{-180,100},{
+          -180,-60},{-172,-60}},
+                               color={255,0,255}));
+  connect(y1HeaCoo.y, cooOrDir.u2) annotation (Line(points={{-218,60},{-190,60},
+          {-190,-68},{-172,-68}},
+                                color={255,0,255}));
+  connect(y1Coo.y, hea.u) annotation (Line(points={{-218,100},{-180,100},{-180,20},
+          {-172,20}}, color={255,0,255}));
+  connect(hea.y, booToInt.u)
+    annotation (Line(points={{-148,20},{-142,20}}, color={255,0,255}));
+  connect(booToInt.y, numHea.u)
+    annotation (Line(points={{-118,20},{-112,20}},
+                                                 color={255,127,0}));
+  connect(idx.y, intLes.u1)
+    annotation (Line(points={{-218,-20},{-112,-20}},color={255,127,0}));
+  connect(rep.y, intLes.u2) annotation (Line(points={{-128,-40},{-120,-40},{-120,
+          -28},{-112,-28}},
+                      color={255,127,0}));
+  connect(intLes.y, mul.u2) annotation (Line(points={{-88,-20},{-80,-20},{-80,-28},
+          {-42,-28}}, color={255,0,255}));
+  connect(mul.y, yValConSwi.u)
+    annotation (Line(points={{-18,-20},{-12,-20}},
+                                                 color={255,0,255}));
+  connect(yValConSwi.y, chi.yValConSwi) annotation (Line(points={{12,-20},{36,-20},
+          {36,16},{54,16},{54,12}}, color={0,0,127}));
+  connect(y1Coo.y[1:2], mul.u1) annotation (Line(points={{-218,100},{-60,100},{-60,
+          -20},{-42,-20}}, color={255,0,255}));
+  connect(yValEvaSwi.y, chi.yValEvaSwi) annotation (Line(points={{12,-60},{34,-60},
+          {34,-40},{54,-40},{54,-26},{54,-26},{54,-12}},
+                             color={0,0,127}));
+  connect(numHea.y, rep.u) annotation (Line(points={{-88,20},{-80,20},{-80,0},{-160,
+          0},{-160,-40},{-152,-40}}, color={255,127,0}));
+  connect(cooOrDir.y, heaAndCas.u) annotation (Line(points={{-148,-60},{-140,
+          -60},{-140,-80},{-176,-80},{-176,-100},{-172,-100}},
+                                                            color={255,0,255}));
+  connect(heaAndCas.y, booToInt1.u) annotation (Line(points={{-148,-100},{-142,-100}},
+                                    color={255,0,255}));
+  connect(booToInt1.y, numHeaAndCas.u)
+    annotation (Line(points={{-118,-100},{-112,-100}},
+                                                     color={255,127,0}));
+  connect(numHeaAndCas.y, rep1.u) annotation (Line(points={{-88,-100},{-80,-100},
+          {-80,-120},{-160,-120},{-160,-160},{-152,-160}},
+                                  color={255,127,0}));
+  connect(rep1.y, intLes1.u2) annotation (Line(points={{-128,-160},{-120,-160},
+          {-120,-148},{-112,-148}},
+                             color={255,127,0}));
+  connect(idx.y, intLes1.u1) annotation (Line(points={{-218,-20},{-200,-20},{-200,
+          -140},{-112,-140}},                  color={255,127,0}));
+  connect(cooOrDir.y, mul1.u1) annotation (Line(points={{-148,-60},{-42,-60}},
+                          color={255,0,255}));
+  connect(intLes1.y, mul1.u2) annotation (Line(points={{-88,-140},{-56,-140},{
+          -56,-68},{-42,-68}},
+                          color={255,0,255}));
+  connect(mul1.y, yValEvaSwi.u) annotation (Line(points={{-18,-60},{-12,-60}},
+                     color={255,0,255}));
+  connect(TChiWatSet.y, TChiHeaSupSet.u1) annotation (Line(points={{-218,-180},{
+          -190,-180},{-190,-192},{-170,-192}}, color={0,0,127}));
+  connect(THeaWatSet.y, TChiHeaSupSet.u3) annotation (Line(points={{-218,-220},{
+          -190,-220},{-190,-208},{-170,-208}}, color={0,0,127}));
+  connect(y1Coo.y, TChiHeaSupSet.u2) annotation (Line(points={{-218,100},{-180,100},
+          {-180,-200},{-170,-200}}, color={255,0,255}));
+  connect(TChiHeaSupSet.y, chi.TSet) annotation (Line(points={{-146,-200},{24,
+          -200},{24,-6},{48,-6}},
+                            color={0,0,127}));
+  connect(pumChiWat.port_b, floChiWat.port_a) annotation (Line(points={{140,-140},
+          {160,-140},{160,-110}},color={0,127,255}));
+  connect(y1Coo.y[1:2], y1PumConWatCon.u[1:2]) annotation (Line(points={{-218,100},
+          {-180,100},{-180,140},{-42,140},{-42,141.75}}, color={255,0,255}));
+  connect(pumHeaWat.port_b, floHeaWat.port_a) annotation (Line(points={{140,20},
+          {160,20},{160,80},{140,80}}, color={0,127,255}));
+  connect(y1.y[1:2], onAndHea.u1) annotation (Line(points={{-218,180},{-160,180},
+          {-160,60},{-112,60}}, color={255,0,255}));
+  connect(hea.y, onAndHea.u2) annotation (Line(points={{-148,20},{-146,20},{-146,
+          52},{-112,52}}, color={255,0,255}));
+  connect(onAndHea.y, y1PumHeaWat.u[1:2]) annotation (Line(points={{-88,60},{-42,
+          60},{-42,61.75}}, color={255,0,255}));
+  connect(y1PumHeaWat.y, pumHeaWat.y1[1]) annotation (Line(points={{-18,60},{110,
+          60},{110,28},{118,28}}, color={255,0,255}));
+  connect(THeaWatSup.port_b, pumHeaWat.port_a)
+    annotation (Line(points={{110,20},{120,20}}, color={0,127,255}));
+  connect(pumConWatEva.port_b, chi.port_a2) annotation (Line(points={{140,-60},{
+          150,-60},{150,3},{70,3}}, color={0,127,255}));
+  connect(chi.port_b3, pumConWatCon.port_a) annotation (Line(points={{70,-3.1},{
+          170,-3.1},{170,160},{140,160}}, color={0,127,255}));
+  connect(numHeaAndCas.y, y1PumConWatEva.u)
+    annotation (Line(points={{-88,-100},{-42,-100}}, color={255,127,0}));
+  connect(y1PumConWatEva.y, pumConWatEva.y1[1]) annotation (Line(points={{-18,-100},
+          {110,-100},{110,-52},{118,-52}}, color={255,0,255}));
+  connect(y1PumConWatCon.y, pumConWatCon.y1[1]) annotation (Line(points={{-18,140},
+          {160,140},{160,168},{142,168}}, color={255,0,255}));
+  connect(y1PumChiWat.y, pumChiWat.y1[1]) annotation (Line(points={{-18,-160},{110,
+          -160},{110,-132},{118,-132}}, color={255,0,255}));
+  connect(cooOrDir.y, y1PumChiWat.u[1:2]) annotation (Line(points={{-148,-60},{-60,
+          -60},{-60,-160},{-42,-160},{-42,-158.25}}, color={255,0,255}));
+  connect(floHeaWat.port_b, disHeaWat.port_a)
+    annotation (Line(points={{120,80},{100,80}}, color={0,127,255}));
+  connect(disHeaWat.port_b, chi.port_a1) annotation (Line(points={{80,80},{44,80},
+          {44,8},{50,8}},     color={0,127,255}));
+  connect(chi.port_b2, disConWatEva.port_a) annotation (Line(points={{50,3},{44,
+          3},{44,-60},{80,-60}}, color={0,127,255}));
+  connect(disConWatEva.port_b, pumConWatEva.port_a)
+    annotation (Line(points={{100,-60},{120,-60}}, color={0,127,255}));
+  connect(pumConWatCon.port_b, disConWatCon.port_a)
+    annotation (Line(points={{120,160},{100,160}}, color={0,127,255}));
+  connect(disConWatCon.port_b, chi.port_a3) annotation (Line(points={{80,160},{40,
+          160},{40,-3.2},{50,-3.2}},    color={0,127,255}));
+  connect(THeaWatRet.y, disHeaWat.TSet) annotation (Line(points={{198,100},{110,
+          100},{110,88},{102,88}},color={0,0,127}));
+  connect(TConWatConSup.y, disConWatCon.TSet) annotation (Line(points={{198,180},
+          {110,180},{110,168},{102,168}}, color={0,0,127}));
+  connect(TConWatEvaSup.y, disConWatEva.TSet) annotation (Line(points={{198,-20},
+          {70,-20},{70,-52},{78,-52}}, color={0,0,127}));
+  connect(disChiWat.port_b, pumChiWat.port_a)
+    annotation (Line(points={{100,-140},{120,-140}}, color={0,127,255}));
+  connect(TChiWatSup.port_b, disChiWat.port_a) annotation (Line(points={{40,-90},
+          {40,-140},{80,-140}}, color={0,127,255}));
+  connect(TChiWatRet.y, disChiWat.TSet) annotation (Line(points={{198,-120},{68,
+          -120},{68,-132},{78,-132}}, color={0,0,127}));
+  connect(bouChiWat.ports[1], pumChiWat.port_a)
+    annotation (Line(points={{120,-180},{120,-140}}, color={0,127,255}));
+  connect(booToRea.y, chi.yValCon) annotation (Line(points={{-118,200},{52,200},
+          {52,12}},                color={0,0,127}));
+  connect(bouHeaWat.ports[1], pumHeaWat.port_a) annotation (Line(points={{200,40},
+          {116,40},{116,20},{120,20}}, color={0,127,255}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=2000,
+      Tolerance=1e-06),
+    Diagram(coordinateSystem(extent={{-260,-260},{260,260}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup</a>
+in a configuration with two HRCs.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ChillerHeatRecoveryGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
new file mode 100644
index 00000000000..4ed9491bc58
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
@@ -0,0 +1,143 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model CoolingTowerGroup "Validation of cooling tower group model"
+  extends Modelica.Icons.Example;
+
+  replaceable package MediumConWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CW medium";
+
+  Buildings.DHC.Plants.Combined.Subsystems.CoolingTowerGroup coo(
+    redeclare final package Medium = MediumConWat,
+    show_T=true,
+    nUni=2,
+    mConWatUni_flow_nominal=1,
+    dpConWatFriUni_nominal=1E4,
+    mAirUni_flow_nominal=coo.mConWatUni_flow_nominal/1.45,
+    TWetBulEnt_nominal=297.05,
+    TConWatRet_nominal=308.15,
+    TConWatSup_nominal=302.55,
+    PFanUni_nominal=340*coo.mConWatUni_flow_nominal,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Cooling tower group"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  Fluid.Sources.Boundary_pT bouConWat(
+    redeclare final package Medium = MediumConWat,
+    T=coo.TConWatRet_nominal,
+    nPorts=2)
+    "Boundary conditions for CW"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={0,-70})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TConWatSupSet(
+    height=+3,
+    duration=500,
+    offset=coo.TConWatSup_nominal,
+    startTime=500,
+    y(displayUnit="degC", unit="K"))
+    "CW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[0,1,1; 0.4,1,1; 0.4,1,0; 0.8,1,0; 0.8,0,0; 1,0,0],
+    timeScale=1000,
+    period=1000)
+    "On/Off command"
+    annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    filNam=Modelica.Utilities.Files.loadResource(
+    "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Outdoor conditions"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-100,20})));
+  Fluid.Sensors.TemperatureTwoPort TConWatSup(
+    redeclare package Medium =MediumConWat,
+    final m_flow_nominal=coo.mConWat_flow_nominal)
+    "CW supply temperature" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=180,
+        origin={30,0})));
+  Fluid.Sensors.TemperatureTwoPort TConWatRet(
+    redeclare package Medium =MediumConWat,
+    final m_flow_nominal=coo.mConWat_flow_nominal)
+    "CW return temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-60,-40})));
+  ETS.Combined.Controls.PIDWithEnable ctl(
+    k=1,
+    Ti=60,
+    reverseActing=false) "Controller"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum(
+    redeclare package Medium =MediumConWat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    final nPum=coo.nUni,
+    have_var=false,
+    have_valve=false,
+    final mPum_flow_nominal=coo.mConWatUni_flow_nominal,
+    final dpPum_nominal=coo.dpConWatFriUni_nominal)
+    "CW pumps"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+equation
+  connect(y1.y, coo.y1) annotation (Line(points={{-88,100},{-40,100},{-40,6},{-12,
+          6}}, color={255,0,255}));
+  connect(weaDat.weaBus, coo.weaBus) annotation (Line(
+      points={{-90,20},{0,20},{0,10}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(coo.port_b, TConWatSup.port_a)
+    annotation (Line(points={{10,0},{10,1.77636e-15},{20,1.77636e-15}},
+                                                      color={0,127,255}));
+  connect(bouConWat.ports[1],TConWatRet. port_a) annotation (Line(points={{-1,-80},
+          {-60,-80},{-60,-50}},  color={0,127,255}));
+  connect(TConWatRet.port_b, coo.port_a)
+    annotation (Line(points={{-60,-30},{-60,0},{-10,0}}, color={0,127,255}));
+  connect(coo.TConWatSup, ctl.u_m) annotation (Line(points={{12,4},{20,4},{20,
+          40},{0,40},{0,48}}, color={0,0,127}));
+  connect(y1.y[1], ctl.uEna) annotation (Line(points={{-88,100},{-40,100},{-40,
+          40},{-4,40},{-4,48}}, color={255,0,255}));
+  connect(TConWatSupSet.y, ctl.u_s)
+    annotation (Line(points={{-88,60},{-12,60}}, color={0,0,127}));
+  connect(ctl.y, coo.y) annotation (Line(points={{12,60},{20,60},{20,80},{-28,
+          80},{-28,-6},{-12,-6}}, color={0,0,127}));
+  connect(pum.port_b, bouConWat.ports[2]) annotation (Line(points={{70,0},{80,0},
+          {80,-80},{1,-80}},   color={0,127,255}));
+  connect(TConWatSup.port_b, pum.port_a)
+    annotation (Line(points={{40,0},{50,0}}, color={0,127,255}));
+  connect(y1.y, pum.y1) annotation (Line(points={{-88,100},{40,100},{40,8},{48,8}},
+        color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.CoolingTowerGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.CoolingTowerGroup</a>
+in a configuration with two tower cells.
+The tower cells are initially enabled and they are disabled one after the other
+as the CW supply temperature setpoint is increasing after an initial
+period where it is fixed at its design value.
+The Start command of the CW pumps is the same signal
+as the one used for the cooling towers.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end CoolingTowerGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
new file mode 100644
index 00000000000..4725caffcd5
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
@@ -0,0 +1,142 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model HeatPumpGroup "Validation of heat pump group model"
+  extends Modelica.Icons.Example;
+
+  replaceable package MediumHeaWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW medium";
+  replaceable package MediumAir=Buildings.Media.Air
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CW medium";
+
+  parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic dat(
+    dpHeaLoa_nominal=50000,
+    dpHeaSou_nominal=100,
+    hea(
+      mLoa_flow=dat.hea.Q_flow / 10 / 4186,
+      mSou_flow=1E-4 * dat.hea.Q_flow,
+      Q_flow=1E6,
+      P=dat.hea.Q_flow / 2.2,
+      coeQ={-5.64420084,  1.95212447,  9.96663913,  0.23316322, -5.64420084},
+      coeP={-3.96682255,  6.8419453,   1.99606939,  0.01393387, -3.96682255},
+      TRefLoa=298.15,
+      TRefSou=253.15),
+    coo(
+      mLoa_flow=0,
+      mSou_flow=0,
+      Q_flow=-1,
+      P=0,
+      coeQ=fill(0, 5),
+      coeP=fill(0, 5),
+      TRefLoa=273.15,
+      TRefSou=273.15))
+    "Heat pump parameters (each unit)"
+    annotation (Placement(transformation(extent={{90,92},{110,112}})));
+
+  Buildings.DHC.Plants.Combined.Subsystems.HeatPumpGroup heaPum(
+    redeclare final package Medium = MediumHeaWat,
+    redeclare final package MediumAir = MediumAir,
+    show_T=true,
+    nUni=2,
+    final dat=dat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Heat pump group"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  Fluid.Sources.Boundary_pT bouHeaWat(
+    redeclare final package Medium = MediumHeaWat,
+    use_T_in=true,
+    nPorts=2)
+    "Boundary conditions for HW"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={2,-90})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(
+    k=dat.hea.TRefLoa+ 10,
+    y(displayUnit="degC", unit="K")) "HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[0,1,1; 0.5,1,1; 0.5,1,0; 0.8,1,0; 0.8,0,0; 1,0,0],
+    timeScale=1000,
+    period=1000)
+    "Heat pump On/Off command"
+    annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
+
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    filNam=Modelica.Utilities.Files.loadResource(
+    "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
+    "Outdoor conditions"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-100,20})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp THeaWatRetBou(
+    y(displayUnit="degC", unit="K"),
+    height=+5,
+    duration=1000,
+    offset=dat.hea.TRefLoa) "HW return temperature"
+    annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
+  Fluid.Sensors.TemperatureTwoPort THeaWatSup(
+    redeclare package Medium = MediumHeaWat,
+    final m_flow_nominal=heaPum.mHeaWat_flow_nominal)
+    "HW supply temperature" annotation (Placement(transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=90,
+        origin={20,-40})));
+  Fluid.Sensors.TemperatureTwoPort THeaWatRet(
+    redeclare package Medium = MediumHeaWat,
+    final m_flow_nominal=heaPum.mHeaWat_flow_nominal)
+    "HW return temperature" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-20,-40})));
+equation
+  connect(THeaWatSupSet.y,heaPum. TSet) annotation (Line(points={{-88,60},{-60,60},
+          {-60,-6},{-12,-6}},      color={0,0,127}));
+  connect(y1.y,heaPum. y1) annotation (Line(points={{-88,100},{-40,100},{-40,6},
+          {-12,6}},
+               color={255,0,255}));
+  connect(weaDat.weaBus,heaPum. weaBus) annotation (Line(
+      points={{-90,20},{0,20},{0,10}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(THeaWatRetBou.y, bouHeaWat.T_in)
+    annotation (Line(points={{-88,-60},{6,-60},{6,-78}}, color={0,0,127}));
+  connect(heaPum.port_b, THeaWatSup.port_a)
+    annotation (Line(points={{10,0},{20,0},{20,-30}}, color={0,127,255}));
+  connect(THeaWatSup.port_b, bouHeaWat.ports[1])
+    annotation (Line(points={{20,-50},{20,-100},{1,-100}}, color={0,127,255}));
+  connect(bouHeaWat.ports[2], THeaWatRet.port_a) annotation (Line(points={{3,-100},
+          {-20,-100},{-20,-50}}, color={0,127,255}));
+  connect(THeaWatRet.port_b, heaPum.port_a)
+    annotation (Line(points={{-20,-30},{-20,0},{-10,0}}, color={0,127,255}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.HeatPumpGroup\">
+Buildings.DHC.Plants.Combined.Subsystems.HeatPumpGroup</a>
+in a configuration with two heat pumps.
+The heat pumps are initially On and they are switched Off one after the other
+as they are exposed to an increasing HW return temperature.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HeatPumpGroup;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
new file mode 100644
index 00000000000..e2a595f38c0
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
@@ -0,0 +1,58 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model MultiplePumpsDp
+  "Validation of multiple pumps model with dp-controlled pump model"
+  extends BaseClasses.PartialMultiplePumps(
+    redeclare final Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsDp pum,
+    redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum1(
+      final m_flow_nominal=mPum_flow_nominal,
+      final dp_nominal=dpPum_nominal),
+    redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum2(
+      final m_flow_nominal=mPum_flow_nominal,
+      final dp_nominal=dpPum_nominal));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpSet(
+    height=dpPum_nominal, duration=500)
+    "Differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
+equation
+  connect(dpSet.y, inp1.u1)
+    annotation (Line(points={{-98,40},{114,40},{114,14}}, color={0,0,127}));
+  connect(dpSet.y, inp2.u1) annotation (Line(points={{-98,40},{100,40},{100,-26},
+          {114,-26},{114,-30}}, color={0,0,127}));
+  connect(inp1.y, pum1.dp_in) annotation (Line(points={{120,-10},{120,-20},{0,-20},
+          {0,-28}}, color={0,0,127}));
+  connect(inp2.y, pum2.dp_in) annotation (Line(points={{120,-54},{120,-60},{0,-60},
+          {0,-68}}, color={0,0,127}));
+  connect(dpSet.y, pum.dp_in) annotation (Line(points={{-98,40},{-40,40},{-40,64},
+          {-12,64}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+  Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsDp\">
+Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsDp</a>
+by comparing an instance of that model with two instances of
+<a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_dp\">
+Buildings.Fluid.Movers.FlowControlled_dp</a>
+connected in parallel.
+The two pumps are commanded On one after the other as they receive
+an increasing differential pressure setpoint and work
+against a two-way modulating valve that gets progressively opened.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiplePumpsDp;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
new file mode 100644
index 00000000000..5149514b6bf
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
@@ -0,0 +1,67 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model MultiplePumpsFlow
+  "Validation of multiple pumps model with flow-controlled pump model"
+  extends BaseClasses.PartialMultiplePumps(
+    redeclare final Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow pum,
+    redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum1(
+      final m_flow_nominal=mPum_flow_nominal,
+      final dp_nominal=dpPum_nominal),
+    redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum2(
+      final m_flow_nominal=mPum_flow_nominal,
+      final dp_nominal=dpPum_nominal));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp floSet(height=
+        mPum_flow_nominal, duration=500) "Mass flow rate setpoint (each pump)"
+    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Add floTotSet
+    "Compute total flow rate setpoint (all pumps)" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={80,0})));
+equation
+  connect(floSet.y, inp1.u1)
+    annotation (Line(points={{-98,40},{114,40},{114,14}}, color={0,0,127}));
+  connect(floSet.y, inp2.u1) annotation (Line(points={{-98,40},{100,40},{100,-26},
+          {114,-26},{114,-30}}, color={0,0,127}));
+  connect(inp2.y, pum2.m_flow_in) annotation (Line(points={{120,-54},{120,-60},
+          {0,-60},{0,-68}}, color={0,0,127}));
+  connect(inp1.y, pum1.m_flow_in) annotation (Line(points={{120,-10},{120,-20},
+          {0,-20},{0,-28}}, color={0,0,127}));
+  connect(floTotSet.y, pum.m_flow_in) annotation (Line(points={{80,12},{80,44},
+          {-16,44},{-16,64},{-12,64}}, color={0,0,127}));
+  connect(inp1.y, floTotSet.u1) annotation (Line(points={{120,-10},{120,-20},{
+          86,-20},{86,-12}}, color={0,0,127}));
+  connect(inp2.y, floTotSet.u2) annotation (Line(points={{120,-54},{120,-60},{
+          74,-60},{74,-12}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+  Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow\">
+Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow</a>
+by comparing an instance of that model with two instances of
+<a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_m_flow\">
+Buildings.Fluid.Movers.FlowControlled_m_flow</a>
+connected in parallel.
+The two pumps are commanded On one after the other as they receive
+an increasing flow setpoint and work against a two-way modulating
+valve that gets progressively opened.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiplePumpsFlow;
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
new file mode 100644
index 00000000000..15cffc337f1
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
@@ -0,0 +1,53 @@
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
+model MultiplePumpsSpeed
+  "Validation of multiple pumps model with speed-controlled pump model"
+  extends BaseClasses.PartialMultiplePumps(
+    redeclare final Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum,
+    redeclare final Fluid.Movers.SpeedControlled_y pum1,
+    redeclare final Fluid.Movers.SpeedControlled_y pum2);
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp spe(duration=500)
+    "Pump speed signal"
+    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
+equation
+  connect(spe.y, pum.y) annotation (Line(points={{-98,40},{-40,40},{-40,64},{
+          -12,64}}, color={0,0,127}));
+  connect(spe.y, inp1.u1)
+    annotation (Line(points={{-98,40},{114,40},{114,14}}, color={0,0,127}));
+  connect(spe.y, inp2.u1) annotation (Line(points={{-98,40},{100,40},{100,-26},
+          {114,-26},{114,-30}}, color={0,0,127}));
+  connect(inp1.y, pum1.y) annotation (Line(points={{120,-10},{120,-20},{0,-20},
+          {0,-28}}, color={0,0,127}));
+  connect(inp2.y, pum2.y) annotation (Line(points={{120,-54},{120,-60},{0,-60},
+          {0,-68}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=1000,
+      Tolerance=1e-06),
+  Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed\">
+Buildings.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed</a>
+by comparing an instance of that model with two instances of
+<a href=\"modelica://Buildings.Fluid.Movers.SpeedControlled_y\">
+Buildings.Fluid.Movers.SpeedControlled_y</a>
+connected in parallel.
+The two pumps are commanded On one after the other as they receive
+an increasing speed signal and work against a two-way modulating valve
+that gets progressively opened.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiplePumpsSpeed;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
index ed84d121851..5b3ea86e6f5 100644
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
+within Buildings.DHC.Plants.Combined.Subsystems.Validation;
 model ValveOpeningFlowBalancing
   "Validation model for the computation of the valve opening ensuring flow balancing"
   extends Modelica.Icons.Example;
@@ -72,7 +72,7 @@ equation
           0,-20},{0,-28}}, color={0,0,127}));
   annotation (
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos"
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos"
       "Simulate and plot"),
     experiment(
       StopTime=1,
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.mo
new file mode 100644
index 00000000000..096eff30a95
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.mo
@@ -0,0 +1,10 @@
+within Buildings.DHC.Plants.Combined.Subsystems;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This pakcge contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.order b/Buildings/DHC/Plants/Combined/Subsystems/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/Validation/package.order
diff --git a/Buildings/DHC/Plants/Combined/Subsystems/package.mo b/Buildings/DHC/Plants/Combined/Subsystems/package.mo
new file mode 100644
index 00000000000..dae1b6795fb
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Subsystems/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Plants.Combined;
+package Subsystems "Package of models for subsystems of combined plants"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains models of components used in
+combined heating and cooling plants.
+</p>
+</html>"));
+end Subsystems;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.order b/Buildings/DHC/Plants/Combined/Subsystems/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.order
rename to Buildings/DHC/Plants/Combined/Subsystems/package.order
diff --git a/Buildings/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo b/Buildings/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
new file mode 100644
index 00000000000..2eba202eae4
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
@@ -0,0 +1,237 @@
+within Buildings.DHC.Plants.Combined.Validation;
+model AllElectricCWStorage "Validation of all-electric plant model"
+  extends Modelica.Icons.Example;
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Main medium (common to CHW, HW and CW)";
+  replaceable package MediumConWatCoo=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium in cooler circuit";
+
+  replaceable parameter
+    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD datChi(
+      EIRFunT={0.0101739374, 0.0607200115, 0.0003348647, 0.003162578, 0.0002388594, -0.0014121289},
+      capFunT={0.0387084662, 0.2305017927, 0.0004779504, 0.0178244359, -8.48808e-05, -0.0032406711},
+      EIRFunPLR={0.4304252832, -0.0144718912, 5.12039e-05, -0.7562386674, 0.5661683373,
+        0.0406987748, 3.0278e-06, -0.3413411197, -0.000469572, 0.0055009208},
+      QEva_flow_nominal=-1E6,
+      COP_nominal=2.5,
+    mEva_flow_nominal=-datChi.QEva_flow_nominal/5/4186,
+      mCon_flow_nominal=-datChi.QEva_flow_nominal * (1 + 1/datChi.COP_nominal) / 10 / 4186,
+    TEvaLvg_nominal=279.15,
+    TEvaLvgMin=277.15,
+    TEvaLvgMax=308.15,
+    TConLvg_nominal=333.15,
+    TConLvgMin=296.15,
+    TConLvgMax=336.15)
+    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
+    "Chiller parameters (each unit)"
+    annotation (
+      Dialog(group="CHW loop and cooling-only chillers"),
+      Placement(transformation(extent={{140,200},{160,220}})));
+  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChiHea=
+    datChi
+    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
+    "Chiller parameters (each unit)"
+    annotation (
+      Dialog(group="HW loop and heat recovery chillers"),
+      Placement(transformation(extent={{170,200},{190,220}})));
+  replaceable parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic datHeaPum(
+    dpHeaLoa_nominal=50000,
+    dpHeaSou_nominal=100,
+    hea(
+      mLoa_flow=datHeaPum.hea.Q_flow / 10 / 4186,
+      mSou_flow=1E-4 * datHeaPum.hea.Q_flow,
+      Q_flow=1E6,
+      P=datHeaPum.hea.Q_flow / 2.2,
+      coeQ={-5.64420084,  1.95212447,  9.96663913,  0.23316322, -5.64420084},
+      coeP={-3.96682255,  6.8419453,   1.99606939,  0.01393387, -3.96682255},
+      TRefLoa=298.15,
+      TRefSou=253.15),
+    coo(
+      mLoa_flow=0,
+      mSou_flow=0,
+      Q_flow=-1,
+      P=0,
+      coeQ=fill(0, 5),
+      coeP=fill(0, 5),
+      TRefLoa=273.15,
+      TRefSou=273.15))
+    "Heat pump parameters (each unit)"
+    annotation (Placement(transformation(extent={{200,200},{220,220}})));
+
+  // Assumptions
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
+    Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
+
+  Buildings.DHC.Plants.Combined.AllElectricCWStorage pla(
+    redeclare final package Medium = Medium,
+    redeclare package MediumHea_b = Medium,
+    redeclare final package MediumConWatCoo = MediumConWatCoo,
+    allowFlowReversal=true,
+    dpConWatCooFri_nominal=1E4,
+    mAirCooUni_flow_nominal=pla.mConWatCoo_flow_nominal/pla.nCoo/1.45,
+    TWetBulCooEnt_nominal=297.05,
+    PFanCoo_nominal=340*pla.mConWatCoo_flow_nominal/pla.nCoo,
+    chi(show_T=true),
+    chiHea(show_T=true),
+    heaPum(show_T=true),
+    final datChi=datChi,
+    final datChiHea=datChiHea,
+    final datHeaPum=datHeaPum,
+    nChi=2,
+    dpChiWatSet_max=20E4,
+    nChiHea=2,
+    dpHeaWatSet_max=20E4,
+    nHeaPum=2,
+    dInsTan=0.05,
+    nCoo=3,
+    final energyDynamics=energyDynamics)
+    "CHW and HW plant"
+    annotation (Placement(transformation(extent={{-30,-30},{30,30}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(final k=pla.TChiWatSup_nominal,
+    y(final unit="K", displayUnit="degC"))
+                   "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-220,10},{-200,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(final k=pla.THeaWatSup_nominal,
+    y(final unit="K", displayUnit="degC"))
+                   "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-190,-10},{-170,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpHeaWatSet_max(
+    k=pla.dpHeaWatSet_max,
+    y(final unit="Pa")) "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpChiWatSet_max(
+    k=pla.dpChiWatSet_max,
+    y(final unit="Pa")) "Source signal for setpoint"
+    annotation (Placement(transformation(extent={{-220,-50},{-200,-30}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
+        Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Outdoor conditions"
+    annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-210,120})));
+  Fluid.HeatExchangers.SensibleCooler_T disHeaWat(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=pla.mHeaWat_flow_nominal,
+    final dp_nominal=0,
+    final energyDynamics=energyDynamics,
+    tau=300)
+    "Distribution system approximated by prescribed return temperature"
+    annotation (Placement(transformation(extent={{12,130},{-8,150}})));
+  Fluid.HeatExchangers.Heater_T disChiWat(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=pla.mChiWat_flow_nominal,
+    show_T=true,
+    final dp_nominal=0,
+    final energyDynamics=energyDynamics,
+    tau=300)
+    "Distribution system approximated by prescribed return temperature"
+    annotation (Placement(transformation(extent={{10,-150},{-10,-130}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(k=pla.THeaWatRet_nominal,
+              y(final unit="K", displayUnit="degC"))
+    "Source signal for HW return temperature"
+    annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(k=pla.TChiWatRet_nominal,
+              y(final unit="K", displayUnit="degC"))
+    "Source signal for CHW return temperature"
+    annotation (Placement(transformation(extent={{-220,-110},{-200,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
+    table=[0,0,0; 4,1,1; 72,0,1; 96,0,0],
+    timeScale=3600,
+    period=96*3600) "Plant enable signal: y[1] for cooling, y[2] for heating"
+    annotation (Placement(transformation(extent={{-220,50},{-200,70}})));
+  Fluid.Actuators.Valves.TwoWayPressureIndependent valDisHeaWat(
+    redeclare final package Medium = Medium,
+    m_flow_nominal=pla.mHeaWat_flow_nominal,
+    dpValve_nominal=1E4,
+    dpFixed_nominal=pla.dpHeaWatSet_max - valDisHeaWat.dpValve_nominal)
+    "Distribution system approximated by variable flow resistance"
+    annotation (Placement(transformation(extent={{-30,130},{-50,150}})));
+  Fluid.Actuators.Valves.TwoWayPressureIndependent valDisChiWat(
+    redeclare final package Medium = Medium,
+    m_flow_nominal=pla.mChiWat_flow_nominal,
+    dpValve_nominal=1E4,
+    dpFixed_nominal=pla.dpChiWatSet_max - valDisChiWat.dpValve_nominal)
+    "Distribution system approximated by variable flow resistance"
+    annotation (Placement(transformation(extent={{-30,-150},{-50,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(table=[0,0,0;
+        6,0,0; 10,0.3,0.1; 15,1,0.1; 24,0.1,0.1; 30,0.1,1; 39,1,0.3; 48,0.1,0.1;
+        54,0.1,1; 63,0.1,0.3; 72,0,0; 78,0,1; 96,0,0],
+                                    timeScale=3600)
+    "Source signal: y[1] for cooling load, y[2] for heating load"
+    annotation (Placement(transformation(extent={{-220,170},{-200,190}})));
+equation
+  connect(TChiWatSupSet.y, pla.TChiWatSupSet) annotation (Line(points={{-198,20},
+          {-34,20}},                   color={0,0,127}));
+  connect(THeaWatSupSet.y, pla.THeaWatSupSet) annotation (Line(points={{-168,0},
+          {-74,0},{-74,16},{-34,16}},   color={0,0,127}));
+  connect(dpChiWatSet_max.y, pla.dpChiWatSet) annotation (Line(points={{-198,-40},
+          {-70,-40},{-70,12},{-34,12}},color={0,0,127}));
+  connect(dpHeaWatSet_max.y, pla.dpHeaWatSet) annotation (Line(points={{-168,-60},
+          {-66,-60},{-66,8},{-34,8}},   color={0,0,127}));
+
+  connect(weaDat.weaBus, pla.weaBus) annotation (Line(
+      points={{-200,120},{0,120},{0,30}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(pla.port_bSerHea, disHeaWat.port_a) annotation (Line(points={{30,0},{
+          60,0},{60,140},{12,140}}, color={0,127,255}));
+  connect(pla.port_bSerCoo, disChiWat.port_a) annotation (Line(points={{30,-4},
+          {60,-4},{60,-140},{10,-140}},color={0,127,255}));
+  connect(THeaWatRet.y, disHeaWat.TSet) annotation (Line(points={{-168,80},{20,80},
+          {20,148},{14,148}},      color={0,0,127}));
+  connect(TChiWatRet.y, disChiWat.TSet) annotation (Line(points={{-198,-100},{20,
+          -100},{20,-132},{12,-132}}, color={0,0,127}));
+  connect(u1.y[1], pla.u1Coo) annotation (Line(points={{-198,60},{-40,60},{-40,28},
+          {-34,28}},     color={255,0,255}));
+  connect(disHeaWat.port_b, valDisHeaWat.port_a)
+    annotation (Line(points={{-8,140},{-30,140}}, color={0,127,255}));
+  connect(valDisHeaWat.port_b, pla.port_aSerHea) annotation (Line(points={{-50,140},
+          {-60,140},{-60,0},{-30,0}}, color={0,127,255}));
+  connect(disChiWat.port_b, valDisChiWat.port_a)
+    annotation (Line(points={{-10,-140},{-30,-140}}, color={0,127,255}));
+  connect(valDisChiWat.port_b, pla.port_aSerCoo) annotation (Line(points={{-50,-140},
+          {-60,-140},{-60,-4},{-30,-4}}, color={0,127,255}));
+  connect(ratFlo.y[2], valDisHeaWat.y) annotation (Line(points={{-198,180},{-40,
+          180},{-40,152}}, color={0,0,127}));
+  connect(ratFlo.y[1], valDisChiWat.y) annotation (Line(points={{-198,180},{-80,
+          180},{-80,-120},{-40,-120},{-40,-128}}, color={0,0,127}));
+  connect(u1.y[2], pla.u1Hea) annotation (Line(points={{-198,60},{-40,60},{-40,
+          24},{-34,24}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos"
+      "Simulate and plot"),
+    experiment(
+      StopTime=345600,
+      Tolerance=1e-06),
+  Diagram(coordinateSystem(extent={{-240,-240},{240,240}})),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Combined.AllElectricCWStorage\">
+Buildings.DHC.Plants.Combined.AllElectricCWStorage</a>
+over a four-day simulation period where the load profile is characterized by
+high cooling loads and low heating loads during the first day,
+concomitant high cooling and heating loads during the second day,
+low cooling loads and high heating loads during the third day,
+and no cooling loads (cooling disabled) and high heating loads
+during the last day.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+February 24, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AllElectricCWStorage;
diff --git a/Buildings/DHC/Plants/Combined/Validation/package.mo b/Buildings/DHC/Plants/Combined/Validation/package.mo
new file mode 100644
index 00000000000..dc17d159474
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/Validation/package.mo
@@ -0,0 +1,10 @@
+within Buildings.DHC.Plants.Combined;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Validation/package.order b/Buildings/DHC/Plants/Combined/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/Validation/package.order
rename to Buildings/DHC/Plants/Combined/Validation/package.order
diff --git a/Buildings/DHC/Plants/Combined/package.mo b/Buildings/DHC/Plants/Combined/package.mo
new file mode 100644
index 00000000000..20e7613ab18
--- /dev/null
+++ b/Buildings/DHC/Plants/Combined/package.mo
@@ -0,0 +1,11 @@
+within Buildings.DHC.Plants;
+package Combined "Package of models for central plants that provide heating and cooling"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains models for combined heating and cooling plants
+used in DHC systems.
+</p>
+</html>"));
+end Combined;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/package.order b/Buildings/DHC/Plants/Combined/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Combined/package.order
rename to Buildings/DHC/Plants/Combined/package.order
diff --git a/Buildings/DHC/Plants/Cooling/BaseClasses/IdealUser.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
new file mode 100644
index 00000000000..c72266210b0
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
@@ -0,0 +1,194 @@
+within Buildings.DHC.Plants.Cooling.BaseClasses;
+model IdealUser "Ideal user model"
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium package";
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate";
+
+  parameter Modelica.Units.SI.Temperature T_CHWR_nominal
+    "Nominal temperature of CHW return";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(
+    final displayUnit="Pa")
+    "Nominal pressure drop when valve is fully open";
+
+  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage val(
+    redeclare final package Medium = Medium,
+    final use_inputFilter=true,
+    final dpValve_nominal=dp_nominal/2,
+    final init=Modelica.Blocks.Types.Init.InitialState,
+    final dpFixed_nominal=dp_nominal/2,
+    final m_flow_nominal=m_flow_nominal,
+    y_start=0) "User control valve"
+    annotation (Placement(transformation(extent={{0,50},{20,70}})));
+  Buildings.Controls.Continuous.LimPID conPI(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    k=0.5,
+    Ti=20,
+    final reverseActing=true)  "PI controller" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,80})));
+  Modelica.Blocks.Interfaces.RealInput mPre_flow(
+    final quantity = "MassFlowRate",
+    final unit = "kg/s")
+    "Load in terms of flow rate prescription" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-110,80}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-110,80})));
+  Modelica.Blocks.Interfaces.RealOutput yVal_actual(
+    final unit = "1")
+    "Consumer control valve actuator position" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={110,80}), iconTransformation(
+        extent={{10,-10},{-10,10}},
+        rotation=180,
+        origin={110,80})));
+  Buildings.Fluid.Sensors.RelativePressure senRelPre(
+    redeclare final package Medium = Medium)
+    "Differential pressure sensor" annotation (Placement(
+        transformation(
+        extent={{-10,10},{10,-10}},
+        rotation=-90,
+        origin={-72,20})));
+  Modelica.Blocks.Interfaces.RealOutput dp(
+    final quantity="PressureDifference",
+    final unit="Pa",
+    displayUnit="Pa")
+    "Differential pressure from the sensor" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={110,20}),  iconTransformation(
+        extent={{10,-10},{-10,10}},
+        rotation=180,
+        origin={110,40})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_a(
+    p(start=Medium.p_default),
+    redeclare final package Medium = Medium,
+    h_outflow(start=Medium.h_default, nominal=Medium.h_default))
+    "Fluid connector a (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}}),
+        iconTransformation(extent={{-110,50},{-90,70}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b(
+    p(start=Medium.p_default),
+    redeclare final package Medium = Medium,
+    h_outflow(start=Medium.h_default, nominal=Medium.h_default))
+    "Fluid connector b (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{-90,-70},{-110,-50}}),
+        iconTransformation(extent={{-90,-70},{-110,-50}})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
+    redeclare final package Medium = Medium)
+    "Mass flow rate sensor"
+    annotation (Placement(transformation(extent={{-20,-70},{-40,-50}})));
+  Buildings.Fluid.Sources.PropertySource_T proSou(
+    redeclare final package Medium = Medium,
+    final use_T_in=true) "Ideal temperature source" annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={10,-60})));
+  Modelica.Blocks.Sources.Constant TRet(final k=T_CHWR_nominal)
+    "Constant CHW return temperature"
+    annotation (Placement(transformation(extent={{-20,-40},{0,-20}})));
+equation
+  connect(senRelPre.p_rel, dp) annotation (Line(points={{-63,20},{110,20}},
+                           color={0,0,127}));
+  connect(val.y_actual, yVal_actual)
+    annotation (Line(points={{15,67},{40,67},{40,80},{110,80}},
+                                                         color={0,0,127}));
+  connect(senRelPre.port_a, port_a) annotation (Line(
+      points={{-72,30},{-72,60},{-100,60}},
+      color={0,127,255},
+      pattern=LinePattern.Dash));
+  connect(senRelPre.port_b, port_b) annotation (Line(
+      points={{-72,10},{-72,-60},{-100,-60}},
+      color={0,127,255},
+      pattern=LinePattern.Dash));
+  connect(conPI.y, val.y)
+    annotation (Line(points={{-19,80},{10,80},{10,72}},   color={0,0,127}));
+  connect(senMasFlo.port_b, port_b)
+    annotation (Line(points={{-40,-60},{-100,-60}}, color={0,127,255}));
+  connect(senMasFlo.m_flow, conPI.u_m)
+    annotation (Line(points={{-30,-49},{-30,68}}, color={0,0,127}));
+  connect(port_a, val.port_a)
+    annotation (Line(points={{-100,60},{0,60}}, color={0,127,255}));
+  connect(conPI.u_s, mPre_flow)
+    annotation (Line(points={{-42,80},{-110,80}}, color={0,0,127}));
+  connect(senMasFlo.port_a, proSou.port_b)
+    annotation (Line(points={{-20,-60},{0,-60}}, color={0,127,255}));
+  connect(proSou.port_a, val.port_b) annotation (Line(points={{20,-60},{40,-60},
+          {40,60},{20,60}}, color={0,127,255}));
+  connect(TRet.y, proSou.T_in)
+    annotation (Line(points={{1,-30},{14,-30},{14,-48}}, color={0,0,127}));
+  annotation (
+    defaultComponentName = "ideUse",
+                                 Documentation(info="<html>
+<p>
+This is a simple ideal user model used by
+<a href=\"Modelica://Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
+Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
+The load of the user is described by a varying mass flow rate setpoint.
+The valve is controlled to maintain the requested mass flow rate.
+The model sets its leaving water temperature to the user-specified temperature
+<code>T_CHWR_nominal</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 31, 2023, by Michael Wetter:<br/>
+Revised implementation, removed unused parameter.
+</li>
+<li>
+February 18, 2022 by Hongxiang Fu:<br/>
+First implementation. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
+</li>
+</ul>
+</html>"),
+    Icon(graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-40,40},{40,-40}},
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-34,34},{-4,6}},
+          pattern=LinePattern.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{6,34},{34,6}},
+          pattern=LinePattern.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{-34,-4},{-4,-34}},
+          pattern=LinePattern.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0}),
+        Rectangle(
+          extent={{6,-4},{34,-34}},
+          pattern=LinePattern.None,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineColor={0,0,0}),
+        Text(
+          extent={{-151,-100},{149,-140}},
+          textColor={0,0,255},
+          textString="%name")}));
+end IdealUser;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
index 5d102252b58..fb104d98f0a 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelJunctions.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model ParallelJunctions "A pair of junctions in parallel"
 
   replaceable package Medium =
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
similarity index 98%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
index 845a11e557a..48e4d360b2a 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/ParallelPipes.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model ParallelPipes "CHW supply and return pipes in parallel"
   extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
     redeclare final package Medium1 = Medium,
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
index 65fca950256..928f4724186 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/ReversibleConnection.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model ReversibleConnection
   "A connection that supports reversible flow with a pump and a valve"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/TankBranch.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
rename to Buildings/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
index e40fa59f89e..1cbdd8b330d 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/TankBranch.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
+within Buildings.DHC.Plants.Cooling.BaseClasses;
 model TankBranch "Model of the tank branch of a storage plant"
 
   extends Buildings.Fluid.Interfaces.PartialFourPort(
diff --git a/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
new file mode 100644
index 00000000000..33b7fc25645
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
@@ -0,0 +1,79 @@
+within Buildings.DHC.Plants.Cooling.BaseClasses.Validation;
+model IdealUser "Test model for the dummy user"
+  extends Modelica.Icons.Example;
+
+  package Medium = Buildings.Media.Water "Medium model";
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal=500000
+    "Nominal pressure difference";
+  parameter Modelica.Units.SI.AbsolutePressure p_Pressurisation=300000
+    "Pressurisation point";
+  parameter Modelica.Units.SI.Temperature T_CHWR_nominal(
+    final displayUnit="degC")=12+273.15
+    "Nominal temperature of CHW return";
+  parameter Modelica.Units.SI.Temperature T_CHWS_nominal(
+    final displayUnit="degC")=7+273.15
+    "Nominal temperature of CHW supply";
+  parameter Boolean allowFlowReversal=false
+    "Flow reversal setting";
+  parameter Modelica.Units.SI.Power QCooLoa_flow_nominal=5*4200*0.9
+    "Nominal cooling load of one consumer";
+
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    T_CHWR_nominal=T_CHWR_nominal,
+    final dp_nominal=dp_nominal) "Ideal user" annotation (Placement(
+        transformation(extent={{-10,-10},{10,10}}, rotation=0)));
+  Buildings.Fluid.Sources.Boundary_pT sin(
+    redeclare final package Medium = Medium,
+    final p=p_Pressurisation,
+    final T=T_CHWR_nominal,
+    nPorts=1) "Sink representing CHW return line"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-70,-30})));
+  Buildings.Fluid.Sources.Boundary_pT sou(
+    redeclare final package Medium = Medium,
+    final p=p_Pressurisation+dp_nominal,
+    final T=T_CHWS_nominal,
+    nPorts=1) "Source representing CHW supply line" annotation (Placement(
+        transformation(
+        extent={{10,10},{-10,-10}},
+        rotation=180,
+        origin={-70,30})));
+  Modelica.Blocks.Sources.TimeTable mPre_flow(table=[0*3600,0; 0.5*3600,0; 0.5*
+        3600,m_flow_nominal; 0.75*3600,m_flow_nominal; 0.75*3600,0; 1*3600,0])
+    "Prescribed flow rate representing cooling load"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+equation
+  connect(sou.ports[1],ideUse. port_a) annotation (Line(points={{-60,30},{-40,
+          30},{-40,6},{-10,6}},                      color={0,127,255}));
+  connect(ideUse.port_b, sin.ports[1])
+    annotation (Line(points={{-10,-6},{-40,-6},{-40,-30},{-60,-30}},
+                                             color={0,127,255}));
+  connect(mPre_flow.y, ideUse.mPre_flow) annotation (Line(points={{-59,70},{-20,
+          70},{-20,8},{-11,8}}, color={0,0,127}));
+annotation(__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos"
+        "Simulate and plot"),
+experiment(Tolerance=1e-06, StopTime=3600), Documentation(info="<html>
+<p>
+This is a simple test model for the ideal user.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 31, 2023, by Michael Wetter:<br/>
+Revised implementation, removed unused parameter.
+</li>
+<li>
+February 18, 2022 by Hongxiang Fu:<br/>
+First implementation. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
+</li>
+</ul>
+</html>"));
+end IdealUser;
diff --git a/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
new file mode 100644
index 00000000000..40167c11c3e
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
@@ -0,0 +1,7 @@
+within Buildings.DHC.Plants.Cooling.BaseClasses;
+package Validation "Package containing validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (Documentation(info="<html>
+Package containing validation models for the base classes.
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.order b/Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.order
rename to Buildings/DHC/Plants/Cooling/BaseClasses/Validation/package.order
diff --git a/Buildings/DHC/Plants/Cooling/BaseClasses/package.mo b/Buildings/DHC/Plants/Cooling/BaseClasses/package.mo
new file mode 100644
index 00000000000..e56a61de04c
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/BaseClasses/package.mo
@@ -0,0 +1,7 @@
+within Buildings.DHC.Plants.Cooling;
+package BaseClasses "Package containing base classes"
+  extends Modelica.Icons.BasesPackage;
+  annotation (Documentation(info="<html>
+Package containing base classes.
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.order b/Buildings/DHC/Plants/Cooling/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.order
rename to Buildings/DHC/Plants/Cooling/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
new file mode 100644
index 00000000000..1afa798227f
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
@@ -0,0 +1,120 @@
+within Buildings.DHC.Plants.Cooling.Controls;
+model ChilledWaterBypass
+  "Controller for chilled water bypass valve"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Integer numChi(
+    min=1)
+    "Number of chillers";
+  parameter Modelica.Units.SI.MassFlowRate mMin_flow
+    "Minimum mass flow rate of single chiller";
+  parameter Real k(min=0) = 0.06 "Gain of controller";
+  parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small) = 60
+    "Time constant of Integrator block" annotation (Dialog(enable=
+          controllerType == Modelica.Blocks.Types.SimpleController.PI or
+          controllerType == Modelica.Blocks.Types.SimpleController.PID));
+  parameter Modelica.Blocks.Types.SimpleController controllerType=
+         Modelica.Blocks.Types.SimpleController.PI
+    "Type of controller";
+  Modelica.Blocks.Interfaces.BooleanInput chiOn[numChi]
+    "On signals of the chillers"
+    annotation (Placement(transformation(extent={{-140,30},{-100,70}}),
+        iconTransformation(extent={{-140,30},{-100,70}})));
+  Modelica.Blocks.Interfaces.RealInput mFloChi(final unit="kg/s")
+    "Mass flow rate through the chillers"
+    annotation (Placement(transformation(extent={{-140,-70},{-100,-30}})));
+  Modelica.Blocks.Interfaces.RealOutput y
+    "Bypass valve opening ratio"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
+        iconTransformation(extent={{100,-10},{120,10}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset
+                                       bypValCon(
+    controllerType=controllerType,
+    final k=k,
+    final Ti=Ti,
+    y_reset=0)
+    "Chilled water bypass valve controller"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Modelica.Blocks.Math.BooleanToInteger booToInt[numChi]
+    "Boolean signal to integer"
+    annotation (Placement(transformation(extent={{-90,40},{-70,60}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr
+    "Greater than zero"
+    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum numChiOn(nin=numChi)
+    "Number of chillers on"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+  Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea
+    "Integer to real"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+  Modelica.Blocks.Math.Gain mFloSetSca(k=1/numChi)
+    "Normalize mass flowrate setpoint"
+    annotation (Placement(transformation(extent={{20,40},{40,60}})));
+  Modelica.Blocks.Math.Gain mFloBypSca(k=1/(numChi*mMin_flow))
+    "Normalize the measured mass flowrate"
+    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
+equation
+  connect(chiOn, booToInt.u)
+    annotation (Line(points={{-120,50},{-92,50}}, color={255,0,255}));
+  connect(booToInt.y, numChiOn.u)
+    annotation (Line(points={{-69,50},{-62,50}}, color={255,127,0}));
+  connect(numChiOn.y, intGreThr.u)
+    annotation (Line(points={{-38,50},{-30,50},{-30,-30},{-2,-30}},
+                           color={255,127,0}));
+  connect(intGreThr.y, bypValCon.trigger)
+    annotation (Line(points={{22,-30},{64,-30},{64,-12}},color={255,0,255}));
+  connect(numChiOn.y, intToRea.u)
+    annotation (Line(points={{-38,50},{-22,50}}, color={255,127,0}));
+  connect(bypValCon.y, y)
+    annotation (Line(points={{82,0},{110,0}},  color={0,0,127}));
+  connect(intToRea.y, mFloSetSca.u)
+    annotation (Line(points={{2,50},{18,50}}, color={0,0,127}));
+  connect(mFloSetSca.y, bypValCon.u_s)
+    annotation (Line(points={{41,50},{50,50},{50,0},{58,0}}, color={0,0,127}));
+  connect(mFloChi, mFloBypSca.u)
+    annotation (Line(points={{-120,-50},{-62,-50}}, color={0,0,127}));
+  connect(mFloBypSca.y, bypValCon.u_m)
+    annotation (Line(points={{-39,-50},{70,-50},{70,-12}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="chiBypCon",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false),
+      graphics={
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+January 27, 2023, by Michael Wetter:<br/>
+Removed connection to itself.
+</li>
+<li>
+December 14, 2022, by Kathryn Hinkelman:<br/>
+Corrected measured mass flow rate to be on the chiller
+leg in order to control minimum flow rate through the chillers.<br>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">#2912</a>.
+</li>
+<li>
+May 3, 2021 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model implements the chilled water loop bypass valve control logic as
+follows: </p>
+<p>When the plant is on, the PID controller controls the valve opening ratio to
+reach the scaled mass flow rate setpoint. </p>
+<p>The setpoint is <code>mMin_flow</code> multiplied by the number of chillers
+that are on. <code>mMin_flow</code> is the minimum mass flow rate required by
+one chiller. </p>
+<p>This control sequence assumes that all the chillers are identical and the
+cooling load is evenly split between all of the chillers that are on.</p>
+</html>"));
+end ChilledWaterBypass;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
new file mode 100644
index 00000000000..6a83280cfc6
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
@@ -0,0 +1,213 @@
+within Buildings.DHC.Plants.Cooling.Controls;
+model ChilledWaterPumpSpeed
+  "Controller for two headered variable speed chilled water pumps"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.Units.SI.PressureDifference dpSetPoi(displayUnit="Pa")
+    "Pressure difference setpoint";
+  parameter Modelica.Units.SI.Time tWai "Waiting time";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate of single chilled water pump";
+  parameter Real minSpe(
+    final unit="1",
+    final min=0,
+    final max=1)=0.05
+    "Minimum speed ratio required by chilled water pumps";
+  parameter Modelica.Units.SI.MassFlowRate criPoiFlo=0.7*m_flow_nominal
+    "Critcal point of flowrate for switching pump on or off";
+  parameter Modelica.Units.SI.MassFlowRate deaBanFlo=0.1*m_flow_nominal
+    "Deadband for critical point of flowrate";
+  parameter Real criPoiSpe=0.5
+    "Critical point of speed signal for switching on or off";
+  parameter Real deaBanSpe=0.3
+    "Deadband for critical point of speed signal";
+  parameter Modelica.Blocks.Types.SimpleController controllerType=
+    Modelica.Blocks.Types.SimpleController.PI
+    "Type of pump speed controller"
+    annotation (Dialog(group="Speed Controller"));
+  parameter Real k(
+    final unit="1",
+    final min=0)=1
+    "Gain of controller"
+    annotation (Dialog(group="Speed Controller"));
+  parameter Modelica.Units.SI.Time Ti(final min=Modelica.Constants.small) = 60
+    "Time constant of Integrator block" annotation (Dialog(enable=
+          controllerType == Modelica.Blocks.Types.SimpleController.PI or
+          controllerType == Modelica.Blocks.Types.SimpleController.PID, group=
+          "Speed Controller"));
+  parameter Modelica.Units.SI.Time Td(final min=0) = 0.1
+    "Time constant of Derivative block" annotation (Dialog(enable=
+          controllerType == Modelica.Blocks.Types.SimpleController.PD or
+          controllerType == Modelica.Blocks.Types.SimpleController.PID, group=
+          "Speed Controller"));
+  Modelica.Blocks.Interfaces.RealInput masFloPum(
+    final unit="kg/s")
+    "Total mass flowrate of chilled water pumps"
+    annotation (Placement(transformation(extent={{-140,0},{-100,40}}),
+        iconTransformation(extent={{-140,0},{-100,40}})));
+  Modelica.Blocks.Interfaces.RealInput dpMea(
+    final unit="Pa")
+    "Measured pressure difference"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
+  Modelica.Blocks.Interfaces.RealOutput y[numPum](
+    each final unit="1",
+    each final min=0,
+    each final max=1)
+    "Pump speed signal"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+  Modelica.Blocks.Math.Product pumSpe[numPum] "Output pump speed"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage pumStaCon(
+    final tWai=tWai,
+    final m_flow_nominal=m_flow_nominal,
+    final minSpe=minSpe,
+    final criPoiFlo=criPoiFlo,
+    final deaBanFlo=deaBanFlo,
+    final criPoiSpe=criPoiSpe,
+    final deaBanSpe=deaBanSpe)
+    "Chilled water pump staging control"
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
+    final controllerType=controllerType,
+    final Ti=Ti,
+    final k=k,
+    final Td=Td)
+    "PID controller of pump speed"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Modelica.Blocks.Sources.Constant dpSetSca(final k=1)
+    "Scaled differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Modelica.Blocks.Math.Gain gai(k=1/dpSetPoi) "Gain for mesaured dp value"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Modelica.Blocks.Math.RealToBoolean twoPum(threshold=1.5) "Two pumps are on"
+    annotation (Placement(transformation(extent={{10,-60},{-10,-40}})));
+  Modelica.Blocks.Math.Sum totPum(final nin=numPum) "Total number of pumps on"
+    annotation (Placement(transformation(extent={{42,-60},{22,-40}})));
+  Modelica.Blocks.Interfaces.BooleanInput on
+    "On signal of the plant"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+   iconTransformation(extent={{-140,60},{-100,100}})));
+  Modelica.Blocks.Logical.Or orRes "Or block for controller reset"
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+protected
+  final parameter Integer numPum=2
+    "Number of chilled water pumps";
+equation
+  connect(pumStaCon.masFloPum,masFloPum)
+    annotation (Line(points={{8,4},{0,4},{0,20},{-120,20}},      color={0,0,127}));
+  connect(conPID.y,pumStaCon.speSig)
+    annotation (Line(points={{-18,0},{0,0},{0,0},{8,0}},      color={0,0,127}));
+  connect(pumStaCon.y,pumSpe.u1)
+    annotation (Line(points={{31,0},{50,0},{50,6},{58,6}},color={0,0,127}));
+  connect(conPID.y,pumSpe[1].u2)
+    annotation (Line(points={{-18,0},{-10,0},{-10,-20},{48,-20},{48,-6},{58,-6}},
+      color={0,0,127}));
+  connect(conPID.y,pumSpe[2].u2)
+    annotation (Line(points={{-18,0},{-10,0},{-10,-20},{48,-20},{48,-6},{58,-6}},
+      color={0,0,127}));
+  connect(dpSetSca.y,conPID.u_s)
+    annotation (Line(points={{-59,0},{-42,0}},color={0,0,127}));
+  connect(dpMea, gai.u)
+    annotation (Line(points={{-120,-40},{-82,-40}}, color={0,0,127}));
+  connect(gai.y, conPID.u_m)
+    annotation (Line(points={{-59,-40},{-30,-40},{-30,-12}}, color={0,0,127}));
+  connect(pumStaCon.y, totPum.u) annotation (Line(points={{31,0},{50,0},{50,-50},
+          {44,-50}}, color={0,0,127}));
+  connect(totPum.y, twoPum.u)
+    annotation (Line(points={{21,-50},{12,-50}},color={0,0,127}));
+  connect(pumSpe.y, y)
+    annotation (Line(points={{81,0},{110,0}}, color={0,0,127}));
+  connect(on, pumStaCon.on) annotation (Line(points={{-120,80},{4,80},{4,8},{8,
+          8}}, color={255,0,255}));
+  connect(twoPum.y, orRes.u2) annotation (Line(points={{-11,-50},{-20,-50},{-20,
+          -90},{-70,-90},{-70,-78},{-62,-78}}, color={255,0,255}));
+  connect(on, orRes.u1) annotation (Line(points={{-120,80},{-90,80},{-90,-70},{
+          -62,-70}}, color={255,0,255}));
+  connect(orRes.y, conPID.trigger) annotation (Line(points={{-39,-70},{-36,-70},
+          {-36,-12}}, color={255,0,255}));
+  annotation (
+    defaultComponentName="CHWPumCon",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false),
+      graphics={
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255}),
+        Ellipse(
+          extent={{-54,52},{52,-52}},
+          lineColor={0,0,0},
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{78,8},{94,-4}},
+          textColor={0,0,127},
+          textString="y"),
+        Ellipse(
+          extent={{-52,50},{50,-50}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-2,50},{-2,-50},{50,0},{-2,50}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={0,0,0},
+          fillPattern=FillPattern.Solid)}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+August 9, 2023, by Hongxiang Fu:<br/>
+Restricted this block to a two-pump configuration as intended.
+<ul>
+<li>
+Set <code>final totPum.nin = numPum</code>.
+</li>
+<li>
+Corrected the \"up to two pumps\" language in documentation.
+</li>
+</ul>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3470\">#3470</a>.
+</li>
+<li>
+December 30, 2022, by Kathryn Hinkelman:<br/>
+Added an <code>on</code> input for a plant-level override to turn pumps off.
+</li>
+<li>
+December 14, 2022 by Kathryn Hinkelman:<br/>
+Normalized <code>u_s</code> and <code>u_m</code> by <code>dpSetPoi</code>.
+Added reset for PI controller based on the number of pumps that are on.<br>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">#2912</a>.
+</li>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model implements the control logic for variable speed pumps.
+The staging of pumps is implemented through an instance of
+<a href=\"modelica://Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage\">
+Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage</a>.
+</p>
+<p>
+The pump speed is controlled to maintain the pressure difference setpoint
+through a PI controller.
+</p>
+<p>The model inputs are the measured chilled water mass flow rate
+<code>masFloPum</code> and the pressure difference <code>dpMea</code> at a
+reference point from the demand side. The output <code>y</code> is a vector
+of pump speeds.
+</p>
+<p>
+The model currently only supports the control of two variable speed pumps.
+</p>
+</html>"));
+end ChilledWaterPumpSpeed;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/ChillerStage.mo b/Buildings/DHC/Plants/Cooling/Controls/ChillerStage.mo
new file mode 100644
index 00000000000..a4f0f3b4a15
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/ChillerStage.mo
@@ -0,0 +1,241 @@
+within Buildings.DHC.Plants.Cooling.Controls;
+model ChillerStage
+  "Chiller staging controller for plants with two chillers of the same size"
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Service side medium";
+  parameter Modelica.Units.SI.Time tWai "Waiting time";
+  parameter Modelica.Units.SI.Power QChi_nominal(final max=0)
+    "Nominal cooling capacity (negative)";
+  parameter Modelica.Units.SI.Power staUpThr(final min=0) = -0.8*QChi_nominal
+    "Stage up load threshold(from one to two chillers)";
+  parameter Modelica.Units.SI.Power staDowThr(final min=0) = -0.6*QChi_nominal
+    "Stage down load threshold(from two to one chiller)";
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    "State graph root"
+    annotation (Placement(transformation(extent={{120,60},{140,80}})));
+  Modelica.Blocks.Interfaces.BooleanInput on
+    "Enabling signal of the plant. True: chiller should be enabled"
+    annotation (Placement(transformation(extent={{-200,40},{-160,80}}),
+      iconTransformation(extent={{-200,40},{-160,80}})));
+  Modelica.Blocks.Interfaces.RealInput TChiWatRet
+    "Chilled water return temperature"
+    annotation (Placement(transformation(extent={{-200,-24},{-160,16}}),
+      iconTransformation(extent={{-200,-24},{-160,16}})));
+  Modelica.Blocks.Interfaces.RealInput TChiWatSup
+    "Chilled water supply temperature"
+    annotation (Placement(transformation(extent={{-200,-60},{-160,-20}}),
+      iconTransformation(extent={{-200,-60},{-160,-20}})));
+  Modelica.Blocks.Interfaces.RealInput mFloChiWat
+    "Chilled water mass flow rate"
+    annotation (Placement(transformation(extent={{-200,-96},{-160,-56}}),
+      iconTransformation(extent={{-200,-96},{-160,-56}})));
+  Modelica.Blocks.Interfaces.BooleanOutput y[2]
+    "On/off signal for the chillers - false: off; true: on"
+    annotation (Placement(transformation(extent={{160,10},{180,-10}}),
+      iconTransformation(extent={{160,-10},{180,10}})));
+  Modelica.StateGraph.InitialStep off(nIn=1, nOut=1)
+    "No cooling is demanded"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
+      rotation=-90,origin={10,90})));
+  Modelica.StateGraph.StepWithSignal oneOn(
+    nOut=2,
+    nIn=2)
+    "Status of one chiller on"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+      rotation=90,origin={10,0})));
+  Modelica.StateGraph.StepWithSignal twoOn(nOut=1, nIn=1)
+    "Status of two chillers on"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+      rotation=90,origin={10,-90})));
+  Modelica.StateGraph.TransitionWithSignal offToOne(
+    enableTimer=true,
+    waitTime=tWai)
+    "Condition of transition from off to one chiller on"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
+      rotation=90,origin={10,60})));
+  Modelica.StateGraph.TransitionWithSignal oneToTwo(
+    enableTimer=true,
+    waitTime=tWai)
+    "Condition of transition from one chiller to two chillers"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
+      rotation=90,origin={10,-40})));
+  Modelica.StateGraph.TransitionWithSignal twoToOne(
+    enableTimer=true,
+    waitTime=tWai) "Condition of transion from two chillers to one chiller"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
+      rotation=90,origin={60,-40})));
+  Modelica.StateGraph.TransitionWithSignal oneToOff(
+    enableTimer=true,
+    waitTime=tWai)
+    "Condition of transition from one chiller to off"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
+      rotation=90,origin={40,60})));
+  Buildings.Controls.OBC.CDL.Reals.Hysteresis thrOneToTwo(uLow=-staDowThr/
+        QChi_nominal, uHigh=-staUpThr/QChi_nominal)
+                    "Threshold of turning two chillers on"
+    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
+  Modelica.Blocks.Logical.Not thrTwoToOne
+    "Threshold of turning off the second chiller"
+    annotation (Placement(transformation(extent={{-100,-18},{-80,2}})));
+  Modelica.Blocks.Math.Add dT(
+    final k1=-1,
+    final k2=+1)
+    "Temperature difference"
+    annotation (Placement(transformation(extent={{-140,-20},{-120,0}})));
+  Modelica.Blocks.Math.Product pro
+    "Product"
+    annotation (Placement(transformation(extent={{-140,-80},{-120,-60}})));
+  Modelica.Blocks.Math.Gain plr(final k=cp_default/QChi_nominal)
+    "Specific heat multiplier to calculate heat flow rate"
+    annotation (Placement(transformation(extent={{-102,-80},{-82,-60}})));
+  Buildings.Controls.OBC.CDL.Logical.Or Or "On signal for either chiller"
+    annotation (Placement(transformation(extent={{120,20},{140,40}})));
+  Modelica.Blocks.Logical.Not notOn "on switches to false"
+    annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
+  Modelica.Blocks.Logical.Or TwoToOne
+    "Conditions that turn off the second chiller"
+    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
+protected
+  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+    T=Medium.T_default,
+    p=Medium.p_default,
+    X=Medium.X_default)
+    "Medium state at default properties";
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
+      Medium.specificHeatCapacityCp(sta_default)
+    "Specific heat capacity of the fluid";
+equation
+  connect(off.outPort[1],offToOne.inPort)
+    annotation (Line(points={{10,79.5},{10,64}},color={0,0,0}));
+  connect(oneToTwo.outPort,twoOn.inPort[1])
+    annotation (Line(points={{10,-41.5},{10,-79}},color={0,0,0}));
+  connect(twoToOne.outPort,oneOn.inPort[2])
+    annotation (Line(points={{60,-38.5},{60,20},{9.75,20},{9.75,11}},
+      color={0,0,0}));
+  connect(oneOn.outPort[2],oneToOff.inPort)
+    annotation (Line(points={{9.875,-10.5},{9.875,-20},{40,-20},{40,56}},
+      color={0,0,0}));
+  connect(oneOn.outPort[1],oneToTwo.inPort)
+    annotation (Line(points={{10.125,-10.5},{10.125,-36},{10,-36}},
+      color={0,0,0}));
+  connect(oneToTwo.condition,thrOneToTwo.y)
+    annotation (Line(points={{-2,-40},{-20,-40},{-20,-70},{-38,-70}},
+      color={255,0,255}));
+  connect(dT.y,pro.u1)
+    annotation (Line(points={{-119,-10},{-114,-10},{-114,-40},{-150,-40},
+      {-150,-64},{-142,-64}},color={0,0,127}));
+  connect(plr.u, pro.y)
+    annotation (Line(points={{-104,-70},{-119,-70}},
+      color={0,0,127}));
+  connect(plr.y, thrOneToTwo.u) annotation (Line(points={{-81,-70},{-62,-70}},
+    color={0,0,127}));
+  connect(dT.u1,TChiWatRet)
+    annotation (Line(points={{-142,-4},{-180,-4}},
+      color={0,0,127}));
+  connect(TChiWatSup,dT.u2)
+    annotation (Line(points={{-180,-40},{-160,-40},{-160,-16},{-142,-16}},
+      color={0,0,127}));
+  connect(pro.u2,mFloChiWat)
+    annotation (Line(points={{-142,-76},{-180,-76}},color={0,0,127}));
+  connect(oneToTwo.condition, thrTwoToOne.u)
+    annotation (Line(points={{-2,-40},{-108,-40},{-108,-8},{-102,-8}},
+      color={255,0,255}));
+  connect(oneOn.active, Or.u1)
+    annotation (Line(points={{21,-8.88178e-16},{80,-8.88178e-16},{80,30},{118,30}},
+      color={255,0,255}));
+  connect(twoOn.active, Or.u2)
+    annotation (Line(points={{21,-90},{100,-90},{100,22},{118,22}},
+      color={255,0,255}));
+  connect(Or.y, y[1])
+    annotation (Line(points={{142,30},{144,30},{144,-2.5},{170,-2.5}},
+      color={255,0,255}));
+  connect(twoOn.active, y[2])
+    annotation (Line(points={{21,-90},{120,-90},{120,2.5},{170,2.5}},
+      color={255,0,255}));
+  connect(on, notOn.u)
+    annotation (Line(points={{-180,60},{-120,60},{-120,30},{-102,30}},
+      color={255,0,255}));
+  connect(twoOn.outPort[1],twoToOne.inPort)
+    annotation (Line(points={{10,-100.5},{10,-120},{60,-120},{60,-44}},
+      color={0,0,0}));
+  connect(offToOne.outPort,oneOn.inPort[1])
+    annotation (Line(points={{10,58.5},{10,11},{10.25,11}},
+                                                         color={0,0,0}));
+  connect(oneToOff.outPort,off.inPort[1])
+    annotation (Line(points={{40,61.5},{40,120},{10,120},{10,101}},
+      color={0,0,0}));
+  connect(on, offToOne.condition) annotation (Line(points={{-180,60},{-2,60}},
+    color={255,0,255}));
+  connect(thrTwoToOne.y, TwoToOne.u2) annotation (Line(points={{-79,-8},{-80,-8},
+          {-80,-18},{-42,-18}}, color={255,0,255}));
+  connect(notOn.y, TwoToOne.u1) annotation (Line(points={{-79,30},{-60,30},{-60,
+          -10},{-42,-10}}, color={255,0,255}));
+  connect(TwoToOne.y, twoToOne.condition) annotation (Line(points={{-19,-10},{-10,
+          -10},{-10,-28},{40,-28},{40,-40},{48,-40}}, color={255,0,255}));
+  connect(notOn.y, oneToOff.condition)
+    annotation (Line(points={{-79,30},{28,30},{28,60}}, color={255,0,255}));
+  annotation (
+    defaultComponentName="chiStaCon",
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-160,-160},{160,160}})),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-160,-160},{160,160}}),
+        graphics={
+        Rectangle(
+          extent={{-160,-160},{160,160}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-154,206},{146,166}},
+          textColor={0,0,255},
+          textString="%name")}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+December 10, 2021, by Michael Wetter:<br/>
+Corrected parameter value for <code>twoOn.nOut</code>.
+This correction is required to simulate the model in Dymola 2022
+if the model has been updated to MSL 4.0.0. With MSL 3.2.3, the simulation
+works without this correction.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
+</li>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model implements the staging control logic as follows: </p>
+<ul>
+<li>When the plant enabling signal <code>on</code> changes from
+<code>false</code> to <code>true</code>, one chiller is enabled. </li>
+<li>When the total cooling load <code>QLoa</code> exceeds 80 percent (adjustable)
+of one chiller&apos;s nominal capacity <code>QChi_nominal</code>, a second
+chiller is enabled. </li>
+<li>When the total cooling load <code>QLoa</code> drops below 60 percent
+(adjustable) of one chiller&apos;s nominal capacity <code>QChi_nominal</code>
+(i.e. 30 percent of both chillers combined), or the plant enabling signal
+<code>on</code> changes from <code>true</code> to <code>false</code>, the second
+chiller is disabled. </li>
+<li>When the plant enabling signal <code>on</code> changes from <code>true</code>
+to <code>false</code>, the operating chillers will be disabled sequentially.</li>
+<li>Parameter <code>tWai</code> assures a transitional time is kept between each
+operation. </li>
+</ul>
+<p><br>It is assumed that both chillers have the same capacity of
+<code>QChi_nominal</code>. </p>
+<p>Note: This model can be used for plants with two chillers with or without
+waterside econimizer (WSE). For plants with WSE, extra control logic on top of
+this model needs to be added. </p>
+<p><img src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.png\" alt=\"State graph\"/>. </p>
+</html>"));
+end ChillerStage;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/FlowControl.mo b/Buildings/DHC/Plants/Cooling/Controls/FlowControl.mo
similarity index 99%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/FlowControl.mo
rename to Buildings/DHC/Plants/Cooling/Controls/FlowControl.mo
index ee8c17eec8a..11f249c3291 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/FlowControl.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/FlowControl.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 block FlowControl
   "This block controls the flow at the primary and secondary pumps"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/SelectMin.mo b/Buildings/DHC/Plants/Cooling/Controls/SelectMin.mo
similarity index 97%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/SelectMin.mo
rename to Buildings/DHC/Plants/Cooling/Controls/SelectMin.mo
index 25f67a144d9..be6baea2652 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/SelectMin.mo
+++ b/Buildings/DHC/Plants/Cooling/Controls/SelectMin.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
+within Buildings.DHC.Plants.Cooling.Controls;
 block SelectMin
   "Block that includes or excludes storage plant pressure signal for min"
   extends Modelica.Blocks.Icons.Block;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/TankStatus.mo b/Buildings/DHC/Plants/Cooling/Controls/TankStatus.mo
new file mode 100644
index 00000000000..717490cee1b
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/TankStatus.mo
@@ -0,0 +1,119 @@
+within Buildings.DHC.Plants.Cooling.Controls;
+block TankStatus "Returns the tank status from its temperature sensors"
+
+  parameter Modelica.Units.SI.Temperature THig
+    "Higher threshold to consider the tank empty";
+  parameter Modelica.Units.SI.Temperature TLow
+    "Lower threshold to consider the tank full";
+
+  parameter Modelica.Units.SI.TemperatureDifference dTHys(min=0.1) = 0.5
+    "Deadband for hysteresis";
+
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TTan[2](
+    each final quantity="Temperature",
+    each final unit="K",
+    each displayUnit="degC") "Temperatures at the tank 1: top; and 2: bottom"
+                                                    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-110,0}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-110,0})));
+  Buildings.Controls.OBC.CDL.Reals.Hysteresis hysCha(
+    final uLow=TLow,
+    final uHigh=TLow + dTHys) "Hysteresis, tank charged"
+    annotation (Placement(visible = true, transformation(origin = {0, 50}, extent = {{-40, -60}, {-20, -40}}, rotation = 0)));
+  Buildings.Controls.OBC.CDL.Reals.Hysteresis hysEmp(
+    final uHigh=THig,
+    final uLow=THig - dTHys) "Hysteresis, tank empty"
+    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
+  Buildings.Controls.OBC.CDL.Logical.Not not1 "Not block"
+    annotation (Placement(visible = true, transformation(origin = {0, 50}, extent = {{20, -60}, {40, -40}}, rotation = 0)));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[2]
+    "Tank status - y[1]=true is empty; y[2] = true is charged; both false means partially charged"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
+      iconTransformation(extent={{100,-10},{120,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TTanTopChe(
+    final k(final unit="K", displayUnit="degC") = THig) "Set point for top temperatuer of tank"
+     annotation (
+    Placement(visible = true, transformation(origin = {-70, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TTanBotChe(
+    final k(final unit="K", displayUnit="degC") = TLow) "Set point for bottom temperature of tank"
+    annotation (
+    Placement(visible = true, transformation(origin = {-70, -70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  Buildings.Controls.OBC.CDL.Reals.Greater gre
+   "Test for temperature set points"
+  annotation (
+    Placement(visible = true, transformation(origin = {-30, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
+    message = "THig must be greater than TLow.")
+   "Assertion if temperature set points are not correct"
+   annotation (
+    Placement(visible = true, transformation(origin = {10, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+equation
+  connect(hysCha.y, not1.u)
+    annotation (Line(points={{-18,0},{18,0}},  color={255,0,255}));
+  connect(TTan[1],hysCha. u) annotation (Line(points={{-110,-2.5},{-52,-2.5},{-52,
+          0},{-42,0}},  color={0,0,127}));
+  connect(TTan[2],hysEmp. u) annotation (Line(points={{-110,2.5},{-52,2.5},{-52,
+          50},{-42,50}},
+                     color={0,0,127}));
+  connect(hysEmp.y, y[1]) annotation (Line(points={{-18,50},{60,50},{60,0},{110,
+          0},{110,-2.5}}, color={255,0,255}));
+  connect(not1.y, y[2]) annotation (Line(points={{42,0},{60,0},{60,2.5},{110,
+          2.5}}, color={255,0,255}));
+  connect(TTanTopChe.y, gre.u1) annotation (
+    Line(points = {{-58, -30}, {-50, -30}, {-50, -50}, {-42, -50}}, color = {0, 0, 127}));
+  connect(TTanBotChe.y, gre.u2) annotation (
+    Line(points = {{-58, -70}, {-52, -70}, {-52, -58}, {-42, -58}}, color = {0, 0, 127}));
+  connect(gre.y, assMes.u) annotation (
+    Line(points = {{-18, -50}, {-2, -50}}, color = {255, 0, 255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+                                Rectangle(
+        extent={{-100,-100},{100,100}},
+        lineColor={0,0,127},
+        fillColor={255,255,255},
+        fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-42,72},{40,-72}},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-30,-64},{28,-28}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-30,-20},{28,16}},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+        Rectangle(
+          extent={{-24,54},{22,30}},
+          fillColor={135,135,135},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None)}),
+                               Diagram(coordinateSystem(preserveAspectRatio=false)),
+  defaultComponentName="tanSta",
+   Documentation(info="<html>
+<p>
+This model outputs tank status signals using the temperatures
+at the CHW tank top and the tank bottom as input.
+The status has two separate boolean signals indicating whether the tank is
+charged or empty (of cooling). The two output signals can be both false,
+indicating an in-between state, but they can never both be true.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+August 10, 2023 by Hongxiang Fu:<br/>
+First implementation. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
+</li>
+</ul>
+</html>"));
+end TankStatus;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
new file mode 100644
index 00000000000..2250c0411a5
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
@@ -0,0 +1,62 @@
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
+model ChilledWaterBypass
+  "Example to test the chilled water bypass controller"
+  extends Modelica.Icons.Example;
+  Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(numChi=2,
+    mMin_flow=0.03)
+    "Chilled water bypass loop control"
+    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
+  Modelica.Blocks.Sources.BooleanTable onOne(
+    table(
+      each displayUnit="s")={300,900})
+    "On signal of the first chiller"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+  Modelica.Blocks.Sources.BooleanTable onTwo(
+    table(
+      each displayUnit="s")={600,900})
+    "On signal of the second chiller"
+    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
+  Modelica.Blocks.Sources.Sine mFloChi(
+    amplitude=0.03,
+    f=1/300,
+    offset=0.03,
+    startTime=300) "Mass flow rate through the chillers"
+    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+equation
+  connect(mFloChi.y,chiBypCon.mFloChi)  annotation (Line(points={{-39,-30},{-20,
+          -30},{-20,-15},{-2,-15}},
+                                  color={0,0,127}));
+  connect(onTwo.y,chiBypCon.chiOn[2])
+    annotation (Line(points={{-39,10},{-20,10},{-20,-4},{-2,-4}},
+      color={255,0,255}));
+  connect(onOne.y,chiBypCon.chiOn[1])
+    annotation (Line(points={{-39,40},{-20,40},{-20,-6},{-2,-6}},
+      color={255,0,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    experiment(
+      Tolerance=1e-06, StopTime=1200),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos"
+      "Simulate and Plot"),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+May 3, 2021 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model validates the chilled water bypass valve control logic implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass\">
+Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass</a>.
+</p>
+</html>"));
+end ChilledWaterBypass;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
new file mode 100644
index 00000000000..cfb99ee27ac
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
@@ -0,0 +1,68 @@
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
+model ChilledWaterPumpSpeed
+  "Example to test the chilled water pump speed controller"
+  extends Modelica.Icons.Example;
+  Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed chiWatPumSpe(
+    dpSetPoi=68900,
+    tWai=30,
+    m_flow_nominal=0.5,
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    k=1,
+    Ti=60,
+    Td=0.1)
+    "Chilled water pump speed controller"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Modelica.Blocks.Sources.Pulse mFloTot(
+    amplitude=2*chiWatPumSpe.m_flow_nominal,
+    period=300,
+    startTime=150) "Total chilled water mass flow rate"
+    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
+  Modelica.Blocks.Sources.Pulse dpMea(
+    amplitude=0.4*chiWatPumSpe.dpSetPoi,
+    period=150,
+    offset=0.8*chiWatPumSpe.dpSetPoi,
+    startTime=150) "Measured pressure drop"
+    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
+  Modelica.Blocks.Sources.BooleanConstant on "Plant on signal"
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+equation
+  connect(mFloTot.y,chiWatPumSpe.masFloPum)
+    annotation (Line(points={{-39,30},{-30,30},{-30,2},{-12,2}},
+      color={0,0,127}));
+  connect(dpMea.y, chiWatPumSpe.dpMea) annotation (Line(points={{-39,-30},{-30,
+          -30},{-30,-4},{-12,-4}}, color={0,0,127}));
+  connect(on.y, chiWatPumSpe.on) annotation (Line(points={{-39,70},{-20,70},{
+          -20,8},{-12,8}}, color={255,0,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    experiment(
+      StopTime=1200,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos"
+      "Simulate and Plot"),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+December 14, 2022 by Kathryn Hinkelman:<br>
+Revised <code>dpMea</code> input from constant to step function.
+</li>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model validates the variable speed pump control logic implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed\">
+Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed</a>.
+</p>
+</html>"));
+end ChilledWaterPumpSpeed;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
new file mode 100644
index 00000000000..7da52405806
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
@@ -0,0 +1,67 @@
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
+model ChillerStage
+  "Example to test the chiller staging controller"
+  extends Modelica.Icons.Example;
+  Buildings.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
+    tWai=30,
+    QChi_nominal=-200*3.517*1000)
+    "Chiller staging controller"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Modelica.Blocks.Sources.BooleanTable on(
+    table(
+      each displayUnit="s")={300,900})
+    "On signal of the cooling plant"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+  Modelica.Blocks.Sources.Constant TRet(k=18)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
+  Modelica.Blocks.Sources.Constant TSup(k=8)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
+  Modelica.Blocks.Sources.Sine mFlo(
+    amplitude=0.5*chiStaCon.QChi_nominal/(-10)/4200,
+    f=1/300,
+    offset=0.5*chiStaCon.QChi_nominal/(-10)/4200) "Total mass flow rate"
+    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
+equation
+  connect(on.y,chiStaCon.on)
+    annotation (Line(points={{-39,50},{-28,50},{-28,3.75},{-1.25,3.75}},
+      color={255,0,255}));
+  connect(mFlo.y,chiStaCon.mFloChiWat)
+    annotation (Line(points={{-39,-50},{-28,-50},{-28,-3.75},{-1.25,-3.75}},
+      color={0,0,127}));
+  connect(TRet.y,chiStaCon.TChiWatRet)
+    annotation (Line(points={{-39,20},{-34,20},{-34,1.25},{-1.25,1.25}},
+      color={0,0,127}));
+  connect(TSup.y,chiStaCon.TChiWatSup)
+    annotation (Line(points={{-39,-20},{-34,-20},{-34,-1.25},{-1.25,-1.25}},
+      color={0,0,127}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    experiment(
+      StopTime=1200,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos"
+      "Simulate and Plot"),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model validates the chiller staging control logic implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChillerStage\">
+Buildings.DHC.Plants.Cooling.Controls.ChillerStage</a>.
+</p>
+</html>"));
+end ChillerStage;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
new file mode 100644
index 00000000000..4918ab83bb7
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
@@ -0,0 +1,47 @@
+within Buildings.DHC.Plants.Cooling.Controls.Validation;
+model TankStatus "Validation model for tank status controller"
+  extends Modelica.Icons.Example;
+  Buildings.DHC.Plants.Cooling.Controls.TankStatus tanSta(
+    TLow=280.15,
+    THig=286.15,
+    dTHys=1) "Tank status"
+    annotation (Placement(transformation(extent={{0,0},{20,20}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TTanBot(
+    table=[0,273.15 + 11; 0.25,273.15 + 13.5; 0.5,273.15 + 12.5; 0.75,273.15 + 13.5; 1,273.15 + 11])
+    "Temperature at tank bottom"
+    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TTanTop(
+    table=[0,273.15 + 9; 0.25,273.15 + 6.5;
+        0.5,273.15 + 7.5; 0.75,273.15 + 6.5; 1,273.15 + 9])
+    "Temperature at tank top"
+    annotation (Placement(visible = true, transformation(origin = {0, 0}, extent = {{-60, 20}, {-40, 40}}, rotation = 0)));
+equation
+  connect(TTanTop.y[1], tanSta.TTan[1]) annotation (Line(points={{-38,30},{-6,30},{
+          -6,9.75},{-1,9.75}}, color={0,0,127}));
+  connect(TTanBot.y[1], tanSta.TTan[2]) annotation (Line(points={{-39,-10},{-6,-10},
+          {-6,10.25},{-1,10.25}}, color={0,0,127}));
+          annotation(experiment(Tolerance=1e-6, StopTime=1),
+          __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos"
+      "Simulate and Plot"),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+August 11, 2023 by Hongxiang Fu:<br/>
+First implementation. This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.TankStatus\">
+Buildings.DHC.Plants.Cooling.Controls.TankStatus</a>.
+Note that the output signals turn <code>true</code> as soon as their respective temperature
+input crosses the threshold, but there is a delay for it to turn back to
+<code>false</code> due to the hysteresis.
+</p>
+</html>"));
+end TankStatus;
diff --git a/Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo b/Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo
new file mode 100644
index 00000000000..dad8f5b91a7
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/Validation/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Plants.Cooling.Controls;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls\">
+Buildings.DHC.Plants.Cooling.Controls</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.order b/Buildings/DHC/Plants/Cooling/Controls/Validation/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.order
rename to Buildings/DHC/Plants/Cooling/Controls/Validation/package.order
diff --git a/Buildings/DHC/Plants/Cooling/Controls/package.mo b/Buildings/DHC/Plants/Cooling/Controls/package.mo
new file mode 100644
index 00000000000..1eeff36e292
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Controls/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.Plants.Cooling;
+package Controls "Package of control sequences for cooling plants"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains control sequences for central cooling plants.
+</p>
+</html>"));
+end Controls;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.order b/Buildings/DHC/Plants/Cooling/Controls/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Controls/package.order
rename to Buildings/DHC/Plants/Cooling/Controls/package.order
diff --git a/Buildings/DHC/Plants/Cooling/ElectricChillerParallel.mo b/Buildings/DHC/Plants/Cooling/ElectricChillerParallel.mo
new file mode 100644
index 00000000000..a10dc21cd12
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/ElectricChillerParallel.mo
@@ -0,0 +1,447 @@
+within Buildings.DHC.Plants.Cooling;
+model ElectricChillerParallel
+  "District cooling plant model"
+  extends Buildings.DHC.Plants.BaseClasses.PartialPlant(
+    have_eleCoo=true,
+    have_pum=true,
+    have_fan=true,
+    have_weaBus=true,
+    typ=Buildings.DHC.Types.DistrictSystemType.Cooling);
+  // chiller parameters
+  final parameter Integer numChi=2
+    "Number of chillers"
+    annotation (Dialog(group="Chiller"));
+  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.Generic perChi
+    "Performance data of chiller"
+    annotation (Dialog(group="Chiller"),choicesAllMatching=true,
+   Placement(transformation(extent={{124,264},{138,278}})));
+  parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal
+    "Nominal chilled water mass flow rate" annotation (Dialog(group="Chiller"));
+  parameter Modelica.Units.SI.Pressure dpCHW_nominal
+    "Pressure difference at the chilled water side"
+    annotation (Dialog(group="Chiller"));
+  parameter Modelica.Units.SI.HeatFlowRate QChi_nominal(max=0)
+    "Nominal cooling capacity of single chiller (negative means cooling)"
+    annotation (Dialog(group="Chiller"));
+  parameter Modelica.Units.SI.MassFlowRate mMin_flow
+    "Minimum mass flow rate of single chiller"
+    annotation (Dialog(group="Chiller"));
+  // cooling tower parameters
+  parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal
+    "Nominal condenser water mass flow rate"
+    annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.Pressure dpCW_nominal
+    "Pressure difference at the condenser water side"
+    annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.Temperature TAirInWB_nominal
+    "Nominal air wetbulb temperature" annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.Temperature TCW_nominal
+    "Nominal condenser water temperature at tower inlet"
+    annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
+    "Temperature difference between inlet and outlet of the tower"
+    annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.TemperatureDifference dTApp
+    "Approach temperature" annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.Temperature TMin
+    "Minimum allowed water temperature entering chiller"
+    annotation (Dialog(group="Cooling Tower"));
+  parameter Modelica.Units.SI.Power PFan_nominal "Fan power"
+    annotation (Dialog(group="Cooling Tower"));
+  // pump parameters
+  replaceable parameter Buildings.Fluid.Movers.Data.Generic perCHWPum
+    constrainedby Buildings.Fluid.Movers.Data.Generic
+    "Performance data of chilled water pump"
+    annotation (Dialog(group="Pump"),choicesAllMatching=true,
+   Placement(transformation(extent={{164,264},{178,278}})));
+  replaceable parameter Buildings.Fluid.Movers.Data.Generic perCWPum
+    constrainedby Buildings.Fluid.Movers.Data.Generic
+    "Performance data of condenser water pump"
+    annotation (Dialog(group="Pump"),choicesAllMatching=true,
+   Placement(transformation(extent={{204,264},{218,278}})));
+  parameter Modelica.Units.SI.Pressure dpCHWPumVal_nominal
+    "Nominal pressure drop of chilled water pump valve"
+    annotation (Dialog(group="Pump"));
+  parameter Modelica.Units.SI.Pressure dpCWPumVal_nominal
+    "Nominal pressure drop of condenser water pump valve"
+    annotation (Dialog(group="Pump"));
+  parameter Modelica.Units.SI.Time tau=1
+    "Pump time constant at nominal flow (if energyDynamics <> SteadyState)"
+    annotation (Dialog(tab="Dynamics", group="Pump"));
+  parameter Boolean use_inputFilter=false
+    "= true, if pump speed is filtered with a 2nd order CriticalDamping filter"
+    annotation(Dialog(tab="Dynamics", group="Pump"));
+  parameter Modelica.Units.SI.Time riseTimePump=30
+    "Pump rise time of the filter (time to reach 99.6 % of the speed)" annotation (
+      Dialog(
+      tab="Dynamics",
+      group="Pump",
+      enable=use_inputFilter));
+  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization for pumps (no init/steady state/initial state/initial output)"
+    annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
+  parameter Real[numChi] yCHWP_start=fill(0,numChi)
+    "Initial value of CHW pump signals"
+    annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
+  parameter Real[numChi] yCWP_start=fill(0,numChi)
+    "Initial value of CW pump signals"
+    annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
+  parameter Modelica.Units.SI.PressureDifference dpCooTowVal_nominal
+    "Nominal pressure difference of the cooling tower valve";
+  // control settings
+  parameter Modelica.Units.SI.Time tWai "Waiting time"
+    annotation (Dialog(group="Control Settings"));
+  // dynamics
+  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 Modelica.Fluid.Types.Dynamics massDynamics=energyDynamics
+    "Type of mass balance: dynamic (3 initialization options) or steady state, must be steady state if energyDynamics is steady state"
+    annotation(Evaluate=true, Dialog(tab = "Advanced", group="Dynamics"));
+  Modelica.Blocks.Interfaces.BooleanInput on
+    "On signal of the plant"
+    annotation (Placement(transformation(extent={{-420,200},{-380,240}}),
+   iconTransformation(extent={{-340,200},{-300,240}})));
+  Modelica.Blocks.Interfaces.RealInput TCHWSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Set point for chilled water supply temperature"
+    annotation (Placement(transformation(extent={{-420,100},{-380,140}}),
+   iconTransformation(extent={{-340,140},{-300,180}})));
+  Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel mulChiSys(
+    final use_inputFilter=use_inputFilter,
+    final per=fill(
+      perChi,
+      numChi),
+    final m1_flow_nominal=mCW_flow_nominal,
+    final m2_flow_nominal=mCHW_flow_nominal,
+    final dp1_nominal=dpCW_nominal/2,
+    final dp2_nominal=dpCHW_nominal,
+    final num=numChi,
+    redeclare final package Medium1=Medium,
+    redeclare final package Medium2=Medium)
+    "Chillers connected in parallel"
+    annotation (Placement(transformation(extent={{60,40},{40,60}})));
+  Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass cooTowWitByp(
+    redeclare final package Medium=Medium,
+    final num=numChi,
+    final m_flow_nominal=mCW_flow_nominal,
+    final use_inputFilter=use_inputFilter,
+    final dp_nominal=dpCW_nominal/2,
+    final dpValve_nominal = dpCooTowVal_nominal,
+    final TAirInWB_nominal=TAirInWB_nominal,
+    final TWatIn_nominal=TCW_nominal,
+    final dT_nominal=dT_nominal,
+    final dTApp=dTApp,
+    final PFan_nominal=PFan_nominal,
+    final TMin=TMin)
+    "Cooling towers with bypass valve"
+    annotation (Placement(transformation(extent={{-40,160},{-20,180}})));
+  Buildings.Applications.BaseClasses.Equipment.FlowMachine_y pumCHW(
+    redeclare final package Medium=Medium,
+    final per=fill(
+      perCHWPum,
+      numChi),
+    yValve_start=fill(
+      1,
+      numChi),
+    final tau=tau,
+    final use_inputFilter=use_inputFilter,
+    final riseTimePump=riseTimePump,
+    final init=init,
+    final yPump_start=yCHWP_start,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=mCHW_flow_nominal,
+    final dpValve_nominal=dpCHWPumVal_nominal,
+    final num=numChi)
+    "Chilled water pumps"
+    annotation (Placement(transformation(extent={{-52,34},{-32,54}})));
+  Buildings.Applications.BaseClasses.Equipment.FlowMachine_m pumCW(
+    redeclare final package Medium=Medium,
+    final per=fill(
+      perCWPum,
+      numChi),
+    final tau=tau,
+    final use_inputFilter=use_inputFilter,
+    final riseTimePump=riseTimePump,
+    final init=init,
+    final yPump_start=yCWP_start,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=mCW_flow_nominal,
+    final dpValve_nominal=dpCWPumVal_nominal,
+    final num=numChi)
+    "Condenser water pumps"
+    annotation (Placement(transformation(extent={{60,160},{80,180}})));
+  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage valByp(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=false,
+    final m_flow_nominal=mCHW_flow_nominal,
+    final dpValve_nominal=dpCHWPumVal_nominal,
+    final use_inputFilter=true,
+    riseTime=60)
+    "Chilled water bypass valve"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
+      rotation=0,origin={-30,-70})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTCHWSup(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=mCHW_flow_nominal)
+    "Chilled water supply temperature"
+    annotation (Placement(transformation(extent={{140,-30},{160,-50}})));
+  Buildings.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
+    final tWai=tWai,
+    final QChi_nominal=QChi_nominal)
+    "Chiller staging controller"
+    annotation (Placement(transformation(extent={{-200,200},{-180,220}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTCHWRet(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=mCHW_flow_nominal)
+    "Chilled water return temperature"
+    annotation (Placement(transformation(extent={{-270,-50},{-250,-30}})));
+  Buildings.Fluid.Sources.Boundary_pT expTanCW(
+    redeclare final package Medium=Medium,
+    p=300000,
+    nPorts=1)
+    "Condenser water expansion tank"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+        rotation=270,
+        origin={0,142})));
+  Buildings.Fluid.Sources.Boundary_pT expTanCHW(
+    redeclare final package Medium=Medium,
+    p=300000,
+    nPorts=1)
+    "Chilled water expansion tank"
+    annotation (Placement(transformation(extent={{-108,-26},{-88,-6}})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
+    redeclare final package Medium=Medium)
+    "Chilled water return mass flow"
+    annotation (Placement(transformation(extent={{-230,-50},{-210,-30}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal chiOn[numChi]
+    "Convert chiller on signal from boolean to real"
+    annotation (Placement(transformation(extent={{-120,200},{-100,220}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum totPPum(
+    nin=4)
+    "Total pump power"
+    annotation (Placement(transformation(extent={{340,150},{360,170}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum totPFan(
+    nin=2)
+    "Total fan power"
+    annotation (Placement(transformation(extent={{340,190},{360,210}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum totPCoo(
+    nin=2)
+    "Total cooling power"
+    annotation (Placement(transformation(extent={{340,230},{360,250}})));
+  Buildings.Fluid.FixedResistances.Junction joiCHWRet(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=mCHW_flow_nominal .* {1,-1,1},
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    dp_nominal={0,0,0})
+    "Flow joint for the chilled water return side"
+    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
+      rotation=90, origin={-80,-40})));
+  Buildings.Fluid.FixedResistances.Junction splCHWSup(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=mCHW_flow_nominal .* {1,-1,-1},
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    dp_nominal={0,0,0})
+    "Flow splitter for the chilled water supply side"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
+      rotation=90,origin={120,-42})));
+  Buildings.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(
+    final numChi=numChi,
+    final mMin_flow=mMin_flow,
+    k=1,
+    Ti=120)
+    "Chilled water bypass control"
+    annotation (Placement(transformation(extent={{-120,-160},{-100,-140}})));
+  Fluid.Sensors.MassFlowRate senMasFloCHW(
+    redeclare final package Medium = Medium)
+    "Total chilled water pump mass flow rate"
+    annotation (Placement(
+        transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=90,
+        origin={120,20})));
+protected
+  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+    T=Medium.T_default,
+    p=Medium.p_default,
+    X=Medium.X_default)
+    "Medium state at default properties";
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
+      Medium.specificHeatCapacityCp(sta_default)
+    "Specific heat capacity of the fluid";
+
+initial equation
+  assert(energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState or
+         massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState,
+         "In " + getInstanceName() +
+         ": energyDynamics is selected as steady state, and therefore massDynamics must also be steady-state.");
+
+equation
+  connect(cooTowWitByp.port_b,pumCW.port_a)
+    annotation (Line(points={{-20,170},{60,170}},color={0,127,255}));
+  connect(on,chiStaCon.on)
+    annotation (Line(points={{-400,220},{-220,220},{-220,213.75},{-201.25,
+          213.75}},
+      color={255,0,255}));
+  connect(pumCHW.port_b,mulChiSys.port_a2)
+    annotation (Line(points={{-32,44},{40,44}}, color={0,127,255}));
+  connect(pumCW.port_b,mulChiSys.port_a1)
+    annotation (Line(points={{80,170},{120,170},{120,56},{60,56}},
+      color={0,127,255}));
+  connect(mulChiSys.port_b1,cooTowWitByp.port_a)
+    annotation (Line(points={{40,56},{-80,56},{-80,170},{-40,170}},
+      color={0,127,255}));
+  connect(expTanCW.ports[1],pumCW.port_a)
+    annotation (Line(points={{1.9984e-15,152},{1.9984e-15,170},{60,170}},
+      color={0,127,255}));
+  connect(senTCHWRet.port_b,senMasFlo.port_a)
+    annotation (Line(points={{-250,-40},{-230,-40}},color={0,127,255}));
+  connect(chiStaCon.y,mulChiSys.on)
+    annotation (Line(points={{-179.375,210},{-160,210},{-160,100},{80,100},{80,54},{62,54}},
+      color={255,0,255}));
+  connect(chiStaCon.y,chiOn.u)
+    annotation (Line(points={{-179.375,210},{-122,210}},
+      color={255,0,255}));
+  connect(chiOn.y,pumCW.u)
+    annotation (Line(points={{-98,210},{0,210},{0,174},{58,174}},
+      color={0,0,127}));
+  connect(chiStaCon.y,cooTowWitByp.on)
+    annotation (Line(points={{-179.375,210},{-160,210},{-160,174},{-42,174}},
+      color={255,0,255}));
+  connect(weaBus.TWetBul,cooTowWitByp.TWetBul)
+    annotation (Line(points={{0,380},{0,380},{0,238},{-50,238},{-50,168},{-42,168}},
+    color={255,204,51},thickness=0.5),Text(string="%first",index=-1,
+    extent={{-6,3},{-6,3}},horizontalAlignment=TextAlignment.Right));
+  connect(port_aSerCoo,senTCHWRet.port_a)
+    annotation (Line(points={{-380,-40},{-270,-40}},color={0,127,255}));
+  connect(senTCHWSup.port_b,port_bSerCoo)
+    annotation (Line(points={{160,-40},{380,-40}}, color={0,127,255}));
+  connect(TCHWSupSet,mulChiSys.TSet)
+    annotation (Line(points={{-400,120},{100,120},{100,50},{62,50}},color={0,0,127}));
+  connect(totPPum.y,PPum)
+    annotation (Line(points={{362,160},{400,160}},color={0,0,127}));
+  connect(pumCW.P,totPPum.u[1:2])
+    annotation (Line(points={{81,174},{240,174},{240,159.75},{338,159.75}},
+                                                                         color={0,0,127}));
+  connect(pumCHW.P,totPPum.u[3:4])
+    annotation (Line(points={{-31,48},{0,48},{0,0},{240,0},{240,160.75},{338,
+          160.75}},
+      color={0,0,127}));
+  connect(totPFan.y,PFan)
+    annotation (Line(points={{362,200},{400,200}},color={0,0,127}));
+  connect(cooTowWitByp.PFan,totPFan.u[1:2])
+    annotation (Line(points={{-19,176},{-20,176},{-20,200},{338,200},{338,200.5}},
+      color={0,0,127}));
+  connect(totPCoo.y,PCoo)
+    annotation (Line(points={{362,240},{400,240}},color={0,0,127}));
+  connect(mulChiSys.P,totPCoo.u[1:2])
+    annotation (Line(points={{39,52},{20,52},{20,240.5},{338,240.5}},
+      color={0,0,127}));
+  connect(splCHWSup.port_3,senTCHWSup.port_a)
+    annotation (Line(points={{130,-42},{130,-40},{140,-40}},color={0,127,255}));
+  connect(senTCHWRet.T,chiStaCon.TChiWatRet)
+    annotation (Line(points={{-260,-29},{-260,209.75},{-201.25,209.75}},
+      color={0,0,127}));
+  connect(senTCHWSup.T,chiStaCon.TChiWatSup)
+    annotation (Line(points={{150,-51},{150,-200},{-240,-200},{-240,207.5},{-201.25,207.5}},
+      color={0,0,127}));
+  connect(senMasFlo.m_flow,chiStaCon.mFloChiWat)
+    annotation (Line(points={{-220,-29},{-220,205.25},{-201.25,205.25}},
+      color={0,0,127}));
+  connect(chiStaCon.y,chiBypCon.chiOn)
+    annotation (Line(points={{-179.375,210},{-160,210},{-160,-145},{-122,-145}},
+      color={255,0,255}));
+  connect(senMasFlo.port_b, joiCHWRet.port_3)
+    annotation (Line(points={{-210,-40},{-90,-40}}, color={0,127,255}));
+  connect(valByp.port_b, joiCHWRet.port_1)
+    annotation (Line(points={{-40,-70},{-80,-70},{-80,-50}}, color={0,127,255}));
+  connect(senMasFloCHW.m_flow, chiBypCon.mFloChi) annotation (Line(points={{109,
+          20},{-140,20},{-140,-155},{-122,-155}}, color={0,0,127}));
+  connect(valByp.port_a, splCHWSup.port_2) annotation (Line(points={{-20,-70},{
+          120,-70},{120,-52}}, color={0,127,255}));
+  connect(joiCHWRet.port_2, pumCHW.port_a)
+    annotation (Line(points={{-80,-30},{-80,44},{-52,44}}, color={0,127,255}));
+  connect(expTanCHW.ports[1], pumCHW.port_a) annotation (Line(points={{-88,-16},
+          {-80,-16},{-80,44},{-52,44}}, color={0,127,255}));
+  connect(mulChiSys.port_b2, senMasFloCHW.port_a)
+    annotation (Line(points={{60,44},{120,44},{120,30}}, color={0,127,255}));
+  connect(senMasFloCHW.port_b, splCHWSup.port_1)
+    annotation (Line(points={{120,10},{120,-32}}, color={0,127,255}));
+  connect(chiBypCon.y, valByp.y) annotation (Line(points={{-99,-150},{-30,-150},
+          {-30,-82}}, color={0,0,127}));
+  connect(chiOn.y, pumCHW.u) annotation (Line(points={{-98,210},{-90,210},{-90,48},
+          {-54,48}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="pla",
+    Documentation(
+      info="<html>
+<p>This model implements a generic district central cooling plant as illustrated
+in the schematics below. </p>
+<ul>
+<li>The cooling is provided by two parallel chillers instantiated from
+<a href=\"modelica://Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel\">
+Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel</a>. </li>
+<li>The chilled water bypass loop is controlled to ensure a minimum flow of
+chilled water running through the chillers all the time. </li>
+<li>The condenser water is cooled by two parallel cooling towers with a bypass
+loop. See <a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
+Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass</a>
+for the details of the modeling of the cooling towers. </li>
+<li>The chilled water loop is equipped with two parallel constant speed pumps,
+which run one-and-one with each chiller. The condenser water pumps are constant speed with prescribed
+mass flow rates. </li>
+<li>The plant operates when it receives an <code>on</code> signal from the
+external control. </li>
+</ul>
+<p>The staging of the chillers is based on the calculated cooling load. </p>
+<p>See <a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.ChillerStage\">
+Buildings.DHC.Plants.Cooling.Controls.ChillerStage</a> for
+the detailed control logic. </p>
+<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/ElectricChillerParallel.png\" alt=\"System schematics\"/>. </p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+January 2, 2023, by Kathryn Hinkelman:<br/>
+Revised chilled water pump control to be constant speed and running 1-and-1 with chillers.
+</li>
+<li>
+December 14, 2022, by Kathryn Hinkelman:<br/>
+Corrected <code>chiBypCon</code> to control mass flow rate through the chillers.<br>
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">issue 2912</a>.
+</li>
+<li>
+November 16, 2022, by Michael Wetter:<br/>
+Corrected wrong assignments for chiller system <code>mulChiSys</code> which assigned chilled water
+to condenser water parameters and vice versa.<br/>
+Changed rise time of valve to 30 seconds so that it is the same as the one for the pumps.
+</li>
+<li>
+September 15, 2022, by Kathryn Hinkelman:<br/>
+Propagated dynamics and initialization parameters for pumps.
+</li>
+<li>
+March 3, 2022, by Michael Wetter:<br/>
+Moved <code>massDynamics</code> to <code>Advanced</code> tab and
+added assertion for correct combination of energy and mass dynamics.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1542\">issue 1542</a>.
+</li>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        extent={{-300,-300},{300,300}}),
+      graphics={
+        Polygon(
+          points={{-62,-14},{-62,-14}},
+          lineColor={238,46,47},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid)}));
+end ElectricChillerParallel;
diff --git a/Buildings/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo b/Buildings/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
new file mode 100644
index 00000000000..4157a83e90d
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
@@ -0,0 +1,163 @@
+within Buildings.DHC.Plants.Cooling.Examples;
+model ElectricChillerParallel
+  "Example to test the chiller cooling plant"
+  extends Modelica.Icons.Example;
+  package Medium=Buildings.Media.Water
+    "Medium model for water";
+  // chiller and cooling tower
+  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_York_YT_1055kW_5_96COP_Vanes perChi
+    "Performance data of chiller";
+  parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=18.3
+    "Nominal chilled water mass flow rate";
+  parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=34.7
+    "Nominal condenser water mass flow rate";
+  parameter Modelica.Units.SI.PressureDifference dpCHW_nominal=44.8*1000
+    "Nominal chilled water side pressure";
+  parameter Modelica.Units.SI.PressureDifference dpCW_nominal=46.2*1000
+    "Nominal condenser water side pressure";
+  parameter Modelica.Units.SI.Power QChi_nominal=mCHW_flow_nominal*4200*(6.67
+       - 18.56) "Nominal cooling capaciaty (Negative means cooling)";
+  parameter Modelica.Units.SI.MassFlowRate mMin_flow=mCHW_flow_nominal*0.1
+    "Minimum mass flow rate of single chiller";
+  parameter Modelica.Units.SI.TemperatureDifference dTApp=3
+    "Approach temperature";
+  parameter Modelica.Units.SI.Power PFan_nominal=5000 "Fan power";
+  // control settings
+  parameter Modelica.Units.SI.Temperature TCHWSet=273.15 + 8
+    "Chilled water temperature setpoint";
+  parameter Modelica.Units.SI.Time tWai=30 "Waiting time";
+  // pumps
+  parameter Buildings.Fluid.Movers.Data.Generic perCHWPum(
+    pressure=Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
+      V_flow=mCHW_flow_nominal/1000*{0.2,0.6,0.8,1.0},
+      dp=(dpCHW_nominal+18000+30000)*{1,0.8,0.6,0.2}))
+    "Performance data for chilled water pumps";
+  parameter Buildings.Fluid.Movers.Data.Generic perCWPum(
+    pressure=Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
+      V_flow=mCW_flow_nominal/1000*{0.2,0.6,1.0,1.2},
+      dp=(2*dpCW_nominal+60000+6000)*{1,0.8,0.6,0.2}))
+    "Performance data for condenser water pumps";
+  parameter Modelica.Units.SI.Pressure dpCHWPumVal_nominal=6000
+    "Nominal pressure drop of chilled water pump valve";
+  parameter Modelica.Units.SI.Pressure dpCWPumVal_nominal=6000
+    "Nominal pressure drop of chilled water pump valve";
+  parameter Modelica.Units.SI.PressureDifference dpCooTowVal_nominal=6000
+    "Nominal pressure difference of the cooling tower valve";
+  replaceable Buildings.DHC.Plants.Cooling.ElectricChillerParallel pla(
+    perChi=perChi,
+    dTApp=dTApp,
+    perCHWPum=perCHWPum,
+    perCWPum=perCWPum,
+    mCHW_flow_nominal=mCHW_flow_nominal,
+    dpCHW_nominal=dpCHW_nominal,
+    QChi_nominal=QChi_nominal,
+    mMin_flow=mMin_flow,
+    mCW_flow_nominal=mCW_flow_nominal,
+    dpCW_nominal=dpCW_nominal,
+    TAirInWB_nominal=298.7,
+    TCW_nominal=308.15,
+    dT_nominal=5.56,
+    TMin=288.15,
+    PFan_nominal=PFan_nominal,
+    dpCooTowVal_nominal=dpCooTowVal_nominal,
+    dpCHWPumVal_nominal=dpCHWPumVal_nominal,
+    dpCWPumVal_nominal=dpCWPumVal_nominal,
+    tWai=tWai,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "District cooling plant"
+    annotation (Placement(transformation(extent={{-10,-20},{10,0}})));
+  Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    final computeWetBulbTemperature=true,
+    filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Weather data"
+    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
+  Modelica.Blocks.Sources.BooleanConstant on
+    "On signal of the plant"
+    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
+  Modelica.Blocks.Sources.Constant TCHWSupSet(
+    k=TCHWSet)
+    "Chilled water supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
+  Fluid.MixingVolumes.MixingVolume vol(
+    nPorts=2,
+    redeclare package Medium=Medium,
+    m_flow_nominal=pla.numChi*mCHW_flow_nominal,
+    V=0.5,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Mixing volume"
+    annotation (Placement(transformation(extent={{50,20},{70,40}})));
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow fixHeaFlo(
+    T_ref=293.15)
+    "Fixed heat flow rate"
+    annotation (Placement(transformation(extent={{0,60},{20,80}})));
+  Fluid.FixedResistances.PressureDrop res(
+    redeclare package Medium = Medium,
+    m_flow_nominal=pla.numChi*mCHW_flow_nominal,
+    dp_nominal(displayUnit="kPa") = 60000)
+    "Flow resistance"
+    annotation (Placement(transformation(extent={{70,-50},{50,-30}})));
+  Modelica.Blocks.Sources.Sine loaVar(
+    amplitude=913865,
+    f=1/126900,
+    offset=913865,
+    startTime(displayUnit="h") = 21600) "Variable demand load"
+    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
+equation
+  connect(fixHeaFlo.port,vol.heatPort)
+    annotation (Line(points={{20,70},{32,70},{32,30},{50,30}},color={191,0,0}));
+  connect(vol.ports[1], res.port_a) annotation (Line(points={{58,20},{80,20},{
+          80,-40},{70,-40}},      color={0,127,255}));
+  connect(res.port_b, pla.port_aSerCoo) annotation (Line(points={{50,-40},{-14,
+          -40},{-14,-11.3333},{-10,-11.3333}}, color={0,127,255}));
+  connect(on.y,pla.on)
+    annotation (Line(points={{-39,-10},{-38,-10},{-38,-2.6},{-10.7333,-2.6}},
+      color={255,0,255}));
+  connect(weaDat.weaBus,pla.weaBus)
+    annotation (Line(points={{-40,30},{0.0333333,30},{0.0333333,-1.13333}},
+      color={255,204,51}));
+  connect(fixHeaFlo.Q_flow,loaVar. y)
+    annotation (Line(points={{0,70},{-39,70}}, color={0,0,127}));
+  connect(pla.port_bSerCoo, vol.ports[2]) annotation (Line(points={{10,-11.3333},
+          {20,-11.3333},{20,20},{62,20}}, color={0,127,255}));
+  connect(pla.TCHWSupSet, TCHWSupSet.y) annotation (Line(points={{-10.6667,
+          -4.73333},{-30,-4.73333},{-30,-50},{-39,-50}},
+                                               color={0,0,127}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    experiment(
+      StopTime=86400,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>This model validates the district central cooling plant implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.ElectricChillerParallel\">
+Buildings.DHC.Plants.Cooling.ElectricChillerParallel</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+December 14, 2022, by Kathryn Hinkelman:<br/>
+Enabled filters for CHW pumps and valves. Corrected pressure drop in loop.
+This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">issue 2912</a>.
+</li>
+<li>
+October 20, 2021, by Chengnan Shi:<br/>
+Revised the model for extensibility. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2749\">issue 2749</a>.
+</li>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos"
+      "Simulate and Plot"));
+end ElectricChillerParallel;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo b/Buildings/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
rename to Buildings/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
index eb7225d174d..39ad7ee7ccb 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
+++ b/Buildings/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Examples;
+within Buildings.DHC.Plants.Cooling.Examples;
 model StoragePlantDualSource
   "Idealised district system model with two sources and three users"
   extends Modelica.Icons.Example;
@@ -51,12 +51,12 @@ model StoragePlantDualSource
         extent={{10,10},{-10,-10}},
         rotation=180,
         origin={-130,150})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.SelectMin selMin_dp(nin=3)
+  Buildings.DHC.Plants.Cooling.Controls.SelectMin selMin_dp(nin=3)
     "Min of pressure heads with the signal from storage plant optionally used"
     annotation (Placement(transformation(extent={{-180,100},{-160,120}})));
 
 // Second plant: chiller and tank
-  Buildings.Experimental.DHC.Plants.Cooling.StoragePlant stoPla(redeclare
+  Buildings.DHC.Plants.Cooling.StoragePlant stoPla(redeclare
       final package Medium = Medium,
     mTan_flow_nominal=mTan_flow_nominal,
     mChi_flow_nominal=mChi_flow_nominal,
@@ -89,7 +89,7 @@ model StoragePlantDualSource
         origin={-222,110})));
 
 // Users
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse1(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse1(
     redeclare final package Medium = Medium,
     final m_flow_nominal=0.6*m_flow_nominal,
     dp_nominal=0.2*dp_nominal,
@@ -98,7 +98,7 @@ model StoragePlantDualSource
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={130,150})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse2(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse2(
     redeclare final package Medium = Medium,
     final m_flow_nominal=0.65*m_flow_nominal,
     dp_nominal=0.2*dp_nominal,
@@ -107,7 +107,7 @@ model StoragePlantDualSource
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={130,-10})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse3(
+  Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse3(
     redeclare final package Medium = Medium,
     final m_flow_nominal=0.65*m_flow_nominal,
     dp_nominal=0.2*dp_nominal,
@@ -150,7 +150,7 @@ model StoragePlantDualSource
         origin={202,-166})));
 
 // District pipe network
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
     parJunPla1(
     redeclare final package Medium = Medium,
     T1_start=T_CHWS_nominal,
@@ -161,7 +161,7 @@ model StoragePlantDualSource
         extent={{-10,10},{10,-10}},
         rotation=-90,
         origin={10,70})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
     parJunUse2(
     redeclare final package Medium = Medium,
     T1_start=T_CHWR_nominal,
@@ -172,7 +172,7 @@ model StoragePlantDualSource
         extent={{-10,10},{10,-10}},
         rotation=90,
         origin={10,-10})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions
     parJunPla2(
     redeclare final package Medium = Medium,
     T1_start=T_CHWS_nominal,
@@ -183,7 +183,7 @@ model StoragePlantDualSource
         extent={{-10,10},{10,-10}},
         rotation=-90,
         origin={10,-90})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS1U1(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
@@ -192,7 +192,7 @@ model StoragePlantDualSource
         extent={{10,-10},{-10,10}},
         rotation=-90,
         origin={10,110})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS1U2(
     redeclare package Medium = Medium,
     m_flow_nominal=2*m_flow_nominal,
@@ -201,7 +201,7 @@ model StoragePlantDualSource
         extent={{10,-10},{-10,10}},
         rotation=-90,
         origin={10,30})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS2U2(
     redeclare package Medium = Medium,
     m_flow_nominal=2*m_flow_nominal,
@@ -210,7 +210,7 @@ model StoragePlantDualSource
         extent={{10,-10},{-10,10}},
         rotation=-90,
         origin={10,-50})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes
+  Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes
     parPipS2U3(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
@@ -363,7 +363,7 @@ equation
   connect(mulMax_yVal_actual.y, hys_yVal_actual.u)
     annotation (Line(points={{222,-210},{238,-210}}, color={0,0,127}));
   annotation (experiment(Tolerance=1e-06, StopTime=9000),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos"
+    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos"
         "Simulate and plot"),
         Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
             100}})),                                             Diagram(
@@ -371,8 +371,8 @@ equation
         Documentation(info="<html>
 <p>
 The modelled system is described in the documentation of
-<a href=\"Modelica://Buildings.Experimental.DHC.Plants.Cooling.StoragePlant\">
-Buildings.Experimental.DHC.Plants.Cooling.StoragePlant</a>.
+<a href=\"Modelica://Buildings.DHC.Plants.Cooling.StoragePlant\">
+Buildings.DHC.Plants.Cooling.StoragePlant</a>.
 </p>
 <p>
 The source blocks give the system the following operation schedule during
diff --git a/Buildings/DHC/Plants/Cooling/Examples/package.mo b/Buildings/DHC/Plants/Cooling/Examples/package.mo
new file mode 100644
index 00000000000..f5ec7336774
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Examples/package.mo
@@ -0,0 +1,15 @@
+within Buildings.DHC.Plants.Cooling;
+package Examples "Example models integrating multiple components"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling\">
+Buildings.DHC.Plants.Cooling</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.order b/Buildings/DHC/Plants/Cooling/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Examples/package.order
rename to Buildings/DHC/Plants/Cooling/Examples/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/StoragePlant.mo b/Buildings/DHC/Plants/Cooling/StoragePlant.mo
similarity index 94%
rename from Buildings/Experimental/DHC/Plants/Cooling/StoragePlant.mo
rename to Buildings/DHC/Plants/Cooling/StoragePlant.mo
index ea0c897470b..cfd92be68ba 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/StoragePlant.mo
+++ b/Buildings/DHC/Plants/Cooling/StoragePlant.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
+within Buildings.DHC.Plants.Cooling;
 model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
 
   extends Buildings.Fluid.Interfaces.PartialFourPort(
@@ -49,7 +49,7 @@ model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
         extent={{10,-10},{-10,10}},
         rotation=0,
         origin={-30,-60})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.TankBranch tanBra(
+  Buildings.DHC.Plants.Cooling.BaseClasses.TankBranch tanBra(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final mTan_flow_nominal=mTan_flow_nominal,
@@ -63,7 +63,7 @@ model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={10,-10})));
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ReversibleConnection
+  Buildings.DHC.Plants.Cooling.BaseClasses.ReversibleConnection
     revCon(redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final mTan_flow_nominal=mTan_flow_nominal,
@@ -72,12 +72,12 @@ model StoragePlant "Model of a storage plant with a chiller and a CHW tank"
     final T_start=T_CHWS_nominal)
     "Reversible connection"
     annotation (Placement(transformation(extent={{40,20},{60,40}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl floCon(
+  Buildings.DHC.Plants.Cooling.Controls.FlowControl floCon(
     final mChi_flow_nominal=mChi_flow_nominal,
     final mTan_flow_nominal=mTan_flow_nominal)
     "Control block for storage plant flows"
     annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus tanSta(
+  Buildings.DHC.Plants.Cooling.Controls.TankStatus tanSta(
     TLow=T_CHWS_nominal + 0.5,
     THig=T_CHWR_nominal - 0.5) "Tank status"
     annotation (Placement(transformation(extent={{40,-80},{60,-60}})));
@@ -252,8 +252,8 @@ chiller on the same CHW district network.
 <h4>System Concept Example</h4>
 <p>
 An example usage of this model within a district network is implemented in
-<a href=\"Modelica://Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
-Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
+<a href=\"Modelica://Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
+Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
 Shown in the schematic below, it has two CHW plants and three users.
 </p>
 <ul>
@@ -272,7 +272,7 @@ or throttle water from the pressurised network to charge the tank.
 </ul>
 <p align=\"center\">
 <img alt=\"SystemConcept\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.png\"/>
 </p>
 <h4>Control Signals</h4>
 <p>
@@ -327,13 +327,13 @@ the district network.
 </ul>
 <p align=\"center\">
 <img alt=\"ControlSignals\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.png\"/>
+src=\"modelica://Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.png\"/>
 </p>
 <h4>Implementation</h4>
 <p>
 The flow control of the storage plant is implemented as a state graph in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Controls.FlowControl\">
+Buildings.DHC.Plants.Cooling.Controls.FlowControl</a>.
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
new file mode 100644
index 00000000000..22306a0c14e
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
@@ -0,0 +1,277 @@
+within Buildings.DHC.Plants.Cooling.Subsystems;
+model CoolingTowersParallel
+  "Multiple identical cooling towers in parallel connection"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    redeclare replaceable package Medium=Buildings.Media.Water);
+  parameter Integer num(
+    final min=1)=2
+    "Number of cooling towers";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Modelica.Units.SI.PressureDifference dp_nominal
+    "Nominal pressure difference of the tower"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpValve_nominal
+    "Nominal pressure difference of the valve";
+  parameter Real ratWatAir_nominal(
+    final min=0,
+    final unit="1")=0.625
+    "Design water-to-air ratio"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TAirInWB_nominal
+    "Nominal outdoor (air inlet) wetbulb temperature"
+    annotation (Dialog(group="Heat transfer"));
+  parameter Modelica.Units.SI.Temperature TWatIn_nominal
+    "Nominal water inlet temperature" annotation (Dialog(group="Heat transfer"));
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
+    "Temperature difference between inlet and outlet of the tower"
+    annotation (Dialog(group="Heat transfer"));
+  parameter Modelica.Units.SI.Power PFan_nominal "Fan power"
+    annotation (Dialog(group="Fan"));
+  parameter Boolean use_inputFilter=true
+    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
+    annotation (Dialog(tab="Dynamics",group="Filtered opening"));
+  Modelica.Blocks.Interfaces.BooleanInput on[num]
+    "On signal for cooling towers"
+    annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
+  Modelica.Blocks.Interfaces.RealInput uFanSpe(
+    final unit="1")
+    "Fan speed control signal"
+    annotation (Placement(transformation(extent={{-140,0},{-100,40}})));
+  Modelica.Blocks.Interfaces.RealInput TWetBul(
+    final unit="K",
+    displayUnit="degC")
+    "Entering air wetbulb temperature"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
+  Modelica.Blocks.Interfaces.RealOutput PFan[num](
+    each final quantity="Power",
+    each final unit="W")
+    "Electric power consumed by fan"
+    annotation (Placement(transformation(extent={{100,50},{120,70}})));
+  Modelica.Blocks.Interfaces.RealOutput TLvg(
+    final unit="K",
+    displayUnit="degC")
+    "Leaving water temperature"
+    annotation (Placement(transformation(extent={{100,20},{120,40}})));
+  replaceable Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel cooTow[num](
+    each final allowFlowReversal=allowFlowReversal,
+    each final m_flow_small=m_flow_small,
+    each final ratWatAir_nominal=ratWatAir_nominal,
+    each final TAirInWB_nominal=TAirInWB_nominal,
+    each final TWatIn_nominal=TWatIn_nominal,
+    each final TWatOut_nominal=TWatIn_nominal-dT_nominal,
+    each final PFan_nominal=PFan_nominal,
+    each final dp_nominal=0)
+    constrainedby
+    Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.CoolingTowerVariableSpeed(
+      redeclare each final package Medium=Medium,
+      each final show_T=show_T,
+      each final m_flow_nominal=m_flow_nominal,
+      each final energyDynamics=energyDynamics)
+    "Cooling tower type"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage val[num](
+    redeclare each final package Medium=Medium,
+    each final allowFlowReversal=allowFlowReversal,
+    each final m_flow_nominal=m_flow_nominal,
+    each final dpValve_nominal=dpValve_nominal,
+    each final use_inputFilter=use_inputFilter,
+    each riseTime=30,
+    each final dpFixed_nominal=dp_nominal)
+    "Cooling tower valves"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[num]
+    "Boolean signal to real signal"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTem(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_small=m_flow_small,
+    final T_start=Medium.T_default)
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+
+equation
+  for i in 1:num loop
+    connect(port_a,val[i].port_a)
+      annotation (Line(points={{-100,0},{-60,0}},color={0,127,255}));
+    connect(val[i].port_b,cooTow[i].port_a)
+      annotation (Line(points={{-40,0},{-10,0}},color={0,127,255}));
+    connect(uFanSpe,cooTow[i].y)
+      annotation (Line(points={{-120,20},{-20,20},{-20,8},{-12,8}},color={0,0,127}));
+    connect(TWetBul,cooTow[i].TAir)
+      annotation (Line(points={{-120,-60},{-20,-60},{-20,4},{-12,4}},color={0,0,127}));
+    connect(cooTow[i].PFan,PFan[i])
+      annotation (Line(points={{11,8},{20,8},{20,60},{110,60}},color={0,0,127}));
+    connect(cooTow[i].port_b, senTem.port_a)
+      annotation (Line(points={{10,0},{40,0}}, color={0,127,255}));
+  end for;
+  connect(on,booToRea.u)
+    annotation (Line(points={{-120,60},{-92,60}},color={255,0,255}));
+  connect(senTem.port_b, port_b)
+    annotation (Line(points={{60,0},{100,0}}, color={0,127,255}));
+  connect(senTem.T, TLvg)
+    annotation (Line(points={{50,11},{50,30},{110,30}}, color={0,0,127}));
+  connect(booToRea.y, val.y)
+    annotation (Line(points={{-68,60},{-50,60},{-50,12}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="cooTowPar",
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-30,80},{30,6}},
+          lineColor={95,95,95},
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-22,74},{0,66}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{0,74},{22,66}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{16,56},{22,44}},
+          color={255,0,0}),
+        Line(
+          points={{0,56},{6,44}},
+          color={255,0,0}),
+        Line(
+          points={{0,56},{-6,44}},
+          color={255,0,0}),
+        Line(
+          points={{16,56},{10,44}},
+          color={255,0,0}),
+        Rectangle(
+          extent={{-30,-6},{30,-80}},
+          lineColor={95,95,95},
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-149,-114},{151,-154}},
+          textColor={0,0,255},
+          textString="%name"),
+        Ellipse(
+          extent={{-22,-12},{0,-20}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{0,-12},{22,-20}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-16,-30},{-22,-42}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{-16,-30},{-10,-42}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{0,-30},{-6,-42}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{0,-30},{6,-42}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{16,-30},{10,-42}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{16,-30},{22,-42}},
+          color={255,0,0},
+          thickness=0.5),
+        Rectangle(
+          extent={{30,10},{60,6}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{30,-76},{60,-80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{62,2},{92,-2}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{58,-80},{62,10}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-90,2},{-60,-2}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-64,-30},{-60,60}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,-26},{16,-30}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,60},{16,56}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-16,56},{-22,44}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{-16,56},{-10,44}},
+          color={255,0,0},
+          thickness=0.5)}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+November 16, 2022, by Michael Wetter:<br/>
+Changed rise time of valve to 30 seconds so that it is the same as the one for the pumps.
+</li>
+<li>
+May 19, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model implements a parallel cooling tower system with <code>num</code>
+identical cooling towers. </p>
+<p>The cooling tower type is replaceable.
+<a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel\">
+Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel</a> is currently used in
+this model. </p>
+</html>"),
+    __Dymola_Commands);
+end CoolingTowersParallel;
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
new file mode 100644
index 00000000000..50c56ee00e9
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
@@ -0,0 +1,419 @@
+within Buildings.DHC.Plants.Cooling.Subsystems;
+model CoolingTowersWithBypass
+  "Cooling tower system with bypass valve"
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    redeclare replaceable package Medium=Buildings.Media.Water);
+  parameter Integer num(
+    final min=1)=2
+    "Number of cooling towers";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Boolean use_inputFilter=true
+    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
+    annotation (Dialog(tab="Dynamics",group="Filtered opening"));
+  parameter Modelica.Units.SI.Time riseTime=30
+    "Pump rise time of the filter (time to reach 99.6 % of the speed)" annotation (
+      Dialog(
+      tab="Dynamics",
+      enable=use_inputFilter));
+  parameter Modelica.Units.SI.Pressure dp_nominal
+    "Nominal pressure difference of the tower"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpValve_nominal
+    "Nominal pressure difference of the valve";
+  parameter Real ratWatAir_nominal(
+    final min=0,
+    final unit="1")=0.625
+    "Design water-to-air ratio"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature TAirInWB_nominal
+    "Nominal outdoor (air inlet) wetbulb temperature"
+    annotation (Dialog(group="Heat transfer"));
+  parameter Modelica.Units.SI.Temperature TWatIn_nominal
+    "Nominal water inlet temperature" annotation (Dialog(group="Heat transfer"));
+  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
+    "Temperature difference between inlet and outlet of the tower"
+    annotation (Dialog(group="Heat transfer"));
+  parameter Modelica.Units.SI.Power PFan_nominal "Fan power"
+    annotation (Dialog(group="Fan"));
+  parameter Modelica.Units.SI.TemperatureDifference dTApp=3
+    "Approach temperature" annotation (Dialog(group="Control Settings"));
+  parameter Modelica.Units.SI.Temperature TMin
+    "Minimum allowed water temperature entering chiller"
+    annotation (Dialog(group="Control Settings"));
+  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
+    "Type of fan speed controller"
+    annotation (Dialog(group="Control Settings"));
+  parameter Real k(
+    final unit="1",
+    final min=0)=1
+    "Gain of the tower PID controller"
+    annotation (Dialog(group="Control Settings"));
+  parameter Modelica.Units.SI.Time Ti(final min=Modelica.Constants.small) = 60
+    "Integrator time constant of the tower PID controller"
+    annotation (Dialog(enable=(enableTi), group="Control Settings"));
+  parameter Modelica.Units.SI.Time Td(final min=0) = 0.1
+    "Derivative time constant of the tower PID controller"
+    annotation (Dialog(enable=(enableTd), group="Control Settings"));
+  Modelica.Blocks.Interfaces.BooleanInput on[num]
+    "On signal for cooling towers"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
+  Modelica.Blocks.Interfaces.RealInput TWetBul(
+    final unit="K",
+    displayUnit="degC")
+    "Entering air wetbulb temperature"
+    annotation (Placement(transformation(extent={{-140,-40},{-100,0}})));
+  Modelica.Blocks.Interfaces.RealOutput PFan[num](
+    each final quantity="Power",
+    each final unit="W")
+    "Electric power consumed by fan"
+    annotation (Placement(transformation(extent={{100,50},{120,70}})));
+  Modelica.Blocks.Interfaces.RealOutput TLvg(
+    final unit="K",
+    displayUnit="degC")
+    "Leaving water temperature"
+    annotation (Placement(transformation(extent={{100,20},{120,40}})));
+  Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel cooTowSys(
+    redeclare final package Medium=Medium,
+    final use_inputFilter=false,
+    final num=num,
+    final show_T=show_T,
+    final m_flow_small=m_flow_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal/num,
+    final dpValve_nominal=dpValve_nominal,
+    final dp_nominal=dp_nominal,
+    final ratWatAir_nominal=ratWatAir_nominal,
+    final TAirInWB_nominal=TAirInWB_nominal,
+    final TWatIn_nominal=TWatIn_nominal,
+    final dT_nominal=dT_nominal,
+    final PFan_nominal=PFan_nominal,
+    final energyDynamics=energyDynamics)
+    "Cooling tower system"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage valByp(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T,
+    final dpValve_nominal=dpValve_nominal,
+    final riseTime=riseTime,
+    final use_inputFilter=use_inputFilter)
+    "Condenser water bypass valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={0,-40})));
+  Buildings.Fluid.Sensors.TemperatureTwoPort senTCWSup(
+    redeclare final package Medium=Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_small=m_flow_nominal,
+    final T_start=Medium.T_default)
+    "Temperature sensor"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetByp(
+    final k=TMin)
+    "Bypass loop temperature setpoint"
+    annotation (Placement(transformation(extent={{-90,-60},{-70,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset bypValCon(
+    u_s(
+      final unit="K",
+      displayUnit="degC"),
+    u_m(
+      final unit="K",
+      displayUnit="degC"),
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    final k=k,
+    final Ti=Ti,
+    final y_reset=0)
+    "Bypass valve controller"
+    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.PID cooTowSpeCon(
+    u_s(
+      final unit="K",
+      displayUnit="degC"),
+    u_m(
+      final unit="K",
+      displayUnit="degC"),
+    final reverseActing=false,
+    final controllerType=controllerType,
+    final k=k,
+    final Ti=Ti)
+    "Cooling tower fan speed controller"
+    annotation (Placement(transformation(extent={{-10,40},{10,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi
+    "Output the input of higher value"
+    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
+  Buildings.Controls.OBC.CDL.Reals.Hysteresis hys(
+    uLow=TMin-0.1,
+    uHigh=TMin+0.1)
+    "Compare if (TWetBul+dTApp) is greater than TMin"
+    annotation (Placement(transformation(extent={{-70,40},{-50,60}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(
+    p=dTApp)
+    "Add approach temperature on top of wetbulb temperature"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Buildings.Fluid.FixedResistances.Junction jun(
+  redeclare final package Medium=Medium,
+    m_flow_nominal=m_flow_nominal .* {1,-1,-1},
+    dp_nominal={0,0,0},
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+    "Upstream mixing point of cooTowSys and valByp"
+    annotation (Placement(transformation(extent={{-34,-4},{-26,4}})));
+protected
+  parameter Boolean enableTi=
+    controllerType == Modelica.Blocks.Types.SimpleController.PI or
+    controllerType == Modelica.Blocks.Types.SimpleController.PID
+    "Flag to enable controller parameter Ti";
+  parameter Boolean enableTd=
+    controllerType == Modelica.Blocks.Types.SimpleController.PD or
+    controllerType == Modelica.Blocks.Types.SimpleController.PID
+    "Flag to enable controller parameter Td";
+equation
+  connect(cooTowSys.TWetBul,TWetBul)
+    annotation (Line(points={{-12,-6},{-40,-6},{-40,-20},{-120,-20}},color={0,0,127}));
+  connect(cooTowSys.port_b,senTCWSup.port_a)
+    annotation (Line(points={{10,0},{60,0}},color={0,127,255}));
+  connect(senTCWSup.port_b,port_b)
+    annotation (Line(points={{80,0},{100,0}},color={0,127,255}));
+  connect(TSetByp.y,bypValCon.u_s)
+    annotation (Line(points={{-68,-50},{-62,-50}},color={0,0,127}));
+  connect(senTCWSup.T,bypValCon.u_m)
+    annotation (Line(points={{70,11},{70,30},{54,30},{54,-80},{-50,-80},{-50,-62}},
+                                                                    color={0,0,127}));
+  connect(valByp.port_b,senTCWSup.port_a)
+    annotation (Line(points={{10,-40},{30,-40},{30,0},{60,0}},color={0,127,255}));
+  connect(cooTowSpeCon.y,cooTowSys.uFanSpe)
+    annotation (Line(points={{12,50},{16,50},{16,14},{-18,14},{-18,2},{-12,2}},
+      color={0,0,127}));
+  connect(cooTowSys.PFan,PFan)
+    annotation (Line(points={{11,6},{40,6},{40,60},{110,60}},color={0,0,127}));
+  connect(bypValCon.y,valByp.y)
+    annotation (Line(points={{-38,-50},{-20,-50},{-20,-20},{0,-20},{0,-28}},
+      color={0,0,127}));
+  connect(senTCWSup.T,cooTowSpeCon.u_m)
+    annotation (Line(points={{70,11},{70,30},{0,30},{0,38}},
+                      color={0,0,127}));
+  connect(hys.y, swi.u2)
+    annotation (Line(points={{-48,50},{-42,50}}, color={255,0,255}));
+  connect(cooTowSpeCon.u_s,swi.y)
+    annotation (Line(points={{-12,50},{-18,50}},color={0,0,127}));
+  connect(TSetByp.y,swi.u3)
+    annotation (Line(points={{-68,-50},{-66,-50},{-66,34},{-46,34},{-46,42},{-42,
+          42}},          color={0,0,127}));
+  connect(TWetBul,addPar.u)
+    annotation (Line(points={{-120,-20},{-86,-20},{-86,80},{-82,80}},
+      color={0,0,127}));
+  connect(addPar.y,swi.u1)
+    annotation (Line(points={{-58,80},{-46,80},{-46,64},{-42,64},{-42,58}},
+      color={0,0,127}));
+  connect(on,cooTowSys.on)
+    annotation (Line(points={{-120,40},{-80,40},{-80,6},{-12,6}},
+      color={255,0,255}));
+  connect(on[1],bypValCon.trigger)
+    annotation (Line(points={{-120,30},{-80,30},{-80,-28},{-94,-28},{-94,-80},{-56,
+          -80},{-56,-62}},
+      color={255,0,255}));
+  connect(port_a, jun.port_1)
+    annotation (Line(points={{-100,0},{-34,0}}, color={0,127,255}));
+  connect(cooTowSys.port_a, jun.port_2)
+    annotation (Line(points={{-10,0},{-26,0}}, color={0,127,255}));
+  connect(valByp.port_a, jun.port_3)
+    annotation (Line(points={{-10,-40},{-30,-40},{-30,-4}}, color={0,127,255}));
+  connect(addPar.y, hys.u)
+    annotation (Line(points={{-58,80},{-46,80},{-46,64},{-78,64},{-78,50},{-72,50}},
+      color={0,0,127}));
+  connect(senTCWSup.T, TLvg)
+    annotation (Line(points={{70,11},{70,30},{110,30}},
+      color={0,0,127}));
+  annotation (
+    defaultComponentName="cooTowWitByp",
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Polygon(
+          points={{0,-80},{-10,-72},{-10,-88},{0,-80}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{0,-80},{10,-72},{10,-88},{0,-80}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-149,-114},{151,-154}},
+          textColor={0,0,255},
+          textString="%name"),
+        Rectangle(
+          extent={{-30,94},{30,20}},
+          lineColor={95,95,95},
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-22,88},{0,80}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{0,88},{22,80}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{16,70},{22,58}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{0,70},{6,58}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{0,70},{-6,58}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{16,70},{10,58}},
+          color={255,0,0},
+          thickness=0.5),
+        Rectangle(
+          extent={{-30,8},{30,-66}},
+          lineColor={95,95,95},
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-22,2},{0,-6}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{0,2},{22,-6}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-16,-16},{-22,-28}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{-16,-16},{-10,-28}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{0,-16},{-6,-28}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{0,-16},{6,-28}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{16,-16},{10,-28}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{16,-16},{22,-28}},
+          color={255,0,0},
+          thickness=0.5),
+        Rectangle(
+          extent={{30,24},{60,20}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{30,-62},{60,-66}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{62,2},{92,-2}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{58,-80},{62,24}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-90,2},{-60,-2}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-64,-82},{-60,74}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,-12},{16,-16}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-60,74},{16,70}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-16,70},{-22,58}},
+          color={255,0,0},
+          thickness=0.5),
+        Line(
+          points={{-16,70},{-10,58}},
+          color={255,0,0},
+          thickness=0.5),
+        Rectangle(
+          extent={{-60,-78},{-10,-82}},
+          lineColor={238,46,47},
+          pattern=LinePattern.None,
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{10,-78},{62,-82}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid)}),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+January 2, 2023, by Kathryn Hinkelman:<br/>
+Set <code>dp_fixed = 0</code> for the bypass valve because the pressure drop in this leg
+will be significantly less than the cooling towers.<br/>
+Propagated <code>riseTime</code> for the valve signal filters.
+</li>
+<li>
+November 16, 2022, by Michael Wetter:<br/>
+Changed rise time of valve to 30 seconds so that it is the same as the one for the pumps,
+and set <code>use_inputFilter = false</code> for shut-off valve in cooling tower.
+This avoids a sharp rise in pressure near <i>t=35</i> seconds.
+</li>
+<li>May 19, 2020 by Jing Wang:<br/>First implementation. </li>
+</ul>
+</html>",
+      info="<html>
+<p>This model simulates parallel connected cooling tower subsystem with a bypass
+valve. </p>
+<p>The bypass valve is controlled to enforce that the leaving condenser water
+temperature does not drop below the minimum temperature <code>TMin</code>.</p>
+<p>By default, the condenser water setpoint is the ambient wet bulb temperature
+<code>TWetBul</code> plus the approach temperature <code>dTApp</code>. </p>
+<p>Inside the model, a cooling tower fan speed controller is also implemented to
+maintain the condenser water at its setpoint.</p>
+</html>"));
+end CoolingTowersWithBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
similarity index 96%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
index 26700804742..de4f6c8337c 100644
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/PartialCoolingTowersSubsystem.mo
@@ -1,4 +1,4 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses;
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses;
 partial model PartialCoolingTowersSubsystem
   "Partial class for test models of subsystems"
 
@@ -156,8 +156,8 @@ Duplicate <a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Exam
 Buildings.Fluid.HeatExchangers.CoolingTowers.Examples.BaseClasses.PartialStaticTwoPortCoolingTower</a><br/>
 Changed replaceable cooling tower model to <code>PartialTwoPortInterface</code>
 for reusability in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples</a>.
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.Examples\">
+Buildings.DHC.Plants.Cooling.Subsystems.Examples</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
new file mode 100644
index 00000000000..0f1fd966e24
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples;
+package BaseClasses "Package with base classes"
+  extends Modelica.Icons.BasesPackage;
+
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>This package contains base classes that are used to construct the classes in <a href=\"modelica://Buildings.DHC.Plants\">Buildings.DHC.Plants</a>. </p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
new file mode 100644
index 00000000000..c00a162ed08
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
@@ -0,0 +1,84 @@
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples;
+model CoolingTowersParallel
+  "Example model for parallel cooling tower model"
+  extends Modelica.Icons.Example;
+  extends
+    Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
+    redeclare Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel tow(
+      TAirInWB_nominal=273.15+25.55,
+      TWatIn_nominal=273.15+35,
+      dT_nominal=5.56,
+      dpValve_nominal = 6000,
+      dp_nominal = 6000,
+      PFan_nominal=4800,
+      use_inputFilter=false),
+    weaDat(final computeWetBulbTemperature=true));
+
+   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetLea(
+    k=273.15+18)
+    "Setpoint for leaving temperature"
+    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conFan(
+    k=1,
+    Ti=60,
+    Td=10,
+    reverseActing=false,
+    u_s(
+      unit="K",
+      displayUnit="degC"),
+    u_m(
+      unit="K",
+      displayUnit="degC"))
+    "Controller for tower fan"
+    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
+equation
+  connect(TSetLea.y, conFan.u_s)
+    annotation (Line(points={{-58,10},{-42,10}},  color={0,0,127}));
+  connect(tow.TLvg, conFan.u_m)
+    annotation (Line(points={{43,-47},{50,-47},{50,-20},{-30,-20},{-30,-2}},
+      color={0,0,127}));
+  connect(conFan.y, tow.uFanSpe)
+    annotation (Line(points={{-18,10},{10,10},{10,-48},{20,-48}},
+      color={0,0,127}));
+  connect(weaBus.TWetBul, tow.TWetBul)
+   annotation (Line(points={{-59.95,50.05},{-4,50.05},{-4,-56},{20,-56}},
+    color={255,204,51},thickness=0.5),
+     Text(string="%first",index=-1,extent={{-6,3},{-6,3}},
+     horizontalAlignment=TextAlignment.Right));
+  connect(hys.y, tow.on[1]) annotation (Line(points={{42,-190},{50,-190},{50,
+          -132},{0,-132},{0,-44},{20,-44}}, color={255,0,255}));
+  connect(hys.y, tow.on[2]) annotation (Line(points={{42,-190},{50,-190},{50,
+          -132},{0,-132},{0,-44},{20,-44}}, color={255,0,255}));
+  connect(hys.y, conFan.trigger) annotation (Line(points={{42,-190},{50,-190},{
+          50,-132},{0,-132},{0,-12},{-36,-12},{-36,-2}}, color={255,0,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-140,-260},{140,100}})),
+    experiment(
+      StartTime=15552000,
+      StopTime=15724800,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos"
+      "Simulate and Plot"),
+    Documentation(
+      info="<html>
+<p>This model validates the parallel connected cooling tower subsystem in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel\">
+Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel</a>.</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end CoolingTowersParallel;
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
new file mode 100644
index 00000000000..7941431ee99
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
@@ -0,0 +1,58 @@
+within Buildings.DHC.Plants.Cooling.Subsystems.Examples;
+model CoolingTowersWithBypass
+  "Example model for parallel cooling towers with bypass valve"
+  extends Modelica.Icons.Example;
+  extends Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
+    redeclare Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass tow(
+      dpValve_nominal = 6000,
+      dp_nominal(displayUnit="Pa") = 6000,
+      TAirInWB_nominal=273.15 + 25.55,
+      TWatIn_nominal=273.15 + 35,
+      dT_nominal=5.56,
+      PFan_nominal=4800,
+      TMin=TMin,
+      controllerType=Modelica.Blocks.Types.SimpleController.PI),
+    weaDat(final computeWetBulbTemperature=true));
+  parameter Modelica.Units.SI.Temperature TMin=273.15 + 10
+    "Minimum allowed water temperature entering chiller";
+equation
+  connect(weaBus.TWetBul, tow.TWetBul)
+   annotation (Line( points={{-59.95,50.05},{-8,50.05},{-8,-52},{20,-52}},
+    color={255,204,51},thickness=0.5),
+     Text(string="%first",index=-1,extent={{-6,3},{-6,3}},
+      horizontalAlignment=TextAlignment.Right));
+  connect(hys.y, tow.on[1]) annotation (Line(points={{42,-190},{50,-190},{50,
+          -130},{0,-130},{0,-46},{20,-46}}, color={255,0,255}));
+  connect(hys.y, tow.on[2]) annotation (Line(points={{42,-190},{50,-190},{50,
+          -130},{0,-130},{0,-46},{20,-46}}, color={255,0,255}));
+  annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-140,-260},{140,100}})),
+    experiment(
+      StartTime=10368000,
+      StopTime=10540800,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos"
+      "Simulate and Plot"),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+August 6, 2020 by Jing Wang:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>This model validates the parallel connected cooling tower subsystem in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
+Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowerWithBypass</a>.</p>
+</html>"));
+end CoolingTowersWithBypass;
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.mo b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.mo
new file mode 100644
index 00000000000..d0f2c1716fb
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.mo
@@ -0,0 +1,14 @@
+within Buildings.DHC.Plants.Cooling.Subsystems;
+package Examples "Example models integrating multiple components"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.Plants.Cooling.Subsystems\">
+Buildings.DHC.Plants.Cooling.Subsystems</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.order b/Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.order
rename to Buildings/DHC/Plants/Cooling/Subsystems/Examples/package.order
diff --git a/Buildings/DHC/Plants/Cooling/Subsystems/package.mo b/Buildings/DHC/Plants/Cooling/Subsystems/package.mo
new file mode 100644
index 00000000000..254f7aa63d4
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/Subsystems/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.Plants.Cooling;
+package Subsystems "Package of models for subsystems of cooling plants"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for subsystems composing central cooling plants.
+</p>
+</html>"));
+end Subsystems;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.order b/Buildings/DHC/Plants/Cooling/Subsystems/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.order
rename to Buildings/DHC/Plants/Cooling/Subsystems/package.order
diff --git a/Buildings/DHC/Plants/Cooling/package.mo b/Buildings/DHC/Plants/Cooling/package.mo
new file mode 100644
index 00000000000..f7a5a898e4d
--- /dev/null
+++ b/Buildings/DHC/Plants/Cooling/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC.Plants;
+package Cooling "Package of models for central cooling production"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for central plants producing chilled water.
+</p>
+</html>"));
+end Cooling;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/package.order b/Buildings/DHC/Plants/Cooling/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Cooling/package.order
rename to Buildings/DHC/Plants/Cooling/package.order
diff --git a/Buildings/Experimental/DHC/Plants/Heating/SewageHeatRecovery.mo b/Buildings/DHC/Plants/Heating/SewageHeatRecovery.mo
similarity index 93%
rename from Buildings/Experimental/DHC/Plants/Heating/SewageHeatRecovery.mo
rename to Buildings/DHC/Plants/Heating/SewageHeatRecovery.mo
index 863e708473a..1001aa1d994 100644
--- a/Buildings/Experimental/DHC/Plants/Heating/SewageHeatRecovery.mo
+++ b/Buildings/DHC/Plants/Heating/SewageHeatRecovery.mo
@@ -1,13 +1,13 @@
-within Buildings.Experimental.DHC.Plants.Heating;
+within Buildings.DHC.Plants.Heating;
 model SewageHeatRecovery
   "Model for sewage heat recovery plant"
-  extends Buildings.Experimental.DHC.Plants.BaseClasses.PartialPlant(
+  extends Buildings.DHC.Plants.BaseClasses.PartialPlant(
     final have_fan=false,
     final have_pum=true,
     final have_eleHea=false,
     final have_eleCoo=false,
     final have_weaBus=false,
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration5);
+    final typ=Buildings.DHC.Types.DistrictSystemType.CombinedGeneration5);
 
   parameter Modelica.Units.SI.MassFlowRate mSew_flow_nominal
     "Sewage water nominal mass flow rate"
@@ -66,7 +66,7 @@ model SewageHeatRecovery
         extent={{10,-10},{-10,10}},
         rotation=0,
         origin={0,14})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumDis(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumDis(
     redeclare final package Medium=Medium,
     final m_flow_nominal=mDis_flow_nominal,
     final dp_nominal=dpDis_nominal,
@@ -86,7 +86,7 @@ model SewageHeatRecovery
       extent={{-10,-10},{10,10}},
       rotation=0,
       origin={-70,76})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumSew(
+  Buildings.DHC.ETS.BaseClasses.Pump_m_flow pumSew(
     redeclare final package Medium=Medium,
     final m_flow_nominal=mSew_flow_nominal,
     final dp_nominal=dpSew_nominal,
@@ -106,7 +106,7 @@ model SewageHeatRecovery
         extent={{-6,6},{6,-6}},
         rotation=180,
         origin={-40,20})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
+  Buildings.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
     redeclare package Medium1 = Medium,
     final m_flow_nominal=mDis_flow_nominal)
     "Variation of enthalpy flow rate"
diff --git a/Buildings/DHC/Plants/Heating/package.mo b/Buildings/DHC/Plants/Heating/package.mo
new file mode 100644
index 00000000000..599203576bc
--- /dev/null
+++ b/Buildings/DHC/Plants/Heating/package.mo
@@ -0,0 +1,9 @@
+within Buildings.DHC.Plants;
+package Heating "Package of models for central heating production"
+  extends Modelica.Icons.VariantsPackage;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models for central plants producing hot water.
+</p>
+</html>"));
+end Heating;
diff --git a/Buildings/Experimental/DHC/Plants/Heating/package.order b/Buildings/DHC/Plants/Heating/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Heating/package.order
rename to Buildings/DHC/Plants/Heating/package.order
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo b/Buildings/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
new file mode 100644
index 00000000000..a38df2095ec
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
@@ -0,0 +1,302 @@
+within Buildings.DHC.Plants.Steam.BaseClasses;
+model BoilerPolynomial
+  "A equilibrium boiler with water phase change from liquid to vapor, discharging
+  saturated steam vapor, with the efficiency curve described by a polynomial."
+  extends Buildings.BaseClasses.BaseIconLow;
+  extends Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
+    redeclare final package Medium_a=MediumWat,
+    redeclare final package Medium_b=MediumSte,
+    final T_start=MediumSte.saturationTemperature(p_start));
+
+  // Medium declarations
+  replaceable package MediumWat =
+    Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium - port_a (inlet)";
+  replaceable package MediumSte = Buildings.Media.Steam
+     "Steam medium - port_b (oulet)";
+  // Initialization
+  parameter Boolean fixed_p_start=false
+    "Set to true if p_start is to be used as an explicit initial equation,
+    not an initial guess"
+    annotation(Dialog(tab = "Initialization"));
+  // Nominal conditions
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
+    "Pressure drop at nominal mass flow rate"
+    annotation(Dialog(group = "Nominal condition"));
+  parameter Modelica.Units.SI.Power Q_flow_nominal "Nominal heating power";
+  parameter Modelica.Units.SI.Temperature T_nominal = 373.15
+    "Temperature used to compute nominal efficiency
+    (only used if efficiency curve depends on temperature)";
+
+  // Efficiency, fuel, and boiler properties
+  parameter Buildings.Fluid.Types.EfficiencyCurves effCur=
+    Buildings.Fluid.Types.EfficiencyCurves.Constant
+    "Curve used to compute the efficiency";
+  parameter Real a[:] = {0.9} "Coefficients for efficiency curve";
+  parameter Buildings.Fluid.Data.Fuels.Generic fue "Fuel type"
+   annotation (choicesAllMatching = true);
+  parameter Modelica.Units.SI.ThermalConductance UA=0.05*Q_flow_nominal/30
+    "Overall UA value";
+  parameter Modelica.Units.SI.Volume V = 1.5E-6*Q_flow_nominal
+    "Total internal volume of boiler"
+    annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
+  parameter Modelica.Units.SI.Mass mDry = 1.5E-3*Q_flow_nominal
+    "Mass of boiler that will be lumped to water heat capacity"
+    annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
+
+  // Variables
+  Modelica.Units.SI.Efficiency eta=
+    if effCur == Buildings.Fluid.Types.EfficiencyCurves.Constant then
+      a[1]
+    elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.Polynomial then
+      Buildings.Utilities.Math.Functions.polynomial(a=a, x=y_internal)
+    elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear then
+      Buildings.Utilities.Math.Functions.quadraticLinear(
+        a=aQuaLin,
+        x1=y_internal,
+        x2=MediumSte.saturationTemperature(port_a.p))
+    else 0
+    "Boiler efficiency";
+  Modelica.Units.SI.Power QFue_flow = y_internal * Q_flow_nominal/eta_nominal
+    "Heat released by fuel";
+  Modelica.Units.SI.Power QWat_flow = eta * QFue_flow
+    "Heat transfer from gas into water";
+  Modelica.Units.SI.MassFlowRate mFue_flow = QFue_flow/fue.h
+    "Fuel mass flow rate";
+  Modelica.Units.SI.VolumeFlowRate VFue_flow = mFue_flow/fue.d
+    "Fuel volume flow rate";
+
+  Modelica.Blocks.Interfaces.RealInput y(min=0, max=1) if not steadyDynamics
+    "Part load ratio"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
+  Modelica.Blocks.Interfaces.RealOutput VLiq(
+    final quantity="Volume",
+    final unit="m3",
+    min=0) "Output liquid water volume"
+    annotation (Placement(transformation(extent={{100,50},{120,70}})));
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort if not steadyDynamics
+    "Heat port, can be used to connect to ambient"
+    annotation (Placement(transformation(extent={{-10,62}, {10,82}})));
+  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heaCapDry(
+    C=500*mDry,
+    T(start=T_start)) if not steadyDynamics
+    "Heat capacity of boiler metal"
+    annotation (Placement(transformation(extent={{-80,12},{-60,32}})));
+  Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation vol(
+    redeclare final package MediumSte = MediumSte,
+    redeclare final package MediumWat = MediumWat,
+    final allowFlowReversal=allowFlowReversal,
+    final energyDynamics=energyDynamics,
+    final massDynamics=massDynamics,
+    final p_start=p_start,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T,
+    final V=V,
+    final fixed_p_start=fixed_p_start)
+    "Steam/water control volume"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Fluid.FixedResistances.PressureDrop res(
+    redeclare final package Medium = MediumWat,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    final show_T=show_T,
+    final dp_nominal=dp_nominal)
+    "Flow resistance"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+
+  Modelica.Blocks.Interfaces.RealOutput QFueFlo(
+    final quantity="HeatFlowRate",
+    final unit="W",
+    min=0) "Heat flow rate of the fuel"
+    annotation (Placement(transformation(extent={{100,80},{120,100}})));
+
+protected
+  final parameter Boolean steadyDynamics=
+    if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then true
+    else false
+    "= true, if steady state formulation";
+  parameter Real eta_nominal(fixed=false) "Boiler efficiency at nominal condition";
+  parameter Real aQuaLin[6] = if size(a, 1) == 6 then a else fill(0, 6)
+  "Auxiliary variable for efficiency curve because quadraticLinear requires exactly 6 elements";
+
+  Modelica.Blocks.Interfaces.RealInput y_internal(min=0, max=1)
+    "Internal block needed for conditional input part load ratio";
+
+  Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo if not steadyDynamics
+  "Prescribed heat flow (if heatPort is connected)"
+    annotation (Placement(transformation(extent={{-49,-40},{-29,-20}})));
+  Modelica.Blocks.Sources.RealExpression Q_flow_in(y=QWat_flow)
+    if not steadyDynamics
+    "Heat transfer from gas into water (if heatPort is connected)"
+    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
+
+  Modelica.Thermal.HeatTransfer.Components.ThermalConductor UAOve(G=UA) if not steadyDynamics
+    "Overall thermal conductance (if heatPort is connected)"
+    annotation (Placement(transformation(extent={{-48,10},{-28,30}})));
+
+  Modelica.Blocks.Sources.RealExpression QFue_flow_out(y=QFue_flow)
+    "Heat flow rate of the fuel"
+    annotation (Placement(transformation(extent={{60,80},{80,100}})));
+initial equation
+  if  effCur == Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear then
+    assert(size(a, 1) == 6,
+    "The boiler has the efficiency curve set to 'Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear',
+    and hence the parameter 'a' must have exactly 6 elements.
+    However, only " + String(size(a, 1)) + " elements were provided.");
+  end if;
+
+  if effCur == Buildings.Fluid.Types.EfficiencyCurves.Constant then
+    eta_nominal = a[1];
+  elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.Polynomial then
+    eta_nominal = Buildings.Utilities.Math.Functions.polynomial(
+      a=a, x=1);
+  elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear then
+    // For this efficiency curve, a must have 6 elements.
+    eta_nominal = Buildings.Utilities.Math.Functions.quadraticLinear(
+      a=aQuaLin, x1=1, x2=T_nominal);
+  else
+     eta_nominal = 999;
+  end if;
+
+equation
+  assert(eta > 0.001, "Efficiency curve is wrong.");
+
+  connect(y,y_internal);
+
+  if steadyDynamics then
+    if allowFlowReversal then
+      -QWat_flow = port_a.m_flow*actualStream(port_a.h_outflow) +
+                   port_b.m_flow*actualStream(port_b.h_outflow);
+    else
+      -QWat_flow = port_a.m_flow*inStream(port_a.h_outflow) +
+                   port_b.m_flow*port_b.h_outflow;
+
+    end if;
+  end if;
+
+  connect(UAOve.port_a, heatPort) annotation (Line(
+      points={{-48,20},{-52,20},{-52,60},{0,60},{0,72}},
+      color={191,0,0},
+      smooth=Smooth.None));
+  connect(Q_flow_in.y,preHeaFlo. Q_flow) annotation (Line(
+      points={{-59,-30},{-49,-30}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(heaCapDry.port, UAOve.port_b) annotation (Line(points={{-70,12},{-70,6},
+          {-20,6},{-20,20},{-28,20}}, color={191,0,0}));
+  connect(preHeaFlo.port, UAOve.port_b) annotation (Line(points={{-29,-30},{-20,
+          -30},{-20,20},{-28,20}}, color={191,0,0}));
+  connect(vol.heatPort, UAOve.port_b) annotation (Line(points={{10,-10},{10,-20},
+          {-20,-20},{-20,20},{-28,20}}, color={191,0,0}));
+  connect(vol.port_b, port_b)
+    annotation (Line(points={{20,0},{100,0}}, color={0,127,255}));
+  connect(port_a, res.port_a)
+    annotation (Line(points={{-100,0},{-60,0}}, color={0,127,255}));
+  connect(res.port_b, vol.port_a)
+    annotation (Line(points={{-40,0},{0,0}}, color={0,127,255}));
+  connect(vol.VLiq,VLiq)  annotation (Line(points={{21,7},{80,7},{80,60},{110,
+          60}},
+        color={0,0,127}));
+  connect(QFue_flow_out.y, QFueFlo)
+    annotation (Line(points={{81,90},{110,90}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="boi",
+    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+        Rectangle(
+          extent={{-80,60},{80,-60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-40,40},{40,-40}},
+          fillColor={127,0,0},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None),
+      Line(
+        points={{20,18},{0,8},{20,-12},{0,-22}},
+        color={0,0,0},
+        smooth=Smooth.Bezier),
+      Line(
+        points={{-2,18},{-22,8},{-2,-12},{-22,-22}},
+        color={0,0,0},
+        smooth=Smooth.Bezier)}), Diagram(coordinateSystem(
+          preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This model represents a steam boiler that discharges saturated
+steam and has an efficiency curve defined by a polynomial.
+The efficiency in this model represents the fuel-to-water
+efficiency (e.g., thermal efficiency).
+This model is similar to the
+<a href=\"modelica://Buildings.Fluid.Boilers.BoilerPolynomial\">
+Buildings.Fluid.Boilers.BoilerPolynomial</a> for the efficiency
+and fuel mass flow rate computation with the following exceptions:
+</p>
+<ul>
+<li>
+Water enters <code>port_a</code> in liquid state and exits
+<code>port_b</code> in vapor state.
+</li>
+<li>
+The liquid and vapor phases are at equilibrium; thus, the steam
+boiler is constrained to saturated states only with the volume
+containing a wet steam mixture.
+</li>
+<li>
+If the boiler is configured in steady state, several blocks involving
+the heat flow rate are conditionally removed to avoid overconstraining
+the model. This is because the discharging fluid is constrained at
+a saturated state. The blocks that are conditionally removed as a
+result are within the green region in the below figure:
+</li>
+</ul>
+
+<p align=\"center\">
+<img src=\"modelica://Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png\" border=\"1\"
+alt=\"Boiler polynomial steam with blocks in green conditionally removed if steady state\"/>
+</p>
+<h4>Implementation</h4>
+<p>
+In order to improve the numerical efficiency, this model follows
+the split-medium approach using the
+<a href=\"modelica://Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium\">
+Buildings.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium</a> interface model.
+The saturated mixing volume for an evaporation process
+<a href=\"modelica://Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
+Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a>
+represents the phase change process of water from liquid
+to vapor at equilibrium.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Updated publication references.
+</li>
+<li>
+February 25, 2022 by Kathryn Hinkelman:<br/>
+Refactored base classes for improved extensibility and relocated models into Steam subpackages.
+</li>
+<li>
+July 22, 2021 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BoilerPolynomial;
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo b/Buildings/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
new file mode 100644
index 00000000000..ab7b96c0f24
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
@@ -0,0 +1,75 @@
+within Buildings.DHC.Plants.Steam.BaseClasses;
+model ControlVolumeEvaporation
+  "Control volume model exhibiting the evaporation process of water"
+  extends Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
+    redeclare final package Medium_a=MediumWat,
+    redeclare final package Medium_b=MediumSte,
+    hSte(start = MediumSte.h_default),
+    hWat(start = MediumWat.h_default),
+    p(final fixed=fixed_p_start));
+  parameter Boolean fixed_p_start = false
+    "Set to true if p_start is to be used as an explicit initial equation,
+    not an initial guess"
+    annotation(Dialog(tab = "Initialization"));
+equation
+// boundary conditions at the ports
+  port_a.m_flow = mWat_flow;
+  port_a.h_outflow = hWat;
+  port_b.m_flow = mSte_flow;
+  port_b.h_outflow = hSte;
+
+annotation (defaultComponentName="vol",
+    Icon(coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+    graphics={
+      Line(
+        points={{40,42},{0,22},{40,-18},{0,-38}},
+        color={238,46,47},
+        smooth=Smooth.Bezier),
+      Line(
+        points={{0,42},{-40,22},{0,-18},{-40,-38}},
+        color={238,46,47},
+        smooth=Smooth.Bezier)}),
+    Documentation(revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Updated publication references.
+</li>
+<li>
+February 26, 2022 by Kathryn Hinkelman:<br/>
+Moved control volume formulation into a base class
+for reusability in condensation and evaporation instances.
+</li>
+<li>
+July 22, 2021 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model represents an evaporation process of water with
+liquid and vapor phases in equilibrium and at a saturated state.
+Further information regarding the model formulation and assumptions
+are in the base class
+<a href=\"modelica://Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
+Buildings.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
+
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>"));
+end ControlVolumeEvaporation;
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
new file mode 100644
index 00000000000..2b767b768a0
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
@@ -0,0 +1,107 @@
+within Buildings.DHC.Plants.Steam.BaseClasses.Examples;
+model BoilerPolynomial
+  "Example model for the steam boiler with a polynomial efficiency curve"
+  extends Modelica.Icons.Example;
+
+  // Medium declarations
+  package MediumWat =
+      Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium - port_a (inlet)";
+  package MediumSte = Buildings.Media.Steam
+     "Steam medium - port_b (oulet)";
+
+  // Nominal conditions
+  parameter Modelica.Units.SI.AbsolutePressure p_nominal = 300000
+    "Nominal pressure";
+  parameter Modelica.Units.SI.Temperature T_nominal=
+    MediumSte.saturationTemperature(p_nominal)
+    "Nominal saturation temperature";
+  parameter Modelica.Units.SI.Power Q_flow_nominal = 50000 "Nominal power";
+  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal=
+    MediumSte.specificEnthalpy(
+      MediumSte.setState_pTX(p=p_nominal, T=T_nominal, X=MediumSte.X_default))
+    "Nominal change in enthalpy";
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
+    Q_flow_nominal/dh_nominal/2
+    "Nominal mass flow rate";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal = 3000
+    "Pressure drop at m_flow_nominal";
+
+  Modelica.Blocks.Sources.TimeTable y(
+    table=[0,0; 1200,1; 1200,0; 2000,0; 2000,1; 3600,1])
+    "Load ratio"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
+  Buildings.Fluid.Sources.Boundary_pT sin(
+    redeclare package Medium = MediumSte,
+    p(displayUnit="bar") = 300000,
+    T=423.15,
+    nPorts=2)
+    "Sink"
+    annotation (Placement(transformation(extent={{60,-20},{40,0}})));
+  Buildings.Fluid.Sources.Boundary_pT sou(
+    redeclare package Medium = MediumWat,
+    p=300000 + dp_nominal,
+    T=303.15,
+    nPorts=2)
+    "Source"
+    annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
+  Buildings.HeatTransfer.Sources.FixedTemperature TAmb(T=288.15)
+    "Ambient temperature in boiler room"
+    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
+  Buildings.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiDyn(
+    redeclare package MediumSte = MediumSte,
+    redeclare package MediumWat = MediumWat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    m_flow_nominal=m_flow_nominal,
+    Q_flow_nominal=Q_flow_nominal,
+    fue=Buildings.Fluid.Data.Fuels.NaturalGasLowerHeatingValue(),
+    dp_nominal=dp_nominal)
+    "Steam boiler with dynamic balance"
+    annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
+  Buildings.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiSte(
+    redeclare package MediumSte = MediumSte,
+    redeclare package MediumWat = MediumWat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    m_flow_nominal=m_flow_nominal,
+    Q_flow_nominal=Q_flow_nominal,
+    fue=Buildings.Fluid.Data.Fuels.NaturalGasLowerHeatingValue(),
+    dp_nominal=dp_nominal)
+    "Steam boiler with steady state balance"
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+equation
+  connect(TAmb.port, boiDyn.heatPort)
+    annotation (Line(points={{-20,50},{-10,50},{-10,-2.8}},
+                                                          color={191,0,0}));
+  connect(y.y, boiDyn.y)
+    annotation (Line(points={{-59,50},{-50,50},{-50,-2},{-22,-2}},
+                   color={0,0,127}));
+  connect(sou.ports[1], boiSte.port_a)
+    annotation (Line(points={{-60,-11},{-50,-11},{-50,-50},{-20,-50}},
+                                   color={0,127,255}));
+  connect(boiDyn.port_a, sou.ports[2]) annotation (Line(points={{-20,-10},{-60,
+          -10},{-60,-9}}, color={0,127,255}));
+  connect(boiSte.port_b, sin.ports[1]) annotation (Line(points={{0,-50},{30,-50},
+          {30,-11},{40,-11}}, color={0,127,255}));
+  connect(boiDyn.port_b, sin.ports[2])
+    annotation (Line(points={{0,-10},{40,-10},{40,-9}}, color={0,127,255}));
+  annotation (__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos"
+        "Simulate and plot"),
+    experiment(Tolerance=1e-6, StopTime=3600),
+    Documentation(info="<html>
+<p>
+This example demonstrates the open loop response of the
+steam boiler model. The dynamic boiler includes a control
+signal that is first a ramp from <i>0</i> to <i>1</i>,
+followed by a step that switches the boiler off and then
+on again. The steady boiler is only dependent on the fluid
+flow.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 23, 2021 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end BoilerPolynomial;
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
new file mode 100644
index 00000000000..bc04f8397e1
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
@@ -0,0 +1,101 @@
+within Buildings.DHC.Plants.Steam.BaseClasses.Examples;
+model ControlVolumeEvaporation
+  "Example model for heat transfer with the evaporation control volume"
+  extends Modelica.Icons.Example;
+
+  package MediumSte = Buildings.Media.Steam
+    "Steam medium - Medium model for port_b (outlet)";
+  package MediumWat =
+      Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    "Water medium - Medium model for port_a (inlet)";
+
+  parameter Modelica.Units.SI.AbsolutePressure p_start = 1E6 "Initial pressure";
+
+  Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volDyn(
+    p_start=p_start,
+    V=1,
+    redeclare package MediumWat = MediumWat,
+    redeclare package MediumSte = MediumSte,
+    m_flow_nominal=0.01,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    allowFlowReversal=true) "Dynamic volume"
+    annotation (Placement(transformation(extent={{10,0},{30,-20}})));
+  Buildings.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volSte(
+    V=1,
+    redeclare package MediumWat = MediumWat,
+    redeclare package MediumSte = MediumSte,
+    m_flow_nominal=0.01,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    p_start=p_start,
+    allowFlowReversal=true) "Steady volume"
+    annotation (Placement(transformation(extent={{10,-40},{30,-60}})));
+  Modelica.Fluid.Sources.MassFlowSource_T sou(
+    redeclare package Medium = MediumWat,
+    use_m_flow_in=true,
+    T=313.15,
+    nPorts=1) "Flow source"
+    annotation (Placement(transformation(extent={{-18,-20},{2,0}})));
+  Modelica.Fluid.Sources.MassFlowSource_T sou1(
+    redeclare package Medium = MediumWat,
+    use_m_flow_in=true,
+    T=313.15,
+    nPorts=1) "Flow source"
+    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
+  Modelica.Fluid.Sources.FixedBoundary bou(
+    redeclare package Medium = MediumSte,
+    p=p_start,
+    nPorts=2) "Boundary condition"
+    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
+  Modelica.Blocks.Sources.Ramp ramp(
+    duration=1,
+    offset=1,
+    height=-2) "Ramp"
+    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
+  Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo
+    "Heat flow sensor"
+    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
+  Modelica.Blocks.Sources.Constant const(k=-1000000) "Heat loss"
+    annotation (Placement(transformation(extent={{-90,40},{-70,60}})));
+  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
+    "Prescribed heat flow rate"
+    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
+equation
+  connect(sou.ports[1], volDyn.port_a)
+    annotation (Line(points={{2,-10},{10,-10}}, color={0,127,255}));
+  connect(preHeaFlo.port,heaFlo. port_a) annotation (Line(
+      points={{-40,50},{-20,50}},
+      color={191,0,0}));
+  connect(preHeaFlo.Q_flow,const. y) annotation (Line(
+      points={{-60,50},{-69,50}},
+      color={0,0,127}));
+  connect(heaFlo.port_b, volDyn.heatPort)
+    annotation (Line(points={{0,50},{20,50},{20,0}}, color={191,0,0}));
+  connect(sou1.ports[1], volSte.port_a)
+    annotation (Line(points={{0,-50},{10,-50}}, color={0,127,255}));
+  connect(ramp.y, sou.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},{-40,-2},{-18,-2}},
+                             color={0,0,127}));
+  connect(ramp.y, sou1.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},
+          {-40,-42},{-20,-42}}, color={0,0,127}));
+  connect(volSte.port_b, bou.ports[1]) annotation (Line(points={{30,-50},{50,-50},
+          {50,-8},{60,-8}},        color={0,127,255}));
+  connect(volDyn.port_b, bou.ports[2])
+    annotation (Line(points={{30,-10},{60,-10},{60,-12}},color={0,127,255}));
+  annotation (Documentation(
+        info="<html>
+<p>
+This model demonstrates the use of the control volume with evaporation.
+The dynamic volume includes heat conduction to the ambient while the
+steady volume heat balance is only dependent on the mass flow rate.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+July 22, 2021 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+experiment(Tolerance=1E-6, StopTime=1.0),
+__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos"
+        "Simulate and plot"));
+end ControlVolumeEvaporation;
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.mo b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.mo
new file mode 100644
index 00000000000..ad7e35ef693
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Plants.Steam.BaseClasses;
+package Examples "Collection of models that illustrate model use and test models"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains examples for the use of models that can be found in
+<a href=\"modelica://Buildings.DHC.Plants.Steam.BaseClasses\">
+Buildings.DHC.Plants.Steam.BaseClasses</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.order b/Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.order
rename to Buildings/DHC/Plants/Steam/BaseClasses/Examples/package.order
diff --git a/Buildings/DHC/Plants/Steam/BaseClasses/package.mo b/Buildings/DHC/Plants/Steam/BaseClasses/package.mo
new file mode 100644
index 00000000000..6dd2b426a97
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Plants.Steam;
+package BaseClasses "Package with base classes for Buildings.DHC.Plants.Steam"
+  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.DHC.Plants.Steam\">
+Buildings.DHC.Plants.Steam</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.order b/Buildings/DHC/Plants/Steam/BaseClasses/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.order
rename to Buildings/DHC/Plants/Steam/BaseClasses/package.order
diff --git a/Buildings/DHC/Plants/Steam/Examples/SingleBoiler.mo b/Buildings/DHC/Plants/Steam/Examples/SingleBoiler.mo
new file mode 100644
index 00000000000..68336f824dc
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/Examples/SingleBoiler.mo
@@ -0,0 +1,141 @@
+within Buildings.DHC.Plants.Steam.Examples;
+model SingleBoiler "Example model to demonstrate the single-boiler steam plant
+  in a single closed loop"
+  extends Modelica.Icons.Example;
+
+  package MediumSte = Buildings.Media.Steam (
+    p_default=300000,
+    T_default=273.15+200,
+    h_default=2700000)
+    "Steam medium";
+  package MediumWat =
+    Buildings.Media.Specialized.Water.TemperatureDependentDensity (
+      p_default=101325,
+      T_default=273.15+100)
+    "Water medium";
+
+  parameter Modelica.Units.SI.AbsolutePressure pSat=300000
+    "Saturation pressure";
+  parameter Modelica.Units.SI.Temperature TSat=
+     MediumSte.saturationTemperature(pSat)
+     "Saturation temperature";
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate of plant";
+  parameter Modelica.Units.SI.PressureDifference dpPip=6000
+    "Pressure drop in the condensate return pipe";
+  // pumps
+  parameter Buildings.Fluid.Movers.Data.Generic perPumFW(
+    pressure(
+      V_flow=(m_flow_nominal/1000)*{0.4,0.6,0.8,1.0},
+      dp=(pSat-101325)*{1.34,1.27,1.17,1.0}))
+    "Performance data for feedwater pump";
+    parameter Buildings.Fluid.Movers.Data.Generic perPumCNR(
+   pressure(
+     V_flow=(m_flow_nominal/1000)*{0,1,2},
+     dp=dpPip*{2,1,0}))
+    "Performance data for condensate return pumps";
+
+  Buildings.DHC.Plants.Steam.SingleBoiler pla(
+    redeclare final package Medium = MediumWat,
+    redeclare final package MediumHea_b = MediumSte,
+    allowFlowReversal=true,
+    final m_flow_nominal=m_flow_nominal,
+    final pSteSet=pSat,
+    final per=perPumFW,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
+    "Plant"
+    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
+    redeclare final package MediumSte = MediumSte,
+    redeclare final package MediumWat = MediumWat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    final p_start=pSat,
+    final m_flow_nominal=m_flow_nominal,
+    V=1)
+    "Volume"
+    annotation (Placement(transformation(extent={{20,40},{40,20}})));
+  Buildings.Fluid.FixedResistances.PressureDrop res(
+    redeclare final package Medium = MediumWat,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal = dpPip)
+    "Resistance in district network"
+    annotation (Placement(transformation(extent={{0,-60},{-20,-40}})));
+  Buildings.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
+    redeclare final package Medium = MediumWat,
+    final m_flow_nominal=m_flow_nominal)
+    "Steam trap"
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Modelica.Blocks.Sources.Sine inp(
+    amplitude=-0.5,
+    f=1/86400,
+    phase=3.1415926535898,
+    offset=0.5)
+    "Input signal"
+    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
+  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
+    redeclare final package Medium = MediumWat)
+    "Mass flow rate sensor"
+    annotation (Placement(transformation(extent={{80,-60},{60,-40}})));
+  Buildings.Controls.Continuous.LimPID conPumCNR(
+    controllerType=Modelica.Blocks.Types.SimpleController.PI,
+    k=1,
+    Ti=15)
+    "Controller"
+    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
+  Modelica.Blocks.Math.Gain m_flow(final k=m_flow_nominal)
+    "Gain to calculate m_flow"
+    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
+  Buildings.Fluid.Movers.SpeedControlled_y pumCNR(
+    redeclare final package Medium = MediumWat,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    p_start=101325,
+    final per=perPumCNR,
+    y_start=1)
+    "Condensate return pump"
+    annotation (Placement(transformation(extent={{40,-60},{20,-40}})));
+equation
+  connect(res.port_b, pla.port_aSerHea) annotation (Line(points={{-20,-50},{-30,
+          -50},{-30,30},{-20,30}},
+                              color={0,127,255}));
+  connect(vol.port_b, steTra.port_a)
+    annotation (Line(points={{40,30},{60,30}}, color={0,127,255}));
+  connect(pla.port_bSerHea, vol.port_a)
+    annotation (Line(points={{0,30},{20,30}},  color={0,127,255}));
+  connect(steTra.port_b, senMasFlo.port_a) annotation (Line(points={{80,30},{90,
+          30},{90,-50},{80,-50}}, color={0,127,255}));
+  connect(senMasFlo.port_b, pumCNR.port_a)
+    annotation (Line(points={{60,-50},{40,-50}},color={0,127,255}));
+  connect(pumCNR.port_b, res.port_a)
+    annotation (Line(points={{20,-50},{0,-50}},    color={0,127,255}));
+  connect(senMasFlo.m_flow, conPumCNR.u_m)
+    annotation (Line(points={{70,-39},{70,-30},{10,-30},{10,-22}},
+                                                 color={0,0,127}));
+  connect(conPumCNR.y, pumCNR.y)
+    annotation (Line(points={{21,-10},{30,-10},{30,-38}},   color={0,0,127}));
+  connect(m_flow.y, conPumCNR.u_s)
+    annotation (Line(points={{-39,-10},{-2,-10}},color={0,0,127}));
+  connect(inp.y, m_flow.u)
+    annotation (Line(points={{-69,-10},{-62,-10}},
+                                                 color={0,0,127}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+    experiment(StopTime=86400, Tolerance=1e-6),
+      __Dymola_Commands(file=
+    "modelica://Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos"
+    "Simulate and plot"),
+    Documentation(info="<html>
+<p>This model validates the steam plant implemented in
+<a href=\"modelica://Buildings.DHC.Plants.Steam.SingleBoiler\">
+Buildings.DHC.Plants.Steam.SingleBoiler</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 3, 2022 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SingleBoiler;
diff --git a/Buildings/DHC/Plants/Steam/Examples/package.mo b/Buildings/DHC/Plants/Steam/Examples/package.mo
new file mode 100644
index 00000000000..4b6c93a940b
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/Examples/package.mo
@@ -0,0 +1,12 @@
+within Buildings.DHC.Plants.Steam;
+package Examples "Example models for steam plants"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains advanced examples illustrating the use of the models in
+<a href=\"modelica://Buildings.DHC.Plants.Steam\">
+Buildings.DHC.Plants.Steam</a>.
+</p>
+</html>"));
+end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/Examples/package.order b/Buildings/DHC/Plants/Steam/Examples/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/Examples/package.order
rename to Buildings/DHC/Plants/Steam/Examples/package.order
diff --git a/Buildings/DHC/Plants/Steam/SingleBoiler.mo b/Buildings/DHC/Plants/Steam/SingleBoiler.mo
new file mode 100644
index 00000000000..4f900a37dc5
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/SingleBoiler.mo
@@ -0,0 +1,320 @@
+within Buildings.DHC.Plants.Steam;
+model SingleBoiler "A generic steam plant with a single boiler that discharges
+  saturated steam"
+  extends Buildings.DHC.Plants.BaseClasses.PartialPlant(
+    final typ=Buildings.DHC.Types.DistrictSystemType.HeatingGeneration1,
+    redeclare replaceable package MediumHea_b=Buildings.Media.Steam,
+    final have_fan=false,
+    final have_pum=true,
+    final nFue=1,
+    final fue={fueBoi},
+    final have_eleHea=false,
+    final have_eleCoo=false,
+    final have_weaBus=false);
+
+  parameter Buildings.Fluid.Data.Fuels.Generic fueBoi=
+    Buildings.Fluid.Data.Fuels.NaturalGasLowerHeatingValue()
+    "Boiler fuel type"
+     annotation (choicesAllMatching = true, Dialog(enable=have_fue));
+
+  // Nominal values
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
+    "Nominal mass flow rate";
+  parameter Modelica.Units.SI.Power Q_flow_nominal=m_flow_nominal*(
+      MediumHea_b.specificEnthalpy(MediumHea_b.setState_pTX(
+        p=pSteSet,
+        T=TSat,
+        X=MediumHea_b.X_default)) -
+      Medium.specificEnthalpy(Medium.setState_pTX(
+        p=pSteSet,
+        T=TSat,
+        X=Medium.X_default)))
+    "Nominal heating power";
+
+  // Setpoints
+  parameter Modelica.Units.SI.AbsolutePressure pSteSet=300000
+    "Steam pressure setpoint";
+  final parameter Modelica.Units.SI.Temperature TSat=
+    MediumHea_b.saturationTemperature(pSteSet)
+    "Saturation temperature at pressure setpoint";
+  parameter Modelica.Units.SI.AbsolutePressure pTanFW=101325
+    "Pressure of feedwater tank";
+  parameter Modelica.Units.SI.Volume VBoiWatSet=VBoi/2
+    "Setpoint for liquid water volume in the boiler";
+
+  // System sizing
+  parameter Modelica.Units.SI.Volume VBoi=3
+    "Total drum volume of steam boiler";
+  parameter Real boiSca = 1.25 "Boiler heat capacity scaling factor";
+  parameter Modelica.Units.SI.Mass mDry = 1.5E-3*Q_flow_nominal
+    "Mass of boiler that will be lumped to water heat capacity"
+    annotation(Dialog(tab = "Dynamics",
+      enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
+  parameter Buildings.Fluid.Movers.Data.Generic per(
+    pressure(
+      V_flow=(m_flow_nominal/1000)*{0.4,0.6,0.8,1.0},
+      dp=(pSteSet-pTanFW)*{1.34,1.27,1.17,1.0}))
+    "Performance data for the feedwater pump";
+
+  // Initial conditions
+  parameter Modelica.Units.SI.Volume VTanFW_start=1
+    "Setpoint for liquid water volume in the boiler"
+    annotation(Dialog(tab = "Initialization"));
+  parameter Modelica.Media.Interfaces.Types.AbsolutePressure pBoi_start=pTanFW
+    "Start value of boiler pressure"
+    annotation(Dialog(tab = "Initialization"));
+  parameter Real yPum_start=0.7 "Initial value of pump speed"
+    annotation(Dialog(tab="Initialization"));
+
+  // Dynamics
+  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="Equations"));
+  parameter Modelica.Fluid.Types.Dynamics massDynamics=energyDynamics
+    "Type of mass balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Equations"));
+
+  // Boiler controller
+  parameter Modelica.Blocks.Types.SimpleController controllerTypeBoi=
+    Modelica.Blocks.Types.SimpleController.PI "Type of controller"
+    annotation (Dialog(tab="Control", group="Boiler"));
+  parameter Real kBoi(min=0) = 10 "Gain of controller"
+    annotation (Dialog(tab="Control", group="Boiler"));
+  parameter Modelica.Units.SI.Time TiBoi(min=Modelica.Constants.small)=120
+    "Time constant of Integrator block"
+     annotation (Dialog(enable=
+          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PI or
+          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PID,
+          tab="Control", group="Boiler"));
+  parameter Modelica.Units.SI.Time TdBoi(min=0)=10
+    "Time constant of Derivative block" annotation (Dialog(enable=
+          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PD or
+          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PID,
+          tab="Control", group="Boiler"));
+  parameter Real wpBoi(min=0) = 1 "Set-point weight for Proportional block (0..1)"
+    annotation (Dialog(tab="Control", group="Boiler"));
+  parameter Real wdBoi(min=0) = 0 "Set-point weight for Derivative block (0..1)"
+    annotation(Dialog(enable=
+      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PD or
+      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PID,
+      tab="Control", group="Boiler"));
+  parameter Real NiBoi(min=100*Modelica.Constants.eps) = 0.9
+    "Ni*Ti is time constant of anti-windup compensation"
+     annotation(Dialog(enable=
+       controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PI or
+       controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PID,
+       tab="Control", group="Boiler"));
+  parameter Real NdBoi(min=100*Modelica.Constants.eps) = 10
+    "The higher Nd, the more ideal the derivative block"
+    annotation(Dialog(enable=
+      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PD or
+      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PID,
+      tab="Control", group="Boiler"));
+
+  // Feedwater pump controller
+  parameter Modelica.Blocks.Types.SimpleController controllerTypePum=
+    Modelica.Blocks.Types.SimpleController.PI "Type of controller"
+    annotation (Dialog(tab="Control", group="Pump"));
+  parameter Real kPum(min=0) = 5 "Gain of controller"
+    annotation (Dialog(tab="Control", group="Pump"));
+  parameter Modelica.Units.SI.Time TiPum(min=Modelica.Constants.small)=120
+    "Time constant of Integrator block"
+    annotation (Dialog(enable=
+      controllerTypePum == Modelica.Blocks.Types.SimpleController.PI or
+      controllerTypePum == Modelica.Blocks.Types.SimpleController.PID,
+      tab="Control", group="Pump"));
+  parameter Modelica.Units.SI.Time TdPum(min=0)=0.1
+    "Time constant of Derivative block"
+    annotation (Dialog(enable=
+      controllerTypePum == Modelica.Blocks.Types.SimpleController.PD or
+      controllerTypePum == Modelica.Blocks.Types.SimpleController.PID,
+      tab="Control", group="Pump"));
+  parameter Real wpPum(min=0) = 1 "Set-point weight for Proportional block (0..1)"
+    annotation (Dialog(tab="Control", group="Pump"));
+  parameter Real wdPum(min=0) = 0 "Set-point weight for Derivative block (0..1)"
+    annotation(Dialog(enable=
+      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PD or
+      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PID,
+      tab="Control", group="Pump"));
+  parameter Real NiPum(min=100*Modelica.Constants.eps) = 0.9
+    "Ni*Ti is time constant of anti-windup compensation"
+     annotation(Dialog(enable=
+       controllerTypePum==.Modelica.Blocks.Types.SimpleController.PI or
+       controllerTypePum==.Modelica.Blocks.Types.SimpleController.PID,
+       tab="Control", group="Pump"));
+  parameter Real NdPum(min=100*Modelica.Constants.eps) = 10
+    "The higher Nd, the more ideal the derivative block"
+    annotation(Dialog(enable=
+      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PD or
+      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PID,
+      tab="Control", group="Pump"));
+
+  // Pump can have reverse flow at start up
+  Buildings.Fluid.Movers.SpeedControlled_y pumFW(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    p_start=pTanFW,
+    final allowFlowReversal=allowFlowReversal,
+    final per=per,
+    final y_start=yPum_start)
+    "Feedwater pump"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+
+  // At start up, water leaves port_a, see Buildings.DHC.Examples.Steam.SingleBoiler
+  Buildings.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boi(
+    redeclare final package MediumSte = MediumHea_b,
+    redeclare final package MediumWat = Medium,
+    final energyDynamics=energyDynamics,
+    final massDynamics=massDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final p_start=pTanFW,
+    fixed_p_start=true,
+    final fue=fueBoi,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=3000,
+    final Q_flow_nominal=Q_flow_nominal*boiSca,
+    final V=VBoi,
+    final mDry=mDry)
+    "Steam boiler"
+    annotation (Placement(transformation(extent={{140,-10},{160,10}})));
+  Buildings.Controls.Continuous.LimPID conPum(
+    final controllerType=controllerTypePum,
+    final k=kPum,
+    final Ti=TiPum,
+    final Td=TdPum,
+    final wp=wpPum,
+    final wd=wdPum,
+    final Ni=NiPum,
+    final Nd=NdPum,
+    initType=Modelica.Blocks.Types.Init.InitialOutput,
+    y_start=yPum_start)
+    "Pump control"
+    annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
+  Modelica.Blocks.Math.Gain VNor(final k=1/VBoiWatSet)
+    "Normalized volume setpoint"
+    annotation (Placement(transformation(extent={{160,60},{140,80}})));
+  Buildings.Controls.Continuous.LimPID conBoi(
+    final controllerType=controllerTypeBoi,
+    final k=kBoi,
+    final Ti=TiBoi,
+    final Td=TdBoi,
+    final wp=wpBoi,
+    final wd=wdBoi,
+    final Ni=NiBoi,
+    final Nd=NdBoi)
+    "Boiler control"
+    annotation (Placement(transformation(extent={{80,-82},{100,-62}})));
+  Modelica.Blocks.Math.Gain PNor(final k=1/pSteSet)
+    "Normalized pressure setpoint"
+    annotation (Placement(transformation(extent={{160,-100},{140,-80}})));
+  Buildings.Fluid.Sensors.Pressure senPreSte(
+    redeclare final package Medium = MediumHea_b)
+    "Steam pressure sensor"
+    annotation (Placement(transformation(extent={{220,-80},{200,-100}})));
+  Modelica.Blocks.Sources.Constant uni(final k=1) "Unitary"
+    annotation (Placement(transformation(extent={{-180,100},{-160,120}})));
+  Buildings.Fluid.Storage.ExpansionVessel tanFW(
+    redeclare final package Medium = Medium,
+    final V_start=VTanFW_start,
+    final p_start=pTanFW)
+    "Feedwater tank"
+    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
+  Buildings.Fluid.FixedResistances.CheckValve cheVal(
+    redeclare final package Medium = Medium,
+    final allowFlowReversal=allowFlowReversal,
+    final m_flow_nominal=m_flow_nominal,
+    dpValve_nominal=6000,
+    rhoStd=Medium.density_pTX(
+        pSteSet,
+        MediumHea_b.saturationTemperature(pSteSet),
+        Medium.X_default))
+    "Check valve"
+    annotation (Placement(transformation(extent={{38,-10},{58,10}})));
+equation
+  connect(port_aSerHea, pumFW.port_a)
+    annotation (Line(points={{-300,0},{-40,0}}, color={0,127,255}));
+  connect(boi.port_b, port_bSerHea)
+    annotation (Line(points={{160,0},{300,0}}, color={0,127,255}));
+  connect(conPum.y, pumFW.y)
+    annotation (Line(points={{-59,110},{-30,110},{-30,12}},
+                                                          color={0,0,127}));
+  connect(uni.y, conPum.u_s)
+    annotation (Line(points={{-159,110},{-82,110}},
+                                                  color={0,0,127}));
+  connect(VNor.y, conPum.u_m)
+    annotation (Line(points={{139,70},{-70,70},{-70,98}}, color={0,0,127}));
+  connect(boi.VLiq, VNor.u)
+    annotation (Line(points={{161,6},{180,6},{180,70},{162,70}},
+      color={0,0,127}));
+  connect(senPreSte.port, boi.port_b)
+    annotation (Line(points={{210,-80},{210,0},{160,0}}, color={0,127,255}));
+  connect(senPreSte.p, PNor.u)
+    annotation (Line(points={{199,-90},{162,-90}}, color={0,0,127}));
+  connect(PNor.y, conBoi.u_m)
+    annotation (Line(points={{139,-90},{90,-90},{90,-84}}, color={0,0,127}));
+  connect(conBoi.y, boi.y)
+    annotation (Line(points={{101,-72},{120,-72},{120,8},{138,8}},
+      color={0,0,127}));
+  connect(uni.y, conBoi.u_s)
+    annotation (Line(points={{-159,110},{-150,110},{-150,-72},{78,-72}},
+      color={0,0,127}));
+  connect(QFue_flow, boi.QFueFlo)
+    annotation (Line(points={{320,120},{200,120},{200,9},{161,9}},
+      color={0,0,127}));
+  connect(PPum, pumFW.P)
+    annotation (Line(points={{320,160},{0,160},{0,9},{-19,9}},
+      color={0,0,127}));
+  connect(tanFW.port_a, pumFW.port_a)
+    annotation (Line(points={{-70,20},{-70,0},{-40,0}}, color={0,127,255}));
+  connect(pumFW.port_b, cheVal.port_a)
+    annotation (Line(points={{-20,0},{38,0}}, color={0,127,255}));
+  connect(cheVal.port_b, boi.port_a)
+    annotation (Line(points={{58,0},{140,0},{140,0}}, color={0,127,255}));
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
+    defaultComponentName="pla",
+    Diagram(coordinateSystem(preserveAspectRatio=false)),
+    Documentation(info="<html>
+<p>
+This is a generic steam plant model that can be used in
+district heating system simulations. The model contains a
+feedwater tank, feedwater pump, check valve, and a boiler.
+The boiler is designed to discharge saturated steam vapor.
+For controls, the feedwater pump maintains the water volume
+setpoint in the drum boiler, while the boiler control
+maintains the discharge pressure setpoint.
+</p>
+<h4>References </h4>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
+&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
+Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
+<i>Energy</i>, 254(A), pp. 124227.
+<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
+</p>
+<p>
+Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
+&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
+<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
+Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
+<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 15, 2023, by Kathryn Hinkelman:<br/>
+Added publication references.
+</li>
+<li>
+July 18, 2023, by Michael Wetter:<br/>
+Corrected assignment of <code>allowFlowReversal</code>, and set start pressure
+of boiler to be equal to start pressure of feed water tank. Otherwise, backflow
+occurs at the start of the simulation.
+</li>
+<li>
+March 3, 2022 by Kathryn Hinkelman:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SingleBoiler;
diff --git a/Buildings/DHC/Plants/Steam/package.mo b/Buildings/DHC/Plants/Steam/package.mo
new file mode 100644
index 00000000000..48f13321285
--- /dev/null
+++ b/Buildings/DHC/Plants/Steam/package.mo
@@ -0,0 +1,10 @@
+within Buildings.DHC.Plants;
+package Steam "Package with models for steam plants"
+  extends Modelica.Icons.VariantsPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models for plants producing steam.
+</p>
+</html>"));
+end Steam;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/package.order b/Buildings/DHC/Plants/Steam/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/Steam/package.order
rename to Buildings/DHC/Plants/Steam/package.order
diff --git a/Buildings/DHC/Plants/package.mo b/Buildings/DHC/Plants/package.mo
new file mode 100644
index 00000000000..6dc35802630
--- /dev/null
+++ b/Buildings/DHC/Plants/package.mo
@@ -0,0 +1,13 @@
+within Buildings.DHC;
+package Plants "Package of models for central plants"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for central plants.
+</p>
+</html>"));
+end Plants;
diff --git a/Buildings/Experimental/DHC/Plants/package.order b/Buildings/DHC/Plants/package.order
similarity index 100%
rename from Buildings/Experimental/DHC/Plants/package.order
rename to Buildings/DHC/Plants/package.order
diff --git a/Buildings/DHC/Types.mo b/Buildings/DHC/Types.mo
new file mode 100644
index 00000000000..9e8c9f6021e
--- /dev/null
+++ b/Buildings/DHC/Types.mo
@@ -0,0 +1,71 @@
+within Buildings.DHC;
+package Types  "Package with type definitions"
+  extends Modelica.Icons.TypesPackage;
+
+  type DistrictSystemType = enumeration(
+      CombinedGeneration1
+    "First generation district heating and cooling system",
+      CombinedGeneration2to4
+    "Second to fourth generation district heating and cooling system",
+      CombinedGeneration5
+    "Fifth generation district heating and cooling system",
+      Cooling
+    "District cooling system",
+      HeatingGeneration1
+    "First generation district heating system",
+      HeatingGeneration2to4
+    "Second to fourth generation district heating system")
+    "Enumeration to define the type of district system"
+    annotation (Documentation(info="<html>
+  <p>
+  Enumeration to define the type of district system:<br/>
+  </p>
+  <table border=\"1\" summary=\"Explanation of the enumeration\">
+  <tr>
+  <th>Enumeration</th>
+  <th>Description</th>
+  </tr>
+  <tr>
+  <td>CombinedGeneration1</td>
+  <td>First generation district heating and cooling system (using steam and chilled
+  water)</td>
+  </tr>
+  <tr>
+  <td>CombinedGeneration2to4</td>
+  <td>Second to fourth generation district heating and cooling system (using heating
+  water and chilled water)</td>
+  </tr>
+  <tr>
+  <td>CombinedGeneration5</td>
+  <td>Fifth generation district heating and cooling system (using water near
+  ambient temperature)</td>
+  </tr>
+  <tr>
+  <td>Cooling</td>
+  <td>District cooling system</td>
+  </tr>
+  <tr>
+  <td>HeatingGeneration1</td>
+  <td>First generation district heating system (using steam)</td>
+  </tr>
+  <tr>
+  <td>HeatingGeneration2to4</td>
+  <td>Second to fourth generation district heating system (using heating
+  water)</td>
+  </tr>
+  </table>
+  </html>",revisions="<html>
+<ul>
+<li>
+December 10, 2020, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+
+annotation (Documentation(info="<html>
+<p>
+This package contains type definitions.
+</p>
+</html>"));
+end Types;
diff --git a/Buildings/DHC/UsersGuide.mo b/Buildings/DHC/UsersGuide.mo
new file mode 100644
index 00000000000..f2739560fa2
--- /dev/null
+++ b/Buildings/DHC/UsersGuide.mo
@@ -0,0 +1,389 @@
+within Buildings.DHC;
+package UsersGuide
+  extends Modelica.Icons.Information;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<h4>Overview</h4>
+<p>
+The package <code>Buildings.DHC</code> consists of models
+for district heating and cooling (DHC) systems. The package contains models
+at the component, sub-system, and system level, which can be used as
+templates or for generating custom system models. Generally, the
+model structures are capable of representing any generation of DHC (1st-5th),
+though template models are not specifically available for all system types
+and combinations of technology. Note also that some components typically
+seen in district networks have been implemented elsewhere in the
+library (e.g. <a href=\"modelica://Buildings.Fluid.Geothermal\">geothermal storage</a>).
+</p>
+<p>
+The structure of the package is such that it decomposes a DHC into four
+primary sub-systems each with their own sub-packages
+as described in the table below:
+Energy Transfer Stations (ETS), Loads, Networks, and Plants.
+In addition to these sub-packages, the sub-package
+<a href=\"modelica://Buildings.DHC.Examples\">
+Buildings.DHC.Examples</a>
+contains system models which may be used as examples or templates.
+</p>
+
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<th>Sub-Package</th>
+<th>Description</th>
+</tr>
+<tr>
+  <td><a href=\"modelica://Buildings.DHC.ETS\">
+      Buildings.DHC.ETS</a></td>
+  <td>Connection point between a building and district network which contains
+      physical components such as heat exchangers, heat pumps, pipes, valves,
+      sensors, and pumps, as well as control logic based on flow rate,
+      temperature, and/or pressure measurements.</td>
+</tr>
+<tr>
+  <td><a href=\"modelica://Buildings.DHC.Loads\">
+      Buildings.DHC.Loads</a></td>
+  <td>Timeseries or physics-based representation of space heating and cooling
+      and domestic hot water loads in buildings, and connected to an ETS.</td>
+</tr>
+<tr>
+  <td><a href=\"modelica://Buildings.DHC.Networks\">
+      Buildings.DHC.Networks</a></td>
+  <td>Distribution system between buildings and plants which contains
+      distribution pipes and service lines to the
+      energy transfer stations.</td>
+</tr>
+<tr>
+  <td><a href=\"modelica://Buildings.DHC.Plants\">
+      Buildings.DHC.Plants</a>
+  </td>
+  <td>Sources of cooling or heating for the DHC such as boilers, chillers,
+      heat pumps, waste heat, tank storage, and geothermal storage.
+  </td>
+</tr>
+</table>
+<p>
+The figure below further illustrates the abstract relationship between the
+sub-systems and offers concrete example systems which can be modeled
+with concrete implementation of the abstractions.
+</p>
+<p align=\"center\">
+<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/DHC/UserGuide/DHC_Package_Concept.png\"/>
+</p>
+
+<p>
+Further sub-packages divide the application of each model based on the
+terms in the table below:
+</p>
+
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr>
+<th>Further Sub-Package</th>
+<th>Description</th>
+</tr>
+<tr>
+  <td>Combined</td>
+  <td>Water-based heating and cooling</td>
+</tr>
+<tr>
+  <td>Cooling</td>
+  <td>Water-based cooling only</td>
+</tr>
+<tr>
+  <td>Heating</td>
+  <td>Water-based heating only</td>
+</tr>
+<tr>
+  <td>HotWater</td>
+  <td>Domestic hot water</td>
+</tr>
+<tr>
+  <td>Steam</td>
+  <td>Steam-based heating only</td>
+</tr>
+</table>
+
+<h4>Content Summary</h4>
+
+<p>
+This section provides a summary of the models available in the package to
+help a user navigate. However, refer to the specific
+documentation of the model and subpackages for further modeling and implementation details.
+</p>
+
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td valign=\"top\"><b>Sub-Package Name</b>
+    </td>
+    <td valign=\"top\"><b>Model Name</b>
+    </td>
+    <td valign=\"top\"><b>Model Description</b>
+    </td>
+</tr>
+<tr><td colspan=\"3\">
+    <a href=\"modelica://Buildings.DHC.ETS\">
+    Buildings.DHC.ETS</a>
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"3\">Combined
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.ETS.Combined.ChillerBorefield\">ChillerBorefield</a>
+    </td>
+    <td valign=\"top\">ETS with heat recovery chiller and optional borefield.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">HeatPumpHeatExchanger</a>
+    </td>
+    <td valign=\"top\">ETS with heat pump for heating, heat pump for domestic hot water, and compressor-less cooling by heat exchanger.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank\">
+    HeatPumpHeatExchangerDHWTank</a>
+    </td>
+    <td valign=\"top\">
+    ETS with heat pump for heating, heat pump with storage tank and heat exchanger for domestic hot water, and
+    compressor-less cooling by heat exchanger.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"2\">Cooling
+    </td>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Cooling.Direct\">Direct</a>
+    </td>
+    <td valign=\"top\">ETS with direct connection and district return water temperature control. In-building pumping not modeled.
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Cooling.Indirect\">Indirect</a>
+    </td>
+    <td valign=\"top\">ETS with indirect connection with heat exchanger and building supply water temperature control.
+    In-building pumping not modeled.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"2\">Heating
+    </td>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Heating.Direct\">Direct</a>
+    </td>
+    <td valign=\"top\">ETS with direct connection and district return water temperature control. In-building pumping not modeled.
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.DHC.ETS.Heating.Indirect\">Indirect</a>
+    </td>
+    <td valign=\"top\">ETS with indirect connection with heat exchanger and building supply water temperature control.
+    In-building pumping not modeled.
+    </td>
+</tr>
+
+<tr><td colspan=\"3\">
+    <a href=\"modelica://Buildings.DHC.Loads\">
+    Buildings.DHC.Loads</a>
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"2\">Combined
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
+    </td>
+    <td valign=\"top\">
+    Building with loads provided as time series, connected to an ETS with heat pump for space heating, heat pump for domestic hot water,
+    and a heat exchanger for cooling water.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
+    BuildingTimeSeriesWithETSWithDHWTank</a>
+    </td>
+    <td valign=\"top\">
+    Building with loads provided as time series, connected to an ETS with heat pump for space heating,
+    heat pump with storage tank and heat exchanger for domestic hot water, and a heat exchanger for cooling water.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Cooling
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
+    </td>
+    <td valign=\"top\">
+    Building with loads provided as time series, connected to an ETS with direct connection for chilled water supply to the building.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Heating
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.Heating.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
+    </td>
+    <td valign=\"top\">
+    Building with loads provided as time series, connected to an ETS with direct connection for heating water supply to the building.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"3\">HotWater
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat\">
+    DirectHeatExchangerWithElectricHeat</a>
+    </td>
+    <td valign=\"top\">
+    A model for generating hot water using a district heat exchanger and supplemental electric resistance.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
+    StorageTankWithExternalHeatExchanger</a>
+    </td>
+    <td valign=\"top\">
+    A model of a storage tank with external heat exchanger to produce hot water.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.HotWater.ThermostaticMixingValve\">ThermostaticMixingValve</a>
+    </td>
+    <td valign=\"top\">A model for a thermostatic mixing valve.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Steam
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Loads.Steam.BuildingTimeSeriesAtETS\">BuildingTimeSeriesAtETS</a>
+    </td>
+    <td valign=\"top\">
+    Steam heating building interconnection with the district piping only and the load at the ETS provided as a time series.
+    </td>
+</tr>
+
+<tr><td colspan=\"3\">
+    <a href=\"modelica://Buildings.DHC.Networks\">
+    Buildings.DHC.Networks</a>
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"4\">
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution1PipePlugFlow_v\">Distribution1PipePlugFlow_v</a>
+    </td>
+    <td valign=\"top\">
+    1-Pipe distribution network with fluid heat transfer modeled in the main lines between ETS determined by external model (e.g. ground) and flow friction by nominal velocity.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution1Pipe_R\">Distribution1Pipe_R</a>
+    </td>
+    <td valign=\"top\">
+    1-Pipe distribution network with flow friction modeled in the main lines between ETS determined by pressure drop per length.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\">Distribution2PipePlugFlow_v</a>
+    </td>
+    <td valign=\"top\">
+    2-Pipe distribution network with fluid heat transfer modeled in the main lines between ETS determined by external model (e.g. ground) and flow friction by nominal velocity.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Networks.Distribution2Pipe_R\">Distribution2Pipe_R</a>
+    </td>
+    <td valign=\"top\">
+    2-Pipe distribution network with flow friction modeled in the main lines between ETS determined by pressure drop per length.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Steam
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Networks.Steam.DistributionCondensatePipe\">DistributionCondensatePipe</a>
+    </td>
+    <td valign=\"top\">
+    2-Pipe distribution network with steam supply and condensate return using a fixed resistance pipe model for condensate returns.
+    </td>
+</tr>
+
+<tr><td colspan=\"3\">
+    <a href=\"modelica://Buildings.DHC.Plants\">
+    Buildings.DHC.Plants</a>
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Combined
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Plants.Combined.AllElectricCWStorage\">AllElectricCWStorage</a>
+    </td>
+    <td valign=\"top\">
+    All-electric chilled water and heating water production plant with heat recovery chillers and condenser water storage.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"2\">Cooling
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Plants.Cooling.ElectricChillerParallel\">ElectricChillerParallel</a>
+    </td>
+    <td valign=\"top\">Chilled water production plant with parallel chillers and parallel cooling towers.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Plants.Cooling.StoragePlant\">StoragePlant</a>
+    </td>
+    <td valign=\"top\">
+    Chilled water storage tank system which can be charged by local chiller or remotely from district.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Heating
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Plants.Heating.SewageHeatRecovery\">SewageHeatRecovery</a>
+    </td>
+    <td valign=\"top\">Heating water production plant using sewage heat recovery.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Steam
+    </td>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.Plants.Steam.SingleBoiler\">SingleBoiler</a>
+    </td>
+    <td valign=\"top\">Steam plant with a single boiler that discharges saturated steam.
+    </td>
+</tr>
+
+<tr><td colspan=\"3\">
+    <a href=\"modelica://Buildings.DHC.Examples\">
+    Buildings.DHC.Examples</a>
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"3\">Combined
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesConstantFlow\">SeriesConstantFlow</a>
+    </td>
+    <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>, with constant district water mass flow rate.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlow\">SeriesVariableFlow</a>
+    </td>
+    <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>, with variable district water mass flow rate.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">SeriesVariableFlowAgentControl</a>
+    </td>
+    <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>,
+    with variable district water mass flow rate with updated agent controller.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Cooling
+    </td>
+    <td valign=\"top\">
+    <a href=\"modelica://Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS\">ElectricChillersDirectETS</a>
+    </td>
+    <td valign=\"top\">
+    Example model for district cooling system with an electric chiller plant and a direct controlled ETS at each building.
+    </td>
+</tr>
+<tr><td valign=\"top\" rowspan=\"1\">Steam
+    </td>
+    <td valign=\"top\"><a href=\"modelica://Buildings.DHC.Examples.Steam.SingleBoiler\">SingleBoiler</a>
+    </td>
+    <td valign=\"top\">
+    Example model for a steam district heating system with a central plant boiler producing steam that is distributed to each building.
+    </td>
+</tr>
+
+</table>
+
+</html>"));
+end UsersGuide;
diff --git a/Buildings/DHC/package.mo b/Buildings/DHC/package.mo
new file mode 100644
index 00000000000..b2d6086c307
--- /dev/null
+++ b/Buildings/DHC/package.mo
@@ -0,0 +1,13 @@
+within Buildings;
+package DHC "Models for district heating and cooling systems"
+  extends Modelica.Icons.VariantsPackage;
+
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains models for district heating and cooling (DHC) systems.
+</p>
+</html>"));
+end DHC;
diff --git a/Buildings/DHC/package.order b/Buildings/DHC/package.order
new file mode 100644
index 00000000000..5327c1d3f7b
--- /dev/null
+++ b/Buildings/DHC/package.order
@@ -0,0 +1,8 @@
+UsersGuide
+ETS
+Loads
+Networks
+Plants
+Types
+Examples
+BaseClasses
diff --git a/Buildings/Electrical/Interfaces/InductiveLoad.mo b/Buildings/Electrical/Interfaces/InductiveLoad.mo
index 14cd425372c..c80b4a578eb 100644
--- a/Buildings/Electrical/Interfaces/InductiveLoad.mo
+++ b/Buildings/Electrical/Interfaces/InductiveLoad.mo
@@ -24,7 +24,11 @@ protected
     "Magnetic flux";
   Modelica.Units.SI.Impedance Z[2] "Impedance of the load";
   Modelica.Units.SI.AngularVelocity omega "Angular frequency";
-  Modelica.Units.SI.Power Q=P*tan(acos(pf_internal))
+  Modelica.Units.SI.Power Q=P*tan(acos(
+    Buildings.Utilities.Math.Functions.smoothMin(
+      x1=pf_internal,
+      x2=0.99999,
+      deltaX=0.0000025)))
     "Reactive power (positive because inductive load)";
 equation
   connect(pf_in, pf_internal);
@@ -36,6 +40,13 @@ equation
   annotation (Documentation(revisions="<html>
 <ul>
 <li>
+April 4, 2024, by Michael Wetter:<br/>
+Reformulated calculation of reactive power to bound argument of tangent away from &pi;,
+which avoids an infinite function value.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3776\">Buildings, #3776</a>.
+</li>
+<li>
 June 06, 2014, by Marco Bonvini:<br/>
 Added power factor input <code>pf_in</code> and updated documentation.
 </li>
diff --git a/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo b/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo
index 282849c1314..05023567754 100644
--- a/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo
+++ b/Buildings/Examples/VAVReheat/BaseClasses/Controls/SystemHysteresis.mo
@@ -93,12 +93,12 @@ equation
         Ellipse(
           extent={{71,7},{85,-7}},
           lineColor=DynamicSelect({235,235,235},
-            if truFalHol.y then
+            if truFalHol1.y then
               {0,255,0}
             else
               {235,235,235}),
           fillColor=DynamicSelect({235,235,235},
-            if truFalHol.y then
+            if truFalHol1.y then
               {0,255,0}
             else
               {235,235,235}),
@@ -106,12 +106,12 @@ equation
         Ellipse(
           extent={{-83,7},{-69,-7}},
           lineColor=DynamicSelect({235,235,235},
-            if truFalHol.u then
+            if truFalHol1.u then
               {0,255,0}
             else
               {235,235,235}),
           fillColor=DynamicSelect({235,235,235},
-            if truFalHol.u then
+            if truFalHol1.u then
               {0,255,0}
             else
               {235,235,235}),
@@ -127,6 +127,10 @@ Block that ensure that the system runs for a minimum time once it is switched on
 </html>", revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Michael Wetter:<br/>
+Corrected wrong annotation.
+</li>
+<li>
 January 31, 2023, by Jianjun Hu:<br/>
 Added a true delay block to avoid triggering the pump operation by a spike input.
 </li>
diff --git a/Buildings/Experimental/DHC/BaseClasses/Steam/package.mo b/Buildings/Experimental/DHC/BaseClasses/Steam/package.mo
deleted file mode 100644
index 043550def05..00000000000
--- a/Buildings/Experimental/DHC/BaseClasses/Steam/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.BaseClasses;
-package Steam "Package for steam systems using the split-medium approach."
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains base class models for steam systems.
-These models use the split-medium approach to allow various
-water/steam models to be coupled with a numerically-efficient
-liquid water model. This can greatly improve the computing performance
-by decoupling the energy and mass balance equations.
-</p>
-</html>"));
-end Steam;
diff --git a/Buildings/Experimental/DHC/BaseClasses/package.mo b/Buildings/Experimental/DHC/BaseClasses/package.mo
deleted file mode 100644
index 59543af4a4d..00000000000
--- a/Buildings/Experimental/DHC/BaseClasses/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC;
-package BaseClasses "Package with base classes for Buildings.Experimental.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>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/CollectorDistributor.mo b/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/CollectorDistributor.mo
deleted file mode 100644
index 32fa5ef0de0..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/CollectorDistributor.mo
+++ /dev/null
@@ -1,50 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
-model CollectorDistributor
-  "Model of a collector/distributor with zero pressure drop between connections"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe(
-    mDis_flow_nominal=sum(
-      mCon_flow_nominal),
-    final mDisCon_flow_nominal=fill(
-      mDis_flow_nominal,
-      nCon),
-    final mEnd_flow_nominal=mDis_flow_nominal,
-    final allowFlowReversal=true,
-    final iConDpSen=-1,
-    redeclare Connection2PipeLossless con[nCon],
-    redeclare model Model_pipDis=Fluid.FixedResistances.LosslessPipe);
-  annotation (
-    defaultComponentName="colDis",
-    Documentation(
-      info="<html>
-<p>
-This model represents a collector/distributor which connects
-<code>nCon</code> hydronic circuits in parallel.
-The pressure drop between each connection is assumed negligible
-compared to the pressure drop in each circuit, and is set to zero
-in the model.
-By default,
-</p>
-<ul>
-<li>
-there is no bypass flow (which can be added later by connecting
-the ports <code>port_bDisSup</code> and <code>port_aDisRet</code>),
-</li>
-<li>
-the nominal distribution mass flow rate
-<code>mDis_flow_nominal</code> is equal to the sum
-of the nominal mass flow rate in each circuit.
-However, this parameter assigment is not final and it can be set
-for instance to a higher value to represent a primary overflow
-in a supply through loop.
-</li>
-</ul>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end CollectorDistributor;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Junction.mo b/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Junction.mo
deleted file mode 100644
index 3e1e3daa631..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Junction.mo
+++ /dev/null
@@ -1,24 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
-model Junction
-  "Fluid junction with zero pressure drop"
-  extends Fluid.FixedResistances.Junction(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    final dp_nominal=fill(
-      0,
-      3),
-    final from_dp=false);
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Documentation(
-      info="<html>
-<p>
-This is a model of a fluid junction with zero pressure drop.
-By default the model is configured in steady-state.
-</p>
-</html>"));
-end Junction;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mo b/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mo
deleted file mode 100644
index 20f7d25e8c9..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mo
+++ /dev/null
@@ -1,723 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation;
-model CollectorDistributor
-  "Validation of collector distributor model"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Source side medium";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal mass flow rate";
-  Fluid.Movers.FlowControlled_m_flow sou1(
-    redeclare package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T_start=273.15+40,
-    m_flow_nominal=m_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true)
-    "Primary supply"
-    annotation (Placement(transformation(extent={{-170,330},{-150,350}})));
-  Fluid.Movers.FlowControlled_m_flow sou2_1(
-    redeclare package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T_start=273.15+30,
-    m_flow_nominal=m_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true)
-    "Secondary pump"
-    annotation (Placement(transformation(extent={{190,290},{170,310}})));
-  Fluid.Sources.Boundary_pT bou1(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=2)
-    "Boundary pressure"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-190,320})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m1(
-    height=1.1,
-    duration=1000,
-    startTime=0)
-    "Primary flow"
-    annotation (Placement(transformation(extent={{-240,370},{-220,390}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T1(
-    k=40+273.15)
-    "Primary supply temperature"
-    annotation (Placement(transformation(extent={{-240,270},{-220,290}})));
-  Fluid.Sensors.TemperatureTwoPort senT2_1Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,340})));
-  Fluid.Sensors.TemperatureTwoPort senT1_1Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-100,340})));
-  Fluid.Sensors.TemperatureTwoPort senT1_1Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,300})));
-  Fluid.Sensors.TemperatureTwoPort senT2_1Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,300})));
-  Fluid.Sensors.MassFlowRate senMasFlo1_1(
-    redeclare final package Medium=Medium)
-    "Primary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{-140,330},{-120,350}})));
-  Fluid.Sensors.MassFlowRate senMasFlo2_1(
-    redeclare final package Medium=Medium)
-    "Secondary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{130,330},{150,350}})));
-  Fluid.MixingVolumes.MixingVolume vol2_1(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start=273.15+30,
-    final prescribedHeatFlowRate=true,
-    redeclare final package Medium=Medium,
-    V=1,
-    final mSenFac=1,
-    final m_flow_nominal=m_flow_nominal,
-    nPorts=2)
-    "Volume for fluid stream"
-    annotation (Placement(transformation(extent={{209,300},{229,280}})));
-  Fluid.HeatExchangers.HeaterCooler_u coo(
-    redeclare final package Medium=Medium,
-    dp_nominal=1,
-    m_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1E5)
-    "Heat exchange with water stream"
-    annotation (Placement(transformation(extent={{100,290},{80,310}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_1Ret(
-    k=30+273.15)
-    "First secondary return temperature"
-    annotation (Placement(transformation(extent={{60,370},{80,390}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat1(
-    k=0.1,
-    Ti=10,
-    yMax=1,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMin=0,
-    reverseActing=false)
-    "PI controller for chilled water supply"
-    annotation (Placement(transformation(extent={{90,370},{110,390}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m2_1(
-    height=0.5,
-    duration=1000,
-    offset=0.5,
-    startTime=2000)
-    "First secondary flow signal"
-    annotation (Placement(transformation(extent={{220,370},{200,390}})));
-  Fluid.Movers.FlowControlled_m_flow sou2_2(
-    redeclare package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T_start=273.15+30,
-    m_flow_nominal=m_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true)
-    "Secondary pump"
-    annotation (Placement(transformation(extent={{190,150},{170,170}})));
-  Fluid.Sensors.TemperatureTwoPort senT2_2Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,200})));
-  Fluid.Sensors.TemperatureTwoPort senT2_2Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,160})));
-  Fluid.Sensors.MassFlowRate senMasFlo2_2(
-    redeclare final package Medium=Medium)
-    "Secondary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{130,190},{150,210}})));
-  Fluid.MixingVolumes.MixingVolume vol2(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start=273.15+30,
-    final prescribedHeatFlowRate=true,
-    redeclare final package Medium=Medium,
-    V=1,
-    final mSenFac=1,
-    final m_flow_nominal=m_flow_nominal,
-    nPorts=2)
-    "Volume for fluid stream"
-    annotation (Placement(transformation(extent={{209,160},{229,140}})));
-  Fluid.HeatExchangers.HeaterCooler_u coo1(
-    redeclare final package Medium=Medium,
-    dp_nominal=1,
-    m_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1E5)
-    "Heat exchange with water stream"
-    annotation (Placement(transformation(extent={{100,150},{80,170}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_2Ret(
-    k=35+273.15)
-    "Second secondary return temperature"
-    annotation (Placement(transformation(extent={{60,230},{80,250}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat2(
-    k=0.1,
-    Ti=10,
-    yMax=1,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMin=0,
-    reverseActing=false)
-    "PI controller for chilled water supply"
-    annotation (Placement(transformation(extent={{90,230},{110,250}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant m2_2(
-    k=0.5)
-    "Second secondary mass flow rate signal"
-    annotation (Placement(transformation(extent={{220,230},{200,250}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colDis(
-    redeclare final package Medium=Medium,
-    mCon_flow_nominal=fill(
-      m_flow_nominal,
-      2),
-    nCon=2)
-    "Collector/distributor"
-    annotation (Placement(transformation(extent={{-60,310},{-20,330}})));
-  Fluid.Movers.FlowControlled_m_flow sou2(
-    redeclare package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T_start=273.15+40,
-    m_flow_nominal=m_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true,
-    dp_nominal=50E3)
-    "Primary supply"
-    annotation (Placement(transformation(extent={{-170,50},{-150,70}})));
-  Fluid.Sources.Boundary_pT bou2(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=2)
-    "Boundary pressure"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-190,40})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2(
-    k=40+273.15)
-    "Primary supply temperature"
-    annotation (Placement(transformation(extent={{-240,-10},{-220,10}})));
-  Fluid.Sensors.TemperatureTwoPort senT2_3Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,60})));
-  Fluid.Sensors.TemperatureTwoPort senT1_2Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-100,60})));
-  Fluid.Sensors.TemperatureTwoPort senT1_2Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,20})));
-  Fluid.Sensors.TemperatureTwoPort senT2_3Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,20})));
-  Fluid.Sensors.MassFlowRate senMasFlo1_2(
-    redeclare final package Medium=Medium)
-    "Primary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{-140,50},{-120,70}})));
-  Fluid.Sensors.MassFlowRate senMasFlo2_3(
-    redeclare final package Medium=Medium)
-    "Secondary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{130,50},{150,70}})));
-  Fluid.MixingVolumes.MixingVolume vol2_2(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start=273.15+30,
-    final prescribedHeatFlowRate=true,
-    redeclare final package Medium=Medium,
-    V=1,
-    final mSenFac=1,
-    final m_flow_nominal=m_flow_nominal,
-    nPorts=2)
-    "Volume for fluid stream"
-    annotation (Placement(transformation(extent={{209,20},{229,0}})));
-  Fluid.HeatExchangers.HeaterCooler_u coo2(
-    redeclare final package Medium=Medium,
-    dp_nominal=1,
-    m_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1E5)
-    "Heat exchange with water stream"
-    annotation (Placement(transformation(extent={{100,10},{80,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_1Ret1(
-    k=30+273.15)
-    "First secondary return temperature"
-    annotation (Placement(transformation(extent={{60,90},{80,110}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat3(
-    k=0.1,
-    Ti=10,
-    yMax=1,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMin=0,
-    reverseActing=false)
-    "PI controller for chilled water supply"
-    annotation (Placement(transformation(extent={{90,90},{110,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m2_3(
-    height=0.5,
-    duration=1000,
-    offset=0.5,
-    startTime=2000)
-    "First secondary flow signal"
-    annotation (Placement(transformation(extent={{220,90},{200,110}})));
-  Fluid.Sensors.TemperatureTwoPort senT2_4Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,-80})));
-  Fluid.Sensors.TemperatureTwoPort senT2_4Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-120})));
-  Fluid.Sensors.MassFlowRate senMasFlo2_4(
-    redeclare final package Medium=Medium)
-    "Secondary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{130,-90},{150,-70}})));
-  Fluid.MixingVolumes.MixingVolume vol1(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start=273.15+30,
-    final prescribedHeatFlowRate=true,
-    redeclare final package Medium=Medium,
-    V=1,
-    final mSenFac=1,
-    final m_flow_nominal=m_flow_nominal,
-    nPorts=2)
-    "Volume for fluid stream"
-    annotation (Placement(transformation(extent={{209,-120},{229,-140}})));
-  Fluid.HeatExchangers.HeaterCooler_u coo3(
-    redeclare final package Medium=Medium,
-    dp_nominal=1,
-    m_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1E5)
-    "Heat exchange with water stream"
-    annotation (Placement(transformation(extent={{100,-130},{80,-110}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_2Ret1(
-    k=35+273.15)
-    "Second secondary return temperature"
-    annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat4(
-    k=0.1,
-    Ti=10,
-    yMax=1,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMin=0,
-    reverseActing=false)
-    "PI controller for chilled water supply"
-    annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant m2_4(
-    k=0.5)
-    "Second secondary mass flow rate signal"
-    annotation (Placement(transformation(extent={{220,-50},{200,-30}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colDis1(
-    redeclare final package Medium=Medium,
-    mCon_flow_nominal=fill(
-      m_flow_nominal,
-      2),
-    nCon=2)
-    "Collector/distributor"
-    annotation (Placement(transformation(extent={{-60,30},{-20,50}})));
-  Fluid.Actuators.Valves.TwoWayEqualPercentage val2_1(
-    redeclare package Medium=Medium,
-    m_flow_nominal=m_flow_nominal,
-    dpValve_nominal=3000,
-    dpFixed_nominal=7000)
-    "Secondary control valve"
-    annotation (Placement(transformation(extent={{190,10},{170,30}})));
-  Fluid.Actuators.Valves.TwoWayEqualPercentage val2_2(
-    redeclare package Medium=Medium,
-    m_flow_nominal=m_flow_nominal,
-    dpValve_nominal=3000,
-    dpFixed_nominal=7000)
-    "Secondary control valve"
-    annotation (Placement(transformation(extent={{190,-130},{170,-110}})));
-  Fluid.Movers.FlowControlled_m_flow sou2_3(
-    redeclare package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T_start=273.15+30,
-    m_flow_nominal=m_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true)
-    "Secondary pump"
-    annotation (Placement(transformation(extent={{190,-270},{170,-250}})));
-  Fluid.Sources.Boundary_pT bou3(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=2)
-    "Boundary pressure"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-190,-240})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T3(
-    k=40+273.15)
-    "Primary supply temperature"
-    annotation (Placement(transformation(extent={{-240,-290},{-220,-270}})));
-  Fluid.Sensors.TemperatureTwoPort senT2_5Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,-220})));
-  Fluid.Sensors.TemperatureTwoPort senT1_3Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-100,-220})));
-  Fluid.Sensors.TemperatureTwoPort senT1_3Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,-260})));
-  Fluid.Sensors.TemperatureTwoPort senT2_5Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-260})));
-  Fluid.Sensors.MassFlowRate senMasFlo1_3(
-    redeclare final package Medium=Medium)
-    "Primary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{-140,-230},{-120,-210}})));
-  Fluid.Sensors.MassFlowRate senMasFlo2_5(
-    redeclare final package Medium=Medium)
-    "Secondary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{130,-230},{150,-210}})));
-  Fluid.MixingVolumes.MixingVolume vol2_3(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start=273.15+30,
-    final prescribedHeatFlowRate=true,
-    redeclare final package Medium=Medium,
-    V=1,
-    final mSenFac=1,
-    final m_flow_nominal=m_flow_nominal,
-    nPorts=2)
-    "Volume for fluid stream"
-    annotation (Placement(transformation(extent={{209,-260},{229,-280}})));
-  Fluid.HeatExchangers.HeaterCooler_u coo4(
-    redeclare final package Medium=Medium,
-    dp_nominal=1,
-    m_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1E5)
-    "Heat exchange with water stream"
-    annotation (Placement(transformation(extent={{100,-270},{80,-250}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_1Ret2(
-    k=30+273.15)
-    "First secondary return temperature"
-    annotation (Placement(transformation(extent={{60,-190},{80,-170}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat5(
-    k=0.1,
-    Ti=10,
-    yMax=1,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMin=0,
-    reverseActing=false)
-    "PI controller for chilled water supply"
-    annotation (Placement(transformation(extent={{90,-190},{110,-170}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp m2_5(
-    height=0.5,
-    duration=1000,
-    offset=0.5,
-    startTime=2000)
-    "First secondary flow signal"
-    annotation (Placement(transformation(extent={{220,-190},{200,-170}})));
-  Fluid.Movers.FlowControlled_m_flow sou2_4(
-    redeclare package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    T_start=273.15+30,
-    m_flow_nominal=m_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true)
-    "Secondary pump"
-    annotation (Placement(transformation(extent={{190,-410},{170,-390}})));
-  Fluid.Sensors.TemperatureTwoPort senT2_6Sup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={60,-360})));
-  Fluid.Sensors.TemperatureTwoPort senT2_6Ret(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-400})));
-  Fluid.Sensors.MassFlowRate senMasFlo2_6(
-    redeclare final package Medium=Medium)
-    "Secondary mass flow rate (measured)"
-    annotation (Placement(transformation(extent={{130,-370},{150,-350}})));
-  Fluid.MixingVolumes.MixingVolume vol3(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    T_start=273.15+30,
-    final prescribedHeatFlowRate=true,
-    redeclare final package Medium=Medium,
-    V=1,
-    final mSenFac=1,
-    final m_flow_nominal=m_flow_nominal,
-    nPorts=2)
-    "Volume for fluid stream"
-    annotation (Placement(transformation(extent={{209,-400},{229,-420}})));
-  Fluid.HeatExchangers.HeaterCooler_u coo5(
-    redeclare final package Medium=Medium,
-    dp_nominal=1,
-    m_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1E5)
-    "Heat exchange with water stream"
-    annotation (Placement(transformation(extent={{100,-410},{80,-390}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant T2_2Ret2(
-    k=35+273.15)
-    "Second secondary return temperature"
-    annotation (Placement(transformation(extent={{60,-330},{80,-310}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTChiWat6(
-    k=0.1,
-    Ti=10,
-    yMax=1,
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    yMin=0,
-    reverseActing=false)
-    "PI controller for chilled water supply"
-    annotation (Placement(transformation(extent={{90,-330},{110,-310}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant m2_6(
-    k=0.5)
-    "Second secondary mass flow rate signal"
-    annotation (Placement(transformation(extent={{220,-330},{200,-310}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor colDis2(
-    redeclare final package Medium=Medium,
-    mCon_flow_nominal=fill(
-      m_flow_nominal,
-      2),
-    nCon=2)
-    "Collector/distributor"
-    annotation (Placement(transformation(extent={{-60,-250},{-20,-230}})));
-equation
-  connect(m1.y,sou1.m_flow_in)
-    annotation (Line(points={{-218,380},{-160,380},{-160,352}},color={0,0,127}));
-  connect(senMasFlo1_1.port_b,senT1_1Sup.port_a)
-    annotation (Line(points={{-120,340},{-110,340}},color={0,127,255}));
-  connect(senT2_1Sup.port_b,senMasFlo2_1.port_a)
-    annotation (Line(points={{70,340},{130,340}},color={0,127,255}));
-  connect(sou1.port_b,senMasFlo1_1.port_a)
-    annotation (Line(points={{-150,340},{-140,340}},color={0,127,255}));
-  connect(coo.port_b,senT2_1Ret.port_a)
-    annotation (Line(points={{80,300},{70,300}},color={0,127,255}));
-  connect(T2_1Ret.y,conTChiWat1.u_s)
-    annotation (Line(points={{82,380},{74,380},{74,384},{76,384},{76,380},{88,380}},color={0,0,127}));
-  connect(conTChiWat1.y,coo.u)
-    annotation (Line(points={{112,380},{120,380},{120,306},{102,306}},color={0,0,127}));
-  connect(senT2_1Ret.T,conTChiWat1.u_m)
-    annotation (Line(points={{60,311},{60,320},{100,320},{100,368}},color={0,0,127}));
-  connect(vol2_1.ports[1],sou2_1.port_a)
-    annotation (Line(points={{217,300},{190,300}},color={0,127,255}));
-  connect(senMasFlo2_1.port_b,vol2_1.ports[2])
-    annotation (Line(points={{150,340},{221,340},{221,300}},color={0,127,255}));
-  connect(m2_1.y,sou2_1.m_flow_in)
-    annotation (Line(points={{198,380},{180,380},{180,312}},color={0,0,127}));
-  connect(bou1.ports[1],sou1.port_a)
-    annotation (Line(points={{-180,322},{-180,340},{-170,340}},color={0,127,255}));
-  connect(T1.y,bou1.T_in)
-    annotation (Line(points={{-218,280},{-212,280},{-212,324},{-202,324}},color={0,0,127}));
-  connect(senT2_2Sup.port_b,senMasFlo2_2.port_a)
-    annotation (Line(points={{70,200},{130,200}},color={0,127,255}));
-  connect(coo1.port_b,senT2_2Ret.port_a)
-    annotation (Line(points={{80,160},{70,160}},color={0,127,255}));
-  connect(T2_2Ret.y,conTChiWat2.u_s)
-    annotation (Line(points={{82,240},{78,240},{78,244},{80,244},{80,240},{88,240}},color={0,0,127}));
-  connect(conTChiWat2.y,coo1.u)
-    annotation (Line(points={{112,240},{120,240},{120,166},{102,166}},color={0,0,127}));
-  connect(senT2_2Ret.T,conTChiWat2.u_m)
-    annotation (Line(points={{60,171},{60,180},{100,180},{100,228}},color={0,0,127}));
-  connect(vol2.ports[1],sou2_2.port_a)
-    annotation (Line(points={{217,160},{190,160}},color={0,127,255}));
-  connect(senMasFlo2_2.port_b,vol2.ports[2])
-    annotation (Line(points={{150,200},{221,200},{221,160}},color={0,127,255}));
-  connect(sou2_2.port_b,coo1.port_a)
-    annotation (Line(points={{170,160},{100,160}},color={0,127,255}));
-  connect(senT1_1Ret.port_b,bou1.ports[2])
-    annotation (Line(points={{-110,300},{-180,300},{-180,318}},color={0,127,255}));
-  connect(sou2_1.port_b,coo.port_a)
-    annotation (Line(points={{170,300},{100,300}},color={0,127,255}));
-  connect(m2_2.y,sou2_2.m_flow_in)
-    annotation (Line(points={{198,240},{180,240},{180,172}},color={0,0,127}));
-  connect(senT1_1Sup.port_b,colDis.port_aDisSup)
-    annotation (Line(points={{-90,340},{-80,340},{-80,320},{-60,320}},color={0,127,255}));
-  connect(senT1_1Ret.port_a,colDis.port_bDisRet)
-    annotation (Line(points={{-90,300},{-80,300},{-80,314},{-60,314}},color={0,127,255}));
-  connect(colDis.ports_bCon[1],senT2_1Sup.port_a)
-    annotation (Line(points={{-48,330},{-40,330},{-40,360},{44,360},{44,340},{50,340}},color={0,127,255}));
-  connect(colDis.ports_bCon[2],senT2_2Sup.port_a)
-    annotation (Line(points={{-56,330},{-56,356},{40,356},{40,200},{50,200}},color={0,127,255}));
-  connect(senT2_1Ret.port_b,colDis.ports_aCon[1])
-    annotation (Line(points={{50,300},{24,300},{24,340},{-14,340},{-14,330},{-24,330}},color={0,127,255}));
-  connect(senT2_2Ret.port_b,colDis.ports_aCon[2])
-    annotation (Line(points={{50,160},{20,160},{20,336},{-32,336},{-32,330}},color={0,127,255}));
-  connect(colDis.port_bDisSup,colDis.port_aDisRet)
-    annotation (Line(points={{-20,320},{0,320},{0,314},{-20,314}},color={0,127,255}));
-  connect(senMasFlo1_2.port_b,senT1_2Sup.port_a)
-    annotation (Line(points={{-120,60},{-110,60}},color={0,127,255}));
-  connect(senT2_3Sup.port_b,senMasFlo2_3.port_a)
-    annotation (Line(points={{70,60},{130,60}},color={0,127,255}));
-  connect(sou2.port_b,senMasFlo1_2.port_a)
-    annotation (Line(points={{-150,60},{-140,60}},color={0,127,255}));
-  connect(coo2.port_b,senT2_3Ret.port_a)
-    annotation (Line(points={{80,20},{70,20}},color={0,127,255}));
-  connect(T2_1Ret1.y,conTChiWat3.u_s)
-    annotation (Line(points={{82,100},{74,100},{74,104},{76,104},{76,100},{88,100}},color={0,0,127}));
-  connect(conTChiWat3.y,coo2.u)
-    annotation (Line(points={{112,100},{120,100},{120,26},{102,26}},color={0,0,127}));
-  connect(senT2_3Ret.T,conTChiWat3.u_m)
-    annotation (Line(points={{60,31},{60,40},{100,40},{100,88}},color={0,0,127}));
-  connect(senMasFlo2_3.port_b,vol2_2.ports[1])
-    annotation (Line(points={{150,60},{217,60},{217,20}},color={0,127,255}));
-  connect(bou2.ports[1],sou2.port_a)
-    annotation (Line(points={{-180,42},{-180,60},{-170,60}},color={0,127,255}));
-  connect(T2.y,bou2.T_in)
-    annotation (Line(points={{-218,0},{-212,0},{-212,44},{-202,44}},color={0,0,127}));
-  connect(senT2_4Sup.port_b,senMasFlo2_4.port_a)
-    annotation (Line(points={{70,-80},{130,-80}},color={0,127,255}));
-  connect(coo3.port_b,senT2_4Ret.port_a)
-    annotation (Line(points={{80,-120},{70,-120}},color={0,127,255}));
-  connect(T2_2Ret1.y,conTChiWat4.u_s)
-    annotation (Line(points={{82,-40},{78,-40},{78,-36},{80,-36},{80,-40},{88,-40}},color={0,0,127}));
-  connect(conTChiWat4.y,coo3.u)
-    annotation (Line(points={{112,-40},{120,-40},{120,-114},{102,-114}},color={0,0,127}));
-  connect(senT2_4Ret.T,conTChiWat4.u_m)
-    annotation (Line(points={{60,-109},{60,-100},{100,-100},{100,-52}},color={0,0,127}));
-  connect(senMasFlo2_4.port_b,vol1.ports[1])
-    annotation (Line(points={{150,-80},{217,-80},{217,-120}},color={0,127,255}));
-  connect(senT1_2Ret.port_b,bou2.ports[2])
-    annotation (Line(points={{-110,20},{-180,20},{-180,38}},color={0,127,255}));
-  connect(senT1_2Sup.port_b,colDis1.port_aDisSup)
-    annotation (Line(points={{-90,60},{-80,60},{-80,40},{-60,40}},color={0,127,255}));
-  connect(senT1_2Ret.port_a,colDis1.port_bDisRet)
-    annotation (Line(points={{-90,20},{-80,20},{-80,34},{-60,34}},color={0,127,255}));
-  connect(colDis1.ports_bCon[1],senT2_3Sup.port_a)
-    annotation (Line(points={{-48,50},{-40,50},{-40,80},{44,80},{44,60},{50,60}},color={0,127,255}));
-  connect(colDis1.ports_bCon[2],senT2_4Sup.port_a)
-    annotation (Line(points={{-56,50},{-56,76},{40,76},{40,-80},{50,-80}},color={0,127,255}));
-  connect(senT2_3Ret.port_b,colDis1.ports_aCon[1])
-    annotation (Line(points={{50,20},{24,20},{24,60},{-14,60},{-14,50},{-24,50}},color={0,127,255}));
-  connect(senT2_4Ret.port_b,colDis1.ports_aCon[2])
-    annotation (Line(points={{50,-120},{20,-120},{20,56},{-32,56},{-32,50}},color={0,127,255}));
-  connect(vol2_2.ports[2],val2_1.port_a)
-    annotation (Line(points={{221,20},{190,20}},color={0,127,255}));
-  connect(val2_1.port_b,coo2.port_a)
-    annotation (Line(points={{170,20},{100,20}},color={0,127,255}));
-  connect(m2_3.y,val2_1.y)
-    annotation (Line(points={{198,100},{180,100},{180,32}},color={0,0,127}));
-  connect(vol1.ports[2],val2_2.port_a)
-    annotation (Line(points={{221,-120},{190,-120}},color={0,127,255}));
-  connect(val2_2.port_b,coo3.port_a)
-    annotation (Line(points={{170,-120},{100,-120}},color={0,127,255}));
-  connect(m2_4.y,val2_2.y)
-    annotation (Line(points={{198,-40},{180,-40},{180,-108}},color={0,0,127}));
-  connect(senMasFlo1_3.port_b,senT1_3Sup.port_a)
-    annotation (Line(points={{-120,-220},{-110,-220}},color={0,127,255}));
-  connect(senT2_5Sup.port_b,senMasFlo2_5.port_a)
-    annotation (Line(points={{70,-220},{130,-220}},color={0,127,255}));
-  connect(coo4.port_b,senT2_5Ret.port_a)
-    annotation (Line(points={{80,-260},{70,-260}},color={0,127,255}));
-  connect(T2_1Ret2.y,conTChiWat5.u_s)
-    annotation (Line(points={{82,-180},{74,-180},{74,-176},{76,-176},{76,-180},{88,-180}},color={0,0,127}));
-  connect(conTChiWat5.y,coo4.u)
-    annotation (Line(points={{112,-180},{120,-180},{120,-254},{102,-254}},color={0,0,127}));
-  connect(senT2_5Ret.T,conTChiWat5.u_m)
-    annotation (Line(points={{60,-249},{60,-240},{100,-240},{100,-192}},color={0,0,127}));
-  connect(vol2_3.ports[1],sou2_3.port_a)
-    annotation (Line(points={{217,-260},{190,-260}},color={0,127,255}));
-  connect(senMasFlo2_5.port_b,vol2_3.ports[2])
-    annotation (Line(points={{150,-220},{221,-220},{221,-260}},color={0,127,255}));
-  connect(m2_5.y,sou2_3.m_flow_in)
-    annotation (Line(points={{198,-180},{180,-180},{180,-248}},color={0,0,127}));
-  connect(T3.y,bou3.T_in)
-    annotation (Line(points={{-218,-280},{-212,-280},{-212,-236},{-202,-236}},color={0,0,127}));
-  connect(senT2_6Sup.port_b,senMasFlo2_6.port_a)
-    annotation (Line(points={{70,-360},{130,-360}},color={0,127,255}));
-  connect(coo5.port_b,senT2_6Ret.port_a)
-    annotation (Line(points={{80,-400},{70,-400}},color={0,127,255}));
-  connect(T2_2Ret2.y,conTChiWat6.u_s)
-    annotation (Line(points={{82,-320},{78,-320},{78,-316},{80,-316},{80,-320},{88,-320}},color={0,0,127}));
-  connect(conTChiWat6.y,coo5.u)
-    annotation (Line(points={{112,-320},{120,-320},{120,-394},{102,-394}},color={0,0,127}));
-  connect(senT2_6Ret.T,conTChiWat6.u_m)
-    annotation (Line(points={{60,-389},{60,-380},{100,-380},{100,-332}},color={0,0,127}));
-  connect(vol3.ports[1],sou2_4.port_a)
-    annotation (Line(points={{217,-400},{190,-400}},color={0,127,255}));
-  connect(senMasFlo2_6.port_b,vol3.ports[2])
-    annotation (Line(points={{150,-360},{221,-360},{221,-400}},color={0,127,255}));
-  connect(sou2_4.port_b,coo5.port_a)
-    annotation (Line(points={{170,-400},{100,-400}},color={0,127,255}));
-  connect(sou2_3.port_b,coo4.port_a)
-    annotation (Line(points={{170,-260},{100,-260}},color={0,127,255}));
-  connect(m2_6.y,sou2_4.m_flow_in)
-    annotation (Line(points={{198,-320},{180,-320},{180,-388}},color={0,0,127}));
-  connect(colDis2.ports_bCon[1],senT2_5Sup.port_a)
-    annotation (Line(points={{-48,-230},{-40,-230},{-40,-200},{44,-200},{44,-220},{50,-220}},color={0,127,255}));
-  connect(colDis2.ports_bCon[2],senT2_6Sup.port_a)
-    annotation (Line(points={{-56,-230},{-56,-204},{40,-204},{40,-360},{50,-360}},color={0,127,255}));
-  connect(senT2_5Ret.port_b,colDis2.ports_aCon[1])
-    annotation (Line(points={{50,-260},{24,-260},{24,-220},{-14,-220},{-14,-230},{-24,-230}},color={0,127,255}));
-  connect(senT2_6Ret.port_b,colDis2.ports_aCon[2])
-    annotation (Line(points={{50,-400},{20,-400},{20,-224},{-32,-224},{-32,-230}},color={0,127,255}));
-  connect(bou3.ports[1],senMasFlo1_3.port_a)
-    annotation (Line(points={{-180,-238},{-180,-220},{-140,-220}},color={0,127,255}));
-  connect(senT1_3Sup.port_b,colDis2.port_aDisSup)
-    annotation (Line(points={{-90,-220},{-80,-220},{-80,-240},{-60,-240}},color={0,127,255}));
-  connect(senT1_3Ret.port_a,colDis2.port_bDisRet)
-    annotation (Line(points={{-90,-260},{-80,-260},{-80,-246},{-60,-246}},color={0,127,255}));
-  connect(m1.y,sou2.m_flow_in)
-    annotation (Line(points={{-218,380},{-140,380},{-140,80},{-160,80},{-160,72}},color={0,0,127}));
-  connect(bou3.ports[2],senT1_3Ret.port_b)
-    annotation (Line(points={{-180,-242},{-180,-260},{-110,-260}},color={0,127,255}));
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.CollectorDistributor</a>
-in a configuration where the model is used to connect
-</p>
-<ol>
-<li>
-an active primary circuit which mass flow rate varies from 0 to 1.1 times
-<code>m_flow_nominal</code> and two active secondary circuits,
-one with a mass flow rate varying from 0.5 to 1 times
-<code>m_flow_nominal</code>,
-another with a constant mass flow rate, equal to 0.5 times
-<code>m_flow_nominal</code>: this case illustrates a typical supply-through
-loop and the supply temperature drop in one secondary circuit resulting
-from flow recirculation when the sum of the secondary mass flow rates
-exceeds the primary mass flow rate;
-</li>
-<li>
-an active primary circuit which mass flow rate varies from 0 to 1.1 times
-<code>m_flow_nominal</code> (similar to the previous case) and
-two passive secondary circuits, with no recirculation loop at the
-end of the distribution line,
-</li>
-<li>
-a passive primary circuit and two active secondary circuits,
-both with a varying mass flow rate, with no recirculation loop at the
-end of the distribution line.
-</li>
-</ol>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-November 15, 2022, by Michael Wetter:<br/>
-Set pump head.
-</li>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-260,-440},{260,440}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos" "Simulate and plot"),
-    experiment(
-      StopTime=5000,
-      Tolerance=1e-06));
-end CollectorDistributor;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.mo
deleted file mode 100644
index b8c1315b6c3..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses\">
-Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.mo
deleted file mode 100644
index 73bbca4a305..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations\">
-Buildings.Experimental.DHC.EnergyTransferStations</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.mo
deleted file mode 100644
index b1caeb30b05..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.mo
deleted file mode 100644
index 5b0ddb253ba..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.mo
+++ /dev/null
@@ -1,372 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-model ChillerBorefield "ETS model for 5GDHC systems with heat recovery chiller and optional borefield"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialParallel(
-    final have_eleCoo=true,
-    final have_fan=false,
-    redeclare replaceable Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory conSup
-      constrainedby Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory(
-        final controllerType=controllerType,
-        final kHot=kHot,
-        final kCol=kCol,
-        final TiHot=TiHot,
-        final TiCol=TiCol,
-        final THeaWatSupSetMin=THeaWatSupSetMin,
-        final TChiWatSupSetMin=TChiWatSupSetMin),
-    nSysHea=1,
-    nSouAmb=
-      if have_borFie then
-        2
-      else
-        1,
-    VTanHeaWat=datChi.PLRMin*datChi.mCon_flow_nominal*5*60/1000,
-    VTanChiWat=datChi.PLRMin*datChi.mEva_flow_nominal*5*60/1000,
-    colChiWat(
-      mCon_flow_nominal={colAmbWat.mDis_flow_nominal,datChi.mEva_flow_nominal}),
-    colHeaWat(
-      mCon_flow_nominal={colAmbWat.mDis_flow_nominal,datChi.mCon_flow_nominal}),
-    colAmbWat(
-      mCon_flow_nominal=
-        if have_borFie then
-          {hex.m2_flow_nominal,datBorFie.conDat.mBorFie_flow_nominal}
-        else
-          {hex.m2_flow_nominal}),
-    totPPum(
-      nin=3),
-    totPHea(
-      nin=1),
-    totPCoo(
-      nin=1),
-    nPorts_bChiWat=1,
-    nPorts_aHeaWat=1,
-    nPorts_aChiWat=1,
-    nPorts_bHeaWat=1);
-  parameter Boolean have_borFie=false
-    "Set to true in case a borefield is used in addition of the district HX"
-    annotation (Evaluate=true);
-  parameter Boolean have_WSE=false
-    "Set to true in case a waterside economizer is used"
-    annotation (Evaluate=true);
-  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
-    "Nominal pressure drop accross condenser"
-    annotation (Dialog(group="Chiller"));
-  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
-    "Nominal pressure drop accross evaporator"
-    annotation (Dialog(group="Chiller"));
-  replaceable parameter Fluid.Chillers.Data.ElectricEIR.Generic datChi
-    "Chiller performance data"
-    annotation (Dialog(group="Chiller"),choicesAllMatching=true,
-    Placement(transformation(extent={{20,222},{40,242}})));
-  parameter Modelica.Units.SI.PressureDifference dp1WSE_nominal(displayUnit=
-        "Pa") = 40E3
-    "Nominal pressure drop across heat exchanger on district side"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.PressureDifference dp2WSE_nominal(displayUnit=
-        "Pa") = 40E3
-    "Nominal pressure drop across heat exchanger on building side"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.HeatFlowRate QWSE_flow_nominal=0
-    "Nominal heat flow rate through heat exchanger (<=0)"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.Temperature T_a1WSE_nominal=279.15
-    "Nominal water inlet temperature on district side"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.Temperature T_b1WSE_nominal=284.15
-    "Nominal water outlet temperature on district side"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.Temperature T_a2WSE_nominal=288.15
-    "Nominal water inlet temperature on building side"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.Temperature T_b2WSE_nominal=281.15
-    "Nominal water outlet temperature on building side"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Real y1WSEMin(unit="1")=0.05
-    "Minimum pump flow rate or valve opening for temperature measurement (fractional)"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  final parameter Modelica.Units.SI.MassFlowRate m1WSE_flow_nominal=abs(
-      QWSE_flow_nominal/4200/(T_b1WSE_nominal - T_a1WSE_nominal))
-    "WSE primary mass flow rate"
-    annotation (Dialog(group="Waterside economizer", enable=have_WSE));
-  parameter Modelica.Units.SI.Temperature TBorWatEntMax=313.15
-    "Maximum value of borefield water entering temperature"
-    annotation (Dialog(group="Borefield", enable=have_borFie));
-  parameter Real spePumBorMin(unit="1")=0.1
-    "Borefield pump minimum speed"
-    annotation (Dialog(group="Borefield",enable=have_borFie));
-  parameter Modelica.Units.SI.Pressure dpBorFie_nominal(displayUnit="Pa") = 5E4
-    "Pressure losses for the entire borefield (control valve excluded)"
-    annotation (Dialog(group="Borefield", enable=have_borFie));
-  replaceable parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie
-    constrainedby Fluid.Geothermal.Borefields.Data.Borefield.Template
-    "Borefield parameters"
-    annotation (Dialog(group="Borefield",enable=have_borFie),
-    choicesAllMatching=true,Placement(transformation(extent={{140,222},{160,242}})));
-  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=
-    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-    "Type of controller"
-    annotation (Dialog(group="Supervisory controller"));
-  parameter Real kHot(
-    min=0)=0.05
-    "Gain of controller on hot side"
-    annotation (Dialog(group="Supervisory controller"));
-  parameter Real kCol(
-    min=0)=0.1
-    "Gain of controller on cold side"
-    annotation (Dialog(group="Supervisory controller"));
-  parameter Modelica.Units.SI.Time TiHot(min=Buildings.Controls.OBC.CDL.Constants.small)
-     = 300 "Time constant of integrator block on hot side" annotation (Dialog(
-        group="Supervisory controller", enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Modelica.Units.SI.Time TiCol(min=Buildings.Controls.OBC.CDL.Constants.small)
-     = 120 "Time constant of integrator block on cold side" annotation (Dialog(
-        group="Supervisory controller", enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Modelica.Units.SI.Temperature THeaWatSupSetMin(displayUnit="degC")
-     = datChi.TConEntMin + 5
-    "Minimum value of heating water supply temperature set point"
-    annotation (Dialog(group="Supervisory controller"));
-  parameter Modelica.Units.SI.Temperature TChiWatSupSetMin(displayUnit="degC")
-     = datChi.TEvaLvgMin
-    "Minimum value of chilled water supply temperature set point"
-    annotation (Dialog(group="Supervisory controller"));
-
-  replaceable
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller
-    chi(
-    redeclare final package Medium = MediumBui,
-    final dpCon_nominal=dpCon_nominal,
-    final dpEva_nominal=dpEva_nominal,
-    final dat=datChi) "Chiller" annotation (Dialog(group="Chiller"), Placement(
-        transformation(extent={{-10,-16},{10,4}})));
-  replaceable
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield
-    borFie(
-    redeclare final package Medium = MediumBui,
-    final datBorFie=datBorFie,
-    final TBorWatEntMax=TBorWatEntMax,
-    final spePumBorMin=spePumBorMin,
-    final dp_nominal=dpBorFie_nominal) if have_borFie "Borefield" annotation (
-      Dialog(group="Borefield", enable=have_borFie), Placement(transformation(
-          extent={{-80,-230},{-60,-210}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerPPum(
-    final k=0) if not have_borFie
-    "Zero power"
-    annotation (Placement(transformation(extent={{220,-90},{240,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zerPHea(
-    final k=0)
-    "Zero power"
-    annotation (Placement(transformation(extent={{220,50},{240,70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloHeaWat(
-    redeclare final package Medium1 = MediumBui,
-    final m_flow_nominal=colHeaWat.mDis_flow_nominal)
-    "Variation of enthalpy flow rate"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={-274,130})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dHHeaWat_flow(final unit="W")
-    "Heating water distributed energy flow rate"
-    annotation (Placement(transformation(extent={{300,140},{340,180}}),
-      iconTransformation(extent={{-40,-40},{40,40}},
-        rotation=-90,
-        origin={240,-340})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dHChiWat_flow(final unit="W")
-    "Chilled water distributed energy flow rate"
-    annotation (Placement(transformation(extent={{300,100},{340,140}}),
-      iconTransformation(extent={{-40,-40},{40,40}},
-        rotation=-90,
-        origin={280,-340})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate dHFloChiWat(
-    redeclare final package Medium1 = MediumBui,
-    final m_flow_nominal=colChiWat.mDis_flow_nominal)
-    "Variation of enthalpy flow rate"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={274,130})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer
-    WSE(
-    redeclare final package Medium1 = MediumSer,
-    redeclare final package Medium2 = MediumBui,
-    final allowFlowReversal1=allowFlowReversalSer,
-    final allowFlowReversal2=allowFlowReversalBui,
-    final conCon=conCon,
-    final dp1Hex_nominal=dp1WSE_nominal,
-    final dp2Hex_nominal=dp2WSE_nominal,
-    final Q_flow_nominal=QWSE_flow_nominal,
-    final T_a1_nominal=T_a1WSE_nominal,
-    final T_b1_nominal=T_b1WSE_nominal,
-    final T_a2_nominal=T_a2WSE_nominal,
-    final T_b2_nominal=T_b2WSE_nominal,
-    final y1Min=y1WSEMin) if have_WSE "Waterside economizer"
-    annotation (Placement(transformation(extent={{220,116},{240,136}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splWSE(
-    redeclare final package Medium = MediumSer,
-    final m_flow_nominal={
-      hex.m1_flow_nominal + m1WSE_flow_nominal,
-      -hex.m1_flow_nominal,
-      -m1WSE_flow_nominal})
-    "Flow splitter for WSE"
-    annotation (Placement(transformation(extent={{-230,-270},{-210,-250}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction mixWSE(
-    redeclare final package Medium = MediumSer,
-    final m_flow_nominal={
-      hex.m1_flow_nominal,
-      -hex.m1_flow_nominal - m1WSE_flow_nominal,
-      m1WSE_flow_nominal})
-    "Flow mixer for WSE"
-    annotation (Placement(transformation(extent={{244,-250},{264,-270}})));
-
-equation
-  if not have_WSE then
-    connect(tanChiWat.port_aTop, dHFloChiWat.port_b2)
-    annotation (Line(points={{200,112},{268,112},{268,120}}, color={0,127,255}));
-  end if;
-
-  connect(chi.port_bHeaWat,colHeaWat.ports_aCon[2])
-    annotation (Line(points={{-10,0},{-108,0},{-108,-24}},color={0,127,255}));
-  connect(chi.port_aHeaWat,colHeaWat.ports_bCon[2])
-    annotation (Line(points={{-10,-12},{-132,-12},{-132,-24}},color={0,127,255}));
-  connect(chi.port_bChiWat,colChiWat.ports_aCon[2])
-    annotation (Line(points={{10,0},{108,0},{108,-24}},color={0,127,255}));
-  connect(colChiWat.ports_bCon[2],chi.port_aChiWat)
-    annotation (Line(points={{132,-24},{132,-12},{10,-12},{10,-12}},color={0,127,255}));
-  connect(conSup.TChiWatSupSet,chi.TChiWatSupSet)
-    annotation (Line(points={{-238,17},{-26,17},{-26,-8},{-12,-8}},color={0,0,127}));
-  connect(chi.PPum,totPPum.u[2])
-    annotation (Line(points={{12,-8},{20,-8},{20,-58},{258,-58},{258,-60}},color={0,0,127}));
-  connect(colAmbWat.ports_aCon[2],borFie.port_b)
-    annotation (Line(points={{12,-116},{14,-116},{14,-220},{-60,-220}},color={0,127,255}));
-  connect(colAmbWat.ports_bCon[2],borFie.port_a)
-    annotation (Line(points={{-12,-116},{-14,-116},{-14,-140},{-100,-140},{-100,-220},{-80,-220}},color={0,127,255}));
-  connect(conSup.yAmb[1],borFie.u)
-    annotation (Line(points={{-238,25},{-200,25},{-200,-212},{-82,-212}},color={0,0,127}));
-  connect(valIsoCon.y_actual,borFie.yValIso_actual[1])
-    annotation (Line(points={{-55,-113},{-40,-113},{-40,-198},{-90,-198},{-90,
-          -216.5},{-82,-216.5}},                                                                color={0,0,127}));
-  connect(valIsoEva.y_actual,borFie.yValIso_actual[2])
-    annotation (Line(points={{55,-113},{40,-113},{40,-200},{-88,-200},{-88,
-          -215.5},{-82,-215.5}},                                                             color={0,0,127}));
-  connect(borFie.PPum,totPPum.u[3])
-    annotation (Line(points={{-58,-216},{250,-216},{250,-62},{258,-62},{258,-60}},color={0,0,127}));
-  connect(zerPPum.y,totPPum.u[3])
-    annotation (Line(points={{242,-80},{248,-80},{248,-60},{258,-60}},          color={0,0,127}));
-  connect(zerPHea.y,totPHea.u[1])
-    annotation (Line(points={{242,60},{258,60}},color={0,0,127}));
-  connect(chi.PChi,totPCoo.u[1])
-    annotation (Line(points={{12,-4},{20,-4},{20,20},{258,20}},color={0,0,127}));
-  connect(uHea,conSup.uHea)
-    annotation (Line(points={{-320,100},{-290,100},{-290,31},{-262,31}},color={255,0,255}));
-  connect(conSup.yHea,chi.uHea)
-    annotation (Line(points={{-238,31},{-20,31},{-20,-2},{-12,-2}},color={255,0,255}));
-  connect(conSup.yCoo,chi.uCoo)
-    annotation (Line(points={{-238,29},{-22,29},{-22,-4},{-12,-4}},color={255,0,255}));
-  connect(valIsoCon.y_actual,conSup.yValIsoCon_actual)
-    annotation (Line(points={{-55,-113},{-40,-113},{-40,-60},{-266,-60},{-266,15},
-          {-262,15}},                                                                        color={0,0,127}));
-  connect(valIsoEva.y_actual,conSup.yValIsoEva_actual)
-    annotation (Line(points={{55,-113},{40,-113},{40,-64},{-270,-64},{-270,13},{
-          -262,13}},                                                                      color={0,0,127}));
-  connect(dHFloHeaWat.dH_flow,dHHeaWat_flow)
-    annotation (Line(points={{-271,142},{-271,160},{320,160}},           color={0,0,127}));
-  connect(dHFloChiWat.dH_flow,dHChiWat_flow)
-    annotation (Line(points={{277,142},{292,142},{292,120},{320,120}},color={0,0,127}));
-  connect(dHFloChiWat.port_a1, tanChiWat.port_bBot)
-    annotation (Line(points={{280,120},{280,100},{200,100}},           color={0,127,255}));
-  connect(dHFloChiWat.port_b1, ports_bChiWat[1])
-    annotation (Line(points={{280,140},{280,200},{300,200}},                               color={0,127,255}));
-  connect(tanHeaWat.port_bTop, dHFloHeaWat.port_a1)
-    annotation (Line(points={{-220,112},{-268,112},{-268,120}},
-                                                     color={0,127,255}));
-  connect(tanHeaWat.port_aBot, dHFloHeaWat.port_b2)
-    annotation (Line(points={{-220,100},{-280,100},{-280,120}},
-                                                     color={0,127,255}));
-  connect(dHFloHeaWat.port_a2, ports_aHeaWat[1])
-    annotation (Line(points={{-280,140},{-280,260},{-300,260}},            color={0,127,255}));
-  connect(ports_aChiWat[1], dHFloChiWat.port_a2)
-    annotation (Line(points={{-300,200},{268,200},{268,140}},             color={0,127,255}));
-  connect(dHFloHeaWat.port_b1, ports_bHeaWat[1])
-    annotation (Line(points={{-268,140},{-268,260},{300,260}},            color={0,127,255}));
-  connect(splWSE.port_2, hex.port_a1) annotation (Line(points={{-210,-260},{-10,
-          -260}},                                                                       color={0,127,255}));
-  connect(dHFloChiWat.port_b2, WSE.port_a2)
-    annotation (Line(points={{268,120},{240,120}},                     color={0,127,255}));
-  connect(WSE.port_b2, tanChiWat.port_aTop) annotation (Line(points={{220,120},{206,120},{206,112},{200,112}},
-                                                                                           color={0,127,255}));
-  connect(mixWSE.port_2, port_bSerAmb)
-    annotation (Line(points={{264,-260},{280,-260},{280,-200},{300,-200}}, color={0,127,255}));
-  connect(splWSE.port_3, WSE.port_a1)
-    annotation (Line(points={{-220,-270},{-220,-280},{210,-280},{210,132},{220,132}}, color={0,127,255}));
-  connect(WSE.port_b1, mixWSE.port_3) annotation (Line(points={{240,132},{254,132},{254,-250}}, color={0,127,255}));
-  connect(hex.port_b1, mixWSE.port_1) annotation (Line(points={{10,-260},{244,-260}}, color={0,127,255}));
-  connect(conSup.yCoo, WSE.uCoo) annotation (Line(points={{-238,29},{140,29},{140,
-          126},{218,126}},                                                                         color={255,0,255}));
-  connect(valIsoEva.y_actual, WSE.yValIsoEva_actual)
-    annotation (Line(points={{55,-113},{40,-113},{40,123},{218,123}}, color={0,0,127}));
-  connect(port_aSerAmb, splWSE.port_1) annotation (Line(points={{-300,-200},{
-          -280,-200},{-280,-260},{-230,-260}}, color={0,127,255}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-300,-300},{300,300}}),
-      graphics={
-        Line(
-          points={{86,92}},
-          color={28,108,200},
-          pattern=LinePattern.Dash)}),
-    defaultComponentName="ets",
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-April 30, 2021, by Michael Wetter:<br/>
-Reformulated replaceable class to avoid access of components that are not in the constraining type.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2471\">issue #2471</a>.
-</li>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model represents an energy transfer station as illustrated in the schematics
-below.
-</p>
-<ul>
-<li>
-The heating and cooling functions are provided by a heat recovery chiller, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller</a>
-for the operating principles and modeling assumptions.
-The condenser and evaporator loops are equipped with constant speed pumps.
-</li>
-<li>
-The supervisory controller ensures the load balancing between the condenser side
-and the evaporator side of the chiller by controlling in sequence an optional
-geothermal borefield (priority system), the district heat exchanger (second
-priority system), and ultimately the chiller, by resetting down the chilled
-water supply temperature, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>
-for a detailed description.
-The borefield and district heat exchanger loops are equipped with
-variable speed pumps modulated by the supervisory controller.
-</li>
-</ul>
-<p>
-Note that the heating and cooling enable signals (<code>uHea</code> and <code>uCoo</code>)
-connected to this model should be switched to <code>false</code> when the
-building has no corresponding demand (e.g., based on the requests yielded by
-the terminal unit controllers, in conjunction with a schedule).
-This will significantly improve the system performance as it is a
-necessary condition for the chiller to be operated at a lower lift, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Reset</a>.
-<br/>
-</p>
-<p align=\"center\">
-<img alt=\"System schematics\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.png\"/>
-</p>
-</html>"));
-end ChillerBorefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo
deleted file mode 100644
index 606b62b9cfd..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Borefield.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Borefield.mo
deleted file mode 100644
index a7043a1dfce..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Borefield.mo
+++ /dev/null
@@ -1,204 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-model Borefield
-  "Borefield controller"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.Temperature TBorWatEntMax(displayUnit="degC")
-    "Maximum value of borefield water entering temperature";
-  parameter Real spePumBorMin(
-    final unit="1")=0.1
-    "Borefield pump minimum speed";
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
-    "Isolation valves return position (fractional)"
-    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
-    iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
-    "Control signal from supervisory"
-    annotation (Placement(transformation(extent={{-140,40},{-100,80}}),
-    iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPum(
-    final unit="kg/s")
-    "Control signal for borefield pump"
-    annotation (Placement(transformation(extent={{100,40},{140,80}}),
-    iconTransformation(extent={{100,40},{140,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValMix(
-    final unit="1")
-    "Control signal for borefield mixing valve"
-    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
-    iconTransformation(extent={{100,-80},{140,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TBorWatEnt(
-    final unit="K",
-    displayUnit="degC")
-    "Borefield water entering temperature"
-    annotation (Placement(transformation(extent={{-140,-120},{-100,-80}}),
-    iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conMix(
-    final yMin=0,
-    final yMax=1,
-    final reverseActing=true,
-    y_reset=0,
-    k=0.1,
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Ti(
-      displayUnit="s")=120)
-    "Mixing valve controller"
-    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTBorWatEnt(
-    y(final unit="K",
-      displayUnit="degC"),
-    final k=TBorWatEntMax)
-    "Maximum value of borefield water entering temperature"
-    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold opeVal(
-    final t=0.9,
-    final h=0.1)
-    "True if at least one isolation valve is open"
-    annotation (Placement(transformation(extent={{-50,-58},{-30,-38}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiMax multiMax1(
-    final nin=2)
-    "Maximum opening"
-    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaSup(
-    final t=0.05,
-    final h=0.025)
-    "Borefield enabled from supervisory"
-    annotation (Placement(transformation(extent={{-50,-30},{-30,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch runBor
-    "Enable borefield system pump"
-    annotation (Placement(transformation(extent={{70,50},{90,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant limVal(
-    final k=0.3)
-    "Control signal value for full opening of the valve"
-    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant speMin(
-    final k=spePumBorMin)
-    "Minimum pump speed"
-    annotation (Placement(transformation(extent={{-40,74},{-20,94}})));
-  Buildings.Controls.OBC.CDL.Logical.And enaBor
-    "Borefield enable signal"
-    annotation (Placement(transformation(extent={{-10,-40},{10,-20}})));
-  Buildings.Controls.OBC.CDL.Reals.Line mapSpe
-    "Mapping function for pump speed"
-    annotation (Placement(transformation(extent={{20,70},{40,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
-    final k=1)
-    "One"
-    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
-    final k=0)
-    "Zero"
-    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Line mapVal
-    "Mapping function for valve opening"
-    annotation (Placement(transformation(extent={{20,30},{40,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Min min1
-    "Minimum"
-    annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
-equation
-  connect(multiMax1.y,opeVal.u)
-    annotation (Line(points={{-68,-40},{-60,-40},{-60,-48},{-52,-48}},color={0,0,127}));
-  connect(yValIso_actual,multiMax1.u)
-    annotation (Line(points={{-120,-40},{-92,-40}},color={0,0,127}));
-  connect(u,enaSup.u)
-    annotation (Line(points={{-120,60},{-80,60},{-80,-20},{-52,-20}},color={0,0,127}));
-  connect(enaSup.y,enaBor.u1)
-    annotation (Line(points={{-28,-20},{-20,-20},{-20,-30},{-12,-30}},color={255,0,255}));
-  connect(opeVal.y,enaBor.u2)
-    annotation (Line(points={{-28,-48},{-20,-48},{-20,-38},{-12,-38}},color={255,0,255}));
-  connect(enaBor.y,conMix.trigger)
-    annotation (Line(points={{12,-30},{20,-30},{20,-96},{-6,-96},{-6,-92}},color={255,0,255}));
-  connect(maxTBorWatEnt.y,conMix.u_s)
-    annotation (Line(points={{-28,-80},{-12,-80}},color={0,0,127}));
-  connect(runBor.y,yPum)
-    annotation (Line(points={{92,60},{120,60}},color={0,0,127}));
-  connect(TBorWatEnt,conMix.u_m)
-    annotation (Line(points={{-120,-100},{0,-100},{0,-92}},color={0,0,127}));
-  connect(enaBor.y,runBor.u2)
-    annotation (Line(points={{12,-30},{20,-30},{20,20},{64,20},{64,60},{68,60}},color={255,0,255}));
-  connect(mapSpe.y,runBor.u1)
-    annotation (Line(points={{42,80},{60,80},{60,68},{68,68}},color={0,0,127}));
-  connect(u,mapSpe.u)
-    annotation (Line(points={{-120,60},{0,60},{0,80},{18,80}},color={0,0,127}));
-  connect(speMin.y,mapSpe.f1)
-    annotation (Line(points={{-18,84},{18,84}},color={0,0,127}));
-  connect(min1.y,yValMix)
-    annotation (Line(points={{92,-60},{120,-60}},color={0,0,127}));
-  connect(conMix.y,min1.u2)
-    annotation (Line(points={{12,-80},{60,-80},{60,-66},{68,-66}},color={0,0,127}));
-  connect(mapVal.y,min1.u1)
-    annotation (Line(points={{42,40},{60,40},{60,-54},{68,-54}},color={0,0,127}));
-  connect(one.y,mapSpe.x2)
-    annotation (Line(points={{2,0},{12,0},{12,76},{18,76}},color={0,0,127}));
-  connect(one.y,mapSpe.f2)
-    annotation (Line(points={{2,0},{12,0},{12,72},{18,72}},color={0,0,127}));
-  connect(one.y,mapVal.f2)
-    annotation (Line(points={{2,0},{12,0},{12,32},{18,32}},color={0,0,127}));
-  connect(zer.y,mapVal.x1)
-    annotation (Line(points={{-38,40},{-10,40},{-10,48},{18,48}},color={0,0,127}));
-  connect(limVal.y,mapVal.x2)
-    annotation (Line(points={{-18,20},{6,20},{6,36},{18,36}},color={0,0,127}));
-  connect(u,mapVal.u)
-    annotation (Line(points={{-120,60},{0,60},{0,40},{18,40}},color={0,0,127}));
-  connect(limVal.y,mapSpe.x1)
-    annotation (Line(points={{-18,20},{6,20},{6,88},{18,88}},color={0,0,127}));
-  connect(zer.y,mapVal.f1)
-    annotation (Line(points={{-38,40},{-10,40},{-10,44},{18,44}},color={0,0,127}));
-  connect(zer.y,runBor.u3)
-    annotation (Line(points={{-38,40},{-10,40},{-10,52},{68,52}},color={0,0,127}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-120},{100,120}})),
-    defaultComponentName="con",
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This block implements the control logic for the borefield system.
-The main control signal <code>u</code> is yielded by the hot side
-or cold side controller, see for instance
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SideHot</a>.
-</p>
-<p>
-The system is enabled when
-</p>
-<ul>
-<li>
-the main control signal is greater than zero,
-</li>
-<li>
-the return position of at least one isolation valve is greater than 90%.
-</li>
-</ul>
-<p>
-When the system is enabled,
-</p>
-<ul>
-<li>
-the input signal is mapped to modulate in sequence the mixing valve
-(from full bypass to closed bypass for a control signal varying between
-0% and 30%) and the pump speed (from the minimum to the maximum value
-for a control signal varying between 30% and 100%),
-</li>
-<li>
-a PI loop tracks the maximum inlet temperature, the minimum between this
-loop output and the previously mapped signal being used to modulate the
-valve.
-</li>
-</ul>
-<p>
-Note that the first control signal for the valve is needed to stabilize
-the control of the system when the mass flow rate required to meet
-the heat or cold rejection demand is below the flow rate corresponding
-to the minimum pump speed.
-</p>
-</html>"));
-end Borefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Chiller.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Chiller.mo
deleted file mode 100644
index abb7822d164..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/Chiller.mo
+++ /dev/null
@@ -1,140 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-model Chiller
-  "Chiller controller"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.Temperature TConWatEntMin(displayUnit="degC")
-    "Minimum value of condenser water entering temperature";
-  parameter Modelica.Units.SI.Temperature TEvaWatEntMax(displayUnit="degC")
-    "Maximum value of evaporator water entering temperature";
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-200,20},{-160,60}}),
-    iconTransformation(extent={{-140,10},{-100,50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHea
-    "Heating enable signal"
-    annotation (Placement(transformation(extent={{-200,60},{-160,100}}),
-    iconTransformation(extent={{-140,50},{-100,90}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatEnt(
-    final unit="K",
-    displayUnit="degC")
-    "Condenser water entering temperature"
-    annotation (Placement(transformation(extent={{-200,-100},{-160,-60}}),
-    iconTransformation(extent={{-140,-90},{-100,-50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEvaWatEnt(
-    final unit="K",
-    displayUnit="degC")
-    "Evaporator water entering temperature"
-    annotation (Placement(transformation(extent={{-200,-40},{-160,0}}),
-    iconTransformation(extent={{-140,-50},{-100,-10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValCon
-    "Condenser mixing valve control signal"
-    annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
-    iconTransformation(extent={{100,-90},{140,-50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEva
-    "Evaporator mixing valve control signal"
-    annotation (Placement(transformation(extent={{160,-20},{200,20}}),
-    iconTransformation(extent={{100,-50},{140,-10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput yChi
-    "Chiller enable signal"
-    annotation (Placement(transformation(extent={{160,40},{200,80}}),
-    iconTransformation(extent={{100,40},{140,80}})));
-  Buildings.Controls.OBC.CDL.Logical.Or heaOrCoo
-    "Heating or cooling enabled"
-    annotation (Placement(transformation(extent={{-120,50},{-100,70}})));
-  PIDWithEnable conValEva(
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    final yMax=1,
-    final yMin=0,
-    y_reset=0,
-    k=0.1,
-    Ti(
-      displayUnit="s")=60,
-    final reverseActing=true)
-    "Evaporator three-way valve control"
-    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
-  PIDWithEnable conValCon(
-    final controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    final yMax=1,
-    final yMin=0,
-    y_reset=0,
-    k=0.1,
-    Ti(
-      displayUnit="s")=60,
-    final reverseActing=false)
-    "Condenser three-way valve control"
-    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTEvaWatEnt(
-    y(final unit="K",
-      displayUnit="degC"),
-    final k=TEvaWatEntMax)
-    "Maximum value of evaporator water entering temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant minTConWatEnt(
-    y(final unit="K",
-      displayUnit="degC"),
-    final k=TConWatEntMin)
-    "Minimum value of condenser water entering temperature"
-    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
-equation
-  connect(TEvaWatEnt,conValEva.u_m)
-    annotation (Line(points={{-180,-20},{60,-20},{60,-12}},color={0,0,127}));
-  connect(TConWatEnt,conValCon.u_m)
-    annotation (Line(points={{-180,-80},{60,-80},{60,-72}},color={0,0,127}));
-  connect(heaOrCoo.y,yChi)
-    annotation (Line(points={{-98,60},{180,60}},color={255,0,255}));
-  connect(uHea,heaOrCoo.u1)
-    annotation (Line(points={{-180,80},{-140,80},{-140,60},{-122,60}},color={255,0,255}));
-  connect(uCoo,heaOrCoo.u2)
-    annotation (Line(points={{-180,40},{-140,40},{-140,52},{-122,52}},color={255,0,255}));
-  connect(maxTEvaWatEnt.y,conValEva.u_s)
-    annotation (Line(points={{12,0},{48,0}},color={0,0,127}));
-  connect(minTConWatEnt.y,conValCon.u_s)
-    annotation (Line(points={{12,-60},{48,-60}},color={0,0,127}));
-  connect(conValEva.y,yValEva)
-    annotation (Line(points={{72,0},{180,0}},color={0,0,127}));
-  connect(heaOrCoo.y,conValEva.uEna)
-    annotation (Line(points={{-98,60},{-40,60},{-40,-16},{56,-16},{56,-12}},color={255,0,255}));
-  connect(heaOrCoo.y,conValCon.uEna)
-    annotation (Line(points={{-98,60},{-40,60},{-40,-76},{56,-76},{56,-72}},color={255,0,255}));
-  connect(conValCon.y,yValCon)
-    annotation (Line(points={{72,-60},{180,-60}},color={0,0,127}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-160,-120},{160,120}})),
-    defaultComponentName="con",
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This is a controller for the chiller system, which includes the dedicated
-condenser and evaporator pumps.
-</p>
-<p>
-The system is enabled if any of the input control signals <code>uHea</code>
-or <code>uCoo</code> is <code>true</code>.
-When enabled,
-</p>
-<ul>
-<li>
-the condenser and evaporator pumps are operated at constant speed,
-</li>
-<li>
-the condenser (resp. evaporator) mixing valve is modulated with a PI
-loop controlling the minimum (resp. maximum) inlet temperature.
-</li>
-</ul>
-</html>"));
-end Chiller;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/HeatExchanger.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/HeatExchanger.mo
deleted file mode 100644
index 16fa058df18..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/HeatExchanger.mo
+++ /dev/null
@@ -1,209 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-model HeatExchanger
-  "District heat exchanger controller"
-  extends Modelica.Blocks.Icons.Block;
-  parameter DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon
-    "District connection configuration" annotation (Evaluate=true);
-  parameter Real spePum1Min(
-    final unit="1",
-    min=0)=0.1
-    "Heat exchanger primary pump minimum speed (fractional)"
-    annotation (Dialog(enable=not have_val1));
-  parameter Real spePum2Min(
-    final unit="1",
-    min=0.01)=0.1
-    "Heat exchanger secondary pump minimum speed (fractional)";
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso[2]
-    "Isolation valves return position (index 1 for condenser)"
-    annotation (Placement(transformation(extent={{-260,-60},{-220,-20}}),
-                                                                       iconTransformation(extent={{-140,-70},{-100,-30}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y1(final unit="1")
-    "District heat exchanger primary control signal" annotation (Placement(
-        transformation(extent={{220,20},{260,60}}), iconTransformation(extent={
-            {100,40},{140,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPum2(
-    final unit="1")
-    "District heat exchanger secondary pump control signal"
-    annotation (Placement(transformation(extent={{220,-20},{260,20}}),
-                                                                     iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yVal2(
-    final unit="1")
-    "District heat exchanger secondary valve control signal"
-    annotation (Placement(transformation(extent={{220,-80},{260,-40}}),iconTransformation(extent={{100,-80},{140,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.Max max1
-    "Maximum between control signal and minimum speed or opening"
-    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swiOff1
-    "Output zero if not enabled"
-    annotation (Placement(transformation(extent={{160,-70},{180,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant min1(
-    final k=if have_val1 then 0 else spePum1Min)
-    "Minimum pump speed or actuator opening"
-    annotation (Placement(transformation(extent={{40,-90},{60,-70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
-    "Control signal for secondary side (from supervisory)"
-    annotation (Placement(transformation(extent={{-260,20},{-220,60}}),  iconTransformation(extent={{-140,30},{-100,70}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(
-    final t=0.01,
-    final h=0.005)
-    "Check for heat or cold rejection demand"
-    annotation (Placement(transformation(extent={{-170,30},{-150,50}})));
-  Buildings.Controls.OBC.CDL.Logical.And and2
-    "At least one valve is open and HX circuit is enabled"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold heaRej(
-    final t=0.9,
-    final h=0.1)
-    "Heat rejection if condenser isolation valve is open"
-    annotation (Placement(transformation(extent={{-170,-10},{-150,10}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cooRej(
-    final t=0.9,
-    final h=0.1)
-    "Cold rejection if evaporator isolation valve is open"
-    annotation (Placement(transformation(extent={{-170,-50},{-150,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or1
-    "At least one valve is open "
-    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant speMin(
-    final k=spePum2Min)
-    "Minimum pump speed"
-    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swiOff2
-    "Output zero if not enabled"
-    annotation (Placement(transformation(extent={{160,50},{180,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Line mapSpe
-    "Mapping function for pump speed"
-    annotation (Placement(transformation(extent={{90,50},{110,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
-    final k=1)
-    "One"
-    annotation (Placement(transformation(extent={{40,10},{60,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
-    final k=0)
-    "Zero"
-    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant hal(
-    final k=0.3)
-    "Control signal value for full opening of the valve"
-    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Line mapVal
-    "Mapping function for valve opening"
-    annotation (Placement(transformation(extent={{90,10},{110,30}})));
-protected
-  parameter Boolean have_val1=conCon ==
-    DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
-    "True in case of control valve on district side, false in case of a pump";
-equation
-  connect(swiOff1.y, y1) annotation (Line(points={{182,-60},{200,-60},{200,40},
-          {240,40}}, color={0,0,127}));
-  connect(max1.y,swiOff1.u1)
-    annotation (Line(points={{112,-60},{126,-60},{126,-52},{158,-52}},color={0,0,127}));
-  connect(u,greThr.u)
-    annotation (Line(points={{-240,40},{-172,40}},  color={0,0,127}));
-  connect(greThr.y,and2.u1)
-    annotation (Line(points={{-148,40},{-80,40},{-80,0},{-62,0}},    color={255,0,255}));
-  connect(and2.y,swiOff1.u2)
-    annotation (Line(points={{-38,0},{140,0},{140,-60},{158,-60}},  color={255,0,255}));
-  connect(cooRej.y,or1.u2)
-    annotation (Line(points={{-148,-40},{-120,-40},{-120,-28},{-112,-28}},
-                                                                      color={255,0,255}));
-  connect(heaRej.y,or1.u1)
-    annotation (Line(points={{-148,0},{-120,0},{-120,-20},{-112,-20}},color={255,0,255}));
-  connect(or1.y,and2.u2)
-    annotation (Line(points={{-88,-20},{-80,-20},{-80,-8},{-62,-8}},
-                                                                  color={255,0,255}));
-  connect(min1.y,max1.u2)
-    annotation (Line(points={{62,-80},{80,-80},{80,-66},{88,-66}},  color={0,0,127}));
-  connect(swiOff2.y,yPum2)
-    annotation (Line(points={{182,60},{190,60},{190,0},{240,0}},      color={0,0,127}));
-  connect(one.y,mapSpe.x2)
-    annotation (Line(points={{62,20},{70,20},{70,56},{88,56}},    color={0,0,127}));
-  connect(one.y,mapSpe.f2)
-    annotation (Line(points={{62,20},{70,20},{70,52},{88,52}},    color={0,0,127}));
-  connect(u,mapSpe.u)
-    annotation (Line(points={{-240,40},{-180,40},{-180,60},{88,60}},    color={0,0,127}));
-  connect(speMin.y,mapSpe.f1)
-    annotation (Line(points={{12,80},{70,80},{70,64},{88,64}},    color={0,0,127}));
-  connect(mapSpe.y,swiOff2.u1)
-    annotation (Line(points={{112,60},{120,60},{120,68},{158,68}},    color={0,0,127}));
-  connect(zer.y,swiOff2.u3)
-    annotation (Line(points={{12,-40},{120,-40},{120,52},{158,52}},color={0,0,127}));
-  connect(zer.y,swiOff1.u3)
-    annotation (Line(points={{12,-40},{120,-40},{120,-68},{158,-68}},
-                                                                   color={0,0,127}));
-  connect(hal.y,mapSpe.x1)
-    annotation (Line(points={{12,20},{20,20},{20,68},{88,68}},    color={0,0,127}));
-  connect(u,mapVal.u)
-    annotation (Line(points={{-240,40},{-180,40},{-180,60},{84,60},{84,20},{88,20}},      color={0,0,127}));
-  connect(zer.y,mapVal.x1)
-    annotation (Line(points={{12,-40},{80,-40},{80,28},{88,28}},color={0,0,127}));
-  connect(zer.y,mapVal.f1)
-    annotation (Line(points={{12,-40},{80,-40},{80,24},{88,24}},color={0,0,127}));
-  connect(one.y,mapVal.f2)
-    annotation (Line(points={{62,20},{70,20},{70,12},{88,12}},  color={0,0,127}));
-  connect(hal.y,mapVal.x2)
-    annotation (Line(points={{12,20},{20,20},{20,4},{84,4},{84,16},{88,16}},    color={0,0,127}));
-  connect(mapVal.y,yVal2)
-    annotation (Line(points={{112,20},{210,20},{210,-60},{240,-60}},  color={0,0,127}));
-  connect(and2.y,swiOff2.u2)
-    annotation (Line(points={{-38,0},{-20,0},{-20,40},{130,40},{130,60},{158,60}},      color={255,0,255}));
-  connect(u, max1.u1)
-    annotation (Line(points={{-240,40},{-200,40},{-200,-60},{80,-60},{80,-54},{
-          88,-54}},                                                                        color={0,0,127}));
-  connect(yValIso[1], heaRej.u)
-    annotation (Line(points={{-240,-50},{-238,-40},{-180,-40},{-180,0},{-172,0}}, color={0,0,127}));
-  connect(yValIso[2], cooRej.u) annotation (Line(points={{-240,-30},{-240,-40},{-172,-40}}, color={0,0,127}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-220,-120},{220,120}})),
-    defaultComponentName="con",
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 14, 2021, by Antoine Gautier:<br/>
-Updated the control logic.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2561\">issue #2561</a>.
-</li>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This block implements the control logic for the district heat exchanger,
-which realizes the interface between the building system and the district system.
-</p>
-<p>
-The input signal <code>u</code> is yielded by the supervisory controller, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Supervisory</a>.
-The primary and secondary circuits are enabled to operate if this input signal
-is greater than zero and the return position of at least one isolation valve
-is greater than 90%.
-When enabled,
-</p>
-<ul>
-<li>
-the secondary circuit is controlled based on the input signal <code>u</code>,
-which is mapped to modulate in sequence the mixing valve
-(from full bypass to closed bypass for a control signal varying between
-0% and 30%) and the pump speed (from the minimum to the maximum value
-for a control signal varying between 30% and 100%),
-</li>
-<li>
-the primary pump speed (or valve opening) is directly modulated with
-the input signal <code>u</code>.
-</li>
-</ul>
-<p>
-Note that the valve on the secondary side is needed to stabilize the control
-of the system when the secondary mass flow rate required to meet the heat or
-cold rejection demand is below the flow rate corresponding to the minimum pump speed.
-</p>
-</html>"));
-end HeatExchanger;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo
deleted file mode 100644
index 63909fe9203..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/PIDWithEnable.mo
+++ /dev/null
@@ -1,114 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-block PIDWithEnable
-  "PID controller with enable signal"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-    "Type of controller";
-  parameter Real k(
-    min=0)=1
-    "Gain of controller";
-  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)
-     = 0.5 "Time constant of integrator block" annotation (Dialog(enable=
-          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI
-           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Modelica.Units.SI.Time Td(min=0) = 0.1
-    "Time constant of derivative block" annotation (Dialog(enable=
-          controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD
-           or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Real r(
-    min=100*Modelica.Constants.eps)=1
-    "Typical range of control error, used for scaling the control error";
-  parameter Real yMin=0
-    "Lower limit of output";
-  parameter Real yMax=1
-    "Upper limit of output";
-  parameter Boolean reverseActing=true
-    "Set to true for reverse acting, or false for direct acting control action";
-  parameter Real y_reset=yMin
-    "Value to which the controller output is reset if the boolean trigger has a rising edge";
-  parameter Real y_neutral=y_reset
-    "Value to which the controller output is reset when the controller is disabled";
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput u_s
-    "Connector of setpoint input signal"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput u_m
-    "Connector of measurement input signal"
-    annotation (Placement(transformation(origin={0,-120},extent={{20,-20},{-20,20}},rotation=270),iconTransformation(extent={{20,-20},{-20,20}},rotation=270,origin={0,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
-    "Connector of actuator output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}}),iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEna
-    "Enable signal"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,origin={-60,-120}),iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={-40,-120})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
-    final k=k,
-    final Ti=Ti,
-    final Td=Td,
-    final r=r,
-    final controllerType=controllerType,
-    final yMin=yMin,
-    final yMax=yMax,
-    final reverseActing=reverseActing,
-    final y_reset=y_reset)
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swi
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swi1
-    annotation (Placement(transformation(extent={{72,-10},{92,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant valDis(
-    final k=y_neutral)
-    "Value when disabled"
-    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
-equation
-  connect(conPID.u_s,swi.y)
-    annotation (Line(points={{-12,0},{-18,0}},color={0,0,127}));
-  connect(uEna,swi.u2)
-    annotation (Line(points={{-60,-120},{-60,-21.5625},{-60,0},{-42,0}},color={255,0,255}));
-  connect(u_s,swi.u1)
-    annotation (Line(points={{-120,0},{-80,0},{-80,8},{-42,8}},color={0,0,127}));
-  connect(u_m,swi.u3)
-    annotation (Line(points={{0,-120},{0,-80},{-50,-80},{-50,-8},{-42,-8}},color={0,0,127}));
-  connect(uEna,conPID.trigger)
-    annotation (Line(points={{-60,-120},{-60,-20},{-6,-20},{-6,-12}},color={255,0,255}));
-  connect(u_m,conPID.u_m)
-    annotation (Line(points={{0,-120},{0,-12}},color={0,0,127}));
-  connect(conPID.y,swi1.u1)
-    annotation (Line(points={{12,0},{40,0},{40,8},{70,8}},color={0,0,127}));
-  connect(swi1.y,y)
-    annotation (Line(points={{94,0},{120,0}},color={0,0,127}));
-  connect(uEna,swi1.u2)
-    annotation (Line(points={{-60,-120},{-60,-20},{60,-20},{60,0},{70,0}},color={255,0,255}));
-  connect(valDis.y,swi1.u3)
-    annotation (Line(points={{52,-40},{64,-40},{64,-8},{70,-8}},color={0,0,127}));
-  annotation (
-    defaultComponentName="conPID",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Documentation(
-      info="<html>
-<p>
-This is an update of
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.PIDWithReset\">
-Buildings.Controls.OBC.CDL.Reals.PIDWithReset</a>
-with an additional Boolean input representing an enable signal.
-</p>
-<ul>
-<li>
-When enabled, the controller output is identical to
-<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.PIDWithReset\">
-Buildings.Controls.OBC.CDL.Reals.PIDWithReset</a>
-(and the controller integral term is reset to <code>yMin</code> at
-enabling time).
-</li>
-<li>
-When disabled, the controller output is zero (and the set point
-is replaced by the measurement signal to avoid any
-time integration of the control error).
-</li>
-</ul>
-</html>"));
-end PIDWithEnable;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SwitchBox.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SwitchBox.mo
deleted file mode 100644
index 9eaec83cc57..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/SwitchBox.mo
+++ /dev/null
@@ -1,99 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-block SwitchBox "Controller for flow switch box"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
-    "Nominal mass flow rate, used for scaling to avoid chattering"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Real trueHoldDuration(
-    final quantity="Time",
-    final unit="s")
-    "true hold duration";
-  parameter Real falseHoldDuration(
-    final quantity="Time",
-    final unit="s") = trueHoldDuration
-    "false hold duration";
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mPos_flow(final unit="kg/s")
-    "Service water mass flow rate in positive direction"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mRev_flow(final unit="kg/s")
-    "Service water mass flow rate in reverse direction"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(final unit="1")
-    "Control output signal"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold posDom(final t, h=0.001*m_flow_nominal)
-    "Output true in case of dominating positive flow"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-  Modelica.Blocks.Logical.Switch swi "Switch to select the mode"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Modelica.Blocks.Sources.Constant posModOn(final k=1)
-    "Output signal in case of dominating positive flow"
-    annotation (Placement(transformation(extent={{0,70},{20,90}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold truFalHol(
-    final trueHoldDuration=trueHoldDuration,
-    final falseHoldDuration=falseHoldDuration)
-    "True/false hold to remove the risk of chattering"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Modelica.Blocks.Sources.Constant revModOn(final k=0)
-    "Output signal in case of dominating reverse flow"
-    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
-protected
-  Buildings.Controls.OBC.CDL.Reals.Subtract sub
-    "Differences in mass flow rates"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-equation
-  connect(posModOn.y, swi.u1)
-    annotation (Line(points={{21,80},{40,80},{40,8},{58,8}}, color={0,0,127}));
-  connect(swi.y, y) annotation (Line(points={{81,0},{120,0}}, color={0,0,127}));
-  connect(posDom.y, truFalHol.u)
-    annotation (Line(points={{-18,0},{-2,0}},
-                                            color={255,0,255}));
-  connect(truFalHol.y, swi.u2)
-    annotation (Line(points={{22,0},{58,0}}, color={255,0,255}));
-  connect(revModOn.y, swi.u3) annotation (Line(points={{21,-80},{40,-80},{40,-8},
-          {58,-8}}, color={0,0,127}));
-  connect(posDom.u, sub.y)
-    annotation (Line(points={{-42,0},{-58,0}}, color={0,0,127}));
-  connect(mPos_flow, sub.u1) annotation (Line(points={{-120,80},{-90,80},{-90,6},
-          {-82,6}}, color={0,0,127}));
-  connect(mRev_flow, sub.u2) annotation (Line(points={{-120,-80},{-90,-80},{-90,
-          -6},{-82,-6}}, color={0,0,127}));
-  annotation (Documentation(info="<html>
-<p>
-This block implements a control logic preventing flow reversal in the
-service line, for instance with the hydronic configuration of
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>.
-The block requires two input signals representing the mass flow rate contributing
-to a positive flow direction <code>mPos_flow</code> and the mass flow contributing
-to a reverse flow direction <code>mRev_flow</code>.
-The output signal <code>y</code> switches to maintain <code>mPos_flow ≥ mRev_flow</code>
-with a temporization avoiding short cycling.
-Due to the temporization, the mass flow rate may transiently change direction as
-illustrated in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 28, 2024, by Michael Wetter:<br/>
-Added hysteresis to avoid chattering if signals are near zero and have numerical noise.
-</li>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-Refactored with CDL connectors.
-</li>
-<li>
-January 23, 2020, by Michael Wetter:<br/>
-Added <a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.TrueFalseHold\">
-Buildings.Controls.OBC.CDL.Logical.TrueFalseHold</a>
-to avoid the risk of chattering.
-</li>
-<li>
-January 12, 2020, by Michael Wetter:<br/>
-Added documentation.
-</li>
-</ul>
-</html>"));
-end SwitchBox;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
deleted file mode 100644
index 448fd2b3ed9..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/WatersideEconomizer.mo
+++ /dev/null
@@ -1,312 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls;
-model WatersideEconomizer
-  "Waterside economizer controller"
-  extends Modelica.Blocks.Icons.Block;
-
-  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal
-    "Heat exchanger secondary mass flow rate"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_a1_nominal
-    "Nominal water inlet temperature on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_b2_nominal
-    "Nominal water outlet temperature on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Real y1Min(final unit="1")=0.05
-    "Minimum pump flow rate or valve opening for temperature measurement (fractional)"
-    annotation (Dialog(group="Controls"));
-  parameter Modelica.Units.SI.TemperatureDifference dTEna=1
-    "Minimum delta-T above predicted heat exchanger leaving water temperature to enable WSE"
-    annotation (Dialog(group="Controls"));
-  parameter Modelica.Units.SI.TemperatureDifference dTDis=0.5
-    "Minimum delta-T across heat exchanger before disabling WSE"
-    annotation (Dialog(group="Controls"));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput T1WatEnt(
-    final unit="K",
-    displayUnit="degC") "Heat exchanger primary water entering temperature"
-    annotation (Placement(transformation(extent={{-220,-60},{-180,-20}}),
-      iconTransformation(extent={{-140,0},{-100,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput m2_flow(
-    final unit="kg/s")
-    "Heat exchanger secondary mass flow rate" annotation (
-      Placement(transformation(extent={{-220,80},{-180,120}}),
-        iconTransformation(extent={{-140,30},{-100,70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput T2WatLvg(
-    final unit="K", displayUnit="degC")
-    "Heat exchanger secondary water leaving temperature"
-    annotation (Placement(transformation(extent={{-220,-140},{-180,-100}}),
-                     iconTransformation(extent={{-140,-60},{-100,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput T2WatEnt(
-    final unit="K", displayUnit="degC")
-    "Heat exchanger secondary water entering temperature"
-    annotation (Placement(transformation(extent={{-220,-100},{-180,-60}}),
-                    iconTransformation(extent={{-140,-30},{-100,10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y1(final unit="1")
-    "Primary control signal (pump or valve)" annotation (Placement(
-        transformation(extent={{180,80},{220,120}}), iconTransformation(extent=
-            {{100,30},{140,70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yVal2(
-    final unit="1")
-    "Secondary valve control signal"
-    annotation (Placement(transformation(extent={{180,-60},{220,-20}}),
-      iconTransformation(extent={{100,-70},{140,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter addDelTem(
-    final p=dTEna)
-    "Add threshold for enabling WSE"
-    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
-  Modelica.StateGraph.InitialStepWithSignal iniSta(nIn=1, nOut=1)
-                                                   "Initial state "
-    annotation (Placement(transformation(extent={{-30,30},{-10,50}})));
-  Modelica.StateGraph.TransitionWithSignal ena "Transition to enabled state"
-    annotation (Placement(transformation(extent={{10,30},{30,50}})));
-  Modelica.StateGraph.StepWithSignal actSta(nIn=1, nOut=1)
-                                            "Active WSE"
-    annotation (Placement(transformation(extent={{50,30},{70,50}})));
-  Modelica.StateGraph.TransitionWithSignal dis "Transition to disabled state"
-    annotation (Placement(transformation(extent={{90,30},{110,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract delT1 "Add delta-T"
-    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.LessThreshold delTemDis(t=dTDis)
-    "Compare to threshold for disabling WSE"
-    annotation (Placement(transformation(extent={{-50,-110},{-30,-90}})));
-  PredictLeavingTemperature calTemLvg(
-    final dTApp_nominal=abs(T_a1_nominal - T_b2_nominal),
-    final m2_flow_nominal=m2_flow_nominal)
-    "Compute predicted leaving water temperature"
-    annotation (Placement(transformation(extent={{-140,-50},{-120,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Less delTemDis1
-    "Compare to threshold for enabling WSE"
-    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
-    final realTrue=1,
-    final realFalse=0)
-    "Convert to real signal (close bypass valve when WSE enabled)"
-    annotation (Placement(transformation(extent={{140,-50},{160,-30}})));
-  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot "Root of state graph"
-    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant min1(
-    final k=y1Min)
-    "Minimum signal"
-    annotation (Placement(transformation(extent={{-10,130},{10,150}})));
-  Buildings.Controls.OBC.CDL.Reals.Line lin
-    "Linear variation bounded by minimum and 1"
-    annotation (Placement(transformation(extent={{60,90},{80,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swiOff1
-    "Output zero if cooling not enabled or isolation valve open (cold rejection)"
-    annotation (Placement(transformation(extent={{100,150},{120,170}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Zero"
-    annotation (Placement(transformation(extent={{60,130},{80,150}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-220,140},{-180,180}}),
-    iconTransformation(extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd(nin=4)
-    "Enable if cooling enabled and temperature criterion verified"
-    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.MultiOr or1(nin=3)
-    "Cooling disabled or temperature criterion verified"
-    annotation (Placement(transformation(extent={{0,-110},{20,-90}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not2 "Cooling disabled"
-    annotation (Placement(transformation(extent={{-50,-80},{-30,-60}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer tim(t=1200)
-    "True when WSE active for more than t" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={50,-70})));
-  Buildings.Controls.OBC.CDL.Logical.Timer tim1(t=1200)
-    "True when WSE inactive for more than t"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90)));
-  Buildings.Controls.OBC.CDL.Logical.And and2
-    "Cooling disabled or temperature criterion verified"
-    annotation (Placement(transformation(extent={{70,-102},{90,-82}})));
-  Buildings.Controls.OBC.CDL.Reals.LessThreshold isValIsoEvaClo(
-    final t=1E-6, h=0.5E-6)
-    "True if valve closed"
-    annotation (Placement(transformation(extent={{-140,-170},{-120,-150}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIsoEva_actual(final unit="1")
-    "Return position of evaporator to ambient loop isolation valve"
-    annotation (Placement(transformation(extent={{-220,-180},{-180,-140}}),
-    iconTransformation(extent={{-140,-90},{-100,-50}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not1 "True if valve open"
-    annotation (Placement(transformation(extent={{-50,-150},{-30,-130}})));
-  Buildings.Controls.OBC.CDL.Logical.And and1 "Cooling disabled or temperature criterion verified"
-    annotation (Placement(transformation(extent={{-90,150},{-70,170}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter nor2(
-    k=1/m2_flow_nominal) "Normalize"
-    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swiOff2
-    "Switch between enabled and disabled mode"
-    annotation (Placement(transformation(extent={{140,90},{160,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(final k=1) "One"
-    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
-equation
-  connect(T2WatEnt, delT1.u1)
-    annotation (Line(points={{-200,-80},{-160,-80},{-160,-94},{-142,-94}}, color={0,0,127}));
-  connect(T2WatLvg, delT1.u2)
-    annotation (Line(points={{-200,-120},{-160,-120},{-160,-106},{-142,-106}},
-                                                                             color={0,0,127}));
-  connect(delT1.y, delTemDis.u) annotation (Line(points={{-118,-100},{-52,-100}},color={0,0,127}));
-  connect(T1WatEnt, calTemLvg.T1WatEnt)
-    annotation (Line(points={{-200,-40},{-160,-40},{-160,-45},{-142,-45}},
-                                                                     color={0,0,127}));
-  connect(calTemLvg.T2WatLvg, addDelTem.u) annotation (Line(points={{-118,-40},{-92,-40}}, color={0,0,127}));
-  connect(addDelTem.y, delTemDis1.u1) annotation (Line(points={{-68,-40},{-52,-40}}, color={0,0,127}));
-  connect(T2WatEnt, delTemDis1.u2)
-    annotation (Line(points={{-200,-80},{-60,-80},{-60,-48},{-52,-48}}, color={0,0,127}));
-  connect(iniSta.outPort[1], ena.inPort) annotation (Line(points={{-9.5,40},{16,40}},   color={0,0,0}));
-  connect(ena.outPort, actSta.inPort[1]) annotation (Line(points={{21.5,40},{49,40}}, color={0,0,0}));
-  connect(actSta.outPort[1], dis.inPort) annotation (Line(points={{70.5,40},{96,40}}, color={0,0,0}));
-  connect(dis.outPort, iniSta.inPort[1])
-    annotation (Line(points={{101.5,40},{120,40},{120,60},{-40,60},{-40,40},{-31,40}}, color={0,0,0}));
-  connect(booToRea.y, yVal2) annotation (Line(points={{162,-40},{200,-40}}, color={0,0,127}));
-  connect(zer.y, swiOff1.u3) annotation (Line(points={{82,140},{90,140},{90,152},
-          {98,152}},                                                                    color={0,0,127}));
-  connect(mulAnd.y, ena.condition) annotation (Line(points={{22,-40},{30,-40},{
-          30,18},{20,18},{20,28}},                                                      color={255,0,255}));
-  connect(uCoo, not2.u) annotation (Line(points={{-200,160},{-170,160},{-170,-70},{-52,-70}},   color={255,0,255}));
-  connect(actSta.active, booToRea.u) annotation (Line(points={{60,29},{60,-40},{138,-40}}, color={255,0,255}));
-  connect(delTemDis1.y, mulAnd.u[1])
-    annotation (Line(points={{-28,-40},{-2,-40},{-2,-42.625}},                   color={255,0,255}));
-  connect(iniSta.active, tim1.u) annotation (Line(points={{-20,29},{-20,20},{
-          2.22045e-15,20},{2.22045e-15,12}},                                  color={255,0,255}));
-  connect(tim1.passed, mulAnd.u[2])
-    annotation (Line(points={{-8,-12},{-8,-36},{-2,-36},{-2,-38.25}},  color={255,0,255}));
-  connect(uCoo, mulAnd.u[3]) annotation (Line(points={{-200,160},{-170,160},{-170,
-          0},{-20,0},{-20,-38},{-2,-38},{-2,-41.75}},
-                          color={255,0,255}));
-  connect(actSta.active, tim.u) annotation (Line(points={{60,29},{60,-40},{50,-40},{50,-58}},
-                                                                            color={255,0,255}));
-  connect(tim.passed, and2.u1) annotation (Line(points={{42,-82},{42,-92},{68,-92}},    color={255,0,255}));
-  connect(or1.y, and2.u2) annotation (Line(points={{22,-100},{68,-100}},                     color={255,0,255}));
-  connect(and2.y, dis.condition) annotation (Line(points={{92,-92},{100,-92},{100,28}}, color={255,0,255}));
-  connect(m2_flow, calTemLvg.m2_flow) annotation (Line(points={{-200,100},{-160,
-          100},{-160,-35},{-142,-35}}, color={0,0,127}));
-  connect(yValIsoEva_actual,isValIsoEvaClo.u)
-    annotation (Line(points={{-200,-160},{-142,-160}},color={0,0,127}));
-  connect(isValIsoEvaClo.y, mulAnd.u[4])
-    annotation (Line(points={{-118,-160},{-100,-160},{-100,-20},{-24,-20},{-24,-42},
-          {-2,-42},{-2,-45.25}}, color={255,0,255}));
-  connect(isValIsoEvaClo.y, not1.u)
-    annotation (Line(points={{-118,-160},{-60,-160},{-60,-140},{-52,-140}}, color={255,0,255}));
-  connect(delTemDis.y, or1.u[1])
-    annotation (Line(points={{-28,-100},{-2,-100},{-2,-102.333}},                 color={255,0,255}));
-  connect(not2.y, or1.u[2]) annotation (Line(points={{-28,-70},{-20,-70},{-20,
-          -96},{-2,-96},{-2,-100}}, color={255,0,255}));
-  connect(not1.y, or1.u[3])
-    annotation (Line(points={{-28,-140},{-20,-140},{-20,-104},{-2,-104},{-2,
-          -97.6667}},                                                             color={255,0,255}));
-  connect(uCoo, and1.u1) annotation (Line(points={{-200,160},{-92,160}}, color={255,0,255}));
-  connect(and1.y, swiOff1.u2) annotation (Line(points={{-68,160},{98,160}},                   color={255,0,255}));
-  connect(isValIsoEvaClo.y, and1.u2)
-    annotation (Line(points={{-118,-160},{-100,-160},{-100,152},{-92,152}}, color={255,0,255}));
-  connect(m2_flow, nor2.u)
-    annotation (Line(points={{-200,100},{-142,100}}, color={0,0,127}));
-  connect(min1.y, swiOff1.u1) annotation (Line(points={{12,140},{40,140},{40,
-          168},{98,168}}, color={0,0,127}));
-  connect(swiOff2.y, y1)
-    annotation (Line(points={{162,100},{200,100}}, color={0,0,127}));
-  connect(swiOff1.y, swiOff2.u1) annotation (Line(points={{122,160},{130,160},{
-          130,108},{138,108}}, color={0,0,127}));
-  connect(iniSta.active, swiOff2.u2) annotation (Line(points={{-20,29},{-20,20},
-          {130,20},{130,100},{138,100}}, color={255,0,255}));
-  connect(lin.y, swiOff2.u3) annotation (Line(points={{82,100},{120,100},{120,
-          92},{138,92}}, color={0,0,127}));
-  connect(nor2.y, lin.u)
-    annotation (Line(points={{-118,100},{58,100}}, color={0,0,127}));
-  connect(one.y, lin.x2) annotation (Line(points={{12,80},{40,80},{40,96},{58,
-          96}}, color={0,0,127}));
-  connect(one.y, lin.f2) annotation (Line(points={{12,80},{50,80},{50,92},{58,
-          92}}, color={0,0,127}));
-  connect(zer.y, lin.x1) annotation (Line(points={{82,140},{90,140},{90,120},{
-          50,120},{50,108},{58,108}}, color={0,0,127}));
-  connect(min1.y, lin.f1) annotation (Line(points={{12,140},{40,140},{40,104},{
-          58,104}}, color={0,0,127}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-180,-180},{180,180}})),
-    defaultComponentName="conWSE",
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 14, 2021, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This block implements the control logic for the waterside economizer.
-</p>
-<p>
-The system is enabled if
-</p>
-<ul>
-<li>
-it has been disabled for more than 20 minutes, and
-</li>
-<li>
-the \"cooling enabled\" input signal is <code>true</code>, and
-</li>
-<li>
-the evaporator isolation valve is closed (i.e., the system is not in cold
-rejection mode), and
-</li>
-<li>
-the predicted leaving water temperature is lower than the entering water
-temperature minus <code>dTEna</code>.
-</li>
-</ul>
-<p>
-The system is disabled if
-</p>
-<ul>
-<li>
-it has been enabled for more than 20 minutes, and
-</li>
-<li>
-the \"cooling enabled\" input signal is <code>false</code>, or
-</li>
-<li>
-the evaporator isolation valve is open, or
-</li>
-<li>
-the leaving water temperature is higher than the entering water
-temperature minus <code>dTDis</code>.
-</li>
-</ul>
-<p>
-When the system is enabled
-</p>
-<ul>
-<li>
-the primary side is controlled so that the primary flow rate
-varies linearly with the secondary flow rate,
-</li>
-<li>
-the bypass valve on the secondary side is fully closed.
-</li>
-</ul>
-<p>
-When the system is disabled
-</p>
-<ul>
-<li>
-if the \"cooling enabled\" input signal is <code>true</code> and
-the evaporator isolation valve is closed,
-the primary pump (resp. valve) is operated at its minimum speed
-(resp. opening), otherwise it is switched off (resp. fully closed):
-this is needed to yield a representative measurement of the
-service water entering temperature,
-</li>
-<li>
-the bypass valve on the secondary side is fully open.
-</li>
-</ul>
-</html>"));
-end WatersideEconomizer;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.mo
deleted file mode 100644
index a44204faccb..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Controls/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-package Controls "Package of control blocks for fifth generation DHC ETS"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains control blocks for energy transfer stations in
-fifth generation district heating and cooling systems.
-</p>
-</html>"));
-end Controls;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mo
deleted file mode 100644
index 2d593e9c134..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mo
+++ /dev/null
@@ -1,49 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples;
-model ChillerBorefield
-  "Example of the ETS model with heat recovery chiller and borefield"
-  extends ChillerOnly(
-    ets(
-      have_borFie=true,
-      datBorFie=datBorFie));
-  parameter Integer nBorHol=64
-    "Number of boreholes (must be a square number)";
-  parameter Modelica.Units.SI.Distance dxy=6
-    "Distance in x-axis (and y-axis) between borehole axes";
-  final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.computeCoordinates(nBorHol, dxy)
-    "Coordinates of boreholes";
-  parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
-    conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
-      cooBor=cooBor,
-      dp_nominal=0))
-    "Borefield design data"
-    annotation (Placement(transformation(extent={{60,180},{80,200}})));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos" "Simulate and plot"),
-    experiment(
-      StartTime=6.5E6,
-      StopTime=7E6,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
-in a system configuration including a geothermal borefield.
-See
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly</a>
-for the description of the main modeling assumptions.
-</p>
-</html>"));
-end ChillerBorefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mo
deleted file mode 100644
index 94d500cbd59..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mo
+++ /dev/null
@@ -1,97 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples;
-model ChillerOnly
-  "Example of the ETS model with heat recovery chiller"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield(
-    TDisWatSup(
-      table=[
-        0,11;
-        1,12;
-        2,13;
-        3,14;
-        4,15;
-        5,16;
-        6,17;
-        7,18;
-        8,20;
-        9,18;
-        10,16;
-        11,13;
-        12,11],
-      timeScale=2592000),
-    loa(
-      tableOnFile=true,
-      fileName=Modelica.Utilities.Files.loadResource(
-        filNam),
-      timeScale=1),
-    QCoo_flow_nominal=Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
-      string="#Peak space cooling load",
-      filNam=Modelica.Utilities.Files.loadResource(filNam)),
-    QHea_flow_nominal=Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
-      string="#Peak space heating load",
-      filNam=Modelica.Utilities.Files.loadResource(filNam)));
-  parameter String filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"
-    "File name with thermal loads as time series";
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaNorHea(
-    final k=1/ets.QHeaWat_flow_nominal)
-    "Normalize by nominal" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-278,60})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaNorCoo(
-    final k=1/ets.QChiWat_flow_nominal) "Normalize by nominal" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={298,60})));
-equation
-  connect(loa.y[2],loaNorHea.u)
-    annotation (Line(points={{-309,160},{-300,160},{-300,60},{-290,60}},color={0,0,127}));
-  connect(loa.y[1],loaNorCoo.u)
-    annotation (Line(points={{-309,160},{320,160},{320,60},{310,60}},color={0,0,127}));
-  connect(loaNorHea.y,heaLoaNor.u)
-    annotation (Line(points={{-266,60},{-252,60}},color={0,0,127}));
-  connect(loaNorCoo.y,loaCooNor.u)
-    annotation (Line(points={{286,60},{272,60}},color={0,0,127}));
-  connect(TDisWatSup.y[1],disWat.T_in)
-    annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos" "Simulate and plot"),
-    experiment(
-      StartTime=6.5E6,
-      StopTime=7E6,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
-in a system configuration with no geothermal borefield.
-</p>
-<ul>
-<li>
-A load profile based on a whole building energy simulation is used to
-represent realistic operating conditions.
-</li>
-<li>
-The district water supply temperature varies on a monthly basis, with
-a minimum in January and a maximum in August.
-</li>
-<li>
-The other modeling assumptions are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
-</li>
-</ul>
-</html>"));
-end ChillerOnly;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.mo
deleted file mode 100644
index ee0b1618d53..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Examples/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-package Examples "Example models integrating multiple components"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
deleted file mode 100644
index 338e0e5888f..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
+++ /dev/null
@@ -1,163 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-model HeatPumpHeatExchanger
-  "Model of a substation with heat pump for heating, heat pump for domestic hot water, and compressor-less cooling"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
-      volMix_a(nPorts=4),
-      volMix_b(nPorts=4));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump proHotWat(
-    redeclare final package Medium1 = MediumBui,
-    redeclare final package Medium2 = MediumSer,
-    final COP_nominal=COPHotWat_nominal,
-    final TCon_nominal=THotWatSup_nominal,
-    final TEva_nominal=TDisWatMin - dT_nominal,
-    dT_nominal=dT_nominal,
-    final Q1_flow_nominal=QHotWat_flow_nominal,
-    final allowFlowReversal1=allowFlowReversalBui,
-    final allowFlowReversal2=allowFlowReversalSer,
-    final dp1_nominal=dp_nominal,
-    final dp2_nominal=dp_nominal) if have_hotWat
-    "Subsystem for hot water production"
-    annotation (Placement(transformation(extent={{-10,24},{10,44}})));
-  Buildings.Fluid.Sources.Boundary_pT      souColWat(
-    redeclare final package Medium = MediumBui,
-    use_T_in=true,
-    nPorts=1) if have_hotWat
-    "Source for cold water"
-    annotation (Placement(transformation(extent={{-48,-50},{-28,-30}})));
-  Buildings.Fluid.Sources.Boundary_pT sinSHW(redeclare final package Medium = MediumBui,
-      nPorts=1)
-               if have_hotWat
-    "Sink for service hot water" annotation (Placement(
-      transformation(
-      extent={{10,-10},{-10,10}},
-      rotation=180,
-      origin={-60,60})));
-  Buildings.Controls.OBC.CDL.Reals.Divide div1 if have_hotWat
-    "Compute mass flow rate from load"
-    annotation (Placement(transformation(extent={{-100,-60},{-80,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai(final k=
-        cpBui_default) if have_hotWat "Times Cp"
-    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract delT if have_hotWat
-    "Compute DeltaT needed on condenser side"
-    annotation (Placement(transformation(extent={{-150,-20},{-130,0}})));
-equation
-  connect(souColWat.ports[1], proHotWat.port_a1) annotation (Line(points={{-28,-40},
-          {-20,-40},{-20,40},{-10,40}}, color={0,127,255}));
-  connect(sinSHW.ports[1], proHotWat.port_b1) annotation (Line(points={{-50,60},
-          {14,60},{14,40},{10,40}},    color={0,127,255}));
-  connect(THotWatSupSet, proHotWat.TSupSet) annotation (Line(points={{-320,-40},
-          {-160,-40},{-160,36},{-86,36},{-86,37},{-12,37}},
-                                          color={0,0,127}));
-  connect(enaSHW.y, proHotWat.uEna) annotation (Line(points={{-118,80},{-114,80},
-          {-114,43},{-12,43}}, color={255,0,255}));
-  connect(proHotWat.PPum, PPumHeaTot.u[2]) annotation (Line(points={{12,34},{176,
-          34},{176,420},{188,420},{188,420.5}},
-                                              color={0,0,127}));
-  connect(proHotWat.mEva_flow, masFloHeaTot.u[2]) annotation (Line(points={{12,31},
-          {218,31},{218,-139.5},{268,-139.5}},
-                                           color={0,0,127}));
-  connect(proHotWat.mEva_flow, masFloHea.u2) annotation (Line(points={{12,31},{18,
-          31},{18,-240},{-6,-240},{-6,-252}}, color={0,0,127}));
-  connect(proHotWat.PHea, PHeaTot.u[2]) annotation (Line(points={{12,37},{240,
-          37},{240,80},{256,80},{256,80.5},{268,80.5}},
-                              color={0,0,127}));
-  connect(TColWat, souColWat.T_in) annotation (Line(points={{-320,-80},{-60,-80},
-          {-60,-36},{-50,-36}}, color={0,0,127}));
-  connect(proHotWat.port_a2, volMix_a.ports[4]) annotation (Line(points={{10,28},
-          {14,28},{14,20},{-260,20},{-260,-360}}, color={0,127,255}));
-  connect(proHotWat.port_b2, volMix_b.ports[4])
-    annotation (Line(points={{-10,28},{-14,28},{-14,0},{260,0},{260,-360}},
-                                                           color={0,127,255}));
-  connect(gai.y,div1. u2) annotation (Line(points={{-98,-10},{-80,-10},{-80,-30},
-          {-120,-30},{-120,-56},{-102,-56}},          color={0,0,127}));
-  connect(QReqHotWat_flow,div1. u1) annotation (Line(points={{-320,-120},{-290,-120},{
-          -290,-44},{-102,-44}},
-                            color={0,0,127}));
-  connect(delT.y,gai. u)
-    annotation (Line(points={{-128,-10},{-122,-10}}, color={0,0,127}));
-  connect(TColWat,delT. u2) annotation (Line(points={{-320,-80},{-156,-80},{
-          -156,-16},{-152,-16}},
-                            color={0,0,127}));
-  connect(THotWatSupSet,delT. u1) annotation (Line(points={{-320,-40},{-160,-40},
-          {-160,-4},{-152,-4}},
-                            color={0,0,127}));
-  connect(div1.y, proHotWat.m1_flow) annotation (Line(points={{-78,-50},{-70,
-          -50},{-70,34},{-12,34}}, color={0,0,127}));
-  annotation (
-  Documentation(info="<html>
-<p>
-This model uses the base energy transfer station defined in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
-</p>
-<h4>Domestic Hot Water</h4>
-<p>
-Domestic hot water is produced using a dedicated water-to-water heat pump
-on-demand with no storage.
-</p>
-<p>
-Heating is enabled based on the input signal <code>uSHW</code>
-which is held for <i>15</i> minutes, meaning that,
-when enabled, the mode remains active for at least <i>15</i> minutes and,
-when disabled, the mode cannot be enabled again for at least <i>15</i> minutes.
-The enable signal should be computed externally based
-on a schedule (to lock out the system during off-hours), ideally in conjunction
-with the number of requests or any other signal representative of the load.
-</p>
-<p>
-When enabled,
-</p>
-<ul>
-<li>
-The heat pump and the evaporator and condenser hydronics are controlled
-based on the principles described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
-</li>
-<li>
-The condensor water mass flow rate is computed based on the domestic hot water
-heating load (input <code>QReqHotWat_flow</code>) where the temperature of water is boosted from the
-domestic cold water temperature (input <code>TColWat</code>) to the desired domestic hot water
-distribution temperature (parameter <code>THotWatSup_nominal</code>), according
-to the following equation:
-<p align=\"center\" style=\"font-style:italic;\">
-<code>QReqHotWat_flow</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
-</p>
-</li>
-</ul>
-</html>",
-  revisions="<html>
-<ul>
-<li>
-September 13, 2023, by David Blum:<br/>
-Extended from partial base class.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
-issue 3063</a>.
-</li>
-<li>
-May 17, 2023, by David Blum:<br/>
-Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
-Corrected calculation of heat pump evaporator mass flow control.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
-issue 3379</a>.
-</li>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-Refactored with subsystem models and partial ETS base class.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1769\">
-issue 1769</a>.
-</li>
-<li>
-December 12, 2017, by Michael Wetter:<br/>
-Removed call to <code>Modelica.Utilities.Files.loadResource</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1097\">issue 1097</a>.
-</li>
-</ul>
-</html>"));
-end HeatPumpHeatExchanger;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
deleted file mode 100644
index 2f1282619f4..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
+++ /dev/null
@@ -1,164 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-model HeatPumpHeatExchangerDHWTank
-  "Model of a substation with heat pump for heating, heat pump with storage tank for domestic hot water, and compressor-less cooling"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger(
-    volMix_b(nPorts=4),
-    volMix_a(nPorts=4));
-  Buildings.Fluid.Sources.Boundary_pT souDCW(
-    redeclare final package Medium = MediumBui,
-    use_T_in=true,
-    nPorts=1)  if have_hotWat "Source for domestic cold water"
-                                 annotation (Placement(
-      transformation(
-      extent={{10,-10},{-10,10}},
-      rotation=180,
-      origin={-52,-56})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank proHotWat(
-    redeclare final package Medium1 = MediumBui,
-    redeclare final package Medium2 = MediumSer,
-    final COP_nominal=COPHotWat_nominal,
-    TCon_nominal=THotWatSup_nominal,
-    TEva_nominal=TDisWatMin - dT_nominal,
-    QHotWat_flow_nominal=QHotWat_flow_nominal,
-    dT_nominal=dT_nominal,
-    final allowFlowReversal1=allowFlowReversalBui,
-    final allowFlowReversal2=allowFlowReversalSer,
-    dp1_nominal=6000,
-    dp2_nominal=6000,
-    datWatHea=datWatHea) if have_hotWat
-    "Subsystem for hot water production"
-    annotation (Placement(transformation(extent={{30,24},{50,44}})));
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
-    datWatHea "Performance data"
-    annotation (Placement(transformation(extent={{36,48},{48,60}})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(
-    redeclare package Medium = MediumBui,
-    mMix_flow_nominal=QHotWat_flow_nominal/cpBui_default/(THotWatSup_nominal - TColWat_nominal))
-     if have_hotWat
-     "Thermostatic mixing valve"
-    annotation (Placement(transformation(extent={{-20,50},{-40,72}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction dcwSpl(
-      redeclare final package Medium = MediumBui, final m_flow_nominal=
-        datWatHea.mDom_flow_nominal*{1,-1,-1})
-                                             "Splitter for domestic cold water"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-10,0})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai(
-    k=1/QHotWat_flow_nominal) if have_hotWat
-    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
-equation
-
-  connect(proHotWat.port_b2, volMix_b.ports[4])
-    annotation (Line(points={{30,28},{28,28},{28,0},{260,0},{260,-360}},
-                                                           color={0,127,255}));
-  connect(proHotWat.PHea, PHeaTot.u[2]) annotation (Line(points={{52,37},{66,37},
-          {66,38},{268,38},{268,80.5}},
-        color={0,0,127}));
-  connect(proHotWat.PPum, PPumHeaTot.u[2]) annotation (Line(points={{52,34},{
-          176,34},{176,420.5},{188,420.5}},
-                                    color={0,0,127}));
-  connect(proHotWat.mEva_flow, masFloHeaTot.u[2]) annotation (Line(points={{52,31},
-          {68,31},{68,30},{256,30},{256,-139.5},{268,-139.5}},
-                                                           color={0,0,127}));
-  connect(proHotWat.mEva_flow, masFloHea.u2) annotation (Line(points={{52,31},{
-          58,31},{58,-242},{-6,-242},{-6,-252}},
-                                              color={0,0,127}));
-  connect(proHotWat.port_a2, volMix_a.ports[4]) annotation (Line(points={{50,28},
-          {54,28},{54,20},{-260,20},{-260,-360}},             color={0,127,255}));
-  connect(souDCW.ports[1], dcwSpl.port_1) annotation (Line(points={{-42,-56},{
-          -10,-56},{-10,-10}},color={0,127,255}));
-  connect(dcwSpl.port_3, proHotWat.port_a1)
-    annotation (Line(points={{0,-6.66134e-16},{10,-6.66134e-16},{10,40},{30,40}},
-                                                           color={0,127,255}));
-  connect(dcwSpl.port_2, theMixVal.port_col) annotation (Line(points={{-10,10},
-          {-10,52.2},{-20,52.2}}, color={0,127,255}));
-  connect(proHotWat.port_b1, theMixVal.port_hot) annotation (Line(points={{50,40},
-          {60,40},{60,80},{0,80},{0,56.6},{-20,56.6}},
-                                           color={0,127,255}));
-  connect(souDCW.T_in, TColWat) annotation (Line(points={{-64,-60},{-156,-60},{
-          -156,-80},{-320,-80}}, color={0,0,127}));
-  connect(THotWatSupSet, theMixVal.TMixSet) annotation (Line(points={{-320,-40},
-          {-32,-40},{-32,32},{-6,32},{-6,64},{-14,64},{-14,63.2},{-19,63.2}},
-                                                            color={0,0,127}));
-  connect(QReqHotWat_flow, gai.u) annotation (Line(points={{-320,-120},{-288,-120},
-          {-288,60},{-82,60}},
-                         color={0,0,127}));
-  connect(gai.y, theMixVal.yMixSet) annotation (Line(points={{-58,60},{-48,60},
-          {-48,78},{-6,78},{-6,70},{-12,70},{-12,69.8},{-19,69.8}},
-                                                  color={0,0,127}));
-  connect(enaSHW.y, proHotWat.uEna) annotation (Line(points={{-118,80},{-108,80},
-          {-108,43},{28,43}}, color={255,0,255}));
-  annotation (
-  Documentation(info="<html>
-<p>
-This model uses the base energy transfer station defined in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
-</p>
-<h4>Domestic Hot Water</h4>
-<p>
-Domestic hot water is produced using a dedicated water-to-water heat pump
-with storage tank.
-</p>
-<p>
-Heating is enabled based on the input signal <code>uSHW</code>
-which is held for <i>15</i> minutes, meaning that,
-when enabled, the mode remains active for at least <i>15</i> minutes and,
-when disabled, the mode cannot be enabled again for at least <i>15</i> minutes.
-The enable signal should be computed externally based
-on a schedule (to lock out the system during off-hours), ideally in conjunction
-with the number of requests or any other signal representative of the load.
-</p>
-<p>
-When enabled,
-</p>
-<ul>
-<li>
-The heat pump and the evaporator and condenser hydronics are controlled
-based on the principles described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
-</li>
-<li>
-The mass flow rate of water leaving the domestic hot water heat exchanger is computed based on the domestic hot water
-heating load (input <code>QReqHotWat_flow</code>) combined with the operation of a thermostatic
-mixing valve used to mix down the temperature of hot water leaving the domestic hot water heat exchanger
-to the temperature distributed to fixtures (parameter <code>THotWatSup_nominal</code>)
-using domestic cold water at the cold water temperature (input <code>TColWat</code>).
-The desired water flow rate leaving the thermostatic mixing valve
-is determined according to the following equation:
-<p align=\"center\" style=\"font-style:italic;\">
-<code>QReqHotWat_flow</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
-</p>
-</li>
-</ul>
-</html>",
-  revisions="<html>
-<ul>
-<li>
-September 13, 2023, by David Blum:<br/>
-First implementation, extended from partial base class.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
-issue 3063</a>.
-</li>
-</ul>
-</html>"), Icon(graphics={
-        Rectangle(
-          extent={{-70,36},{-68,26}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1.5,5.5},{1.5,-5.5}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid,
-          origin={-13.5,26.5},
-          rotation=90)}));
-end HeatPumpHeatExchangerDHWTank;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/PartialHeatPump.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
deleted file mode 100644
index ec3c4026f43..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/PartialHeatPump.mo
+++ /dev/null
@@ -1,336 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses;
-model PartialHeatPump
-  "Partial base class for subsystems containing a heat pump"
-  replaceable package Medium1=Modelica.Media.Interfaces.PartialMedium
-    "Medium model on condenser side"
-    annotation (choices(choice(redeclare package Medium=Buildings.Media.Water "Water"),
-    choice(redeclare package Medium =
-      Buildings.Media.Antifreeze.PropyleneGlycolWater (property_T=293.15,X_a=0.40)
-    "Propylene glycol water, 40% mass fraction")));
-  replaceable package Medium2=Modelica.Media.Interfaces.PartialMedium
-    "Medium model on evaporator side"
-    annotation (choices(choice(redeclare package Medium=Buildings.Media.Water "Water"),
-    choice(redeclare package Medium =
-      Buildings.Media.Antifreeze.PropyleneGlycolWater (property_T=293.15,X_a=0.40)
-    "Propylene glycol water, 40% mass fraction")));
-  parameter Real COP_nominal(final unit="1")
-    "Heat pump COP"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TCon_nominal
-    "Condenser outlet temperature used to compute COP_nominal"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TEva_nominal
-    "Evaporator outlet temperature used to compute COP_nominal"
-    annotation (Dialog(group="Nominal condition"));
-
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0) = 5
-    "Water temperature drop/increase accross load and source-side HX (always positive)"
-    annotation (Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal = heaPum.m1_flow_nominal
-    "Condenser mass flow rate";
-  final parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal = heaPum.m2_flow_nominal
-    "Evaporator mass flow rate";
-
-  parameter Boolean allowFlowReversal1=false
-    "Set to true to allow flow reversal on condenser side"
-    annotation (Dialog(tab="Assumptions"), Evaluate=true);
-  parameter Boolean allowFlowReversal2=false
-    "Set to true to allow flow reversal on evaporator side"
-    annotation (Dialog(tab="Assumptions"), Evaluate=true);
-  parameter Modelica.Units.SI.Pressure dp1_nominal(displayUnit="Pa")
-    "Pressure difference over condenser"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Pressure dp2_nominal(displayUnit="Pa")
-    "Pressure difference over evaporator"
-    annotation (Dialog(group="Nominal condition"));
-  // IO CONNECTORS
-  Modelica.Fluid.Interfaces.FluidPort_a port_a2(
-    redeclare final package Medium = Medium2,
-    m_flow(min=if allowFlowReversal2 then -Modelica.Constants.inf else 0),
-    h_outflow(start=Medium2.h_default, nominal=Medium2.h_default))
-    "Fluid port for entering evaporator water" annotation (Placement(
-        transformation(extent={{190,-70},{210,-50}}), iconTransformation(extent=
-           {{90,-70},{110,-50}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_b2(
-    redeclare final package Medium = Medium2,
-    m_flow(max=if allowFlowReversal2 then +Modelica.Constants.inf else 0),
-    h_outflow(start=Medium2.h_default, nominal=Medium2.h_default))
-    "Fluid port for leaving evaporator water" annotation (Placement(
-        transformation(extent={{-210,-70},{-190,-50}}),
-                                                    iconTransformation(extent={{-110,
-            -70},{-90,-50}})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_a1(
-    redeclare final package Medium = Medium1,
-    m_flow(min=if allowFlowReversal1 then -Modelica.Constants.inf else 0),
-    h_outflow(start=Medium1.h_default, nominal=Medium1.h_default))
-    "Fluid port for cold domestic water"      annotation (Placement(
-        transformation(extent={{-210,50},{-190,70}}),   iconTransformation(
-          extent={{-110,50},{-90,70}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_b1(
-    redeclare final package Medium = Medium1,
-    m_flow(max=if allowFlowReversal1 then +Modelica.Constants.inf else 0),
-    h_outflow(start=Medium1.h_default, nominal=Medium1.h_default))
-    "Fluid port for heated domestic hot water"
-                                             annotation (Placement(
-        transformation(extent={{190,50},{210,70}}),   iconTransformation(extent={{90,50},
-            {110,70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PHea(
-    final unit="W") "Heat pump power"
-    annotation (Placement(transformation(extent={{200,20},{240,60}}),
-    iconTransformation(extent={{100,10},{140,50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
-    final unit="W") "Pump power"
-    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
-    iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mEva_flow(final unit="kg/s")
-    "Evaporator water mass flow rate"
-    annotation (Placement(transformation(
-      extent={{200,-60},{240,-20}}), iconTransformation(extent={{100,-50},{
-        140,-10}})));
-  // COMPONENTS
-  Buildings.Fluid.HeatPumps.Carnot_TCon heaPum(
-    redeclare package Medium1 = Medium1,
-    redeclare package Medium2 = Medium2,
-    allowFlowReversal1=false,
-    allowFlowReversal2=false,
-    dTEva_nominal=-dT_nominal,
-    dTCon_nominal=dT_nominal,
-    use_eta_Carnot_nominal=false,
-    COP_nominal=COP_nominal,
-    TCon_nominal=TCon_nominal,
-    TEva_nominal=TEva_nominal,
-    final dp1_nominal=dp1_nominal,
-    final dp2_nominal=dp2_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Domestic hot water heat pump"
-    annotation (Placement(transformation(extent={{-80,-82},{-60,-62}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow
-                                     pumCon(
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    redeclare package Medium = Medium2,
-    m_flow_nominal=mCon_flow_nominal,
-    riseTime=10,
-    dp_nominal=dp1_nominal)
-                 "Pump for heat pump condenser"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-        rotation=270,
-        origin={-26,0})));
-
-  Buildings.Fluid.Movers.Preconfigured.SpeedControlled_y pumEva(
-    redeclare final package Medium = Medium2,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    final allowFlowReversal=allowFlowReversal2,
-    addPowerToMedium=false,
-    use_inputFilter=false,
-    m_flow_nominal=mEva_flow_nominal,
-    dp_nominal=dp2_nominal + 6000)
-    "Heat pump evaporator water pump"
-    annotation (Placement(transformation(extent={{8,-88},{-12,-68}})));
-
-  Modelica.Blocks.Math.Add addPPum "Electricity use for pumps"
-    annotation (Placement(transformation(extent={{140,70},{160,90}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal floEva
-                           "Evaporator mass flow rate"
-    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
-  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valHeaPumEva(
-    redeclare package Medium = Medium2,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    m_flow_nominal=mEva_flow_nominal,
-    dpValve_nominal=6000) "Valve at heat pump evaporator"
-    annotation (Placement(transformation(extent={{80,-70},{60,-50}})));
-  Fluid.Sensors.TemperatureTwoPort senTEvaRet(
-    redeclare final package Medium = Medium2,
-    final allowFlowReversal=allowFlowReversal1,
-    final m_flow_nominal=mEva_flow_nominal,
-    tau=0)
-    "Evaporator return temperature sensor" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-110,-80})));
-  Fluid.Sensors.TemperatureTwoPort senTDisSup(
-    redeclare final package Medium = Medium2,
-    final allowFlowReversal=allowFlowReversal1,
-    final m_flow_nominal=mEva_flow_nominal,
-    tau=0)
-    "District supply temperature sensor" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={110,-60})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract dT_supRet
-    "Temperature difference over heat pump connection"
-    annotation (Placement(transformation(extent={{80,-20},{100,0}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTSet(k=dT_nominal)
-    "Set point for temperature difference over heat pump"
-    annotation (Placement(transformation(extent={{80,10},{100,30}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPI(
-    k=0.1,
-    Ti=120,                                                  xi_start=0.2,
-    reverseActing=false)
-    "Controller to ensure dT_nominal over heat pump connection"
-    annotation (Placement(transformation(extent={{120,10},{140,30}})));
-  Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium2)
-    "Mass flow rate drawn from ETS"
-    annotation (Placement(transformation(extent={{160,-70},{140,-50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEna(start=false)
-    "Enable signal"
-    annotation (
-      Placement(transformation(extent={{-240,100},{-200,140}}),
-        iconTransformation(extent={{-140,70},{-100,110}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction
-    junction(redeclare package Medium = Medium2, m_flow_nominal={
-        mEva_flow_nominal,-mEva_flow_nominal,mEva_flow_nominal})
-    annotation (Placement(transformation(extent={{-130,-90},{-150,-70}})));
-equation
-  connect(heaPum.port_b1,pumCon. port_a) annotation (Line(points={{-60,-66},{
-          -26,-66},{-26,-10}},
-                           color={0,127,255}));
-  connect(heaPum.P, PHea) annotation (Line(points={{-59,-72},{-20,-72},{-20,-20},
-          {22,-20},{22,40},{220,40}},
-                color={0,0,127}));
-  connect(senTDisSup.T, dT_supRet.u1) annotation (Line(points={{110,-49},{110,
-          -32},{34,-32},{34,-4},{78,-4}},
-                                       color={0,0,127}));
-  connect(valHeaPumEva.port_1, senTDisSup.port_b)
-    annotation (Line(points={{80,-60},{100,-60}}, color={0,127,255}));
-  connect(conPI.u_s, dTSet.y)
-    annotation (Line(points={{118,20},{102,20}},
-                                               color={0,0,127}));
-  connect(dT_supRet.y, conPI.u_m)
-    annotation (Line(points={{102,-10},{130,-10},{130,8}},   color={0,0,127}));
-  connect(conPI.y, valHeaPumEva.y) annotation (Line(points={{142,20},{148,20},{
-          148,-26},{70,-26},{70,-48}},
-                                   color={0,0,127}));
-  connect(senTDisSup.port_a, senMasFlo.port_b)
-    annotation (Line(points={{120,-60},{140,-60}}, color={0,127,255}));
-  connect(senMasFlo.port_a, port_a2)
-    annotation (Line(points={{160,-60},{200,-60}}, color={0,127,255}));
-  connect(senMasFlo.m_flow, mEva_flow)
-    annotation (Line(points={{150,-49},{150,-40},{220,-40}}, color={0,0,127}));
-  connect(pumCon.P, addPPum.u1) annotation (Line(points={{-17,11},{-16,11},{-16,
-          86},{138,86}}, color={0,0,127}));
-  connect(addPPum.u2, pumEva.P) annotation (Line(points={{138,74},{-180,74},{
-          -180,-44},{-13,-44},{-13,-69}},
-                          color={0,0,127}));
-  connect(heaPum.port_b2, senTEvaRet.port_a) annotation (Line(points={{-80,-78},
-          {-90,-78},{-90,-80},{-100,-80}}, color={0,127,255}));
-  connect(senTEvaRet.T, dT_supRet.u2) annotation (Line(points={{-110,-69},{-110,
-          -16},{78,-16}}, color={0,0,127}));
-  connect(heaPum.port_a2, pumEva.port_b)
-    annotation (Line(points={{-60,-78},{-12,-78}}, color={0,127,255}));
-  connect(junction.port_2, port_b2) annotation (Line(points={{-150,-80},{-180,
-          -80},{-180,-60},{-200,-60}}, color={0,127,255}));
-  connect(junction.port_1, senTEvaRet.port_b)
-    annotation (Line(points={{-130,-80},{-120,-80}}, color={0,127,255}));
-  connect(valHeaPumEva.port_2, pumEva.port_a) annotation (Line(points={{60,-60},
-          {40,-60},{40,-78},{8,-78}}, color={0,127,255}));
-  connect(junction.port_3, valHeaPumEva.port_3) annotation (Line(points={{-140,
-          -90},{-140,-100},{70,-100},{70,-70}}, color={0,127,255}));
-  connect(floEva.y, pumEva.y)
-    annotation (Line(points={{-58,120},{-2,120},{-2,-66}}, color={0,0,127}));
-  annotation (
-  defaultComponentName="heaPum",
-  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-32,40},{40,-38}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-18,-20},{28,-28}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-12,2},{-16,-6},{-8,-6},{-12,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-12,2},{-16,10},{-8,10},{-12,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{18,20},{22,-20}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{12,8},{30,-10}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{20,8},{12,-4},{30,-4},{20,8}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-14,-6},{-10,-20}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-14,20},{-10,10}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-20,28},{26,20}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}), Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-200,-140},{200,140}})),
-    Documentation(info="<html>
-<p>
-This model represents a water-to-water heat pump, as described in
-<a href=\"modelica://Buildings.Fluid.HeatPumps.Carnot_TCon\">
-Buildings.Fluid.HeatPumps.Carnot_TCon</a>, the condenser pump, and the
-evaporator side hydronics and control.
-
-<h4>Evaporator Controls</h4>
-<p>
-The system is enabled when the input control signal <code>uEna</code> switches to
-<code>true</code>.
-When enabled,
-</p>
-<ul>
-<li>
-the evaporator pump is commanded on and supplies the nominal mass flow rate,
-</li>
-<li>
-a three-way diverging valve is used to bypass flow through the evaporator and
-is controlled by a PI controller to maintain <code>dT_nominal</code> across
-the district supply and return flows.
-</li>
-</ul>
-</html>", revisions="<html>
-<ul>
-<li>
-February 15, 2024, by Ettore Zanetti:<br/>
-Made heat pump model dynamic and added junction.
-</li>
-<li>
-November 15, 2023, by David Blum:<br/>
-Changed to partial base class with evaporator hydronics and control.
-</li>
-<li>
-November 16, 2022, by Michael Wetter:<br/>
-Set <code>pumEva.dp_nominal</code> to correct value.
-</li>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PartialHeatPump;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.mo
deleted file mode 100644
index d0cac58d742..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/BaseClasses/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-package BaseClasses "Contains base classes for Subsystems"
-  extends Modelica.Icons.BasesPackage;
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains base class models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Borefield.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Borefield.mo
deleted file mode 100644
index 7200ea7df64..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Borefield.mo
+++ /dev/null
@@ -1,179 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model Borefield
-  "Base subsystem with geothermal borefield"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    final m_flow_nominal=datBorFie.conDat.mBorFie_flow_nominal);
-  replaceable model BoreFieldType=Fluid.Geothermal.Borefields.OneUTube
-    constrainedby Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield(
-      redeclare package Medium=Medium,
-      allowFlowReversal=allowFlowReversal,
-      borFieDat=datBorFie,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Wall heat transfer"
-    annotation (choicesAllMatching=true);
-  replaceable parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
-    conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example())
-    constrainedby Fluid.Geothermal.Borefields.Data.Borefield.Template(
-      conDat(
-        dp_nominal=0))
-    "Borefield parameters"
-    annotation (choicesAllMatching=true,Placement(transformation(extent={{0,60},{20,80}})));
-  parameter Modelica.Units.SI.Pressure dp_nominal(displayUnit="Pa")
-    "Pressure losses for the entire borefield (control valve excluded)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Pressure dpValBorFie_nominal=dp_nominal/2
-    "Nominal pressure drop of control valve";
-  parameter Modelica.Units.SI.Temperature TBorWatEntMax(displayUnit="degC")
-    "Maximum value of borefield water entering temperature";
-  parameter Real spePumBorMin=0.1
-    "Borefield pump minimum speed";
-  // IO VARIABLES
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
-    "Isolation valves return position (fractional)"
-    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
-    iconTransformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
-    "Control signal from supervisory"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
-    iconTransformation(extent={{-140,60},{-100,100}})));
-  // COMPONENTS
-  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear val(
-    redeclare final package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    from_dp=false,
-    use_inputFilter=false,
-    final m_flow_nominal=m_flow_nominal,
-    final dpValve_nominal=dpValBorFie_nominal,
-    final dpFixed_nominal=fill(
-      dp_nominal,
-      2))
-    "Mixing valve controlling entering temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-80,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=m_flow_nominal,
-    final dp_nominal=dpValBorFie_nominal+dp_nominal)
-    "Pump with prescribed mass flow rate"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-40,0})));
-  Fluid.Sensors.TemperatureTwoPort senTEnt(
-    final tau=
-      if allowFlowReversal then
-        1
-      else
-        0,
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal)
-    "Entering temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,0})));
-  BoreFieldType borFie
-    "Geothermal borefield"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={22,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction spl(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=m_flow_nominal .* {1,-1,-1})
-    "Flow splitter"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={80,0})));
-  Fluid.Sensors.TemperatureTwoPort senTLvg(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal)
-    "Leaving temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={50,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Borefield con(
-    final TBorWatEntMax=TBorWatEntMax,
-    final spePumBorMin=spePumBorMin)
-    "Controller"
-    annotation (Placement(transformation(extent={{-80,64},{-60,84}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
-    final unit="W")
-    "Pump power"
-    annotation (Placement(transformation(extent={{100,20},{140,60}}),iconTransformation(extent={{100,20},{140,60}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
-        m_flow_nominal) "Scale to nominal mass flow rate" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-40,50})));
-initial equation
-  assert(
-    abs(
-      datBorFie.conDat.dp_nominal) < Modelica.Constants.eps,
-    "In "+getInstanceName()+": dp_nominal in the parameter record should be set to zero as the nominal
-    pressure drop is lumped in the valve model. Use the exposed parameter
-    dp_nominal instead.",
-    level=AssertionLevel.warning);
-equation
-  connect(pum.port_b,senTEnt.port_a)
-    annotation (Line(points={{-30,0},{-20,0}},color={0,127,255}));
-  connect(senTEnt.port_b,borFie.port_a)
-    annotation (Line(points={{0,0},{12,0}},color={0,127,255}));
-  connect(port_b,spl.port_2)
-    annotation (Line(points={{100,0},{90,0}},color={0,127,255}));
-  connect(spl.port_1,senTLvg.port_b)
-    annotation (Line(points={{70,0},{60,0}},color={0,127,255}));
-  connect(borFie.port_b,senTLvg.port_a)
-    annotation (Line(points={{32,0},{40,0}},color={0,127,255}));
-  connect(spl.port_3,val.port_3)
-    annotation (Line(points={{80,-10},{80,-40},{-80,-40},{-80,-10}},color={0,127,255}));
-  connect(u,con.u)
-    annotation (Line(points={{-120,80},{-82,80}},color={0,0,127}));
-  connect(yValIso_actual,con.yValIso_actual)
-    annotation (Line(points={{-120,40},{-90,40},{-90,74},{-82,74}},color={0,0,127}));
-  connect(con.yValMix,val.y)
-    annotation (Line(points={{-58,68},{-56,68},{-56,60},{-80,60},{-80,12}},color={0,0,127}));
-  connect(port_a,val.port_1)
-    annotation (Line(points={{-100,0},{-90,0}},color={0,127,255}));
-  connect(val.port_2,pum.port_a)
-    annotation (Line(points={{-70,0},{-50,0}},color={0,127,255}));
-  connect(senTEnt.T,con.TBorWatEnt)
-    annotation (Line(points={{-10,11},{-10,30},{-86,30},{-86,68},{-82,68}},color={0,0,127}));
-  connect(pum.P,PPum)
-    annotation (Line(points={{-29,9},{-20,9},{-20,40},{120,40}},color={0,0,127}));
-  connect(con.yPum,gai1.u)
-    annotation (Line(points={{-58,80},{-40,80},{-40,62}},color={0,0,127}));
-  connect(gai1.y,pum.m_flow_in)
-    annotation (Line(points={{-40,38},{-40,12}},color={0,0,127}));
-  annotation (
-    defaultComponentName="borFie",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false),
-      graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,60},{60,-60}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid)}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Documentation(
-      info="<html>
-<p>
-This is a model for a borefield system with a variable speed pump
-and a mixing valve modulated to maintain a maximum inlet temperature.
-</p>
-<p>
-The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Borefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Borefield</a>.
-The pump flow rate is considered proportional to the pump speed
-under the assumption of a constant flow resistance in the borefield loop.
-This assumption is justified by the connection of the loop to the buffer tanks,
-and by the additional assumption that the bypass branch of the mixing valve
-is balanced with the direct branch.
-</p>
-<p>
-(The parameter <code>from_dp</code> of the valve model is set to false to
-simplify the system of algebraic equations, which, in this specific case,
-alleviates non-convergence issues.)
-</p>
-</html>"));
-end Borefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Chiller.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Chiller.mo
deleted file mode 100644
index 580e71b1ff2..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Chiller.mo
+++ /dev/null
@@ -1,346 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model Chiller
-  "Base subsystem with heat recovery chiller"
-  replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
-    "Medium model"
-    annotation (choices(choice(redeclare package Medium=Buildings.Media.Water "Water"),
-    choice(redeclare package Medium =
-            Buildings.Media.Antifreeze.PropyleneGlycolWater (property_T=293.15,X_a=0.40)
-    "Propylene glycol water, 40% mass fraction")));
-  parameter Boolean allowFlowReversal=false
-    "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
-    annotation (Dialog(tab="Assumptions"),Evaluate=true);
-  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.Generic dat
-    "Chiller performance data"
-    annotation (choicesAllMatching=true,Placement(transformation(extent={{60,160},{80,180}})));
-  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
-    "Nominal pressure drop accross condenser"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
-    "Nominal pressure drop accross evaporator"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Pressure dpValCon_nominal=dpCon_nominal/2
-    "Nominal pressure drop accross control valve on condenser side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Pressure dpValEva_nominal=dpEva_nominal/2
-    "Nominal pressure drop accross control valve on evaporator side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TConWatEntMin(displayUnit="degC")=
-    dat.TConEntMin "Minimum value of condenser water entering temperature"
-    annotation (Dialog(group="Controls"));
-  parameter Modelica.Units.SI.Temperature TEvaWatEntMax(displayUnit="degC")=
-    dat.TEvaLvgMax - dat.QEva_flow_nominal/cp_default/dat.mEva_flow_nominal
-    "Maximum value of evaporator water entering temperature"
-    annotation (Dialog(group="Controls"));
-  // IO CONNECTORS
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uHea
-    "Heating enable signal"
-    annotation (Placement(transformation(extent={{-240,168},{-200,208}}),
-    iconTransformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-240,148},{-200,188}}),
-    iconTransformation(extent={{-140,0},{-100,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "Chilled water supply temperature set point (may be reset down)"
-    annotation (Placement(transformation(extent={{-240,120},{-200,160}}),
-    iconTransformation(extent={{-140,-40},{-100,0}})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_aChiWat(
-    redeclare final package Medium=Medium,
-    m_flow(
-      min=
-        if allowFlowReversal then
-          -Modelica.Constants.inf
-        else
-          0),
-    h_outflow(
-      start=Medium.h_default,
-      nominal=Medium.h_default))
-    "Fluid port for chilled water return"
-    annotation (Placement(transformation(extent={{190,-70},{210,-50}}),
-    iconTransformation(extent={{90,-70},{110,-50}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_bChiWat(
-    redeclare final package Medium=Medium,
-    m_flow(
-      max=
-        if allowFlowReversal then
-          +Modelica.Constants.inf
-        else
-          0),
-    h_outflow(
-      start=Medium.h_default,
-      nominal=Medium.h_default))
-    "Fluid port for chilled water supply"
-    annotation (Placement(transformation(extent={{190,50},{210,70}}),
-    iconTransformation(extent={{90,50},{110,70}})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_aHeaWat(
-    redeclare final package Medium=Medium,
-    m_flow(
-      min=
-        if allowFlowReversal then
-          -Modelica.Constants.inf
-        else
-          0),
-    h_outflow(
-      start=Medium.h_default,
-      nominal=Medium.h_default))
-    "Fluid port for heating water return"
-    annotation (Placement(transformation(extent={{-210,-70},{-190,-50}}),
-    iconTransformation(extent={{-110,-70},{-90,-50}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_bHeaWat(
-    redeclare final package Medium=Medium,
-    m_flow(
-      max=
-        if allowFlowReversal then
-          +Modelica.Constants.inf
-        else
-          0),
-    h_outflow(
-      start=Medium.h_default,
-      nominal=Medium.h_default))
-    "Fluid port for heating water supply"
-    annotation (Placement(transformation(extent={{-210,50},{-190,70}}),
-    iconTransformation(extent={{-110,50},{-90,70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PChi(
-    final unit="W")
-    "Chiller power"
-    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
-    iconTransformation(extent={{100,0},{140,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
-    final unit="W")
-    "Pump power"
-    annotation (Placement(transformation(extent={{200,-160},{240,-120}}),
-    iconTransformation(extent={{100,-40},{140,0}})));
-  // COMPONENTS
-  Fluid.Chillers.ElectricEIR chi(
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=Medium,
-    final allowFlowReversal1=allowFlowReversal,
-    final allowFlowReversal2=allowFlowReversal,
-    final dp1_nominal=0,
-    final dp2_nominal=0,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    final per=dat)
-    "Water cooled chiller (ports indexed 1 are on condenser side)"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumCon(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=dat.mCon_flow_nominal,
-    final dp_nominal=dpCon_nominal+dpValCon_nominal)
-    "Condenser pump"
-    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pumEva(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=dat.mEva_flow_nominal,
-    final dp_nominal=dpEva_nominal+dpValEva_nominal)
-    "Evaporator pump"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-100,-60})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Chiller con(
-    final TConWatEntMin=TConWatEntMin,
-    final TEvaWatEntMax=TEvaWatEntMax)
-    "Controller"
-    annotation (Placement(transformation(extent={{-70,130},{-50,150}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTConLvg(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=dat.mCon_flow_nominal)
-    "Condenser water leaving temperature"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=270,origin={20,20})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTConEnt(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=dat.mCon_flow_nominal)
-    "Condenser water entering temperature"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=-90,origin={-20,40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTEvaEnt(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=dat.mEva_flow_nominal)
-    "Evaporator water entering temperature"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=270,origin={20,-40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTEvaLvg(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=dat.mEva_flow_nominal)
-    "Evaporator water leaving temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=90,origin={-20,-20})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splEva(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=dat.mEva_flow_nominal .* {1,-1,-1})
-    "Flow splitter for the evaporator water circuit"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-140,-60})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splConMix(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=dat.mCon_flow_nominal .* {1,-1,-1})
-    "Flow splitter"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=0,origin={120,60})));
-  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valEva(
-    redeclare final package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    from_dp=false,
-    use_inputFilter=false,
-    final m_flow_nominal=dat.mEva_flow_nominal,
-    final dpValve_nominal=dpValEva_nominal,
-    final dpFixed_nominal=fill(
-      dpEva_nominal,
-      2))
-    "Control valve for maximum evaporator water entering temperature"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=180,origin={120,-60})));
-  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valCon(
-    redeclare final package Medium=Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    from_dp=false,
-    use_inputFilter=false,
-    final m_flow_nominal=dat.mCon_flow_nominal,
-    final dpValve_nominal=dpValCon_nominal,
-    final dpFixed_nominal=fill(
-      dpCon_nominal,
-      2))
-    "Control valve for minimum condenser water entering temperature"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},rotation=0,origin={-140,60})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
-    "Constant speed primary pumps control signal"
-    annotation (Placement(transformation(extent={{-60,170},{-80,190}})));
-  Buildings.Controls.OBC.CDL.Reals.Add add2
-    annotation (Placement(transformation(extent={{160,-150},{180,-130}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=dat.mCon_flow_nominal)
-    "Scale to nominal mass flow rate" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-100,114})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=dat.mEva_flow_nominal)
-    "Scale to nominal mass flow rate" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-100,-22})));
-protected
-  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-    T=Medium.T_default,
-    p=Medium.p_default,
-    X=Medium.X_default[1:Medium.nXi])
-    "Medium state at default properties";
-  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
-      Medium.specificHeatCapacityCp(sta_default)
-    "Specific heat capacity of the fluid";
-equation
-  connect(splConMix.port_3,valCon.port_3)
-    annotation (Line(points={{120,70},{120,80},{-140,80},{-140,70}},color={0,127,255}));
-  connect(valCon.port_2,pumCon.port_a)
-    annotation (Line(points={{-130,60},{-110,60}},color={0,127,255}));
-  connect(pumEva.port_b,splEva.port_1)
-    annotation (Line(points={{-110,-60},{-130,-60}},color={0,127,255}));
-  connect(splEva.port_3,valEva.port_3)
-    annotation (Line(points={{-140,-70},{-140,-80},{120,-80},{120,-70}},color={0,127,255}));
-  connect(con.yValEva,valEva.y)
-    annotation (Line(points={{-48,137},{-32,137},{-32,120},{160,120},{160,-40},{
-          120,-40},{120,-48}},                                                                      color={0,0,127}));
-  connect(con.yValCon,valCon.y)
-    annotation (Line(points={{-48,133},{-44,133},{-44,90},{-160,90},{-160,40},{-140,
-          40},{-140,48}},                                                                          color={0,0,127}));
-  connect(con.yChi,chi.on)
-    annotation (Line(points={{-48,146},{-36,146},{-36,3},{-12,3}},color={255,0,255}));
-  connect(uHea,con.uHea)
-    annotation (Line(points={{-220,188},{-180,188},{-180,147},{-72,147}},color={255,0,255}));
-  connect(uCoo,con.uCoo)
-    annotation (Line(points={{-220,168},{-186,168},{-186,143},{-72,143}},color={255,0,255}));
-  connect(senTConEnt.T,con.TConWatEnt)
-    annotation (Line(points={{-31,40},{-78,40},{-78,133},{-72,133}},color={0,0,127}));
-  connect(senTEvaEnt.T,con.TEvaWatEnt)
-    annotation (Line(points={{9,-40},{-80,-40},{-80,137},{-72,137}},color={0,0,127}));
-  connect(splConMix.port_2,port_bHeaWat)
-    annotation (Line(points={{130,60},{140,60},{140,100},{-180,100},{-180,60},{-200,60}},color={0,127,255}));
-  connect(splEva.port_2,port_bChiWat)
-    annotation (Line(points={{-150,-60},{-160,-60},{-160,-100},{180,-100},{180,60},{200,60}},color={0,127,255}));
-  connect(port_aHeaWat,valCon.port_1)
-    annotation (Line(points={{-200,-60},{-170,-60},{-170,60},{-150,60}},color={0,127,255}));
-  connect(port_aChiWat,valEva.port_1)
-    annotation (Line(points={{200,-60},{130,-60}},color={0,127,255}));
-  connect(valEva.port_2,senTEvaEnt.port_a)
-    annotation (Line(points={{110,-60},{20,-60},{20,-50}},color={0,127,255}));
-  connect(senTEvaLvg.port_b,pumEva.port_a)
-    annotation (Line(points={{-20,-30},{-20,-60},{-90,-60}},color={0,127,255}));
-  connect(senTEvaLvg.port_a,chi.port_b2)
-    annotation (Line(points={{-20,-10},{-20,-6},{-10,-6}},color={0,127,255}));
-  connect(senTEvaEnt.port_b,chi.port_a2)
-    annotation (Line(points={{20,-30},{20,-6},{10,-6}},color={0,127,255}));
-  connect(chi.port_b1,senTConLvg.port_a)
-    annotation (Line(points={{10,6},{20,6},{20,10}},color={0,127,255}));
-  connect(senTConLvg.port_b,splConMix.port_1)
-    annotation (Line(points={{20,30},{20,60},{110,60}},color={0,127,255}));
-  connect(pumCon.port_b,senTConEnt.port_a)
-    annotation (Line(points={{-90,60},{-20,60},{-20,50}},color={0,127,255}));
-  connect(senTConEnt.port_b,chi.port_a1)
-    annotation (Line(points={{-20,30},{-20,6},{-10,6}},color={0,127,255}));
-  connect(chi.P,PChi)
-    annotation (Line(points={{11,9},{14,9},{14,0},{220,0}},color={0,0,127}));
-  connect(add2.y,PPum)
-    annotation (Line(points={{182,-140},{220,-140}},color={0,0,127}));
-  connect(pumEva.P,add2.u2)
-    annotation (Line(points={{-111,-51},{-120,-51},{-120,-140},{140,-140},{140,-146},{158,-146}},color={0,0,127}));
-  connect(pumCon.P,add2.u1)
-    annotation (Line(points={{-89,69},{-60,69},{-60,-134},{158,-134}},color={0,0,127}));
-  connect(con.yChi,booToRea.u)
-    annotation (Line(points={{-48,146},{-36,146},{-36,180},{-58,180}},color={255,0,255}));
-  connect(booToRea.y,gai2.u)
-    annotation (Line(points={{-82,180},{-120,180},{-120,0},{-100,0},{-100,-10}},color={0,0,127}));
-  connect(gai2.y,pumEva.m_flow_in)
-    annotation (Line(points={{-100,-34},{-100,-48}},color={0,0,127}));
-  connect(gai1.y,pumCon.m_flow_in)
-    annotation (Line(points={{-100,102},{-100,72}},color={0,0,127}));
-  connect(booToRea.y,gai1.u)
-    annotation (Line(points={{-82,180},{-100,180},{-100,126}},color={0,0,127}));
-  connect(TChiWatSupSet,chi.TSet)
-    annotation (Line(points={{-220,140},{-188,140},{-188,-3},{-12,-3}},color={0,0,127}));
-  annotation (
-    defaultComponentName="chi",
-    Icon(
-      graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,60},{60,-60}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-149,-110},{151,-150}},
-          textColor={0,0,255},
-          textString="%name")}),
-    Diagram(
-      coordinateSystem(
-        extent={{-200,-200},{200,200}})),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This is a model for a chiller system with constant speed evaporator and
-condenser pumps, and mixing valves modulated to maintain a minimum
-condenser inlet temperature (resp. maximum evaporator inlet temperature).
-</p>
-<p>
-The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Chiller\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.Chiller</a>.
-The pump flow rate is considered proportional to the pump speed
-under the assumption of a constant flow resistance for both the condenser
-and the evaporator loops. This assumption is justified
-by the connection of the loops to the buffer tanks, and the additional
-assumption that the bypass branch of the mixing valves is balanced
-with the direct branch.
-</p>
-</html>"));
-end Chiller;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatExchanger.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatExchanger.mo
deleted file mode 100644
index 112eddc92f2..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatExchanger.mo
+++ /dev/null
@@ -1,275 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model HeatExchanger
-  "Base subsystem with district heat exchanger"
-  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
-    final m1_flow_nominal=abs(Q_flow_nominal/4200/(T_b1_nominal - T_a1_nominal)),
-    final m2_flow_nominal=abs(Q_flow_nominal/4200/(T_b2_nominal - T_a2_nominal)));
-  parameter DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon
-    "District connection configuration" annotation (Evaluate=true);
-  parameter Modelica.Units.SI.PressureDifference dp1Hex_nominal(displayUnit=
-        "Pa") "Nominal pressure drop across heat exchanger on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp2Hex_nominal(displayUnit=
-        "Pa") "Nominal pressure drop across heat exchanger on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpVal1_nominal(displayUnit=
-        "Pa") = dp1Hex_nominal/2
-    "Nominal pressure drop of primary control valve"
-    annotation (Dialog(enable=have_val1, group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpVal2_nominal(displayUnit=
-        "Pa") = dp2Hex_nominal/2
-    "Nominal pressure drop of secondary control valve"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
-    "Nominal heat flow rate (from district to building)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_a1_nominal
-    "Nominal water inlet temperature on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_b1_nominal
-    "Nominal water outlet temperature on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_a2_nominal
-    "Nominal water inlet temperature on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_b2_nominal
-    "Nominal water outlet temperature on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Real spePum1Min(unit="1")=0.1
-    "Heat exchanger primary pump minimum speed (fractional)"
-    annotation (Dialog(group="Controls",enable=not have_val1));
-  parameter Real spePum2Min(unit="1")=0.1
-    "Heat exchanger secondary pump minimum speed (fractional)"
-    annotation (Dialog(group="Controls"));
-  // IO CONNECTORS
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIso_actual[2]
-    "Isolation valves return position (index 1 for condenser)"
-    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
-    iconTransformation(extent={{-140,-40},{-100,0}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
-    "Control signal for secondary side (from supervisory)"
-    annotation (Placement(transformation(extent={{-140,120},{-100,160}}),
-    iconTransformation(extent={{-140,0},{-100,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
-    final unit="W")
-    "Power drawn by pump motors"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
-    iconTransformation(extent={{100,-20},{140,20}})));
-  // COMPONENTS
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.HeatExchanger con(
-    final conCon=conCon,
-    final spePum1Min=spePum1Min,
-    final spePum2Min=spePum2Min)
-    "District heat exchanger loop controller"
-    annotation (Placement(transformation(extent={{-70,150},{-50,170}})));
-  Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU hex(
-    redeclare final package Medium1 = Medium1,
-    redeclare final package Medium2 = Medium2,
-    final use_Q_flow_nominal=true,
-    configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow,
-    final allowFlowReversal1=allowFlowReversal1,
-    final allowFlowReversal2=allowFlowReversal2,
-    final dp1_nominal=if have_val1 then 0 else dp1Hex_nominal,
-    final dp2_nominal=0,
-    final m1_flow_nominal=m1_flow_nominal,
-    final m2_flow_nominal=m2_flow_nominal,
-    final Q_flow_nominal=Q_flow_nominal,
-    final T_a1_nominal=T_a1_nominal,
-    final T_a2_nominal=T_a2_nominal)
-    "Heat exchanger" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=180,
-        origin={0,0})));
-
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1(
-    redeclare final package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final dp_nominal=dp1Hex_nominal,
-    final allowFlowReversal=allowFlowReversal1) if not have_val1
-    "District heat exchanger primary pump" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=180,
-        origin={-60,80})));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum2(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final dp_nominal=dp2Hex_nominal + dpVal2_nominal,
-    final allowFlowReversal=allowFlowReversal2)
-    "Secondary pump" annotation (
-      Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=180,
-        origin={40,-60})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatEnt(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final allowFlowReversal=allowFlowReversal2)
-    "Heat exchanger secondary water entering temperature" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={20,-40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatLvg(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final allowFlowReversal=allowFlowReversal2)
-    "Heat exchanger secondary water leaving temperature" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-20,-20})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=
-        m2_flow_nominal) "Scale to nominal mass flow rate" annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={40,118})));
-  Fluid.Actuators.Valves.TwoWayPressureIndependent val1(
-    redeclare final package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    from_dp=true,
-    final dpValve_nominal=dpVal1_nominal,
-    use_inputFilter=false,
-    final dpFixed_nominal=dp1Hex_nominal) if have_val1
-    "Heat exchanger primary control valve"
-    annotation (Placement(transformation(extent={{70,70},{90,90}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
-        m1_flow_nominal) if not have_val1 "Scale to nominal mass flow rate"
-    annotation (Placement(transformation(extent={{-12,110},{-32,130}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiSum totPPum(
-    final nin=
-      if have_val1 then
-        1
-      else
-        2)
-    "Total pump power"
-    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
-  Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear val2(
-    redeclare final package Medium = Medium2,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    from_dp=false,
-    use_inputFilter=false,
-    final m_flow_nominal=m2_flow_nominal,
-    final dpValve_nominal=dpVal2_nominal,
-    final dpFixed_nominal=fill(dp2Hex_nominal, 2))
-    "Control valve" annotation (
-      Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={80,-60})));
-  DHC.EnergyTransferStations.BaseClasses.Junction spl(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal .* {1,-1,-1})
-    "Flow splitter" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-60,-60})));
-protected
-  parameter Boolean have_val1=
-    conCon == DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
-    "True in case of control valve on district side, false in case of a pump";
-equation
-  if have_val1 then
-    connect(port_a1, hex.port_a1)
-      annotation (Line(points={{-100,60},{-20,60},{-20,6},{-10,6}}, color={0,127,255}));
-  else
-    connect(hex.port_b1, port_b1)
-      annotation (Line(points={{10,6},{20,6},{20,60},{100,60}}, color={0,127,255}));
-  end if;
-  connect(gai2.y,pum2.m_flow_in)
-    annotation (Line(points={{40,106},{40,-48}},color={0,0,127}));
-  connect(port_a1,pum1.port_a)
-    annotation (Line(points={{-100,60},{-90,60},{-90,80},{-70,80}},color={0,127,255}));
-  connect(val1.port_b,port_b1)
-    annotation (Line(points={{90,80},{94,80},{94,60},{100,60}},color={0,127,255}));
-  connect(pum2.port_b,senT2WatEnt.port_a)
-    annotation (Line(points={{30,-60},{20,-60},{20,-50}},color={0,127,255}));
-  connect(senT2WatEnt.port_b,hex.port_a2)
-    annotation (Line(points={{20,-30},{20,-6},{10,-6}},color={0,127,255}));
-  connect(con.y1, val1.y)
-    annotation (Line(points={{-48,166},{80,166},{80,92}}, color={0,0,127}));
-  connect(con.y1, gai1.u) annotation (Line(points={{-48,166},{0,166},{0,120},{-10,
-          120}}, color={0,0,127}));
-  connect(gai1.y,pum1.m_flow_in)
-    annotation (Line(points={{-34,120},{-60,120},{-60,92}},color={0,0,127}));
-  connect(pum1.P,totPPum.u[2])
-    annotation (Line(points={{-49,89},{60,89},{60,0},{68,0}},color={0,0,127}));
-  connect(pum2.P,totPPum.u[1])
-    annotation (Line(points={{29,-51},{28,-51},{28,0},{68,0}},color={0,0,127}));
-  connect(totPPum.y,PPum)
-    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
-  connect(yValIso_actual,con.yValIso)
-    annotation (Line(points={{-120,100},{-92,100},{-92,155},{-72,155}},color={0,0,127}));
-  connect(con.yPum2,gai2.u)
-    annotation (Line(points={{-48,160},{40,160},{40,130}},color={0,0,127}));
-  connect(u,con.u)
-    annotation (Line(points={{-120,140},{-96,140},{-96,165},{-72,165}},color={0,0,127}));
-  connect(hex.port_b2,senT2WatLvg.port_a)
-    annotation (Line(points={{-10,-6},{-20,-6},{-20,-10}},color={0,127,255}));
-  connect(val2.port_2,pum2.port_a)
-    annotation (Line(points={{70,-60},{50,-60}},color={0,127,255}));
-  connect(port_a2,val2.port_1)
-    annotation (Line(points={{100,-60},{90,-60}},color={0,127,255}));
-  connect(spl.port_1,senT2WatLvg.port_b)
-    annotation (Line(points={{-50,-60},{-20,-60},{-20,-30}},color={0,127,255}));
-  connect(spl.port_2,port_b2)
-    annotation (Line(points={{-70,-60},{-100,-60}},color={0,127,255}));
-  connect(spl.port_3,val2.port_3)
-    annotation (Line(points={{-60,-70},{-60,-80},{80,-80},{80,-70}},color={0,127,255}));
-  connect(con.yVal2,val2.y)
-    annotation (Line(points={{-48,154},{64,154},{64,-40},{80,-40},{80,-48}},color={0,0,127}));
-  connect(hex.port_b1, val1.port_a) annotation (Line(points={{10,6},{20,6},{20,80},{70,80}}, color={0,127,255}));
-  connect(pum1.port_b, hex.port_a1) annotation (Line(points={{-50,80},{-20,80},{-20,6},{-10,6}}, color={0,127,255}));
-  annotation (
-    defaultComponentName="hex",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}}),
-      graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,60},{60,-60}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid)}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-160},{100,180}})),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 14, 2021, by Antoine Gautier:<br/>
-Refactored after updating the control logic, changed the primary control valve to pressure-independent.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2561\">issue #2561</a>.
-</li>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This is a model for a district heat exchanger system with a variable speed
-pump on the secondary side, and a variable speed pump (in case of a passive
-network) or a two-way modulating valve (in case of an active network)
-on the primary side.
-</p>
-<p>
-The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.HeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.HeatExchanger</a>.
-The pump flow rate is considered proportional to the pump speed
-under the assumption of a constant flow resistance in both the primary and
-the secondary loops.
-</p>
-</html>"));
-end HeatExchanger;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPump.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPump.mo
deleted file mode 100644
index 277377ea6ee..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPump.mo
+++ /dev/null
@@ -1,168 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model HeatPump "Base subsystem with water-to-water heat pump"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump(
-        heaPum(QCon_flow_nominal=Q1_flow_nominal));
-  parameter Boolean have_varFloCon = true
-    "Set to true for a variable condenser flow"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.HeatFlowRate Q1_flow_nominal(min=0)
-    "Heating heat flow rate" annotation (Dialog(group="Nominal condition"));
-  // IO CONNECTORS
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "Supply temperature set point"
-    annotation (Placement(transformation(extent={{-240,-40},{-200,0}}),
-      iconTransformation(extent={{-140,10},{-100,50}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput m1_flow(
-    final unit="kg/s") if have_varFloCon
-    "Condenser mass flow rate"
-    annotation (Placement(transformation(extent={{-240,60},{-200,100}}),
-      iconTransformation(extent={{-140,-20},{-100,20}})));
-  // COMPONENTS
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant floConNom(
-    final k=mCon_flow_nominal) if not have_varFloCon
-    "Nominal flow rate"
-    annotation (Placement(transformation(extent={{-178,80},{-158,100}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
-    annotation (Placement(transformation(extent={{-180,110},{-160,130}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply floCon
-    "Zero flow rate if not enabled"
-    annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
-equation
-  connect(booToRea.y, floCon.u1) annotation (Line(points={{-158,120},{-140,120},
-          {-140,106},{-122,106}}, color={0,0,127}));
-  connect(m1_flow, floCon.u2) annotation (Line(points={{-220,80},{-188,80},{
-          -188,70},{-140,70},{-140,94},{-122,94}},
-                            color={0,0,127}));
-  connect(floConNom.y, floCon.u2) annotation (Line(points={{-156,90},{-140,90},
-          {-140,94},{-122,94}},  color={0,0,127}));
-  connect(port_a1, heaPum.port_a1) annotation (Line(points={{-200,60},{-100,60},
-          {-100,-66},{-80,-66}},      color={0,127,255}));
-  connect(pumCon.port_b, port_b1) annotation (Line(points={{-26,10},{-26,60},{
-          200,60}},            color={0,127,255}));
-  connect(TSupSet, heaPum.TSet) annotation (Line(points={{-220,-20},{-90,-20},{
-          -90,-63},{-82,-63}},   color={0,0,127}));
-  connect(floCon.y, pumCon.m_flow_in)
-    annotation (Line(points={{-98,100},{12,100},{12,0},{-14,0},{-14,
-          -2.22045e-15}},                                   color={0,0,127}));
-  connect(conPI.trigger, floEva.u) annotation (Line(points={{124,8},{124,-2},{
-          110,-2},{110,136},{-90,136},{-90,120},{-82,120}},
-                                                          color={255,0,255}));
-  connect(addPPum.y, PPum) annotation (Line(points={{161,80},{174,80},{174,0},{
-          220,0}}, color={0,0,127}));
-  connect(uEna, booToRea.u)
-    annotation (Line(points={{-220,120},{-182,120}}, color={255,0,255}));
-  connect(uEna, floEva.u) annotation (Line(points={{-220,120},{-190,120},{-190,
-          136},{-90,136},{-90,120},{-82,120}}, color={255,0,255}));
-  annotation (
-  defaultComponentName="heaPum",
-  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{92,-58},{18,-60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{18,-38},{20,-60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-14,-38},{-12,-60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,42},{1,-42}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          origin={-54,-59},
-          rotation=90),
-        Rectangle(
-          extent={{-14,62},{-12,40}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{18,62},{20,40}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,42},{1,-42}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid,
-          origin={-54,61},
-          rotation=90),
-        Rectangle(
-          extent={{92,62},{18,60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid)}), Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-200,-140},{200,140}})),
-    Documentation(info="<html>
-<p>
-This model represents a water-to-water heat pump, an evaporator water pump,
-and a condenser water pump.
-The heat pump model is described in
-<a href=\"modelica://Buildings.Fluid.HeatPumps.Carnot_TCon\">
-Buildings.Fluid.HeatPumps.Carnot_TCon</a>.
-By default, a variable speed condenser pump is considered, but a constant speed
-pump may also be represented by setting <code>have_varFloCon</code> to <code>false</code>.
-The evaporator hydronics and control are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
-</p>
-<h4>Condenser Controls</h4>
-<p>
-The system is enabled when the input control signal <code>uEna</code> switches to
-<code>true</code>.
-When enabled, on the condenser side,
-</p>
-<ul>
-<li>
-the condenser water pumps are commanded on and supply either
-the condenser mass flow rate set point provided as an input in the case of the variable speed condenser pump,
-or the nominal mass flow rate in the case of the constant speed condenser pump,
-</li>
-<li>
-the heat pump controller—idealized in this model—tracks the
-supply temperature set point at the condenser outlet.
-</li>
-</ul>
-</html>", revisions="<html>
-<ul>
-<li>
-November 15, 2023, by David Blum:<br/>
-Changed to extend partial base class with added condenser hydronics and control.
-</li>
-<li>
-May 3, 2023, by David Blum:<br/>
-Assigned <code>dp_nominal</code> to condenser pump.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
-issue 3379</a>.
-</li>
-<li>
-November 16, 2022, by Michael Wetter:<br/>
-Set <code>pumEva.dp_nominal</code> to correct value.
-</li>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end HeatPump;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.mo
deleted file mode 100644
index 151bfc3d62e..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.mo
+++ /dev/null
@@ -1,381 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model HeatPumpDHWTank
-  "Base subsystem with water-to-water heat pump with storage tank for domestic hot water"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump(
-      heaPum(
-        QCon_flow_nominal=QHotWat_flow_nominal,
-        QCon_flow_max=QHotWat_flow_nominal));
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
-    datWatHea "Performance data"
-    annotation (Placement(transformation(extent={{140,100},{160,120}})));
-  parameter Modelica.Units.SI.HeatFlowRate QHotWat_flow_nominal(min=0)
-    "Nominal capacity of heat pump condenser for hot water production system (>=0)"
-    annotation (Dialog(group="Nominal condition"));
-  // IO CONNECTORS
-  // COMPONENTS
-
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal floCon(realTrue=
-        mCon_flow_nominal) "Condenser mass flow rate"
-    annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
-  Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger heaPumTan(
-    redeclare package MediumDom = Medium1,
-    redeclare package MediumHea = Medium2,                      final dat=
-        datWatHea)
-    "Heat pump with storage tank for domestic hot water"
-    annotation (Placement(transformation(extent={{-80,10},{-60,30}})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THotSouSet(k=datWatHea.TDom_nominal)
-    "Set point of water in hot water tank"
-    annotation (Placement(transformation(extent={{-180,10},{-160,30}})));
-  Buildings.Fluid.Sources.Boundary_pT preRef(
-    redeclare package Medium = Medium2,
-    p(displayUnit="bar"),
-    nPorts=1) "Reference pressure for loop" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-60,-20})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTemHeaPumRet(
-    redeclare package Medium = Medium1,
-    m_flow_nominal=mCon_flow_nominal,
-    tau=0)
-    annotation (Placement(transformation(extent={{-140,-60},{-120,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter
-                                      addPar(p=dT_nominal)
-                                                  "dT for heater"
-    annotation (Placement(transformation(extent={{-120,-40},{-100,-20}})));
-  Modelica.Blocks.Math.Add addPPum1
-                                   "Electricity use for pumps"
-    annotation (Placement(transformation(extent={{170,-8},{190,12}})));
-  Buildings.Controls.OBC.CDL.Logical.And and2
-    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
-equation
-  connect(THotSouSet.y, heaPumTan.TDomSet) annotation (Line(points={{-158,20},{
-          -81,20}},                color={0,0,127}));
-  connect(preRef.ports[1], heaPumTan.port_bHea) annotation (Line(points={{-70,-20},
-          {-92,-20},{-92,14},{-80,14}}, color={0,127,255}));
-  connect(heaPumTan.port_bHea, senTemHeaPumRet.port_a) annotation (Line(points={{-80,14},
-          {-120,14},{-120,0},{-140,0},{-140,-50}},          color={0,127,255}));
-  connect(senTemHeaPumRet.T, addPar.u) annotation (Line(points={{-130,-39},{
-          -130,-30},{-122,-30}},
-                            color={0,0,127}));
-  connect(floCon.y, pumCon.m_flow_in)
-    annotation (Line(points={{-58,90},{-4,90},{-4,0},{-14,0},{-14,-3.55271e-15}},
-                                                            color={0,0,127}));
-  connect(heaPumTan.port_aHea, pumCon.port_b)
-    annotation (Line(points={{-60,14},{-26,14},{-26,10}},
-                                                 color={0,127,255}));
-  connect(senTemHeaPumRet.port_b, heaPum.port_a1)
-    annotation (Line(points={{-120,-50},{-100,-50},{-100,-66},{-80,-66}},
-                                                    color={0,127,255}));
-  connect(addPPum.y, addPPum1.u1)
-    annotation (Line(points={{161,80},{168,80},{168,8}}, color={0,0,127}));
-  connect(heaPumTan.PEle, addPPum1.u2) annotation (Line(points={{-59,20},{-50,
-          20},{-50,56},{164,56},{164,-4},{168,-4}}, color={0,0,127}));
-  connect(addPPum1.y, PPum)
-    annotation (Line(points={{191,2},{191,0},{220,0}}, color={0,0,127}));
-  connect(addPar.y, heaPum.TSet) annotation (Line(points={{-98,-30},{-92,-30},{
-          -92,-63},{-82,-63}}, color={0,0,127}));
-  connect(heaPumTan.port_bDom, port_b1) annotation (Line(points={{-60,26},{-54,
-          26},{-54,60},{200,60}},  color={0,127,255}));
-  connect(port_a1, heaPumTan.port_aDom) annotation (Line(points={{-200,60},{
-          -120,60},{-120,26},{-80,26}},  color={0,127,255}));
-  connect(uEna, and2.u1)
-    annotation (Line(points={{-220,120},{-142,120}}, color={255,0,255}));
-  connect(heaPumTan.charge, and2.u2) annotation (Line(points={{-58,11},{-56,11},
-          {-56,12},{-54,12},{-54,0},{-100,0},{-100,80},{-160,80},{-160,112},{
-          -142,112}}, color={255,0,255}));
-  connect(and2.y, floEva.u)
-    annotation (Line(points={{-118,120},{-82,120}}, color={255,0,255}));
-  connect(and2.y, floCon.u) annotation (Line(points={{-118,120},{-100,120},{
-          -100,90},{-82,90}}, color={255,0,255}));
-  connect(and2.y, conPI.trigger) annotation (Line(points={{-118,120},{-100,120},
-          {-100,106},{110,106},{110,0},{124,0},{124,8}}, color={255,0,255}));
-  annotation (
-  defaultComponentName="heaPum",
-  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-12,0},{60,-78}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{2,-60},{48,-68}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{8,-38},{4,-46},{12,-46},{8,-38}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{8,-38},{4,-30},{12,-30},{8,-38}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{38,-20},{42,-60}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{32,-32},{50,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{40,-32},{32,-44},{50,-44},{40,-32}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{6,-46},{10,-60}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{6,-20},{10,-30}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{0,-12},{46,-20}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,54},{-40,28}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-46,68},{-44,54}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,9},{1,-9}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          origin={-37,67},
-          rotation=90),
-        Rectangle(
-          extent={{-46,28},{-44,18}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,9},{1,-9}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          origin={-37,19},
-          rotation=90),
-        Rectangle(
-          extent={{-1.5,13.5},{1.5,-13.5}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          origin={-3.5,18.5},
-          rotation=90),
-        Rectangle(
-          extent={{-1.5,29.5},{1.5,-29.5}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          origin={12.5,66.5},
-          rotation=90),
-        Rectangle(
-          extent={{-30,70},{2,14}},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-30,70},{2,42}},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{8,20},{10,0}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{42,68},{40,0}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={255,0,0},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,84},{-54,54}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,28},{-54,18}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{96,-60},{74,-62}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{8,-78},{10,-88}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,30},{1,-30}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid,
-          origin={-20,-87},
-          rotation=90),
-        Rectangle(
-          extent={{-50,-60},{-48,-88}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,22},{1,-22}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid,
-          origin={-70,-59},
-          rotation=90),
-        Rectangle(
-          extent={{40,-78},{42,-88}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,17},{1,-17}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid,
-          origin={57,-87},
-          rotation=90),
-        Rectangle(
-          extent={{72,-60},{74,-88}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,64},{1,-64}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid,
-          origin={8,83},
-          rotation=90),
-        Rectangle(
-          extent={{70,84},{72,60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{92,62},{70,60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-1,10},{1,-10}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid,
-          origin={-64,19},
-          rotation=90),
-        Rectangle(
-          extent={{-74,62},{-72,20}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-72,62},{-90,60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid)}), Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-200,-140},{200,140}})),
-    Documentation(info="<html>
-<p>
-Model of a water-to-water heat pump with temperature control on evaporator side, with the heat pump
-being connected to a domestic hot water tank with fresh water stations.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.png\"
-  alt=\"Heat pump with domestic hot water tank\"/>
-</p>
-<p>
-The heat pump model with storage tank is described in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
-Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
-The evaporator hydronics and control are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
-</p>
-<h4>Condenser Controls</h4>
-<p>
-The system is enabled when the tank charge control signal switches to
-<code>true</code>.
-When enabled,
-</p>
-<ul>
-<li>
-the condenser pump is commanded on and supplies the nominal mass flow rate
-to the tank and domestic hot water system,
-</li>
-<li>
-the heat pump evaporator supplies a constant temperature increase from the return to
-the supply equal to <code>dT_nominal</code>.
-</li>
-</ul>
-</html>", revisions="<html>
-<ul>
-<li>
-November 28, 2023, by David Blum:<br/>
-First implementation, extended from partial base class with added
-condenser hydronics and control.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
-issue 3063</a>.
-</li>
-</ul>
-</html>"));
-end HeatPumpDHWTank;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/SwitchBox.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/SwitchBox.mo
deleted file mode 100644
index bce7e0430bd..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/SwitchBox.mo
+++ /dev/null
@@ -1,161 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model SwitchBox
-  "Model for mass flow rate redirection with three-port two-position directional valves"
-  replaceable package Medium = Modelica.Media.Interfaces.PartialMedium
-    "Medium model";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
-    "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpValve_nominal(
-    min=0,
-    displayUnit="Pa") = 5000 "Valve pressure drop at nominal conditions"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Real trueHoldDuration(
-    final unit="s") = 60
-    "true hold duration";
-  parameter Real falseHoldDuration(
-    final unit="s") = trueHoldDuration
-    "false hold duration";
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
-    Modelica.Fluid.Types.Dynamics.FixedInitial
-    "Type of energy balance (except for the pump always modeled in steady state)"
-    annotation(Evaluate=true, Dialog(tab="Dynamics", group="Conservation equations"));
-  // IO CONECTORS
-  Modelica.Fluid.Interfaces.FluidPort_b port_bSup(
-    redeclare package Medium = Medium)
-    "Supply line outlet port"
-    annotation (Placement(transformation(
-      extent={{-30,90},{-10,110}}),
-      iconTransformation(extent={{-70,90},{-50,110}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_bRet(
-    redeclare final package Medium = Medium)
-    "Return line outlet port"
-    annotation (Placement(transformation(extent={{10,-110},{30,-90}}),
-      iconTransformation(extent={{50,-110},{70,-90}})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_aSup(
-    redeclare final package Medium = Medium)
-    "Supply line inlet port"
-    annotation (Placement(transformation(extent={{-30,-110},{-10,-90}}),
-      iconTransformation(extent={{-70,-110},{-50,-90}})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_aRet(
-    redeclare final package Medium = Medium)
-    "Return line inlet port"
-    annotation (Placement(transformation(extent={{10,90},{30,110}}),
-      iconTransformation(extent={{50,90},{70,110}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mRev_flow(final unit="kg/s")
-    "Service water mass flow rate in reverse direction"
-    annotation (Placement(
-      transformation(extent={{-140,-60},{-100,-20}}),
-        iconTransformation(extent={{-140,-60},{-100,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mPos_flow(final unit="kg/s")
-    "Service water mass flow rate in positive direction"
-    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
-    iconTransformation(extent=
-           {{-140,20},{-100,60}})));
-  // COMPONENTS
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splSup(
-    redeclare final package Medium = Medium,
-    m_flow_nominal={1,1,1}*m_flow_nominal)
-    "Flow splitter"
-    annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=-90,
-        origin={-20,40})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction splRet(
-    redeclare final package Medium = Medium,
-    m_flow_nominal={1,1,1}*m_flow_nominal)
-    "Flow splitter"
-    annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={20,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SwitchBox con(
-    final m_flow_nominal=m_flow_nominal,
-    final trueHoldDuration=trueHoldDuration,
-    final falseHoldDuration=falseHoldDuration)
-    "Switch box controller"
-    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
-  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valSup(
-    redeclare package Medium = Medium,
-    dpValve_nominal=dpValve_nominal,
-    use_inputFilter=false,
-    m_flow_nominal=m_flow_nominal,
-    linearized={true,true},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
-    "Directional valve"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}}, origin={-20,0},
-     rotation=-90)));
-  Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear valRet(
-    redeclare package Medium = Medium,
-    dpValve_nominal=dpValve_nominal,
-    use_inputFilter=false,
-    m_flow_nominal=m_flow_nominal,
-    linearized={true,true},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
-    "Directional valve"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={20,-40},
-      rotation=-90)));
-equation
-  connect(port_bSup, splSup.port_2)
-    annotation (Line(points={{-20,100},{-20,50}}, color={0,127,255}));
-  connect(mRev_flow, con.mRev_flow) annotation (Line(points={{-120,-40},{-80,-40},
-          {-80,-8},{-72,-8}}, color={0,0,127}));
-  connect(splRet.port_1, port_aRet)
-    annotation (Line(points={{20,10},{20,100}}, color={0,127,255}));
-  connect(valSup.port_1, splSup.port_1)
-    annotation (Line(points={{-20,10},{-20,30}}, color={0,127,255}));
-  connect(valSup.port_3, splRet.port_3)
-    annotation (Line(points={{-10,0},{10,0}}, color={0,127,255}));
-  connect(splRet.port_2, valRet.port_1)
-    annotation (Line(points={{20,-10},{20,-30}}, color={0,127,255}));
-  connect(splSup.port_3, valRet.port_3) annotation (Line(points={{-10,40},{0,40},
-          {0,-40},{10,-40}}, color={0,127,255}));
-  connect(valRet.port_2, port_bRet)
-    annotation (Line(points={{20,-50},{20,-100}}, color={0,127,255}));
-  connect(valSup.port_2, port_aSup) annotation (Line(points={{-20,-10},{-20,-100}},
-                      color={0,127,255}));
-  connect(con.y, valRet.y) annotation (Line(points={{-48,0},{-40,0},{-40,-20},{60,
-          -20},{60,-40},{32,-40}},
-                     color={0,0,127}));
-  connect(mPos_flow, con.mPos_flow) annotation (Line(points={{-120,40},{-80,40},
-          {-80,8},{-72,8}}, color={0,0,127}));
-  connect(con.y, valSup.y)
-    annotation (Line(points={{-48,0},{-32,0}}, color={0,0,127}));
-  annotation (
-  defaultComponentName="swiFlo",
-  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
-    {100,100}}), graphics={Rectangle(extent={{-100,100},{100,-100}},
-    lineColor={0,0,127}, fillColor={255,255,255},
-  fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,60},{60,-60}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid)}),                   Diagram(
-  coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
-    Documentation(info="<html>
-<p>
-This model represents a hydronic arrangement avoid flow reversal in the service line,
-for instance when connecting an energy transfer station such as the one modeled in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>.
-For that intent, two three-port two-position directional valves are used. The valves are
-actuated based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.SwitchBox</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-Refactored with three-way valves instead of pumps.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1769\">
-issue 1769</a>.
-</li>
-<li>
-January 16, 2020, by Michael Wetter:<br/>
-Added documentation.
-</li>
-</ul>
-</html>"));
-end SwitchBox;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mo
deleted file mode 100644
index 9b1072ba1f9..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mo
+++ /dev/null
@@ -1,111 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model Borefield
-  "Validation of the base subsystem model with geothermal borefield"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  parameter Integer nBorHol=100
-    "Number of boreholes (must be a square number)";
-  parameter Modelica.Units.SI.Distance dxy=6
-    "Distance in x-axis (and y-axis) between borehole axes";
-  final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
-      Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.computeCoordinates(
-      nBorHol, dxy) "Coordinates of boreholes";
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield borFie(
-    redeclare final package Medium=Medium,
-    final datBorFie=datBorFie,
-    dp_nominal=5E4,
-    TBorWatEntMax=313.15)
-    "Subsystem with heat recovery chiller"
-    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-  Fluid.Sources.Boundary_pT conWat(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=2)
-    "Condenser water boundary conditions"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-40,-2})));
-  Fluid.Sensors.TemperatureTwoPort senTInl(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=borFie.pum.m_flow_nominal)
-    "Water inlet temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-10,20})));
-  Fluid.Sensors.TemperatureTwoPort senTOut(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=borFie.pum.m_flow_nominal)
-    "Water outlet temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,-20})));
-  parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
-    conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
-      cooBor=cooBor,
-      dp_nominal=0))
-    "Borefield design data"
-    annotation (Placement(transformation(extent={{60,60},{80,80}})));
-  Modelica.Blocks.Sources.TimeTable TInlVal(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,2;
-      2,2;
-      3,15;
-      7,15;
-      9,35;
-      10,45;
-      11,30;
-      20,30],
-    timeScale=1000,
-    offset=273.15)
-    "Inlet temperature values"
-    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
-    k=0)
-    "Zero"
-    annotation (Placement(transformation(extent={{-110,30},{-90,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp u(
-    duration=1000,
-    startTime=2500)
-    "Control signal"
-    annotation (Placement(transformation(extent={{-110,70},{-90,90}})));
-equation
-  connect(senTInl.port_b,conWat.ports[1])
-    annotation (Line(points={{-20,20},{-30,20},{-30,0}},color={0,127,255}));
-  connect(conWat.ports[2],senTOut.port_a)
-    annotation (Line(points={{-30,-4},{-30,-20},{-20,-20}},color={0,127,255}));
-  connect(senTInl.port_a,borFie.port_a)
-    annotation (Line(points={{0,20},{20,20},{20,0},{40,0}},color={0,127,255}));
-  connect(borFie.port_b,senTOut.port_b)
-    annotation (Line(points={{60,0},{80,0},{80,-20},{0,-20}},color={0,127,255}));
-  connect(TInlVal.y,conWat.T_in)
-    annotation (Line(points={{-89,0},{-70,0},{-70,2},{-52,2}},color={0,0,127}));
-  connect(zer.y,borFie.yValIso_actual[2])
-    annotation (Line(points={{-88,40},{30,40},{30,5},{38,5}},color={0,0,127}));
-  connect(u.y,borFie.u)
-    annotation (Line(points={{-88,80},{32,80},{32,8},{38,8}},color={0,0,127}));
-  connect(u.y,borFie.yValIso_actual[1])
-    annotation (Line(points={{-88,80},{32,80},{32,3},{38,3}},color={0,0,127}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-120,-100},{100,100}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos" "Simulate and plot"),
-    experiment(
-      StopTime=20000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Borefield</a>.
-</p>
-</html>"));
-end Borefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mo
deleted file mode 100644
index 01e37915137..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mo
+++ /dev/null
@@ -1,161 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model Chiller
-  "Validation of the base subsystem model with heat recovery chiller"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  parameter Fluid.Chillers.Data.ElectricEIR.Generic datChi(
-    QEva_flow_nominal=-1E6,
-    COP_nominal=3,
-    PLRMax=1,
-    PLRMinUnl=0.3,
-    PLRMin=0.3,
-    etaMotor=1,
-    mEva_flow_nominal=30,
-    mCon_flow_nominal=30,
-    TEvaLvg_nominal=280.15,
-    capFunT={1,0,0,0,0,0},
-    EIRFunT={1,0,0,0,0,0},
-    EIRFunPLR={1,0,0},
-    TEvaLvgMin=276.15,
-    TEvaLvgMax=288.15,
-    TConEnt_nominal=313.15,
-    TConEntMin=303.15,
-    TConEntMax=333.15)
-    "Chiller performance data"
-    annotation (Placement(transformation(extent={{20,100},{40,120}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller chi(
-    redeclare final package Medium=Medium,
-    final dat=datChi,
-    dpCon_nominal=15E3,
-    dpEva_nominal=15E3)
-    "Subsystem with heat recovery chiller"
-    annotation (Placement(transformation(extent={{-10,-72},{10,-52}})));
-  Fluid.Sources.Boundary_pT evaWat(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=2)
-    "Evaporator water boundary conditions"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,-62})));
-  Fluid.Sources.Boundary_pT conWat(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=2)
-    "Condenser water boundary conditions"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,-62})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(
-    k=7+273.15,
-    y(final unit="K",
-      displayUnit="degC"))
-    "Chilled water supply temperature set point"
-    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  Fluid.Sensors.TemperatureTwoPort senTHeaWatSup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=datChi.mCon_flow_nominal)
-    "Heating water supply temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={-80,-40})));
-  Fluid.Sensors.TemperatureTwoPort senTChiWatSup(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=datChi.mEva_flow_nominal)
-    "Chilled water supply temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={70,-40})));
-  Fluid.Sensors.TemperatureTwoPort senTHeaWatRet(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=datChi.mCon_flow_nominal)
-    "Heating water return temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-80,-80})));
-  Fluid.Sensors.TemperatureTwoPort senTChiWatRet(
-    redeclare final package Medium=Medium,
-    m_flow_nominal=datChi.mEva_flow_nominal)
-    "Chilled water return temperature"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={70,-80})));
-  Modelica.Blocks.Sources.BooleanExpression uHea(
-    y=time < 4000)
-    "Heating enable signal"
-    annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
-  Modelica.Blocks.Sources.BooleanExpression uCoo(
-    y=time >= 1000)
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-120,70},{-100,90}})));
-  Modelica.Blocks.Sources.TimeTable THeaWatRet(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,44;
-      2,44;
-      3,34;
-      4.5,34;
-      5,14;
-      10,14],
-    timeScale=1000,
-    offset=273.15)
-    "Heating water return temperature values"
-    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
-  Modelica.Blocks.Sources.TimeTable TChiWatRet(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,9;
-      1,9;
-      2,14;
-      3,14;
-      4,11;
-      5,11],
-    timeScale=1000,
-    offset=273.15)
-    "Chilled water return temperature values"
-    annotation (Placement(transformation(extent={{160,-70},{140,-50}})));
-equation
-  connect(chi.port_bHeaWat,senTHeaWatSup.port_a)
-    annotation (Line(points={{-10,-56},{-40,-56},{-40,-40},{-70,-40}},color={0,127,255}));
-  connect(senTHeaWatSup.port_b,conWat.ports[1])
-    annotation (Line(points={{-90,-40},{-100,-40},{-100,-63}},color={0,127,255}));
-  connect(evaWat.ports[1],senTChiWatSup.port_b)
-    annotation (Line(points={{100,-63},{100,-40},{80,-40}},color={0,127,255}));
-  connect(senTChiWatSup.port_a,chi.port_bChiWat)
-    annotation (Line(points={{60,-40},{40,-40},{40,-56},{10,-56}},color={0,127,255}));
-  connect(conWat.ports[2],senTHeaWatRet.port_a)
-    annotation (Line(points={{-100,-61},{-100,-80},{-90,-80}},color={0,127,255}));
-  connect(senTHeaWatRet.port_b,chi.port_aHeaWat)
-    annotation (Line(points={{-70,-80},{-40,-80},{-40,-68},{-10,-68}},color={0,127,255}));
-  connect(chi.port_aChiWat,senTChiWatRet.port_b)
-    annotation (Line(points={{10,-68},{40,-68},{40,-80},{60,-80}},color={0,127,255}));
-  connect(senTChiWatRet.port_a,evaWat.ports[2])
-    annotation (Line(points={{80,-80},{100,-80},{100,-61}},color={0,127,255}));
-  connect(uCoo.y,chi.uCoo)
-    annotation (Line(points={{-99,80},{-24,80},{-24,-60},{-12,-60}},color={255,0,255}));
-  connect(uHea.y,chi.uHea)
-    annotation (Line(points={{-99,100},{-20,100},{-20,-58},{-12,-58}},color={255,0,255}));
-  connect(TChiWatSupSet.y,chi.TChiWatSupSet)
-    annotation (Line(points={{-98,0},{-34,0},{-34,-64},{-12,-64}},color={0,0,127}));
-  connect(THeaWatRet.y,conWat.T_in)
-    annotation (Line(points={{-169,-60},{-140,-60},{-140,-58},{-122,-58}},color={0,0,127}));
-  connect(TChiWatRet.y,evaWat.T_in)
-    annotation (Line(points={{139,-60},{132,-60},{132,-58},{122,-58}},color={0,0,127}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-200,-140},{200,140}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos" "Simulate and plot"),
-    experiment(
-      StopTime=5000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Chiller</a>.
-</p>
-</html>"));
-end Chiller;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mo
deleted file mode 100644
index 574910c1e65..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mo
+++ /dev/null
@@ -1,301 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model HeatExchanger
-  "Validation of the base subsystem model with district heat exchanger"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  Buildings.Fluid.Sources.Boundary_pT bou1Pum(
-    redeclare package Medium = Medium,
-    use_T_in=true,
-    nPorts=2) "Primary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={150,-82})));
-  Buildings.Fluid.Sources.Boundary_pT bou2(
-    redeclare package Medium = Medium,
-    use_T_in=true,
-    nPorts=4) "Secondary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-70,-20})));
-  Modelica.Blocks.Sources.BooleanExpression uHeaRej(
-    y=time >= 3000) "Heat rejection enable signal"
-    annotation (Placement(transformation(extent={{-190,90},{-170,110}})));
-  Modelica.Blocks.Sources.BooleanExpression uEnaColRej(
-    y=time >= 1000 and time < 3000)
-    "Cold rejection enable signal"
-    annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger hexPum(
-    redeclare final package Medium1 = Medium,
-    redeclare final package Medium2 = Medium,
-    show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.Pump,
-    dp1Hex_nominal=20E3,
-    dp2Hex_nominal=20E3,
-    Q_flow_nominal=1E6,
-    T_a1_nominal=281.15,
-    T_b1_nominal=277.15,
-    T_a2_nominal=275.15,
-    T_b2_nominal=279.15)
-    "Heat exchanger with primary pump"
-    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swi
-    "Switch secondary temperature value depending on heat/cold rejection mode"
-    annotation (Placement(transformation(extent={{-120,-90},{-100,-70}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
-    "Primary outlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={110,-100})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
-    "Primary inlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={110,-60})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
-    "Secondary outlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-30,-60})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
-    "Secondary inlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,-100})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger hexVal(
-    redeclare final package Medium1 = Medium,
-    redeclare final package Medium2 = Medium,
-    show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve,
-    dp1Hex_nominal=20E3,
-    dp2Hex_nominal=20E3,
-    Q_flow_nominal=1E6,
-    T_a1_nominal=281.15,
-    T_b1_nominal=277.15,
-    T_a2_nominal=275.15,
-    T_b2_nominal=279.15)
-    "Heat exchanger with primary control valve"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-
-  Buildings.Fluid.Sources.Boundary_pT bou1InlVal(
-    redeclare package Medium = Medium,
-    p=Medium.p_default + 30E3,
-    use_T_in=true,
-    nPorts=1) "Primary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={152,20})));
-  Buildings.Fluid.Sources.Boundary_pT bou1OutVal(redeclare package Medium =
-        Medium, nPorts=1) "Primary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={150,-20})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
-    "Primary inlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={110,20})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
-    "Primary outlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={110,-20})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
-    "Secondary outlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-30,20})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
-    "Secondary inlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,-20})));
-  Buildings.Controls.OBC.CDL.Logical.Or or2
-    "Compute enable signal for heat/cold rejection"
-    annotation (Placement(transformation(extent={{-120,70},{-100,90}})));
-  Modelica.Blocks.Sources.RealExpression yValIsoCon(
-    y=if time >= 2500 then
-        1
-      else
-        0)
-    "Condenser loop isolation valve opening"
-    annotation (Placement(transformation(extent={{-190,50},{-170,70}})));
-  Modelica.Blocks.Sources.RealExpression yValIsoEva(
-    y=if time >= 500 then
-        1
-      else
-        0)
-    "Evaporator loop isolation valve opening"
-    annotation (Placement(transformation(extent={{-190,30},{-170,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin1(
-    amplitude=0.5,
-    freqHz=1e-3,
-    offset=0.5)
-    "Control signal"
-    annotation (Placement(transformation(extent={{-80,130},{-60,150}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swi1 "Activate heat/cold rejection"
-    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
-    k=0) "Zero"
-    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
-  Modelica.Blocks.Sources.TimeTable TColVal(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,6;
-      2,6;
-      3,16;
-      4.5,16;
-      5,6;
-      10,6],
-    timeScale=1000,
-    offset=273.15) "Cold side temperature values"
-    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
-  Modelica.Blocks.Sources.TimeTable THotVal(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,45;
-      2,45;
-      3,55;
-      4.5,55;
-      5,25;
-      10,25],
-    timeScale=1000,
-    offset=273.15)
-    "Hot side temperature values"
-    annotation (Placement(transformation(extent={{-190,-110},{-170,-90}})));
-  Modelica.Blocks.Sources.TimeTable TSerWat(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,8;
-      1,8;
-      2,13;
-      3,18;
-      4,6;
-      5,18],
-    timeScale=1000,
-    offset=273.15) "Service water temperature values"
-    annotation (Placement(transformation(extent={{210,-90},{190,-70}})));
-equation
-  connect(swi.y, bou2.T_in) annotation (Line(points={{-98,-80},{-90,-80},{-90,
-          -16},{-82,-16}}, color={0,0,127}));
-  connect(uEnaColRej.y,swi.u2)
-    annotation (Line(points={{-169,80},{-140,80},{-140,20},{-120,20},{-120,-60},
-          {-130,-60},{-130,-80},{-122,-80}},                                                                        color={255,0,255}));
-  connect(hexPum.port_b1,senT1OutPum.port_a)
-    annotation (Line(points={{50,-74},{80,-74},{80,-100},{100,-100}},
-                                                                  color={0,127,255}));
-  connect(senT1OutPum.port_b, bou1Pum.ports[1]) annotation (Line(points={{120,
-          -100},{140,-100},{140,-83}},
-                                 color={0,127,255}));
-  connect(hexPum.port_a1,senT1InlPum.port_b)
-    annotation (Line(points={{30,-74},{20,-74},{20,-60},{100,-60}},  color={0,127,255}));
-  connect(senT1InlPum.port_a, bou1Pum.ports[2]) annotation (Line(points={{120,-60},
-          {140,-60},{140,-81}}, color={0,127,255}));
-  connect(hexPum.port_b2,senT2OutPum.port_a)
-    annotation (Line(points={{30,-86},{0,-86},{0,-60},{-20,-60}},     color={0,127,255}));
-  connect(senT2OutPum.port_b, bou2.ports[1]) annotation (Line(points={{-40,-60},
-          {-50,-60},{-50,-24},{-60,-24},{-60,-21.5}},
-                                                    color={0,127,255}));
-  connect(bou2.ports[2], senT2InlPum.port_a) annotation (Line(points={{-60,
-          -20.5},{-60,-100},{-40,-100}},
-                                  color={0,127,255}));
-  connect(senT2InlPum.port_b,hexPum.port_a2)
-    annotation (Line(points={{-20,-100},{60,-100},{60,-86},{50,-86}},
-                                                                   color={0,127,255}));
-  connect(hexVal.port_a1,senT1InlVal.port_b)
-    annotation (Line(points={{30,6},{20,6},{20,20},{100,20}},    color={0,127,255}));
-  connect(senT1InlVal.port_a, bou1InlVal.ports[1])
-    annotation (Line(points={{120,20},{142,20}}, color={0,127,255}));
-  connect(bou1OutVal.ports[1], senT1OutVal.port_b)
-    annotation (Line(points={{140,-20},{120,-20}}, color={0,127,255}));
-  connect(senT1OutVal.port_a,hexVal.port_b1)
-    annotation (Line(points={{100,-20},{70,-20},{70,6},{50,6}},
-                                                            color={0,127,255}));
-  connect(hexVal.port_a2,senT2InlVal.port_b)
-    annotation (Line(points={{50,-6},{60,-6},{60,-20},{-20,-20}},
-                                                             color={0,127,255}));
-  connect(senT2OutVal.port_a,hexVal.port_b2)
-    annotation (Line(points={{-20,20},{0,20},{0,-6},{30,-6}},     color={0,127,255}));
-  connect(uEnaColRej.y,or2.u2)
-    annotation (Line(points={{-169,80},{-140,80},{-140,72},{-122,72}},  color={255,0,255}));
-  connect(uHeaRej.y,or2.u1)
-    annotation (Line(points={{-169,100},{-130,100},{-130,80},{-122,80}},  color={255,0,255}));
-  connect(yValIsoCon.y,hexVal.yValIso_actual[1])
-    annotation (Line(points={{-169,60},{8,60},{8,-2.5},{28,-2.5}}, color={0,0,127}));
-  connect(yValIsoCon.y,hexPum.yValIso_actual[1])
-    annotation (Line(points={{-169,60},{8,60},{8,-82.5},{28,-82.5}}, color={0,0,127}));
-  connect(yValIsoEva.y,hexVal.yValIso_actual[2])
-    annotation (Line(points={{-169,40},{4,40},{4,-1.5},{28,-1.5}}, color={0,0,127}));
-  connect(yValIsoEva.y,hexPum.yValIso_actual[2])
-    annotation (Line(points={{-169,40},{4,40},{4,-81.5},{28,-81.5}}, color={0,0,127}));
-  connect(or2.y,swi1.u2)
-    annotation (Line(points={{-98,80},{-22,80}},   color={255,0,255}));
-  connect(sin1.y,swi1.u1)
-    annotation (Line(points={{-58,140},{-40,140},{-40,88},{-22,88}},  color={0,0,127}));
-  connect(zer.y,swi1.u3)
-    annotation (Line(points={{-58,100},{-50,100},{-50,72},{-22,72}},color={0,0,127}));
-  connect(swi1.y,hexVal.u)
-    annotation (Line(points={{2,80},{12,80},{12,2},{28,2}},         color={0,0,127}));
-  connect(swi1.y,hexPum.u)
-    annotation (Line(points={{2,80},{12,80},{12,-78},{28,-78}},       color={0,0,127}));
-  connect(TColVal.y,swi.u1)
-    annotation (Line(points={{-169,-60},{-140,-60},{-140,-72},{-122,-72}},color={0,0,127}));
-  connect(THotVal.y,swi.u3)
-    annotation (Line(points={{-169,-100},{-140,-100},{-140,-88},{-122,-88}},
-                                                                          color={0,0,127}));
-  connect(TSerWat.y, bou1Pum.T_in) annotation (Line(points={{189,-80},{180,-80},
-          {180,-78},{162,-78}}, color={0,0,127}));
-  connect(TSerWat.y, bou1InlVal.T_in) annotation (Line(points={{189,-80},{180,-80},
-          {180,24},{164,24}}, color={0,0,127}));
-  connect(senT2OutVal.port_b, bou2.ports[3])
-    annotation (Line(points={{-40,20},{-60,20},{-60,-19.5}},
-                                                           color={0,127,255}));
-  connect(bou2.ports[4], senT2InlVal.port_a) annotation (Line(points={{-60,
-          -18.5},{-60,-20},{-40,-20}},
-                                color={0,127,255}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-220,-160},{220,160}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos" "Simulate and plot"),
-    experiment(
-      StopTime=5000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatExchanger</a>
-in a configuration where the primary flow rate is modulated by means of a
-two-way valve (see <code>hexVal</code>), and in a configuration where the
-primary flow rate is modulated by means of a variable speed pump
-(see <code>hexPum</code>).
-</p>
-</html>"));
-end HeatExchanger;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mo
deleted file mode 100644
index 4fdb26cd64a..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mo
+++ /dev/null
@@ -1,131 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model HeatPump
-  "Validation of the base subsystem model with heat pump"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  parameter Modelica.Units.SI.Temperature TCon_nominal = 273.15+30 "Nominal condenser outlet temperature";
-  parameter Modelica.Units.SI.Temperature TAmb_nominal = 273.15+15 "Nominal ambient loop temperature to evaporator";
-  parameter Modelica.Units.SI.Power QLoa_nominal = 1000 "Nominal load";
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump
-    heaPum(
-    redeclare package Medium1 = Medium,
-    redeclare package Medium2 = Medium,
-    COP_nominal=2.3,
-    TCon_nominal=TCon_nominal,
-    TEva_nominal(displayUnit="K") = TAmb_nominal - heaPum.dT_nominal,
-    dp1_nominal=6000,
-    dp2_nominal=6000,
-    Q1_flow_nominal=QLoa_nominal)
-    annotation (Placement(transformation(extent={{-10,-12},{10,8}})));
-  Fluid.Sources.Boundary_pT supAmb(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar"),
-    T=TAmb_nominal,
-    nPorts=1) "Ambient water supply" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={60,-60})));
-  Fluid.Sources.Boundary_pT sinAmb(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar"),
-    nPorts=1) "Sink for ambient water" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={60,10})));
-  Fluid.Sources.Boundary_pT souLoa(
-    redeclare final package Medium = Medium,
-    T=TCon_nominal - heaPum.dT_nominal,
-    nPorts=1) "Source for load (return from load)"
-                                 annotation (Placement(
-      transformation(
-      extent={{10,-10},{-10,10}},
-      rotation=180,
-      origin={-110,-52})));
-
-  Modelica.Blocks.Sources.Sine sin(f=1/(86400/2)) "Load signal"
-    annotation (Placement(transformation(extent={{-120,80},{-100,100}})));
-  Modelica.Blocks.Nonlinear.Limiter limiter(uMax=1, uMin=0)
-    annotation (Placement(transformation(extent={{-80,80},{-60,100}})));
-  Modelica.Blocks.Math.Gain gain(k=QLoa_nominal/(4200*5))
-    annotation (Placement(transformation(extent={{-48,80},{-28,100}})));
-  Modelica.Blocks.Sources.Step TSetCon(
-    height=-2,
-    offset=TCon_nominal,
-    startTime=86400/2) "Set point of condenser outlet"
-    annotation (Placement(transformation(extent={{-120,20},{-100,40}})));
-  Fluid.Sources.Boundary_pT sinLoa(redeclare final package Medium = Medium,
-      nPorts=1) "Sink for load" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=180,
-        origin={-110,0})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaHea(t=1e-4)
-    "Threshold comparison to enable heating"
-    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
-  Fluid.Sensors.TemperatureTwoPort senTLoaSup(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=QLoa_nominal/(4200*5),
-    tau=0) "Load supply temperature sensor"
-                                         annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-70,0})));
-  Fluid.Sensors.MassFlowRate senMasFloAmb(redeclare package Medium = Medium)
-    "Mass flow rate sensor for ambient loop"
-    annotation (Placement(transformation(extent={{40,-70},{20,-50}})));
-equation
-  connect(sinAmb.ports[1], heaPum.port_b2) annotation (Line(points={{50,10},{22,
-          10},{22,4},{10,4}}, color={0,127,255}));
-  connect(sin.y, limiter.u)
-    annotation (Line(points={{-99,90},{-82,90}}, color={0,0,127}));
-  connect(limiter.y, gain.u)
-    annotation (Line(points={{-59,90},{-50,90}}, color={0,0,127}));
-  connect(heaPum.m1_flow, gain.y) annotation (Line(points={{-12,-2},{-27,-2},{-27,
-          90}},          color={0,0,127}));
-  connect(TSetCon.y, heaPum.TSupSet) annotation (Line(points={{-99,30},{-22,30},
-          {-22,1},{-12,1}}, color={0,0,127}));
-  connect(souLoa.ports[1], heaPum.port_a1) annotation (Line(points={{-100,-52},{
-          -20,-52},{-20,-8},{-10,-8}}, color={0,127,255}));
-  connect(enaHea.y, heaPum.uEna) annotation (Line(points={{-58,50},{-18,50},{-18,
-          8},{-12,8},{-12,7}}, color={255,0,255}));
-  connect(limiter.y, enaHea.u) annotation (Line(points={{-59,90},{-56,90},{-56,68},
-          {-92,68},{-92,50},{-82,50}}, color={0,0,127}));
-  connect(sinLoa.ports[1], senTLoaSup.port_b) annotation (Line(points={{-100,
-          -8.88178e-16},{-90,-8.88178e-16},{-90,0},{-80,0}}, color={0,127,255}));
-  connect(senTLoaSup.port_a, heaPum.port_b1) annotation (Line(points={{-60,0},{
-          -40,0},{-40,4},{-10,4}}, color={0,127,255}));
-  connect(heaPum.port_a2, senMasFloAmb.port_b)
-    annotation (Line(points={{10,-8},{20,-8},{20,-60}}, color={0,127,255}));
-  connect(senMasFloAmb.port_a, supAmb.ports[1])
-    annotation (Line(points={{40,-60},{50,-60}}, color={0,127,255}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-120,-100},{100,100}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos" "Simulate and plot"),
-    experiment(
-      StopTime=172800,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-November 15, 2023, by David Blum:<br/>
-Update for new heat pump subsystem model.
-</li>
-<li>
-November 1, 2020, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
-</p>
-</html>"));
-end HeatPump;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
deleted file mode 100644
index c14dc0bc088..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mo
+++ /dev/null
@@ -1,139 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model HeatPumpDHWTank
-  "Validation of the base subsystem model with domestic hot water tank and heat pump"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal = 5
-    "Nominal temperature difference across heat pump condensor and district supply/return water";
-  parameter Modelica.Units.SI.Temperature TDisSup_nominal = 273.15 + 15
-    "Nominal district supply water temperature";
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank
-    heaPum(
-    redeclare package Medium1 = Medium,
-    redeclare package Medium2 = Medium,
-    datWatHea=datWatHea,
-    COP_nominal=2.3,
-    TCon_nominal=datWatHea.TDom_nominal + datWatHea.dTHexApp_nominal +
-        dT_nominal,
-    TEva_nominal(displayUnit="K") = TDisSup_nominal - dT_nominal,
-    QHotWat_flow_nominal=datWatHea.QHex_flow_nominal,
-    dT_nominal=dT_nominal,
-    dp1_nominal=6000,
-    dp2_nominal=6000)
-    annotation (Placement(transformation(extent={{-10,-12},{10,8}})));
-  Fluid.Sources.Boundary_pT           supAmbWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar"),
-    use_T_in=true,
-    T=280.15,
-    nPorts=1) "Ambient water supply"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,-60})));
-  Fluid.Sources.Boundary_pT           sinAmbWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar"),
-    nPorts=1) "Sink for ambient water"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={60,10})));
-  Fluid.Sensors.MassFlowRate           senMasFlo(redeclare package Medium =
-        Medium)
-    "Mass flow rate sensor"
-    annotation (Placement(transformation(extent={{40,-70},{20,-50}})));
-  Modelica.Blocks.Sources.Constant TDisSup(k = TDisSup_nominal)
-    "District supply temperature"
-    annotation (Placement(transformation(extent={{100,-60},{80,-40}})));
-  Fluid.Sources.Boundary_pT souDCW(
-    redeclare final package Medium = Medium,
-    T=283.15,
-    nPorts=1) "Source for domestic cold water"
-                                 annotation (Placement(
-      transformation(
-      extent={{10,-10},{-10,10}},
-      rotation=180,
-      origin={-70,-30})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Junction dcwSpl(
-      redeclare final package Medium = Medium, final m_flow_nominal=6000*{1,-1,
-        -1})                                 "Splitter for domestic cold water"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-32,-10})));
-  Modelica.Blocks.Sources.CombiTimeTable sch(
-    tableOnFile=true,
-    tableName="tab1",
-    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
-    smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
-    "Domestic hot water fixture draw fraction schedule"
-    annotation (Placement(transformation(extent={{-120,60},{-100,80}})));
-
-  Modelica.Blocks.Sources.Constant conTSetMix(k(
-      final unit="K",
-      displayUnit="degC") = 308.15)
-    "Temperature setpoint for mixed water supply to fixture"
-    annotation (Placement(transformation(extent={{-120,20},{-100,40}})));
-  Loads.HotWater.ThermostaticMixingValve
-                          theMixVal(redeclare package Medium = Medium,
-      mMix_flow_nominal=1.2*datWatHea.mDom_flow_nominal)
-    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
-  parameter Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
-    datWatHea(VTan=0.1892706, mDom_flow_nominal=6.52944E-06*1000)
-    "Data for heat pump water heater with tank"
-    annotation (Placement(transformation(extent={{-10,22},{10,42}})));
-  Modelica.Blocks.Sources.BooleanConstant on "Enable"
-    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
-equation
-  connect(TDisSup.y,supAmbWat. T_in)
-    annotation (Line(points={{79,-50},{76,-50},{76,-56},{72,-56}},
-                                                 color={0,0,127}));
-  connect(supAmbWat.ports[1], senMasFlo.port_a)
-    annotation (Line(points={{50,-60},{40,-60}}, color={0,127,255}));
-  connect(senMasFlo.port_b, heaPum.port_a2) annotation (Line(points={{20,-60},{16,
-          -60},{16,-8},{10,-8}}, color={0,127,255}));
-  connect(sinAmbWat.ports[1], heaPum.port_b2) annotation (Line(points={{50,10},
-          {22,10},{22,-8},{-10,-8}},
-                                 color={0,127,255}));
-  connect(dcwSpl.port_1, souDCW.ports[1]) annotation (Line(points={{-32,-20},{-32,
-          -30},{-60,-30}}, color={0,127,255}));
-  connect(dcwSpl.port_3, heaPum.port_a1)
-    annotation (Line(points={{-22,-10},{-22,4},{-10,4}},   color={0,127,255}));
-  connect(sch.y[1], theMixVal.yMixSet) annotation (Line(points={{-99,70},{-80,70},
-          {-80,78},{-61,78}}, color={0,0,127}));
-  connect(conTSetMix.y, theMixVal.TMixSet) annotation (Line(points={{-99,30},{-76,
-          30},{-76,72},{-61,72}}, color={0,0,127}));
-  connect(dcwSpl.port_2, theMixVal.port_col) annotation (Line(points={{-32,0},{-32,
-          38},{-68,38},{-68,62},{-60,62}}, color={0,127,255}));
-  connect(theMixVal.port_hot, heaPum.port_b1) annotation (Line(points={{-60,66},
-          {-72,66},{-72,4},{10,4}},  color={0,127,255}));
-  connect(on.y, heaPum.uEna) annotation (Line(points={{-99,-10},{-60,-10},{-60,
-          7},{-12,7}}, color={255,0,255}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-120,-100},{100,100}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos" "Simulate and plot"),
-    experiment(
-      StopTime=172800,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-November 28, 2023, by David Blum:<br/>
-Update for new heat pump with storage tank subsystem model.
-</li>
-<li>
-October 31, 2020, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
-</p>
-</html>"));
-end HeatPumpDHWTank;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mo
deleted file mode 100644
index de6af5b972a..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mo
+++ /dev/null
@@ -1,119 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model SwitchBox "Validation of flow switch box"
-  extends Modelica.Icons.Example;
-
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal water mass flow rate";
-  Fluid.Delays.DelayFirstOrder volSup(
-    redeclare final package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
-    final m_flow_nominal=m_flow_nominal,
-    tau=60,
-    nPorts=3) "Mixing volume supply" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-70,0})));
-  Fluid.Delays.DelayFirstOrder volRet(
-    redeclare final package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
-    final m_flow_nominal=m_flow_nominal,
-    tau=60,
-    nPorts=3) "Mixing volume return" annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={70,0})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1(
-    redeclare package Medium = Medium,
-    final m_flow_nominal=m_flow_nominal)
-    "Chilled water HX secondary pump"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum2(
-    redeclare package Medium = Medium,
-    final m_flow_nominal=m_flow_nominal)
-    "Chilled water HX secondary pump"
-    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox
-    floSwiBox(final m_flow_nominal=m_flow_nominal, redeclare final package
-      Medium = Medium,
-    trueHoldDuration=300)
-                       "Flow switch box"
-    annotation (Placement(transformation(extent={{-10,-60},{10,-40}})));
-  Fluid.Sensors.MassFlowRate senMasFlo(
-    redeclare final package Medium = Medium) "District water mass flow rate"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={0,-100})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant setMasFlo1(k=0.5)
-    "Set point for mass flow rate (normalized)"
-    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
-  Fluid.Sources.Boundary_pT disWatBou(redeclare package Medium = Medium,
-      nPorts=2) "District water boundary conditions" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-70,-90})));
-  Modelica.Blocks.Sources.CombiTimeTable setMasFlo2(
-    tableName="tab1",
-    table=[0,0; 0.6,1; 0.7,0; 1,1],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    columns={2},
-    timeScale=1000) "Set point for mass flow rate (normalized)"
-    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(final k=
-        m_flow_nominal) "Scale with nominal mass flow rate"
-    annotation (Placement(transformation(extent={{-46,70},{-26,90}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
-        m_flow_nominal) "Scale with nominal mass flow rate"
-    annotation (Placement(transformation(extent={{-46,30},{-26,50}})));
-equation
-  connect(pum1.port_b, volSup.ports[1]) annotation (Line(points={{-10,0},{-60,0},
-          {-60,-1.33333}}, color={0,127,255}));
-  connect(volSup.ports[2], pum2.port_a) annotation (Line(points={{-60,-4.44089e-16},
-          {-60,60},{-10,60}}, color={0,127,255}));
-  connect(pum2.port_b, volRet.ports[1]) annotation (Line(points={{10,60},{60,60},
-          {60,-1.33333}}, color={0,127,255}));
-  connect(volRet.ports[2], pum1.port_a) annotation (Line(points={{60,8.88178e-16},
-          {60,0},{10,0}}, color={0,127,255}));
-  connect(floSwiBox.port_bSup, volSup.ports[3]) annotation (Line(points={{-6,-40},
-          {-6,-20},{-60,-20},{-60,1.33333}}, color={0,127,255}));
-  connect(floSwiBox.port_aRet, volRet.ports[3]) annotation (Line(points={{6,-40},
-          {6,-20},{60,-20},{60,1.33333}}, color={0,127,255}));
-  connect(floSwiBox.port_bRet, senMasFlo.port_a) annotation (Line(points={{6,-60},
-          {6,-80},{60,-80},{60,-100},{10,-100}},
-                                       color={0,127,255}));
-  connect(senMasFlo.port_b, disWatBou.ports[1]) annotation (Line(points={{-10,
-          -100},{-60,-100},{-60,-91}},
-                                     color={0,127,255}));
-  connect(disWatBou.ports[2], floSwiBox.port_aSup) annotation (Line(points={{-60,-89},
-          {-60,-80},{-6,-80},{-6,-60}},
-                                    color={0,127,255}));
-  connect(pum1.m_flow_actual, floSwiBox.mRev_flow) annotation (Line(points={{-11,
-          5},{-20,5},{-20,-54},{-12,-54}}, color={0,0,127}));
-  connect(setMasFlo2.y[1], gai2.u)
-    annotation (Line(points={{-69,80},{-48,80}}, color={0,0,127}));
-  connect(gai2.y, pum2.m_flow_in)
-    annotation (Line(points={{-24,80},{0,80},{0,72}}, color={0,0,127}));
-  connect(setMasFlo1.y, gai1.u)
-    annotation (Line(points={{-68,40},{-48,40}}, color={0,0,127}));
-  connect(gai1.y, pum1.m_flow_in)
-    annotation (Line(points={{-24,40},{0,40},{0,12}}, color={0,0,127}));
-  connect(pum2.m_flow_actual, floSwiBox.mPos_flow) annotation (Line(points={{11,
-          65},{20,65},{20,-28},{-16,-28},{-16,-46},{-12,-46}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,120}})),
-    Documentation(info="<html>
-<p>
-This model validates that
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.SwitchBox</a>
-maintains a positive flow rate in the district line outside of the temporization
-period set by the controller.
-</p>
-</html>"),
-  experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-    file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos"
-    "Simulate and plot"));
-end SwitchBox;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mo
deleted file mode 100644
index 198d864abf9..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mo
+++ /dev/null
@@ -1,274 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation;
-model WatersideEconomizer
-  "Validation of the base subsystem model with waterside economizer"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  Buildings.Fluid.Sources.Boundary_pT bou1Pum(
-    redeclare package Medium = Medium,
-    use_T_in=true,
-    nPorts=2) "Primary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={140,-62})));
-  Buildings.Fluid.Movers.FlowControlled_dp pum2Pum(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    m_flow_nominal=hexPum.m2_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true,
-    dp_nominal=25E4) "CHW pump" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-70,-40})));
-  Modelica.Blocks.Sources.BooleanExpression uCoo(y=time >= 1000)
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-200,70},{-180,90}})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer hexPum(
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=Medium,
-    show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.Pump,
-    dp1Hex_nominal=3E4,
-    dp2Hex_nominal=3E4,
-    Q_flow_nominal=-1E6,
-    T_a1_nominal=281.15,
-    T_b1_nominal=291.15,
-    T_a2_nominal=293.15,
-    T_b2_nominal=283.15)
-    "Heat exchanger with primary pump"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
-    "Primary outlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={100,-80})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m1_flow_nominal)
-    "Primary inlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={100,-40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
-    "Secondary outlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-40,-40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlPum(redeclare final
-      package Medium = Medium, m_flow_nominal=hexPum.m2_flow_nominal)
-    "Secondary inlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-40,-80})));
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer hexVal(
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=Medium,
-    show_T=true,
-    conCon=Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve,
-    dp1Hex_nominal=3E4,
-    dp2Hex_nominal=3E4,
-    Q_flow_nominal=-1E6,
-    T_a1_nominal=281.15,
-    T_b1_nominal=291.15,
-    T_a2_nominal=293.15,
-    T_b2_nominal=283.15)
-    "Heat exchanger with primary control valve"
-    annotation (Placement(transformation(extent={{20,10},{40,30}})));
-  Buildings.Fluid.Sources.Boundary_pT bou1InlVal(
-    redeclare package Medium = Medium,
-    p=Medium.p_default + 45E3,
-    use_T_in=true,
-    nPorts=1) "Primary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={140,40})));
-  Buildings.Fluid.Sources.Boundary_pT bou1OutVal(redeclare package Medium =
-        Medium, nPorts=1) "Primary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={140,0})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1InlVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
-    "Primary inlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={100,40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1OutVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m1_flow_nominal)
-    "Primary outlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={100,0})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2OutVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
-    "Secondary outlet temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-40,40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2InlVal(redeclare final
-      package Medium = Medium, m_flow_nominal=hexVal.m2_flow_nominal)
-    "Secondary inlet temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-40,0})));
-  Buildings.Fluid.Sensors.RelativePressure senRelPre(redeclare final package
-      Medium = Medium) annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={80,20})));
-  Modelica.Blocks.Sources.TimeTable TChiWatRet(
-    y(final unit="K", displayUnit="degC"),
-    table=[0,10; 2,15; 3,16; 4.5,16; 5,13; 10,9],
-    timeScale=1000,
-    offset=273.15) "Chilled water return temperature values"
-    annotation (Placement(transformation(extent={{-200,10},{-180,30}})));
-  Modelica.Blocks.Sources.TimeTable TSerWat(
-    y(final unit="K",
-      displayUnit="degC"),
-    table=[
-      0,8;
-      1,8;
-      2,13;
-      3,18;
-      4,6;
-      5,18],
-    timeScale=1000,
-    offset=273.15) "Service water temperature values"
-    annotation (Placement(transformation(extent={{200,-70},{180,-50}})));
-  Buildings.Fluid.Sources.Boundary_pT bou2(
-    redeclare package Medium = Medium,
-    use_T_in=true,
-    nPorts=4) "Secondary boundary conditions" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-150,0})));
-  Buildings.Fluid.FixedResistances.PressureDrop resPum(
-    redeclare package Medium = Medium,
-    m_flow_nominal=hexPum.m2_flow_nominal,
-    dp_nominal=20E4) "Pipe flow resistance"
-    annotation (Placement(transformation(extent={{-100,-50},{-120,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp     dpSet(
-    height=15E4,
-    duration=1000,
-    offset=10E4,
-    startTime=1500)                                                    "Differential pressure set point"
-    annotation (Placement(transformation(extent={{-200,-40},{-180,-20}})));
-  Buildings.Fluid.Movers.FlowControlled_dp pum2Val(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    m_flow_nominal=hexPum.m2_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true,
-    dp_nominal=25E4) "CHW pump" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-70,40})));
-  Buildings.Fluid.FixedResistances.PressureDrop resVal(
-    redeclare package Medium = Medium,
-    m_flow_nominal=hexPum.m2_flow_nominal,
-    dp_nominal=20E4) "Pipe flow resistance"
-    annotation (Placement(transformation(extent={{-100,30},{-120,50}})));
-  Modelica.Blocks.Sources.RealExpression yEva(y=0) "Isolation valve signal"
-    annotation (Placement(transformation(extent={{-200,50},{-180,70}})));
-equation
-  connect(hexPum.port_b1,senT1OutPum.port_a)
-    annotation (Line(points={{40,-54},{70,-54},{70,-80},{90,-80}},color={0,127,255}));
-  connect(senT1OutPum.port_b, bou1Pum.ports[1]) annotation (Line(points={{110,-80},
-          {130,-80},{130,-63}}, color={0,127,255}));
-  connect(hexPum.port_a1,senT1InlPum.port_b)
-    annotation (Line(points={{20,-54},{10,-54},{10,-40},{90,-40}},   color={0,127,255}));
-  connect(senT1InlPum.port_a, bou1Pum.ports[2]) annotation (Line(points={{110,-40},
-          {130,-40},{130,-61}}, color={0,127,255}));
-  connect(hexPum.port_b2,senT2OutPum.port_a)
-    annotation (Line(points={{20,-66},{-10,-66},{-10,-40},{-30,-40}}, color={0,127,255}));
-  connect(senT2InlPum.port_b,hexPum.port_a2)
-    annotation (Line(points={{-30,-80},{50,-80},{50,-66},{40,-66}},color={0,127,255}));
-  connect(hexVal.port_a1,senT1InlVal.port_b)
-    annotation (Line(points={{20,26},{10,26},{10,40},{90,40}},   color={0,127,255}));
-  connect(senT1InlVal.port_a, bou1InlVal.ports[1])
-    annotation (Line(points={{110,40},{130,40}}, color={0,127,255}));
-  connect(bou1OutVal.ports[1], senT1OutVal.port_b)
-    annotation (Line(points={{130,0},{110,0}}, color={0,127,255}));
-  connect(senT1OutVal.port_a,hexVal.port_b1)
-    annotation (Line(points={{90,0},{60,0},{60,26},{40,26}},color={0,127,255}));
-  connect(hexVal.port_a2,senT2InlVal.port_b)
-    annotation (Line(points={{40,14},{50,14},{50,0},{-30,0}},color={0,127,255}));
-  connect(senT2OutVal.port_a,hexVal.port_b2)
-    annotation (Line(points={{-30,40},{-10,40},{-10,14},{20,14}}, color={0,127,255}));
-  connect(hexVal.port_a1,senRelPre.port_a)
-    annotation (Line(points={{20,26},{10,26},{10,40},{80,40},{80,30}},   color={0,127,255}));
-  connect(senRelPre.port_b,senT1OutVal.port_a)
-    annotation (Line(points={{80,10},{80,0},{90,0}},color={0,127,255}));
-  connect(TSerWat.y, bou1Pum.T_in) annotation (Line(points={{179,-60},{170,-60},
-          {170,-58},{152,-58}}, color={0,0,127}));
-  connect(TSerWat.y, bou1InlVal.T_in) annotation (Line(points={{179,-60},{170,-60},
-          {170,44},{152,44}}, color={0,0,127}));
-  connect(uCoo.y, hexVal.uCoo) annotation (Line(points={{-179,80},{0,80},{0,20},{18,20}},      color={255,0,255}));
-  connect(uCoo.y, hexPum.uCoo) annotation (Line(points={{-179,80},{0,80},{0,-60},{18,-60}},      color={255,0,255}));
-  connect(bou2.ports[1], senT2InlVal.port_a) annotation (Line(points={{-140,
-          -1.5},{-120,-1.5},{-120,0},{-50,0}},
-                                      color={0,127,255}));
-  connect(TChiWatRet.y, bou2.T_in) annotation (Line(points={{-179,20},{-172,20},
-          {-172,4},{-162,4}}, color={0,0,127}));
-  connect(pum2Pum.port_a, senT2OutPum.port_b)
-    annotation (Line(points={{-60,-40},{-50,-40}}, color={0,127,255}));
-  connect(resPum.port_a, pum2Pum.port_b)
-    annotation (Line(points={{-100,-40},{-80,-40}}, color={0,127,255}));
-  connect(dpSet.y, pum2Pum.dp_in) annotation (Line(points={{-178,-30},{-90,-30},
-          {-90,-20},{-70,-20},{-70,-28}}, color={0,0,127}));
-  connect(senT2OutVal.port_b, pum2Val.port_a)
-    annotation (Line(points={{-50,40},{-60,40}}, color={0,127,255}));
-  connect(pum2Val.port_b, resVal.port_a)
-    annotation (Line(points={{-80,40},{-100,40}}, color={0,127,255}));
-  connect(dpSet.y, pum2Val.dp_in) annotation (Line(points={{-178,-30},{-90,-30},
-          {-90,60},{-70,60},{-70,52}}, color={0,0,127}));
-  connect(resVal.port_b, bou2.ports[2]) annotation (Line(points={{-120,40},{
-          -140,40},{-140,-0.5}},
-                              color={0,127,255}));
-  connect(yEva.y, hexVal.yValIsoEva_actual) annotation (Line(points={{-179,60},
-          {-6,60},{-6,17},{18,17}}, color={0,0,127}));
-  connect(yEva.y, hexPum.yValIsoEva_actual) annotation (Line(points={{-179,60},
-          {-6.07143,60},{-6.07143,17.1429},{-6,17.1429},{-6,-63},{18,-63}},
-        color={0,0,127}));
-  connect(bou2.ports[3], resPum.port_b) annotation (Line(points={{-140,0.5},{
-          -140,-2},{-130,-2},{-130,-40},{-120,-40}}, color={0,127,255}));
-  connect(senT2InlPum.port_a, bou2.ports[4]) annotation (Line(points={{-50,-80},
-          {-140,-80},{-140,1.5}},color={0,127,255}));
-  annotation (
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-220,-120},{220,120}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=5000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.WatersideEconomizer</a>
-in a configuration where the primary flow rate is modulated by means of a
-two-way valve (see <code>hexVal</code>), and in a configuration where the
-primary flow rate is modulated by means of a variable speed pump
-(see <code>hexPum</code>).
-</p>
-</html>"));
-end WatersideEconomizer;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo
deleted file mode 100644
index b3a0467707a..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/WatersideEconomizer.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/WatersideEconomizer.mo
deleted file mode 100644
index 343d39ec1cf..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/WatersideEconomizer.mo
+++ /dev/null
@@ -1,261 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems;
-model WatersideEconomizer
-  "Base subsystem with waterside economizer"
-  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
-    final m1_flow_nominal=abs(Q_flow_nominal/4200/(T_b1_nominal - T_a1_nominal)),
-    final m2_flow_nominal=abs(Q_flow_nominal/4200/(T_b2_nominal - T_a2_nominal)));
-  parameter DHC.EnergyTransferStations.Types.ConnectionConfiguration conCon
-    "District connection configuration" annotation (Evaluate=true);
-  parameter Modelica.Units.SI.PressureDifference dp1Hex_nominal(displayUnit=
-        "Pa") "Nominal pressure drop across heat exchanger on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp2Hex_nominal(displayUnit=
-        "Pa") "Nominal pressure drop across heat exchanger on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpVal1_nominal(displayUnit=
-        "Pa") = if have_val1 then dp1Hex_nominal/2 else 0
-    "Nominal pressure drop of primary control valve"
-    annotation (Dialog(enable=have_val1, group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpVal2_nominal(displayUnit=
-        "Pa") = dp2Hex_nominal/10
-    "Nominal pressure drop of heat exchanger bypass valve"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal
-    "Nominal heat flow rate (from district to building)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_a1_nominal
-    "Nominal water inlet temperature on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_b1_nominal
-    "Nominal water outlet temperature on district side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_a2_nominal
-    "Nominal water inlet temperature on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature T_b2_nominal
-    "Nominal water outlet temperature on building side"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Real y1Min(final unit="1")=0.05
-    "Minimum pump flow rate or valve opening for temperature measurement (fractional)"
-    annotation (Dialog(group="Controls"));
-  parameter Modelica.Units.SI.TemperatureDifference dTEna=1
-    "Minimum delta-T above predicted heat exchanger leaving water temperature to enable WSE"
-    annotation (Dialog(group="Controls"));
-  parameter Modelica.Units.SI.TemperatureDifference dTDis=0.5
-    "Minimum delta-T across heat exchanger before disabling WSE"
-    annotation (Dialog(group="Controls"));
-  parameter Real k(
-    min=0)=1
-    "Gain of controller"
-    annotation (Dialog(group="Controls"));
-  parameter Modelica.Units.SI.Time Ti(min=Buildings.Controls.OBC.CDL.Constants.small)=
-       60 "Time constant of integrator block"
-    annotation (Dialog(group="Controls"));
-  // IO CONNECTORS
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
-    final unit="W") if not have_val1
-    "Power drawn by pump motors"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
-    iconTransformation(extent={{100,-20},{140,20}})));
-  // COMPONENTS
-  Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer conWSE(
-    final m2_flow_nominal=m2_flow_nominal,
-    final y1Min=y1Min,
-    final T_a1_nominal=T_a1_nominal,
-    final T_b2_nominal=T_b2_nominal,
-    final dTEna=dTEna,
-    final dTDis=dTDis)
-    "District heat exchanger loop controller"
-    annotation (Placement(transformation(extent={{30,150},{50,170}})));
-  Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU hex(
-    redeclare final package Medium1 = Medium1,
-    redeclare final package Medium2 = Medium2,
-    final use_Q_flow_nominal=true,
-    configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow,
-    final allowFlowReversal1=allowFlowReversal1,
-    final allowFlowReversal2=allowFlowReversal2,
-    final dp1_nominal=if have_val1 then 0 else dp1Hex_nominal,
-    final dp2_nominal=0,
-    final m1_flow_nominal=m1_flow_nominal,
-    final m2_flow_nominal=m2_flow_nominal,
-    final Q_flow_nominal=Q_flow_nominal,
-    final T_a1_nominal=T_a1_nominal,
-    final T_a2_nominal=T_a2_nominal)
-    "Heat exchanger" annotation (Placement(
-        transformation(extent={{10,10},{-10,-10}}, rotation=180)));
-  DHC.EnergyTransferStations.BaseClasses.Pump_m_flow pum1(
-    redeclare final package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final dp_nominal=dp1Hex_nominal,
-    final allowFlowReversal=allowFlowReversal1) if not have_val1
-    "District heat exchanger primary pump" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=180,
-        origin={-60,80})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatEnt(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final allowFlowReversal=allowFlowReversal2)
-    "Heat exchanger secondary water entering temperature" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={40,-60})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT2WatLvg(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=m2_flow_nominal,
-    final allowFlowReversal=allowFlowReversal2)
-    "Heat exchanger secondary water leaving temperature"
-    annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-40,-60})));
-  Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent val1(
-    redeclare final package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    from_dp=true,
-    final dpValve_nominal=dpVal1_nominal,
-    final dpFixed_nominal=dp1Hex_nominal,
-    use_inputFilter=false) if have_val1
-    "Heat exchanger primary control valve"
-    annotation (Placement(transformation(extent={{70,70},{90,90}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(final k=
-        m1_flow_nominal) if not have_val1 "Scale to nominal mass flow rate"
-    annotation (Placement(transformation(extent={{10,100},{-10,120}})));
-  Buildings.Fluid.Actuators.Valves.ThreeWayLinear val2(
-    redeclare final package Medium = Medium2,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
-    final m_flow_nominal=m2_flow_nominal,
-    final dpValve_nominal=dpVal2_nominal,
-    final dpFixed_nominal={dp2Hex_nominal,0},
-    fraK=1) "Heat exchanger secondary control valve" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={20,-40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senT1WatEnt(
-    redeclare final package Medium = Medium1,
-    final m_flow_nominal=m1_flow_nominal,
-    final allowFlowReversal=allowFlowReversal1)
-    "Heat exchanger primary water entering temperature" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-20,40})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uCoo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-140,140},{-100,180}}),
-    iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValIsoEva_actual(final unit="1")
-    "Return position of evaporator to ambient loop isolation valve"
-    annotation (Placement(transformation(extent={{-140,110},{-100,150}}),
-    iconTransformation(extent={{-140,-50},{-100,-10}})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo2(redeclare final package
-      Medium = Medium2, final allowFlowReversal=allowFlowReversal2)
-    "Heat exchanger secondary mass flow rate" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-80,-60})));
-protected
-  parameter Boolean have_val1=
-    conCon ==Buildings.Experimental.DHC.EnergyTransferStations.Types.ConnectionConfiguration.TwoWayValve
-    "True in case of control valve on district side, false in case of a pump";
-equation
-  if not have_val1 then
-    connect(hex.port_b1, port_b1) annotation (Line(points={{10,6},{20,6},{20,60},
-            {100,60}}, color={0,127,255}));
-  else
-    connect(port_a1, senT1WatEnt.port_a) annotation (Line(points={{-100,60},{-20,60},{-20,50}}, color={0,127,255}));
-  end if;
-  connect(port_a1,pum1.port_a)
-    annotation (Line(points={{-100,60},{-90,60},{-90,80},{-70,80}},color={0,127,255}));
-  connect(val1.port_b,port_b1)
-    annotation (Line(points={{90,80},{94,80},{94,60},{100,60}},color={0,127,255}));
-  connect(conWSE.y1, val1.y) annotation (Line(points={{52,165},{80,165},{80,92}},  color={0,0,127}));
-  connect(conWSE.y1, gai1.u) annotation (Line(points={{52,165},{80,165},{80,110},
-          {12,110}},                                                                           color={0,0,127}));
-  connect(gai1.y,pum1.m_flow_in)
-    annotation (Line(points={{-12,110},{-60,110},{-60,92}},color={0,0,127}));
-  connect(PPum, pum1.P) annotation (Line(points={{120,0},{44,0},{44,89},{-49,89}}, color={0,0,127}));
-  connect(conWSE.yVal2, val2.y)
-    annotation (Line(points={{52,155},{60,155},{60,-40},{32,-40}},        color={0,0,127}));
-  connect(port_a2, senT2WatEnt.port_a) annotation (Line(points={{100,-60},{50,-60}}, color={0,127,255}));
-  connect(hex.port_b2, senT2WatLvg.port_a)
-    annotation (Line(points={{-10,-6},{-20,-6},{-20,-60},{-30,-60}}, color={0,127,255}));
-  connect(senT1WatEnt.port_b, hex.port_a1) annotation (Line(points={{-20,30},
-          {-20,6},{-10,6}},                                                                       color={0,127,255}));
-  connect(senT1WatEnt.port_a, pum1.port_b)
-    annotation (Line(points={{-20,50},{-20,80},{-50,80}}, color={0,127,255}));
-  connect(hex.port_b1, val1.port_a) annotation (Line(points={{10,6},{20,6},{
-          20,80},{70,80}},                                                                      color={0,127,255}));
-  connect(uCoo, conWSE.uCoo) annotation (Line(points={{-120,160},{-40,160},{-40,168},{28,168}}, color={255,0,255}));
-  connect(senT1WatEnt.T, conWSE.T1WatEnt)
-    annotation (Line(points={{-31,40},{-38,40},{-38,162},{28,162}}, color={0,0,127}));
-  connect(conWSE.T2WatEnt, senT2WatEnt.T)
-    annotation (Line(points={{28,159},{20,159},{20,140},{40,140},{40,-49},{40,-49}}, color={0,0,127}));
-  connect(senT2WatLvg.T, conWSE.T2WatLvg)
-    annotation (Line(points={{-40,-49},{-40,156},{28,156}}, color={0,0,127}));
-  connect(yValIsoEva_actual, conWSE.yValIsoEva_actual)
-    annotation (Line(points={{-120,130},{24,130},{24,153},{28,153}}, color={0,0,127}));
-  connect(val2.port_3, senT2WatLvg.port_a)
-    annotation (Line(points={{10,-40},{-20,-40},{-20,-60},{-30,-60}}, color={0,127,255}));
-  connect(val2.port_1, hex.port_a2)
-    annotation (Line(points={{20,-30},{20,-6},{10,-6}}, color={0,127,255}));
-  connect(val2.port_2, senT2WatEnt.port_b)
-    annotation (Line(points={{20,-50},{20,-60},{30,-60}}, color={0,127,255}));
-  connect(port_b2, senMasFlo2.port_b)
-    annotation (Line(points={{-100,-60},{-90,-60}}, color={0,127,255}));
-  connect(senMasFlo2.port_a, senT2WatLvg.port_b)
-    annotation (Line(points={{-70,-60},{-50,-60}}, color={0,127,255}));
-  connect(senMasFlo2.m_flow, conWSE.m2_flow)
-    annotation (Line(points={{-80,-49},{-80,165},{28,165}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="hex",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}}),
-      graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,60},{60,-60}},
-          lineColor={27,0,55},
-          fillColor={170,213,255},
-          fillPattern=FillPattern.Solid)}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-160},{100,180}})),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 14, 2021, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This is a model for a waterside economizer for sidestream integration (in
-series with the chillers).
-The primary side is typically connected to the service line.
-The primary flow rate is modulated either with a variable speed pump or
-with a two-way valve.
-The secondary side is typically connected to the chilled water return,
-using a three-port two-position directional control valve.
-</p>
-<p>
-The system is controlled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Controls.WatersideEconomizer</a>.
-</p>
-</html>"));
-end WatersideEconomizer;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.mo
deleted file mode 100644
index 9325bac7e5f..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-package Subsystems "Package of models for subsystems of fifth generation DHC ETS"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for subsystems composing energy transfer stations in
-fifth generation district heating and cooling systems.
-</p>
-</html>"));
-end Subsystems;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo
deleted file mode 100644
index f35b9964293..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/BaseClasses/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mo
deleted file mode 100644
index 14580dafc6d..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mo
+++ /dev/null
@@ -1,48 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
-model ChillerBorefield
-  "Validation of the ETS model with heat recovery chiller and borefield"
-  extends ChillerOnly(
-    ets(
-      have_borFie=true,
-      datBorFie=datBorFie));
-  parameter Integer nBorHol=64
-    "Number of boreholes (must be a square number)";
-  parameter Modelica.Units.SI.Distance dxy=6
-    "Distance in x-axis (and y-axis) between borehole axes";
-  final parameter Modelica.Units.SI.Distance cooBor[nBorHol,2]=
-      Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.computeCoordinates(nBorHol, dxy)
-    "Coordinates of boreholes";
-  parameter Fluid.Geothermal.Borefields.Data.Borefield.Example datBorFie(
-    conDat=Fluid.Geothermal.Borefields.Data.Configuration.Example(
-      dp_nominal=0,
-      cooBor=cooBor))
-    "Borefield design data"
-    annotation (Placement(transformation(extent={{60,180},{80,200}})));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos" "Simulate and plot"),
-    experiment(
-      StopTime=360000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
-in a system configuration including a geothermal borefield.
-See
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly</a>
-for the description of the main modeling assumptions.
-</p>
-</html>"));
-end ChillerBorefield;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mo
deleted file mode 100644
index 7aa62903c94..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mo
+++ /dev/null
@@ -1,65 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
-model ChillerOnly
-  "Validation of the ETS model with heat recovery chiller"
-  extends Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield;
-  Modelica.Blocks.Sources.CombiTimeTable TDisWatSup(
-    tableName="tab1",
-    table=[
-      0,11;
-      49,11;
-      50,20;
-      100,20],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    timeScale=3600,
-    offset={273.15},
-    columns={2},
-    smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1)
-    "District water supply temperature"
-    annotation (Placement(transformation(extent={{-330,-150},{-310,-130}})));
-equation
-  connect(TDisWatSup.y[1],disWat.T_in)
-    annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
-  connect(loa.y[2],heaLoaNor.u)
-    annotation (Line(points={{-309,160},{-300,160},{-300,60},{-252,60}},color={0,0,127}));
-  connect(loa.y[1],loaCooNor.u)
-    annotation (Line(points={{-309,160},{280,160},{280,60},{272,60}},color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos" "Simulate and plot"),
-    experiment(
-      StopTime=360000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
-in a system configuration with no geothermal borefield.
-</p>
-<ul>
-<li>
-A fictitious load profile is used, consisting in the succession of five load
-patterns.
-</li>
-<li>
-Each load pattern is simulated with two values of the district water supply
-temperature, corresponding to typical extreme values over a whole year
- of operation.
-</li>
-<li>
-The other modeling assumptions are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
-</li>
-</ul>
-</html>"));
-end ChillerOnly;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mo
deleted file mode 100644
index 50a410fc75b..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mo
+++ /dev/null
@@ -1,68 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation;
-model ChillerWSE
-  "Validation of the ETS model with heat recovery chiller and waterside economizer"
-  extends ChillerOnly(
-    ets(
-      have_WSE=true), TChiWatSupSet(k=12 + 273.15));
-  Modelica.Blocks.Sources.CombiTimeTable TDisWatSup(
-    tableName="tab1",
-    table=[
-      0,11;
-      49,11;
-      50,20;
-      100,20],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    timeScale=3600,
-    offset={273.15},
-    columns={2},
-    smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1)
-    "District water supply temperature"
-    annotation (Placement(transformation(extent={{-330,-150},{-310,-130}})));
-equation
-  connect(TDisWatSup.y[1],disWat.T_in)
-    annotation (Line(points={{-309,-140},{-140,-140},{-140,-136},{-122,-136}},color={0,0,127}));
-  connect(loa.y[2],heaLoaNor.u)
-    annotation (Line(points={{-309,160},{-300,160},{-300,60},{-252,60}},color={0,0,127}));
-  connect(loa.y[1],loaCooNor.u)
-    annotation (Line(points={{-309,160},{280,160},{280,60},{272,60}},color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=360000,
-      Tolerance=1e-06),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-July 31, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield</a>
-in a system configuration with no geothermal borefield.
-</p>
-<ul>
-<li>
-A fictitious load profile is used, consisting in the succession of five load
-patterns.
-</li>
-<li>
-Each load pattern is simulated with two values of the district water supply
-temperature, corresponding to typical extreme values over a whole year
- of operation.
-</li>
-<li>
-The other modeling assumptions are described in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.BaseClasses.PartialChillerBorefield</a>.
-</li>
-</ul>
-</html>"));
-end ChillerWSE;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.mo
deleted file mode 100644
index d18031f4844..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/Validation/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Combined;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.mo
deleted file mode 100644
index 6aa1f50941c..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
-package Combined "Package of models for DHC energy transfer stations"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for energy transfer stations used in
-district heating and cooling systems.
-</p>
-</html>"));
-end Combined;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo
deleted file mode 100644
index 3f842091396..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo
+++ /dev/null
@@ -1,81 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling;
-model Direct "Direct cooling ETS model for district energy systems with in-building
-  pumping and deltaT control"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect(
-      final typ=DHC.Types.DistrictSystemType.Cooling,
-      final have_chiWat=true,
-      final have_heaWat=false,
-      con(reverseActing=false),
-      nPorts_aChiWat=1,
-      nPorts_bChiWat=1);
-equation
-  connect(port_aSerCoo, senTDisSup.port_a)
-    annotation (Line(points={{-300,-280},{-180,-280}}, color={0,127,255}));
-  connect(ports_aChiWat[1], senTBuiRet.port_a)
-    annotation (Line(points={{-300,200},{-220,200}}, color={0,127,255}));
-  connect(senTDisRet.port_b, port_bSerCoo) annotation (Line(points={{50,200},{160,
-          200},{160,-240},{260,-240},{260,-280},{300,-280}}, color={0,127,255}));
-  connect(senTBuiSup.port_b, ports_bChiWat[1])
-    annotation (Line(points={{250,200},{300,200}}, color={0,127,255}));
- annotation (
-    defaultComponentName="etsCoo",
-    Documentation(info="<html>
-<p>
-Direct cooling energy transfer station (ETS) model with in-building pumping and
-deltaT control. The design is based on a typical district cooling ETS described
-in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Cooling Guide</a>.
-As shown in the figure below, the district and building piping are hydronically
-coupled. The control valve ensures that the return temperature to the district
-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\"/>
-</p>
-<h4>
-Reference
-</h4>
-<p>American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2019).
-Chapter 5: End User Interface. In <i>District Cooling Guide</i>, Second Edition and
-<i>Owner's Guide for Buildings Served by District Cooling</i>.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-May 5, 2023, by David Blum:<br/>
-Removed assignment of check valve <code>allowFlowReversal=false</code>.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3389\">#3389</a>.
-</li>
-<li>
-April 7, 2023, by David Blum:<br/>
-Change to extend from <code>Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect</code>.
-</li>
-<li>
-January 11, 2023, by Michael Wetter:<br/>
-Changed controls to use CDL. Changed PID to PI as default for controller.
-</li>
-<li>
-January 2, 2023, by Kathryn Hinkelman:<br/>
-Set pressure drops at junctions to 0 and removed parameter <code>dp_nominal</code>
-</li>
-<li>
-December 28, 2022, by Kathryn Hinkelman:<br/>
-Simplified the control implementation for the district return stream. Improved default control parameters.
-</li>
-<li>
-December 23, 2022, by Kathryn Hinkelman:<br/>
-Removed extraneous <code>m*_flow_nominal</code> parameters because
-<code>mBui_flow_nominal</code> can be used across all components.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-<li>
-November 11, 2022, by Michael Wetter:<br/>
-Changed check valve to use version of <code>Buildings</code> library, and hence no outer <code>system</code> is needed.
-</li>
-<li>March 20, 2022, by Chengnan Shi:<br/>Update with base class partial model and standard PI control.</li>
-<li>Novermber 13, 2019, by Kathryn Hinkelman:<br/>First implementation. </li>
-</ul>
-</html>"));
-end Direct;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mo
deleted file mode 100644
index 904a2a21f26..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mo
+++ /dev/null
@@ -1,163 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples;
-model Direct "Example model for direct cooling energy transfer station
-  with in-building pumping and controlled district return temperature"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Water medium";
-  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=-18000
-    "Nominal cooling load (negative for cooling)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=-Q_flow_nominal/(cp*(18-7))
-    "Nominal mass flow rate of building cooling supply"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
-    Medium.setState_pTX(
-      Medium.p_default,
-      Medium.T_default,
-      Medium.X_default))
-    "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct cooETS(
-    mBui_flow_nominal=mBui_flow_nominal,
-    QChiWat_flow_nominal=Q_flow_nominal,
-    dpConVal_nominal=50,
-    dpCheVal_nominal=6000,
-    nPorts_bChiWat=1,
-    nPorts_aChiWat=1) "Energy transfer station"
-    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  Modelica.Blocks.Sources.Constant TSetDisRet_min(k=273.15 + 16)
-    "Minimum setpoint temperature for district return"
-    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
-  Buildings.Fluid.Sources.Boundary_pT sinDis(
-    redeclare package Medium = Medium,
-    p=340000,
-    nPorts=1)
-    "District-side sink"
-    annotation (Placement(transformation(extent={{80,-80},{60,-60}})));
-  Buildings.Fluid.Sources.Boundary_pT souDis(
-    redeclare package Medium = Medium,
-    p=350000,
-    use_T_in=true,
-    T=280.15,
-    nPorts=1)
-    "District-side source"
-    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
-  Modelica.Blocks.Sources.RealExpression TDisSupNoi(
-    y=(273.15 + 7) + 2*sin(time*4*3.14/86400))
-    "Sinusoidal noise signal for district supply temperature"
-    annotation (Placement(transformation(extent={{-120,-76},{-100,-56}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow pum(
-    redeclare replaceable package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    m_flow_nominal=mBui_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true,
-    constantMassFlowRate=mBui_flow_nominal)
-    "Building primary pump"
-    annotation (Placement(transformation(extent={{40,20},{60,40}})));
-  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
-    redeclare package Medium = Medium,
-    allowFlowReversal=false,
-    m_flow_nominal=mBui_flow_nominal,
-    show_T=true,
-    from_dp=false,
-    dp_nominal=100,
-    linearizeFlowResistance=true,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1)
-    "Aggregate building cooling load"
-    annotation (Placement(transformation(extent={{20,40},{0,60}})));
-  Modelica.Blocks.Sources.Ramp ram(
-    height=1,
-    duration(displayUnit="h") = 3600,
-    startTime(displayUnit="h"))
-    "Ramp load from zero"
-    annotation (Placement(transformation(extent={{-120,80},{-100,100}})));
-  Modelica.Blocks.Sources.CombiTimeTable QCoo(
-    table=[
-    0,-100E3;
-    6,-80E3;
-    6,-50E3;
-    12,-20E3;
-    18,-150E3;
-    24,-100E3],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    timeScale=3600)
-    "Cooling demand"
-    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
-  Modelica.Blocks.Math.Product pro
-    "Multiplier to ramp load from zero"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-  Modelica.Blocks.Math.Gain gai(k=-1/(cp*(16 - 7)))
-    "Multiplier gain for calculating m_flow"
-    annotation (Placement(transformation(extent={{0,80},{20,100}})));
-equation
-  connect(TSetDisRet_min.y,cooETS.TDisRetSet)
-    annotation (Line(points={{-99,-10},{-0.6,-10}}, color={0,0,127}));
-  connect(TDisSupNoi.y, souDis.T_in)
-    annotation (Line(points={{-99,-66},{-62,-66}}, color={0,0,127}));
-  connect(souDis.ports[1], cooETS.port_aSerCoo)
-    annotation (Line(points={{-40,-70},{-20,-70},{-20,-19.3333},{0,-19.3333}},
-      color={0,127,255}));
-  connect(cooETS.port_bSerCoo, sinDis.ports[1])
-    annotation (Line(points={{20,-19.3333},{40,-19.3333},{40,-70},{60,-70}},
-      color={0,127,255}));
-  connect(cooETS.ports_bChiWat[1], pum.port_a)
-    annotation (Line(points={{20,-4.66667},{30,-4.66667},{30,30},{40,30}},
-      color={0,127,255}));
-  connect(pum.port_b, loa.port_a)
-    annotation (Line(points={{60,30},{80,30},{80,50},{20,50}},
-      color={0,127,255}));
-  connect(loa.port_b, cooETS.ports_aChiWat[1])
-    annotation (Line(points={{0,50},{-40,50},{-40,-4.66667},{0,-4.66667}},
-      color={0,127,255}));
-  connect(ram.y, pro.u1)
-    annotation (Line(points={{-99,90},{-92,90},{-92,76},{-82,76}},
-      color={0,0,127}));
-  connect(QCoo.y[1], pro.u2)
-    annotation (Line(points={{-99,50},{-92,50},{-92,64},{-82,64}},
-      color={0,0,127}));
-  connect(pro.y, loa.u)
-    annotation (Line(points={{-59,70},{32,70},{32,56},{22,56}},
-      color={0,0,127}));
-  connect(pro.y, gai.u)
-    annotation (Line(points={{-59,70},{-40,70},{-40,90},{-2,90}},
-      color={0,0,127}));
-  connect(gai.y, pum.m_flow_in)
-    annotation (Line(points={{21,90},{50,90},{50,42}}, color={0,0,127}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-160,-120},{160,120}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos" "Simulate and plot"),
-    experiment(
-      StartTime=0,
-      StopTime=86400,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>This model provides an example for the direct cooling energy transfer station
-model, which contains in-building pumping and controls the district return
-temperature. The building's primary variable speed pump is modulated depending
-on the total cooling load and prescribed deltaT. Variation in the district
-supply temperature is modeled as a sinusoidal signal to test the response of system.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-December 23, 2022, by Kathryn Hinkelman:<br/>
-Removed extraneous <code>m*_flow_nominal</code> parameters because
-<code>mBui_flow_nominal</code> can be used across all components.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-<li>November 15, 2022, by Kathryn Hinkelman:<br/>
-Corrected pressure balance across bypass leg and system.
-</li>
-<li>March 20, 2022, by Chengnan Shi:<br/>First implementation.</li>
-</ul>
-</html>"));
-end Direct;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mo
deleted file mode 100644
index bdd28cab79e..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mo
+++ /dev/null
@@ -1,168 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples;
-model Indirect "Example model for indirect cooling energy transfer station
-  with a closed chilled water loop on the building side"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Water medium";
-  parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal = -19000
-    "Cooling design flow rate";
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal = 16-7
-    "Design temperature difference";
-  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=-QCoo_flow_nominal/dT_nominal/cp
-    "Nominal mass flow rate of building cooling supply"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
-    Medium.setState_pTX(
-      Medium.p_default,
-      Medium.T_default,
-      Medium.X_default))
-    "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Indirect cooETS(
-    QChiWat_flow_nominal=QCoo_flow_nominal,
-    mDis_flow_nominal=mBui_flow_nominal,
-    mBui_flow_nominal=mBui_flow_nominal,
-    dpConVal_nominal=9000,
-    dp1_nominal=9000,
-    dp2_nominal=9000,
-    Q_flow_nominal=QCoo_flow_nominal,
-    T_a1_nominal=278.15,
-    T_a2_nominal=289.15,
-    k=0.1,
-    Ti=40,
-    yMax=1,
-    yMin=0.01,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    nPorts_bChiWat=1,
-    nPorts_aChiWat=1) "Direct cooling energy transfer station"
-    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
-  Buildings.Fluid.Sources.Boundary_pT souDis(
-    redeclare package Medium = Medium,
-    p(displayUnit="Pa") = 300000 + 2*9000,
-    use_T_in=false,
-    T=278.15,
-    nPorts=1)
-    "District (primary) source"
-    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
-  Buildings.Fluid.Sources.Boundary_pT sinDis(
-    redeclare package Medium = Medium,
-    T=287.15,
-    nPorts=1)
-    "District (primary) sink"
-    annotation (Placement(transformation(extent={{100,-80},{80,-60}})));
-  Modelica.Blocks.Sources.Constant TSetCHWS(
-    k=273.15+7)
-    "Setpoint temperature for building chilled water supply"
-    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
-    redeclare package Medium = Medium,
-    allowFlowReversal=false,
-    m_flow_nominal=mBui_flow_nominal,
-    show_T=true,
-    from_dp=false,
-    dp_nominal=6000,
-    linearizeFlowResistance=true,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
-    Q_flow_nominal=-1)
-    "Aggregate building cooling load"
-    annotation (Placement(transformation(extent={{40,40},{20,60}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow pumBui(
-    redeclare replaceable package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    allowFlowReversal=false,
-    m_flow_nominal=mBui_flow_nominal,
-    nominalValuesDefineDefaultPressureCurve=true,
-    dp_nominal=6000+9000)
-    "Building-side (secondary) pump"
-    annotation (Placement(transformation(extent={{80,40},{60,60}})));
-  Modelica.Blocks.Sources.CombiTimeTable QCoo(
-    table=[
-      0,-10E3;
-      6,-8E3;
-      6,-5E3;
-      12,-2E3;
-      18,-15E3;
-      24,-10E3],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    timeScale=3600)
-    "Cooling demand"
-    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
-  Modelica.Blocks.Math.Product pro
-    "Multiplier to ramp load from zero"
-    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
-  Modelica.Blocks.Sources.Ramp ram(
-    height=1,
-    duration(displayUnit="h")=18000,
-    startTime(displayUnit="h")=3600) "Ramp load from zero"
-    annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
-  Modelica.Blocks.Math.Gain gai(
-    k=-1/(cp*dT_nominal))
-    "Multiplier gain for calculating m_flow"
-    annotation (Placement(transformation(extent={{-40,100},{-20,120}})));
-  Buildings.Fluid.Sources.Boundary_pT souBui(
-    redeclare package Medium = Medium,
-    nPorts=1)
-    "Building (secondary) source"
-    annotation (Placement(transformation(extent={{128,64},{108,84}})));
-equation
-  connect(cooETS.ports_bChiWat[1], pumBui.port_a) annotation (Line(points={{40,
-          -24.6667},{100,-24.6667},{100,50},{80,50}},
-                                            color={0,127,255}));
-  connect(pumBui.port_b, loa.port_a)
-    annotation (Line(points={{60,50},{40,50}}, color={0,127,255}));
-  connect(loa.port_b, cooETS.ports_aChiWat[1]) annotation (Line(points={{20,50},
-          {-20,50},{-20,-24.6667},{20,-24.6667}},
-                                            color={0,127,255}));
-  connect(QCoo.y[1], gai.u)
-    annotation (Line(points={{-79,110},{-42,110}}, color={0,0,127}));
-  connect(gai.y, pumBui.m_flow_in)
-    annotation (Line(points={{-19,110},{70,110},{70,62}}, color={0,0,127}));
-  connect(ram.y, pro.u2) annotation (Line(points={{-79,70},{-60,70},{-60,64},{-42,
-          64}}, color={0,0,127}));
-  connect(QCoo.y[1], pro.u1) annotation (Line(points={{-79,110},{-60,110},{-60,76},
-          {-42,76}}, color={0,0,127}));
-  connect(pro.y, loa.u) annotation (Line(points={{-19,70},{50,70},{50,56},{42,56}},
-        color={0,0,127}));
-  connect(souDis.ports[1], cooETS.port_aSerCoo) annotation (Line(points={{-20,-70},
-          {0,-70},{0,-39.3333},{20,-39.3333}}, color={0,127,255}));
-  connect(cooETS.port_bSerCoo, sinDis.ports[1]) annotation (Line(points={{40,
-          -39.3333},{60,-39.3333},{60,-70},{80,-70}},
-                                            color={0,127,255}));
-  connect(TSetCHWS.y,cooETS.TBuiSupSet)
-    annotation (Line(points={{-59,-30},{19.3333,-30}}, color={0,0,127}));
-  connect(pumBui.port_a, souBui.ports[1]) annotation (Line(points={{80,50},{94,50},
-          {94,74},{108,74}}, color={0,127,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-140,-140},{140,140}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos" "Simulate and plot"),
-    experiment(
-      StartTime=0,
-      StopTime=86400,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-This model provides an example for the indirect cooling energy transfer station model.
-The cooling load ramps up from zero and is modulated according to the QCoo table specification.
-The mass flow rate of chilled water in the building side is varied based on the building load/demand.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-January 30, 2023:<br/>
-Corrected parameterization.
-</li>
-<li>
-March 20, 2022, by Chengnan Shi:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Indirect;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.mo
deleted file mode 100644
index 04e83cf74aa..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling;
-package Examples
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (Documentation(revisions="<html>
-</html>", info="<html>
-<p>This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.mo
deleted file mode 100644
index 59b0595dbae..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.mo
+++ /dev/null
@@ -1,72 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Cooling;
-model Indirect
-  "Indirect cooling energy transfer station for district energy systems"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect(
-      QChiWat_flow_nominal=-Q_flow_nominal,
-      final typ=DHC.Types.DistrictSystemType.Cooling,
-      final have_chiWat=true,
-      final have_heaWat=false,
-      Q_flow_nominal(max=0),
-      nPorts_aChiWat=1,
-      nPorts_bChiWat=1,
-      con(reverseActing=false));
-equation
-  connect(senTBuiRet.port_a, ports_aChiWat[1])
-    annotation (Line(points={{-218,200},{-300,200}}, color={0,127,255}));
-  connect(senTBuiSup.port_b, ports_bChiWat[1]) annotation (Line(points={{-36,
-          -204},{-80,-204},{-80,160},{180,160},{180,200},{300,200}}, color={0,
-          127,255}));
-  connect(senTDisRet.port_b, port_bSerCoo)
-    annotation (Line(points={{200,-280},{300,-280}}, color={0,127,255}));
-  connect(port_aSerCoo, senTDisSup.port_a)
-    annotation (Line(points={{-300,-280},{-220,-280}}, color={0,127,255}));
-  annotation (
-    defaultComponentName="etsCoo",
-    Documentation(info="<html>
-<p>
-Indirect cooling energy transfer station (ETS) model that controls the
-building chilled water supply temperature by modulating a primary control valve
-on the district supply side. The design is based on a typical district cooling
-ETS described in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Cooling Guide</a>.
-As shown in the figure below, the building pumping design (constant/variable)
-is specified on the building side and not within the ETS.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
-</p>
-<h4>Reference</h4>
-<p>
-American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2019).
-Chapter 5: End User Interface. In <i>District Cooling Guide</i>, Second Edition and
-<i>Owner's Guide for Buildings Served by District Cooling</i>.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-May 30, 2023, by David Blum:<br/>
-Change to extend from <code>Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect</code>.
-</li>
-<li>
-March 16, 2023, by David Blum:<br/>
-Fixed building supply temperature controller parameter <code>reverseActing</code>
-by changing from <code>true</code> to <code>false</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3299\">
-issue 3299</a>.
-</li>
-<li>
-January 11, 2023, by Michael Wetter:<br/>
-Changed controls to use CDL. Changed PID to PI as default for controller.
-</li>
-<li>
-March 21, 2022, by Chengnan Shi:<br/>
-Update with base class partial model.
-</li>
-<li>Novermber 13, 2019, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Indirect;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.mo
deleted file mode 100644
index 5f99f7848c0..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Cooling/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
-package Cooling "This package contains models for energy transfer stations used in district cooling systems"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains models for energy transfer stations used
-in district cooling systems.
-</p>
-</html>"));
-end Cooling;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo
deleted file mode 100644
index 8111c6cba8f..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo
+++ /dev/null
@@ -1,58 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating;
-model Direct "Direct heating ETS model for district energy systems with in-building
-  pumping and deltaT control"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect(
-      final typ=DHC.Types.DistrictSystemType.HeatingGeneration2to4,
-      final have_chiWat=false,
-      final have_heaWat=true,
-      nPorts_aHeaWat=1,
-      nPorts_bHeaWat=1);
-equation
-  connect(senTDisRet.port_b, port_bSerHea) annotation (Line(points={{50,200},{160,
-          200},{160,-240},{300,-240}}, color={0,127,255}));
-  connect(port_aSerHea, senTDisSup.port_a) annotation (Line(points={{-300,-240},
-          {-220,-240},{-220,-280},{-180,-280}}, color={0,127,255}));
-  connect(ports_aHeaWat[1], senTBuiRet.port_a) annotation (Line(points={{-300,260},
-          {-240,260},{-240,200},{-220,200}}, color={0,127,255}));
-  connect(senTBuiSup.port_b, ports_bHeaWat[1]) annotation (Line(points={{250,200},
-          {260,200},{260,260},{300,260}}, color={0,127,255}));
- annotation (
-    defaultComponentName="etsCoo",
-    Documentation(info="<html>
-<p>
-Direct heating energy transfer station (ETS) model with in-building pumping and
-deltaT control. The design is based on a typical district heating ETS described
-in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Heating Guide</a>.
-As shown in the figure below, the district and building piping are hydronically
-coupled. The control valve ensures that the return temperature to the district
-heating network is at or below the maximum 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\"/>
-</p>
-<h4>
-Reference
-</h4>
-<p>
-American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2013).
-Chapter 5: Consumer Interconnection. In <i>District Heating Guide</i>.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-January 8, 2024, by David Blum:<br/>
-Correct documentation to describe heating.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
-issue 3628</a>.
-</li>
-<li>
-April 7, 2023, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Direct;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mo
deleted file mode 100644
index 607023fcbb2..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mo
+++ /dev/null
@@ -1,146 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples;
-model Direct "Example model for direct heating energy transfer station
-  with in-building pumping and controlled district return temperature"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Water medium";
-  parameter Modelica.Units.SI.HeatFlowRate Q_flow_nominal=18000
-    "Nominal heating load"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=Q_flow_nominal/(cp*(50-40))
-    "Nominal mass flow rate of building heating supply"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
-    Medium.setState_pTX(
-      Medium.p_default,
-      Medium.T_default,
-      Medium.X_default))
-    "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct heaETS(
-    mBui_flow_nominal=mBui_flow_nominal,
-    QHeaWat_flow_nominal=Q_flow_nominal,
-    dpConVal_nominal=50,
-    dpCheVal_nominal=6000,
-    nPorts_bHeaWat=1,
-    nPorts_aHeaWat=1) "Energy transfer station"
-    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  Modelica.Blocks.Sources.Constant TSetDisRet_max(k=273.15 + 40)
-    "Maximum setpoint temperature for district return"
-    annotation (Placement(transformation(extent={{-120,-20},{-100,0}})));
-  Buildings.Fluid.Sources.Boundary_pT sinDis(
-    redeclare package Medium = Medium,
-    p=340000,
-    nPorts=1)
-    "District-side sink"
-    annotation (Placement(transformation(extent={{80,-80},{60,-60}})));
-  Buildings.Fluid.Sources.Boundary_pT souDis(
-    redeclare package Medium = Medium,
-    p=350000,
-    use_T_in=true,
-    T=280.15,
-    nPorts=1)
-    "District-side source"
-    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
-  Modelica.Blocks.Sources.RealExpression TDisSupNoi(y=(273.15 + 50) + 2*sin(
-        time*4*3.14/86400))
-    "Sinusoidal noise signal for district supply temperature"
-    annotation (Placement(transformation(extent={{-120,-76},{-100,-56}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow pum(
-    redeclare replaceable package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    m_flow_nominal=mBui_flow_nominal,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true,
-    constantMassFlowRate=mBui_flow_nominal)
-    "Building primary pump"
-    annotation (Placement(transformation(extent={{40,20},{60,40}})));
-  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
-    redeclare package Medium = Medium,
-    allowFlowReversal=false,
-    m_flow_nominal=mBui_flow_nominal,
-    show_T=true,
-    from_dp=false,
-    dp_nominal=100,
-    linearizeFlowResistance=true,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    Q_flow_nominal=-1)
-    "Aggregate building heating load"
-    annotation (Placement(transformation(extent={{20,40},{0,60}})));
-  Modelica.Blocks.Sources.Ramp ram(
-    height=1,
-    duration(displayUnit="h") = 3600,
-    startTime(displayUnit="h"))
-    "Ramp load from zero"
-    annotation (Placement(transformation(extent={{-120,80},{-100,100}})));
-  Modelica.Blocks.Sources.CombiTimeTable QHea(
-    table=[0,100E3; 6,80E3; 6,50E3; 12,20E3; 18,150E3; 24,100E3],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    timeScale=3600) "Heating demand"
-    annotation (Placement(transformation(extent={{-120,40},{-100,60}})));
-  Modelica.Blocks.Math.Product pro
-    "Multiplier to ramp load from zero"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-  Modelica.Blocks.Math.Gain gai(k=1/(cp*(50 - 40)))
-    "Multiplier gain for calculating m_flow"
-    annotation (Placement(transformation(extent={{0,80},{20,100}})));
-equation
-  connect(TSetDisRet_max.y,heaETS.TDisRetSet)
-    annotation (Line(points={{-99,-10},{-0.6,-10}}, color={0,0,127}));
-  connect(TDisSupNoi.y, souDis.T_in)
-    annotation (Line(points={{-99,-66},{-62,-66}}, color={0,0,127}));
-  connect(pum.port_b, loa.port_a)
-    annotation (Line(points={{60,30},{80,30},{80,50},{20,50}},
-      color={0,127,255}));
-  connect(ram.y, pro.u1)
-    annotation (Line(points={{-99,90},{-92,90},{-92,76},{-82,76}},
-      color={0,0,127}));
-  connect(QHea.y[1], pro.u2)
-    annotation (Line(points={{-99,50},{-92,50},{-92,64},{-82,64}},
-      color={0,0,127}));
-  connect(pro.y, loa.u)
-    annotation (Line(points={{-59,70},{32,70},{32,56},{22,56}},
-      color={0,0,127}));
-  connect(pro.y, gai.u)
-    annotation (Line(points={{-59,70},{-40,70},{-40,90},{-2,90}},
-      color={0,0,127}));
-  connect(gai.y, pum.m_flow_in)
-    annotation (Line(points={{21,90},{50,90},{50,42}}, color={0,0,127}));
-  connect(heaETS.ports_bHeaWat[1], pum.port_a) annotation (Line(points={{20,-1.33333},
-          {34,-1.33333},{34,30},{40,30}}, color={0,127,255}));
-  connect(heaETS.ports_aHeaWat[1], loa.port_b) annotation (Line(points={{0,-1.33333},
-          {-26,-1.33333},{-26,0},{-40,0},{-40,50},{0,50}}, color={0,127,255}));
-  connect(heaETS.port_aSerHea, souDis.ports[1]) annotation (Line(points={{0,-18},
-          {-20,-18},{-20,-70},{-40,-70}}, color={0,127,255}));
-  connect(sinDis.ports[1], heaETS.port_bSerHea) annotation (Line(points={{60,-70},
-          {40,-70},{40,-18},{20,-18}}, color={0,127,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-160,-120},{160,120}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos" "Simulate and plot"),
-    experiment(
-      StartTime=0,
-      StopTime=86400,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>This model provides an example for the direct heating energy transfer station
-model, which contains in-building pumping and controls the district return
-temperature. The building's primary variable speed pump is modulated depending
-on the total heating load and prescribed deltaT. Variation in the district
-supply temperature is modeled as a sinusoidal signal to test the response of system.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-April 7, 2023, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Direct;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mo
deleted file mode 100644
index ab7c9b64286..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mo
+++ /dev/null
@@ -1,153 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples;
-model Indirect "Example model for indirect heating energy transfer station
-  with a closed chilled water loop on the building side"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Water medium";
-  parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal = 19000
-    "Heating design flow rate";
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal = 50-40
-    "Design temperature difference";
-  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal=QHea_flow_nominal/dT_nominal/cp
-    "Nominal mass flow rate of building heating supply"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp=Medium.specificHeatCapacityCp(
-    Medium.setState_pTX(
-      Medium.p_default,
-      Medium.T_default,
-      Medium.X_default))
-    "Default specific heat capacity of medium";
-  Buildings.Experimental.DHC.EnergyTransferStations.Heating.Indirect heaETS(
-    QHeaWat_flow_nominal=QHea_flow_nominal,
-    mDis_flow_nominal=mBui_flow_nominal,
-    mBui_flow_nominal=mBui_flow_nominal,
-    dpConVal_nominal=9000,
-    dp1_nominal=9000,
-    dp2_nominal=9000,
-    Q_flow_nominal=QHea_flow_nominal,
-    T_a1_nominal=328.15,
-    T_a2_nominal=313.15,
-    k=0.1,
-    Ti=40,
-    yMax=1,
-    yMin=0.01,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    nPorts_aHeaWat=1,
-    nPorts_bHeaWat=1)
-    "Direct heating energy transfer station"
-    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
-  Buildings.Fluid.Sources.Boundary_pT souDis(
-    redeclare package Medium = Medium,
-    p(displayUnit="Pa") = 300000 + 2*9000,
-    use_T_in=false,
-    T=328.15,
-    nPorts=1)
-    "District (primary) source"
-    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
-  Buildings.Fluid.Sources.Boundary_pT sinDis(
-    redeclare package Medium = Medium,
-    T=314.15,
-    nPorts=1)
-    "District (primary) sink"
-    annotation (Placement(transformation(extent={{100,-80},{80,-60}})));
-  Modelica.Blocks.Sources.Constant TSetHWS(k=273.15 + 50)
-    "Setpoint temperature for building heating water supply"
-    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-  Buildings.Fluid.HeatExchangers.HeaterCooler_u loa(
-    redeclare package Medium = Medium,
-    allowFlowReversal=false,
-    m_flow_nominal=mBui_flow_nominal,
-    show_T=true,
-    from_dp=false,
-    dp_nominal=6000,
-    linearizeFlowResistance=true,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
-    Q_flow_nominal=-1) "Aggregate building heating load"
-    annotation (Placement(transformation(extent={{40,40},{20,60}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow pumBui(
-    redeclare replaceable package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    allowFlowReversal=false,
-    m_flow_nominal=mBui_flow_nominal,
-    nominalValuesDefineDefaultPressureCurve=true,
-    dp_nominal=6000+9000)
-    "Building-side (secondary) pump"
-    annotation (Placement(transformation(extent={{80,40},{60,60}})));
-  Modelica.Blocks.Sources.CombiTimeTable QHea(
-    table=[0,10E3; 6,8E3; 6,5E3; 12,2E3; 18,15E3; 24,10E3],
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    timeScale=3600) "Heating demand"
-    annotation (Placement(transformation(extent={{-100,100},{-80,120}})));
-  Modelica.Blocks.Math.Product pro
-    "Multiplier to ramp load from zero"
-    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
-  Modelica.Blocks.Sources.Ramp ram(
-    height=1,
-    duration(displayUnit="h")=18000,
-    startTime(displayUnit="h")=3600) "Ramp load from zero"
-    annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
-  Modelica.Blocks.Math.Gain gai(k=1/(cp*dT_nominal))
-    "Multiplier gain for calculating m_flow"
-    annotation (Placement(transformation(extent={{-40,100},{-20,120}})));
-  Buildings.Fluid.Sources.Boundary_pT souBui(
-    redeclare package Medium = Medium,
-    nPorts=1)
-    "Building (secondary) source"
-    annotation (Placement(transformation(extent={{128,64},{108,84}})));
-equation
-  connect(pumBui.port_b, loa.port_a)
-    annotation (Line(points={{60,50},{40,50}}, color={0,127,255}));
-  connect(QHea.y[1], gai.u)
-    annotation (Line(points={{-79,110},{-42,110}}, color={0,0,127}));
-  connect(gai.y, pumBui.m_flow_in)
-    annotation (Line(points={{-19,110},{70,110},{70,62}}, color={0,0,127}));
-  connect(ram.y, pro.u2) annotation (Line(points={{-79,70},{-60,70},{-60,64},{-42,
-          64}}, color={0,0,127}));
-  connect(QHea.y[1], pro.u1) annotation (Line(points={{-79,110},{-60,110},{-60,76},
-          {-42,76}}, color={0,0,127}));
-  connect(pro.y, loa.u) annotation (Line(points={{-19,70},{50,70},{50,56},{42,56}},
-        color={0,0,127}));
-  connect(pumBui.port_a, souBui.ports[1]) annotation (Line(points={{80,50},{94,50},
-          {94,74},{108,74}}, color={0,127,255}));
-  connect(TSetHWS.y,heaETS.TBuiSupSet)
-    annotation (Line(points={{-59,-30},{19.3333,-30}}, color={0,0,127}));
-  connect(souDis.ports[1], heaETS.port_aSerHea) annotation (Line(points={{-20,-70},
-          {14,-70},{14,-38},{20,-38}}, color={0,127,255}));
-  connect(sinDis.ports[1], heaETS.port_bSerHea) annotation (Line(points={{80,-70},
-          {60,-70},{60,-38},{40,-38}}, color={0,127,255}));
-  connect(loa.port_b, heaETS.ports_aHeaWat[1]) annotation (Line(points={{20,50},
-          {-20,50},{-20,-21.3333},{20,-21.3333}}, color={0,127,255}));
-  connect(heaETS.ports_bHeaWat[1], pumBui.port_a) annotation (Line(points={{40,
-          -21.3333},{62,-21.3333},{62,-22},{100,-22},{100,50},{80,50}},
-                                                              color={0,127,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-140,-140},{140,140}})),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos" "Simulate and plot"),
-    experiment(
-      StartTime=0,
-      StopTime=86400,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-This model provides an example for the indirect heating energy transfer station model.
-The heating load ramps up from zero and is modulated according to the QHea table specification.
-The mass flow rate of heating water in the building side is varied based on the building load/demand.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-April 7, 2023, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Indirect;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.mo
deleted file mode 100644
index 4e42a7f118f..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating;
-package Examples
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (Documentation(revisions="<html>
-</html>", info="<html>
-<p>This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Indirect.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Indirect.mo
deleted file mode 100644
index 6ec3930cf43..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/Indirect.mo
+++ /dev/null
@@ -1,57 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations.Heating;
-model Indirect
-  "Indirect heating energy transfer station for district energy systems"
-  extends
-    Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect(
-      QHeaWat_flow_nominal=Q_flow_nominal,
-      final typ=DHC.Types.DistrictSystemType.HeatingGeneration2to4,
-      final have_chiWat=false,
-      final have_heaWat=true,
-      Q_flow_nominal(min=0),
-      nPorts_aHeaWat=1,
-      nPorts_bHeaWat=1);
-equation
-  connect(ports_aHeaWat[1], senTBuiRet.port_a) annotation (Line(points={{-300,260},
-          {-240,260},{-240,200},{-218,200}}, color={0,127,255}));
-  connect(port_aSerHea, senTDisSup.port_a) annotation (Line(points={{-300,-240},
-          {-260,-240},{-260,-280},{-220,-280}}, color={0,127,255}));
-  connect(senTBuiSup.port_b, ports_bHeaWat[1]) annotation (Line(points={{-36,-204},
-          {-60,-204},{-60,180},{220,180},{220,260},{300,260}}, color={0,127,255}));
-  connect(senTDisRet.port_b, port_bSerHea) annotation (Line(points={{200,-280},
-          {242,-280},{242,-240},{300,-240}}, color={0,127,255}));
-  annotation (
-    defaultComponentName="etsCoo",
-    Documentation(info="<html>
-<p>
-Indirect heating energy transfer station (ETS) model that controls the
-building chilled water supply temperature by modulating a primary control valve
-on the district supply side. The design is based on a typical district heating
-ETS described in ASHRAE's <a href=\"https://www.ashrae.org/technical-resources/bookstore/district-heating-and-cooling-guides\">District Heating Guide</a>.
-As shown in the figure below, the building pumping design (constant/variable)
-is specified on the building side and not within the ETS.
-</p>
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png\" alt=\"DHC.ETS.Indirect\"/>
-</p>
-<h4>Reference</h4>
-<p>
-American Society of Heating, Refrigeration and Air-Conditioning Engineers. (2013).
-Chapter 5: Consumer Interconnection. In <i>District Heating Guide</i>.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-January 8, 2024, by David Blum:<br/>
-Correct documentation to describe heating.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
-issue 3628</a>.
-</li>
-<li>
-April 7, 2023, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Indirect;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.mo
deleted file mode 100644
index 1b45ff17483..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Heating/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
-package Heating "This package contains models for energy transfer stations used in district heating systems"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains models for energy transfer stations used
-in district heating systems.
-</p>
-</html>"));
-end Heating;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Types.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Types.mo
deleted file mode 100644
index e3ced1af201..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Types.mo
+++ /dev/null
@@ -1,60 +0,0 @@
-within Buildings.Experimental.DHC.EnergyTransferStations;
-package Types
-  "Package with type definitions"
-  extends Modelica.Icons.TypesPackage;
-  type ConnectionConfiguration = enumeration(
-      TwoWayValve
-    "Two-way valve on district side",
-      Pump
-    "Pump on district side")
-    "Enumeration for the type of connection with the district network"
-    annotation (Documentation(info="<html>
-<p>
-Enumeration to define the type of connection with the district network.
-<br/>
-</p>
-<table border=\"1\" summary=\"Explanation of the enumeration\">
-<tr>
-  <th>
-  Enumeration
-  </th>
-  <th>
-  Description
-  </th>
-</tr>
-<tr>
-  <td>
-  TwoWayValve
-  </td>
-  <td>
-  Use this setting in case of an active network with a two-way valve on
-  the district side.
-  </td>
-</tr>
-<tr>
-  <td>
-  Pump
-  </td>
-  <td>
-  Use this setting in case of a passive network with a pump on the
-  district side.
-  </td>
-</tr>
-</table>
-</html>",revisions="<html>
-<ul>
-<li>
-September 2, 2020, by Jianjun Hu:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains type definitions.
-</p>
-</html>"));
-end Types;
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/package.mo b/Buildings/Experimental/DHC/EnergyTransferStations/package.mo
deleted file mode 100644
index 143748da378..00000000000
--- a/Buildings/Experimental/DHC/EnergyTransferStations/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC;
-package EnergyTransferStations "Package of models for energy transfer stations"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for energy transfer stations (ETS), also called
-end user interfaces or customer/consumer interfaces.
-</p>
-</html>"));
-end EnergyTransferStations;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo
deleted file mode 100644
index 6f3c5483284..00000000000
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/BoreField.mo
+++ /dev/null
@@ -1,103 +0,0 @@
-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,
-    final tLoaAgg(displayUnit="h") = 3600,
-    final nSeg=5,
-    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,
-          cFil=3040,
-          dFil=1450),
-      soiDat=Buildings.Fluid.Geothermal.Borefields.Data.Soil.SandStone(
-          kSoi=2.3,
-          cSoi=1000,
-          dSoi=2600),
-      conDat=Buildings.Fluid.Geothermal.Borefields.Data.Configuration.Example(
-        borCon=Buildings.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel,
-        dp_nominal=35000,
-        hBor=300,
-        rBor=0.095,
-        nBor=350,
-        cooBor=cooBor,
-        dBor=1,
-        rTub=0.02,
-        kTub=0.5,
-        eTub=0.0037,
-        xC=0.05)),
-    show_T=true);
-  /*
-  Some parameters (such as nBor) cannot be propagated down to
-  borFieDat.conDat otherwise Dymola fails to expand.
-  We assign them literally within borFieDat.conDat and propagate them up here
-  to compute dependent parameters.
-  */
-  parameter Integer nBor = borFieDat.conDat.nBor
-    "Number of boreholes"
-    annotation(Evaluate=true);
-  parameter Real dxyBor = 10
-    "Distance between boreholes";
-  final parameter Modelica.Units.SI.Length cooBor[nBor,2]={dxyBor*{mod(i - 1,
-      10),floor((i - 1)/10)} for i in 1:nBor}
-    "Cartesian coordinates of the boreholes in meters";
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput Q_flow(final unit="W")
-    "Rate at which heat is extracted from soil"
-    annotation (Placement(transformation(extent={{100,-50},{120,-30}}),
-      iconTransformation(extent={{100,-64},{140,-24}})));
-equation
-  connect(gaiQ_flow.y, Q_flow) annotation (Line(points={{1,80},{14,80},{14,54},{
-          96,54},{96,-40},{110,-40}},
-                                    color={0,0,127}));
-  annotation (Documentation(info="<html>
-<p>
-This model represents a borefield composed of 350 boreholes,
-with the following main assumptions.
-</p>
-<ul>
-<li>
-The soil is made of sandstone.
-</li>
-<li>
-The boreholes are filled with a bentonite grout.
-</li>
-<li>
-The boreholes have a height of 300 m and a diameter of 190 mm.
-They are discretized vertically in five segments.
-</li>
-<li>
-A distance of 10 m between each borehole is considered.
-</li>
-<li>
-HDPE pipes with a diameter of 40 mm are considered, in a
-double U-tube parallel configuration.
-</li>
-</ul>
-</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
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">
-issue 3628</a>.
-</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.
-</li>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-Updated documentation.
-</li>
-<li>
-January 12, 2020, by Michael Wetter:<br/>
-Added documentation.
-</li>
-</ul>
-</html>"));
-end BoreField;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/Zurich.mo b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/Zurich.mo
deleted file mode 100644
index f7c9ef5a1ef..00000000000
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/Zurich.mo
+++ /dev/null
@@ -1,6 +0,0 @@
-within Buildings.Experimental.DHC.Examples.Combined.BaseClasses;
-record Zurich =
-  Buildings.BoundaryConditions.GroundTemperature.ClimaticConstants.Generic (
-    TSurMea=282.98,
-    TSurAmp=9.03,
-    sinPha=9132480) "Zurich";
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo
deleted file mode 100644
index 90dd78f48c3..00000000000
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Examples.Combined;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined\">
-Buildings.Experimental.DHC.Examples.Combined</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order b/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order
deleted file mode 100644
index aa4aaf6faa1..00000000000
--- a/Buildings/Experimental/DHC/Examples/Combined/BaseClasses/package.order
+++ /dev/null
@@ -1,4 +0,0 @@
-BoreField
-PartialSeries
-DesignDataSeries
-Zurich
diff --git a/Buildings/Experimental/DHC/Examples/Combined/package.mo b/Buildings/Experimental/DHC/Examples/Combined/package.mo
deleted file mode 100644
index 8e6969caed3..00000000000
--- a/Buildings/Experimental/DHC/Examples/Combined/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Examples;
-package Combined "Package of example models for DHC systems"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains example models for
-district heating and cooling systems.
-</p>
-</html>"));
-end Combined;
diff --git a/Buildings/Experimental/DHC/Examples/Cooling/package.mo b/Buildings/Experimental/DHC/Examples/Cooling/package.mo
deleted file mode 100644
index c2f03efa39a..00000000000
--- a/Buildings/Experimental/DHC/Examples/Cooling/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Examples;
-package Cooling "Example model for entire district cooling system"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains an example model for
-district cooling system.
-</p>
-</html>"));
-end Cooling;
diff --git a/Buildings/Experimental/DHC/Examples/Steam/SingleBoiler.mo b/Buildings/Experimental/DHC/Examples/Steam/SingleBoiler.mo
deleted file mode 100644
index 1d1016eda05..00000000000
--- a/Buildings/Experimental/DHC/Examples/Steam/SingleBoiler.mo
+++ /dev/null
@@ -1,135 +0,0 @@
-within Buildings.Experimental.DHC.Examples.Steam;
-model SingleBoiler "Example model for a complete steam district heating system with a
-  central plant that contains a single boiler"
-  extends Modelica.Icons.Example;
-
-  package MediumSte = Buildings.Media.Steam (p_default=400000,
-    T_default=273.15+143.61,
-    h_default=2738100)
-    "Steam medium";
-  package MediumWat =
-    Buildings.Media.Specialized.Water.TemperatureDependentDensity (
-      p_default=101325,
-      T_default=100+273.15,
-      h_default=2738100)
-    "Water medium";
-
-  parameter Modelica.Units.SI.AbsolutePressure pSat=400000
-    "Saturation pressure, high pressure";
-  parameter Modelica.Units.SI.AbsolutePressure pLow=200000
-    "Reduced pressure, after PRV";
-  parameter Modelica.Units.SI.Temperature TSat=
-     MediumSte.saturationTemperature(pSat)
-     "Saturation temperature, at high pressure";
-
-  parameter Integer N = 3 "Number of buildings";
-  parameter Modelica.Units.SI.MassFlowRate mDis_flow_nominal=sum(bld.m_flow_nominal)*1.2
-    "Nominal mass flow rate of entire district";
-  parameter Modelica.Units.SI.HeatFlowRate QDis_flow_nominal=QBui_flow_nominal*N
-    "Nominal heat flow rate of entire district";
-  parameter Modelica.Units.SI.HeatFlowRate QBui_flow_nominal=20000
-    "Nominal heat flow rate of each building";
-  parameter Modelica.Units.SI.PressureDifference dpPip=6000
-    "Pressure drop in the condensate return pipe";
-
-  parameter Buildings.Fluid.Movers.Data.Generic perPumFW(
-   pressure(V_flow=(mDis_flow_nominal/1000)*{0,1,2},
-     dp=(pSat-101325)*{2,1,0}))
-    "Performance data for feedwater pump at the plant";
-
-  parameter Modelica.Units.SI.PressureDifference dp_nominal=6000
-    "Pressure drop of distribution at nominal mass flow rate";
-
-  Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS bld[N](
-    redeclare final package MediumSte = MediumSte,
-    redeclare final package MediumWat = MediumWat,
-    each have_prv=true,
-    each dp_nominal=dpPip/2,
-    each final pSte_nominal=pSat,
-    each final Q_flow_nominal=QBui_flow_nominal,
-    each pLow_nominal=pLow,
-    each energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    each tableOnFile=false,
-    each QHeaLoa=
-      [0,0.8; 2,1; 10,1; 12,0.5; 20,0.5; 24,0.8]*[1,0;0,QBui_flow_nominal],
-    each smoothness=Modelica.Blocks.Types.Smoothness.MonotoneContinuousDerivative1,
-    each timeScale(displayUnit="s") = 3600,
-    each show_T=true)
-    "Buildings"
-    annotation (Placement(transformation(extent={{60,20},{40,40}})));
-  Buildings.Experimental.DHC.Networks.Steam.DistributionCondensatePipe dis(
-    redeclare final package MediumSup = MediumSte,
-    redeclare final package MediumRet = MediumWat,
-    final dp_nominal=dp_nominal,
-    final nCon=N,
-    final mDis_flow_nominal=mDis_flow_nominal,
-    final mCon_flow_nominal=bld.m_flow_nominal)
-    "Distribution network"
-    annotation (Placement(transformation(extent={{0,-20},{40,0}})));
-  Buildings.Experimental.DHC.Plants.Steam.SingleBoiler pla(
-    redeclare final package Medium = MediumWat,
-    redeclare final package MediumHea_b = MediumSte,
-    final m_flow_nominal=mDis_flow_nominal,
-    final pSteSet=pSat,
-    final Q_flow_nominal=QDis_flow_nominal,
-    final per=perPumFW,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    kBoi=600,
-    TiBoi(displayUnit="min") = 120,
-    kPum=200,
-    TiPum=1000)
-    "Plant"
-    annotation (Placement(transformation(extent={{-50,20},{-30,40}})));
-equation
-  connect(dis.ports_bCon, bld.port_a)
-    annotation (Line(points={{8,0},{8,30},{40,30}},      color={0,127,255}));
-  connect(bld.port_b, dis.ports_aCon)
-    annotation (Line(points={{40,24},{32,24},{32,0}},  color={0,127,255}));
-  connect(pla.port_bSerHea, dis.port_aDisSup)
-    annotation (Line(points={{-30,30},{-20,30},{-20,-10},{0,-10}},
-                                                 color={0,127,255}));
-  connect(dis.port_bDisRet, pla.port_aSerHea) annotation (Line(points={{0,-16},{
-          -60,-16},{-60,30},{-50,30}},                   color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
-      __Dymola_Commands(file=
-    "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos"
-    "Simulate and plot"),
-    experiment(
-      StopTime=86400,
-      Tolerance=1e-06),
-    Documentation(revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Added publication references.
-</li>
-<li>
-March 3, 2022 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>", info="<html>
-<p>
-This example model demonstrates a complete system simulation for
-steam district heating systems. The central plant features a single boiler.
-For the distribution network, pressure losses on the condensate return
-pipes are included, while the steam pipes are assumed to be lossless.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>"));
-end SingleBoiler;
diff --git a/Buildings/Experimental/DHC/Examples/Steam/package.mo b/Buildings/Experimental/DHC/Examples/Steam/package.mo
deleted file mode 100644
index b2583af6600..00000000000
--- a/Buildings/Experimental/DHC/Examples/Steam/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Examples;
-package Steam "Package of example models for steam district heating systems"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains example models for
-steam-based district heating systems.
-</p>
-</html>"));
-end Steam;
diff --git a/Buildings/Experimental/DHC/Examples/package.mo b/Buildings/Experimental/DHC/Examples/package.mo
deleted file mode 100644
index 2aee309eded..00000000000
--- a/Buildings/Experimental/DHC/Examples/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC;
-package Examples "Collection of cases study"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains district heating and cooling case studies to show how the
-developed models can be used for design and operation.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
deleted file mode 100644
index ddfd73e6190..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/MixingValveControl.mo
+++ /dev/null
@@ -1,198 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Controls;
-block MixingValveControl
-  "Mixing valve controller"
-  extends Modelica.Blocks.Icons.Block;
-  import Type_dis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType
-    "Types of distribution system";
-  parameter Type_dis typDis=Type_dis.HeatingWater
-    "Type of distribution system"
-    annotation (Evaluate=true);
-  parameter Real k(
-    final min=0,
-    final unit="1")=0.1
-    "Gain of controller";
-  parameter Modelica.Units.SI.Time Ti(final min=Modelica.Constants.small) = 10
-    "Time constant of integrator block";
-  // IO CONNECTORS
-  Modelica.Blocks.Interfaces.RealInput TSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "Supply temperature set point"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={-120,-40}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,40})));
-  Modelica.Blocks.Interfaces.IntegerInput modChaOve if typDis == Type_dis.ChangeOver
-    "Operating mode in change-over (1 for heating, 2 for cooling)"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={-120,80}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,80})));
-  Modelica.Blocks.Interfaces.RealInput TSupMes(
-    final unit="K",
-    displayUnit="degC")
-    "Supply temperature (measured)"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={-120,-80}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={-110,-40})));
-  Modelica.Blocks.Interfaces.RealOutput yVal(
-    final unit="1")
-    "Valve control signal"
-    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=0,origin={120,0}),iconTransformation(extent={{-10,-10},{10,10}},rotation=0,origin={110,0})));
-  // COMPONENTS
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
-    k=0)
-    "Zero constant"
-    annotation (Placement(transformation(extent={{-70,10},{-50,30}})));
-  Modelica.Blocks.Math.IntegerToBoolean toBoo(
-    threshold=2) if typDis == Type_dis.ChangeOver
-    "Conversion to boolean (true if cooling mode)"
-    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset resConTSup(
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    final k=k,
-    final Ti=Ti,
-    final yMax=1,
-    final yMin=-1,
-    final reverseActing=true,
-    final y_reset=0) if typDis == Type_dis.ChangeOver
-    "PI controller tracking supply temperature"
-    annotation (Placement(transformation(extent={{-70,-70},{-50,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.PID conTSup(
-    controllerType=Buildings.Controls.OBC.CDL.Types.SimpleController.PI,
-    final k=k,
-    final Ti=Ti,
-    final yMax=1,
-    final yMin=-1,
-    final reverseActing=true) if typDis <> Type_dis.ChangeOver
-    "PI controller tracking supply temperature"
-    annotation (Placement(transformation(extent={{-70,-30},{-50,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.Min negPar
-    "Negative part of control signal"
-    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Max posPar
-    "Positive part of control signal"
-    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter opp(k=-1)
-    "Opposite value"
-    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swi
-    "Logical switch"
-    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
-  Modelica.Blocks.Sources.BooleanExpression fixMod(
-    final y=typDis == Type_dis.ChilledWater) if typDis <> Type_dis.ChangeOver
-    "Fixed operating mode"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Controls.OBC.CDL.Integers.Change cha if typDis == Type_dis.ChangeOver
-    "Evaluate the integer input u to check if its value changes"
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-equation
-  connect(modChaOve,toBoo.u)
-    annotation (Line(points={{-120,80},{-90,80},{-90,40},{-12,40}},color={255,127,0}));
-  connect(toBoo.y,swi.u2)
-    annotation (Line(points={{11,40},{30,40},{30,0},{68,0}},color={255,0,255}));
-  connect(fixMod.y,swi.u2)
-    annotation (Line(points={{11,0},{68,0}},color={255,0,255}));
-  connect(resConTSup.y,posPar.u2)
-    annotation (Line(points={{-48,-60},{-20,-60},{-20,-86},{-12,-86}},color={0,0,127}));
-  connect(zer.y,posPar.u1)
-    annotation (Line(points={{-48,20},{-40,20},{-40,-74},{-12,-74}},color={0,0,127}));
-  connect(zer.y,negPar.u1)
-    annotation (Line(points={{-48,20},{-40,20},{-40,-34},{-12,-34}},color={0,0,127}));
-  connect(resConTSup.y,negPar.u2)
-    annotation (Line(points={{-48,-60},{-20,-60},{-20,-46},{-12,-46}},color={0,0,127}));
-  connect(negPar.y,opp.u)
-    annotation (Line(points={{12,-40},{18,-40}},color={0,0,127}));
-  connect(resConTSup.u_s,TSupSet)
-    annotation (Line(points={{-72,-60},{-90,-60},{-90,-40},{-120,-40}},color={0,0,127}));
-  connect(TSupMes,resConTSup.u_m)
-    annotation (Line(points={{-120,-80},{-60,-80},{-60,-72}},color={0,0,127}));
-  connect(swi.y,yVal)
-    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
-  connect(modChaOve,cha.u)
-    annotation (Line(points={{-120,80},{-82,80}},color={255,127,0}));
-  connect(cha.y,resConTSup.trigger)
-    annotation (Line(points={{-58,80},{-40,80},{-40,60},{-80,60},{-80,-76},{-66,-76},{-66,-72}},color={255,0,255}));
-  connect(opp.y,swi.u1)
-    annotation (Line(points={{42,-40},{50,-40},{50,8},{68,8}},color={0,0,127}));
-  connect(posPar.y,swi.u3)
-    annotation (Line(points={{12,-80},{60,-80},{60,-8},{68,-8}},color={0,0,127}));
-  connect(TSupSet,conTSup.u_s)
-    annotation (Line(points={{-120,-40},{-90,-40},{-90,-20},{-72,-20}},color={0,0,127}));
-  connect(TSupMes,conTSup.u_m)
-    annotation (Line(points={{-120,-80},{-84,-80},{-84,-40},{-60,-40},{-60,-32}},color={0,0,127}));
-  connect(conTSup.y,negPar.u2)
-    annotation (Line(points={{-48,-20},{-20,-20},{-20,-46},{-12,-46}},color={0,0,127}));
-  connect(conTSup.y,posPar.u2)
-    annotation (Line(points={{-48,-20},{-20,-20},{-20,-86},{-12,-86}},color={0,0,127}));
-  annotation (
-    defaultComponentName="conVal",
-    Documentation(
-      info="
-<html>
-<p>
-This model implements a generic controller for a three-way mixing valve.
-Three operating modes are supported:
-</p>
-<ul>
-<li>
-Heating: the controller tracks a minimum supply temperature.
-</li>
-<li>
-Cooling: the controller tracks a maximum supply temperature.
-</li>
-<li>
-Change-over: the controller tracks either a minimum or a maximum
-supplied temperature depending on the actual value of the integer input
-<code>modChaOve</code> (1 for heating, 2 for cooling).
-The model instantiates only one PI block to limit the number of state
-variables in large models. Therefore the PI gain
-is independent from the change-over mode: the reverse action is modeled
-by taking the opposite value of the PI block output. Eventually the
-integral part is reset whenever the change-over mode is switched.
-</li>
-</ul>
-<p>
-See
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl</a>
-for a simulation with change-over.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-February 21, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false),
-      graphics={
-        Text(
-          extent={{-90,96},{-10,66}},
-          textColor={244,125,35},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Left,
-          visible=typDis == Type_dis.ChangeOver,
-          textString="modChaOve"),
-        Text(
-          extent={{-90,54},{-22,26}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Left,
-          textString="TSupSet"),
-        Text(
-          extent={{-90,-26},{-16,-52}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Left,
-          textString="TSupMes"),
-        Text(
-          extent={{50,12},{88,-14}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Right,
-          textString="yVal")}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)));
-end MixingValveControl;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
deleted file mode 100644
index da49be036b0..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mo
+++ /dev/null
@@ -1,207 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation;
-model MixingValveControl
-  "Validation of mixing valve control in change-over mode"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Source side medium";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Mass flow rate at nominal conditions";
-  Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution disFlo(
-    redeclare package Medium=Medium,
-    m_flow_nominal=m_flow_nominal,
-    typDis=Buildings.Experimental.DHC.Loads.BaseClasses.Types.DistributionType.ChangeOver,
-    have_pum=true,
-    have_val=true,
-    dp_nominal=100000,
-    nPorts_a1=1,
-    nPorts_b1=1)
-    "Secondary distribution system"
-    annotation (Placement(transformation(extent={{40,10},{60,30}})));
-  Buildings.Fluid.Sources.Boundary_pT souPri(
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=1)
-    "Primary supply stream"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-10,20})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TPriHea(
-    k=313.15,
-    y(final unit="K",
-      displayUnit="degC"))
-    "Heating water primary supply temperature"
-    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TPriChi(
-    k=280.15,
-    y(final unit="K",
-      displayUnit="degC"))
-    "Chilled water primary supply temperature"
-    annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch TPri(
-    y(final unit="K",
-      displayUnit="degC"))
-    "Actual primary supply temperature"
-    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetSecHea(
-    k=303.15,
-    y(final unit="K",
-      displayUnit="degC"))
-    "Heating water secondary supply temperature set point"
-    annotation (Placement(transformation(extent={{-140,-70},{-120,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetSecChi(
-    k=291.15)
-    "Chilled water secondary supply temperature set point"
-    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch TSetSecAct(
-    y(final unit="K",
-      displayUnit="degC"))
-    "Actual secondary supply temperature set point"
-    annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
-  Buildings.Fluid.Sources.MassFlowSource_T souSec(
-    use_m_flow_in=true,
-    redeclare package Medium=Medium,
-    use_T_in=true,
-    nPorts=1)
-    "Secondary return stream"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,60})));
-  Buildings.Fluid.Sources.Boundary_pT sinSec(
-    redeclare package Medium=Medium,
-    nPorts=1)
-    "Sink for secondary stream"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,100})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTSecHea(
-    k=-5)
-    "Secondary temperature difference between supply and return"
-    annotation (Placement(transformation(extent={{-20,-110},{0,-90}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTSecSup(
-    redeclare package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{70,90},{90,110}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTSecRet(
-    redeclare package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Secondary return temperature (measured)"
-    annotation (Placement(transformation(extent={{90,50},{70,70}})));
-  Buildings.Fluid.Sources.Boundary_pT sinPri(
-    redeclare package Medium=Medium,
-    nPorts=1)
-    "Sink for primary stream"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,origin={110,20})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Pulse mSec_flow(
-    amplitude=m_flow_nominal,
-    period=200,
-    offset=0)
-    "Secondary mass flow rate"
-    annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
-  Buildings.Controls.OBC.CDL.Reals.Add add
-    "Computation of secondary return temperature"
-    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTPriSup(
-    redeclare package Medium=Medium,
-    m_flow_nominal=m_flow_nominal)
-    "Primary supply temperature (measured)"
-    annotation (Placement(transformation(extent={{8,10},{28,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch dTSec(
-    y(final unit="K",
-      displayUnit="degC"))
-    "Actual secondary delta T"
-    annotation (Placement(transformation(extent={{20,-130},{40,-110}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dTSecCoo(
-    k=5)
-    "Secondary temperature difference between supply and return"
-    annotation (Placement(transformation(extent={{-20,-150},{0,-130}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger modInd(
-    final integerTrue=1,
-    final integerFalse=2)
-    "Mode index, 1 for heating, 2 for cooling"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse modCha(
-    period=1000)
-    "Boolean pulse for changing mode"
-    annotation (Placement(transformation(extent={{-140,-10},{-120,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Not mod
-    "Operating mode, true for heating, false for cooling"
-    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
-equation
-  connect(TPri.y,souPri.T_in)
-    annotation (Line(points={{-38,80},{-32,80},{-32,24},{-22,24}},color={0,0,127}));
-  connect(TSetSecAct.y,disFlo.TSupSet)
-    annotation (Line(points={{-38,-80},{32,-80},{32,12},{39,12}},color={0,0,127}));
-  connect(disFlo.ports_b1[1],senTSecSup.port_a)
-    annotation (Line(points={{40,26},{36,26},{36,100},{70,100}},color={0,127,255}));
-  connect(souSec.ports[1],senTSecRet.port_a)
-    annotation (Line(points={{100,60},{90,60}},color={0,127,255}));
-  connect(senTSecRet.port_b,disFlo.ports_a1[1])
-    annotation (Line(points={{70,60},{64,60},{64,26},{60,26}},color={0,127,255}));
-  connect(disFlo.port_b,sinPri.ports[1])
-    annotation (Line(points={{60,20},{100,20}},color={0,127,255}));
-  connect(senTSecSup.port_b,sinSec.ports[1])
-    annotation (Line(points={{90,100},{100,100}},color={0,127,255}));
-  connect(mSec_flow.y,disFlo.mReq_flow[1])
-    annotation (Line(points={{-118,160},{32,160},{32,16},{39,16}},color={0,0,127}));
-  connect(mSec_flow.y,souSec.m_flow_in)
-    annotation (Line(points={{-118,160},{140,160},{140,68},{122,68}},color={0,0,127}));
-  connect(add.y,souSec.T_in)
-    annotation (Line(points={{122,-80},{140,-80},{140,64},{122,64}},color={0,0,127}));
-  connect(souPri.ports[1],senTPriSup.port_a)
-    annotation (Line(points={{0,20},{8,20}},color={0,127,255}));
-  connect(senTPriSup.port_b,disFlo.port_a)
-    annotation (Line(points={{28,20},{40,20}},color={0,127,255}));
-  connect(TSetSecChi.y,TSetSecAct.u3)
-    annotation (Line(points={{-118,-100},{-100,-100},{-100,-88},{-62,-88}},color={0,0,127}));
-  connect(TSetSecHea.y,TSetSecAct.u1)
-    annotation (Line(points={{-118,-60},{-100,-60},{-100,-72},{-62,-72}},color={0,0,127}));
-  connect(TPriChi.y,TPri.u3)
-    annotation (Line(points={{-118,80},{-80,80},{-80,72},{-62,72}},color={0,0,127}));
-  connect(TPriHea.y,TPri.u1)
-    annotation (Line(points={{-118,120},{-80,120},{-80,88},{-62,88}},color={0,0,127}));
-  connect(TSetSecAct.y,add.u1)
-    annotation (Line(points={{-38,-80},{32,-80},{32,-74},{98,-74}},color={0,0,127}));
-  connect(dTSec.y,add.u2)
-    annotation (Line(points={{42,-120},{80,-120},{80,-86},{98,-86}},color={0,0,127}));
-  connect(dTSecHea.y,dTSec.u1)
-    annotation (Line(points={{2,-100},{10,-100},{10,-112},{18,-112}},color={0,0,127}));
-  connect(dTSecCoo.y,dTSec.u3)
-    annotation (Line(points={{2,-140},{10,-140},{10,-128},{18,-128}},color={0,0,127}));
-  connect(modCha.y,mod.u)
-    annotation (Line(points={{-118,0},{-102,0}},color={255,0,255}));
-  connect(mod.y,TPri.u2)
-    annotation (Line(points={{-78,0},{-70,0},{-70,80},{-62,80}},color={255,0,255}));
-  connect(mod.y,TSetSecAct.u2)
-    annotation (Line(points={{-78,0},{-70,0},{-70,-80},{-62,-80}},color={255,0,255}));
-  connect(mod.y,modInd.u)
-    annotation (Line(points={{-78,0},{-62,0}},color={255,0,255}));
-  connect(modInd.y,disFlo.modChaOve)
-    annotation (Line(points={{-38,0},{36,0},{36,14},{39,14}},color={255,127,0}));
-  connect(mod.y,dTSec.u2)
-    annotation (Line(points={{-78,0},{-70,0},{-70,-120},{18,-120}},color={255,0,255}));
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Controls.MixingValveControl\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Controls.MixingValveControl</a>
-(as part of
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution\">
-Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution</a>)
-in change-over mode.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-February 21, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-180,-200},{180,200}})),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos" "Simulate and plot"));
-end MixingValveControl;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.mo
deleted file mode 100644
index 1fe7dfa9ec3..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/Validation/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Controls;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Controls\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Controls</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.mo
deleted file mode 100644
index 1b3b85309a8..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Controls/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
-package Controls "Package of control sequences for DHC systems"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains control sequences used in district heating and
-cooling systems.
-</p>
-</html>"));
-end Controls;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
deleted file mode 100644
index 34491597ccd..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC;
-package OfficeBuilding "Package with RC building zone models"
-  extends Modelica.Icons.Package;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains RC building zone models programmatically generated from
-a GeoJSON file.
-</p>
-</html>"));
-end OfficeBuilding;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
deleted file mode 100644
index 106103a5e62..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/GeojsonExportRC/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses;
-package GeojsonExportRC "Package with RC building zone models"
-  extends Modelica.Icons.Package;
-
-  annotation (
-    Documentation(
-      info="
-<html>
-<p>
-This package contains RC building zone models programmatically generated from
-a GeoJSON file.
-</p>
-</html>"));
-end GeojsonExportRC;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
deleted file mode 100644
index 264c66e65ab..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Examples;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Examples\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Examples</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
deleted file mode 100644
index dc3c3b8b46e..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/BaseClasses/package.order
+++ /dev/null
@@ -1,9 +0,0 @@
-BuildingRCZ1Valve
-BuildingRCZ6
-BuildingSpawnZ1
-BuildingSpawnZ6
-BuildingTimeSeries
-FanCoil4Pipe
-FanCoil4PipeHeatPorts
-PartialFanCoil4Pipe
-GeojsonExportRC
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.mo
deleted file mode 100644
index ba9fe6c02be..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Examples/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
-package Examples "Example models integrating multiple components"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-Buildings.Experimental.DHC.Loads</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo
deleted file mode 100644
index 9b05a5d78b7..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/SimpleRoomODE.mo
+++ /dev/null
@@ -1,163 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
-model SimpleRoomODE
-  "Simplified model for assessing room air temperature variations around a set point"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.TemperatureDifference dTEnv_nominal
-    "Design temperature difference at which envelope heat loss is QEnv_flow_nominal"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TAir_start(displayUnit="degC")
-    "Initial air temperature"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.HeatFlowRate QEnv_flow_nominal(min=0)
-    "Envelope heat loss at temperature difference of dTEnv_nominal (with no internal gains, no solar radiation)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Boolean steadyStateInitial=false
-    "true initializes T with dT(0)/dt=0, false initializes T with T(0)=TIndHea_nominal"
-    annotation (Dialog(group="Initialization"),Evaluate=true);
-  parameter Modelica.Units.SI.Time tau=1800
-    "Time constant of the indoor temperature";
-  Modelica.Blocks.Interfaces.RealInput TSet(
-    final quantity="ThermodynamicTemperature",
-    final unit="K",
-    displayUnit="degC")
-    "Temperature set point for heating or cooling"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),iconTransformation(extent={{-140,60},{-100,100}})));
-  Modelica.Blocks.Interfaces.RealInput QReq_flow(
-    final quantity="HeatFlowRate",
-    final unit="W")
-    "Required heat flow rate to meet temperature set point (>=0 for heating)"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),iconTransformation(extent={{-140,-20},{-100,20}})));
-  Modelica.Blocks.Interfaces.RealInput QAct_flow(
-    final quantity="HeatFlowRate",
-    final unit="W")
-    "Actual heating or cooling heat flow rate (>=0 for heating)"
-    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),iconTransformation(extent={{-140,-100},{-100,-60}})));
-  Modelica.Blocks.Interfaces.RealOutput TAir(
-    final quantity="ThermodynamicTemperature",
-    final unit="K",
-    displayUnit="degC")
-    "Room air temperature"
-    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
-protected
-  parameter Modelica.Units.SI.ThermalConductance G=abs(QEnv_flow_nominal/dTEnv_nominal)
-    "Lumped thermal conductance representing all temperature dependent heat transfer mechanisms";
-initial equation
-  if steadyStateInitial then
-    der(
-      TAir)=0;
-  else
-    TAir=TAir_start;
-  end if;
-equation
-  der(
-    TAir)*tau=(QAct_flow-QReq_flow)/G+TSet-TAir;
-  assert(
-    TAir >= 273.15,
-    "In "+getInstanceName()+": The computed indoor temperature is below 0°C.");
-  annotation (
-    defaultComponentName="roo",
-    Documentation(
-      info="<html>
-<p>
-This is a first order ODE model assessing the indoor air temperature variations
-around a set point, based on the difference between the required and actual
-heating or cooling heat flow rate and a minimum set of parameters at nominal conditions.
-</p>
-<p>
-The lumped thermal conductance <i>G</i> representing all heat transfer mechanisms
-that depend on the temperature difference with the outside (transmission,
-infiltration and ventilation) is assessed from the steady-state energy balance
-at heating nominal conditions as
-</p>
-<p style=\"font-style:italic;\">
-0 = Q&#775;<sub>heating, nom</sub> + G (T<sub>out, heating, nom</sub> - T<sub>ind, heating, nom</sub>).
-</p>
-<p>
-Note that for model representativeness, it is important
-for Q&#775;<sub>heating, nom</sub> to be evaluated in close to steady-state conditions
-with no internal heat gains and no solar heat gains.
-</p>
-<p>
-The lumped thermal conductance <i>G</i> is then considered constant for all operating conditions.
-</p>
-<p>
-The required heating or cooling heat flow rate (i.e. the space load)
-<i>Q&#775;<sub>heat_cool, req</sub></i> corresponds to
-a steady-state control error equal to zero,
-</p>
-<p style=\"font-style:italic;\">
-0 = Q&#775;<sub>heat_cool, req</sub> +
-G (T<sub>out</sub> - T<sub>ind, set</sub>) +
-Q&#775;<sub>various</sub>,
-</p>
-<p>
-where <i>Q&#775;<sub>various</sub></i> represents the miscellaneous heat gains.
-The indoor temperature variation rate due to an unmet load is given by
-</p>
-<p style=\"font-style:italic;\">
-C &part;T<sub>ind</sub> / &part;t = Q&#775;<sub>heat_cool, act</sub> +
-G (T<sub>out</sub> - T<sub>ind</sub>) + Q&#775;<sub>various</sub>,
-</p>
-<p>
-where
-<i>Q&#775;<sub>heat_cool, act</sub></i> is the actual heating or cooling heat flow rate and
-<i>C</i> is the thermal capacitance of the indoor volume.
-The two previous equations yield
-</p>
-<p style=\"font-style:italic;\">
-&tau; &part;T<sub>ind</sub> / &part;t = (Q&#775;<sub>heat_cool, act</sub> - Q&#775;<sub>heat_cool, req</sub>) / G
-- T<sub>ind</sub> + T<sub>ind, set</sub>,
-</p>
-<p>
-where <i>&tau; = C / G</i> is the time constant of the indoor temperature.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-January 26, 2023, by Michael Wetter:<br/>
-Updated parameters for clarity if used for cooling.
-</li>
-
-<li>
-February 21, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false),
-      graphics={
-        Text(
-          extent={{-88,16},{-8,-14}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Left,
-          textString="QReq_flow"),
-        Text(
-          extent={{-88,94},{-52,68}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Left,
-          textString="TSet"),
-        Text(
-          extent={{-88,-64},{-8,-94}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Left,
-          textString="QAct_flow"),
-        Text(
-          extent={{50,10},{90,-8}},
-          textColor={0,0,127},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          horizontalAlignment=TextAlignment.Right,
-          textString="TAir")}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)));
-end SimpleRoomODE;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Types.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Types.mo
deleted file mode 100644
index 70063593150..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Types.mo
+++ /dev/null
@@ -1,147 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
-package Types
-  "Package with type definitions"
-  extends Modelica.Icons.TypesPackage;
-  type DistributionType = enumeration(
-      HeatingWater
-    "Heating water distribution system",
-      ChilledWater
-    "Chilled water distribution system",
-      ChangeOver
-    "Change-over distribution system")
-    "Enumeration for the type of distribution system"
-    annotation (Documentation(info="<html>
-<p>
-Enumeration to define the type of distribution system.
-<br/>
-</p>
-<table border=\"1\" summary=\"Explanation of the enumeration\">
-<tr>
-  <th>
-  Enumeration
-  </th>
-  <th>
-  Description
-  </th>
-</tr>
-<tr>
-  <td>
-  HeatingWater
-  </td>
-  <td>
-  Use this setting for a heating water distribution system.
-  </td>
-</tr>
-<tr>
-  <td>
-  ChilledWater
-  </td>
-  <td>
-  Use this setting for a chilled water distribution system.
-  </td>
-</tr>
-<tr>
-  <td>
-  ChangeOver
-  </td>
-  <td>
-  Use this setting for a change-over distribution system.
-  </td>
-</tr>
-</table>
-</html>",revisions="<html>
-<ul>
-<li>
-February 21, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-  type PumpControlType = enumeration(
-      ConstantSpeed
-    "Constant speed",
-      ConstantFlow
-    "Constant flow rate (three-way valves)",
-      ConstantHead
-    "Constant pump head",
-      LinearHead
-    "Linear relationship between pump head and mass flow rate",
-      ConstantDp
-    "Constant pressure difference at given location")
-    "Enumeration for the type of distribution pump control"
-    annotation (Documentation(info="<html>
-<p>
-Enumeration to define the type of distribution pump control.
-<br/>
-</p>
-<table border=\"1\" summary=\"Explanation of the enumeration\">
-<tr>
-  <th>
-  Enumeration
-  </th>
-  <th>
-  Description
-  </th>
-</tr>
-<tr>
-  <td>
-  ConstantSpeed
-  </td>
-  <td>
-  Use this setting for a constant speed pump.
-  </td>
-</tr>
-<tr>
-  <td>
-  ConstantFlow
-  </td>
-  <td>
-  Use this setting for a constant flow system where terminal units are
-  equipped with three-way valves and the pump operation can be
-  approximated as constant flow and constant head.
-  </td>
-</tr>
-<tr>
-  <td>
-  ConstantHead
-  </td>
-  <td>
-  Use this setting for a pump control ensuring a constant head.
-  </td>
-</tr>
-<tr>
-  <td>
-  LinearHead
-  </td>
-  <td>
-  Use this setting for a pump control ensuring a linear variation of the
-  pump head with the mass flow rate.
-  </td>
-</tr>
-<tr>
-  <td>
-  ConstantDp
-  </td>
-  <td>
-  Use this setting for a pump control ensuring a constant pressure drop
-  at a given location in the distribution system.
-  </td>
-</tr>
-</table>
-</html>",revisions="<html>
-<ul>
-<li>
-February 21, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains type definitions.
-</p>
-</html>"));
-end Types;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
deleted file mode 100644
index cb515e9559e..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/BuildingWithETS.mo
+++ /dev/null
@@ -1,33 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses;
-model BuildingWithETS
-  "Dummy building with ETS model for validation purposes"
-  extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
-    redeclare ETS ets,
-    redeclare Building bui(
-      final QChiWat_flow_nominal=QChiWat_flow_nominal,
-      final QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      final m_flow_nominal=ets.m_flow_nominal));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-This is a minimum example of a class extending
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
-developed for testing purposes only.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 14, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
deleted file mode 100644
index eb602b39ddf..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.Validation\">
-Buildings.Experimental.DHC.Loads.BaseClasses.Validation</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
deleted file mode 100644
index f61a8bcf953..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mo
+++ /dev/null
@@ -1,483 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
-model BuildingWithETS
-  "Validation of the base class PartialBuildingWithPartialETS"
-  extends Modelica.Icons.Example;
-  import TypDisSys=Buildings.Experimental.DHC.Types.DistrictSystemType
-    "District system type enumeration";
-  package MediumW=Buildings.Media.Water
-    "Water";
-  package MediumS=Modelica.Media.Water.WaterIF97_ph (
-    h_default=2770E3)
-    "Steam";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal mass flow rate";
-  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=1E4
-    "Nominal mass flow rate";
-  parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=-1E4
-    "Nominal mass flow rate";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen1(
-    redeclare final package MediumSerHea_a=MediumS,
-    redeclare final package MediumSer=MediumW,
-    redeclare final package MediumBui=MediumW,
-    nPorts_heaWat=1,
-    bui(
-      final have_heaWat=true),
-    ets(
-      final typ=TypDisSys.HeatingGeneration1,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal))
-    "Building and ETS component - Heating only (steam)"
-    annotation (Placement(transformation(extent={{-160,210},{-140,230}})));
-  Fluid.Sources.MassFlowSource_T souDisSup(
-    redeclare final package Medium=MediumS,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-240,210},{-220,230}})));
-  Fluid.Sources.Boundary_pT sinDisRet(
-    redeclare final package Medium=MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-240,170},{-220,190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo(
-    redeclare final package Medium1=MediumS,
-    redeclare final package Medium2=MediumW,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-200,196},{-180,216}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen1(
-    redeclare final package MediumSerHea_a=MediumS,
-    redeclare final package MediumSer=MediumW,
-    redeclare final package MediumBui=MediumW,
-    nPorts_heaWat=1,
-    nPorts_chiWat=1,
-    bui(
-      final have_heaWat=true,
-      final have_chiWat=true),
-    ets(
-      final typ=TypDisSys.CombinedGeneration1,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      final have_chiWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Combined heating (steam) and cooling"
-    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
-  Fluid.Sources.MassFlowSource_T souDisSup1(
-    redeclare final package Medium=MediumS,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-240,-10},{-220,10}})));
-  Fluid.Sources.Boundary_pT sinDisRet1(
-    redeclare final package Medium=MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-240,-50},{-220,-30}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo1(
-    redeclare final package Medium1=MediumS,
-    redeclare final package Medium2 = Media.Water,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-200,-24},{-180,-4}})));
-  Fluid.Sources.MassFlowSource_T souDisSup2(
-    redeclare final package Medium=MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-200,-50},{-180,-30}})));
-  Fluid.Sources.Boundary_pT sinDisRet2(
-    redeclare final package Medium=MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-200,-90},{-180,-70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo2(
-    redeclare final package Medium1=MediumW,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-160,-64},{-140,-44}})));
-  Fluid.Sources.MassFlowSource_T souDisSup3(
-    redeclare final package Medium=MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-240,90},{-220,110}})));
-  Fluid.Sources.Boundary_pT sinDisRet3(
-    redeclare final package Medium=MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-240,50},{-220,70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo3(
-    redeclare final package Medium1=MediumW,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-200,76},{-180,96}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiCoo(
-    redeclare final package MediumSer=MediumW,
-    redeclare final package MediumBui=MediumW,
-    nPorts_chiWat=1,
-    bui(
-      final have_chiWat=true),
-    ets(
-      final typ=TypDisSys.Cooling,
-      final m_flow_nominal=m_flow_nominal,
-      final have_chiWat=true,
-      QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Cooling only"
-    annotation (Placement(transformation(extent={{-160,90},{-140,110}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen2to4(
-    redeclare final package MediumSer = MediumW,
-    redeclare final package MediumBui = MediumW,
-    nPorts_heaWat=1,
-    nPorts_chiWat=1,
-    bui(
-      final have_heaWat=true,
-      final have_chiWat=true),
-    ets(
-      final typ=TypDisSys.CombinedGeneration2to4,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      final have_chiWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Combined heating and cooling"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Fluid.Sources.MassFlowSource_T souDisSup5(
-    redeclare final package Medium = MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Fluid.Sources.Boundary_pT sinDisRet5(
-    redeclare final package Medium = MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo5(
-    redeclare final package Medium1 = MediumW,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-40,-24},{-20,-4}})));
-  Fluid.Sources.MassFlowSource_T souDisSup6(
-    redeclare final package Medium =MediumW,
-    m_flow=m_flow_nominal,                   nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
-  Fluid.Sources.Boundary_pT sinDisRet6(
-    redeclare final package Medium = MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-40,-90},{-20,-70}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo6(
-    redeclare final package Medium1 = MediumW,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{0,-64},{20,-44}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiHeaGen2to4(
-    redeclare final package MediumSer = MediumW,
-    redeclare final package MediumBui = MediumW,
-    nPorts_heaWat=1,
-    bui(
-      final have_heaWat=true),
-    ets(
-      final typ=TypDisSys.HeatingGeneration2to4,
-      final m_flow_nominal= m_flow_nominal,
-      final have_heaWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal))
-    "Building and ETS component - Heating only"
-    annotation (Placement(transformation(extent={{0,210},{20,230}})));
-  Fluid.Sources.MassFlowSource_T souDisSup7(
-    redeclare final package Medium = MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-80,210},{-60,230}})));
-  Fluid.Sources.Boundary_pT sinDisRet7(
-    redeclare final package Medium = MediumW,
-    nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-80,170},{-60,190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo7(
-    redeclare final package Medium1 = MediumW,
-    final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-40,196},{-20,216}})));
-  Fluid.Sources.MassFlowSource_T souDisSup4(
-    redeclare final package Medium = MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
-  Fluid.Sources.Boundary_pT sinDisRet4(redeclare final package Medium = MediumW,
-      nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo4(redeclare
-      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{160,-24},{180,-4}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiComGen5(
-    redeclare final package MediumSer = MediumW,
-    redeclare final package MediumBui = MediumW,
-    nPorts_heaWat=1,
-    nPorts_chiWat=1,
-    bui(final have_heaWat=true, final have_chiWat=true),
-    ets(
-      final typ=TypDisSys.CombinedGeneration5,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      final have_chiWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      QChiWat_flow_nominal=QChiWat_flow_nominal))
-    "Building and ETS component - Combined heating and cooling (ambient)"
-    annotation (Placement(transformation(extent={{200,-10},{220,10}})));
-  Fluid.Sources.MassFlowSource_T souDisSup8(
-    redeclare final package Medium = MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-240,-170},{-220,-150}})));
-  Fluid.Sources.Boundary_pT sinDisRet8(redeclare final package Medium = MediumW,
-      nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-240,-210},{-220,-190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo8(redeclare
-      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-200,-184},{-180,-164}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETS(
-    redeclare final package MediumSer = MediumW,
-    redeclare final package MediumBui = MediumW,
-    nPorts_heaWat=1,
-    nPorts_chiWat=1,
-    bui(final have_heaWat=true, final have_chiWat=true),
-    ets(
-      final typ=TypDisSys.CombinedGeneration5,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      final have_chiWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      QChiWat_flow_nominal=QChiWat_flow_nominal,
-      final have_fan=true,
-      final have_pum=true,
-      final have_eleHea=true,
-      final have_eleCoo=true))
-    "Building and ETS component - Testing ETS output connectors"
-    annotation (Placement(transformation(extent={{-160,-170},{-140,-150}})));
-  Fluid.Sources.MassFlowSource_T souDisSup9(
-    redeclare final package Medium = MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
-  Fluid.Sources.Boundary_pT sinDisRet9(redeclare final package Medium = MediumW,
-      nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{-80,-210},{-60,-190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo9(redeclare
-      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{-40,-184},{-20,-164}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesOutETSBui(
-    redeclare final package MediumSer = MediumW,
-    redeclare final package MediumBui = MediumW,
-    nPorts_heaWat=1,
-    nPorts_chiWat=1,
-    bui(
-      final have_heaWat=true,
-      final have_chiWat=true,
-      final have_fan=true,
-      final have_pum=true,
-      final have_eleHea=true,
-      final have_eleCoo=true),
-    ets(
-      final typ=TypDisSys.CombinedGeneration5,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      final have_chiWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      QChiWat_flow_nominal=QChiWat_flow_nominal,
-      final have_fan=true,
-      final have_pum=true,
-      final have_eleHea=true,
-      final have_eleCoo=true))
-    "Building and ETS component - Testing ETS and building output connectors"
-    annotation (Placement(transformation(extent={{0,-170},{20,-150}})));
-  Fluid.Sources.MassFlowSource_T souDisSup10(
-    redeclare final package Medium = MediumW,
-    m_flow=m_flow_nominal,
-    nPorts=1)
-    "Source for district supply"
-    annotation (Placement(transformation(extent={{100,-170},{120,-150}})));
-  Fluid.Sources.Boundary_pT sinDisRet10(redeclare final package Medium =
-        MediumW, nPorts=1)
-    "Sink for district return"
-    annotation (Placement(transformation(extent={{100,-210},{120,-190}})));
-  Buildings.Experimental.DHC.Networks.BaseClasses.DifferenceEnthalpyFlowRate senDifEntFlo10(redeclare
-      final package Medium1 = MediumW, final m_flow_nominal=m_flow_nominal)
-    "Change in enthalpy flow rate "
-    annotation (Placement(transformation(extent={{140,-184},{160,-164}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BaseClasses.BuildingWithETS buiTesFacMul(
-    redeclare final package MediumSer = MediumW,
-    redeclare final package MediumBui = MediumW,
-    nPorts_heaWat=1,
-    nPorts_chiWat=1,
-    facMul=2,
-    bui(
-      final have_heaWat=true,
-      final have_chiWat=true,
-      final have_fan=true,
-      final have_pum=true,
-      final have_eleHea=true,
-      final have_eleCoo=true),
-    ets(
-      final typ=TypDisSys.CombinedGeneration5,
-      final m_flow_nominal=m_flow_nominal,
-      final have_heaWat=true,
-      final have_chiWat=true,
-      QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-      QChiWat_flow_nominal=QChiWat_flow_nominal,
-      final have_fan=true,
-      final have_pum=true,
-      final have_eleHea=true,
-      final have_eleCoo=true))
-    "Building and ETS component - Testing scaling factor"
-    annotation (Placement(transformation(extent={{180,-170},{200,-150}})));
-equation
-  connect(souDisSup.ports[1],senDifEntFlo.port_a1)
-    annotation (Line(points={{-220,220},{-212,220},{-212,212},{-200,212}},color={0,127,255}));
-  connect(senDifEntFlo.port_b2,sinDisRet.ports[1])
-    annotation (Line(points={{-200,200},{-212,200},{-212,180},{-220,180}},color={0,127,255}));
-  connect(souDisSup1.ports[1],senDifEntFlo1.port_a1)
-    annotation (Line(points={{-220,0},{-212,0},{-212,-8},{-200,-8}},  color={0,127,255}));
-  connect(senDifEntFlo1.port_b2,sinDisRet1.ports[1])
-    annotation (Line(points={{-200,-20},{-212,-20},{-212,-40},{-220,-40}},
-                                                                      color={0,127,255}));
-  connect(souDisSup2.ports[1],senDifEntFlo2.port_a1)
-    annotation (Line(points={{-180,-40},{-170,-40},{-170,-48},{-160,-48}},
-                                                                    color={0,127,255}));
-  connect(senDifEntFlo2.port_b2,sinDisRet2.ports[1])
-    annotation (Line(points={{-160,-60},{-170,-60},{-170,-80},{-180,-80}},
-                                                                    color={0,127,255}));
-  connect(souDisSup3.ports[1],senDifEntFlo3.port_a1)
-    annotation (Line(points={{-220,100},{-210,100},{-210,92},{-200,92}},color={0,127,255}));
-  connect(sinDisRet3.ports[1],senDifEntFlo3.port_b2)
-    annotation (Line(points={{-220,60},{-210,60},{-210,80},{-200,80}},color={0,127,255}));
-  connect(senDifEntFlo.port_b1, buiHeaGen1.port_aSerHea) annotation (Line(
-        points={{-180,212},{-170,212},{-170,216},{-160,216}}, color={0,127,255}));
-  connect(senDifEntFlo.port_a2, buiHeaGen1.port_bSerHea) annotation (Line(
-        points={{-180,200},{-120,200},{-120,216},{-140,216}}, color={0,127,255}));
-  connect(senDifEntFlo1.port_b1, buiComGen1.port_aSerHea) annotation (Line(
-        points={{-180,-8},{-170,-8},{-170,-4},{-160,-4}},
-                                                        color={0,127,255}));
-  connect(buiComGen1.port_bSerHea, senDifEntFlo1.port_a2) annotation (Line(
-        points={{-140,-4},{-120,-4},{-120,-20},{-180,-20}},
-                                                       color={0,127,255}));
-  connect(senDifEntFlo2.port_b1, buiComGen1.port_aSerCoo) annotation (Line(
-        points={{-140,-48},{-120,-48},{-120,-30},{-166,-30},{-166,-8},{-160,-8}},
-                                                                       color={0,
-          127,255}));
-  connect(buiComGen1.port_bSerCoo, senDifEntFlo2.port_a2) annotation (Line(
-        points={{-140,-8},{-100,-8},{-100,-60},{-140,-60}},
-                                                      color={0,127,255}));
-  connect(senDifEntFlo3.port_b1, buiCoo.port_aSerCoo)
-    annotation (Line(points={{-180,92},{-160,92}}, color={0,127,255}));
-  connect(buiCoo.port_bSerCoo, senDifEntFlo3.port_a2) annotation (Line(points={{
-          -140,92},{-120,92},{-120,80},{-180,80}}, color={0,127,255}));
-  connect(souDisSup5.ports[1],senDifEntFlo5.port_a1)
-    annotation (Line(points={{-60,0},{-52,0},{-52,-8},{-40,-8}},      color={0,127,255}));
-  connect(senDifEntFlo5.port_b2,sinDisRet5.ports[1])
-    annotation (Line(points={{-40,-20},{-52,-20},{-52,-40},{-60,-40}},color={0,127,255}));
-  connect(souDisSup6.ports[1],senDifEntFlo6.port_a1)
-    annotation (Line(points={{-20,-40},{-10,-40},{-10,-48},{0,-48}},color={0,127,255}));
-  connect(senDifEntFlo6.port_b2,sinDisRet6.ports[1])
-    annotation (Line(points={{0,-60},{-10,-60},{-10,-80},{-20,-80}},color={0,127,255}));
-  connect(senDifEntFlo5.port_b1, buiComGen2to4.port_aSerHea) annotation (Line(
-        points={{-20,-8},{-10,-8},{-10,-4},{0,-4}}, color={0,127,255}));
-  connect(buiComGen2to4.port_bSerHea, senDifEntFlo5.port_a2) annotation (Line(
-        points={{20,-4},{40,-4},{40,-20},{-20,-20}}, color={0,127,255}));
-  connect(senDifEntFlo6.port_b1, buiComGen2to4.port_aSerCoo) annotation (Line(
-        points={{20,-48},{40,-48},{40,-30},{-6,-30},{-6,-8},{0,-8}}, color={0,127,
-          255}));
-  connect(buiComGen2to4.port_bSerCoo, senDifEntFlo6.port_a2) annotation (Line(
-        points={{20,-8},{60,-8},{60,-60},{20,-60}}, color={0,127,255}));
-  connect(souDisSup7.ports[1], senDifEntFlo7.port_a1) annotation (Line(points={{
-          -60,220},{-52,220},{-52,212},{-40,212}}, color={0,127,255}));
-  connect(senDifEntFlo7.port_b2, sinDisRet7.ports[1]) annotation (Line(points={{
-          -40,200},{-52,200},{-52,180},{-60,180}}, color={0,127,255}));
-  connect(senDifEntFlo7.port_b1, buiHeaGen2to4.port_aSerHea) annotation (Line(
-        points={{-20,212},{-10,212},{-10,216},{0,216}}, color={0,127,255}));
-  connect(senDifEntFlo7.port_a2, buiHeaGen2to4.port_bSerHea) annotation (Line(
-        points={{-20,200},{40,200},{40,216},{20,216}}, color={0,127,255}));
-  connect(souDisSup4.ports[1],senDifEntFlo4.port_a1)
-    annotation (Line(points={{140,0},{150,0},{150,-8},{160,-8}},        color={0,127,255}));
-  connect(sinDisRet4.ports[1],senDifEntFlo4.port_b2)
-    annotation (Line(points={{140,-40},{150,-40},{150,-20},{160,-20}},color={0,127,255}));
-  connect(senDifEntFlo4.port_b1,buiComGen5. port_aSerAmb) annotation (Line(
-        points={{180,-8},{190,-8},{190,0},{200,0}},     color={0,127,255}));
-  connect(buiComGen5.port_bSerAmb,senDifEntFlo4. port_a2) annotation (Line(
-        points={{220,0},{240,0},{240,-20},{180,-20}},     color={0,127,255}));
-  connect(souDisSup8.ports[1],senDifEntFlo8.port_a1)
-    annotation (Line(points={{-220,-160},{-210,-160},{-210,-168},{-200,-168}},
-                                                                        color={0,127,255}));
-  connect(sinDisRet8.ports[1],senDifEntFlo8.port_b2)
-    annotation (Line(points={{-220,-200},{-210,-200},{-210,-180},{-200,-180}},
-                                                                      color={0,127,255}));
-  connect(senDifEntFlo8.port_b1,buiTesOutETS. port_aSerAmb) annotation (Line(
-        points={{-180,-168},{-170,-168},{-170,-160},{-160,-160}}, color={0,127,255}));
-  connect(buiTesOutETS.port_bSerAmb,senDifEntFlo8. port_a2) annotation (Line(
-        points={{-140,-160},{-120,-160},{-120,-180},{-180,-180}}, color={0,127,255}));
-  connect(souDisSup9.ports[1],senDifEntFlo9.port_a1)
-    annotation (Line(points={{-60,-160},{-52,-160},{-52,-168},{-40,-168}},
-                                                                        color={0,127,255}));
-  connect(sinDisRet9.ports[1],senDifEntFlo9.port_b2)
-    annotation (Line(points={{-60,-200},{-52,-200},{-52,-180},{-40,-180}},
-                                                                      color={0,127,255}));
-  connect(senDifEntFlo9.port_b1,buiTesOutETSBui. port_aSerAmb) annotation (Line(
-        points={{-20,-168},{-12,-168},{-12,-160},{0,-160}},  color={0,127,255}));
-  connect(buiTesOutETSBui.port_bSerAmb,senDifEntFlo9. port_a2) annotation (Line(
-        points={{20,-160},{40,-160},{40,-180},{-20,-180}}, color={0,127,255}));
-  connect(souDisSup10.ports[1],senDifEntFlo10. port_a1) annotation (Line(points={{120,
-          -160},{130,-160},{130,-168},{140,-168}},      color={0,127,255}));
-  connect(sinDisRet10.ports[1],senDifEntFlo10. port_b2) annotation (Line(points={{120,
-          -200},{130,-200},{130,-180},{140,-180}},      color={0,127,255}));
-  connect(senDifEntFlo10.port_b1,buiTesFacMul. port_aSerAmb) annotation (Line(
-        points={{160,-168},{170,-168},{170,-160},{180,-160}}, color={0,127,255}));
-  connect(buiTesFacMul.port_bSerAmb,senDifEntFlo10. port_a2) annotation (Line(
-        points={{200,-160},{220,-160},{220,-180},{160,-180}}, color={0,127,255}));
-  annotation (
-    experiment(
-      Tolerance=1e-6,
-      StopTime=1.0),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos"
-      "Simulate and plot"),
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-260,-260},{260,260}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS\">
-Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS</a>
-for various types of district system.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 12, 2021, by Michael Wetter:<br/>
-Changed steam medium.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2395\">#2395</a>.
-</li>
-<li>
-December 14, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
deleted file mode 100644
index 40269fd67eb..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mo
+++ /dev/null
@@ -1,69 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
-model GetPeakLoad
-  "Model that validates the getPeakLoad function"
-  extends Modelica.Icons.Example;
-  parameter Modelica.Units.SI.HeatFlowRate QCoo_flow=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
-      "#Peak space cooling load", filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
-    "Peak heat flow rate";
-  parameter Modelica.Units.SI.HeatFlowRate QHea_flow=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
-      "#Peak space heating load", filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
-    "Peak heat flow rate";
-  parameter Modelica.Units.SI.HeatFlowRate QWatHea_flow=
-      Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(string=
-      "#Peak water heating load", filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos"))
-    "Peak water heating flow rate";
-equation
-  assert(
-    abs(
-      QCoo_flow-(-383165.6989)) < 1E-3,
-    "Error in reading the peak heating load. Read "+String(
-      QCoo_flow));
-  assert(
-    abs(
-      QHea_flow-893931.4335) < 1E-3,
-    "Error in reading the peak heating load. Read "+String(
-      QHea_flow));
-  assert(
-    abs(
-      QWatHea_flow-19496.90012) < 1E-3,
-    "Error in reading the peak water heating load. Read "+String(
-      QWatHea_flow));
-  annotation (
-    experiment(
-      Tolerance=1e-6,
-      StopTime=1.0),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos" "Simulate and plot"),
-    Documentation(
-      info="<html>
-<p>
-This model tests reading the peak loads from the load file.
-If the wrong values are read, then the simulation stops with an error.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-November 28, 2016, by Michael Wetter:<br/>
-Added call to <code>Modelica.Utilities.Files.loadResource</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/585\">#585</a>.
-</li>
-<li>
-November 8, 2016, by Michael Wetter:<br/>
-Removed test for equality of real variables.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/572\">#572</a>.
-</li>
-<li>
-December 1, 2015, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end GetPeakLoad;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
deleted file mode 100644
index 15ac5044319..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mo
+++ /dev/null
@@ -1,201 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses.Validation;
-model SimpleRoomODE
-  "Validation of the model SimpleRoomODE"
-  extends Modelica.Icons.Example;
-  package Medium1=Buildings.Media.Water
-    "Source side medium";
-  package Medium2=Buildings.Media.Air
-    "Load side medium";
-  parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=112000 "Design heating heat flow rate (for TInd=TIndHea_nominal, TOut=TOutHea_nominal,
-    with no internal gains, no solar radiation)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=-200000
-    "Design cooling heat flow rate"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Time tau=1800
-    "Time constant of the indoor temperature";
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaMet
-    "ROM where the heating load is always met"
-    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
-    TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
-    TDryBul=276.15,
-    calTSky=Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.HorizontalRadiation,
-    computeWetBulbTemperature=false,
-    filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
-    "Weather data reader"
-    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
-  Buildings.Controls.Continuous.LimPID conHea(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Ti=10)
-    annotation (Placement(transformation(extent={{30,110},{50,130}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant minTSet(
-    k=293.15,
-    y(final unit="K",
-      displayUnit="degC"))
-    "Minimum temperature set point"
-    annotation (Placement(transformation(extent={{-140,150},{-120,170}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai(k=
-        QHea_flow_nominal) "Scaling"
-    annotation (Placement(transformation(extent={{60,110},{80,130}})));
-  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow
-    "Prescribed heat flow rate"
-    annotation (Placement(transformation(extent={{82,130},{62,150}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romHeaUnm
-    "ROM where the heating load is not met"
-    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai1(k=0.7)
-    "Scaling "
-    annotation (Placement(transformation(extent={{92,90},{112,110}})));
-  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow1
-    "Prescribed heat flow rate"
-    annotation (Placement(transformation(extent={{82,70},{62,90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeHea(
-    dTEnv_nominal=20,
-    TAir_start=293.15,
-    QEnv_flow_nominal=QHea_flow_nominal,
-    tau=tau)
-    "ODE heated room model"
-    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant maxTSet(
-    k=297.15,
-    y(final unit="K",
-      displayUnit="degC"))
-    "Maximum temperature set point"
-    annotation (Placement(transformation(extent={{-140,-170},{-120,-150}})));
-  Buildings.Controls.Continuous.LimPID conCoo(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    Ti=10,
-    reverseActing=false)
-    "PI controller tracking the room maximum temperature"
-    annotation (Placement(transformation(extent={{30,-110},{50,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai2(k=
-        QCoo_flow_nominal) "Scaling"
-    annotation (Placement(transformation(extent={{60,-110},{80,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE rooOdeCoo(
-    dTEnv_nominal=20,
-    TAir_start=293.15,
-    QEnv_flow_nominal=QHea_flow_nominal,
-    tau=tau)
-    "ODE cooled room model"
-    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai3(k=0.8)
-    "Scaling"
-    annotation (Placement(transformation(extent={{92,-90},{112,-70}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat1(
-    TDryBulSou=Buildings.BoundaryConditions.Types.DataSource.Parameter,
-    TDryBul=293.15,
-    calTSky=Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.HorizontalRadiation,
-    computeWetBulbTemperature=false,
-    filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
-    "Weather data reader"
-    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooMet
-    "ROM where the cooling load is always met"
-    annotation (Placement(transformation(extent={{-10,-130},{10,-110}})));
-  Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.GeojsonExportRC.OfficeBuilding.Office romCooUnm
-    "ROM where the cooling load is not met"
-    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
-  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow2
-    "Prescribed heat flow rate"
-    annotation (Placement(transformation(extent={{80,-70},{60,-50}})));
-  HeatTransfer.Sources.PrescribedHeatFlow prescribedHeatFlow3
-    "Prescribed heat flow rate"
-    annotation (Placement(transformation(extent={{82,-150},{62,-130}})));
-equation
-  connect(weaDat.weaBus,romHeaMet.weaBus)
-    annotation (Line(points={{-120,100},{0,100},{0,99.8},{-6,99.8}},color={255,204,51},thickness=0.5));
-  connect(romHeaMet.TAir,conHea.u_m)
-    annotation (Line(points={{11,100},{40,100},{40,108}},color={0,0,127}));
-  connect(conHea.y,gai.u)
-    annotation (Line(points={{51,120},{58,120}},color={0,0,127}));
-  connect(gai.y,prescribedHeatFlow.Q_flow)
-    annotation (Line(points={{82,120},{126,120},{126,140},{82,140}},color={0,0,127}));
-  connect(prescribedHeatFlow.port,romHeaMet.port_a)
-    annotation (Line(points={{62,140},{0,140},{0,110}},color={191,0,0}));
-  connect(conCoo.y,gai2.u)
-    annotation (Line(points={{51,-100},{58,-100}},color={0,0,127}));
-  connect(gai1.y,prescribedHeatFlow1.Q_flow)
-    annotation (Line(points={{114,100},{120,100},{120,80},{82,80}},color={0,0,127}));
-  connect(gai1.y,rooOdeHea.QAct_flow)
-    annotation (Line(points={{114,100},{120,100},{120,6},{-14,6},{-14,12},{-12,12}},color={0,0,127}));
-  connect(gai2.y,rooOdeCoo.QReq_flow)
-    annotation (Line(points={{82,-100},{126,-100},{126,-34},{-20,-34},{-20,-20},{-12,-20}},color={0,0,127}));
-  connect(prescribedHeatFlow1.port,romHeaUnm.port_a)
-    annotation (Line(points={{62,80},{0,80},{0,70}},color={191,0,0}));
-  connect(gai2.y,gai3.u)
-    annotation (Line(points={{82,-100},{86,-100},{86,-80},{90,-80}},color={0,0,127}));
-  connect(gai3.y,rooOdeCoo.QAct_flow)
-    annotation (Line(points={{114,-80},{120,-80},{120,-40},{-14,-40},{-14,-28},{-12,-28}},color={0,0,127}));
-  connect(weaDat.weaBus,romHeaUnm.weaBus)
-    annotation (Line(points={{-120,100},{-20,100},{-20,59.8},{-6,59.8}},color={255,204,51},thickness=0.5));
-  connect(weaDat1.weaBus,romCooMet.weaBus)
-    annotation (Line(points={{-120,-100},{-20,-100},{-20,-120.2},{-6,-120.2}},color={255,204,51},thickness=0.5));
-  connect(weaDat1.weaBus,romCooUnm.weaBus)
-    annotation (Line(points={{-120,-100},{-20,-100},{-20,-80.2},{-6,-80.2}},color={255,204,51},thickness=0.5));
-  connect(romCooMet.TAir,conCoo.u_m)
-    annotation (Line(points={{11,-120},{40,-120},{40,-112}},color={0,0,127}));
-  connect(gai.y,gai1.u)
-    annotation (Line(points={{82,120},{86,120},{86,100},{90,100}},color={0,0,127}));
-  connect(gai.y,rooOdeHea.QReq_flow)
-    annotation (Line(points={{82,120},{126,120},{126,0},{-20,0},{-20,20},{-12,20}},color={0,0,127}));
-  connect(gai3.y,prescribedHeatFlow2.Q_flow)
-    annotation (Line(points={{114,-80},{120,-80},{120,-60},{80,-60}},color={0,0,127}));
-  connect(prescribedHeatFlow2.port,romCooUnm.port_a)
-    annotation (Line(points={{60,-60},{0,-60},{0,-70}},color={191,0,0}));
-  connect(gai2.y,prescribedHeatFlow3.Q_flow)
-    annotation (Line(points={{82,-100},{120,-100},{120,-140},{82,-140}},color={0,0,127}));
-  connect(prescribedHeatFlow3.port,romCooMet.port_a)
-    annotation (Line(points={{62,-140},{0,-140},{0,-110}},color={191,0,0}));
-  connect(minTSet.y,conHea.u_s)
-    annotation (Line(points={{-118,160},{20,160},{20,120},{28,120}},color={0,0,127}));
-  connect(minTSet.y,rooOdeHea.TSet)
-    annotation (Line(points={{-118,160},{-40,160},{-40,28},{-12,28}},color={0,0,127}));
-  connect(maxTSet.y,conCoo.u_s)
-    annotation (Line(points={{-118,-160},{20,-160},{20,-100},{28,-100}},color={0,0,127}));
-  connect(maxTSet.y,rooOdeCoo.TSet)
-    annotation (Line(points={{-118,-160},{-40,-160},{-40,-12},{-12,-12}},color={0,0,127}));
-  annotation (
-    experiment(
-      StopTime=1209600,
-      Tolerance=1e-06),
-    Documentation(
-      info="
-<html>
-<p>
-This example validates
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE\">
-Buildings.Experimental.DHC.Loads.BaseClasses.SimpleRoomODE</a> by comparison with
-<a href=\"modelica://Buildings.ThermalZones.ReducedOrder.RC.TwoElements\">
-Buildings.ThermalZones.ReducedOrder.RC.TwoElements</a>.
-<p>
-A first instance of the reduced order model is used to assess the heating and
-cooling loads. A second instance is used to assess the indoor air temperature
-variation when the rate at which heating or cooling is provided is lower than
-the load. That second instance is used as a reference for the validation.
-</p>
-<p>
-Eventually the validation is performed with two sets of ambient conditions,
-one requiring heating, and the second requiring cooling.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-January 26, 2023, by Michael Wetter:<br/>
-Updated parameter names.
-</li>
-<li>
-February 21, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos" "Simulate and plot"),
-    Diagram(
-      coordinateSystem(
-        extent={{-180,-200},{180,200}})));
-end SimpleRoomODE;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.mo
deleted file mode 100644
index 9e2142e98e9..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/Validation/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Loads.BaseClasses;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models that validate the base classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.BaseClasses\">
-Buildings.Experimental.DHC.Loads.BaseClasses</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/BaseClasses/package.mo
deleted file mode 100644
index 65165242a21..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Loads;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-Buildings.Experimental.DHC.Loads</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/BaseClasses/package.order b/Buildings/Experimental/DHC/Loads/BaseClasses/package.order
deleted file mode 100644
index 52d611fc112..00000000000
--- a/Buildings/Experimental/DHC/Loads/BaseClasses/package.order
+++ /dev/null
@@ -1,11 +0,0 @@
-ConstraintViolation
-FlowDistribution
-PartialBuilding
-PartialBuildingWithPartialETS
-PartialTerminalUnit
-SimpleRoomODE
-getPeakLoad
-Controls
-Types
-Examples
-Validation
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo b/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
deleted file mode 100644
index 915f8be9700..00000000000
--- a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/PartialBuildingWithETS.mo
+++ /dev/null
@@ -1,126 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Combined.BaseClasses;
-model PartialBuildingWithETS
-  "Partial model with ETS model and partial building model"
-  extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
-    nPorts_heaWat=1,
-    nPorts_chiWat=1);
-  outer parameter Buildings.Experimental.DHC.Examples.Combined.BaseClasses.DesignDataSeries datDes "DHC system design data"
-    annotation (Placement(transformation(extent={{-250,262},{-230,282}})));
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0) = 4
-    "Water temperature drop/increase accross load and source-side HX (always positive)"
-    annotation (Dialog(group="ETS model parameters"));
-  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=18 + 273.15
-    "Chilled water supply temperature"
-    annotation (Dialog(group="ETS model parameters"));
-  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=38 + 273.15
-    "Heating water supply temperature"
-    annotation (Dialog(group="ETS model parameters"));
-  parameter Modelica.Units.SI.Temperature THotWatSup_nominal=63 + 273.15
-    "Domestic hot water supply temperature to fixtures"
-    annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
-  parameter Modelica.Units.SI.Temperature TColWat_nominal=288.15
-    "Cold water temperature (for hot water production)"
-    annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
-  parameter Modelica.Units.SI.Pressure dp_nominal=50000
-    "Pressure difference at nominal flow rate (for each flow leg)"
-    annotation (Dialog(group="ETS model parameters"));
-  parameter Real COPHeaWat_nominal(final unit="1") = 4.0
-    "COP of heat pump for heating water production"
-    annotation (Dialog(group="ETS model parameters"));
-  parameter Real COPHotWat_nominal(final unit="1") = 2.3
-    "COP of heat pump for hot water production"
-    annotation (Dialog(group="ETS model parameters", enable=have_hotWat));
-  // IO CONNECTORS
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "Chilled water supply temperature set point"
-    annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-320,80}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-120,50})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupMaxSet(
-    final unit="K",
-    displayUnit="degC")
-    "Heating water supply temperature set point - Maximum value"
-    annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-320,120}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-120,70})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupMinSet(
-    final unit="K",
-    displayUnit="degC")
-    "Heating water supply temperature set point - Minimum value"
-    annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-320,160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-120,90})));
-  // COMPONENTS
-  Buildings.Controls.OBC.CDL.Reals.Line resTHeaWatSup
-    "HW supply temperature reset"
-    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(k=0)
-    "Zero"
-    annotation (Placement(transformation(extent={{-180,-30},{-160,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(k=1)
-    "One"
-    annotation (Placement(transformation(extent={{-180,-70},{-160,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter mulPPumETS(u(final
-        unit="W"), final k=facMul) if have_pum "Scaling"
-    annotation (Placement(transformation(extent={{270,-10},{290,10}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPumETS(
-    final unit="W") if have_pum
-    "ETS pump power"
-    annotation (Placement(
-        transformation(extent={{300,-20},{340,20}}),iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={70,120})));
-equation
-  connect(TChiWatSupSet, ets.TChiWatSupSet) annotation (Line(points={{-320,80},{
-          -132,80},{-132,-62},{-34,-62}},color={0,0,127}));
-  connect(resTHeaWatSup.y, ets.THeaWatSupSet) annotation (Line(points={{-88,-40},
-          {-60,-40},{-60,-58},{-34,-58}}, color={0,0,127}));
-  connect(THeaWatSupMaxSet, resTHeaWatSup.f2) annotation (Line(points={{-320,120},
-          {-280,120},{-280,-48},{-112,-48}}, color={0,0,127}));
-  connect(THeaWatSupMinSet, resTHeaWatSup.f1) annotation (Line(points={{-320,160},
-          {-276,160},{-276,-36},{-112,-36}}, color={0,0,127}));
-  connect(one.y, resTHeaWatSup.x2) annotation (Line(points={{-158,-60},{-126,-60},
-          {-126,-44},{-112,-44}}, color={0,0,127}));
-  connect(zer.y, resTHeaWatSup.x1) annotation (Line(points={{-158,-20},{-116,-20},
-          {-116,-32},{-112,-32}}, color={0,0,127}));
-  connect(mulPPumETS.y, PPumETS)
-    annotation (Line(points={{292,0},{320,0}},   color={0,0,127}));
-  connect(ets.PPum, mulPPumETS.u) annotation (Line(points={{34,-60},{240,-60},{
-          240,0},{268,0}},   color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-This model is composed of a heat pump based energy transfer station model
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
-connected to a repleacable building load model.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PartialBuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.mo
deleted file mode 100644
index 376050eab35..00000000000
--- a/Buildings/Experimental/DHC/Loads/Combined/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Combined;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined\">
-Buildings.Experimental.DHC.Loads.Combined</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
deleted file mode 100644
index 2130db00757..00000000000
--- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
+++ /dev/null
@@ -1,155 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Combined;
-model BuildingTimeSeriesWithETS
-  "Model of a building with loads provided as time series, connected to an ETS"
-  extends
-    Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
-      filNam=filNam,
-      have_hotWat=true,
-      T_aHeaWat_nominal=ets.THeaWatSup_nominal,
-      T_bHeaWat_nominal=ets.THeaWatRet_nominal,
-      T_aChiWat_nominal=ets.TChiWatSup_nominal,
-      T_bChiWat_nominal=ets.TChiWatRet_nominal),
-    redeclare
-      Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger
-      ets(
-      final dT_nominal=dT_nominal,
-      final TDisWatMin=datDes.TLooMin,
-      final TDisWatMax=datDes.TLooMax,
-      final TChiWatSup_nominal=TChiWatSup_nominal,
-      final THeaWatSup_nominal=THeaWatSup_nominal,
-      final THotWatSup_nominal=THotWatSup_nominal,
-      final TColWat_nominal=TColWat_nominal,
-      final dp_nominal=dp_nominal,
-      final COPHeaWat_nominal=COPHeaWat_nominal,
-      final COPHotWat_nominal=COPHotWat_nominal,
-      have_hotWat=true,
-      QChiWat_flow_nominal=QCoo_flow_nominal,
-      QHeaWat_flow_nominal=QHea_flow_nominal,
-      QHotWat_flow_nominal=QHot_flow_nominal));
-  parameter String filNam
-    "Library path of the file with thermal loads as time series";
-  final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(
-    max=-Modelica.Constants.eps)=
-    bui.facMul * bui.QCoo_flow_nominal
-    "Space cooling design load (<=0)"
-    annotation (Dialog(group="Design parameter"));
-  final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(
-    min=Modelica.Constants.eps)=
-    bui.facMul * bui.QHea_flow_nominal
-    "Space heating design load (>=0)"
-    annotation (Dialog(group="Design parameter"));
-  final parameter Modelica.Units.SI.HeatFlowRate QHot_flow_nominal(
-    min=Modelica.Constants.eps)=
-    bui.facMul * Buildings.Experimental.DHC.Loads.BaseClasses.getPeakLoad(
-      string="#Peak water heating load",
-      filNam=Modelica.Utilities.Files.loadResource(filNam))
-    "Hot water design load (>=0)"
-    annotation (Dialog(group="Design parameter"));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THotWatSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "Service hot water supply temperature set point"
-    annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-320,40}),  iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-120,30})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TColWat(
-    final unit="K",
-    displayUnit="degC")
-    "Cold water temperature"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={-320,0}),   iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={-80,-120})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaHeaNor(
-    k=1/QHea_flow_nominal) "Normalized heating load"
-    annotation (Placement(transformation(extent={{-200,-110},{-180,-90}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold enaHeaCoo[2](each t=1e-4)
-    "Threshold comparison to enable heating and cooling"
-    annotation (Placement(transformation(extent={{-110,-130},{-90,-110}})));
-  Modelica.Blocks.Sources.BooleanConstant enaSHW(
-    final k=true) if have_hotWat
-    "SHW production enable signal"
-    annotation (Placement(transformation(extent={{0,-130},{-20,-110}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter loaCooNor(k=1/
-        QCoo_flow_nominal) "Normalized cooling load"
-    annotation (Placement(transformation(extent={{-200,-150},{-180,-130}})));
-equation
-  connect(bui.QReqHotWat_flow, ets.QReqHotWat_flow) annotation (Line(points={{28,4},{28,
-          -10},{-64,-10},{-64,-74},{-34,-74}}, color={0,0,127}));
-  connect(THotWatSupSet, ets.THotWatSupSet) annotation (Line(points={{-320,40},
-          {-136,40},{-136,-66},{-34,-66}},  color={0,0,127}));
-  connect(TColWat, ets.TColWat) annotation (Line(points={{-320,0},{-148,0},{
-          -148,-70},{-34,-70}},  color={0,0,127}));
-  connect(enaHeaCoo[1].y, ets.uHea) annotation (Line(points={{-88,-120},{-40,
-          -120},{-40,-46},{-34,-46}}, color={255,0,255}));
-  connect(enaHeaCoo[2].y, ets.uCoo) annotation (Line(points={{-88,-120},{-40,
-          -120},{-40,-50},{-34,-50}}, color={255,0,255}));
-  connect(enaSHW.y, ets.uSHW) annotation (Line(points={{-21,-120},{-38,-120},{-38,
-          -54},{-34,-54}}, color={255,0,255}));
-  connect(loaHeaNor.y, enaHeaCoo[1].u) annotation (Line(points={{-178,-100},{
-          -120,-100},{-120,-120},{-112,-120}}, color={0,0,127}));
-  connect(loaCooNor.y, enaHeaCoo[2].u) annotation (Line(points={{-178,-140},{
-          -120,-140},{-120,-120},{-112,-120}}, color={0,0,127}));
-  connect(bui.QReqHea_flow, loaHeaNor.u) annotation (Line(points={{20,4},{20,-6},
-          {-218,-6},{-218,-100},{-202,-100}}, color={0,0,127}));
-  connect(bui.QReqCoo_flow, loaCooNor.u) annotation (Line(points={{24,4},{24,-4},
-          {-220,-4},{-220,-140},{-202,-140}}, color={0,0,127}));
-  connect(loaHeaNor.y, resTHeaWatSup.u) annotation (Line(points={{-178,-100},{
-          -120,-100},{-120,-40},{-112,-40}},  color={0,0,127}));
-  annotation (
-    Documentation(info="<html>
-<p>
-This model is composed of a heat pump based energy transfer station model
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
-connected to a simplified building model where the space heating, cooling
-and hot water loads are provided as time series.
-</p>
-<h4>Scaling</h4>
-<p>
-The parameter <code>bui.facMul</code> is the multiplier factor
-applied to the building loads that are provided as time series.
-It is used to represent multiple identical buildings served by
-a unique energy transfer station.
-The parameter <code>facMul</code> is the multiplier factor
-applied to the whole system composed of the building(s) and the
-energy transfer station.
-It is used to represent multiple identical ETSs served by
-the DHC system.
-So, if for instance the overall heating and cooling efficiency is
-equal to <i>1</i>, then the load on the district loop
-is the load provided as time series multiplied by <i>facMul * bui.facMul</i>.
-</p>
-<p>
-Note that the parameters <code>QCoo_flow_nominal</code>, <code>QHea_flow_nominal</code>
-and <code>QHot_flow_nominal</code> are the <i>ETS</i> design values. They include
-the building loads multiplier factor <code>bui.facMul</code> but not
-the building and ETS multiplier factor <code>facMul</code>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-November 21, 2022, by David Blum:<br/>
-Change <code>bui.facMulHea</code> and <code>bui.facMulCoo</code> to be default.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2302\">
-issue 2302</a>.
-</li>
-<li>
-February 23, 2021, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-300,-300},{
-            300,300}})));
-end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
deleted file mode 100644
index a517e520d9e..00000000000
--- a/Buildings/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mo
+++ /dev/null
@@ -1,101 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Combined.Examples;
-model BuildingTimeSeriesWithETS
-  "Example model of a building in an ambient district network with loads provided as time series and heat pump heating, free cooling, and heat pump domestic hot water"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  Buildings.Fluid.Sources.Boundary_pT supAmbWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar"),
-    use_T_in=true,
-    T=280.15,
-    nPorts=1) "Ambient water supply"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-10})));
-  Buildings.Fluid.Sources.Boundary_pT sinAmbWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar"),
-    nPorts=1) "Sink for ambient water"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-70})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
-    "Mass flow rate sensor"
-    annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
-  Modelica.Blocks.Sources.Constant TDisSup(k(
-      unit="K",
-      displayUnit="degC") = 288.15)
-    "District supply temperature"
-    annotation (Placement(transformation(extent={{-92,-16},{-72,4}})));
-  Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS bui(
-    redeclare package MediumSer = Medium,
-    redeclare package MediumBui = Medium,
-    bui(facMul=10),
-    allowFlowReversalSer=true,
-    THotWatSup_nominal=322.15,
-    filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos")
-    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TColWat(k=bui.ets.TColWat_nominal)
-    "Cold water temperature"
-    annotation (Placement(transformation(extent={{-20,-50},{0,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THotWatSupSet(k=bui.ets.THotWatSup_nominal)
-    "Hot water supply temperature set point"
-    annotation (Placement(transformation(extent={{-90,20},{-70,40}})));
- Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(k=bui.TChiWatSup_nominal)
-    "Chilled water supply temperature set point"
-    annotation (Placement(transformation(extent={{-90,60},{-70,80}})));
- Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMaxSet(k=bui.THeaWatSup_nominal)
-    "Heating water supply temperature set point - Maximum value"
-    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
- Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupMinSet(
-   k(final unit="K",
-     displayUnit="degC") = 301.15)
-   "Heating water supply temperature set point - Minimum value"
-    annotation (Placement(transformation(extent={{0,60},{20,80}})));
-equation
-  connect(supAmbWat.ports[1], senMasFlo.port_a)
-    annotation (Line(points={{-40,-10},{-20,-10}},
-                                                 color={0,127,255}));
-  connect(TDisSup.y,supAmbWat. T_in)
-    annotation (Line(points={{-71,-6},{-62,-6}}, color={0,0,127}));
-  connect(senMasFlo.port_b, bui.port_aSerAmb) annotation (Line(points={{0,-10},
-          {40,-10}},              color={0,127,255}));
-  connect(sinAmbWat.ports[1], bui.port_bSerAmb) annotation (Line(points={{-40,-70},
-          {70,-70},{70,-10},{60,-10}}, color={0,127,255}));
-  connect(THeaWatSupMinSet.y, bui.THeaWatSupMinSet) annotation (Line(points={{22,70},
-          {34,70},{34,0},{38,0},{38,-1}},                 color={0,0,127}));
-  connect(THeaWatSupMaxSet.y, bui.THeaWatSupMaxSet) annotation (Line(points={{-18,70},
-          {-10,70},{-10,34},{32,34},{32,-3},{38,-3}},     color={0,0,127}));
-  connect(TChiWatSupSet.y, bui.TChiWatSupSet) annotation (Line(points={{-68,70},
-          {-52,70},{-52,32},{30,32},{30,-5},{38,-5}},
-                                                color={0,0,127}));
-  connect(THotWatSupSet.y, bui.THotWatSupSet) annotation (Line(points={{-68,30},
-          {26,30},{26,-7},{38,-7}},                color={0,0,127}));
-  connect(TColWat.y, bui.TColWat) annotation (Line(points={{2,-40},{34,-40},{34,
-          -22},{42,-22}},                      color={0,0,127}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false)),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
-    experiment(
-      StopTime=864000,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-Example model of a building in an ambient district network with loads
-provided as time series and heat pump heating, free cooling,
-and heat pump domestic hot water.  It uses
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
-Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-May 3, 2023, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/Examples/package.mo b/Buildings/Experimental/DHC/Loads/Combined/Examples/package.mo
deleted file mode 100644
index e489cac1422..00000000000
--- a/Buildings/Experimental/DHC/Loads/Combined/Examples/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Combined;
-package Examples "This package contains example models"
-  extends Modelica.Icons.ExamplesPackage;
-  annotation (Documentation(info="<html>
-<p>
-This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined\">
-Buildings.Experimental.DHC.Loads.Combined</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Combined/package.mo b/Buildings/Experimental/DHC/Loads/Combined/package.mo
deleted file mode 100644
index e689605a8f6..00000000000
--- a/Buildings/Experimental/DHC/Loads/Combined/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads;
-package Combined "Package with models for loads"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains models of building loads that are used to
-build example models of DHC systems.
-</p>
-</html>"));
-end Combined;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo b/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
deleted file mode 100644
index f4280807a0a..00000000000
--- a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/PartialBuildingWithETS.mo
+++ /dev/null
@@ -1,81 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Cooling.BaseClasses;
-model PartialBuildingWithETS
-  "Partial model with ETS model for cooling and partial building model"
-  extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
-      nPorts_chiWat=1,
-      redeclare Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct ets(
-      final mBui_flow_nominal=mBui_flow_nominal,
-      final controllerType=controllerType,
-      final k=k,
-      final Ti=Ti,
-      final Td=Td,
-      final yMax=yMax,
-      final yMin=yMin));
-
-  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal(
-    final min=0,
-    final start=0.5)
-    "Nominal mass flow rate"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpSup(
-    final min=0,
-    displayUnit="Pa")=5000
-    "Pressure drop in the ETS supply side";
-  parameter Modelica.Units.SI.PressureDifference dpRet(
-    final min=0,
-    displayUnit="Pa")=5000
-    "Pressure drop in the ETS return side";
-  // Controller parameters
-  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
-    "Type of controller"
-    annotation (Dialog(group="PID controller"));
-  parameter Real k(
-    final min=0,
-    final unit="1")=0.1
-    "Gain of controller"
-    annotation (Dialog(group="PID controller"));
-  parameter Modelica.Units.SI.Time Ti(
-    final min=Modelica.Constants.small)=60
-    "Time constant of integrator block"
-    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Modelica.Units.SI.Time Td(
-    final min=0)=0.1
-    "Time constant of derivative block"
-    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Real yMax(
-    final start=1)=1
-    "Upper limit of output"
-    annotation (Dialog(group="PID controller"));
-  parameter Real yMin=0
-    "Lower limit of output"
-    annotation (Dialog(group="PID controller"));
-  Modelica.Blocks.Interfaces.RealInput TDisRetSet(
-     final unit="K",
-     displayUnit="degC")
-    "Setpoint for the minimum district return temperature"
-    annotation (Placement(transformation(extent={{-340,20},{-300,-20}}),
-        iconTransformation(extent={{-120,60},{-100,80}})));
-equation
-  connect(TDisRetSet,ets.TDisRetSet)  annotation (Line(points={{-320,0},{-64,0},
-          {-64,-56},{-31.8,-56}}, color={0,0,127}));
-  annotation (Documentation(info="<html>
-<p>
-This model is composed of a direct controlled energy transfer station model for cooling
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct</a>
-connected to a repleacable building load model.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 23, 2022, by Kathryn Hinkelman:<br>
-Revised ETS from direct uncontrolled to direct controlled.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-</ul>
-<ul>
-<li>March 20, 2022, by Chengnan Shi:<br>First implementation. </li>
-</ul>
-</html>"));
-end PartialBuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.mo
deleted file mode 100644
index 62d02f9095a..00000000000
--- a/Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Cooling;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
deleted file mode 100644
index a3038f24253..00000000000
--- a/Buildings/Experimental/DHC/Loads/Cooling/BuildingTimeSeriesWithETS.mo
+++ /dev/null
@@ -1,80 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Cooling;
-model BuildingTimeSeriesWithETS
-  "Model of a building with loads provided as time series, connected to an ETS for cooling"
-  extends BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
-      final have_heaWat=false,
-      final have_chiWat=true,
-      final have_hotWat=false,
-      final filNam=filNam,
-      T_aChiWat_nominal=TChiWatSup_nominal,
-      T_bChiWat_nominal=TChiWatRet_nominal),
-      mBui_flow_nominal=-QCoo_flow_nominal/(cp*dT_nominal),
-          ets(
-      QChiWat_flow_nominal=QCoo_flow_nominal));
-
-  final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=
-    bui.facMul * bui.QCoo_flow_nominal
-    "Space cooling design load (<=0)";
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0)=9
-    "Water temperature drop/increase accross load and source-side HX (always positive)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=7 + 273.15
-    "Chilled water supply temperature"
-    annotation (Dialog(group="Nominal conditions"));
-  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=
-    TChiWatSup_nominal + dT_nominal
-    "Chilled water return temperature"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
-    "Type of energy balance"
-    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
-  parameter Boolean use_inputFilter=false
-    "= true, if pump speed is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Pump"));
-  parameter String filNam
-    "Library path of the file with thermal loads as time series";
-protected
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp=MediumSer.specificHeatCapacityCp(
-    MediumSer.setState_pTX(
-      MediumSer.p_default,
-      MediumSer.T_default,
-      MediumSer.X_default))
-    "Default specific heat capacity of medium";
-  annotation (
-  defaultComponentName="loa",
-  Documentation(info="<html>
-<p>
-This model is composed of a direct controlled energy transfer station model for cooling
-<a href=\"modelica://Buildings/Experimental/DHC/EnergyTransferStations/Cooling/Direct.mo\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct</a>
-connected to a simplified building model <a href=\"modelica://Buildings/Experimental/DHC/Loads/Cooling/BaseClasses/BuildingTimeSeries.mo\">
-Buildings.Experimental.DHC.Loads.Cooling.BaseClasses.BuildingTimeSeries</a>
-where the space cooling loads are provided as time series.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-January 12, 2023, by Michael Wetter:<br/>
-Removed unused parameter <code>riseTime</code>.
-</li>
-<li>
-January 2, 2023, by Kathryn Hinkelman:<br/>
-Propagated energy dynamics and a filter for the (variable) secondary pumps.
-</li>
-<li>
-December 23, 2022, by Kathryn Hinkelman:<br>
-Revised ETS from direct uncontrolled to direct controlled.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-<li>
-December 21, 2022 by Kathryn Hinkelman:<br>
-Removed in-building pumping because of coupling with the direct/uncontrolled ETS.<br>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-</ul>
-<ul>
-<li>March 20, 2022 by Chengnan Shi:<br>First implementation. </li>
-</ul>
-</html>"));
-end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
deleted file mode 100644
index eef7c037788..00000000000
--- a/Buildings/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mo
+++ /dev/null
@@ -1,76 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Cooling.Examples;
-model BuildingTimeSeriesWithETS
-  "Example model of a building with loads provided as time series and
-  connected to an ETS for cooling"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS buiWitETS(
-    filNam=
-      "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
-  "Building Time Series load coupled with ETS"
-    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
-  Buildings.Fluid.Sources.Boundary_pT supChiWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar") = 350000,
-    use_T_in=true,
-    T=280.15,
-    nPorts=1)
-    "Chilled water supply"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,10})));
-  Buildings.Fluid.Sources.Boundary_pT sinChiWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar") = 340000,
-    nPorts=1)
-    "Sink for chilled water"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-50})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
-    "Mass flow rate sensor"
-    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
-  Modelica.Blocks.Sources.Constant TDisRetSet(k=273.15 + 16)
-    "Setpoint for district return temperature"
-    annotation (Placement(transformation(extent={{0,40},{20,60}})));
-  Modelica.Blocks.Sources.Constant TDisSup(k(
-      unit="K",
-      displayUnit="degC") = 280.15)
-    "District supply temperature"
-    annotation (Placement(transformation(extent={{-90,4},{-70,24}})));
-equation
-  connect(supChiWat.ports[1], senMasFlo.port_a)
-    annotation (Line(points={{-40,10},{-20,10}}, color={0,127,255}));
-  connect(senMasFlo.port_b, buiWitETS.port_aSerCoo) annotation (Line(points={{0,
-          10},{20,10},{20,-18},{40,-18}}, color={0,127,255}));
-  connect(buiWitETS.port_bSerCoo, sinChiWat.ports[1]) annotation (Line(points={
-          {60,-18},{80,-18},{80,-50},{-40,-50}}, color={0,127,255}));
-  connect(TDisSup.y, supChiWat.T_in)
-    annotation (Line(points={{-69,14},{-62,14}}, color={0,0,127}));
-  connect(TDisRetSet.y,buiWitETS.TDisRetSet)  annotation (Line(points={{21,50},
-          {30,50},{30,-3},{39,-3}}, color={0,0,127}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false)),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
-    experiment(
-      StartTime=2592000,
-      StopTime=3628800,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-This model provides an example for a building with loads provided
-as time series and connected to a direct ETS for cooling with the
-return chilled water temperature controlled above a minimum threshold.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 20, 2022, by Chengnan Shi:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.mo b/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.mo
deleted file mode 100644
index 5a620a2c59c..00000000000
--- a/Buildings/Experimental/DHC/Loads/Cooling/Examples/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Cooling;
-package Examples
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (Documentation(info="<html>
-<p>This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Cooling/package.mo b/Buildings/Experimental/DHC/Loads/Cooling/package.mo
deleted file mode 100644
index ebd2e58e7cd..00000000000
--- a/Buildings/Experimental/DHC/Loads/Cooling/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads;
-package Cooling "This package contains models for energy transfer stations used in district cooling system."
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains models of building loads that are used to
-build example models of district cooling systems.
-</p>
-</html>"));
-end Cooling;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo b/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
deleted file mode 100644
index 61834ec600c..00000000000
--- a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/PartialBuildingWithETS.mo
+++ /dev/null
@@ -1,81 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Heating.BaseClasses;
-model PartialBuildingWithETS
-  "Partial model with ETS model for heating and partial building model"
-  extends
-    Buildings.Experimental.DHC.Loads.BaseClasses.PartialBuildingWithPartialETS(
-      nPorts_heaWat=1,
-      redeclare Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct ets(
-      final mBui_flow_nominal=mBui_flow_nominal,
-      final controllerType=controllerType,
-      final k=k,
-      final Ti=Ti,
-      final Td=Td,
-      final yMax=yMax,
-      final yMin=yMin));
-
-  parameter Modelica.Units.SI.MassFlowRate mBui_flow_nominal(
-    final min=0,
-    final start=0.5)
-    "Nominal mass flow rate"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpSup(
-    final min=0,
-    displayUnit="Pa")=5000
-    "Pressure drop in the ETS supply side";
-  parameter Modelica.Units.SI.PressureDifference dpRet(
-    final min=0,
-    displayUnit="Pa")=5000
-    "Pressure drop in the ETS return side";
-  // Controller parameters
-  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
-    "Type of controller"
-    annotation (Dialog(group="PID controller"));
-  parameter Real k(
-    final min=0,
-    final unit="1")=0.1
-    "Gain of controller"
-    annotation (Dialog(group="PID controller"));
-  parameter Modelica.Units.SI.Time Ti(
-    final min=Modelica.Constants.small)=60
-    "Time constant of integrator block"
-    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PI or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Modelica.Units.SI.Time Td(
-    final min=0)=0.1
-    "Time constant of derivative block"
-    annotation (Dialog(group="PID controller",enable=controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PD or controllerType == Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
-  parameter Real yMax(
-    final start=1)=1
-    "Upper limit of output"
-    annotation (Dialog(group="PID controller"));
-  parameter Real yMin=0
-    "Lower limit of output"
-    annotation (Dialog(group="PID controller"));
-  Modelica.Blocks.Interfaces.RealInput TDisRetSet(
-     final unit="K",
-     displayUnit="degC")
-    "Setpoint for the maximum district return temperature"
-    annotation (Placement(transformation(extent={{-340,20},{-300,-20}}),
-        iconTransformation(extent={{-120,60},{-100,80}})));
-equation
-  connect(TDisRetSet,ets.TDisRetSet)  annotation (Line(points={{-320,0},{-64,0},
-          {-64,-56},{-31.8,-56}}, color={0,0,127}));
-  annotation (Documentation(info="<html>
-<p>
-This model is composed of a direct controlled energy transfer station model for cooling
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct\">
-Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct</a>
-connected to a repleacable building load model.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 23, 2022, by Kathryn Hinkelman:<br>
-Revised ETS from direct uncontrolled to direct controlled.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-</ul>
-<ul>
-<li>March 20, 2022, by Chengnan Shi:<br>First implementation. </li>
-</ul>
-</html>"));
-end PartialBuildingWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.mo
deleted file mode 100644
index f98fecd077e..00000000000
--- a/Buildings/Experimental/DHC/Loads/Heating/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Heating;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
deleted file mode 100644
index ad16646d77a..00000000000
--- a/Buildings/Experimental/DHC/Loads/Heating/BuildingTimeSeriesWithETS.mo
+++ /dev/null
@@ -1,80 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Heating;
-model BuildingTimeSeriesWithETS
-  "Model of a building with loads provided as time series, connected to an ETS for heating"
-  extends BaseClasses.PartialBuildingWithETS(
-    redeclare Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries bui(
-      final have_heaWat=true,
-      final have_chiWat=false,
-      final have_hotWat=false,
-      final filNam=filNam,
-      T_aHeaWat_nominal=THeaWatSup_nominal,
-      T_bHeaWat_nominal=THeaWatRet_nominal),
-      mBui_flow_nominal=QHea_flow_nominal/(cp*dT_nominal),
-          ets(
-      QHeaWat_flow_nominal=QHea_flow_nominal));
-
-  final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
-    bui.facMul * bui.QHea_flow_nominal
-    "Space heating design load (>=0)";
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal(min=0)=10
-    "Water temperature drop/increase accross load and source-side HX (always positive)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=50 + 273.15
-    "Heating water supply temperature"
-    annotation (Dialog(group="Nominal conditions"));
-  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
-    THeaWatSup_nominal - dT_nominal
-    "Heating water return temperature"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState
-    "Type of energy balance"
-    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
-  parameter Boolean use_inputFilter=false
-    "= true, if pump speed is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Pump"));
-  parameter String filNam
-    "Library path of the file with thermal loads as time series";
-protected
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp=MediumSer.specificHeatCapacityCp(
-    MediumSer.setState_pTX(
-      MediumSer.p_default,
-      MediumSer.T_default,
-      MediumSer.X_default))
-    "Default specific heat capacity of medium";
-  annotation (
-  defaultComponentName="loa",
-  Documentation(info="<html>
-<p>
-This model is composed of a direct controlled energy transfer station model for heating
-<a href=\"modelica://Buildings/Experimental/DHC/EnergyTransferStations/Heating/Direct.mo\">
-Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct</a>
-connected to a simplified building model <a href=\"modelica://Buildings/Experimental/DHC/Loads/Heating/BaseClasses/BuildingTimeSeries.mo\">
-Buildings.Experimental.DHC.Loads.Heating.BaseClasses.BuildingTimeSeries</a>
-where the space heating loads are provided as time series.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-January 12, 2023, by Michael Wetter:<br/>
-Removed unused parameter <code>riseTime</code>.
-</li>
-<li>
-January 2, 2023, by Kathryn Hinkelman:<br/>
-Propagated energy dynamics and a filter for the (variable) secondary pumps.
-</li>
-<li>
-December 23, 2022, by Kathryn Hinkelman:<br>
-Revised ETS from direct uncontrolled to direct controlled.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-<li>
-December 21, 2022 by Kathryn Hinkelman:<br>
-Removed in-building pumping because of coupling with the direct/uncontrolled ETS.<br>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912\">#2912</a>.
-</li>
-</ul>
-<ul>
-<li>March 20, 2022 by Chengnan Shi:<br>First implementation. </li>
-</ul>
-</html>"));
-end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
deleted file mode 100644
index 4074479adb9..00000000000
--- a/Buildings/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mo
+++ /dev/null
@@ -1,71 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Heating.Examples;
-model BuildingTimeSeriesWithETS
-  "Example model of a building with loads provided as time series and
-  connected to an ETS for cooling"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model";
-  Buildings.Experimental.DHC.Loads.Heating.BuildingTimeSeriesWithETS buiWitETS(filNam="modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos")
-    "Building Time Series load coupled with ETS"
-    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
-  Buildings.Fluid.Sources.Boundary_pT supHeaWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar") = 350000,
-    use_T_in=true,
-    nPorts=1) "Heating water supply"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,10})));
-  Buildings.Fluid.Sources.Boundary_pT sinHeaWat(
-    redeclare package Medium = Medium,
-    p(displayUnit="bar") = 340000,
-    nPorts=1) "Sink for heating water"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,origin={-50,-50})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
-    "Mass flow rate sensor"
-    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
-  Modelica.Blocks.Sources.Constant TDisRetSet(k=273.15 + 45)
-    "Setpoint for district return temperature"
-    annotation (Placement(transformation(extent={{0,40},{20,60}})));
-  Modelica.Blocks.Sources.Constant TDisSup(k(
-      unit="K",
-      displayUnit="degC") = 323.15)
-    "District supply temperature"
-    annotation (Placement(transformation(extent={{-90,4},{-70,24}})));
-equation
-  connect(supHeaWat.ports[1], senMasFlo.port_a)
-    annotation (Line(points={{-40,10},{-20,10}}, color={0,127,255}));
-  connect(TDisSup.y,supHeaWat. T_in)
-    annotation (Line(points={{-69,14},{-62,14}}, color={0,0,127}));
-  connect(TDisRetSet.y,buiWitETS.TDisRetSet)  annotation (Line(points={{21,50},
-          {30,50},{30,-3},{39,-3}}, color={0,0,127}));
-  connect(senMasFlo.port_b, buiWitETS.port_aSerHea) annotation (Line(points={{0,
-          10},{20,10},{20,-14},{40,-14}}, color={0,127,255}));
-  connect(buiWitETS.port_bSerHea, sinHeaWat.ports[1]) annotation (Line(points={{
-          60,-14},{80,-14},{80,-50},{-40,-50}}, color={0,127,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-        coordinateSystem(
-        preserveAspectRatio=false)),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos" "Simulate and plot"),
-    experiment(
-      StartTime=2592000,
-      StopTime=3628800,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-This model provides an example for a building with loads provided
-as time series and connected to a direct ETS for heating with the
-return heating water temperature controlled below a maximum threshold.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 20, 2022, by Chengnan Shi:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingTimeSeriesWithETS;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/Examples/package.mo b/Buildings/Experimental/DHC/Loads/Heating/Examples/package.mo
deleted file mode 100644
index 67c01f1f77e..00000000000
--- a/Buildings/Experimental/DHC/Loads/Heating/Examples/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Heating;
-package Examples
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (Documentation(info="<html>
-<p>This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling\">
-Buildings.Experimental.DHC.Loads.Cooling</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Heating/package.mo b/Buildings/Experimental/DHC/Loads/Heating/package.mo
deleted file mode 100644
index 018fc983aaf..00000000000
--- a/Buildings/Experimental/DHC/Loads/Heating/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads;
-package Heating "This package contains models for loads used in district heating systems."
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains models of building loads that are used to
-build example models of district heating systems.
-</p>
-</html>"));
-end Heating;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.mo
deleted file mode 100644
index 61962d052f2..00000000000
--- a/Buildings/Experimental/DHC/Loads/HotWater/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater\">
-Buildings.Experimental.DHC.Loads.Heating.DHW</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Data/package.mo b/Buildings/Experimental/DHC/Loads/HotWater/Data/package.mo
deleted file mode 100644
index b2475fe7f87..00000000000
--- a/Buildings/Experimental/DHC/Loads/HotWater/Data/package.mo
+++ /dev/null
@@ -1,9 +0,0 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
-package Data "Package for data related to hot water generation"
-  extends Modelica.Icons.MaterialPropertiesPackage;
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-Package for data related to hot water generation.
-</p>
-</html>"));
-end Data;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo b/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
deleted file mode 100644
index 9d6aea1c0b2..00000000000
--- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mo
+++ /dev/null
@@ -1,138 +0,0 @@
-within Buildings.Experimental.DHC.Loads.HotWater.Examples;
-model StorageTankWithExternalHeatExchanger
-  "Example model for storage tank with external heat exchanger"
-  extends Modelica.Icons.Example;
-  package Medium = Buildings.Media.Water "Medium model";
-  parameter Modelica.Units.SI.Temperature TCol = 273.15+10 "Temperature of domestic cold water supply";
-  parameter Modelica.Units.SI.MassFlowRate mHea_flow_nominal = datWatHea.QHex_flow_nominal/4200/(55 - 50) "Tank heater water loop nominal mass flow";
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
-    datWatHea(VTan=0.1892706, mDom_flow_nominal=6.52944E-06*1000)
-    "Data for heat pump water heater with tank"
-    annotation (Placement(transformation(extent={{-80,-60},{-60,-40}})));
-
-  Modelica.Blocks.Sources.CombiTimeTable sch(
-    tableOnFile=true,
-    tableName="tab1",
-    fileName=Modelica.Utilities.Files.loadResource(
-        "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos"),
-    smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
-    extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic)
-    "Domestic hot water fixture draw fraction schedule"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-
-  Buildings.Fluid.Sources.Boundary_pT souCol(
-    nPorts=2,
-    redeclare package Medium = Medium,
-    T(displayUnit="degC") = 283.15) "Source of domestic cold water"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-32,-50})));
-  Modelica.Blocks.Sources.Constant conTSetMix(k(
-      final unit="K",
-      displayUnit="degC") = 308.15)
-    "Temperature setpoint for mixed water supply to fixture"
-    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-  Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger
-    domHotWatTan(redeclare package MediumDom = Medium, redeclare package
-      MediumHea = Medium,
-    dat=datWatHea)        "Storage tank with external heat exchanger"
-    annotation (Placement(transformation(extent={{0,20},{20,40}})));
-  Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve theMixVal(redeclare
-      package                                                                                   Medium = Medium,
-      mMix_flow_nominal=1.2*datWatHea.mDom_flow_nominal)
-    annotation (Placement(transformation(extent={{40,60},{60,80}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(realTrue=
-        mHea_flow_nominal)
-    annotation (Placement(transformation(extent={{40,-20},{60,0}})));
-  Modelica.Blocks.Sources.Constant conTSetHot(k(
-      final unit="K",
-      displayUnit="degC") = 313.15)
-    "Temperature setpoint for hot water supply to fixture"
-    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
-  Buildings.Fluid.HeatExchangers.Heater_T hea(
-    redeclare package Medium = Medium,
-    m_flow_nominal=mHea_flow_nominal,
-    dp_nominal=0)
-    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow mov(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    nominalValuesDefineDefaultPressureCurve=true,
-    m_flow_nominal=mHea_flow_nominal)
-    annotation (Placement(transformation(extent={{70,14},{50,34}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTem(
-    redeclare package Medium = Medium,
-    m_flow_nominal=mHea_flow_nominal,
-    tau=0) annotation (Placement(transformation(extent={{10,-50},{30,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(p=5) "dT for heater"
-    annotation (Placement(transformation(extent={{14,-24},{24,-14}})));
-  Buildings.Fluid.Sources.Boundary_pT preRef(
-    nPorts=1,
-    redeclare package Medium = Medium,
-    T(displayUnit="degC")) "Reference pressure" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={80,-60})));
-equation
-  connect(theMixVal.yMixSet, sch.y[1]) annotation (Line(points={{39,78},{-50,78},
-          {-50,70},{-59,70}}, color={0,0,127}));
-  connect(conTSetMix.y, theMixVal.TMixSet) annotation (Line(points={{-59,40},{
-          -10,40},{-10,72},{39,72}},
-                                 color={0,0,127}));
-  connect(domHotWatTan.port_bDom, theMixVal.port_hot) annotation (Line(points={{
-          20,36},{32,36},{32,66},{40,66}}, color={0,127,255}));
-  connect(souCol.ports[1], domHotWatTan.port_aDom)
-    annotation (Line(points={{-31,-40},{-31,36},{0,36}}, color={0,127,255}));
-  connect(souCol.ports[2], theMixVal.port_col)
-    annotation (Line(points={{-33,-40},{-33,62},{40,62}}, color={0,127,255}));
-  connect(booToRea.u, domHotWatTan.charge) annotation (Line(points={{38,-10},{32,
-          -10},{32,21},{22,21}}, color={255,0,255}));
-  connect(domHotWatTan.TDomSet, conTSetHot.y) annotation (Line(points={{-1,30},{
-          -20,30},{-20,10},{-59,10}}, color={0,0,127}));
-  connect(mov.port_b, domHotWatTan.port_aHea)
-    annotation (Line(points={{50,24},{20,24}}, color={0,127,255}));
-  connect(hea.port_b, mov.port_a) annotation (Line(points={{60,-40},{80,-40},{80,
-          24},{70,24}}, color={0,127,255}));
-  connect(booToRea.y, mov.m_flow_in) annotation (Line(points={{62,-10},{90,-10},
-          {90,46},{60,46},{60,36}}, color={0,0,127}));
-  connect(domHotWatTan.port_bHea, senTem.port_a) annotation (Line(points={{0,24},
-          {-10,24},{-10,-40},{10,-40}}, color={0,127,255}));
-  connect(senTem.port_b, hea.port_a)
-    annotation (Line(points={{30,-40},{40,-40}}, color={0,127,255}));
-  connect(addPar.y, hea.TSet) annotation (Line(points={{25,-19},{32,-19},{32,-32},
-          {38,-32}}, color={0,0,127}));
-  connect(senTem.T, addPar.u) annotation (Line(points={{20,-29},{14,-29},{14,-28},
-          {6,-28},{6,-19},{13,-19}}, color={0,0,127}));
-  connect(hea.port_b, preRef.ports[1])
-    annotation (Line(points={{60,-40},{80,-40},{80,-50}}, color={0,127,255}));
-  annotation (Diagram(graphics={
-        Text(
-          extent={{-140,160},{160,120}},
-          textString="%name",
-          textColor={0,0,255})}),
-          __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos" "Simulate and plot"),
-Documentation(info="<html>
-<p>
-Example model of a fresh water station that heats up domestic hot water.
-Input is a load profile which is sent to a model that computes the hot and cold water draw.
-If the tank needs to be recharged, then tank water is circulated through a heater
-with a prescribed temperature lift.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-November 15, 2023, by David Blum:<br/>
-Add heater with constant dT as heat source.
-</li>
-<li>
-October 5, 2023, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    experiment(
-      StopTime=172800,
-      Tolerance=1e-06));
-end StorageTankWithExternalHeatExchanger;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.mo b/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.mo
deleted file mode 100644
index 95ca57769fc..00000000000
--- a/Buildings/Experimental/DHC/Loads/HotWater/Examples/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
-package Examples "Example implementations of district-integrated DHW models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains a collection of domestic hot water (DHW) models
-to demonstrate how these models might be used in district heating systems.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo b/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
deleted file mode 100644
index f2795d03ac7..00000000000
--- a/Buildings/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.mo
+++ /dev/null
@@ -1,445 +0,0 @@
-within Buildings.Experimental.DHC.Loads.HotWater;
-model StorageTankWithExternalHeatExchanger
-  "A model of a storage tank with external heat exchanger to produce hot water"
-  extends
-    Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.PartialFourPortDHW(
-    final allowFlowReversalHea=false);
-
-  parameter Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger
-    dat "Performance data"
-    annotation (Placement(transformation(extent={{60,80},{80,100}})));
-
-  parameter Real k=0.1 "Proportional gain of circulation pump controller";
-  parameter Real Ti=60 "Integrator time constant of circulation pump controller";
-
-  parameter Modelica.Media.Interfaces.Types.Temperature TTan_start=323.15
-    "Start value of tank temperature"
-    annotation(Dialog(tab="Initialization"));
-  final parameter Real eps =
-    dat.QHex_flow_nominal / CMin_flow_nominal / ( dat.TDom_nominal + dat.dTHexApp_nominal - dat.TCol_nominal)
-    "Heat exchanger effectiveness"
-    annotation(Dialog(tab="Advanced"));
-  Buildings.Fluid.Movers.Preconfigured.FlowControlled_dp pumHex(
-    redeclare package Medium = MediumHea,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
-    riseTime=10,
-    m_flow_nominal=dat.mHex_flow_nominal,
-    dp_nominal=dat.dpHexHea_nominal) "Pump with head as input" annotation (
-      Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=270,
-        origin={-40,0})));
-
-  Buildings.Fluid.Storage.Stratified tan(
-    redeclare package Medium = MediumHea,
-    kIns=dat.kIns,
-    final T_start=TTan_start,
-    hTan=dat.hTan,
-    dIns=dat.dIns,
-    VTan=dat.VTan,
-    nSeg=dat.nSeg,
-    m_flow_nominal=dat.mHex_flow_nominal)
-    "Heating water tank"
-    annotation (Placement(transformation(extent={{30,-18},{10,2}})));
-  Modelica.Blocks.Interfaces.RealOutput PEle(unit="W")
-    "Electric power required for pumping equipment"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
-        iconTransformation(extent={{100,-10},{120,10}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTemHot(
-    redeclare package Medium =  MediumDom,
-    final allowFlowReversal=allowFlowReversalDom,
-    m_flow_nominal=dat.mDom_flow_nominal)
-    "Temperature sensor for hot water supply"
-    annotation (Placement(transformation(extent={{20,50},{40,70}})));
-
-  Buildings.Fluid.HeatExchangers.ConstantEffectiveness hex(
-    redeclare package Medium1 = MediumDom,
-    redeclare package Medium2 = MediumHea,
-    final allowFlowReversal1=allowFlowReversalDom,
-    m1_flow_nominal=dat.mDom_flow_nominal,
-    m2_flow_nominal=dat.mHex_flow_nominal,
-    dp1_nominal=dat.dpHexHea_nominal,
-    from_dp2=true,
-    dp2_nominal=dat.dpHexDom_nominal,
-    eps=eps)
-    annotation (Placement(transformation(extent={{-60,44},{-40,64}})));
-  Buildings.Fluid.FixedResistances.Junction junTop(
-    redeclare package Medium = MediumHea,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    m_flow_nominal=dat.mHex_flow_nominal*{1,1,1},
-    dp_nominal=zeros(3)) "Flow junction at top of tank"
-    annotation (Placement(transformation(extent={{10,20},{30,40}})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = MediumDom)
-    "Mass flow rate of domestic hot water"
-    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
-  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TTanTop(
-    T(displayUnit="degC"))
-    "Fluid temperature at the top of the tank"
-    annotation (Placement(transformation(extent={{40,0},{60,20}})));
-  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TTanBot(
-    T(displayUnit="degC"))
-    "Fluid temperature at the bottom of the tank"
-    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
-
-  Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.HeatExchangerPumpController conPum(final mDom_flow_nominal=dat.mDom_flow_nominal,
-      final dpPum_nominal=dat.dpHexHea_nominal)
-    "Controller for pump of heat exchanger"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.TankChargingController conCha "Controller for tank charge signal"
-    annotation (Placement(transformation(extent={{72,-90},{92,-70}})));
-
-  Buildings.Fluid.Actuators.Valves.ThreeWayLinear divVal(
-    redeclare package Medium = MediumHea,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    use_inputFilter=false,
-    m_flow_nominal=dat.mHex_flow_nominal,
-    dpValve_nominal=1000) "Diversion valve to reduce mixing in tank"
-    annotation (Placement(transformation(extent={{30,-40},{10,-60}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTemRet(
-    redeclare package Medium = MediumHea,
-    final allowFlowReversal=allowFlowReversalDom,
-    m_flow_nominal=dat.mHex_flow_nominal)
-    "Temperature sensor for return heating water from heat exchanger"
-    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-  Buildings.Experimental.DHC.Loads.HotWater.BaseClasses.TankValveController conVal "Diversion valve controller"
-    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
-
-  Buildings.Controls.OBC.CDL.Reals.AddParameter dTHexApp(p=dat.dTHexApp_nominal)
-    "Offset for heat exchanger approach temperature"
-    annotation (Placement(transformation(extent={{34,-84},{54,-64}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput charge
-    "Output true if tank needs to be charged, false if it is sufficiently charged"
-    annotation (Placement(transformation(extent={{100,-100},{140,-60}}),
-        iconTransformation(extent={{100,-110},{140,-70}})));
-protected
-  parameter Modelica.Units.SI.SpecificHeatCapacity cpHea_default =
-    MediumHea.specificHeatCapacityCp(MediumHea.setState_pTX(
-      MediumHea.p_default,
-      MediumHea.T_default,
-      MediumHea.X_default))
-    "Specific heat capacity of heating medium at default medium state";
-  parameter Modelica.Units.SI.SpecificHeatCapacity cpDom_default =
-    MediumDom.specificHeatCapacityCp(MediumDom.setState_pTX(
-      MediumDom.p_default,
-      MediumDom.T_default,
-      MediumDom.X_default))
-    "Specific heat capacity of domestic hot water medium at default medium state";
-  parameter Modelica.Units.SI.ThermalConductance CMin_flow_nominal =
-    min(dat.mHex_flow_nominal*cpHea_default, dat.mDom_flow_nominal*cpDom_default)
-    "Minimum heat capacity flow rate";
-initial equation
-  assert(eps < 1, "In " + getInstanceName() + ": Heat exchanger effectivness must be below 1, received eps = " + String(eps) + ". Check sizing.");
-
-equation
-  connect(tan.port_a, junTop.port_3)
-    annotation (Line(points={{20,2},{20,20}},
-                                            color={0,127,255}));
-  connect(pumHex.P, PEle) annotation (Line(points={{-49,-11},{-50,-11},{-50,-32},
-          {86,-32},{86,0},{110,0}},     color={0,0,127}));
-  connect(junTop.port_2, port_aHea) annotation (Line(points={{30,30},{84,30},{84,
-          -60},{100,-60}},     color={0,127,255}));
-  connect(hex.port_b1, senMasFlo.port_a)
-    annotation (Line(points={{-40,60},{-20,60}}, color={0,127,255}));
-  connect(senMasFlo.port_b, senTemHot.port_a)
-    annotation (Line(points={{0,60},{20,60}},    color={0,127,255}));
-  connect(TTanTop.port, tan.heaPorVol[1])
-    annotation (Line(points={{40,10},{22,10},{22,-8},{20,-8}},
-                                                color={191,0,0}));
-  connect(senMasFlo.m_flow, conPum.mDom_flow) annotation (Line(points={{-10,71},
-          {-10,74},{-86,74},{-86,6},{-82,6}}, color={0,0,127}));
-  connect(senTemHot.T, conPum.TDom) annotation (Line(points={{30,71},{30,80},{-88,
-          80},{-88,-6},{-81,-6}}, color={0,0,127}));
-  connect(conPum.TDomSet, TDomSet) annotation (Line(points={{-81,0},{-92,0},{-92,
-          0},{-110,0}}, color={0,0,127}));
-  connect(conCha.TTanTop, TTanTop.T) annotation (Line(points={{70,-80},{66,-80},
-          {66,10},{61,10}},   color={0,0,127}));
-  connect(conCha.charge, charge) annotation (Line(points={{94,-80},{120,-80}},
-                           color={255,0,255}));
-  connect(senTemHot.port_b, port_bDom)
-    annotation (Line(points={{40,60},{100,60}}, color={0,127,255}));
-  connect(conPum.dpPumHex, pumHex.dp_in)
-    annotation (Line(points={{-58,0},{-52,0}}, color={0,0,127}));
-
-  connect(port_aDom, hex.port_a1)
-    annotation (Line(points={{-100,60},{-60,60}}, color={0,127,255}));
-  connect(junTop.port_1, hex.port_a2) annotation (Line(points={{10,30},{-30,30},
-          {-30,48},{-40,48}}, color={0,127,255}));
-  connect(hex.port_b2, pumHex.port_a) annotation (Line(points={{-60,48},{-72,48},
-          {-72,20},{-40,20},{-40,10}}, color={0,127,255}));
-  connect(senTemRet.port_b, divVal.port_2)
-    annotation (Line(points={{0,-50},{10,-50}}, color={0,127,255}));
-  connect(divVal.port_1, tan.fluPorVol[integer(dat.nSeg/2)]) annotation (Line(
-        points={{30,-50},{34,-50},{34,-8},{25,-8}}, color={0,127,255}));
-  connect(senTemRet.T, conVal.TRet) annotation (Line(points={{-10,-39},{-10,-36},
-          {-26,-36},{-26,-80},{-21,-80}}, color={0,0,127}));
-  connect(conVal.y, divVal.y)
-    annotation (Line(points={{2,-80},{20,-80},{20,-62}}, color={0,0,127}));
-  connect(TTanBot.port, tan.heaPorVol[dat.nSeg]) annotation (Line(points={{40,-20},
-          {22,-20},{22,-8},{20,-8}}, color={191,0,0}));
-  connect(conCha.TTanTopSet, dTHexApp.y)
-    annotation (Line(points={{71,-72},{64,-72},{64,-74},{56,-74}},
-                                                 color={0,0,127}));
-  connect(dTHexApp.u, TDomSet) annotation (Line(points={{32,-74},{26,-74},{26,
-          -96},{-90,-96},{-90,0},{-110,0}}, color={0,0,127}));
-  connect(divVal.port_3, tan.fluPorVol[dat.nSeg]) annotation (Line(points={{20,-40},
-          {20,-36},{32,-36},{32,-8},{25,-8}}, color={0,127,255}));
-  connect(tan.port_b, port_bHea) annotation (Line(points={{20,-18},{20,-26},{-80,
-          -26},{-80,-60},{-100,-60}}, color={0,127,255}));
-  connect(pumHex.port_b, senTemRet.port_a) annotation (Line(points={{-40,-10},{-40,
-          -50},{-20,-50}}, color={0,127,255}));
-  connect(TTanBot.T, conCha.TTanBot) annotation (Line(points={{61,-20},{62,-20},
-          {62,-88},{70,-88}}, color={0,0,127}));
-  annotation (
-  defaultComponentName="domHotWatTan",
-  Documentation(info="<html>
-<p>
-This model implements a heating hot water tank with external heat exchanger that heats domestic hot water.
-</p>
-<p>
-The storage tank model is described in
-<a href=\"modelica://Buildings.Fluid.Storage.StratifiedEnhancedInternalHex\">
-Buildings.Fluid.Storage.StratifiedEnhancedInternalHex</a>.
-The heat pump and storage tank system should be parameterized altogether using
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger\">
-Buildings.Experimental.DHC.Loads.HotWater.Data.GenericDomesticHotWaterWithHeatExchanger</a>.
-</p>
-<p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png\"/>
-</p>
-<p>
-It is based on Fig. 3 in <i>Evaluations of different domestic hot water
-preparing methods with ultra-low-temperature district heating</i> by X. Yang,
-H. Li, and S. Svendsen at <a href=\"https:/doi.org/10.1016/j.energy.2016.04.109\">
-doi.org/10.1016/j.energy.2016.04.109</a>, as well as the
-<i>Advanced Energy Design Guide for Multifamily Buildings-Achieving Zero Energy</i>
-published by ASHRAE in 2022 at <a href=\"https://www.ashrae.org/technical-resources/aedgs/zero-energy-aedg-free-download\">
-https://www.ashrae.org/technical-resources/aedgs/zero-energy-aedg-free-download</a>.
-</p>
-<p>
-For a model that connects this hot water system to a heat pump, see
-<a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-October 5, 2023, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Polygon(
-          points={{-140,86},{-140,86}},
-          lineColor={95,95,95},
-          lineThickness=1,
-          fillColor={0,0,0},
-          fillPattern=FillPattern.CrossDiag),
-        Rectangle(
-          extent={{60,40},{0,-78}},
-          lineColor={0,0,0},
-          lineThickness=0.5),
-        Rectangle(
-          extent={{-30,40},{-50,0}},
-          lineColor={0,0,0},
-          lineThickness=0.5),
-        Rectangle(
-          extent={{-100,64},{-60,58}},
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-44,64},{100,58}},
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-60,-10},{-44,-16}},
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-40,2},{40,-2}},
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-60,24},
-          rotation=90),
-        Rectangle(
-          extent={{-6,2},{6,-2}},
-          fillColor={0,140,72},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-46,-6},
-          rotation=90),
-        Rectangle(
-          extent={{76,-58},{98,-62}},
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-58,2},{58,-2}},
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={22,50},
-          rotation=180),
-        Rectangle(
-          extent={{-56.5,2.5},{56.5,-2.5}},
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={77.5,-4.5},
-          rotation=270),
-        Rectangle(
-          extent={{-6,2},{6,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-6,-60},
-          rotation=180),
-        Rectangle(
-          extent={{-6,2},{6,-2}},
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={32,46},
-          rotation=270),
-        Rectangle(
-          extent={{-6,2},{6,-2}},
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-34,46},
-          rotation=270),
-        Rectangle(
-          extent={{-15,2},{15,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-85,-60},
-          rotation=180),
-        Rectangle(
-          extent={{-6,2},{6,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-26,-44},
-          rotation=360),
-        Rectangle(
-          extent={{-23,2},{23,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-34,-23},
-          rotation=270),
-        Rectangle(
-          extent={{-12,2},{12,-2}},
-          fillColor={102,44,145},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-44,52},
-          rotation=90),
-        Text(
-          extent={{-116,36},{-66,0}},
-          textColor={0,0,127},
-          textString="TDomSet"),
-        Rectangle(
-          extent={{-5,2},{5,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-10,-55},
-          rotation=270),
-        Rectangle(
-          extent={{-6,2},{6,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-6,-12},
-          rotation=180),
-        Polygon(
-          points={{-13,-3},{-5,3},{-5,-9},{-13,-3}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          origin={-7,-57},
-          rotation=270),
-        Polygon(
-          points={{-15,-3},{-7,3},{-7,-9},{-15,-3}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          origin={-13,-29},
-          rotation=90),
-        Polygon(
-          points={{-15,-3},{-5,3},{-5,-9},{-15,-3}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          origin={-25,-47},
-          rotation=180),
-        Rectangle(
-          extent={{-12,2},{12,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-10,-24},
-          rotation=270),
-        Ellipse(
-          extent={{-42,-20},{-26,-34}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-15,-3},{-7,5},{-7,-11},{-15,-3}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          origin={-37,-19},
-          rotation=90),
-        Text(
-         extent={{72,42},{-14,12}},
-          textColor={0,0,0},
-          textString=DynamicSelect("", String(TTanTop.T-273.15, format=".1f"))),
-        Text(
-         extent={{74,-46},{-12,-76}},
-          textColor={0,0,0},
-          textString=DynamicSelect("", String(TTanBot.T-273.15, format=".1f"))),
-        Ellipse(
-          extent={{81,-83},{95,-97}},
-          lineColor=DynamicSelect({235,235,235},
-            if charge then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillColor=DynamicSelect({235,235,235},
-            if charge then
-              {0,255,0}
-            else
-              {235,235,235}),
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-16,2},{16,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-72,-76},
-          rotation=270),
-        Rectangle(
-          extent={{-54,2},{54,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={-20,-90},
-          rotation=180),
-        Rectangle(
-          extent={{-7,2},{7,-2}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          origin={32,-85},
-          rotation=270)}),
-        Diagram(
-        coordinateSystem(preserveAspectRatio=false)));
-end StorageTankWithExternalHeatExchanger;
diff --git a/Buildings/Experimental/DHC/Loads/HotWater/package.mo b/Buildings/Experimental/DHC/Loads/HotWater/package.mo
deleted file mode 100644
index 4401b76ccd2..00000000000
--- a/Buildings/Experimental/DHC/Loads/HotWater/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.Loads;
-package HotWater "Package of models for domestic hot water generation and loads served by district networks"
-   extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains models for building domestic hot water loads served by a district heating network.
-These loads are typically charactersized as being from fixtures in kitchens,
-bathrooms, and laundry, and typically require a higher temperature water than
-space heating.
-</p>
-</html>"));
-end HotWater;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
deleted file mode 100644
index 311d047ac8c..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ControlVolumeCondensation.mo
+++ /dev/null
@@ -1,63 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
-model ControlVolumeCondensation
-  "Control volume model exhibiting the condensation process of water"
-  extends
-    Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
-      redeclare final package Medium_a=MediumSte,
-      redeclare final package Medium_b=MediumWat);
-equation
-  // boundary conditions at the ports
-  port_a.m_flow = mSte_flow;
-  port_a.h_outflow = hSte;
-  port_b.m_flow = mWat_flow;
-  port_b.h_outflow = hWat;
-
-annotation (defaultComponentName="vol",
-    Icon(coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}}), graphics={
-      Line(
-        points={{38,40},{-2,20},{38,-20},{-2,-40}},
-        color={0,0,255},
-        smooth=Smooth.Bezier),
-      Line(
-        points={{-2,40},{-42,20},{-2,-20},{-42,-40}},
-        color={0,0,255},
-        smooth=Smooth.Bezier)}),
-    Documentation(revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Added publication references.
-</li>
-<li>
-February 26, 2022 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>", info="<html>
-<p>
-This model represents a condensation process of water with
-liquid and vapor phases in equilibrium and at a saturated state.
-Further information regarding the model formulation and assumptions
-are in the base class
-<a href=\"modelica://Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
-Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
-
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>"));
-end ControlVolumeCondensation;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
deleted file mode 100644
index 09c87a57693..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mo
+++ /dev/null
@@ -1,100 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples;
-model ControlVolumeCondensation
-  "Example model for heat transfer with the condensation control volume"
-  extends Modelica.Icons.Example;
-
-package MediumSte = Buildings.Media.Steam (
-  T_default=273.15+180,
-  p_default=1e6)
-    "Steam medium - Medium model for port_a (inlet)";
-package MediumWat =
-      Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium - Medium model for port_b (outlet)";
-
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volDyn(
-    V=1,
-    redeclare package MediumWat = MediumWat,
-    redeclare package MediumSte = MediumSte,
-    m_flow_nominal=0.01,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    allowFlowReversal=true) "Dynamic volume"
-    annotation (Placement(transformation(extent={{20,0},{40,-20}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation volSte(
-    V=1,
-    redeclare package MediumWat = MediumWat,
-    redeclare package MediumSte = MediumSte,
-    m_flow_nominal=0.01,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    allowFlowReversal=true) "Steady volume"
-    annotation (Placement(transformation(extent={{20,-40},{40,-60}})));
-  Modelica.Fluid.Sources.MassFlowSource_T sou(
-    redeclare package Medium = MediumSte,
-    use_m_flow_in=true,
-    T=453.15,
-    nPorts=1) "Flow source"
-    annotation (Placement(transformation(extent={{-18,-20},{2,0}})));
-  Modelica.Fluid.Sources.MassFlowSource_T sou1(
-    redeclare package Medium = MediumSte,
-    use_m_flow_in=true,
-    T=453.15,
-    nPorts=1) "Flow source"
-    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-  Modelica.Fluid.Sources.FixedBoundary bou(
-    redeclare package Medium = MediumWat,
-    p=volDyn.p_start,
-    T=293.15,
-    nPorts=2) "Boundary condition"
-    annotation (Placement(transformation(extent={{80,-22},{60,-2}})));
-  Modelica.Blocks.Sources.Ramp ramp(
-    duration=1,
-    offset=2,
-    height=-1) "Ramp signal"
-    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
-  Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo
-    "Heat flow sensor"
-    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
-  Modelica.Blocks.Sources.Constant const(k=-10000) "Heat loss"
-    annotation (Placement(transformation(extent={{-90,40},{-70,60}})));
-  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
-    "Prescribed heat flow rate"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-equation
-  connect(sou.ports[1], volDyn.port_a)
-    annotation (Line(points={{2,-10},{20,-10}}, color={0,127,255}));
-  connect(volDyn.port_b, bou.ports[1])
-    annotation (Line(points={{40,-10},{60,-10}}, color={0,127,255}));
-  connect(preHeaFlo.port,heaFlo. port_a) annotation (Line(
-      points={{-40,50},{-20,50}},
-      color={191,0,0}));
-  connect(preHeaFlo.Q_flow,const. y) annotation (Line(
-      points={{-60,50},{-69,50}},
-      color={0,0,127}));
-  connect(heaFlo.port_b, volDyn.heatPort)
-    annotation (Line(points={{0,50},{30,50},{30,0}}, color={191,0,0}));
-  connect(sou1.ports[1], volSte.port_a)
-    annotation (Line(points={{0,-50},{20,-50}}, color={0,127,255}));
-  connect(ramp.y, sou.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},{-40,-2},{-18,-2}},
-                             color={0,0,127}));
-  connect(ramp.y, sou1.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},
-          {-40,-42},{-20,-42}}, color={0,0,127}));
-  connect(volSte.port_b, bou.ports[2]) annotation (Line(points={{40,-50},{50,
-          -50},{50,-14},{60,-14}}, color={0,127,255}));
-  annotation (Documentation(
-        info="<html>
-<p>
-This model demonstrates the use of the control volume with condensation.
-The dynamic volume includes heat conduction to the ambient while the
-steady volume heat balance is only dependent on the mass flow rate.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 26, 2022 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-experiment(Tolerance=1E-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos"
-        "Simulate and plot"));
-end ControlVolumeCondensation;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
deleted file mode 100644
index ea1df6b5de1..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mo
+++ /dev/null
@@ -1,91 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples;
-model SteamTrap "Example model to demonstrate the steam trap"
-  extends Modelica.Icons.Example;
-
-  package MediumWat = Buildings.Media.Water "Water medium";
-
-  parameter Modelica.Units.SI.Temperature TSatHig=273.15+110
-     "High pressure saturation temperature";
-  parameter Modelica.Units.SI.Temperature TSatLow=273.15+100
-     "Low pressure saturation temperature";
-  parameter Modelica.Units.SI.AbsolutePressure pSat=143380
-     "Saturation pressure";
-  parameter Modelica.Units.SI.PressureDifference dp=pSat-101325
-    "Prescribed pressure change";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=10
-    "Nominal mass flow rate";
-
-  Modelica.Blocks.Sources.Ramp ram(
-    height=m_flow_nominal,
-    duration(displayUnit="min") = 60,
-    startTime(displayUnit="min") = 60)
-    "Ramp"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-  Buildings.Fluid.Sources.Boundary_pT sou(
-    redeclare package Medium = MediumWat,
-    p=pSat,
-    T=TSatHig,
-    nPorts=1)
-    "Source"
-    annotation (Placement(transformation(extent={{-90,0},{-70,20}})));
-  Buildings.Fluid.Sources.Boundary_pT sin(
-    redeclare package Medium = MediumWat,
-    p=pSat - dp,
-    T=TSatLow,
-    nPorts=1)
-    "Sink"
-    annotation (Placement(transformation(extent={{90,0},{70,20}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
-    redeclare package Medium = MediumWat,
-    m_flow_nominal=m_flow_nominal,
-    show_T=true)
-    "Steam trap"
-    annotation (Placement(transformation(extent={{-30,0},{-10,20}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow pum(
-    redeclare package Medium = MediumWat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    m_flow_nominal=m_flow_nominal,
-    nominalValuesDefineDefaultPressureCurve=true)
-    "Pump"
-    annotation (Placement(transformation(extent={{40,0},{60,20}})));
-  Fluid.Sensors.SpecificEnthalpyTwoPort hIn(
-    redeclare package Medium = MediumWat,
-    m_flow_nominal=m_flow_nominal)
-    "Inflowing specific enthalpy"
-    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
-  Fluid.Sensors.SpecificEnthalpyTwoPort hOut(
-    redeclare package Medium = MediumWat,
-    m_flow_nominal=m_flow_nominal)
-    "Outflowing specific enthalpy"
-    annotation (Placement(transformation(extent={{0,0},{20,20}})));
-equation
-  connect(pum.port_b, sin.ports[1])
-    annotation (Line(points={{60,10},{70,10}}, color={0,127,255}));
-  connect(ram.y, pum.m_flow_in)
-    annotation (Line(points={{-59,70},{50,70},{50,22}}, color={0,0,127}));
-  connect(sou.ports[1], hIn.port_a)
-    annotation (Line(points={{-70,10},{-60,10}}, color={0,127,255}));
-  connect(hIn.port_b, steTra.port_a)
-    annotation (Line(points={{-40,10},{-30,10}}, color={0,127,255}));
-  connect(steTra.port_b, hOut.port_a)
-    annotation (Line(points={{-10,10},{0,10}}, color={0,127,255}));
-  connect(hOut.port_b, pum.port_a)
-    annotation (Line(points={{20,10},{40,10}}, color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
-  experiment(Tolerance=1e-6, StopTime=180.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-<p>
-This example model demonstrates the performance of the steam trap with a ramped mass flow rate.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end SteamTrap;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
deleted file mode 100644
index a7b89c0c0ca..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mo
+++ /dev/null
@@ -1,90 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples;
-model ValveSelfActing
-  "Example model for self-acting steam valve with a noisy inlet pressure input"
-  extends Modelica.Icons.Example;
-  package MediumSte = Buildings.Media.Steam(p_default=400000,
-    T_default=273.15+143.61,
-    h_default=2738100) "Medium model";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal mass flow rate";
-
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
-    redeclare final package Medium = MediumSte,
-    m_flow_nominal=m_flow_nominal,
-    show_T=true,
-    pb_nominal=300000,
-    dp_start(displayUnit="Pa"))
-     "Self acting pressure reducing valve"
-    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
-  Buildings.Fluid.Sources.Boundary_pT sou(
-    redeclare final package Medium = MediumSte,
-    use_p_in=true,
-    p(displayUnit="Pa"),
-    T(displayUnit="K") = MediumSte.saturationTemperature(sou.p),
-    nPorts=1) "Source"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort speEntIn(
-    redeclare final package Medium = MediumSte,
-    m_flow_nominal=m_flow_nominal)
-    "Upstream specific enthalpy"
-    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
-  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort speEntOut(
-    redeclare final package Medium = MediumSte,
-    m_flow_nominal=m_flow_nominal)
-    "Downstream specific enthalpy"
-    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
-  Modelica.Blocks.Noise.UniformNoise pInSig(
-    samplePeriod(displayUnit="s") = 1,
-    y_min=500000 + 200000,
-    y_max=500000 - 200000) "Noisy signal for inlet pressure"
-    annotation (Placement(transformation(extent={{-60,40},{-80,60}})));
-  Fluid.Sources.Boundary_pT sin(
-    redeclare final package Medium = MediumSte,
-    p=200000,
-    T=MediumSte.saturationTemperature(sin.p),
-    nPorts=1) "Sink"
-    annotation (Placement(transformation(extent={{100,-10},{80,10}})));
-  Fluid.FixedResistances.PressureDrop res(
-    redeclare final package Medium = MediumSte,
-    m_flow_nominal=m_flow_nominal,
-    dp_nominal=1000) "Pressure drop"
-    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-  inner Modelica.Blocks.Noise.GlobalSeed globalSeed
-    "Setting for sublibrary noise"
-    annotation (Placement(transformation(extent={{80,-60},{100,-40}})));
-equation
-  connect(sou.ports[1], speEntIn.port_a)
-    annotation (Line(points={{-60,0},{-50,0}}, color={0,127,255}));
-  connect(speEntIn.port_b, prv.port_a)
-    annotation (Line(points={{-30,0},{-20,0}},
-                                             color={0,127,255}));
-  connect(prv.port_b, speEntOut.port_a)
-    annotation (Line(points={{0,0},{10,0}},  color={0,127,255}));
-  connect(pInSig.y, sou.p_in) annotation (Line(points={{-81,50},{-90,50},{-90,8},
-          {-82,8}}, color={0,0,127}));
-  connect(sin.ports[1], res.port_b)
-    annotation (Line(points={{80,0},{60,0}}, color={0,127,255}));
-  connect(res.port_a, speEntOut.port_b)
-    annotation (Line(points={{40,0},{30,0}}, color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
-    Diagram(coordinateSystem(preserveAspectRatio=false)),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos"
-    "Simulate and plot"),
-    experiment(StopTime=15, Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-This example model demonstrates the performance of self-acting steam pressure
-regulator with a noisy/varying inlet pressure signal. The inlet pressure
-conditions are selected to demonstrate how the downstream pressure is maintained
-at the setpoint, unless the inlet pressure drops below the setpoint
-(pressure drop is then zero).
-</p>
-</html>",revisions="<html>
-<ul>
-<li>
-March 2, 2022 by Saranya Anbarasu:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ValveSelfActing;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.mo
deleted file mode 100644
index c47cc40ce56..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
-package Examples "Collection of models that illustrate model use and test models"
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam.BaseClasses\">
-Buildings.Experimental.DHC.Loads.Steam.BaseClasses</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/SteamTrap.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
deleted file mode 100644
index 9e867621b63..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/SteamTrap.mo
+++ /dev/null
@@ -1,101 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
-model SteamTrap "Steam trap with isenthalpic expansion from high to atmospheric
-  pressure, followed by a isobaric condensation process as flashed steam
-  is brought back to a liquid state"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-      redeclare replaceable package Medium=Buildings.Media.Water);
-
-  constant Modelica.Units.SI.AbsolutePressure pAtm=101325
-     "Atmospheric pressure discharge state";
-  constant Modelica.Units.SI.Temperature TSat=
-    Buildings.Media.Steam.saturationTemperature(pAtm)
-    "Saturation temperature at atmospheric pressure";
-
-  Modelica.Blocks.Interfaces.RealOutput QLos_flow(unit="W")
-    "Heat transfer loss rate"
-    annotation (Placement(transformation(extent={{100,60},{120,80}})));
-
-  Medium.SpecificEnthalpy dh
-    "Change in enthalpy";
-equation
-  // Pressure setpoints
-  port_b.p = pAtm;
-
-  // Flashed steam condenses
-  port_b.h_outflow = Medium.specificEnthalpy(
-    state=Medium.setState_pTX(
-      p=pAtm,
-      T=TSat,
-      X=inStream(port_a.Xi_outflow)));
-  dh = port_b.h_outflow - inStream(port_a.h_outflow);
-
-  // Return reverse flow as the inStream value
-  port_a.h_outflow = inStream(port_a.h_outflow);
-
-  // Steady state conservation of mass
-  port_a.m_flow + port_b.m_flow = 0;
-
-  // Steady state conservation of energy
-  port_a.m_flow*dh = QLos_flow;
-
-  annotation (
-    defaultComponentName="tra",
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-80,80},{80,-80}},
-          lineColor={0,0,0},
-          lineThickness=0.5,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-40,-40},{40,40}},
-          lineColor={0,0,0},
-          lineThickness=1),
-        Ellipse(
-          extent={{-40,40},{40,-40}},
-          lineColor={0,0,0},
-          lineThickness=1,
-          startAngle=-45,
-          endAngle=135,
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid)}),
-                                 Diagram(coordinateSystem(preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-The steam trap ensures that only liquid condensate leaves
-the component, while any flashed steam is returned to a liquid
-state before discharge. The model assumes a steady state isenthalpic
-thermodynamic process that transforms water from an upstream
-high pressure state to atmospheric pressure, followed by an
-isobaric condensation process as flashed steam vapor is returned to
-a liquid state. This implementation is consistent with
-physical valves that vent to the atmosphere.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Added publication references.
-</li>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end SteamTrap;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
deleted file mode 100644
index f1dc75856d4..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/ValveSelfActing.mo
+++ /dev/null
@@ -1,161 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.BaseClasses;
-model ValveSelfActing "Ideal pressure reducing valve for steam heating systems"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    final allowFlowReversal=false);
-  parameter Modelica.Units.SI.Pressure pb_nominal(
-    displayUnit="Pa",
-    min=101325)
-    "Nominal outlet pressure"
-    annotation (Dialog(group="Nominal condition"));
-
-  parameter Modelica.Units.SI.PressureDifference dp_start(displayUnit="Pa")=pb_nominal
-    "Guess value of dp = port_a.p - port_b.p"
-    annotation (Dialog(tab="Advanced"));
-
-  Buildings.Fluid.Sensors.Pressure pUp(redeclare final package Medium = Medium)
-    "Pressure sensor"
-    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
-  Buildings.Utilities.Math.SmoothMax dpSet(final deltaX=0.5) "Pressure drop setpoint"
-    annotation (Placement(transformation(extent={{20,40},{40,60}})));
-
-protected
-  Buildings.Fluid.Movers.BaseClasses.IdealSource ideSou(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final dp_start=dp_start,
-    m_flow_start=m_flow_nominal,
-    final m_flow_small=m_flow_small,
-    final show_T=show_T,
-    final control_m_flow=false,
-    final control_dp=true) "Ideal source controlling dp"
-    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-  Modelica.Blocks.Sources.RealExpression pbSet(final y=pb_nominal)
-    "Downstream pressure setpoint"
-    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(final k=0) "Zero"
-    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract dpReq "Calculating dp required"
-    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
-
-equation
-  assert(dpReq.y > 0, "pb_nominal is set higher than the upstream pressure in "
-  + getInstanceName() + ", which results in a negative pressure drop.
-  This is not typical of real systems and should be verified.", AssertionLevel.warning);
-
-  connect(ideSou.port_b, port_b)
-    annotation (Line(points={{60,0},{100,0}}, color={0,127,255}));
-  connect(pUp.port, ideSou.port_a)
-    annotation (Line(points={{-80,50},{-80,0},{40,0}}, color={0,127,255}));
-  connect(zer.y, dpSet.u1) annotation (Line(points={{-38,80},{12,80},{12,56},{
-          18,56}},
-                color={0,0,127}));
-  connect(dpSet.y, ideSou.dp_in)
-    annotation (Line(points={{41,50},{56,50},{56,8}}, color={0,0,127}));
-  connect(port_a, ideSou.port_a)
-    annotation (Line(points={{-100,0},{40,0}}, color={0,127,255}));
-  connect(pUp.p, dpReq.u1) annotation (Line(points={{-69,60},{-28,60},{-28,56},{
-          -22,56}}, color={0,0,127}));
-  connect(pbSet.y, dpReq.u2) annotation (Line(points={{-39,40},{-28,40},{-28,44},
-          {-22,44}}, color={0,0,127}));
-  connect(dpReq.y, dpSet.u2) annotation (Line(points={{2,50},{10,50},{10,44},{
-          18,44}}, color={0,0,127}));
-    annotation (
-    defaultComponentName="prv",
-    Documentation(info="<html>
-<p>
-This is the model of self-acting control valve that automatically adjusts
-the diameter of valve  orifice to reduce the unregulated inlet pressure to a
-constant, reduced outlet pressure.
-</p>
-<h4>Implementation</h4>
-<p>
-To simplify the complex relationships of the valve opening (<code>y_actual</code>),
-mass flow rate (<code>m_flow</code>), and change in pressure (<code>dp</code>)
-for compressible medium (such as steam), this model is implemented using an ideal source
-<a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.IdealSource\">
-Buildings.Fluid.Movers.BaseClasses.IdealSource</a>, that allows the pressure drop
-to be prescribed independently of mass flow rate.
-</p>
-<p>
-The model maintains <code>dp</code> based on the user specified downstream pressure
-value (<code>pb_nominal</code>), except for instances where the upstream pressure
-falls below <code>pb_nominal</code>. In these instances, the valve exibits no
-pressure drop (<code>dpSet = 0</code>) and asserts a warning.
-This model assumes that <code>dp</code> across the valve is independent of
-<code>m_flow</code>. This generally leads to a simplier set of equations.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Added publication references.
-</li>
-<li>
-March 2, 2022 by Saranya Anbarasu:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Icon(graphics={
-        Rectangle(
-          extent={{-52,40},{68,-40}},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-100,40},{100,-40}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={192,192,192}),
-        Rectangle(
-          extent={{-100,22},{100,-24}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={0,127,255}),
-        Rectangle(
-          extent={{-52,40},{68,-40}},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Ellipse(
-          extent={{-32,80},{30,34}},
-          lineColor={0,0,0},
-          fillColor={160,160,160},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-32,56},{34,8}},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Polygon(
-          points={{0,0},{-76,60},{-76,-60},{0,0}},
-          lineColor={0,0,0},
-          fillColor=DynamicSelect({0,0,0}, max(0, min(1, dpSet.y/pb_nominal))*{255,255,255}),
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{0,0},{76,60},{76,-60},{0,0}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(points={{-32,56},{30,56}}, color={0,0,0}),
-        Line(points={{0,0},{0,56}}, color={0,0,0}),
-        Line(points={{0,80},{0,100}}, color={0,0,0}),
-        Line(points={{0,100},{56,100}}, color={0,0,0}),
-        Line(points={{56,100},{0,0}}, color={0,0,0})}));
-end ValveSelfActing;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo b/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo
deleted file mode 100644
index 5cbe99eba4c..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam;
-package BaseClasses "Package with base classes for Buildings.Experimental.DHC.Loads.Steam"
-  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.Loads.Steam\">
-Buildings.Experimental.DHC.Loads.Steam</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo b/Buildings/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
deleted file mode 100644
index e48457ad4d1..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.mo
+++ /dev/null
@@ -1,374 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam;
-model BuildingTimeSeriesAtETS
-  "Steam heating building interconnection with the district piping only
-  and the load at the ETS provided as a time series."
-  replaceable package MediumSte = Buildings.Media.Steam constrainedby
-    Modelica.Media.Interfaces.PartialMedium
-     "Steam medium";
-  replaceable package MediumWat =
-   Buildings.Media.Specialized.Water.TemperatureDependentDensity
-   constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Water medium";
-
-  constant Boolean allowFlowReversal = false
-    "= false to simplify equations, assuming, but not enforcing, no flow reversal. Set to false because the flow rate is prescribed."
-    annotation(Dialog(tab="Assumptions"), Evaluate=true);
-
-  parameter Boolean have_prv = false
-    "Set to true if the building has a pressure reducing valve (PRV) station";
-  // Nominal conditions
-  parameter Modelica.Units.SI.Power Q_flow_nominal
-    "Nominal heat flow rate"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
-    "Pressure drop at nominal mass flow rate"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.AbsolutePressure pSte_nominal=MediumSte.p_default
-    "Nominal pressure of steam entering the building"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.AbsolutePressure pLow_nominal=0.8*MediumSte.p_default
-    "Nominal low pressure setpoint, downstream of PRV (if present)"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TSte_nominal=
-     MediumSte.saturationTemperature(pSte_nominal)
-     "Nominal temperature of steam entering the building"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TLow_nominal=
-     MediumSte.temperature(
-       MediumSte.setState_phX(
-         p=pLow_nominal,
-         h=MediumSte.specificEnthalpy(MediumSte.setState_pTX(
-            p=pSte_nominal,
-            T=TSte_nominal,
-            X=MediumSte.X_default)),
-         X=MediumSte.X_default))
-     "Nominal temperature of steam entering heat exchanger, if PRV present"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal=
-    MediumSte.specificEnthalpy(MediumSte.setState_pTX(
-        p=if have_prv then pLow_nominal else pSte_nominal,
-        T=if have_prv then TLow_nominal else TSte_nominal,
-        X=MediumSte.X_default)) -
-      MediumWat.specificEnthalpy(MediumWat.setState_pTX(
-        p=if have_prv then pLow_nominal else pSte_nominal,
-        T=if have_prv then TLow_nominal else TSte_nominal,
-        X=MediumWat.X_default))
-    "Nominal change in enthalpy across the heat exchanger"
-    annotation(Dialog(group = "Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
-    Q_flow_nominal/dh_nominal
-    "Nominal mass flow rate"
-    annotation(Dialog(group = "Nominal condition"));
-
-  parameter Modelica.Units.SI.Volume V=1
-    "Total volume of the steam side of the heat exchanger";
-
-  // Assumptions
-  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="Equations"));
-
-  // Initialization
-  parameter MediumSte.AbsolutePressure p_start=MediumSte.p_default
-    "Start value of pressure"
-    annotation(Dialog(tab = "Initialization"));
-  parameter MediumSte.Temperature T_start=MediumSte.T_default
-    "Start value of temperature"
-    annotation(Dialog(tab = "Initialization"));
-  parameter Modelica.Units.SI.MassFlowRate m_flow_start=0
-    "Initial value of mass flow rate"
-    annotation(Dialog(tab = "Initialization"));
-
-  // Heating load time series
-  parameter Boolean tableOnFile=false
-    "= true, if table is defined on file or in function usertab"
-    annotation (Dialog(tab = "Load Profile", group="Table data definition"));
-  parameter Real QHeaLoa[:, :] = fill(0.0, 0, 2)
-    "Table matrix (time = first column; e.g., table=[0, 0; 1, 1; 2, 4])"
-    annotation (Dialog(tab = "Load Profile", group="Table data definition",enable=not tableOnFile));
-  parameter String tableName="NoName"
-    "Table name on file or in function usertab (see docu)"
-    annotation (Dialog(tab = "Load Profile", group="Table data definition",enable=tableOnFile));
-  parameter String fileName="NoName" "File where matrix is stored"
-    annotation (Dialog(
-      tab = "Load Profile",
-      group="Table data definition",
-      enable=tableOnFile,
-      loadSelector(filter="Text files (*.txt);;MATLAB MAT-files (*.mat)",
-          caption="Open file in which table is present")));
-  parameter Integer columns[:]=2:size(QHeaLoa, 2)
-    "Columns of table to be interpolated"
-    annotation (Dialog(tab = "Load Profile", group="Table data interpretation"));
-  parameter Modelica.Blocks.Types.Smoothness smoothness=
-    Modelica.Blocks.Types.Smoothness.LinearSegments
-    "Smoothness of table interpolation"
-    annotation (Dialog(tab = "Load Profile", group="Table data interpretation"));
-  parameter Modelica.Units.SI.Time timeScale(
-    min=Modelica.Constants.eps)=1 "Time scale of first table column"
-    annotation (Dialog(tab = "Load Profile", group="Table data interpretation"), Evaluate=true);
-
-  // Diagnostics
-   parameter Boolean show_T = false
-    "= true, if actual temperature at port is computed"
-    annotation(Dialog(tab="Advanced",group="Diagnostics"));
-
-  MediumSte.ThermodynamicState sta_a=
-      MediumSte.setState_phX(port_a.p,
-                          noEvent(actualStream(port_a.h_outflow)),
-                          noEvent(actualStream(port_a.Xi_outflow))) if show_T
-    "Medium properties in port_a";
-
-  MediumWat.ThermodynamicState sta_b=
-      MediumWat.setState_phX(port_b.p,
-                          noEvent(actualStream(port_b.h_outflow)),
-                          noEvent(actualStream(port_b.Xi_outflow))) if show_T
-    "Medium properties in port_b";
-
-  // Advanced
-  parameter Modelica.Units.SI.Density rho_a_default=
-    MediumSte.density(MediumSte.setState_pTX(
-      p=pSte_nominal,T=TSte_nominal,X=MediumSte.X_default))
-    "Default steam density"
-    annotation(Dialog(tab="Advanced",group="Nominal condition"));
-  parameter Modelica.Units.SI.Density rho_b_default=
-    MediumWat.density(MediumWat.setState_pTX(
-      p=101325,T=273.15+90,X=MediumWat.X_default))
-    "Default water density"
-    annotation(Dialog(tab="Advanced",group="Nominal condition"));
-
-  Modelica.Blocks.Interfaces.RealOutput Q_flow(
-    final quantity="HeatFlowRate",
-    final unit="W",
-    displayUnit="kW")
-    "Total heat transfer rate"
-    annotation (Placement(transformation(extent={{100,70},{120,90}})));
-  Modelica.Blocks.Interfaces.RealOutput EHea(
-    final quantity="HeatFlow",
-    final unit="J",
-    displayUnit="kWh")
-    "Total heating energy"
-    annotation (Placement(transformation(extent={{100,40},{120,60}})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_a(
-    redeclare final package Medium = MediumSte)
-    "Inlet port"
-    annotation (Placement(transformation(extent={{90,-10},{110,10}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_b(
-    redeclare final package Medium = MediumWat)
-    "Outlet port"
-    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
-  Modelica.Blocks.Sources.CombiTimeTable QHea(
-    final tableOnFile=tableOnFile,
-    final table=QHeaLoa,
-    final tableName=tableName,
-    final fileName=fileName,
-    final columns=columns,
-    final smoothness=smoothness,
-    final extrapolation=Modelica.Blocks.Types.Extrapolation.Periodic,
-    final timeScale=timeScale)
-    "Heating demand"
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  Modelica.Blocks.Continuous.Integrator IntEHea(y(unit="J"))
-    "Integrator for heating energy of building"
-    annotation (Placement(transformation(extent={{60,40},{80,60}})));
-  Buildings.Fluid.Movers.FlowControlled_m_flow pumCNR(
-    redeclare final package Medium = MediumWat,
-    final energyDynamics=energyDynamics,
-    p_start=steTra.pAtm,
-    T_start=steTra.TSat,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T,
-    addPowerToMedium=false,
-    nominalValuesDefineDefaultPressureCurve=true,
-    init=Modelica.Blocks.Types.Init.InitialOutput,
-    final m_flow_start=m_flow_start)
-    "Condensate return pump"
-    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
-    redeclare final package MediumSte = MediumSte,
-    redeclare final package MediumWat = MediumWat,
-    final allowFlowReversal=allowFlowReversal,
-    final energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    final p_start=if have_prv then pLow_nominal else pSte_nominal,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T,
-    final V=V)
-    "Steam side of the heat exchanger, modeled as a steady state control volume"
-    annotation (Placement(transformation(extent={{-60,-50},{-40,-70}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
-    redeclare final package Medium = MediumWat,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T)
-    "Steam trap"
-    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
-  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort hIn(
-    redeclare final package Medium = MediumSte,
-    final m_flow_nominal=m_flow_nominal)
-    "Enthalpy in"
-    annotation (Placement(transformation(extent={{0,10},{-20,-10}})));
-  Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort hOut(
-    redeclare final package Medium = MediumWat,
-    final m_flow_nominal=m_flow_nominal)
-    "Enthalpy out"
-    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
-  Modelica.Blocks.Math.Add dh(final k2=-1)
-    "Change in enthalpy with building-side fluid"
-    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
-  Modelica.Blocks.Math.Division m_flow "Mass flow"
-    annotation (Placement(transformation(extent={{32,-34},{52,-14}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ValveSelfActing prv(
-    redeclare final package Medium = MediumSte,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T,
-    final pb_nominal=pLow_nominal) if have_prv
-    "Optional pressure reducing valve"
-    annotation (Placement(transformation(extent={{60,10},{40,30}})));
-equation
-  connect(Q_flow, Q_flow) annotation (Line(points={{110,80},{107,80},{107,80},{
-          110,80}}, color={0,0,127}));
-  connect(IntEHea.y, EHea) annotation (Line(points={{81,50},{96,50},{96,50},{
-          110,50}}, color={0,0,127}));
-  connect(QHea.y[1], Q_flow) annotation (Line(points={{-59,80},{110,80}},
-                    color={0,0,127}));
-  connect(IntEHea.u, Q_flow) annotation (Line(points={{58,50},{20,50},{20,80},{110,
-          80}}, color={0,0,127}));
-  connect(pumCNR.port_b, port_b)
-    annotation (Line(points={{70,-60},{100,-60}}, color={0,127,255}));
-  connect(steTra.port_b, pumCNR.port_a)
-    annotation (Line(points={{40,-60},{50,-60}}, color={0,127,255}));
-  connect(hIn.port_b, vol.port_a) annotation (Line(points={{-20,0},{-80,0},{-80,
-          -60},{-60,-60}}, color={0,127,255}));
-  connect(vol.port_b, hOut.port_a)
-    annotation (Line(points={{-40,-60},{-20,-60}}, color={0,127,255}));
-  connect(hOut.port_b, steTra.port_a)
-    annotation (Line(points={{0,-60},{20,-60}}, color={0,127,255}));
-  connect(dh.y, m_flow.u2)
-    annotation (Line(points={{21,-30},{30,-30}}, color={0,0,127}));
-  connect(QHea.y[1], m_flow.u1) annotation (Line(points={{-59,80},{20,80},{20,-18},
-          {30,-18}},      color={0,0,127}));
-  connect(m_flow.y, pumCNR.m_flow_in)
-    annotation (Line(points={{53,-24},{60,-24},{60,-48}}, color={0,0,127}));
-  connect(hIn.h_out, dh.u1)
-    annotation (Line(points={{-10,-11},{-10,-24},{-2,-24}}, color={0,0,127}));
-  connect(hOut.h_out, dh.u2)
-    annotation (Line(points={{-10,-49},{-10,-36},{-2,-36}}, color={0,0,127}));
-  connect(port_a, prv.port_a) annotation (Line(points={{100,0},{70,0},{70,20},{60,
-          20}}, color={0,127,255}));
-  if have_prv then
-    connect(prv.port_b, hIn.port_a)
-     annotation (Line(points={{40,20},{30,20},{30,0},{0,0}}, color={0,127,255}));
-  else
-  connect(port_a, hIn.port_a)
-    annotation (Line(points={{100,0},{0,0}}, color={0,127,255}));
-  end if;
-
-  annotation (
-    defaultComponentName="bui",
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-      Polygon(
-        points={{20,-70},{60,-85},{20,-100},{20,-70}},
-        lineColor={0,128,255},
-        fillColor={0,128,255},
-        fillPattern=FillPattern.Solid,
-        visible=not allowFlowReversal),
-      Line(
-        points={{55,-85},{-60,-85}},
-        color={0,128,255},
-        visible=not allowFlowReversal),
-      Rectangle(
-        extent={{-100,-100},{100,100}},
-        lineColor={0,0,127},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-      Polygon(
-        points={{0,80},{-78,38},{80,38},{0,80}},
-        lineColor={95,95,95},
-        smooth=Smooth.None,
-        fillPattern=FillPattern.Solid,
-        fillColor={95,95,95}),
-      Rectangle(
-          extent={{-64,38},{64,-70}},
-          lineColor={150,150,150},
-          fillPattern=FillPattern.Sphere,
-          fillColor={255,0,0}),
-      Rectangle(
-        extent={{-42,-4},{-14,24}},
-        lineColor={255,255,255},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-      Rectangle(
-        extent={{16,-4},{44,24}},
-        lineColor={255,255,255},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-      Rectangle(
-        extent={{16,-54},{44,-26}},
-        lineColor={255,255,255},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-      Rectangle(
-        extent={{-42,-54},{-14,-26}},
-        lineColor={255,255,255},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-      Text(
-        extent={{-149,-114},{151,-154}},
-        textxColor={0,0,255},
-        textString="%name")}),
-      Diagram(coordinateSystem(preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-This model is intended for existing steam district heating systems
-where the heating load at the energy transfer station (ETS) is
-availble as a time series data input. Thus, the building-side piping and equipement
-is not included in this model, as depicted below.
-</p>
-<p>
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png\" alt=\"steamBuilding\"/>.
-</p>
-<h4> Implementation</h4>
-<p>
-With the time series input, this model is configured such that the control
-volume (representing the steam side of the heat exchanger) has steady state
-energy and mass balances. The steam trap also has steady state balances by
-design. Meanwhile, the condensate return pump allows either dynamic or steady
-state balances. The mass flow rate at the pump is prescribed ideally such that
-the heat flow rate input from the time series is rejected at the control volume
-based on the physical laws.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Added publication references.
-</li>
-<li>
-March 28, 2022, by Kathryn Hinkelman:<br/>
-Removed <code>massDynamics</code>.<br/>
-This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1542\">issue 1542</a>.
-</li>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingTimeSeriesAtETS;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo b/Buildings/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
deleted file mode 100644
index f32a5d017dc..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mo
+++ /dev/null
@@ -1,80 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam.Examples;
-model BuildingTimeSeriesAtETS
-  "Example model for time series load with external read-in file."
-  extends Modelica.Icons.Example;
-
-  package MediumSte = Buildings.Media.Steam (p_default=400000,
-    T_default=273.15+143.61,
-    h_default=2738100) "Steam medium";
-  package MediumWat =
-    Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium";
-
-  parameter Modelica.Units.SI.AbsolutePressure pSat=400000
-    "Saturation pressure";
-  parameter Modelica.Units.SI.Temperature TSat=
-     MediumSte.saturationTemperature(pSat)
-     "Saturation temperature";
-  parameter Modelica.Units.SI.Power Q_flow_nominal= 2e4
-    "Nominal heat flow rate";
-
-  Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui(
-    redeclare package MediumSte = MediumSte,
-    redeclare package MediumWat = MediumWat,
-    have_prv=true,
-    pLow_nominal=200000,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    dp_nominal=3000,
-    tableOnFile=false,
-    final Q_flow_nominal=Q_flow_nominal,
-    final pSte_nominal=pSat,
-    QHeaLoa=[0,Q_flow_nominal*0.2; 6,Q_flow_nominal; 16,Q_flow_nominal*0.1; 24,Q_flow_nominal*0.2],
-    columns={2},
-    smoothness=Modelica.Blocks.Types.Smoothness.ContinuousDerivative,
-    timeScale(displayUnit="h") = 3600,
-    show_T=true)
-    "Building model with time series load at the ETS"
-    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
-  Buildings.Fluid.Sources.Boundary_pT souSte(
-    redeclare final package Medium = MediumSte,
-    p(displayUnit="Pa") = pSat,
-    T=TSat,
-    nPorts=1)
-    "Steam source"
-    annotation (Placement(transformation(extent={{42,30},{22,50}})));
-  Buildings.Fluid.Sources.Boundary_pT watSin(
-    redeclare final package Medium = MediumWat,
-    p=101325,
-    nPorts=1)
-    "Water sink"
-    annotation (Placement(transformation(extent={{42,-6},{22,14}})));
-equation
-  connect(souSte.ports[1], bui.port_a)
-    annotation (Line(points={{22,40},{10,40},{10,10},{-40,10}},
-                                              color={0,127,255}));
-  connect(bui.port_b, watSin.ports[1]) annotation (Line(points={{-40,4},{22,4}},
-                           color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
-  experiment(
-      StartTime=1728000,
-      StopTime=1814400,
-      Tolerance=1e-06),
-__Dymola_Commands(file=
-  "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos"
-  "Simulate and plot"),
-    Documentation(info="<html>
-<p>
-Example model for the steam building model with heat flow
-rate prescribed as a time series at the district-side
-of the energy transfer station (ETS).
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BuildingTimeSeriesAtETS;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/Examples/package.mo b/Buildings/Experimental/DHC/Loads/Steam/Examples/package.mo
deleted file mode 100644
index ebf73cfeef6..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Loads.Steam;
-package Examples "Collection of models that illustrate model use and test models"
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam\">
-Buildings.Experimental.DHC.Loads.Steam</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Loads/Steam/package.mo b/Buildings/Experimental/DHC/Loads/Steam/package.mo
deleted file mode 100644
index 194afbf0fe5..00000000000
--- a/Buildings/Experimental/DHC/Loads/Steam/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Loads;
-package Steam "Package with models for loads involving steam systems"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains models of building loads that are used to
-build example models of steam district heating systems.
-</p>
-</html>"));
-end Steam;
diff --git a/Buildings/Experimental/DHC/Loads/package.mo b/Buildings/Experimental/DHC/Loads/package.mo
deleted file mode 100644
index 12efa669ded..00000000000
--- a/Buildings/Experimental/DHC/Loads/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC;
-package Loads "Models for computing thermal loads served by the DES"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for the thermal and domestic hot water demand
-prediction in buildings.
-</p>
-</html>"));
-end Loads;
diff --git a/Buildings/Experimental/DHC/Networks/BaseClasses/package.mo b/Buildings/Experimental/DHC/Networks/BaseClasses/package.mo
deleted file mode 100644
index aff84640c17..00000000000
--- a/Buildings/Experimental/DHC/Networks/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Networks;
-package BaseClasses "Package with base classes that are used by multiple models"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-Buildings.Experimental.DHC.Networks</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/Examples/package.mo b/Buildings/Experimental/DHC/Networks/Connections/Examples/package.mo
deleted file mode 100644
index 3456922179d..00000000000
--- a/Buildings/Experimental/DHC/Networks/Connections/Examples/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Connections;
-package Examples "This package contains example models"
-  extends Modelica.Icons.ExamplesPackage;
-  annotation (Documentation(info="<html>
-<p>
-This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined\">
-Buildings.Experimental.DHC.Loads.Combined</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Connections/package.mo b/Buildings/Experimental/DHC/Networks/Connections/package.mo
deleted file mode 100644
index 20101f47abb..00000000000
--- a/Buildings/Experimental/DHC/Networks/Connections/package.mo
+++ /dev/null
@@ -1,9 +0,0 @@
-within Buildings.Experimental.DHC.Networks;
-package Connections "Package containing various configurations for connecting network participants to a distribution network"
-  extends Modelica.Icons.VariantsPackage;
-  annotation (Documentation(info="<html>
-<p>
-This package contains hydronic connection models that allow an agent to connect to the distribution network.
-</p>
-</html>"));
-end Connections;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/Examples/package.mo b/Buildings/Experimental/DHC/Networks/Controls/Examples/package.mo
deleted file mode 100644
index 01be2289a54..00000000000
--- a/Buildings/Experimental/DHC/Networks/Controls/Examples/package.mo
+++ /dev/null
@@ -1,4 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Controls;
-package Examples "District controller example models"
-  extends Modelica.Icons.ExamplesPackage;
-end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Controls/package.mo b/Buildings/Experimental/DHC/Networks/Controls/package.mo
deleted file mode 100644
index 44ba6f0bc04..00000000000
--- a/Buildings/Experimental/DHC/Networks/Controls/package.mo
+++ /dev/null
@@ -1,47 +0,0 @@
-within Buildings.Experimental.DHC.Networks;
-package Controls "Package of control blocks for distribution systems"
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for control of distribution networks.
-</p>
-</html>"),
-    Icon(graphics={
-        Rectangle(
-          lineColor={200,200,200},
-          fillColor={248,248,248},
-          fillPattern=FillPattern.HorizontalCylinder,
-          extent={{-100,-100},{100,100}},
-          radius=25.0),
-        Rectangle(
-          lineColor={128,128,128},
-          extent={{-100,-100},{100,100}},
-          radius=25.0),
-      Rectangle(
-        origin={0,35.1488},
-        fillColor={255,255,255},
-        extent={{-30.0,-20.1488},{30.0,20.1488}}),
-      Rectangle(
-        origin={0,-34.8512},
-        fillColor={255,255,255},
-        extent={{-30.0,-20.1488},{30.0,20.1488}}),
-      Line(
-        origin={-51.25,0},
-        points={{21.25,-35.0},{-13.75,-35.0},{-13.75,35.0},{6.25,35.0}}),
-      Polygon(
-        origin={-40,35},
-        pattern=LinePattern.None,
-        fillPattern=FillPattern.Solid,
-        points={{10.0,0.0},{-5.0,5.0},{-5.0,-5.0}}),
-      Line(
-        origin={51.25,0},
-        points={{-21.25,35.0},{13.75,35.0},{13.75,-35.0},{-6.25,-35.0}}),
-      Polygon(
-        origin={40,-35},
-        pattern=LinePattern.None,
-        fillPattern=FillPattern.Solid,
-        points={{-10.0,0.0},{5.0,5.0},{5.0,-5.0}})}));
-end Controls;
diff --git a/Buildings/Experimental/DHC/Networks/Examples/package.mo b/Buildings/Experimental/DHC/Networks/Examples/package.mo
deleted file mode 100644
index 8ee733599b0..00000000000
--- a/Buildings/Experimental/DHC/Networks/Examples/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Networks;
-package Examples "This package contains example models"
-  extends Modelica.Icons.ExamplesPackage;
-  annotation (Documentation(info="<html>
-<p>
-This package contains an example illustrating the use of the model in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-Buildings.Experimental.DHC.Networks</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.mo b/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.mo
deleted file mode 100644
index efa7a5066d0..00000000000
--- a/Buildings/Experimental/DHC/Networks/Pipes/Validation/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Pipes;
-package Validation "Validation models for Pipes"
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains validation cases for the BaseClasses found in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Pipes\">
-Buildings.Experimental.DHC.Networks.Pipes</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Networks/Pipes/package.mo b/Buildings/Experimental/DHC/Networks/Pipes/package.mo
deleted file mode 100644
index 43c3f043c67..00000000000
--- a/Buildings/Experimental/DHC/Networks/Pipes/package.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within Buildings.Experimental.DHC.Networks;
-package Pipes "Package containing pipe models used within district network modeling"
-  extends Modelica.Icons.VariantsPackage;
-  annotation (Documentation(info="<html>
-This package contains pipe models specific for distribution networks.
-</html>"));
-end Pipes;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/ConnectionCondensatePipe.mo b/Buildings/Experimental/DHC/Networks/Steam/ConnectionCondensatePipe.mo
deleted file mode 100644
index ff501e55fb7..00000000000
--- a/Buildings/Experimental/DHC/Networks/Steam/ConnectionCondensatePipe.mo
+++ /dev/null
@@ -1,88 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Steam;
-model ConnectionCondensatePipe
-  "Connection for a steam district heating network featuring the condensate return pipe"
-  extends
-    Buildings.Experimental.DHC.Networks.BaseClasses.PartialConnection2Pipe2Medium(
-    redeclare final model Model_pipDisRet =
-        Buildings.Fluid.FixedResistances.PressureDrop (
-          final dp_nominal=dp_nominal),
-    redeclare model Model_pipDisSup =
-        Buildings.Fluid.FixedResistances.LosslessPipe);
-  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
-    "Pressure drop at nominal mass flow rate"
-    annotation (Dialog(group="Nominal condition"));
-  Buildings.Fluid.FixedResistances.PressureDrop pipConRet(
-    redeclare package Medium = MediumRet,
-    m_flow_nominal=mCon_flow_nominal,
-    final dp_nominal=dp_nominal)
-    "Connection return pipe"
-    annotation (Placement(transformation(
-      extent={{10,-10},{-10,10}},rotation=90,origin={20,-10})));
-equation
-  connect(port_aCon, pipConRet.port_a)
-    annotation (Line(points={{20,120},{20,0}}, color={0,127,255}));
-  connect(pipConRet.port_b, junConRet.port_3)
-    annotation (Line(points={{20,-20},{20,-70}}, color={0,127,255}));
-  connect(port_bCon, junConSup.port_3)
-    annotation (Line(points={{-20,120},{-20,-30}}, color={0,127,255}));
-  connect(pipDisSup.port_b, junConSup.port_1)
-    annotation (Line(points={{-60,-40},{-30,-40}}, color={0,127,255}));
-  connect(pipDisRet.port_a, junConRet.port_2)
-    annotation (Line(points={{-60,-80},{10,-80}}, color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{48,76},{72,24}},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0}),
-        Rectangle(
-          extent={{-76,-48},{-20,-72}},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None,
-          lineColor={0,0,0})}),
-        Diagram(
-          coordinateSystem(preserveAspectRatio=false)),
-          defaultComponentName="con",
-    Documentation(info="<html>
-<p>
-This network connection model contains one pipe declaration
-for the condensate pipe, featuring a fixed hydraulic resistance.
-This model is intended for steam heating systems that utilize
-a split-medium approach with two separate medium declarations
-between liquid and vapor states.
-</p>
-<p>
-In this model, it is assumed that there are no mass losses in
-the network connection. Further, heat transfer with the external
-environment and transport delays are also not included.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Updated publication references.
-</li>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ConnectionCondensatePipe;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/DistributionCondensatePipe.mo b/Buildings/Experimental/DHC/Networks/Steam/DistributionCondensatePipe.mo
deleted file mode 100644
index 2881c216db0..00000000000
--- a/Buildings/Experimental/DHC/Networks/Steam/DistributionCondensatePipe.mo
+++ /dev/null
@@ -1,63 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Steam;
-model DistributionCondensatePipe
-  "Model of a steam distribution network using fixed resistance pipe model for condensate returns"
-  extends Buildings.Experimental.DHC.Networks.BaseClasses.PartialDistribution2Pipe2Medium(
-    redeclare ConnectionCondensatePipe con[nCon](
-      each final dp_nominal=dp_nominal),
-    redeclare model Model_pipDis=Buildings.Fluid.FixedResistances.LosslessPipe);
-  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
-    "Pressure drop at nominal mass flow rate"
-    annotation (Dialog(group="Nominal condition"));
-  annotation (
-  defaultComponentName="dis",
-    Documentation(
-      info="<html>
-<p>
-This is a model of a distribution network for steam heating systems.
-The model utilizes a split-medium approach with two separate medium
-declarations between liquid (condensate return) and vapor (steam
-supply) states. The piping network features:
-</p>
-<ul>
-<li>
-a connection model with fixed hydraulic resistance and no heat loss
-in the condensate return pipe segments;
-</li>
-<li>
-a dummy pipe model with no hydraulic resistance and no heat loss for
-the steam supply pipes; and
-</li>
-<li>
-a dummy pipe model with no hydraulic resistance and no heat loss for the end of
-the distribution line (after the last connection).
-</li>
-</ul>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Updated publication references.
-</li>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end DistributionCondensatePipe;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo b/Buildings/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
deleted file mode 100644
index 8b18dfeb39f..00000000000
--- a/Buildings/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mo
+++ /dev/null
@@ -1,98 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Steam.Examples;
-model ConnectionCondensatePipe "Example model for the steam heating connection block"
-  extends Modelica.Icons.Example;
-
-  package MediumSte = Buildings.Media.Steam "Steam medium";
-  package MediumWat =
-      Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium";
-
-  parameter Modelica.Units.SI.AbsolutePressure pSat = 150000
-    "Saturation pressure";
-  parameter Modelica.Units.SI.Temperature TSat = MediumSte.saturationTemperature(pSat)
-     "Saturation temperature";
-  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal = MediumSte.specificEnthalpy(
-  MediumSte.setState_pTX(p=pSat,T=TSat,X=MediumSte.X_default)) -
-  MediumWat.specificEnthalpy(MediumWat.setState_pTX(p=pSat,T=TSat,X=MediumWat.X_default))
-    "Nominal change in enthalpy due to vaporization";
-  parameter Modelica.Units.SI.Power Q_flow_nominal = 200E3
-    "Nominal heat flow rate";
-  parameter Real QHeaLoa[:, :] = [0, 200E3; 6, 200E3; 6, 50E3; 18, 50E3; 18, 75E3; 24, 75E3]
-    "Heating load profile for the building";
-  parameter Modelica.Units.SI.PressureDifference dp_nominal = 6000
-    "Pressure drop at nominal mass flow rate";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal = Q_flow_nominal/dh_nominal
-    "Nominal mass flow rate";
-
-  Modelica.Blocks.Sources.Ramp ram(duration=60, startTime=60) "Ramp signal"
-    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
-  Fluid.Sources.MassFlowSource_T souWat(
-    redeclare package Medium = MediumWat,
-    use_m_flow_in=true,
-    nPorts=1)
-    "Water source"
-    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
-  Fluid.Sources.MassFlowSource_T souSte(
-    redeclare package Medium = MediumSte,
-    use_m_flow_in=true,
-    nPorts=1)
-    "Steam source"
-    annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
-  Buildings.Fluid.Sources.Boundary_pT sinWat(
-    redeclare package Medium = MediumWat,
-    p(displayUnit="Pa") = 101325,
-    nPorts=1)
-    "Water condensate sink"
-    annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
-  Fluid.Sources.Boundary_pT sinSte(
-    redeclare package Medium = MediumSte,
-    p=pSat,
-    T=TSat,
-    nPorts=1)
-    "Steam sink"
-    annotation (Placement(transformation(extent={{80,20},{60,40}})));
-  Buildings.Experimental.DHC.Networks.Steam.ConnectionCondensatePipe con(
-    redeclare package MediumSup = MediumSte,
-    redeclare package MediumRet = MediumWat,
-    mDis_flow_nominal=m_flow_nominal,
-    mCon_flow_nominal=m_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    dp_nominal=1500)
-    "Connection block for steam systems"
-    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
-
-equation
-  connect(con.port_bDisRet, sinWat.ports[1]) annotation (Line(points={{20,-36},
-          {0,-36},{0,-70},{-20,-70}},
-                                   color={0,127,255}));
-  connect(con.port_bCon, sinSte.ports[1])
-    annotation (Line(points={{30,-20},{30,30},{60,30}}, color={0,127,255}));
-  connect(souSte.ports[1], con.port_aDisSup)
-    annotation (Line(points={{-20,-30},{20,-30}}, color={0,127,255}));
-  connect(souWat.ports[1], con.port_aCon)
-    annotation (Line(points={{60,-10},{36,-10},{36,-20}}, color={0,127,255}));
-  connect(ram.y, souSte.m_flow_in) annotation (Line(points={{-59,50},{-50,50},{
-          -50,-22},{-42,-22}}, color={0,0,127}));
-  connect(ram.y, souWat.m_flow_in) annotation (Line(points={{-59,50},{90,50},{
-          90,-2},{82,-2}}, color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
-    Diagram(coordinateSystem(preserveAspectRatio=false)),
-    experiment(StopTime=86400, Tolerance=1e-6),
-    __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos"
-        "Simulate and plot"),
-    Documentation(revisions="<html>
-<ul>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>", info="<html>
-<p>
-This model demonstrates the performance of the
-connection block for steam heating systems with a
-ramp input for the mass flow rate at the building
-interconnection.
-</p>
-</html>"));
-end ConnectionCondensatePipe;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo b/Buildings/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
deleted file mode 100644
index 31684971151..00000000000
--- a/Buildings/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mo
+++ /dev/null
@@ -1,101 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Steam.Examples;
-model DistributionCondensatePipe
-  "Example model for the steam heating distribution network"
-  extends Modelica.Icons.Example;
-
-  package MediumSte = Buildings.Media.Steam "Steam medium";
-  package MediumWat =
-      Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium";
-
-  parameter Modelica.Units.SI.AbsolutePressure pSat = 150000
-    "Saturation pressure";
-  parameter Modelica.Units.SI.Temperature TSat = MediumSte.saturationTemperature(pSat)
-     "Saturation temperature";
-  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal = MediumSte.specificEnthalpy(
-  MediumSte.setState_pTX(p=pSat,T=TSat,X=MediumSte.X_default)) -
-  MediumWat.specificEnthalpy(MediumWat.setState_pTX(p=pSat,T=TSat,X=MediumWat.X_default))
-    "Nominal change in enthalpy due to vaporization";
-  parameter Modelica.Units.SI.Power Q1_flow_nominal=200E3
-    "Nominal heat flow rate, building 1";
-  parameter Modelica.Units.SI.Power Q2_flow_nominal=300E3
-    "Nominal heat flow rate, building 2";
-  parameter Real QHeaLoa1[:, :]= [0, 200E3; 6, 200E3; 6, 50E3; 18, 50E3; 18, 75E3; 24, 75E3]
-    "Heating load profile for the building 1";
-  parameter Real QHeaLoa2[:, :]= [0, 100E3; 6, 200E3; 6, 200E3; 10, 300E3; 18, 300E3; 24, 100E3]
-    "Heating load profile for the building 2";
-  parameter Modelica.Units.SI.PressureDifference dp_nominal=6000
-    "Pressure drop at nominal mass flow rate";
-  parameter Modelica.Units.SI.MassFlowRate m1_flow_nominal=
-    Q1_flow_nominal/dh_nominal
-    "Nominal mass flow rate, building 1";
-  parameter Modelica.Units.SI.MassFlowRate m2_flow_nominal=
-    Q2_flow_nominal/dh_nominal
-    "Nominal mass flow rate, building 2";
-
-  Buildings.Fluid.Sources.Boundary_pT souSte(
-    redeclare package Medium = MediumSte,
-    p=pSat,
-    T=TSat,
-    nPorts=1)
-    "Steam source"
-    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
-  Buildings.Fluid.Sources.Boundary_pT sinWat(
-    redeclare package Medium = MediumWat,
-    p(displayUnit="Pa") = 101325,
-    nPorts=1)
-    "Water condensate sink"
-    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-  Buildings.Experimental.DHC.Networks.Steam.DistributionCondensatePipe dis(
-    redeclare package MediumSup = MediumSte,
-    redeclare package MediumRet = MediumWat,
-    nCon=2,
-    mDis_flow_nominal=m1_flow_nominal + m2_flow_nominal,
-    mCon_flow_nominal={m1_flow_nominal,m2_flow_nominal},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    dp_nominal=dp_nominal)
-    annotation (Placement(transformation(extent={{-20,0},{20,20}})));
-  Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS bui[2](
-    redeclare package MediumSte = MediumSte,
-    redeclare package MediumWat = MediumWat,
-    each pSte_nominal=pSat,
-    each TSte_nominal=TSat,
-    each dh_nominal=dh_nominal,
-    Q_flow_nominal={Q1_flow_nominal,Q2_flow_nominal},
-    each dp_nominal=dp_nominal,
-    each energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    QHeaLoa={QHeaLoa1,QHeaLoa2},
-    each timeScale(displayUnit="s") = 3600)
-    "Building vector consisting of 2 buildings"
-    annotation (Placement(transformation(extent={{60,40},{40,60}})));
-
-equation
-  connect(souSte.ports[1], dis.port_aDisSup)
-    annotation (Line(points={{-60,10},{-20,10}}, color={0,127,255}));
-  connect(sinWat.ports[1], dis.port_bDisRet) annotation (Line(points={{-60,-30},
-          {-40,-30},{-40,4},{-20,4}},   color={0,127,255}));
-  connect(dis.ports_bCon, bui.port_a)
-    annotation (Line(points={{-12,20},{-12,50},{40,50}}, color={0,127,255}));
-  connect(bui.port_b, dis.ports_aCon)
-    annotation (Line(points={{40,44},{12,44},{12,20}}, color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
-    Diagram(coordinateSystem(preserveAspectRatio=false)),
-    experiment(StopTime=86400, Tolerance=1e-6),
-    __Dymola_Commands(file=
-      "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos"
-      "Simulate and plot"),
-    Documentation(revisions="<html>
-<ul>
-<li>
-March 2, 2022, by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>", info="<html>
-<p>
-This model demonstrates the performance of the distribution
-network block for steam heating systems with two connected
-buildings with unique heating load profiles.
-</p>
-</html>"));
-end DistributionCondensatePipe;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/Examples/package.mo b/Buildings/Experimental/DHC/Networks/Steam/Examples/package.mo
deleted file mode 100644
index abeac9d72b2..00000000000
--- a/Buildings/Experimental/DHC/Networks/Steam/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Networks.Steam;
-package Examples "Collection of models that illustrate model use and test models"
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Networks.Steam\">
-Buildings.Experimental.DHC.Networks.Steam</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Networks/Steam/package.mo b/Buildings/Experimental/DHC/Networks/Steam/package.mo
deleted file mode 100644
index c980940b4dd..00000000000
--- a/Buildings/Experimental/DHC/Networks/Steam/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within Buildings.Experimental.DHC.Networks;
-package Steam "Collection of models for distribution networks involving steam"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (Documentation(info="<html>
-<p>
-This package contains models for steam heating distribution networks.
-</p>
-</html>"));
-end Steam;
diff --git a/Buildings/Experimental/DHC/Networks/package.mo b/Buildings/Experimental/DHC/Networks/package.mo
deleted file mode 100644
index 9ef054eace5..00000000000
--- a/Buildings/Experimental/DHC/Networks/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC;
-package Networks "Package of models for district energy distribution networks"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for elements that form district energy distribution
-networks.
-</p>
-</html>"));
-end Networks;
diff --git a/Buildings/Experimental/DHC/Plants/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/BaseClasses/package.mo
deleted file mode 100644
index d033e3782b3..00000000000
--- a/Buildings/Experimental/DHC/Plants/BaseClasses/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Plants;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains base classes that are used to construct the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants\">
-Buildings.Experimental.DHC.Plants</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/AllElectricCWStorage.mo b/Buildings/Experimental/DHC/Plants/Combined/AllElectricCWStorage.mo
deleted file mode 100644
index 433db202cfa..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/AllElectricCWStorage.mo
+++ /dev/null
@@ -1,1642 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined;
-model AllElectricCWStorage
-  "All-electric CHW and HW plant with CW storage"
-  extends BaseClasses.PartialPlant(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.CombinedGeneration2to4,
-    final have_weaBus=true,
-    final have_fan=true,
-    final have_pum=true,
-    final have_eleHea=true,
-    final have_eleCoo=true);
-
-  replaceable package MediumAir=Buildings.Media.Air
-    "Air medium";
-  replaceable package MediumConWatCoo=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Medium model for cooling tower circuit"
-    annotation (choices(
-      choice(redeclare package Medium=Buildings.Media.Water "Water"),
-      choice(redeclare package Medium =
-            Buildings.Media.Antifreeze.PropyleneGlycolWater (
-        property_T=293.15,X_a=0.40)
-        "Propylene glycol water, 40% mass fraction")));
-
-  // CHW loop and cooling-only chillers
-  parameter Integer nChi(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"),
-      Evaluate=true);
-  parameter Integer nPumChiWat(final min=1, start=1)=max(nChi, nChiHea)
-    "Number of CHW pumps operating at design conditions"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"),
-      Evaluate=true);
-  final parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_nominal(
-    final min=0)=datChi.mEva_flow_nominal
-    "Design chiller CHW mass flow rate (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_min(
-    final min=0)=0.6 * mChiWatChi_flow_nominal
-    "Chiller CHW minimum mass flow rate (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWatChi_flow_nominal(
-    final min=0)=datChi.mCon_flow_nominal
-    "Design chiller CW mass flow rate (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpChiWatSet_max(
-    final min=0,
-    displayUnit="Pa")
-    "Design (maximum) CHW differential pressure setpoint"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpEvaChi_nominal(
-    final min=0,
-    displayUnit="Pa")=5E4
-    "Design evaporator pressure drop (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpConChi_nominal(
-    final min=0,
-    displayUnit="Pa")=5E4
-    "Design condenser pressure drop (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpPumChiWat_nominal(
-    final min=0,
-    displayUnit="Pa")=1.1 * (dpChiWatSet_max + max(
-      dpEvaChi_nominal + chi.valEva.dpValve_nominal,
-      dpEvaChiHea_nominal + max(chiHea.valEva.dpValve_nominal) + sum(chiHea.valEvaSwi.dpValve_nominal)))
-    "Design head of CHW pump(each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-
-  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChi
-    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
-    "Chiller parameters (each unit)"
-    annotation (
-      Dialog(group="CHW loop and cooling-only chillers"),
-      Placement(transformation(extent={{80,340},{100,360}})));
-
-  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
-    max(chi.TChiWatSup_nominal, chiHea.TChiWatSup_nominal)
-    "Design (minimum) CHW supply temperature"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=
-    TChiWatSup_nominal - QChiWat_flow_nominal / mChiWat_flow_nominal / cp_default
-    "Design (maximum) CHW return temperature"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  // Plant capacity computed with HRCs in direct heat recovery mode, see
-  // Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant.
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
-    chi.QChiWat_flow_nominal + chiHea.QChiWat_flow_nominal
-    "Design plant cooling heat flow rate (all units)";
-  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
-    final min=0)=
-    nChi * mChiWatChi_flow_nominal + nChiHea * mChiWatChiHea_flow_nominal
-    "Design CHW mass flow rate (all units)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-
-  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_min=10
-    "Minimum chiller lift at minimum load"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_nominal=
-    TTanSet[1, 2] + 5 - TChiWatSup_nominal
-    "Design chiller lift"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-
-  // HW loop and heat recovery chillers
-  parameter Integer nChiHea(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="HW loop and heat recovery chillers"),
-      Evaluate=true);
-  parameter Integer nPumHeaWat(final min=1, start=1) = nChiHea
-    "Number of HW pumps operating at design conditions"
-    annotation (Dialog(group="HW loop and heat recovery chillers"),
-      Evaluate=true);
-  final parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_nominal=
-    datChiHea.mEva_flow_nominal
-    "Design HRC CHW mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_min(
-    final min=0)=0.6 * mChiWatChiHea_flow_nominal
-    "HRC CHW minimum mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mHeaWatChiHea_flow_min(
-    final min=0)=0.6 * mConWatChiHea_flow_nominal
-    "HRC HW minimum mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWatChiHea_flow_nominal=
-    datChiHea.mCon_flow_nominal
-    "Design HRC CW mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpHeaWatSet_max(
-    final min=0,
-    displayUnit="Pa")
-    "Design (maximum) HW differential pressure setpoint"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpEvaChiHea_nominal(
-    final min=0,
-    displayUnit="Pa")=5E4
-    "Design evaporator  pressure drop (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpConChiHea_nominal(
-    final min=0,
-    displayUnit="Pa")=5E4
-    "Design condenser pressure drop (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-
-  parameter Modelica.Units.SI.PressureDifference dpPumHeaWat_nominal(
-    final min=0,
-    displayUnit="Pa")=1.1 * (dpHeaWatSet_max +
-      dpConChiHea_nominal + max(chiHea.valCon.dpValve_nominal) +
-      sum(chiHea.valConSwi.dpValve_nominal))
-    "Design head of HW pump(each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-
-  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChiHea
-    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
-    "HRC parameters (each unit)"
-    annotation (
-      Dialog(group="HW loop and heat recovery chillers"),
-      Placement(transformation(extent={{120,340},{140,360}})));
-
-  final parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=
-    chiHea.THeaWatSup_nominal
-    "Design (maximum) HW supply temperature"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
-    THeaWatSup_nominal - QHeaWat_flow_nominal / mHeaWat_flow_nominal / cp_default
-    "Design (minimum) HW return temperature"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-
-  // TCasHeaEnt_nominal computed in second cycle of TES tank.
-  final parameter Modelica.Units.SI.Temperature TCasHeaEnt_nominal=
-    TTanSet[2, 2]
-    "Design evaporator entering temperature in cascading heating mode"
-    annotation(Evaluate=true);
-  // TCasCooEnt_nominal computed in Heat Rejection mode.
-  final parameter Modelica.Units.SI.Temperature TCasCooEnt_nominal=
-    TConWatCooSup_nominal + dTHexCoo_nominal
-    "Design condenser entering temperature in cascading cooling mode"
-    annotation(Evaluate=true);
-  final parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=
-    chiHea.QHeaWat_flow_nominal
-    "Design heating heat flow rate (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  final parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal=
-    chiHea.mConWat_flow_nominal
-    "Design HW mass flow rate (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-
-  // CW loop, TES tank and heat pumps
-  parameter Integer nHeaPum(final min=1, start=1)
-    "Number of heat pumps operating at design conditions"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-      Evaluate=true);
-  parameter Integer nPumConWatCon(final min=1, start=1)=max(nChi, nChiHea)
-    "Number of CW pumps serving condenser barrels at design conditions"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-      Evaluate=true);
-  parameter Integer nPumConWatEva(final min=1, start=1)=nChiHea
-    "Number of CW pumps serving evaporator barrels at design conditions"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.PressureDifference dpConWatConSet_max(
-    final min=0,
-    displayUnit="Pa")=max(
-     dpConChi_nominal + chi.valCon.dpValve_nominal,
-     dpConChiHea_nominal + max(chiHea.valCon.dpValve_nominal) + sum(chiHea.valConSwi.dpValve_nominal))
-    "Design (maximum) CW condenser loop differential pressure setpoint"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.PressureDifference dpConWatEvaSet_max(
-    final min=0,
-    displayUnit="Pa")=
-    dpEvaChiHea_nominal + max(chiHea.valEva.dpValve_nominal) + sum(chiHea.valEvaSwi.dpValve_nominal)
-    "Design (maximum) CW evaporator loop differential pressure setpoint"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.PressureDifference dpPumConWatCon_nominal(
-    final min=0,
-    displayUnit="Pa")=1.1 * (dpConWatConSet_max + max(dpHexCoo_nominal, dpTan_nominal))
-    "Design head of CW pump serving condenser barrels (each unit)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.PressureDifference dpPumConWatEva_nominal(
-    final min=0,
-    displayUnit="Pa")=1.1 * (dpConWatEvaSet_max + dpTan_nominal)
-    "Design head of CW pump serving evaporator barrels (each unit)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWatCon_flow_nominal(
-    final min=0)=chi.mConWat_flow_nominal + chiHea.mConWat_flow_nominal
-    "Design total CW mass flow rate through condenser barrels (all units)";
-  final parameter Modelica.Units.SI.MassFlowRate mConWatEva_flow_nominal(
-    final min=0)=chiHea.mChiWat_flow_nominal
-    "Design total CW mass flow rate through evaporator barrels (all units)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.Volume VTan=
-    -chiHea.QEvaCasHea_flow_nominal * 3 * 3600 / (max(TTanSet) - min(TTanSet)) /
-    cp_default / rho_default
-    "Tank volume"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.Length hTan = (16 * VTan / Modelica.Constants.pi)^(1/3)
-    "Height of tank (without insulation)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  // Default considering 1 m high thermmocline and 1 m high section below and above diffusers.
-  // Thermocline only useless during last tank cycle, hence the scale factor.
-  parameter Real fraUslTan(final unit="1", final min=0, final max=1, start=0.1) =
-    ((max(TTanSet[2]) - min(TTanSet)) / (max(TTanSet) - min(TTanSet)) * 1 + 1) / hTan
-    "Useless fraction of TES"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.Length dInsTan
-    "Thickness of insulation"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.ThermalConductivity kInsTan=0.04
-    "Specific heat conductivity of insulation"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Integer nSegTan(min=2) = 10
-    "Number of volume segments"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps", tab="Advanced"));
-  parameter Modelica.Units.SI.Temperature TTanSet[2, 2] = {
-    {15 + 273.15, 25 + 273.15},
-    {TChiWatSup_nominal, 15 + 273.15}}
-    "Tank temperature setpoints: 2 cycles with 2 setpoints"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  // Default TES tank pressure drop without PSV, otherwise ~ 20E3
-  parameter Modelica.Units.SI.PressureDifference dpTan_nominal(displayUnit="Pa")=1E3
-    "Design pressure drop through TES tank"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"));
-  replaceable parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic datHeaPum
-    "Heat pump parameters (each unit)"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-    Placement(transformation(extent={{160,340},{180,360}})));
-
-  // Cooling tower loop
-  parameter Integer nCoo(final min=1, start=1)
-    "Number of cooling tower cells operating at design conditions"
-    annotation (Dialog(group="Cooling tower loop"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.MassFlowRate mConWatCoo_flow_nominal(
-    final min=0)=mConWatCon_flow_nominal
-    "Design CT CW mass flow rate (all units)"
-    annotation(Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.PressureDifference dpConWatCooFri_nominal(
-    displayUnit="Pa",
-    start=1E4,
-    final min=0)
-    "Design CW flow-friction losses through tower and piping only (without elevation head or valve)"
-    annotation (Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.MassFlowRate mAirCooUni_flow_nominal(
-    final min=0,
-    start=mConWatCoo_flow_nominal / nCoo / 1.45)
-    "Design CT air mass flow rate (each unit)"
-    annotation (Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.Temperature TWetBulCooEnt_nominal(
-    final min=273.15)
-    "Design CT entering air wetbulb temperature"
-    annotation (Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.Temperature TConWatCooRet_nominal(
-    final min=273.15)=TConWatCooSup_nominal +
-    abs(QHexCoo_flow_nominal) / mConWatCoo_flow_nominal / cpConWatCoo_default
-    "Design CT CW return temperature (tower entering)"
-    annotation (Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.Temperature TConWatCooSup_nominal(
-    final min=273.15)=TWetBulCooEnt_nominal + 3
-    "Design CT CW supply temperature (tower leaving)"
-    annotation (Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.Power PFanCoo_nominal(
-    final min=0,
-    start=340 * mConWatCoo_flow_nominal / nCoo)
-    "CT fan power (each unit)"
-    annotation (Dialog(group="Cooling tower loop"));
-
-  parameter Integer nPumConWatCoo(final min=1, start=1)=nCoo
-    "Number of CW pumps serving cooling towers at design conditions"
-    annotation (Dialog(group="Cooling tower loop"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.PressureDifference dpPumConWatCoo_nominal=
-    1.1 * (dpHexCoo_nominal + dpConWatCooFri_nominal)
-    "Design head of CW pump serving cooling towers (each unit)"
-    annotation (Dialog(group="Cooling tower loop"));
-
-  parameter Modelica.Units.SI.TemperatureDifference dTHexCoo_nominal=2
-    "Design heat exchanger approach"
-    annotation (Dialog(group="Cooling tower loop"));
-  parameter Modelica.Units.SI.PressureDifference dpHexCoo_nominal=3E4
-    "Design pressure drop through heat exchanger (same on both sides)"
-    annotation (Dialog(group="Cooling tower loop"));
-
-  // HX sized with all HRCs in cascading cooling mode.
-  parameter Modelica.Units.SI.HeatFlowRate QHexCoo_flow_nominal=
-    -(chi.QConWat_flow_nominal + chiHea.QConCasCoo_flow_nominal)
-    "Design cooling heat flow rate of heat exchanger (<0)"
-    annotation (Dialog(group="Cooling tower loop"));
-
-  // Assumptions
-  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 use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
-    "= true, if control signal is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered signal for actuators and movers"));
-
-  // Outside connectors
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-420,260},{-380,300}}),
-        iconTransformation(extent={{-380,240},{-300,320}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
-    "Heating enable signal"
-    annotation (Placement(transformation(extent={{-420,240},{-380,280}}),
-        iconTransformation(extent={{-380,200},{-300,280}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "CHW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-420,200},{-380,240}}),
-        iconTransformation(extent={{-380,160},{-300,240}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatSet(
-    final unit="Pa",
-    final min=0)
-    "CHW differential pressure setpoint (for local dp sensor)"
-    annotation (Placement(transformation(extent={{-420,140},{-380,180}}),
-        iconTransformation(extent={{-380,80},{-300,160}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "HW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-420,180},{-380,220}}),
-        iconTransformation(extent={{-380,120},{-300,200}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatSet(
-    final unit="Pa",
-    final min=0)
-    "HW differential pressure setpoint (for local dp sensor)"
-    annotation (Placement(transformation(extent={{-420,120},{-380,160}}),
-        iconTransformation(extent={{-380,40},{-300,120}})));
-
-  // Components - CHW loop and cooling-only chillers
-  Subsystems.ChillerGroup chi(
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=Medium,
-    final dat=datChi,
-    final nUni=nChi,
-    final dpEva_nominal=dpEvaChi_nominal,
-    final dpCon_nominal=dpConChi_nominal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal1=allowFlowReversal,
-    final allowFlowReversal2=allowFlowReversal)
-    "Cooling-only chillers"
-    annotation (Placement(transformation(extent={{50,76},{70,96}})));
-  Subsystems.MultiplePumpsSpeed pumChiWat(
-    redeclare final package Medium=Medium,
-    final nPum=nPumChiWat,
-    final have_var=true,
-    final have_valve=true,
-    final mPum_flow_nominal=mChiWat_flow_nominal / nPumChiWat,
-    final dpPum_nominal=dpPumChiWat_nominal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "Primary CHW pumps"
-    annotation (Placement(transformation(extent={{170,190},{190,210}})));
-  Fluid.FixedResistances.Junction junChiWatSup(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mChiWat_flow_nominal * {1, -1, -1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal
-      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal
-      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal
-      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Leaving)
-    "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={240,200})));
-  Fluid.FixedResistances.Junction junChiWatRet(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mChiWat_flow_nominal * {1, -1, 1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal
-      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal
-      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal
-      then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-       else Modelica.Fluid.Types.PortFlowDirection.Entering)
-   "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={240,80})));
-  Fluid.FixedResistances.Junction junChiWatChiHeaRet(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mChiWat_flow_nominal * {1,-1,-1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={120,80})));
-  Fluid.FixedResistances.Junction junChiWatChiHeaSup(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mChiWat_flow_nominal*{1,-1,1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={140,200})));
-  // PICV model sized at design flow (instead of minimum flow) for convenience.
-  Fluid.Actuators.Valves.TwoWayLinear valChiWatMinByp(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=max(mChiWatChi_flow_min, mChiWatChiHea_flow_min),
-    from_dp=true,
-    linearized=true,
-    dpValve_nominal=1E3,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "CHW minimum flow bypass valve"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={240,140})));
-  Fluid.Sensors.RelativePressure dpChiWat(
-    redeclare final package Medium=Medium)
-    "CHW differential pressure (local sensor hardwired to plant controller)"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={300,140})));
-  Fluid.Sensors.TemperatureTwoPort TChiWatPriRet(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=mChiWat_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) "Primary CHW return temperature"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={220,80})));
-  Fluid.Sensors.MassFlowRate mChiWatPri_flow(
-    redeclare final package Medium =Medium,
-    final allowFlowReversal=allowFlowReversal) "Primary CHW mass flow rate"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={180,80})));
-  Fluid.Sensors.TemperatureTwoPort TChiWatSup(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mChiWat_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "CHW supply temperature"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={210,200})));
-
-  // Components - HW loop and heat recovery chillers
-  Subsystems.ChillerHeatRecoveryGroup chiHea(
-    redeclare final package Medium = Medium,
-    final dat=datChiHea,
-    final nUni=nChiHea,
-    final TCasCooEnt_nominal=TCasCooEnt_nominal,
-    final TCasHeaEnt_nominal=TCasHeaEnt_nominal,
-    final dpEva_nominal=dpEvaChiHea_nominal,
-    final dpCon_nominal=dpConChiHea_nominal,
-    final allowFlowReversal=allowFlowReversal,
-    final use_inputFilter=use_inputFilter,
-    final energyDynamics=energyDynamics)
-    "Heat recovery chillers"
-    annotation (Placement(transformation(extent={{50,-158},{70,-138}})));
-
-  Subsystems.MultiplePumpsSpeed pumHeaWat(
-    redeclare final package Medium=Medium,
-    final nPum=nPumHeaWat,
-    final have_var=true,
-    final have_valve=true,
-    final mPum_flow_nominal=mHeaWat_flow_nominal/nPumHeaWat,
-    final dpPum_nominal=dpPumHeaWat_nominal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "Primary HW pumps"
-    annotation (Placement(transformation(extent={{170,-150},{190,-130}})));
-  Fluid.FixedResistances.Junction junHeaWatSup(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mHeaWat_flow_nominal * {1,-1,-1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={240,-140})));
-  Fluid.FixedResistances.Junction junHeaWatRet(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mHeaWat_flow_nominal * {1,-1,1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-       else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={240,-260})));
-  // PICV model sized at design flow (instead of minimum flow) for convenience.
-  Fluid.Actuators.Valves.TwoWayLinear valHeaWatMinByp(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mHeaWatChiHea_flow_min,
-    from_dp=true,
-    linearized=true,
-    dpValve_nominal=1E3,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal) "HW minimum flow bypass valve"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={240,-200})));
-  Fluid.Sensors.RelativePressure dpHeaWat(
-    redeclare final package Medium =Medium)
-    "HW differential pressure (local sensor hardwired to plant controller)"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={300,-200})));
-  Fluid.Sensors.TemperatureTwoPort THeaWatPriRet(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mHeaWat_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "Primary HW return temperature"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={200,-260})));
-  Fluid.Sensors.TemperatureTwoPort THeaWatSup(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mHeaWat_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "HW supply temperature"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={210,-140})));
-  Fluid.Sensors.MassFlowRate mHeaWatPri_flow(
-    redeclare final package Medium =Medium,
-    final allowFlowReversal=allowFlowReversal)
-    "Primary HW mass flow rate" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={180,-260})));
-
-  // Components - CW loop and heat pumps
-  Subsystems.MultiplePumpsSpeed pumConWatCon(
-    redeclare final package Medium = Medium,
-    final nPum=nPumConWatCon,
-    final have_var=true,
-    final have_valve=true,
-    final mPum_flow_nominal=mConWatCon_flow_nominal / nPumConWatCon,
-    final dpPum_nominal=dpPumConWatCon_nominal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "CW pumps serving condenser barrels"
-    annotation (Placement(transformation(extent={{-90,-350},{-70,-330}})));
-  Subsystems.MultiplePumpsSpeed pumConWatEva(
-    redeclare final package Medium = Medium,
-    final nPum=nPumConWatEva,
-    final have_var=true,
-    final have_valve=true,
-    final mPum_flow_nominal=mConWatEva_flow_nominal / nPumConWatEva,
-    final dpPum_nominal=dpPumConWatEva_nominal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "CW pumps serving evaporator barrels"
-    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-  Fluid.FixedResistances.Junction junConWatEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,-1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=0,
-        origin={20,-340})));
-  Fluid.Storage.Stratified tan(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final VTan=VTan,
-    final hTan=hTan,
-    final dIns=dInsTan,
-    final kIns=kInsTan,
-    final nSeg=nSegTan)
-    "TES tank"
-    annotation (Placement(transformation(extent={{-130,-190},{-110,-170}})));
-  Fluid.Sources.Boundary_pT bouConWat(
-    redeclare final package Medium = Medium,
-    final p=hTan * rho_default * Modelica.Constants.g_n,
-    final nPorts=1)
-    "CW pressure boundary condition prescribed by tank operating level"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={-110,-210})));
-  Fluid.FixedResistances.Junction junConWatTanEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,-1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=Modelica.Fluid.Types.PortFlowDirection.Bidirectional)
-    "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={-160,-40})));
-  Fluid.FixedResistances.Junction junConWatLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={80,40})));
-  Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor TTan[nSegTan](
-    T(each displayUnit="degC"))
-    "TES tank temperature sensor gateway"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={-120,-140})));
-  HeatTransfer.Sources.PrescribedTemperature out "Outdoor temperature"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-100,-140})));
-  Fluid.FixedResistances.Junction junConWatHeaPumEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,-1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
-    "Fluid junction" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={-80,40})));
-  Fluid.FixedResistances.Junction junConWatHeaPumLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering)
-    "Fluid junction" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={-120,40})));
-  Subsystems.HeatPumpGroup heaPum(
-    redeclare final package Medium = Medium,
-    redeclare final package MediumAir = MediumAir,
-    final nUni=nHeaPum,
-    final dat=datHeaPum,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "Heat pumps"
-    annotation (Placement(transformation(extent={{-90,150},{-110,170}})));
-  Fluid.FixedResistances.Junction junConWatTanLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal*{1,-1,1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={-120,-280})));
-  Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU hexCoo(
-    redeclare final package Medium1=MediumConWatCoo,
-    redeclare final package Medium2=Medium,
-    final m1_flow_nominal=mConWatCoo_flow_nominal,
-    final m2_flow_nominal=mConWatCon_flow_nominal,
-    final dp1_nominal=0,
-    final dp2_nominal=0,
-    final Q_flow_nominal=QHexCoo_flow_nominal,
-    final T_a1_nominal=TConWatCooSup_nominal,
-    final T_a2_nominal=TConWatCooRet_nominal + dTHexCoo_nominal,
-    final allowFlowReversal1=allowFlowReversal,
-    final allowFlowReversal2=allowFlowReversal,
-    final configuration=Buildings.Fluid.Types.HeatExchangerConfiguration.CounterFlow)
-    "Heat exchanger with cooling tower circuit"
-    annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-206,-170})));
-  Subsystems.CoolingTowerGroup coo(
-    redeclare final package Medium=Medium,
-    final nUni=nCoo,
-    final mConWatUni_flow_nominal=mConWatCoo_flow_nominal / nCoo,
-    final dpConWatFriUni_nominal=dpConWatCooFri_nominal + dpHexCoo_nominal,
-    final mAirUni_flow_nominal=mAirCooUni_flow_nominal,
-    final TWetBulEnt_nominal=TWetBulCooEnt_nominal,
-    final TConWatRet_nominal=TConWatCooRet_nominal,
-    final TConWatSup_nominal=TConWatCooSup_nominal,
-    final PFanUni_nominal=PFanCoo_nominal,
-    final energyDynamics=energyDynamics,
-    final allowFlowReversal=allowFlowReversal)
-    "Cooling towers"
-    annotation (Placement(transformation(extent={{-250,-90},{-270,-70}})));
-  Fluid.Actuators.Valves.ThreeWayLinear valBypTan(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final energyDynamics=energyDynamics,
-    dpValve_nominal=1E3,
-    dpFixed_nominal={dpTan_nominal,dpHexCoo_nominal})
-    "TES tank bypass valve"
-    annotation (Placement(
-        transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={-160,-100})));
-  Fluid.Sources.Boundary_pT bouConWatCoo(
-    redeclare final package Medium = Medium,
-    final p=130000,
-    nPorts=1)
-    "CW pressure boundary condition prescribed by CT elevation head"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={-300,-250})));
-  Subsystems.MultiplePumpsSpeed pumConWatCoo(
-    redeclare final package Medium = Medium,
-    final nPum=nPumConWatCoo,
-    final have_var=true,
-    have_valve=false,
-    final mPum_flow_nominal=mConWatCoo_flow_nominal / nPumConWatCoo,
-    final dpPum_nominal=dpPumConWatCoo_nominal,
-    final energyDynamics=energyDynamics,
-    final allowFlowReversal=allowFlowReversal) "Cooling tower pumps"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-250,-220})));
-  Fluid.Sensors.TemperatureTwoPort TConWatEvaEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatEva_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "HRC evaporator entering CW temperature"
-    annotation (Placement(transformation(
-          extent={{-10,10},{10,-10}}, rotation=-90,
-        origin={80,-60})));
-
-  // Controls
-  Buildings.Experimental.DHC.Plants.Combined.Controls.Controller ctl(
-    final nChi=nChi,
-    final nPumChiWat=nPumChiWat,
-    final QHeaPum_flow_nominal=datHeaPum.hea.Q_flow*nHeaPum,
-    final dTLifChi_min=dTLifChi_min,
-    final dTLifChi_nominal=dTLifChi_nominal,
-    final nChiHea=nChiHea,
-    final nPumHeaWat=nPumHeaWat,
-    final nHeaPum=nHeaPum,
-    final nPumConWatCon=nPumConWatCon,
-    final nPumConWatEva=nPumConWatEva,
-    final TTanSet=TTanSet,
-    final nCoo=nCoo,
-    final nPumConWatCoo=nPumConWatCoo,
-    final THeaWatSup_nominal=THeaWatSup_nominal,
-    final TChiWatSup_nominal=TChiWatSup_nominal,
-    final mChiWat_flow_nominal=mChiWat_flow_nominal,
-    final mHeaWat_flow_nominal=mHeaWat_flow_nominal,
-    final mConWatCon_flow_nominal=mConWatCon_flow_nominal,
-    final mConWatEva_flow_nominal=mConWatEva_flow_nominal,
-    final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
-    final mChiWatChi_flow_min=mChiWatChi_flow_min,
-    final mConWatChi_flow_nominal=mConWatChi_flow_nominal,
-    final mChiWatChiHea_flow_nominal=mChiWatChiHea_flow_nominal,
-    final mChiWatChiHea_flow_min=mChiWatChiHea_flow_min,
-    final mConWatChiHea_flow_nominal=mConWatChiHea_flow_nominal,
-    final mHeaWatChiHea_flow_min=mHeaWatChiHea_flow_min,
-    final dpChiWatSet_max=dpChiWatSet_max,
-    final dpHeaWatSet_max=dpHeaWatSet_max,
-    final dpConWatConSet_max=dpConWatConSet_max,
-    final dpConWatEvaSet_max=dpConWatEvaSet_max,
-    final dpEvaChi_nominal=dpEvaChi_nominal,
-    final dpValEvaChi_nominal=chi.valEva.dpValve_nominal,
-    final dpEvaChiHea_nominal=dpEvaChiHea_nominal,
-    final dpValEvaChiHea_nominal=max(chiHea.valEva.dpValve_nominal),
-    final QChiWatChi_flow_nominal=chi.QChiWat_flow_nominal,
-    final QChiWatCasCoo_flow_nominal=chiHea.QChiWatCasCoo_flow_nominal,
-    final QChiWatCasCoo_flow_nominal_approx=chiHea.QChiWat_flow_nominal,
-    final QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-    final cp_default=cp_default,
-    final fraUslTan=fraUslTan,
-    final dTHexCoo_nominal=dTHexCoo_nominal,
-    final nTTan=nSegTan)
-    "Controller"
-    annotation (Placement(transformation(extent={{-342,246},{-298,322}})));
-
-  // Miscellaneous
-  Modelica.Blocks.Sources.RealExpression sumPHea(
-    final y=heaPum.P + sum({
-      if ctl.y1CooChiHea[i] or ctl.y1HeaCooChiHea[i] then 0 else chiHea.chi[i].P
-      for i in 1:nChiHea}))
-    "Sum up power drawn from all subsystems"
-    annotation (Placement(transformation(extent={{340,270},{360,290}})));
-  Modelica.Blocks.Sources.RealExpression sumPCoo(
-    final y=chi.P + sum({
-      if ctl.y1CooChiHea[i] or ctl.y1HeaCooChiHea[i] then chiHea.chi[i].P else 0
-      for i in 1:nChiHea}))
-    "Sum up power drawn from all subsystems"
-    annotation (Placement(transformation(extent={{340,230},{360,250}})));
-  Modelica.Blocks.Sources.RealExpression sumPFan(y=coo.P)
-    "Sum up power drawn from all subsystems"
-    annotation (Placement(transformation(extent={{340,190},{360,210}})));
-  Modelica.Blocks.Sources.RealExpression sumPPum(
-    final y=pumChiWat.P + pumHeaWat.P + pumConWatCon.P + pumConWatEva.P + pumConWatCoo.P + heaPum.PPum)
-    "Sum up power drawn from all subsystems"
-    annotation (Placement(transformation(extent={{340,150},{360,170}})));
-
-  Fluid.Sensors.RelativePressure dpConWatEva(redeclare final package Medium =
-        Medium) "CW evaporator loop differential pressure " annotation (
-      Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={0,-70})));
-  Fluid.Sensors.RelativePressure dpConWatCon(redeclare final package Medium =
-        Medium) "CW condenser loop differential pressure " annotation (
-      Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={-20,-310})));
-  Fluid.Sensors.MassFlowRate mConWatEva_flow(redeclare final package Medium =
-        Medium, final allowFlowReversal=allowFlowReversal)
-    "CW evaporator loop mass flow rate" annotation (Placement(transformation(
-        extent={{40,-50},{60,-30}},
-        rotation=0)));
-  Fluid.Sensors.MassFlowRate mConWatCon_flow(redeclare final package Medium =
-        Medium, final allowFlowReversal=allowFlowReversal)
-    "CW condenser loop mass flow rate" annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={-120,-320})));
-  Fluid.Sensors.MassFlowRate mConWatOutTan_flow(redeclare final package Medium =
-        Medium, final allowFlowReversal=allowFlowReversal)
-    "Mass flow rate out of lower port of TES tank (>0 when charging)"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={-80,-240})));
-  Fluid.Sensors.TemperatureTwoPort TConWatConChiLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "Chiller and HRC leaving CW temperature" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={-50,40})));
-  Fluid.Sensors.TemperatureTwoPort TConWatConChiEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "Chiller and HRC entering CW temperature" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={0,-340})));
-  Fluid.Sensors.TemperatureTwoPort TConWatCooSup(
-    redeclare final package Medium = MediumConWatCoo,
-    final m_flow_nominal=mConWatCoo_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "Cooling tower loop CW supply temperature" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=-90,
-        origin={-212,-204})));
-  Fluid.Sensors.TemperatureTwoPort TConWatCooRet(
-    redeclare final package Medium = MediumConWatCoo,
-    final m_flow_nominal=mConWatCoo_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "Cooling tower loop CW return temperature" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=-90,
-        origin={-212,-136})));
-  Fluid.Sensors.TemperatureTwoPort TConWatHexCooEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) "HX entering CW temperature"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-200,-140})));
-  Fluid.Sensors.TemperatureTwoPort TConWatHexCooLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) "HX leaving CW temperature"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-200,-200})));
-  Fluid.Actuators.Valves.ThreeWayLinear valConWatEvaMix(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatEva_flow_nominal,
-    final energyDynamics=energyDynamics,
-    dpValve_nominal=1E3,
-    final dpFixed_nominal=fill(0, 2)) "HRC evaporator CW mixing valve"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-120,-40})));
-  Fluid.FixedResistances.Junction junConWatEvaLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatEva_flow_nominal*{1,-1,-1},
-    final dp_nominal=fill(0, 3),
-    final energyDynamics=energyDynamics,
-    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering,
-    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
-    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
-    "Fluid junction" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=0,
-        origin={0,-146})));
-  Fluid.Sensors.TemperatureTwoPort TConWatConRet(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal)
-    "Condenser loop CW return temperature" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-160,20})));
-  Fluid.Sensors.TemperatureTwoPort TConWatHeaPumEnt(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) "HP entering CW temperature"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={-80,90})));
-  Fluid.Sensors.TemperatureTwoPort TConWatHeaPumLvg(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) "HP leaving CW temperature"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-120,90})));
-protected
-  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-    T=Medium.T_default,
-    p=Medium.p_default,
-    X=Medium.X_default)
-    "Medium state at default properties";
-  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
-    Medium.specificHeatCapacityCp(sta_default)
-    "Specific heat capacity of the fluid";
-  final parameter Modelica.Units.SI.Density rho_default=
-    Medium.density(sta_default)
-    "Density of the fluid";
-  final parameter MediumConWatCoo.ThermodynamicState staConWatCoo_default=
-    MediumConWatCoo.setState_pTX(
-    T=MediumConWatCoo.T_default,
-    p=MediumConWatCoo.p_default,
-    X=MediumConWatCoo.X_default)
-    "Medium state at default properties";
-  final parameter Modelica.Units.SI.SpecificHeatCapacity cpConWatCoo_default=
-    MediumConWatCoo.specificHeatCapacityCp(staConWatCoo_default)
-    "Specific heat capacity of the fluid";
-public
-  Fluid.Sensors.MassFlowRate mConWatHexCoo_flow(redeclare final package Medium =
-        Medium, final allowFlowReversal=allowFlowReversal)
-    "CW mass flow rate through secondary (plant) side of HX" annotation (
-      Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={-200,-240})));
-  Fluid.Actuators.Valves.TwoWayLinear valConWatByp(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatCon_flow_nominal,
-    from_dp=true,
-    linearized=true,
-    dpValve_nominal=1E3,
-    final use_inputFilter=use_inputFilter,
-    final allowFlowReversal=allowFlowReversal)
-    "CW chiller bypass valve" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-40,-120})));
-equation
-  connect(junChiWatSup.port_2, port_bSerCoo)
-    annotation (Line(points={{250,200},{320,200},{320,-40},{380,-40}},
-                                                   color={0,127,255}));
-  connect(junChiWatSup.port_3, valChiWatMinByp.port_a)
-    annotation (Line(points={{240,190},{240,150}}, color={0,127,255}));
-  connect(valChiWatMinByp.port_b, junChiWatRet.port_3)
-    annotation (Line(points={{240,130},{240,90}}, color={0,127,255}));
-  connect(junChiWatSup.port_2, dpChiWat.port_a) annotation (Line(points={{250,200},
-          {300,200},{300,150}}, color={0,127,255}));
-  connect(TChiWatPriRet.port_a, junChiWatRet.port_2)
-    annotation (Line(points={{230,80},{230,80}}, color={0,127,255}));
-  connect(port_aSerCoo, junChiWatRet.port_1) annotation (Line(points={{-380,-40},
-          {-340,-40},{-340,8},{300,8},{300,80},{250,80}},
-                                        color={0,127,255}));
-  connect(dpChiWat.port_b, junChiWatRet.port_1)
-    annotation (Line(points={{300,130},{300,80},{250,80}}, color={0,127,255}));
-  connect(junHeaWatSup.port_3, valHeaWatMinByp.port_a)
-    annotation (Line(points={{240,-150},{240,-190}},color={0,127,255}));
-  connect(valHeaWatMinByp.port_b, junHeaWatRet.port_3)
-    annotation (Line(points={{240,-210},{240,-250}}, color={0,127,255}));
-  connect(THeaWatPriRet.port_a, junHeaWatRet.port_2)
-    annotation (Line(points={{210,-260},{230,-260}}, color={0,127,255}));
-  connect(dpHeaWat.port_b, junHeaWatRet.port_1) annotation (Line(points={{300,
-          -210},{300,-260},{250,-260}},
-                                  color={0,127,255}));
-  connect(junHeaWatSup.port_2, port_bSerHea) annotation (Line(points={{250,-140},
-          {340,-140},{340,0},{380,0}},color={0,127,255}));
-  connect(ctl.y1Chi, chi.y1) annotation (Line(points={{-296,313},{28,313},{28,
-          95},{48,95}},        color={255,0,255}));
-  connect(ctl.yValConChi, chi.yValCon) annotation (Line(points={{-296,309},{30,
-          309},{30,100},{54,100},{54,98}},           color={0,0,127}));
-  connect(TChiWatSupSet, chi.TSet) annotation (Line(points={{-400,220},{40,220},
-          {40,77},{48,77}},     color={0,0,127}));
-  connect(ctl.y1PumChiWat, pumChiWat.y1) annotation (Line(points={{-296,307},{
-          166,307},{166,208},{168,208}},
-                                    color={255,0,255}));
-  connect(ctl.y1PumHeaWat, pumHeaWat.y1) annotation (Line(points={{-296,282},{
-          160,282},{160,-132},{168,-132}},
-                                    color={255,0,255}));
-  connect(ctl.yValChiWatMinByp, valChiWatMinByp.y) annotation (Line(points={{-296,
-          303},{40,303},{40,180},{260,180},{260,140},{252,140}},
-                                                 color={0,0,127}));
-  connect(ctl.yValHeaWatMinByp, valHeaWatMinByp.y) annotation (Line(points={{-296,
-          278},{264,278},{264,-200},{252,-200}},   color={0,0,127}));
-  connect(THeaWatPriRet.port_b, mHeaWatPri_flow.port_a)
-    annotation (Line(points={{190,-260},{190,-260}}, color={0,127,255}));
-  connect(TChiWatPriRet.port_b, mChiWatPri_flow.port_a)
-    annotation (Line(points={{210,80},{190,80}}, color={0,127,255}));
-  connect(ctl.y1PumConWatEva, pumConWatEva.y1) annotation (Line(points={{-296,
-          271},{38,271},{38,-26},{-82,-26},{-82,-32}},
-                                               color={255,0,255}));
-  connect(ctl.yPumConWatEva, pumConWatEva.y) annotation (Line(points={{-296,269},
-          {34,269},{34,-24},{-84,-24},{-84,-36},{-82,-36}},
-                                               color={0,0,127}));
-  connect(sumPHea.y, PHea)
-    annotation (Line(points={{361,280},{400,280}}, color={0,0,127}));
-  connect(sumPCoo.y, PCoo) annotation (Line(points={{361,240},{400,240}},
-                                 color={0,0,127}));
-  connect(sumPFan.y, PFan)
-    annotation (Line(points={{361,200},{400,200}}, color={0,0,127}));
-  connect(sumPPum.y, PPum) annotation (Line(points={{361,160},{400,160}},
-                           color={0,0,127}));
-  connect(junHeaWatSup.port_2, dpHeaWat.port_a) annotation (Line(points={{250,
-          -140},{300,-140},{300,-190}},
-                                 color={0,127,255}));
-  connect(pumChiWat.port_b, TChiWatSup.port_a)
-    annotation (Line(points={{190,200},{200,200}}, color={0,127,255}));
-  connect(TChiWatSup.port_b, junChiWatSup.port_1)
-    annotation (Line(points={{220,200},{230,200}}, color={0,127,255}));
-  connect(tan.heaPorVol, TTan.port)
-    annotation (Line(points={{-120,-180},{-120,-150}},color={191,0,0}));
-  connect(out.port, tan.heaPorTop) annotation (Line(points={{-100,-150},{-100,
-          -160},{-118,-160},{-118,-172.6}},
-                         color={191,0,0}));
-  connect(out.port, tan.heaPorSid) annotation (Line(points={{-100,-150},{-100,
-          -160},{-114.4,-160},{-114.4,-180}},
-                          color={191,0,0}));
-  connect(out.port, tan.heaPorBot) annotation (Line(points={{-100,-150},{-100,
-          -187.4},{-118,-187.4}},       color={191,0,0}));
-  connect(pumHeaWat.port_b, THeaWatSup.port_a)
-    annotation (Line(points={{190,-140},{200,-140}},
-                                                   color={0,127,255}));
-  connect(THeaWatSup.port_b, junHeaWatSup.port_1)
-    annotation (Line(points={{220,-140},{230,-140}},
-                                                   color={0,127,255}));
-  connect(junConWatHeaPumEnt.port_2, junConWatHeaPumLvg.port_1)
-    annotation (Line(points={{-90,40},{-110,40}},  color={0,127,255}));
-  connect(weaBus.TDryBul, out.T) annotation (Line(
-      points={{0,380},{0,120},{-100,120},{-100,-128}},
-      color={255,204,51},
-      thickness=0.5), Text(
-      string="%first",
-      index=-1,
-      extent={{6,3},{6,3}},
-      horizontalAlignment=TextAlignment.Left));
-  connect(weaBus, heaPum.weaBus) annotation (Line(
-      points={{0,380},{0,180},{-100,180},{-100,170}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(ctl.y1HeaPum, heaPum.y1) annotation (Line(points={{-296,266},{-42,266},
-          {-42,166},{-88,166}},        color={255,0,255}));
-  connect(ctl.THeaPumSet, heaPum.TSet) annotation (Line(points={{-296,264},{-44,
-          264},{-44,154},{-88,154}},        color={0,0,127}));
-  connect(bouConWat.ports[1], tan.port_b)
-    annotation (Line(points={{-110,-200},{-110,-180}}, color={0,127,255}));
-  connect(ctl.yPumChiWat, pumChiWat.y) annotation (Line(points={{-296,305},{162,
-          305},{162,204},{168,204}},   color={0,0,127}));
-  connect(ctl.yPumHeaWat, pumHeaWat.y) annotation (Line(points={{-296,280},{158,
-          280},{158,-136},{168,-136}}, color={0,0,127}));
-  connect(mChiWatPri_flow.port_b,junChiWatChiHeaRet. port_1)
-    annotation (Line(points={{170,80},{130,80}},         color={0,127,255}));
-  connect(junChiWatChiHeaRet.port_2, chi.port_a2)
-    annotation (Line(points={{110,80},{70,80}},           color={0,127,255}));
-  connect(port_aSerHea, junHeaWatRet.port_1) annotation (Line(points={{-380,0},
-          {310,0},{310,-260},{250,-260}},                        color={0,127,255}));
-  connect(junConWatTanEnt.port_2, valBypTan.port_2)
-    annotation (Line(points={{-160,-50},{-160,-90}}, color={0,127,255}));
-  connect(valBypTan.port_1, tan.port_a) annotation (Line(points={{-160,-110},{
-          -160,-180},{-130,-180}},
-                              color={0,127,255}));
-  connect(ctl.yValBypTan, valBypTan.y) annotation (Line(points={{-296,252},{
-          -180,252},{-180,-86},{-146,-86},{-146,-100},{-148,-100}},
-                                            color={0,0,127}));
-  connect(bouConWatCoo.ports[1], pumConWatCoo.port_a)
-    annotation (Line(points={{-300,-240},{-300,-220},{-260,-220}},
-                                                       color={0,127,255}));
-  connect(coo.port_b, pumConWatCoo.port_a) annotation (Line(points={{-270,-80},
-          {-300,-80},{-300,-220},{-260,-220}},
-                                            color={0,127,255}));
-  connect(weaBus, coo.weaBus) annotation (Line(
-      points={{0,380},{0,120},{-260,120},{-260,-70}},
-      color={255,204,51},
-      thickness=0.5), Text(
-      string="%first",
-      index=-1,
-      extent={{6,3},{6,3}},
-      horizontalAlignment=TextAlignment.Left));
-  connect(ctl.yCoo, coo.y) annotation (Line(points={{-296,255},{-222,255},{-222,
-          -86},{-248,-86}},                     color={0,0,127}));
-  connect(ctl.y1PumConWatCoo, pumConWatCoo.y1) annotation (Line(points={{-296,
-          261},{-278,261},{-278,-212},{-262,-212}},
-        color={255,0,255}));
-  connect(chi.port_b1, junConWatLvg.port_3)
-    annotation (Line(points={{70,92},{80,92},{80,50}},   color={0,127,255}));
-  connect(chiHea.port_b1, pumHeaWat.port_a)
-    annotation (Line(points={{70,-140},{170,-140}},
-                                                  color={0,127,255}));
-  connect(mHeaWatPri_flow.port_b, chiHea.port_a1) annotation (Line(points={{170,
-          -260},{44,-260},{44,-140},{50,-140}},color={0,127,255}));
-  connect(junChiWatChiHeaRet.port_3, chiHea.port_a4) annotation (Line(points={{120,70},
-          {120,-156},{70,-156}},            color={0,127,255}));
-  connect(junConWatEnt.port_2, chiHea.port_a3) annotation (Line(points={{30,-340},
-          {40,-340},{40,-151.2},{50,-151.2}},color={0,127,255}));
-  connect(chiHea.port_b3, junConWatLvg.port_1) annotation (Line(points={{70,
-          -151.1},{100,-151.1},{100,40},{90,40}},
-                                       color={0,127,255}));
-  connect(ctl.yValEvaChiHea, chiHea.yValEva) annotation (Line(points={{-296,292},
-          {32,292},{32,-162},{52,-162},{52,-160}},          color={0,0,127}));
-  connect(ctl.y1CooChiHea, chiHea.y1Coo) annotation (Line(points={{-296,298},{
-          36,298},{36,-146},{48,-146},{48,-148}}, color={255,0,255}));
-  connect(ctl.y1ChiHea, chiHea.y1) annotation (Line(points={{-296,300},{38,300},
-          {38,-142},{48,-142}},       color={255,0,255}));
-  connect(ctl.yValConChiHea, chiHea.yValCon) annotation (Line(points={{-296,290},
-          {32,290},{32,-122},{52,-122},{52,-136}},     color={0,0,127}));
-  connect(ctl.TChiHeaSet, chiHea.TSet) annotation (Line(points={{-296,294},{30,
-          294},{30,-154},{48,-154}},                          color={0,0,127}));
-  connect(ctl.yValEvaChi, chi.yValEva) annotation (Line(points={{-296,311},{32,
-          311},{32,72},{54.2,72},{54.2,74}},          color={0,0,127}));
-  connect(junChiWatChiHeaSup.port_2, pumChiWat.port_a)
-    annotation (Line(points={{150,200},{170,200}},color={0,127,255}));
-  connect(chi.port_b2, junChiWatChiHeaSup.port_1) annotation (Line(points={{50,80},
-          {44,80},{44,200},{130,200}},      color={0,127,255}));
-  connect(chiHea.port_b4, junChiWatChiHeaSup.port_3) annotation (Line(points={{50,
-          -156.5},{50,-156},{48,-156},{48,-170},{140,-170},{140,190}},
-                                                             color={0,127,255}));
-  connect(TConWatEvaEnt.port_b, chiHea.port_a2) annotation (Line(points={{80,-70},
-          {80,-145},{70,-145}},      color={0,127,255}));
-  connect(TChiWatSupSet, ctl.TChiWatSupSet) annotation (Line(points={{-400,220},
-          {-356,220},{-356,316},{-344,316}},     color={0,0,127}));
-  connect(dpChiWatSet, ctl.dpChiWatSet) annotation (Line(points={{-400,160},{
-          -360,160},{-360,312},{-344,312}},     color={0,0,127}));
-  connect(THeaWatSupSet, ctl.THeaWatSupSet) annotation (Line(points={{-400,200},
-          {-360,200},{-360,314},{-344,314}},     color={0,0,127}));
-  connect(dpHeaWatSet, ctl.dpHeaWatSet) annotation (Line(points={{-400,140},{
-          -356,140},{-356,310},{-344,310}},     color={0,0,127}));
-  connect(u1Coo, ctl.u1Coo) annotation (Line(points={{-400,280},{-372,280},{
-          -372,320},{-344,320}},     color={255,0,255}));
-  connect(u1Hea, ctl.u1Hea) annotation (Line(points={{-400,260},{-362,260},{
-          -362,318},{-344,318}},     color={255,0,255}));
-  connect(mChiWatPri_flow.m_flow, ctl.mChiWatPri_flow) annotation (Line(points={{180,91},
-          {180,132},{-354,132},{-354,266},{-344,266}},              color={0,0,127}));
-  connect(dpChiWat.p_rel, ctl.dpChiWat) annotation (Line(points={{291,140},{280,
-          140},{280,124},{-372,124},{-372,254},{-344,254}},     color={0,0,127}));
-  connect(mHeaWatPri_flow.m_flow, ctl.mHeaWatPri_flow) annotation (Line(points={{180,
-          -271},{180,-294},{-366,-294},{-366,264},{-344,264}},          color={0,
-          0,127}));
-  connect(dpHeaWat.p_rel, ctl.dpHeaWat) annotation (Line(points={{291,-200},{
-          280,-200},{280,62},{-366,62},{-366,252},{-344,252}},     color={0,0,127}));
-  connect(pumConWatEva.port_b, dpConWatEva.port_a) annotation (Line(points={{-60,-40},
-          {1.77636e-15,-40},{1.77636e-15,-60}},
-                                     color={0,127,255}));
-  connect(pumConWatEva.port_b, mConWatEva_flow.port_a)
-    annotation (Line(points={{-60,-40},{40,-40}},   color={0,127,255}));
-  connect(mConWatEva_flow.port_b, TConWatEvaEnt.port_a)
-    annotation (Line(points={{60,-40},{80,-40},{80,-50}}, color={0,127,255}));
-  connect(junConWatTanLvg.port_2, mConWatCon_flow.port_a)
-    annotation (Line(points={{-120,-290},{-120,-310}}, color={0,127,255}));
-  connect(mConWatCon_flow.port_b, pumConWatCon.port_a) annotation (Line(points={{-120,
-          -330},{-120,-340},{-90,-340}},         color={0,127,255}));
-  connect(mConWatCon_flow.m_flow, ctl.mConWatCon_flow) annotation (Line(points={{-131,
-          -320},{-360,-320},{-360,262},{-344,262}},            color={0,0,127}));
-  connect(mConWatEva_flow.m_flow, ctl.mConWatEva_flow) annotation (Line(points={{50,-29},
-          {50,66},{-364,66},{-364,260},{-344,260}},            color={0,0,127}));
-  connect(dpConWatEva.p_rel, ctl.dpConWatEva) annotation (Line(points={{9,-70},
-          {22,-70},{22,64},{-352,64},{-352,248},{-344,248}},           color={0,
-          0,127}));
-  connect(dpConWatCon.p_rel, ctl.dpConWatCon) annotation (Line(points={{-29,
-          -310},{-368,-310},{-368,250},{-344,250}},
-                                                 color={0,0,127}));
-  connect(TChiWatPriRet.T, ctl.TChiWatPriRet) annotation (Line(points={{220,91},
-          {220,130},{-348,130},{-348,306},{-344,306}},     color={0,0,127}));
-  connect(THeaWatPriRet.T, ctl.THeaWatPriRet) annotation (Line(points={{200,
-          -249},{200,64},{-368,64},{-368,290},{-344,290}},
-        color={0,0,127}));
-  connect(TTan.T, ctl.TTan) annotation (Line(points={{-120,-129},{-120,-120},{
-          -374,-120},{-374,288},{-344,288}},              color={0,0,127}));
-  connect(tan.port_b, mConWatOutTan_flow.port_a) annotation (Line(points={{-110,
-          -180},{-80,-180},{-80,-230}},   color={0,127,255}));
-  connect(mConWatHexCoo_flow.m_flow, ctl.mConWatHexCoo_flow) annotation (Line(
-        points={{-211,-240},{-230,-240},{-230,-202},{-358,-202},{-358,258},{
-          -344,258}},
-        color={0,0,127}));
-  connect(mConWatOutTan_flow.m_flow, ctl.mConWatOutTan_flow) annotation (Line(
-        points={{-91,-240},{-100,-240},{-100,-298},{-362,-298},{-362,-74},{
-          -349.818,-74},{-349.818,256},{-344,256}},          color={0,0,127}));
-  connect(junConWatEnt.port_3, chi.port_a1) annotation (Line(points={{20,-330},
-          {20,92},{50,92}},   color={0,127,255}));
-  connect(chi.mCon_flow, ctl.mConChi_flow) annotation (Line(points={{68,98},{68,
-          124},{-344,124},{-344,272}},                color={0,0,127}));
-  connect(chi.mEva_flow, ctl.mEvaChi_flow) annotation (Line(points={{68,74},{68,
-          68},{-346,68},{-346,274},{-344,274}},     color={0,0,127}));
-  connect(chiHea.mCon_flow, ctl.mConChiHea_flow) annotation (Line(points={{69,-136},
-          {69,54},{-366,54},{-366,268},{-344,268}},                   color={0,
-          0,127}));
-  connect(chiHea.mEva_flow, ctl.mEvaChiHea_flow) annotation (Line(points={{68,-160},
-          {68,-168},{24,-168},{24,52},{-352,52},{-352,270},{-344,270}},
-                 color={0,0,127}));
-  connect(ctl.yValConSwiChiHea, chiHea.yValConSwi) annotation (Line(points={{-296,
-          286},{28,286},{28,-120},{54,-120},{54,-136}},         color={0,0,127}));
-  connect(ctl.yValEvaSwiHea, chiHea.yValEvaSwi) annotation (Line(points={{-296,
-          288},{30,288},{30,-164},{54,-164},{54,-160}},
-        color={0,0,127}));
-  connect(TChiWatSup.T, ctl.TChiWatSup) annotation (Line(points={{210,211},{210,
-          218},{-346,218},{-346,308},{-344,308}},     color={0,0,127}));
-  connect(chiHea.TEvaLvg, ctl.TEvaLvgChiHea) annotation (Line(points={{66,-160},
-          {66,-166},{26,-166},{26,52},{-372,52},{-372,296},{-344,296}},
-        color={0,0,127}));
-  connect(junConWatLvg.port_2, TConWatConChiLvg.port_a)
-    annotation (Line(points={{70,40},{-40,40}}, color={0,127,255}));
-  connect(TConWatConChiLvg.port_b, junConWatHeaPumEnt.port_1)
-    annotation (Line(points={{-60,40},{-70,40}}, color={0,127,255}));
-  connect(THeaWatSup.T, ctl.THeaWatSup) annotation (Line(points={{210,-129},{
-          210,128},{-346,128},{-346,292},{-344,292}},         color={0,0,127}));
-  connect(TConWatConChiEnt.port_b, junConWatEnt.port_1)
-    annotation (Line(points={{10,-340},{10,-340}},   color={0,127,255}));
-  connect(pumConWatCoo.port_b, TConWatCooSup.port_a) annotation (Line(points={{-240,
-          -220},{-212,-220},{-212,-214}},      color={0,127,255}));
-  connect(TConWatCooSup.port_b, hexCoo.port_a1)
-    annotation (Line(points={{-212,-194},{-212,-180}}, color={0,127,255}));
-  connect(hexCoo.port_b1, TConWatCooRet.port_a)
-    annotation (Line(points={{-212,-160},{-212,-146}},color={0,127,255}));
-  connect(TConWatCooRet.port_b, coo.port_a) annotation (Line(points={{-212,-126},
-          {-212,-80},{-250,-80}},
-                              color={0,127,255}));
-  connect(valBypTan.port_3, TConWatHexCooEnt.port_a) annotation (Line(points={{-170,
-          -100},{-200,-100},{-200,-130}},   color={0,127,255}));
-  connect(TConWatHexCooEnt.port_b, hexCoo.port_a2)
-    annotation (Line(points={{-200,-150},{-200,-160}}, color={0,127,255}));
-  connect(hexCoo.port_b2, TConWatHexCooLvg.port_a)
-    annotation (Line(points={{-200,-180},{-200,-190}}, color={0,127,255}));
-  connect(TConWatHexCooLvg.port_b, mConWatHexCoo_flow.port_a) annotation (Line(
-        points={{-200,-210},{-200,-230}},             color={0,127,255}));
-  connect(TConWatConChiLvg.T, ctl.TConWatConChiLvg) annotation (Line(points={{-50,51},
-          {-50,62},{-352,62},{-352,284},{-344,284}},                 color={0,0,
-          127}));
-  connect(TConWatConChiEnt.T, ctl.TConWatConChiEnt) annotation (Line(points={{0,-329},
-          {0,-292},{-364,-292},{-364,286},{-344,286}},
-        color={0,0,127}));
-  connect(TConWatCooSup.T, ctl.TConWatCooSup) annotation (Line(points={{-223,
-          -204},{-356,-204},{-356,282},{-344,282}},       color={0,0,127}));
-  connect(TConWatCooRet.T, ctl.TConWatCooRet) annotation (Line(points={{-223,
-          -136},{-350,-136},{-350,280},{-344,280}},
-                                                 color={0,0,127}));
-  connect(TConWatHexCooEnt.T, ctl.TConWatHexCooEnt) annotation (Line(points={{-211,
-          -140},{-350,-140},{-350,278},{-344,278}},           color={0,0,127}));
-  connect(TConWatHexCooLvg.T, ctl.TConWatHexCooLvg) annotation (Line(points={{-211,
-          -200},{-354,-200},{-354,276},{-344,276}},             color={0,0,127}));
-  connect(ctl.yPumConWatCoo, pumConWatCoo.y) annotation (Line(points={{-296,259},
-          {-280,259},{-280,-216},{-262,-216}},
-        color={0,0,127}));
-  connect(chiHea.TConLvg, ctl.TConLvgChiHea) annotation (Line(points={{67,-136},
-          {67,58},{-370,58},{-370,298},{-344,298}},
-        color={0,0,127}));
-  connect(chiHea.TConEnt, ctl.TConEntChiHea) annotation (Line(points={{65,-136},
-          {65,56},{-362,56},{-362,300},{-344,300}},                     color={
-          0,0,127}));
-  connect(junConWatTanEnt.port_3, valConWatEvaMix.port_1)
-    annotation (Line(points={{-150,-40},{-130,-40}},
-                                                 color={0,127,255}));
-  connect(valConWatEvaMix.port_2, pumConWatEva.port_a)
-    annotation (Line(points={{-110,-40},{-80,-40}},
-                                                 color={0,127,255}));
-  connect(junConWatEvaLvg.port_3, valConWatEvaMix.port_3) annotation (Line(
-        points={{0,-136},{0,-100},{-120,-100},{-120,-50}},  color={0,127,255}));
-  connect(junConWatEvaLvg.port_3, dpConWatEva.port_b)
-    annotation (Line(points={{0,-136},{0,-80},{-1.77636e-15,-80}},
-                                                   color={0,127,255}));
-  connect(chiHea.port_b2, junConWatEvaLvg.port_1) annotation (Line(points={{50,-145},
-          {50,-146},{10,-146}},      color={0,127,255}));
-  connect(junConWatEvaLvg.port_2, junConWatTanLvg.port_3) annotation (Line(
-        points={{-10,-146},{-30,-146},{-30,-280},{-110,-280}},
-                                                   color={0,127,255}));
-  connect(TConWatEvaEnt.T, ctl.TConWatEvaEnt) annotation (Line(points={{69,-60},
-          {64,-60},{64,60},{-358,60},{-358,302},{-344,302}},           color={0,
-          0,127}));
-  connect(ctl.yValConWatEvaMix, valConWatEvaMix.y) annotation (Line(points={{-296,
-          284},{26,284},{26,-20},{-120,-20},{-120,-28}},           color={0,0,
-          127}));
-  connect(junConWatHeaPumLvg.port_2, TConWatConRet.port_a)
-    annotation (Line(points={{-130,40},{-160,40},{-160,30}},
-                                                   color={0,127,255}));
-  connect(TConWatConRet.port_b, junConWatTanEnt.port_1)
-    annotation (Line(points={{-160,10},{-160,-30}},color={0,127,255}));
-  connect(TConWatConRet.T, ctl.TConWatConRet) annotation (Line(points={{-171,20},
-          {-178,20},{-178,54},{-362,54},{-362,194},{-354,194},{-354,304},{-344,
-          304}},
-        color={0,0,127}));
-  connect(chi.TConLvg, ctl.TConLvgChi) annotation (Line(points={{66,98},{66,134},
-          {-348,134},{-348,294},{-344,294}},            color={0,0,127}));
-  connect(junConWatHeaPumEnt.port_3, TConWatHeaPumEnt.port_a)
-    annotation (Line(points={{-80,50},{-80,80}},   color={0,127,255}));
-  connect(TConWatHeaPumEnt.port_b, heaPum.port_a) annotation (Line(points={{-80,100},
-          {-80,160},{-90,160}},       color={0,127,255}));
-  connect(heaPum.port_b, TConWatHeaPumLvg.port_a) annotation (Line(points={{-110,
-          160},{-120,160},{-120,100}},color={0,127,255}));
-  connect(TConWatHeaPumLvg.port_b, junConWatHeaPumLvg.port_3)
-    annotation (Line(points={{-120,80},{-120,50}}, color={0,127,255}));
-  connect(ctl.y1Coo, coo.y1) annotation (Line(points={{-296,257},{-220,257},{
-          -220,-74},{-248,-74}},
-                             color={255,0,255}));
-  connect(mConWatHexCoo_flow.port_b, junConWatTanLvg.port_1) annotation (Line(
-        points={{-200,-250},{-200,-260},{-120,-260},{-120,-270}},
-                                                                color={0,127,
-          255}));
-  connect(mConWatOutTan_flow.port_b, junConWatTanLvg.port_1)
-    annotation (Line(points={{-80,-250},{-80,-260},{-120,-260},{-120,-270}},
-                                                     color={0,127,255}));
-  connect(ctl.yPumConWatCon, pumConWatCon.y) annotation (Line(points={{-296,273},
-          {-276,273},{-276,-336},{-92,-336}}, color={0,0,127}));
-  connect(ctl.y1PumConWatCon, pumConWatCon.y1) annotation (Line(points={{-296,
-          275},{-284,275},{-284,254},{-274,254},{-274,-332},{-92,-332}}, color=
-          {255,0,255}));
-  connect(pumConWatCon.port_b, valConWatByp.port_b) annotation (Line(points={{
-          -70,-340},{-40,-340},{-40,-130}}, color={0,127,255}));
-  connect(ctl.yValConWatByp, valConWatByp.y) annotation (Line(points={{-296,248},
-          {28,248},{28,-120},{-28,-120}}, color={0,0,127}));
-  connect(pumConWatCon.port_b, TConWatConChiEnt.port_a)
-    annotation (Line(points={{-70,-340},{-10,-340}}, color={0,127,255}));
-  connect(pumConWatCon.port_b, dpConWatCon.port_a) annotation (Line(points={{
-          -70,-340},{-20,-340},{-20,-320}}, color={0,127,255}));
-  connect(valConWatByp.port_a, TConWatConChiLvg.port_a)
-    annotation (Line(points={{-40,-110},{-40,40}}, color={0,127,255}));
-  connect(dpConWatCon.port_b, TConWatConChiLvg.port_a) annotation (Line(points=
-          {{-20,-300},{-20,40},{-40,40}}, color={0,127,255}));
-annotation (
-  defaultComponentName="pla", Documentation(info="<html>
-<p>
-This model represents a combined heating and cooling plant where chilled
-water is produced by cooling-only chillers and heat recovery chillers,
-hot water is produced by heat recovery chillers, and a thermal energy storage
-tank is integrated in the condenser water circuit to maximize heat recovery
-(\"Tank Charge/Discharge\" operating mode).
-Cooling towers allow rejecting excess heat from the condenser loop
-(\"Heat Rejection\" operating mode).
-Air-source heat pumps allow injecting heat into the condenser loop
-(\"Charge Assist\" operating mode).
-</p>
-<p>
-This model has been developed based on the publication by <a href=\"#Gill2021\">B. Gill (2021)</a>
-and further discussions with Taylor Engineers.
-</p>
-<h4>Abbreviations and naming conventions</h4>
-<p>
-The following abbreviations are used in the documentation of this
-model and of its components.<br/>
-</p>
-<table summary=\"log levels\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><th>Abbreviation</th><th>Description</th></tr>
-<tr><td>AI</td><td>Analog input (integer or real)</td></tr>
-<tr><td>AO</td><td>Analog output (integer or real)</td></tr>
-<tr><td>CHW</td><td>Chilled water</td></tr>
-<tr><td>CT</td><td>Cooling tower</td></tr>
-<tr><td>CW</td><td>Condenser water</td></tr>
-<tr><td>CWC</td><td>Condenser water circuit serving chiller and HRC condenser barrel</td></tr>
-<tr><td>CWE</td><td>Condenser water circuit serving HRC evaporator barrel</td></tr>
-<tr><td>DI</td><td>Digital input (Boolean)</td></tr>
-<tr><td>DO</td><td>Digital output (Boolean)</td></tr>
-<tr><td>HP</td><td>Heat pump</td></tr>
-<tr><td>HR</td><td>Heat recovery</td></tr>
-<tr><td>HRC</td><td>Heat recovery chiller</td></tr>
-<tr><td>HW</td><td>Hot water</td></tr>
-<tr><td>VFD</td><td>Variable frequency drive</td></tr>
-</table>
-<p>
-To clearly distinguish cooling-only chillers from heat recovery chillers,
-the term \"chiller\" is used systematically to refer to cooling-only chillers
-whereas the abbreviation \"HRC\" is used systematically to refer to heat recovery chillers.
-</p>
-<p>
-Each HRC can operate under the following modes.
-In <b>cascading heating</b> mode, the condenser barrel is connected to the
-HW loop and the evaporator barrel is connected to the CW loop (CWE circuit).
-The onboard controller controls the HRC to track a HW
-supply temperature setpoint at condenser outlet.
-In <b>cascading cooling</b> mode, the condenser barrel is connected to the CW
-loop (CWC circuit) and the evaporator barrel is connected to the CHW
-loop. The onboard controller controls the HRC to track a CHW
-supply temperature setpoint at evaporator outlet.
-In <b>direct heat recovery</b> mode, the condenser barrel is connected to the HW
-loop and the evaporator barrel is connected to the CHW
-loop. The onboard controller controls the HRC to track a HW
-supply temperature setpoint at condenser outlet while the plant supervisory
-controller maintains the CHW supply temperature at setpoint by
-modulating the evaporator flow rate or the condenser entering temperature.
-</p>
-<h4>System schematic</h4>
-<p>
-The schematic below represents a configuration of the system with two chillers
-and three HRCs.
-The equipment tags correspond to the component names in the plant model.
-The control points used by each control function are represented at the intersection
-of the gray area that describes the function and the four bus lines corresponding
-to the different control point categories (AI, DI, AO, DO).
-For the sake of clarity, control logic that is duplicated between multiple
-units (for instance the chiller isolation valve control) is only illustrated for
-one unit.
-The detailed description of each control function is available in the documentation
-of
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.Controller\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.Controller</a>.
-For an overview of the different operating modes and the design principles of such
-a system, the user may refer to the article by <a href=\"#Gill2021\">B. Gill (2021)</a>.
-</p>
-<p align=\"left\">
-<img alt=\"System schematic\"
-src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.png\"/>
-</p>
-<h4>Control points</h4>
-<h5>Cooling and heating Enable signals</h5>
-<p>
-The cooling and heating Enable signals <code>u1Coo</code> and <code>u1Hea</code>
-shall be computed outside of the plant model, for instance based on a time schedule.
-</p>
-<h5>CHW and HW supply temperature and differential pressure setpoint</h5>
-<p>
-Those setpoints are provided as control inputs.
-Ideally, a reset logic based on consumer valve requests should be implemented to adapt
-those setpoints to the demand.
-</p>
-<h4>Details</h4>
-<h5>Sizing considerations</h5>
-<p>
-Sizing the TES tank and the heat pumps is a joint optimization problem
-under the constraint that on a design heating day, heating loads can be
-met using both the recovered heat and the heat added to the tank by
-the heat pumps.
-As stated by <a href=\"#Gill2021\">B. Gill (2021)</a>, increasing the tank
-capacity generally improves plant efficiency by providing more opportunity
-for heat recovery. Tank capacity should therefore be maximized under the limit
-corresponding to the amount of heat that can be recovered over the day.
-</p>
-<p>
-The model is configured by default with a tank that is sized to store
-the heat needed to operate the HRCs during <i>3&nbsp;</i>h at peak heating
-load with a <i>&Delta;T</i> covering the two temperature cycles specified
-with the parameter <code>TTanSet</code> (heels and thermocline neglected).
-This default can be overwritten.
-</p>
-<h5>TES tank</h5>
-<p>
-The tank is assumed to be integrated without pressure separation, i.e.,
-the operating level of the tank sets the system pressure and no pressure
-sustaining valve or discharge pump is included.
-The operating level is approximated as equal to the tank height.
-A default height to diameter ratio of <i>2</i> is also taken into
-account
-(designers tend to favor a height to diameter ratio above <i>1.5</i>
-in order to minimize the volume of the thermocline which is
-considered useless).
-No high limit is considered for the tank mass flow rate.
-</p>
-<h5>CHW and HW minimum flow bypass valve</h5>
-<p>
-As per standard practice, the bypass valve is sized for the highest
-chiller minimum flow.
-The bypass valve model is configured with
-a pressure drop varying linearly with the flow rate, as opposed
-to a quadratic dependency usually considered for a turbulent flow
-regime.
-This is because the whole plant model contains large nonlinear systems
-of equations, and this configuration limits the risk of solver failure
-while reducing the time to solution.
-This has no significant impact on the operating point of the circulation pumps
-due to the control loop that modulates the valve opening to generate
-enough pressure differential at the chiller boundaries to allow for
-minimum flow circulation.
-So whatever the modeling assumptions for the bypass valve, the
-control loop ensures that the valve creates the adequate pressure drop
-and bypass flow, which will simply be reached at a different valve opening
-with the above simplification.
-</p>
-<h5>Cooling tower circuit</h5>
-<p>
-The design heat flow rate used to size the cooling towers and the intermediary
-heat exchanger corresponds to the heat flow rate rejected by all HRCs operating in
-cascading cooling mode and all chillers operating at design conditions.
-The cooling towers are sized with a default approach of <i>3&nbsp;</i>K to the
-design wetbulb temperature.
-The intermediary heat exchanger is sized with a default approach of <i>2&nbsp;</i>K.
-</p>
-<h5>Chiller and HRC performance data</h5>
-<p>
-The chiller performance data should cover the CW temperature levels
-reached when the plant is operating in Heat Rejection mode.
-The parameter <code>TCasConEnt_nominal</code> (set with a final assignment)
-provides the maximum CW supply (condenser entering) temperature in this
-operating mode.
-The HRC performance data should cover the HRC lift envelope,
-that is when the HRC is operating in direct heat recovery mode,
-producing CHW and HW at their setpoint value at full load.
-</p>
-<h4>References</h4>
-<p>
-<a name=\"Gill2021\"/>
-Brandon Gill, P.E., Taylor Engineers, Alameda, CA, USA.<br/>
-<a href=\"https://tayloreng.egnyte.com/dl/hHl2ZkZRDC/ASHRAE_Journal_-_Solving_the_Large_Building_All-Electric_Heating_Problem.pdf_\">
-Solving the large building all-electric heating problem</a>.<br/>
-ASHRAE Journal, October 2021.
-</p>
-
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end AllElectricCWStorage;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
deleted file mode 100644
index 61a4a4c4965..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/PartialController.mo
+++ /dev/null
@@ -1,657 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
-block PartialController "Interface class for plant controller"
-
-  parameter Integer nChi(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"),
-      Evaluate=true);
-  parameter Integer nPumChiWat(final min=1, start=1)
-    "Number of CHW pumps operating at design conditions"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal
-    "Design (minimum) CHW supply temperature"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-
-  parameter Integer nChiHea(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="HW loop and heat recovery chillers"),
-      Evaluate=true);
-  parameter Integer nPumHeaWat(final min=1, start=1)
-    "Number of HW pumps operating at design conditions"
-    annotation (Dialog(group="HW loop and heat recovery chillers"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal
-    "Design (maximum) HW supply temperature"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-
-  parameter Integer nHeaPum(final min=1, start=1)
-    "Number of heat pumps operating at design conditions"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-      Evaluate=true);
-  parameter Integer nPumConWatCon(final min=1, start=1)
-    "Number of CW pumps serving condenser barrels at design conditions"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-      Evaluate=true);
-  parameter Integer nPumConWatEva(final min=1, start=1)
-    "Number of CW pumps serving evaporator barrels at design conditions"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"),
-      Evaluate=true);
-
-  parameter Integer nCoo(final min=1, start=1)
-    "Number of cooling tower cells operating at design conditions"
-    annotation (Dialog(group="Cooling tower loop"),
-      Evaluate=true);
-  parameter Integer nPumConWatCoo(final min=1, start=1)
-    "Number of CW pumps serving cooling towers at design conditions"
-    annotation (Dialog(group="Cooling tower loop"),
-      Evaluate=true);
-
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatChi_flow_nominal
-    "Cooling design heat flow rate of cooling-only chillers (all units)"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.HeatFlowRate QHeaPum_flow_nominal
-    "Heating design heat flow rate of heat pumps (all units)"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Real PLRStaTra(final unit="1", final min=0, final max=1) = 0.85
-    "Part load ratio triggering stage transition";
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal
-    "Cooling design heat flow rate of HRC in cascading cooling mode (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal_approx
-    "Cooling design heat flow rate of HRC in cascading cooling mode (all units), approximate for scaling"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
-    QChiWatChi_flow_nominal+QChiWatCasCoo_flow_nominal
-    "Plant cooling design heat flow rate (all units)";
-  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal
-    "Heating design heat flow rate (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
-    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
-    "Specific heat capacity of the fluid";
-
-  parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
-    final min=0)
-    "CHW design mass flow rate (all units)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpChiWatSet_max(
-    final min=0,
-    displayUnit="Pa")
-    "Design (maximum) CHW differential pressure setpoint"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal
-    "HW design mass flow rate (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpHeaWatSet_max(
-    final min=0,
-    displayUnit="Pa")
-    "Design (maximum) HW differential pressure setpoint"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mConWatCon_flow_nominal(
-    final min=0)
-    "Design total CW mass flow rate through condenser barrels (all units)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.MassFlowRate mConWatEva_flow_nominal(
-    final min=0)
-    "Design total CW mass flow rate through evaporator barrels (all units)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-
-  parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_nominal
-    "Chiller CHW design mass flow rate (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mChiWatChi_flow_min
-    "Chiller CHW minimum mass flow rate (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mConWatChi_flow_nominal
-    "Chiller CW design mass flow rate (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_nominal
-    "HRC CHW design mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mChiWatChiHea_flow_min
-    "HRC CHW minimum mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mConWatChiHea_flow_nominal
-    "HRC CW design mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.MassFlowRate mHeaWatChiHea_flow_min
-    "Chiller HW minimum mass flow rate (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-
-  parameter Modelica.Units.SI.PressureDifference dpEvaChi_nominal(
-    final min=0,
-    displayUnit="Pa")
-    "Chiller evaporator design pressure drop (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpValEvaChi_nominal(
-    final min=0,
-    displayUnit="Pa")
-    "Chiller evaporator isolation valve design pressure drop (each unit)"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpEvaChiHea_nominal(
-    final min=0,
-    displayUnit="Pa")
-    "Design chiller evaporator  pressure drop (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.PressureDifference dpValEvaChiHea_nominal(
-    final min=0,
-    displayUnit="Pa")
-    "HRC evaporator isolation valve design pressure drop (each unit)"
-    annotation(Dialog(group="HW loop and heat recovery chillers"));
-
-  parameter Modelica.Units.SI.PressureDifference dpConWatConSet_max(
-    final min=0,
-    displayUnit="Pa")
-    "Design (maximum) CW condenser loop differential pressure setpoint"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Modelica.Units.SI.PressureDifference dpConWatEvaSet_max(
-    final min=0,
-    displayUnit="Pa")
-    "Design (maximum) CW evaporator loop differential pressure setpoint"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-
-  parameter Modelica.Units.SI.Temperature TTanSet[2, 2]
-    "Tank temperature setpoints: 2 cycles with 2 setpoints"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Real fraUslTan(final unit="1", final min=0, final max=1)
-    "Useless fraction of TES"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-  parameter Integer nTTan(final min=0)=0
-    "Number of tank temperature points"
-    annotation (Dialog(group="CW loop, TES tank and heat pumps", connectorSizing=true),HideResult=true);
-  parameter Real ratFraChaTanLim[5](each final unit="1/h")=
-    {-0.3, -0.2, -0.15, -0.10, -0.08}
-    "Rate of change of tank charge fraction (over 10, 30, 120, 240, and 360') that triggers Charge Assist (<0)"
-    annotation(Dialog(group="CW loop, TES tank and heat pumps"));
-
-  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_min
-    "Minimum chiller lift at minimum load"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Modelica.Units.SI.TemperatureDifference dTLifChi_nominal
-    "Design chiller lift"
-    annotation(Dialog(group="CHW loop and cooling-only chillers"));
-
-  parameter Modelica.Units.SI.TemperatureDifference dTHexCoo_nominal
-    "Design heat exchanger approach"
-    annotation (Dialog(group="Cooling tower loop"));
-
-  parameter Modelica.Units.SI.Time riseTimePum=30
-    "Pump rise time of the filter (time to reach 99.6 % of the speed)"
-    annotation (
-      Dialog(
-      tab="Dynamics",
-      group="Filtered speed"));
-  parameter Modelica.Units.SI.Time riseTimeVal=120
-    "Pump rise time of the filter (time to reach 99.6 % of the opening)"
-    annotation (
-      Dialog(
-      tab="Dynamics",
-      group="Filtered opening"));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-300,420},{-260,460}}),
-        iconTransformation(extent={{-260,340},{-220,380}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
-    "Heating enable signal"
-    annotation (Placement(transformation(extent={{-300,380},{-260,420}}),
-        iconTransformation(extent={{-260,320},{-220,360}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(final unit="K",
-      displayUnit="degC") "CHW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-300,340},{-260,380}}),
-        iconTransformation(extent={{-260,300},{-220,340}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(final unit="K",
-      displayUnit="degC")
-    "HW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-300,320},{-260,360}}),
-        iconTransformation(extent={{-260,280},{-220,320}})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEvaChi[nChi]
-    "Cooling-only chiller evaporator isolation valve commanded position"
-    annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,320}),iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,270})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConChi[nChi](
-    each final unit="1")
-    "Cooling-only chiller condenser isolation valve commanded position"
-    annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,300}),iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,250})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Chi[nChi]
-    "Cooling-only chiller On/Off command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,340}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,290})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWat[nPumChiWat]
-    "CHW pump Start command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,260}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,230})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWat(
-    final unit="1")
-    "CHW pump speed signal"
-    annotation (Placement(
-        transformation(extent={{260,220},{300,260}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,210})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEvaChiHea[nChiHea](
-    each final unit="1") "HRC evaporator isolation valve commanded position"
-    annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,80}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,80})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ChiHea[nChiHea]
-    "HRC On/Off command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,160})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1CooChiHea[nChiHea]
-    "HRC cooling mode switchover command: true for cooling, false for heating"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,140}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,140})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConChiHea[nChiHea](
-    each final unit="1") "HRC condenser isolation valve commanded position"
-    annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,60}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,60})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWat[nPumHeaWat]
-    "HW pump Start command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,-20}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-20})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWat(
-    final unit="1")
-    "HW pump speed signal"
-    annotation (Placement(
-        transformation(extent={{260,-60},{300,-20}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-40})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValChiWatMinByp(
-    final unit="1")
-    "CHW minimum flow bypass valve control signal"
-    annotation (Placement(
-        transformation(extent={{260,180},{300,220}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,190})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValHeaWatMinByp(
-    final unit="1") "HW minimum flow bypass valve control signal"
-    annotation (Placement(
-        transformation(extent={{260,-100},{300,-60}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-60})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumConWatCon[nPumConWatCon]
-    "CW pump serving condenser barrels Start command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,-120}),iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-90})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumConWatCon(
-    final unit="1")
-    "CW pump serving condenser barrels Speed command"
-    annotation (Placement(
-        transformation(extent={{260,-160},{300,-120}},rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-110})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumConWatEva[nPumConWatEva]
-    "CW pump serving evaporator barrels Start command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,-160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-130})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumConWatEva(
-    final unit="1")
-    "CW pump serving evaporator barrels Speed command"
-    annotation (Placement(
-        transformation(extent={{260,-200},{300,-160}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-150})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaPum[nHeaPum]
-    "Heat pump On/Off command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,-220}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-180})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput THeaPumSet(
-    final unit="K", displayUnit="degC") "Heat pump supply temperature setpoint"
-    annotation (Placement(
-        transformation(extent={{260,-260},{300,-220}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-200})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValBypTan(
-    final unit="1") "TES tank bypass valve commanded position"
-    annotation (Placement(
-        transformation(extent={{260,-300},{300,-260}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-320})));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Coo[nCoo]
-    "Cooling tower Start command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,-360}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-270})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yCoo(
-    final unit="1") "Cooling tower fan speed command"
-                                      annotation (Placement(transformation(
-          extent={{260,-400},{300,-360}}, rotation=0), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-290})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumConWatCoo[
-    nPumConWatCoo] "Cooling tower pump Start command"
-    annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,-320}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-230})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TChiHeaSet[nChiHea](
-    each final unit="K", each displayUnit="degC")
-    "HRC supply temperature setpoint"
-    annotation (Placement(transformation(extent={{260,80},{300,120}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,100})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaCooChiHea[nChiHea]
-    "HRC direct heat recovery switchover command: true for direct HR, false for cascading"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,120}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatSet(final unit="Pa",
-      final min=0) "CHW differential pressure setpoint (for local dp sensor)"
-    annotation (Placement(transformation(extent={{-300,300},{-260,340}}),
-        iconTransformation(extent={{-260,260},{-220,300}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatSet(final unit="Pa",
-      final min=0)
-    "HW differential pressure setpoint (for local dp sensor)"
-    annotation (Placement(transformation(extent={{-300,280},{-260,320}}),
-        iconTransformation(extent={{-260,240},{-220,280}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWat(final unit="Pa")
-    "CHW differential pressure (from local dp sensor)"
-    annotation (Placement(transformation(extent={{-300,-360},{-260,-320}}),
-        iconTransformation(extent={{-260,-320},{-220,-280}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWat(final unit="Pa")
-    "HW differential pressure (from local dp sensor)"
-    annotation (Placement(transformation(extent={{-300,-380},{-260,-340}}),
-        iconTransformation(extent={{-260,-340},{-220,-300}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mChiWatPri_flow(final unit=
-        "kg/s") "Primary CHW mass flow rate"
-    annotation (Placement(
-        transformation(extent={{-300,-200},{-260,-160}}),
-                                                       iconTransformation(
-          extent={{-260,-200},{-220,-160}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mHeaWatPri_flow(final unit=
-        "kg/s") "Primary HW mass flow rate" annotation (Placement(
-        transformation(extent={{-300,-220},{-260,-180}}),
-                                                      iconTransformation(extent={{-260,
-            -220},{-220,-180}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpConWatCon(final unit="Pa")
-    "CW condenser loop differential pressure" annotation (Placement(
-        transformation(extent={{-300,-400},{-260,-360}}), iconTransformation(
-          extent={{-260,-360},{-220,-320}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpConWatEva(final unit="Pa")
-    "CW evaporator loop differential pressure" annotation (Placement(
-        transformation(extent={{-300,-420},{-260,-380}}), iconTransformation(
-          extent={{-260,-380},{-220,-340}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatCon_flow(final unit=
-        "kg/s") "CW condenser loop mass flow rate" annotation (Placement(
-        transformation(extent={{-300,-260},{-260,-220}}),
-                                                     iconTransformation(extent={{-260,
-            -240},{-220,-200}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatEva_flow(final unit=
-        "kg/s") "CW evaporator loop mass flow rate" annotation (Placement(
-        transformation(extent={{-300,-280},{-260,-240}}),
-                                                      iconTransformation(extent={{-260,
-            -260},{-220,-220}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(final unit="K",
-      displayUnit="degC") "CHW supply temperature " annotation (
-      Placement(transformation(extent={{-300,240},{-260,280}}),
-        iconTransformation(extent={{-260,220},{-220,260}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriRet(final unit="K",
-      displayUnit="degC") "Primary CHW return temperature " annotation (
-      Placement(transformation(extent={{-300,220},{-260,260}}),
-        iconTransformation(extent={{-260,200},{-220,240}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriRet(final unit="K",
-      displayUnit="degC") "Primary HW return temperature " annotation (
-      Placement(transformation(extent={{-300,60},{-260,100}}),
-        iconTransformation(extent={{-260,40},{-220,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TTan[nTTan](
-    each final unit="K",
-    each  displayUnit="degC")
-    "TES tank temperature" annotation (Placement(
-        transformation(extent={{-300,40},{-260,80}}),     iconTransformation(
-          extent={{-260,20},{-220,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatHexCoo_flow(final unit
-      ="kg/s") "CW mass flow rate through secondary (plant) side of HX"
-    annotation (Placement(transformation(extent={{-300,-300},{-260,-260}}),
-        iconTransformation(extent={{-260,-280},{-220,-240}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConWatOutTan_flow(final unit
-      ="kg/s")
-    "Mass flow rate out of lower port of TES tank (>0 when charging)"
-    annotation (Placement(transformation(extent={{-300,-320},{-260,-280}}),
-        iconTransformation(extent={{-260,-300},{-220,-260}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mEvaChi_flow[nChi](
-    each final unit="kg/s")
-    "Chiller evaporator barrel mass flow rate" annotation (Placement(
-        transformation(extent={{-300,-120},{-260,-80}}),
-                                                       iconTransformation(
-          extent={{-260,-120},{-220,-80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConChi_flow[nChi](
-    each final unit="kg/s")
-    "Chiller condenser barrel mass flow rate" annotation (Placement(
-        transformation(extent={{-300,-140},{-260,-100}}),
-                                                      iconTransformation(extent={{-260,
-            -140},{-220,-100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mEvaChiHea_flow[nChiHea](
-    each final unit="kg/s")
-    "HRC evaporator barrel mass flow rate" annotation (
-      Placement(transformation(extent={{-300,-160},{-260,-120}}),
-        iconTransformation(extent={{-260,-160},{-220,-120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mConChiHea_flow[nChiHea](
-    each final unit="kg/s")
-    "HRC condenser barrel mass flow rate" annotation (
-      Placement(transformation(extent={{-300,-180},{-260,-140}}),
-        iconTransformation(extent={{-260,-180},{-220,-140}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValEvaSwiHea[nChiHea](
-    each final unit="1")
-    "HRC evaporator switchover valve commanded position"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,40}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,40})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConSwiChiHea[nChiHea](
-    each final unit="1")
-    "HRC condenser switchover valve commanded position"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,20}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,20})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TEvaLvgChiHea[nChiHea](
-    each final unit="K", each displayUnit="degC")
-    "HRC evaporator barrel leaving temperature"
-    annotation (Placement(transformation(extent={{-300,120},{-260,160}}),
-        iconTransformation(extent={{-260,100},{-220,140}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSup(
-    final unit="K",
-    displayUnit="degC") "HW supply temperature " annotation (Placement(
-        transformation(extent={{-300,80},{-260,120}}),iconTransformation(extent={{-260,60},
-            {-220,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumConWatCoo
-    "Cooling tower pump speed command" annotation (Placement(transformation(
-          extent={{260,-360},{300,-320}}), iconTransformation(extent={{220,-270},
-            {260,-230}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatConChiEnt(final unit=
-        "K", displayUnit="degC") "Chiller and HRC entering CW temperature"
-    annotation (Placement(transformation(extent={{-300,20},{-260,60}}),
-        iconTransformation(extent={{-260,0},{-220,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatConChiLvg(final unit=
-        "K", displayUnit="degC") "Chiller and HRC leaving CW temperature"
-    annotation (Placement(transformation(extent={{-300,0},{-260,40}}),
-        iconTransformation(extent={{-260,-20},{-220,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatCooSup(final unit="K",
-      displayUnit="degC") "Cooling tower loop CW supply temperature"
-    annotation (Placement(transformation(extent={{-300,-20},{-260,20}}),
-        iconTransformation(extent={{-260,-40},{-220,0}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatCooRet(final unit="K",
-      displayUnit="degC") "Cooling tower loop CW return temperature"
-    annotation (Placement(transformation(extent={{-300,-40},{-260,0}}),
-        iconTransformation(extent={{-260,-60},{-220,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatHexCooEnt(final unit="K",
-      displayUnit="degC")        "HX entering CW temperature" annotation (
-      Placement(transformation(extent={{-300,-60},{-260,-20}}),
-        iconTransformation(extent={{-260,-80},{-220,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatHexCooLvg(final unit="K",
-      displayUnit="degC")        "HX leaving CW temperature" annotation (
-      Placement(transformation(extent={{-300,-80},{-260,-40}}),
-        iconTransformation(extent={{-260,-100},{-220,-60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConEntChiHea[nChiHea](each final
-            unit="K", each displayUnit="degC")
-    "HRC condenser barrel entering temperature" annotation (Placement(
-        transformation(extent={{-300,160},{-260,200}}), iconTransformation(
-          extent={{-260,140},{-220,180}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConLvgChiHea[nChiHea](each final
-            unit="K", each displayUnit="degC")
-    "HRC condenser barrel leaving temperature" annotation (Placement(
-        transformation(extent={{-300,140},{-260,180}}), iconTransformation(
-          extent={{-260,120},{-220,160}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatEvaEnt(final unit="K",
-      displayUnit="degC") "HRC evaporator entering CW temperature " annotation (
-     Placement(transformation(extent={{-300,180},{-260,220}}),
-        iconTransformation(extent={{-260,160},{-220,200}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConWatEvaMix
-    "HRC evaporator CW mixing valve commanded position" annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={280,0}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,0})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConWatConRet(final unit
-      ="K", displayUnit="degC") "Condenser loop CW return temperature"
-    annotation (Placement(transformation(extent={{-300,200},{-260,240}}),
-        iconTransformation(extent={{-260,180},{-220,220}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TConLvgChi[nChi](each final
-      unit="K", each displayUnit="degC")
-    "Chiller condenser barrel leaving temperature" annotation (Placement(
-        transformation(extent={{-300,100},{-260,140}}), iconTransformation(
-          extent={{-260,80},{-220,120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yValConWatByp(final unit="1")
-    "CW chiller bypass valve control signal" annotation (Placement(
-        transformation(extent={{260,-440},{300,-400}}, rotation=0),
-        iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={240,-360})));
-  annotation (Diagram(coordinateSystem(extent={{-260,-460},{260,460}})), Icon(
-        coordinateSystem(extent={{-220,-380},{220,380}}),
-        graphics={                      Text(
-        extent={{-150,430},{150,390}},
-        textString="%name",
-        textColor={0,0,255}),
-        Rectangle(
-          extent={{-220,-380},{220,380}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}),
-    Documentation(info="<html>
-<p>
-This block serves as an interface class for the plant controller.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PartialController;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
deleted file mode 100644
index 3bb131b037a..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StageIndex.mo
+++ /dev/null
@@ -1,246 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
-block StageIndex
-  "Block that computes the stage index out of staging signals"
-
-  parameter Integer nSta(start=1)
-    "Number of stages"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.Time tSta=0
-    "Minimum runtime of each stage"
-    annotation(Evaluate=true);
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
-    "Enable signal"
-    annotation (Placement(
-        transformation(extent={{-220,40},{-180,80}}),iconTransformation(extent={{-140,40},
-            {-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Up
-    "Staging up signal"
-    annotation (Placement(
-        transformation(extent={{-220,-100},{-180,-60}}),iconTransformation(extent={{-140,
-            -20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Dow
-    "Staging down signal"
-    annotation (Placement(
-        transformation(extent={{-220,-140},{-180,-100}}),
-        iconTransformation(extent={{-140,
-            -78},{-100,-38}})));
-  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput idxSta
-    "Stage index"
-    annotation (Placement(transformation(extent={{180,-20},{220,20}}),
-        iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput preIdxSta
-    "Left limit (in discrete-time) of stage index"
-    annotation (Placement(
-        transformation(extent={{180,-60},{220,-20}}), iconTransformation(extent={{100,-80},
-            {140,-40}})));
-
-  Modelica.StateGraph.InitialStepWithSignal sta0(
-    final nOut=1,
-    final nIn=nSta+1)
-    "Stage 0: no unit"
-    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
-  Modelica.StateGraph.StepWithSignal sta[nSta](
-    each final nIn=2, each final nOut=3)
-    "Stage i"
-    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
-  Modelica.StateGraph.TransitionWithSignal enaLea(
-    final enableTimer=false) "Transition enabling lead unit"
-    annotation (Placement(transformation(extent={{-42,30},{-22,50}})));
-  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot "State graph root"
-    annotation (Placement(transformation(extent={{-10,128},{10,148}})));
-  Modelica.StateGraph.TransitionWithSignal enaLag[nSta](
-    each final enableTimer=false)
-    "Transition enabling lag unit"
-    annotation (Placement(transformation(extent={{90,30},{110,50}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer tim[nSta](each final t=tSta)
-    "Timer for minimum runtime"
-    annotation (Placement(transformation(extent={{10,-50},{30,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer tim0(final t=tSta)
-    "Timer for minimum runtime"
-    annotation (Placement(transformation(extent={{-100,0},{-80,20}})));
-  Buildings.Controls.OBC.CDL.Logical.And and2 "Timer for minimum runtime"
-    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
-  Buildings.Controls.OBC.CDL.Logical.And andUp[nSta]
-    "Runtime criterion met AND staging up order"
-    annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
-  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep(
-    final nout=nSta)
-    "Replicate"
-    annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
-  Buildings.Controls.OBC.CDL.Logical.And andDow[nSta]
-    "Runtime criterion met AND staging down order"
-    annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
-  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep1(
-    final nout=nSta) "Replicate"
-    annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
-  Modelica.StateGraph.TransitionWithSignal disLag[nSta](
-    each final enableTimer=false)
-    "Transition disabling lag unit"
-    annotation (Placement(transformation(extent={{110,10},{130,30}})));
-  Modelica.StateGraph.TransitionWithSignal disAll[nSta](
-    each final enableTimer=false)
-    "Transition disabling all units"
-    annotation (Placement(transformation(extent={{70,50},{90,70}})));
-  Buildings.Controls.OBC.CDL.Logical.And andNotEna[nSta]
-    "Runtime criterion met AND enable signal false"
-    annotation (Placement(transformation(extent={{50,-50},{70,-30}})));
-  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep2(
-    final nout=nSta)
-    "Replicate"
-    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not1 "True if enable signal false"
-    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
-  Modelica.Blocks.Sources.IntegerExpression calIdxSta(final y=
-        Modelica.Math.BooleanVectors.firstTrueIndex(sta.active))
-    "Compute stage index"
-    annotation (Placement(transformation(extent={{140,-10},{160,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Edge edg
-    "Transition to stage 1 at enable time"
-    annotation (Placement(transformation(extent={{-130,70},{-110,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or2
-    "Transition to stage 1 at enable time or staging up order"
-    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
-  Modelica.Blocks.Sources.IntegerExpression calPre(final y=pre(idxSta))
-    "Compute left limit of stage index"
-    annotation (Placement(transformation(extent={{140,-50},{160,-30}})));
-
-  Buildings.Controls.OBC.CDL.Logical.And upAndEna "Stage up only if enabled"
-    annotation (Placement(transformation(extent={{-160,-90},{-140,-70}})));
-  Buildings.Controls.OBC.CDL.Logical.And dowOrDis "Stage down if disabled"
-    annotation (Placement(transformation(extent={{-160,-130},{-140,-110}})));
-initial equation
-  preIdxSta=0;
-equation
-  for i in 1:(nSta - 1) loop
-  connect(enaLag[i].outPort, sta[i+1].inPort[1]) annotation (Line(points={{101.5,
-            40},{110,40},{110,80},{-20,80},{-20,39.75},{-11,39.75}},
-                                                               color={0,0,0}));
-  connect(disLag[i+1].outPort, sta[i].inPort[2]) annotation (Line(points={{121.5,
-            20},{130,20},{130,80},{-20,80},{-20,40.25},{-11,40.25}}, color={0,0,0}));
-  end for;
-  connect(enaLag[nSta].outPort, sta[nSta].inPort[2])
-    annotation (Line(points={{101.5,40},{110,40},{110,80},{-20,80},{-20,40.25},{
-          -11,40.25}},                                       color={0,0,0}));
-  connect(disAll.outPort, sta0.inPort[1:nSta])
-    annotation (Line(points={{81.5,60},{90,60},{90,100},{-140,100},{-140,40},{
-          -121,40}},                                color={0,0,0}));
-  connect(sta0.outPort[1], enaLea.inPort)
-    annotation (Line(points={{-99.5,40},{-36,40}}, color={0,0,0}));
-  connect(enaLea.outPort, sta[1].inPort[1])
-    annotation (Line(points={{-30.5,40},{-24,40},{-24,39.75},{-11,39.75}},color={0,0,0}));
-
-  connect(disLag[1].outPort, sta0.inPort[nSta+1]) annotation (Line(points={{121.5,
-          20},{130,20},{130,100},{-140,100},{-140,40},{-121,40}},
-                                                            color={0,0,0}));
-  connect(sta.outPort[1], disAll.inPort) annotation (Line(points={{10.5,39.8333},
-          {20,39.8333},{20,60},{76,60}},
-                            color={0,0,0}));
-  connect(sta.outPort[2], enaLag.inPort) annotation (Line(points={{10.5,40},{96,
-          40}},                         color={0,0,0}));
-  connect(sta.outPort[3], disLag.inPort) annotation (Line(points={{10.5,40.1667},
-          {20,40.1667},{20,20},{116,20}},
-                                        color={0,0,0}));
-
-  connect(sta.active, tim.u)
-    annotation (Line(points={{0,29},{0,-40},{8,-40}}, color={255,0,255}));
-  connect(sta0.active, tim0.u) annotation (Line(points={{-110,29},{-110,10},{
-          -102,10}},
-                color={255,0,255}));
-  connect(tim0.passed, and2.u2)
-    annotation (Line(points={{-78,2},{-62,2}}, color={255,0,255}));
-  connect(and2.y, enaLea.condition)
-    annotation (Line(points={{-38,10},{-32,10},{-32,28}}, color={255,0,255}));
-  connect(rep.y, andUp.u2) annotation (Line(points={{-38,-80},{34,-80},{34,-88},
-          {48,-88}}, color={255,0,255}));
-  connect(andUp.y, enaLag.condition)
-    annotation (Line(points={{72,-80},{100,-80},{100,28}}, color={255,0,255}));
-  connect(tim.passed, andDow.u1) annotation (Line(points={{32,-48},{40,-48},{40,
-          -120},{48,-120}}, color={255,0,255}));
-  connect(rep1.y, andDow.u2) annotation (Line(points={{-38,-120},{36,-120},{36,-128},
-          {48,-128}}, color={255,0,255}));
-  connect(tim.passed, andUp.u1) annotation (Line(points={{32,-48},{40,-48},{40,-80},
-          {48,-80}}, color={255,0,255}));
-  connect(andDow.y, disLag.condition) annotation (Line(points={{72,-120},{120,-120},
-          {120,8}}, color={255,0,255}));
-  connect(u1, not1.u) annotation (Line(points={{-200,60},{-170,60},{-170,-40},{
-          -102,-40}},
-                 color={255,0,255}));
-  connect(not1.y, rep2.u)
-    annotation (Line(points={{-78,-40},{-62,-40}}, color={255,0,255}));
-  connect(rep2.y, andNotEna.u1) annotation (Line(points={{-38,-40},{-20,-40},{-20,
-          -20},{40,-20},{40,-40},{48,-40}}, color={255,0,255}));
-  connect(tim.passed, andNotEna.u2)
-    annotation (Line(points={{32,-48},{48,-48}}, color={255,0,255}));
-  connect(andNotEna.y, disAll.condition)
-    annotation (Line(points={{72,-40},{80,-40},{80,48}}, color={255,0,255}));
-
-  connect(calIdxSta.y, idxSta)
-    annotation (Line(points={{161,0},{200,0}},color={255,127,0}));
-  connect(u1, edg.u) annotation (Line(points={{-200,60},{-170,60},{-170,80},{
-          -132,80}},
-                color={255,0,255}));
-  connect(edg.y, or2.u1)
-    annotation (Line(points={{-108,80},{-102,80}},
-                                                 color={255,0,255}));
-  connect(or2.y, and2.u1) annotation (Line(points={{-78,80},{-70,80},{-70,10},{
-          -62,10}},               color={255,0,255}));
-  connect(calPre.y, preIdxSta)
-    annotation (Line(points={{161,-40},{200,-40}}, color={255,127,0}));
-  connect(u1, upAndEna.u2) annotation (Line(points={{-200,60},{-170,60},{-170,
-          -88},{-162,-88}}, color={255,0,255}));
-  connect(u1Up, upAndEna.u1)
-    annotation (Line(points={{-200,-80},{-162,-80}}, color={255,0,255}));
-  connect(upAndEna.y, rep.u)
-    annotation (Line(points={{-138,-80},{-62,-80}}, color={255,0,255}));
-  connect(dowOrDis.y, rep1.u)
-    annotation (Line(points={{-138,-120},{-62,-120}}, color={255,0,255}));
-  connect(u1Dow, dowOrDis.u1)
-    annotation (Line(points={{-200,-120},{-162,-120}}, color={255,0,255}));
-  connect(u1, dowOrDis.u2) annotation (Line(points={{-200,60},{-170,60},{-170,
-          -128},{-162,-128}}, color={255,0,255}));
-  connect(upAndEna.y, or2.u2) annotation (Line(points={{-138,-80},{-130,-80},{
-          -130,60},{-106,60},{-106,72},{-102,72}},
-                                                color={255,0,255}));
-  annotation (
-  defaultComponentName="sta",
-  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Text(
-          textColor={0,0,255},
-          extent={{-150,110},{150,150}},
-          textString="%name")}), Diagram(coordinateSystem(preserveAspectRatio=false,
-          extent={{-180,-180},{180,180}})),
-    Documentation(info="<html>
-<p>
-This block is used to compute the stage index of the plant or
-of multiple lead/lag units such as pump groups.
-</p>
-<p>
-At initial time, stage <code>#0</code> is active.
-The transition to stage <code>#1</code> is triggered when stage <code>#0</code> has been active
-for the minimum runtime and when either the Enable signal <code>u1</code>
-has a rising edge or when the stage up signal <code>u1Up</code> is <code>true</code>.
-</p>
-<p>
-From stage <code>#i</code>, the transition to stage <code>#i+1</code> (resp. <code>i-1</code>) is triggered
-when stage <code>#i</code> has been active for the minimum runtime and when the
-stage up signal <code>u1Up</code> (resp. stage down signal <code>u1Dow</code>)
-is <code>true</code>.
-From stage <code>#i</code>, the transition to stage <code>#0</code> is triggered
-when stage <code>#i</code> has been active for the minimum runtime and the Enable signal
-<code>u1</code> is <code>false</code>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end StageIndex;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
deleted file mode 100644
index 5533523e0c5..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPlant.mo
+++ /dev/null
@@ -1,655 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
-block StagingPlant
-  "Block that computes plant stage and command signals for chillers and HRC"
-
-  parameter Integer nChi(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatChi_flow_nominal
-    "Cooling design heat flow rate of cooling-only chillers (all units)"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Integer nChiHea(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="HW loop and heat recovery chillers"),
-      Evaluate=true);
-  parameter Real PLRStaTra(unit="1") = 0.85
-    "Part load ratio triggering stage transition";
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal
-    "Cooling design heat flow rate of HRC in cascading cooling mode (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal_approx
-    "Cooling design heat flow rate of HRC in cascading cooling mode (all units), approximate for scaling"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal
-    "Heating design heat flow rate (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
-    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
-    "Specific heat capacity of the fluid";
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mChiWatPri_flow(
-    final unit="kg/s")
-    "Primary CHW mass flow rate"
-    annotation (Placement(transformation(extent={{-280,80},{-240,120}}),
-      iconTransformation(extent={{-140,80},{-100,120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSupSet(
-    final unit="K", displayUnit="degC") "CHW supply temperature setpoint"
-    annotation (Placement(transformation(
-          extent={{-280,60},{-240,100}}), iconTransformation(extent={{-140,60},
-            {-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriRet(final unit="K",
-      displayUnit="degC") "Primary CHW return temperature" annotation (
-      Placement(transformation(extent={{-280,20},{-240,60}}),
-        iconTransformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput mHeaWatPri_flow(final unit="kg/s")
-    "Primary HW mass flow rate" annotation (Placement(transformation(extent={{-280,
-            -100},{-240,-60}}),iconTransformation(extent={{-140,-60},{-100,-20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSupSet(
-    final unit="K", displayUnit="degC")
-    "HW supply temperature setpoint" annotation (Placement(transformation(
-          extent={{-280,-140},{-240,-100}}),
-                                        iconTransformation(extent={{-140,-80},{
-            -100,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriRet(final unit="K",
-      displayUnit="degC") "Primary HW return temperature" annotation (Placement(
-        transformation(extent={{-280,-180},{-240,-140}}), iconTransformation(
-          extent={{-140,-120},{-100,-80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSup(final unit="K",
-      displayUnit="degC") "CHW supply temperature" annotation (Placement(
-        transformation(extent={{-280,180},{-240,220}}), iconTransformation(
-          extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWat(final unit="Pa")
-    "CHW loop differential pressure"
-                                   annotation (
-      Placement(transformation(extent={{-280,240},{-240,280}}),
-        iconTransformation(extent={{-140,-20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatSet(final unit="Pa")
-    "CHW loop differential pressure setpoint"
-                                            annotation (
-     Placement(transformation(extent={{-280,260},{-240,300}}),
-        iconTransformation(extent={{-140,0},{-100,40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSup(final unit="K",
-      displayUnit="degC") "HW supply temperature" annotation (Placement(
-        transformation(extent={{-280,-240},{-240,-200}}), iconTransformation(
-          extent={{-140,-100},{-100,-60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWat(final unit="Pa")
-    "HW loop differential pressure" annotation (Placement(transformation(extent
-          ={{-280,-300},{-240,-260}}), iconTransformation(extent={{-140,-160},{
-            -100,-120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatSet(final unit="Pa")
-    "HW loop differential pressure setpoint" annotation (Placement(
-        transformation(extent={{-280,-280},{-240,-240}}), iconTransformation(
-          extent={{-140,-140},{-100,-100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput QCooReq_flow(final unit="W")
-    "Plant required cooling capacity (>0)" annotation (
-      Placement(transformation(extent={{240,160},{280,200}}),
-        iconTransformation(extent={{100,120},{140,160}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
-    "Cooling enable signal"
-    annotation (Placement(transformation(extent={{-280,140},{-240,180}}),
-        iconTransformation(extent={{-140,122},{-100,162}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
-    "Heating enable signal"
-    annotation (Placement(transformation(extent={{-280,120},{-240,160}}),
-        iconTransformation(extent={{-140,102},{-100,142}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Chi[nChi]
-    "Chiller On/Off command"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={260,120}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={120,80})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1CooChiHea[nChiHea]
-    "HRC cooling mode switchover command: true for cooling, false for heating"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={260,40}),  iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={120,-80})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ChiHea[nChiHea]
-    "HRC On/Off command" annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={260,-100}),iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={120,-20})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaCooChiHea[nChiHea]
-    "HRC cooling mode switchover command: true for cooling, false for heating"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={260,-40}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=0,
-        origin={120,-140})));
-
-  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve(delta=300)
-    "Moving average"
-    annotation (Placement(transformation(extent={{-150,110},{-130,130}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply loaChiWat
-    "Compute total chiller load (>0)"
-    annotation (Placement(transformation(extent={{-180,110},{-160,130}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract dTChiWatPos
-    "Compute deltaT (>0)"
-    annotation (Placement(transformation(extent={{-210,70},{-190,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply loaHeaWat
-    "Compute total chiller load"
-    annotation (Placement(transformation(extent={{-180,-130},{-160,-110}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract dTHeaWat "Compute deltaT"
-    annotation (Placement(transformation(extent={{-220,-150},{-200,-130}})));
-  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(final nout=
-        nChi) "Replicate"
-    annotation (Placement(transformation(extent={{180,110},{200,130}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold cmdChi[nChi](final
-      t={i for i in 1:nChi})
-    "Compute chiller On/Off command from number of units to be commanded On"
-    annotation (Placement(transformation(extent={{210,110},{230,130}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter timCp(final k = cp_default)
-  "Scale" annotation (Placement(transformation(extent={{-210,130},{-190,150}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter timCp1(final k = cp_default)
-   "Scale" annotation (Placement(transformation(extent={{-220,-90},{-200,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve1(delta=300)
-    "Moving average" annotation (Placement(transformation(extent={{-150,-130},{-130,-110}})));
-  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep5(final nout = nChiHea)
-    "Replicate" annotation (Placement(transformation(extent={{180,-110},{200,-90}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold cmdChiHea[nChiHea](
-      final t={i for i in 1:nChiHea})
-    "Compute chiller On/Off command from number of units to be commanded On" annotation (Placement(transformation(extent={{210,-110},{230,-90}})));
-  Buildings.Controls.OBC.CDL.Integers.Subtract numChiHeaCoo
-    "Number of HRC required in direct HR mode" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={10,-20})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant numChiHea(final k = nChiHea)
-  "Number of HRC" annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-
-  Buildings.Controls.OBC.CDL.Integers.Add nChiHeaAndCooUnb
-    "Number of HRC required to meet heating and cooling load - Unbounded" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-70,0})));
-  Buildings.Controls.OBC.CDL.Integers.Subtract numChiCasCoo
-    "Number of HRC required in cascading cooling" annotation (Placement(transformation(extent={{40,10},{60,30}})));
-  ModeHeatRecoveryChiller modHeaCoo(final nChiHea=nChiHea)
-    "Compute the cascading cooling and direct HR switchover signals" annotation (Placement(transformation(extent={{180,-10},{200,10}})));
-
-  Buildings.Controls.OBC.CDL.Integers.Min nChiHeaHeaAndCoo
-    "Number of HRC required to meet heating and cooling load - Bounded by number of HRC" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,-40})));
-
-  Buildings.Controls.OBC.CDL.Reals.Subtract errTChiWatSup
-    "Compute tracking error" annotation (Placement(transformation(extent={{-200,200},{-180,220}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract errDpChiWat
-    "Compute tracking error" annotation (Placement(transformation(extent={{-200,250},{-180,270}})));
-  Buildings.Controls.OBC.CDL.Reals.LessThreshold cmpErrLim(t=-1, h=1E-4)
-    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,200},{-150,220}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cmpErrLim1(t=1.5E4, h=1E-1)
-    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,250},{-150,270}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim(t=15*60)
-    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,200},{-90,220}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim1(t=15*60)
-    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,250},{-90,270}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or2 "Failsafe condition to stage up" annotation (Placement(transformation(extent={{-70,220},{-50,240}})));
-  Buildings.Controls.OBC.CDL.Logical.And and2
-    "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,250},{-120,270}})));
-  Buildings.Controls.OBC.CDL.Logical.And and3
-    "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,200},{-120,220}})));
-  StageIndex staCoo(final nSta=nChi + nChiHea, tSta=15*60)
-    "Compute cooling stage" annotation (Placement(transformation(extent={{50,144},{70,164}})));
-  Modelica.Blocks.Sources.RealExpression capCoo(final y=abs(PLRStaTra*(min(nChi,
-        staCoo.preIdxSta)/nChi*QChiWatChi_flow_nominal + max(0, staCoo.preIdxSta
-         - nChi)/nChiHea*QChiWatCasCoo_flow_nominal)))
-    "Total capacity at current stage (>0) times stage-up PLR limit" annotation (Placement(transformation(extent={{-120,90},{-100,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Greater cmpOPLRLimUp(h=-1E-4*(
-        QChiWatChi_flow_nominal + QChiWatCasCoo_flow_nominal_approx)/2)
-    "Check OPLR limit" annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim(t=15*60)
-    "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-40,110},{-20,130}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or1
-    "Failsafe condition or efficiency condition to stage up" annotation (Placement(transformation(extent={{0,130},{20,150}})));
-  Buildings.Controls.OBC.CDL.Integers.Min numOpeChi
-    "Number of operating chillers" annotation (Placement(transformation(extent={{90,110},{110,130}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant numChi(final k=nChi)
-    "Number of chillers" annotation (Placement(transformation(extent={{50,90},{70,110}})));
-  Buildings.Controls.OBC.CDL.Integers.Subtract numOpeCooChiHea
-    "Number of HRC required for cooling" annotation (Placement(transformation(extent={{-120,10},{-100,30}})));
-  Modelica.Blocks.Sources.RealExpression capHea(final y=PLRStaTra*staHea.preIdxSta
-        /nChiHea*QHeaWat_flow_nominal)
-    "Total capacity at current stage times stage-up PLR limit" annotation (Placement(transformation(extent={{-120,-150},{-100,-130}})));
-  Buildings.Controls.OBC.CDL.Reals.Greater cmpOPLRLimUp1(h=1E-1)
-    "Check OPLR limit" annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim1(t=15*60)
-    "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-50,-130},{-30,-110}})));
-  StageIndex staHea(final nSta=nChiHea, tSta=15*60) "Compute heating stage" annotation (Placement(transformation(extent={{50,-130},{70,-110}})));
-  Modelica.Blocks.Sources.RealExpression capHeaLow(final y=PLRStaTra*max(0,
-        staHea.preIdxSta - 1)/nChiHea*QHeaWat_flow_nominal)
-    "Total capacity at next lower stage times stage-down PLR limit" annotation (Placement(transformation(extent={{-120,-178},{-100,-158}})));
-  Buildings.Controls.OBC.CDL.Reals.Less cmpOPLRLimDow(h=1E-1)
-  "Check OPLR limit" annotation (Placement(transformation(extent={{-80,-170},{-60,-150}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim2(t=15*60)
-    "Timer for OPLR exceeding limit"  annotation (Placement(transformation(extent={{-50,-170},{-30,-150}})));
-  Modelica.Blocks.Sources.RealExpression capCooLow(final y=abs(PLRStaTra*(min(
-        nChi, max(0, staCoo.preIdxSta - 1))/nChi*QChiWatChi_flow_nominal + max(
-        0, staCoo.preIdxSta - 1 - nChi)/nChiHea*QChiWatCasCoo_flow_nominal)))
-    "Total capacity at next lower stage (>0) times stage-down PLR limit" annotation (Placement(transformation(extent={{-120,62},{-100,82}})));
-  Buildings.Controls.OBC.CDL.Reals.Less cmpOPLRLimDow1(h=-1E-4*(
-        QChiWatChi_flow_nominal + QChiWatCasCoo_flow_nominal_approx)/2)
-    "Check OPLR limit" annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timOPLRExcLim3(t=15*60)
-    "Timer for OPLR exceeding limit" annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
-  Buildings.Controls.OBC.CDL.Logical.Not notFail
-    "Failsafe conditions are not true" annotation (Placement(transformation(extent={{-40,190},{-20,210}})));
-  Buildings.Controls.OBC.CDL.Logical.And dowAndNotFail
-    "No stage up failsafe condition and efficiency condition to stage down" annotation (Placement(transformation(extent={{0,90},{20,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract errTChiWatSup1
-    "Compute tracking error" annotation (Placement(transformation(extent={{-200,-230},{-180,-210}})));
-  Buildings.Controls.OBC.CDL.Reals.Subtract errDpHeaWat
-    "Compute tracking error" annotation (Placement(transformation(extent={{-200,-290},{-180,-270}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold   cmpErrLim2(t=+1, h=1E-4)
-    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,-230},{-150,-210}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cmpErrLim3(t=1.5E4, h=1E-1)
-    "Check tracking error limit" annotation (Placement(transformation(extent={{-170,-290},{-150,-270}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim2(t=15*60)
-    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,-230},{-90,-210}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timErrExcLim3(t=15*60)
-    "Timer for error exceeding error limit" annotation (Placement(transformation(extent={{-110,-290},{-90,-270}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or3 "Failsafe condition to stage up" annotation (Placement(transformation(extent={{-70,-270},{-50,-250}})));
-  Buildings.Controls.OBC.CDL.Logical.And and1 "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,-290},{-120,-270}})));
-  Buildings.Controls.OBC.CDL.Logical.And and4 "Apply failsafe condition only in stage >= 1" annotation (Placement(transformation(extent={{-140,-230},{-120,-210}})));
-  Buildings.Controls.OBC.CDL.Logical.Not notFail1
-    "Failsafe conditions are not true" annotation (Placement(transformation(extent={{-30,-230},{-10,-210}})));
-  Buildings.Controls.OBC.CDL.Logical.Or or4
-    "Failsafe condition or efficiency condition to stage up" annotation (Placement(transformation(extent={{10,-130},{30,-110}})));
-  Buildings.Controls.OBC.CDL.Logical.And dowAndNotFail1
-    "No stage up failsafe condition and efficiency condition to stage down" annotation (Placement(transformation(extent={{10,-170},{30,-150}})));
-  IntegerArrayHold hol(holdDuration=15*60, nin=4)
-    "Minimum plant stage runtime (needed because cooling and heating stage runtimes are handled separately)" annotation (Placement(transformation(extent={{130,-10},{150,10}})));
-
-equation
-  connect(dTChiWatPos.y, loaChiWat.u2) annotation (Line(points={{-188,80},{-186,
-          80},{-186,114},{-182,114}},
-                                    color={0,0,127}));
-  connect(dTHeaWat.y, loaHeaWat.u2) annotation (Line(points={{-198,-140},{-186,
-          -140},{-186,-126},{-182,-126}},
-                                  color={0,0,127}));
-  connect(THeaWatSupSet, dTHeaWat.u1) annotation (Line(points={{-260,-120},{
-          -230,-120},{-230,-134},{-222,-134}},    color={0,0,127}));
-  connect(THeaWatPriRet, dTHeaWat.u2) annotation (Line(points={{-260,-160},{
-          -226,-160},{-226,-146},{-222,-146}},
-                                          color={0,0,127}));
-  connect(rep.y, cmdChi.u)
-    annotation (Line(points={{202,120},{208,120}},
-                                                 color={255,127,0}));
-  connect(mChiWatPri_flow, timCp.u)
-    annotation (Line(points={{-260,100},{-220,100},{-220,140},{-212,140}},
-                                                     color={0,0,127}));
-  connect(timCp.y, loaChiWat.u1) annotation (Line(points={{-188,140},{-186,140},
-          {-186,126},{-182,126}}, color={0,0,127}));
-  connect(mHeaWatPri_flow, timCp1.u)
-    annotation (Line(points={{-260,-80},{-222,-80}}, color={0,0,127}));
-  connect(timCp1.y, loaHeaWat.u1) annotation (Line(points={{-198,-80},{-186,-80},
-          {-186,-114},{-182,-114}},
-                                  color={0,0,127}));
-  connect(loaChiWat.y, movAve.u)
-    annotation (Line(points={{-158,120},{-152,120}}, color={0,0,127}));
-  connect(loaHeaWat.y, movAve1.u)
-    annotation (Line(points={{-158,-120},{-152,-120}},
-                                                     color={0,0,127}));
-  connect(rep5.y, cmdChiHea.u)
-    annotation (Line(points={{202,-100},{208,-100}},
-                                                 color={255,127,0}));
-  connect(cmdChiHea.y, y1ChiHea)
-    annotation (Line(points={{232,-100},{260,-100}}, color={255,0,255}));
-  connect(modHeaCoo.y1HeaCoo, y1HeaCooChiHea) annotation (Line(points={{202,-6},
-          {220,-6},{220,-40},{260,-40}},  color={255,0,255}));
-  connect(numChiHea.y, nChiHeaHeaAndCoo.u2)
-    annotation (Line(points={{-58,-40},{-50,-40},{-50,-46},{-42,-46}},
-                                                 color={255,127,0}));
-  connect(nChiHeaAndCooUnb.y, nChiHeaHeaAndCoo.u1) annotation (Line(points={{-58,0},
-          {-50,0},{-50,-34},{-42,-34}},     color={255,127,0}));
-  connect(nChiHeaAndCooUnb.y, numChiHeaCoo.u1)
-    annotation (Line(points={{-58,0},{-20,0},{-20,-14},{-2,-14}},
-                                                 color={255,127,0}));
-  connect(nChiHeaHeaAndCoo.y, numChiHeaCoo.u2) annotation (Line(points={{-18,-40},
-          {-10,-40},{-10,-26},{-2,-26}},
-                                       color={255,127,0}));
-  connect(modHeaCoo.y1Coo, y1CooChiHea) annotation (Line(points={{202,6},{220,6},
-          {220,40},{260,40}},      color={255,0,255}));
-  connect(numChiHeaCoo.y, numChiCasCoo.u2) annotation (Line(points={{22,-20},{
-          30,-20},{30,14},{38,14}},            color={255,127,0}));
-  connect(TChiWatSupSet, errTChiWatSup.u1) annotation (Line(points={{-260,80},{
-          -230,80},{-230,180},{-204,180},{-204,216},{-202,216}},
-                                                          color={0,0,127}));
-  connect(dpChiWatSet, errDpChiWat.u1) annotation (Line(points={{-260,280},{
-          -206,280},{-206,266},{-202,266}},
-                                       color={0,0,127}));
-  connect(errTChiWatSup.y, cmpErrLim.u)
-    annotation (Line(points={{-178,210},{-172,210}}, color={0,0,127}));
-  connect(errDpChiWat.y, cmpErrLim1.u)
-    annotation (Line(points={{-178,260},{-172,260}}, color={0,0,127}));
-  connect(timErrExcLim1.passed, or2.u1) annotation (Line(points={{-88,252},{-80,
-          252},{-80,230},{-72,230}},   color={255,0,255}));
-  connect(timErrExcLim.passed, or2.u2) annotation (Line(points={{-88,202},{-80,
-          202},{-80,222},{-72,222}},   color={255,0,255}));
-  connect(cmpErrLim1.y, and2.u1)
-    annotation (Line(points={{-148,260},{-142,260}}, color={255,0,255}));
-  connect(and2.y, timErrExcLim1.u)
-    annotation (Line(points={{-118,260},{-112,260}}, color={255,0,255}));
-  connect(cmpErrLim.y, and3.u1) annotation (Line(points={{-148,210},{-142,210}},
-                                  color={255,0,255}));
-  connect(and3.y, timErrExcLim.u)
-    annotation (Line(points={{-118,210},{-112,210}}, color={255,0,255}));
-  connect(u1Coo, and3.u2) annotation (Line(points={{-260,160},{-146,160},{-146,
-          202},{-142,202}}, color={255,0,255}));
-  connect(u1Coo, and2.u2) annotation (Line(points={{-260,160},{-146,160},{-146,
-          252},{-142,252}}, color={255,0,255}));
-  connect(cmdChi.y, y1Chi)
-    annotation (Line(points={{232,120},{260,120}},
-                                                 color={255,0,255}));
-  connect(u1Coo, staCoo.u1)
-    annotation (Line(points={{-260,160},{48,160}},  color={255,0,255}));
-  connect(cmpOPLRLimUp.y, timOPLRExcLim.u)
-    annotation (Line(points={{-58,120},{-42,120}},
-                                                 color={255,0,255}));
-  connect(or2.y, or1.u1) annotation (Line(points={{-48,230},{-6,230},{-6,140},{
-          -2,140}},  color={255,0,255}));
-  connect(or1.y, staCoo.u1Up) annotation (Line(points={{22,140},{24,140},{24,
-          154},{48,154}}, color={255,0,255}));
-  connect(timOPLRExcLim.passed, or1.u2) annotation (Line(points={{-18,112},{-14,
-          112},{-14,132},{-2,132}},
-                                 color={255,0,255}));
-  connect(numChi.y, numOpeChi.u2) annotation (Line(points={{72,100},{84,100},{
-          84,114},{88,114}},
-                        color={255,127,0}));
-  connect(staCoo.idxSta, numOpeChi.u1) annotation (Line(points={{72,154},{80,
-          154},{80,126},{88,126}},
-                                 color={255,127,0}));
-  connect(staCoo.idxSta, numOpeCooChiHea.u1) annotation (Line(points={{72,154},
-          {80,154},{80,60},{-132,60},{-132,26},{-122,26}},   color={255,127,0}));
-  connect(numOpeChi.y, numOpeCooChiHea.u2) annotation (Line(points={{112,120},{
-          120,120},{120,54},{-126,54},{-126,14},{-122,14}},  color={255,127,0}));
-  connect(numOpeCooChiHea.y, nChiHeaAndCooUnb.u1) annotation (Line(points={{-98,20},
-          {-90,20},{-90,6},{-82,6}},           color={255,127,0}));
-  connect(cmpOPLRLimUp1.y, timOPLRExcLim1.u)
-    annotation (Line(points={{-58,-120},{-52,-120}}, color={255,0,255}));
-  connect(u1Hea, staHea.u1) annotation (Line(points={{-260,140},{-234,140},{
-          -234,-100},{40,-100},{40,-114},{48,-114}},   color={255,0,255}));
-  connect(cmpOPLRLimDow.y, timOPLRExcLim2.u)
-    annotation (Line(points={{-58,-160},{-52,-160}}, color={255,0,255}));
-  connect(cmpOPLRLimDow1.y, timOPLRExcLim3.u)
-    annotation (Line(points={{-58,80},{-42,80}}, color={255,0,255}));
-  connect(or2.y, notFail.u) annotation (Line(points={{-48,230},{-46,230},{-46,
-          200},{-42,200}}, color={255,0,255}));
-  connect(dowAndNotFail.y, staCoo.u1Dow) annotation (Line(points={{22,100},{26,
-          100},{26,148.2},{48,148.2}},color={255,0,255}));
-  connect(timOPLRExcLim3.passed, dowAndNotFail.u2) annotation (Line(points={{-18,72},
-          {-10,72},{-10,92},{-2,92}},         color={255,0,255}));
-  connect(notFail.y, dowAndNotFail.u1) annotation (Line(points={{-18,200},{-10,
-          200},{-10,100},{-2,100}},
-                                  color={255,0,255}));
-  connect(staHea.idxSta, nChiHeaAndCooUnb.u2) annotation (Line(points={{72,-120},
-          {80,-120},{80,-80},{-100,-80},{-100,-6},{-82,-6}},   color={255,127,0}));
-  connect(numOpeCooChiHea.y, numChiCasCoo.u1) annotation (Line(points={{-98,20},
-          {30,20},{30,26},{38,26}},    color={255,127,0}));
-  connect(movAve.y, cmpOPLRLimUp.u1)
-    annotation (Line(points={{-128,120},{-82,120}},
-                                                  color={0,0,127}));
-  connect(capCoo.y, cmpOPLRLimUp.u2) annotation (Line(points={{-99,100},{-94,
-          100},{-94,112},{-82,112}},
-                              color={0,0,127}));
-  connect(movAve.y, cmpOPLRLimDow1.u1) annotation (Line(points={{-128,120},{-90,
-          120},{-90,80},{-82,80}},color={0,0,127}));
-  connect(capCooLow.y, cmpOPLRLimDow1.u2)
-    annotation (Line(points={{-99,72},{-82,72}}, color={0,0,127}));
-  connect(capHea.y, cmpOPLRLimUp1.u2) annotation (Line(points={{-99,-140},{-94,
-          -140},{-94,-128},{-82,-128}}, color={0,0,127}));
-  connect(movAve1.y, cmpOPLRLimUp1.u1)
-    annotation (Line(points={{-128,-120},{-82,-120}}, color={0,0,127}));
-  connect(capHeaLow.y, cmpOPLRLimDow.u2) annotation (Line(points={{-99,-168},{
-          -82,-168}},                       color={0,0,127}));
-  connect(movAve1.y, cmpOPLRLimDow.u1) annotation (Line(points={{-128,-120},{
-          -90,-120},{-90,-160},{-82,-160}}, color={0,0,127}));
-  connect(TChiWatSupSet, dTChiWatPos.u2) annotation (Line(points={{-260,80},{
-          -230,80},{-230,74},{-212,74}}, color={0,0,127}));
-  connect(TChiWatPriRet, dTChiWatPos.u1) annotation (Line(points={{-260,40},{
-          -220,40},{-220,86},{-212,86}},color={0,0,127}));
-  connect(dpHeaWatSet, errDpHeaWat.u1) annotation (Line(points={{-260,-260},{
-          -206,-260},{-206,-274},{-202,-274}}, color={0,0,127}));
-  connect(errTChiWatSup1.y, cmpErrLim2.u)
-    annotation (Line(points={{-178,-220},{-172,-220}}, color={0,0,127}));
-  connect(errDpHeaWat.y, cmpErrLim3.u)
-    annotation (Line(points={{-178,-280},{-172,-280}}, color={0,0,127}));
-  connect(cmpErrLim3.y,and1. u1)
-    annotation (Line(points={{-148,-280},{-142,-280}},
-                                                     color={255,0,255}));
-  connect(and1.y,timErrExcLim3. u)
-    annotation (Line(points={{-118,-280},{-112,-280}},
-                                                     color={255,0,255}));
-  connect(cmpErrLim2.y, and4.u1)
-    annotation (Line(points={{-148,-220},{-142,-220}}, color={255,0,255}));
-  connect(and4.y, timErrExcLim2.u)
-    annotation (Line(points={{-118,-220},{-112,-220}}, color={255,0,255}));
-  connect(or3.y, notFail1.u) annotation (Line(points={{-48,-260},{-40,-260},{
-          -40,-220},{-32,-220}}, color={255,0,255}));
-  connect(THeaWatSupSet, errTChiWatSup1.u1) annotation (Line(points={{-260,-120},
-          {-230,-120},{-230,-200},{-206,-200},{-206,-214},{-202,-214}}, color={
-          0,0,127}));
-  connect(timErrExcLim2.passed, or3.u1) annotation (Line(points={{-88,-228},{
-          -80,-228},{-80,-260},{-72,-260}}, color={255,0,255}));
-  connect(timErrExcLim3.passed, or3.u2) annotation (Line(points={{-88,-288},{
-          -80,-288},{-80,-268},{-72,-268}}, color={255,0,255}));
-  connect(u1Hea, and4.u2) annotation (Line(points={{-260,140},{-234,140},{-234,
-          -240},{-144,-240},{-144,-228},{-142,-228}}, color={255,0,255}));
-  connect(u1Hea, and1.u2) annotation (Line(points={{-260,140},{-234,140},{-234,
-          -240},{-144,-240},{-144,-288},{-142,-288}}, color={255,0,255}));
-  connect(timOPLRExcLim1.passed, or4.u1) annotation (Line(points={{-28,-128},{
-          -20,-128},{-20,-120},{8,-120}}, color={255,0,255}));
-  connect(or3.y, or4.u2) annotation (Line(points={{-48,-260},{0,-260},{0,-128},
-          {8,-128}}, color={255,0,255}));
-  connect(timOPLRExcLim2.passed, dowAndNotFail1.u1) annotation (Line(points={{
-          -28,-168},{-20,-168},{-20,-160},{8,-160}}, color={255,0,255}));
-  connect(notFail1.y, dowAndNotFail1.u2) annotation (Line(points={{-8,-220},{4,
-          -220},{4,-168},{8,-168}}, color={255,0,255}));
-  connect(dowAndNotFail1.y, staHea.u1Dow) annotation (Line(points={{32,-160},{
-          40,-160},{40,-125.8},{48,-125.8}}, color={255,0,255}));
-  connect(or4.y, staHea.u1Up)
-    annotation (Line(points={{32,-120},{48,-120}}, color={255,0,255}));
-  connect(numOpeChi.y, hol.u[1]) annotation (Line(points={{112,120},{120,120},{
-          120,-0.75},{128,-0.75}}, color={255,127,0}));
-  connect(numChiCasCoo.y, hol.u[2]) annotation (Line(points={{62,20},{116,20},{
-          116,-0.25},{128,-0.25}}, color={255,127,0}));
-  connect(numChiHeaCoo.y, hol.u[3]) annotation (Line(points={{22,-20},{116,-20},
-          {116,0.25},{128,0.25}},
-                             color={255,127,0}));
-  connect(nChiHeaHeaAndCoo.y, hol.u[4]) annotation (Line(points={{-18,-40},{120,
-          -40},{120,-2},{128,-2},{128,0.75}},
-                                       color={255,127,0}));
-  connect(hol.y[1], rep.u) annotation (Line(points={{152,0},{160,0},{160,120},{
-          178,120}}, color={255,127,0}));
-  connect(hol.y[2], modHeaCoo.nCasCoo) annotation (Line(points={{152,0},{160,0},
-          {160,6},{178,6}},   color={255,127,0}));
-  connect(hol.y[3], modHeaCoo.nHeaCoo) annotation (Line(points={{152,0},{160,0},
-          {160,-6},{178,-6}},
-                            color={255,127,0}));
-  connect(hol.y[4], rep5.u) annotation (Line(points={{152,0},{160,0},{160,-100},
-          {178,-100}},color={255,127,0}));
-  connect(movAve.y, QCooReq_flow) annotation (Line(points={{-128,120},{-100,120},
-          {-100,180},{260,180}}, color={0,0,127}));
-  connect(dpChiWat, errDpChiWat.u2) annotation (Line(points={{-260,260},{-220,
-          260},{-220,254},{-202,254}}, color={0,0,127}));
-  connect(TChiWatSup, errTChiWatSup.u2) annotation (Line(points={{-260,200},{
-          -220,200},{-220,204},{-202,204}}, color={0,0,127}));
-  connect(THeaWatSup, errTChiWatSup1.u2) annotation (Line(points={{-260,-220},{
-          -220,-220},{-220,-226},{-202,-226}}, color={0,0,127}));
-  connect(dpHeaWat, errDpHeaWat.u2) annotation (Line(points={{-260,-280},{-220,
-          -280},{-220,-286},{-202,-286}}, color={0,0,127}));
-  annotation (
-  defaultComponentName="staPla",
-  Documentation(info="<html>
-<p>
-This block implements the staging logic for the chillers and HRCs.
-The units are staged in part based on an efficiency condition
-using the operative part load ratio.
-The units are also staged based on failsafe conditions using the CHW and HW
-supply temperature and differential pressure.
-</p>
-<p>
-For the sake of simplicity, equipment rotation (i.e. the possibility at a given
-stage that either one unit or another unit can be operating) is not taken into account.
-</p>
-<h4>Plant stages</h4>
-<p>
-At cooling (resp. heating) stage <code>#i</code>, a number <code>i</code>
-of units are operating in cooling (resp. heating) mode.
-The cooling (resp. heating) stage <code>#0</code> (no unit operating in
-that given mode) is active whenever the plant is disabled based on the cooling
-and heating Enable condition (see below) or when the plant is enabled
-and has been staged down due to the efficiency or failsafe conditions.
-The plant stage is given by the couple (cooling stage, heating stage).
-The minimum runtime of each plant stage is set to <i>15&nbsp;</i>min.
-</p>
-<h5>Direct heat recovery mode</h5>
-<p>
-All HRCs are allowed to operate in direct heat recovery mode, that is when
-their condenser is indexed to the HW loop and their evaporator is indexed to the
-CHW loop.
-Switching a HRC to operate in direct heat recovery mode is done on
-a load requirement basis. This means that HRCs are first switched over
-to cascading heating or cascading cooling mode. Only when all HRCs are operating
-and when a new stage up event is initiated, an additional HRC is then switched
-to operate in direct heat recovery mode.
-As described in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeHeatRecoveryChiller</a>
-the HRC with the highest index that is not operating operating in cascading
-cooling mode is the next to be switched into direct heat recovery mode.
-</p>
-<p>
-For example, considering a plant with two chillers and three HRCs, the table below shows
-the plant stages derived from this logic.
-In this table, the chiller with index <code>#i</code> is denoted <code>CHI#i</code>,
-the HRC with index <code>#i</code> is denoted <code>HRC#i</code>,
-the units enumerated before (resp. after) the semicolon sign (<code>:</code>) operate
-in cooling (resp. heating) mode, the units marked with a star (<code>*</code>) operate
-in direct heat recovery mode.
-</p>
-<table border=\"1\" summary=\"Explanation of the enumeration\">
-<tr><th>Heating stage &darr; Cooling stage &rarr;</th>
-<td>0</td>
-<td>1</td>
-<td>2</td>
-<td>3</td>
-<td>4</td>
-<td>5</td>
-</tr>
-<tr><td>0</td>
-<td>N/A:<br/>N/A</td>
-<td>CHI1:<br/>N/A</td>
-<td>CHI1 &amp; CHI2:<br/>N/A</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>N/A</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2:<br/>N/A</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2 &amp; HRC1:<br/>N/A</td>
-</tr>
-<tr><td>1</td>
-<td>N/A:<br/>HRC1</td>
-<td>CHI1:<br/>HRC1</td>
-<td>CHI1 &amp; CHI2:<br/>HRC1</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2:<br/>HRC1</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3 &amp; HRC2:<br/>HRC1*</td>
-</tr>
-<tr><td>2</td>
-<td>N/A:<br/>HRC1 &amp; HRC2</td>
-<td>CHI1:<br/>HRC1 &amp; HRC2</td>
-<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1 &amp; HRC2</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1 &amp; HRC2*</td>
-<td>CHI1 &amp; CHI2 &amp; HRC3:<br/>HRC1* &amp; HRC2*</td>
-</tr>
-<tr><td>3</td>
-<td>N/A:<br/>HRC1 &amp; HRC2 &amp; HRC3</td>
-<td>CHI1:<br/>HRC1 &amp; HRC2 &amp; HRC3</td>
-<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2 &amp; HRC3</td>
-<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2 &amp; HRC3*</td>
-<td>CHI1 &amp; CHI2:<br/>HRC1 &amp; HRC2* &amp; HRC3*</td>
-<td>CHI1 &amp; CHI2:<br/>HRC1* &amp; HRC2* &amp; HRC3*</td>
-</tr>
-</table>
-<h4>Cooling and heating Enable condition</h4>
-<p>
-The cooling and heating Enable signals <code>u1Coo</code> and <code>u1Hea</code>
-shall be computed outside of the plant model,
-at least based on a time schedule and ideally in conjunction
-with a signal representative of the demand such as the requests yielded by
-the consumer control valves.
-Based on those signals, the cooling (resp. heating) stage <code>#1</code> is
-activated whenever the cooling (resp. heating) Enable signal switches
-to <code>true</code> and when cooling (resp. heating) has been disabled
-for at least <i>15&nbsp;</i>min.
-</p>
-<h4>Operative part load ratio</h4>
-<p>
-The efficiency condition is based on the operative part load ratio
-which is computed as the ratio of the required capacity
-relative to design capacity of a given stage, which is the sum of the design capacity
-of each unit active in a given stage.
-The required capacity is calculated based on the primary mass flow rate and the
-temperature difference between supply and primary return, and averaged over a
-<i>5</i>-minute moving window.
-<h4>Cooling and heating staging</h4>
-<p>
-A stage up event is initiated if any of the following conditions is true.
-</p>
-<ul>
-<li>
-Efficiency condition: the operative part load ratio of the current stage
-exceeds the value of the parameter <i>PLRStaTra</i> for <i>15&nbsp;</i>min.
-</li>
-<li>
-Failsafe conditions: the CHW (resp. HW) supply temperature is <i>1&nbsp;</i>K
-higher (resp. lower) than setpoint for <i>15</i>&nbsp;min, or
-the CHW (resp. HW) differential pressure is <i>1.5E4&nbsp;</i>Pa lower than
-setpoint for <i>15&nbsp;</i>min.
-</li>
-</ul>
-<p>
-A stage down event is initiated if both of the following conditions are true.
-</p>
-<ul>
-<li>
-Efficiency condition: the operative part load ratio of the next lower stage
-falls below the value of the parameter <i>PLRStaTra</i> for <i>15&nbsp;</i>min.
-</li>
-<li>
-Failsafe conditions: the failsafe stage up conditions are not true.
-</li>
-</ul>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Diagram(coordinateSystem(extent={{-240,-320},{240,320}})),
-    Icon(coordinateSystem(extent={{-100,-160},{100,160}}), graphics={
-        Text(
-          textColor={0,0,255},
-          extent={{-150,170},{150,210}},
-          textString="%name"),
-        Rectangle(
-          extent={{-100,-160},{100,160}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}));
-end StagingPlant;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
deleted file mode 100644
index 3ba25cbb4ce..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/StagingPump.mo
+++ /dev/null
@@ -1,266 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
-block StagingPump "Pump staging"
-
-  parameter Boolean have_flowCriterion=true
-    "Set to true for flow criterion in conjunction with speed criterion"
-    annotation(Evaluate=true);
-  parameter Integer nPum(
-    final min=1,
-    start=1)
-    "Number of pumps"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Loop design mass flow rate (all pumps)"
-    annotation(Dialog(group="Nominal condition", enable=have_flowCriterion));
-  parameter Real yDow=0.30
-    "Low speed limit for staging down";
-  parameter Real yUp=0.99
-    "High speed limit for staging up";
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1Ena
-    "Lead pump Enable signal (e.g. based on isolation valve opening command)"
-    annotation (Placement(transformation(extent={{-240,140},{-200,180}}),
-        iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput m_flow(final unit="kg/s")
-    if have_flowCriterion
-    "Mass flow rate as measured by the loop flow meter"
-    annotation (Placement(
-        transformation(extent={{-240,60},{-200,100}}),iconTransformation(extent={{-140,
-            -20},{-100,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(final unit="1")
-    "Commanded speed"
-    annotation (Placement(transformation(extent={{-240,-20},{-200,20}}),
-      iconTransformation(extent={{-140,-80},{-100,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nPum]
-    "Start signal (VFD Run or motor starter contact)"
-    annotation (Placement(
-        transformation(extent={{200,-20},{240,20}}), iconTransformation(extent={{100,40},
-            {140,80}})));
-
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold cmp(final t=yUp, h=1e-3)
-    "Compare"
-    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timSpe(t=5*60)
-    "True delay"
-    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter ratFlo(
-    final k=1/m_flow_nominal) if have_flowCriterion
-    "Ratio of current flow rate to design value"
-    annotation (Placement(transformation(extent={{-148,70},{-128,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Greater cmp2(h=1e-3)
-    if have_flowCriterion
-    "Compare"
-    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter addOff(p=-0.03)
-    if have_flowCriterion
-    "Add offset"
-    annotation (Placement(transformation(extent={{-80,130},{-100,150}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timFlo(t=10*60)
-    if have_flowCriterion
-    "Check if true for a given time"
-    annotation (Placement(transformation(extent={{-72,90},{-52,110}})));
-  Buildings.Controls.OBC.CDL.Logical.Or up
-    "Check if flow or speed criterion passed for staging up"
-    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Less cmp3(h=1e-3)
-    if have_flowCriterion
-    "Compare"
-    annotation (Placement(transformation(extent={{-100,50},{-80,70}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timFlo1(t=10*60)
-    if have_flowCriterion
-    "Check if true for a given time"
-    annotation (Placement(transformation(extent={{-72,50},{-52,70}})));
-  Buildings.Controls.OBC.CDL.Reals.LessThreshold  cmp4(final t=yDow, h=1e-3)
-    "Compare"
-    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer timSpe1(t=5*60) "True delay"
-    annotation (Placement(transformation(extent={{-70,-50},{-50,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Or  dow
-    "Check if flow or speed criterion passed for staging down"
-    annotation (Placement(transformation(extent={{-30,-50},{-10,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter ratOpeDsg(
-    final k=1/nPum)
-    "Ratio of number of operating pumps to number of operating pumps at design conditions"
-    annotation (Placement(transformation(extent={{-40,130},{-60,150}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold cvtBoo[nPum](
-    final t={i for i in 1:nPum})
-    "Compute pump Start command from number of pumps to be commanded On"
-    annotation (Placement(transformation(extent={{160,-10},{180,10}})));
-  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(
-    final nout=nPum) "Replicate"
-    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
-  StageIndex staLag(final nSta=max(1, nPum - 1), tSta=30)
-    if nPum>1
-    "Stage lag pumps (minimum runtime allowing for pump start time)"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-  Buildings.Controls.OBC.CDL.Conversions.IntegerToReal cvtInt "Convert"
-    annotation (Placement(transformation(extent={{50,130},{30,150}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter addOffLowSta(
-    final p=-1/nPum) if have_flowCriterion
-    "Add offset for lower stage"
-    annotation (Placement(transformation(extent={{-150,30},{-130,50}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger leaEna
-    "Return 1 if lead pump enabled"
-    annotation (Placement(transformation(extent={{30,30},{50,50}})));
-  Buildings.Controls.OBC.CDL.Integers.Add num "Number of pumps enabled"
-    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
-  Buildings.Controls.OBC.CDL.Integers.Add numPre "Number of pumps enabled"
-    annotation (Placement(transformation(extent={{80,50},{100,70}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant zer(final k=0)
-    if nPum==1
-    "Constant"
-    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.Constant fal(final k=false)
-    if not have_flowCriterion
-    "Constant"
-    annotation (Placement(transformation(extent={{-70,-90},{-50,-70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput nPumEna
-    "Number of pumps that are enabled" annotation (Placement(transformation(
-          extent={{200,-80},{240,-40}}), iconTransformation(extent={{100,-80},{
-            140,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Any
-    "Return true if any pump enabled (left limit to avoid direct feedback)"
-    annotation (Placement(transformation(extent={{200,-140},{240,-100}}),
-        iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold anyEna(final t=1)
-    "Return true if any pump is enabled"
-    annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
-  Buildings.Controls.OBC.CDL.Logical.Pre pre1
-    "Left limit of signal avoiding direct feedback"
-    annotation (Placement(transformation(extent={{160,-130},{180,-110}})));
-equation
-  connect(y, cmp.u)
-    annotation (Line(points={{-220,0},{-102,0}},     color={0,0,127}));
-  connect(cmp.y, timSpe.u)
-    annotation (Line(points={{-78,0},{-72,0}},       color={255,0,255}));
-  connect(ratFlo.y, cmp2.u1)
-    annotation (Line(points={{-126,80},{-120,80},{-120,100},{-102,100}},
-                                                 color={0,0,127}));
-  connect(addOff.y, cmp2.u2) annotation (Line(points={{-102,140},{-110,140},{
-          -110,92},{-102,92}},            color={0,0,127}));
-  connect(timFlo.passed, up.u1) annotation (Line(points={{-50,92},{-36,92},{-36,
-          0},{-32,0}},     color={255,0,255}));
-  connect(ratFlo.y, cmp3.u1) annotation (Line(points={{-126,80},{-120,80},{-120,
-          60},{-102,60}}, color={0,0,127}));
-  connect(y, cmp4.u) annotation (Line(points={{-220,0},{-160,0},{-160,-40},{-102,
-          -40}},       color={0,0,127}));
-  connect(cmp4.y, timSpe1.u)
-    annotation (Line(points={{-78,-40},{-72,-40}},   color={255,0,255}));
-  connect(timFlo1.passed,dow. u1) annotation (Line(points={{-50,52},{-40,52},{
-          -40,-40},{-32,-40}},                   color={255,0,255}));
-  connect(addOff.u, ratOpeDsg.y)
-    annotation (Line(points={{-78,140},{-62,140}}, color={0,0,127}));
-  connect(rep.y, cvtBoo.u)
-    annotation (Line(points={{142,0},{158,0}}, color={255,127,0}));
-  connect(cmp2.y, timFlo.u)
-    annotation (Line(points={{-78,100},{-74,100}},
-                                                 color={255,0,255}));
-  connect(cmp3.y, timFlo1.u)
-    annotation (Line(points={{-78,60},{-74,60}}, color={255,0,255}));
-  connect(timSpe.passed, up.u2) annotation (Line(points={{-48,-8},{-32,-8}},
-                               color={255,0,255}));
-  connect(timSpe1.passed,dow. u2) annotation (Line(points={{-48,-48},{-40,-48},
-          {-40,-48},{-32,-48}},color={255,0,255}));
-  connect(y1Ena, staLag.u1) annotation (Line(points={{-220,160},{0,160},{0,6},{
-          28,6}},
-               color={255,0,255}));
-  connect(cvtInt.y, ratOpeDsg.u)
-    annotation (Line(points={{28,140},{-38,140}}, color={0,0,127}));
-  connect(cvtBoo.y, y1)
-    annotation (Line(points={{182,0},{220,0}}, color={255,0,255}));
-  connect(addOff.y, addOffLowSta.u) annotation (Line(points={{-102,140},{-160,
-          140},{-160,40},{-152,40}}, color={0,0,127}));
-  connect(addOffLowSta.y, cmp3.u2) annotation (Line(points={{-128,40},{-116,40},
-          {-116,52},{-102,52}}, color={0,0,127}));
-  connect(y1Ena, leaEna.u) annotation (Line(points={{-220,160},{0,160},{0,40},{
-          28,40}},
-                color={255,0,255}));
-  connect(dow.y, staLag.u1Dow) annotation (Line(points={{-8,-40},{0,-40},{0,
-          -5.8},{28,-5.8}},
-                      color={255,0,255}));
-  connect(num.y, rep.u)
-    annotation (Line(points={{102,0},{118,0}},
-                                             color={255,127,0}));
-  connect(staLag.idxSta, num.u2) annotation (Line(points={{52,0},{60,0},{60,-6},
-          {78,-6}}, color={255,127,0}));
-  connect(leaEna.y, num.u1) annotation (Line(points={{52,40},{60,40},{60,6},{78,
-          6}}, color={255,127,0}));
-  connect(numPre.y, cvtInt.u) annotation (Line(points={{102,60},{120,60},{120,
-          140},{52,140}},
-                     color={255,127,0}));
-  connect(leaEna.y, numPre.u1) annotation (Line(points={{52,40},{60,40},{60,66},
-          {78,66}}, color={255,127,0}));
-  connect(staLag.preIdxSta, numPre.u2) annotation (Line(points={{52,-6},{56,-6},
-          {56,54},{78,54}}, color={255,127,0}));
-  connect(zer.y, num.u2) annotation (Line(points={{52,-40},{68,-40},{68,-6},{78,
-          -6}}, color={255,127,0}));
-  connect(zer.y, numPre.u2) annotation (Line(points={{52,-40},{68,-40},{68,54},
-          {78,54}},color={255,127,0}));
-  connect(up.y, staLag.u1Up)
-    annotation (Line(points={{-8,0},{28,0}}, color={255,0,255}));
-  connect(fal.y, dow.u1) annotation (Line(points={{-48,-80},{-36,-80},{-36,-40},
-          {-32,-40}}, color={255,0,255}));
-  connect(fal.y, up.u1) annotation (Line(points={{-48,-80},{-36,-80},{-36,0},{-32,
-          0}}, color={255,0,255}));
-  connect(num.y, nPumEna) annotation (Line(points={{102,0},{110,0},{110,-60},{
-          220,-60}}, color={255,127,0}));
-  connect(anyEna.y, pre1.u)
-    annotation (Line(points={{142,-120},{158,-120}}, color={255,0,255}));
-  connect(pre1.y, y1Any)
-    annotation (Line(points={{182,-120},{220,-120}}, color={255,0,255}));
-  connect(num.y, anyEna.u) annotation (Line(points={{102,0},{110,0},{110,-120},
-          {118,-120}}, color={255,127,0}));
-  connect(m_flow, ratFlo.u)
-    annotation (Line(points={{-220,80},{-150,80}}, color={0,0,127}));
-  annotation (
-  defaultComponentName="staPum",
-  Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Text(
-          textColor={0,0,255},
-          extent={{-150,110},{150,150}},
-          textString="%name"),
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}),          Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-200,-200},{200,
-            200}})),
-    Documentation(info="<html>
-<p>
-This block implements the logic for staging the lag pump of
-a multiple-pump group.
-<p>
-The first staging criterion is optional and is based on <i>ratFlo</i>,
-the ratio of current flow rate to design flow rate.
-The lag pump is enabled whenever any of the following is true.
-</p>
-<ul>
-<li>The pump speed command is higher than <code>yUp</code> for <i>5</i>&nbsp;min.
-</li>
-<li>Optionally if <code>have_flowCriterion</code> is set to <code>true</code>, the ratio <i>ratFlo</i>
-is higher than <i>n / nPum - 0.03</i> for <i>10</i>&nbsp;min, where <i>n</i> is the number
-of operating pumps and <i>nPum</i> is the number of pumps operating at design conditions.
-</li>
-</ul>
-<p>
-The lag pump is disabled whenever any of the following is true.
-</p>
-<ul>
-<li>The lead pump is disabled.
-</li>
-<li>The pump speed command is lower than <code>yDow</code> for <i>5</i>&nbsp;min.
-</li>
-<li>Optionally if <code>have_flowCriterion</code> is set to <code>true</code>, the ratio <i>ratFlo</i>
-is higher than <i>(n - 1) / nPum - 0.03</i> for <i>10</i>&nbsp;min.
-</li>
-</ul>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end StagingPump;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
deleted file mode 100644
index 3e8c76315f7..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mo
+++ /dev/null
@@ -1,43 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation;
-model StageIndex
-  extends Modelica.Icons.Example;
-
-  Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StageIndex
-    sta(nSta=3, tSta=60) "Staging"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
-    table=[0,0,0,0; 1,1,0,0; 2,1,1,1; 3,0,1,1; 4,1,0,0; 5,1,0,1; 6,1,1,0; 7,1,0,
-        1],
-    timeScale=100,
-    period=1000) "Source signal"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-equation
-  connect(booTimTab.y[1], sta.u1) annotation (Line(points={{-38,0},{-20,0},{-20,
-          6},{-12,6}}, color={255,0,255}));
-  connect(booTimTab.y[2], sta.u1Up)
-    annotation (Line(points={{-38,0},{-12,0}}, color={255,0,255}));
-  connect(booTimTab.y[3], sta.u1Dow) annotation (Line(points={{-38,0},{-20,0},{-20,
-          -5.8},{-12,-5.8}}, color={255,0,255}));
-
-annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-    Documentation(info="<html>
-<p>
-This is a validation model for the block
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StageIndex\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StageIndex</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end StageIndex;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
deleted file mode 100644
index f5cd54c4c52..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mo
+++ /dev/null
@@ -1,137 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation;
-model StagingPlant "Validation of plant staging block"
-  extends Modelica.Icons.Example;
-
-  parameter Integer nChi(final min=1, start=1)=2
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"),
-      Evaluate=true);
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatChi_flow_nominal=-4.4E6
-    "Cooling design heat flow rate of cooling-only chillers (all units)"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"));
-  parameter Integer nChiHea(final min=1, start=1)=3
-    "Number of units operating at design conditions"
-    annotation (Dialog(group="HW loop and heat recovery chillers"),
-      Evaluate=true);
-  parameter Real PLRStaTra(final unit="1", final min=0, final max=1) = 0.85
-    "Part load ratio triggering stage transition";
-  parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal=-6E6
-    "Cooling design heat flow rate of HRC in cascading cooling mode (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=6.4E6
-    "Heating design heat flow rate (all units)"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-  final parameter Modelica.Units.SI.HeatFlowRate mChiWat_flow_nominal=
-    abs(QChiWatChi_flow_nominal+QChiWatCasCoo_flow_nominal) /
-    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq /
-    5
-    "CHW design mass flow rate"
-    annotation (Dialog(group="CHW loop and cooling-only chillers"));
-  final parameter Modelica.Units.SI.HeatFlowRate mHeaWat_flow_nominal=
-    QHeaWat_flow_nominal /
-    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq /
-    10
-    "HW design mass flow rate"
-    annotation (Dialog(group="HW loop and heat recovery chillers"));
-
-  BaseClasses.StagingPlant
-    staChi(
-    final nChi=nChi,
-    final nChiHea=nChiHea,
-    final QChiWatChi_flow_nominal=QChiWatChi_flow_nominal,
-    final QChiWatCasCoo_flow_nominal=QChiWatCasCoo_flow_nominal,
-    QChiWatCasCoo_flow_nominal_approx=QChiWatCasCoo_flow_nominal,
-    final QHeaWat_flow_nominal=QHeaWat_flow_nominal) "Chiller staging block"
-    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(table=[0,0,0; 1,
-        0,0; 4,0.3,0.1; 5,1,0.1; 10,0.1,0.1; 13,1,0.3; 16,0.3,1;20,0.1,0.1; 24,0.1,0.3; 25,
-        0.1,1; 30,0,0],
-    timeScale=1000) "Source signal"
-    annotation (Placement(transformation(extent={{-100,10},{-80,30}})));
-  Modelica.Blocks.Sources.BooleanExpression u1(y=time > 0)
-    "Enable signal"
-    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(k=7 + 273.15)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatPriRet(k=12 + 273.15)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(k=60 + 273.15)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatPriRet(k=50 + 273.15)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-100,-90},{-80,-70}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter sca(final k=
-        mChiWat_flow_nominal) "Scale signal"
-    annotation (Placement(transformation(extent={{12,30},{32,50}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter sca1(final k=
-        mHeaWat_flow_nominal) "Scale signal"
-    annotation (Placement(transformation(extent={{12,-10},{32,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpSet(k=20E4)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-60,-110},{-40,-90}})));
-equation
-  connect(u1.y, staChi.u1Coo) annotation (Line(points={{-79,80},{60,80},{60,
-          8.875},{78,8.875}},
-               color={255,0,255}));
-  connect(u1.y, staChi.u1Hea) annotation (Line(points={{-79,80},{60,80},{60,
-          7.625},{78,7.625}},
-               color={255,0,255}));
-  connect(TChiWatSupSet.y, staChi.TChiWatSupSet) annotation (Line(points={{-38,-20},
-          {40,-20},{40,5},{78,5}},
-                                 color={0,0,127}));
-  connect(THeaWatPriRet.y, staChi.THeaWatPriRet) annotation (Line(points={{-78,-80},
-          {50,-80},{50,-6.25},{78,-6.25}},
-                                     color={0,0,127}));
-  connect(THeaWatSupSet.y, staChi.THeaWatSupSet) annotation (Line(points={{-38,-60},
-          {48,-60},{48,-3.75},{78,-3.75}},
-                                   color={0,0,127}));
-  connect(TChiWatPriRet.y, staChi.TChiWatPriRet) annotation (Line(points={{-78,-40},
-          {42,-40},{42,2.5},{78,2.5}},
-                                   color={0,0,127}));
-  connect(sca.y, staChi.mChiWatPri_flow)
-    annotation (Line(points={{34,40},{40,40},{40,6.25},{78,6.25}},
-                                                           color={0,0,127}));
-  connect(sca1.y, staChi.mHeaWatPri_flow) annotation (Line(points={{34,0},{38,0},
-          {38,-2.5},{78,-2.5}}, color={0,0,127}));
-  connect(TChiWatSupSet.y, staChi.TChiWatSup) annotation (Line(points={{-38,-20},
-          {40,-20},{40,3.75},{78,3.75}},       color={0,0,127}));
-  connect(dpSet.y, staChi.dpChiWat) annotation (Line(points={{-38,-100},{46,
-          -100},{46,0},{78,0}}, color={0,0,127}));
-  connect(dpSet.y, staChi.dpChiWatSet) annotation (Line(points={{-38,-100},{46,
-          -100},{46,1.25},{78,1.25}}, color={0,0,127}));
-  connect(dpSet.y, staChi.dpHeaWatSet) annotation (Line(points={{-38,-100},{
-          45.8824,-100},{45.8824,-7.5},{78,-7.5}}, color={0,0,127}));
-  connect(dpSet.y, staChi.dpHeaWat) annotation (Line(points={{-38,-100},{
-          45.8824,-100},{45.8824,-8.75},{78,-8.75}}, color={0,0,127}));
-  connect(THeaWatSupSet.y, staChi.THeaWatSup) annotation (Line(points={{-38,-60},
-          {47.8431,-60},{47.8431,-5},{78,-5}}, color={0,0,127}));
-  connect(ratFlo.y[1], sca.u) annotation (Line(points={{-78,20},{0,20},{0,40},{
-          10,40}}, color={0,0,127}));
-  connect(ratFlo.y[2], sca1.u)
-    annotation (Line(points={{-78,20},{0,20},{0,0},{10,0}}, color={0,0,127}));
-          annotation (
-              __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=30000,
-      Tolerance=1e-06),
-    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
-    Documentation(info="<html>
-<p>
-This is a validation model for the plant staging logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end StagingPlant;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
deleted file mode 100644
index 73c5bd8ff98..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mo
+++ /dev/null
@@ -1,73 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation;
-model StagingPump "Validation of pump staging block"
-  extends Modelica.Icons.Example;
-
-  parameter Integer nPum(
-    final min=1,
-    start=1)=3
-    "Number of pumps"
-    annotation(Evaluate=true);
-  parameter Integer nChi(
-    final min=1,
-    start=1)=1
-    "Number of chillers served by the pumps"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    annotation(Dialog(group="Nominal condition"));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable floSpe(
-    table=[
-      0,0,0;
-      1,0,0;
-      4,(nPum - 1)/nPum*m_flow_nominal,1;
-      5,m_flow_nominal,0.9;
-      10,0,0.1],
-    timeScale=500)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-  Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump
-    staDet(
-    final nPum=nPum,
-    final m_flow_nominal=m_flow_nominal)
-    "Pump staging block - Detailed version"
-    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yVal(k=1)
-    "Source signal"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isOpe(t=0.1,
-    h=5E-2) "Check if valve open"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-equation
-  connect(floSpe.y[1],staDet. m_flow) annotation (Line(points={{-58,40},{30,40},
-          {30,0},{38,0}},     color={0,0,127}));
-  connect(floSpe.y[2],staDet. y)
-    annotation (Line(points={{-58,40},{30,40},{30,-6},{38,-6}},
-                                                 color={0,0,127}));
-  connect(yVal.y, isOpe.u)
-    annotation (Line(points={{-58,0},{-42,0}}, color={0,0,127}));
-  connect(isOpe.y,staDet.y1Ena)
-    annotation (Line(points={{-18,0},{0,0},{0,6},{38,6}}, color={255,0,255}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=5000,
-      Tolerance=1e-06),
-  Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-This is a validation model for the pump staging logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end StagingPump;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
deleted file mode 100644
index 2d425a0bd74..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses;
-package Validation "Package with validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains validation models.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.mo
deleted file mode 100644
index 1c0fe6e412f..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/BaseClasses/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-  annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used to construct
-the main plant controller.
-Those include an interface class for the controller as well
-as blocks that implement the sequence of operation for each
-component of the plant.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/Controller.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/Controller.mo
deleted file mode 100644
index 80d71654e5d..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/Controller.mo
+++ /dev/null
@@ -1,547 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls;
-block Controller "Plant controller"
-  extends BaseClasses.PartialController;
-
-  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator repHeaPum(
-    final nout=nHeaPum) "Replicate signal"
-    annotation (Placement(transformation(extent={{220,-230},{240,-210}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal cvtValBypTan
-    "Convert DO to AO"
-    annotation (Placement(transformation(extent={{-40,-290},{-20,-270}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch TChiHeaSupSet[nChiHea]
-    "Switch supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
-  BaseClasses.StagingPump staPumChiWat(
-    final nPum=nPumChiWat,
-    final m_flow_nominal=mChiWat_flow_nominal)
-    "CHW pump staging"
-    annotation (Placement(transformation(extent={{120,230},{140,250}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumChiWat(
-    k=0.1,
-    Ti=60,
-    r=dpChiWatSet_max,
-    y_reset=1,
-    y_neutral=0)
-    "Pump speed controller"
-    annotation (Placement(transformation(extent={{190,230},{210,250}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumHeaWat(
-    k=0.1,
-    Ti=60,
-    r=dpHeaWatSet_max,
-    y_reset=1,
-    y_neutral=0)
-    "Pump speed controller"
-    annotation (Placement(transformation(extent={{190,-50},{210,-30}})));
-  BaseClasses.StagingPump staPumHeaWat(
-    final nPum=nPumHeaWat,
-    final m_flow_nominal=mHeaWat_flow_nominal)
-    "HW pump staging"
-    annotation (Placement(transformation(extent={{120,-50},{140,-30}})));
-  BaseClasses.StagingPump staPumConWatCon(
-    final nPum=nPumConWatCon,
-    final m_flow_nominal=mConWatCon_flow_nominal)
-    "CW pump staging"
-    annotation (Placement(transformation(extent={{120,-130},{140,-110}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumConWatCon(
-    k=0.1,
-    Ti=60,
-    final r=dpConWatConSet_max,
-    y_reset=1,
-    y_neutral=0)
-    "Pump speed controller"
-    annotation (Placement(transformation(extent={{190,-130},{210,-110}})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable pumConWatEva(
-    k=0.1,
-    Ti=60,
-    final r=dpConWatEvaSet_max,
-    y_reset=1,
-    y_neutral=0)
-    "Pump speed controller"
-    annotation (Placement(transformation(extent={{190,-190},{210,-170}})));
-  BaseClasses.StagingPump staPumConWatEva(
-    final nPum=nPumConWatEva,
-    final m_flow_nominal=mConWatEva_flow_nominal)
-    "CW pump staging"
-    annotation (Placement(transformation(extent={{120,-190},{140,-170}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpConNom(final k=
-        dpConWatConSet_max) "Constant"
-    annotation (Placement(transformation(extent={{160,-130},{180,-110}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpEvaNom(final k=
-        dpConWatEvaSet_max) "Constant"
-    annotation (Placement(transformation(extent={{160,-190},{180,-170}})));
-  BaseClasses.StagingPlant staPla(
-    final nChi=nChi,
-    final QChiWatChi_flow_nominal=QChiWatChi_flow_nominal,
-    final nChiHea=nChiHea,
-    final QChiWatCasCoo_flow_nominal=QChiWatCasCoo_flow_nominal,
-    final QChiWatCasCoo_flow_nominal_approx=QChiWatCasCoo_flow_nominal_approx,
-    final QHeaWat_flow_nominal=QHeaWat_flow_nominal,
-    final cp_default=cp_default) "Plant staging"
-    annotation (Placement(transformation(extent={{-210,140},{-190,172}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTSet(nout=nChiHea)
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-140,110},{-120,130}})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTSet1(nout=nChiHea)
-    "Replicate signal"
-    annotation (Placement(transformation(extent={{-140,70},{-120,90}})));
-  BaseClasses.ModeCondenserLoop modConLoo(
-    final mConWatHexCoo_flow_nominal=mConWatCon_flow_nominal,
-    final QHeaPum_flow_nominal=QHeaPum_flow_nominal,
-    final TTanSet=TTanSet,
-    final fraUslTan=fraUslTan,
-    final ratFraChaTanLim=ratFraChaTanLim,
-    final cp_default=cp_default,
-    nTTan=nTTan) "Condenser loop operating mode"
-    annotation (Placement(transformation(extent={{-170,-170},{-150,-150}})));
-  BaseClasses.TankCycle cycTan(
-    mConWatHexCoo_flow_nominal=mConWatCon_flow_nominal,
-                               final TTanSet=TTanSet, nTTan=nTTan)
-    "Determine tank cycle"
-    annotation (Placement(transformation(extent={{-170,-110},{-150,-90}})));
-  Buildings.Controls.OBC.CDL.Integers.Equal isModChaAss
-    "Return true if charge assist mode is active"
-    annotation (Placement(transformation(extent={{-120,-190},{-100,-170}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant chaAss(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.chargeAssist)
-    "Charge assist mode index"
-    annotation (Placement(transformation(extent={{-170,-198},{-150,-178}})));
-  Buildings.Controls.OBC.CDL.Logical.And assAndPum
-    "Charge assist mode and any CW pump On"
-    annotation (Placement(transformation(extent={{186,-210},{206,-230}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaPumSetVal[2](
-    final k={max(TTanSet[i]) + 3 for i in 1:2})
-    "HP supply temperature setpoint for each tank cycle"
-    annotation (Placement(transformation(extent={{-170,-230},{-150,-210}})));
-  Buildings.Controls.OBC.CDL.Routing.RealExtractor extIndRea(final nin=2)
-    "Extract active setpoint"
-    annotation (Placement(transformation(extent={{-120,-230},{-100,-210}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant heaRej(
-    final k=Buildings.Experimental.DHC.Plants.Combined.Controls.ModeCondenserLoop.heatRejection)
-    "Heat rejection mode index"
-    annotation (Placement(transformation(extent={{-170,-290},{-150,-270}})));
-  Buildings.Controls.OBC.CDL.Integers.Equal isModHeaRej
-    "Return true if heat rejection mode is active"
-    annotation (Placement(transformation(extent={{-120,-290},{-100,-270}})));
-  Buildings.Controls.OBC.CDL.Logical.Not isModNotHeaRej
-    "Return true if heat rejection mode is NOT active"
-    annotation (Placement(transformation(extent={{-80,-290},{-60,-270}})));
-  BaseClasses.ValveCondenserEvaporator valConEva(
-    final nChi=nChi,
-    final nChiHea=nChiHea,
-    final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
-    final mChiWatChi_flow_min=mChiWatChi_flow_min,
-    final mConWatChi_flow_nominal=mConWatChi_flow_nominal,
-    final dpEvaChi_nominal=dpEvaChi_nominal,
-    final dpValEvaChi_nominal=dpValEvaChi_nominal,
-    final mChiWatChiHea_flow_nominal=mChiWatChiHea_flow_nominal,
-    final mChiWatChiHea_flow_min=mChiWatChiHea_flow_min,
-    final mConWatChiHea_flow_nominal=mConWatChiHea_flow_nominal,
-    final mHeaWatChiHea_flow_min=mHeaWatChiHea_flow_min,
-    final dpEvaChiHea_nominal=dpEvaChiHea_nominal,
-    final dpValEvaChiHea_nominal=dpValEvaChiHea_nominal,
-    final TTanSet=TTanSet)
-    "Controller for chiller and HRC condenser and evaporator valves"
-    annotation (Placement(transformation(extent={{-60,20},{-40,60}})));
-  Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.DirectHeatRecovery dirHeaCoo(
-    final nChi=nChi,
-    final nChiHea=nChiHea,
-    final mChiWatChi_flow_nominal=mChiWatChi_flow_nominal,
-    final mChiWatChi_flow_min=mChiWatChi_flow_min,
-    final mChiWatChiHea_flow_nominal=mChiWatChiHea_flow_nominal,
-    final mChiWatChiHea_flow_min=mChiWatChiHea_flow_min)
-    "Control logic for HRC in direct HR mode"
-    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  BaseClasses.CoolingTowerLoop coo(
-    final mConWatHexCoo_flow_nominal=mConWatCon_flow_nominal,
-    final nCoo=nCoo,
-    final nPumConWatCoo=nPumConWatCoo,
-    final QChiWat_flow_nominal=QChiWat_flow_nominal,
-    final dTLifChi_min=dTLifChi_min,
-    final dTLifChi_nominal=dTLifChi_nominal,
-    final TTanSet=TTanSet,
-    final dTHexCoo_nominal=dTHexCoo_nominal) "Cooling tower loop"
-    annotation (Placement(transformation(extent={{40,-364},{60,-328}})));
-  Buildings.Controls.OBC.CDL.Logical.Or u1CooOrHea
-    "Plant Enable signal: either cooling or heating is enabled"
-    annotation (Placement(transformation(extent={{-160,430},{-140,450}})));
-equation
-  connect(repHeaPum.y, y1HeaPum)
-    annotation (Line(points={{242,-220},{280,-220}},color={255,0,255}));
-  connect(cvtValBypTan.y, yValBypTan) annotation (Line(points={{-18,-280},{280,-280}},
-                                        color={0,0,127}));
-  connect(staPumChiWat.y1, y1PumChiWat) annotation (Line(points={{142,246},{180,
-          246},{180,260},{280,260}},
-                                color={255,0,255}));
-  connect(pumChiWat.y, yPumChiWat)
-    annotation (Line(points={{212,240},{280,240}}, color={0,0,127}));
-  connect(dpChiWatSet, pumChiWat.u_s) annotation (Line(points={{-280,320},{-10,
-          320},{-10,260},{176,260},{176,240},{188,240}},
-                                     color={0,0,127}));
-  connect(staPumHeaWat.y1, y1PumHeaWat)
-    annotation (Line(points={{142,-34},{180,-34},{180,-20},{280,-20}},
-                                                color={255,0,255}));
-  connect(pumHeaWat.y, yPumHeaWat)
-    annotation (Line(points={{212,-40},{280,-40}}, color={0,0,127}));
-  connect(dpHeaWatSet, pumHeaWat.u_s) annotation (Line(points={{-280,300},{4,
-          300},{4,-20},{160,-20},{160,-40},{188,-40}},
-                                      color={0,0,127}));
-  connect(pumConWatEva.y, yPumConWatEva)
-    annotation (Line(points={{212,-180},{280,-180}}, color={0,0,127}));
-  connect(pumConWatCon.y, yPumConWatCon) annotation (Line(points={{212,-120},{220,
-          -120},{220,-140},{280,-140}},     color={0,0,127}));
-  connect(staPumConWatCon.y1, y1PumConWatCon) annotation (Line(points={{142,-114},
-          {150,-114},{150,-100},{240,-100},{240,-120},{280,-120}},
-                                          color={255,0,255}));
-  connect(staPumConWatEva.y1, y1PumConWatEva)
-    annotation (Line(points={{142,-174},{150,-174},{150,-160},{280,-160}},
-                                                    color={255,0,255}));
-  connect(dpHeaWat, pumHeaWat.u_m) annotation (Line(points={{-280,-360},{-234,-360},
-          {-234,-64},{200,-64},{200,-52}}, color={0,0,127}));
-  connect(mHeaWatPri_flow, staPumHeaWat.m_flow) annotation (Line(points={{-280,
-          -200},{-242,-200},{-242,-40},{118,-40}},
-                                        color={0,0,127}));
-  connect(dpChiWat, pumChiWat.u_m) annotation (Line(points={{-280,-340},{-226,
-          -340},{-226,208},{200,208},{200,228}},
-                                           color={0,0,127}));
-  connect(mConWatEva_flow, staPumConWatEva.m_flow) annotation (Line(points={{-280,
-          -260},{-252,-260},{-252,-140},{60,-140},{60,-180},{118,-180}},
-                                                  color={0,0,127}));
-  connect(mConWatCon_flow, staPumConWatCon.m_flow) annotation (Line(points={{-280,
-          -240},{-244,-240},{-244,-120},{118,-120}},
-                                               color={0,0,127}));
-  connect(mChiWatPri_flow, staPumChiWat.m_flow) annotation (Line(points={{-280,-180},
-          {-238,-180},{-238,240},{118,240}},    color={0,0,127}));
-  connect(dpConNom.y, pumConWatCon.u_s) annotation (Line(points={{182,-120},{188,
-          -120}},                      color={0,0,127}));
-  connect(dpEvaNom.y, pumConWatEva.u_s)
-    annotation (Line(points={{182,-180},{188,-180}}, color={0,0,127}));
-  connect(mHeaWatPri_flow, staPla.mHeaWatPri_flow) annotation (Line(points={{-280,
-          -200},{-236,-200},{-236,152},{-212,152}},    color={0,0,127}));
-  connect(THeaWatSupSet, staPla.THeaWatSupSet) annotation (Line(points={{-280,
-          340},{-250,340},{-250,150},{-212,150}}, color={0,0,127}));
-  connect(mChiWatPri_flow, staPla.mChiWatPri_flow) annotation (Line(points={{-280,
-          -180},{-238,-180},{-238,166},{-212,166}},color={0,0,127}));
-  connect(u1Coo, staPla.u1Coo) annotation (Line(points={{-280,440},{-236,440},{
-          -236,170.2},{-212,170.2}},                   color={255,0,255}));
-  connect(u1Hea, staPla.u1Hea) annotation (Line(points={{-280,400},{-240,400},{
-          -240,168.2},{-212,168.2}},                   color={255,0,255}));
-  connect(TChiWatSupSet, staPla.TChiWatSupSet) annotation (Line(points={{-280,
-          360},{-242,360},{-242,164},{-212,164}}, color={0,0,127}));
-  connect(TChiWatPriRet, staPla.TChiWatPriRet) annotation (Line(points={{-280,
-          240},{-242,240},{-242,160},{-212,160}},
-                                                color={0,0,127}));
-  connect(THeaWatPriRet, staPla.THeaWatPriRet) annotation (Line(points={{-280,80},
-          {-242,80},{-242,146},{-212,146}},     color={0,0,127}));
-  connect(repTSet1.y, TChiHeaSupSet.u3) annotation (Line(points={{-118,80},{
-          -106,80},{-106,92},{-102,92}}, color={0,0,127}));
-  connect(repTSet.y, TChiHeaSupSet.u1) annotation (Line(points={{-118,120},{
-          -106,120},{-106,108},{-102,108}}, color={0,0,127}));
-  connect(staPla.y1CooChiHea, TChiHeaSupSet.u2) annotation (Line(points={{-188,148},
-          {-110,148},{-110,100},{-102,100}},      color={255,0,255}));
-  connect(TChiHeaSupSet.y, TChiHeaSet)
-    annotation (Line(points={{-78,100},{280,100}}, color={0,0,127}));
-  connect(TChiWatSupSet, repTSet.u) annotation (Line(points={{-280,360},{-254,
-          360},{-254,120},{-142,120}}, color={0,0,127}));
-  connect(THeaWatSupSet, repTSet1.u) annotation (Line(points={{-280,340},{-250,
-          340},{-250,80},{-142,80}}, color={0,0,127}));
-  connect(mConWatHexCoo_flow, modConLoo.mConWatHexCoo_flow) annotation (Line(
-        points={{-280,-280},{-248,-280},{-248,-152},{-172,-152}},
-                                                                color={0,0,127}));
-  connect(mConWatOutTan_flow, modConLoo.mConWatOutTan_flow) annotation (Line(
-        points={{-280,-300},{-234,-300},{-234,-156},{-172,-156}},
-                                                                color={0,0,127}));
-  connect(TTan, modConLoo.TTan) annotation (Line(points={{-280,60},{-180,60},{
-          -180,-160},{-172,-160}},
-                                 color={0,0,127}));
-  connect(TTan, cycTan.TTan) annotation (Line(points={{-280,60},{-180,60},{-180,
-          -106},{-172,-106}},
-                          color={0,0,127}));
-  connect(mConWatOutTan_flow, cycTan.mConWatOutTan_flow) annotation (Line(
-        points={{-280,-300},{-226,-300},{-226,-94},{-172,-94}},
-                                                            color={0,0,127}));
-  connect(chaAss.y, isModChaAss.u2) annotation (Line(points={{-148,-188},{-122,
-          -188}},                         color={255,127,0}));
-  connect(modConLoo.mode, isModChaAss.u1) annotation (Line(points={{-148,-160},
-          {-144,-160},{-144,-180},{-122,-180}},
-                                              color={255,127,0}));
-  connect(assAndPum.y, repHeaPum.u)
-    annotation (Line(points={{208,-220},{218,-220}}, color={255,0,255}));
-  connect(isModChaAss.y, assAndPum.u1)
-    annotation (Line(points={{-98,-180},{-80,-180},{-80,-220},{184,-220}},
-                                                     color={255,0,255}));
-  connect(THeaPumSetVal.y, extIndRea.u)
-    annotation (Line(points={{-148,-220},{-122,-220}}, color={0,0,127}));
-  connect(extIndRea.y, THeaPumSet) annotation (Line(points={{-98,-220},{-80,
-          -220},{-80,-240},{280,-240}},            color={0,0,127}));
-  connect(cycTan.idxCycTan, extIndRea.index) annotation (Line(points={{-148,
-          -100},{-140,-100},{-140,-240},{-110,-240},{-110,-232}},
-                                                         color={255,127,0}));
-  connect(heaRej.y, isModHeaRej.u1)
-    annotation (Line(points={{-148,-280},{-122,-280}}, color={255,127,0}));
-  connect(modConLoo.mode, isModHeaRej.u2) annotation (Line(points={{-148,-160},{
-          -144,-160},{-144,-288},{-122,-288}},color={255,127,0}));
-  connect(isModNotHeaRej.y, cvtValBypTan.u)
-    annotation (Line(points={{-58,-280},{-42,-280}}, color={255,0,255}));
-  connect(isModHeaRej.y, isModNotHeaRej.u)
-    annotation (Line(points={{-98,-280},{-82,-280}}, color={255,0,255}));
-  connect(mEvaChi_flow,valConEva. mEvaChi_flow) annotation (Line(points={{-280,
-          -100},{-212,-100},{-212,42},{-62,42}}, color={0,0,127}));
-  connect(mConChi_flow,valConEva. mConChi_flow) annotation (Line(points={{-280,
-          -120},{-256,-120},{-256,40},{-62,40}},     color={0,0,127}));
-  connect(mEvaChiHea_flow,valConEva. mEvaChiHea_flow) annotation (Line(points={{-280,
-          -140},{-254,-140},{-254,38},{-62,38}},           color={0,0,127}));
-  connect(mConChiHea_flow,valConEva. mConChiHea_flow) annotation (Line(points={{-280,
-          -160},{-252,-160},{-252,36},{-62,36}},           color={0,0,127}));
-  connect(staPla.y1Chi,valConEva. u1Chi) annotation (Line(points={{-188,164},{
-          -164,164},{-164,58},{-62,58}},
-                                    color={255,0,255}));
-  connect(staPla.y1ChiHea,valConEva. u1ChiHea) annotation (Line(points={{-188,
-          154},{-166,154},{-166,56},{-62,56}}, color={255,0,255}));
-  connect(staPla.y1CooChiHea,valConEva. u1CooChiHea) annotation (Line(points={{-188,
-          148},{-168,148},{-168,54},{-62,54}},      color={255,0,255}));
-  connect(staPla.y1HeaCooChiHea,valConEva. u1HeaCooChiHea) annotation (Line(
-        points={{-188,142},{-170,142},{-170,52},{-62,52}}, color={255,0,255}));
-  connect(valConEva.yValEvaChi, yValEvaChi) annotation (Line(points={{-38,42},{
-          0,42},{0,320},{280,320}}, color={0,0,127}));
-  connect(valConEva.yValConChi, yValConChi) annotation (Line(points={{-38,40},{
-          2,40},{2,300},{280,300}}, color={0,0,127}));
-  connect(valConEva.yValConSwiChiHea, yValConSwiChiHea)
-    annotation (Line(points={{-38,32},{260,32},{260,20},{280,20}},
-                                                 color={0,0,127}));
-  connect(valConEva.yValEvaSwiChiHea, yValEvaSwiHea) annotation (Line(points={{-38,34},
-          {240,34},{240,40},{280,40}},         color={0,0,127}));
-  connect(valConEva.yValConChiHea, yValConChiHea) annotation (Line(points={{-38,36},
-          {238,36},{238,60},{280,60}},     color={0,0,127}));
-  connect(valConEva.yValEvaChiHea, yValEvaChiHea) annotation (Line(points={{-38,38},
-          {236,38},{236,80},{280,80}},     color={0,0,127}));
-  connect(dpConWatEva, pumConWatEva.u_m) annotation (Line(points={{-280,-400},{-240,
-          -400},{-240,-204},{200,-204},{200,-192}},      color={0,0,127}));
-  connect(dpConWatCon, pumConWatCon.u_m) annotation (Line(points={{-280,-380},{-242,
-          -380},{-242,-144},{200,-144},{200,-132}},      color={0,0,127}));
-  connect(cycTan.idxCycTan,valConEva. idxCycTan) annotation (Line(points={{-148,
-          -100},{-140,-100},{-140,48},{-62,48}},     color={255,127,0}));
-  connect(modConLoo.mode,valConEva. mode) annotation (Line(points={{-148,-160},
-          {-144,-160},{-144,50},{-62,50}},     color={255,127,0}));
-  connect(TChiWatSup, staPla.TChiWatSup) annotation (Line(points={{-280,260},{
-          -246,260},{-246,162},{-212,162}},         color={0,0,127}));
-  connect(dpChiWatSet, staPla.dpChiWatSet) annotation (Line(points={{-280,320},
-          {-246,320},{-246,158},{-212,158}},         color={0,0,127}));
-  connect(dpChiWat, staPla.dpChiWat) annotation (Line(points={{-280,-340},{-238,
-          -340},{-238,156},{-212,156}},         color={0,0,127}));
-  connect(valConEva.y1PumChiWat, staPumChiWat.y1Ena) annotation (Line(points={{-38,58},
-          {-4,58},{-4,246},{118,246}},        color={255,0,255}));
-  connect(pumChiWat.y, staPumChiWat.y) annotation (Line(points={{212,240},{220,240},
-          {220,220},{110,220},{110,234},{118,234}},   color={0,0,127}));
-  connect(pumHeaWat.y, staPumHeaWat.y) annotation (Line(points={{212,-40},{220,
-          -40},{220,-60},{110,-60},{110,-46},{118,-46}},
-                                                  color={0,0,127}));
-  connect(valConEva.y1PumHeaWat, staPumHeaWat.y1Ena) annotation (Line(points={{-38,56},
-          {74,56},{74,-34},{118,-34}},    color={255,0,255}));
-  connect(pumConWatCon.y, staPumConWatCon.y) annotation (Line(points={{212,-120},
-          {220,-120},{220,-140},{114,-140},{114,-126},{118,-126}},
-                                                            color={0,0,127}));
-  connect(pumConWatEva.y, staPumConWatEva.y) annotation (Line(points={{212,-180},
-          {220,-180},{220,-200},{114,-200},{114,-186},{118,-186}},
-                                                                color={0,0,127}));
-  connect(valConEva.y1PumConWatEva, staPumConWatEva.y1Ena) annotation (Line(
-        points={{-38,52},{-4,52},{-4,-174},{118,-174}},color={255,0,255}));
-  connect(valConEva.y1PumConWatCon, staPumConWatCon.y1Ena) annotation (Line(
-        points={{-38,54},{-2,54},{-2,-114},{118,-114}},
-                                                     color={255,0,255}));
-  connect(staPla.y1Chi, y1Chi) annotation (Line(points={{-188,164},{-6,164},{-6,
-          340},{280,340}}, color={255,0,255}));
-  connect(staPla.y1ChiHea, y1ChiHea) annotation (Line(points={{-188,154},{6,154},
-          {6,160},{280,160}}, color={255,0,255}));
-  connect(staPla.y1CooChiHea, y1CooChiHea) annotation (Line(points={{-188,148},{
-          6,148},{6,140},{280,140}},   color={255,0,255}));
-  connect(staPla.y1HeaCooChiHea, y1HeaCooChiHea) annotation (Line(points={{-188,
-          142},{4,142},{4,120},{280,120}},   color={255,0,255}));
-  connect(staPla.y1ChiHea, dirHeaCoo.y1) annotation (Line(points={{-188,154},{
-          -166,154},{-166,8},{-122,8}},         color={255,0,255}));
-  connect(staPla.y1HeaCooChiHea, dirHeaCoo.y1HeaCoo) annotation (Line(points={{-188,
-          142},{-170,142},{-170,4},{-126,4},{-126,4},{-122,4}},     color={255,
-          0,255}));
-  connect(TChiWatSupSet, dirHeaCoo.TChiWatSupSet) annotation (Line(points={{-280,
-          360},{-254,360},{-254,0},{-122,0}},          color={0,0,127}));
-  connect(TEvaLvgChiHea, dirHeaCoo.TEvaLvg) annotation (Line(points={{-280,140},
-          {-232,140},{-232,-4},{-122,-4}},      color={0,0,127}));
-  connect(THeaWatPriRet, dirHeaCoo.THeaWatPriRet) annotation (Line(points={{-280,80},
-          {-242,80},{-242,-8},{-122,-8}},                color={0,0,127}));
-  connect(dirHeaCoo.mEvaChiSet_flow,valConEva. mEvaChiSet_flow) annotation (
-      Line(points={{-98,6},{-92,6},{-92,46},{-62,46}},         color={0,0,127}));
-  connect(dirHeaCoo.mEvaChiHeaSet_flow,valConEva. mEvaChiHeaSet_flow)
-    annotation (Line(points={{-98,0},{-88,0},{-88,44},{-62,44}},     color={0,0,
-          127}));
-  connect(dpHeaWatSet, staPla.dpHeaWatSet) annotation (Line(points={{-280,300},
-          {-240,300},{-240,144},{-212,144}},color={0,0,127}));
-  connect(dpHeaWat, staPla.dpHeaWat) annotation (Line(points={{-280,-360},{-234,
-          -360},{-234,142},{-212,142}}, color={0,0,127}));
-  connect(THeaWatSup, staPla.THeaWatSup) annotation (Line(points={{-280,100},{-230,
-          100},{-230,148},{-212,148}},color={0,0,127}));
-  connect(coo.y1PumConWatCoo, y1PumConWatCoo) annotation (Line(points={{62,-334},
-          {240,-334},{240,-320},{280,-320}}, color={255,0,255}));
-  connect(coo.yPumConWatCoo, yPumConWatCoo) annotation (Line(points={{62,-340},
-          {280,-340}},                      color={0,0,127}));
-  connect(coo.y1Coo, y1Coo) annotation (Line(points={{62,-352},{240,-352},{240,
-          -360},{280,-360}},
-                       color={255,0,255}));
-  connect(coo.yCoo, yCoo) annotation (Line(points={{62,-358},{236,-358},{236,
-          -380},{280,-380}},
-                       color={0,0,127}));
-  connect(cycTan.idxCycTan, coo.idxCycTan) annotation (Line(points={{-148,-100},
-          {0,-100},{0,-332},{38,-332}}, color={255,127,0}));
-  connect(modConLoo.mode, coo.mode) annotation (Line(points={{-148,-160},{2,
-          -160},{2,-330},{38,-330}},
-                               color={255,127,0}));
-  connect(TChiWatSupSet, coo.TChiWatSupSet) annotation (Line(points={{-280,360},
-          {-2,360},{-2,-336},{38,-336}}, color={0,0,127}));
-  connect(TConWatConChiEnt, coo.TConWatConChiEnt) annotation (Line(points={{-280,40},
-          {-252,40},{-252,-338},{38,-338}},     color={0,0,127}));
-  connect(TConWatConChiLvg, coo.TConWatConChiLvg) annotation (Line(points={{-280,20},
-          {-248,20},{-248,-340},{38,-340}},     color={0,0,127}));
-  connect(TConWatCooSup, coo.TConWatCooSup) annotation (Line(points={{-280,0},{
-          -250,0},{-250,-343.8},{38,-343.8}},
-                                         color={0,0,127}));
-  connect(TConWatCooRet, coo.TConWatCooRet) annotation (Line(points={{-280,-20},
-          {-244,-20},{-244,-345.8},{38,-345.8}},                       color={0,
-          0,127}));
-  connect(TConWatHexCooEnt, coo.TConWatHexCooEnt) annotation (Line(points={{-280,
-          -40},{-248,-40},{-248,-347.8},{38,-347.8}}, color={0,0,127}));
-  connect(TConWatHexCooLvg, coo.TConWatHexCooLvg) annotation (Line(points={{-280,
-          -60},{-236,-60},{-236,-349.8},{38,-349.8}}, color={0,0,127}));
-  connect(staPla.QCooReq_flow, coo.QCooReq_flow) annotation (Line(points={{-188,
-          170},{-8,170},{-8,-354},{38,-354}}, color={0,0,127}));
-  connect(mConWatHexCoo_flow, coo.mConWatHexCoo_flow) annotation (Line(points={{-280,
-          -280},{-232,-280},{-232,-358},{38,-358}},      color={0,0,127}));
-  connect(cvtValBypTan.y, coo.yValBypTan) annotation (Line(points={{-18,-280},{
-          -6,-280},{-6,-362},{38,-362}},
-                                      color={0,0,127}));
-  connect(dirHeaCoo.TConEntChiHeaSet,valConEva. TConEntChiHeaSet) annotation (
-      Line(points={{-98,-6},{-84,-6},{-84,34},{-62,34}},             color={0,0,
-          127}));
-  connect(TConEntChiHea,valConEva. TConEntChiHea) annotation (Line(points={{-280,
-          180},{-220,180},{-220,32},{-62,32}},              color={0,0,127}));
-  connect(staPumConWatCon.y1Any, pumConWatCon.uEna) annotation (Line(points={{142,
-          -120},{154,-120},{154,-136},{196,-136},{196,-132}}, color={255,0,255}));
-  connect(staPumConWatEva.y1Any, pumConWatEva.uEna) annotation (Line(points={{142,
-          -180},{150,-180},{150,-198},{196,-198},{196,-192}}, color={255,0,255}));
-  connect(staPumConWatCon.y1Any, assAndPum.u2) annotation (Line(points={{142,-120},
-          {154,-120},{154,-212},{184,-212}}, color={255,0,255}));
-  connect(staPumHeaWat.y1Any, pumHeaWat.uEna) annotation (Line(points={{142,-40},
-          {152,-40},{152,-56},{196,-56},{196,-52}}, color={255,0,255}));
-  connect(staPumChiWat.y1Any, pumChiWat.uEna) annotation (Line(points={{142,240},
-          {170,240},{170,224},{196,224},{196,228}}, color={255,0,255}));
-  connect(valConEva.yValConWatEvaMix, yValConWatEvaMix) annotation (Line(points={{-38,30},
-          {240,30},{240,0},{280,0}},                  color={0,0,127}));
-  connect(TEvaLvgChiHea, valConEva.TEvaLvgChiHea) annotation (Line(points={{-280,
-          140},{-244,140},{-244,26},{-62,26}},              color={0,0,127}));
-  connect(TConWatEvaEnt, valConEva.TConWatEvaEnt) annotation (Line(points={{-280,
-          200},{-256,200},{-256,22},{-62,22}},      color={0,0,127}));
-  connect(TConLvgChiHea, valConEva.TConLvgChiHea) annotation (Line(points={{-280,
-          160},{-250,160},{-250,30},{-62,30}},      color={0,0,127}));
-  connect(TConLvgChi, valConEva.TConLvgChi) annotation (Line(points={{-280,120},
-          {-258,120},{-258,28},{-62,28}}, color={0,0,127}));
-  connect(TConWatConRet, valConEva.TConWatConRet) annotation (Line(points={{-280,
-          220},{-242,220},{-242,24},{-62,24}},      color={0,0,127}));
-  connect(valConEva.yValChiWatMinByp, yValChiWatMinByp) annotation (Line(points={{-38,48},
-          {6,48},{6,200},{280,200}},          color={0,0,127}));
-  connect(valConEva.yValHeaWatMinByp, yValHeaWatMinByp) annotation (Line(points={{-38,46},
-          {6,46},{6,-80},{280,-80}},          color={0,0,127}));
-  connect(valConEva.yValConWatByp, yValConWatByp) annotation (Line(points={{-38,26},
-          {4,26},{4,-420},{280,-420}},     color={0,0,127}));
-  connect(mConWatCon_flow, modConLoo.mConWatCon_flow) annotation (Line(points={
-          {-280,-240},{-232,-240},{-232,-164},{-172,-164}}, color={0,0,127}));
-  connect(TConWatConChiLvg, modConLoo.TConWatConChiLvg) annotation (Line(points
-        ={{-280,20},{-246,20},{-246,-166},{-172,-166}}, color={0,0,127}));
-  connect(TConWatConRet, modConLoo.TConWatConRet) annotation (Line(points={{
-          -280,220},{-232,220},{-232,-168},{-172,-168}}, color={0,0,127}));
-  connect(u1Coo, u1CooOrHea.u1)
-    annotation (Line(points={{-280,440},{-162,440}}, color={255,0,255}));
-  connect(u1Hea, u1CooOrHea.u2) annotation (Line(points={{-280,400},{-180,400},
-          {-180,432},{-162,432}}, color={255,0,255}));
-  connect(u1CooOrHea.y, valConEva.u1CooOrHea) annotation (Line(points={{-138,
-          440},{-57.8,440},{-57.8,62}}, color={255,0,255}));
-annotation (
-  defaultComponentName="ctl", Documentation(info="<html>
-<p>
-This block implements the following control functions.
-</p>
-<ul>
-<li>
-Plant heating and cooling staging and HRC operating mode selection,
-see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPlant</a>.
-</li>
-<li>
-CW loop operating mode selection, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop</a>.
-</li>
-<li>
-TES tank cycle flag selection, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.TankCycle\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.TankCycle</a>.
-</li>
-<li>
-Load balancing, temperature and flow setpoint tracking for chillers and HRCs
-depending on active operating modes, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
-</li>
-<li>
-Cooling tower pumps and cooling tower fans control, see description in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.CoolingTowerLoop</a>.
-</li>
-<li>
-Air-to-water heat pump control, see below.
-</li>
-<li>
-CHW, HW, CWE and CWC pumps, see below.
-</li>
-</ul>
-<h4>Heat pumps</h4>
-<p>
-Heat pumps are enabled whenever Charge Assist mode is active and any
-CWC pump is enabled. Heat pumps are disabled otherwise.
-</p>
-<p>
-The supply temperature setpoint is <i>3&nbsp;</i>K plus the highest
-setpoint of the active tank cycle.
-Note that no limitation of the setpoint value per HP manufacturer specification
-is taken into account.
-</p>
-<h4>CHW, HW, CWE and CWC pumps</h4>
-<p>
-The lead pump is enabled based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ValveCondenserEvaporator</a>.
-</p>
-<p>
-Pumps are staged based on the logic described in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump\">
-Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.StagingPump</a>.
-</p>
-<p>
-When any pump is enabled, the pump speed is modulated by a PI controller tracking
-a differential pressure setpoint at the boundaries of the circuit served by the pump.
-The control loop is biased to launch from <i>100&nbsp;%</i> (maximum speed).
-All pumps within the same group receive the same speed command signal.
-</p>
-<p>
-The differential pressure setpoint for the CHW and HW loops is provided as a control input.
-Ideally, a reset logic based on consumer valve requests should be implemented to adapt
-those setpoints to the demand.
-For the sake of simplicity, the differential pressure setpoint for the CWC and CWE loops
-is a fixed parameter (design pressure drop).
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Controller;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
deleted file mode 100644
index 632a3377b0e..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/ModeCondenserLoop/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Controls;
-package ModeCondenserLoop "Condenser loop operating modes"
-
-  constant Integer tankCharge = 1 "Tank Charge/Discharge";
-  constant Integer chargeAssist = 2  "Charge Assist";
-  constant Integer heatRejection = 3 "Heat Rejection";
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains constant definitions representing
-the operating modes of the condenser water loop.
-</p>
-</html>"));
-end ModeCondenserLoop;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Controls/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Controls/package.mo
deleted file mode 100644
index 75996e511f3..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Controls/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined;
-package Controls "Package of control blocks for combined plants"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains control blocks for combined heating and cooling plants.
-</p>
-</html>"));
-end Controls;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo b/Buildings/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
deleted file mode 100644
index e061e4e23ac..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mo
+++ /dev/null
@@ -1,285 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Examples;
-model AllElectricCWStorage
-  "Validation of all-electric plant model with buildings loads"
-  extends Modelica.Icons.Example;
-
-  replaceable package Medium=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Main medium (common to CHW, HW and CW)";
-  replaceable package MediumConWatCoo=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Medium in cooler circuit";
-
-  parameter String filNam[2]={"modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos",
-                              "modelica://Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos"}
-    "Path to file with timeseries loads";
-  parameter Modelica.Units.SI.Temperature TSetDisSupHea = 273.15+60 "District heating supply temperature set point";
-  parameter Modelica.Units.SI.Temperature TSetDisSupCoo = 273.15+6 "District cooling supply temperature set point";
-
-  replaceable parameter
-    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD datChi(
-      EIRFunT={0.0101739374, 0.0607200115, 0.0003348647, 0.003162578, 0.0002388594, -0.0014121289},
-      capFunT={0.0387084662, 0.2305017927, 0.0004779504, 0.0178244359, -8.48808e-05, -0.0032406711},
-      EIRFunPLR={0.4304252832, -0.0144718912, 5.12039e-05, -0.7562386674, 0.5661683373,
-        0.0406987748, 3.0278e-06, -0.3413411197, -0.000469572, 0.0055009208},
-    QEva_flow_nominal=sum(loaCoo.QCoo_flow_nominal)/pla.nChi,
-      COP_nominal=2.5,
-    mEva_flow_nominal=-datChi.QEva_flow_nominal/5/4186,
-      mCon_flow_nominal=-datChi.QEva_flow_nominal * (1 + 1/datChi.COP_nominal) / 10 / 4186,
-    TEvaLvg_nominal=TSetDisSupCoo,
-    TEvaLvgMin=277.15,
-    TEvaLvgMax=308.15,
-    TConLvg_nominal=TSetDisSupHea,
-    TConLvgMin=296.15,
-    TConLvgMax=336.15)
-    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
-    "Chiller parameters (each unit)"
-    annotation (
-      Dialog(group="CHW loop and cooling-only chillers"),
-      Placement(transformation(extent={{140,200},{160,220}})));
-  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChiHea = datChi
-    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
-    "Chiller parameters (each unit)"
-    annotation (
-      Dialog(group="HW loop and heat recovery chillers"),
-      Placement(transformation(extent={{170,200},{190,220}})));
-  replaceable parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic datHeaPum(
-    dpHeaLoa_nominal=50000,
-    dpHeaSou_nominal=100,
-    hea(
-      mLoa_flow=datHeaPum.hea.Q_flow/10/4186,
-      mSou_flow=1E-4*datHeaPum.hea.Q_flow,
-      Q_flow=sum(loaHea.QHea_flow_nominal)/pla.nHeaPum,
-      P=datHeaPum.hea.Q_flow/2.2,
-      coeQ={-5.64420084,1.95212447,9.96663913,0.23316322,-5.64420084},
-      coeP={-3.96682255,6.8419453,1.99606939,0.01393387,-3.96682255},
-      TRefLoa=298.15,
-      TRefSou=253.15),
-    coo(
-      mLoa_flow=0,
-      mSou_flow=0,
-      Q_flow=-1,
-      P=0,
-      coeQ=fill(0, 5),
-      coeP=fill(0, 5),
-      TRefLoa=273.15,
-      TRefSou=273.15))
-    "Heat pump parameters (each unit)"
-    annotation (Placement(transformation(extent={{200,200},{220,220}})));
-
-  // Assumptions
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
-    Modelica.Fluid.Types.Dynamics.FixedInitial
-    "Type of energy balance: dynamic (3 initialization options) or steady state"
-    annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
-
-  Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage pla(
-    redeclare final package Medium = Medium,
-    redeclare package MediumHea_b = Medium,
-    redeclare final package MediumConWatCoo = MediumConWatCoo,
-    allowFlowReversal=true,
-    dpConWatCooFri_nominal=1E4,
-    mAirCooUni_flow_nominal=pla.mConWatCoo_flow_nominal/pla.nCoo/1.45,
-    TWetBulCooEnt_nominal=297.05,
-    PFanCoo_nominal=340*pla.mConWatCoo_flow_nominal/pla.nCoo,
-    chi(show_T=true),
-    chiHea(show_T=true),
-    heaPum(show_T=true),
-    final datChi=datChi,
-    final datChiHea=datChiHea,
-    final datHeaPum=datHeaPum,
-    nChi=2,
-    dpChiWatSet_max=(sum(disCoo.lDis) + disCoo.lEnd)*disCoo.dp_length_nominal,
-    nChiHea=2,
-    dpHeaWatSet_max=(sum(disHea.lDis) + disHea.lEnd)*disHea.dp_length_nominal,
-    nHeaPum=2,
-    dInsTan=0.05,
-    nCoo=3,
-    final energyDynamics=energyDynamics)
-    "CHW and HW plant"
-    annotation (Placement(transformation(extent={{-30,-30},{30,30}})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(final k=pla.TChiWatSup_nominal,
-    y(final unit="K", displayUnit="degC"))
-                   "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-220,10},{-200,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(final k=pla.THeaWatSup_nominal,
-    y(final unit="K", displayUnit="degC"))
-                   "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-190,-10},{-170,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpHeaWatSet_max(
-    k=pla.dpHeaWatSet_max,
-    y(final unit="Pa")) "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpChiWatSet_max(
-    k=pla.dpChiWatSet_max,
-    y(final unit="Pa")) "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-220,-50},{-200,-30}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
-        Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
-    "Outdoor conditions"
-    annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-210,120})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet[2](each k=pla.TChiWatRet_nominal)
-    "Source signal for CHW return temperature"
-    annotation (Placement(transformation(extent={{-190,-110},{-170,-90}})));
-  Loads.Heating.BuildingTimeSeriesWithETS loaHea[2](
-    each THeaWatSup_nominal=pla.THeaWatSup_nominal,
-    filNam=filNam)                     "Building heating load"
-    annotation (Placement(transformation(extent={{10,100},{-10,120}})));
-    // dpCheVal_nominal to avoid too hot water in building waterr supply due to problem of temperature drop in Dymola
-  Loads.Cooling.BuildingTimeSeriesWithETS loaCoo[2](
-    each TChiWatSup_nominal=pla.TChiWatSup_nominal,
-    filNam=filNam,
-    each bui(w_aLoaCoo_nominal=0.015)) "Building cooling load"
-    annotation (Placement(transformation(extent={{10,-130},{-10,-110}})));
-    // dpCheVal_nominal to avoid freezing in building waterr supply due to problem of temperature drop in Dymola
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet[2](each k=pla.THeaWatRet_nominal)
-    "Source signal for HW return temperature"
-    annotation (Placement(transformation(extent={{-190,40},{-170,60}})));
-  Buildings.Controls.OBC.CDL.Logical.Not
-                               onPla "On signal for the plant"
-    annotation (Placement(transformation(extent={{-64,146},{-44,166}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer
-                                 tim(t=3600)
-    annotation (Placement(transformation(extent={{-104,154},{-84,174}})));
-  Buildings.Controls.OBC.CDL.Reals.LessThreshold offHea(t=1e-4)
-    "Threshold comparison to disable the plant"
-    annotation (Placement(transformation(extent={{-144,154},{-124,174}})));
-  Modelica.Blocks.Math.Gain norQFloHea(k=1/sum(loaHea.QHea_flow_nominal))
-    "Normalized Q_flow"
-    annotation (Placement(transformation(extent={{-184,154},{-164,174}})));
-  Buildings.Controls.OBC.CDL.Logical.Not
-                               onPla1
-                                     "On signal for the plant"
-    annotation (Placement(transformation(extent={{-26,-198},{-6,-178}})));
-  Buildings.Controls.OBC.CDL.Logical.Timer
-                                 tim1(t=3600)
-    annotation (Placement(transformation(extent={{-66,-190},{-46,-170}})));
-  Buildings.Controls.OBC.CDL.Reals.LessThreshold offCoo1(t=1e-4)
-    "Threshold comparison to disable the plant"
-    annotation (Placement(transformation(extent={{-106,-190},{-86,-170}})));
-  Modelica.Blocks.Math.Gain norQFloCoo(k=1/sum(loaCoo.QCoo_flow_nominal))
-    "Normalized Q_flow"
-    annotation (Placement(transformation(extent={{-146,-190},{-126,-170}})));
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R disHea(
-    redeclare final package Medium = Medium,
-    nCon=2,
-    allowFlowReversal=false,
-    mDis_flow_nominal=sum(loaHea.mBui_flow_nominal),
-    mCon_flow_nominal={loaHea[1].mBui_flow_nominal,loaHea[2].mBui_flow_nominal},
-
-    mEnd_flow_nominal=sum(loaHea.mBui_flow_nominal),
-    lDis={800,200},
-    lEnd=200) "Distribution network for district heating system"
-    annotation (Placement(transformation(extent={{20,62},{-20,82}})));
-
-  Buildings.Experimental.DHC.Networks.Distribution2Pipe_R disCoo(
-    redeclare final package Medium = Medium,
-    nCon=2,
-    allowFlowReversal=false,
-    mDis_flow_nominal=sum(loaCoo.mBui_flow_nominal),
-    mCon_flow_nominal={loaCoo[1].mBui_flow_nominal,loaCoo[2].mBui_flow_nominal},
-
-    mEnd_flow_nominal=sum(loaCoo.mBui_flow_nominal),
-    lDis={80,20},
-    lEnd=20) "Distribution network for district cooling system"
-    annotation (Placement(transformation(extent={{20,-60},{-20,-80}})));
-
-  Modelica.Blocks.Math.Sum QTotHea_flow(nin=2)
-    "Total heating flow rate for all buildings "
-    annotation (Placement(transformation(extent={{-60,120},{-80,140}})));
-  Modelica.Blocks.Math.Sum QTotCoo_flow(nin=2)
-    "Total cooling flow rate for all buildings "
-    annotation (Placement(transformation(extent={{-82,-150},{-102,-130}})));
-equation
-  connect(TChiWatSupSet.y, pla.TChiWatSupSet) annotation (Line(points={{-198,20},
-          {-34,20}},                   color={0,0,127}));
-  connect(THeaWatSupSet.y, pla.THeaWatSupSet) annotation (Line(points={{-168,0},
-          {-74,0},{-74,16},{-34,16}},   color={0,0,127}));
-  connect(dpChiWatSet_max.y, pla.dpChiWatSet) annotation (Line(points={{-198,-40},
-          {-70,-40},{-70,12},{-34,12}},color={0,0,127}));
-  connect(dpHeaWatSet_max.y, pla.dpHeaWatSet) annotation (Line(points={{-168,-60},
-          {-66,-60},{-66,8},{-34,8}},   color={0,0,127}));
-
-  connect(weaDat.weaBus, pla.weaBus) annotation (Line(
-      points={{-200,120},{-100,120},{-100,40},{0,40},{0,30}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(norQFloHea.y,offHea. u)
-    annotation (Line(points={{-163,164},{-146,164}}, color={0,0,127}));
-  connect(offHea.y, tim.u)
-    annotation (Line(points={{-122,164},{-106,164}}, color={255,0,255}));
-  connect(tim.passed, onPla.u)
-    annotation (Line(points={{-82,156},{-66,156}}, color={255,0,255}));
-  connect(onPla.y, pla.u1Hea) annotation (Line(points={{-42,156},{-38,156},{-38,
-          24},{-34,24}},                     color={255,0,255}));
-  connect(tim1.passed, onPla1.u)
-    annotation (Line(points={{-44,-188},{-40,-188},{-40,-190},{-36,-190},{-36,-188},
-          {-28,-188}},                               color={255,0,255}));
-  connect(offCoo1.y, tim1.u)
-    annotation (Line(points={{-84,-180},{-80,-180},{-80,-182},{-76,-182},{-76,-180},
-          {-68,-180}},                               color={255,0,255}));
-  connect(norQFloCoo.y, offCoo1.u)
-    annotation (Line(points={{-125,-180},{-120,-180},{-120,-182},{-116,-182},{-116,
-          -180},{-108,-180}},                          color={0,0,127}));
-  connect(onPla1.y, pla.u1Coo) annotation (Line(points={{-4,-188},{8,-188},{8,-150},
-          {-54,-150},{-54,28},{-34,28}}, color={255,0,255}));
-  connect(pla.port_bSerHea, disHea.port_aDisSup) annotation (Line(points={{30,0},
-          {40,0},{40,72},{20,72}}, color={0,127,255}));
-  connect(disHea.port_bDisRet, pla.port_aSerHea) annotation (Line(points={{20,66},
-          {30,66},{30,50},{-40,50},{-40,0},{-30,0}}, color={0,127,255}));
-  connect(disCoo.port_aDisSup, pla.port_bSerCoo) annotation (Line(points={{20,-70},
-          {40,-70},{40,-4},{30,-4}}, color={0,127,255}));
-  connect(disCoo.port_bDisRet, pla.port_aSerCoo) annotation (Line(points={{20,-64},
-          {30,-64},{30,-46},{-40,-46},{-40,-4},{-30,-4}}, color={0,127,255}));
-  connect(disCoo.ports_aCon, loaCoo.port_bSerCoo) annotation (Line(points={{-12,
-          -80},{-12,-92},{-32,-92},{-32,-128},{-10,-128}}, color={0,127,255}));
-  connect(disCoo.ports_bCon, loaCoo.port_aSerCoo) annotation (Line(points={{12,-80},
-          {12,-92},{30,-92},{30,-128},{10,-128}}, color={0,127,255}));
-  connect(disHea.ports_bCon, loaHea.port_aSerHea) annotation (Line(points={{12,82},
-          {12,92},{32,92},{32,106},{10,106}}, color={0,127,255}));
-  connect(loaHea.port_bSerHea, disHea.ports_aCon) annotation (Line(points={{-10,
-          106},{-32,106},{-32,90},{-12,90},{-12,82}}, color={0,127,255}));
-  connect(QTotHea_flow.y, norQFloHea.u) annotation (Line(points={{-81,130},{-194,
-          130},{-194,164},{-186,164}}, color={0,0,127}));
-  connect(loaCoo.QCoo_flow, QTotCoo_flow.u) annotation (Line(points={{-7,-132},{
-          -8,-132},{-8,-140},{-80,-140}}, color={0,0,127}));
-  connect(QTotCoo_flow.y, norQFloCoo.u) annotation (Line(points={{-103,-140},{-160,
-          -140},{-160,-180},{-148,-180}}, color={0,0,127}));
-  connect(loaHea.QHea_flow, QTotHea_flow.u) annotation (Line(points={{-5,98},{-4,
-          98},{-4,94},{-50,94},{-50,130},{-58,130}}, color={0,0,127}));
-  connect(TChiWatRet.y,loaCoo.TDisRetSet)  annotation (Line(points={{-168,-100},
-          {20,-100},{20,-113},{11,-113}}, color={0,0,127}));
-  connect(THeaWatRet.y,loaHea.TDisRetSet)  annotation (Line(points={{-168,50},{-44,
-          50},{-44,126},{20,126},{20,117},{11,117}}, color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos"
-      "Simulate and plot"),
-    experiment(
-      StartTime=3024000,
-      StopTime=3456000,
-      Tolerance=1e-06),
-  Diagram(coordinateSystem(extent={{-240,-240},{240,240}})),
-    Documentation(info="<html>
-<p>
-This model uses
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage\">
-Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage</a>
-to provide heating and cooling to two identical buildings with heating and cooling
-loads provided as time series.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-April 7, 2023, by David Blum:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end AllElectricCWStorage;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Examples/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Examples/package.mo
deleted file mode 100644
index c5b6b00876b..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Examples/package.mo
+++ /dev/null
@@ -1,4 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined;
-package Examples "This package holds example models using plants providing district heating and cooling"
-  extends Modelica.Icons.ExamplesPackage;
-end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
deleted file mode 100644
index deb11cafe87..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/PartialMultiplePumps.mo
+++ /dev/null
@@ -1,265 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses;
-partial model PartialMultiplePumps
-  "Base class for modeling multiple identical pumps in parallel"
-  extends Buildings.Fluid.Interfaces.LumpedVolumeDeclarations(
-    final massDynamics=energyDynamics,
-    final mSenFac=1);
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    final m_flow_nominal(final min=Modelica.Constants.small)=nPum * mPum_flow_nominal,
-    show_T=false,
-    port_a(
-      h_outflow(start=h_outflow_start)),
-    port_b(
-      h_outflow(start=h_outflow_start),
-      p(start=p_start),
-      final m_flow(max = if allowFlowReversal then +Modelica.Constants.inf else 0)));
-
-  parameter Integer nPum(
-    final min=1,
-    start=1)
-    "Number of pumps"
-    annotation(Evaluate=true);
-  parameter Boolean have_var = true
-    "Set to true for variable speed pumps, false for constant speed"
-    annotation(Evaluate=true);
-  parameter Boolean have_valve = true
-    "Set to true for inline check valve"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.MassFlowRate mPum_flow_nominal
-    "Design mass flow rate (each pump)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpPum_nominal(
-    displayUnit="Pa")
-    "Design head (each pump)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpValve_nominal(
-    displayUnit="Pa")=10000
-    "Pressure drop of check valve fully open"
-    annotation(Dialog(group="Nominal condition", enable=have_valve));
-  replaceable parameter Fluid.Movers.Data.Generic per
-    constrainedby Buildings.Fluid.Movers.Data.Generic(
-      pressure(
-        V_flow={0, 1, 2} * mPum_flow_nominal / rho_default,
-        dp={1.14, 1, 0.42} * dpPum_nominal),
-      motorCooledByFluid=false) "Pump parameters"
-    annotation (Placement(transformation(extent={{-10,-98},{10,-78}})));
-
-  parameter Modelica.Units.SI.Time tau=1
-    "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
-    annotation (Dialog(
-      tab="Dynamics",
-      group="Nominal condition",
-      enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
-
-  // Classes used to implement the filtered speed
-  parameter Boolean use_inputFilter=true
-    "= true, if speed is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered speed"));
-  parameter Modelica.Units.SI.Time riseTime=30
-    "Rise time of the filter (time to reach 99.6 % of the speed)" annotation (
-      Dialog(
-      tab="Dynamics",
-      group="Filtered speed",
-      enable=use_inputFilter));
-  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
-    "Type of initialization (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Filtered speed",enable=use_inputFilter));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nPum]
-    "Start signal (VFD Run or motor starter contact)"
-    annotation (Placement(
-        transformation(extent={{-140,80},{-100,120}}), iconTransformation(
-          extent={{-140,60},{-100,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(final unit="W")
-    "Total power (all pumps)"
-    annotation (Placement(transformation(extent={{100,20},{140,60}}),
-        iconTransformation(extent={{100,20},{140,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1_actual[nPum]
-    "Pump status"
-    annotation (Placement(transformation(extent={{100,80},{140,
-            120}}), iconTransformation(extent={{100,60},{140,100}})));
-
-  Fluid.BaseClasses.MassFlowRateMultiplier mulOut(
-    redeclare final package Medium=Medium,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulInl(
-    redeclare final package Medium=Medium,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  replaceable Fluid.Movers.SpeedControlled_y pum
-    constrainedby Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine(
-    redeclare final package Medium=Medium,
-    final tau=tau,
-    final show_T=show_T,
-    final allowFlowReversal=allowFlowReversal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final riseTime=riseTime,
-    final init=init,
-    final per=per,
-    addPowerToMedium=false) "Pump"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nPum)
-    "Convert command signal"
-    annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
-
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
-    "Convert to real"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={10,100})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply mul "Compute total power"
-    annotation (Placement(transformation(extent={{60,30},{80,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply inp
-    "Compute pump input signal" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={0,40})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant cst
-               if not have_var "Constant setpoint"
-    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
-  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isOpe(t=1E-2, h=0.5E-2)
-    "Evaluate if pump is operating"
-    annotation (Placement(transformation(extent={{30,-70},{50,-50}})));
-  Fluid.FixedResistances.CheckValve cheVal(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=mPum_flow_nominal,
-    final dpValve_nominal=dpValve_nominal,
-    final show_T=show_T,
-    final allowFlowReversal=allowFlowReversal) if have_valve
-    "Check valve (optional)"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-  PassThroughFluid pas(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal) if not have_valve
-    "Direct fluid pass-through (case without check valve)"
-    annotation (Placement(transformation(extent={{30,-30},{50,-10}})));
-  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep(
-    final nout=nPum)
-    "Replicate"
-    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
-  Buildings.Controls.OBC.CDL.Logical.Pre preY1[nPum]
-    "Left limit of signal avoiding direct feedback of status to controller"
-    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
-protected
-  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-      T=Medium.T_default,
-      p=Medium.p_default,
-      X=Medium.X_default)
-    "State of the medium at the medium default properties";
-  parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
-    "Density at the medium default properties";
-  final parameter Medium.ThermodynamicState sta_start=Medium.setState_pTX(
-    T=T_start,
-    p=p_start,
-    X=X_start)
-    "Medium state at start values";
-  final parameter Modelica.Units.SI.SpecificEnthalpy h_outflow_start=
-    Medium.specificEnthalpy(sta_start)
-    "Start value for outflowing enthalpy";
-equation
-  connect(mulOut.port_b, port_b)
-    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
-  connect(port_a, mulInl.port_a)
-    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
-  connect(mulOut.uInv, mulInl.u) annotation (Line(points={{81,6},{88,6},{88,-26},
-          {-90,-26},{-90,6},{-82,6}},color={0,0,127}));
-  connect(mulInl.port_b, pum.port_a)
-    annotation (Line(points={{-60,0},{-10,0}}, color={0,127,255}));
-  connect(com.nUniOnBou, mulOut.u) annotation (Line(points={{-28,94},{-20,94},{
-          -20,80},{54,80},{54,6},{58,6}},
-                      color={0,0,127}));
-  connect(com.y1One, booToRea.u)
-    annotation (Line(points={{-28,106},{-10,106},{-10,100},{-2,100}},
-                                                   color={255,0,255}));
-  connect(mul.y, P)
-    annotation (Line(points={{82,40},{120,40}}, color={0,0,127}));
-  connect(com.nUniOn, mul.u1) annotation (Line(points={{-28,100},{-18,100},{-18,
-          82},{56,82},{56,46},{58,46}},
-                    color={0,0,127}));
-  connect(pum.P, mul.u2) annotation (Line(points={{11,9},{20,9},{20,34},{58,34}},
-                color={0,0,127}));
-  connect(pum.port_b, cheVal.port_a)
-    annotation (Line(points={{10,0},{30,0}}, color={0,127,255}));
-  connect(cheVal.port_b, mulOut.port_a)
-    annotation (Line(points={{50,0},{60,0}}, color={0,127,255}));
-  connect(cst.y, inp.u1) annotation (Line(points={{-58,30},{-40,30},{-40,60},{
-          -6,60},{-6,52}},
-                color={0,0,127}));
-  connect(booToRea.y, inp.u2) annotation (Line(points={{22,100},{40,100},{40,60},
-          {6,60},{6,52}},
-                     color={0,0,127}));
-  connect(pum.port_b, pas.port_a)
-    annotation (Line(points={{10,0},{30,0},{30,-20}}, color={0,127,255}));
-  connect(pas.port_b, mulOut.port_a)
-    annotation (Line(points={{50,-20},{50,0},{60,0}}, color={0,127,255}));
-  connect(pum.y_actual, isOpe.u) annotation (Line(points={{11,7},{20,7},{20,-60},
-          {28,-60}}, color={0,0,127}));
-  connect(isOpe.y, rep.u)
-    annotation (Line(points={{52,-60},{58,-60}}, color={255,0,255}));
-  connect(y1, preY1.u) annotation (Line(points={{-120,100},{-82,100}},
-                                     color={255,0,255}));
-  connect(preY1.y, com.y1)
-    annotation (Line(points={{-58,100},{-52,100}}, color={255,0,255}));
-  connect(rep.y, y1_actual) annotation (Line(points={{82,-60},{92,-60},{92,100},
-          {120,100}}, color={255,0,255}));
-  annotation (
-    defaultComponentName="pum",
-    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
-            100}}),                                   graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-100,16},{100,-16}},
-          lineColor={0,0,0},
-          fillColor={0,127,255},
-          fillPattern=FillPattern.HorizontalCylinder),
-        Ellipse(
-          extent={{-58,58},{58,-58}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.Sphere,
-          fillColor={0,100,199}),
-        Ellipse(
-          extent={{4,16},{36,-16}},
-          lineColor={0,0,0},
-          fillPattern=FillPattern.Sphere,
-          visible=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState,
-          fillColor={0,100,199}),
-        Polygon(
-          points={{0,50},{0,-50},{54,0},{0,50}},
-          lineColor={0,0,0},
-          pattern=LinePattern.None,
-          fillPattern=FillPattern.HorizontalCylinder,
-          fillColor={255,255,255})}),                            Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-120},{100,120}})),
-    Documentation(info="<html>
-<p>
-This base class represents multiple identical pumps that are piped in parallel.
-An optional check valve in series with each pump is included.
-This class is used to construct the various multiple-pump models within
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems</a>.
-</p>
-<h4>Details</h4>
-<p>
-In a parallel arrangement, all operating units have the same operating point.
-This allows modeling the multiple pumps with a single instance of any
-class derived from
-<a href=\"modelica://Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine\">
-Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</a>.
-Hydronics are resolved with mass flow rate multiplier components.
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PartialMultiplePumps;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
deleted file mode 100644
index 5721171cc44..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/BaseClasses/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used
-to construct subsystem models.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
deleted file mode 100644
index e955a5ebb4d..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerGroup.mo
+++ /dev/null
@@ -1,545 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model ChillerGroup
-  "Model of multiple identical chillers in parallel"
-  extends Buildings.Fluid.Interfaces.PartialFourPortInterface(
-    final m1_flow_nominal = mConWat_flow_nominal,
-    final m2_flow_nominal = mChiWat_flow_nominal);
-
-  parameter Integer nUni(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation(Evaluate=true);
-  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
-    dat.TEvaLvg_nominal
-    "Design (minimum) CHW supply temperature";
-  final parameter Modelica.Units.SI.Temperature TConWatLvg_nominal=
-    dat.TConLvg_nominal
-    "Design (maximum) CW leaving temperature";
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWatUni_flow_nominal=
-    dat.QEva_flow_nominal
-    "Design cooling heat flow rate (each unit, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QConWatUni_flow_nominal=
-    -dat.QEva_flow_nominal * (1 + 1 / dat.COP_nominal * dat.etaMotor)
-    "Design CW heat flow rate (each unit, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
-    nUni * QChiWatUni_flow_nominal
-    "Design cooling heat flow rate (all units, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QConWat_flow_nominal=
-    nUni * QConWatUni_flow_nominal
-    "Design CW heat flow rate (all units, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mChiWatUni_flow_nominal(
-    final min=0)=dat.mEva_flow_nominal
-    "Design chiller CHW mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWatUni_flow_nominal(
-    final min=0)=dat.mCon_flow_nominal
-    "Design chiller CW mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
-    final min=0)=nUni * mChiWatUni_flow_nominal
-    "Design CHW mass flow rate (all units)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWat_flow_nominal(
-    final min=0)=nUni * mConWatUni_flow_nominal
-    "Design CW mass flow rate (all units)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
-    "Design chiller evaporator pressure drop (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
-    "Chiller condenser design pressure drop (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-
-  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic dat
-    "Chiller parameters (each unit)"
-    annotation (Placement(transformation(extent={{-10,-134},{10,-114}})));
-
-  // Assumptions
-  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 use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
-    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening"));
-  parameter Modelica.Units.SI.Time riseTime=120
-    "Rise time of the filter (time to reach 99.6 % of an opening step)"
-    annotation (Dialog(
-      tab="Dynamics",
-      group="Filtered opening",
-      enable=use_inputFilter));
-  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
-    "Type of initialization (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
-  parameter Real y_start=1 "Initial position of actuator"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
-    "Chiller On/Off command"
-    annotation (Placement(transformation(extent={{-140,
-            100},{-100,140}}), iconTransformation(extent={{-140,70},{-100,110}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSet(
-    final unit="K", displayUnit="degC")
-    "Supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-140,-110},{-100,-70}}),
-      iconTransformation(extent={{-140,-110},{-100, -70}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
-    final unit="W")
-    "Power drawn"
-    annotation (Placement(transformation(extent={{100,0},{140,40}}),
-      iconTransformation(extent={{100,70},{140,110}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValCon[nUni](
-    each final unit="1", each final min=0, each final max=1)
-    "Chiller condenser isolation valve commanded position"
-    annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={0,178}),  iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={-60,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValEva[nUni](
-    each final unit="1", each final min=0, each final max=1)
-    "Chiller evaporator isolation valve commanded position"
-    annotation (
-      Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={0,-180}),   iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={-58,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConLvg[nUni](each final
-      unit="K", each displayUnit="degC")
-    "Chiller condenser leaving temperature" annotation (Placement(
-        transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={40,180}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={60,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mCon_flow[nUni](
-    each final unit="kg/s")
-    "Chiller condenser barrel mass flow rate" annotation (
-      Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={60,180}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={80,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TEvaLvg[nUni](each final
-      unit="K", each displayUnit="degC")
-    "Chiller evaporator leaving temperature" annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={40,-180}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={60,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mEva_flow[nUni](
-    each final unit="kg/s")
-    "Chiller evaporator barrel mass flow rate" annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={60,-180}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={80,-120})));
-
-  Fluid.Chillers.ElectricReformulatedEIR chi(
-    PLR1(start=0),
-    final per=dat,
-    redeclare final package Medium1=Medium1,
-    redeclare final package Medium2=Medium2,
-    final have_switchover=false,
-    final dp1_nominal=0,
-    final dp2_nominal=0,
-    final allowFlowReversal1=allowFlowReversal1,
-    final allowFlowReversal2=allowFlowReversal2,
-    final energyDynamics=energyDynamics,
-    final show_T=show_T) "Chiller"
-    annotation (Placement(transformation(extent={{-4,-10},{16,10}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulConInl(
-    redeclare final package Medium = Medium1,
-    final allowFlowReversal=allowFlowReversal1,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulConOut(
-    redeclare final package Medium = Medium1,
-    final allowFlowReversal=allowFlowReversal1,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{30,50},{50,70}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulEvaInl(
-    redeclare final package Medium = Medium2,
-    final allowFlowReversal=allowFlowReversal2,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{50,-70},{30,-50}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulEvaOut(
-    redeclare final package Medium = Medium2,
-    final allowFlowReversal=allowFlowReversal2,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{-30,-70},{-50,-50}})));
-  Buildings.Templates.Components.Controls.MultipleCommands com(
-    final nUni=nUni)
-    "Convert command signals"
-    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
-  BaseClasses.MultipleValves valEva(
-    redeclare final package Medium = Medium2,
-    redeclare final Buildings.Fluid.Actuators.Valves.TwoWayLinear val,
-    linearized=true,
-    final nUni=nUni,
-    final mUni_flow_nominal=mChiWatUni_flow_nominal,
-    final dpFixed_nominal=dpEva_nominal,
-    dpValve_nominal=1E3,
-    final allowFlowReversal=allowFlowReversal2,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final riseTime=riseTime,
-    final init=init,
-    final y_start=y_start,
-    final show_T=show_T)
-    "Chiller evaporator isolation valves"
-    annotation (Placement(transformation(extent={{-70,-50},{-90,-70}})));
-  BaseClasses.MultipleValves valCon(
-    redeclare final package Medium = Medium1,
-    redeclare final Buildings.Fluid.Actuators.Valves.TwoWayLinear val,
-    linearized=true,
-    final nUni=nUni,
-    final mUni_flow_nominal=mConWatUni_flow_nominal,
-    final dpFixed_nominal=dpCon_nominal,
-    dpValve_nominal=1E3,
-    final allowFlowReversal=allowFlowReversal1,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final riseTime=riseTime,
-    final init=init,
-    final y_start=y_start,
-    final show_T=show_T)
-    "Chiller condenser isolation valves"
-    annotation (Placement(transformation(extent={{70,50},{90,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
-    annotation (Placement(transformation(extent={{70,30},{90,10}})));
-  Fluid.Sensors.TemperatureTwoPort temConLvg(
-    redeclare final package Medium = Medium1,
-    final m_flow_nominal=mConWatUni_flow_nominal,
-    final allowFlowReversal=allowFlowReversal1)
-    "Chiller condenser leaving temperature" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={20,20})));
-  Fluid.Sensors.TemperatureTwoPort temEvaLvg(
-    redeclare final package Medium = Medium2,
-    final m_flow_nominal=mChiWatUni_flow_nominal,
-    final allowFlowReversal=allowFlowReversal2)
-    "Chiller evaporator leaving temperature" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={-20,-20})));
-  Fluid.Sensors.MassFlowRate floCon(
-    redeclare final package Medium =Medium1,
-    final allowFlowReversal=allowFlowReversal1)
-    "Chiller condenser barrel mass flow rate"
-    annotation (Placement(
-        transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={20,40})));
-  Fluid.Sensors.MassFlowRate floEva(
-    redeclare final package Medium =Medium2,
-    final allowFlowReversal=allowFlowReversal2)
-    "Chiller evaporator barrel mass flow rate"
-    annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={-20,-40})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(nout=nUni)
-    "Replicate" annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={40,140})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep1(nout=nUni)
-    "Replicate" annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={60,140})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep2(nout=nUni)
-    "Replicate" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={60,-140})));
-  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep3(nout=nUni)
-    "Replicate" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={40,-140})));
-equation
-  connect(mulEvaInl.port_b,chi. port_a2)
-    annotation (Line(points={{30,-60},{20,-60},{20,-6},{16,-6}},
-    color={0,127,255}));
-  connect(TSet,chi. TSet) annotation (Line(points={{-120,-90},{-10,-90},{-10,-3},
-          {-6,-3}},  color={0,0,127}));
-  connect(mulConOut.uInv, mulConInl.u) annotation (Line(points={{51,66},{54,66},
-          {54,80},{-54,80},{-54,66},{-52,66}}, color={0,0,127}));
-  connect(mulEvaOut.uInv, mulEvaInl.u) annotation (Line(points={{-51,-54},{-54,-54},
-          {-54,-80},{56,-80},{56,-54},{52,-54}}, color={0,0,127}));
-  connect(port_a1, mulConInl.port_a)
-    annotation (Line(points={{-100,60},{-50,60}}, color={0,127,255}));
-  connect(port_a2, mulEvaInl.port_a)
-    annotation (Line(points={{100,-60},{50,-60}}, color={0,127,255}));
-  connect(port_b2, valEva.port_b)
-    annotation (Line(points={{-100,-60},{-90,-60}}, color={0,127,255}));
-  connect(mulEvaOut.port_b, valEva.port_a)
-    annotation (Line(points={{-50,-60},{-70,-60}}, color={0,127,255}));
-  connect(y1, com.y1) annotation (Line(points={{-120,120},{-82,120}},
-                     color={255,0,255}));
-  connect(chi.P, mulP.u1) annotation (Line(points={{17,9},{60,9},{60,14},{68,14}},
-                 color={0,0,127}));
-  connect(com.nUniOn, mulP.u2) annotation (Line(points={{-58,120},{56,120},{56,
-          26},{68,26}},     color={0,0,127}));
-  connect(yValCon, valCon.y) annotation (Line(points={{0,178},{0,122},{64,122},
-          {64,66},{68,66}}, color={0,0,127}));
-  connect(yValEva, valEva.y) annotation (Line(points={{0,-180},{0,-140},{-60,
-          -140},{-60,-66},{-68,-66}}, color={0,0,127}));
-
-  connect(mulConInl.port_b,chi. port_a1) annotation (Line(points={{-30,60},{-20,
-          60},{-20,6},{-4,6}},  color={0,127,255}));
-  connect(mulP.y, P)
-    annotation (Line(points={{92,20},{120,20}}, color={0,0,127}));
-  connect(com.nUniOnBou, mulConOut.u) annotation (Line(points={{-58,114},{20,114},
-          {20,66},{28,66}},      color={0,0,127}));
-  connect(mulConInl.uInv, mulEvaOut.u) annotation (Line(points={{-29,66},{-24,66},
-          {-24,-54},{-28,-54}},     color={0,0,127}));
-  connect(com.y1One,chi. on) annotation (Line(points={{-58,126},{-10,126},{-10,3},
-          {-6,3}},                  color={255,0,255}));
-  connect(valCon.port_b, port_b1)
-    annotation (Line(points={{90,60},{100,60}}, color={0,127,255}));
-  connect(mulConOut.port_b, valCon.port_a)
-    annotation (Line(points={{50,60},{70,60}}, color={0,127,255}));
-  connect(temEvaLvg.port_a, chi.port_b2)
-    annotation (Line(points={{-20,-10},{-20,-6},{-4,-6}}, color={0,127,255}));
-  connect(chi.port_b1, temConLvg.port_a)
-    annotation (Line(points={{16,6},{20,6},{20,10}}, color={0,127,255}));
-  connect(temConLvg.port_b, floCon.port_a)
-    annotation (Line(points={{20,30},{20,30}}, color={0,127,255}));
-  connect(floCon.port_b, mulConOut.port_a)
-    annotation (Line(points={{20,50},{20,60},{30,60}}, color={0,127,255}));
-  connect(temEvaLvg.port_b, floEva.port_a)
-    annotation (Line(points={{-20,-30},{-20,-30}}, color={0,127,255}));
-  connect(floEva.port_b, mulEvaOut.port_a) annotation (Line(points={{-20,-50},{
-          -20,-60},{-30,-60}}, color={0,127,255}));
-  connect(rep.y, TConLvg)
-    annotation (Line(points={{40,152},{40,180}}, color={0,0,127}));
-  connect(rep1.y, mCon_flow)
-    annotation (Line(points={{60,152},{60,180}}, color={0,0,127}));
-  connect(floCon.m_flow, rep1.u)
-    annotation (Line(points={{31,40},{60,40},{60,128}}, color={0,0,127}));
-  connect(temConLvg.T, rep.u) annotation (Line(points={{9,20},{0,20},{0,100},{
-          40,100},{40,128}}, color={0,0,127}));
-  connect(rep3.y, TEvaLvg)
-    annotation (Line(points={{40,-152},{40,-180},{40,-180}}, color={0,0,127}));
-  connect(rep2.y, mEva_flow) annotation (Line(points={{60,-152},{60,-158},{60,
-          -158},{60,-180}}, color={0,0,127}));
-  connect(floEva.m_flow, rep2.u)
-    annotation (Line(points={{-9,-40},{60,-40},{60,-128}}, color={0,0,127}));
-  connect(temEvaLvg.T, rep3.u) annotation (Line(points={{-9,-20},{24,-20},{24,-120},
-          {40,-120},{40,-128}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="chi",
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-70,80},{70,-80}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,52},{-40,12}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,70},{58,52}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,12},{-32,12},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,-10},{-40,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{38,52},{42,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,-50},{58,-68}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{18,24},{62,-18}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{40,24},{22,-8},{58,-8},{40,24}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,52},{-40,12}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,70},{58,52}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,12},{-32,12},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,-10},{-40,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{38,52},{42,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,-50},{58,-68}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{18,24},{62,-18}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{40,24},{22,-8},{58,-8},{40,24}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}),                      Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-160},{100,160}})),
-    Documentation(info="<html>
-<p>
-This model represents a set of identical water-cooled compression chillers
-that are piped in parallel.
-Modulating isolation valves are included on condenser and evaporator side.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-On/Off command <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-CHW supply temperature setpoint <code>TSet</code>:
-AO signal common to all units, with a dimensionality of zero
-</li>
-<li>
-Condenser and evaporator isolation valve commanded position <code>yVal(Con|Eva)</code>:
-AO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Condenser and evaporator leaving temperature <code>T(Con|Eva)Lvg</code>:
-AI signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Condenser and evaporator mass flow rate <code>m(Con|Eva)_flow</code>:
-AI signal dedicated to each unit, with a dimensionality of one
-</li>
-</ul>
-<h4>Details</h4>
-<h5>Modeling approach</h5>
-<p>
-In a parallel arrangement, all operating units have the same operating point,
-<i>provided that the isolation valves are commanded to the same position</i>.
-This allows modeling the heat transfer through the condenser and evaporator
-barrel with a single instance of
-<a href=\"modelica://Buildings.Fluid.Chillers.ElectricReformulatedEIR\">
-Buildings.Fluid.Chillers.ElectricReformulatedEIR</a>.
-Hydronics are resolved with mass flow rate multiplier components in
-conjunction with instances of
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleValves</a>
-which represent the parallel network of valves and fixed resistances.
-</p>
-<h5>Actuators</h5>
-<p>
-By default, linear valve models are used. Those are configured with
-a pressure drop varying linearly with the flow rate, as opposed
-to the quadratic dependency usually considered for a turbulent flow
-regime.
-This is because the whole plant model contains large nonlinear systems
-of equations and this configuration limits the risk of solver failure
-while reducing the time to solution.
-This has no significant impact on the operating point of the circulation pumps
-when a control loop is used to modulate the valve opening and maintain
-the flow rate or the leaving temperature at setpoint.
-Then, whatever the modeling assumptions for the valve, the
-control loop ensures that the valve creates the adequate pressure drop
-and flow, which will simply be reached at a different valve opening
-with the above simplification.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ChillerGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
deleted file mode 100644
index 764aaf1f206..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/ChillerHeatRecoveryGroup.mo
+++ /dev/null
@@ -1,779 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model ChillerHeatRecoveryGroup
-  "Model of multiple identical heat recovery chillers in parallel"
-  extends Buildings.Fluid.Interfaces.PartialEightPortInterface(
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=Medium,
-    redeclare final package Medium3=Medium,
-    redeclare final package Medium4=Medium,
-    final m1_flow_nominal = mConWat_flow_nominal,
-    final m2_flow_nominal = mChiWat_flow_nominal,
-    final m3_flow_nominal = mConWat_flow_nominal,
-    final m4_flow_nominal = mChiWat_flow_nominal,
-    final allowFlowReversal1=allowFlowReversal,
-    final allowFlowReversal2=allowFlowReversal,
-    final allowFlowReversal3=allowFlowReversal,
-    final allowFlowReversal4=allowFlowReversal);
-
-  replaceable package Medium=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Medium model for all four fluid circuits"
-    annotation (choices(
-      choice(redeclare package Medium=Buildings.Media.Water "Water"),
-      choice(redeclare package Medium =
-            Buildings.Media.Antifreeze.PropyleneGlycolWater (
-        property_T=293.15,X_a=0.40)
-        "Propylene glycol water, 40% mass fraction")));
-
-  parameter Integer nUni(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.Temperature TCasHeaEnt_nominal=298.15
-    "Design evaporator entering temperature in cascading heating mode";
-  parameter Modelica.Units.SI.Temperature TCasCooEnt_nominal=288.15
-    "Design condenser entering temperature in cascading cooling mode";
-  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
-    dat.TEvaLvg_nominal
-    "Design (minimum) CHW supply temperature";
-  final parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=
-    dat.TConLvg_nominal
-    "Design (maximum) HW supply temperature";
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWatUni_flow_nominal=
-    dat.QEva_flow_nominal
-    "Design cooling heat flow rate (each unit, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QHeaWatUni_flow_nominal=
-    -dat.QEva_flow_nominal * (1 + 1 / dat.COP_nominal * dat.etaMotor)
-    "Design heating heat flow rate in direct heat recovery mode (each unit, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.Efficiency COPCasHea_nominal(fixed=false)
-    "Coefficient of performance in cascading heating mode";
-  final parameter Modelica.Units.SI.Efficiency COPCasCoo_nominal(fixed=false)
-    "Coefficient of performance in cascading cooling mode";
-  final parameter Modelica.Units.SI.Temperature TCasHeaLvg_nominal(fixed=false)
-    "Design value of evaporator leaving temperature in cascading heating mode";
-  final parameter Modelica.Units.SI.Temperature TCasCooLvg_nominal(fixed=false)
-    "Design value of condenser leaving temperature in cascading cooling mode";
-  final parameter Modelica.Units.SI.HeatFlowRate QEvaCasHeaUni_flow_nominal(
-    fixed=false,
-    start=QChiWatUni_flow_nominal * (1 + 2E-2 * (TCasHeaEnt_nominal -
-      (dat.TEvaLvg_nominal - QChiWatUni_flow_nominal / mChiWatUni_flow_nominal / cpCas))))
-    "Design evaporator heat flow rate in cascading heating mode (each unit, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCooUni_flow_nominal(
-    fixed=false,
-    start=QChiWatUni_flow_nominal * (1 - 2E-2 * (TCasCooEnt_nominal -
-      (dat.TConLvg_nominal - QHeaWatUni_flow_nominal / mConWatUni_flow_nominal / cpCas))))
-    "Design cooling heat flow rate in cascading cooling mode (each unit, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QHeaWatCasHeaUni_flow_nominal=
-    -QEvaCasHeaUni_flow_nominal * (1 + 1 / COPCasHea_nominal * dat.etaMotor)
-    "Design heating heat flow rate in cascading heating mode (each unit, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QConCasCooUni_flow_nominal=
-    -QChiWatCasCooUni_flow_nominal * (1 + 1 / COPCasCoo_nominal * dat.etaMotor)
-    "Design condenser heat flow rate in cascading cooling mode (each unit, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWat_flow_nominal=
-    nUni * QChiWatUni_flow_nominal
-    "Design cooling heat flow rate (all units, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QHeaWat_flow_nominal=
-    nUni * QHeaWatUni_flow_nominal
-    "Design heating heat flow rate (all units, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QEvaCasHea_flow_nominal=
-    nUni * QEvaCasHeaUni_flow_nominal
-    "Design evaporator heat flow rate in cascading heating mode (all units, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QChiWatCasCoo_flow_nominal=
-    nUni * QChiWatCasCooUni_flow_nominal
-    "Design cooling heat flow rate in cascading cooling mode (all units, <0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QHeaWatCasHea_flow_nominal=
-    nUni * QHeaWatCasHeaUni_flow_nominal
-    "Design heating heat flow rate in cascading heating mode (all units, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.HeatFlowRate QConCasCoo_flow_nominal=
-    nUni * QConCasCooUni_flow_nominal
-    "Design condenser heat flow rate in cascading cooling mode (all units, >0)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mChiWatUni_flow_nominal(
-    final min=0)=dat.mEva_flow_nominal
-    "Design CHW mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWatUni_flow_nominal(
-    final min=0)=dat.mCon_flow_nominal
-    "Design CW mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
-    final min=0)=nUni * mChiWatUni_flow_nominal
-    "Design CHW mass flow rate (all units)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWat_flow_nominal(
-    final min=0)=nUni * mConWatUni_flow_nominal
-    "Design CW mass flow rate (all units)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpEva_nominal(displayUnit="Pa")
-    "Design evaporator pressure drop (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpCon_nominal(displayUnit="Pa")
-    "Design condenser pressure drop (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-
-  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic dat
-    "Chiller parameters (each unit)"
-    annotation (Placement(transformation(extent={{-90,-120},{-70,-100}})));
-
-  // Assumptions
-  parameter Boolean allowFlowReversal = true
-    "= false to simplify equations, assuming, but not enforcing, no flow reversal"
-    annotation(Dialog(tab="Assumptions"), Evaluate=true);
-
-  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 use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
-    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening"));
-  parameter Modelica.Units.SI.Time riseTime=120
-    "Rise time of the filter (time to reach 99.6 % of an opening step)"
-    annotation (Dialog(
-      tab="Dynamics",
-      group="Filtered opening",
-      enable=use_inputFilter));
-  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
-    "Type of initialization (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
-  parameter Real y_start=1 "Initial position of actuator"
-    annotation(Dialog(tab="Dynamics", group="Filtered opening",enable=use_inputFilter));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
-    "Chiller On/Off command"
-    annotation (Placement(transformation(extent={{-140,100},{-100,140}}),
-      iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1Coo[nUni]
-    "Cooling switchover command: true for cooling, false for heating"
-    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
-      iconTransformation(extent={{-20,-20},{20,20}}, rotation=0,  origin={-120,0})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSet[nUni](
-    each final unit="K", each displayUnit="degC")
-    "Supply temperature setpoint"
-    annotation (Placement(
-      transformation(extent={{-140,-20},{-100,20}}),   iconTransformation(
-        extent={{-140,-80},{-100,-40}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValConSwi[nUni](
-    each final unit="1",
-    each final min=0,
-    each final max=1) "Chiller condenser switchover valve commanded position"
-    annotation (Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={-40,160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={-60,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValEvaSwi[nUni](
-    each final unit="1",
-    each final min=0,
-    each final max=1) "Chiller evaporator switchover valve commanded position"
-    annotation (Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={0,-160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={-60,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
-    final unit="W") "Power drawn"
-    annotation (Placement(transformation(extent={{100,100},{140,140}}),
-      iconTransformation(extent={{100,-20},{140,20}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValCon[nUni](
-    each final unit="1", each final min=0, each final max=1)
-    "Chiller condenser isolation valve commanded position"
-    annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={0,160}),  iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={-80,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput yValEva[nUni](
-    each final unit="1", each final min=0, each final max=1)
-    "Chiller evaporator isolation valve commanded position"
-    annotation (
-      Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={-40,-160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={-80,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mEva_flow[nUni](each final
-      unit="kg/s") "Chiller evaporator barrel mass flow rate" annotation (
-      Placement(transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={60,-160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={80,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TEvaLvg[nUni](
-    each final unit="K", each displayUnit="degC")
-    "Chiller evaporator leaving temperature" annotation (Placement(
-        transformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={40,-160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=-90,
-        origin={60,-120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput mCon_flow[nUni](
-    each final unit="kg/s")
-    "Chiller condenser barrel mass flow rate" annotation (
-      Placement(transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={60,160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={90,120})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConLvg[nUni](
-    each final unit="K", each displayUnit="degC")
-    "Chiller condenser leaving temperature" annotation (Placement(
-        transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={40,160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={70,120})));
-
-  Fluid.Chillers.ElectricReformulatedEIR chi[nUni](
-    PLR1(each start=0),
-    each final per=dat,
-    redeclare each final package Medium1 = Medium,
-    redeclare final package Medium2 = Medium,
-    each final have_switchover=true,
-    each final dp1_nominal=0,
-    each final dp2_nominal=0,
-    each final allowFlowReversal1=allowFlowReversal,
-    each final allowFlowReversal2=allowFlowReversal,
-    each final energyDynamics=energyDynamics,
-    each final show_T=show_T) "Chiller"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Fluid.Actuators.Valves.TwoWayLinear valCon[nUni](
-    redeclare each final package Medium = Medium,
-    each linearized=true,
-    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
-    each final m_flow_nominal=mConWatUni_flow_nominal,
-    each dpValve_nominal=1E3,
-    each final dpFixed_nominal=dpCon_nominal,
-    each final allowFlowReversal=allowFlowReversal,
-    each final use_inputFilter=use_inputFilter,
-    each final riseTime=riseTime,
-    each final init=init,
-    each final y_start=y_start) "Condenser isolation valve"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={20,80})));
-  Fluid.Actuators.Valves.TwoWayLinear valEva[nUni](
-    redeclare each final package Medium = Medium,
-    each linearized=true,
-    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
-    each final m_flow_nominal=mChiWatUni_flow_nominal,
-    each dpValve_nominal=1E3,
-    each final dpFixed_nominal=dpEva_nominal,
-    each final allowFlowReversal=allowFlowReversal,
-    each final use_inputFilter=use_inputFilter,
-    each final riseTime=riseTime,
-    each final init=init,
-    each final y_start=y_start) "Evaporator isolation valve"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={-20,-80})));
-  Fluid.FixedResistances.Junction junConWatEvaOut[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mChiWatUni_flow_nominal*{1,-1,1},
-    each final dp_nominal=fill(1E3, 3),
-    each final energyDynamics=energyDynamics,
-    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-80,-60})));
-  Fluid.FixedResistances.Junction junConWatEvaInl[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mChiWatUni_flow_nominal*{1,-1,-1},
-    each final dp_nominal=fill(1E3, 3),
-    each final energyDynamics=energyDynamics,
-    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={60,-6})));
-  Fluid.Sensors.TemperatureTwoPort temEvaLvg[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mChiWatUni_flow_nominal,
-    each final allowFlowReversal=allowFlowReversal)
-    "Chiller evaporator leaving temperature" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={-20,-20})));
-  Fluid.FixedResistances.Junction junHeaWatConInl[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mConWatUni_flow_nominal*{1,-1,-1},
-    each final dp_nominal=fill(1E3, 3),
-    each final energyDynamics=energyDynamics,
-    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Leaving) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-60,60})));
-  Fluid.FixedResistances.Junction junHeaWatConOut[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mConWatUni_flow_nominal*{1,-1,1},
-    each final dp_nominal=fill(1E3, 3),
-    each final energyDynamics=energyDynamics,
-    each final portFlowDirection_1=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_2=Modelica.Fluid.Types.PortFlowDirection.Bidirectional,
-    each final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering) "Fluid junction"
-    annotation (Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={80,60})));
-  Fluid.Sensors.TemperatureTwoPort temConEnt[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mConWatUni_flow_nominal,
-    each final allowFlowReversal=allowFlowReversal)
-    "Chiller condenser entering temperature" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-20,20})));
-  Fluid.Sensors.TemperatureTwoPort temConLvg[nUni](
-    redeclare each final package Medium = Medium,
-    each final m_flow_nominal=mConWatUni_flow_nominal,
-    each final allowFlowReversal=allowFlowReversal)
-    "Chiller condenser leaving temperature" annotation (Placement(
-        transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={20,20})));
-  Buildings.Controls.OBC.CDL.Reals.MultiSum mulSum(nin=nUni)
-    "Sum up power of all units"
-    annotation (Placement(transformation(extent={{70,110},{90,130}})));
-  Fluid.Sensors.MassFlowRate floEva[nUni](
-    redeclare each final package Medium =Medium,
-    each final allowFlowReversal=allowFlowReversal)
-    "Chiller evaporator barrel mass flow rate" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={-20,-50})));
-  Fluid.Sensors.MassFlowRate floCon[nUni](
-    redeclare each final package Medium =Medium,
-    each final allowFlowReversal=allowFlowReversal)
-    "Chiller condenser barrel mass flow rate" annotation (Placement(
-        transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={20,50})));
-  Fluid.Actuators.Valves.TwoWayLinear valConSwi[nUni](
-    redeclare each final package Medium = Medium,
-    each linearized=true,
-    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
-    each final m_flow_nominal=mConWatUni_flow_nominal,
-    each dpValve_nominal=1E3,
-    each final dpFixed_nominal=0,
-    each final allowFlowReversal=true,
-    each final use_inputFilter=use_inputFilter,
-    each final riseTime=riseTime,
-    each final init=init,
-    each final y_start=y_start) "Condenser switchover valve" annotation (
-      Placement(transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=90,
-        origin={-60,20})));
-  Fluid.Actuators.Valves.TwoWayLinear valEvaSwi[nUni](
-    redeclare each final package Medium = Medium,
-    each linearized=true,
-    each final CvData=Buildings.Fluid.Types.CvTypes.OpPoint,
-    each final m_flow_nominal=mChiWatUni_flow_nominal,
-    each dpValve_nominal=1E3,
-    each final dpFixed_nominal=0,
-    each final allowFlowReversal=true,
-    each final use_inputFilter=use_inputFilter,
-    each final riseTime=riseTime,
-    each final init=init,
-    each final y_start=y_start) "Evaporator switchover valve" annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={60,-40})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConEnt[nUni](each final
-      unit="K", each displayUnit="degC")
-    "Chiller condenser entering temperature" annotation (Placement(
-        transformation(
-        extent={{20,-20},{-20,20}},
-        rotation=-90,
-        origin={20,160}), iconTransformation(
-        extent={{-20,-20},{20,20}},
-        rotation=90,
-        origin={50,120})));
-protected
-  parameter Medium.ThermodynamicState staCas=Medium.setState_pTX(
-    T=(TCasHeaEnt_nominal + TCasCooEnt_nominal) / 2,
-    p=Medium.p_default,
-    X=Medium.X_default)
-    "State of source medium in cascading mode (at mean source temperature)";
-  parameter Modelica.Units.SI.SpecificHeatCapacity cpCas=
-    Medium.specificHeatCapacityCp(state=staCas)
-    "Heat capacity of source medium in cascading mode";
-initial equation
-  TCasHeaLvg_nominal = TCasHeaEnt_nominal +
-    QEvaCasHeaUni_flow_nominal / cpCas / mConWatUni_flow_nominal;
-  TCasCooLvg_nominal = TCasCooEnt_nominal +
-    QConCasCooUni_flow_nominal / cpCas / mConWatUni_flow_nominal;
-  QEvaCasHeaUni_flow_nominal = dat.QEva_flow_nominal *
-    Buildings.Utilities.Math.Functions.biquadratic(
-      a=dat.capFunT,
-      x1=Modelica.Units.Conversions.to_degC(TCasHeaLvg_nominal),
-      x2=Modelica.Units.Conversions.to_degC(THeaWatSup_nominal));
-  QChiWatCasCooUni_flow_nominal = dat.QEva_flow_nominal *
-    Buildings.Utilities.Math.Functions.biquadratic(
-      a=dat.capFunT,
-      x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
-      x2=Modelica.Units.Conversions.to_degC(TCasCooLvg_nominal));
-  COPCasHea_nominal = dat.COP_nominal /
-    Buildings.Utilities.Math.Functions.biquadratic(
-      a=dat.EIRFunT,
-      x1=Modelica.Units.Conversions.to_degC(TCasCooLvg_nominal),
-      x2=Modelica.Units.Conversions.to_degC(THeaWatSup_nominal));
-  COPCasCoo_nominal = dat.COP_nominal /
-    Buildings.Utilities.Math.Functions.biquadratic(
-      a=dat.EIRFunT,
-      x1=Modelica.Units.Conversions.to_degC(TChiWatSup_nominal),
-      x2=Modelica.Units.Conversions.to_degC(TCasCooLvg_nominal));
-equation
-  if nUni > 1 then
-    connect(junHeaWatConOut[1:nUni - 1].port_1, junHeaWatConOut[2:nUni].port_2)
-      annotation (Line(points={{80,50},{66,50},{66,70},{80,70}}, color={0,127,255}));
-    connect(valEvaSwi[1:nUni - 1].port_a, junConWatEvaInl[2:nUni].port_2)
-      annotation (Line(points={{60,-50},{40,-50},{40,4},{60,4}}, color={0,127,255}));
-    connect(valConSwi[1:nUni - 1].port_a, junHeaWatConInl[2:nUni].port_2)
-      annotation (Line(points={{-60,10},{-44,10},{-44,70},{-60,70}}, color={0,127,
-            255}));
-    connect(junConWatEvaOut[1:nUni - 1].port_1, junConWatEvaOut[2:nUni].port_2)
-      annotation (Line(points={{-80,-70},{-60,-70},{-60,-50},{-80,-50}}, color={0,
-            127,255}));
-  end if;
-  connect(port_a4, valEvaSwi[nUni].port_a)
-    annotation (Line(points={{100,-80},{60,-80},{60,-50}}, color={0,127,255}));
-  connect(yValConSwi, valConSwi.y)
-    annotation (Line(points={{-40,160},{-40,20},{-48,20}}, color={0,0,127}));
-
-  connect(y1, chi.on) annotation (Line(points={{-120,120},{-16,120},{-16,3},{-12,
-          3}}, color={255,0,255}));
-  connect(TSet, chi.TSet) annotation (Line(points={{-120,0},{-20,0},{-20,-3},{-12,
-          -3}},      color={0,0,127}));
-  connect(y1Coo, chi.coo)
-    annotation (Line(points={{-120,100},{-8,100},{-8,14}}, color={255,0,255}));
-  connect(yValCon, valCon.y) annotation (Line(points={{0,160},{0,80},{8,80}},
-                   color={0,0,127}));
-  connect(chi.port_b2, temEvaLvg.port_a)
-    annotation (Line(points={{-10,-6},{-20,-6},{-20,-10}}, color={0,127,255}));
-  connect(yValEva, valEva.y) annotation (Line(points={{-40,-160},{-40,-120},{-4,
-          -120},{-4,-80},{-8,-80}},
-                             color={0,0,127}));
-  connect(temConEnt.port_b, chi.port_a1)
-    annotation (Line(points={{-20,10},{-20,6},{-10,6}}, color={0,127,255}));
-  connect(chi.port_b1, temConLvg.port_a)
-    annotation (Line(points={{10,6},{20,6},{20,10}}, color={0,127,255}));
-  connect(valCon.port_b, junHeaWatConOut.port_3)
-    annotation (Line(points={{20,90},{20,100},{60,100},{60,60},{70,60}},
-                                                       color={0,127,255}));
-  connect(valEva.port_b,junConWatEvaOut. port_3) annotation (Line(points={{-20,-90},
-          {-20,-100},{-40,-100},{-40,-60},{-70,-60}},
-                                color={0,127,255}));
-  connect(chi.P, mulSum.u) annotation (Line(points={{11,9},{64,9},{64,120},{68,120}},
-        color={0,0,127}));
-  connect(temEvaLvg.port_b, floEva.port_a)
-    annotation (Line(points={{-20,-30},{-20,-40}}, color={0,127,255}));
-  connect(floEva.port_b, valEva.port_a)
-    annotation (Line(points={{-20,-60},{-20,-70}}, color={0,127,255}));
-  connect(mulSum.y, P)
-    annotation (Line(points={{92,120},{120,120}}, color={0,0,127}));
-  connect(floEva.m_flow, mEva_flow)
-    annotation (Line(points={{-9,-50},{2,-50},{2,-118},{60,-118},{60,-160}},
-                                                           color={0,0,127}));
-  connect(temEvaLvg.T, TEvaLvg) annotation (Line(points={{-9,-20},{-2,-20},{-2,-120},
-          {40,-120},{40,-160}}, color={0,0,127}));
-  connect(temConLvg.port_b, floCon.port_a)
-    annotation (Line(points={{20,30},{20,40}}, color={0,127,255}));
-  connect(floCon.port_b, valCon.port_a)
-    annotation (Line(points={{20,60},{20,70}}, color={0,127,255}));
-  connect(temConLvg.T, TConLvg)
-    annotation (Line(points={{31,20},{40,20},{40,160}}, color={0,0,127}));
-  connect(floCon.m_flow, mCon_flow) annotation (Line(points={{31,50},{62,50},{
-          62,140},{60,140},{60,160}}, color={0,0,127}));
-  connect(junConWatEvaInl.port_3, chi.port_a2) annotation (Line(points={{50,-6},
-          {10,-6}},                  color={0,127,255}));
-  connect(yValEvaSwi, valEvaSwi.y)
-    annotation (Line(points={{0,-160},{0,-40},{48,-40}}, color={0,0,127}));
-  connect(junHeaWatConInl.port_3, temConEnt.port_a)
-    annotation (Line(points={{-50,60},{-20,60},{-20,30}}, color={0,127,255}));
-
-  connect(port_a1, junHeaWatConInl[1].port_2)
-    annotation (Line(points={{-100,80},{-60,80},{-60,70}}, color={0,127,255}));
-  connect(valConSwi.port_b, junHeaWatConInl.port_1)
-    annotation (Line(points={{-60,30},{-60,50}}, color={0,127,255}));
-  connect(junHeaWatConOut[1].port_2, port_b1)
-    annotation (Line(points={{80,70},{80,80},{100,80}}, color={0,127,255}));
-  connect(valEvaSwi.port_b, junConWatEvaInl.port_1)
-    annotation (Line(points={{60,-30},{60,-16}}, color={0,127,255}));
-  connect(port_a2, junConWatEvaInl[1].port_2)
-    annotation (Line(points={{100,30},{60,30},{60,4}}, color={0,127,255}));
-  connect(junHeaWatConOut[nUni].port_1, port_b3)
-    annotation (Line(points={{80,50},{80,-30},{100,-30}}, color={0,127,255}));
-  connect(junConWatEvaOut[1].port_2, port_b2) annotation (Line(points={{-80,-50},
-          {-80,30},{-100,30}}, color={0,127,255}));
-  connect(junConWatEvaOut[nUni].port_1, port_b4) annotation (Line(points={{-80,-70},
-          {-80,-80},{-100,-80}}, color={0,127,255}));
-  connect(valConSwi[nUni].port_a, port_a3) annotation (Line(points={{-60,10},{
-          -60,-32},{-100,-32}},
-                            color={0,127,255}));
-
-  connect(temConEnt.T, TConEnt) annotation (Line(points={{-31,20},{-32,20},{-32,
-          130},{20,130},{20,160}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="chi",
-    Icon(coordinateSystem(preserveAspectRatio=false),
-      graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-70,80},{70,-80}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,52},{-40,12}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,70},{58,52}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,12},{-32,12},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,-10},{-40,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{38,52},{42,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,-50},{58,-68}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{18,24},{62,-18}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{40,24},{22,-8},{58,-8},{40,24}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,52},{-40,12}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,70},{58,52}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,12},{-32,12},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,2},{-52,-10},{-32,-10},{-42,2}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,-10},{-40,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{38,52},{42,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,-50},{58,-68}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{18,24},{62,-18}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{40,24},{22,-8},{58,-8},{40,24}},
-          lineColor={0,0,0},
-          smooth=Smooth.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}),                      Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-100,-140},{100,140}})),
-    Documentation(info="<html>
-<p>
-This model represents a set of identical heat recovery chillers
-that are piped in parallel.
-Modulating isolation valves and modulating switchover valves are included
-on condenser and evaporator side.
-The switchover valves allow indexing the condenser (resp. the evaporator)
-either to the CWC loop or to the HW loop (resp. to the CWE loop or to
-the CHW loop). Modulating valves are used to allow for sequences of
-operation that bleed CWE into the HW return flow to modulate the
-condenser entering temperature.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-On/Off command <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Cooling switchover command <code>y1Coo</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Supply temperature setpoint <code>TSet</code>:
-AO signal dedicated to each unit, with a dimensionality of one</br>
-The signal corresponds either to the HW supply temperature setpoint when
-the unit operates in heating mode, or to the CHW supply temperature setpoint when
-the unit operates in cooling mode.
-</li>
-<li>
-Condenser and evaporator isolation valve commanded position <code>yVal(Con|Eva)</code>:
-AO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Condenser and evaporator switchover valve commanded position <code>yVal(Con|Eva)Swi</code>:
-AO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Condenser and evaporator leaving temperature <code>T(Con|Eva)Lvg</code>:
-AI signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Condenser entering temperature <code>TConEnt</code>:
-AI signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Condenser and evaporator mass flow rate <code>m(Con|Eva)_flow</code>:
-AI signal dedicated to each unit, with a dimensionality of one
-</li>
-</ul>
-<h4>
-Details
-</h4>
-<h5>
-HRC performance data
-</h5>
-<p>
-The performance data should cover the HRC lift envelope,
-that is when the HRC is operating in direct heat recovery mode,
-producing CHW and HW at their setpoint value at full load.
-In this case, and to allow for cascading heat recovery where
-a third fluid circuit is used to generate a cascade of thermodynamic cycles,
-two additional parameters <code>TCasEntCoo_nominal</code> and
-<code>TCasEntHea_nominal</code> are exposed to specify the
-<i>entering</i> temperature of the third fluid circuit when
-the HRC is operating in cooling mode and in heating mode,
-respectively.
-In cooling mode the third fluid circuit is connected to the
-condenser barrel.
-In heating mode, the third fluid circuit is connected to the
-evaporator barrel.
-The parameters <code>TCasEnt*_nominal</code> are then used to assess the
-design capacity in heating and cooling mode, respectively.
-</p>
-<h5>
-Actuators
-</h5>
-<p>
-By default, linear valve models are used. Those are configured with
-a pressure drop varying linearly with the flow rate, as opposed
-to the quadratic dependency usually considered for a turbulent flow
-regime.
-This is because the whole plant model contains large nonlinear systems
-of equations and this configuration limits the risk of solver failure
-while reducing the time to solution.
-This has no significant impact on the operating point of the circulation pumps
-when a control loop is used to modulate the valve opening and maintain
-the flow rate or the leaving temperature at setpoint.
-Then, whatever the modeling assumptions for the valve, the
-control loop ensures that the valve creates the adequate pressure drop
-and flow, which will simply be reached at a different valve opening
-with the above simplification.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ChillerHeatRecoveryGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
deleted file mode 100644
index c60857b7a34..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/CoolingTowerGroup.mo
+++ /dev/null
@@ -1,262 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model CoolingTowerGroup "Model of multiple identical cooling towers in parallel"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    final m_flow_nominal(final min=Modelica.Constants.small)=mConWat_flow_nominal);
-
-  parameter Integer nUni(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.MassFlowRate mConWatUni_flow_nominal(
-    final min=0)
-    "CW design mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mConWat_flow_nominal(
-    final min=0)=nUni * mConWatUni_flow_nominal
-    "CW design mass flow rate (all units)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpConWatFriUni_nominal(
-      displayUnit="Pa")
-    "CW flow-friction losses through tower and piping only (without elevation head or valve)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.MassFlowRate mAirUni_flow_nominal(
-    final min=0,
-    start=mConWatUni_flow_nominal / 1.45)
-    "Air mass flow rate (each unit)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TWetBulEnt_nominal(
-    final min=273.15)
-    "Entering air wetbulb temperature"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TConWatRet_nominal(
-    final min=273.15)
-    "CW return temperature (tower entering)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TConWatSup_nominal(
-    final min=273.15)
-    "CW supply temperature (tower leaving)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Power PFanUni_nominal(
-    final min=0,
-    start=340 * mConWatUni_flow_nominal)
-    "Fan power (each unit)"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Real yFan_min(unit="1")=0.1
-    "CT fan minimum speed";
-
-  // Assumptions
-  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 Modelica.Units.SI.Time tau=30
-    "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
-    annotation (Dialog(
-      tab="Dynamics",
-      group="Nominal condition",
-      enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
-    "Cooling tower Start command"
-    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
-                         iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(
-    final unit="1", final min=0)
-    "Cooling tower speed (common to all tower cells)"
-    annotation (Placement(
-        transformation(extent={{-140,40},{-100,80}}),   iconTransformation(
-          extent={{-140,-80},{-100,-40}})));
-  BoundaryConditions.WeatherData.Bus weaBus
-    "Bus with weather data"
-    annotation (Placement(transformation(extent={{90,-50},{110,-30}}),
-        iconTransformation(extent={{-20,80},{20,120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(final unit="W")
-    "Power drawn by tower fans"
-    annotation (Placement(transformation(extent={{100,60},{140,100}}),
-      iconTransformation(extent={{100,60},{140,100}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TConWatSup(
-    final unit="K", displayUnit="degC")
-    "CW supply temperature (tower leaving)"
-    annotation (Placement(
-        transformation(extent={{100,20},{140,60}}), iconTransformation(extent={{100,20},
-            {140,60}})));
-
-  Fluid.BaseClasses.MassFlowRateMultiplier mulInl(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final use_input=false,
-    final k=1/nUni)       "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulOut(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final use_input=false,
-    final k=nUni)         "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
-    "Convert command signals"
-    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
-    annotation (Placement(transformation(extent={{60,90},{80,70}})));
-
-  Fluid.HeatExchangers.CoolingTowers.Merkel coo(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mConWatUni_flow_nominal,
-    final dp_nominal=dpConWatFriUni_nominal,
-    final yMin=yFan_min,
-    final ratWatAir_nominal=mConWatUni_flow_nominal/mAirUni_flow_nominal,
-    final TAirInWB_nominal=TWetBulEnt_nominal,
-    final TWatIn_nominal=TConWatRet_nominal,
-    final TWatOut_nominal=TConWatSup_nominal,
-    final PFan_nominal=PFanUni_nominal,
-    final tau=tau,
-    final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T,
-    final energyDynamics=energyDynamics)
-    "Cooling tower"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Pre preY1[nUni]
-    "Left limit of signal avoiding direct feedback of status to controller"
-    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
-    "Convert to real"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-14,80})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply inp
-    "Compute pump input signal"
-    annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-20,30})));
-equation
-  connect(com.nUniOn, mulP.u2) annotation (Line(points={{-38,100},{40,100},{40,
-          86},{58,86}},     color={0,0,127}));
-
-  connect(mulP.y, P)
-    annotation (Line(points={{82,80},{120,80}}, color={0,0,127}));
-  connect(mulOut.port_b, port_b)
-    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
-  connect(mulInl.port_b, coo.port_a)
-    annotation (Line(points={{-60,0},{-10,0}},
-                                             color={0,127,255}));
-  connect(coo.port_b, mulOut.port_a)
-    annotation (Line(points={{10,0},{60,0}}, color={0,127,255}));
-  connect(weaBus.TWetBul, coo.TAir) annotation (Line(
-      points={{100,-40},{-20,-40},{-20,4},{-12,4}},
-      color={255,204,51},
-      thickness=0.5), Text(
-      string="%first",
-      index=-1,
-      extent={{-6,3},{-6,3}},
-      horizontalAlignment=TextAlignment.Right));
-  connect(coo.PFan, mulP.u1)
-    annotation (Line(points={{11,8},{40,8},{40,74},{58,74}}, color={0,0,127}));
-  connect(coo.TLvg, TConWatSup) annotation (Line(points={{11,-6},{50,-6},{50,40},
-          {120,40}}, color={0,0,127}));
-  connect(y1, preY1.u)
-    annotation (Line(points={{-120,100},{-92,100}},
-                                                  color={255,0,255}));
-  connect(preY1.y, com.y1)
-    annotation (Line(points={{-68,100},{-62,100}},
-                                                 color={255,0,255}));
-  connect(com.y1One, booToRea.u) annotation (Line(points={{-38,106},{-14,106},{
-          -14,92}}, color={255,0,255}));
-  connect(inp.y, coo.y)
-    annotation (Line(points={{-20,18},{-20,8},{-12,8}}, color={0,0,127}));
-  connect(y, inp.u1)
-    annotation (Line(points={{-120,60},{-26,60},{-26,42}}, color={0,0,127}));
-  connect(booToRea.y, inp.u2)
-    annotation (Line(points={{-14,68},{-14,42}}, color={0,0,127}));
-  connect(port_a, mulInl.port_a)
-    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
-  annotation (
-    defaultComponentName="coo",
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-70,80},{70,-80}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Text(
-         extent={{190,-12},{70,-62}},
-          textColor={0,0,0},
-          textString=DynamicSelect("", String(TLvg-273.15, format=".1f"))),
-        Ellipse(
-          extent={{-54,56},{0,44}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{0,56},{54,44}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{0,56},{54,44}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-54,56},{0,44}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}),
-    Diagram(coordinateSystem(extent={{-100,-120},{100,120}})),
-    Documentation(info="<html>
-<p>
-This model represents a set of identical cooling towers
-that are piped in parallel.
-No actuated isolation valves are included.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-Start command (VFD Run) <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Speed command <code>y</code>:
-AO signal common to all units, with a dimensionality of zero
-</li>
-<li>
-CW supply temperature <code>TConWatSup</code>:
-AI signal common to all units, with a dimensionality of zero
-</li>
-</ul>
-<h4>Details</h4>
-<h5>Modeling approach</h5>
-<p>
-In a parallel arrangement, all operating units have the same operating point.
-This allows modeling the heat transfer from outdoor air to condenser water
-with a single instance of
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel\">
-Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel</a>.
-Hydronics are resolved with mass flow rate multiplier components.
-Note that the elevation head of open-circuit cooling towers is not modeled,
-which is an inherent limitation of the cooling tower component model.
-</p>
-<p>
-The fan cycling On and Off is implicitly modeled
-in the cooling tower component which uses a low limit of the control signal
-to switch to a free convection regime at zero fan power.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end CoolingTowerGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
deleted file mode 100644
index a49ae54b1a9..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/HeatPumpGroup.mo
+++ /dev/null
@@ -1,371 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model HeatPumpGroup
-  "Model of multiple identical air-source heat pumps in parallel"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    final m_flow_nominal(final min=Modelica.Constants.small)=mHeaWat_flow_nominal);
-
-  replaceable package MediumAir=Buildings.Media.Air
-    "Air medium";
-
-  parameter Integer nUni(final min=1, start=1)
-    "Number of units operating at design conditions"
-    annotation(Evaluate=true);
-  final parameter Modelica.Units.SI.HeatFlowRate capUni_nominal(
-    final min=0)=dat.hea.Q_flow
-    "Heat pump design capacity (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mHeaWatUni_flow_nominal(
-    final min=0)=dat.hea.mLoa_flow
-    "HW design mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mAirUni_flow_nominal(
-    final min=0)=dat.hea.mSou_flow
-    "Air design mass flow rate (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal(
-    final min=0)=nUni * mHeaWatUni_flow_nominal
-    "HW design mass flow rate (all units)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpPumHeaWatUni_nominal(
-    final min=0,
-    displayUnit="Pa")=dat.dpHeaLoa_nominal
-    "HW pump design head (each unit)"
-    annotation(Dialog(group="Nominal condition"));
-
-  replaceable parameter Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic dat
-    "Heat pump parameters (each unit)"
-    annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
-  replaceable parameter Fluid.Movers.Data.Generic datPum
-    constrainedby Fluid.Movers.Data.Generic(
-      pressure(V_flow={0,1,2}*mHeaWatUni_flow_nominal/rho_nominal,
-      dp={1.14,1,0.42}*dpPumHeaWatUni_nominal),
-      motorCooledByFluid=false)
-    "Condenser pump parameters (each unit)"
-    annotation (Placement(transformation(extent={{20,-110},{40,-90}})));
-
-  // Assumptions
-  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 Modelica.Units.SI.Time tau=30
-    "Time constant of fluid volume for nominal HW flow, used if energy or mass balance is dynamic"
-    annotation (Dialog(
-      tab="Dynamics",
-      group="Nominal condition",
-      enable=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState));
-
-  // Pump speed filter parameters
-  parameter Boolean use_inputFilter=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState
-    "= true, if signal is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Filtered pump speed"));
-  parameter Modelica.Units.SI.Time riseTime=30
-    "Rise time of the filter (time to reach 99.6 % of the speed)"
-    annotation (Dialog(
-      tab="Dynamics",
-      group="Filtered pump speed",
-      enable=use_inputFilter));
-  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
-    "Type of initialization (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Filtered pump speed",enable=use_inputFilter));
-  parameter Real y_start=1 "Initial position of actuator"
-    annotation(Dialog(tab="Dynamics", group="Filtered pump speed",enable=use_inputFilter));
-
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1[nUni]
-    "Heat pump On/Off command"
-    annotation (Placement(transformation(extent={{-140,80},{-100,120}}),
-                         iconTransformation(extent={{-140,40},{-100,80}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSet(
-    final unit="K", displayUnit="degC")
-    "Supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
-      iconTransformation(extent={{-140,-80},{-100,-40}})));
-  BoundaryConditions.WeatherData.Bus weaBus
-    "Bus with weather data"
-    annotation (Placement(transformation(extent={{90,-50},{110,-30}}),
-        iconTransformation(extent={{-20,80},{20,120}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput PPum(
-    final unit="W")
-    "Power drawn by HW pumps"
-    annotation (Placement(transformation(extent={{100,40},{140,80}}),
-                     iconTransformation(extent={{100,20},{140,60}})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealOutput P(
-    final unit="W")
-    "Power drawn by heat pumps"
-    annotation (Placement(transformation(extent={{100,80},{140,120}}),
-      iconTransformation(extent={{100,60},{140,100}})));
-
-  Fluid.BaseClasses.MassFlowRateMultiplier mulConInl(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Fluid.BaseClasses.MassFlowRateMultiplier mulConOut(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final use_input=true)
-    "Flow rate multiplier"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Buildings.Templates.Components.Controls.MultipleCommands com(final nUni=nUni)
-    "Convert command signals"
-    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply mulP "Scale power"
-    annotation (Placement(transformation(extent={{70,110},{90,90}})));
-  Fluid.HeatPumps.EquationFitReversible heaPum(
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=MediumAir,
-    final per=dat,
-    final tau1=tau,
-    final show_T=show_T,
-    final energyDynamics=energyDynamics,
-    final allowFlowReversal1=allowFlowReversal,
-    final allowFlowReversal2=false)
-    "Heat pump"
-    annotation (Placement(transformation(extent={{-10,-16},{10,4}})));
-  Fluid.Movers.SpeedControlled_y pum(
-    redeclare final package Medium = Medium,
-    inputType=Buildings.Fluid.Types.InputType.Continuous,
-    final tau=tau,
-    final show_T=show_T,
-    final allowFlowReversal=allowFlowReversal,
-    final energyDynamics=energyDynamics,
-    final use_inputFilter=use_inputFilter,
-    final riseTime=riseTime,
-    final init=init,
-    final per=datPum,
-    addPowerToMedium=false) "HW pump"
-    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
-  Fluid.Sources.MassFlowSource_WeatherData airSou(
-    redeclare final package Medium=MediumAir,
-    final use_m_flow_in=true,
-    final nPorts=1)
-    "Air flow source"
-    annotation (Placement(transformation(extent={{42,-50},{22,-30}})));
-  Fluid.Sources.Boundary_pT airSin(
-    redeclare final package Medium=MediumAir,
-    final nPorts=1)
-    "Air flow sink"
-    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter comFan(
-    final k=mAirUni_flow_nominal)
-    "Convert On/Off command to air flow setpoint"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={46,30})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply mulP1 "Scale power"
-    annotation (Placement(transformation(extent={{70,70},{90,50}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Pre preY1[nUni]
-    "Left limit of signal avoiding direct feedback of status to controller"
-    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
-    "Convert to real"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-20,80})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply inp
-    "Compute pump input signal" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={-40,30})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant cst(final k=1)
-    "Constant"
-    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
-  Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt
-    "Convert to integer"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-14,30})));
-protected
-  parameter Medium.ThermodynamicState sta_nominal=Medium.setState_pTX(
-    T=dat.hea.TRefLoa,
-    p=3E5,
-    X=Medium.X_default)
-    "State of the medium at the medium default properties";
-  parameter Modelica.Units.SI.Density rho_nominal=Medium.density(sta_nominal)
-    "Density at the medium default properties";
-equation
-  connect(mulConOut.uInv, mulConInl.u) annotation (Line(points={{81,6},{86,6},{86,
-          -20},{-86,-20},{-86,6},{-82,6}},     color={0,0,127}));
-  connect(com.nUniOn, mulP.u2) annotation (Line(points={{-38,100},{60,100},{60,
-          106},{68,106}},   color={0,0,127}));
-
-  connect(mulP.y, P)
-    annotation (Line(points={{92,100},{120,100}},
-                                                color={0,0,127}));
-  connect(com.nUniOnBou, mulConOut.u) annotation (Line(points={{-38,94},{16,94},
-          {16,6},{58,6}},        color={0,0,127}));
-  connect(pum.port_b, heaPum.port_a1)
-    annotation (Line(points={{-30,0},{-10,0}}, color={0,127,255}));
-  connect(heaPum.port_b1, mulConOut.port_a) annotation (Line(points={{10,0},{60,
-          0}},                 color={0,127,255}));
-  connect(mulConInl.port_b, pum.port_a) annotation (Line(points={{-60,0},{-50,0}},
-                            color={0,127,255}));
-  connect(mulConOut.port_b, port_b)
-    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
-  connect(heaPum.P, mulP.u1) annotation (Line(points={{11,-6.2},{18,-6.2},{18,
-          94},{68,94}},
-                    color={0,0,127}));
-  connect(port_a, mulConInl.port_a)
-    annotation (Line(points={{-100,0},{-80,0}}, color={0,127,255}));
-  connect(airSou.ports[1], heaPum.port_a2) annotation (Line(points={{22,-40},{
-          16,-40},{16,-12},{10,-12}},
-                                   color={0,127,255}));
-  connect(airSin.ports[1], heaPum.port_b2) annotation (Line(points={{-30,-40},{-20,
-          -40},{-20,-12},{-10,-12}}, color={0,127,255}));
-  connect(TSet, heaPum.TSet) annotation (Line(points={{-120,-60},{-16,-60},{-16,
-          3},{-11.4,3}}, color={0,0,127}));
-  connect(comFan.y, airSou.m_flow_in) annotation (Line(points={{46,18},{46,-32},
-          {42,-32}},         color={0,0,127}));
-  connect(weaBus, airSou.weaBus) annotation (Line(
-      points={{100,-40},{42,-40},{42,-39.8}},
-      color={255,204,51},
-      thickness=0.5), Text(
-      string="%first",
-      index=-1,
-      extent={{6,3},{6,3}},
-      horizontalAlignment=TextAlignment.Left));
-  connect(mulP1.y, PPum)
-    annotation (Line(points={{92,60},{120,60}}, color={0,0,127}));
-  connect(pum.P, mulP1.u1) annotation (Line(points={{-29,9},{60,9},{60,54},{68,
-          54}}, color={0,0,127}));
-  connect(com.nUniOn, mulP1.u2) annotation (Line(points={{-38,100},{60,100},{60,
-          66},{68,66}},
-                    color={0,0,127}));
-  connect(y1, preY1.u)
-    annotation (Line(points={{-120,100},{-92,100}}, color={255,0,255}));
-  connect(preY1.y, com.y1)
-    annotation (Line(points={{-68,100},{-62,100}}, color={255,0,255}));
-  connect(com.y1One, booToRea.u) annotation (Line(points={{-38,106},{-20,106},{
-          -20,92}},      color={255,0,255}));
-  connect(inp.y, pum.y)
-    annotation (Line(points={{-40,18},{-40,12}}, color={0,0,127}));
-  connect(booToRea.y, comFan.u)
-    annotation (Line(points={{-20,68},{-20,60},{46,60},{46,42}},
-                                                      color={0,0,127}));
-  connect(booToRea.y, inp.u2) annotation (Line(points={{-20,68},{-20,60},{-34,
-          60},{-34,42}}, color={0,0,127}));
-  connect(cst.y, inp.u1)
-    annotation (Line(points={{-68,60},{-46,60},{-46,42}}, color={0,0,127}));
-  connect(booToRea.y, reaToInt.u) annotation (Line(points={{-20,68},{-20,60},{
-          -14,60},{-14,42}}, color={0,0,127}));
-  connect(reaToInt.y, heaPum.uMod)
-    annotation (Line(points={{-14,18},{-14,-6},{-11,-6}}, color={255,127,0}));
-  annotation (
-    defaultComponentName="heaPum",
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-100,-100},{100,100}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-70,80},{70,-80}},
-          lineColor={0,0,0},
-          fillColor={215,215,215},
-          fillPattern=FillPattern.Solid,
-          lineThickness=0.5),
-        Rectangle(
-          extent={{-56,68},{58,50}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-56,-52},{58,-70}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-42,0},{-52,-12},{-32,-12},{-42,0}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          lineThickness=0.5),
-        Polygon(
-          points={{-42,0},{-52,10},{-32,10},{-42,0}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          lineThickness=0.5),
-        Rectangle(
-          extent={{-44,50},{-40,10}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-44,-12},{-40,-52}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{38,50},{42,-52}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{18,22},{62,-20}},
-          lineColor={0,0,0},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          lineThickness=0.5),
-        Polygon(
-          points={{40,22},{22,-10},{58,-10},{40,22}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid)}),
-    Diagram(coordinateSystem(extent={{-100,-120},{100,120}})),
-    Documentation(info="<html>
-<p>
-This model represents a set of identical air-to-water heat pumps
-that are piped in parallel.
-Dedicated constant-speed condenser pumps are included.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-On/Off command <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-Supply temperature setpoint <code>TSet</code>:
-AO signal common to all units, with a dimensionality of zero
-</li>
-<li>
-CW supply temperature <code>TConWatSup</code>:
-AI signal common to all units, with a dimensionality of zero
-</li>
-</ul>
-<h4>Details</h4>
-<h5>Modeling approach</h5>
-<p>
-In a parallel arrangement, all operating units have the same operating point.
-This allows modeling the heat transfer from outdoor air to condenser water
-with a single instance of
-<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
-Buildings.Fluid.HeatPumps.EquationFitReversible</a>.
-Hydronics are resolved with mass flow rate multiplier components.
-<p>
-The model
-<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
-Buildings.Fluid.HeatPumps.EquationFitReversible</a>
-does not capture the sensitivity of the heat pump performance
-to the HW supply temperature setpoint.
-This means that a varying HW supply temperature setpoint
-has no impact on the heat pump <i>COP</i> (all other variables
-such as the HW return temperature being kept invariant).
-This is a limitation of the model.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end HeatPumpGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
deleted file mode 100644
index 2d252f5b79c..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsDp.mo
+++ /dev/null
@@ -1,69 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model MultiplePumpsDp
-  "Model of multiple identical pumps in parallel with dp-controlled pump model"
-  extends BaseClasses.PartialMultiplePumps(
-    final have_var=have_varSet,
-    redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum(
-      final m_flow_nominal=mPum_flow_nominal,
-      final dp_nominal=dpPum_nominal),
-    cst(final k=dpPum_nominal));
-
-  parameter Boolean have_varSet = true
-    "Set to true for variable setpoint, false for constant setpoint (design value)"
-    annotation(Evaluate=true);
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput dp_in(
-    final unit="Pa",
-    final min=0)
-    if have_var
-    "Differential pressure setpoint"
-    annotation (
-    Placement(transformation(extent={{-140,40},{-100,80}}),
-      iconTransformation(extent={{-140,20},{-100,60}})));
-equation
-  connect(dp_in, inp.u1) annotation (Line(points={{-120,60},{-6,60},{-6,52}},
-                    color={0,0,127}));
-  connect(inp.y, pum.dp_in)
-    annotation (Line(points={{-8.88178e-16,28},{0,28},{0,12}},
-                                                     color={0,0,127}));
-  annotation (
-    defaultComponentName="pum", Documentation(info="<html>
-<p>
-This model represents a set of identical dp-controlled
-variable speed pumps that are piped in parallel.
-An optional check valve in series with each pump is included.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-Start command (VFD Run) <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-(Optionally if <code>have_varSet</code> is <code>true</code>) Differential pressure setpoint <code>dp_in</code>:
-AO signal common to all units, with a dimensionality of zero
-</li>
-<li>
-Pump status <code>y1_actual</code>:
-DI signal dedicated to each unit, with a dimensionality of one
-</li>
-</ul>
-<h4>Details</h4>
-<p>
-See the base class
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
-for a description of the modeling approach.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end MultiplePumpsDp;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
deleted file mode 100644
index 834fc47391e..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsFlow.mo
+++ /dev/null
@@ -1,77 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model MultiplePumpsFlow
-  "Model of multiple identical pumps in parallel with flow-controlled pump model"
-  extends BaseClasses.PartialMultiplePumps(
-    final have_var=have_varSet,
-    redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum(
-      final m_flow_nominal=mPum_flow_nominal,
-      final dp_nominal=dpPum_nominal),
-    cst(final k=mPum_flow_nominal));
-
-  parameter Boolean have_varSet = true
-    "Set to true for variable setpoint, false for constant setpoint (design value)"
-    annotation(Evaluate=true);
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput m_flow_in(
-    final unit="kg/s",
-    final min=0)
-    if have_var
-    "Mass flow rate setpoint (total over all pumps)"
-    annotation (
-    Placement(transformation(extent={{-140,40},{-100,80}}),
-      iconTransformation(extent={{-140,20},{-100,60}})));
-  Buildings.Controls.OBC.CDL.Reals.Divide div1
-    "Divide total flow setpoint by number of pumps commanded On"
-    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
-equation
-  connect(m_flow_in, div1.u1) annotation (Line(points={{-120,60},{-90,60},{-90,66},
-          {-82,66}}, color={0,0,127}));
-  connect(com.nUniOnBou, div1.u2) annotation (Line(points={{-28,94},{-20,94},{
-          -20,80},{-86,80},{-86,54},{-82,54}}, color={0,0,127}));
-  connect(div1.y, inp.u1) annotation (Line(points={{-58,60},{-6,60},{-6,52}},
-                color={0,0,127}));
-  connect(inp.y, pum.m_flow_in)
-    annotation (Line(points={{-8.88178e-16,28},{0,28},{0,12}},
-                                                     color={0,0,127}));
-  annotation (
-    defaultComponentName="pum", Documentation(info="<html>
-<p>
-This model represents a set of identical flow-controlled
-variable speed pumps that are piped in parallel.
-An optional check valve in series with each pump is included.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-Start command (VFD Run) <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-(Optionally if <code>have_varSet</code> is <code>true</code>) Mass flow rate setpoint <code>m_flow_in</code>:
-AO signal with a dimensionality of zero</br>
-The setpoint corresponds to the <i>total</i> flow rate of all units.
-</li>
-<li>
-Pump status <code>y1_actual</code>:
-DI signal dedicated to each unit, with a dimensionality of one
-</li>
-</ul>
-<h4>Details</h4>
-<p>
-See the base class
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
-for a description of the modeling approach.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end MultiplePumpsFlow;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
deleted file mode 100644
index 29923e9d5a1..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/MultiplePumpsSpeed.mo
+++ /dev/null
@@ -1,67 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-model MultiplePumpsSpeed
-  "Model of multiple identical pumps in parallel with speed-controlled pump model"
-  extends
-    Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
-    redeclare final Buildings.Fluid.Movers.SpeedControlled_y pum,
-    cst(final k=1));
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput y(
-    final unit="1",
-    final min=0,
-    final max=1)
-    if have_var
-    "Pump speed (common to all pumps)"
-    annotation (
-     Placement(transformation(extent={{-140,40},{-100,80}}), iconTransformation(
-          extent={{-140,20},{-100,60}})));
-
-equation
-  connect(y, inp.u1) annotation (Line(points={{-120,60},{-6,60},{-6,52}},
-        color={0,0,127}));
-  connect(inp.y, pum.y)
-    annotation (Line(points={{-8.88178e-16,28},{0,28},{0,12}},
-                                                     color={0,0,127}));
-  annotation (
-    defaultComponentName="pum", Documentation(info="<html>
-<p>
-This model represents a set of identical speed-controlled
-pumps that are piped in parallel.
-The model may be configured to represent either constant speed
-pumps or variable speed pumps.
-An optional check valve in series with each pump is included.
-</p>
-<h4>Control points</h4>
-<p>
-The following input and output points are available.
-</p>
-<ul>
-<li>
-Start command (VFD Run for variable speed pumps or Starter contact for constant speed pumps) <code>y1</code>:
-DO signal dedicated to each unit, with a dimensionality of one
-</li>
-<li>
-(Optionally if <code>have_var</code> is <code>true</code>) Speed command <code>y</code>:
-AO signal common to all units, with a dimensionality of zero
-</li>
-<li>
-Pump status <code>y1_actual</code>:
-DI signal dedicated to each unit, with a dimensionality of one
-</li>
-</ul>
-<h4>Details</h4>
-<p>
-See the base class
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps</a>.
-for a description of the modeling approach.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end MultiplePumpsSpeed;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
deleted file mode 100644
index ef93a3b1e9c..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/PartialMultiplePumps.mo
+++ /dev/null
@@ -1,204 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.BaseClasses;
-partial model PartialMultiplePumps
-  "Base class for validating the multiple pumps model"
-  extends Modelica.Icons.Example;
-
-  package Medium = Buildings.Media.Water
-    "Medium model for hot water";
-
-  parameter Integer nPum(
-    final min=1)=2
-    "Number of pumps"
-    annotation(Evaluate=true);
-  parameter Modelica.Units.SI.MassFlowRate mPum_flow_nominal=1
-    "Pump mass flow rate (each pump)"
-    annotation(Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpPum_nominal = 1E5
-    "Pump head (each pump)"
-    annotation(Dialog(group="Nominal condition"));
-  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
-    nPum * mPum_flow_nominal
-    "Circuit mass flow rate at design conditions";
-  parameter Modelica.Units.SI.Pressure p_min = 2E5
-    "Circuit minimum pressure";
-  parameter Modelica.Units.SI.PressureDifference dp_nominal = dpPum_nominal
-    "Circuit total pressure drop at design conditions";
-
-  Fluid.Sources.Boundary_pT bou(
-    redeclare final package Medium = Medium,
-    final p=p_min,
-    nPorts=2)
-    "Pressure boundary condition"
-    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
-  replaceable Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum
-    constrainedby
-    Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.PartialMultiplePumps(
-    redeclare final package Medium = Medium,
-    final nPum=nPum,
-    final mPum_flow_nominal=mPum_flow_nominal,
-    final dpPum_nominal=dpPum_nominal,
-    use_inputFilter=false,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Multiple pumps in parallel - Speed controlled"
-    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-
-  Fluid.Sensors.RelativePressure senRelPre(redeclare package Medium = Medium)
-    "Differential pressure sensor" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={40,60})));
-  Fluid.Sensors.MassFlowRate senMasFlo(redeclare package Medium = Medium)
-    "Mass flow rate sensor" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={20,30})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ope(
-    height=0.8,
-    duration=300,
-    offset=0.2,
-    startTime=200)
-    "Valve opening signal"
-    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
-  Fluid.Actuators.Valves.TwoWayEqualPercentage val(
-    redeclare package Medium = Medium,
-    m_flow_nominal=m_flow_nominal,
-    dpValve_nominal=5000,
-    dpFixed_nominal=dp_nominal - val.dpValve_nominal)
-    "Modulating valve"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Pum(
-    table=[0,0,0; 1,0,0; 1,1,0; 4,1,1; 4,1,1; 10,1,1],
-    timeScale=100,
-    period=1000) "Pump Start signal"
-    annotation (Placement(transformation(extent={{-120,110},{-100,130}})));
-  replaceable Fluid.Movers.SpeedControlled_y pum1
-    constrainedby Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine(
-    redeclare final package Medium = Medium,
-    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    use_inputFilter=false,
-    final per=pum.per,
-    addPowerToMedium=false)
-    "Pump"
-    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
-  Fluid.FixedResistances.CheckValve cheVal1(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mPum_flow_nominal,
-    final dpValve_nominal=pum.dpValve_nominal)
-    "Check valve"
-    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
-  replaceable Fluid.Movers.SpeedControlled_y pum2
-    constrainedby Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine(
-    redeclare final package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    use_inputFilter=false,
-    final per=pum.per,
-    addPowerToMedium=false)
-    "Pump"
-    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
-  Fluid.FixedResistances.CheckValve cheVal2(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=mPum_flow_nominal,
-    final dpValve_nominal=pum.dpValve_nominal)
-    "Check valve"
-    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
-  Fluid.Actuators.Valves.TwoWayEqualPercentage val1(
-    redeclare package Medium = Medium,
-    m_flow_nominal=m_flow_nominal,
-    dpValve_nominal=5000,
-    dpFixed_nominal=dp_nominal - val.dpValve_nominal)
-    "Modulating valve"
-    annotation (Placement(transformation(extent={{10,-130},{-10,-110}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[2]
-    "Convert to real"
-    annotation (Placement(transformation(extent={{80,110},{100,130}})));
-  Fluid.Sensors.RelativePressure senRelPre1(redeclare package Medium = Medium)
-    "Differential pressure sensor" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={90,-80})));
-  Fluid.Sensors.MassFlowRate senMasFlo1(redeclare package Medium = Medium)
-    "Mass flow rate sensor" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={60,-100})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply inp1
-    "Compute pump input signal" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={120,2})));
-  Buildings.Controls.OBC.CDL.Reals.Multiply inp2
-    "Compute pump input signal" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={120,-42})));
-equation
-  connect(bou.ports[1], pum.port_a)
-    annotation (Line(points={{-60,59},{-60,60},{-10,60}}, color={0,127,255}));
-  connect(val.port_b, pum.port_a) annotation (Line(points={{-10,0},{-20,0},{-20,
-          60},{-10,60}}, color={0,127,255}));
-  connect(pum.port_b, senRelPre.port_a)
-    annotation (Line(points={{10,60},{30,60}}, color={0,127,255}));
-  connect(ope.y, val.y) annotation (Line(points={{-98,0},{-40,0},{-40,20},{0,20},
-          {0,12}}, color={0,0,127}));
-  connect(y1Pum.y, pum.y1) annotation (Line(points={{-98,120},{-14,120},{-14,68},
-          {-12,68}},         color={255,0,255}));
-  connect(pum.port_b, senMasFlo.port_a)
-    annotation (Line(points={{10,60},{20,60},{20,40}}, color={0,127,255}));
-  connect(senMasFlo.port_b, val.port_a)
-    annotation (Line(points={{20,20},{20,0},{10,0}}, color={0,127,255}));
-  connect(senRelPre.port_b, pum.port_a) annotation (Line(points={{50,60},{60,60},
-          {60,74},{-10,74},{-10,60}}, color={0,127,255}));
-  connect(pum1.port_b, cheVal1.port_a)
-    annotation (Line(points={{10,-40},{30,-40}}, color={0,127,255}));
-  connect(pum2.port_b, cheVal2.port_a)
-    annotation (Line(points={{10,-80},{30,-80}}, color={0,127,255}));
-  connect(val1.port_b, pum2.port_a) annotation (Line(points={{-10,-120},{-40,-120},
-          {-40,-80},{-10,-80}}, color={0,127,255}));
-  connect(val1.port_b, pum1.port_a) annotation (Line(points={{-10,-120},{-40,-120},
-          {-40,-40},{-10,-40}}, color={0,127,255}));
-  connect(val1.port_b, bou.ports[2]) annotation (Line(points={{-10,-120},{-60,-120},
-          {-60,61}}, color={0,127,255}));
-  connect(y1Pum.y, booToRea.u)
-    annotation (Line(points={{-98,120},{78,120}}, color={255,0,255}));
-  connect(cheVal2.port_b, senMasFlo1.port_a)
-    annotation (Line(points={{50,-80},{60,-80},{60,-90}}, color={0,127,255}));
-  connect(senMasFlo1.port_b, val1.port_a) annotation (Line(points={{60,-110},{60,
-          -120},{10,-120}}, color={0,127,255}));
-  connect(cheVal1.port_b, senMasFlo1.port_a)
-    annotation (Line(points={{50,-40},{60,-40},{60,-90}}, color={0,127,255}));
-  connect(senRelPre1.port_a, senMasFlo1.port_a)
-    annotation (Line(points={{80,-80},{60,-80},{60,-90}}, color={0,127,255}));
-  connect(senRelPre1.port_b, pum2.port_a) annotation (Line(points={{100,-80},{120,
-          -80},{120,-130},{-40,-130},{-40,-80},{-10,-80}}, color={0,127,255}));
-  connect(booToRea[1].y, inp1.u2)
-    annotation (Line(points={{102,120},{126,120},{126,14}}, color={0,0,127}));
-  connect(ope.y, val1.y) annotation (Line(points={{-98,0},{-80,0},{-80,-100},{0,
-          -100},{0,-108}}, color={0,0,127}));
-  connect(booToRea[2].y, inp2.u2) annotation (Line(points={{102,120},{134,120},{
-          134,-20},{126,-20},{126,-30}}, color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
-    Documentation(info="<html>
-<p>
-This base class is used to construct validation models
-for the various multiple-pump models within
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PartialMultiplePumps;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
deleted file mode 100644
index be31811c453..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/BaseClasses/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains base classes that are used
-for validation purposes.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
deleted file mode 100644
index 82f8c341a74..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mo
+++ /dev/null
@@ -1,125 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model ChillerGroup "Validation of chiller group model"
-  extends Modelica.Icons.Example;
-
-  replaceable package MediumChiWat=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "CHW medium";
-  replaceable package MediumConWat=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "CW medium";
-
-  parameter
-    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD
-    dat "Chiller parameters"
-    annotation (Placement(transformation(extent={{90,92},{110,112}})));
-
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerGroup chi(
-    redeclare final package Medium1 = MediumConWat,
-    redeclare final package Medium2 = MediumChiWat,
-    show_T=true,
-    nUni=2,
-    dpEva_nominal=3E5,
-    dpCon_nominal=3E5,
-    final dat=dat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Chiller group"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
-  Fluid.Sources.Boundary_pT retChiWat(
-    redeclare final package Medium = MediumChiWat,
-    p=supChiWat.p + chi.dpEva_nominal + chi.valEva.dpValve_nominal,
-    T=288.15,
-    nPorts=1)
-    "Boundary conditions for CHW"
-    annotation (
-      Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={20,-102})));
-
-  Fluid.Sources.Boundary_pT supConWat(
-    redeclare final package Medium = MediumConWat,
-    p=retConWat.p + chi.dpCon_nominal + chi.valCon.dpValve_nominal,
-    nPorts=1) "Boundary conditions for CW" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={-20,100})));
-
-  Fluid.Sources.Boundary_pT retConWat(
-    redeclare final package Medium = MediumConWat,
-    p=200000,
-    nPorts=1) "Boundary conditions for CW" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={20,100})));
-  Fluid.Sources.Boundary_pT supChiWat(
-    redeclare final package Medium = MediumChiWat,
-    p=200000,
-    nPorts=1) "Boundary conditions for CHW"
-    annotation (
-      Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={-20,-102})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TChiWatSupSet(
-    y(displayUnit="degC", unit="K"),
-    height=+5,
-    duration=1000,
-    offset=dat.TEvaLvg_nominal) "CHW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
-    table=[0,1,1; 0.5,1,1; 0.5,1,0; 0.8,1,0; 0.8,0,0; 1,0,0],
-    timeScale=1000,
-    period=1000) "Chiller On/Off command"
-    annotation (Placement(transformation(extent={{-110,70},{-90,90}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[chi.nUni]
-    "Convert DO to AO" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-60,80})));
-equation
-  connect(chi.port_b1, retConWat.ports[1])
-    annotation (Line(points={{10,6},{20,6},{20,90}}, color={0,127,255}));
-  connect(supConWat.ports[1], chi.port_a1)
-    annotation (Line(points={{-20,90},{-20,6},{-10,6}}, color={0,127,255}));
-  connect(retChiWat.ports[1], chi.port_a2)
-    annotation (Line(points={{20,-92},{20,-6},{10,-6}}, color={0,127,255}));
-  connect(supChiWat.ports[1], chi.port_b2)
-    annotation (Line(points={{-20,-92},{-20,-6},{-10,-6}}, color={0,127,255}));
-  connect(TChiWatSupSet.y, chi.TSet) annotation (Line(points={{-88,-40},{-16,
-          -40},{-16,-9},{-12,-9}}, color={0,0,127}));
-  connect(y1.y, chi.y1) annotation (Line(points={{-88,80},{-80,80},{-80,9},{-12,
-          9}}, color={255,0,255}));
-  connect(y1.y, booToRea.u)
-    annotation (Line(points={{-88,80},{-72,80}}, color={255,0,255}));
-  connect(booToRea.y, chi.yValCon)
-    annotation (Line(points={{-48,80},{-6,80},{-6,12}}, color={0,0,127}));
-  connect(booToRea.y, chi.yValEva) annotation (Line(points={{-48,80},{-40,80},{
-          -40,-20},{-5.8,-20},{-5.8,-12}}, color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerGroup</a>
-in a configuration with two chillers.
-The chillers are initially On and they are switched Off one after the other
-as they receive an increasing CHW supply temperature setpoint.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ChillerGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
deleted file mode 100644
index 94189087a8b..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mo
+++ /dev/null
@@ -1,476 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model ChillerHeatRecoveryGroup
-  "Validation of heat recovery chiller group model"
-  extends Modelica.Icons.Example;
-
-  replaceable package Medium=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Medium model";
-  final parameter Integer nChiHea(final min=1, start=1)=2
-    "Number of HRCs operating at design conditions"
-    annotation(Evaluate=true);
-  parameter
-    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD dat(
-      EIRFunT={0.0101739374, 0.0607200115, 0.0003348647, 0.003162578, 0.0002388594, -0.0014121289},
-      capFunT={0.0387084662, 0.2305017927, 0.0004779504, 0.0178244359, -8.48808e-05, -0.0032406711},
-      EIRFunPLR={0.4304252832, -0.0144718912, 5.12039e-05, -0.7562386674, 0.5661683373,
-        0.0406987748, 3.0278e-06, -0.3413411197, -0.000469572, 0.0055009208},
-      QEva_flow_nominal=-1E6,
-      COP_nominal=2.5,
-      mEva_flow_nominal=20,
-      mCon_flow_nominal=22,
-      TEvaLvg_nominal=279.15,
-      TEvaLvgMin=277.15,
-      TEvaLvgMax=308.15,
-      TConLvg_nominal=333.15,
-      TConLvgMin=296.15,
-      TConLvgMax=336.15)
-    "Chiller parameters (each unit)"
-    annotation (
-      Dialog(group="CHW loop and cooling-only chillers"),
-      Placement(transformation(extent={{140,200},{160,220}})));
-
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup
-    chi(
-    redeclare final package Medium = Medium,
-    show_T=true,
-    final nUni=nChiHea,
-    dpEva_nominal=3E5,
-    dpCon_nominal=3E5,
-    final dat=dat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Chiller group"
-    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
-
-  Fluid.Sources.Boundary_pT bouChiWat(
-    redeclare final package Medium = Medium,
-    p=300000,
-    nPorts=1) "Pressure boundary condition for CHW"
-    annotation (
-      Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={120,-190})));
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
-    table=[0,1,1; 0.8,1,1; 0.8,1,0; 0.9,1,0; 0.9,0,0; 1,0,0],
-    timeScale=2000,
-    period=2000) "Chiller On/Off command"
-    annotation (Placement(transformation(extent={{-240,170},{-220,190}})));
-
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Coo(
-    table=[0,0,0; 0.2,0,0; 0.2,0,1; 0.6,0,1; 0.6,1,1; 1,1,1],
-    timeScale=2000,
-    period=2000)
-    "Cooling mode switchover command"
-    annotation (Placement(transformation(extent={{-240,90},{-220,110}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1HeaCoo(
-    table=[0,0,0; 0.4,0,0; 0.4,1,0; 0.6,1,0; 0.6,0,0; 1,0,0],
-    timeScale=2000,
-    period=2000)
-    "Direct heat recovery switchover command"
-    annotation (Placement(transformation(extent={{-240,50},{-220,70}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSet[nChiHea](
-      each final k=chi.TChiWatSup_nominal, y(each final unit="K", each
-        displayUnit="degC")) "Supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-240,-190},{-220,-170}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[chi.nUni]
-    "Convert DO to AO" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-130,200})));
-  Fluid.Sensors.TemperatureTwoPort THeaWatSup(
-    redeclare final package Medium =
-               Medium, final m_flow_nominal=chi.mConWat_flow_nominal)
-    "HW supply temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={100,20})));
-  Fluid.Sensors.MassFlowRate floHeaWat(redeclare final package Medium =
-        Medium) "HW flow" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={130,80})));
-  Fluid.Sensors.MassFlowRate floChiWat(redeclare final package Medium =
-        Medium) "CHW flow" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={160,-100})));
-  Fluid.Sensors.TemperatureTwoPort TChiWatSup(redeclare final package Medium =
-               Medium, final m_flow_nominal=chi.mChiWat_flow_nominal)
-    "CHW supply temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={40,-80})));
-  Buildings.Controls.OBC.CDL.Logical.Or cooOrDir[nChiHea]
-    "Return true if cooling OR direct HR" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-160,-60})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal yValConSwi[nChiHea]
-    "HRC condenser switchover valve commanded position"
-                                           annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={0,-20})));
-  Buildings.Controls.OBC.CDL.Logical.Not hea[nChiHea] "Return true if heating"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-160,20})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nChiHea]
-    "Convert"
-    annotation (Placement(transformation(extent={{-140,10},{-120,30}})));
-  Buildings.Controls.OBC.CDL.Integers.MultiSum numHea(nin=nChiHea)
-    "Number of HRC connected to HW loop"
-    annotation (Placement(transformation(extent={{-110,10},{-90,30}})));
-  Buildings.Controls.OBC.CDL.Integers.Less intLes[nChiHea]
-    "Return true if switchover valve to be open"
-    annotation (Placement(transformation(extent={{-110,-30},{-90,-10}})));
-  Buildings.Controls.OBC.CDL.Integers.Sources.Constant idx[nChiHea](final k={i
-        for i in 1:nChiHea}) "HRC index"
-    annotation (Placement(transformation(extent={{-240,-30},{-220,-10}})));
-  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(final nout=
-        nChiHea) "Replicate"
-    annotation (Placement(transformation(extent={{-150,-50},{-130,-30}})));
-  Buildings.Controls.OBC.CDL.Logical.Or mul[nChiHea]
-    "Return true if cooling OR direct HR" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,-20})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal yValEvaSwi[nChiHea]
-    "HRC evaporator switchover valve commanded position" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={0,-60})));
-  Buildings.Controls.OBC.CDL.Logical.Not heaAndCas[nChiHea]
-    "Return true if cascading heating" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-160,-100})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1[nChiHea]
-    "Convert"
-    annotation (Placement(transformation(extent={{-140,-110},{-120,-90}})));
-  Buildings.Controls.OBC.CDL.Integers.MultiSum numHeaAndCas(nin=nChiHea)
-    "Number of HRC in cascading heating"
-    annotation (Placement(transformation(extent={{-110,-110},{-90,-90}})));
-  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep1(final nout=
-        nChiHea) "Replicate"
-    annotation (Placement(transformation(extent={{-150,-170},{-130,-150}})));
-  Buildings.Controls.OBC.CDL.Integers.Less intLes1
-                                                 [nChiHea]
-    "Return true if switchover valve to be open"
-    annotation (Placement(transformation(extent={{-110,-150},{-90,-130}})));
-  Buildings.Controls.OBC.CDL.Logical.Or mul1
-                                           [nChiHea]
-    "Return true if cooling OR direct HR" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,-60})));
-  Buildings.Controls.OBC.CDL.Reals.Switch TChiHeaSupSet[nChiHea]
-    "Switch supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-168,-210},{-148,-190}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSet[nChiHea](
-      each final k=chi.THeaWatSup_nominal, y(each final unit="K", each
-        displayUnit="degC")) "Supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-240,-230},{-220,-210}})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumChiWat(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    nPum=1,
-    have_var=false,
-    have_valve=true,
-    final mPum_flow_nominal=chi.mChiWat_flow_nominal,
-    final dpPum_nominal=chi.dpEva_nominal)
-    "CHW pumps"
-    annotation (Placement(transformation(extent={{120,-150},{140,-130}})));
-  Buildings.Controls.OBC.CDL.Logical.MultiOr y1PumConWatCon(nin=2)
-    "Start pump if any HRC in cascading cooling" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,140})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumHeaWat(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    nPum=1,
-    have_var=false,
-    have_valve=true,
-    final mPum_flow_nominal=chi.mConWat_flow_nominal,
-    final dpPum_nominal=chi.dpCon_nominal)
-    "HW pumps" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={130,20})));
-  Buildings.Controls.OBC.CDL.Logical.And onAndHea[nChiHea]
-    "Return true if On and heating" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-100,60})));
-  Buildings.Controls.OBC.CDL.Logical.MultiOr y1PumHeaWat(nin=2)
-    "Start pump if any HRC On and in heating" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,60})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatCon(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    nPum=1,
-    have_var=false,
-    have_valve=true,
-    final mPum_flow_nominal=chi.mConWat_flow_nominal,
-    final dpPum_nominal=chi.dpCon_nominal)
-    "CW pumps serving condenser barrels" annotation (Placement(transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={130,160})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pumConWatEva(
-    redeclare package Medium = Medium,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    nPum=1,
-    have_var=false,
-    have_valve=true,
-    final mPum_flow_nominal=chi.mChiWat_flow_nominal,
-    final dpPum_nominal=chi.dpEva_nominal)
-    "CW pumps serving evaporator barrels"
-    annotation (Placement(transformation(extent={{120,-70},{140,-50}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold y1PumConWatEva(t=1)
-    "Return true if CW to be operating"
-    annotation (Placement(transformation(extent={{-40,-110},{-20,-90}})));
-  Buildings.Controls.OBC.CDL.Logical.MultiOr y1PumChiWat(nin=2)
-    "Start pump if any HRC in cooling or direct HR mode" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,-160})));
-  Fluid.HeatExchangers.SensibleCooler_T disHeaWat(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=THeaWatRet.k,
-    final dp_nominal=0,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    tau=300,
-    T_start=chi.THeaWatSup_nominal - 12)
-    "Distribution system approximated by prescribed temperature"
-    annotation (Placement(transformation(extent={{100,70},{80,90}})));
-  Fluid.HeatExchangers.Heater_T disConWatEva(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=chi.mChiWat_flow_nominal,
-    final dp_nominal=0,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    tau=300,
-    T_start=TConWatEvaSup.k)
-    "Distribution system approximated by prescribed temperature"
-    annotation (Placement(transformation(extent={{80,-70},{100,-50}})));
-  Fluid.HeatExchangers.SensibleCooler_T disConWatCon(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=TConWatConSup.k,
-    final dp_nominal=0,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    tau=300,
-    T_start=chi.TCasCooEnt_nominal)
-    "Distribution system approximated by prescribed temperature"
-    annotation (Placement(transformation(extent={{100,150},{80,170}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(
-    final k=chi.THeaWatSup_nominal - 12,
-    y(final unit="K", displayUnit="degC"))
-    "Return temperature"
-    annotation (Placement(transformation(extent={{220,90},{200,110}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TConWatConSup(final k=
-        chi.TCasCooEnt_nominal, y(final unit="K", displayUnit="degC"))
-    "Supply temperature"
-    annotation (Placement(transformation(extent={{220,170},{200,190}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TConWatEvaSup(final k=
-        chi.TCasHeaEnt_nominal, y(final unit="K", displayUnit="degC"))
-    "Supply temperature"
-    annotation (Placement(transformation(extent={{220,-30},{200,-10}})));
-  Fluid.HeatExchangers.Heater_T disChiWat(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=TChiWatRet.k,
-    final dp_nominal=0,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    tau=300,
-    T_start=chi.TChiWatSup_nominal)
-    "Distribution system approximated by prescribed temperature"
-    annotation (Placement(transformation(extent={{80,-150},{100,-130}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(
-    final k=chi.TChiWatSup_nominal + 6, y(final unit="K", displayUnit="degC"))
-    "Return temperature"
-    annotation (Placement(transformation(extent={{220,-130},{200,-110}})));
-  Fluid.Sources.Boundary_pT bouHeaWat(
-    redeclare final package Medium = Medium,
-    p=300000,
-    nPorts=1) "Pressure boundary condition for HW" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={210,40})));
-equation
-  connect(y1.y, chi.y1)
-    annotation (Line(points={{-218,180},{26,180},{26,6},{48,6}},
-                                               color={255,0,255}));
-  connect(y1Coo.y, chi.y1Coo)
-    annotation (Line(points={{-218,100},{14,100},{14,0},{48,0}},
-                                                        color={255,0,255}));
-  connect(y1.y, booToRea.u) annotation (Line(points={{-218,180},{-160,180},{-160,
-          200},{-142,200}},
-                     color={255,0,255}));
-  connect(booToRea.y, chi.yValEva) annotation (Line(points={{-118,200},{20,200},
-          {20,-16},{52,-16},{52,-12}},
-                       color={0,0,127}));
-  connect(chi.port_b1, THeaWatSup.port_a)
-    annotation (Line(points={{70,8},{80,8},{80,20},{90,20}},
-                                             color={0,127,255}));
-  connect(floChiWat.port_b, chi.port_a4)
-    annotation (Line(points={{160,-90},{160,-8},{70,-8}},
-                                                        color={0,127,255}));
-  connect(TChiWatSup.port_a, chi.port_b4) annotation (Line(points={{40,-70},{40,
-          -8.5},{50,-8.5}},  color={0,127,255}));
-  connect(y1Coo.y, cooOrDir.u1) annotation (Line(points={{-218,100},{-180,100},{
-          -180,-60},{-172,-60}},
-                               color={255,0,255}));
-  connect(y1HeaCoo.y, cooOrDir.u2) annotation (Line(points={{-218,60},{-190,60},
-          {-190,-68},{-172,-68}},
-                                color={255,0,255}));
-  connect(y1Coo.y, hea.u) annotation (Line(points={{-218,100},{-180,100},{-180,20},
-          {-172,20}}, color={255,0,255}));
-  connect(hea.y, booToInt.u)
-    annotation (Line(points={{-148,20},{-142,20}}, color={255,0,255}));
-  connect(booToInt.y, numHea.u)
-    annotation (Line(points={{-118,20},{-112,20}},
-                                                 color={255,127,0}));
-  connect(idx.y, intLes.u1)
-    annotation (Line(points={{-218,-20},{-112,-20}},color={255,127,0}));
-  connect(rep.y, intLes.u2) annotation (Line(points={{-128,-40},{-120,-40},{-120,
-          -28},{-112,-28}},
-                      color={255,127,0}));
-  connect(intLes.y, mul.u2) annotation (Line(points={{-88,-20},{-80,-20},{-80,-28},
-          {-42,-28}}, color={255,0,255}));
-  connect(mul.y, yValConSwi.u)
-    annotation (Line(points={{-18,-20},{-12,-20}},
-                                                 color={255,0,255}));
-  connect(yValConSwi.y, chi.yValConSwi) annotation (Line(points={{12,-20},{36,-20},
-          {36,16},{54,16},{54,12}}, color={0,0,127}));
-  connect(y1Coo.y[1:2], mul.u1) annotation (Line(points={{-218,100},{-60,100},{-60,
-          -20},{-42,-20}}, color={255,0,255}));
-  connect(yValEvaSwi.y, chi.yValEvaSwi) annotation (Line(points={{12,-60},{34,-60},
-          {34,-40},{54,-40},{54,-26},{54,-26},{54,-12}},
-                             color={0,0,127}));
-  connect(numHea.y, rep.u) annotation (Line(points={{-88,20},{-80,20},{-80,0},{-160,
-          0},{-160,-40},{-152,-40}}, color={255,127,0}));
-  connect(cooOrDir.y, heaAndCas.u) annotation (Line(points={{-148,-60},{-140,
-          -60},{-140,-80},{-176,-80},{-176,-100},{-172,-100}},
-                                                            color={255,0,255}));
-  connect(heaAndCas.y, booToInt1.u) annotation (Line(points={{-148,-100},{-142,-100}},
-                                    color={255,0,255}));
-  connect(booToInt1.y, numHeaAndCas.u)
-    annotation (Line(points={{-118,-100},{-112,-100}},
-                                                     color={255,127,0}));
-  connect(numHeaAndCas.y, rep1.u) annotation (Line(points={{-88,-100},{-80,-100},
-          {-80,-120},{-160,-120},{-160,-160},{-152,-160}},
-                                  color={255,127,0}));
-  connect(rep1.y, intLes1.u2) annotation (Line(points={{-128,-160},{-120,-160},
-          {-120,-148},{-112,-148}},
-                             color={255,127,0}));
-  connect(idx.y, intLes1.u1) annotation (Line(points={{-218,-20},{-200,-20},{-200,
-          -140},{-112,-140}},                  color={255,127,0}));
-  connect(cooOrDir.y, mul1.u1) annotation (Line(points={{-148,-60},{-42,-60}},
-                          color={255,0,255}));
-  connect(intLes1.y, mul1.u2) annotation (Line(points={{-88,-140},{-56,-140},{
-          -56,-68},{-42,-68}},
-                          color={255,0,255}));
-  connect(mul1.y, yValEvaSwi.u) annotation (Line(points={{-18,-60},{-12,-60}},
-                     color={255,0,255}));
-  connect(TChiWatSet.y, TChiHeaSupSet.u1) annotation (Line(points={{-218,-180},{
-          -190,-180},{-190,-192},{-170,-192}}, color={0,0,127}));
-  connect(THeaWatSet.y, TChiHeaSupSet.u3) annotation (Line(points={{-218,-220},{
-          -190,-220},{-190,-208},{-170,-208}}, color={0,0,127}));
-  connect(y1Coo.y, TChiHeaSupSet.u2) annotation (Line(points={{-218,100},{-180,100},
-          {-180,-200},{-170,-200}}, color={255,0,255}));
-  connect(TChiHeaSupSet.y, chi.TSet) annotation (Line(points={{-146,-200},{24,
-          -200},{24,-6},{48,-6}},
-                            color={0,0,127}));
-  connect(pumChiWat.port_b, floChiWat.port_a) annotation (Line(points={{140,-140},
-          {160,-140},{160,-110}},color={0,127,255}));
-  connect(y1Coo.y[1:2], y1PumConWatCon.u[1:2]) annotation (Line(points={{-218,100},
-          {-180,100},{-180,140},{-42,140},{-42,141.75}}, color={255,0,255}));
-  connect(pumHeaWat.port_b, floHeaWat.port_a) annotation (Line(points={{140,20},
-          {160,20},{160,80},{140,80}}, color={0,127,255}));
-  connect(y1.y[1:2], onAndHea.u1) annotation (Line(points={{-218,180},{-160,180},
-          {-160,60},{-112,60}}, color={255,0,255}));
-  connect(hea.y, onAndHea.u2) annotation (Line(points={{-148,20},{-146,20},{-146,
-          52},{-112,52}}, color={255,0,255}));
-  connect(onAndHea.y, y1PumHeaWat.u[1:2]) annotation (Line(points={{-88,60},{-42,
-          60},{-42,61.75}}, color={255,0,255}));
-  connect(y1PumHeaWat.y, pumHeaWat.y1[1]) annotation (Line(points={{-18,60},{110,
-          60},{110,28},{118,28}}, color={255,0,255}));
-  connect(THeaWatSup.port_b, pumHeaWat.port_a)
-    annotation (Line(points={{110,20},{120,20}}, color={0,127,255}));
-  connect(pumConWatEva.port_b, chi.port_a2) annotation (Line(points={{140,-60},{
-          150,-60},{150,3},{70,3}}, color={0,127,255}));
-  connect(chi.port_b3, pumConWatCon.port_a) annotation (Line(points={{70,-3.1},{
-          170,-3.1},{170,160},{140,160}}, color={0,127,255}));
-  connect(numHeaAndCas.y, y1PumConWatEva.u)
-    annotation (Line(points={{-88,-100},{-42,-100}}, color={255,127,0}));
-  connect(y1PumConWatEva.y, pumConWatEva.y1[1]) annotation (Line(points={{-18,-100},
-          {110,-100},{110,-52},{118,-52}}, color={255,0,255}));
-  connect(y1PumConWatCon.y, pumConWatCon.y1[1]) annotation (Line(points={{-18,140},
-          {160,140},{160,168},{142,168}}, color={255,0,255}));
-  connect(y1PumChiWat.y, pumChiWat.y1[1]) annotation (Line(points={{-18,-160},{110,
-          -160},{110,-132},{118,-132}}, color={255,0,255}));
-  connect(cooOrDir.y, y1PumChiWat.u[1:2]) annotation (Line(points={{-148,-60},{-60,
-          -60},{-60,-160},{-42,-160},{-42,-158.25}}, color={255,0,255}));
-  connect(floHeaWat.port_b, disHeaWat.port_a)
-    annotation (Line(points={{120,80},{100,80}}, color={0,127,255}));
-  connect(disHeaWat.port_b, chi.port_a1) annotation (Line(points={{80,80},{44,80},
-          {44,8},{50,8}},     color={0,127,255}));
-  connect(chi.port_b2, disConWatEva.port_a) annotation (Line(points={{50,3},{44,
-          3},{44,-60},{80,-60}}, color={0,127,255}));
-  connect(disConWatEva.port_b, pumConWatEva.port_a)
-    annotation (Line(points={{100,-60},{120,-60}}, color={0,127,255}));
-  connect(pumConWatCon.port_b, disConWatCon.port_a)
-    annotation (Line(points={{120,160},{100,160}}, color={0,127,255}));
-  connect(disConWatCon.port_b, chi.port_a3) annotation (Line(points={{80,160},{40,
-          160},{40,-3.2},{50,-3.2}},    color={0,127,255}));
-  connect(THeaWatRet.y, disHeaWat.TSet) annotation (Line(points={{198,100},{110,
-          100},{110,88},{102,88}},color={0,0,127}));
-  connect(TConWatConSup.y, disConWatCon.TSet) annotation (Line(points={{198,180},
-          {110,180},{110,168},{102,168}}, color={0,0,127}));
-  connect(TConWatEvaSup.y, disConWatEva.TSet) annotation (Line(points={{198,-20},
-          {70,-20},{70,-52},{78,-52}}, color={0,0,127}));
-  connect(disChiWat.port_b, pumChiWat.port_a)
-    annotation (Line(points={{100,-140},{120,-140}}, color={0,127,255}));
-  connect(TChiWatSup.port_b, disChiWat.port_a) annotation (Line(points={{40,-90},
-          {40,-140},{80,-140}}, color={0,127,255}));
-  connect(TChiWatRet.y, disChiWat.TSet) annotation (Line(points={{198,-120},{68,
-          -120},{68,-132},{78,-132}}, color={0,0,127}));
-  connect(bouChiWat.ports[1], pumChiWat.port_a)
-    annotation (Line(points={{120,-180},{120,-140}}, color={0,127,255}));
-  connect(booToRea.y, chi.yValCon) annotation (Line(points={{-118,200},{52,200},
-          {52,12}},                color={0,0,127}));
-  connect(bouHeaWat.ports[1], pumHeaWat.port_a) annotation (Line(points={{200,40},
-          {116,40},{116,20},{120,20}}, color={0,127,255}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=2000,
-      Tolerance=1e-06),
-    Diagram(coordinateSystem(extent={{-260,-260},{260,260}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.ChillerHeatRecoveryGroup</a>
-in a configuration with two HRCs.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ChillerHeatRecoveryGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
deleted file mode 100644
index 1b53f070580..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mo
+++ /dev/null
@@ -1,143 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model CoolingTowerGroup "Validation of cooling tower group model"
-  extends Modelica.Icons.Example;
-
-  replaceable package MediumConWat=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "CW medium";
-
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.CoolingTowerGroup coo(
-    redeclare final package Medium = MediumConWat,
-    show_T=true,
-    nUni=2,
-    mConWatUni_flow_nominal=1,
-    dpConWatFriUni_nominal=1E4,
-    mAirUni_flow_nominal=coo.mConWatUni_flow_nominal/1.45,
-    TWetBulEnt_nominal=297.05,
-    TConWatRet_nominal=308.15,
-    TConWatSup_nominal=302.55,
-    PFanUni_nominal=340*coo.mConWatUni_flow_nominal,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Cooling tower group"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
-  Fluid.Sources.Boundary_pT bouConWat(
-    redeclare final package Medium = MediumConWat,
-    T=coo.TConWatRet_nominal,
-    nPorts=2)
-    "Boundary conditions for CW"
-    annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={0,-70})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TConWatSupSet(
-    height=+3,
-    duration=500,
-    offset=coo.TConWatSup_nominal,
-    startTime=500,
-    y(displayUnit="degC", unit="K"))
-    "CW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
-    table=[0,1,1; 0.4,1,1; 0.4,1,0; 0.8,1,0; 0.8,0,0; 1,0,0],
-    timeScale=1000,
-    period=1000)
-    "On/Off command"
-    annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
-    filNam=Modelica.Utilities.Files.loadResource(
-    "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
-    "Outdoor conditions"
-    annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-100,20})));
-  Fluid.Sensors.TemperatureTwoPort TConWatSup(
-    redeclare package Medium =MediumConWat,
-    final m_flow_nominal=coo.mConWat_flow_nominal)
-    "CW supply temperature" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=180,
-        origin={30,0})));
-  Fluid.Sensors.TemperatureTwoPort TConWatRet(
-    redeclare package Medium =MediumConWat,
-    final m_flow_nominal=coo.mConWat_flow_nominal)
-    "CW return temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-60,-40})));
-  EnergyTransferStations.Combined.Controls.PIDWithEnable ctl(
-    k=1,
-    Ti=60,
-    reverseActing=false) "Controller"
-    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed pum(
-    redeclare package Medium =MediumConWat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    final nPum=coo.nUni,
-    have_var=false,
-    have_valve=false,
-    final mPum_flow_nominal=coo.mConWatUni_flow_nominal,
-    final dpPum_nominal=coo.dpConWatFriUni_nominal)
-    "CW pumps"
-    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
-equation
-  connect(y1.y, coo.y1) annotation (Line(points={{-88,100},{-40,100},{-40,6},{-12,
-          6}}, color={255,0,255}));
-  connect(weaDat.weaBus, coo.weaBus) annotation (Line(
-      points={{-90,20},{0,20},{0,10}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(coo.port_b, TConWatSup.port_a)
-    annotation (Line(points={{10,0},{10,1.77636e-15},{20,1.77636e-15}},
-                                                      color={0,127,255}));
-  connect(bouConWat.ports[1],TConWatRet. port_a) annotation (Line(points={{-1,-80},
-          {-60,-80},{-60,-50}},  color={0,127,255}));
-  connect(TConWatRet.port_b, coo.port_a)
-    annotation (Line(points={{-60,-30},{-60,0},{-10,0}}, color={0,127,255}));
-  connect(coo.TConWatSup, ctl.u_m) annotation (Line(points={{12,4},{20,4},{20,
-          40},{0,40},{0,48}}, color={0,0,127}));
-  connect(y1.y[1], ctl.uEna) annotation (Line(points={{-88,100},{-40,100},{-40,
-          40},{-4,40},{-4,48}}, color={255,0,255}));
-  connect(TConWatSupSet.y, ctl.u_s)
-    annotation (Line(points={{-88,60},{-12,60}}, color={0,0,127}));
-  connect(ctl.y, coo.y) annotation (Line(points={{12,60},{20,60},{20,80},{-28,
-          80},{-28,-6},{-12,-6}}, color={0,0,127}));
-  connect(pum.port_b, bouConWat.ports[2]) annotation (Line(points={{70,0},{80,0},
-          {80,-80},{1,-80}},   color={0,127,255}));
-  connect(TConWatSup.port_b, pum.port_a)
-    annotation (Line(points={{40,0},{50,0}}, color={0,127,255}));
-  connect(y1.y, pum.y1) annotation (Line(points={{-88,100},{40,100},{40,8},{48,8}},
-        color={255,0,255}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.CoolingTowerGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.CoolingTowerGroup</a>
-in a configuration with two tower cells.
-The tower cells are initially enabled and they are disabled one after the other
-as the CW supply temperature setpoint is increasing after an initial
-period where it is fixed at its design value.
-The Start command of the CW pumps is the same signal
-as the one used for the cooling towers.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end CoolingTowerGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
deleted file mode 100644
index 6534df7a8cb..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mo
+++ /dev/null
@@ -1,142 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model HeatPumpGroup "Validation of heat pump group model"
-  extends Modelica.Icons.Example;
-
-  replaceable package MediumHeaWat=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "CHW medium";
-  replaceable package MediumAir=Buildings.Media.Air
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "CW medium";
-
-  parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic dat(
-    dpHeaLoa_nominal=50000,
-    dpHeaSou_nominal=100,
-    hea(
-      mLoa_flow=dat.hea.Q_flow / 10 / 4186,
-      mSou_flow=1E-4 * dat.hea.Q_flow,
-      Q_flow=1E6,
-      P=dat.hea.Q_flow / 2.2,
-      coeQ={-5.64420084,  1.95212447,  9.96663913,  0.23316322, -5.64420084},
-      coeP={-3.96682255,  6.8419453,   1.99606939,  0.01393387, -3.96682255},
-      TRefLoa=298.15,
-      TRefSou=253.15),
-    coo(
-      mLoa_flow=0,
-      mSou_flow=0,
-      Q_flow=-1,
-      P=0,
-      coeQ=fill(0, 5),
-      coeP=fill(0, 5),
-      TRefLoa=273.15,
-      TRefSou=273.15))
-    "Heat pump parameters (each unit)"
-    annotation (Placement(transformation(extent={{90,92},{110,112}})));
-
-  Buildings.Experimental.DHC.Plants.Combined.Subsystems.HeatPumpGroup heaPum(
-    redeclare final package Medium = MediumHeaWat,
-    redeclare final package MediumAir = MediumAir,
-    show_T=true,
-    nUni=2,
-    final dat=dat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Heat pump group"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-
-  Fluid.Sources.Boundary_pT bouHeaWat(
-    redeclare final package Medium = MediumHeaWat,
-    use_T_in=true,
-    nPorts=2)
-    "Boundary conditions for HW"
-    annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=-90,
-        origin={2,-90})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(
-    k=dat.hea.TRefLoa+ 10,
-    y(displayUnit="degC", unit="K")) "HW supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
-    table=[0,1,1; 0.5,1,1; 0.5,1,0; 0.8,1,0; 0.8,0,0; 1,0,0],
-    timeScale=1000,
-    period=1000)
-    "Heat pump On/Off command"
-    annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
-
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
-    filNam=Modelica.Utilities.Files.loadResource(
-    "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
-    "Outdoor conditions"
-    annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-100,20})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp THeaWatRetBou(
-    y(displayUnit="degC", unit="K"),
-    height=+5,
-    duration=1000,
-    offset=dat.hea.TRefLoa) "HW return temperature"
-    annotation (Placement(transformation(extent={{-110,-70},{-90,-50}})));
-  Fluid.Sensors.TemperatureTwoPort THeaWatSup(
-    redeclare package Medium = MediumHeaWat,
-    final m_flow_nominal=heaPum.mHeaWat_flow_nominal)
-    "HW supply temperature" annotation (Placement(transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=90,
-        origin={20,-40})));
-  Fluid.Sensors.TemperatureTwoPort THeaWatRet(
-    redeclare package Medium = MediumHeaWat,
-    final m_flow_nominal=heaPum.mHeaWat_flow_nominal)
-    "HW return temperature" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=90,
-        origin={-20,-40})));
-equation
-  connect(THeaWatSupSet.y,heaPum. TSet) annotation (Line(points={{-88,60},{-60,60},
-          {-60,-6},{-12,-6}},      color={0,0,127}));
-  connect(y1.y,heaPum. y1) annotation (Line(points={{-88,100},{-40,100},{-40,6},
-          {-12,6}},
-               color={255,0,255}));
-  connect(weaDat.weaBus,heaPum. weaBus) annotation (Line(
-      points={{-90,20},{0,20},{0,10}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(THeaWatRetBou.y, bouHeaWat.T_in)
-    annotation (Line(points={{-88,-60},{6,-60},{6,-78}}, color={0,0,127}));
-  connect(heaPum.port_b, THeaWatSup.port_a)
-    annotation (Line(points={{10,0},{20,0},{20,-30}}, color={0,127,255}));
-  connect(THeaWatSup.port_b, bouHeaWat.ports[1])
-    annotation (Line(points={{20,-50},{20,-100},{1,-100}}, color={0,127,255}));
-  connect(bouHeaWat.ports[2], THeaWatRet.port_a) annotation (Line(points={{3,-100},
-          {-20,-100},{-20,-50}}, color={0,127,255}));
-  connect(THeaWatRet.port_b, heaPum.port_a)
-    annotation (Line(points={{-20,-30},{-20,0},{-10,0}}, color={0,127,255}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-    Diagram(coordinateSystem(extent={{-120,-120},{120,120}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.HeatPumpGroup\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.HeatPumpGroup</a>
-in a configuration with two heat pumps.
-The heat pumps are initially On and they are switched Off one after the other
-as they are exposed to an increasing HW return temperature.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end HeatPumpGroup;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
deleted file mode 100644
index 3fa740c7a1e..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mo
+++ /dev/null
@@ -1,58 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model MultiplePumpsDp
-  "Validation of multiple pumps model with dp-controlled pump model"
-  extends BaseClasses.PartialMultiplePumps(
-    redeclare final Subsystems.MultiplePumpsDp pum,
-    redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum1(
-      final m_flow_nominal=mPum_flow_nominal,
-      final dp_nominal=dpPum_nominal),
-    redeclare final Buildings.Fluid.Movers.FlowControlled_dp pum2(
-      final m_flow_nominal=mPum_flow_nominal,
-      final dp_nominal=dpPum_nominal));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp dpSet(
-    height=dpPum_nominal, duration=500)
-    "Differential pressure setpoint"
-    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
-equation
-  connect(dpSet.y, inp1.u1)
-    annotation (Line(points={{-98,40},{114,40},{114,14}}, color={0,0,127}));
-  connect(dpSet.y, inp2.u1) annotation (Line(points={{-98,40},{100,40},{100,-26},
-          {114,-26},{114,-30}}, color={0,0,127}));
-  connect(inp1.y, pum1.dp_in) annotation (Line(points={{120,-10},{120,-20},{0,-20},
-          {0,-28}}, color={0,0,127}));
-  connect(inp2.y, pum2.dp_in) annotation (Line(points={{120,-54},{120,-60},{0,-60},
-          {0,-68}}, color={0,0,127}));
-  connect(dpSet.y, pum.dp_in) annotation (Line(points={{-98,40},{-40,40},{-40,64},
-          {-12,64}}, color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsDp\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsDp</a>
-by comparing an instance of that model with two instances of
-<a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_dp\">
-Buildings.Fluid.Movers.FlowControlled_dp</a>
-connected in parallel.
-The two pumps are commanded On one after the other as they receive
-an increasing differential pressure setpoint and work
-against a two-way modulating valve that gets progressively opened.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end MultiplePumpsDp;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
deleted file mode 100644
index 58ebe2f8277..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mo
+++ /dev/null
@@ -1,67 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model MultiplePumpsFlow
-  "Validation of multiple pumps model with flow-controlled pump model"
-  extends BaseClasses.PartialMultiplePumps(
-    redeclare final Subsystems.MultiplePumpsFlow pum,
-    redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum1(
-      final m_flow_nominal=mPum_flow_nominal,
-      final dp_nominal=dpPum_nominal),
-    redeclare final Buildings.Fluid.Movers.FlowControlled_m_flow pum2(
-      final m_flow_nominal=mPum_flow_nominal,
-      final dp_nominal=dpPum_nominal));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp floSet(height=
-        mPum_flow_nominal, duration=500) "Mass flow rate setpoint (each pump)"
-    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
-  Buildings.Controls.OBC.CDL.Reals.Add floTotSet
-    "Compute total flow rate setpoint (all pumps)" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=-90,
-        origin={80,0})));
-equation
-  connect(floSet.y, inp1.u1)
-    annotation (Line(points={{-98,40},{114,40},{114,14}}, color={0,0,127}));
-  connect(floSet.y, inp2.u1) annotation (Line(points={{-98,40},{100,40},{100,-26},
-          {114,-26},{114,-30}}, color={0,0,127}));
-  connect(inp2.y, pum2.m_flow_in) annotation (Line(points={{120,-54},{120,-60},
-          {0,-60},{0,-68}}, color={0,0,127}));
-  connect(inp1.y, pum1.m_flow_in) annotation (Line(points={{120,-10},{120,-20},
-          {0,-20},{0,-28}}, color={0,0,127}));
-  connect(floTotSet.y, pum.m_flow_in) annotation (Line(points={{80,12},{80,44},
-          {-16,44},{-16,64},{-12,64}}, color={0,0,127}));
-  connect(inp1.y, floTotSet.u1) annotation (Line(points={{120,-10},{120,-20},{
-          86,-20},{86,-12}}, color={0,0,127}));
-  connect(inp2.y, floTotSet.u2) annotation (Line(points={{120,-54},{120,-60},{
-          74,-60},{74,-12}}, color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsFlow</a>
-by comparing an instance of that model with two instances of
-<a href=\"modelica://Buildings.Fluid.Movers.FlowControlled_m_flow\">
-Buildings.Fluid.Movers.FlowControlled_m_flow</a>
-connected in parallel.
-The two pumps are commanded On one after the other as they receive
-an increasing flow setpoint and work against a two-way modulating
-valve that gets progressively opened.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end MultiplePumpsFlow;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
deleted file mode 100644
index 1d94cc90eb2..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mo
+++ /dev/null
@@ -1,53 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation;
-model MultiplePumpsSpeed
-  "Validation of multiple pumps model with speed-controlled pump model"
-  extends BaseClasses.PartialMultiplePumps(
-    redeclare final Subsystems.MultiplePumpsSpeed pum,
-    redeclare final Fluid.Movers.SpeedControlled_y pum1,
-    redeclare final Fluid.Movers.SpeedControlled_y pum2);
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp spe(duration=500)
-    "Pump speed signal"
-    annotation (Placement(transformation(extent={{-120,30},{-100,50}})));
-equation
-  connect(spe.y, pum.y) annotation (Line(points={{-98,40},{-40,40},{-40,64},{
-          -12,64}}, color={0,0,127}));
-  connect(spe.y, inp1.u1)
-    annotation (Line(points={{-98,40},{114,40},{114,14}}, color={0,0,127}));
-  connect(spe.y, inp2.u1) annotation (Line(points={{-98,40},{100,40},{100,-26},
-          {114,-26},{114,-30}}, color={0,0,127}));
-  connect(inp1.y, pum1.y) annotation (Line(points={{120,-10},{120,-20},{0,-20},
-          {0,-28}}, color={0,0,127}));
-  connect(inp2.y, pum2.y) annotation (Line(points={{120,-54},{120,-60},{0,-60},
-          {0,-68}}, color={0,0,127}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=1000,
-      Tolerance=1e-06),
-  Diagram(
-        coordinateSystem(preserveAspectRatio=false, extent={{-140,-140},{140,140}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed\">
-Buildings.Experimental.DHC.Plants.Combined.Subsystems.MultiplePumpsSpeed</a>
-by comparing an instance of that model with two instances of
-<a href=\"modelica://Buildings.Fluid.Movers.SpeedControlled_y\">
-Buildings.Fluid.Movers.SpeedControlled_y</a>
-connected in parallel.
-The two pumps are commanded On one after the other as they receive
-an increasing speed signal and work against a two-way modulating valve
-that gets progressively opened.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end MultiplePumpsSpeed;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.mo
deleted file mode 100644
index 72c90cfbbbb..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/Validation/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Subsystems;
-package Validation "Package with validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This pakcge contains validation models.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.mo
deleted file mode 100644
index 07c16cf9777..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Subsystems/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined;
-package Subsystems "Package of models for subsystems of combined plants"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains models of components used in
-combined heating and cooling plants.
-</p>
-</html>"));
-end Subsystems;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo b/Buildings/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
deleted file mode 100644
index d2a6b6140c5..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mo
+++ /dev/null
@@ -1,237 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined.Validation;
-model AllElectricCWStorage "Validation of all-electric plant model"
-  extends Modelica.Icons.Example;
-
-  replaceable package Medium=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Main medium (common to CHW, HW and CW)";
-  replaceable package MediumConWatCoo=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Medium in cooler circuit";
-
-  replaceable parameter
-    Fluid.Chillers.Data.ElectricReformulatedEIR.ReformEIRChiller_Carrier_19XR_1403kW_7_09COP_VSD datChi(
-      EIRFunT={0.0101739374, 0.0607200115, 0.0003348647, 0.003162578, 0.0002388594, -0.0014121289},
-      capFunT={0.0387084662, 0.2305017927, 0.0004779504, 0.0178244359, -8.48808e-05, -0.0032406711},
-      EIRFunPLR={0.4304252832, -0.0144718912, 5.12039e-05, -0.7562386674, 0.5661683373,
-        0.0406987748, 3.0278e-06, -0.3413411197, -0.000469572, 0.0055009208},
-      QEva_flow_nominal=-1E6,
-      COP_nominal=2.5,
-    mEva_flow_nominal=-datChi.QEva_flow_nominal/5/4186,
-      mCon_flow_nominal=-datChi.QEva_flow_nominal * (1 + 1/datChi.COP_nominal) / 10 / 4186,
-    TEvaLvg_nominal=279.15,
-    TEvaLvgMin=277.15,
-    TEvaLvgMax=308.15,
-    TConLvg_nominal=333.15,
-    TConLvgMin=296.15,
-    TConLvgMax=336.15)
-    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
-    "Chiller parameters (each unit)"
-    annotation (
-      Dialog(group="CHW loop and cooling-only chillers"),
-      Placement(transformation(extent={{140,200},{160,220}})));
-  replaceable parameter Fluid.Chillers.Data.ElectricReformulatedEIR.Generic datChiHea=
-    datChi
-    constrainedby Buildings.Fluid.Chillers.Data.BaseClasses.Chiller
-    "Chiller parameters (each unit)"
-    annotation (
-      Dialog(group="HW loop and heat recovery chillers"),
-      Placement(transformation(extent={{170,200},{190,220}})));
-  replaceable parameter Fluid.HeatPumps.Data.EquationFitReversible.Generic datHeaPum(
-    dpHeaLoa_nominal=50000,
-    dpHeaSou_nominal=100,
-    hea(
-      mLoa_flow=datHeaPum.hea.Q_flow / 10 / 4186,
-      mSou_flow=1E-4 * datHeaPum.hea.Q_flow,
-      Q_flow=1E6,
-      P=datHeaPum.hea.Q_flow / 2.2,
-      coeQ={-5.64420084,  1.95212447,  9.96663913,  0.23316322, -5.64420084},
-      coeP={-3.96682255,  6.8419453,   1.99606939,  0.01393387, -3.96682255},
-      TRefLoa=298.15,
-      TRefSou=253.15),
-    coo(
-      mLoa_flow=0,
-      mSou_flow=0,
-      Q_flow=-1,
-      P=0,
-      coeQ=fill(0, 5),
-      coeP=fill(0, 5),
-      TRefLoa=273.15,
-      TRefSou=273.15))
-    "Heat pump parameters (each unit)"
-    annotation (Placement(transformation(extent={{200,200},{220,220}})));
-
-  // Assumptions
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
-    Modelica.Fluid.Types.Dynamics.FixedInitial
-    "Type of energy balance: dynamic (3 initialization options) or steady state"
-    annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
-
-  Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage pla(
-    redeclare final package Medium = Medium,
-    redeclare package MediumHea_b = Medium,
-    redeclare final package MediumConWatCoo = MediumConWatCoo,
-    allowFlowReversal=true,
-    dpConWatCooFri_nominal=1E4,
-    mAirCooUni_flow_nominal=pla.mConWatCoo_flow_nominal/pla.nCoo/1.45,
-    TWetBulCooEnt_nominal=297.05,
-    PFanCoo_nominal=340*pla.mConWatCoo_flow_nominal/pla.nCoo,
-    chi(show_T=true),
-    chiHea(show_T=true),
-    heaPum(show_T=true),
-    final datChi=datChi,
-    final datChiHea=datChiHea,
-    final datHeaPum=datHeaPum,
-    nChi=2,
-    dpChiWatSet_max=20E4,
-    nChiHea=2,
-    dpHeaWatSet_max=20E4,
-    nHeaPum=2,
-    dInsTan=0.05,
-    nCoo=3,
-    final energyDynamics=energyDynamics)
-    "CHW and HW plant"
-    annotation (Placement(transformation(extent={{-30,-30},{30,30}})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(final k=pla.TChiWatSup_nominal,
-    y(final unit="K", displayUnit="degC"))
-                   "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-220,10},{-200,30}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(final k=pla.THeaWatSup_nominal,
-    y(final unit="K", displayUnit="degC"))
-                   "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-190,-10},{-170,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpHeaWatSet_max(
-    k=pla.dpHeaWatSet_max,
-    y(final unit="Pa")) "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-190,-70},{-170,-50}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpChiWatSet_max(
-    k=pla.dpChiWatSet_max,
-    y(final unit="Pa")) "Source signal for setpoint"
-    annotation (Placement(transformation(extent={{-220,-50},{-200,-30}})));
-  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(filNam=
-        Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
-    "Outdoor conditions"
-    annotation (
-      Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-210,120})));
-  Fluid.HeatExchangers.SensibleCooler_T disHeaWat(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=pla.mHeaWat_flow_nominal,
-    final dp_nominal=0,
-    final energyDynamics=energyDynamics,
-    tau=300)
-    "Distribution system approximated by prescribed return temperature"
-    annotation (Placement(transformation(extent={{12,130},{-8,150}})));
-  Fluid.HeatExchangers.Heater_T disChiWat(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=pla.mChiWat_flow_nominal,
-    show_T=true,
-    final dp_nominal=0,
-    final energyDynamics=energyDynamics,
-    tau=300)
-    "Distribution system approximated by prescribed return temperature"
-    annotation (Placement(transformation(extent={{10,-150},{-10,-130}})));
-
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(k=pla.THeaWatRet_nominal,
-              y(final unit="K", displayUnit="degC"))
-    "Source signal for HW return temperature"
-    annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(k=pla.TChiWatRet_nominal,
-              y(final unit="K", displayUnit="degC"))
-    "Source signal for CHW return temperature"
-    annotation (Placement(transformation(extent={{-220,-110},{-200,-90}})));
-  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
-    table=[0,0,0; 4,1,1; 72,0,1; 96,0,0],
-    timeScale=3600,
-    period=96*3600) "Plant enable signal: y[1] for cooling, y[2] for heating"
-    annotation (Placement(transformation(extent={{-220,50},{-200,70}})));
-  Fluid.Actuators.Valves.TwoWayPressureIndependent valDisHeaWat(
-    redeclare final package Medium = Medium,
-    m_flow_nominal=pla.mHeaWat_flow_nominal,
-    dpValve_nominal=1E4,
-    dpFixed_nominal=pla.dpHeaWatSet_max - valDisHeaWat.dpValve_nominal)
-    "Distribution system approximated by variable flow resistance"
-    annotation (Placement(transformation(extent={{-30,130},{-50,150}})));
-  Fluid.Actuators.Valves.TwoWayPressureIndependent valDisChiWat(
-    redeclare final package Medium = Medium,
-    m_flow_nominal=pla.mChiWat_flow_nominal,
-    dpValve_nominal=1E4,
-    dpFixed_nominal=pla.dpChiWatSet_max - valDisChiWat.dpValve_nominal)
-    "Distribution system approximated by variable flow resistance"
-    annotation (Placement(transformation(extent={{-30,-150},{-50,-130}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(table=[0,0,0;
-        6,0,0; 10,0.3,0.1; 15,1,0.1; 24,0.1,0.1; 30,0.1,1; 39,1,0.3; 48,0.1,0.1;
-        54,0.1,1; 63,0.1,0.3; 72,0,0; 78,0,1; 96,0,0],
-                                    timeScale=3600)
-    "Source signal: y[1] for cooling load, y[2] for heating load"
-    annotation (Placement(transformation(extent={{-220,170},{-200,190}})));
-equation
-  connect(TChiWatSupSet.y, pla.TChiWatSupSet) annotation (Line(points={{-198,20},
-          {-34,20}},                   color={0,0,127}));
-  connect(THeaWatSupSet.y, pla.THeaWatSupSet) annotation (Line(points={{-168,0},
-          {-74,0},{-74,16},{-34,16}},   color={0,0,127}));
-  connect(dpChiWatSet_max.y, pla.dpChiWatSet) annotation (Line(points={{-198,-40},
-          {-70,-40},{-70,12},{-34,12}},color={0,0,127}));
-  connect(dpHeaWatSet_max.y, pla.dpHeaWatSet) annotation (Line(points={{-168,-60},
-          {-66,-60},{-66,8},{-34,8}},   color={0,0,127}));
-
-  connect(weaDat.weaBus, pla.weaBus) annotation (Line(
-      points={{-200,120},{0,120},{0,30}},
-      color={255,204,51},
-      thickness=0.5));
-  connect(pla.port_bSerHea, disHeaWat.port_a) annotation (Line(points={{30,0},{
-          60,0},{60,140},{12,140}}, color={0,127,255}));
-  connect(pla.port_bSerCoo, disChiWat.port_a) annotation (Line(points={{30,-4},
-          {60,-4},{60,-140},{10,-140}},color={0,127,255}));
-  connect(THeaWatRet.y, disHeaWat.TSet) annotation (Line(points={{-168,80},{20,80},
-          {20,148},{14,148}},      color={0,0,127}));
-  connect(TChiWatRet.y, disChiWat.TSet) annotation (Line(points={{-198,-100},{20,
-          -100},{20,-132},{12,-132}}, color={0,0,127}));
-  connect(u1.y[1], pla.u1Coo) annotation (Line(points={{-198,60},{-40,60},{-40,28},
-          {-34,28}},     color={255,0,255}));
-  connect(disHeaWat.port_b, valDisHeaWat.port_a)
-    annotation (Line(points={{-8,140},{-30,140}}, color={0,127,255}));
-  connect(valDisHeaWat.port_b, pla.port_aSerHea) annotation (Line(points={{-50,140},
-          {-60,140},{-60,0},{-30,0}}, color={0,127,255}));
-  connect(disChiWat.port_b, valDisChiWat.port_a)
-    annotation (Line(points={{-10,-140},{-30,-140}}, color={0,127,255}));
-  connect(valDisChiWat.port_b, pla.port_aSerCoo) annotation (Line(points={{-50,-140},
-          {-60,-140},{-60,-4},{-30,-4}}, color={0,127,255}));
-  connect(ratFlo.y[2], valDisHeaWat.y) annotation (Line(points={{-198,180},{-40,
-          180},{-40,152}}, color={0,0,127}));
-  connect(ratFlo.y[1], valDisChiWat.y) annotation (Line(points={{-198,180},{-80,
-          180},{-80,-120},{-40,-120},{-40,-128}}, color={0,0,127}));
-  connect(u1.y[2], pla.u1Hea) annotation (Line(points={{-198,60},{-40,60},{-40,
-          24},{-34,24}}, color={255,0,255}));
-  annotation (
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos"
-      "Simulate and plot"),
-    experiment(
-      StopTime=345600,
-      Tolerance=1e-06),
-  Diagram(coordinateSystem(extent={{-240,-240},{240,240}})),
-    Documentation(info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage\">
-Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage</a>
-over a four-day simulation period where the load profile is characterized by
-high cooling loads and low heating loads during the first day,
-concomitant high cooling and heating loads during the second day,
-low cooling loads and high heating loads during the third day,
-and no cooling loads (cooling disabled) and high heating loads
-during the last day.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-February 24, 2023, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end AllElectricCWStorage;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/Validation/package.mo b/Buildings/Experimental/DHC/Plants/Combined/Validation/package.mo
deleted file mode 100644
index a708d489d62..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/Validation/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Combined;
-package Validation "Package with validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains validation models.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Combined/package.mo b/Buildings/Experimental/DHC/Plants/Combined/package.mo
deleted file mode 100644
index d58f0974d94..00000000000
--- a/Buildings/Experimental/DHC/Plants/Combined/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Experimental.DHC.Plants;
-package Combined "Package of models for central plants that provide heating and cooling"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains models for combined heating and cooling plants
-used in DHC systems.
-</p>
-</html>"));
-end Combined;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/IdealUser.mo b/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
deleted file mode 100644
index 96e1e39cfec..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/IdealUser.mo
+++ /dev/null
@@ -1,194 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
-model IdealUser "Ideal user model"
-  replaceable package Medium =
-    Modelica.Media.Interfaces.PartialMedium "Medium package";
-
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
-    "Nominal mass flow rate";
-
-  parameter Modelica.Units.SI.Temperature T_CHWR_nominal
-    "Nominal temperature of CHW return";
-  parameter Modelica.Units.SI.PressureDifference dp_nominal(
-    final displayUnit="Pa")
-    "Nominal pressure drop when valve is fully open";
-
-  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage val(
-    redeclare final package Medium = Medium,
-    final use_inputFilter=true,
-    final dpValve_nominal=dp_nominal/2,
-    final init=Modelica.Blocks.Types.Init.InitialState,
-    final dpFixed_nominal=dp_nominal/2,
-    final m_flow_nominal=m_flow_nominal,
-    y_start=0) "User control valve"
-    annotation (Placement(transformation(extent={{0,50},{20,70}})));
-  Buildings.Controls.Continuous.LimPID conPI(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    k=0.5,
-    Ti=20,
-    final reverseActing=true)  "PI controller" annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-30,80})));
-  Modelica.Blocks.Interfaces.RealInput mPre_flow(
-    final quantity = "MassFlowRate",
-    final unit = "kg/s")
-    "Load in terms of flow rate prescription" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-110,80}), iconTransformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-110,80})));
-  Modelica.Blocks.Interfaces.RealOutput yVal_actual(
-    final unit = "1")
-    "Consumer control valve actuator position" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={110,80}), iconTransformation(
-        extent={{10,-10},{-10,10}},
-        rotation=180,
-        origin={110,80})));
-  Buildings.Fluid.Sensors.RelativePressure senRelPre(
-    redeclare final package Medium = Medium)
-    "Differential pressure sensor" annotation (Placement(
-        transformation(
-        extent={{-10,10},{10,-10}},
-        rotation=-90,
-        origin={-72,20})));
-  Modelica.Blocks.Interfaces.RealOutput dp(
-    final quantity="PressureDifference",
-    final unit="Pa",
-    displayUnit="Pa")
-    "Differential pressure from the sensor" annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={110,20}),  iconTransformation(
-        extent={{10,-10},{-10,10}},
-        rotation=180,
-        origin={110,40})));
-  Modelica.Fluid.Interfaces.FluidPort_a port_a(
-    p(start=Medium.p_default),
-    redeclare final package Medium = Medium,
-    h_outflow(start=Medium.h_default, nominal=Medium.h_default))
-    "Fluid connector a (positive design flow direction is from port_a to port_b)"
-    annotation (Placement(transformation(extent={{-110,50},{-90,70}}),
-        iconTransformation(extent={{-110,50},{-90,70}})));
-  Modelica.Fluid.Interfaces.FluidPort_b port_b(
-    p(start=Medium.p_default),
-    redeclare final package Medium = Medium,
-    h_outflow(start=Medium.h_default, nominal=Medium.h_default))
-    "Fluid connector b (positive design flow direction is from port_a to port_b)"
-    annotation (Placement(transformation(extent={{-90,-70},{-110,-50}}),
-        iconTransformation(extent={{-90,-70},{-110,-50}})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
-    redeclare final package Medium = Medium)
-    "Mass flow rate sensor"
-    annotation (Placement(transformation(extent={{-20,-70},{-40,-50}})));
-  Buildings.Fluid.Sources.PropertySource_T proSou(
-    redeclare final package Medium = Medium,
-    final use_T_in=true) "Ideal temperature source" annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=0,
-        origin={10,-60})));
-  Modelica.Blocks.Sources.Constant TRet(final k=T_CHWR_nominal)
-    "Constant CHW return temperature"
-    annotation (Placement(transformation(extent={{-20,-40},{0,-20}})));
-equation
-  connect(senRelPre.p_rel, dp) annotation (Line(points={{-63,20},{110,20}},
-                           color={0,0,127}));
-  connect(val.y_actual, yVal_actual)
-    annotation (Line(points={{15,67},{40,67},{40,80},{110,80}},
-                                                         color={0,0,127}));
-  connect(senRelPre.port_a, port_a) annotation (Line(
-      points={{-72,30},{-72,60},{-100,60}},
-      color={0,127,255},
-      pattern=LinePattern.Dash));
-  connect(senRelPre.port_b, port_b) annotation (Line(
-      points={{-72,10},{-72,-60},{-100,-60}},
-      color={0,127,255},
-      pattern=LinePattern.Dash));
-  connect(conPI.y, val.y)
-    annotation (Line(points={{-19,80},{10,80},{10,72}},   color={0,0,127}));
-  connect(senMasFlo.port_b, port_b)
-    annotation (Line(points={{-40,-60},{-100,-60}}, color={0,127,255}));
-  connect(senMasFlo.m_flow, conPI.u_m)
-    annotation (Line(points={{-30,-49},{-30,68}}, color={0,0,127}));
-  connect(port_a, val.port_a)
-    annotation (Line(points={{-100,60},{0,60}}, color={0,127,255}));
-  connect(conPI.u_s, mPre_flow)
-    annotation (Line(points={{-42,80},{-110,80}}, color={0,0,127}));
-  connect(senMasFlo.port_a, proSou.port_b)
-    annotation (Line(points={{-20,-60},{0,-60}}, color={0,127,255}));
-  connect(proSou.port_a, val.port_b) annotation (Line(points={{20,-60},{40,-60},
-          {40,60},{20,60}}, color={0,127,255}));
-  connect(TRet.y, proSou.T_in)
-    annotation (Line(points={{1,-30},{14,-30},{14,-48}}, color={0,0,127}));
-  annotation (
-    defaultComponentName = "ideUse",
-                                 Documentation(info="<html>
-<p>
-This is a simple ideal user model used by
-<a href=\"Modelica://Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource\">
-Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource</a>.
-The load of the user is described by a varying mass flow rate setpoint.
-The valve is controlled to maintain the requested mass flow rate.
-The model sets its leaving water temperature to the user-specified temperature
-<code>T_CHWR_nominal</code>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-July 31, 2023, by Michael Wetter:<br/>
-Revised implementation, removed unused parameter.
-</li>
-<li>
-February 18, 2022 by Hongxiang Fu:<br/>
-First implementation. This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
-</li>
-</ul>
-</html>"),
-    Icon(graphics={
-        Rectangle(
-          extent={{-100,100},{100,-100}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-40,40},{40,-40}},
-          fillColor={175,175,175},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-34,34},{-4,6}},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          lineColor={0,0,0}),
-        Rectangle(
-          extent={{6,34},{34,6}},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          lineColor={0,0,0}),
-        Rectangle(
-          extent={{-34,-4},{-4,-34}},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          lineColor={0,0,0}),
-        Rectangle(
-          extent={{6,-4},{34,-34}},
-          pattern=LinePattern.None,
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid,
-          lineColor={0,0,0}),
-        Text(
-          extent={{-151,-100},{149,-140}},
-          textColor={0,0,255},
-          textString="%name")}));
-end IdealUser;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo b/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
deleted file mode 100644
index 156d6b8207c..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mo
+++ /dev/null
@@ -1,79 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation;
-model IdealUser "Test model for the dummy user"
-  extends Modelica.Icons.Example;
-
-  package Medium = Buildings.Media.Water "Medium model";
-
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal mass flow rate";
-  parameter Modelica.Units.SI.PressureDifference dp_nominal=500000
-    "Nominal pressure difference";
-  parameter Modelica.Units.SI.AbsolutePressure p_Pressurisation=300000
-    "Pressurisation point";
-  parameter Modelica.Units.SI.Temperature T_CHWR_nominal(
-    final displayUnit="degC")=12+273.15
-    "Nominal temperature of CHW return";
-  parameter Modelica.Units.SI.Temperature T_CHWS_nominal(
-    final displayUnit="degC")=7+273.15
-    "Nominal temperature of CHW supply";
-  parameter Boolean allowFlowReversal=false
-    "Flow reversal setting";
-  parameter Modelica.Units.SI.Power QCooLoa_flow_nominal=5*4200*0.9
-    "Nominal cooling load of one consumer";
-
-  Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser ideUse(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=m_flow_nominal,
-    T_CHWR_nominal=T_CHWR_nominal,
-    final dp_nominal=dp_nominal) "Ideal user" annotation (Placement(
-        transformation(extent={{-10,-10},{10,10}}, rotation=0)));
-  Buildings.Fluid.Sources.Boundary_pT sin(
-    redeclare final package Medium = Medium,
-    final p=p_Pressurisation,
-    final T=T_CHWR_nominal,
-    nPorts=1) "Sink representing CHW return line"
-    annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-70,-30})));
-  Buildings.Fluid.Sources.Boundary_pT sou(
-    redeclare final package Medium = Medium,
-    final p=p_Pressurisation+dp_nominal,
-    final T=T_CHWS_nominal,
-    nPorts=1) "Source representing CHW supply line" annotation (Placement(
-        transformation(
-        extent={{10,10},{-10,-10}},
-        rotation=180,
-        origin={-70,30})));
-  Modelica.Blocks.Sources.TimeTable mPre_flow(table=[0*3600,0; 0.5*3600,0; 0.5*
-        3600,m_flow_nominal; 0.75*3600,m_flow_nominal; 0.75*3600,0; 1*3600,0])
-    "Prescribed flow rate representing cooling load"
-    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
-equation
-  connect(sou.ports[1],ideUse. port_a) annotation (Line(points={{-60,30},{-40,
-          30},{-40,6},{-10,6}},                      color={0,127,255}));
-  connect(ideUse.port_b, sin.ports[1])
-    annotation (Line(points={{-10,-6},{-40,-6},{-40,-30},{-60,-30}},
-                                             color={0,127,255}));
-  connect(mPre_flow.y, ideUse.mPre_flow) annotation (Line(points={{-59,70},{-20,
-          70},{-20,8},{-11,8}}, color={0,0,127}));
-annotation(__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos"
-        "Simulate and plot"),
-experiment(Tolerance=1e-06, StopTime=3600), Documentation(info="<html>
-<p>
-This is a simple test model for the ideal user.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-July 31, 2023, by Michael Wetter:<br/>
-Revised implementation, removed unused parameter.
-</li>
-<li>
-February 18, 2022 by Hongxiang Fu:<br/>
-First implementation. This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
-</li>
-</ul>
-</html>"));
-end IdealUser;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
deleted file mode 100644
index 9da11f1ef99..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/package.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.BaseClasses;
-package Validation "Package containing validation models"
-  extends Modelica.Icons.ExamplesPackage;
-  annotation (Documentation(info="<html>
-Package containing validation models for the base classes.
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.mo
deleted file mode 100644
index 1b2cf6c94c0..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/BaseClasses/package.mo
+++ /dev/null
@@ -1,7 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
-package BaseClasses "Package containing base classes"
-  extends Modelica.Icons.BasesPackage;
-  annotation (Documentation(info="<html>
-Package containing base classes.
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
deleted file mode 100644
index e7b68c237c4..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterBypass.mo
+++ /dev/null
@@ -1,120 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
-model ChilledWaterBypass
-  "Controller for chilled water bypass valve"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Integer numChi(
-    min=1)
-    "Number of chillers";
-  parameter Modelica.Units.SI.MassFlowRate mMin_flow
-    "Minimum mass flow rate of single chiller";
-  parameter Real k(min=0) = 0.06 "Gain of controller";
-  parameter Modelica.Units.SI.Time Ti(min=Modelica.Constants.small) = 60
-    "Time constant of Integrator block" annotation (Dialog(enable=
-          controllerType == Modelica.Blocks.Types.SimpleController.PI or
-          controllerType == Modelica.Blocks.Types.SimpleController.PID));
-  parameter Modelica.Blocks.Types.SimpleController controllerType=
-         Modelica.Blocks.Types.SimpleController.PI
-    "Type of controller";
-  Modelica.Blocks.Interfaces.BooleanInput chiOn[numChi]
-    "On signals of the chillers"
-    annotation (Placement(transformation(extent={{-140,30},{-100,70}}),
-        iconTransformation(extent={{-140,30},{-100,70}})));
-  Modelica.Blocks.Interfaces.RealInput mFloChi(final unit="kg/s")
-    "Mass flow rate through the chillers"
-    annotation (Placement(transformation(extent={{-140,-70},{-100,-30}})));
-  Modelica.Blocks.Interfaces.RealOutput y
-    "Bypass valve opening ratio"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
-        iconTransformation(extent={{100,-10},{120,10}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset
-                                       bypValCon(
-    controllerType=controllerType,
-    final k=k,
-    final Ti=Ti,
-    y_reset=0)
-    "Chilled water bypass valve controller"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Modelica.Blocks.Math.BooleanToInteger booToInt[numChi]
-    "Boolean signal to integer"
-    annotation (Placement(transformation(extent={{-90,40},{-70,60}})));
-  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold intGreThr
-    "Greater than zero"
-    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
-  Buildings.Controls.OBC.CDL.Integers.MultiSum numChiOn(nin=numChi)
-    "Number of chillers on"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-  Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea
-    "Integer to real"
-    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
-  Modelica.Blocks.Math.Gain mFloSetSca(k=1/numChi)
-    "Normalize mass flowrate setpoint"
-    annotation (Placement(transformation(extent={{20,40},{40,60}})));
-  Modelica.Blocks.Math.Gain mFloBypSca(k=1/(numChi*mMin_flow))
-    "Normalize the measured mass flowrate"
-    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
-equation
-  connect(chiOn, booToInt.u)
-    annotation (Line(points={{-120,50},{-92,50}}, color={255,0,255}));
-  connect(booToInt.y, numChiOn.u)
-    annotation (Line(points={{-69,50},{-62,50}}, color={255,127,0}));
-  connect(numChiOn.y, intGreThr.u)
-    annotation (Line(points={{-38,50},{-30,50},{-30,-30},{-2,-30}},
-                           color={255,127,0}));
-  connect(intGreThr.y, bypValCon.trigger)
-    annotation (Line(points={{22,-30},{64,-30},{64,-12}},color={255,0,255}));
-  connect(numChiOn.y, intToRea.u)
-    annotation (Line(points={{-38,50},{-22,50}}, color={255,127,0}));
-  connect(bypValCon.y, y)
-    annotation (Line(points={{82,0},{110,0}},  color={0,0,127}));
-  connect(intToRea.y, mFloSetSca.u)
-    annotation (Line(points={{2,50},{18,50}}, color={0,0,127}));
-  connect(mFloSetSca.y, bypValCon.u_s)
-    annotation (Line(points={{41,50},{50,50},{50,0},{58,0}}, color={0,0,127}));
-  connect(mFloChi, mFloBypSca.u)
-    annotation (Line(points={{-120,-50},{-62,-50}}, color={0,0,127}));
-  connect(mFloBypSca.y, bypValCon.u_m)
-    annotation (Line(points={{-39,-50},{70,-50},{70,-12}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="chiBypCon",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false),
-      graphics={
-        Text(
-          extent={{-150,150},{150,110}},
-          textString="%name",
-          textColor={0,0,255})}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-January 27, 2023, by Michael Wetter:<br/>
-Removed connection to itself.
-</li>
-<li>
-December 14, 2022, by Kathryn Hinkelman:<br/>
-Corrected measured mass flow rate to be on the chiller
-leg in order to control minimum flow rate through the chillers.<br>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">#2912</a>.
-</li>
-<li>
-May 3, 2021 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model implements the chilled water loop bypass valve control logic as
-follows: </p>
-<p>When the plant is on, the PID controller controls the valve opening ratio to
-reach the scaled mass flow rate setpoint. </p>
-<p>The setpoint is <code>mMin_flow</code> multiplied by the number of chillers
-that are on. <code>mMin_flow</code> is the minimum mass flow rate required by
-one chiller. </p>
-<p>This control sequence assumes that all the chillers are identical and the
-cooling load is evenly split between all of the chillers that are on.</p>
-</html>"));
-end ChilledWaterBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
deleted file mode 100644
index cbe589922d9..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChilledWaterPumpSpeed.mo
+++ /dev/null
@@ -1,213 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
-model ChilledWaterPumpSpeed
-  "Controller for two headered variable speed chilled water pumps"
-  extends Modelica.Blocks.Icons.Block;
-  parameter Modelica.Units.SI.PressureDifference dpSetPoi(displayUnit="Pa")
-    "Pressure difference setpoint";
-  parameter Modelica.Units.SI.Time tWai "Waiting time";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
-    "Nominal mass flow rate of single chilled water pump";
-  parameter Real minSpe(
-    final unit="1",
-    final min=0,
-    final max=1)=0.05
-    "Minimum speed ratio required by chilled water pumps";
-  parameter Modelica.Units.SI.MassFlowRate criPoiFlo=0.7*m_flow_nominal
-    "Critcal point of flowrate for switching pump on or off";
-  parameter Modelica.Units.SI.MassFlowRate deaBanFlo=0.1*m_flow_nominal
-    "Deadband for critical point of flowrate";
-  parameter Real criPoiSpe=0.5
-    "Critical point of speed signal for switching on or off";
-  parameter Real deaBanSpe=0.3
-    "Deadband for critical point of speed signal";
-  parameter Modelica.Blocks.Types.SimpleController controllerType=
-    Modelica.Blocks.Types.SimpleController.PI
-    "Type of pump speed controller"
-    annotation (Dialog(group="Speed Controller"));
-  parameter Real k(
-    final unit="1",
-    final min=0)=1
-    "Gain of controller"
-    annotation (Dialog(group="Speed Controller"));
-  parameter Modelica.Units.SI.Time Ti(final min=Modelica.Constants.small) = 60
-    "Time constant of Integrator block" annotation (Dialog(enable=
-          controllerType == Modelica.Blocks.Types.SimpleController.PI or
-          controllerType == Modelica.Blocks.Types.SimpleController.PID, group=
-          "Speed Controller"));
-  parameter Modelica.Units.SI.Time Td(final min=0) = 0.1
-    "Time constant of Derivative block" annotation (Dialog(enable=
-          controllerType == Modelica.Blocks.Types.SimpleController.PD or
-          controllerType == Modelica.Blocks.Types.SimpleController.PID, group=
-          "Speed Controller"));
-  Modelica.Blocks.Interfaces.RealInput masFloPum(
-    final unit="kg/s")
-    "Total mass flowrate of chilled water pumps"
-    annotation (Placement(transformation(extent={{-140,0},{-100,40}}),
-        iconTransformation(extent={{-140,0},{-100,40}})));
-  Modelica.Blocks.Interfaces.RealInput dpMea(
-    final unit="Pa")
-    "Measured pressure difference"
-    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
-  Modelica.Blocks.Interfaces.RealOutput y[numPum](
-    each final unit="1",
-    each final min=0,
-    each final max=1)
-    "Pump speed signal"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
-  Modelica.Blocks.Math.Product pumSpe[numPum] "Output pump speed"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage pumStaCon(
-    final tWai=tWai,
-    final m_flow_nominal=m_flow_nominal,
-    final minSpe=minSpe,
-    final criPoiFlo=criPoiFlo,
-    final deaBanFlo=deaBanFlo,
-    final criPoiSpe=criPoiSpe,
-    final deaBanSpe=deaBanSpe)
-    "Chilled water pump staging control"
-    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
-    final controllerType=controllerType,
-    final Ti=Ti,
-    final k=k,
-    final Td=Td)
-    "PID controller of pump speed"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-  Modelica.Blocks.Sources.Constant dpSetSca(final k=1)
-    "Scaled differential pressure setpoint"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-  Modelica.Blocks.Math.Gain gai(k=1/dpSetPoi) "Gain for mesaured dp value"
-    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
-  Modelica.Blocks.Math.RealToBoolean twoPum(threshold=1.5) "Two pumps are on"
-    annotation (Placement(transformation(extent={{10,-60},{-10,-40}})));
-  Modelica.Blocks.Math.Sum totPum(final nin=numPum) "Total number of pumps on"
-    annotation (Placement(transformation(extent={{42,-60},{22,-40}})));
-  Modelica.Blocks.Interfaces.BooleanInput on
-    "On signal of the plant"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
-   iconTransformation(extent={{-140,60},{-100,100}})));
-  Modelica.Blocks.Logical.Or orRes "Or block for controller reset"
-    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
-protected
-  final parameter Integer numPum=2
-    "Number of chilled water pumps";
-equation
-  connect(pumStaCon.masFloPum,masFloPum)
-    annotation (Line(points={{8,4},{0,4},{0,20},{-120,20}},      color={0,0,127}));
-  connect(conPID.y,pumStaCon.speSig)
-    annotation (Line(points={{-18,0},{0,0},{0,0},{8,0}},      color={0,0,127}));
-  connect(pumStaCon.y,pumSpe.u1)
-    annotation (Line(points={{31,0},{50,0},{50,6},{58,6}},color={0,0,127}));
-  connect(conPID.y,pumSpe[1].u2)
-    annotation (Line(points={{-18,0},{-10,0},{-10,-20},{48,-20},{48,-6},{58,-6}},
-      color={0,0,127}));
-  connect(conPID.y,pumSpe[2].u2)
-    annotation (Line(points={{-18,0},{-10,0},{-10,-20},{48,-20},{48,-6},{58,-6}},
-      color={0,0,127}));
-  connect(dpSetSca.y,conPID.u_s)
-    annotation (Line(points={{-59,0},{-42,0}},color={0,0,127}));
-  connect(dpMea, gai.u)
-    annotation (Line(points={{-120,-40},{-82,-40}}, color={0,0,127}));
-  connect(gai.y, conPID.u_m)
-    annotation (Line(points={{-59,-40},{-30,-40},{-30,-12}}, color={0,0,127}));
-  connect(pumStaCon.y, totPum.u) annotation (Line(points={{31,0},{50,0},{50,-50},
-          {44,-50}}, color={0,0,127}));
-  connect(totPum.y, twoPum.u)
-    annotation (Line(points={{21,-50},{12,-50}},color={0,0,127}));
-  connect(pumSpe.y, y)
-    annotation (Line(points={{81,0},{110,0}}, color={0,0,127}));
-  connect(on, pumStaCon.on) annotation (Line(points={{-120,80},{4,80},{4,8},{8,
-          8}}, color={255,0,255}));
-  connect(twoPum.y, orRes.u2) annotation (Line(points={{-11,-50},{-20,-50},{-20,
-          -90},{-70,-90},{-70,-78},{-62,-78}}, color={255,0,255}));
-  connect(on, orRes.u1) annotation (Line(points={{-120,80},{-90,80},{-90,-70},{
-          -62,-70}}, color={255,0,255}));
-  connect(orRes.y, conPID.trigger) annotation (Line(points={{-39,-70},{-36,-70},
-          {-36,-12}}, color={255,0,255}));
-  annotation (
-    defaultComponentName="CHWPumCon",
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false),
-      graphics={
-        Text(
-          extent={{-150,150},{150,110}},
-          textString="%name",
-          textColor={0,0,255}),
-        Ellipse(
-          extent={{-54,52},{52,-52}},
-          lineColor={0,0,0},
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{78,8},{94,-4}},
-          textColor={0,0,127},
-          textString="y"),
-        Ellipse(
-          extent={{-52,50},{50,-50}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{-2,50},{-2,-50},{50,0},{-2,50}},
-          lineColor={0,0,0},
-          lineThickness=1,
-          fillColor={0,0,0},
-          fillPattern=FillPattern.Solid)}),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-August 9, 2023, by Hongxiang Fu:<br/>
-Restricted this block to a two-pump configuration as intended.
-<ul>
-<li>
-Set <code>final totPum.nin = numPum</code>.
-</li>
-<li>
-Corrected the \"up to two pumps\" language in documentation.
-</li>
-</ul>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3470\">#3470</a>.
-</li>
-<li>
-December 30, 2022, by Kathryn Hinkelman:<br/>
-Added an <code>on</code> input for a plant-level override to turn pumps off.
-</li>
-<li>
-December 14, 2022 by Kathryn Hinkelman:<br/>
-Normalized <code>u_s</code> and <code>u_m</code> by <code>dpSetPoi</code>.
-Added reset for PI controller based on the number of pumps that are on.<br>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">#2912</a>.
-</li>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model implements the control logic for variable speed pumps.
-The staging of pumps is implemented through an instance of
-<a href=\"modelica://Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage\">
-Buildings.Applications.BaseClasses.Controls.VariableSpeedPumpStage</a>.
-</p>
-<p>
-The pump speed is controlled to maintain the pressure difference setpoint
-through a PI controller.
-</p>
-<p>The model inputs are the measured chilled water mass flow rate
-<code>masFloPum</code> and the pressure difference <code>dpMea</code> at a
-reference point from the demand side. The output <code>y</code> is a vector
-of pump speeds.
-</p>
-<p>
-The model currently only supports the control of two variable speed pumps.
-</p>
-</html>"));
-end ChilledWaterPumpSpeed;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.mo
deleted file mode 100644
index d4bfbbfa1a5..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.mo
+++ /dev/null
@@ -1,241 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
-model ChillerStage
-  "Chiller staging controller for plants with two chillers of the same size"
-  replaceable package Medium=Buildings.Media.Water
-    constrainedby Modelica.Media.Interfaces.PartialMedium
-    "Service side medium";
-  parameter Modelica.Units.SI.Time tWai "Waiting time";
-  parameter Modelica.Units.SI.Power QChi_nominal(final max=0)
-    "Nominal cooling capacity (negative)";
-  parameter Modelica.Units.SI.Power staUpThr(final min=0) = -0.8*QChi_nominal
-    "Stage up load threshold(from one to two chillers)";
-  parameter Modelica.Units.SI.Power staDowThr(final min=0) = -0.6*QChi_nominal
-    "Stage down load threshold(from two to one chiller)";
-  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
-    "State graph root"
-    annotation (Placement(transformation(extent={{120,60},{140,80}})));
-  Modelica.Blocks.Interfaces.BooleanInput on
-    "Enabling signal of the plant. True: chiller should be enabled"
-    annotation (Placement(transformation(extent={{-200,40},{-160,80}}),
-      iconTransformation(extent={{-200,40},{-160,80}})));
-  Modelica.Blocks.Interfaces.RealInput TChiWatRet
-    "Chilled water return temperature"
-    annotation (Placement(transformation(extent={{-200,-24},{-160,16}}),
-      iconTransformation(extent={{-200,-24},{-160,16}})));
-  Modelica.Blocks.Interfaces.RealInput TChiWatSup
-    "Chilled water supply temperature"
-    annotation (Placement(transformation(extent={{-200,-60},{-160,-20}}),
-      iconTransformation(extent={{-200,-60},{-160,-20}})));
-  Modelica.Blocks.Interfaces.RealInput mFloChiWat
-    "Chilled water mass flow rate"
-    annotation (Placement(transformation(extent={{-200,-96},{-160,-56}}),
-      iconTransformation(extent={{-200,-96},{-160,-56}})));
-  Modelica.Blocks.Interfaces.BooleanOutput y[2]
-    "On/off signal for the chillers - false: off; true: on"
-    annotation (Placement(transformation(extent={{160,10},{180,-10}}),
-      iconTransformation(extent={{160,-10},{180,10}})));
-  Modelica.StateGraph.InitialStep off(nIn=1, nOut=1)
-    "No cooling is demanded"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
-      rotation=-90,origin={10,90})));
-  Modelica.StateGraph.StepWithSignal oneOn(
-    nOut=2,
-    nIn=2)
-    "Status of one chiller on"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-      rotation=90,origin={10,0})));
-  Modelica.StateGraph.StepWithSignal twoOn(nOut=1, nIn=1)
-    "Status of two chillers on"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-      rotation=90,origin={10,-90})));
-  Modelica.StateGraph.TransitionWithSignal offToOne(
-    enableTimer=true,
-    waitTime=tWai)
-    "Condition of transition from off to one chiller on"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
-      rotation=90,origin={10,60})));
-  Modelica.StateGraph.TransitionWithSignal oneToTwo(
-    enableTimer=true,
-    waitTime=tWai)
-    "Condition of transition from one chiller to two chillers"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
-      rotation=90,origin={10,-40})));
-  Modelica.StateGraph.TransitionWithSignal twoToOne(
-    enableTimer=true,
-    waitTime=tWai) "Condition of transion from two chillers to one chiller"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
-      rotation=90,origin={60,-40})));
-  Modelica.StateGraph.TransitionWithSignal oneToOff(
-    enableTimer=true,
-    waitTime=tWai)
-    "Condition of transition from one chiller to off"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
-      rotation=90,origin={40,60})));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis thrOneToTwo(uLow=-staDowThr/
-        QChi_nominal, uHigh=-staUpThr/QChi_nominal)
-                    "Threshold of turning two chillers on"
-    annotation (Placement(transformation(extent={{-60,-80},{-40,-60}})));
-  Modelica.Blocks.Logical.Not thrTwoToOne
-    "Threshold of turning off the second chiller"
-    annotation (Placement(transformation(extent={{-100,-18},{-80,2}})));
-  Modelica.Blocks.Math.Add dT(
-    final k1=-1,
-    final k2=+1)
-    "Temperature difference"
-    annotation (Placement(transformation(extent={{-140,-20},{-120,0}})));
-  Modelica.Blocks.Math.Product pro
-    "Product"
-    annotation (Placement(transformation(extent={{-140,-80},{-120,-60}})));
-  Modelica.Blocks.Math.Gain plr(final k=cp_default/QChi_nominal)
-    "Specific heat multiplier to calculate heat flow rate"
-    annotation (Placement(transformation(extent={{-102,-80},{-82,-60}})));
-  Buildings.Controls.OBC.CDL.Logical.Or Or "On signal for either chiller"
-    annotation (Placement(transformation(extent={{120,20},{140,40}})));
-  Modelica.Blocks.Logical.Not notOn "on switches to false"
-    annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
-  Modelica.Blocks.Logical.Or TwoToOne
-    "Conditions that turn off the second chiller"
-    annotation (Placement(transformation(extent={{-40,-20},{-20,0}})));
-protected
-  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-    T=Medium.T_default,
-    p=Medium.p_default,
-    X=Medium.X_default)
-    "Medium state at default properties";
-  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
-      Medium.specificHeatCapacityCp(sta_default)
-    "Specific heat capacity of the fluid";
-equation
-  connect(off.outPort[1],offToOne.inPort)
-    annotation (Line(points={{10,79.5},{10,64}},color={0,0,0}));
-  connect(oneToTwo.outPort,twoOn.inPort[1])
-    annotation (Line(points={{10,-41.5},{10,-79}},color={0,0,0}));
-  connect(twoToOne.outPort,oneOn.inPort[2])
-    annotation (Line(points={{60,-38.5},{60,20},{9.75,20},{9.75,11}},
-      color={0,0,0}));
-  connect(oneOn.outPort[2],oneToOff.inPort)
-    annotation (Line(points={{9.875,-10.5},{9.875,-20},{40,-20},{40,56}},
-      color={0,0,0}));
-  connect(oneOn.outPort[1],oneToTwo.inPort)
-    annotation (Line(points={{10.125,-10.5},{10.125,-36},{10,-36}},
-      color={0,0,0}));
-  connect(oneToTwo.condition,thrOneToTwo.y)
-    annotation (Line(points={{-2,-40},{-20,-40},{-20,-70},{-38,-70}},
-      color={255,0,255}));
-  connect(dT.y,pro.u1)
-    annotation (Line(points={{-119,-10},{-114,-10},{-114,-40},{-150,-40},
-      {-150,-64},{-142,-64}},color={0,0,127}));
-  connect(plr.u, pro.y)
-    annotation (Line(points={{-104,-70},{-119,-70}},
-      color={0,0,127}));
-  connect(plr.y, thrOneToTwo.u) annotation (Line(points={{-81,-70},{-62,-70}},
-    color={0,0,127}));
-  connect(dT.u1,TChiWatRet)
-    annotation (Line(points={{-142,-4},{-180,-4}},
-      color={0,0,127}));
-  connect(TChiWatSup,dT.u2)
-    annotation (Line(points={{-180,-40},{-160,-40},{-160,-16},{-142,-16}},
-      color={0,0,127}));
-  connect(pro.u2,mFloChiWat)
-    annotation (Line(points={{-142,-76},{-180,-76}},color={0,0,127}));
-  connect(oneToTwo.condition, thrTwoToOne.u)
-    annotation (Line(points={{-2,-40},{-108,-40},{-108,-8},{-102,-8}},
-      color={255,0,255}));
-  connect(oneOn.active, Or.u1)
-    annotation (Line(points={{21,-8.88178e-16},{80,-8.88178e-16},{80,30},{118,30}},
-      color={255,0,255}));
-  connect(twoOn.active, Or.u2)
-    annotation (Line(points={{21,-90},{100,-90},{100,22},{118,22}},
-      color={255,0,255}));
-  connect(Or.y, y[1])
-    annotation (Line(points={{142,30},{144,30},{144,-2.5},{170,-2.5}},
-      color={255,0,255}));
-  connect(twoOn.active, y[2])
-    annotation (Line(points={{21,-90},{120,-90},{120,2.5},{170,2.5}},
-      color={255,0,255}));
-  connect(on, notOn.u)
-    annotation (Line(points={{-180,60},{-120,60},{-120,30},{-102,30}},
-      color={255,0,255}));
-  connect(twoOn.outPort[1],twoToOne.inPort)
-    annotation (Line(points={{10,-100.5},{10,-120},{60,-120},{60,-44}},
-      color={0,0,0}));
-  connect(offToOne.outPort,oneOn.inPort[1])
-    annotation (Line(points={{10,58.5},{10,11},{10.25,11}},
-                                                         color={0,0,0}));
-  connect(oneToOff.outPort,off.inPort[1])
-    annotation (Line(points={{40,61.5},{40,120},{10,120},{10,101}},
-      color={0,0,0}));
-  connect(on, offToOne.condition) annotation (Line(points={{-180,60},{-2,60}},
-    color={255,0,255}));
-  connect(thrTwoToOne.y, TwoToOne.u2) annotation (Line(points={{-79,-8},{-80,-8},
-          {-80,-18},{-42,-18}}, color={255,0,255}));
-  connect(notOn.y, TwoToOne.u1) annotation (Line(points={{-79,30},{-60,30},{-60,
-          -10},{-42,-10}}, color={255,0,255}));
-  connect(TwoToOne.y, twoToOne.condition) annotation (Line(points={{-19,-10},{-10,
-          -10},{-10,-28},{40,-28},{40,-40},{48,-40}}, color={255,0,255}));
-  connect(notOn.y, oneToOff.condition)
-    annotation (Line(points={{-79,30},{28,30},{28,60}}, color={255,0,255}));
-  annotation (
-    defaultComponentName="chiStaCon",
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-160,-160},{160,160}})),
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-160,-160},{160,160}}),
-        graphics={
-        Rectangle(
-          extent={{-160,-160},{160,160}},
-          lineColor={0,0,127},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-154,206},{146,166}},
-          textColor={0,0,255},
-          textString="%name")}),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-December 10, 2021, by Michael Wetter:<br/>
-Corrected parameter value for <code>twoOn.nOut</code>.
-This correction is required to simulate the model in Dymola 2022
-if the model has been updated to MSL 4.0.0. With MSL 3.2.3, the simulation
-works without this correction.<br/>
-This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
-</li>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model implements the staging control logic as follows: </p>
-<ul>
-<li>When the plant enabling signal <code>on</code> changes from
-<code>false</code> to <code>true</code>, one chiller is enabled. </li>
-<li>When the total cooling load <code>QLoa</code> exceeds 80 percent (adjustable)
-of one chiller&apos;s nominal capacity <code>QChi_nominal</code>, a second
-chiller is enabled. </li>
-<li>When the total cooling load <code>QLoa</code> drops below 60 percent
-(adjustable) of one chiller&apos;s nominal capacity <code>QChi_nominal</code>
-(i.e. 30 percent of both chillers combined), or the plant enabling signal
-<code>on</code> changes from <code>true</code> to <code>false</code>, the second
-chiller is disabled. </li>
-<li>When the plant enabling signal <code>on</code> changes from <code>true</code>
-to <code>false</code>, the operating chillers will be disabled sequentially.</li>
-<li>Parameter <code>tWai</code> assures a transitional time is kept between each
-operation. </li>
-</ul>
-<p><br>It is assumed that both chillers have the same capacity of
-<code>QChi_nominal</code>. </p>
-<p>Note: This model can be used for plants with two chillers with or without
-waterside econimizer (WSE). For plants with WSE, extra control logic on top of
-this model needs to be added. </p>
-<p><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.png\" alt=\"State graph\"/>. </p>
-</html>"));
-end ChillerStage;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/TankStatus.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/TankStatus.mo
deleted file mode 100644
index 88337ec556a..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/TankStatus.mo
+++ /dev/null
@@ -1,119 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
-block TankStatus "Returns the tank status from its temperature sensors"
-
-  parameter Modelica.Units.SI.Temperature THig
-    "Higher threshold to consider the tank empty";
-  parameter Modelica.Units.SI.Temperature TLow
-    "Lower threshold to consider the tank full";
-
-  parameter Modelica.Units.SI.TemperatureDifference dTHys(min=0.1) = 0.5
-    "Deadband for hysteresis";
-
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput TTan[2](
-    each final quantity="Temperature",
-    each final unit="K",
-    each displayUnit="degC") "Temperatures at the tank 1: top; and 2: bottom"
-                                                    annotation (Placement(
-        transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-110,0}), iconTransformation(
-        extent={{-10,-10},{10,10}},
-        rotation=0,
-        origin={-110,0})));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis hysCha(
-    final uLow=TLow,
-    final uHigh=TLow + dTHys) "Hysteresis, tank charged"
-    annotation (Placement(visible = true, transformation(origin = {0, 50}, extent = {{-40, -60}, {-20, -40}}, rotation = 0)));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis hysEmp(
-    final uHigh=THig,
-    final uLow=THig - dTHys) "Hysteresis, tank empty"
-    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
-  Buildings.Controls.OBC.CDL.Logical.Not not1 "Not block"
-    annotation (Placement(visible = true, transformation(origin = {0, 50}, extent = {{20, -60}, {40, -40}}, rotation = 0)));
-  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y[2]
-    "Tank status - y[1]=true is empty; y[2] = true is charged; both false means partially charged"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}}),
-      iconTransformation(extent={{100,-10},{120,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TTanTopChe(
-    final k(final unit="K", displayUnit="degC") = THig) "Set point for top temperatuer of tank"
-     annotation (
-    Placement(visible = true, transformation(origin = {-70, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TTanBotChe(
-    final k(final unit="K", displayUnit="degC") = TLow) "Set point for bottom temperature of tank"
-    annotation (
-    Placement(visible = true, transformation(origin = {-70, -70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Buildings.Controls.OBC.CDL.Reals.Greater gre
-   "Test for temperature set points"
-  annotation (
-    Placement(visible = true, transformation(origin = {-30, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  Buildings.Controls.OBC.CDL.Utilities.Assert assMes(
-    message = "THig must be greater than TLow.")
-   "Assertion if temperature set points are not correct"
-   annotation (
-    Placement(visible = true, transformation(origin = {10, -50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-equation
-  connect(hysCha.y, not1.u)
-    annotation (Line(points={{-18,0},{18,0}},  color={255,0,255}));
-  connect(TTan[1],hysCha. u) annotation (Line(points={{-110,-2.5},{-52,-2.5},{-52,
-          0},{-42,0}},  color={0,0,127}));
-  connect(TTan[2],hysEmp. u) annotation (Line(points={{-110,2.5},{-52,2.5},{-52,
-          50},{-42,50}},
-                     color={0,0,127}));
-  connect(hysEmp.y, y[1]) annotation (Line(points={{-18,50},{60,50},{60,0},{110,
-          0},{110,-2.5}}, color={255,0,255}));
-  connect(not1.y, y[2]) annotation (Line(points={{42,0},{60,0},{60,2.5},{110,
-          2.5}}, color={255,0,255}));
-  connect(TTanTopChe.y, gre.u1) annotation (
-    Line(points = {{-58, -30}, {-50, -30}, {-50, -50}, {-42, -50}}, color = {0, 0, 127}));
-  connect(TTanBotChe.y, gre.u2) annotation (
-    Line(points = {{-58, -70}, {-52, -70}, {-52, -58}, {-42, -58}}, color = {0, 0, 127}));
-  connect(gre.y, assMes.u) annotation (
-    Line(points = {{-18, -50}, {-2, -50}}, color = {255, 0, 255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-                                Rectangle(
-        extent={{-100,-100},{100,100}},
-        lineColor={0,0,127},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-42,72},{40,-72}},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-30,-64},{28,-28}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-30,-20},{28,16}},
-          fillColor={28,108,200},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-        Rectangle(
-          extent={{-24,54},{22,30}},
-          fillColor={135,135,135},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None)}),
-                               Diagram(coordinateSystem(preserveAspectRatio=false)),
-  defaultComponentName="tanSta",
-   Documentation(info="<html>
-<p>
-This model outputs tank status signals using the temperatures
-at the CHW tank top and the tank bottom as input.
-The status has two separate boolean signals indicating whether the tank is
-charged or empty (of cooling). The two output signals can be both false,
-indicating an in-between state, but they can never both be true.
-</p>
-</html>",
-revisions="<html>
-<ul>
-<li>
-August 10, 2023 by Hongxiang Fu:<br/>
-First implementation. This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
-</li>
-</ul>
-</html>"));
-end TankStatus;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
deleted file mode 100644
index a9d1187de33..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mo
+++ /dev/null
@@ -1,62 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
-model ChilledWaterBypass
-  "Example to test the chilled water bypass controller"
-  extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(numChi=2,
-    mMin_flow=0.03)
-    "Chilled water bypass loop control"
-    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  Modelica.Blocks.Sources.BooleanTable onOne(
-    table(
-      each displayUnit="s")={300,900})
-    "On signal of the first chiller"
-    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
-  Modelica.Blocks.Sources.BooleanTable onTwo(
-    table(
-      each displayUnit="s")={600,900})
-    "On signal of the second chiller"
-    annotation (Placement(transformation(extent={{-60,0},{-40,20}})));
-  Modelica.Blocks.Sources.Sine mFloChi(
-    amplitude=0.03,
-    f=1/300,
-    offset=0.03,
-    startTime=300) "Mass flow rate through the chillers"
-    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
-equation
-  connect(mFloChi.y,chiBypCon.mFloChi)  annotation (Line(points={{-39,-30},{-20,
-          -30},{-20,-15},{-2,-15}},
-                                  color={0,0,127}));
-  connect(onTwo.y,chiBypCon.chiOn[2])
-    annotation (Line(points={{-39,10},{-20,10},{-20,-4},{-2,-4}},
-      color={255,0,255}));
-  connect(onOne.y,chiBypCon.chiOn[1])
-    annotation (Line(points={{-39,40},{-20,40},{-20,-6},{-2,-6}},
-      color={255,0,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    experiment(
-      Tolerance=1e-06, StopTime=1200),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos"
-      "Simulate and Plot"),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-May 3, 2021 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model validates the chilled water bypass valve control logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass</a>.
-</p>
-</html>"));
-end ChilledWaterBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
deleted file mode 100644
index 0b2b5ec3821..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mo
+++ /dev/null
@@ -1,68 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
-model ChilledWaterPumpSpeed
-  "Example to test the chilled water pump speed controller"
-  extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed chiWatPumSpe(
-    dpSetPoi=68900,
-    tWai=30,
-    m_flow_nominal=0.5,
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    k=1,
-    Ti=60,
-    Td=0.1)
-    "Chilled water pump speed controller"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Modelica.Blocks.Sources.Pulse mFloTot(
-    amplitude=2*chiWatPumSpe.m_flow_nominal,
-    period=300,
-    startTime=150) "Total chilled water mass flow rate"
-    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  Modelica.Blocks.Sources.Pulse dpMea(
-    amplitude=0.4*chiWatPumSpe.dpSetPoi,
-    period=150,
-    offset=0.8*chiWatPumSpe.dpSetPoi,
-    startTime=150) "Measured pressure drop"
-    annotation (Placement(transformation(extent={{-60,-40},{-40,-20}})));
-  Modelica.Blocks.Sources.BooleanConstant on "Plant on signal"
-    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
-equation
-  connect(mFloTot.y,chiWatPumSpe.masFloPum)
-    annotation (Line(points={{-39,30},{-30,30},{-30,2},{-12,2}},
-      color={0,0,127}));
-  connect(dpMea.y, chiWatPumSpe.dpMea) annotation (Line(points={{-39,-30},{-30,
-          -30},{-30,-4},{-12,-4}}, color={0,0,127}));
-  connect(on.y, chiWatPumSpe.on) annotation (Line(points={{-39,70},{-20,70},{
-          -20,8},{-12,8}}, color={255,0,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    experiment(
-      StopTime=1200,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos"
-      "Simulate and Plot"),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-December 14, 2022 by Kathryn Hinkelman:<br>
-Revised <code>dpMea</code> input from constant to step function.
-</li>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model validates the variable speed pump control logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed</a>.
-</p>
-</html>"));
-end ChilledWaterPumpSpeed;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
deleted file mode 100644
index 21b7a769bd3..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mo
+++ /dev/null
@@ -1,67 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
-model ChillerStage
-  "Example to test the chiller staging controller"
-  extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
-    tWai=30,
-    QChi_nominal=-200*3.517*1000)
-    "Chiller staging controller"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Modelica.Blocks.Sources.BooleanTable on(
-    table(
-      each displayUnit="s")={300,900})
-    "On signal of the cooling plant"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-  Modelica.Blocks.Sources.Constant TRet(k=18)
-    "Return temperature"
-    annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
-  Modelica.Blocks.Sources.Constant TSup(k=8)
-    "Supply temperature"
-    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
-  Modelica.Blocks.Sources.Sine mFlo(
-    amplitude=0.5*chiStaCon.QChi_nominal/(-10)/4200,
-    f=1/300,
-    offset=0.5*chiStaCon.QChi_nominal/(-10)/4200) "Total mass flow rate"
-    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
-equation
-  connect(on.y,chiStaCon.on)
-    annotation (Line(points={{-39,50},{-28,50},{-28,3.75},{-1.25,3.75}},
-      color={255,0,255}));
-  connect(mFlo.y,chiStaCon.mFloChiWat)
-    annotation (Line(points={{-39,-50},{-28,-50},{-28,-3.75},{-1.25,-3.75}},
-      color={0,0,127}));
-  connect(TRet.y,chiStaCon.TChiWatRet)
-    annotation (Line(points={{-39,20},{-34,20},{-34,1.25},{-1.25,1.25}},
-      color={0,0,127}));
-  connect(TSup.y,chiStaCon.TChiWatSup)
-    annotation (Line(points={{-39,-20},{-34,-20},{-34,-1.25},{-1.25,-1.25}},
-      color={0,0,127}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    experiment(
-      StopTime=1200,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos"
-      "Simulate and Plot"),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model validates the chiller staging control logic implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage</a>.
-</p>
-</html>"));
-end ChillerStage;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
deleted file mode 100644
index bc8ebd082fc..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mo
+++ /dev/null
@@ -1,47 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation;
-model TankStatus "Validation model for tank status controller"
-  extends Modelica.Icons.Example;
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus tanSta(
-    TLow=280.15,
-    THig=286.15,
-    dTHys=1) "Tank status"
-    annotation (Placement(transformation(extent={{0,0},{20,20}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TTanBot(
-    table=[0,273.15 + 11; 0.25,273.15 + 13.5; 0.5,273.15 + 12.5; 0.75,273.15 + 13.5; 1,273.15 + 11])
-    "Temperature at tank bottom"
-    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable TTanTop(
-    table=[0,273.15 + 9; 0.25,273.15 + 6.5;
-        0.5,273.15 + 7.5; 0.75,273.15 + 6.5; 1,273.15 + 9])
-    "Temperature at tank top"
-    annotation (Placement(visible = true, transformation(origin = {0, 0}, extent = {{-60, 20}, {-40, 40}}, rotation = 0)));
-equation
-  connect(TTanTop.y[1], tanSta.TTan[1]) annotation (Line(points={{-38,30},{-6,30},{
-          -6,9.75},{-1,9.75}}, color={0,0,127}));
-  connect(TTanBot.y[1], tanSta.TTan[2]) annotation (Line(points={{-39,-10},{-6,-10},
-          {-6,10.25},{-1,10.25}}, color={0,0,127}));
-          annotation(experiment(Tolerance=1e-6, StopTime=1),
-          __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos"
-      "Simulate and Plot"),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-August 11, 2023 by Hongxiang Fu:<br/>
-First implementation. This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">#2859</a>.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>
-This model validates
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus</a>.
-Note that the output signals turn <code>true</code> as soon as their respective temperature
-input crosses the threshold, but there is a delay for it to turn back to
-<code>false</code> due to the hysteresis.
-</p>
-</html>"));
-end TankStatus;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.mo
deleted file mode 100644
index 6cbc8754d37..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/Validation/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Controls;
-package Validation "Collection of validation models"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains validation models for the classes in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls</a>.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.mo
deleted file mode 100644
index d648d90b573..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Controls/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
-package Controls "Package of control sequences for cooling plants"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains control sequences for central cooling plants.
-</p>
-</html>"));
-end Controls;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.mo b/Buildings/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.mo
deleted file mode 100644
index 429b4f2e989..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.mo
+++ /dev/null
@@ -1,447 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
-model ElectricChillerParallel
-  "District cooling plant model"
-  extends Buildings.Experimental.DHC.Plants.BaseClasses.PartialPlant(
-    have_eleCoo=true,
-    have_pum=true,
-    have_fan=true,
-    have_weaBus=true,
-    typ=Buildings.Experimental.DHC.Types.DistrictSystemType.Cooling);
-  // chiller parameters
-  final parameter Integer numChi=2
-    "Number of chillers"
-    annotation (Dialog(group="Chiller"));
-  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.Generic perChi
-    "Performance data of chiller"
-    annotation (Dialog(group="Chiller"),choicesAllMatching=true,
-   Placement(transformation(extent={{124,264},{138,278}})));
-  parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal
-    "Nominal chilled water mass flow rate" annotation (Dialog(group="Chiller"));
-  parameter Modelica.Units.SI.Pressure dpCHW_nominal
-    "Pressure difference at the chilled water side"
-    annotation (Dialog(group="Chiller"));
-  parameter Modelica.Units.SI.HeatFlowRate QChi_nominal(max=0)
-    "Nominal cooling capacity of single chiller (negative means cooling)"
-    annotation (Dialog(group="Chiller"));
-  parameter Modelica.Units.SI.MassFlowRate mMin_flow
-    "Minimum mass flow rate of single chiller"
-    annotation (Dialog(group="Chiller"));
-  // cooling tower parameters
-  parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal
-    "Nominal condenser water mass flow rate"
-    annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.Pressure dpCW_nominal
-    "Pressure difference at the condenser water side"
-    annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.Temperature TAirInWB_nominal
-    "Nominal air wetbulb temperature" annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.Temperature TCW_nominal
-    "Nominal condenser water temperature at tower inlet"
-    annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
-    "Temperature difference between inlet and outlet of the tower"
-    annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.TemperatureDifference dTApp
-    "Approach temperature" annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.Temperature TMin
-    "Minimum allowed water temperature entering chiller"
-    annotation (Dialog(group="Cooling Tower"));
-  parameter Modelica.Units.SI.Power PFan_nominal "Fan power"
-    annotation (Dialog(group="Cooling Tower"));
-  // pump parameters
-  replaceable parameter Buildings.Fluid.Movers.Data.Generic perCHWPum
-    constrainedby Buildings.Fluid.Movers.Data.Generic
-    "Performance data of chilled water pump"
-    annotation (Dialog(group="Pump"),choicesAllMatching=true,
-   Placement(transformation(extent={{164,264},{178,278}})));
-  replaceable parameter Buildings.Fluid.Movers.Data.Generic perCWPum
-    constrainedby Buildings.Fluid.Movers.Data.Generic
-    "Performance data of condenser water pump"
-    annotation (Dialog(group="Pump"),choicesAllMatching=true,
-   Placement(transformation(extent={{204,264},{218,278}})));
-  parameter Modelica.Units.SI.Pressure dpCHWPumVal_nominal
-    "Nominal pressure drop of chilled water pump valve"
-    annotation (Dialog(group="Pump"));
-  parameter Modelica.Units.SI.Pressure dpCWPumVal_nominal
-    "Nominal pressure drop of condenser water pump valve"
-    annotation (Dialog(group="Pump"));
-  parameter Modelica.Units.SI.Time tau=1
-    "Pump time constant at nominal flow (if energyDynamics <> SteadyState)"
-    annotation (Dialog(tab="Dynamics", group="Pump"));
-  parameter Boolean use_inputFilter=false
-    "= true, if pump speed is filtered with a 2nd order CriticalDamping filter"
-    annotation(Dialog(tab="Dynamics", group="Pump"));
-  parameter Modelica.Units.SI.Time riseTimePump=30
-    "Pump rise time of the filter (time to reach 99.6 % of the speed)" annotation (
-      Dialog(
-      tab="Dynamics",
-      group="Pump",
-      enable=use_inputFilter));
-  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
-    "Type of initialization for pumps (no init/steady state/initial state/initial output)"
-    annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
-  parameter Real[numChi] yCHWP_start=fill(0,numChi)
-    "Initial value of CHW pump signals"
-    annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
-  parameter Real[numChi] yCWP_start=fill(0,numChi)
-    "Initial value of CW pump signals"
-    annotation(Dialog(tab="Dynamics", group="Pump",enable=use_inputFilter));
-  parameter Modelica.Units.SI.PressureDifference dpCooTowVal_nominal
-    "Nominal pressure difference of the cooling tower valve";
-  // control settings
-  parameter Modelica.Units.SI.Time tWai "Waiting time"
-    annotation (Dialog(group="Control Settings"));
-  // dynamics
-  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 Modelica.Fluid.Types.Dynamics massDynamics=energyDynamics
-    "Type of mass balance: dynamic (3 initialization options) or steady state, must be steady state if energyDynamics is steady state"
-    annotation(Evaluate=true, Dialog(tab = "Advanced", group="Dynamics"));
-  Modelica.Blocks.Interfaces.BooleanInput on
-    "On signal of the plant"
-    annotation (Placement(transformation(extent={{-420,200},{-380,240}}),
-   iconTransformation(extent={{-340,200},{-300,240}})));
-  Modelica.Blocks.Interfaces.RealInput TCHWSupSet(
-    final unit="K",
-    displayUnit="degC")
-    "Set point for chilled water supply temperature"
-    annotation (Placement(transformation(extent={{-420,100},{-380,140}}),
-   iconTransformation(extent={{-340,140},{-300,180}})));
-  Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel mulChiSys(
-    final use_inputFilter=use_inputFilter,
-    final per=fill(
-      perChi,
-      numChi),
-    final m1_flow_nominal=mCW_flow_nominal,
-    final m2_flow_nominal=mCHW_flow_nominal,
-    final dp1_nominal=dpCW_nominal/2,
-    final dp2_nominal=dpCHW_nominal,
-    final num=numChi,
-    redeclare final package Medium1=Medium,
-    redeclare final package Medium2=Medium)
-    "Chillers connected in parallel"
-    annotation (Placement(transformation(extent={{60,40},{40,60}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass cooTowWitByp(
-    redeclare final package Medium=Medium,
-    final num=numChi,
-    final m_flow_nominal=mCW_flow_nominal,
-    final use_inputFilter=use_inputFilter,
-    final dp_nominal=dpCW_nominal/2,
-    final dpValve_nominal = dpCooTowVal_nominal,
-    final TAirInWB_nominal=TAirInWB_nominal,
-    final TWatIn_nominal=TCW_nominal,
-    final dT_nominal=dT_nominal,
-    final dTApp=dTApp,
-    final PFan_nominal=PFan_nominal,
-    final TMin=TMin)
-    "Cooling towers with bypass valve"
-    annotation (Placement(transformation(extent={{-40,160},{-20,180}})));
-  Buildings.Applications.BaseClasses.Equipment.FlowMachine_y pumCHW(
-    redeclare final package Medium=Medium,
-    final per=fill(
-      perCHWPum,
-      numChi),
-    yValve_start=fill(
-      1,
-      numChi),
-    final tau=tau,
-    final use_inputFilter=use_inputFilter,
-    final riseTimePump=riseTimePump,
-    final init=init,
-    final yPump_start=yCHWP_start,
-    final energyDynamics=energyDynamics,
-    final m_flow_nominal=mCHW_flow_nominal,
-    final dpValve_nominal=dpCHWPumVal_nominal,
-    final num=numChi)
-    "Chilled water pumps"
-    annotation (Placement(transformation(extent={{-52,34},{-32,54}})));
-  Buildings.Applications.BaseClasses.Equipment.FlowMachine_m pumCW(
-    redeclare final package Medium=Medium,
-    final per=fill(
-      perCWPum,
-      numChi),
-    final tau=tau,
-    final use_inputFilter=use_inputFilter,
-    final riseTimePump=riseTimePump,
-    final init=init,
-    final yPump_start=yCWP_start,
-    final energyDynamics=energyDynamics,
-    final m_flow_nominal=mCW_flow_nominal,
-    final dpValve_nominal=dpCWPumVal_nominal,
-    final num=numChi)
-    "Condenser water pumps"
-    annotation (Placement(transformation(extent={{60,160},{80,180}})));
-  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage valByp(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=false,
-    final m_flow_nominal=mCHW_flow_nominal,
-    final dpValve_nominal=dpCHWPumVal_nominal,
-    final use_inputFilter=true,
-    riseTime=60)
-    "Chilled water bypass valve"
-    annotation (Placement(transformation(extent={{10,10},{-10,-10}},
-      rotation=0,origin={-30,-70})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTCHWSup(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=mCHW_flow_nominal)
-    "Chilled water supply temperature"
-    annotation (Placement(transformation(extent={{140,-30},{160,-50}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage chiStaCon(
-    final tWai=tWai,
-    final QChi_nominal=QChi_nominal)
-    "Chiller staging controller"
-    annotation (Placement(transformation(extent={{-200,200},{-180,220}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTCHWRet(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=mCHW_flow_nominal)
-    "Chilled water return temperature"
-    annotation (Placement(transformation(extent={{-270,-50},{-250,-30}})));
-  Buildings.Fluid.Sources.Boundary_pT expTanCW(
-    redeclare final package Medium=Medium,
-    p=300000,
-    nPorts=1)
-    "Condenser water expansion tank"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-        rotation=270,
-        origin={0,142})));
-  Buildings.Fluid.Sources.Boundary_pT expTanCHW(
-    redeclare final package Medium=Medium,
-    p=300000,
-    nPorts=1)
-    "Chilled water expansion tank"
-    annotation (Placement(transformation(extent={{-108,-26},{-88,-6}})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
-    redeclare final package Medium=Medium)
-    "Chilled water return mass flow"
-    annotation (Placement(transformation(extent={{-230,-50},{-210,-30}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal chiOn[numChi]
-    "Convert chiller on signal from boolean to real"
-    annotation (Placement(transformation(extent={{-120,200},{-100,220}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiSum totPPum(
-    nin=4)
-    "Total pump power"
-    annotation (Placement(transformation(extent={{340,150},{360,170}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiSum totPFan(
-    nin=2)
-    "Total fan power"
-    annotation (Placement(transformation(extent={{340,190},{360,210}})));
-  Buildings.Controls.OBC.CDL.Reals.MultiSum totPCoo(
-    nin=2)
-    "Total cooling power"
-    annotation (Placement(transformation(extent={{340,230},{360,250}})));
-  Buildings.Fluid.FixedResistances.Junction joiCHWRet(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=mCHW_flow_nominal .* {1,-1,1},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    dp_nominal={0,0,0})
-    "Flow joint for the chilled water return side"
-    annotation (Placement(transformation(extent={{-10,10},{10,-10}},
-      rotation=90, origin={-80,-40})));
-  Buildings.Fluid.FixedResistances.Junction splCHWSup(
-    redeclare final package Medium=Medium,
-    final m_flow_nominal=mCHW_flow_nominal .* {1,-1,-1},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    dp_nominal={0,0,0})
-    "Flow splitter for the chilled water supply side"
-    annotation (Placement(transformation(extent={{10,-10},{-10,10}},
-      rotation=90,origin={120,-42})));
-  Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterBypass chiBypCon(
-    final numChi=numChi,
-    final mMin_flow=mMin_flow,
-    k=1,
-    Ti=120)
-    "Chilled water bypass control"
-    annotation (Placement(transformation(extent={{-120,-160},{-100,-140}})));
-  Fluid.Sensors.MassFlowRate senMasFloCHW(
-    redeclare final package Medium = Medium)
-    "Total chilled water pump mass flow rate"
-    annotation (Placement(
-        transformation(
-        extent={{10,-10},{-10,10}},
-        rotation=90,
-        origin={120,20})));
-protected
-  final parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-    T=Medium.T_default,
-    p=Medium.p_default,
-    X=Medium.X_default)
-    "Medium state at default properties";
-  final parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
-      Medium.specificHeatCapacityCp(sta_default)
-    "Specific heat capacity of the fluid";
-
-initial equation
-  assert(energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState or
-         massDynamics == Modelica.Fluid.Types.Dynamics.SteadyState,
-         "In " + getInstanceName() +
-         ": energyDynamics is selected as steady state, and therefore massDynamics must also be steady-state.");
-
-equation
-  connect(cooTowWitByp.port_b,pumCW.port_a)
-    annotation (Line(points={{-20,170},{60,170}},color={0,127,255}));
-  connect(on,chiStaCon.on)
-    annotation (Line(points={{-400,220},{-220,220},{-220,213.75},{-201.25,
-          213.75}},
-      color={255,0,255}));
-  connect(pumCHW.port_b,mulChiSys.port_a2)
-    annotation (Line(points={{-32,44},{40,44}}, color={0,127,255}));
-  connect(pumCW.port_b,mulChiSys.port_a1)
-    annotation (Line(points={{80,170},{120,170},{120,56},{60,56}},
-      color={0,127,255}));
-  connect(mulChiSys.port_b1,cooTowWitByp.port_a)
-    annotation (Line(points={{40,56},{-80,56},{-80,170},{-40,170}},
-      color={0,127,255}));
-  connect(expTanCW.ports[1],pumCW.port_a)
-    annotation (Line(points={{1.9984e-15,152},{1.9984e-15,170},{60,170}},
-      color={0,127,255}));
-  connect(senTCHWRet.port_b,senMasFlo.port_a)
-    annotation (Line(points={{-250,-40},{-230,-40}},color={0,127,255}));
-  connect(chiStaCon.y,mulChiSys.on)
-    annotation (Line(points={{-179.375,210},{-160,210},{-160,100},{80,100},{80,54},{62,54}},
-      color={255,0,255}));
-  connect(chiStaCon.y,chiOn.u)
-    annotation (Line(points={{-179.375,210},{-122,210}},
-      color={255,0,255}));
-  connect(chiOn.y,pumCW.u)
-    annotation (Line(points={{-98,210},{0,210},{0,174},{58,174}},
-      color={0,0,127}));
-  connect(chiStaCon.y,cooTowWitByp.on)
-    annotation (Line(points={{-179.375,210},{-160,210},{-160,174},{-42,174}},
-      color={255,0,255}));
-  connect(weaBus.TWetBul,cooTowWitByp.TWetBul)
-    annotation (Line(points={{0,380},{0,380},{0,238},{-50,238},{-50,168},{-42,168}},
-    color={255,204,51},thickness=0.5),Text(string="%first",index=-1,
-    extent={{-6,3},{-6,3}},horizontalAlignment=TextAlignment.Right));
-  connect(port_aSerCoo,senTCHWRet.port_a)
-    annotation (Line(points={{-380,-40},{-270,-40}},color={0,127,255}));
-  connect(senTCHWSup.port_b,port_bSerCoo)
-    annotation (Line(points={{160,-40},{380,-40}}, color={0,127,255}));
-  connect(TCHWSupSet,mulChiSys.TSet)
-    annotation (Line(points={{-400,120},{100,120},{100,50},{62,50}},color={0,0,127}));
-  connect(totPPum.y,PPum)
-    annotation (Line(points={{362,160},{400,160}},color={0,0,127}));
-  connect(pumCW.P,totPPum.u[1:2])
-    annotation (Line(points={{81,174},{240,174},{240,159.75},{338,159.75}},
-                                                                         color={0,0,127}));
-  connect(pumCHW.P,totPPum.u[3:4])
-    annotation (Line(points={{-31,48},{0,48},{0,0},{240,0},{240,160.75},{338,
-          160.75}},
-      color={0,0,127}));
-  connect(totPFan.y,PFan)
-    annotation (Line(points={{362,200},{400,200}},color={0,0,127}));
-  connect(cooTowWitByp.PFan,totPFan.u[1:2])
-    annotation (Line(points={{-19,176},{-20,176},{-20,200},{338,200},{338,200.5}},
-      color={0,0,127}));
-  connect(totPCoo.y,PCoo)
-    annotation (Line(points={{362,240},{400,240}},color={0,0,127}));
-  connect(mulChiSys.P,totPCoo.u[1:2])
-    annotation (Line(points={{39,52},{20,52},{20,240.5},{338,240.5}},
-      color={0,0,127}));
-  connect(splCHWSup.port_3,senTCHWSup.port_a)
-    annotation (Line(points={{130,-42},{130,-40},{140,-40}},color={0,127,255}));
-  connect(senTCHWRet.T,chiStaCon.TChiWatRet)
-    annotation (Line(points={{-260,-29},{-260,209.75},{-201.25,209.75}},
-      color={0,0,127}));
-  connect(senTCHWSup.T,chiStaCon.TChiWatSup)
-    annotation (Line(points={{150,-51},{150,-200},{-240,-200},{-240,207.5},{-201.25,207.5}},
-      color={0,0,127}));
-  connect(senMasFlo.m_flow,chiStaCon.mFloChiWat)
-    annotation (Line(points={{-220,-29},{-220,205.25},{-201.25,205.25}},
-      color={0,0,127}));
-  connect(chiStaCon.y,chiBypCon.chiOn)
-    annotation (Line(points={{-179.375,210},{-160,210},{-160,-145},{-122,-145}},
-      color={255,0,255}));
-  connect(senMasFlo.port_b, joiCHWRet.port_3)
-    annotation (Line(points={{-210,-40},{-90,-40}}, color={0,127,255}));
-  connect(valByp.port_b, joiCHWRet.port_1)
-    annotation (Line(points={{-40,-70},{-80,-70},{-80,-50}}, color={0,127,255}));
-  connect(senMasFloCHW.m_flow, chiBypCon.mFloChi) annotation (Line(points={{109,
-          20},{-140,20},{-140,-155},{-122,-155}}, color={0,0,127}));
-  connect(valByp.port_a, splCHWSup.port_2) annotation (Line(points={{-20,-70},{
-          120,-70},{120,-52}}, color={0,127,255}));
-  connect(joiCHWRet.port_2, pumCHW.port_a)
-    annotation (Line(points={{-80,-30},{-80,44},{-52,44}}, color={0,127,255}));
-  connect(expTanCHW.ports[1], pumCHW.port_a) annotation (Line(points={{-88,-16},
-          {-80,-16},{-80,44},{-52,44}}, color={0,127,255}));
-  connect(mulChiSys.port_b2, senMasFloCHW.port_a)
-    annotation (Line(points={{60,44},{120,44},{120,30}}, color={0,127,255}));
-  connect(senMasFloCHW.port_b, splCHWSup.port_1)
-    annotation (Line(points={{120,10},{120,-32}}, color={0,127,255}));
-  connect(chiBypCon.y, valByp.y) annotation (Line(points={{-99,-150},{-30,-150},
-          {-30,-82}}, color={0,0,127}));
-  connect(chiOn.y, pumCHW.u) annotation (Line(points={{-98,210},{-90,210},{-90,48},
-          {-54,48}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="pla",
-    Documentation(
-      info="<html>
-<p>This model implements a generic district central cooling plant as illustrated
-in the schematics below. </p>
-<ul>
-<li>The cooling is provided by two parallel chillers instantiated from
-<a href=\"modelica://Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel\">
-Buildings.Applications.BaseClasses.Equipment.ElectricChillerParallel</a>. </li>
-<li>The chilled water bypass loop is controlled to ensure a minimum flow of
-chilled water running through the chillers all the time. </li>
-<li>The condenser water is cooled by two parallel cooling towers with a bypass
-loop. See <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass</a>
-for the details of the modeling of the cooling towers. </li>
-<li>The chilled water loop is equipped with two parallel constant speed pumps,
-which run one-and-one with each chiller. The condenser water pumps are constant speed with prescribed
-mass flow rates. </li>
-<li>The plant operates when it receives an <code>on</code> signal from the
-external control. </li>
-</ul>
-<p>The staging of the chillers is based on the calculated cooling load. </p>
-<p>See <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage\">
-Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage</a> for
-the detailed control logic. </p>
-<p align=\"center\"><img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.png\" alt=\"System schematics\"/>. </p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-January 2, 2023, by Kathryn Hinkelman:<br/>
-Revised chilled water pump control to be constant speed and running 1-and-1 with chillers.
-</li>
-<li>
-December 14, 2022, by Kathryn Hinkelman:<br/>
-Corrected <code>chiBypCon</code> to control mass flow rate through the chillers.<br>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">issue 2912</a>.
-</li>
-<li>
-November 16, 2022, by Michael Wetter:<br/>
-Corrected wrong assignments for chiller system <code>mulChiSys</code> which assigned chilled water
-to condenser water parameters and vice versa.<br/>
-Changed rise time of valve to 30 seconds so that it is the same as the one for the pumps.
-</li>
-<li>
-September 15, 2022, by Kathryn Hinkelman:<br/>
-Propagated dynamics and initialization parameters for pumps.
-</li>
-<li>
-March 3, 2022, by Michael Wetter:<br/>
-Moved <code>massDynamics</code> to <code>Advanced</code> tab and
-added assertion for correct combination of energy and mass dynamics.<br/>
-This is for
-<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1542\">issue 1542</a>.
-</li>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    Icon(
-      coordinateSystem(
-        extent={{-300,-300},{300,300}}),
-      graphics={
-        Polygon(
-          points={{-62,-14},{-62,-14}},
-          lineColor={238,46,47},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid)}));
-end ElectricChillerParallel;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo b/Buildings/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
deleted file mode 100644
index 4d31cc294a5..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mo
+++ /dev/null
@@ -1,163 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Examples;
-model ElectricChillerParallel
-  "Example to test the chiller cooling plant"
-  extends Modelica.Icons.Example;
-  package Medium=Buildings.Media.Water
-    "Medium model for water";
-  // chiller and cooling tower
-  replaceable parameter Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_York_YT_1055kW_5_96COP_Vanes perChi
-    "Performance data of chiller";
-  parameter Modelica.Units.SI.MassFlowRate mCHW_flow_nominal=18.3
-    "Nominal chilled water mass flow rate";
-  parameter Modelica.Units.SI.MassFlowRate mCW_flow_nominal=34.7
-    "Nominal condenser water mass flow rate";
-  parameter Modelica.Units.SI.PressureDifference dpCHW_nominal=44.8*1000
-    "Nominal chilled water side pressure";
-  parameter Modelica.Units.SI.PressureDifference dpCW_nominal=46.2*1000
-    "Nominal condenser water side pressure";
-  parameter Modelica.Units.SI.Power QChi_nominal=mCHW_flow_nominal*4200*(6.67
-       - 18.56) "Nominal cooling capaciaty (Negative means cooling)";
-  parameter Modelica.Units.SI.MassFlowRate mMin_flow=mCHW_flow_nominal*0.1
-    "Minimum mass flow rate of single chiller";
-  parameter Modelica.Units.SI.TemperatureDifference dTApp=3
-    "Approach temperature";
-  parameter Modelica.Units.SI.Power PFan_nominal=5000 "Fan power";
-  // control settings
-  parameter Modelica.Units.SI.Temperature TCHWSet=273.15 + 8
-    "Chilled water temperature setpoint";
-  parameter Modelica.Units.SI.Time tWai=30 "Waiting time";
-  // pumps
-  parameter Buildings.Fluid.Movers.Data.Generic perCHWPum(
-    pressure=Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
-      V_flow=mCHW_flow_nominal/1000*{0.2,0.6,0.8,1.0},
-      dp=(dpCHW_nominal+18000+30000)*{1,0.8,0.6,0.2}))
-    "Performance data for chilled water pumps";
-  parameter Buildings.Fluid.Movers.Data.Generic perCWPum(
-    pressure=Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParameters(
-      V_flow=mCW_flow_nominal/1000*{0.2,0.6,1.0,1.2},
-      dp=(2*dpCW_nominal+60000+6000)*{1,0.8,0.6,0.2}))
-    "Performance data for condenser water pumps";
-  parameter Modelica.Units.SI.Pressure dpCHWPumVal_nominal=6000
-    "Nominal pressure drop of chilled water pump valve";
-  parameter Modelica.Units.SI.Pressure dpCWPumVal_nominal=6000
-    "Nominal pressure drop of chilled water pump valve";
-  parameter Modelica.Units.SI.PressureDifference dpCooTowVal_nominal=6000
-    "Nominal pressure difference of the cooling tower valve";
-  replaceable Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel pla(
-    perChi=perChi,
-    dTApp=dTApp,
-    perCHWPum=perCHWPum,
-    perCWPum=perCWPum,
-    mCHW_flow_nominal=mCHW_flow_nominal,
-    dpCHW_nominal=dpCHW_nominal,
-    QChi_nominal=QChi_nominal,
-    mMin_flow=mMin_flow,
-    mCW_flow_nominal=mCW_flow_nominal,
-    dpCW_nominal=dpCW_nominal,
-    TAirInWB_nominal=298.7,
-    TCW_nominal=308.15,
-    dT_nominal=5.56,
-    TMin=288.15,
-    PFan_nominal=PFan_nominal,
-    dpCooTowVal_nominal=dpCooTowVal_nominal,
-    dpCHWPumVal_nominal=dpCHWPumVal_nominal,
-    dpCWPumVal_nominal=dpCWPumVal_nominal,
-    tWai=tWai,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "District cooling plant"
-    annotation (Placement(transformation(extent={{-10,-20},{10,0}})));
-  Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
-    final computeWetBulbTemperature=true,
-    filNam=Modelica.Utilities.Files.loadResource(
-      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
-    "Weather data"
-    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
-  Modelica.Blocks.Sources.BooleanConstant on
-    "On signal of the plant"
-    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Modelica.Blocks.Sources.Constant TCHWSupSet(
-    k=TCHWSet)
-    "Chilled water supply temperature setpoint"
-    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
-  Fluid.MixingVolumes.MixingVolume vol(
-    nPorts=2,
-    redeclare package Medium=Medium,
-    m_flow_nominal=pla.numChi*mCHW_flow_nominal,
-    V=0.5,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Mixing volume"
-    annotation (Placement(transformation(extent={{50,20},{70,40}})));
-  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow fixHeaFlo(
-    T_ref=293.15)
-    "Fixed heat flow rate"
-    annotation (Placement(transformation(extent={{0,60},{20,80}})));
-  Fluid.FixedResistances.PressureDrop res(
-    redeclare package Medium = Medium,
-    m_flow_nominal=pla.numChi*mCHW_flow_nominal,
-    dp_nominal(displayUnit="kPa") = 60000)
-    "Flow resistance"
-    annotation (Placement(transformation(extent={{70,-50},{50,-30}})));
-  Modelica.Blocks.Sources.Sine loaVar(
-    amplitude=913865,
-    f=1/126900,
-    offset=913865,
-    startTime(displayUnit="h") = 21600) "Variable demand load"
-    annotation (Placement(transformation(extent={{-60,60},{-40,80}})));
-equation
-  connect(fixHeaFlo.port,vol.heatPort)
-    annotation (Line(points={{20,70},{32,70},{32,30},{50,30}},color={191,0,0}));
-  connect(vol.ports[1], res.port_a) annotation (Line(points={{58,20},{80,20},{
-          80,-40},{70,-40}},      color={0,127,255}));
-  connect(res.port_b, pla.port_aSerCoo) annotation (Line(points={{50,-40},{-14,
-          -40},{-14,-11.3333},{-10,-11.3333}}, color={0,127,255}));
-  connect(on.y,pla.on)
-    annotation (Line(points={{-39,-10},{-38,-10},{-38,-2.6},{-10.7333,-2.6}},
-      color={255,0,255}));
-  connect(weaDat.weaBus,pla.weaBus)
-    annotation (Line(points={{-40,30},{0.0333333,30},{0.0333333,-1.13333}},
-      color={255,204,51}));
-  connect(fixHeaFlo.Q_flow,loaVar. y)
-    annotation (Line(points={{0,70},{-39,70}}, color={0,0,127}));
-  connect(pla.port_bSerCoo, vol.ports[2]) annotation (Line(points={{10,-11.3333},
-          {20,-11.3333},{20,20},{62,20}}, color={0,127,255}));
-  connect(pla.TCHWSupSet, TCHWSupSet.y) annotation (Line(points={{-10.6667,
-          -4.73333},{-30,-4.73333},{-30,-50},{-39,-50}},
-                                               color={0,0,127}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false)),
-    experiment(
-      StopTime=86400,
-      Tolerance=1e-06),
-    Documentation(
-      info="<html>
-<p>This model validates the district central cooling plant implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel\">
-Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel</a>.
-</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-December 14, 2022, by Kathryn Hinkelman:<br/>
-Enabled filters for CHW pumps and valves. Corrected pressure drop in loop.
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2912#issuecomment-1324375700\">issue 2912</a>.
-</li>
-<li>
-October 20, 2021, by Chengnan Shi:<br/>
-Revised the model for extensibility. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2749\">issue 2749</a>.
-</li>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos"
-      "Simulate and Plot"));
-end ElectricChillerParallel;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.mo
deleted file mode 100644
index 662d7723533..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Examples/package.mo
+++ /dev/null
@@ -1,15 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
-package Examples "Example models integrating multiple components"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling\">
-Buildings.Experimental.DHC.Plants.Cooling</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
deleted file mode 100644
index cb83c42db4a..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersParallel.mo
+++ /dev/null
@@ -1,277 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems;
-model CoolingTowersParallel
-  "Multiple identical cooling towers in parallel connection"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    redeclare replaceable package Medium=Buildings.Media.Water);
-  parameter Integer num(
-    final min=1)=2
-    "Number of cooling towers";
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
-    "Type of energy balance: dynamic (3 initialization options) or steady state"
-    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
-  parameter Modelica.Units.SI.PressureDifference dp_nominal
-    "Nominal pressure difference of the tower"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpValve_nominal
-    "Nominal pressure difference of the valve";
-  parameter Real ratWatAir_nominal(
-    final min=0,
-    final unit="1")=0.625
-    "Design water-to-air ratio"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TAirInWB_nominal
-    "Nominal outdoor (air inlet) wetbulb temperature"
-    annotation (Dialog(group="Heat transfer"));
-  parameter Modelica.Units.SI.Temperature TWatIn_nominal
-    "Nominal water inlet temperature" annotation (Dialog(group="Heat transfer"));
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
-    "Temperature difference between inlet and outlet of the tower"
-    annotation (Dialog(group="Heat transfer"));
-  parameter Modelica.Units.SI.Power PFan_nominal "Fan power"
-    annotation (Dialog(group="Fan"));
-  parameter Boolean use_inputFilter=true
-    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
-    annotation (Dialog(tab="Dynamics",group="Filtered opening"));
-  Modelica.Blocks.Interfaces.BooleanInput on[num]
-    "On signal for cooling towers"
-    annotation (Placement(transformation(extent={{-140,40},{-100,80}})));
-  Modelica.Blocks.Interfaces.RealInput uFanSpe(
-    final unit="1")
-    "Fan speed control signal"
-    annotation (Placement(transformation(extent={{-140,0},{-100,40}})));
-  Modelica.Blocks.Interfaces.RealInput TWetBul(
-    final unit="K",
-    displayUnit="degC")
-    "Entering air wetbulb temperature"
-    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}})));
-  Modelica.Blocks.Interfaces.RealOutput PFan[num](
-    each final quantity="Power",
-    each final unit="W")
-    "Electric power consumed by fan"
-    annotation (Placement(transformation(extent={{100,50},{120,70}})));
-  Modelica.Blocks.Interfaces.RealOutput TLvg(
-    final unit="K",
-    displayUnit="degC")
-    "Leaving water temperature"
-    annotation (Placement(transformation(extent={{100,20},{120,40}})));
-  replaceable Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel cooTow[num](
-    each final allowFlowReversal=allowFlowReversal,
-    each final m_flow_small=m_flow_small,
-    each final ratWatAir_nominal=ratWatAir_nominal,
-    each final TAirInWB_nominal=TAirInWB_nominal,
-    each final TWatIn_nominal=TWatIn_nominal,
-    each final TWatOut_nominal=TWatIn_nominal-dT_nominal,
-    each final PFan_nominal=PFan_nominal,
-    each final dp_nominal=0)
-    constrainedby
-    Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.CoolingTowerVariableSpeed(
-      redeclare each final package Medium=Medium,
-      each final show_T=show_T,
-      each final m_flow_nominal=m_flow_nominal,
-      each final energyDynamics=energyDynamics)
-    "Cooling tower type"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage val[num](
-    redeclare each final package Medium=Medium,
-    each final allowFlowReversal=allowFlowReversal,
-    each final m_flow_nominal=m_flow_nominal,
-    each final dpValve_nominal=dpValve_nominal,
-    each final use_inputFilter=use_inputFilter,
-    each riseTime=30,
-    each final dpFixed_nominal=dp_nominal)
-    "Cooling tower valves"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[num]
-    "Boolean signal to real signal"
-    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTem(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    final m_flow_small=m_flow_small,
-    final T_start=Medium.T_default)
-    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
-
-equation
-  for i in 1:num loop
-    connect(port_a,val[i].port_a)
-      annotation (Line(points={{-100,0},{-60,0}},color={0,127,255}));
-    connect(val[i].port_b,cooTow[i].port_a)
-      annotation (Line(points={{-40,0},{-10,0}},color={0,127,255}));
-    connect(uFanSpe,cooTow[i].y)
-      annotation (Line(points={{-120,20},{-20,20},{-20,8},{-12,8}},color={0,0,127}));
-    connect(TWetBul,cooTow[i].TAir)
-      annotation (Line(points={{-120,-60},{-20,-60},{-20,4},{-12,4}},color={0,0,127}));
-    connect(cooTow[i].PFan,PFan[i])
-      annotation (Line(points={{11,8},{20,8},{20,60},{110,60}},color={0,0,127}));
-    connect(cooTow[i].port_b, senTem.port_a)
-      annotation (Line(points={{10,0},{40,0}}, color={0,127,255}));
-  end for;
-  connect(on,booToRea.u)
-    annotation (Line(points={{-120,60},{-92,60}},color={255,0,255}));
-  connect(senTem.port_b, port_b)
-    annotation (Line(points={{60,0},{100,0}}, color={0,127,255}));
-  connect(senTem.T, TLvg)
-    annotation (Line(points={{50,11},{50,30},{110,30}}, color={0,0,127}));
-  connect(booToRea.y, val.y)
-    annotation (Line(points={{-68,60},{-50,60},{-50,12}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="cooTowPar",
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}}),
-      graphics={
-        Rectangle(
-          extent={{-30,80},{30,6}},
-          lineColor={95,95,95},
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-22,74},{0,66}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{0,74},{22,66}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{16,56},{22,44}},
-          color={255,0,0}),
-        Line(
-          points={{0,56},{6,44}},
-          color={255,0,0}),
-        Line(
-          points={{0,56},{-6,44}},
-          color={255,0,0}),
-        Line(
-          points={{16,56},{10,44}},
-          color={255,0,0}),
-        Rectangle(
-          extent={{-30,-6},{30,-80}},
-          lineColor={95,95,95},
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-149,-114},{151,-154}},
-          textColor={0,0,255},
-          textString="%name"),
-        Ellipse(
-          extent={{-22,-12},{0,-20}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{0,-12},{22,-20}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-16,-30},{-22,-42}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{-16,-30},{-10,-42}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{0,-30},{-6,-42}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{0,-30},{6,-42}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{16,-30},{10,-42}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{16,-30},{22,-42}},
-          color={255,0,0},
-          thickness=0.5),
-        Rectangle(
-          extent={{30,10},{60,6}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{30,-76},{60,-80}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{62,2},{92,-2}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{58,-80},{62,10}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-90,2},{-60,-2}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-64,-30},{-60,60}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,-26},{16,-30}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,60},{16,56}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-16,56},{-22,44}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{-16,56},{-10,44}},
-          color={255,0,0},
-          thickness=0.5)}),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-November 16, 2022, by Michael Wetter:<br/>
-Changed rise time of valve to 30 seconds so that it is the same as the one for the pumps.
-</li>
-<li>
-May 19, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model implements a parallel cooling tower system with <code>num</code>
-identical cooling towers. </p>
-<p>The cooling tower type is replaceable.
-<a href=\"modelica://Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel\">
-Buildings.Fluid.HeatExchangers.CoolingTowers.Merkel</a> is currently used in
-this model. </p>
-</html>"),
-    __Dymola_Commands);
-end CoolingTowersParallel;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
deleted file mode 100644
index 3f3b841dd9d..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/CoolingTowersWithBypass.mo
+++ /dev/null
@@ -1,419 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems;
-model CoolingTowersWithBypass
-  "Cooling tower system with bypass valve"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    redeclare replaceable package Medium=Buildings.Media.Water);
-  parameter Integer num(
-    final min=1)=2
-    "Number of cooling towers";
-  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
-    "Type of energy balance: dynamic (3 initialization options) or steady state"
-    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Conservation equations"));
-  parameter Boolean use_inputFilter=true
-    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
-    annotation (Dialog(tab="Dynamics",group="Filtered opening"));
-  parameter Modelica.Units.SI.Time riseTime=30
-    "Pump rise time of the filter (time to reach 99.6 % of the speed)" annotation (
-      Dialog(
-      tab="Dynamics",
-      enable=use_inputFilter));
-  parameter Modelica.Units.SI.Pressure dp_nominal
-    "Nominal pressure difference of the tower"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.PressureDifference dpValve_nominal
-    "Nominal pressure difference of the valve";
-  parameter Real ratWatAir_nominal(
-    final min=0,
-    final unit="1")=0.625
-    "Design water-to-air ratio"
-    annotation (Dialog(group="Nominal condition"));
-  parameter Modelica.Units.SI.Temperature TAirInWB_nominal
-    "Nominal outdoor (air inlet) wetbulb temperature"
-    annotation (Dialog(group="Heat transfer"));
-  parameter Modelica.Units.SI.Temperature TWatIn_nominal
-    "Nominal water inlet temperature" annotation (Dialog(group="Heat transfer"));
-  parameter Modelica.Units.SI.TemperatureDifference dT_nominal
-    "Temperature difference between inlet and outlet of the tower"
-    annotation (Dialog(group="Heat transfer"));
-  parameter Modelica.Units.SI.Power PFan_nominal "Fan power"
-    annotation (Dialog(group="Fan"));
-  parameter Modelica.Units.SI.TemperatureDifference dTApp=3
-    "Approach temperature" annotation (Dialog(group="Control Settings"));
-  parameter Modelica.Units.SI.Temperature TMin
-    "Minimum allowed water temperature entering chiller"
-    annotation (Dialog(group="Control Settings"));
-  parameter Modelica.Blocks.Types.SimpleController controllerType=Modelica.Blocks.Types.SimpleController.PI
-    "Type of fan speed controller"
-    annotation (Dialog(group="Control Settings"));
-  parameter Real k(
-    final unit="1",
-    final min=0)=1
-    "Gain of the tower PID controller"
-    annotation (Dialog(group="Control Settings"));
-  parameter Modelica.Units.SI.Time Ti(final min=Modelica.Constants.small) = 60
-    "Integrator time constant of the tower PID controller"
-    annotation (Dialog(enable=(enableTi), group="Control Settings"));
-  parameter Modelica.Units.SI.Time Td(final min=0) = 0.1
-    "Derivative time constant of the tower PID controller"
-    annotation (Dialog(enable=(enableTd), group="Control Settings"));
-  Modelica.Blocks.Interfaces.BooleanInput on[num]
-    "On signal for cooling towers"
-    annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
-  Modelica.Blocks.Interfaces.RealInput TWetBul(
-    final unit="K",
-    displayUnit="degC")
-    "Entering air wetbulb temperature"
-    annotation (Placement(transformation(extent={{-140,-40},{-100,0}})));
-  Modelica.Blocks.Interfaces.RealOutput PFan[num](
-    each final quantity="Power",
-    each final unit="W")
-    "Electric power consumed by fan"
-    annotation (Placement(transformation(extent={{100,50},{120,70}})));
-  Modelica.Blocks.Interfaces.RealOutput TLvg(
-    final unit="K",
-    displayUnit="degC")
-    "Leaving water temperature"
-    annotation (Placement(transformation(extent={{100,20},{120,40}})));
-  Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel cooTowSys(
-    redeclare final package Medium=Medium,
-    final use_inputFilter=false,
-    final num=num,
-    final show_T=show_T,
-    final m_flow_small=m_flow_nominal,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal/num,
-    final dpValve_nominal=dpValve_nominal,
-    final dp_nominal=dp_nominal,
-    final ratWatAir_nominal=ratWatAir_nominal,
-    final TAirInWB_nominal=TAirInWB_nominal,
-    final TWatIn_nominal=TWatIn_nominal,
-    final dT_nominal=dT_nominal,
-    final PFan_nominal=PFan_nominal,
-    final energyDynamics=energyDynamics)
-    "Cooling tower system"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage valByp(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T,
-    final dpValve_nominal=dpValve_nominal,
-    final riseTime=riseTime,
-    final use_inputFilter=use_inputFilter)
-    "Condenser water bypass valve"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}},origin={0,-40})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTCWSup(
-    redeclare final package Medium=Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    final m_flow_small=m_flow_nominal,
-    final T_start=Medium.T_default)
-    "Temperature sensor"
-    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetByp(
-    final k=TMin)
-    "Bypass loop temperature setpoint"
-    annotation (Placement(transformation(extent={{-90,-60},{-70,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset bypValCon(
-    u_s(
-      final unit="K",
-      displayUnit="degC"),
-    u_m(
-      final unit="K",
-      displayUnit="degC"),
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    final k=k,
-    final Ti=Ti,
-    final y_reset=0)
-    "Bypass valve controller"
-    annotation (Placement(transformation(extent={{-60,-60},{-40,-40}})));
-  Buildings.Controls.OBC.CDL.Reals.PID cooTowSpeCon(
-    u_s(
-      final unit="K",
-      displayUnit="degC"),
-    u_m(
-      final unit="K",
-      displayUnit="degC"),
-    final reverseActing=false,
-    final controllerType=controllerType,
-    final k=k,
-    final Ti=Ti)
-    "Cooling tower fan speed controller"
-    annotation (Placement(transformation(extent={{-10,40},{10,60}})));
-  Buildings.Controls.OBC.CDL.Reals.Switch swi
-    "Output the input of higher value"
-    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
-  Buildings.Controls.OBC.CDL.Reals.Hysteresis hys(
-    uLow=TMin-0.1,
-    uHigh=TMin+0.1)
-    "Compare if (TWetBul+dTApp) is greater than TMin"
-    annotation (Placement(transformation(extent={{-70,40},{-50,60}})));
-  Buildings.Controls.OBC.CDL.Reals.AddParameter addPar(
-    p=dTApp)
-    "Add approach temperature on top of wetbulb temperature"
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  Buildings.Fluid.FixedResistances.Junction jun(
-  redeclare final package Medium=Medium,
-    m_flow_nominal=m_flow_nominal .* {1,-1,-1},
-    dp_nominal={0,0,0},
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
-    "Upstream mixing point of cooTowSys and valByp"
-    annotation (Placement(transformation(extent={{-34,-4},{-26,4}})));
-protected
-  parameter Boolean enableTi=
-    controllerType == Modelica.Blocks.Types.SimpleController.PI or
-    controllerType == Modelica.Blocks.Types.SimpleController.PID
-    "Flag to enable controller parameter Ti";
-  parameter Boolean enableTd=
-    controllerType == Modelica.Blocks.Types.SimpleController.PD or
-    controllerType == Modelica.Blocks.Types.SimpleController.PID
-    "Flag to enable controller parameter Td";
-equation
-  connect(cooTowSys.TWetBul,TWetBul)
-    annotation (Line(points={{-12,-6},{-40,-6},{-40,-20},{-120,-20}},color={0,0,127}));
-  connect(cooTowSys.port_b,senTCWSup.port_a)
-    annotation (Line(points={{10,0},{60,0}},color={0,127,255}));
-  connect(senTCWSup.port_b,port_b)
-    annotation (Line(points={{80,0},{100,0}},color={0,127,255}));
-  connect(TSetByp.y,bypValCon.u_s)
-    annotation (Line(points={{-68,-50},{-62,-50}},color={0,0,127}));
-  connect(senTCWSup.T,bypValCon.u_m)
-    annotation (Line(points={{70,11},{70,30},{54,30},{54,-80},{-50,-80},{-50,-62}},
-                                                                    color={0,0,127}));
-  connect(valByp.port_b,senTCWSup.port_a)
-    annotation (Line(points={{10,-40},{30,-40},{30,0},{60,0}},color={0,127,255}));
-  connect(cooTowSpeCon.y,cooTowSys.uFanSpe)
-    annotation (Line(points={{12,50},{16,50},{16,14},{-18,14},{-18,2},{-12,2}},
-      color={0,0,127}));
-  connect(cooTowSys.PFan,PFan)
-    annotation (Line(points={{11,6},{40,6},{40,60},{110,60}},color={0,0,127}));
-  connect(bypValCon.y,valByp.y)
-    annotation (Line(points={{-38,-50},{-20,-50},{-20,-20},{0,-20},{0,-28}},
-      color={0,0,127}));
-  connect(senTCWSup.T,cooTowSpeCon.u_m)
-    annotation (Line(points={{70,11},{70,30},{0,30},{0,38}},
-                      color={0,0,127}));
-  connect(hys.y, swi.u2)
-    annotation (Line(points={{-48,50},{-42,50}}, color={255,0,255}));
-  connect(cooTowSpeCon.u_s,swi.y)
-    annotation (Line(points={{-12,50},{-18,50}},color={0,0,127}));
-  connect(TSetByp.y,swi.u3)
-    annotation (Line(points={{-68,-50},{-66,-50},{-66,34},{-46,34},{-46,42},{-42,
-          42}},          color={0,0,127}));
-  connect(TWetBul,addPar.u)
-    annotation (Line(points={{-120,-20},{-86,-20},{-86,80},{-82,80}},
-      color={0,0,127}));
-  connect(addPar.y,swi.u1)
-    annotation (Line(points={{-58,80},{-46,80},{-46,64},{-42,64},{-42,58}},
-      color={0,0,127}));
-  connect(on,cooTowSys.on)
-    annotation (Line(points={{-120,40},{-80,40},{-80,6},{-12,6}},
-      color={255,0,255}));
-  connect(on[1],bypValCon.trigger)
-    annotation (Line(points={{-120,30},{-80,30},{-80,-28},{-94,-28},{-94,-80},{-56,
-          -80},{-56,-62}},
-      color={255,0,255}));
-  connect(port_a, jun.port_1)
-    annotation (Line(points={{-100,0},{-34,0}}, color={0,127,255}));
-  connect(cooTowSys.port_a, jun.port_2)
-    annotation (Line(points={{-10,0},{-26,0}}, color={0,127,255}));
-  connect(valByp.port_a, jun.port_3)
-    annotation (Line(points={{-10,-40},{-30,-40},{-30,-4}}, color={0,127,255}));
-  connect(addPar.y, hys.u)
-    annotation (Line(points={{-58,80},{-46,80},{-46,64},{-78,64},{-78,50},{-72,50}},
-      color={0,0,127}));
-  connect(senTCWSup.T, TLvg)
-    annotation (Line(points={{70,11},{70,30},{110,30}},
-      color={0,0,127}));
-  annotation (
-    defaultComponentName="cooTowWitByp",
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}}),
-      graphics={
-        Polygon(
-          points={{0,-80},{-10,-72},{-10,-88},{0,-80}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Polygon(
-          points={{0,-80},{10,-72},{10,-88},{0,-80}},
-          lineColor={0,0,0},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Text(
-          extent={{-149,-114},{151,-154}},
-          textColor={0,0,255},
-          textString="%name"),
-        Rectangle(
-          extent={{-30,94},{30,20}},
-          lineColor={95,95,95},
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-22,88},{0,80}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{0,88},{22,80}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{16,70},{22,58}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{0,70},{6,58}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{0,70},{-6,58}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{16,70},{10,58}},
-          color={255,0,0},
-          thickness=0.5),
-        Rectangle(
-          extent={{-30,8},{30,-66}},
-          lineColor={95,95,95},
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-22,2},{0,-6}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{0,2},{22,-6}},
-          lineColor={255,255,255},
-          fillColor={255,255,255},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-16,-16},{-22,-28}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{-16,-16},{-10,-28}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{0,-16},{-6,-28}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{0,-16},{6,-28}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{16,-16},{10,-28}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{16,-16},{22,-28}},
-          color={255,0,0},
-          thickness=0.5),
-        Rectangle(
-          extent={{30,24},{60,20}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{30,-62},{60,-66}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{62,2},{92,-2}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{58,-80},{62,24}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-90,2},{-60,-2}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-64,-82},{-60,74}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,-12},{16,-16}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-60,74},{16,70}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Line(
-          points={{-16,70},{-22,58}},
-          color={255,0,0},
-          thickness=0.5),
-        Line(
-          points={{-16,70},{-10,58}},
-          color={255,0,0},
-          thickness=0.5),
-        Rectangle(
-          extent={{-60,-78},{-10,-82}},
-          lineColor={238,46,47},
-          pattern=LinePattern.None,
-          fillColor={238,46,47},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{10,-78},{62,-82}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid)}),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-January 2, 2023, by Kathryn Hinkelman:<br/>
-Set <code>dp_fixed = 0</code> for the bypass valve because the pressure drop in this leg
-will be significantly less than the cooling towers.<br/>
-Propagated <code>riseTime</code> for the valve signal filters.
-</li>
-<li>
-November 16, 2022, by Michael Wetter:<br/>
-Changed rise time of valve to 30 seconds so that it is the same as the one for the pumps,
-and set <code>use_inputFilter = false</code> for shut-off valve in cooling tower.
-This avoids a sharp rise in pressure near <i>t=35</i> seconds.
-</li>
-<li>May 19, 2020 by Jing Wang:<br/>First implementation. </li>
-</ul>
-</html>",
-      info="<html>
-<p>This model simulates parallel connected cooling tower subsystem with a bypass
-valve. </p>
-<p>The bypass valve is controlled to enforce that the leaving condenser water
-temperature does not drop below the minimum temperature <code>TMin</code>.</p>
-<p>By default, the condenser water setpoint is the ambient wet bulb temperature
-<code>TWetBul</code> plus the approach temperature <code>dTApp</code>. </p>
-<p>Inside the model, a cooling tower fan speed controller is also implemented to
-maintain the condenser water at its setpoint.</p>
-</html>"));
-end CoolingTowersWithBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
deleted file mode 100644
index 20703c15c3f..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples;
-package BaseClasses "Package with base classes"
-  extends Modelica.Icons.BasesPackage;
-
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>This package contains base classes that are used to construct the classes in <a href=\"modelica://Buildings.Experimental.DHC.Plants\">Buildings.Experimental.DHC.Plants</a>. </p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
deleted file mode 100644
index 41f96f9af15..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mo
+++ /dev/null
@@ -1,84 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples;
-model CoolingTowersParallel
-  "Example model for parallel cooling tower model"
-  extends Modelica.Icons.Example;
-  extends
-    Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
-    redeclare Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel tow(
-      TAirInWB_nominal=273.15+25.55,
-      TWatIn_nominal=273.15+35,
-      dT_nominal=5.56,
-      dpValve_nominal = 6000,
-      dp_nominal = 6000,
-      PFan_nominal=4800,
-      use_inputFilter=false),
-    weaDat(final computeWetBulbTemperature=true));
-
-   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSetLea(
-    k=273.15+18)
-    "Setpoint for leaving temperature"
-    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
-  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conFan(
-    k=1,
-    Ti=60,
-    Td=10,
-    reverseActing=false,
-    u_s(
-      unit="K",
-      displayUnit="degC"),
-    u_m(
-      unit="K",
-      displayUnit="degC"))
-    "Controller for tower fan"
-    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
-equation
-  connect(TSetLea.y, conFan.u_s)
-    annotation (Line(points={{-58,10},{-42,10}},  color={0,0,127}));
-  connect(tow.TLvg, conFan.u_m)
-    annotation (Line(points={{43,-47},{50,-47},{50,-20},{-30,-20},{-30,-2}},
-      color={0,0,127}));
-  connect(conFan.y, tow.uFanSpe)
-    annotation (Line(points={{-18,10},{10,10},{10,-48},{20,-48}},
-      color={0,0,127}));
-  connect(weaBus.TWetBul, tow.TWetBul)
-   annotation (Line(points={{-59.95,50.05},{-4,50.05},{-4,-56},{20,-56}},
-    color={255,204,51},thickness=0.5),
-     Text(string="%first",index=-1,extent={{-6,3},{-6,3}},
-     horizontalAlignment=TextAlignment.Right));
-  connect(hys.y, tow.on[1]) annotation (Line(points={{42,-190},{50,-190},{50,
-          -132},{0,-132},{0,-44},{20,-44}}, color={255,0,255}));
-  connect(hys.y, tow.on[2]) annotation (Line(points={{42,-190},{50,-190},{50,
-          -132},{0,-132},{0,-44},{20,-44}}, color={255,0,255}));
-  connect(hys.y, conFan.trigger) annotation (Line(points={{42,-190},{50,-190},{
-          50,-132},{0,-132},{0,-12},{-36,-12},{-36,-2}}, color={255,0,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-140,-260},{140,100}})),
-    experiment(
-      StartTime=15552000,
-      StopTime=15724800,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos"
-      "Simulate and Plot"),
-    Documentation(
-      info="<html>
-<p>This model validates the parallel connected cooling tower subsystem in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel</a>.</p>
-</html>",
-      revisions="<html>
-<ul>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end CoolingTowersParallel;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
deleted file mode 100644
index 6002ccc73e7..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mo
+++ /dev/null
@@ -1,58 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples;
-model CoolingTowersWithBypass
-  "Example model for parallel cooling towers with bypass valve"
-  extends Modelica.Icons.Example;
-  extends Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem(
-    redeclare Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass tow(
-      dpValve_nominal = 6000,
-      dp_nominal(displayUnit="Pa") = 6000,
-      TAirInWB_nominal=273.15 + 25.55,
-      TWatIn_nominal=273.15 + 35,
-      dT_nominal=5.56,
-      PFan_nominal=4800,
-      TMin=TMin,
-      controllerType=Modelica.Blocks.Types.SimpleController.PI),
-    weaDat(final computeWetBulbTemperature=true));
-  parameter Modelica.Units.SI.Temperature TMin=273.15 + 10
-    "Minimum allowed water temperature entering chiller";
-equation
-  connect(weaBus.TWetBul, tow.TWetBul)
-   annotation (Line( points={{-59.95,50.05},{-8,50.05},{-8,-52},{20,-52}},
-    color={255,204,51},thickness=0.5),
-     Text(string="%first",index=-1,extent={{-6,3},{-6,3}},
-      horizontalAlignment=TextAlignment.Right));
-  connect(hys.y, tow.on[1]) annotation (Line(points={{42,-190},{50,-190},{50,
-          -130},{0,-130},{0,-46},{20,-46}}, color={255,0,255}));
-  connect(hys.y, tow.on[2]) annotation (Line(points={{42,-190},{50,-190},{50,
-          -130},{0,-130},{0,-46},{20,-46}}, color={255,0,255}));
-  annotation (
-    Icon(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}})),
-    Diagram(
-      coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-140,-260},{140,100}})),
-    experiment(
-      StartTime=10368000,
-      StopTime=10540800,
-      Tolerance=1e-06),
-    __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos"
-      "Simulate and Plot"),
-    Documentation(
-      revisions="<html>
-<ul>
-<li>
-August 6, 2020 by Jing Wang:<br/>
-First implementation.
-</li>
-</ul>
-</html>",
-      info="<html>
-<p>This model validates the parallel connected cooling tower subsystem in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowerWithBypass</a>.</p>
-</html>"));
-end CoolingTowersWithBypass;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.mo
deleted file mode 100644
index 52faf61152f..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/Examples/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling.Subsystems;
-package Examples "Example models integrating multiple components"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (
-    Documentation(
-      info="<html>
-<p>
-This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.Subsystems\">
-Buildings.Experimental.DHC.Plants.Cooling.Subsystems</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.mo
deleted file mode 100644
index d348f9927b8..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/Subsystems/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Cooling;
-package Subsystems "Package of models for subsystems of cooling plants"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for subsystems composing central cooling plants.
-</p>
-</html>"));
-end Subsystems;
diff --git a/Buildings/Experimental/DHC/Plants/Cooling/package.mo b/Buildings/Experimental/DHC/Plants/Cooling/package.mo
deleted file mode 100644
index 071c9676af2..00000000000
--- a/Buildings/Experimental/DHC/Plants/Cooling/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC.Plants;
-package Cooling "Package of models for central cooling production"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for central plants producing chilled water.
-</p>
-</html>"));
-end Cooling;
diff --git a/Buildings/Experimental/DHC/Plants/Heating/package.mo b/Buildings/Experimental/DHC/Plants/Heating/package.mo
deleted file mode 100644
index d76dc424148..00000000000
--- a/Buildings/Experimental/DHC/Plants/Heating/package.mo
+++ /dev/null
@@ -1,9 +0,0 @@
-within Buildings.Experimental.DHC.Plants;
-package Heating "Package of models for central heating production"
-  extends Modelica.Icons.VariantsPackage;
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains models for central plants producing hot water.
-</p>
-</html>"));
-end Heating;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
deleted file mode 100644
index ee9b808231b..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.mo
+++ /dev/null
@@ -1,302 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses;
-model BoilerPolynomial
-  "A equilibrium boiler with water phase change from liquid to vapor, discharging
-  saturated steam vapor, with the efficiency curve described by a polynomial."
-  extends Buildings.BaseClasses.BaseIconLow;
-  extends Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium(
-    redeclare final package Medium_a=MediumWat,
-    redeclare final package Medium_b=MediumSte,
-    final T_start=MediumSte.saturationTemperature(p_start));
-
-  // Medium declarations
-  replaceable package MediumWat =
-    Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium - port_a (inlet)";
-  replaceable package MediumSte = Buildings.Media.Steam
-     "Steam medium - port_b (oulet)";
-  // Initialization
-  parameter Boolean fixed_p_start=false
-    "Set to true if p_start is to be used as an explicit initial equation,
-    not an initial guess"
-    annotation(Dialog(tab = "Initialization"));
-  // Nominal conditions
-  parameter Modelica.Units.SI.PressureDifference dp_nominal(displayUnit="Pa")
-    "Pressure drop at nominal mass flow rate"
-    annotation(Dialog(group = "Nominal condition"));
-  parameter Modelica.Units.SI.Power Q_flow_nominal "Nominal heating power";
-  parameter Modelica.Units.SI.Temperature T_nominal = 373.15
-    "Temperature used to compute nominal efficiency
-    (only used if efficiency curve depends on temperature)";
-
-  // Efficiency, fuel, and boiler properties
-  parameter Buildings.Fluid.Types.EfficiencyCurves effCur=
-    Buildings.Fluid.Types.EfficiencyCurves.Constant
-    "Curve used to compute the efficiency";
-  parameter Real a[:] = {0.9} "Coefficients for efficiency curve";
-  parameter Buildings.Fluid.Data.Fuels.Generic fue "Fuel type"
-   annotation (choicesAllMatching = true);
-  parameter Modelica.Units.SI.ThermalConductance UA=0.05*Q_flow_nominal/30
-    "Overall UA value";
-  parameter Modelica.Units.SI.Volume V = 1.5E-6*Q_flow_nominal
-    "Total internal volume of boiler"
-    annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
-  parameter Modelica.Units.SI.Mass mDry = 1.5E-3*Q_flow_nominal
-    "Mass of boiler that will be lumped to water heat capacity"
-    annotation(Dialog(tab = "Dynamics", enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
-
-  // Variables
-  Modelica.Units.SI.Efficiency eta=
-    if effCur == Buildings.Fluid.Types.EfficiencyCurves.Constant then
-      a[1]
-    elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.Polynomial then
-      Buildings.Utilities.Math.Functions.polynomial(a=a, x=y_internal)
-    elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear then
-      Buildings.Utilities.Math.Functions.quadraticLinear(
-        a=aQuaLin,
-        x1=y_internal,
-        x2=MediumSte.saturationTemperature(port_a.p))
-    else 0
-    "Boiler efficiency";
-  Modelica.Units.SI.Power QFue_flow = y_internal * Q_flow_nominal/eta_nominal
-    "Heat released by fuel";
-  Modelica.Units.SI.Power QWat_flow = eta * QFue_flow
-    "Heat transfer from gas into water";
-  Modelica.Units.SI.MassFlowRate mFue_flow = QFue_flow/fue.h
-    "Fuel mass flow rate";
-  Modelica.Units.SI.VolumeFlowRate VFue_flow = mFue_flow/fue.d
-    "Fuel volume flow rate";
-
-  Modelica.Blocks.Interfaces.RealInput y(min=0, max=1) if not steadyDynamics
-    "Part load ratio"
-    annotation (Placement(transformation(extent={{-140,60},{-100,100}})));
-  Modelica.Blocks.Interfaces.RealOutput VLiq(
-    final quantity="Volume",
-    final unit="m3",
-    min=0) "Output liquid water volume"
-    annotation (Placement(transformation(extent={{100,50},{120,70}})));
-  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort if not steadyDynamics
-    "Heat port, can be used to connect to ambient"
-    annotation (Placement(transformation(extent={{-10,62}, {10,82}})));
-  Modelica.Thermal.HeatTransfer.Components.HeatCapacitor heaCapDry(
-    C=500*mDry,
-    T(start=T_start)) if not steadyDynamics
-    "Heat capacity of boiler metal"
-    annotation (Placement(transformation(extent={{-80,12},{-60,32}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation vol(
-    redeclare final package MediumSte = MediumSte,
-    redeclare final package MediumWat = MediumWat,
-    final allowFlowReversal=allowFlowReversal,
-    final energyDynamics=energyDynamics,
-    final massDynamics=massDynamics,
-    final p_start=p_start,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T,
-    final V=V,
-    final fixed_p_start=fixed_p_start)
-    "Steam/water control volume"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Buildings.Fluid.FixedResistances.PressureDrop res(
-    redeclare final package Medium = MediumWat,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    final show_T=show_T,
-    final dp_nominal=dp_nominal)
-    "Flow resistance"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-
-  Modelica.Blocks.Interfaces.RealOutput QFueFlo(
-    final quantity="HeatFlowRate",
-    final unit="W",
-    min=0) "Heat flow rate of the fuel"
-    annotation (Placement(transformation(extent={{100,80},{120,100}})));
-
-protected
-  final parameter Boolean steadyDynamics=
-    if energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState then true
-    else false
-    "= true, if steady state formulation";
-  parameter Real eta_nominal(fixed=false) "Boiler efficiency at nominal condition";
-  parameter Real aQuaLin[6] = if size(a, 1) == 6 then a else fill(0, 6)
-  "Auxiliary variable for efficiency curve because quadraticLinear requires exactly 6 elements";
-
-  Modelica.Blocks.Interfaces.RealInput y_internal(min=0, max=1)
-    "Internal block needed for conditional input part load ratio";
-
-  Buildings.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo if not steadyDynamics
-  "Prescribed heat flow (if heatPort is connected)"
-    annotation (Placement(transformation(extent={{-49,-40},{-29,-20}})));
-  Modelica.Blocks.Sources.RealExpression Q_flow_in(y=QWat_flow)
-    if not steadyDynamics
-    "Heat transfer from gas into water (if heatPort is connected)"
-    annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-
-  Modelica.Thermal.HeatTransfer.Components.ThermalConductor UAOve(G=UA) if not steadyDynamics
-    "Overall thermal conductance (if heatPort is connected)"
-    annotation (Placement(transformation(extent={{-48,10},{-28,30}})));
-
-  Modelica.Blocks.Sources.RealExpression QFue_flow_out(y=QFue_flow)
-    "Heat flow rate of the fuel"
-    annotation (Placement(transformation(extent={{60,80},{80,100}})));
-initial equation
-  if  effCur == Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear then
-    assert(size(a, 1) == 6,
-    "The boiler has the efficiency curve set to 'Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear',
-    and hence the parameter 'a' must have exactly 6 elements.
-    However, only " + String(size(a, 1)) + " elements were provided.");
-  end if;
-
-  if effCur == Buildings.Fluid.Types.EfficiencyCurves.Constant then
-    eta_nominal = a[1];
-  elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.Polynomial then
-    eta_nominal = Buildings.Utilities.Math.Functions.polynomial(
-      a=a, x=1);
-  elseif effCur == Buildings.Fluid.Types.EfficiencyCurves.QuadraticLinear then
-    // For this efficiency curve, a must have 6 elements.
-    eta_nominal = Buildings.Utilities.Math.Functions.quadraticLinear(
-      a=aQuaLin, x1=1, x2=T_nominal);
-  else
-     eta_nominal = 999;
-  end if;
-
-equation
-  assert(eta > 0.001, "Efficiency curve is wrong.");
-
-  connect(y,y_internal);
-
-  if steadyDynamics then
-    if allowFlowReversal then
-      -QWat_flow = port_a.m_flow*actualStream(port_a.h_outflow) +
-                   port_b.m_flow*actualStream(port_b.h_outflow);
-    else
-      -QWat_flow = port_a.m_flow*inStream(port_a.h_outflow) +
-                   port_b.m_flow*port_b.h_outflow;
-
-    end if;
-  end if;
-
-  connect(UAOve.port_a, heatPort) annotation (Line(
-      points={{-48,20},{-52,20},{-52,60},{0,60},{0,72}},
-      color={191,0,0},
-      smooth=Smooth.None));
-  connect(Q_flow_in.y,preHeaFlo. Q_flow) annotation (Line(
-      points={{-59,-30},{-49,-30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(heaCapDry.port, UAOve.port_b) annotation (Line(points={{-70,12},{-70,6},
-          {-20,6},{-20,20},{-28,20}}, color={191,0,0}));
-  connect(preHeaFlo.port, UAOve.port_b) annotation (Line(points={{-29,-30},{-20,
-          -30},{-20,20},{-28,20}}, color={191,0,0}));
-  connect(vol.heatPort, UAOve.port_b) annotation (Line(points={{10,-10},{10,-20},
-          {-20,-20},{-20,20},{-28,20}}, color={191,0,0}));
-  connect(vol.port_b, port_b)
-    annotation (Line(points={{20,0},{100,0}}, color={0,127,255}));
-  connect(port_a, res.port_a)
-    annotation (Line(points={{-100,0},{-60,0}}, color={0,127,255}));
-  connect(res.port_b, vol.port_a)
-    annotation (Line(points={{-40,0},{0,0}}, color={0,127,255}));
-  connect(vol.VLiq,VLiq)  annotation (Line(points={{21,7},{80,7},{80,60},{110,
-          60}},
-        color={0,0,127}));
-  connect(QFue_flow_out.y, QFueFlo)
-    annotation (Line(points={{81,90},{110,90}}, color={0,0,127}));
-  annotation (
-    defaultComponentName="boi",
-    Icon(coordinateSystem(preserveAspectRatio=false), graphics={
-        Rectangle(
-          extent={{-80,60},{80,-60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={95,95,95},
-          fillPattern=FillPattern.Solid),
-        Ellipse(
-          extent={{-40,40},{40,-40}},
-          fillColor={127,0,0},
-          fillPattern=FillPattern.Solid,
-          pattern=LinePattern.None),
-      Line(
-        points={{20,18},{0,8},{20,-12},{0,-22}},
-        color={0,0,0},
-        smooth=Smooth.Bezier),
-      Line(
-        points={{-2,18},{-22,8},{-2,-12},{-22,-22}},
-        color={0,0,0},
-        smooth=Smooth.Bezier)}), Diagram(coordinateSystem(
-          preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-This model represents a steam boiler that discharges saturated
-steam and has an efficiency curve defined by a polynomial.
-The efficiency in this model represents the fuel-to-water
-efficiency (e.g., thermal efficiency).
-This model is similar to the
-<a href=\"modelica://Buildings.Fluid.Boilers.BoilerPolynomial\">
-Buildings.Fluid.Boilers.BoilerPolynomial</a> for the efficiency
-and fuel mass flow rate computation with the following exceptions:
-</p>
-<ul>
-<li>
-Water enters <code>port_a</code> in liquid state and exits
-<code>port_b</code> in vapor state.
-</li>
-<li>
-The liquid and vapor phases are at equilibrium; thus, the steam
-boiler is constrained to saturated states only with the volume
-containing a wet steam mixture.
-</li>
-<li>
-If the boiler is configured in steady state, several blocks involving
-the heat flow rate are conditionally removed to avoid overconstraining
-the model. This is because the discharging fluid is constrained at
-a saturated state. The blocks that are conditionally removed as a
-result are within the green region in the below figure:
-</li>
-</ul>
-
-<p align=\"center\">
-<img src=\"modelica://Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png\" border=\"1\"
-alt=\"Boiler polynomial steam with blocks in green conditionally removed if steady state\"/>
-</p>
-<h4>Implementation</h4>
-<p>
-In order to improve the numerical efficiency, this model follows
-the split-medium approach using the
-<a href=\"modelica://Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium\">
-Buildings.Experimental.DHC.BaseClasses.Steam.PartialTwoPortTwoMedium</a> interface model.
-The saturated mixing volume for an evaporation process
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation\">
-Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation</a>
-represents the phase change process of water from liquid
-to vapor at equilibrium.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Updated publication references.
-</li>
-<li>
-February 25, 2022 by Kathryn Hinkelman:<br/>
-Refactored base classes for improved extensibility and relocated models into Steam subpackages.
-</li>
-<li>
-July 22, 2021 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BoilerPolynomial;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
deleted file mode 100644
index bf49428b26d..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/ControlVolumeEvaporation.mo
+++ /dev/null
@@ -1,75 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses;
-model ControlVolumeEvaporation
-  "Control volume model exhibiting the evaporation process of water"
-  extends Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume(
-    redeclare final package Medium_a=MediumWat,
-    redeclare final package Medium_b=MediumSte,
-    hSte(start = MediumSte.h_default),
-    hWat(start = MediumWat.h_default),
-    p(final fixed=fixed_p_start));
-  parameter Boolean fixed_p_start = false
-    "Set to true if p_start is to be used as an explicit initial equation,
-    not an initial guess"
-    annotation(Dialog(tab = "Initialization"));
-equation
-// boundary conditions at the ports
-  port_a.m_flow = mWat_flow;
-  port_a.h_outflow = hWat;
-  port_b.m_flow = mSte_flow;
-  port_b.h_outflow = hSte;
-
-annotation (defaultComponentName="vol",
-    Icon(coordinateSystem(
-        preserveAspectRatio=false,
-        extent={{-100,-100},{100,100}}),
-    graphics={
-      Line(
-        points={{40,42},{0,22},{40,-18},{0,-38}},
-        color={238,46,47},
-        smooth=Smooth.Bezier),
-      Line(
-        points={{0,42},{-40,22},{0,-18},{-40,-38}},
-        color={238,46,47},
-        smooth=Smooth.Bezier)}),
-    Documentation(revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Updated publication references.
-</li>
-<li>
-February 26, 2022 by Kathryn Hinkelman:<br/>
-Moved control volume formulation into a base class
-for reusability in condensation and evaporation instances.
-</li>
-<li>
-July 22, 2021 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>", info="<html>
-<p>
-This model represents an evaporation process of water with
-liquid and vapor phases in equilibrium and at a saturated state.
-Further information regarding the model formulation and assumptions
-are in the base class
-<a href=\"modelica://Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume\">
-Buildings.Experimental.DHC.BaseClasses.Steam.PartialSaturatedControlVolume</a>.
-
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>"));
-end ControlVolumeEvaporation;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
deleted file mode 100644
index 7f6ccec669d..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mo
+++ /dev/null
@@ -1,107 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples;
-model BoilerPolynomial
-  "Example model for the steam boiler with a polynomial efficiency curve"
-  extends Modelica.Icons.Example;
-
-  // Medium declarations
-  package MediumWat =
-      Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium - port_a (inlet)";
-  package MediumSte = Buildings.Media.Steam
-     "Steam medium - port_b (oulet)";
-
-  // Nominal conditions
-  parameter Modelica.Units.SI.AbsolutePressure p_nominal = 300000
-    "Nominal pressure";
-  parameter Modelica.Units.SI.Temperature T_nominal=
-    MediumSte.saturationTemperature(p_nominal)
-    "Nominal saturation temperature";
-  parameter Modelica.Units.SI.Power Q_flow_nominal = 50000 "Nominal power";
-  parameter Modelica.Units.SI.SpecificEnthalpy dh_nominal=
-    MediumSte.specificEnthalpy(
-      MediumSte.setState_pTX(p=p_nominal, T=T_nominal, X=MediumSte.X_default))
-    "Nominal change in enthalpy";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=
-    Q_flow_nominal/dh_nominal/2
-    "Nominal mass flow rate";
-  parameter Modelica.Units.SI.PressureDifference dp_nominal = 3000
-    "Pressure drop at m_flow_nominal";
-
-  Modelica.Blocks.Sources.TimeTable y(
-    table=[0,0; 1200,1; 1200,0; 2000,0; 2000,1; 3600,1])
-    "Load ratio"
-    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
-  Buildings.Fluid.Sources.Boundary_pT sin(
-    redeclare package Medium = MediumSte,
-    p(displayUnit="bar") = 300000,
-    T=423.15,
-    nPorts=2)
-    "Sink"
-    annotation (Placement(transformation(extent={{60,-20},{40,0}})));
-  Buildings.Fluid.Sources.Boundary_pT sou(
-    redeclare package Medium = MediumWat,
-    p=300000 + dp_nominal,
-    T=303.15,
-    nPorts=2)
-    "Source"
-    annotation (Placement(transformation(extent={{-80,-20},{-60,0}})));
-  Buildings.HeatTransfer.Sources.FixedTemperature TAmb(T=288.15)
-    "Ambient temperature in boiler room"
-    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiDyn(
-    redeclare package MediumSte = MediumSte,
-    redeclare package MediumWat = MediumWat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    m_flow_nominal=m_flow_nominal,
-    Q_flow_nominal=Q_flow_nominal,
-    fue=Buildings.Fluid.Data.Fuels.NaturalGasLowerHeatingValue(),
-    dp_nominal=dp_nominal)
-    "Steam boiler with dynamic balance"
-    annotation (Placement(transformation(extent={{-20,-20},{0,0}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boiSte(
-    redeclare package MediumSte = MediumSte,
-    redeclare package MediumWat = MediumWat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    m_flow_nominal=m_flow_nominal,
-    Q_flow_nominal=Q_flow_nominal,
-    fue=Buildings.Fluid.Data.Fuels.NaturalGasLowerHeatingValue(),
-    dp_nominal=dp_nominal)
-    "Steam boiler with steady state balance"
-    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-equation
-  connect(TAmb.port, boiDyn.heatPort)
-    annotation (Line(points={{-20,50},{-10,50},{-10,-2.8}},
-                                                          color={191,0,0}));
-  connect(y.y, boiDyn.y)
-    annotation (Line(points={{-59,50},{-50,50},{-50,-2},{-22,-2}},
-                   color={0,0,127}));
-  connect(sou.ports[1], boiSte.port_a)
-    annotation (Line(points={{-60,-11},{-50,-11},{-50,-50},{-20,-50}},
-                                   color={0,127,255}));
-  connect(boiDyn.port_a, sou.ports[2]) annotation (Line(points={{-20,-10},{-60,
-          -10},{-60,-9}}, color={0,127,255}));
-  connect(boiSte.port_b, sin.ports[1]) annotation (Line(points={{0,-50},{30,-50},
-          {30,-11},{40,-11}}, color={0,127,255}));
-  connect(boiDyn.port_b, sin.ports[2])
-    annotation (Line(points={{0,-10},{40,-10},{40,-9}}, color={0,127,255}));
-  annotation (__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos"
-        "Simulate and plot"),
-    experiment(Tolerance=1e-6, StopTime=3600),
-    Documentation(info="<html>
-<p>
-This example demonstrates the open loop response of the
-steam boiler model. The dynamic boiler includes a control
-signal that is first a ramp from <i>0</i> to <i>1</i>,
-followed by a step that switches the boiler off and then
-on again. The steady boiler is only dependent on the fluid
-flow.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-July 23, 2021 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end BoilerPolynomial;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
deleted file mode 100644
index be38d2cc544..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mo
+++ /dev/null
@@ -1,101 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples;
-model ControlVolumeEvaporation
-  "Example model for heat transfer with the evaporation control volume"
-  extends Modelica.Icons.Example;
-
-  package MediumSte = Buildings.Media.Steam
-    "Steam medium - Medium model for port_b (outlet)";
-  package MediumWat =
-      Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    "Water medium - Medium model for port_a (inlet)";
-
-  parameter Modelica.Units.SI.AbsolutePressure p_start = 1E6 "Initial pressure";
-
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volDyn(
-    p_start=p_start,
-    V=1,
-    redeclare package MediumWat = MediumWat,
-    redeclare package MediumSte = MediumSte,
-    m_flow_nominal=0.01,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    allowFlowReversal=true) "Dynamic volume"
-    annotation (Placement(transformation(extent={{10,0},{30,-20}})));
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.ControlVolumeEvaporation volSte(
-    V=1,
-    redeclare package MediumWat = MediumWat,
-    redeclare package MediumSte = MediumSte,
-    m_flow_nominal=0.01,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    p_start=p_start,
-    allowFlowReversal=true) "Steady volume"
-    annotation (Placement(transformation(extent={{10,-40},{30,-60}})));
-  Modelica.Fluid.Sources.MassFlowSource_T sou(
-    redeclare package Medium = MediumWat,
-    use_m_flow_in=true,
-    T=313.15,
-    nPorts=1) "Flow source"
-    annotation (Placement(transformation(extent={{-18,-20},{2,0}})));
-  Modelica.Fluid.Sources.MassFlowSource_T sou1(
-    redeclare package Medium = MediumWat,
-    use_m_flow_in=true,
-    T=313.15,
-    nPorts=1) "Flow source"
-    annotation (Placement(transformation(extent={{-20,-60},{0,-40}})));
-  Modelica.Fluid.Sources.FixedBoundary bou(
-    redeclare package Medium = MediumSte,
-    p=p_start,
-    nPorts=2) "Boundary condition"
-    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
-  Modelica.Blocks.Sources.Ramp ramp(
-    duration=1,
-    offset=1,
-    height=-2) "Ramp"
-    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
-  Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo
-    "Heat flow sensor"
-    annotation (Placement(transformation(extent={{-20,40},{0,60}})));
-  Modelica.Blocks.Sources.Constant const(k=-1000000) "Heat loss"
-    annotation (Placement(transformation(extent={{-90,40},{-70,60}})));
-  Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow preHeaFlo
-    "Prescribed heat flow rate"
-    annotation (Placement(transformation(extent={{-60,40},{-40,60}})));
-equation
-  connect(sou.ports[1], volDyn.port_a)
-    annotation (Line(points={{2,-10},{10,-10}}, color={0,127,255}));
-  connect(preHeaFlo.port,heaFlo. port_a) annotation (Line(
-      points={{-40,50},{-20,50}},
-      color={191,0,0}));
-  connect(preHeaFlo.Q_flow,const. y) annotation (Line(
-      points={{-60,50},{-69,50}},
-      color={0,0,127}));
-  connect(heaFlo.port_b, volDyn.heatPort)
-    annotation (Line(points={{0,50},{20,50},{20,0}}, color={191,0,0}));
-  connect(sou1.ports[1], volSte.port_a)
-    annotation (Line(points={{0,-50},{10,-50}}, color={0,127,255}));
-  connect(ramp.y, sou.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},{-40,-2},{-18,-2}},
-                             color={0,0,127}));
-  connect(ramp.y, sou1.m_flow_in) annotation (Line(points={{-69,-10},{-40,-10},
-          {-40,-42},{-20,-42}}, color={0,0,127}));
-  connect(volSte.port_b, bou.ports[1]) annotation (Line(points={{30,-50},{50,-50},
-          {50,-8},{60,-8}},        color={0,127,255}));
-  connect(volDyn.port_b, bou.ports[2])
-    annotation (Line(points={{30,-10},{60,-10},{60,-12}},color={0,127,255}));
-  annotation (Documentation(
-        info="<html>
-<p>
-This model demonstrates the use of the control volume with evaporation.
-The dynamic volume includes heat conduction to the ambient while the
-steady volume heat balance is only dependent on the mass flow rate.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-July 22, 2021 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"),
-experiment(Tolerance=1E-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos"
-        "Simulate and plot"));
-end ControlVolumeEvaporation;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.mo
deleted file mode 100644
index 3b72af8b732..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam.BaseClasses;
-package Examples "Collection of models that illustrate model use and test models"
-  extends Modelica.Icons.ExamplesPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.BaseClasses\">
-Buildings.Experimental.DHC.Plants.Steam.BaseClasses</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo b/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo
deleted file mode 100644
index 270123e9dc4..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/BaseClasses/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam;
-package BaseClasses "Package with base classes for Buildings.Experimental.DHC.Plants.Steam"
-  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.Plants.Steam\">
-Buildings.Experimental.DHC.Plants.Steam</a>.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mo b/Buildings/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mo
deleted file mode 100644
index 1db129e5dc6..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mo
+++ /dev/null
@@ -1,141 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam.Examples;
-model SingleBoiler "Example model to demonstrate the single-boiler steam plant
-  in a single closed loop"
-  extends Modelica.Icons.Example;
-
-  package MediumSte = Buildings.Media.Steam (
-    p_default=300000,
-    T_default=273.15+200,
-    h_default=2700000)
-    "Steam medium";
-  package MediumWat =
-    Buildings.Media.Specialized.Water.TemperatureDependentDensity (
-      p_default=101325,
-      T_default=273.15+100)
-    "Water medium";
-
-  parameter Modelica.Units.SI.AbsolutePressure pSat=300000
-    "Saturation pressure";
-  parameter Modelica.Units.SI.Temperature TSat=
-     MediumSte.saturationTemperature(pSat)
-     "Saturation temperature";
-
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal mass flow rate of plant";
-  parameter Modelica.Units.SI.PressureDifference dpPip=6000
-    "Pressure drop in the condensate return pipe";
-  // pumps
-  parameter Buildings.Fluid.Movers.Data.Generic perPumFW(
-    pressure(
-      V_flow=(m_flow_nominal/1000)*{0.4,0.6,0.8,1.0},
-      dp=(pSat-101325)*{1.34,1.27,1.17,1.0}))
-    "Performance data for feedwater pump";
-    parameter Buildings.Fluid.Movers.Data.Generic perPumCNR(
-   pressure(
-     V_flow=(m_flow_nominal/1000)*{0,1,2},
-     dp=dpPip*{2,1,0}))
-    "Performance data for condensate return pumps";
-
-  Buildings.Experimental.DHC.Plants.Steam.SingleBoiler pla(
-    redeclare final package Medium = MediumWat,
-    redeclare final package MediumHea_b = MediumSte,
-    allowFlowReversal=true,
-    final m_flow_nominal=m_flow_nominal,
-    final pSteSet=pSat,
-    final per=perPumFW,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    massDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial)
-    "Plant"
-    annotation (Placement(transformation(extent={{-20,20},{0,40}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.ControlVolumeCondensation vol(
-    redeclare final package MediumSte = MediumSte,
-    redeclare final package MediumWat = MediumWat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
-    final p_start=pSat,
-    final m_flow_nominal=m_flow_nominal,
-    V=1)
-    "Volume"
-    annotation (Placement(transformation(extent={{20,40},{40,20}})));
-  Buildings.Fluid.FixedResistances.PressureDrop res(
-    redeclare final package Medium = MediumWat,
-    final m_flow_nominal=m_flow_nominal,
-    final dp_nominal = dpPip)
-    "Resistance in district network"
-    annotation (Placement(transformation(extent={{0,-60},{-20,-40}})));
-  Buildings.Experimental.DHC.Loads.Steam.BaseClasses.SteamTrap steTra(
-    redeclare final package Medium = MediumWat,
-    final m_flow_nominal=m_flow_nominal)
-    "Steam trap"
-    annotation (Placement(transformation(extent={{60,20},{80,40}})));
-  Modelica.Blocks.Sources.Sine inp(
-    amplitude=-0.5,
-    f=1/86400,
-    phase=3.1415926535898,
-    offset=0.5)
-    "Input signal"
-    annotation (Placement(transformation(extent={{-90,-20},{-70,0}})));
-  Buildings.Fluid.Sensors.MassFlowRate senMasFlo(
-    redeclare final package Medium = MediumWat)
-    "Mass flow rate sensor"
-    annotation (Placement(transformation(extent={{80,-60},{60,-40}})));
-  Buildings.Controls.Continuous.LimPID conPumCNR(
-    controllerType=Modelica.Blocks.Types.SimpleController.PI,
-    k=1,
-    Ti=15)
-    "Controller"
-    annotation (Placement(transformation(extent={{0,-20},{20,0}})));
-  Modelica.Blocks.Math.Gain m_flow(final k=m_flow_nominal)
-    "Gain to calculate m_flow"
-    annotation (Placement(transformation(extent={{-60,-20},{-40,0}})));
-  Buildings.Fluid.Movers.SpeedControlled_y pumCNR(
-    redeclare final package Medium = MediumWat,
-    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    p_start=101325,
-    final per=perPumCNR,
-    y_start=1)
-    "Condensate return pump"
-    annotation (Placement(transformation(extent={{40,-60},{20,-40}})));
-equation
-  connect(res.port_b, pla.port_aSerHea) annotation (Line(points={{-20,-50},{-30,
-          -50},{-30,30},{-20,30}},
-                              color={0,127,255}));
-  connect(vol.port_b, steTra.port_a)
-    annotation (Line(points={{40,30},{60,30}}, color={0,127,255}));
-  connect(pla.port_bSerHea, vol.port_a)
-    annotation (Line(points={{0,30},{20,30}},  color={0,127,255}));
-  connect(steTra.port_b, senMasFlo.port_a) annotation (Line(points={{80,30},{90,
-          30},{90,-50},{80,-50}}, color={0,127,255}));
-  connect(senMasFlo.port_b, pumCNR.port_a)
-    annotation (Line(points={{60,-50},{40,-50}},color={0,127,255}));
-  connect(pumCNR.port_b, res.port_a)
-    annotation (Line(points={{20,-50},{0,-50}},    color={0,127,255}));
-  connect(senMasFlo.m_flow, conPumCNR.u_m)
-    annotation (Line(points={{70,-39},{70,-30},{10,-30},{10,-22}},
-                                                 color={0,0,127}));
-  connect(conPumCNR.y, pumCNR.y)
-    annotation (Line(points={{21,-10},{30,-10},{30,-38}},   color={0,0,127}));
-  connect(m_flow.y, conPumCNR.u_s)
-    annotation (Line(points={{-39,-10},{-2,-10}},color={0,0,127}));
-  connect(inp.y, m_flow.u)
-    annotation (Line(points={{-69,-10},{-62,-10}},
-                                                 color={0,0,127}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
-        coordinateSystem(preserveAspectRatio=false)),
-    experiment(StopTime=86400, Tolerance=1e-6),
-      __Dymola_Commands(file=
-    "modelica://Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos"
-    "Simulate and plot"),
-    Documentation(info="<html>
-<p>This model validates the steam plant implemented in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.SingleBoiler\">
-Buildings.Experimental.DHC.Plants.Steam.SingleBoiler</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-March 3, 2022 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end SingleBoiler;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/Examples/package.mo b/Buildings/Experimental/DHC/Plants/Steam/Examples/package.mo
deleted file mode 100644
index e3fe2dcfb89..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/Examples/package.mo
+++ /dev/null
@@ -1,12 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam;
-package Examples "Example models for steam plants"
-  extends Modelica.Icons.ExamplesPackage;
-
-  annotation (Documentation(info="<html>
-<p>
-This package contains advanced examples illustrating the use of the models in
-<a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam\">
-Buildings.Experimental.DHC.Plants.Steam</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/SingleBoiler.mo b/Buildings/Experimental/DHC/Plants/Steam/SingleBoiler.mo
deleted file mode 100644
index 85c445ecead..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/SingleBoiler.mo
+++ /dev/null
@@ -1,320 +0,0 @@
-within Buildings.Experimental.DHC.Plants.Steam;
-model SingleBoiler "A generic steam plant with a single boiler that discharges
-  saturated steam"
-  extends Buildings.Experimental.DHC.Plants.BaseClasses.PartialPlant(
-    final typ=Buildings.Experimental.DHC.Types.DistrictSystemType.HeatingGeneration1,
-    redeclare replaceable package MediumHea_b=Buildings.Media.Steam,
-    final have_fan=false,
-    final have_pum=true,
-    final nFue=1,
-    final fue={fueBoi},
-    final have_eleHea=false,
-    final have_eleCoo=false,
-    final have_weaBus=false);
-
-  parameter Buildings.Fluid.Data.Fuels.Generic fueBoi=
-    Buildings.Fluid.Data.Fuels.NaturalGasLowerHeatingValue()
-    "Boiler fuel type"
-     annotation (choicesAllMatching = true, Dialog(enable=have_fue));
-
-  // Nominal values
-  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=1
-    "Nominal mass flow rate";
-  parameter Modelica.Units.SI.Power Q_flow_nominal=m_flow_nominal*(
-      MediumHea_b.specificEnthalpy(MediumHea_b.setState_pTX(
-        p=pSteSet,
-        T=TSat,
-        X=MediumHea_b.X_default)) -
-      Medium.specificEnthalpy(Medium.setState_pTX(
-        p=pSteSet,
-        T=TSat,
-        X=Medium.X_default)))
-    "Nominal heating power";
-
-  // Setpoints
-  parameter Modelica.Units.SI.AbsolutePressure pSteSet=300000
-    "Steam pressure setpoint";
-  final parameter Modelica.Units.SI.Temperature TSat=
-    MediumHea_b.saturationTemperature(pSteSet)
-    "Saturation temperature at pressure setpoint";
-  parameter Modelica.Units.SI.AbsolutePressure pTanFW=101325
-    "Pressure of feedwater tank";
-  parameter Modelica.Units.SI.Volume VBoiWatSet=VBoi/2
-    "Setpoint for liquid water volume in the boiler";
-
-  // System sizing
-  parameter Modelica.Units.SI.Volume VBoi=3
-    "Total drum volume of steam boiler";
-  parameter Real boiSca = 1.25 "Boiler heat capacity scaling factor";
-  parameter Modelica.Units.SI.Mass mDry = 1.5E-3*Q_flow_nominal
-    "Mass of boiler that will be lumped to water heat capacity"
-    annotation(Dialog(tab = "Dynamics",
-      enable = not (energyDynamics == Modelica.Fluid.Types.Dynamics.SteadyState)));
-  parameter Buildings.Fluid.Movers.Data.Generic per(
-    pressure(
-      V_flow=(m_flow_nominal/1000)*{0.4,0.6,0.8,1.0},
-      dp=(pSteSet-pTanFW)*{1.34,1.27,1.17,1.0}))
-    "Performance data for the feedwater pump";
-
-  // Initial conditions
-  parameter Modelica.Units.SI.Volume VTanFW_start=1
-    "Setpoint for liquid water volume in the boiler"
-    annotation(Dialog(tab = "Initialization"));
-  parameter Modelica.Media.Interfaces.Types.AbsolutePressure pBoi_start=pTanFW
-    "Start value of boiler pressure"
-    annotation(Dialog(tab = "Initialization"));
-  parameter Real yPum_start=0.7 "Initial value of pump speed"
-    annotation(Dialog(tab="Initialization"));
-
-  // Dynamics
-  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="Equations"));
-  parameter Modelica.Fluid.Types.Dynamics massDynamics=energyDynamics
-    "Type of mass balance: dynamic (3 initialization options) or steady state"
-    annotation (Evaluate=true,Dialog(tab="Dynamics",group="Equations"));
-
-  // Boiler controller
-  parameter Modelica.Blocks.Types.SimpleController controllerTypeBoi=
-    Modelica.Blocks.Types.SimpleController.PI "Type of controller"
-    annotation (Dialog(tab="Control", group="Boiler"));
-  parameter Real kBoi(min=0) = 10 "Gain of controller"
-    annotation (Dialog(tab="Control", group="Boiler"));
-  parameter Modelica.Units.SI.Time TiBoi(min=Modelica.Constants.small)=120
-    "Time constant of Integrator block"
-     annotation (Dialog(enable=
-          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PI or
-          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PID,
-          tab="Control", group="Boiler"));
-  parameter Modelica.Units.SI.Time TdBoi(min=0)=10
-    "Time constant of Derivative block" annotation (Dialog(enable=
-          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PD or
-          controllerTypeBoi == Modelica.Blocks.Types.SimpleController.PID,
-          tab="Control", group="Boiler"));
-  parameter Real wpBoi(min=0) = 1 "Set-point weight for Proportional block (0..1)"
-    annotation (Dialog(tab="Control", group="Boiler"));
-  parameter Real wdBoi(min=0) = 0 "Set-point weight for Derivative block (0..1)"
-    annotation(Dialog(enable=
-      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PD or
-      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PID,
-      tab="Control", group="Boiler"));
-  parameter Real NiBoi(min=100*Modelica.Constants.eps) = 0.9
-    "Ni*Ti is time constant of anti-windup compensation"
-     annotation(Dialog(enable=
-       controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PI or
-       controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PID,
-       tab="Control", group="Boiler"));
-  parameter Real NdBoi(min=100*Modelica.Constants.eps) = 10
-    "The higher Nd, the more ideal the derivative block"
-    annotation(Dialog(enable=
-      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PD or
-      controllerTypeBoi==.Modelica.Blocks.Types.SimpleController.PID,
-      tab="Control", group="Boiler"));
-
-  // Feedwater pump controller
-  parameter Modelica.Blocks.Types.SimpleController controllerTypePum=
-    Modelica.Blocks.Types.SimpleController.PI "Type of controller"
-    annotation (Dialog(tab="Control", group="Pump"));
-  parameter Real kPum(min=0) = 5 "Gain of controller"
-    annotation (Dialog(tab="Control", group="Pump"));
-  parameter Modelica.Units.SI.Time TiPum(min=Modelica.Constants.small)=120
-    "Time constant of Integrator block"
-    annotation (Dialog(enable=
-      controllerTypePum == Modelica.Blocks.Types.SimpleController.PI or
-      controllerTypePum == Modelica.Blocks.Types.SimpleController.PID,
-      tab="Control", group="Pump"));
-  parameter Modelica.Units.SI.Time TdPum(min=0)=0.1
-    "Time constant of Derivative block"
-    annotation (Dialog(enable=
-      controllerTypePum == Modelica.Blocks.Types.SimpleController.PD or
-      controllerTypePum == Modelica.Blocks.Types.SimpleController.PID,
-      tab="Control", group="Pump"));
-  parameter Real wpPum(min=0) = 1 "Set-point weight for Proportional block (0..1)"
-    annotation (Dialog(tab="Control", group="Pump"));
-  parameter Real wdPum(min=0) = 0 "Set-point weight for Derivative block (0..1)"
-    annotation(Dialog(enable=
-      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PD or
-      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PID,
-      tab="Control", group="Pump"));
-  parameter Real NiPum(min=100*Modelica.Constants.eps) = 0.9
-    "Ni*Ti is time constant of anti-windup compensation"
-     annotation(Dialog(enable=
-       controllerTypePum==.Modelica.Blocks.Types.SimpleController.PI or
-       controllerTypePum==.Modelica.Blocks.Types.SimpleController.PID,
-       tab="Control", group="Pump"));
-  parameter Real NdPum(min=100*Modelica.Constants.eps) = 10
-    "The higher Nd, the more ideal the derivative block"
-    annotation(Dialog(enable=
-      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PD or
-      controllerTypePum==.Modelica.Blocks.Types.SimpleController.PID,
-      tab="Control", group="Pump"));
-
-  // Pump can have reverse flow at start up
-  Buildings.Fluid.Movers.SpeedControlled_y pumFW(
-    redeclare final package Medium = Medium,
-    final energyDynamics=energyDynamics,
-    p_start=pTanFW,
-    final allowFlowReversal=allowFlowReversal,
-    final per=per,
-    final y_start=yPum_start)
-    "Feedwater pump"
-    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
-
-  // At start up, water leaves port_a, see Buildings.Experimental.DHC.Examples.Steam.SingleBoiler
-  Buildings.Experimental.DHC.Plants.Steam.BaseClasses.BoilerPolynomial boi(
-    redeclare final package MediumSte = MediumHea_b,
-    redeclare final package MediumWat = Medium,
-    final energyDynamics=energyDynamics,
-    final massDynamics=massDynamics,
-    final allowFlowReversal=allowFlowReversal,
-    final p_start=pTanFW,
-    fixed_p_start=true,
-    final fue=fueBoi,
-    final m_flow_nominal=m_flow_nominal,
-    final dp_nominal=3000,
-    final Q_flow_nominal=Q_flow_nominal*boiSca,
-    final V=VBoi,
-    final mDry=mDry)
-    "Steam boiler"
-    annotation (Placement(transformation(extent={{140,-10},{160,10}})));
-  Buildings.Controls.Continuous.LimPID conPum(
-    final controllerType=controllerTypePum,
-    final k=kPum,
-    final Ti=TiPum,
-    final Td=TdPum,
-    final wp=wpPum,
-    final wd=wdPum,
-    final Ni=NiPum,
-    final Nd=NdPum,
-    initType=Modelica.Blocks.Types.Init.InitialOutput,
-    y_start=yPum_start)
-    "Pump control"
-    annotation (Placement(transformation(extent={{-80,100},{-60,120}})));
-  Modelica.Blocks.Math.Gain VNor(final k=1/VBoiWatSet)
-    "Normalized volume setpoint"
-    annotation (Placement(transformation(extent={{160,60},{140,80}})));
-  Buildings.Controls.Continuous.LimPID conBoi(
-    final controllerType=controllerTypeBoi,
-    final k=kBoi,
-    final Ti=TiBoi,
-    final Td=TdBoi,
-    final wp=wpBoi,
-    final wd=wdBoi,
-    final Ni=NiBoi,
-    final Nd=NdBoi)
-    "Boiler control"
-    annotation (Placement(transformation(extent={{80,-82},{100,-62}})));
-  Modelica.Blocks.Math.Gain PNor(final k=1/pSteSet)
-    "Normalized pressure setpoint"
-    annotation (Placement(transformation(extent={{160,-100},{140,-80}})));
-  Buildings.Fluid.Sensors.Pressure senPreSte(
-    redeclare final package Medium = MediumHea_b)
-    "Steam pressure sensor"
-    annotation (Placement(transformation(extent={{220,-80},{200,-100}})));
-  Modelica.Blocks.Sources.Constant uni(final k=1) "Unitary"
-    annotation (Placement(transformation(extent={{-180,100},{-160,120}})));
-  Buildings.Fluid.Storage.ExpansionVessel tanFW(
-    redeclare final package Medium = Medium,
-    final V_start=VTanFW_start,
-    final p_start=pTanFW)
-    "Feedwater tank"
-    annotation (Placement(transformation(extent={{-80,20},{-60,40}})));
-  Buildings.Fluid.FixedResistances.CheckValve cheVal(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal,
-    final m_flow_nominal=m_flow_nominal,
-    dpValve_nominal=6000,
-    rhoStd=Medium.density_pTX(
-        pSteSet,
-        MediumHea_b.saturationTemperature(pSteSet),
-        Medium.X_default))
-    "Check valve"
-    annotation (Placement(transformation(extent={{38,-10},{58,10}})));
-equation
-  connect(port_aSerHea, pumFW.port_a)
-    annotation (Line(points={{-300,0},{-40,0}}, color={0,127,255}));
-  connect(boi.port_b, port_bSerHea)
-    annotation (Line(points={{160,0},{300,0}}, color={0,127,255}));
-  connect(conPum.y, pumFW.y)
-    annotation (Line(points={{-59,110},{-30,110},{-30,12}},
-                                                          color={0,0,127}));
-  connect(uni.y, conPum.u_s)
-    annotation (Line(points={{-159,110},{-82,110}},
-                                                  color={0,0,127}));
-  connect(VNor.y, conPum.u_m)
-    annotation (Line(points={{139,70},{-70,70},{-70,98}}, color={0,0,127}));
-  connect(boi.VLiq, VNor.u)
-    annotation (Line(points={{161,6},{180,6},{180,70},{162,70}},
-      color={0,0,127}));
-  connect(senPreSte.port, boi.port_b)
-    annotation (Line(points={{210,-80},{210,0},{160,0}}, color={0,127,255}));
-  connect(senPreSte.p, PNor.u)
-    annotation (Line(points={{199,-90},{162,-90}}, color={0,0,127}));
-  connect(PNor.y, conBoi.u_m)
-    annotation (Line(points={{139,-90},{90,-90},{90,-84}}, color={0,0,127}));
-  connect(conBoi.y, boi.y)
-    annotation (Line(points={{101,-72},{120,-72},{120,8},{138,8}},
-      color={0,0,127}));
-  connect(uni.y, conBoi.u_s)
-    annotation (Line(points={{-159,110},{-150,110},{-150,-72},{78,-72}},
-      color={0,0,127}));
-  connect(QFue_flow, boi.QFueFlo)
-    annotation (Line(points={{320,120},{200,120},{200,9},{161,9}},
-      color={0,0,127}));
-  connect(PPum, pumFW.P)
-    annotation (Line(points={{320,160},{0,160},{0,9},{-19,9}},
-      color={0,0,127}));
-  connect(tanFW.port_a, pumFW.port_a)
-    annotation (Line(points={{-70,20},{-70,0},{-40,0}}, color={0,127,255}));
-  connect(pumFW.port_b, cheVal.port_a)
-    annotation (Line(points={{-20,0},{38,0}}, color={0,127,255}));
-  connect(cheVal.port_b, boi.port_a)
-    annotation (Line(points={{58,0},{140,0},{140,0}}, color={0,127,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false)),
-    defaultComponentName="pla",
-    Diagram(coordinateSystem(preserveAspectRatio=false)),
-    Documentation(info="<html>
-<p>
-This is a generic steam plant model that can be used in
-district heating system simulations. The model contains a
-feedwater tank, feedwater pump, check valve, and a boiler.
-The boiler is designed to discharge saturated steam vapor.
-For controls, the feedwater pump maintains the water volume
-setpoint in the drum boiler, while the boiler control
-maintains the discharge pressure setpoint.
-</p>
-<h4>References </h4>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Wangda Zuo. 2022.
-&ldquo;A Fast and Accurate Modeling Approach for Water and Steam
-Thermodynamics with Practical Applications in District Heating System Simulation,&rdquo;
-<i>Energy</i>, 254(A), pp. 124227.
-<a href=\"https://doi.org/10.1016/j.energy.2022.124227\">10.1016/j.energy.2022.124227</a>
-</p>
-<p>
-Kathryn Hinkelman, Saranya Anbarasu, Michael Wetter, Antoine Gautier, Baptiste Ravache, Wangda Zuo 2022.
-&ldquo;Towards Open-Source Modelica Models For Steam-Based District Heating Systems.&rdquo;
-<i>Proc. of the 1st International Workshop On Open Source Modelling And Simulation Of
-Energy Systems (OSMSES 2022)</i>, Aachen, German, April 4-5, 2022.
-<a href=\"https://doi.org/10.1109/OSMSES54027.2022.9769121\">10.1109/OSMSES54027.2022.9769121</a>
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-September 15, 2023, by Kathryn Hinkelman:<br/>
-Added publication references.
-</li>
-<li>
-July 18, 2023, by Michael Wetter:<br/>
-Corrected assignment of <code>allowFlowReversal</code>, and set start pressure
-of boiler to be equal to start pressure of feed water tank. Otherwise, backflow
-occurs at the start of the simulation.
-</li>
-<li>
-March 3, 2022 by Kathryn Hinkelman:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end SingleBoiler;
diff --git a/Buildings/Experimental/DHC/Plants/Steam/package.mo b/Buildings/Experimental/DHC/Plants/Steam/package.mo
deleted file mode 100644
index 31bcb2b0b5f..00000000000
--- a/Buildings/Experimental/DHC/Plants/Steam/package.mo
+++ /dev/null
@@ -1,10 +0,0 @@
-within Buildings.Experimental.DHC.Plants;
-package Steam "Package with models for steam plants"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains models for plants producing steam.
-</p>
-</html>"));
-end Steam;
diff --git a/Buildings/Experimental/DHC/Plants/package.mo b/Buildings/Experimental/DHC/Plants/package.mo
deleted file mode 100644
index b50f3b4c812..00000000000
--- a/Buildings/Experimental/DHC/Plants/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental.DHC;
-package Plants "Package of models for central plants"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for central plants.
-</p>
-</html>"));
-end Plants;
diff --git a/Buildings/Experimental/DHC/Types.mo b/Buildings/Experimental/DHC/Types.mo
deleted file mode 100644
index 98ba25f0704..00000000000
--- a/Buildings/Experimental/DHC/Types.mo
+++ /dev/null
@@ -1,71 +0,0 @@
-within Buildings.Experimental.DHC;
-package Types  "Package with type definitions"
-  extends Modelica.Icons.TypesPackage;
-
-  type DistrictSystemType = enumeration(
-      CombinedGeneration1
-    "First generation district heating and cooling system",
-      CombinedGeneration2to4
-    "Second to fourth generation district heating and cooling system",
-      CombinedGeneration5
-    "Fifth generation district heating and cooling system",
-      Cooling
-    "District cooling system",
-      HeatingGeneration1
-    "First generation district heating system",
-      HeatingGeneration2to4
-    "Second to fourth generation district heating system")
-    "Enumeration to define the type of district system"
-    annotation (Documentation(info="<html>
-  <p>
-  Enumeration to define the type of district system:<br/>
-  </p>
-  <table border=\"1\" summary=\"Explanation of the enumeration\">
-  <tr>
-  <th>Enumeration</th>
-  <th>Description</th>
-  </tr>
-  <tr>
-  <td>CombinedGeneration1</td>
-  <td>First generation district heating and cooling system (using steam and chilled
-  water)</td>
-  </tr>
-  <tr>
-  <td>CombinedGeneration2to4</td>
-  <td>Second to fourth generation district heating and cooling system (using heating
-  water and chilled water)</td>
-  </tr>
-  <tr>
-  <td>CombinedGeneration5</td>
-  <td>Fifth generation district heating and cooling system (using water near
-  ambient temperature)</td>
-  </tr>
-  <tr>
-  <td>Cooling</td>
-  <td>District cooling system</td>
-  </tr>
-  <tr>
-  <td>HeatingGeneration1</td>
-  <td>First generation district heating system (using steam)</td>
-  </tr>
-  <tr>
-  <td>HeatingGeneration2to4</td>
-  <td>Second to fourth generation district heating system (using heating
-  water)</td>
-  </tr>
-  </table>
-  </html>",revisions="<html>
-<ul>
-<li>
-December 10, 2020, by Antoine Gautier:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-
-annotation (Documentation(info="<html>
-<p>
-This package contains type definitions.
-</p>
-</html>"));
-end Types;
diff --git a/Buildings/Experimental/DHC/UsersGuide.mo b/Buildings/Experimental/DHC/UsersGuide.mo
deleted file mode 100644
index 4b0b252940f..00000000000
--- a/Buildings/Experimental/DHC/UsersGuide.mo
+++ /dev/null
@@ -1,389 +0,0 @@
-within Buildings.Experimental.DHC;
-package UsersGuide
-  extends Modelica.Icons.Information;
-  annotation (preferredView="info",
-  Documentation(info="<html>
-<h4>Overview</h4>
-<p>
-The package <code>Buildings.Experimental.DHC</code> consists of models
-for district heating and cooling (DHC) systems. The package contains models
-at the component, sub-system, and system level, which can be used as
-templates or for generating custom system models. Generally, the
-model structures are capable of representing any generation of DHC (1st-5th),
-though template models are not specifically available for all system types
-and combinations of technology. Note also that some components typically
-seen in district networks have been implemented elsewhere in the
-library (e.g. <a href=\"modelica://Buildings.Fluid.Geothermal\">geothermal storage</a>).
-</p>
-<p>
-The structure of the package is such that it decomposes a DHC into four
-primary sub-systems each with their own sub-packages
-as described in the table below:
-Energy Transfer Stations (ETS), Loads, Networks, and Plants.
-In addition to these sub-packages, the sub-package
-<a href=\"modelica://Buildings.Experimental.DHC.Examples\">
-Buildings.Experimental.DHC.Examples</a>
-contains system models which may be used as examples or templates.
-</p>
-
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr>
-<th>Sub-Package</th>
-<th>Description</th>
-</tr>
-<tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations\">
-      Buildings.Experimental.DHC.EnergyTransferStations</a></td>
-  <td>Connection point between a building and district network which contains
-      physical components such as heat exchangers, heat pumps, pipes, valves,
-      sensors, and pumps, as well as control logic based on flow rate,
-      temperature, and/or pressure measurements.</td>
-</tr>
-<tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-      Buildings.Experimental.DHC.Loads</a></td>
-  <td>Timeseries or physics-based representation of space heating and cooling
-      and domestic hot water loads in buildings, and connected to an ETS.</td>
-</tr>
-<tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-      Buildings.Experimental.DHC.Networks</a></td>
-  <td>Distribution system between buildings and plants which contains
-      distribution pipes and service lines to the
-      energy transfer stations.</td>
-</tr>
-<tr>
-  <td><a href=\"modelica://Buildings.Experimental.DHC.Plants\">
-      Buildings.Experimental.DHC.Plants</a>
-  </td>
-  <td>Sources of cooling or heating for the DHC such as boilers, chillers,
-      heat pumps, waste heat, tank storage, and geothermal storage.
-  </td>
-</tr>
-</table>
-<p>
-The figure below further illustrates the abstract relationship between the
-sub-systems and offers concrete example systems which can be modeled
-with concrete implementation of the abstractions.
-</p>
-<p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.png\"/>
-</p>
-
-<p>
-Further sub-packages divide the application of each model based on the
-terms in the table below:
-</p>
-
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr>
-<th>Further Sub-Package</th>
-<th>Description</th>
-</tr>
-<tr>
-  <td>Combined</td>
-  <td>Water-based heating and cooling</td>
-</tr>
-<tr>
-  <td>Cooling</td>
-  <td>Water-based cooling only</td>
-</tr>
-<tr>
-  <td>Heating</td>
-  <td>Water-based heating only</td>
-</tr>
-<tr>
-  <td>HotWater</td>
-  <td>Domestic hot water</td>
-</tr>
-<tr>
-  <td>Steam</td>
-  <td>Steam-based heating only</td>
-</tr>
-</table>
-
-<h4>Content Summary</h4>
-
-<p>
-This section provides a summary of the models available in the package to
-help a user navigate. However, refer to the specific
-documentation of the model and subpackages for further modeling and implementation details.
-</p>
-
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td valign=\"top\"><b>Sub-Package Name</b>
-    </td>
-    <td valign=\"top\"><b>Model Name</b>
-    </td>
-    <td valign=\"top\"><b>Model Description</b>
-    </td>
-</tr>
-<tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations\">
-    Buildings.Experimental.DHC.EnergyTransferStations</a>
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"3\">Combined
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.ChillerBorefield\">ChillerBorefield</a>
-    </td>
-    <td valign=\"top\">ETS with heat recovery chiller and optional borefield.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">HeatPumpHeatExchanger</a>
-    </td>
-    <td valign=\"top\">ETS with heat pump for heating, heat pump for domestic hot water, and compressor-less cooling by heat exchanger.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank\">
-    HeatPumpHeatExchangerDHWTank</a>
-    </td>
-    <td valign=\"top\">
-    ETS with heat pump for heating, heat pump with storage tank and heat exchanger for domestic hot water, and
-    compressor-less cooling by heat exchanger.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"2\">Cooling
-    </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct\">Direct</a>
-    </td>
-    <td valign=\"top\">ETS with direct connection and district return water temperature control. In-building pumping not modeled.
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Indirect\">Indirect</a>
-    </td>
-    <td valign=\"top\">ETS with indirect connection with heat exchanger and building supply water temperature control.
-    In-building pumping not modeled.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"2\">Heating
-    </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct\">Direct</a>
-    </td>
-    <td valign=\"top\">ETS with direct connection and district return water temperature control. In-building pumping not modeled.
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.EnergyTransferStations.Heating.Indirect\">Indirect</a>
-    </td>
-    <td valign=\"top\">ETS with indirect connection with heat exchanger and building supply water temperature control.
-    In-building pumping not modeled.
-    </td>
-</tr>
-
-<tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads\">
-    Buildings.Experimental.DHC.Loads</a>
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"2\">Combined
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
-    </td>
-    <td valign=\"top\">
-    Building with loads provided as time series, connected to an ETS with heat pump for space heating, heat pump for domestic hot water,
-    and a heat exchanger for cooling water.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
-    BuildingTimeSeriesWithETSWithDHWTank</a>
-    </td>
-    <td valign=\"top\">
-    Building with loads provided as time series, connected to an ETS with heat pump for space heating,
-    heat pump with storage tank and heat exchanger for domestic hot water, and a heat exchanger for cooling water.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Cooling
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Cooling.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
-    </td>
-    <td valign=\"top\">
-    Building with loads provided as time series, connected to an ETS with direct connection for chilled water supply to the building.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Heating
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Heating.BuildingTimeSeriesWithETS\">BuildingTimeSeriesWithETS</a>
-    </td>
-    <td valign=\"top\">
-    Building with loads provided as time series, connected to an ETS with direct connection for heating water supply to the building.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"3\">HotWater
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.DirectHeatExchangerWithElectricHeat\">
-    DirectHeatExchangerWithElectricHeat</a>
-    </td>
-    <td valign=\"top\">
-    A model for generating hot water using a district heat exchanger and supplemental electric resistance.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
-    StorageTankWithExternalHeatExchanger</a>
-    </td>
-    <td valign=\"top\">
-    A model of a storage tank with external heat exchanger to produce hot water.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.ThermostaticMixingValve\">ThermostaticMixingValve</a>
-    </td>
-    <td valign=\"top\">A model for a thermostatic mixing valve.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Steam
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS\">BuildingTimeSeriesAtETS</a>
-    </td>
-    <td valign=\"top\">
-    Steam heating building interconnection with the district piping only and the load at the ETS provided as a time series.
-    </td>
-</tr>
-
-<tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks\">
-    Buildings.Experimental.DHC.Networks</a>
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"4\">
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v\">Distribution1PipePlugFlow_v</a>
-    </td>
-    <td valign=\"top\">
-    1-Pipe distribution network with fluid heat transfer modeled in the main lines between ETS determined by external model (e.g. ground) and flow friction by nominal velocity.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution1Pipe_R\">Distribution1Pipe_R</a>
-    </td>
-    <td valign=\"top\">
-    1-Pipe distribution network with flow friction modeled in the main lines between ETS determined by pressure drop per length.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\">Distribution2PipePlugFlow_v</a>
-    </td>
-    <td valign=\"top\">
-    2-Pipe distribution network with fluid heat transfer modeled in the main lines between ETS determined by external model (e.g. ground) and flow friction by nominal velocity.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Distribution2Pipe_R\">Distribution2Pipe_R</a>
-    </td>
-    <td valign=\"top\">
-    2-Pipe distribution network with flow friction modeled in the main lines between ETS determined by pressure drop per length.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Steam
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Networks.Steam.DistributionCondensatePipe\">DistributionCondensatePipe</a>
-    </td>
-    <td valign=\"top\">
-    2-Pipe distribution network with steam supply and condensate return using a fixed resistance pipe model for condensate returns.
-    </td>
-</tr>
-
-<tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants\">
-    Buildings.Experimental.DHC.Plants</a>
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Combined
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage\">AllElectricCWStorage</a>
-    </td>
-    <td valign=\"top\">
-    All-electric chilled water and heating water production plant with heat recovery chillers and condenser water storage.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"2\">Cooling
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel\">ElectricChillerParallel</a>
-    </td>
-    <td valign=\"top\">Chilled water production plant with parallel chillers and parallel cooling towers.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Cooling.StoragePlant\">StoragePlant</a>
-    </td>
-    <td valign=\"top\">
-    Chilled water storage tank system which can be charged by local chiller or remotely from district.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Heating
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Plants.Heating.SewageHeatRecovery\">SewageHeatRecovery</a>
-    </td>
-    <td valign=\"top\">Heating water production plant using sewage heat recovery.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Steam
-    </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.Plants.Steam.SingleBoiler\">SingleBoiler</a>
-    </td>
-    <td valign=\"top\">Steam plant with a single boiler that discharges saturated steam.
-    </td>
-</tr>
-
-<tr><td colspan=\"3\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples\">
-    Buildings.Experimental.DHC.Examples</a>
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"3\">Combined
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow\">SeriesConstantFlow</a>
-    </td>
-    <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>, with constant district water mass flow rate.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow\">SeriesVariableFlow</a>
-    </td>
-    <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>, with variable district water mass flow rate.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">SeriesVariableFlowAgentControl</a>
-    </td>
-    <td valign=\"top\">Example of ambient network, so-called <i>Reservoir Network</i>,
-    with variable district water mass flow rate with updated agent controller.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Cooling
-    </td>
-    <td valign=\"top\">
-    <a href=\"modelica://Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS\">ElectricChillersDirectETS</a>
-    </td>
-    <td valign=\"top\">
-    Example model for district cooling system with an electric chiller plant and a direct controlled ETS at each building.
-    </td>
-</tr>
-<tr><td valign=\"top\" rowspan=\"1\">Steam
-    </td>
-    <td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC.Examples.Steam.SingleBoiler\">SingleBoiler</a>
-    </td>
-    <td valign=\"top\">
-    Example model for a steam district heating system with a central plant boiler producing steam that is distributed to each building.
-    </td>
-</tr>
-
-</table>
-
-</html>"));
-end UsersGuide;
diff --git a/Buildings/Experimental/DHC/package.mo b/Buildings/Experimental/DHC/package.mo
deleted file mode 100644
index 63d724aaeca..00000000000
--- a/Buildings/Experimental/DHC/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Experimental;
-package DHC "Models for district heating and cooling systems"
-  extends Modelica.Icons.VariantsPackage;
-
-  annotation (
-    preferredView="info",
-    Documentation(
-      info="<html>
-<p>
-This package contains models for district heating and cooling (DHC) systems.
-</p>
-</html>"));
-end DHC;
diff --git a/Buildings/Experimental/DHC/package.order b/Buildings/Experimental/DHC/package.order
deleted file mode 100644
index 9a56ac67235..00000000000
--- a/Buildings/Experimental/DHC/package.order
+++ /dev/null
@@ -1,8 +0,0 @@
-UsersGuide
-EnergyTransferStations
-Loads
-Networks
-Plants
-Types
-Examples
-BaseClasses
diff --git a/Buildings/Experimental/package.mo b/Buildings/Experimental/package.mo
deleted file mode 100644
index 550d706a85b..00000000000
--- a/Buildings/Experimental/package.mo
+++ /dev/null
@@ -1,14 +0,0 @@
-within Buildings;
-package Experimental "Package with experimental models"
-  extends Modelica.Icons.Package;
-
-  annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains models that are experimental.
-The models may change in non-backward compatible ways even
-between minor releases of the <code>Buildings</code> library.
-The models may be moved to other packages of the <code>Buildings</code> library
-if they have been shown to be useful and their development is stable.
-</p>
-</html>"));
-end Experimental;
diff --git a/Buildings/Experimental/package.order b/Buildings/Experimental/package.order
deleted file mode 100644
index f577981fbd0..00000000000
--- a/Buildings/Experimental/package.order
+++ /dev/null
@@ -1 +0,0 @@
-DHC
diff --git a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo
index ebd928c6542..222089c5e59 100644
--- a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/BaseClasses/PerformanceCurve.mo
@@ -6,7 +6,7 @@ record PerformanceCurve "Data record for a performance curve"
     "Biquadratic coefficients for cooling capacity function of temperature"
     annotation (Dialog(group="Performance curves"));
   parameter Real  capFunFF[:]
-    "Polynomial coefficients for cooling capacity function of flow fration"
+    "Polynomial coefficients for cooling capacity function of flow fraction"
     annotation (Dialog(group="Performance curves"));
   parameter Real  EIRFunT[6]
     "Biquadratic coefficients for EIR function of temperature"
diff --git a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo
index 7185cef5c38..94c366d1bf5 100644
--- a/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/AirSource/Data/Generic/DXCoil.mo
@@ -113,13 +113,13 @@ Each element of the array <code>per</code> has the following data.
      EIRFunT  - Coefficients of biquadratic polynomial for EIR as a function of temperature.
      EIRFunFF - Polynomial coefficients for EIR
                 as a function of the mass flow fraction.
-     TConInRan - Minimum and maximum condenser air inlet temperatures
+     [TConInMin, TConInMax] - Minimum and maximum condenser air inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     TEvaInRan - Minimum and maximum evaporator air inlet temperatures
+     [TEvaInMin, TEvaInMax] - Minimum and maximum evaporator air inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     ffRan     - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
+     [ffMin, ffMax] - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
 </pre>
@@ -157,6 +157,11 @@ a quadratic function.
 revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Karthik Devaprasad:<br/>
+Replaced unused parameter names with correct parameter pairs for curve limit
+definitions in the documentation.
+</li>
+<li>
 April 4, 2023, by Xing Lu and Karthik Devaprasad:<br/>
 Updated record class name from <code>DXCoil</code> to <code>CoolingCoil</code>.
 </li>
diff --git a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo
index 22c4596d55d..0e8bad136bb 100644
--- a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/BaseClasses/PerformanceCurve.mo
@@ -9,7 +9,7 @@ record PerformanceCurve "Data record for a performance curve"
     annotation (Dialog(group="Performance curves"));
 
   parameter Real EIRFunFFCon[:]
-    "Polynomial coefficients for EIR function of water flow fration at condensers"
+    "Polynomial coefficients for EIR function of water flow fraction at condensers"
     annotation (Dialog(group="Performance curves"));
 //------------------------Range for performance curves------------------------//
 
diff --git a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo
index 4f434c4be14..6f7280db19b 100644
--- a/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo
+++ b/Buildings/Fluid/DXSystems/Cooling/WaterSource/Data/Generic/DXCoil.mo
@@ -59,16 +59,17 @@ Each element of the array <code>per</code> has the following data.
                 as a function of the air mass flow fraction at evaporators.
      EIRFunFFCon - Polynomial coefficients for EIR
                 as a function of the water mass flow fraction at condensers.
-     TConInRan - Minimum and maximum condenser water inlet temperatures
+     [TConInMin, TConInMax] - Minimum and maximum condenser water inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     TEvaInRan - Minimum and maximum evaporator air inlet temperatures
+     [TEvaInMin, TEvaInMax] - Minimum and maximum evaporator air inlet temperatures
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     ffRan     - Minimum and maximum air mass flow fraction at evaporators (relative to m_flow_nominal)
+     [ffMin, ffMax] - Minimum and maximum air mass flow fraction at evaporators (relative to m_flow_nominal)
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
-     ffConRan     - Minimum and maximum water mass flow fraction at condensers (relative to m_flow_nominal)
+     [ffConMin, ffConMax] - Minimum and maximum water mass flow fraction at
+                 condensers (relative to m_flow_nominal)
                  for which the performance curves are valid.
                  Outside this range, they will be linearly extrapolated.
 
@@ -107,6 +108,11 @@ a quadratic function.
 revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Karthik Devaprasad:<br/>
+Replaced unused parameter names with correct parameter pairs for curve limit
+definitions in the documentation.
+</li>
+<li>
 April 5, 2023, by Xing Lu:<br/>
 Updated class being extended from <code>DXCoil</code> to
 <a href=\"modelica://Buildings.Fluid.DXSystems.Cooling.AirSource.Data.Generic.DXCoil\">
diff --git a/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo b/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo
index 75855e59a05..8f2c33723ce 100644
--- a/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo
+++ b/Buildings/Fluid/DXSystems/Heating/AirSource/Data/Generic/DXCoil.mo
@@ -51,7 +51,7 @@ record DXCoil
     "Crankcase heater capacity";
 //-----------------------------Performance curves-----------------------------//
   parameter Real defEIRFunT[6] = fill(0,6)
-    "Biquadratic coefficients for defrost capacity function of temperature"
+    "Biquadratic coefficients for defrost capacity as a function of temperature"
     annotation (Dialog(enable = defOpe==Buildings.Fluid.DXSystems.Heating.BaseClasses.Types.DefrostOperation.reverseCycle));
 
   parameter Real PLFraFunPLR[:] = {1}
@@ -80,7 +80,7 @@ Each element of the array <code>per</code> has the following data.
 </p>
 <pre>
   spe    - Rotational speed for the respective stage.
-           (This is only used for variable speed coils to interpolate for 
+           (This is only used for variable speed coils to interpolate for
            intermediate speeds).
   nomVal - Nominal performance values for the respective stage. Data of the
            nomVal record are:<br/>
@@ -96,22 +96,22 @@ Each element of the array <code>per</code> has the following data.
     per            - Array of records with one performance curve for the respective
                      stage of the coil. That is, the performance curves will be used
                      in conjunction with the nominal values defined in the record <code>spe</code>:<br/>
-                     
+
       capFunT   - Coefficients of biquadratic polynomial for heating capacity
                   as a function of temperature.
-      capFunFF  - Polynomial coefficients for heating capacity as a function of 
+      capFunFF  - Polynomial coefficients for heating capacity as a function of
                   the mass flow fraction.
-      EIRFunT   - Coefficients of biquadratic polynomial for EIR as a function 
+      EIRFunT   - Coefficients of biquadratic polynomial for EIR as a function
                   of temperature.
       EIRFunFF  - Polynomial coefficients for EIR as a function of the mass flow
                   fraction.
-      TConInRan - Minimum and maximum condenser air inlet temperatures for which 
-                  the performance curves are valid.
+      [TConInMin, TConInMax] - Minimum and maximum condenser air inlet temperatures
+                  for which the performance curves are valid.
                   Outside this range, they will be linearly extrapolated.
-      TEvaInRan - Minimum and maximum evaporator air inlet temperatures for which 
-                  the performance curves are valid.
+      [TEvaInMin, TEvaInMax] - Minimum and maximum evaporator air inlet temperatures
+                  for which the performance curves are valid.
                   Outside this range, they will be linearly extrapolated.
-      ffRan     - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
+      [ffMin, ffMax] - Minimum and maximum air mass flow fraction (relative to m_flow_nominal)
                   for which the performance curves are valid.
                   Outside this range, they will be linearly extrapolated.
                   </pre>
@@ -124,16 +124,16 @@ quadratic function is used for stage one, then stage two must also use
 a quadratic function.
 </p>
 <p>
-It also contains settings and performance curves for defrost operation and overall 
+It also contains settings and performance curves for defrost operation and overall
 performance modifiers:
 </p>
 <pre>
-  defEIRFunT  - Coefficients of biquadratic polynomial for EIR for defrost as a 
+  defEIRFunT  - Coefficients of biquadratic polynomial for EIR for defrost as a
                 function of temperature.
   PLFraFunPLR - Coefficients of polynomial for part-load fraction as a function
                 of part-load ratio.
   defOpe      - Defrost operation type.
-  QDefResCap  - Capacity of heating element on outdoor coil (used for resistive defrost).  
+  QDefResCap  - Capacity of heating element on outdoor coil (used for resistive defrost).
   QCraCap     - Capacity of crankcase heater.
   defTri      - Defrost time fraction calculation method.
   tDefRun     - Fraction of time for which defrost is run if timed fraction calculation is used.
@@ -143,6 +143,11 @@ performance modifiers:
 revisions="<html>
 <ul>
 <li>
+April 6, 2024, by Karthik Devaprasad:<br/>
+Replaced unused parameter names with correct parameter pairs for curve limit
+definitions in the documentation.
+</li>
+<li>
 March 31, 2023 by Karthik Devaprasad and Xing Lu:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo b/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo
index 1e7661380fa..4ee42ccda2e 100644
--- a/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo
+++ b/Buildings/Fluid/FixedResistances/BuriedPipes/PipeGroundCoupling.mo
@@ -13,7 +13,7 @@ model PipeGroundCoupling
   parameter Boolean steadyStateInitial = false
     "true initializes dT(0)/dt=0, false initializes T(0) at fixed temperature using TpipSta and TGrouBouSta" annotation (Dialog(group="Initialization", enable=not steadyStateInitial));
   parameter Modelica.Units.SI.Length dep = 10 "Depth of buried pipe to calculate ground temperature";
-  replaceable parameter Buildings.Experimental.DHC.Examples.Combined.BaseClasses.Zurich cliCon
+  replaceable parameter Buildings.DHC.Examples.Combined.BaseClasses.Zurich cliCon
     "Surface temperature climatic conditions";
   replaceable parameter Buildings.HeatTransfer.Data.Soil.Generic soiDat(
     k=1.58,c=1150,d=1600) "Soil thermal properties" annotation (Placement(transformation(extent={{-90,72},{-70,92}})));
diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo
index 84a5bd11137..d8b1779e517 100644
--- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo
+++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo
@@ -375,7 +375,7 @@ equation
   annotation (
     experiment(
       StopTime=603900,
-      Interval=900,
+      Interval=120,
       Tolerance=1e-006),
     __Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mos"
         "Simulate and plot"),
diff --git a/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo b/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo
index 34fc082884a..d2cd387fbab 100644
--- a/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo
+++ b/Buildings/Fluid/HeatExchangers/BaseClasses/MassExchange.mo
@@ -44,7 +44,7 @@ protected
        p=Medium.p_default, X=Medium.X_default);
   parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(sta_default)
-    "Density, used to compute fluid volume";
+    "Specific heat capacity";
  parameter Real cpLe_default(unit="J/(kg.K)") = cp_default * Le^(1-n);
 equation
   connect(TSur, TDewPoi.T) annotation (Line(points={{-120,80},{-80,80},{-80,50},
diff --git a/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo b/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo
index feeae432bfd..40f15964b38 100644
--- a/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo
+++ b/Buildings/Fluid/HeatExchangers/EvaporatorCondenser.mo
@@ -46,7 +46,7 @@ model EvaporatorCondenser
 protected
   parameter Modelica.Units.SI.SpecificHeatCapacity cp_default=
       Medium.specificHeatCapacityCp(sta_default)
-    "Density, used to compute fluid volume";
+    "Specific heat capacity";
 
   Modelica.Thermal.HeatTransfer.Sensors.HeatFlowSensor heaFlo
     "Heat flow sensor"
diff --git a/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo b/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo
index 8fd02bad276..5f5fb7173db 100644
--- a/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo
+++ b/Buildings/Fluid/HeatPumps/Data/EquationFitReversible/Generic.mo
@@ -8,9 +8,13 @@ record Generic
      mLoa_flow = hea.mLoa_flow,
      mSou_flow = hea.mSou_flow)
    "Performance data for cooling mode (set coo.P = 0 to disable operation in cooling mode)";
-  parameter Modelica.Units.SI.PressureDifference dpHeaLoa_nominal(min=0) =
+  parameter Modelica.Units.SI.PressureDifference dpHeaLoa_nominal(
+    min=0,
+    displayUnit="Pa") =
     30000 "Nominal pressure drop at load heat exchanger side at hea.mLoa_flow";
-  parameter Modelica.Units.SI.PressureDifference dpHeaSou_nominal(min=0) =
+  parameter Modelica.Units.SI.PressureDifference dpHeaSou_nominal(
+    min=0,
+    displayUnit="Pa") =
     30000 "Nominal pressure drop at load heat exchanger side at hea.mSou_flow";
 
   final parameter Boolean reverseCycle=coo.P > Modelica.Constants.eps
@@ -30,6 +34,10 @@ Buildings.Fluid.HeatPumps.EquationFitReversible</a>.
 </html>",  revisions="<html>
 <ul>
 <li>
+April 1, 2024, by Michael Wetter:<br/>
+Added <code>displayUnit</code> for pressure drop.
+</li>
+<li>
 May 16, 2022, by Michael Wetter:<br/>
 Removed <code>protected</code> keyword as the Modelica Language Specification only
 allows public sections in a record.<br/>
diff --git a/Buildings/Fluid/HeatPumps/EquationFitReversible.mo b/Buildings/Fluid/HeatPumps/EquationFitReversible.mo
index d12aec66415..110fced63d1 100644
--- a/Buildings/Fluid/HeatPumps/EquationFitReversible.mo
+++ b/Buildings/Fluid/HeatPumps/EquationFitReversible.mo
@@ -56,6 +56,13 @@ model EquationFitReversible
 
   output Real PLR(min=0, nominal=1, unit="1") = equFit.PLR
    "Part load ratio";
+
+  Buildings.Controls.OBC.CDL.Utilities.Assert aleMes(
+    message="uMod cannot be -1 if reverseCycle is false.")
+      if not per.reverseCycle
+    "Generate alert message if control input is not valid"
+    annotation (Placement(transformation(extent={{-52,-90},{-32,-70}})));
+
 protected
   constant Modelica.Units.SI.SpecificEnergy h1_default=
       Medium1.specificEnthalpy_pTX(
@@ -112,16 +119,11 @@ protected
    "Prescribed source side heat flow rate"
     annotation (Placement(transformation(extent={{59,-70},{39,-50}})));
 
-  Buildings.Controls.OBC.CDL.Integers.LessThreshold lesThr(final t=0) if not
-    per.reverseCycle "Indicator, outputs true if in cooling mode"
+  Controls.OBC.CDL.Integers.GreaterEqualThreshold greEqu(
+    final t=0) if not per.reverseCycle
+    "Indicator, outputs true if in cooling mode"
     annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
 
-  Buildings.Controls.OBC.CDL.Utilities.Assert aleMes(
-    message="uMod cannot be -1 if reverseCycle is false.")
-      if not per.reverseCycle
-    "Generate alert message if control input is not valid"
-    annotation (Placement(transformation(extent={{-52,-90},{-32,-70}})));
-
 equation
   connect(equFit.QSou_flow,QSou_flow)
     annotation (Line(points={{11,-2},{32,-2},{32,-88},{110,-88}}, color={0,0,127}));
@@ -148,9 +150,9 @@ equation
     annotation (Line(points={{-10,60},{-14,60},{-14,20},{39,20}}, color={191,0,0}));
   connect(vol2.heatPort, preHeaFloSou.port)
     annotation (Line(points={{12,-60},{39,-60}},color={191,0,0}));
-  connect(aleMes.u, lesThr.y)
+  connect(aleMes.u,greEqu.y)
     annotation (Line(points={{-54,-80},{-58,-80}}, color={255,0,255}));
-  connect(lesThr.u, uMod) annotation (Line(points={{-82,-80},{-88,-80},{-88,0},{
+  connect(greEqu.u, uMod) annotation (Line(points={{-82,-80},{-88,-80},{-88,0},{
           -112,0}}, color={255,127,0}));
   connect(equFit.Q_flow_set, Q_flow_set.y)
     annotation (Line(points={{-11,9},{-44,9},{-44,40},{-59,40}},color={0,0,127}));
@@ -365,6 +367,12 @@ Master Thesis. Oklahoma State University, Oklahoma, USA. 2005.
 </html>", revisions="<html>
 <ul>
 <li>
+April 1, 2024, by Michael Wetter:<br/>
+Corrected wrong assertion.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3664\">#3664</a>.
+</li>
+<li>
 September 16, 2019 by Michael Wetter:<br/>
 Refactored implementation.
 </li>
diff --git a/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo b/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
index 46a2f04e0a7..a9357403239 100644
--- a/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
+++ b/Buildings/Fluid/Movers/Validation/BaseClasses/ControlledFlowMachine.mo
@@ -166,7 +166,7 @@ equation
     Documentation(info="<html>
 This example demonstrates the use of the flow model with four different configuration.
 At steady-state, all flow models have the same mass flow rate and pressure difference.
-</html>"), revisions="<html>
+</html>", revisions="<html>
 <ul>
 <li>
 March 21, 2023, by Hongxiang Fu:<br/>
@@ -175,5 +175,5 @@ This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, #1704</a>.
 </li>
 </ul>
-</html>");
+</html>"));
 end ControlledFlowMachine;
diff --git a/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo b/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo
index 56595f38c93..4f27129b9e5 100644
--- a/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo
+++ b/Buildings/Fluid/Sensors/Conversions/Examples/To_VolumeFraction.mo
@@ -16,8 +16,10 @@ model To_VolumeFraction "Example problem for conversion model"
     k=2,
     Td=1)
     annotation (Placement(transformation(extent={{-100,-20},{-80,0}})));
-  Buildings.Fluid.Sensors.TraceSubstances senCO2(redeclare package Medium =
-        Medium, substanceName="CO2") "CO2 sensor"
+  Buildings.Fluid.Sensors.TraceSubstances senCO2(
+    redeclare package Medium = Medium,
+    substanceName="CO2",
+    warnAboutOnePortConnection = false) "CO2 sensor"
     annotation (Placement(transformation(extent={{120,0},{140,20}})));
   Buildings.Fluid.MixingVolumes.MixingVolume vol(
     nPorts=4,
@@ -153,6 +155,12 @@ the setpoint, which does not comply with ASHRAE regulations.
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1857\">IBPSA, #1857</a>.
+</li>
+<li>
 May 2, 2019, by Jianjun Hu:<br/>
 Replaced fluid source. This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1072\"> #1072</a>.
@@ -175,4 +183,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end To_VolumeFraction;
+end To_VolumeFraction;
\ No newline at end of file
diff --git a/Buildings/Fluid/Sources/Examples/TraceSubstancesFlowSource.mo b/Buildings/Fluid/Sources/Examples/TraceSubstancesFlowSource.mo
index dc6236a07ec..f7fb32a8917 100644
--- a/Buildings/Fluid/Sources/Examples/TraceSubstancesFlowSource.mo
+++ b/Buildings/Fluid/Sources/Examples/TraceSubstancesFlowSource.mo
@@ -11,11 +11,13 @@ model TraceSubstancesFlowSource
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial) "Mixing volume"
                           annotation (Placement(transformation(extent={{100,120},
             {120,140}})));
-  Sources.TraceSubstancesFlowSource sou(redeclare package Medium = Medium,
-      use_m_flow_in=true,
+  Sources.TraceSubstancesFlowSource sou(
+    redeclare package Medium = Medium,
+    use_m_flow_in=true,
     nPorts=1)
     annotation (Placement(transformation(extent={{-46,110},{-26,130}})));
-  Modelica.Blocks.Sources.Step step(          startTime=0.5,
+  Modelica.Blocks.Sources.Step step(
+    startTime=0.5,
     height=-2,
     offset=2)
     annotation (Placement(transformation(extent={{-92,30},{-72,50}})));
@@ -106,16 +108,24 @@ model TraceSubstancesFlowSource
     "Resistance, used to check if species are transported between ports"
     annotation (Placement(transformation(extent={{-28,-80},{-6,-60}})));
 
-  Sensors.TraceSubstances C(redeclare package Medium = Medium)
+  Sensors.TraceSubstances C(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Trace substance sensor"
     annotation (Placement(transformation(extent={{120,134},{140,154}})));
-  Sensors.TraceSubstances C1(redeclare package Medium = Medium)
+  Sensors.TraceSubstances C1(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Trace substance sensor"
     annotation (Placement(transformation(extent={{120,90},{140,110}})));
-  Sensors.TraceSubstances C2(redeclare package Medium = Medium)
+  Sensors.TraceSubstances C2(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Trace substance sensor"
     annotation (Placement(transformation(extent={{168,6},{188,26}})));
-  Sensors.TraceSubstances C3(redeclare package Medium = Medium)
+  Sensors.TraceSubstances C3(
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Trace substance sensor"
     annotation (Placement(transformation(extent={{188,-50},{208,-30}})));
   FixedResistances.PressureDrop res4(
@@ -255,6 +265,12 @@ as there is a mass flow rate with zero CO<sub>2</sub> from the source <code>bou<
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1857\">IBPSA, #1857</a>.
+</li>
+<li>
 November 27, 2013 by Michael Wetter:<br/>
 Added pressure boundary condition to model.
 This is required for the new air model,
@@ -278,4 +294,4 @@ First implementation.
 </li>
 </ul>
 </html>"));
-end TraceSubstancesFlowSource;
+end TraceSubstancesFlowSource;
\ No newline at end of file
diff --git a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
index 5ff4f7a68b7..396aa50646d 100644
--- a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
+++ b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/DamperValves.mo
@@ -310,7 +310,7 @@ protected
   Buildings.Controls.OBC.CDL.Reals.Subtract sub2
     "Calculate temperature difference between AHU supply air and room "
     annotation (Placement(transformation(extent={{-160,190},{-140,210}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol2(duration=600)
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol2(duration=600)
     "Check if the true input holds for certain time"
     annotation (Placement(transformation(extent={{-222,-220},{-202,-200}})));
   Buildings.Controls.OBC.CDL.Logical.TrueDelay truDel3(delayTime=600)
diff --git a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
index 33a369eb597..2b9ddd381e9 100644
--- a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
+++ b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/Reheat/SystemRequests.mo
@@ -348,7 +348,7 @@ protected
     have_heaPla)
     "Output 0 or 1 request "
     annotation (Placement(transformation(extent={{100,-440},{120,-420}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(duration=samplePeriod)
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(duration=samplePeriod)
     "Hold true signal for sample period of time"
     annotation (Placement(transformation(extent={{120,330},{140,350}})));
   Buildings.Controls.OBC.CDL.Logical.Switch logSwi "Logical switch"
diff --git a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
index 0736e26206d..8adce4f2ef5 100644
--- a/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
+++ b/Buildings/Obsolete/Controls/OBC/ASHRAE/G36_PR1/TerminalUnits/SetPoints/ZoneTemperatures.mo
@@ -232,7 +232,7 @@ block ZoneTemperatures
   Buildings.Controls.OBC.CDL.Logical.Timer tim(final t=300)
     "Check whether the zone has been unpopulated for 5 minutes continuously during occupied mode"
     annotation (Placement(transformation(extent={{-220,-280},{-200,-260}})));
-  Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset truHol(duration=60)
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(duration=60)
     "When the zone is unpopulated by more than 5 minute and then becomes populated, hold the change by 1 minute"
     annotation (Placement(transformation(extent={{-100,-280},{-80,-260}})));
   Buildings.Controls.OBC.CDL.Logical.Edge edg1
diff --git a/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo b/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo
index 97129797427..6b068a5d772 100644
--- a/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo
+++ b/Buildings/Obsolete/Controls/OBC/CDL/Interfaces/package.mo
@@ -4,7 +4,7 @@ package Interfaces "Package with obsolete interfaces"
 
 annotation (preferredView="info", Documentation(info="<html>
 <p>
-Package with obsolete interfaces.
+Package with obsolete Buildings.Controls.OBC.CDL.Interfaces.
 </p>
 </html>"));
 end Interfaces;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mo b/Buildings/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mo
deleted file mode 100644
index 38bc1775ddf..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mo
+++ /dev/null
@@ -1,103 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Examples;
-model KalmanFilter
-  "Kalman filter implemented in Python and called from Modelica"
-  extends Modelica.Icons.Example;
-  Obsolete.Utilities.IO.Python36.Real_Real ran(
-    nDblWri=1,
-    nDblRea=1,
-    functionName="random",
-    moduleName="KalmanFilter",
-    samplePeriod=samplePeriod) "Generate a random number in Python"
-    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
-  Modelica.Blocks.Sources.ContinuousClock clock
-    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
-  Obsolete.Utilities.IO.Python36.Real_Real kalFil(
-    moduleName="KalmanFilter",
-    functionName="filter",
-    nDblWri=1,
-    nDblRea=1,
-    samplePeriod=samplePeriod) "Kalman filter in Python"
-    annotation (Placement(transformation(extent={{60,20},{80,40}})));
-
-  parameter Modelica.Units.SI.Time samplePeriod=0.001
-    "Sample period of component";
-  Modelica.Blocks.Sources.Sine sine(f=1) "Sine wave"
-    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
-  Modelica.Blocks.Math.Add add
-    "Addition of signals before sending it to the Kalman filter"
-    annotation (Placement(transformation(extent={{20,20},{40,40}})));
-equation
- // Delete the temporary file generated by the Python file
- // at the start and end of the simulation.
- when {initial(), terminal()} then
-    Modelica.Utilities.Files.remove("tmp-kalman.json");
- end when;
-
-  connect(clock.y, ran.uR[1]) annotation (Line(
-      points={{-59,10},{-42,10}},
-      color={0,0,127},
-      smooth=Smooth.None));
-
-  connect(add.y, kalFil.uR[1]) annotation (Line(
-      points={{41,30},{58,30}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(ran.yR[1], add.u2) annotation (Line(
-      points={{-19,10},{0,10},{0,24},{18,24}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  connect(sine.y, add.u1) annotation (Line(
-      points={{-19,50},{0,50},{0,36},{18,36}},
-      color={0,0,127},
-      smooth=Smooth.None));
-  annotation (
-experiment(Tolerance=1e-6, StopTime=1),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-<p>
-This example demonstrates the implementation of a Kalman filter
-in Python.
-The model generates a uniform random number, which is computed
-in the Python file <code>KalmanFilter.py</code> by the function
-<code>random(seed)</code>.
-This random number is added to a sine wave and then sent to
-the function <code>filter(u)</code> in the above Python file.
-The function <code>filter(u)</code> implements a Kalman filter that estimates and returns
-the state.
-The function saves its temporary variables to a file called
-<code>tmp-kalman.json</code>.
-</p>
-<p>
-When simulating this model, the figure below will be generated which
-shows the sine wave, the sine wave plus noise, which is input to the Kalman filter,
-and the estimated state which is the output of the Kalman filter.
-</p>
-<p align=\"center\">
-<img alt=\"image\" src=\"modelica://Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.png\"/>
-</p>
-<h4>Implementation</h4>
-<p>
-The code is based on
-<a href=\"http://www.scipy.org/Cookbook/KalmanFiltering\">
-http://www.scipy.org/Cookbook/KalmanFiltering</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-October 24, 2019, by Antoine Gautier:<br/>
-Changed the temporary file format from <code>pickle</code> to <code>json</code> as the former can trigger a
-segfault with JModelica simulation run in a subprocess.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1587\">Buildings, #1587</a>.
-</li>
-<li>
-February 5, 2013, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end KalmanFilter;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mo b/Buildings/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mo
deleted file mode 100644
index 9b5d87682d8..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mo
+++ /dev/null
@@ -1,85 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Examples;
-model SimpleRoom
-  "Simple room model implemented in Python that outputs the temperature and the energy"
-  extends Modelica.Icons.Example;
-  Buildings.Utilities.Time.ModelTime modTim "Model time"
-    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
-
-  Obsolete.Utilities.IO.Python36.Real_Real pyt(
-    moduleName="SimpleRoom",
-    functionName="doStep",
-    nDblRea=2,
-    nDblWri=4,
-    samplePeriod=60,
-    passPythonObject=true) "Python interface"
-    annotation (Placement(transformation(extent={{-10,0},{10,20}})));
-  Modelica.Blocks.Sources.Constant T0(k=293.15) "Initial temperature"
-    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
-  Modelica.Blocks.Routing.Multiplex4 mul "Multiplex"
-    annotation (Placement(transformation(extent={{-40,0},{-20,20}})));
-  Buildings.Obsolete.Controls.OBC.CDL.Logical.OnOffController onOffCon(
-    bandwidth=2,
-    u(unit="K", displayUnit="degC")) "On/off controller"
-    annotation (Placement(transformation(extent={{30,10},{50,30}})));
-  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal onOff(realTrue=1.2)
-    "On off control"
-    annotation (Placement(transformation(extent={{60,10},{80,30}})));
-  Modelica.Blocks.Sources.Sine TAmb(
-    amplitude=5,
-    offset=283.15,
-    y(unit="K", displayUnit="degC"),
-    f=1/86400,
-    phase=-1.5707963267949) "Ambient temperature"
-    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
-equation
-  connect(mul.u1[1], T0.y) annotation (Line(points={{-42,19},{-46,19},{-46,80},{
-          -59,80}}, color={0,0,127}));
-  connect(modTim.y, mul.u4[1]) annotation (Line(points={{-59,0},{-50,0},{-50,1},
-          {-42,1}}, color={0,0,127}));
-  connect(mul.y, pyt.uR)
-    annotation (Line(points={{-19,10},{-12,10}}, color={0,0,127}));
-  connect(pyt.yR[1], onOffCon.u) annotation (Line(points={{11,9.75},{18,9.75},{18,
-          14},{28,14}}, color={0,0,127}));
-  connect(onOffCon.reference, T0.y) annotation (Line(points={{28,26},{0,26},{0,80},
-          {-59,80}}, color={0,0,127}));
-  connect(onOffCon.y, onOff.u)
-    annotation (Line(points={{52,20},{58,20}}, color={255,0,255}));
-  connect(onOff.y, mul.u3[1]) annotation (Line(points={{82,20},{90,20},{90,-10},
-          {-48,-10},{-48,7},{-42,7}}, color={0,0,127}));
-  connect(TAmb.y, mul.u2[1]) annotation (Line(points={{-59,40},{-52,40},{-52,13},
-          {-42,13}}, color={0,0,127}));
-  annotation (
-experiment(Tolerance=1e-6, StopTime=86400),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mos"
-        "Simulate and plot"),
-    Documentation(info="<html>
-<p>
-This example demonstrates the implementation of a simple room model
-that is implemented in the Python module <code>Resources/Python-Sources/SimpleRoom.py</code>.
-The Python model computes a first-order response to the room model.
-It returns the current room air temperature and the energy consumed during the simulation.
-The Python module also passes an object from one call to the next. This object
-contains the past room temperature, energy and time when the function was called,
-stored as a Python dictionary.
-This illustrates how Python data structures can be passed between function calls,
-thereby enabling for example to call some (memory-intensive) machine learning program,
-implemented in Python, from a Modelica block that may then pass the output of this program
-to a controller.
-</p>
-<p>
-Note that this example is for demonstration only. An implementation in Modelica
-would be much simpler and computationally more efficient.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end SimpleRoom;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Examples/package.mo b/Buildings/Obsolete/Utilities/IO/Python36/Examples/package.mo
deleted file mode 100644
index 81609c03742..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Examples/package.mo
+++ /dev/null
@@ -1,13 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36;
-package Examples "Collection of models that illustrate model use and test models"
-  extends Modelica.Icons.ExamplesPackage;
-
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36\">
-Buildings.Obsolete.Utilities.IO.Python36</a>.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Examples/package.order b/Buildings/Obsolete/Utilities/IO/Python36/Examples/package.order
deleted file mode 100644
index 417416a3219..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Examples/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-KalmanFilter
-SimpleRoom
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/PythonObject.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/PythonObject.mo
deleted file mode 100644
index 4cd3da6f4e1..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/PythonObject.mo
+++ /dev/null
@@ -1,109 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses;
-class PythonObject
-  "class used to create the external object: PythonObject"
-extends ExternalObject;
-    impure function constructor
-      "Construct an external object that can be used to store a Python object"
-    output PythonObject pytObj;
-    external "C" pytObj = initPythonMemory()
-        annotation (Library={"ModelicaBuildingsPython3.6",  "python3.6m"},
-          LibraryDirectory="modelica://Buildings/Resources/Library",
-          __iti_dll = "ITI_ModelicaBuildingsPython3.6.dll",
-          __iti_dllNoExport = true);
-
-    annotation(Documentation(info="<html>
-<p>
-The function <code>constructor</code> is a C function that is called by a Modelica simulator
-exactly once during the initialization.
-The function returns the object <code>PythonObject</code> that
-will be used to store a Python object and pass it from one invocation to another
-in the function
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.exchange\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.exchange</a>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 11, 2021, by Michael Wetter:<br/>
-Declared function as <code>pure</code> for MSL 4.0.0.
-</li>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-March 06, 2020, by Jianjun Hu:<br/>
-Upgraded python version from 2.7 to 3.6.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue 1760</a>.
-</li>
-<li>
-April 13, 2018, by Michael Wetter:<br/>
-Corrected <code>LibraryDirectory</code> annotation.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1160\">issue 1160</a>.
-</li>
-<li>
-January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-    end constructor;
-
-  impure function destructor "Release memory"
-    input PythonObject pytObj;
-    external "C" freePythonMemory(pytObj)
-      annotation (Library={"ModelicaBuildingsPython3.6",  "python3.6m"},
-        LibraryDirectory="modelica://Buildings/Resources/Library",
-        __iti_dll = "ITI_ModelicaBuildingsPython3.6.dll",
-        __iti_dllNoExport = true);
-
-  annotation(Documentation(info="<html>
-<p>
-Destructor that frees the memory of the object
-<code>PythonObject</code>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-March 06, 2020, by Jianjun Hu:<br/>
-Upgraded python version from 2.7 to 3.6.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue 1760</a>.
-</li>
-<li>
-January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-  end destructor;
-annotation(Documentation(info="<html>
-<p>
-Class derived from <code>ExternalObject</code> having two local external functions
-named <code>destructor</code> and <code>constructor</code>.
-</p>
-<p>
-These functions create and release an external object that allows the storage
-of a Python object.
-</p>
-</html>",
-revisions="<html>
-<ul>
-<li>
-December 11, 2021, by Michael Wetter:<br/>
-Declared function as <code>pure</code> for MSL 4.0.0.
-</li>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PythonObject;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/exchange.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/exchange.mo
deleted file mode 100644
index d56c01d8903..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/exchange.mo
+++ /dev/null
@@ -1,85 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses;
-impure function exchange "Function that communicates with Python"
-  input String moduleName
-    "Name of the python module that contains the function";
-  input String functionName=moduleName "Name of the python function";
-  input BaseClasses.PythonObject pytObj "Memory that holds the Python object";
-  input Boolean passPythonObject
-    "Set to true if the Python function returns and receives an object, see User's Guide";
-  input String pythonPath "Value of PYTHONPATH environment variable";
-
-  input Real    dblWri[max(1, nDblWri)] "Double values to write";
-  input Integer intWri[max(1, nIntWri)] "Integer values to write";
-  input String  strWri[max(1, nStrWri)] "String values to write";
-
-  input Integer nDblWri(min=0) "Number of double values to write";
-  input Integer nDblRea(min=0) "Number of double values to read";
-
-  input Integer nIntWri(min=0) "Number of integer values to write";
-  input Integer nIntRea(min=0) "Number of integer values to read";
-
-  input Integer nStrWri(min=0) "Number of strings to write";
-//  input Integer nStrRea(min=0) "Number of strings to read";
-//  input Integer strLenRea(min=0)
-//    "Maximum length of each string that is read. If exceeded, the simulation stops with an error";
-
-  output Real    dblRea[max(1, nDblRea)] "Double values returned by Python";
-  output Integer intRea[max(1, nIntRea)] "Integer values returned by Python";
-
-  external "C" pythonExchangeValues(moduleName, functionName,
-                                    pythonPath,
-                                    dblWri, nDblWri,
-                                    dblRea, nDblRea,
-                                    intWri, nIntWri,
-                                    intRea, nIntRea,
-                                    strWri, nStrWri,
-                                    pytObj,
-                                    passPythonObject)
-    annotation (Library={"ModelicaBuildingsPython3.6",  "python3.6m"},
-      LibraryDirectory="modelica://Buildings/Resources/Library",
-      IncludeDirectory="modelica://Buildings/Resources/C-Sources",
-      Include="#include \"pythonWrapper.c\"",
-      __iti_dll = "ITI_ModelicaBuildingsPython3.6.dll",
-      __iti_dllNoExport = true);
-  annotation (Documentation(info="<html>
-<p>
-This function exchanges data with Python.
-See
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.UsersGuide\">
-Buildings.Obsolete.Utilities.IO.Python36.UsersGuide</a>
-for instructions, and
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples</a>
-for examples.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 11, 2021, by Michael Wetter:<br/>
-Declared function as <code>impure</code> for MSL 4.0.0.
-</li>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-March 06, 2020, by Jianjun Hu:<br/>
-Upgraded python version from 2.7 to 3.6.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue 1760</a>.
-</li>
-<li>
-April 13, 2018, by Michael Wetter:<br/>
-Corrected <code>LibraryDirectory</code> annotation.<br/>
-This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1160\">issue 1160</a>.
-</li>
-<li>
-March 27, 2013, by Thierry S. Nouidui:<br/>
-Added  a wrapper to <code>ModelicaFormatError</code> to support Windows OS.
-</li>
-<li>
-January 31, 2013, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end exchange;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/package.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/package.mo
deleted file mode 100644
index bfcb6577401..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions;
-package BaseClasses "Package with functions that call Python"
-  extends Modelica.Icons.BasesPackage;
-
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains functions that call Python.
-</p>
-</html>"));
-end BaseClasses;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/package.order b/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/package.order
deleted file mode 100644
index 8c17336eed3..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/BaseClasses/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-PythonObject
-exchange
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mo
deleted file mode 100644
index 31e092b241e..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mo
+++ /dev/null
@@ -1,190 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples;
-model Exchange "Test model for exchange function"
-  extends Modelica.Icons.Example;
-
-  parameter Boolean passPythonObject = false
-    "Set to true if the Python function returns and receives an object, see User's Guide";
-
-  parameter Real    yR1[1](each fixed=false) "Real function value";
-  parameter Integer yI1[1](each fixed=false) "Integer function value";
-  parameter Real    yR2[2](each fixed=false) "Real function value";
-  parameter Integer yI2[2](each fixed=false) "Integer function value";
-
-protected
-  model M "Class that contains the Python object"
-    Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.PythonObject pytObj=
-        Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.PythonObject()
-      "Instance of Python object";
-  end M;
-
-  M[8] m "Array with instances of Python objects";
-
-initial algorithm
-  yR1 := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r1_r1",
-    pytObj=m[1].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={2.0},
-    intWri={0},
-    nDblWri=1,
-    nDblRea=1,
-    nIntWri=0,
-    nIntRea=0,
-    nStrWri=0,
-    strWri={""});
-    assert(abs(4-yR1[1]) < 1e-5, "Error in function r1_r1");
-
-  yR1 := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r2_r1",
-    pytObj=m[2].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={2.0,3.0},
-    intWri={0},
-    nDblWri=2,
-    nDblRea=1,
-    nIntWri=0,
-    nIntRea=0,
-    nStrWri=0,
-    strWri={""});
-    assert(abs(6-yR1[1]) < 1e-5, "Error in function r2_r1");
-
-  yR2 := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r1_r2",
-    pytObj=m[3].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={2.0},
-    intWri={0},
-    nDblWri=1,
-    nDblRea=2,
-    nIntWri=0,
-    nIntRea=0,
-    nStrWri=0,
-    strWri={""});
-  assert(abs(yR2[1]-2) + abs(yR2[2]-4) < 1E-5, "Error in function r1_r2");
-
-  // In the call below, yR1 is a dummy variable, as exchange returns (Real[1], Integer[1])
-  (yR1,yI1) := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="i1_i1",
-    pytObj=m[4].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={0.0},
-    intWri={3},
-    nDblWri=0,
-    nDblRea=0,
-    nIntWri=1,
-    nIntRea=1,
-    nStrWri=0,
-    strWri={""});
-  assert((6-yI1[1]) < 1e-5, "Error in function i1_i1");
-
-  // In the call below, yR1 is a dummy variable, as exchange returns (Real[1], Integer[2])
-  (yR1,yI2) := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="i1_i2",
-    pytObj=m[5].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={0.0},
-    intWri={2},
-    nDblWri=0,
-    nDblRea=0,
-    nIntWri=1,
-    nIntRea=2,
-    nStrWri=0,
-    strWri={""});
-  assert(abs(yI2[1]-2) + abs(yI2[2]-4) < 1E-5, "Error in function i1_i2");
-
-  yR2 := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r1i1_r2",
-    pytObj=m[6].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={0.3},
-    intWri={2},
-    nDblWri=1,
-    nDblRea=2,
-    nIntWri=1,
-    nIntRea=0,
-    nStrWri=0,
-    strWri={""});
-  assert(abs(yR2[1]-0.6) + abs(yI2[2]-4) < 1E-5, "Error in function r1i1_r2");
-
-  // From Modelica, write a number to a text file, and from Python, read the text file
-  // and return the number.
-  Modelica.Utilities.Streams.print(string="1.23", fileName="tmp-TestPythonInterface.txt");
-  yR1 := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="s2_r1",
-    pytObj=m[7].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={0.0},
-    intWri={0},
-    nDblWri=0,
-    nDblRea=1,
-    nIntWri=0,
-    nIntRea=0,
-    nStrWri=2,
-    strWri={"tmp-TestPythonInterface","txt"});
-   assert(abs(yR1[1]-1.23) < 1E-5, "Error in function s2_r1");
-
-  (yR2,yI1) := Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r1i1_r2i1",
-    pytObj=m[8].pytObj,
-    passPythonObject=passPythonObject,
-    dblWri={0.3},
-    intWri={2},
-    nDblWri=1,
-    nDblRea=2,
-    nIntWri=1,
-    nIntRea=1,
-    nStrWri=0,
-    strWri={""});
-  assert(abs(yR2[1]-0.6) + abs(yR2[2]-4) < 1E-5, "Error in function r1i1_r2i1");
-  assert(abs(yI1[1]-3) == 0, "Error in function r1i1_r2i1");
-  annotation (
-experiment(Tolerance=1e-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mos"
-        "Simulate and plot"),
-Documentation(info="<html>
-<p>
-This example calls various functions in the Python module <code>testFunctions.py</code>.
-It tests whether arguments and return values are passed correctly.
-The functions in  <code>testFunctions.py</code> are very simple in order to test
-whether they compute correctly, and whether the data conversion between Modelica and
-Python is implemented correctly.
-Each call to Python is followed by an <code>assert</code> statement which terminates
-the simulation if the return value is different from the expected value.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 11, 2021, by Michael Wetter:<br/>
-Changed implementation to assigning parameters as opposed to variables because the
-assignment is made through impure function calls.
-This is for MSL 4.0.0.
-</li>
-<li>
-December 10, 2021, by Michael Wetter:<br/>
-Removed call to impure function <code>removeFile</code>.
-This removal is required for MSL 4.0.0.
-</li>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-February 2, 2016, by Michael Wetter:<br/>
-Changed constant arguments of exchange function from <code>int</code> to <code>double</code>.
-This is required for OpenModelica.
-</li>
-<li>
-January 31, 2013, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end Exchange;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mo
deleted file mode 100644
index 08f8ff99cbf..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mo
+++ /dev/null
@@ -1,79 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples;
-model ExchangeWithPassPythonObject
-  "Test model for exchange function with memory"
-  extends Modelica.Icons.Example;
-
-  parameter Boolean passPythonObject = true
-    "Set to true if the Python function returns and receives an object, see User's Guide";
-  Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.PythonObject pytObj=
-      Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.PythonObject();
-
-  parameter Real yR1[1](each fixed=false) "Real function value";
-  parameter Real yR2[1](each fixed=false) "Real function value";
-
-initial equation
-  yR1 = Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r1_r1PassPythonObject",
-    dblWri={2.0},
-    intWri={0},
-    nDblWri=1,
-    nDblRea=1,
-    nIntWri=0,
-    nIntRea=0,
-    nStrWri=0,
-    strWri={""},
-    pytObj=pytObj,
-    passPythonObject=passPythonObject);
-  assert(abs(3-yR1[1]) < 1e-5, "Error in function r1_r1PassPythonObject");
-
-  // Invoke the same function with the same Python object.
-  // Hence, pytObj is reused.
-  yR2 = Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-    moduleName="testFunctions",
-    functionName="r1_r1PassPythonObject",
-    dblWri=yR1,
-    intWri={0},
-    nDblWri=1,
-    nDblRea=1,
-    nIntWri=0,
-    nIntRea=0,
-    nStrWri=0,
-    strWri={""},
-    pytObj=pytObj,
-    passPythonObject=passPythonObject);
-    assert(abs(16-yR2[1]) < 1e-5, "Error in function r1_r1PassPythonObject");
-
-  annotation (
-experiment(Tolerance=1e-6, StopTime=1.0),
-__Dymola_Commands(file="modelica://Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos"
-        "Simulate and plot"),
-Documentation(info="<html>
-<p>
-This example calls various functions in the Python module <code>testFunctions.py</code>.
-It tests whether arguments and return values are passed correctly.
-The functions in  <code>testFunctions.py</code> are very simple in order to test
-whether they compute correctly, and whether the data conversion between Modelica and
-Python is implemented correctly.
-Each call to Python is followed by an <code>assert</code> statement which terminates
-the simulation if the return value is different from the expected value.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 11, 2021, by Michael Wetter:<br/>
-Changed implementation to assigning parameters as opposed to variables because the
-assignment is made through impure function calls.
-This is for MSL 4.0.0.
-</li>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-January 31, 2018, by Michael Wetter and Thierry Nouidui:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end ExchangeWithPassPythonObject;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/package.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/package.mo
deleted file mode 100644
index 0f84ddd0282..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/package.mo
+++ /dev/null
@@ -1,16 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions;
-package Examples "Collection of models that illustrate model use and test models"
-  extends Modelica.Icons.ExamplesPackage;
-
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains examples for the use of models that can be found in
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions</a>.
-</p>
-<p>
-The examples demonstrate how to call Python functions from Modelica.
-</p>
-</html>"));
-end Examples;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/package.order b/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/package.order
deleted file mode 100644
index 373bc2f8e6b..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/Examples/package.order
+++ /dev/null
@@ -1,2 +0,0 @@
-Exchange
-ExchangeWithPassPythonObject
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/exchange.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/exchange.mo
deleted file mode 100644
index 55cd2a00c51..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/exchange.mo
+++ /dev/null
@@ -1,121 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36.Functions;
-impure function exchange "Function that communicates with Python"
-  extends Modelica.Icons.Function;
-
-  input String moduleName
-    "Name of the python module that contains the function";
-  input String functionName=moduleName "Name of the python function";
-  input BaseClasses.PythonObject pytObj "Memory that holds the Python object";
-  input Boolean passPythonObject
-    "Set to true if the Python function returns and receives an object, see User's Guide";
-
-  input Real    dblWri[max(1, nDblWri)] "Double values to write";
-  input Integer intWri[max(1, nIntWri)] "Integer values to write";
-  input String  strWri[max(1, nStrWri)] "String values to write";
-
-  input Integer nDblWri(min=0) "Number of double values to write";
-  input Integer nDblRea(min=0) "Number of double values to read";
-
-  input Integer nIntWri(min=0) "Number of integer values to write";
-  input Integer nIntRea(min=0) "Number of integer values to read";
-
-  input Integer nStrWri(min=0) "Number of strings to write";
-//  input Integer nStrRea(min=0) "Number of strings to read";
-//  input Integer strLenRea(min=0)
-//    "Maximum length of each string that is read. If exceeded, the simulation stops with an error";
-
-  output Real    dblRea[max(1, nDblRea)] "Double values returned by Python";
-  output Integer intRea[max(1, nIntRea)] "Integer values returned by Python";
-protected
-  String pytPatOld "Old value of PYTHONPATH environment variable";
-  String pytPatBuildings "PYTHONPATH of Buildings library";
-  String pytPat "Value of PYTHONPATH environment variable";
-  Boolean havePytPat "true if PYTHONPATH is already set by the user";
-  package P
-    constant String filNam = "modelica://Buildings/legal.html"
-        "Name to a file of the Buildings library";
-    constant String buiLibFil = Modelica.Utilities.Files.loadResource(uri=filNam) "Absolute path to filNam";
-  end P;
-  String searchString = "legal.html" "String to be replaced";
-algorithm
- // Get the directory to Buildings/Resources/Python-Sources
- pytPatBuildings := Modelica.Utilities.Strings.replace(
-   string=P.buiLibFil,
-   searchString=searchString,
-   replaceString="Resources/Python-Sources");
-
- // Update the PYTHONPATH variable
- (pytPatOld, havePytPat) :=Modelica.Utilities.System.getEnvironmentVariable("PYTHONPATH");
- if havePytPat then
-   if Modelica.Utilities.Strings.find(pytPatOld, pytPatBuildings) == 0 then
-     // The new python path is not yet in the environment variable, add it.
-     pytPat:=pytPatOld + ":" + pytPatBuildings;
-   else
-     // The new python path is already in the variable.
-     pytPat:=pytPatOld;
-   end if;
- else
-   pytPat := pytPatBuildings;
- end if;
- // Call the exchange function
- (dblRea, intRea) :=BaseClasses.exchange(
-    moduleName=moduleName,
-    functionName=functionName,
-    pytObj=pytObj,
-    passPythonObject=passPythonObject,
-    pythonPath=pytPat,
-    dblWri=dblWri,
-    intWri=intWri,
-    strWri=strWri,
-    nDblWri=nDblWri,
-    nDblRea=nDblRea,
-    nIntWri=nIntWri,
-    nIntRea=nIntRea,
-    nStrWri=nStrWri);
-  annotation (
-  obsolete = "Obsolete model - use Buildings.Utilities.IO.Python_3_8.Real_Real instead",
-  Documentation(info="<html>
-<p>
-This function is a wrapper for
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.exchange\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.exchange</a>.
-It adds the directory <code>modelica://Buildings/Resources/Python-Sources</code>
-to the environment variable <code>PYTHONPATH</code>
-prior to calling the function that exchanges data with Python.
-After the function call, the <code>PYTHONPATH</code> is set back to what
-it used to be when entering this function.
-See
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.UsersGuide\">
-Buildings.Obsolete.Utilities.IO.Python36.UsersGuide</a>
-for instructions, and
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples</a>
-for examples.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-December 11, 2021, by Michael Wetter:<br/>
-Declared function as <code>impure</code> for MSL 4.0.0.
-</li>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-June 14, 2019, by Antoine Gautier and Michael Wetter:<br/>
-Refactored for setting <code>PYTHONPATH</code> correctly independent of working directory.
-</li>
-<li>
-April 24, 2019, by Michael Wetter:<br/>
-Refactored for getting <code>PYTHONPATH</code>.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1421\">#1421</a>.
-</li>
-<li>
-May 2, 2013, by Michael Wetter:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end exchange;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/package.mo b/Buildings/Obsolete/Utilities/IO/Python36/Functions/package.mo
deleted file mode 100644
index 9278b3789f7..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/package.mo
+++ /dev/null
@@ -1,11 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36;
-package Functions "Package with functions that call Python"
-  extends Modelica.Icons.BasesPackage;
-
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains functions that call Python.
-</p>
-</html>"));
-end Functions;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Functions/package.order b/Buildings/Obsolete/Utilities/IO/Python36/Functions/package.order
deleted file mode 100644
index 0ae837897f4..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Functions/package.order
+++ /dev/null
@@ -1,3 +0,0 @@
-exchange
-Examples
-BaseClasses
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/Real_Real.mo b/Buildings/Obsolete/Utilities/IO/Python36/Real_Real.mo
deleted file mode 100644
index 5d17465796f..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/Real_Real.mo
+++ /dev/null
@@ -1,189 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36;
-model Real_Real
-  "Block that exchanges a vector of real values with a Python function"
-  extends Buildings.Obsolete.BaseClasses.ObsoleteModel;
-  extends Modelica.Blocks.Interfaces.DiscreteBlock(
-    startTime=0,
-    firstTrigger(fixed=true, start=false));
-
-  parameter String moduleName
-    "Name of the python module that contains the function";
-  parameter String functionName=moduleName "Name of the python function";
-
-  parameter Integer nDblWri(min=1) "Number of double values to write to Python";
-  parameter Integer nDblRea(min=1)
-    "Number of double values to be read from the Python";
-  parameter Integer flag = 0
-    "Flag for double values (0: use current value, 1: use average over interval, 2: use integral over interval)";
-  final parameter Integer flaDblWri[nDblWri] = fill(flag, nDblWri)
-    "Flag for double values (0: use current value, 1: use average over interval, 2: use integral over interval)";
-
-  parameter Boolean passPythonObject = false
-    "Set to true if the Python function returns and receives an object, see User's Guide";
-
-  Modelica.Blocks.Interfaces.RealInput uR[nDblWri]
-    "Real inputs to be sent to Python"
-    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
-  Modelica.Blocks.Interfaces.RealOutput yR[nDblRea]
-    "Real outputs received from Python"
-    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
-
-  Real uRInt[nDblWri] "Value of integral";
-  Real uRIntPre[nDblWri] "Value of integral at previous sampling instance";
-  Real uRWri[nDblWri] "Value to be sent to Python";
-  Real uRWri_temp[nDblWri] "Internal value";
-protected
-  Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.PythonObject pytObj=
-    Buildings.Obsolete.Utilities.IO.Python36.Functions.BaseClasses.PythonObject()
-    "Python object, used to avoid instantiating Python in each call, and to pass python object if passPythonObject=true";
-initial equation
-   uRWri    =  pre(uR);
-   uRWri_temp = pre(uR);
-   uRInt    =  zeros(nDblWri);
-   uRIntPre =  zeros(nDblWri);
-   for i in 1:nDblWri loop
-     assert(flaDblWri[i]>=0 and flaDblWri[i]<=2,
-        "Parameter flaDblWri out of range for " + String(i) + "-th component.");
-   end for;
-   // The assignment of yR avoids the warning
-   // "initial conditions for variables of type Real are not fully specified".
-   // At startTime, the sampleTrigger is true and hence this value will
-   // be overwritten.
-   yR = zeros(nDblRea);
-equation
-   for i in 1:nDblWri loop
-      der(uRInt[i]) = if (flaDblWri[i] > 0) then uR[i] else 0;
-   end for;
-
-  when {sampleTrigger} then
-     // Compute value that will be sent to Python
-      for i in 1:nDblWri loop
-        if (flaDblWri[i] == 0) then
-          uRWri_temp[i] = pre(uR[i]);
-          uRWri[i] = pre(uR[i]);                 // Send the current value.
-        else
-          if (time > 0) then
-            uRWri_temp[i] = uRInt[i] - pre(uRIntPre[i]); // Integral over the sampling interval
-            if (flaDblWri[i] == 2) then
-              uRWri[i] = uRWri_temp[i];
-            else
-              uRWri[i] = uRWri_temp[i]/samplePeriod;  // Average value over the sampling interval
-            end if;
-          else
-            uRWri[i] = pre(uR[i]);
-            uRWri_temp[i] = pre(uR[i]);
-          end if;
-        end if;
-      end for;
-    // Exchange data
-    yR = Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange(
-      moduleName=moduleName,
-      functionName=functionName,
-      dblWri=uRWri,
-      intWri={0},
-      nDblWri=nDblWri,
-      nDblRea=nDblRea,
-      nIntWri=0,
-      nIntRea=0,
-      nStrWri=0,
-      strWri={""},
-      pytObj=pytObj,
-      passPythonObject = passPythonObject);
-    // Store current value of integral
-    uRIntPre= uRInt;
-  end when;
-
-  annotation (defaultComponentName="pyt",
- Icon(coordinateSystem(
-          preserveAspectRatio=false, extent={{-100,-100},{100,100}}), graphics={Bitmap(
-            extent={{-88,82},{80,-78}}, fileName="modelica://Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/python.png")}),
-    obsolete = "Obsolete model - use Buildings.Utilities.IO.Python_3_8.Real_Real instead",
-    Documentation(info="<html>
-<p>
-Block that exchanges data with a Python function that does not need to pass
-an object from one call to the next.
-</p>
-<p>
-For each element in the input vector <code>uR[nDblWri]</code>,
-the value of the flag <code>flaDblWri[nDblWri]</code> determines whether
-the current value, the average over the sampling interval or the integral
-over the sampling interval is sent to Python. The following three options are allowed:
-</p>
-<br/>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr>
-<td>
-flaDblWri[i]
-</td>
-<td>
-Value sent to Python
-</td>
-</tr>
-<tr>
-<td>
-0
-</td>
-<td>
-Current value of uR[i]
-</td>
-</tr>
-<tr>
-<td>
-1
-</td>
-<td>
-Average value of uR[i] over the sampling interval
-</td>
-</tr>
-<tr>
-<td>
-2
-</td>
-<td>
-Integral of uR[i] over the sampling interval
-</td>
-</tr>
-</table>
-<p>
-If the function needs to pass an object from one invocation to the
-next, set <code>passPythonObject = true</code>.
-Otherwise, leave it at its default value <code>passPythonObject = false</code>.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-April 10, 2020, by Jianjun Hu and Michael Wetter:<br/>
-Updated to Python 3.6.
-</li>
-<li>
-March 06, 2020, by Jianjun Hu:<br/>
-Corrected implementation so it allows different flag for double values.<br/>
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1716\">issue #1716</a>.
-</li>
-<li>
-June 9, 2015 by Michael Wetter:<br/>
-Set <code>firstTrigger(fixed=true, start=false)</code> to avoid a
-warning about unspecified initial conditions if
-<code>Buildings.Obsolete.Utilities.IO.Python27.Examples.KalmanFilter</code>
-is translated
-using pedantic mode in Dymola 2016.
-This is for
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/426\">#426</a>.
-</li>
-<li>
-September 29, 2014, by Michael Wetter:<br/>
-Changed <code>algorithm</code> to <code>equation</code> section
-and assigned start values to avoid a translation warning in
-Dymola.
-</li>
-<li>
-February 5, 2013, by Michael Wetter:<br/>
-First implementation,
-based on
-<a href=\"modelica://Buildings.Utilities.IO.BCVTB.BCVTB\">
-Buildings.Utilities.IO.BCVTB.BCVTB</a>.
-</li>
-</ul>
-</html>"));
-end Real_Real;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/UsersGuide.mo b/Buildings/Obsolete/Utilities/IO/Python36/UsersGuide.mo
deleted file mode 100644
index 7e48f12db16..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/UsersGuide.mo
+++ /dev/null
@@ -1,287 +0,0 @@
-within Buildings.Obsolete.Utilities.IO.Python36;
-package UsersGuide "User's Guide"
-  extends Modelica.Icons.Information;
-
-annotation (preferredView="info",
-Documentation(info="<html>
-<p>
-This package contains classes that call Python functions.
-The classes can be used to send data to Python functions,
-and to obtain data from Python functions.
-This allows for example to use Python to communicate
-with web services, with hardware, or to do other computations
-inside a Python module.
-</p>
-<p>
-The code has been tested with Python 3.6 on
-Linux 64 bit and Windows 64 bit.
-</p>
-<h4>Software configuration to use classes from this package</h4>
-<p>
-To use classes from this package, a Python 3.6
-runtime environment must be installed.
-Also, the system environment variable
-<code>PYTHONPATH</code> may need to be set in order for Python
-to find the modules that contain the functions.
-These modules are stored in the directory
-<code>Buildings/Resources/Python-Sources</code>.
-In addition, an environment variable (<code>LD_LIBRARY_PATH</code> on Linux
-and <code>PATH</code> on Windows) may need to be set in order for a simulation
-environment to find the dynamically linked libraries.
-</p>
-<p>
-The table below gives hints if there are problems running models that use Python code.
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr>
-  <th>System</th>
-  <th>Settings</th>
-</tr>
-  <!-- =================================================================== -->
-<tr>
-  <td>Linux 64 bit</td>
-  <td>
-  <p>
-  If the examples do not translate or simulate, enter on a console the commands
-  </p>
-<pre>
-export PYTHONPATH=${PYTHONPATH}:\"Path_To_Buildings_Library\"/Resources/Python-Sources
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:\"Path_To_Buildings_Library\"/Resources/Library/linux64
-</pre>
-<p>
-and restart the Modelica environment.
-</p>
-<p>
-If this does not help, make sure <code>libpython3.6.m.so</code> is installed
-on your system. You can check this with
-</p>
-<pre>
-whereis libpython3.6m.so
-</pre>
-<p>
-On Ubuntu 18.04, this library can be installed with
-</p>
-<pre>
-sudo apt-get install libpython3.6-dev
-</pre>
-</td>
-</tr>
-<!-- =================================================================== -->
-<tr>
-<td>Dymola</td>
-<td>
-<p>
-Because the Python libraries link to compiled C code,
-Dymola needs to be configured to generate code for 64-bit.
-This can be done by entering on the
-Dymola command line the assignment</p>
-<pre>
-Advanced.CompileWith64=2
-</pre>
-</td>
-</tr>
-<!-- =================================================================== -->
-</table>
-
-<h4>Type of Python functions</h4>
-<p>
-Two different types of Python functions are supported: Functions that
-do not need to pass Python objects between one invocation to another, and functions
-that need to pass a Python object from one invocation to another.
-For the first case, a Python function may be
-</p>
-<pre>
-def returnTwiceTheInput(xR):
-    return 2.*xR
-</pre>
-<p>
-For the second case, a Python function may be
-</p>
-<pre>
-def incrementAndReturnACounter(i, obj):
-    if obj == None:
-        # Initialize the Python object
-        obj = {'counter': i}
-    else:
-        # Use the python object
-        obj['counter'] = obj['counter'] + i
-    return [i, obj]
-</pre>
-<p>
-For the first case, set in the function
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.exchange</a>
-the input argument <code>passPythonObject = false</code>,
-and for the second case, set <code>passPythonObject = true</code>.
-The second case
-allows for example to build up a Python data structure (or to instantiate a Python object),
-and do computations on this object at each function invocation. For example,
-a Model Predictive Control algorithm or a machine learning algorithm,
-implemented in Python, could be fed with data at each time step.
-It could then store this data
-and use the current and its historical data to feed its algorithm.
-Based on this algorithm, it could output a control signal for use in another Modelica model.
-</p>
-<h4>Number of values to read to Python and write from Python</h4>
-<p>
-The parameters <code>nDblWri</code> (or <code>nIntWri</code> or <code>nStrWri</code>)
-and <code>nDblRea</code> (or <code>nIntRea</code>) declare
-how many double (integer or string) values should be written to, or read from, the Python function.
-These values can be zero, in which case the Python function receives no
-arguments for this data type, or it must return a list with zero elements.
-However, because Modelica does not allow arrays with
-zero elements, the arrays
-<code>dblWri</code> and <code>dblRea</code>, respectively, must contain exactly one element
-if <code>nDblWri=0</code> or <code>nDblRea=0</code>.
-In this situation, <code>dblWri</code> is a dummy argument that will not be written to Python,
-and <code>dblRea</code> contains a number that must not be used in any model.
-</p>
-
-<h4>Arguments of the Python function</h4>
-<p>
-The arguments of the python functions are, in this order,
-floats, integers and strings (and the Python object if <code>passPythonObject = true</code>).
-If there is only one element of each data type, then a single value is passed.
-If there are multiple elements of each data type, then they are stored in a list.
-If there is no value of a data type (such as if <code>nDblWri=0</code>), then the argument is not present.
-Thus, if a data type is not present, then the function will <i>not</i> receive an empty list of this data type.
-If there are no arguments at all, then the function takes no arguments
-(except if <code>passPythonObject = true</code>, in which case the only argument is the Python object).</p>
-<p>
-The table below shows the list of arguments for various combinations where no,
-one or two double values, integers and strings are passed as an argument to a Python function.
-</p>
-<ul>
-<li>If <code>passPythonObject = false</code>:<br/>
- <table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr> <th>nDblWri</th>   <th>nIntWri</th>  <th>nStrWri</th>  <th>Arguments</th>  </tr>
-  <tr> <td>1      </td>   <td>0      </td>  <td>0      </td>  <td>1.                            </td></tr>
-  <tr> <td>0      </td>   <td>1      </td>  <td>1      </td>  <td>1, \"a\"                        </td></tr>
-  <tr> <td>2      </td>   <td>0      </td>  <td>2      </td>  <td>[1.0, 2.0], [\"a\", \"b\"]        </td></tr>
-  <tr> <td>1      </td>   <td>1      </td>  <td>1      </td>  <td> 1.0, 2, \"a\"                  </td></tr>
-  <tr> <td>1      </td>   <td>2      </td>  <td>0      </td>  <td> 1.0       , [1, 2]           </td></tr>
-  <tr> <td>2      </td>   <td>1      </td>  <td>0      </td>  <td>[1.0, 2.0], 1                 </td></tr>
-  <tr> <td>2      </td>   <td>2      </td>  <td>2      </td>  <td>[1.0, 2.0], [1, 2], [\"a\", \"b\"]</td></tr>
-  </table>
-  </li>
-<li>If <code>passPythonObject = true</code>:<br/>
- <table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr> <th>nDblWri</th>   <th>nIntWri</th>  <th>nStrWri</th>  <th>Arguments</th>  </tr>
-  <tr> <td>1      </td>   <td>0      </td>  <td>0      </td>  <td>1., pytObj                            </td></tr>
-  <tr> <td>0      </td>   <td>1      </td>  <td>1      </td>  <td>1, \"a\", pytObj                        </td></tr>
-  <tr> <td>2      </td>   <td>0      </td>  <td>2      </td>  <td>[1.0, 2.0], [\"a\", \"b\"], pytObj        </td></tr>
-  <tr> <td>1      </td>   <td>1      </td>  <td>1      </td>  <td> 1.0, 2, \"a\", pytObj                 </td></tr>
-  <tr> <td>1      </td>   <td>2      </td>  <td>0      </td>  <td> 1.0       , [1, 2], pytObj           </td></tr>
-  <tr> <td>2      </td>   <td>1      </td>  <td>0      </td>  <td>[1.0, 2.0], 1, pytObj                 </td></tr>
-  <tr> <td>2      </td>   <td>2      </td>  <td>2      </td>  <td>[1.0, 2.0], [1, 2], [\"a\", \"b\"], pytObj</td></tr>
-  </table>
-  <br/>
-  where <code>pytObj</code> is the Python object.
-  </li>
-  </ul>
-
-<h4>Returns values of the Python function</h4>
-<p>
-The Python function must return their values in the following order:</p>
-<ol>
-<li>
-If the function returns one or multiple double values, then the first return
-value must be a double (if <code>nDblRea=1</code>) or a list of doubles
-(if <code>nDblRea &gt; 1</code>).
-</li>
-<li>
-If the function returns one or multiple integer values, then the next return
-value must be an integer (if <code>nIntRea=1</code>) or a list of integers
-(if <code>nIntRea &gt; 1</code>).
-</li>
-<li>
-If <code>nDblRea = nIntRea = 0</code>, then the return values of the function, if any, are
-ignored.
-</li>
-</ol>
-<p>
-The table below shows valid return types for various combinations where no, one or two double values
-and integer values are returned.</p>
-<ul>
-<li>If <code>passPythonObject = false</code>:<br/>
- <table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr> <th>nDblRea</th>   <th>nIntRea</th>  <th>Return value</th>  </tr>
-  <tr> <td>1      </td>   <td>0      </td>  <td>1.                 </td></tr>
-  <tr> <td>0      </td>   <td>1      </td>  <td>1                  </td></tr>
-  <tr> <td>2      </td>   <td>0      </td>  <td>[1.0, 2.0]         </td></tr>
-  <tr> <td>1      </td>   <td>1      </td>  <td> 1.0, 2            </td></tr>
-  <tr> <td>1      </td>   <td>2      </td>  <td> 1.0      , [1, 2] </td></tr>
-  <tr> <td>2      </td>   <td>1      </td>  <td>[1.0, 2.0],  1     </td></tr>
-  <tr> <td>2      </td>   <td>2      </td>  <td>[1.0, 2.0], [1, 2] </td></tr>
-  </table>
-  </li>
-  <li>If <code>passPythonObject = true</code>:<br/>
- <table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr> <th>nDblRea</th>   <th>nIntRea</th>  <th>Return value</th>  </tr>
-  <tr> <td>1      </td>   <td>0      </td>  <td>1., pytObj                 </td></tr>
-  <tr> <td>0      </td>   <td>1      </td>  <td>1, pytObj                  </td></tr>
-  <tr> <td>2      </td>   <td>0      </td>  <td>[1.0, 2.0], pytObj         </td></tr>
-  <tr> <td>1      </td>   <td>1      </td>  <td> 1.0, 2, pytObj            </td></tr>
-  <tr> <td>1      </td>   <td>2      </td>  <td> 1.0      , [1, 2], pytObj </td></tr>
-  <tr> <td>2      </td>   <td>1      </td>  <td>[1.0, 2.0],  1, pytObj     </td></tr>
-  <tr> <td>2      </td>   <td>2      </td>  <td>[1.0, 2.0], [1, 2], pytObj </td></tr>
-  </table>
-  <br/>
-  where <code>pytObj</code> is the Python object.
-  </li>
-  </ul>
-
-<!-- Not yet implemented as pure functions are not supported in Dymola 2013 FD01 -->
-<h4>Pure Modelica functions (functions without side effects)</h4>
-<p>
-The functions that exchange data with Python are implemented as <i>pure</i>
-Modelica functions.
-Pure functions always return the same value if called repeatedly.
-If these functions are used to call hardware sensors or web services,
-they need to be called from a <code>when</code>-equation.</p>
-<p>
-See the Modelica language specification for an explanation
-of pure and impure functions.
-</p>
-
-<h4>Examples</h4>
-<p>
-Various examples are provided, and for each of these, the Python functions are stored in the directory
-<code>Buildings/Resources/Python-Sources</code>.
-</p>
-<p>
-The examples
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange</a>
-and
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject\">
-Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject</a>
-contains various calls to different Python functions without and with memory.
-</p>
-<p>
-The example
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter\">
-Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter</a>
-shows how to implement in a Modelica block a call to a Python function.
-This Python function stores its memory on disk between invocations (which,
-in general, is not recommended).
-</p>
-<p>
-The example
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom\">
-Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom</a>
-shows a similiar example. However, rather than using a file to store the
-room temperature and energy between invocations, the function returns
-an object with this information, and receives this object again in the next invocation.
-</p>
-
-<h4>Implementation notes</h4>
-<p>
-String values cannot be returned from a Python function.
-The reason is that Dymola 2013 FD01 generates a compile time error
-if a Modelica function returns <code>(Real[nR], Integer[nI], String)</code>.
-This will be fixed in Dymola 2014.
-(Support request #14983.)
-</p>
-</html>"));
-end UsersGuide;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/package.mo b/Buildings/Obsolete/Utilities/IO/Python36/package.mo
deleted file mode 100644
index 42bdd47cec5..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/package.mo
+++ /dev/null
@@ -1,20 +0,0 @@
-within Buildings.Obsolete.Utilities.IO;
-package Python36 "Package to call Python functions"
-  extends Modelica.Icons.VariantsPackage;
-
-annotation (preferredView="info", Documentation(info="<html>
-<p>
-This package contains blocks and functions that embed Python 3.6 in Modelica.
-Data can be sent to Python functions and received from Python functions.
-This allows for example data analysis in Python as part of a Modelica model,
-or data exchange as part of a hardware-in-the-loop simulation in which
-Python is used to communicate with hardware.
-</p>
-<p>
-See
-<a href=\"modelica://Buildings.Obsolete.Utilities.IO.Python36.UsersGuide\">
-Buildings.Obsolete.Utilities.IO.Python36.UsersGuide</a>
-for instruction.
-</p>
-</html>"));
-end Python36;
diff --git a/Buildings/Obsolete/Utilities/IO/Python36/package.order b/Buildings/Obsolete/Utilities/IO/Python36/package.order
deleted file mode 100644
index f995b2fb07e..00000000000
--- a/Buildings/Obsolete/Utilities/IO/Python36/package.order
+++ /dev/null
@@ -1,4 +0,0 @@
-UsersGuide
-Real_Real
-Functions
-Examples
diff --git a/Buildings/Obsolete/Utilities/IO/package.order b/Buildings/Obsolete/Utilities/IO/package.order
index 9bcec40c2a7..e69de29bb2d 100644
--- a/Buildings/Obsolete/Utilities/IO/package.order
+++ b/Buildings/Obsolete/Utilities/IO/package.order
@@ -1 +0,0 @@
-Python36
diff --git a/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c b/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c
index 45963bb4e2a..bc74cd5b712 100644
--- a/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c
+++ b/Buildings/Resources/C-Sources/EnergyPlus_9_6_0_Wrapper.c
@@ -120,14 +120,13 @@ void getParameters_Modelica_EnergyPlus_9_6_0(
 
 void exchange_Modelica_EnergyPlus_9_6_0(
   void* object,
-  int initialCall,
   const double* u,
   double dummy,
   double* y){
 
     exchange_Spawn_EnergyPlus_9_6_0(
       object,
-      initialCall,
+      0, /* Argument initialCall is hard-coded to false, and can be removed when binaries need to be recompiled. */
       u,
       y);
   }
diff --git a/Buildings/Resources/C-Sources/WeeklySchedule.c b/Buildings/Resources/C-Sources/WeeklySchedule.c
index a01217d8f43..ceb03974290 100644
--- a/Buildings/Resources/C-Sources/WeeklySchedule.c
+++ b/Buildings/Resources/C-Sources/WeeklySchedule.c
@@ -3,6 +3,8 @@
   This code implements a weekly schedule.
 
   Changelog:
+    March 30, 2024 by Filip Jorissen, Builtwins
+          Revisions for #1860 to avoid memory leaks when calling ModelicaFormatError.
     May 25, 2022 by Michael Wetter, LBNL
           Refactored to comply with C89.
     March 9, 2022 by Filip Jorissen, KU Leuven
@@ -29,13 +31,11 @@ int cmpfun(const void * tuple1, const void * tuple2) {
   return  (time1 - time2);
 }
 
-void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t_offset, char* stringData) {
-  FILE* fp;
+void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t_offset, const char* stringData) {
   const int bufLen = 255;
   WeeklySchedule* scheduleID = NULL;
-  char* token = NULL;
 
-  struct TimeDataTuple **rules;
+
   int i = 0;              /* iterator */
   int j = 0;              /* iterator */
   int k = 0;              /* iterator */
@@ -48,34 +48,52 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
   int comment = 0;        /* we are parsing a comment */
   int n_rulesInMem = 0;   /* number of rules for which we have allocated memory */
   int n_rulesInRow = 0;   /* number of rules that exist in the current row */
-  int n_rowsUnpacked = 0; /* total number of unpacked rules */
   int n_rowsPacked = 0;   /* number of rules */
   int n_newLines = 0;     /* number of newlines */
+  int mustHaveNewLine = 0;/* The next character must be a newline */
   char c;                 /* the character that is being parsed in this iteration */
 
+
   int parseToken = 0;
   double timeStamp;
-  char* buff2;
   int tokenLen;
   int offset = 0;
 
-  double* lastData = NULL;
-
   scheduleID = (WeeklySchedule*)calloc(1, sizeof(WeeklySchedule));
-  if ( scheduleID == NULL)
+  if ( scheduleID == NULL){
     ModelicaFormatError("Failed to allocate memory for scheduleID in WeeklySchedule.c.");
+  }
 
-  token = (char*)calloc(sizeof(char), bufLen);
-  if ( token == NULL)
-    ModelicaFormatError("Failed to allocate memory for token in WeeklySchedule.c.");
+  scheduleID->n_allocatedRules = 0;
+  scheduleID->n_allocatedRulesData = 0;
+  scheduleID->lastData = NULL;
+  scheduleID->token = NULL;
+  scheduleID->fp = NULL;
+  scheduleID->buff2 = NULL;
+  scheduleID->rules = NULL;
+
+  scheduleID->token = (char*)calloc(sizeof(char), bufLen);
+  if ( scheduleID->token == NULL){
+      weeklyScheduleFreeInit(scheduleID);
+      weeklyScheduleFree(scheduleID);
+      ModelicaFormatError("Failed to allocate memory for token in WeeklySchedule.c.");
+  }
 
   if (tableOnFile){
-      fp = fopen(name, "r");
-    if (fp == NULL) {
+      scheduleID->fp = fopen(name, "r");
+    if (scheduleID->fp == NULL) {
+      weeklyScheduleFreeInit(scheduleID);
+      weeklyScheduleFree(scheduleID);
       ModelicaFormatError("Failed to open weekly schedule '%s'.", name);
     }
   }
 
+  scheduleID->buff2 = (char*)calloc(sizeof(char), bufLen);
+  if (scheduleID->buff2 == NULL){
+      weeklyScheduleFreeInit(scheduleID);
+      weeklyScheduleFree(scheduleID);
+      ModelicaFormatError("Failed to allocate memory for buff in WeeklySchedule.c.");
+  }
 
   /* Identify 'tokens' by splitting on (one or more) whitespace characters. */
   /* Each token is parsed and special behaviour is created for comments and the header. */
@@ -87,7 +105,7 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
     parseToken = 0;
 
     if (tableOnFile){
-      c = fgetc( fp ); /* read a character from the file */
+      c = fgetc( scheduleID->fp ); /* read a character from the file */
     }else{
       c = stringData[j]; /* read a character from the string */
       j++;
@@ -95,27 +113,38 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
     if ( c == EOF || c == '\0') {
       if (!tableOnFile && c == '\0'){
         break;
-      }else if (tableOnFile && feof(fp)) {
+      }else if (tableOnFile && feof(scheduleID->fp)) {
         break; /* exit the while loop */
       } else {
+        weeklyScheduleFreeInit(scheduleID);
+        weeklyScheduleFree(scheduleID);
         ModelicaFormatError("Error while reading file '%s'.", name);
       }
     }{
       if (index >= bufLen - 2) {
+        weeklyScheduleFreeInit(scheduleID);
+        weeklyScheduleFree(scheduleID);
         ModelicaFormatError("Buffer overflow when reading weekly schedule '%s'.", name);
       }
 
 
       if (c == '\n') { /* Check whether a token ends */
         parseToken = 1;
+        mustHaveNewLine = 0;
         n_newLines++;
+      } else if (mustHaveNewLine == 1){
+        weeklyScheduleFreeInit(scheduleID);
+        weeklyScheduleFree(scheduleID);
+        ModelicaFormatError("Error while reading weekly schedule '%s'. Inconsistent line endings: \\r must be followed by \\n.", name);
+      } else if (c == '\r') { /* Check whether a token ends */
+        mustHaveNewLine = 1;
       } else if (comment == 1 || c == '#') {
         comment = 1;
         continue; /* ignore this character and the next characters until a newline is detected, then parse the token */
       } else if ( isHeaderLine == 0 && (c == ' ' || c == '\t' ) && index > 0) { /* parse token when reaching a space or tab, unless buffer is empty */
         parseToken = 1;
       } else if (c != ' ' && c != '\t' ) { /* build up the token by copying a character */
-        token[index] = c;
+        scheduleID->token[index] = c;
         index++;
       }
 
@@ -123,19 +152,17 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
       /* Parse a token if needed. */
       if (parseToken == 1 && index > 0) {
         /* shouldn't require an overflow check since token is already checked */
-        buff2 = (char*)calloc(sizeof(char), bufLen);
-        if (buff2 == NULL)
-          ModelicaFormatError("Failed to allocate memory for buff in WeeklySchedule.c.");
+
         offset = 0;
 
-        token[index] = '\0';
+        scheduleID->token[index] = '\0';
         index++;
-        tokenLen = strlen(token);
+        tokenLen = strlen(scheduleID->token);
         index = 0;
 
-        /* ModelicaFormatWarning("Parsing token %s", token);*/
+        /* ModelicaFormatWarning("Parsing token %s", scheduleID->token); */
 
-        if (foundHeader == 0 && strcmp("double", token) == 0) {
+        if (foundHeader == 0 && strcmp("double", scheduleID->token) == 0) {
 		  /* we found a header line, we expect a specific format after the whitespace */
           isHeaderLine = 1;
           foundHeader = 1;
@@ -144,105 +171,145 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
           int ncharsRow;
           int ncharsCol;
 
-          if (strncmp("tab1(", token, 4) != 0) {
+          if (strncmp("tab1(", scheduleID->token, 4) != 0) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Incorrect header when reading weekly schedule '%s'. It should start with 'tab1('.", name);
           }
 
-          source = token + 5;
+          source = scheduleID->token + 5;
           ncharsRow = strcspn(source, ",");
 
           if (tokenLen == ncharsRow + 5 ) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Incorrect header when reading weekly schedule '%s'. No comma was found in the header.", name);
           }
-          strncpy(buff2, source, ncharsRow);
-          buff2[ncharsRow] = '\0';
+          if ( ncharsRow > bufLen - 2 ) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
+            ModelicaFormatError("Header length exceeds buffer size.");
+          }
+          strncpy(scheduleID->buff2, source, ncharsRow);
+          scheduleID->buff2[ncharsRow] = '\0';
 
-          if (sscanf(buff2, "%i", &scheduleID->n_rows_in) != 1) {
-            ModelicaFormatError("Error in intenger conversion in header while parsing %s in weekly schedule '%s'.", buff2, name);
+          if (sscanf(scheduleID->buff2, "%i", &scheduleID->n_rows_in) != 1) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
+            ModelicaFormatError("Error in intenger conversion in header while parsing %s in weekly schedule '%s'.", scheduleID->buff2, name);
           }
 
           source = source + ncharsRow + 1;
           ncharsCol = strcspn(source, ")");
           if (tokenLen == ncharsCol + ncharsRow + 5 + 1) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Incorrect header when reading weekly schedule '%s'. No closing bracket was found in the header.", name);
           } else if (tokenLen > ncharsCol + ncharsRow + 5 + 1 + 1) {
-            ModelicaFormatError("Incorrect header when reading weekly schedule '%s'. It has trailing characters: '%s'.", name, token + ncharsRow + ncharsCol + 7);
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
+            ModelicaFormatError("Incorrect header when reading weekly schedule '%s'. It has trailing characters: '%s'.", name, scheduleID->token + ncharsRow + ncharsCol + 7);
           }
-          strncpy(buff2, source, ncharsCol);
-          buff2[ncharsCol] = '\0';
-          if (sscanf(buff2, "%i", &scheduleID->n_cols_in) != 1) {
-            ModelicaFormatError("Error in integer conversion in header while parsing %s in weekly schedule '%s'..", buff2, name);
+          strncpy(scheduleID->buff2, source, ncharsCol);
+          scheduleID->buff2[ncharsCol] = '\0';
+          if (sscanf(scheduleID->buff2, "%i", &scheduleID->n_cols_in) != 1) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
+            ModelicaFormatError("Error in integer conversion in header while parsing %s in weekly schedule '%s'..", scheduleID->buff2, name);
           }
           if (scheduleID->n_cols_in < 2) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Illegal number of columns '%i' when reading weekly schedule '%s'.", scheduleID->n_cols_in, name);
           }
           if (scheduleID->n_rows_in < 1) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Illegal number of rows '%i' when reading weekly schedule '%s'.", scheduleID->n_rows_in, name);
           }
           isHeaderLine = 0;
           foundHeader = 1;
-          rules = (TimeDataTuple**)calloc(sizeof(TimeDataTuple *), scheduleID->n_rows_in);
-          if ( rules == NULL)
+          scheduleID->rules = (TimeDataTuple**)calloc(sizeof(TimeDataTuple *), scheduleID->n_rows_in);
+          if ( scheduleID->rules == NULL){
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Failed to allocate memory for rules in WeeklySchedule.c.");
+          }
 
           n_rulesInMem = scheduleID->n_rows_in;
         } else if (foundHeader == 0) {
+          weeklyScheduleFreeInit(scheduleID);
+          weeklyScheduleFree(scheduleID);
           ModelicaFormatError("Illegal file format, no header was found when reading weekly schedule '%s'.", name);
         } else if (tokensInLine == 0) {
           /* 0 tokens have been found on this line, so we're parsing a date/time */
-          const int ncharsDays = strcspn(token, ":");
+          const int ncharsDays = strcspn(scheduleID->token, ":");
           timeStamp = 0;
           if (tokenLen  != ncharsDays) {
             double val;
-            const int ncharsHour = strcspn(token + ncharsDays + 1, ":");
-
-            strncpy(buff2, token + ncharsDays + 1, ncharsHour);
-            buff2[ncharsHour] = '\0';
-            if (sscanf(buff2, "%lf", &val) != 1) {
-              ModelicaFormatError("Error in float conversion in hours when reading weekly schedule '%s'. Found token %s with length %i", name, buff2, ncharsHour);
+            const int ncharsHour = strcspn(scheduleID->token + ncharsDays + 1, ":");
+
+            strncpy(scheduleID->buff2, scheduleID->token + ncharsDays + 1, ncharsHour);
+            scheduleID->buff2[ncharsHour] = '\0';
+            if (sscanf(scheduleID->buff2, "%lf", &val) != 1) {
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
+              ModelicaFormatError("Error in float conversion in hours when reading weekly schedule '%s'. Found token %s with length %i", name, scheduleID->buff2, ncharsHour);
             }
             if (val > 24 || val < 0) {
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
               ModelicaFormatError("Unexpected value for hour: '%f' when reading weekly schedule '%s', should be between 0 and 24.", val, name);
             }
             timeStamp += val * 3600;
 
             if (tokenLen != ncharsHour + ncharsDays + 1) {
-              const int ncharsMinutes = strcspn(token + ncharsDays + ncharsHour + 2, ":");
-              strncpy(buff2, token + ncharsDays + ncharsHour + 2, ncharsMinutes);
-              buff2[ncharsMinutes] = '\0';
-              if (sscanf(buff2, "%lf", &val) != 1) {
+              const int ncharsMinutes = strcspn(scheduleID->token + ncharsDays + ncharsHour + 2, ":");
+              strncpy(scheduleID->buff2, scheduleID->token + ncharsDays + ncharsHour + 2, ncharsMinutes);
+              scheduleID->buff2[ncharsMinutes] = '\0';
+              if (sscanf(scheduleID->buff2, "%lf", &val) != 1) {
+                weeklyScheduleFreeInit(scheduleID);
+                weeklyScheduleFree(scheduleID);
                 ModelicaFormatError("Error in float conversion in minutes when reading weekly schedule '%s'.", name);
               }
               if (val > 60 || val < 0) {
+                weeklyScheduleFreeInit(scheduleID);
+                weeklyScheduleFree(scheduleID);
                 ModelicaFormatError("Unexpected value for minute: '%f' when reading weekly schedule '%s', should be between 0 and 60.", val, name);
               }
               timeStamp += val * 60;
 
               if (tokenLen != ncharsMinutes + ncharsHour + ncharsDays + 2) {
                 const int ncharsSeconds = tokenLen - ncharsMinutes - ncharsHour - ncharsDays - 2;
-                strncpy(buff2, token + ncharsDays + ncharsHour + ncharsMinutes + 3, ncharsSeconds);
-                buff2[ncharsSeconds] = '\0';
-                if (sscanf(buff2, "%lf", &val) != 1) {
+                strncpy(scheduleID->buff2, scheduleID->token + ncharsDays + ncharsHour + ncharsMinutes + 3, ncharsSeconds);
+                scheduleID->buff2[ncharsSeconds] = '\0';
+                if (sscanf(scheduleID->buff2, "%lf", &val) != 1) {
+                  weeklyScheduleFreeInit(scheduleID);
+                  weeklyScheduleFree(scheduleID);
                   ModelicaFormatError("Error in float conversion in seconds when reading weekly schedule '%s'.", name);
                 }
                 if (val > 60 || val < 0) {
+                  weeklyScheduleFreeInit(scheduleID);
+                  weeklyScheduleFree(scheduleID);
                   ModelicaFormatError("Unexpected value for seconds: '%f' when reading weekly schedule '%s', should be between 0 and 60.", val, name);
                 }
                 timeStamp += val;
               }
             }
           }
-          strncpy(buff2, token, ncharsDays);
-          buff2[ncharsDays] = '\0';
+          strncpy(scheduleID->buff2, scheduleID->token, ncharsDays);
+          scheduleID->buff2[ncharsDays] = '\0';
 
 
           /* loop over all days (comma separated) and for each date, add a rule */
           while ( 1 ) {
-            char * startIndex = buff2 + offset;
+            char * startIndex = scheduleID->buff2 + offset;
             double t_day, time_i;
             int nchars = strcspn(startIndex, ",");
 
             if (nchars != 3 ) {
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
               ModelicaFormatError("Unexpected day format when reading weekly schedule '%s': %s.", name, startIndex);
             }
 
@@ -261,30 +328,42 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
             } else if (strncmp("sun", startIndex, 3) == 0) {
               t_day = 6 * 3600 * 24;
             } else {
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
               ModelicaFormatError("Unexpected day format when parsing weekday '%s': %s.", name, startIndex);
             }
 
             /* expand the memory if the initially assigned memory block does not suffice*/
             if (rule_i >= n_rulesInMem) {
               n_rulesInMem += scheduleID->n_rows_in;
-              rules = (TimeDataTuple**)realloc(rules, sizeof(TimeDataTuple*) * n_rulesInMem);
-              if (rules == NULL) {
+              scheduleID->rules = (TimeDataTuple**)realloc(scheduleID->rules, sizeof(TimeDataTuple*) * n_rulesInMem);
+              if (scheduleID->rules == NULL) {
+                weeklyScheduleFreeInit(scheduleID);
+                weeklyScheduleFree(scheduleID);
                 ModelicaFormatError("Failed to reallocate memory when reading weekly schedule '%s'.", name);
               }
             }
 
             time_i = timeStamp + t_day;
-            rules[rule_i] = (TimeDataTuple*)calloc(sizeof(TimeDataTuple), 1);
-            if ( rules[rule_i] == NULL)
+            scheduleID->rules[rule_i] = (TimeDataTuple*)calloc(sizeof(TimeDataTuple), 1);
+            if ( scheduleID->rules[rule_i] == NULL){
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
               ModelicaFormatError("Failed to allocate memory for rules[rule_i] in WeeklySchedule.c.");
-            rules[rule_i]->time = time_i;
-            rules[rule_i]->data = (double*)calloc(sizeof(double), (scheduleID->n_cols_in - 1));
-            if ( rules[rule_i]->data == NULL)
+            }
+            scheduleID->n_allocatedRules++;
+
+            scheduleID->rules[rule_i]->time = time_i;
+            scheduleID->rules[rule_i]->data = (double*)calloc(sizeof(double), (scheduleID->n_cols_in - 1));
+            if ( scheduleID->rules[rule_i]->data == NULL){
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
               ModelicaFormatError("Failed to allocate memory for rules[rule_i]->data in WeeklySchedule.c.");
-            rule_i++;
+            }
+            scheduleID->n_allocatedRulesData++;
 
+            rule_i++;
             n_rulesInRow++;
-            n_rowsUnpacked++;
             if (offset == 0) /* only for the first rule in this row*/
               n_rowsPacked++;
 
@@ -300,30 +379,37 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
 
           /* a token has been found on this line before, so we're parsing some numerical data*/
           if (tokensInLine >= scheduleID->n_cols_in) {
+            weeklyScheduleFreeInit(scheduleID);
+            weeklyScheduleFree(scheduleID);
             ModelicaFormatError("Too many columns on row %i when reading weekly schedule '%s'.", line, name);
           }
 
-          if (sscanf(token, "%lf", &val) != 1) {
-            if (token[0] == '-') {
+          if (sscanf(scheduleID->token, "%lf", &val) != 1) {
+            if (scheduleID->token[0] == '-') {
               val = HUGE_VAL; /*convert the wildcard in a double representation*/
             } else {
-              ModelicaFormatError("Invalid format for float %s  when reading weekly schedule '%s'.", token, name);
+              weeklyScheduleFreeInit(scheduleID);
+              weeklyScheduleFree(scheduleID);
+              ModelicaFormatError("Invalid format for float %s  when reading weekly schedule '%s'.", scheduleID->token, name);
             }
 
           }
           /* Set the data for all rules that result from this row.*/
           for (i = rule_i - n_rulesInRow; i < rule_i; ++i) {
-            rules[i]->data[tokensInLine - 1] = val;
+            scheduleID->rules[i]->data[tokensInLine - 1] = val;
           }
 
           tokensInLine++;
         } else {
+          weeklyScheduleFreeInit(scheduleID);
+          weeklyScheduleFree(scheduleID);
           ModelicaFormatError("Logic error when reading weekly schedule '%s'.", name); /*should not be able to end up here*/
         }
-        free(buff2);
       }
       if (c == '\n') { /*reset some internal variables*/
         if (tokensInLine > 0 && tokensInLine != scheduleID->n_cols_in) {
+          weeklyScheduleFreeInit(scheduleID);
+          weeklyScheduleFree(scheduleID);
           ModelicaFormatError("Incorrect number of columns on line %i when reading weekly schedule '%s'.", line, name);
         }
         line++;
@@ -333,29 +419,37 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
       }
     }
   }
-  if (tableOnFile){
-    fclose(fp);
-  }
 
   if (n_newLines==0){
+    weeklyScheduleFreeInit(scheduleID);
+    weeklyScheduleFree(scheduleID);
     ModelicaFormatError("In weekly schedule '%s': The provided %s is incorrectly formatted since it does not contain newline characters.", name, tableOnFile ? "file": "string parameter");
   }
 
   if (n_rowsPacked != scheduleID->n_rows_in) {
+    weeklyScheduleFreeInit(scheduleID);
+    weeklyScheduleFree(scheduleID);
     ModelicaFormatError("Incorrect number of rows when reading weekly schedule '%s': %i instead of %i.", name, n_rowsPacked, scheduleID->n_rows_in);
   }
-  if (scheduleID->n_cols_in < 1)
+  if (scheduleID->n_cols_in < 1){
+      weeklyScheduleFreeInit(scheduleID);
+      weeklyScheduleFree(scheduleID);
       ModelicaFormatError("The number of columns in the weekly schedule '%s' is %i, which is too small. ", name, scheduleID->n_cols_in);
+  }
 
   /* sort all data by time stamp*/
-  qsort(rules, rule_i, sizeof(TimeDataTuple*), cmpfun);
+  qsort(scheduleID->rules, rule_i, sizeof(TimeDataTuple*), cmpfun);
 
   {
     /* working vector with zero initial value*/
-    lastData = (double*)calloc(sizeof(double), scheduleID->n_cols_in - 1);
-    if (lastData == NULL)
+    scheduleID->lastData = (double*)calloc(sizeof(double), scheduleID->n_cols_in - 1);
+    if (scheduleID->lastData == NULL){
+      weeklyScheduleFreeInit(scheduleID);
+      weeklyScheduleFree(scheduleID);
       ModelicaFormatError("Failed to allocate memory for lastData in WeeklySchedule.c., scheduleID->n_cols_in -1 = %d", scheduleID->n_cols_in - 1);
-    memset(lastData, (char)(double)0, scheduleID->n_cols_in - 1); /* set vector to zero initial guess*/
+    }
+
+    memset(scheduleID->lastData, (char)(double)0, scheduleID->n_cols_in - 1); /* set vector to zero initial guess*/
 
     /* Loop over all data and fill in wildcards using the last preceeding value.*/
     /* This may wrap back to the end of last week, therefore loop the data twice.*/
@@ -364,41 +458,60 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
     for (i = 0; i < 2; ++i) {
       for (j = 0; j < rule_i; ++j) {
         for (k = 0; k < scheduleID->n_cols_in - 1; ++k) {
-          if ( rules[j]->data[k] != HUGE_VAL ) {
-            lastData[k] = rules[j]->data[k];
+          if ( scheduleID->rules[j]->data[k] != HUGE_VAL ) {
+            scheduleID->lastData[k] = scheduleID->rules[j]->data[k];
           } else if (i > 0) {
             /* only on the second pass, since otherwise the default value is filled in permanently and
                information from the back of the domain can't be recycled */
-            rules[j]->data[k] = lastData[k];
+            scheduleID->rules[j]->data[k] = scheduleID->lastData[k];
           }
         }
       }
     }
-    free(lastData);
   }
 
   /* store data for later use */
   scheduleID->t_offset = t_offset;
-  scheduleID->n_rowsUnpacked = n_rowsUnpacked;
   scheduleID->previousIndex = 0;
-  scheduleID->schedule = rules;
   scheduleID->previousTimestamp = HUGE_VAL;
 
-  free(token);
+  weeklyScheduleFreeInit(scheduleID);
 
   return (void*) scheduleID;
 }
 
+void weeklyScheduleFreeInit(void * ID) {
+  WeeklySchedule* scheduleID = (WeeklySchedule*)ID;
+
+  if (scheduleID->lastData != NULL)
+    free(scheduleID->lastData);
+
+  if (scheduleID->token != NULL)
+    free(scheduleID->token);
+
+  if (scheduleID->fp != NULL)
+    fclose(scheduleID->fp);
+
+  if (scheduleID->buff2 != NULL)
+    free(scheduleID->buff2);
+
+}
+
+
 void weeklyScheduleFree(void * ID) {
   WeeklySchedule* scheduleID = (WeeklySchedule*)ID;
 
   int i;
-  for (i = 0; i < scheduleID->n_rowsUnpacked; ++i) {
-    free(scheduleID->schedule[i]->data);
-    free(scheduleID->schedule[i]);
+  for (i = 0; i < scheduleID->n_allocatedRulesData; ++i) {
+    free(scheduleID->rules[i]->data);
+  }
+  for (i = 0; i < scheduleID->n_allocatedRules; ++i) {
+    free(scheduleID->rules[i]);
   }
 
-  free(scheduleID->schedule);
+  if (scheduleID->rules != NULL)
+    free(scheduleID->rules);
+
   free(ID);
   ID = NULL;
 }
@@ -413,6 +526,8 @@ double getScheduleValue(void * ID, const int column, const double modelicaTime)
   int i;
   const int columnIndex = column - 1; /* Since we do not store the time indices in the data table */
 
+  /* Not calling weeklyScheduleFreeInit() or weeklyScheduleFree() since weeklyScheduleFreeInit() has already been called at the end of the
+  initialization and Modelica will call weeklyScheduleFree() upon a call of ModelicaFormatError) */
   if (column < 0 || column > scheduleID->n_cols_in - 1) {
     ModelicaFormatError("The requested column index '%i' is outside of the table range.", column + 1);
   }
@@ -423,28 +538,28 @@ double getScheduleValue(void * ID, const int column, const double modelicaTime)
 
   if (time == scheduleID->previousTimestamp) {
     i = scheduleID->previousIndex;
-  } else if (time > scheduleID->schedule[scheduleID->previousIndex]->time) {
-    for (i = scheduleID->previousIndex; i < scheduleID->n_rowsUnpacked - 1; i ++) {
-      if (scheduleID->schedule[i + 1]->time > time) {
+  } else if (time > scheduleID->rules[scheduleID->previousIndex]->time) {
+    for (i = scheduleID->previousIndex; i < scheduleID->n_allocatedRules - 1; i ++) {
+      if (scheduleID->rules[i + 1]->time > time) {
         break;
       }
     }
   } else {
     for (i = scheduleID->previousIndex; i > 0; i--) {
-      if (scheduleID->schedule[i - 1]->time < time) {
+      if (scheduleID->rules[i - 1]->time < time) {
         i = i - 1;
         break;
       }
     }
     /* if time is smaller than the first row, wrap back to the end of the week */
-    if (i == 0 && scheduleID->schedule[0]->time > time) {
-      i = scheduleID->n_rowsUnpacked - 1;
+    if (i == 0 && scheduleID->rules[0]->time > time) {
+      i = scheduleID->n_allocatedRules - 1;
     }
   }
   scheduleID->previousIndex = i;
   scheduleID->previousTimestamp = time;
 
-  return scheduleID->schedule[i]->data[columnIndex];
+  return scheduleID->rules[i]->data[columnIndex];
 }
 
 #endif
diff --git a/Buildings/Resources/C-Sources/WeeklySchedule.h b/Buildings/Resources/C-Sources/WeeklySchedule.h
index 4b52a6db2e9..3a4105e2610 100644
--- a/Buildings/Resources/C-Sources/WeeklySchedule.h
+++ b/Buildings/Resources/C-Sources/WeeklySchedule.h
@@ -16,6 +16,7 @@
 #ifndef WEEKCAL_h
 #define WEEKCAL_h
 
+
 typedef struct TimeDataTuple {
   double time;	/* Time relative to monday midnight. */
   double *data; /* Corresponding column data */
@@ -26,20 +27,28 @@ typedef struct WeeklySchedule {
   double t_offset;    /* Time offset for monday, midnight. */
   int n_rows_in;      /* Number of input rows */
   int n_cols_in;      /* Number of input columns */
-  int n_rowsUnpacked; /* Number of rows: number of rows after unpacking the date */
 
   double previousTimestamp; /* Time where the schedule was called the previous time */
   int previousIndex;        /* Index where the schedule was called the previous time */
 
-  struct TimeDataTuple ** schedule;
+  int n_allocatedRules;
+  int n_allocatedRulesData;
+  double * lastData;
+  char * token;
+  FILE* fp;
+  char* buff2;
+  struct TimeDataTuple **rules;
+
 } WeeklySchedule;
 
 
 
-void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t_offset, char* stringData);
+void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t_offset, const char* stringData);
 
 void weeklyScheduleFree(void * ID);
 
+void weeklyScheduleFreeInit(void * ID);
+
 double getScheduleValue(void * ID, const int column, const double time);
 
 #endif
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos b/Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos
rename to Buildings/Resources/Data/DHC/Loads/BaseClasses/Validation/RefBldgLargeOfficeNew2004_7.1_5.0_3C_USA_CA_SAN_FRANCISCO.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/.gitignore b/Buildings/Resources/Data/DHC/Loads/Examples/.gitignore
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/.gitignore
rename to Buildings/Resources/Data/DHC/Loads/Examples/.gitignore
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Floor.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_ICT.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Meeting.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Office.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Restroom.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt b/Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt
rename to Buildings/Resources/Data/DHC/Loads/Examples/BaseClasses/GeojsonExportRC/OfficeBuilding/InternalGains_Storage.txt
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos b/Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/MediumOffice-90.1-2010-5A.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos b/Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissHospital_20190916.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/SwissHospital_20190916.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos b/Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissOffice_20190916.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/SwissOffice_20190916.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos b/Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/Examples/SwissResidential_20190916.mos
rename to Buildings/Resources/Data/DHC/Loads/Examples/SwissResidential_20190916.mos
diff --git a/Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos b/Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos
similarity index 100%
rename from Buildings/Resources/Data/Experimental/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos
rename to Buildings/Resources/Data/DHC/Loads/HotWater/DHW_ApartmentMidRise.mos
diff --git a/Buildings/Resources/Data/scheduleWindows.txt b/Buildings/Resources/Data/scheduleWindows.txt
new file mode 100644
index 00000000000..beabafdb0c4
--- /dev/null
+++ b/Buildings/Resources/Data/scheduleWindows.txt
@@ -0,0 +1,7 @@
+# Comments start with a #
+# The user is responsible for making sure that the header dimensions are correct
+double tab1(3,5) # Comments can be added at the end of a line for adding local documentation
+mon:0:0:10          -  3   1  -
+# Comments can be added in the table too
+tue,thu:20:30:59  123  -  45  -
+wed                12  1   4  -
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt
index 5a326980dc1..196ed9a5919 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/bestPractice.rst.txt
@@ -42,9 +42,9 @@ Building large system models
 When creating a large system model, it is typically easier to build the system model
 through the composition of subsystem models that can be tested in isolation. For example,
 the package
-`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
+`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
 contains small test models that are used to test individual components in the large system model
-`Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
+`Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
 Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.
 
 
@@ -270,9 +270,9 @@ a fluid port represents the physical phenomena that was intended to model.
 
 However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
 This may be achieved by using an instance of the model
-`Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
+`Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
 as shown in the left figure below, which is derived from the test model
-`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
+`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
 
 .. _fig_flu_cor_wro:
 
@@ -283,7 +283,7 @@ as shown in the left figure below, which is derived from the test model
 
 In :numref:`fig_flu_cor_wro` (a), the mixing points have been correctly defined by
 use of the model
-`Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_.
+`Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_.
 However, in :numref:`fig_flu_cor_wro` (b), all connections are made to the port of the instance ``spl2``.
 This results in the same configuration as is shown in :numref:`fig_flu_cor_wro` (c).
 This is certainly not the intention of the modeler, as this causes all flows to be mixed in the port.
@@ -301,13 +301,13 @@ Use of sensors in fluid flow systems
 When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on
 the direction of the flow or not. If the quantity depends on the flow direction,
 such as temperature or relative humidity, then sensors with two ports from the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
+`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
 library should be used. These sensors have a more efficient implementation than sensors with
 one port for situations where the flow reverses its direction.
 The proper use sensors is described in the
-`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_UsersGuide.html>`_
+`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_UsersGuide.html>`_
 of the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
+`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
 package.
 
 
@@ -319,9 +319,9 @@ Reference pressure for incompressible fluids such as water
 This section explains how to set a reference pressure for fluids that model
 the flow as :term:`incompressible flow`,
 such as
-`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
+`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
 and
-`Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
+`Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
 
 Consider the flow circuit shown in :numref:`fig_flow_cir` that consists of a pump or fan,
 a flow resistance and a volume.
@@ -354,7 +354,7 @@ In this situation, attempting to translate the model leads, in Dymola, to the fo
    The number of scalar Real equation elements are 58.
 
 Similarly, if the medium model
-`Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
+`Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
 which models density as a function of pressure and enthalpy, is used, then
 the model is well-defined, but the pressure increases the longer the pump runs.
 The reason is that the pump adds heat to the water. When the water temperature
@@ -364,7 +364,7 @@ the pressure increases from :math:`1 \, \mathrm{bars}` to :math:`150 \, \mathrm{
 To avoid this singularity or increase in pressure,
 use a model that imposes a pressure source and that accounts for the expansion of the fluid.
 For example, use
-`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
+`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
 
 .. _fig_flow_cir_wit_bou:
@@ -376,15 +376,15 @@ to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
    provides a reference presssure.
 
 Alternatively, you may use
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
+`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
 but
-`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
+`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 usually leads to simpler equations than
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
+`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
 Note that the medium that flows out of the fluid port of
-`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
+`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 is at a fixed temperature, while the model
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
+`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
 conserves energy.
 However, since the thermal expansion of the fluid is usually small,
 this effect can be neglected in most building HVAC applications.
@@ -393,10 +393,10 @@ this effect can be neglected in most building HVAC applications.
 
    In each water circuit, there must be exactly on instance of
    `Buildings.Fluid.Sources.Boundary_pT
-   <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_,
+   <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_,
    or instance of
    `Buildings.Fluid.Storage.ExpansionVessel
-   <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
+   <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
 
    If there is more than one such device, then there are multiple
    points in the system that set the reference static pressure.
@@ -592,5 +592,5 @@ is produced. This shows the iteration variables and their start values.
 These start values can be overwritten in the model.
 
 
-.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
-.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized
+.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
+.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt
index 3eb7fbba829..06ab4da9321 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/development.rst.txt
@@ -24,13 +24,13 @@ Models, blocks and functions that are contributed need to adhere to the followin
  * They should be of general interest to other users and well documented and tested.
  * They need to follow the coding conventions described in
 
-   - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_ and
+   - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_ and
    - the `Style Guide` provided in :numref:`sec_sty_gui`
 
- * They need to be made available under the `Modelica Buildings Library license <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License>`_.
+ * They need to be made available under the `Modelica Buildings Library license <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License>`_.
  * For models of thermofluid flow components, they need to be based on the base classes in
-   `Buildings.Fluid.Interfaces <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces.html>`_,
-   which are described in the `user guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ of this package.
+   `Buildings.Fluid.Interfaces <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces.html>`_,
+   which are described in the `user guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ of this package.
    Otherwise, it becomes difficult to ensure that the implementation is numerically robust.
 
 .. _sec_sty_gui:
@@ -408,8 +408,8 @@ Adding a new class, such as a model or a function, is usually easiest by extendi
 In many cases, the similar component already exists.
 In this situation, it is recommended to copy and modify a similar component.
 If both components share a significant amount of similar code, then a base class should be introduced that implements the common code.
-See for example `Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_BaseClasses.html#Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor>`_ which is shared by all sensors with one fluid port in the package
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_.
+See for example `Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_BaseClasses.html#Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor>`_ which is shared by all sensors with one fluid port in the package
+`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_.
 
 The next sections give guidance that is specific to the implementation of thermofluid flow devices, pressure drop models and control sequences.
 
@@ -417,20 +417,20 @@ Thermofluid flow device
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 To add a component of a thermofluid flow device, the package
-`Buildings.Fluid.Interface <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces.html>`_  contains basic classes that can be extended.
-See `Buildings.Fluid.Interface.UsersGuide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ for a description of these classes.
+`Buildings.Fluid.Interface <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces.html>`_  contains basic classes that can be extended.
+See `Buildings.Fluid.Interface.UsersGuide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ for a description of these classes.
 Alternatively, simple models such as the models below may be used as a starting point for implementing new models for thermofluid flow devices:
 
-`Buildings.Fluid.HeatExchangers.HeaterCooler_u <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.HeaterCooler_u>`_
+`Buildings.Fluid.HeatExchangers.HeaterCooler_u <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.HeaterCooler_u>`_
   For a device that adds heat to a fluid stream.
 
-`Buildings.Fluid.Humidifiers.Humidifier_u <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Humidifiers.html#Buildings.Fluid.Humidifiers.Humidifier_u>`_
+`Buildings.Fluid.Humidifiers.Humidifier_u <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Humidifiers.html#Buildings.Fluid.Humidifiers.Humidifier_u>`_
   For a device that adds humidity to a fluid stream.
 
-`Buildings.Fluid.Chillers.Carnot_y <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Chillers.html#Buildings.Fluid.Chillers.Carnot_y>`_
+`Buildings.Fluid.Chillers.Carnot_y <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Chillers.html#Buildings.Fluid.Chillers.Carnot_y>`_
   For a device that exchanges heat between two fluid streams.
 
-`Buildings.Fluid.MassExchangers.ConstantEffectiveness <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_MassExchangers.html#Buildings.Fluid.MassExchangers.ConstantEffectiveness>`_
+`Buildings.Fluid.MassExchangers.ConstantEffectiveness <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_MassExchangers.html#Buildings.Fluid.MassExchangers.ConstantEffectiveness>`_
   For a device that exchanges heat and humidity between two fluid streams.
 
 .. _fig_merkel:
@@ -454,11 +454,11 @@ Pressure drop
 
 When implementing equations for pressure drop, it is recommended
 to expand the base class
-`Buildings.Fluid.BaseClasses.PartialResistance <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance>`_.
+`Buildings.Fluid.BaseClasses.PartialResistance <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance>`_.
 Models should allow computing the flow resistance as a quadratic function
 with regularization near zero as implemented in
-`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp>`_ and in
-`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow>`_.
+`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp>`_ and in
+`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow>`_.
 The governing equation is
 
 .. math::
@@ -514,7 +514,7 @@ The following rules need to be followed, in addition to the guidelines described
 
 #. The naming of parameters, inputs, outputs and instances must follow the naming
    conventions in
-   `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
+   `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
    Avoid providing duplicate information in the instance name, for example if the block is within the ``Boilers`` package,
    the instance name must not contain ``boi``. Ensure that the instance name is unambiguous when viewed in a top level
    controller block.
@@ -671,7 +671,7 @@ The validation models are part of automated unit tests as described at the
 
 For simple models, the validation can be against analytic solutions.
 This is for example done in
-`Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop>`_
+`Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop>`_
 which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.
 
 For complex thermofluid flow devices, a comparative model validation needs to be done, for example
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt
index 55e1c46105b..01ddbe3b3b3 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/gettingStarted.rst.txt
@@ -40,7 +40,7 @@ or by replacing existing component models by new ones.
 The example models can be found in the packages `Examples`.
 
 Study the detailed tutorials with step-by-step instructions for how to build system models,
-which can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_Tutorial.html>`_.
+which can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_Tutorial.html>`_.
 
 Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples`
 are easier to understand than fluid flow models because;
@@ -51,7 +51,7 @@ are easier to understand than fluid flow models because;
 
 To get started with Spawn of EnergyPlus, we recommend to first familiarize yourself with Modelica, as described above.
 Next, read the
-`user guide for the Spawn models <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_ThermalZones_EnergyPlus_9_6_0_UsersGuide.html>`_
+`user guide for the Spawn models <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_ThermalZones_EnergyPlus_9_6_0_UsersGuide.html>`_
 which provides step-by-step instructions and points to various examples.
 
 
@@ -65,7 +65,7 @@ Literature for Developers
 -------------------------
 
 It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors.
-Stream connectors are explained in the Modelica language definition, available at https://modelica.org/documents,
+Stream connectors are explained in the Modelica language definition, available at https://modelica.org/language,
 and in the paper Franke et al. [Fra2009a]_.
 The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library.
 Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_.
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/_sources/performance.rst.txt b/Buildings/Resources/Documentation/userGuide/build/html/_sources/performance.rst.txt
index 5ab89802d21..8d24a727f88 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/_sources/performance.rst.txt
+++ b/Buildings/Resources/Documentation/userGuide/build/html/_sources/performance.rst.txt
@@ -78,8 +78,8 @@ The default value is ``raiseTime=120`` seconds.
           closed loop control performance.
 
 For further information, see the
-`User's Guide of the flow machine package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers_UsersGuide.html>`_, and the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
+`User's Guide of the flow machine package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers_UsersGuide.html>`_, and the
+`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
 
 
 Fluid flow systems
@@ -92,9 +92,9 @@ In fluid flow systems, flow junctions where mass flow rates separate and mix can
 This leads to larger systems of coupled equations that need to be solved,
 which often causes larger computing time and can sometimes cause convergence problems.
 To decouple these systems of equations, in the model of a flow junction
-(`Buildings.Fluid.FixedResistances.Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_),
+(`Buildings.Fluid.FixedResistances.Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_),
 or in models for fans or pumps (such as the model
-`Buildings.Fluid.Movers.SpeedControlled_y <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y>`_),
+`Buildings.Fluid.Movers.SpeedControlled_y <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y>`_),
 the parameter ``dynamicBalance`` can be set to ``true``.
 This adds a control volume at the fluid junction that can decouple the system of equations.
 
@@ -174,7 +174,7 @@ The valve model then computes the pressure drop using :math:`\bar k` and the sam
 Thus, the composite model has the same :term:`valve authority` and mass flow rate, but a nonlinear equation can be avoided.
 
 For more details, see the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
+`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
 
 
 
@@ -183,7 +183,7 @@ Prescribed mass flow rate
 
 For some system models, the mass flow rate can be prescribed by using an idealized pump or fan
 (model
-`Buildings.Fluid.Movers.FlowControlled_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow>`_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T>`_).
+`Buildings.Fluid.Movers.FlowControlled_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow>`_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T>`_).
 Using these models avoids having to compute the intersection of the fan curve and the flow resistance.
 In some situations, this can lead to faster and more robust simulation.
 
@@ -258,12 +258,12 @@ Adding dynamics may be achieved using a formulation such as
 		der(h)=(hMed-h)/tau;
 
 where ``tau``>0 is a time constant. See, for example,
-`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort>`_
+`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort>`_
 for a robust implementation.
 
 .. note::
    In the package
-   `Buildings.Utilities.Math <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math>`_
+   `Buildings.Utilities.Math <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math>`_
    the functions and blocks whose names start with ``smooth`` can be used to avoid events.
 
 
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html b/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html
index f96cac4fb3e..b24de1ecd6e 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/bestPractice.html
@@ -212,9 +212,9 @@ <h2><span class="section-number">2.2. </span>Building large system models<a clas
 <p>When creating a large system model, it is typically easier to build the system model
 through the composition of subsystem models that can be tested in isolation. For example,
 the package
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples">Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples">Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples</a>
 contains small test models that are used to test individual components in the large system model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant">Buildings.Examples.ChillerPlant</a>.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant">Buildings.Examples.ChillerPlant</a>.
 Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.</p>
 </section>
 <section id="propagating-parameters-and-media-packages">
@@ -482,9 +482,9 @@ <h3><span class="section-number">2.4.2. </span>Modeling of fluid junctions<a cla
 </figure>
 <p>However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
 This may be achieved by using an instance of the model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Junction</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Junction</a>
 as shown in the left figure below, which is derived from the test model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop">BoilerPolynomialClosedLoop</a></p>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop">BoilerPolynomialClosedLoop</a></p>
 <figure class="align-default" id="id11">
 <span id="fig-flu-cor-wro"></span><a class="reference internal image-reference" href="_images/fluidJunctionMixingSplitter.svg"><img alt="_images/fluidJunctionMixingSplitter.svg" src="_images/fluidJunctionMixingSplitter.svg" width="1200px" /></a>
 <figcaption>
@@ -493,7 +493,7 @@ <h3><span class="section-number">2.4.2. </span>Modeling of fluid junctions<a cla
 </figure>
 <p>In <a class="reference internal" href="#fig-flu-cor-wro"><span class="std std-numref">Fig. 2.3</span></a> (a), the mixing points have been correctly defined by
 use of the model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Junction</a>.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Junction</a>.
 However, in <a class="reference internal" href="#fig-flu-cor-wro"><span class="std std-numref">Fig. 2.3</span></a> (b), all connections are made to the port of the instance <code class="docutils literal notranslate"><span class="pre">spl2</span></code>.
 This results in the same configuration as is shown in <a class="reference internal" href="#fig-flu-cor-wro"><span class="std std-numref">Fig. 2.3</span></a> (c).
 This is certainly not the intention of the modeler, as this causes all flows to be mixed in the port.
@@ -508,13 +508,13 @@ <h3><span class="section-number">2.4.3. </span>Use of sensors in fluid flow syst
 <p>When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on
 the direction of the flow or not. If the quantity depends on the flow direction,
 such as temperature or relative humidity, then sensors with two ports from the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>
 library should be used. These sensors have a more efficient implementation than sensors with
 one port for situations where the flow reverses its direction.
 The proper use sensors is described in the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_UsersGuide.html">User’s Guide</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_UsersGuide.html">User’s Guide</a>
 of the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>
 package.</p>
 </section>
 <section id="reference-pressure-for-incompressible-fluids-such-as-water">
@@ -522,9 +522,9 @@ <h3><span class="section-number">2.4.3. </span>Use of sensors in fluid flow syst
 <p>This section explains how to set a reference pressure for fluids that model
 the flow as <a class="reference internal" href="glossary.html#term-incompressible-flow"><span class="xref std std-term">incompressible flow</span></a>,
 such as
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Water.html#Buildings.Media.Water">Buildings.Media.Water</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Water.html#Buildings.Media.Water">Buildings.Media.Water</a>
 and
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater">Buildings.Media.Antifreeze.PropyleneGlycolWater</a>.</p>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater">Buildings.Media.Antifreeze.PropyleneGlycolWater</a>.</p>
 <p>Consider the flow circuit shown in <a class="reference internal" href="#fig-flow-cir"><span class="std std-numref">Fig. 2.4</span></a> that consists of a pump or fan,
 a flow resistance and a volume.</p>
 <figure class="align-default" id="id12">
@@ -551,7 +551,7 @@ <h3><span class="section-number">2.4.3. </span>Use of sensors in fluid flow syst
 </pre></div>
 </div>
 <p>Similarly, if the medium model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity">Buildings.Media.Specialized.Water.TemperatureDependentDensity</a>,
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity">Buildings.Media.Specialized.Water.TemperatureDependentDensity</a>,
 which models density as a function of pressure and enthalpy, is used, then
 the model is well-defined, but the pressure increases the longer the pump runs.
 The reason is that the pump adds heat to the water. When the water temperature
@@ -560,7 +560,7 @@ <h3><span class="section-number">2.4.3. </span>Use of sensors in fluid flow syst
 <p>To avoid this singularity or increase in pressure,
 use a model that imposes a pressure source and that accounts for the expansion of the fluid.
 For example, use
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
 to form the system model shown in <a class="reference internal" href="#fig-flow-cir-wit-bou"><span class="std std-numref">Fig. 2.5</span></a>.</p>
 <figure class="align-default" id="id13">
 <span id="fig-flow-cir-wit-bou"></span><a class="reference internal image-reference" href="_images/flowCircuitWithBoundary.svg"><img alt="_images/flowCircuitWithBoundary.svg" src="_images/flowCircuitWithBoundary.svg" width="400pt" /></a>
@@ -570,24 +570,24 @@ <h3><span class="section-number">2.4.3. </span>Use of sensors in fluid flow syst
 </figcaption>
 </figure>
 <p>Alternatively, you may use
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>,
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>,
 but
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
 usually leads to simpler equations than
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>.
 Note that the medium that flows out of the fluid port of
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>
 is at a fixed temperature, while the model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>
 conserves energy.
 However, since the thermal expansion of the fluid is usually small,
 this effect can be neglected in most building HVAC applications.</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
 <p>In each water circuit, there must be exactly on instance of
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>,
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT">Buildings.Fluid.Sources.Boundary_pT</a>,
 or instance of
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>.</p>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel">Buildings.Fluid.Storage.ExpansionVessel</a>.</p>
 <p>If there is more than one such device, then there are multiple
 points in the system that set the reference static pressure.
 This will affect the distribution of the mass flow rate.</p>
@@ -642,7 +642,7 @@ <h3><span class="section-number">2.4.5. </span>Nominal Values<a class="headerlin
 <td><p>These parameters may be used to define a point on the flow rate
 versus pressure drop curve. For other mass flow rates, the pressure drop
 is typically adjusted using similarity laws.
-See <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop">PressureDrop</a>.</p></td>
+See <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop">PressureDrop</a>.</p></td>
 </tr>
 <tr class="row-odd"><td><p><code class="docutils literal notranslate"><span class="pre">m_flow_nominal</span></code>
 <code class="docutils literal notranslate"><span class="pre">m_flow_small</span></code></p></td>
@@ -694,7 +694,7 @@ <h3><span class="section-number">2.4.5. </span>Nominal Values<a class="headerlin
 engineering experience can be used to estimate a
 reasonable value for <code class="docutils literal notranslate"><span class="pre">tau</span></code>, and where generally applicable values
 can be used, components already set a default value for <code class="docutils literal notranslate"><span class="pre">tau.</span></code>
-See for example <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized">WetCoilDiscretized</a>.</p>
+See for example <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized">WetCoilDiscretized</a>.</p>
 </td>
 </tr>
 </tbody>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/development.html b/Buildings/Resources/Documentation/userGuide/build/html/development.html
index 125fb67c71a..3b74b0771d4 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/development.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/development.html
@@ -201,14 +201,14 @@ <h2><span class="section-number">5.1. </span>Contributing<a class="headerlink" h
 <li><p>They should be of general interest to other users and well documented and tested.</p></li>
 <li><p>They need to follow the coding conventions described in</p>
 <ul>
-<li><p>the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings library user guide</a> and</p></li>
+<li><p>the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings library user guide</a> and</p></li>
 <li><p>the <cite>Style Guide</cite> provided in <a class="reference internal" href="#sec-sty-gui"><span class="std std-numref">Section 5.3</span></a></p></li>
 </ul>
 </li>
-<li><p>They need to be made available under the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License">Modelica Buildings Library license</a>.</p></li>
+<li><p>They need to be made available under the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License">Modelica Buildings Library license</a>.</p></li>
 <li><p>For models of thermofluid flow components, they need to be based on the base classes in
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces.html">Buildings.Fluid.Interfaces</a>,
-which are described in the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide">user guide</a> of this package.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces.html">Buildings.Fluid.Interfaces</a>,
+which are described in the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide">user guide</a> of this package.
 Otherwise, it becomes difficult to ensure that the implementation is numerically robust.</p></li>
 </ul>
 </div></blockquote>
@@ -557,23 +557,23 @@ <h2><span class="section-number">5.4. </span>Adding a new class<a class="headerl
 In many cases, the similar component already exists.
 In this situation, it is recommended to copy and modify a similar component.
 If both components share a significant amount of similar code, then a base class should be introduced that implements the common code.
-See for example <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_BaseClasses.html#Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor">Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor</a> which is shared by all sensors with one fluid port in the package
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>.</p>
+See for example <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_BaseClasses.html#Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor">Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor</a> which is shared by all sensors with one fluid port in the package
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors">Buildings.Fluid.Sensors</a>.</p>
 <p>The next sections give guidance that is specific to the implementation of thermofluid flow devices, pressure drop models and control sequences.</p>
 <section id="thermofluid-flow-device">
 <h3><span class="section-number">5.4.1. </span>Thermofluid flow device<a class="headerlink" href="#thermofluid-flow-device" title="Permalink to this headline">¶</a></h3>
 <p>To add a component of a thermofluid flow device, the package
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces.html">Buildings.Fluid.Interface</a>  contains basic classes that can be extended.
-See <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide">Buildings.Fluid.Interface.UsersGuide</a> for a description of these classes.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces.html">Buildings.Fluid.Interface</a>  contains basic classes that can be extended.
+See <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide">Buildings.Fluid.Interface.UsersGuide</a> for a description of these classes.
 Alternatively, simple models such as the models below may be used as a starting point for implementing new models for thermofluid flow devices:</p>
 <dl class="simple">
-<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.HeaterCooler_u">Buildings.Fluid.HeatExchangers.HeaterCooler_u</a></dt><dd><p>For a device that adds heat to a fluid stream.</p>
+<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.HeaterCooler_u">Buildings.Fluid.HeatExchangers.HeaterCooler_u</a></dt><dd><p>For a device that adds heat to a fluid stream.</p>
 </dd>
-<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Humidifiers.html#Buildings.Fluid.Humidifiers.Humidifier_u">Buildings.Fluid.Humidifiers.Humidifier_u</a></dt><dd><p>For a device that adds humidity to a fluid stream.</p>
+<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Humidifiers.html#Buildings.Fluid.Humidifiers.Humidifier_u">Buildings.Fluid.Humidifiers.Humidifier_u</a></dt><dd><p>For a device that adds humidity to a fluid stream.</p>
 </dd>
-<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Chillers.html#Buildings.Fluid.Chillers.Carnot_y">Buildings.Fluid.Chillers.Carnot_y</a></dt><dd><p>For a device that exchanges heat between two fluid streams.</p>
+<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Chillers.html#Buildings.Fluid.Chillers.Carnot_y">Buildings.Fluid.Chillers.Carnot_y</a></dt><dd><p>For a device that exchanges heat between two fluid streams.</p>
 </dd>
-<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_MassExchangers.html#Buildings.Fluid.MassExchangers.ConstantEffectiveness">Buildings.Fluid.MassExchangers.ConstantEffectiveness</a></dt><dd><p>For a device that exchanges heat and humidity between two fluid streams.</p>
+<dt><a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_MassExchangers.html#Buildings.Fluid.MassExchangers.ConstantEffectiveness">Buildings.Fluid.MassExchangers.ConstantEffectiveness</a></dt><dd><p>For a device that exchanges heat and humidity between two fluid streams.</p>
 </dd>
 </dl>
 <figure class="align-default" id="id2">
@@ -595,11 +595,11 @@ <h3><span class="section-number">5.4.1. </span>Thermofluid flow device<a class="
 <h3><span class="section-number">5.4.2. </span>Pressure drop<a class="headerlink" href="#pressure-drop" title="Permalink to this headline">¶</a></h3>
 <p>When implementing equations for pressure drop, it is recommended
 to expand the base class
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance">Buildings.Fluid.BaseClasses.PartialResistance</a>.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance">Buildings.Fluid.BaseClasses.PartialResistance</a>.
 Models should allow computing the flow resistance as a quadratic function
 with regularization near zero as implemented in
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp</a> and in
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow</a>.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp</a> and in
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow</a>.
 The governing equation is</p>
 <div class="math notranslate nohighlight">
 \[k = \frac{\dot m}{\sqrt{\Delta p}}\]</div>
@@ -645,7 +645,7 @@ <h3><span class="section-number">5.4.3. </span>Control sequences using the Contr
 <ol class="arabic">
 <li><p>The naming of parameters, inputs, outputs and instances must follow the naming
 conventions in
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings.UsersGuide.Conventions</a>.
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions">Buildings.UsersGuide.Conventions</a>.
 Avoid providing duplicate information in the instance name, for example if the block is within the <code class="docutils literal notranslate"><span class="pre">Boilers</span></code> package,
 the instance name must not contain <code class="docutils literal notranslate"><span class="pre">boi</span></code>. Ensure that the instance name is unambiguous when viewed in a top level
 controller block.
@@ -821,7 +821,7 @@ <h3><span class="section-number">5.4.3. </span>Control sequences using the Contr
 <a class="reference external" href="https://github.com/lbl-srg/modelica-buildings/wiki/Unit-Tests">unit tests wiki page</a>.</p>
 <p>For simple models, the validation can be against analytic solutions.
 This is for example done in
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop">Buildings.Fluid.FixedResistances.PressureDrop</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop">Buildings.Fluid.FixedResistances.PressureDrop</a>
 which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.</p>
 <p>For complex thermofluid flow devices, a comparative model validation needs to be done, for example
 by comparing the result of the Modelica model against the results from EnergyPlus.
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html b/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html
index 8de4f421f78..accebad4224 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/gettingStarted.html
@@ -197,7 +197,7 @@ <h2><span class="section-number">1.2. </span>Running the First Simulations<a cla
 or by replacing existing component models by new ones.
 The example models can be found in the packages <cite>Examples</cite>.</p>
 <p>Study the detailed tutorials with step-by-step instructions for how to build system models,
-which can be found in the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_Tutorial.html">Tutorial package</a>.</p>
+which can be found in the <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_Tutorial.html">Tutorial package</a>.</p>
 <p>Note that heat transfer models, which can be found in <cite>Buildings.HeatTransfer.*.Examples</cite>
 are easier to understand than fluid flow models because;</p>
 <ul class="simple">
@@ -207,7 +207,7 @@ <h2><span class="section-number">1.2. </span>Running the First Simulations<a cla
 </ul>
 <p>To get started with Spawn of EnergyPlus, we recommend to first familiarize yourself with Modelica, as described above.
 Next, read the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_ThermalZones_EnergyPlus_9_6_0_UsersGuide.html">user guide for the Spawn models</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_ThermalZones_EnergyPlus_9_6_0_UsersGuide.html">user guide for the Spawn models</a>
 which provides step-by-step instructions and points to various examples.</p>
 </section>
 <section id="software-requirements">
@@ -217,7 +217,7 @@ <h2><span class="section-number">1.3. </span>Software Requirements<a class="head
 <section id="literature-for-developers">
 <h2><span class="section-number">1.4. </span>Literature for Developers<a class="headerlink" href="#literature-for-developers" title="Permalink to this headline">¶</a></h2>
 <p>It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors.
-Stream connectors are explained in the Modelica language definition, available at <a class="reference external" href="https://modelica.org/documents">https://modelica.org/documents</a>,
+Stream connectors are explained in the Modelica language definition, available at <a class="reference external" href="https://modelica.org/language">https://modelica.org/language</a>,
 and in the paper Franke et al. <a class="reference internal" href="#fra2009a" id="id4"><span>[Fra2009a]</span></a>.
 The <cite>Buildings</cite> library uses similar modeling principles, and the same base classes, as the <cite>Modelica.Fluid</cite> library.
 Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid <a class="reference internal" href="#fra2009b" id="id5"><span>[Fra2009b]</span></a>.</p>
diff --git a/Buildings/Resources/Documentation/userGuide/build/html/performance.html b/Buildings/Resources/Documentation/userGuide/build/html/performance.html
index 0b3712856d4..688d5905dad 100644
--- a/Buildings/Resources/Documentation/userGuide/build/html/performance.html
+++ b/Buildings/Resources/Documentation/userGuide/build/html/performance.html
@@ -247,8 +247,8 @@ <h2><span class="section-number">3.1. </span>Unstable control loops<a class="hea
 closed loop control performance.</p>
 </div>
 <p>For further information, see the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers_UsersGuide.html">User’s Guide of the flow machine package</a>, and the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Actuators_UsersGuide.html">User’s Guide of the actuator package</a>.</p>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers_UsersGuide.html">User’s Guide of the flow machine package</a>, and the
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Actuators_UsersGuide.html">User’s Guide of the actuator package</a>.</p>
 </section>
 <section id="fluid-flow-systems">
 <h2><span class="section-number">3.3. </span>Fluid flow systems<a class="headerlink" href="#fluid-flow-systems" title="Permalink to this headline">¶</a></h2>
@@ -258,9 +258,9 @@ <h3><span class="section-number">3.3.1. </span>Breaking algebraic loops<a class=
 This leads to larger systems of coupled equations that need to be solved,
 which often causes larger computing time and can sometimes cause convergence problems.
 To decouple these systems of equations, in the model of a flow junction
-(<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Buildings.Fluid.FixedResistances.Junction</a>),
+(<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction">Buildings.Fluid.FixedResistances.Junction</a>),
 or in models for fans or pumps (such as the model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y">Buildings.Fluid.Movers.SpeedControlled_y</a>),
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y">Buildings.Fluid.Movers.SpeedControlled_y</a>),
 the parameter <code class="docutils literal notranslate"><span class="pre">dynamicBalance</span></code> can be set to <code class="docutils literal notranslate"><span class="pre">true</span></code>.
 This adds a control volume at the fluid junction that can decouple the system of equations.</p>
 </section>
@@ -330,13 +330,13 @@ <h3><span class="section-number">3.3.2. </span>Reducing nonlinear equations of s
 The valve model then computes the pressure drop using <span class="math notranslate nohighlight">\(\bar k\)</span> and the same equations as described above for the fixed resistances.
 Thus, the composite model has the same <a class="reference internal" href="glossary.html#term-valve-authority"><span class="xref std std-term">valve authority</span></a> and mass flow rate, but a nonlinear equation can be avoided.</p>
 <p>For more details, see the
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Actuators_UsersGuide.html">User’s Guide of the actuator package</a>.</p>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Actuators_UsersGuide.html">User’s Guide of the actuator package</a>.</p>
 </section>
 <section id="prescribed-mass-flow-rate">
 <h3><span class="section-number">3.3.3. </span>Prescribed mass flow rate<a class="headerlink" href="#prescribed-mass-flow-rate" title="Permalink to this headline">¶</a></h3>
 <p>For some system models, the mass flow rate can be prescribed by using an idealized pump or fan
 (model
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow">Buildings.Fluid.Movers.FlowControlled_m_flow</a>) or a source element that outputs the required mass flow rate (such as the model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T">Buildings.Fluid.Sources.MassFlowSource_T</a>).
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow">Buildings.Fluid.Movers.FlowControlled_m_flow</a>) or a source element that outputs the required mass flow rate (such as the model <a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T">Buildings.Fluid.Sources.MassFlowSource_T</a>).
 Using these models avoids having to compute the intersection of the fan curve and the flow resistance.
 In some situations, this can lead to faster and more robust simulation.</p>
 <div class="admonition warning">
@@ -399,12 +399,12 @@ <h3><span class="section-number">3.3.4. </span>Avoiding events<a class="headerli
 </pre></div>
 </div>
 <p>where <code class="docutils literal notranslate"><span class="pre">tau</span></code>&gt;0 is a time constant. See, for example,
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort">Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort">Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort</a>
 for a robust implementation.</p>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
 <p>In the package
-<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math">Buildings.Utilities.Math</a>
+<a class="reference external" href="https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math">Buildings.Utilities.Math</a>
 the functions and blocks whose names start with <code class="docutils literal notranslate"><span class="pre">smooth</span></code> can be used to avoid events.</p>
 </div>
 </section>
diff --git a/Buildings/Resources/Documentation/userGuide/requirements.txt b/Buildings/Resources/Documentation/userGuide/requirements.txt
index ba0007ce6e0..061dc436838 100644
--- a/Buildings/Resources/Documentation/userGuide/requirements.txt
+++ b/Buildings/Resources/Documentation/userGuide/requirements.txt
@@ -3,7 +3,7 @@ Babel==2.9.1
 certifi==2023.7.22
 charset-normalizer==2.0.12
 docutils==0.17.1
-idna==3.3
+idna==3.7
 imagesize==1.3.0
 Jinja2==3.1.3
 latexcodec==2.0.1
diff --git a/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst b/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst
index 5a326980dc1..196ed9a5919 100644
--- a/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/bestPractice.rst
@@ -42,9 +42,9 @@ Building large system models
 When creating a large system model, it is typically easier to build the system model
 through the composition of subsystem models that can be tested in isolation. For example,
 the package
-`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
+`Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant_BaseClasses_Controls_Examples.html#Buildings.Examples.ChillerPlant.BaseClasses.Controls.Examples>`_
 contains small test models that are used to test individual components in the large system model
-`Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
+`Buildings.Examples.ChillerPlant <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_ChillerPlant.html#Buildings.Examples.ChillerPlant>`_.
 Creating small test models typically saves time as the proper response of controls, and the proper operation of subsystems, can be tested in isolation of complex system-interactions that are often present in large models.
 
 
@@ -270,9 +270,9 @@ a fluid port represents the physical phenomena that was intended to model.
 
 However, in more complex flow configurations, one may want to explicitly control what branches of a piping or duct network mix.
 This may be achieved by using an instance of the model
-`Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
+`Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_
 as shown in the left figure below, which is derived from the test model
-`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
+`BoilerPolynomialClosedLoop <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Boilers_Examples.html#Buildings.Fluid.Boilers.Examples.BoilerPolynomialClosedLoop>`_
 
 .. _fig_flu_cor_wro:
 
@@ -283,7 +283,7 @@ as shown in the left figure below, which is derived from the test model
 
 In :numref:`fig_flu_cor_wro` (a), the mixing points have been correctly defined by
 use of the model
-`Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_.
+`Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_.
 However, in :numref:`fig_flu_cor_wro` (b), all connections are made to the port of the instance ``spl2``.
 This results in the same configuration as is shown in :numref:`fig_flu_cor_wro` (c).
 This is certainly not the intention of the modeler, as this causes all flows to be mixed in the port.
@@ -301,13 +301,13 @@ Use of sensors in fluid flow systems
 When selecting a sensor model, a distinction needs to be made whether the measured quantity depends on
 the direction of the flow or not. If the quantity depends on the flow direction,
 such as temperature or relative humidity, then sensors with two ports from the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
+`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
 library should be used. These sensors have a more efficient implementation than sensors with
 one port for situations where the flow reverses its direction.
 The proper use sensors is described in the
-`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_UsersGuide.html>`_
+`User's Guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_UsersGuide.html>`_
 of the
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
+`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_
 package.
 
 
@@ -319,9 +319,9 @@ Reference pressure for incompressible fluids such as water
 This section explains how to set a reference pressure for fluids that model
 the flow as :term:`incompressible flow`,
 such as
-`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
+`Buildings.Media.Water <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Water.html#Buildings.Media.Water>`_
 and
-`Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
+`Buildings.Media.Antifreeze.PropyleneGlycolWater <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Antifreeze_PropyleneGlycolWater.html#Buildings.Media.Antifreeze.PropyleneGlycolWater>`_.
 
 Consider the flow circuit shown in :numref:`fig_flow_cir` that consists of a pump or fan,
 a flow resistance and a volume.
@@ -354,7 +354,7 @@ In this situation, attempting to translate the model leads, in Dymola, to the fo
    The number of scalar Real equation elements are 58.
 
 Similarly, if the medium model
-`Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
+`Buildings.Media.Specialized.Water.TemperatureDependentDensity <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Media_Specialized_Water_TemperatureDependentDensity.html#Buildings.Media.Specialized.Water.TemperatureDependentDensity>`_,
 which models density as a function of pressure and enthalpy, is used, then
 the model is well-defined, but the pressure increases the longer the pump runs.
 The reason is that the pump adds heat to the water. When the water temperature
@@ -364,7 +364,7 @@ the pressure increases from :math:`1 \, \mathrm{bars}` to :math:`150 \, \mathrm{
 To avoid this singularity or increase in pressure,
 use a model that imposes a pressure source and that accounts for the expansion of the fluid.
 For example, use
-`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
+`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
 
 .. _fig_flow_cir_wit_bou:
@@ -376,15 +376,15 @@ to form the system model shown in :numref:`fig_flow_cir_wit_bou`.
    provides a reference presssure.
 
 Alternatively, you may use
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
+`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_,
 but
-`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
+`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 usually leads to simpler equations than
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
+`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
 Note that the medium that flows out of the fluid port of
-`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
+`Buildings.Fluid.Sources.Boundary_pT <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_
 is at a fixed temperature, while the model
-`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
+`Buildings.Fluid.Storage.ExpansionVessel <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_
 conserves energy.
 However, since the thermal expansion of the fluid is usually small,
 this effect can be neglected in most building HVAC applications.
@@ -393,10 +393,10 @@ this effect can be neglected in most building HVAC applications.
 
    In each water circuit, there must be exactly on instance of
    `Buildings.Fluid.Sources.Boundary_pT
-   <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_,
+   <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.Boundary_pT>`_,
    or instance of
    `Buildings.Fluid.Storage.ExpansionVessel
-   <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
+   <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Storage.html#Buildings.Fluid.Storage.ExpansionVessel>`_.
 
    If there is more than one such device, then there are multiple
    points in the system that set the reference static pressure.
@@ -592,5 +592,5 @@ is produced. This shows the iteration variables and their start values.
 These start values can be overwritten in the model.
 
 
-.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
-.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized
+.. _PressureDrop: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.PressureDrop
+.. _WetCoilDiscretized: https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.WetCoilDiscretized
diff --git a/Buildings/Resources/Documentation/userGuide/source/development.rst b/Buildings/Resources/Documentation/userGuide/source/development.rst
index 3eb7fbba829..06ab4da9321 100644
--- a/Buildings/Resources/Documentation/userGuide/source/development.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/development.rst
@@ -24,13 +24,13 @@ Models, blocks and functions that are contributed need to adhere to the followin
  * They should be of general interest to other users and well documented and tested.
  * They need to follow the coding conventions described in
 
-   - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_ and
+   - the `Buildings library user guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_ and
    - the `Style Guide` provided in :numref:`sec_sty_gui`
 
- * They need to be made available under the `Modelica Buildings Library license <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License>`_.
+ * They need to be made available under the `Modelica Buildings Library license <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.License>`_.
  * For models of thermofluid flow components, they need to be based on the base classes in
-   `Buildings.Fluid.Interfaces <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces.html>`_,
-   which are described in the `user guide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ of this package.
+   `Buildings.Fluid.Interfaces <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces.html>`_,
+   which are described in the `user guide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ of this package.
    Otherwise, it becomes difficult to ensure that the implementation is numerically robust.
 
 .. _sec_sty_gui:
@@ -408,8 +408,8 @@ Adding a new class, such as a model or a function, is usually easiest by extendi
 In many cases, the similar component already exists.
 In this situation, it is recommended to copy and modify a similar component.
 If both components share a significant amount of similar code, then a base class should be introduced that implements the common code.
-See for example `Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors_BaseClasses.html#Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor>`_ which is shared by all sensors with one fluid port in the package
-`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_.
+See for example `Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors_BaseClasses.html#Buildings.Fluid.Sensors.BaseClasses.PartialAbsoluteSensor>`_ which is shared by all sensors with one fluid port in the package
+`Buildings.Fluid.Sensors <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors>`_.
 
 The next sections give guidance that is specific to the implementation of thermofluid flow devices, pressure drop models and control sequences.
 
@@ -417,20 +417,20 @@ Thermofluid flow device
 ~~~~~~~~~~~~~~~~~~~~~~~
 
 To add a component of a thermofluid flow device, the package
-`Buildings.Fluid.Interface <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces.html>`_  contains basic classes that can be extended.
-See `Buildings.Fluid.Interface.UsersGuide <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ for a description of these classes.
+`Buildings.Fluid.Interface <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces.html>`_  contains basic classes that can be extended.
+See `Buildings.Fluid.Interface.UsersGuide <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Interfaces_UsersGuide.html#Buildings.Fluid.Interfaces.UsersGuide>`_ for a description of these classes.
 Alternatively, simple models such as the models below may be used as a starting point for implementing new models for thermofluid flow devices:
 
-`Buildings.Fluid.HeatExchangers.HeaterCooler_u <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.HeaterCooler_u>`_
+`Buildings.Fluid.HeatExchangers.HeaterCooler_u <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_HeatExchangers.html#Buildings.Fluid.HeatExchangers.HeaterCooler_u>`_
   For a device that adds heat to a fluid stream.
 
-`Buildings.Fluid.Humidifiers.Humidifier_u <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Humidifiers.html#Buildings.Fluid.Humidifiers.Humidifier_u>`_
+`Buildings.Fluid.Humidifiers.Humidifier_u <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Humidifiers.html#Buildings.Fluid.Humidifiers.Humidifier_u>`_
   For a device that adds humidity to a fluid stream.
 
-`Buildings.Fluid.Chillers.Carnot_y <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Chillers.html#Buildings.Fluid.Chillers.Carnot_y>`_
+`Buildings.Fluid.Chillers.Carnot_y <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Chillers.html#Buildings.Fluid.Chillers.Carnot_y>`_
   For a device that exchanges heat between two fluid streams.
 
-`Buildings.Fluid.MassExchangers.ConstantEffectiveness <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_MassExchangers.html#Buildings.Fluid.MassExchangers.ConstantEffectiveness>`_
+`Buildings.Fluid.MassExchangers.ConstantEffectiveness <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_MassExchangers.html#Buildings.Fluid.MassExchangers.ConstantEffectiveness>`_
   For a device that exchanges heat and humidity between two fluid streams.
 
 .. _fig_merkel:
@@ -454,11 +454,11 @@ Pressure drop
 
 When implementing equations for pressure drop, it is recommended
 to expand the base class
-`Buildings.Fluid.BaseClasses.PartialResistance <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance>`_.
+`Buildings.Fluid.BaseClasses.PartialResistance <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses.html#Buildings.Fluid.BaseClasses.PartialResistance>`_.
 Models should allow computing the flow resistance as a quadratic function
 with regularization near zero as implemented in
-`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp>`_ and in
-`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow>`_.
+`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp>`_ and in
+`Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_BaseClasses_FlowModels.html#Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow>`_.
 The governing equation is
 
 .. math::
@@ -514,7 +514,7 @@ The following rules need to be followed, in addition to the guidelines described
 
 #. The naming of parameters, inputs, outputs and instances must follow the naming
    conventions in
-   `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
+   `Buildings.UsersGuide.Conventions <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_UsersGuide.html#Buildings.UsersGuide.Conventions>`_.
    Avoid providing duplicate information in the instance name, for example if the block is within the ``Boilers`` package,
    the instance name must not contain ``boi``. Ensure that the instance name is unambiguous when viewed in a top level
    controller block.
@@ -671,7 +671,7 @@ The validation models are part of automated unit tests as described at the
 
 For simple models, the validation can be against analytic solutions.
 This is for example done in
-`Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop>`_
+`Buildings.Fluid.FixedResistances.PressureDrop <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances_Examples.html#Buildings.Fluid.FixedResistances.Examples.PressureDrop>`_
 which uses a regression tests that checks the correct relation between mass flow rate and pressure drop.
 
 For complex thermofluid flow devices, a comparative model validation needs to be done, for example
diff --git a/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst b/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst
index 55e1c46105b..01ddbe3b3b3 100644
--- a/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/gettingStarted.rst
@@ -40,7 +40,7 @@ or by replacing existing component models by new ones.
 The example models can be found in the packages `Examples`.
 
 Study the detailed tutorials with step-by-step instructions for how to build system models,
-which can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Examples_Tutorial.html>`_.
+which can be found in the `Tutorial package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Examples_Tutorial.html>`_.
 
 Note that heat transfer models, which can be found in `Buildings.HeatTransfer.*.Examples`
 are easier to understand than fluid flow models because;
@@ -51,7 +51,7 @@ are easier to understand than fluid flow models because;
 
 To get started with Spawn of EnergyPlus, we recommend to first familiarize yourself with Modelica, as described above.
 Next, read the
-`user guide for the Spawn models <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_ThermalZones_EnergyPlus_9_6_0_UsersGuide.html>`_
+`user guide for the Spawn models <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_ThermalZones_EnergyPlus_9_6_0_UsersGuide.html>`_
 which provides step-by-step instructions and points to various examples.
 
 
@@ -65,7 +65,7 @@ Literature for Developers
 -------------------------
 
 It is essential that users who develop new thermo-fluid models to understand the concept of stream connectors.
-Stream connectors are explained in the Modelica language definition, available at https://modelica.org/documents,
+Stream connectors are explained in the Modelica language definition, available at https://modelica.org/language,
 and in the paper Franke et al. [Fra2009a]_.
 The `Buildings` library uses similar modeling principles, and the same base classes, as the `Modelica.Fluid` library.
 Hence, we also recommend reading the paper about the standardization of thermo-fluid models in Modelica.Fluid [Fra2009b]_.
diff --git a/Buildings/Resources/Documentation/userGuide/source/performance.rst b/Buildings/Resources/Documentation/userGuide/source/performance.rst
index 5ab89802d21..8d24a727f88 100644
--- a/Buildings/Resources/Documentation/userGuide/source/performance.rst
+++ b/Buildings/Resources/Documentation/userGuide/source/performance.rst
@@ -78,8 +78,8 @@ The default value is ``raiseTime=120`` seconds.
           closed loop control performance.
 
 For further information, see the
-`User's Guide of the flow machine package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers_UsersGuide.html>`_, and the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
+`User's Guide of the flow machine package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers_UsersGuide.html>`_, and the
+`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
 
 
 Fluid flow systems
@@ -92,9 +92,9 @@ In fluid flow systems, flow junctions where mass flow rates separate and mix can
 This leads to larger systems of coupled equations that need to be solved,
 which often causes larger computing time and can sometimes cause convergence problems.
 To decouple these systems of equations, in the model of a flow junction
-(`Buildings.Fluid.FixedResistances.Junction <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_),
+(`Buildings.Fluid.FixedResistances.Junction <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_FixedResistances.html#Buildings.Fluid.FixedResistances.Junction>`_),
 or in models for fans or pumps (such as the model
-`Buildings.Fluid.Movers.SpeedControlled_y <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y>`_),
+`Buildings.Fluid.Movers.SpeedControlled_y <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.SpeedControlled_y>`_),
 the parameter ``dynamicBalance`` can be set to ``true``.
 This adds a control volume at the fluid junction that can decouple the system of equations.
 
@@ -174,7 +174,7 @@ The valve model then computes the pressure drop using :math:`\bar k` and the sam
 Thus, the composite model has the same :term:`valve authority` and mass flow rate, but a nonlinear equation can be avoided.
 
 For more details, see the
-`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
+`User's Guide of the actuator package <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Actuators_UsersGuide.html>`_.
 
 
 
@@ -183,7 +183,7 @@ Prescribed mass flow rate
 
 For some system models, the mass flow rate can be prescribed by using an idealized pump or fan
 (model
-`Buildings.Fluid.Movers.FlowControlled_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow>`_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T>`_).
+`Buildings.Fluid.Movers.FlowControlled_m_flow <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Movers.html#Buildings.Fluid.Movers.FlowControlled_m_flow>`_) or a source element that outputs the required mass flow rate (such as the model `Buildings.Fluid.Sources.MassFlowSource_T <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sources.html#Buildings.Fluid.Sources.MassFlowSource_T>`_).
 Using these models avoids having to compute the intersection of the fan curve and the flow resistance.
 In some situations, this can lead to faster and more robust simulation.
 
@@ -258,12 +258,12 @@ Adding dynamics may be achieved using a formulation such as
 		der(h)=(hMed-h)/tau;
 
 where ``tau``>0 is a time constant. See, for example,
-`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort>`_
+`Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Fluid_Sensors.html#Buildings.Fluid.Sensors.SpecificEnthalpyTwoPort>`_
 for a robust implementation.
 
 .. note::
    In the package
-   `Buildings.Utilities.Math <https://simulationresearch.lbl.gov/modelica/releases/v9.1.1/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math>`_
+   `Buildings.Utilities.Math <https://simulationresearch.lbl.gov/modelica/releases/v10.0.0/help/Buildings_Utilities_Math.html#Buildings.Utilities.Math>`_
    the functions and blocks whose names start with ``smooth`` can be used to avoid events.
 
 
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset.png
rename to Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset1.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold1.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset1.png
rename to Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold1.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset2.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold2.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset2.png
rename to Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold2.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset3.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold3.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithReset3.png
rename to Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHold3.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.png
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.png
rename to Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.png
diff --git a/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.svg b/Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.svg
similarity index 100%
rename from Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldWithResetImplementation.svg
rename to Buildings/Resources/Images/Controls/OBC/CDL/Logical/TrueHoldImplementation.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.png b/Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.png
rename to Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.svg b/Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialParallel.svg
rename to Buildings/Resources/Images/DHC/ETS/Combined/BaseClasses/PartialParallel.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.png b/Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.png
rename to Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.svg b/Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/ChillerBorefield.svg
rename to Buildings/Resources/Images/DHC/ETS/Combined/ChillerBorefield.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.png b/Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.png
rename to Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.svg b/Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/HeatPumpDHWTank.svg
rename to Buildings/Resources/Images/DHC/ETS/Combined/Subsystems/HeatPumpDHWTank.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png b/Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.png
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Direct.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.svg b/Buildings/Resources/Images/DHC/ETS/Cooling/Direct.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Direct.svg
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Direct.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png b/Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.png
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.svg b/Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/EnergyTransferStations/Cooling/Indirect.svg
rename to Buildings/Resources/Images/DHC/ETS/Cooling/Indirect.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.png b/Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.png
rename to Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.svg b/Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.svg
rename to Buildings/Resources/Images/DHC/Examples/Cooling/ElectricChillersDirectETS.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.png b/Buildings/Resources/Images/DHC/Loads/FlowDistribution1.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.png
rename to Buildings/Resources/Images/DHC/Loads/FlowDistribution1.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.svg b/Buildings/Resources/Images/DHC/Loads/FlowDistribution1.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution1.svg
rename to Buildings/Resources/Images/DHC/Loads/FlowDistribution1.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.png b/Buildings/Resources/Images/DHC/Loads/FlowDistribution2.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.png
rename to Buildings/Resources/Images/DHC/Loads/FlowDistribution2.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.svg b/Buildings/Resources/Images/DHC/Loads/FlowDistribution2.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/FlowDistribution2.svg
rename to Buildings/Resources/Images/DHC/Loads/FlowDistribution2.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png b/Buildings/Resources/Images/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/DirectHeatExchangerWithElectricHeat.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png b/Buildings/Resources/Images/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/Example_DirectHeatExchangerWithAuxHeat.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_HeatPumpWithTank.png b/Buildings/Resources/Images/DHC/Loads/HotWater/Example_HeatPumpWithTank.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/Example_HeatPumpWithTank.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/Example_HeatPumpWithTank.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png b/Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png
rename to Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg b/Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg
rename to Buildings/Resources/Images/DHC/Loads/HotWater/StorageTankWithExternalHeatExchanger.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.png b/Buildings/Resources/Images/DHC/Loads/PartialBuilding.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.png
rename to Buildings/Resources/Images/DHC/Loads/PartialBuilding.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.svg b/Buildings/Resources/Images/DHC/Loads/PartialBuilding.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuilding.svg
rename to Buildings/Resources/Images/DHC/Loads/PartialBuilding.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.png b/Buildings/Resources/Images/DHC/Loads/PartialBuildingWithPartialETS.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.png
rename to Buildings/Resources/Images/DHC/Loads/PartialBuildingWithPartialETS.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.svg b/Buildings/Resources/Images/DHC/Loads/PartialBuildingWithPartialETS.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/PartialBuildingWithPartialETS.svg
rename to Buildings/Resources/Images/DHC/Loads/PartialBuildingWithPartialETS.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png b/Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png
rename to Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg b/Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg
rename to Buildings/Resources/Images/DHC/Loads/Steam/BuildingTimeSeriesAtETS.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png b/Buildings/Resources/Images/DHC/Networks/Controls/MainPump.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.png
rename to Buildings/Resources/Images/DHC/Networks/Controls/MainPump.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.svg b/Buildings/Resources/Images/DHC/Networks/Controls/MainPump.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Networks/Controls/MainPump.svg
rename to Buildings/Resources/Images/DHC/Networks/Controls/MainPump.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.png b/Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.png
rename to Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.svg b/Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Combined/AllElectricCWStorage.svg
rename to Buildings/Resources/Images/DHC/Plants/Combined/AllElectricCWStorage.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.drawio b/Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.drawio
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.drawio
rename to Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.drawio
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.png b/Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ControlSignals.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/ControlSignals.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.png b/Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/Controls/ChillerStage.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/Controls/ChillerStage.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.png b/Buildings/Resources/Images/DHC/Plants/Cooling/ElectricChillerParallel.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/ElectricChillerParallel.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/ElectricChillerParallel.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/ElectricChillerParallel.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/ElectricChillerParallel.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.drawio b/Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.drawio
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.drawio
rename to Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.drawio
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.png b/Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.png
rename to Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.svg b/Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Cooling/SystemConcept.svg
rename to Buildings/Resources/Images/DHC/Plants/Cooling/SystemConcept.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png b/Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png
rename to Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg b/Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg
rename to Buildings/Resources/Images/DHC/Plants/Steam/BaseClasses/BoilerPolynomial.svg
diff --git a/Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.png b/Buildings/Resources/Images/DHC/UserGuide/DHC_Package_Concept.png
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.png
rename to Buildings/Resources/Images/DHC/UserGuide/DHC_Package_Concept.png
diff --git a/Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.svg b/Buildings/Resources/Images/DHC/UserGuide/DHC_Package_Concept.svg
similarity index 100%
rename from Buildings/Resources/Images/Experimental/DHC/UserGuide/DHC_Package_Concept.svg
rename to Buildings/Resources/Images/DHC/UserGuide/DHC_Package_Concept.svg
diff --git a/Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.png b/Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.png
deleted file mode 100644
index c1910cbac58..00000000000
Binary files a/Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.png and /dev/null differ
diff --git a/Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/python.png b/Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/python.png
deleted file mode 100644
index dfb49fa9b9a..00000000000
Binary files a/Buildings/Resources/Images/Obsolete/Utilities/IO/Python36/python.png and /dev/null differ
diff --git a/Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg b/Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg
new file mode 100644
index 00000000000..5fe70694b31
--- /dev/null
+++ b/Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="200mm"
+   height="200mm"
+   viewBox="0 0 200.00002 199.99998"
+   version="1.1"
+   id="svg12898"
+   sodipodi:docname="MotorStarter.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview34354"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="0.59892245"
+     inkscape:cx="24.210146"
+     inkscape:cy="374.83985"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-6"
+     inkscape:window-y="-6"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g982"
+     inkscape:document-units="mm">
+    <inkscape:grid
+       type="xygrid"
+       id="grid34535"
+       originx="0"
+       originy="0" />
+  </sodipodi:namedview>
+  <defs
+     id="defs12895">
+    <rect
+       x="-440"
+       y="600"
+       width="360"
+       height="520"
+       id="rect35714" />
+    <rect
+       x="640"
+       y="1200"
+       width="720"
+       height="280"
+       id="rect35708" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649" />
+    <rect
+       x="380"
+       y="300"
+       width="400"
+       height="160"
+       id="rect34591" />
+    <rect
+       x="1259.0197"
+       y="284.73633"
+       width="399.67548"
+       height="41.103985"
+       id="rect26041" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245" />
+    <rect
+       x="107.03309"
+       y="-247.09485"
+       width="937.42871"
+       height="201.89989"
+       id="rect2663" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655-3" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655-5" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655-1" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-8" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-8-0" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-8-6" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-85" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-7" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-7-1" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-8" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-8-3" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-8-3-6" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-1" />
+  </defs>
+  <g
+     aria-label="ENABLE"
+     transform="matrix(0.26458333,0,0,0.26458333,-256.72208,-17.474621)"
+     id="text2661"
+     style="font-size:200px;line-height:1.25;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect2663);stroke-width:0.620253" />
+  <g
+     id="g1016"
+     transform="matrix(2.022586,0,0,2.0204084,-185.95699,-316.12899)"
+     style="stroke-width:0.494683">
+    <g
+       id="g982"
+       transform="translate(-11.619452,7.39114)"
+       style="stroke-width:0.494683">
+      <g
+         id="g1642"
+         transform="translate(0.18066117,0.18191892)">
+        <path
+           id="polyline524"
+           style="fill:none;stroke:#000000;stroke-width:0.494684;stroke-miterlimit:4;stroke-dasharray:none"
+           d="m 103.62514,149.14215 v 98.4952 h 98.39104 v -98.4952 z" />
+        <path
+           id="polyline558-5-6"
+           style="fill:none;stroke:#000000;stroke-width:0.494684;stroke-dasharray:none"
+           d="m 183.99711,225.47409 v 9.19625 h 9.20085 v -9.19625 z" />
+        <path
+           id="polyline558-5"
+           style="fill:none;stroke:#000000;stroke-width:0.494684;stroke-dasharray:none"
+           d="m 183.99711,162.28284 v 9.19633 h 9.20085 v -9.19633 z" />
+        <path
+           id="polyline558-5-0"
+           style="fill:none;stroke:#000000;stroke-width:0.494684;stroke-dasharray:none"
+           d="m 183.99711,192.37068 v 9.19626 h 9.20085 v -9.19626 z" />
+        <path
+           id="polyline558-5-9"
+           style="fill:none;stroke:#000000;stroke-width:0.494684;stroke-dasharray:none"
+           d="m 183.99711,208.92234 v 9.19626 h 9.20085 v -9.19626 z" />
+        <g
+           aria-label="CS"
+           transform="matrix(0.09938542,0,0,0.09949007,126.97271,133.11543)"
+           id="text34647"
+           style="font-size:113.333px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect34649);display:inline;fill:none;stroke:#000000;stroke-width:4.97479;stroke-dasharray:none;stop-color:#000000">
+          <path
+             d="m 444.70681,377.42059 q -3.04361,1.32812 -5.53384,2.49022 -2.43488,1.16211 -6.41925,2.43489 -3.37564,1.05143 -7.36,1.77083 -3.92903,0.77474 -8.68813,0.77474 -8.96482,0 -16.32482,-2.49023 -7.30467,-2.54556 -12.72783,-7.91339 -5.31248,-5.25714 -8.30075,-13.33655 -2.98828,-8.13474 -2.98828,-18.87038 0,-10.18227 2.8776,-18.20633 2.8776,-8.02407 8.30076,-13.5579 5.25714,-5.36783 12.67248,-8.19008 7.47069,-2.82226 16.54618,-2.82226 6.64061,0 13.22587,1.60481 6.64061,1.60482 14.72001,5.64452 V 319.758 h -0.83007 q -6.80662,-5.69986 -13.50257,-8.30076 -6.69594,-2.6009 -14.33264,-2.6009 -6.25324,0 -11.28903,2.04752 -4.98045,1.99218 -8.90948,6.25323 -3.81835,4.15038 -5.97654,10.51429 -2.10286,6.30858 -2.10286,14.60934 0,8.68812 2.32421,14.94136 2.37955,6.25324 6.08722,10.18226 3.87369,4.09504 9.02016,6.08722 5.20181,1.93685 10.957,1.93685 7.91339,0 14.83068,-2.71159 6.9173,-2.71158 12.94918,-8.13474 h 0.77474 z"
+             style="fill:#000000;stroke:none;stroke-width:4.97479;stroke-dasharray:none"
+             id="path35569" />
+          <path
+             d="m 520.07768,359.87832 q 0,4.81444 -2.26887,9.5182 -2.21354,4.70376 -6.25324,7.96873 -4.42707,3.54165 -10.34827,5.53384 -5.86587,1.99218 -14.16663,1.99218 -8.90948,0 -16.04813,-1.66015 -7.08331,-1.66015 -14.44332,-4.92512 v -13.72392 h 0.77474 q 6.25324,5.20181 14.44332,8.02407 8.19008,2.82226 15.38407,2.82226 10.18226,0 15.82677,-3.81835 5.69986,-3.81835 5.69986,-10.18226 0,-5.4785 -2.71158,-8.07941 -2.65625,-2.6009 -8.13475,-4.0397 -4.15037,-1.10677 -9.02015,-1.82617 -4.81444,-0.71939 -10.2376,-1.82616 -10.957,-2.32421 -16.26949,-7.91339 -5.25714,-5.64452 -5.25714,-14.66467 0,-10.34828 8.74346,-16.93355 8.74347,-6.6406 22.19069,-6.6406 8.68813,0 15.93746,1.66015 7.24932,1.66015 12.8385,4.09504 v 12.94918 h -0.77474 q -4.70376,-3.98436 -12.39579,-6.58527 -7.6367,-2.65624 -15.66077,-2.65624 -8.7988,0 -14.16662,3.65234 -5.31249,3.65233 -5.31249,9.40752 0,5.14647 2.65625,8.0794 2.65624,2.93294 9.35218,4.48241 3.54166,0.77474 10.07159,1.88151 6.52993,1.10676 11.06767,2.26887 9.18617,2.43489 13.8346,7.36 4.64842,4.92512 4.64842,13.77926 z"
+             style="fill:#000000;stroke:none;stroke-width:4.97479;stroke-dasharray:none"
+             id="path35571" />
+        </g>
+        <g
+           aria-label="HOT"
+           transform="matrix(0.09938542,0,0,0.09949007,117.89253,162.6724)"
+           id="text34647-6"
+           style="font-size:113.333px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect34649-8);display:inline;stroke-width:4.97479;stroke-dasharray:none;stop-color:#000000">
+          <path
+             d="m 444.09809,383.39713 h -10.957 v -40.34168 h -41.11642 v 40.34168 h -10.95699 v -82.39884 h 10.95699 v 32.31761 h 41.11642 v -32.31761 h 10.957 z"
+             id="path35574"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 527.65904,310.46115 q 5.03579,5.53384 7.69204,13.5579 2.71158,8.02407 2.71158,18.20633 0,10.18226 -2.76692,18.26166 -2.71158,8.02407 -7.6367,13.39189 -5.09113,5.58918 -12.06377,8.41143 -6.91729,2.82226 -15.82677,2.82226 -8.68813,0 -15.82678,-2.87759 -7.08331,-2.8776 -12.06377,-8.3561 -4.98045,-5.4785 -7.69203,-13.44723 -2.65624,-7.96872 -2.65624,-18.20632 0,-10.07159 2.65624,-18.04031 2.65624,-8.02407 7.74737,-13.72392 4.86978,-5.42316 12.06377,-8.30076 7.24933,-2.87759 15.77144,-2.87759 8.85414,0 15.88211,2.93293 7.08331,2.8776 12.00843,8.24542 z m -0.99609,31.76423 q 0,-16.04813 -7.19399,-24.73626 -7.19399,-8.74346 -19.64512,-8.74346 -12.56182,0 -19.75581,8.74346 -7.13865,8.68813 -7.13865,24.73626 0,16.21414 7.30467,24.84693 7.30467,8.57745 19.58979,8.57745 12.28512,0 19.53444,-8.57745 7.30467,-8.63279 7.30467,-24.84693 z"
+             id="path35576"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 611.44134,310.73784 h -29.44001 v 72.65929 h -10.957 v -72.65929 h -29.44002 v -9.73955 h 69.83703 z"
+             id="path35578"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+        </g>
+        <g
+           aria-label="AUTO"
+           transform="matrix(0.09938542,0,0,0.09949007,111.09477,179.36983)"
+           id="text34647-6-5"
+           style="font-size:113.333px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect34649-8-3);display:inline;stroke-width:4.97479;stroke-dasharray:none;stop-color:#000000">
+          <path
+             d="m 446.03493,383.39713 h -11.6764 l -8.0794,-22.96543 h -35.63791 l -8.07941,22.96543 H 371.4388 l 29.9934,-82.39884 h 14.60933 z m -23.13144,-32.37295 -14.44332,-40.45235 -14.49865,40.45235 z"
+             id="path35553"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 520.02235,350.30478 q 0,8.96482 -1.99218,15.66076 -1.93685,6.64061 -6.41926,11.06768 -4.26105,4.20572 -9.9609,6.14256 -5.69986,1.93684 -13.28122,1.93684 -7.74737,0 -13.50256,-2.04752 -5.75519,-2.04752 -9.68422,-6.03188 -4.4824,-4.53775 -6.47459,-10.957 -1.93684,-6.41925 -1.93684,-15.77144 v -49.30649 h 10.957 v 49.85988 q 0,6.69594 0.88541,10.56963 0.94076,3.87368 3.09895,7.02797 2.43489,3.59699 6.58527,5.42316 4.20572,1.82617 10.07158,1.82617 5.92121,0 10.07159,-1.77083 4.15038,-1.82617 6.64061,-5.4785 2.15819,-3.15429 3.04361,-7.19399 0.94075,-4.09504 0.94075,-10.12692 v -50.13657 h 10.957 z"
+             id="path35555"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 599.70962,310.73784 h -29.44001 v 72.65929 h -10.957 v -72.65929 h -29.44002 v -9.73955 h 69.83703 z"
+             id="path35557"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 669.43596,310.46115 q 5.0358,5.53384 7.69204,13.5579 2.71158,8.02407 2.71158,18.20633 0,10.18226 -2.76692,18.26166 -2.71158,8.02407 -7.6367,13.39189 -5.09113,5.58918 -12.06376,8.41143 -6.9173,2.82226 -15.82678,2.82226 -8.68812,0 -15.82677,-2.87759 -7.08332,-2.8776 -12.06377,-8.3561 -4.98046,-5.4785 -7.69204,-13.44723 -2.65624,-7.96872 -2.65624,-18.20632 0,-10.07159 2.65624,-18.04031 2.65625,-8.02407 7.74738,-13.72392 4.86977,-5.42316 12.06376,-8.30076 7.24933,-2.87759 15.77144,-2.87759 8.85414,0 15.88212,2.93293 7.08331,2.8776 12.00842,8.24542 z m -0.99609,31.76423 q 0,-16.04813 -7.19399,-24.73626 -7.19398,-8.74346 -19.64512,-8.74346 -12.56181,0 -19.7558,8.74346 -7.13865,8.68813 -7.13865,24.73626 0,16.21414 7.30466,24.84693 7.30467,8.57745 19.58979,8.57745 12.28512,0 19.53445,-8.57745 7.30466,-8.63279 7.30466,-24.84693 z"
+             id="path35559"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+        </g>
+        <g
+           aria-label="AUX"
+           transform="matrix(0.09938542,0,0,0.09949007,118.65152,196.30576)"
+           id="text34647-6-5-9"
+           style="font-size:113.333px;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect34649-8-3-6);display:inline;stroke-width:4.97479;stroke-dasharray:none;stop-color:#000000">
+          <path
+             d="m 446.03493,383.39713 h -11.6764 l -8.0794,-22.96543 h -35.63791 l -8.07941,22.96543 H 371.4388 l 29.9934,-82.39884 h 14.60933 z m -23.13144,-32.37295 -14.44332,-40.45235 -14.49865,40.45235 z"
+             id="path35581"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 520.02235,350.30478 q 0,8.96482 -1.99218,15.66076 -1.93685,6.64061 -6.41926,11.06768 -4.26105,4.20572 -9.9609,6.14256 -5.69986,1.93684 -13.28122,1.93684 -7.74737,0 -13.50256,-2.04752 -5.75519,-2.04752 -9.68422,-6.03188 -4.4824,-4.53775 -6.47459,-10.957 -1.93684,-6.41925 -1.93684,-15.77144 v -49.30649 h 10.957 v 49.85988 q 0,6.69594 0.88541,10.56963 0.94076,3.87368 3.09895,7.02797 2.43489,3.59699 6.58527,5.42316 4.20572,1.82617 10.07158,1.82617 5.92121,0 10.07159,-1.77083 4.15038,-1.82617 6.64061,-5.4785 2.15819,-3.15429 3.04361,-7.19399 0.94075,-4.09504 0.94075,-10.12692 v -50.13657 h 10.957 z"
+             id="path35583"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+          <path
+             d="m 603.80466,300.99829 -28.44392,40.72904 28.38859,41.6698 h -12.67249 l -22.46739,-33.92242 -23.02076,33.92242 H 533.6356 l 28.72062,-41.17175 -28.05656,-41.22709 h 12.61715 l 22.19069,33.47971 22.68874,-33.47971 z"
+             id="path35585"
+             style="stroke-width:4.97479;stroke-dasharray:none" />
+        </g>
+        <g
+           aria-label="M/S"
+           transform="matrix(0.759335,0,0,0.76013426,24.449111,33.397681)"
+           id="text35214"
+           style="font-size:26.177px;-inkscape-font-specification:'sans-serif, Normal';writing-mode:tb-rl;text-orientation:upright;stroke-width:0.651126;stroke-dasharray:none;stop-color:#000000">
+          <path
+             d="m 135.64902,194.75884 h -2.53078 v -16.39897 l -5.29164,11.15846 h -1.50825 l -5.25329,-11.15846 v 16.39897 h -2.36462 v -19.03201 h 3.45106 l 5.07435,10.59607 4.90819,-10.59607 h 3.51498 z"
+             id="path35562"
+             style="stroke-width:0.651126;stroke-dasharray:none" />
+          <path
+             d="m 132.22352,204.31319 -9.16451,23.77403 h -2.21124 l 9.12616,-23.77403 z"
+             id="path35564"
+             style="stroke-width:0.651126;stroke-dasharray:none" />
+          <path
+             d="m 134.6137,252.60899 q 0,1.11201 -0.52405,2.19846 -0.51127,1.08645 -1.44434,1.84057 -1.02254,0.81803 -2.39018,1.27817 -1.35487,0.46015 -3.27213,0.46015 -2.05786,0 -3.7067,-0.38346 -1.63606,-0.38345 -3.33604,-1.13757 v -3.16987 h 0.17895 q 1.44434,1.20148 3.33603,1.85335 1.8917,0.65187 3.55333,0.65187 2.35184,0 3.65557,-0.88194 1.31652,-0.88194 1.31652,-2.35184 0,-1.26539 -0.6263,-1.86613 -0.61353,-0.60075 -1.87892,-0.93307 -0.95863,-0.25564 -2.08342,-0.4218 -1.11201,-0.16616 -2.36462,-0.4218 -2.53079,-0.53683 -3.75783,-1.82778 -1.21427,-1.30374 -1.21427,-3.38717 0,-2.39018 2.01951,-3.91121 2.01952,-1.53381 5.12548,-1.53381 2.00673,0 3.68114,0.38346 1.67441,0.38345 2.96537,0.94584 v 2.99093 h -0.17895 q -1.08645,-0.92028 -2.86311,-1.52103 -1.76388,-0.61352 -3.61723,-0.61352 -2.0323,0 -3.27213,0.8436 -1.22704,0.84359 -1.22704,2.17289 0,1.1887 0.61352,1.86614 0.61352,0.67743 2.16012,1.03532 0.81803,0.17894 2.32627,0.43458 1.50825,0.25563 2.55635,0.52405 2.12177,0.56239 3.19543,1.69997 1.07367,1.13757 1.07367,3.18265 z"
+             id="path35566"
+             style="stroke-width:0.651126;stroke-dasharray:none" />
+        </g>
+      </g>
+    </g>
+  </g>
+  <g
+     transform="matrix(0.26458333,0,0,0.26458333,-256.72208,-17.474621)"
+     id="text26039"
+     style="font-size:40px;line-height:1.25;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect26041);stroke-width:0.620253" />
+</svg>
diff --git a/Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg b/Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg
new file mode 100644
index 00000000000..ffb0936ef06
--- /dev/null
+++ b/Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="200mm"
+   height="200mm"
+   viewBox="0 0 200.00002 199.99998"
+   version="1.1"
+   id="svg12898"
+   sodipodi:docname="ControllerOnboard.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview34354"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="0.29946123"
+     inkscape:cx="-302.20941"
+     inkscape:cy="198.69016"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-6"
+     inkscape:window-y="-6"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g688"
+     inkscape:document-units="mm">
+    <inkscape:grid
+       type="xygrid"
+       id="grid34535"
+       originx="-1.7858433"
+       originy="-0.0011068634" />
+  </sodipodi:namedview>
+  <defs
+     id="defs12895">
+    <rect
+       x="-480"
+       y="-240"
+       width="2000"
+       height="400"
+       id="rect455" />
+    <rect
+       x="200"
+       y="240"
+       width="440"
+       height="320"
+       id="rect449" />
+    <rect
+       x="-440"
+       y="600"
+       width="360"
+       height="520"
+       id="rect35714" />
+    <rect
+       x="640"
+       y="1200"
+       width="720"
+       height="280"
+       id="rect35708" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649" />
+    <rect
+       x="380"
+       y="300"
+       width="400"
+       height="160"
+       id="rect34591" />
+    <rect
+       x="1259.0197"
+       y="284.73633"
+       width="399.67548"
+       height="41.103985"
+       id="rect26041" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245" />
+    <rect
+       x="107.03309"
+       y="-247.09485"
+       width="937.42871"
+       height="201.89989"
+       id="rect2663" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655-3" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655-5" />
+    <rect
+       x="-82.594574"
+       y="496.42636"
+       width="447.10434"
+       height="144.56889"
+       id="rect16655-1" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-8" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-8-0" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-8-6" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-85" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-7" />
+    <rect
+       x="-99.906151"
+       y="-396.78329"
+       width="1227.9442"
+       height="428.09433"
+       id="rect7245-7-1" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-8" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-8-3" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-8-3-6" />
+    <rect
+       x="370"
+       y="280"
+       width="410"
+       height="230"
+       id="rect34649-1" />
+    <rect
+       x="-480"
+       y="-240"
+       width="2000"
+       height="400"
+       id="rect455-4" />
+  </defs>
+  <g
+     aria-label="ENABLE"
+     transform="matrix(0.26458333,0,0,0.26458333,-258.50792,-17.475728)"
+     id="text2661"
+     style="font-size:200px;line-height:1.25;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect2663);stroke-width:0.620253" />
+  <g
+     id="g1016"
+     transform="matrix(2.022586,0,0,2.0204084,-187.74283,-316.1301)"
+     style="stroke-width:0.494683">
+    <g
+       id="g982"
+       transform="translate(-11.619452,7.39114)"
+       style="stroke-width:0.494683">
+      <g
+         id="g688"
+         transform="matrix(0.60959324,0,0,0.60870076,40.685882,58.589712)"
+         style="stroke-width:0.812092">
+        <g
+           id="g2081"
+           transform="translate(0.29304796,0.29862061)">
+          <path
+             id="polyline524"
+             style="fill:none;stroke:#000000;stroke-width:0.812089;stroke-miterlimit:4;stroke-dasharray:none"
+             d="M 104.69641,148.76432 V 310.5771 H 266.1074 V 148.76432 Z" />
+          <g
+             id="g905"
+             transform="matrix(7.5978062,0,0,7.5971831,-705.19002,-975.09522)"
+             style="stroke-width:0.106889;stroke-dasharray:none">
+            <path
+               id="polyline558-5"
+               style="fill:none;stroke:#000000;stroke-width:0.106889;stroke-dasharray:none"
+               d="m 123.1712,154.24966 v 2.02774 h 2.0321 v -2.02774 z" />
+            <path
+               id="polyline558-5-0"
+               style="fill:none;stroke:#000000;stroke-width:0.106889;stroke-dasharray:none"
+               d="m 123.1712,160.88384 v 2.02773 h 2.0321 v -2.02773 z" />
+            <g
+               aria-label="ENABLE"
+               transform="matrix(0.0219504,0,0,0.02193694,122.56864,157.44722)"
+               id="text453"
+               style="font-size:200px;-inkscape-font-specification:'sans-serif, Normal';text-orientation:upright;white-space:pre;stroke-width:4.87108;stroke-dasharray:none">
+              <path
+                 d="m -414.64537,-57.533937 h -54.28695 v -82.398843 h 54.28695 v 9.73955 h -43.32996 v 22.57806 h 43.32996 v 9.739555 h -43.32996 v 30.602124 h 43.32996 z"
+                 id="path1244"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -334.40473,-57.533937 h -13.5579 l -39.06889,-73.710723 v 73.710723 h -10.2376 v -82.398843 h 16.98888 l 35.63791,67.291466 v -67.291466 h 10.2376 z"
+                 id="path1246"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -247.52348,-57.533937 h -11.6764 l -8.0794,-22.965427 h -35.63792 l -8.0794,22.965427 h -11.12301 l 29.9934,-82.398843 h 14.60933 z m -23.13144,-32.372951 -14.44332,-40.452352 -14.49865,40.452352 z"
+                 id="path1248"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -172.872,-82.878914 q 0,6.14256 -2.32421,10.846322 -2.32421,4.703762 -6.25323,7.747373 -4.64843,3.652333 -10.2376,5.201808 -5.53384,1.549474 -14.11129,1.549474 H -235.017 v -82.398843 h 24.40423 q 9.02016,0 13.50256,0.66406 4.48241,0.66406 8.57745,2.76692 4.53775,2.37955 6.58527,6.14256 2.04752,3.70767 2.04752,8.90948 0,5.86586 -2.98827,10.01624 -2.98827,4.09504 -7.96873,6.58527 v 0.44271 q 8.3561,1.71549 13.17054,7.360001 4.81443,5.589176 4.81443,14.166625 z m -18.42768,-37.132056 q 0,-2.98827 -0.99609,-5.03579 -0.99609,-2.04752 -3.20962,-3.3203 -2.60091,-1.49414 -6.30858,-1.82617 -3.70767,-0.38737 -9.18617,-0.38737 H -224.06 v 23.79551 h 14.16663 q 5.14647,0 8.19008,-0.49805 3.04361,-0.55338 5.64451,-2.21353 2.60091,-1.66016 3.65234,-4.26106 1.10676,-2.65624 1.10676,-6.25324 z m 7.02798,37.574763 q 0,-4.980454 -1.49414,-7.913388 -1.49413,-2.932934 -5.42316,-4.980455 -2.65624,-1.383459 -6.47459,-1.770828 -3.76301,-0.442707 -9.18617,-0.442707 H -224.06 v 30.657462 h 14.49866 q 7.19399,0 11.78707,-0.719399 4.59309,-0.774737 7.52602,-2.766919 3.09895,-2.158196 4.53775,-4.925115 1.4388,-2.766919 1.4388,-7.138651 z"
+                 id="path1250"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -105.19316,-57.533937 h -52.12875 v -82.398843 h 10.957 v 72.659289 h 41.17175 z"
+                 id="path1252"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -39.949207,-57.533937 h -54.28695 v -82.398843 h 54.28695 v 9.73955 h -43.329951 v 22.57806 h 43.329951 v 9.739555 h -43.329951 v 30.602124 h 43.329951 z"
+                 id="path1254"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+            </g>
+            <g
+               aria-label="NETWORK"
+               transform="matrix(0.0219504,0,0,0.02193694,119.41649,165.80671)"
+               id="text453-5"
+               style="font-size:113.333px;-inkscape-font-specification:'sans-serif, Normal';text-orientation:upright;white-space:pre;stroke-width:4.87108;stroke-dasharray:none">
+              <path
+                 d="m -406.06793,-136.60287 h -13.5579 l -39.06889,-73.71072 v 73.71072 h -10.2376 v -82.39884 h 16.98888 l 35.63791,67.29146 v -67.29146 h 10.2376 z"
+                 id="path1269"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -329.86698,-136.60287 h -54.28695 v -82.39884 h 54.28695 v 9.73955 h -43.32995 v 22.57806 h 43.32995 v 9.73955 h -43.32995 v 30.60213 h 43.32995 z"
+                 id="path1271"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -253.72138,-209.26216 h -29.44001 v 72.65929 h -10.957 v -72.65929 h -29.44002 v -9.73955 h 69.83703 z"
+                 id="path1273"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -146.75229,-219.00171 -21.41595,82.39884 h -12.34046 l -17.32091,-68.39823 -16.93355,68.39823 h -12.06376 l -21.80332,-82.39884 h 11.23369 l 17.32091,68.50891 17.04422,-68.50891 h 11.12301 l 17.21024,69.17297 17.21024,-69.17297 z"
+                 id="path1275"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="m -69.167856,-209.53885 q 5.035792,5.53384 7.692034,13.5579 2.711581,8.02407 2.711581,18.20633 0,10.18226 -2.766919,18.26166 -2.711581,8.02407 -7.636696,13.39189 -5.091131,5.58918 -12.063767,8.41143 -6.917297,2.82226 -15.826776,2.82226 -8.688121,0 -15.826781,-2.87759 -7.08331,-2.8776 -12.06376,-8.3561 -4.98046,-5.4785 -7.69204,-13.44723 -2.65624,-7.96872 -2.65624,-18.20632 0,-10.07159 2.65624,-18.04031 2.65625,-8.02407 7.74738,-13.72392 4.86977,-5.42316 12.06376,-8.30076 7.24933,-2.87759 15.771441,-2.87759 8.85414,0 15.882114,2.93293 7.083313,2.8776 12.008429,8.24542 z m -0.996091,31.76423 q 0,-16.04813 -7.193989,-24.73626 -7.19399,-8.74346 -19.645125,-8.74346 -12.561809,0 -19.755799,8.74346 -7.13865,8.68813 -7.13865,24.73626 0,16.21414 7.30466,24.84693 7.30467,8.57745 19.589789,8.57745 12.28512,0 19.534448,-8.57745 7.304666,-8.63279 7.304666,-24.84693 z"
+                 id="path1277"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="M 26.78887,-136.60287 H 12.566907 l -27.558513,-32.76032 h -15.439408 v 32.76032 h -10.956999 v -82.39884 h 23.076104 q 7.470682,0 12.4511356,0.99609 4.98045415,0.94075 8.9648174,3.43098 4.4824087,2.82225 6.972636,7.13865 2.545565,4.26105 2.545565,10.84632 0,8.90948 -4.4824085,14.94136 -4.4824087,5.97655 -12.3404585,9.02016 z M 1.1672008,-195.81493 q 0,-3.54166 -1.27278275,-6.25324 -1.21744435,-2.76692 -4.09504005,-4.64842 -2.3795503,-1.60482 -5.6445146,-2.21354 -3.2649644,-0.66406 -7.6920344,-0.66406 h -12.893843 v 31.10017 h 11.067676 q 5.201808,0 9.075494,-0.88542 3.8736868,-0.94075 6.5852674,-3.43097 2.4902271,-2.32422 3.65233303,-5.31249 1.21744437,-3.04361 1.21744437,-7.69203 z"
+                 id="path1279"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+              <path
+                 d="M 103.65388,-136.60287 H 89.431913 l -32.594305,-36.68934 -8.19008,8.74346 v 27.94588 H 37.690529 v -82.39884 h 10.956999 v 42.99792 l 40.009648,-42.99792 h 13.281214 l -36.800025,38.73686 z"
+                 id="path1281"
+                 style="stroke-width:4.87108;stroke-dasharray:none" />
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+  <g
+     transform="matrix(0.26458333,0,0,0.26458333,-258.50792,-17.475728)"
+     id="text26039"
+     style="font-size:40px;line-height:1.25;-inkscape-font-specification:'sans-serif, Normal';white-space:pre;shape-inside:url(#rect26041);stroke-width:0.620253" />
+</svg>
diff --git a/Buildings/Resources/Images/Templates/Components/Pumps/Single.svg b/Buildings/Resources/Images/Templates/Components/Pumps/Single.svg
new file mode 100644
index 00000000000..0a1e92034bc
--- /dev/null
+++ b/Buildings/Resources/Images/Templates/Components/Pumps/Single.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="200mm"
+   height="200mm"
+   viewBox="0 0 199.99999 200"
+   version="1.1"
+   id="svg1536"
+   sodipodi:docname="Single.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1538"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="false"
+     inkscape:zoom="0.53354915"
+     inkscape:cx="182.73855"
+     inkscape:cy="343.92333"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-6"
+     inkscape:window-y="-6"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g2502" />
+  <defs
+     id="defs1533" />
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-59.335463,-129.46387)">
+    <g
+       id="g2502"
+       transform="matrix(0.26458333,0,0,0.26458333,73.084636,70.828511)"
+       style="fill:none;stroke:#000000">
+      <g
+         id="g15452"
+         transform="matrix(0.64025454,0,0,0.64464303,-20.002896,134.38676)"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:5.88304;stroke-dasharray:none">
+        <path
+           d="M 447.66037,226.60848 C 247.60776,226.60471 67.250304,347.20662 -9.3039227,532.1724 -85.857993,717.13779 -43.531312,930.03766 97.926635,1071.6068 239.38458,1213.176 452.11721,1255.5359 636.93731,1178.9217 821.75778,1102.3073 942.26496,921.80801 942.26283,721.59814 l 185.48857,2e-5 V 226.6085 H 447.66365"
+           id="path568"
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5.88304;stroke-dasharray:none"
+           sodipodi:nodetypes="cssscccc" />
+        <path
+           d="m 460.10226,790.17317 a 76.090642,76.150462 0 1 0 0,-152.30092"
+           id="path578"
+           style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5.88304;stroke-dasharray:none" />
+        <path
+           id="polyline580"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.126246;stroke-dasharray:none"
+           transform="matrix(46.581354,0,0,46.617975,-18024.871,-14820.555)"
+           d="m 396.832,331.598 h -1.145" />
+        <path
+           id="polyline582"
+           style="fill:#ffffff;fill-opacity:1;stroke-width:0.126246;stroke-dasharray:none"
+           transform="matrix(46.581354,0,0,46.617975,-18024.871,-14820.555)"
+           d="m 396.832,334.865 h -1.145" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/Buildings/Resources/Images/Templates/Components/Sensors/ProbeInWell.svg b/Buildings/Resources/Images/Templates/Components/Sensors/ProbeInWell.svg
index 29cc872049b..228bc49c3df 100644
--- a/Buildings/Resources/Images/Templates/Components/Sensors/ProbeInWell.svg
+++ b/Buildings/Resources/Images/Templates/Components/Sensors/ProbeInWell.svg
@@ -8,7 +8,7 @@
    version="1.1"
    id="svg19564"
    sodipodi:docname="ProbeInWell.svg"
-   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -25,13 +25,13 @@
      inkscape:document-units="mm"
      showgrid="false"
      inkscape:zoom="0.5989195"
-     inkscape:cx="-124.39067"
-     inkscape:cy="224.57108"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-6"
-     inkscape:window-y="-6"
-     inkscape:window-maximized="1"
+     inkscape:cx="-123.55584"
+     inkscape:cy="223.73625"
+     inkscape:window-width="1880"
+     inkscape:window-height="1027"
+     inkscape:window-x="46"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg19564" />
   <defs
      id="defs19561">
@@ -54,8 +54,8 @@
      id="rect9041"
      width="61.494431"
      height="104.5187"
-     x="69.252785"
-     y="47.74065" />
+     x="69.252762"
+     y="94.978653" />
   <g
      clip-path="url(#clipId0)"
      fill="none"
diff --git a/Buildings/Resources/Images/Templates/Components/Valves/Check.svg b/Buildings/Resources/Images/Templates/Components/Valves/Check.svg
new file mode 100644
index 00000000000..07d84ffe1f2
--- /dev/null
+++ b/Buildings/Resources/Images/Templates/Components/Valves/Check.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="40"
+   height="40"
+   viewBox="0 0 10.583333 10.583334"
+   version="1.1"
+   id="svg16919"
+   inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
+   sodipodi:docname="Check.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview16921"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="true"
+     inkscape:zoom="12.07284"
+     inkscape:cx="26.422947"
+     inkscape:cy="33.504959"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     inkscape:window-x="-6"
+     inkscape:window-y="-6"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g31744">
+    <inkscape:grid
+       type="xygrid"
+       id="grid17403"
+       originx="-41.009527"
+       originy="-82.021737" />
+  </sodipodi:namedview>
+  <defs
+     id="defs16916" />
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-41.009527,-82.021722)">
+    <g
+       id="g18609"
+       transform="matrix(3.6255126,0,0,3.6646368,-111.14669,-222.08081)"
+       style="stroke-width:0.725876;stroke-dasharray:none">
+      <g
+         id="g31744"
+         transform="matrix(0.25807563,0,0,0.25497655,31.40813,62.093045)"
+         style="stroke-width:2.82969;stroke-dasharray:none">
+        <g
+           id="g4264"
+           transform="translate(1.8903815e-4,1.2501343)">
+          <rect
+             style="font-variation-settings:normal;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.282968;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+             id="rect17459"
+             width="7.6713228"
+             height="4.951973"
+             x="42.862389"
+             y="83.865005" />
+          <path
+             style="font-variation-settings:normal;opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.282968;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
+             d="m 42.862388,83.865007 7.671323,4.951973"
+             id="path17824" />
+          <ellipse
+             style="fill:#000000;stroke:#000000;stroke-width:0.282968;stroke-dasharray:none;stroke-opacity:1;stop-color:#000000"
+             id="path17878"
+             cx="42.862389"
+             cy="83.865005"
+             rx="0.52905691"
+             ry="0.52126044" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/Buildings/Resources/Images/Templates/Components/Valves/ThreeWay.svg b/Buildings/Resources/Images/Templates/Components/Valves/ThreeWay.svg
index f66b2a0f944..c560eae7a03 100644
--- a/Buildings/Resources/Images/Templates/Components/Valves/ThreeWay.svg
+++ b/Buildings/Resources/Images/Templates/Components/Valves/ThreeWay.svg
@@ -8,7 +8,7 @@
    version="1.1"
    id="svg1985"
    sodipodi:docname="ThreeWay.svg"
-   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -22,17 +22,34 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
+     showgrid="true"
      inkscape:zoom="1.1978389"
      inkscape:cx="439.54158"
-     inkscape:cy="295.94965"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-6"
-     inkscape:window-y="-6"
-     inkscape:window-maximized="1"
+     inkscape:cy="296.36707"
+     inkscape:window-width="1392"
+     inkscape:window-height="1027"
+     inkscape:window-x="46"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
      inkscape:current-layer="svg1985"
-     inkscape:document-units="mm" />
+     inkscape:document-units="mm">
+    <inkscape:grid
+       id="grid1"
+       units="mm"
+       originx="0"
+       originy="0"
+       spacingx="0.99999994"
+       spacingy="0.99999989"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
   <defs
      id="defs1982">
     <filter
@@ -64,6 +81,13 @@
        height="1297.1672"
        id="rect5225" />
   </defs>
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0264582;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+     id="rect1-9"
+     width="10"
+     height="20"
+     x="95"
+     y="90" />
   <g
      id="g32369"
      transform="matrix(7.8410971,0,0,7.7272357,-3.7311835,59.110039)"
@@ -81,4 +105,11 @@
      id="polyline218-7"
      style="fill:#ffffff;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
      d="m 141.05236,79.935301 -40.45521,20.06029 40.45521,20.068779 z" />
+  <rect
+     style="font-variation-settings:normal;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000"
+     id="rect1"
+     width="10.000001"
+     height="20"
+     x="79.904167"
+     y="89.958336" />
 </svg>
diff --git a/Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg b/Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg
index e21401b50b9..74a7459328e 100644
--- a/Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg
+++ b/Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg
@@ -8,7 +8,7 @@
    version="1.1"
    id="svg1985"
    sodipodi:docname="TwoWay.svg"
-   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -22,17 +22,34 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     showgrid="false"
-     inkscape:zoom="0.59891944"
-     inkscape:cx="242.93751"
-     inkscape:cy="459.99508"
-     inkscape:window-width="1920"
-     inkscape:window-height="1028"
-     inkscape:window-x="-6"
-     inkscape:window-y="-6"
+     showgrid="true"
+     inkscape:zoom="0.84906002"
+     inkscape:cx="289.73217"
+     inkscape:cy="268.53225"
+     inkscape:window-width="1880"
+     inkscape:window-height="1027"
+     inkscape:window-x="46"
+     inkscape:window-y="25"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg1985"
-     inkscape:document-units="mm" />
+     inkscape:document-units="mm">
+    <inkscape:grid
+       id="grid1"
+       units="mm"
+       originx="0"
+       originy="0"
+       spacingx="0.99999999"
+       spacingy="0.99999994"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
   <defs
      id="defs1982">
     <filter
@@ -64,6 +81,13 @@
        height="1297.1672"
        id="rect5225" />
   </defs>
+  <rect
+     style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0264583;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+     id="rect1"
+     width="10.000001"
+     height="20"
+     x="95"
+     y="90" />
   <g
      id="g33616"
      transform="matrix(8.1067807,0,0,7.727236,-7.245951,-4.5006949)"
diff --git a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png
new file mode 100644
index 00000000000..e56207c6969
Binary files /dev/null and b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png differ
diff --git a/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
new file mode 100644
index 00000000000..da70a336999
--- /dev/null
+++ b/Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.svg
@@ -0,0 +1,916 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="215.25mm"
+   height="115.25mm"
+   viewBox="0 0 215.25 115.25"
+   version="1.1"
+   id="svg1"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   sodipodi:docname="AirToWater.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     showgrid="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="345.77521"
+     inkscape:cy="257.03331"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       id="grid6"
+       units="mm"
+       originx="-114.875"
+       originy="-79.874993"
+       spacingx="1"
+       spacingy="0.99999998"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" />
+  </sodipodi:namedview>
+  <defs
+     id="defs1">
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0-8"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6-7" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0-5"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6-2" />
+    </marker>
+    <marker
+       style="overflow:visible"
+       id="Stop-1-0-0-8-3"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Stop"
+       markerWidth="1"
+       markerHeight="1"
+       viewBox="0 0 1 1"
+       inkscape:isstock="true"
+       inkscape:collect="always"
+       preserveAspectRatio="xMidYMid">
+      <path
+         style="fill:none;stroke:context-stroke;stroke-width:1"
+         d="M 0,4 V -4"
+         id="path23-3-4-6-7-8" />
+    </marker>
+  </defs>
+  <g
+     inkscape:label="Piping"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(-114.87501,-79.874992)">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 120,120 h 35"
+       id="path2-83-1"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 140,120 v 20"
+       id="path2-83-1-8"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 120,140 h 33 m 4,0 h 8"
+       id="path2-83-7-1"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0);marker-end:url(#Stop-1-0-0)"
+       d="m 155,115 v 74.99999"
+       id="path2-4-3-0-2-3"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0-8);marker-end:url(#Stop-1-0-0-8)"
+       d="m 165,115 v 74.99999"
+       id="path2-4-3-0-2-3-5"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-opacity:1"
+       d="m 280.00001,140 h 8 m 4,0 h 33"
+       id="path2-83-7-1-6"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 290.00001,120 h 35"
+       id="path2-83-7-1-6-9"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0-5);marker-end:url(#Stop-1-0-0-5)"
+       d="m 280.00001,115.00002 v 74.99999"
+       id="path2-4-3-0-2-3-7"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-1-0-0-8-3);marker-end:url(#Stop-1-0-0-8-3)"
+       d="m 290.00001,115.00002 v 74.99999"
+       id="path2-4-3-0-2-3-5-1"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 210,155 -1e-5,-50.00001"
+       id="path2-83-74-0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 195,165 -1e-5,-60.00001"
+       id="path2-83-74-0-3"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g2-9-4"
+       transform="matrix(0,1,1,0,200,-49.999988)"
+       style="stroke-width:0.25;stroke-dasharray:none">
+      <g
+         id="g3"
+         style="stroke-width:0.25;stroke-dasharray:none">
+        <ellipse
+           style="fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="path10-1-39-91-0"
+           cx="169.99998"
+           cy="-5"
+           rx="4.6807604"
+           ry="4.6807609" />
+        <path
+           style="fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           d="m 174.3727,-5.0000002 -4.20376,-4.4640421 v 8.92808458 z"
+           id="path11-4-05-72-0"
+           sodipodi:nodetypes="cccc" />
+      </g>
+    </g>
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 235.00001,185.00001 -1e-5,-80"
+       id="path2-83-74-0-3-4"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 280.00001,165 h -28 m -4,0 h -11 m -4,0 -66,1e-5 m -4,0 L 155,165"
+       id="path2-83-74-0-3-5"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 290.00001,175 h -8 m -4,0 h -41 m -4,0 H 165"
+       id="path2-83-74-0-3-5-3"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 280.00001,184.99999 -113,1e-5 m -4,0 -8.00001,-1e-5"
+       id="path2-83-74-0-3-5-38"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 250.00001,175.00002 v -70"
+       id="path2-83-74-0-35"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:4, 2;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 290.00001,155 h -8 m -4,0 h -26 m -4,0 h -11 m -4,0 H 197 m -4,0 h -28"
+       id="path2-83-74-0-3-5-3-1"
+       sodipodi:nodetypes="cccccccccc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="154.94212"
+       y="112.01882"
+       id="text5-1-9-3-0-2-0-65-8-9-8-1"><tspan
+         sodipodi:role="line"
+         x="154.94212"
+         y="112.01882"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-5">HWS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="169.85393"
+       y="112.0202"
+       id="text5-1-9-3-0-2-0-65-8-9-8-4"><tspan
+         sodipodi:role="line"
+         x="169.85393"
+         y="112.0202"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-4">HWR</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="275.00964"
+       y="112.01882"
+       id="text5-1-9-3-0-2-0-65-8-9-8-1-6"><tspan
+         sodipodi:role="line"
+         x="275.00964"
+         y="112.01882"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-5-2">CHWS</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#000000;stroke-width:0.999999"
+       x="294.92145"
+       y="112.02022"
+       id="text5-1-9-3-0-2-0-65-8-9-8-4-5"><tspan
+         sodipodi:role="line"
+         x="294.92145"
+         y="112.02022"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.999999"
+         id="tspan2-4-4-04-2-5-0-4-8">CHWR</tspan></text>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="svg_export">
+      <g
+         id="path2-4-3-0-2-3-57">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 154.75,115 v 75 h 0.5 v -75 z"
+           id="path7" />
+        <g
+           id="g2">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 153,189.75 v 0.5 h 4 v -0.5 z"
+             id="path6" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 153,114.75 v 0.5 h 4 v -0.5 z"
+             id="path4" />
+        </g>
+      </g>
+      <g
+         id="path2-4-3-0-2-3-5-9">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 164.75,115 v 75 h 0.5 v -75 z"
+           id="path14" />
+        <g
+           id="g8">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 163,189.75 v 0.5 h 4 v -0.5 z"
+             id="path13" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 163,114.75 v 0.5 h 4 v -0.5 z"
+             id="path12" />
+        </g>
+      </g>
+      <g
+         id="path2-4-3-0-2-3-7-8">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 279.75,115 v 75 h 0.5 v -75 z"
+           id="path28" />
+        <g
+           id="g18">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 278,189.75 v 0.5 h 4 v -0.5 z"
+             id="path27" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 278,114.75 v 0.5 h 4 v -0.5 z"
+             id="path26" />
+        </g>
+      </g>
+      <g
+         id="path2-4-3-0-2-3-5-1-7">
+        <path
+           style="color:#000000;fill:#000000;-inkscape-stroke:none"
+           d="m 289.75,115 v 75 h 0.5 v -75 z"
+           id="path31" />
+        <g
+           id="g29">
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 288,189.75 v 0.5 h 4 v -0.5 z"
+             id="path30" />
+          <path
+             style="color:#000000;fill:#000000;-inkscape-stroke:none"
+             d="m 288,114.75 v 0.5 h 4 v -0.5 z"
+             id="path29" />
+        </g>
+      </g>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
+       x="242.5641"
+       y="91.924835"
+       id="text5-1-9-3-0-2-2-9-5"><tspan
+         sodipodi:role="line"
+         x="242.5641"
+         y="91.924835"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
+         id="tspan2-4-1-2-4">AWHP-2</tspan></text>
+    <g
+       id="g1"
+       transform="matrix(0,-1.4214802,1.4214802,0,154.55682,448.47328)">
+      <ellipse
+         cy="249.4752"
+         cx="67.043098"
+         id="circle5669-8-4-7-9"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)"
+         rx="1.7583774"
+         ry="1.7565393" />
+      <path
+         id="path427"
+         d="m 247.87271,66.352258 2.50934,-0.832062"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path429"
+         d="m 247.82879,67.746427 2.58463,0.80383"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         y="-256.56128"
+         x="58.351643"
+         height="3.5130787"
+         width="7.0335097"
+         id="rect1469-2-9"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         transform="rotate(90)" />
+      <path
+         id="path1471-4-1"
+         d="m 253.04822,58.351681 3.51308,7.033472"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path459"
+         d="m 256.56126,58.351681 -3.51308,7.033472"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path481"
+         d="m 251.29169,67.143547 h 1.75654 V 65.3851"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path483"
+         d="m 253.04823,58.351681 v -1.758394 h -1.75654"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5655-7-5-9-1-5"
+         d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path5657-8-5-7-6-3"
+         d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
+         style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect1469-2-9-7"
+         width="7.0335097"
+         height="3.5130787"
+         x="58.351643"
+         y="-246.02203"
+         transform="rotate(90)" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 242.50899,58.351681 3.51307,7.033472"
+         id="path1471-4-1-5" />
+      <path
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 246.02203,58.351681 -3.51308,7.033472"
+         id="path459-5" />
+      <path
+         id="path3481"
+         d="m 246.02207,58.351681 v -1.758394 h 1.75654"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3538"
+         d="m 246.02207,65.385153 v 1.758368 h 1.69947"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3662"
+         d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3728"
+         d="m 241.63072,56.593287 h 0.87827 v 1.758394"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3730"
+         d="m 256.5613,58.351681 v -1.758394 h 0.87827"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3732"
+         d="m 256.5613,65.385153 v 1.758368 h 0.87827"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3734"
+         d="m 241.63072,67.143547 h 0.87827 V 65.3851"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3-9"
+       style="display:inline"
+       transform="matrix(1.0012268,0,0,1.0012268,-40.285234,-2.4919381)">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:0;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;display:inline;fill:#000000;stroke-width:0.596446"
+         x="242.5641"
+         y="94.285057"
+         id="text5-1-9-3-0-2-2-9-5-0"><tspan
+           sodipodi:role="line"
+           x="242.5641"
+           y="94.285057"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.36661px;line-height:1.25;font-family:'Arial Narrow';-inkscape-font-specification:'Arial Narrow, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;stroke-width:0.596446"
+           id="tspan2-4-1-2-4-5">AWHP-1</tspan></text>
+      <g
+         id="g2-0"
+         transform="matrix(0,-1.4197388,1.4197388,0,154.65231,450.41273)">
+        <ellipse
+           cy="249.4752"
+           cx="67.043098"
+           id="circle5669-8-4-7-9-9"
+           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           transform="matrix(0,1,1,0,0,0)"
+           rx="1.7583774"
+           ry="1.7565393" />
+        <path
+           id="path427-7"
+           d="m 247.87271,66.352258 2.50934,-0.832062"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path429-1"
+           d="m 247.82879,67.746427 2.58463,0.80383"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="-256.56128"
+           x="58.351643"
+           height="3.5130787"
+           width="7.0335097"
+           id="rect1469-2-9-5"
+           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           transform="rotate(90)" />
+        <path
+           id="path1471-4-1-6"
+           d="m 253.04822,58.351681 3.51308,7.033472"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path459-7"
+           d="m 256.56126,58.351681 -3.51308,7.033472"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path481-4"
+           d="m 251.29169,67.143547 h 1.75654 V 65.3851"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path483-6"
+           d="m 253.04823,58.351681 v -1.758394 h -1.75654"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path5655-7-5-9-1-5-6"
+           d="m 251.24604,55.715558 v 1.755431 l -1.7109,-0.877702 z"
+           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path5657-8-5-7-6-3-4"
+           d="m 247.82425,55.715558 v 1.755431 l 1.71089,-0.877702 z"
+           style="display:inline;fill:none;fill-opacity:0;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           style="display:inline;fill:none;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.132292;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="rect1469-2-9-7-9"
+           width="7.0335097"
+           height="3.5130787"
+           x="58.351643"
+           y="-246.02203"
+           transform="rotate(90)" />
+        <path
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 242.50899,58.351681 3.51307,7.033472"
+           id="path1471-4-1-5-4" />
+        <path
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 246.02203,58.351681 -3.51308,7.033472"
+           id="path459-5-4" />
+        <path
+           id="path3481-8"
+           d="m 246.02207,58.351681 v -1.758394 h 1.75654"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3538-5"
+           d="m 246.02207,65.385153 v 1.758368 h 1.69947"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3662-3"
+           d="m 241.63072,54.834892 h 15.80885 v 14.946207 h -15.80885 z"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3728-5"
+           d="m 241.63072,56.593287 h 0.87827 v 1.758394"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3730-9"
+           d="m 256.5613,58.351681 v -1.758394 h 0.87827"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3732-2"
+           d="m 256.5613,65.385153 v 1.758368 h 0.87827"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           id="path3734-8"
+           d="m 241.63072,67.143547 h 0.87827 V 65.3851"
+           style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.132292;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
+    </g>
+    <path
+       style="display:inline;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 305.00001,120 v 20"
+       id="path2-83-1-8-7"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g4-8"
+       style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+       transform="translate(5.0000041,67.999998)">
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="-0.80986268"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="0.80986732"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       id="path5661-2-42-7-3-5-1-1-7"
+       d="M 180,151.67934 V 155"
+       style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+    <ellipse
+       style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path10-1-39-91-0-5"
+       cx="120"
+       cy="235"
+       rx="4.6807604"
+       ry="4.6807609"
+       transform="matrix(0,1,1,0,0,0)" />
+    <path
+       style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 235.00002,124.3727 -4.46404,-4.20376 h 8.92808 z"
+       id="path11-4-05-72-0-7"
+       sodipodi:nodetypes="cccc" />
+    <g
+       id="g5"
+       transform="translate(-0.0333985,-2.8057666)">
+      <ellipse
+         style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10-1-39-91-0-7"
+         cx="-130.0334"
+         cy="122.80576"
+         rx="4.6807604"
+         ry="4.6807609"
+         transform="scale(-1,1)" />
+      <path
+         style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 125.66067,122.80576 4.20376,-4.46404 v 8.92808 z"
+         id="path11-4-05-72-0-3"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <g
+       id="g6"
+       transform="translate(0.10257683,5.0192374)">
+      <ellipse
+         style="display:inline;fill:#fefdfd;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path10-1-39-91-0-1"
+         cx="314.89743"
+         cy="-134.98076"
+         rx="4.6807604"
+         ry="4.6807609"
+         transform="scale(1,-1)" />
+      <path
+         style="display:inline;fill:#4d4d4d;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.271144;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 319.27014,134.98076 -4.20376,4.46404 v -8.92808 z"
+         id="path11-4-05-72-0-4"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <rect
+       y="178"
+       x="147.6844"
+       height="4.0000005"
+       width="3.9949403"
+       id="rect5659-1-1-1-8-2-2-99-3-0"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0,1,1,0,0,0)" />
+    <g
+       id="g9"
+       transform="translate(0.44102414,-2.0000047)">
+      <g
+         id="g4-8-1"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(4.5589824,79.999998)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-9"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-9"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-1"
+         d="M 179.55898,163.67934 V 167"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="177.55898"
+         x="159.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-0"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10">
+      <g
+         id="g4-8-5"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10-6"
+       style="display:inline"
+       transform="translate(-4.0583331e-6,9.9999938)">
+      <g
+         id="g4-8-5-9"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8-6"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8-6"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6-2"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3-4"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g4-8-7"
+       style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+       transform="translate(90.00001,67.999999)">
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-85"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="-0.80986268"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+      <path
+         id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-89"
+         style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:transform-center-x="0.80986732"
+         inkscape:transform-center-y="4.7081598e-05"
+         d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <path
+       id="path5661-2-42-7-3-5-1-1-7-3"
+       d="M 265.00001,151.67934 V 155"
+       style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc" />
+    <rect
+       y="263.00003"
+       x="147.6844"
+       height="4.0000005"
+       width="3.9949403"
+       id="rect5659-1-1-1-8-2-2-99-3-0-5"
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       transform="matrix(0,1,1,0,0,0)" />
+    <g
+       id="g9-7"
+       transform="translate(85.441034,-2.0000042)"
+       style="display:inline">
+      <g
+         id="g4-8-1-3"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(4.5589824,79.999998)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-9-0"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-9-3"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-1-3"
+         d="M 179.55898,163.67934 V 167"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="177.55898"
+         x="159.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-0-2"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10-9"
+       style="display:inline"
+       transform="translate(85.00001)">
+      <g
+         id="g4-8-5-3"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8-4"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8-3"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6-5"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3-5"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+    <g
+       id="g10-6-1"
+       style="display:inline"
+       transform="translate(85.000006,9.9999948)">
+      <g
+         id="g4-8-5-9-7"
+         style="display:inline;stroke-width:0.25;stroke-dasharray:none"
+         transform="translate(5.0000082,88.000003)">
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-7-4-7-6-8-6-9"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="-0.80986268"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+        <path
+           id="path25187-0-9-6-7-8-6-9-2-2-5-68-9-5-7-6-3-5-8-6-8-0-1-5-0-8-4-8-3-5-2-5-5-6-8-8-6-2"
+           style="fill:#ffffff;stroke:#4d4d4d;stroke-width:0.25;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:transform-center-x="0.80986732"
+           inkscape:transform-center-y="4.7081598e-05"
+           d="m 175,86.999998 -5,2.999999 v -5.999999 z"
+           sodipodi:nodetypes="cccc" />
+      </g>
+      <path
+         id="path5661-2-42-7-3-5-1-1-7-6-2-5"
+         d="M 180,171.67934 V 175"
+         style="display:inline;fill:none;stroke:#4d4d4d;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <rect
+         y="178"
+         x="167.6844"
+         height="4.0000005"
+         width="3.9949403"
+         id="rect5659-1-1-1-8-2-2-99-3-0-3-4-5"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.199747;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         transform="matrix(0,1,1,0,0,0)" />
+    </g>
+  </g>
+</svg>
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt
index 9db24bf6bb4..eabd7d68c81 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_BaseClasses_Validation_ControllerChillerDXHeatingEconomizer.txt
@@ -1,4 +1,4 @@
-last-generated=2020-11-20
+last-generated=2024-04-01
 statistics-simulation=
 {
   "linear": " ",
@@ -6,12 +6,12 @@ statistics-simulation=
   "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
-con.TRoo=[2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02]
+time=[0e+00, 1.728e+05]
 con.TSetRooCoo=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 con.TSetRooHea=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
-time=[0e+00, 1.728e+05]
-con.yHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.647239878773689e-02, 3.273643553256989e-01, 8.477213382720975e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.816431403160095e-01, 7.517172694206238e-01, 3.030463457107544e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.647343069314957e-02, 3.2736536860466e-01, 8.477223515510559e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.816421270370483e-01, 7.517160177230835e-01, 3.030450940132141e-01, 0e+00, 0e+00, 0e+00]
-con.yCooCoiVal=[0e+00, 1.720682084560394e-01, 5.100926756858826e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.956660270690918e-01, 8.23597252368927e-01, 4.855729043483734e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.33625653386116e-03, 1.764044463634491e-01, 5.144289135932922e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.956595301628113e-01, 8.235909938812256e-01, 4.85566645860672e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.33625653386116e-03]
-con.yFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082911416888237e-01, 2.105162441730499e-01, 3.722033500671387e-01, 5.635502934455872e-01, 7.542873620986938e-01, 9.141548871994021e-01, 1e+00, 9.980849027633667e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542088508605957e-01, 6.596971154212952e-01, 1.278783231973648e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082934960722923e-01, 2.105187922716141e-01, 3.722059428691864e-01, 5.635528564453125e-01, 7.542899250984192e-01, 9.14157509803772e-01, 1e+00, 9.980853199958801e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542136192321777e-01, 6.597015261650085e-01, 1.278822422027588e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00]
-con.TSetSupAir=[2.861499938964844e+02, 2.861499938964844e+02]
+con.TRoo=[2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02, 2.954033203125e+02, 2.966369018554688e+02, 2.978312377929688e+02, 2.98967529296875e+02, 3.000278625488281e+02, 3.009954833984375e+02, 3.018551330566406e+02, 3.025932922363281e+02, 3.031982727050781e+02, 3.036605529785156e+02, 3.039728698730469e+02, 3.041302795410156e+02, 3.041302795410156e+02, 3.039728698730469e+02, 3.036605529785156e+02, 3.031982727050781e+02, 3.025932922363281e+02, 3.018551330566406e+02, 3.009954833984375e+02, 3.000278625488281e+02, 2.98967529296875e+02, 2.978312377929688e+02, 2.966369018554688e+02, 2.954033203125e+02, 2.941499938964844e+02, 2.928966674804688e+02, 2.916630859375e+02, 2.9046875e+02, 2.893324584960938e+02, 2.882721557617188e+02, 2.873045349121094e+02, 2.864448547363281e+02, 2.857067260742188e+02, 2.851017150878906e+02, 2.846394348144531e+02, 2.843271179199219e+02, 2.841697387695312e+02, 2.841697387695312e+02, 2.843271179199219e+02, 2.846394348144531e+02, 2.851017150878906e+02, 2.857067260742188e+02, 2.864448547363281e+02, 2.873045349121094e+02, 2.882721557617188e+02, 2.893324584960938e+02, 2.9046875e+02, 2.916630859375e+02, 2.928966674804688e+02, 2.941499938964844e+02]
+con.yFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082922741770744e-01, 2.105175256729126e-01, 3.722044825553894e-01, 5.635513663291931e-01, 7.542885541915894e-01, 9.141561388969424e-01, 1e+00, 9.980847835540771e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542185664176941e-01, 6.597064137458801e-01, 1.278872042894363e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082927510142326e-01, 2.105180025100708e-01, 3.722049593925476e-01, 5.635518431663513e-01, 7.542890310287476e-01, 9.141566157341003e-01, 1e+00, 9.980847835540771e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.542185664176941e-01, 6.597064137458801e-01, 1.278872042894363e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+con.yHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.64723913371563e-02, 3.273644745349884e-01, 8.477222323417691e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8164302110672e-01, 7.51718282699585e-01, 3.030494749546051e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.64723913371563e-02, 3.273644745349884e-01, 8.477222323417664e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.8164302110672e-01, 7.51718282699585e-01, 3.030494749546051e-01, 0e+00, 0e+00, 0e+00]
+con.yCooCoiVal=[0e+00, 1.720682084560394e-01, 5.100926756858826e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.956628680229187e-01, 8.235945701599121e-01, 4.855700731277466e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.336489364504814e-03, 1.76404669880867e-01, 5.144291520118713e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.956628680229187e-01, 8.235945701599121e-01, 4.855700731277466e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.336489364504814e-03]
 con.TSup=[2.861499938964844e+02, 2.8702734375e+02, 2.878908386230469e+02, 2.887268676757812e+02, 2.895222778320312e+02, 2.902644958496094e+02, 2.909418334960938e+02, 2.915435791015625e+02, 2.92060302734375e+02, 2.924837951660156e+02, 2.928074035644531e+02, 2.930260009765625e+02, 2.931361999511719e+02, 2.931361999511719e+02, 2.930260009765625e+02, 2.928074035644531e+02, 2.924837951660156e+02, 2.92060302734375e+02, 2.915435791015625e+02, 2.909418334960938e+02, 2.902644958496094e+02, 2.895222778320312e+02, 2.887268676757812e+02, 2.878908386230469e+02, 2.8702734375e+02, 2.861499938964844e+02, 2.852726745605469e+02, 2.844091796875e+02, 2.835731201171875e+02, 2.827777099609375e+02, 2.820354919433594e+02, 2.813581848144531e+02, 2.807564086914062e+02, 2.802397155761719e+02, 2.798162231445312e+02, 2.794926147460938e+02, 2.792739868164062e+02, 2.79163818359375e+02, 2.79163818359375e+02, 2.792739868164062e+02, 2.794926147460938e+02, 2.798162231445312e+02, 2.802397155761719e+02, 2.807564086914062e+02, 2.813581848144531e+02, 2.820354919433594e+02, 2.827777099609375e+02, 2.835731201171875e+02, 2.844091796875e+02, 2.852726745605469e+02, 2.861499938964844e+02, 2.8702734375e+02, 2.878908386230469e+02, 2.887268676757812e+02, 2.895222778320312e+02, 2.902644958496094e+02, 2.909418334960938e+02, 2.915435791015625e+02, 2.92060302734375e+02, 2.924837951660156e+02, 2.928074035644531e+02, 2.930260009765625e+02, 2.931361999511719e+02, 2.931361999511719e+02, 2.930260009765625e+02, 2.928074035644531e+02, 2.924837951660156e+02, 2.92060302734375e+02, 2.915435791015625e+02, 2.909418334960938e+02, 2.902644958496094e+02, 2.895222778320312e+02, 2.887268676757812e+02, 2.878908386230469e+02, 2.8702734375e+02, 2.861499938964844e+02, 2.852726745605469e+02, 2.844091796875e+02, 2.835731201171875e+02, 2.827777099609375e+02, 2.820354919433594e+02, 2.813581848144531e+02, 2.807564086914062e+02, 2.802397155761719e+02, 2.798162231445312e+02, 2.794926147460938e+02, 2.792739868164062e+02, 2.79163818359375e+02, 2.79163818359375e+02, 2.792739868164062e+02, 2.794926147460938e+02, 2.798162231445312e+02, 2.802397155761719e+02, 2.807564086914062e+02, 2.813581848144531e+02, 2.820354919433594e+02, 2.827777099609375e+02, 2.835731201171875e+02, 2.844091796875e+02, 2.852726745605469e+02, 2.861499938964844e+02]
+con.TSetSupAir=[2.861499938964844e+02, 2.861499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt
index 19c83138e85..e67a30b43c4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Air_Systems_SingleZone_VAV_Examples_ChillerDXHeatingEconomizer.txt
@@ -1,4 +1,4 @@
-last-generated=2023-06-16
+last-generated=2024-03-28
 statistics-initialization=
 {
   "linear": "19",
@@ -13,11 +13,11 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 5.048e+05]
-con.TRoo=[2.931499938964844e+02, 2.881458239119098e+02, 2.881132750108507e+02, 2.881048665364584e+02, 2.881011442057292e+02, 2.881063571506077e+02, 2.931441980938366e+02, 2.931304234483507e+02, 2.981698816457508e+02, 2.982812316894531e+02, 2.982970560709635e+02, 2.982501245795356e+02, 2.976850130208333e+02, 2.943042972140842e+02, 2.905318812391493e+02, 2.88130229695638e+02, 2.881117207845052e+02, 2.880957666015625e+02, 2.880845129394531e+02, 2.88075094672309e+02, 2.880690639919705e+02, 2.880634543863932e+02, 2.880589264594184e+02, 2.915165499815814e+02, 2.930083553059896e+02, 2.930214691162109e+02, 2.930190405273437e+02, 2.930169128417969e+02, 2.930125391981337e+02, 2.93002164984809e+02, 2.897204213145534e+02, 2.880541918945312e+02, 2.880427749294705e+02, 2.880367079671224e+02, 2.880343825954861e+02, 2.880335066053602e+02, 2.880345031738281e+02, 2.880339320882161e+02, 2.880302945963542e+02, 2.880278210449219e+02, 2.88474264187283e+02, 2.929802370876736e+02, 2.930349564615885e+02, 2.93857082655165e+02, 2.948437151421441e+02, 2.931369656476367e+02, 2.930649104817708e+02, 2.93011613023546e+02, 2.88057294921875e+02, 2.880393975830078e+02, 2.880325690375434e+02, 2.880278698730469e+02, 2.880208521864149e+02, 2.880172584364149e+02, 2.880172204589844e+02, 2.880166039360894e+02, 2.880174274359809e+02, 2.880476810709636e+02, 2.930611908637153e+02, 2.945135716063933e+02, 2.982007507324219e+02, 2.982234921603733e+02, 2.982080346679688e+02, 2.957201331497719e+02, 2.930482058376736e+02, 2.880754011366103e+02, 2.880496744791666e+02, 2.880381608751085e+02, 2.88036637234158e+02, 2.880355537923177e+02, 2.880364013671875e+02, 2.880595088704427e+02, 2.880612963867188e+02, 2.880621503363715e+02, 2.88095540500217e+02, 2.932049622468184e+02, 2.981838122376992e+02, 2.982645391845703e+02, 2.982858614095052e+02, 2.982657882351346e+02, 2.980193135510544e+02, 2.948067242431641e+02, 2.905028946940104e+02, 2.881298156738281e+02, 2.881034057617188e+02, 2.880948805067274e+02, 2.880910095214844e+02, 2.880875970458985e+02, 2.880952425130208e+02, 2.880917147488064e+02, 2.880894226074219e+02, 2.881098601616753e+02, 2.931753818115306e+02, 2.982176841227214e+02, 2.982943690321181e+02, 2.983226894802517e+02, 2.982930428059896e+02, 2.982161229790582e+02, 2.963477406777981e+02, 2.925950952148438e+02, 2.887920837402344e+02]
-con.TSetRooHea=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.920055494520399e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.915475720884673e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.897793553184725e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.885944383409288e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.882388827853733e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.890499938964844e+02, 2.881499938964844e+02]
-con.TSetRooCoo=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.992944383409288e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.997524157045015e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.015206324744962e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.027055494520399e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.030611050075955e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.022499938964844e+02, 3.031499938964844e+02]
-EFan.y=[0e+00, 5.520335589430495e+02, 4.959542697482639e+03, 9.37129615234375e+03, 1.378305014322917e+04, 1.819480412326389e+04, 2.260655761465498e+04, 2.701831095920139e+04, 4.391144490897324e+04, 3.0789073234375e+05, 9.279758277777778e+05, 1.352337325277778e+06, 1.453162871666667e+06, 1.4591535e+06, 1.4591535e+06, 1.460798375e+06, 1.465210116666667e+06, 1.469621858333333e+06, 1.4740336e+06, 1.478445341666667e+06, 1.482857083333333e+06, 1.487268825e+06, 1.491680566666667e+06, 1.496092396869091e+06, 1.500504175e+06, 1.504915916666667e+06, 1.509327658333333e+06, 1.5137394e+06, 1.518151141666667e+06, 1.522562883333333e+06, 1.526764875e+06, 1.530735991666667e+06, 1.535147733333333e+06, 1.539559475e+06, 1.543971216666667e+06, 1.548382958333333e+06, 1.5527947e+06, 1.557206441666667e+06, 1.561618183333333e+06, 1.566029925e+06, 1.570441677777778e+06, 1.574853533333333e+06, 1.579265275e+06, 1.583677016666667e+06, 1.588088758333333e+06, 1.592500501382709e+06, 1.596912241666667e+06, 1.601323983333333e+06, 1.60490685e+06, 1.609318591666667e+06, 1.613730458333333e+06, 1.6181422e+06, 1.622553941666667e+06, 1.626965683333333e+06, 1.631377425e+06, 1.635789166666667e+06, 1.640200908333333e+06, 1.64461265e+06, 1.649024391666667e+06, 1.653436169452106e+06, 1.665027391666667e+06, 1.727436200833333e+06, 1.800720812222222e+06, 1.816383107325645e+06, 1.820794841666667e+06, 1.823943333333333e+06, 1.828355075e+06, 1.832766816666667e+06, 1.837178558333333e+06, 1.8415903e+06, 1.846002041666667e+06, 1.850413783333333e+06, 1.854825525e+06, 1.859237266666667e+06, 1.863649008333333e+06, 1.868060779426521e+06, 1.881909564517337e+06, 2.039027516111111e+06, 2.491209503333333e+06, 2.957609717777778e+06, 3.136012740176861e+06, 3.146572075e+06, 3.1478935e+06, 3.149770808333333e+06, 3.15418255e+06, 3.158594291666667e+06, 3.163006033333333e+06, 3.167417775e+06, 3.171829516666667e+06, 3.176241258333333e+06, 3.180653e+06, 3.185064892222222e+06, 3.189476733088294e+06, 3.223575888333333e+06, 3.557986627777778e+06, 4.455116472222222e+06, 5.34584958e+06, 5.713142935555556e+06, 5.732647873383145e+06, 5.73448e+06, 5.73448e+06]
-EHea.y=[0e+00, 2.182094290336491e+05, 4.393073151111111e+06, 1.030567978666667e+07, 1.706873387555556e+07, 2.38059042e+07, 3.443325840573355e+07, 4.232165749333333e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.3246784e+07, 4.410182466666666e+07, 4.859313264e+07, 5.510733677333333e+07, 6.370505888e+07, 7.376332159999999e+07, 8.488596106666666e+07, 9.688705733333333e+07, 1.095776518755556e+08, 1.263894269188542e+08, 1.488219458133333e+08, 1.680331573333333e+08, 1.865306586311111e+08, 2.0539339712e+08, 2.246638894222222e+08, 2.449943992533333e+08, 2.655990812692561e+08, 2.755468058311111e+08, 2.901126418488889e+08, 3.059060381866667e+08, 3.223119486577778e+08, 3.388792117333333e+08, 3.5543132032e+08, 3.719193092266667e+08, 3.8875455488e+08, 4.060762434133334e+08, 4.241337265777778e+08, 4.522627504355556e+08, 4.746842397866667e+08, 4.80715648e+08, 4.80715648e+08, 4.809331219314576e+08, 4.880816035555556e+08, 5.042946705066667e+08, 5.1318469376e+08, 5.279413985422222e+08, 5.442589866666666e+08, 5.613741009066666e+08, 5.792503082666667e+08, 5.980160668444444e+08, 6.1693841152e+08, 6.359491399111111e+08, 6.549579266844444e+08, 6.728410065066667e+08, 6.942523172977778e+08, 7.002892576053983e+08, 7.00290112e+08, 7.00290112e+08, 7.00290112e+08, 7.002899751603658e+08, 7.08669632e+08, 7.150957952e+08, 7.279919726933334e+08, 7.432227677866666e+08, 7.593183246222222e+08, 7.7562169472e+08, 7.919248455111111e+08, 8.068823045688889e+08, 8.1898132224e+08, 8.315985854577777e+08, 8.431065671111112e+08, 8.537411029716895e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.53743808e+08, 8.555813832533333e+08, 8.6103020288e+08, 8.683541966222222e+08, 8.764791808e+08, 8.851852100266666e+08, 8.934610167466667e+08, 9.013309156977777e+08, 9.098644224e+08, 9.179788259555556e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08, 9.26628864e+08]
+con.TRoo=[2.931499938964844e+02, 2.881405243773959e+02, 2.881132756890191e+02, 2.881048907470703e+02, 2.881012185329861e+02, 2.881063869900174e+02, 2.901690649414062e+02, 2.931300741238064e+02, 2.981699204983835e+02, 2.982812432861328e+02, 2.98297056749132e+02, 2.982501680501302e+02, 2.976862345377604e+02, 2.943053951009115e+02, 2.905322450086805e+02, 2.881306162516276e+02, 2.881117990451389e+02, 2.880957765028212e+02, 2.880845129394531e+02, 2.880751534695095e+02, 2.880691236707899e+02, 2.880634576416016e+02, 2.880589218478733e+02, 2.892990375434028e+02, 2.930083459472656e+02, 2.93021233452691e+02, 2.930189908854167e+02, 2.930168341064453e+02, 2.930125472005208e+02, 2.930021752251519e+02, 2.897158833041698e+02, 2.880548021104601e+02, 2.880428133138021e+02, 2.880367079671224e+02, 2.880343619791666e+02, 2.880335042317708e+02, 2.88034501953125e+02, 2.880339895290799e+02, 2.880303601074219e+02, 2.880278210449219e+02, 2.884742363823785e+02, 2.929802221001519e+02, 2.930350349934896e+02, 2.937985879043456e+02, 2.948517895507812e+02, 2.931155883789062e+02, 2.930649560546875e+02, 2.93011585422092e+02, 2.880567915852865e+02, 2.880394636366103e+02, 2.880326877170139e+02, 2.880279457600911e+02, 2.880208573404948e+02, 2.880172070990669e+02, 2.880172119140625e+02, 2.880166039360894e+02, 2.880174274359809e+02, 2.880476527913411e+02, 2.930612193467882e+02, 2.941417670579264e+02, 2.982007466634115e+02, 2.982234943305122e+02, 2.982080365668403e+02, 2.957183930876086e+02, 2.930483543565538e+02, 2.880713589138455e+02, 2.880498213704427e+02, 2.880382524278429e+02, 2.880366966417101e+02, 2.880355537923177e+02, 2.880364420572917e+02, 2.880597488742404e+02, 2.880612414550781e+02, 2.880621114095052e+02, 2.880955638292101e+02, 2.933144757220867e+02, 2.981838158876994e+02, 2.982643613688151e+02, 2.982858231608073e+02, 2.982658119032118e+02, 2.980189855937423e+02, 2.948020672607422e+02, 2.904991617838542e+02, 2.881070479329427e+02, 2.881034057617188e+02, 2.880948805067274e+02, 2.880910095214844e+02, 2.880875970458985e+02, 2.880953327094184e+02, 2.880916485595703e+02, 2.88089404296875e+02, 2.881098355441623e+02, 2.9316070018013e+02, 2.982176717122396e+02, 2.982944125705295e+02, 2.983226894802517e+02, 2.982930428059896e+02, 2.982162033420139e+02, 2.963495651910036e+02, 2.925980187988282e+02, 2.887948608398438e+02]
+con.TSetRooHea=[2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.90216660563151e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.920055494520399e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.894055494520399e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.897659886089761e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.885944383409288e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.882388827853733e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.890499938964844e+02, 2.881499938964844e+02]
+con.TSetRooCoo=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.010833272298177e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.992944383409288e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.018944383409288e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.015339991839926e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.027055494520399e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.030611050075955e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.022499938964844e+02, 3.031499938964844e+02]
+EFan.y=[0e+00, 9.080334373967839e+02, 5.319786885850694e+03, 9.73154029296875e+03, 1.414329428385417e+04, 1.855504826388889e+04, 2.296680088541667e+04, 2.737855509982639e+04, 4.432637320767051e+04, 3.0859397703125e+05, 9.289764416666667e+05, 1.353566691666667e+06, 1.454482545e+06, 1.46047475e+06, 1.46047475e+06, 1.462144125e+06, 1.466555866666667e+06, 1.470967608333333e+06, 1.47537935e+06, 1.479791091666667e+06, 1.484202833333333e+06, 1.488614575e+06, 1.493026316666667e+06, 1.497438089722222e+06, 1.501849925e+06, 1.506261666666667e+06, 1.510673408333333e+06, 1.51508515e+06, 1.519496891666667e+06, 1.523908633333333e+06, 1.528110625e+06, 1.532171616666667e+06, 1.536583358333333e+06, 1.5409951e+06, 1.545406841666667e+06, 1.549818593055556e+06, 1.55423045e+06, 1.558642191666667e+06, 1.563053933333333e+06, 1.567465675e+06, 1.571877416666667e+06, 1.576289158333333e+06, 1.5807009e+06, 1.585112628215055e+06, 1.589524383333333e+06, 1.593936125e+06, 1.598347929444444e+06, 1.602759733333333e+06, 1.606473975e+06, 1.610885716666667e+06, 1.615297458333333e+06, 1.6197092e+06, 1.624120941666667e+06, 1.628532808333333e+06, 1.63294455e+06, 1.637356291666667e+06, 1.641768033333333e+06, 1.646179775e+06, 1.650591516666667e+06, 1.655003242144973e+06, 1.666596358333333e+06, 1.728992383611111e+06, 1.802251323888889e+06, 1.81790927276671e+06, 1.822321091666667e+06, 1.825659833333333e+06, 1.830071575e+06, 1.834483316666667e+06, 1.838895058333333e+06, 1.8433068e+06, 1.847718541666667e+06, 1.852130283333333e+06, 1.856542025e+06, 1.860953891666667e+06, 1.865365633333333e+06, 1.869777358044393e+06, 1.88362792293976e+06, 2.040103379722222e+06, 2.491380136666667e+06, 2.957414915e+06, 3.135799733178654e+06, 3.146281325e+06, 3.14760275e+06, 3.149641558333333e+06, 3.1540533e+06, 3.158465041666667e+06, 3.162876783333333e+06, 3.167288525e+06, 3.171700266666667e+06, 3.176112008333333e+06, 3.18052375e+06, 3.184935491666667e+06, 3.189347233333878e+06, 3.223407378333333e+06, 3.558560784444444e+06, 4.456434838888889e+06, 5.34727338e+06, 5.71475069e+06, 5.734303232834861e+06, 5.736135e+06, 5.736135e+06]
+EHea.y=[0e+00, 5.224997060040278e+05, 4.408926968888889e+06, 1.031795445333333e+07, 1.707869444444444e+07, 2.380788362222222e+07, 3.248085178666667e+07, 4.232573241777778e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.3251684e+07, 4.410640946666667e+07, 4.859561953777778e+07, 5.511381551111111e+07, 6.371365616e+07, 7.377090688e+07, 8.489230968888889e+07, 9.689423168000001e+07, 1.095847973333333e+08, 1.2508503968e+08, 1.488291061333333e+08, 1.680464302222222e+08, 1.865435136711111e+08, 2.0541200512e+08, 2.246839163733333e+08, 2.450152041955556e+08, 2.656182330627892e+08, 2.756114527288889e+08, 2.901644273777778e+08, 3.059520072533333e+08, 3.223545915733333e+08, 3.389266592e+08, 3.5547995392e+08, 3.719628374755555e+08, 3.887908421688889e+08, 4.061119374933333e+08, 4.241720817777778e+08, 4.523029738666667e+08, 4.747087159466667e+08, 4.80716832e+08, 4.80716832e+08, 4.810800128e+08, 4.880642993777778e+08, 5.042725534577778e+08, 5.132251776e+08, 5.279604702577778e+08, 5.442670506666666e+08, 5.613752187733333e+08, 5.792464887466667e+08, 5.980213340444444e+08, 6.1694647296e+08, 6.359577002666667e+08, 6.549663746844444e+08, 6.7284975104e+08, 6.942616192e+08, 7.002992e+08, 7.002992e+08, 7.002992e+08, 7.002992e+08, 7.002994748673553e+08, 7.086742994488889e+08, 7.151693212444445e+08, 7.280421597866666e+08, 7.432601508977778e+08, 7.593568804977778e+08, 7.756583125333333e+08, 7.919605902222222e+08, 8.069140743111111e+08, 8.190114483200001e+08, 8.316284371911111e+08, 8.431374225066667e+08, 8.53668587462063e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.53774464e+08, 8.555812330666667e+08, 8.610747426133333e+08, 8.683986403555555e+08, 8.765226743466667e+08, 8.852317777066667e+08, 8.935006492444445e+08, 9.013690144711111e+08, 9.099055872e+08, 9.180191554844445e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08, 9.26666624e+08]
 ECoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-EHVAC.y=[0e+00, 2.187614641882735e+05, 4.398032835555555e+06, 1.031505096e+07, 1.708251583111111e+07, 2.382409915555555e+07, 3.445586603960676e+07, 4.234867686222222e+07, 4.329069798958714e+07, 4.355467552e+07, 4.417476204444444e+07, 4.459912287111111e+07, 4.469994794666667e+07, 4.470594e+07, 4.470594e+07, 4.556262546666667e+07, 5.005834202666666e+07, 5.657695809777778e+07, 6.51790904e+07, 7.524176474666667e+07, 8.636881315555556e+07, 9.837432565333334e+07, 1.110693287822222e+08, 1.278855191569947e+08, 1.503224426666667e+08, 1.695380684444444e+08, 1.880399895466667e+08, 2.0690714784e+08, 2.261820439466667e+08, 2.465169629511111e+08, 2.671258440552996e+08, 2.770775562666667e+08, 2.916477896533333e+08, 3.0744558336e+08, 3.238559128177778e+08, 3.404275861333333e+08, 3.569841216e+08, 3.734765078755556e+08, 3.903161828977778e+08, 4.076422688e+08, 4.257041813333333e+08, 4.5383760256e+08, 4.762635178666667e+08, 4.822993268622222e+08, 4.8230374656e+08, 4.825256365827529e+08, 4.896785065244445e+08, 5.058959997866667e+08, 5.147896136533333e+08, 5.295507163022223e+08, 5.458727111111112e+08, 5.629922555733334e+08, 5.808728914488889e+08, 5.996430473955555e+08, 6.185697894400001e+08, 6.375849152e+08, 6.565980993422222e+08, 6.7448563584e+08, 6.959013486933334e+08, 7.019426752107966e+08, 7.019551061333333e+08, 7.020175239111111e+08, 7.020908012088889e+08, 7.021063209717484e+08, 7.104904556088889e+08, 7.169197361777778e+08, 7.2982031104e+08, 7.450555642311112e+08, 7.611554801777778e+08, 7.774632891733333e+08, 7.937708373333334e+08, 8.087327294577777e+08, 8.2083611136e+08, 8.334578333866667e+08, 8.449702124088889e+08, 8.556091797586492e+08, 8.556257249305016e+08, 8.557828140088888e+08, 8.562350037333333e+08, 8.567014219377778e+08, 8.568798149283201e+08, 8.5689039488e+08, 8.56891712e+08, 8.587311328711112e+08, 8.641844002133334e+08, 8.715128049777777e+08, 8.796421865244445e+08, 8.8835261312e+08, 8.966328558933333e+08, 9.045071645866667e+08, 9.130450816e+08, 9.211638825244445e+08, 9.298183179558308e+08, 9.298524356266667e+08, 9.301868600888889e+08, 9.310839928888888e+08, 9.319746875733334e+08, 9.323419837155555e+08, 9.323614743189523e+08, 9.32363328e+08, 9.32363328e+08]
+EHVAC.y=[0e+00, 5.234077241789048e+05, 4.414246702222222e+06, 1.032768583333333e+07, 1.709283800888889e+07, 2.382644055555556e+07, 3.250381813333333e+07, 4.235311178666667e+07, 4.329600939130612e+07, 4.356027672e+07, 4.418065786666667e+07, 4.460524799111111e+07, 4.470616586666667e+07, 4.4712156e+07, 4.4712156e+07, 4.556855053333333e+07, 5.006217692444444e+07, 5.658478483555555e+07, 6.518903472e+07, 7.525069916444445e+07, 8.637650613333334e+07, 9.838284842666666e+07, 1.1107781824e+08, 1.265824771733333e+08, 1.5033095744e+08, 1.695526853333333e+08, 1.880541885866667e+08, 2.0692709984e+08, 2.262034107022222e+08, 2.465391065244445e+08, 2.671463450627892e+08, 2.771436111644444e+08, 2.917009831822222e+08, 3.0749301568e+08, 3.238999957333333e+08, 3.404765006222222e+08, 3.5703417856e+08, 3.735214761244444e+08, 3.903538872888889e+08, 4.0767940288e+08, 4.257439473777778e+08, 4.538792659911111e+08, 4.7628940544e+08, 4.823019585339746e+08, 4.823063482311111e+08, 4.826739584e+08, 4.896626584177778e+08, 5.058753257955555e+08, 5.148316433066667e+08, 5.295713560177778e+08, 5.458823751111112e+08, 5.629949405866667e+08, 5.808706079288889e+08, 5.996498709333333e+08, 6.185794048e+08, 6.375950755555556e+08, 6.566081473422222e+08, 6.744959210666667e+08, 6.959122076444445e+08, 7.019542524048784e+08, 7.019658496e+08, 7.020282119111111e+08, 7.021014892088889e+08, 7.021173780357436e+08, 7.104966590577778e+08, 7.169949902222222e+08, 7.298722261333333e+08, 7.450946146133333e+08, 7.611957831111112e+08, 7.775016192e+08, 7.938083100444444e+08, 8.087661915022222e+08, 8.2086796288e+08, 8.334893723022223e+08, 8.450027958044444e+08, 8.555383479820107e+08, 8.556580734315673e+08, 8.558145143466667e+08, 8.562658039466667e+08, 8.567318441244445e+08, 8.569102062409424e+08, 8.5692073088e+08, 8.56922048e+08, 8.5873089408e+08, 8.642288119466667e+08, 8.715571207111111e+08, 8.796855520711111e+08, 8.883990528e+08, 8.966723857066667e+08, 9.045451483022223e+08, 9.130861184e+08, 9.212040840533333e+08, 9.298559499205909e+08, 9.298900155733334e+08, 9.302251406222222e+08, 9.311230464e+08, 9.3201387008e+08, 9.323813447111111e+08, 9.324008969776491e+08, 9.32402752e+08, 9.32402752e+08]
 EPum.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHoldWithReset.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHoldWithReset.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Logical_Validation_TrueHold.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt
index e75a3df1b5c..5e367944045 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_CDL_Reals_Validation_Sort.txt
@@ -1,23 +1,33 @@
-last-generated=2017-09-23
+last-generated=2024-04-18
 statistics-simulation=
 {
-  "numerical Jacobians": "0", 
-  "nonlinear": " ", 
-  "linear": " "
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
 }
-sorAsc.u[3]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.800000298022158e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
-sorAsc.u[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
 time=[0e+00, 1e+00]
+sorAsc.u[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorAsc.u[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.899999701977842e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
+sorAsc.u[3]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.800000298022158e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
 sorAsc.u[4]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
 sorAsc.u[5]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
-sorAsc.u[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.899999701977842e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
-sorAsc.y[4]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
-sorAsc.y[5]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
 sorAsc.y[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
 sorAsc.y[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.800000154972077e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
 sorAsc.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
-sorDes.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
-sorDes.y[2]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
-sorDes.y[5]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.y[4]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorAsc.y[5]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
 sorDes.y[1]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
+sorDes.y[2]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorDes.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
 sorDes.y[4]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.800000154972077e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorDes.y[5]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.yIdx[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+sorAsc.yIdx[2]=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2.999996423728557e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00]
+sorAsc.yIdx[3]=[5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2.000003576271443e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00]
+sorAsc.yIdx[4]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4.000011920727175e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00]
+sorAsc.yIdx[5]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999988079272825e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+sorDes.yIdx[1]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999988079272825e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+sorDes.yIdx[2]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4.000011920727175e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 2e+00]
+sorDes.yIdx[3]=[5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2.000003576271443e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00]
+sorDes.yIdx[4]=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2.999996423728557e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4e+00]
+sorDes.yIdx[5]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_BaseClasses_Validation_CollectorDistributor.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_BaseClasses_Validation_CollectorDistributor.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_BaseClasses_Validation_CollectorDistributor.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_BaseClasses_Validation_CollectorDistributor.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerBorefield.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerBorefield.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerBorefield.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerBorefield.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerOnly.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerOnly.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Examples_ChillerOnly.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Examples_ChillerOnly.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Borefield.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Borefield.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Borefield.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Borefield.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Chiller.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Chiller.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_Chiller.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_Chiller.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatExchanger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatExchanger.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatExchanger.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatExchanger.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPump.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPump.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPump.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPump.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPumpDHWTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPumpDHWTank.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_HeatPumpDHWTank.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_HeatPumpDHWTank.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_SwitchBox.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_SwitchBox.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_SwitchBox.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_SwitchBox.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_WatersideEconomizer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_WatersideEconomizer.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Subsystems_Validation_WatersideEconomizer.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Subsystems_Validation_WatersideEconomizer.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerBorefield.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerBorefield.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerBorefield.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerBorefield.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerOnly.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerOnly.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerOnly.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerOnly.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerWSE.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerWSE.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Combined_Validation_ChillerWSE.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Combined_Validation_ChillerWSE.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Direct.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Direct.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Direct.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Direct.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Indirect.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Indirect.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Cooling_Examples_Indirect.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Cooling_Examples_Indirect.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Direct.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Direct.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Direct.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Direct.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Indirect.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Indirect.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_EnergyTransferStations_Heating_Examples_Indirect.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_ETS_Heating_Examples_Indirect.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesConstantFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesConstantFlow.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesConstantFlow.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlow.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlow.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlow.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Combined_SeriesVariableFlowAgentControl.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Cooling_ElectricChillersDirectETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Cooling_ElectricChillersDirectETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Cooling_ElectricChillersDirectETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Cooling_ElectricChillersDirectETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Steam_SingleBoiler.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Examples_Steam_SingleBoiler.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Examples_Steam_SingleBoiler.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Controls_Validation_MixingValveControl.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ1Valve.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingRCZ6.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
new file mode 100644
index 00000000000..8493568266f
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
@@ -0,0 +1,30 @@
+last-generated=2024-03-22
+statistics-initialization=
+{
+  "nonlinear": "1, 1, 5",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0",
+  "nonlinear": "1, 5, 1",
+  "number of continuous time states": "11",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6.048e+05]
+bui.maxTSet.y=[2.971499938964844e+02, 2.971499938964844e+02]
+bui.minTSet.y=[2.931499938964844e+02, 2.931499938964844e+02]
+bui.zon.TAir=[2.931499938964844e+02, 2.931473693847656e+02, 2.931480102539062e+02, 2.931492919921875e+02, 2.931504516601562e+02, 2.931482238769531e+02, 2.931498718261719e+02, 2.931499633789062e+02, 2.931495056152344e+02, 2.931497802734375e+02, 2.931499633789062e+02, 2.931501159667969e+02, 2.931500549316406e+02, 2.931499633789062e+02, 2.931497497558594e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931489868164062e+02, 2.931497192382812e+02, 2.943623962402344e+02, 2.948678894042969e+02, 2.948768615722656e+02, 2.955193786621094e+02, 2.957888488769531e+02, 2.948112182617188e+02, 2.940652465820312e+02, 2.9371875e+02, 2.934517822265625e+02, 2.931719360351562e+02, 2.931508483886719e+02, 2.931502990722656e+02, 2.931498107910156e+02, 2.9314990234375e+02, 2.946982116699219e+02, 2.953076171875e+02, 2.953916931152344e+02, 2.959407653808594e+02, 2.962115783691406e+02, 2.954412841796875e+02, 2.945702209472656e+02, 2.941409301757812e+02, 2.938135681152344e+02, 2.934753723144531e+02, 2.932232360839844e+02, 2.931494140625e+02, 2.931497802734375e+02, 2.931499633789062e+02, 2.943725280761719e+02, 2.951613159179688e+02, 2.955816955566406e+02, 2.957892761230469e+02, 2.96097900390625e+02, 2.960891723632812e+02, 2.946523742675781e+02, 2.941458740234375e+02, 2.938270263671875e+02, 2.934635620117188e+02, 2.931502380371094e+02, 2.931493530273438e+02, 2.931501159667969e+02, 2.93150390625e+02, 2.939641723632812e+02, 2.950294494628906e+02, 2.955462951660156e+02, 2.958534545898438e+02, 2.962309265136719e+02, 2.964024353027344e+02, 2.948607177734375e+02, 2.94292724609375e+02, 2.938360900878906e+02, 2.934384460449219e+02, 2.931499328613281e+02, 2.931505126953125e+02, 2.93150634765625e+02, 2.931504211425781e+02, 2.931510009765625e+02, 2.946406860351562e+02, 2.951609497070312e+02, 2.950343627929688e+02, 2.954814758300781e+02, 2.957160034179688e+02, 2.946957397460938e+02, 2.937189636230469e+02, 2.931838989257812e+02, 2.931502380371094e+02, 2.93150390625e+02, 2.931507568359375e+02, 2.931494140625e+02, 2.931483459472656e+02, 2.931493530273438e+02, 2.93150634765625e+02, 2.93149658203125e+02, 2.931559143066406e+02, 2.9314990234375e+02, 2.931502685546875e+02, 2.931461181640625e+02, 2.931499328613281e+02, 2.931502685546875e+02, 2.931501770019531e+02, 2.931499328613281e+02]
+bui.terUni.QActHea_flow=[-0e+00, 1.369712219238281e+02, 4.202816772460938e+02, 5.983045043945312e+02, 7.337685546875e+02, 7.100137939453125e+02, 6.222805786132812e+02, 6.229212036132812e+02, 7.089094848632812e+02, 7.710151977539062e+02, 8.509810180664062e+02, 8.923736572265625e+02, 9.114884033203125e+02, 9.21342529296875e+02, 9.396116333007812e+02, 8.606598510742188e+02, 8.703107299804688e+02, 8.794151611328125e+02, 8.0243212890625e+02, 6.051441650390625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.332919158935547e+02, 2.2610693359375e+02, 2.907487182617188e+02, 1.540417938232422e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.086499557495117e+02, 2.210079498291016e+02, 2.529270935058594e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.664499092102051e+01, 1.82743408203125e+02, 3.441045837402344e+02, 4.058981018066406e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.078382110595703e+01, 2.654263610839844e+02, 4.350654296875e+02, 5.532825317382812e+02, 4.363927001953125e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.022270812988281e+02, 6.896192016601562e+02, 8.899608154296875e+02, 1.056153930664062e+03, 1.21034619140625e+03, 1.1687841796875e+03, 5.577281494140625e+02, 4.698468933105469e+02, 7.438899536132812e+02, 7.70820556640625e+02, 6.574036254882812e+02, 1.045110961914062e+03, 1.23634521484375e+03, 1.303413330078125e+03, 1.356393188476562e+03, 1.4074921875e+03]
+bui.terUni.QActCoo_flow=[-0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+supHeaWat.T_in=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.terUni.T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.disFloHea.mReq_flow[1]=[0e+00, 3.559430362656713e-03, 1.550933159887791e-02, 2.340160310268402e-02, 2.971852384507656e-02, 2.858954668045044e-02, 2.450184337794781e-02, 2.453144267201424e-02, 2.853960171341896e-02, 3.149616718292236e-02, 3.537457063794136e-02, 3.741317614912987e-02, 3.836129978299141e-02, 3.885162994265556e-02, 3.976371139287949e-02, 3.584926202893257e-02, 3.632388636469841e-02, 3.677266463637352e-02, 3.300868719816208e-02, 2.371473424136639e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.381517948582768e-03, 7.52901379019022e-03, 1.011535618454218e-02, 4.373759496957064e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.2687001619488e-03, 7.31654604896903e-03, 8.602396585047245e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.905376266222447e-04, 5.685630720108747e-03, 1.228293776512146e-02, 1.487676147371531e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.485511061735451e-04, 9.091034531593323e-03, 1.611878164112568e-02, 2.132373489439487e-02, 1.617616787552834e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.055979542434216e-02, 2.757405862212181e-02, 3.721455857157707e-02, 4.557560756802559e-02, 5.362000688910484e-02, 5.142659321427345e-02, 2.151482738554478e-02, 1.761780492961407e-02, 3.014375828206539e-02, 3.14178504049778e-02, 2.606998942792416e-02, 4.499771073460579e-02, 5.500528588891029e-02, 5.861387401819229e-02, 6.150084361433983e-02, 6.431664526462555e-02]
+bui.disFloHea.mAct_flow[1].y=[-0e+00, 3.569016233086586e-03, 1.551889814436436e-02, 2.341116778552532e-02, 2.972808666527271e-02, 2.859911136329174e-02, 2.451140806078911e-02, 2.454100735485554e-02, 2.854916453361511e-02, 3.150573000311852e-02, 3.538413345813751e-02, 3.742273896932602e-02, 3.837086260318756e-02, 3.886119276285172e-02, 3.977327421307564e-02, 3.585882484912872e-02, 3.633344918489456e-02, 3.678222745656967e-02, 3.301825001835823e-02, 2.372429706156254e-02, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 3.391105448827147e-03, 7.538586389273405e-03, 1.012492552399635e-02, 4.38334047794342e-03, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 2.278300700709224e-03, 7.326118648052216e-03, 8.611966855823994e-03, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.006028807954863e-04, 5.695207044482231e-03, 1.229250524193048e-02, 1.488632801920176e-02, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 8.582202717661858e-04, 9.100604802370071e-03, 1.612834632396698e-02, 2.133329957723618e-02, 1.618573255836964e-02, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1.056936476379633e-02, 2.758362144231796e-02, 3.722412139177322e-02, 4.558516666293144e-02, 5.362956970930099e-02, 5.14361560344696e-02, 2.152439206838608e-02, 1.762736961245537e-02, 3.015332110226154e-02, 3.142741322517395e-02, 2.607955411076546e-02, 4.500727355480194e-02, 5.501484498381615e-02, 5.862343683838844e-02, 6.151040643453598e-02, 6.43262043595314e-02]
+bui.disFloHea.m_flow_nominal=[9.560229629278183e-02, 9.560229629278183e-02]
+bui.terUni.QHea_flow_nominal=[2e+03, 2e+03]
+supChiWat.T_in=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.terUni.T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.disFloCoo.mReq_flow[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bui.disFloCoo.mAct_flow[1].y=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+bui.disFloCoo.m_flow_nominal=[9.560229629278183e-02, 9.560229629278183e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
new file mode 100644
index 00000000000..30eded75b2a
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
@@ -0,0 +1,54 @@
+last-generated=2024-03-23
+statistics-initialization=
+{
+  "nonlinear": "1, 1, 1, 1, 1, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 1",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0",
+  "nonlinear": "1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 1, 1",
+  "number of continuous time states": "43",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6.048e+05]
+bui.maxTSet[1].y=[2.971499938964844e+02, 2.971499938964844e+02]
+bui.minTSet[1].y=[2.931499938964844e+02, 2.931499938964844e+02]
+bui.znAttic.TAir=[2.931499938964844e+02, 2.696248474121094e+02, 2.647601623535156e+02, 2.633650817871094e+02, 2.627608337402344e+02, 2.640186767578125e+02, 2.708359680175781e+02, 2.774660949707031e+02, 2.775525207519531e+02, 2.762177734375e+02, 2.729598388671875e+02, 2.704551391601562e+02, 2.701816101074219e+02, 2.697094421386719e+02, 2.690176391601562e+02, 2.672326965332031e+02, 2.668397521972656e+02, 2.670538024902344e+02, 2.686611633300781e+02, 2.699333801269531e+02, 2.736177673339844e+02, 2.777817687988281e+02, 2.818801574707031e+02, 2.807268676757812e+02, 2.764589538574219e+02, 2.736166381835938e+02, 2.730738830566406e+02, 2.734977111816406e+02, 2.728436279296875e+02, 2.720897521972656e+02, 2.722490539550781e+02, 2.725907287597656e+02, 2.714765625e+02, 2.700829162597656e+02, 2.717578735351562e+02, 2.752991027832031e+02, 2.779121398925781e+02, 2.783534240722656e+02, 2.760373229980469e+02, 2.716869201660156e+02, 2.700905151367188e+02, 2.694210510253906e+02, 2.694356384277344e+02, 2.694671630859375e+02, 2.694608154296875e+02, 2.694798278808594e+02, 2.6912548828125e+02, 2.690842895507812e+02, 2.708528442382812e+02, 2.746116027832031e+02, 2.781951599121094e+02, 2.799570617675781e+02, 2.777321166992188e+02, 2.72853271484375e+02, 2.699519348144531e+02, 2.686414794921875e+02, 2.68407470703125e+02, 2.661282958984375e+02, 2.652016906738281e+02, 2.647179260253906e+02, 2.622923278808594e+02, 2.5888037109375e+02, 2.59228759765625e+02, 2.652902526855469e+02, 2.734690246582031e+02, 2.759569396972656e+02, 2.744515380859375e+02, 2.704777526855469e+02, 2.675333557128906e+02, 2.65903564453125e+02, 2.640467529296875e+02, 2.625533752441406e+02, 2.612828674316406e+02, 2.6012841796875e+02, 2.580778503417969e+02, 2.569005432128906e+02, 2.567782592773438e+02, 2.617930908203125e+02, 2.6889013671875e+02, 2.697472534179688e+02, 2.683960266113281e+02, 2.654728088378906e+02, 2.591743164062501e+02, 2.559188079833984e+02, 2.535173187255859e+02, 2.530016784667969e+02, 2.525250396728516e+02, 2.517330474853516e+02, 2.507530670166016e+02, 2.499160614013672e+02, 2.483439636230469e+02, 2.536296691894531e+02, 2.641053161621094e+02, 2.707305297851562e+02, 2.714434509277344e+02, 2.664327697753906e+02, 2.591914978027344e+02, 2.552892761230469e+02, 2.529208679199219e+02, 2.512074432373047e+02, 2.501965484619141e+02]
+bui.znCore_ZN.TAir=[2.931499938964844e+02, 2.946950988769531e+02, 2.944135131835938e+02, 2.942106323242188e+02, 2.940286254882812e+02, 2.939566955566406e+02, 2.939712219238281e+02, 2.938870544433594e+02, 2.9370751953125e+02, 2.935422058105469e+02, 2.933799743652344e+02, 2.932565307617188e+02, 2.931695251464844e+02, 2.931498413085938e+02, 2.931498107910156e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.933429870605469e+02, 2.951820678710938e+02, 2.95649658203125e+02, 2.956305847167969e+02, 2.962224426269531e+02, 2.964516296386719e+02, 2.954553527832031e+02, 2.947343139648438e+02, 2.944199523925781e+02, 2.94181396484375e+02, 2.939446411132812e+02, 2.937984313964844e+02, 2.936788330078125e+02, 2.936059875488281e+02, 2.937900085449219e+02, 2.954376220703125e+02, 2.959713745117188e+02, 2.960086059570312e+02, 2.965057373046875e+02, 2.967352905273438e+02, 2.959407043457031e+02, 2.950741882324219e+02, 2.946865844726562e+02, 2.944045104980469e+02, 2.941205444335938e+02, 2.939288940429688e+02, 2.9377197265625e+02, 2.93658203125e+02, 2.936404113769531e+02, 2.951039733886719e+02, 2.958141784667969e+02, 2.961734619140625e+02, 2.963369750976562e+02, 2.966032409667969e+02, 2.965606079101562e+02, 2.951328125e+02, 2.946884765625e+02, 2.944300842285156e+02, 2.941376342773438e+02, 2.939020080566406e+02, 2.937380065917969e+02, 2.935852966308594e+02, 2.935513305664062e+02, 2.947816467285156e+02, 2.957979736328125e+02, 2.962371520996094e+02, 2.965921325683594e+02, 2.969424743652344e+02, 2.970848999023438e+02, 2.9557666015625e+02, 2.950350646972656e+02, 2.946098022460938e+02, 2.942618103027344e+02, 2.939714660644531e+02, 2.937625732421875e+02, 2.935788269042969e+02, 2.934512634277344e+02, 2.936034851074219e+02, 2.955103149414062e+02, 2.959675903320312e+02, 2.958002624511719e+02, 2.961917419433594e+02, 2.963755493164062e+02, 2.953682556152344e+02, 2.945177307128906e+02, 2.941181335449219e+02, 2.938173522949219e+02, 2.93364990234375e+02, 2.931499938964844e+02, 2.931498718261719e+02, 2.931489562988281e+02, 2.931495666503906e+02, 2.9351171875e+02, 2.9363525390625e+02, 2.933377075195312e+02, 2.932208251953125e+02, 2.933033142089844e+02, 2.931471252441406e+02, 2.931499938964844e+02, 2.931501159667969e+02, 2.931500854492188e+02, 2.931499938964844e+02]
+bui.znPerimeter_ZN_1.TAir=[2.931499938964844e+02, 2.931474914550781e+02, 2.931492004394531e+02, 2.931505126953125e+02, 2.931505737304688e+02, 2.931475219726562e+02, 2.943127136230469e+02, 2.9483984375e+02, 2.933582458496094e+02, 2.93151123046875e+02, 2.931501770019531e+02, 2.931498107910156e+02, 2.931499633789062e+02, 2.931496276855469e+02, 2.931495056152344e+02, 2.931500244140625e+02, 2.931502990722656e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931503295898438e+02, 2.937300109863281e+02, 2.942338256835938e+02, 2.942904968261719e+02, 2.946653137207031e+02, 2.945749206542969e+02, 2.933391418457031e+02, 2.931488647460938e+02, 2.931497192382812e+02, 2.931507568359375e+02, 2.931503601074219e+02, 2.931499938964844e+02, 2.931497192382812e+02, 2.931500244140625e+02, 2.931491088867188e+02, 2.936109924316406e+02, 2.942803039550781e+02, 2.943381042480469e+02, 2.9480615234375e+02, 2.948041687011719e+02, 2.935928344726562e+02, 2.931498413085938e+02, 2.931507263183594e+02, 2.931504211425781e+02, 2.931497802734375e+02, 2.931498107910156e+02, 2.93150146484375e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932991943359375e+02, 2.939285888671875e+02, 2.943627624511719e+02, 2.944831848144531e+02, 2.945306701660156e+02, 2.940908813476562e+02, 2.931520690917969e+02, 2.931500549316406e+02, 2.931487731933594e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931483764648438e+02, 2.955110778808594e+02, 3.013819274902344e+02, 3.005870361328125e+02, 2.998824768066406e+02, 2.985364074707031e+02, 2.953819580078124e+02, 2.938476867675781e+02, 2.931487731933594e+02, 2.931505737304688e+02, 2.931502685546875e+02, 2.931497192382812e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.93158935546875e+02, 2.949291687011719e+02, 2.956778564453125e+02, 2.946517639160156e+02, 2.946813354492188e+02, 2.945335083007812e+02, 2.931480712890625e+02, 2.931504516601562e+02, 2.931498413085938e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499633789062e+02, 2.93149169921875e+02, 2.931497497558594e+02, 2.931501770019531e+02, 2.931421203613281e+02, 2.943613891601562e+02, 2.951016540527344e+02, 2.951234436035156e+02, 2.940075988769531e+02, 2.931509094238281e+02, 2.931498107910156e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+bui.znPerimeter_ZN_2.TAir=[2.931499938964844e+02, 2.931479187011719e+02, 2.931498718261719e+02, 2.931506042480469e+02, 2.931499633789062e+02, 2.931528015136719e+02, 2.931493530273438e+02, 2.931502075195312e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931497497558594e+02, 2.931498413085938e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931498413085938e+02, 2.933660278320312e+02, 2.937336730957031e+02, 2.936688232421875e+02, 2.940513610839844e+02, 2.9405322265625e+02, 2.931499633789062e+02, 2.931492614746094e+02, 2.931499633789062e+02, 2.931509399414062e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499328613281e+02, 2.933926696777344e+02, 2.938340759277344e+02, 2.937544555664062e+02, 2.941476135253906e+02, 2.941908569335938e+02, 2.931890258789062e+02, 2.931505737304688e+02, 2.93150390625e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.936151733398438e+02, 2.939010925292969e+02, 2.939938354492188e+02, 2.940743408203125e+02, 2.937416381835938e+02, 2.931504211425781e+02, 2.931496276855469e+02, 2.931499328613281e+02, 2.931501770019531e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931505432128906e+02, 2.943160400390625e+02, 2.939783935546875e+02, 2.941762390136719e+02, 2.943374328613281e+02, 2.941220397949219e+02, 2.931484375e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931498718261719e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93158447265625e+02, 2.938656005859375e+02, 2.935910949707031e+02, 2.931497192382812e+02, 2.932027587890625e+02, 2.931499938964844e+02, 2.931505126953125e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931493530273438e+02, 2.931499328613281e+02, 2.931500854492188e+02, 2.931478881835938e+02, 2.931488647460938e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.9314990234375e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+bui.znPerimeter_ZN_3.TAir=[2.931499938964844e+02, 2.931475830078125e+02, 2.931493225097656e+02, 2.931505126953125e+02, 2.931504211425781e+02, 2.931501770019531e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931498413085938e+02, 2.931499938964844e+02, 2.931501159667969e+02, 2.931500549316406e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.933556823730469e+02, 2.93752197265625e+02, 2.936982421875e+02, 2.941069946289062e+02, 2.941492614746094e+02, 2.931500549316406e+02, 2.931492004394531e+02, 2.931498107910156e+02, 2.931506652832031e+02, 2.931502380371094e+02, 2.931499633789062e+02, 2.931498107910156e+02, 2.931500244140625e+02, 2.93149658203125e+02, 2.933959045410156e+02, 2.938642883300781e+02, 2.938617858886719e+02, 2.942844543457031e+02, 2.943653869628906e+02, 2.933765563964844e+02, 2.9314990234375e+02, 2.931506042480469e+02, 2.931503295898438e+02, 2.931498107910156e+02, 2.931498413085938e+02, 2.931501159667969e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932023620605469e+02, 2.937019348144531e+02, 2.940452880859375e+02, 2.941720886230469e+02, 2.942837524414062e+02, 2.939806213378906e+02, 2.9315185546875e+02, 2.931500549316406e+02, 2.931488647460938e+02, 2.931500244140625e+02, 2.931500854492188e+02, 2.931499328613281e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.931599731445312e+02, 2.931513977050781e+02, 2.933169555664062e+02, 2.93435791015625e+02, 2.936811828613281e+02, 2.936585693359375e+02, 2.931490478515625e+02, 2.93149658203125e+02, 2.931501770019531e+02, 2.931499938964844e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93151123046875e+02, 2.931517028808594e+02, 2.931499633789062e+02, 2.931503295898438e+02, 2.93150146484375e+02, 2.931500854492188e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931494140625e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931497192382812e+02, 2.931501159667969e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+bui.znPerimeter_ZN_4.TAir=[2.931499938964844e+02, 2.931475830078125e+02, 2.931499328613281e+02, 2.931505737304688e+02, 2.931499328613281e+02, 2.931502990722656e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.9314990234375e+02, 2.931498413085938e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.932111511230469e+02, 2.93587890625e+02, 2.935616455078125e+02, 2.940156860351562e+02, 2.940275573730469e+02, 2.931502380371094e+02, 2.931492919921875e+02, 2.931499633789062e+02, 2.931508483886719e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.931500244140625e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.932061767578125e+02, 2.936568298339844e+02, 2.936614685058594e+02, 2.942024230957031e+02, 2.943663940429688e+02, 2.93226806640625e+02, 2.931505737304688e+02, 2.931504516601562e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.934985046386719e+02, 2.938359680175781e+02, 2.940107727050781e+02, 2.941534118652344e+02, 2.937653503417969e+02, 2.931504211425781e+02, 2.931495971679688e+02, 2.931499328613281e+02, 2.931501770019531e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931479187011719e+02, 2.931520690917969e+02, 2.934186706542969e+02, 2.941679077148438e+02, 2.950186157226562e+02, 2.943148498535156e+02, 2.931483154296875e+02, 2.93150146484375e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931510314941406e+02, 2.931505737304688e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931820068359375e+02, 2.933412780761719e+02, 2.931505737304688e+02, 2.9314990234375e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931493530273438e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931502990722656e+02, 2.931500244140625e+02, 2.931494445800781e+02, 2.931505126953125e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+bui.terUni[1].QActHea_flow=[-0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.962970733642578e+01, 8.622872161865233e+01, 1.94523754119873e+01, 4.607820892333984e+01, 7.232581329345707e+01, 1.130428791046143e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.49547233581543e+01, 1.671635894775391e+02, 2.898949890136719e+02, 1.962145538330078e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.49915283203125e+02, 3.964364013671875e+02, 4.340093383789062e+02, 4.620138549804688e+02, 4.911233215332031e+02]
+bui.terUni[2].QActHea_flow=[-0e+00, 4.242484436035156e+02, 6.18537109375e+02, 7.408370971679688e+02, 8.44078857421875e+02, 3.605400390625e+02, 0e+00, 0e+00, 0e+00, 2.441352081298828e+02, 5.754716186523438e+02, 7.054681396484375e+02, 7.61859375e+02, 8.125081787109375e+02, 8.855921630859375e+02, 9.064968872070312e+02, 9.353364868164062e+02, 9.387322387695312e+02, 9.0996484375e+02, 8.0072802734375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.509655456542969e+02, 5.022601013183594e+02, 6.47918579101562e+02, 7.447162475585938e+02, 8.052264404296875e+02, 8.556721801757812e+02, 9.071554565429688e+02, 8.242752075195312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.522015075683594e+02, 5.489167480468726e+02, 6.882125244140625e+02, 8.048895874023438e+02, 8.774768676757812e+02, 9.315281372070312e+02, 9.579646606445312e+02, 9.502018432617188e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.798787536621094e+02, 6.864669189453125e+02, 8.14484802246094e+02, 9.457015991210916e+02, 1.00757666015625e+03, 1.050108764648438e+03, 1.153783935546875e+03, 1.2007001953125e+03, 3.043600769042969e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.259199371337891e+02, 4.871817932128906e+02, 7.170037841796875e+02, 8.651900024414062e+02, 1.000673034667969e+03, 1.077176147460938e+03, 9.01302001953125e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.640878906249889e+02, 8.706537475585938e+02, 1.03164794921875e+03, 1.139835571289062e+03, 1.267236572265625e+03, 1.328864624023438e+03, 1.387703979492188e+03, 1.432917114257812e+03, 1.421060302734375e+03, 3.306671752929688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 9.19763427734375e+02, 1.119408203125e+03, 1.184815307617188e+03, 1.2456923828125e+03, 1.292478637695312e+03]
+bui.terUni[3].QActHea_flow=[-0e+00, 3.6496044921875e+02, 5.084510803222656e+02, 5.900299682617188e+02, 6.65801025390625e+02, 2.895477905273438e+02, 1.578399810791016e+02, 4.270187683105469e+02, 4.985230407714844e+02, 5.752211303710938e+02, 6.48041259765625e+02, 6.87986083984375e+02, 7.04889892578125e+02, 7.202196044921875e+02, 7.557740478515625e+02, 7.530651245117188e+02, 7.648963623046875e+02, 7.586486206054688e+02, 7.316306762695312e+02, 6.46248291015625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.193456268310547e+01, 3.598055419921875e+02, 4.393113098144531e+02, 5.1834912109375e+02, 5.825684814453125e+02, 6.20140380859375e+02, 6.502913208007812e+02, 6.8075146484375e+02, 6.123912963867188e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.4975634765625e+02, 4.562608947753897e+02, 5.450213012695312e+02, 6.22278564453125e+02, 6.670711669921875e+02, 7.030239868164062e+02, 7.20435791015625e+02, 7.107169799804688e+02, 9.830573081970215e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.94367431640625e+02, 5.307656860351562e+02, 6.172263793945303e+02, 7.062905273437487e+02, 7.549348754882812e+02, 7.877657470703125e+02, 8.682639770507812e+02, 9.067098999023438e+02, 1.332259521484375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.126546936035144e+02, 5.125283203124972e+02, 6.4854248046875e+02, 7.461265258789062e+02, 8.308797607421875e+02, 8.740447998046875e+02, 9.267581176757812e+02, 9.538272705078125e+02, 7.489866943359375e+02, 0e+00, 0e+00, 7.963911437988281e+01, 0e+00, 3.686091232299801e+01, 5.895607910156214e+02, 8.2756689453125e+02, 9.126471557617188e+02, 9.7188671875e+02, 1.057567260742188e+03, 1.096352416992188e+03, 1.136363647460938e+03, 1.167063598632812e+03, 1.151051391601562e+03, 4.699397583007812e+02, 5.46249267578125e+02, 8.548165893554688e+02, 8.641541748046875e+02, 9.111461181640625e+02, 1.062088134765625e+03, 1.112534423828125e+03, 1.127278076171875e+03, 1.1456142578125e+03, 1.15897412109375e+03]
+bui.terUni[4].QActHea_flow=[-0e+00, 5.558490600585938e+02, 7.382572021484375e+02, 8.377820434570312e+02, 9.192134399414062e+02, 9.286492919921875e+02, 8.909351806640625e+02, 8.70552734375e+02, 8.871782836914062e+02, 9.43112548828125e+02, 9.986869506835938e+02, 1.028562744140625e+03, 1.03966259765625e+03, 1.046644775390625e+03, 1.072585571289062e+03, 1.063012451171875e+03, 1.068572265625e+03, 1.05879248046875e+03, 1.020454895019531e+03, 9.199907836914062e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.95516357421875e+01, 5.042350769042969e+02, 6.170817260742188e+02, 7.246373901367184e+02, 7.969044189453125e+02, 8.438342895507812e+02, 8.810458984375e+02, 9.163505859375e+02, 8.413226318359375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.449101867675781e+02, 6.095513916015607e+02, 7.231757202148438e+02, 8.237321166992188e+02, 8.820128173828125e+02, 9.261986083984375e+02, 9.477542724609375e+02, 9.362359008789062e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.958681335449219e+02, 6.835819091796875e+02, 8.006902465820316e+02, 9.154324340820294e+02, 9.74611572265625e+02, 1.010646545410156e+03, 1.105994384765625e+03, 1.145153564453125e+03, 5.52288330078125e+02, 5.574403762817383e+01, 0e+00, 0e+00, 0e+00, 0e+00, 6.937583618164073e+02, 8.69510620117185e+02, 9.84511474609375e+02, 1.065113647460938e+03, 1.141474243164062e+03, 1.174700805664062e+03, 1.219622802734375e+03, 1.241070922851562e+03, 1.1807177734375e+03, 3.444775390625e+02, 1.366398620605469e+02, 3.324584655761719e+02, 8.046581268310547e+01, 1.315629577636729e+02, 8.934635620117148e+02, 1.134846923828125e+03, 1.213582763671875e+03, 1.270757690429688e+03, 1.356181030273438e+03, 1.391718017578125e+03, 1.42895068359375e+03, 1.456744018554688e+03, 1.4343330078125e+03, 1.284538452148438e+03, 1.223737670898438e+03, 1.300488159179688e+03, 1.315287353515625e+03, 1.323021850585938e+03, 1.425040771484375e+03, 1.456104370117188e+03, 1.45984814453125e+03, 1.46987451171875e+03, 1.476750244140625e+03]
+bui.terUni[5].QActHea_flow=[0e+00, 4.093997802734375e+02, 5.491050415039062e+02, 6.258327026367188e+02, 6.970350952148438e+02, 6.92962646484375e+02, 6.155256958007812e+02, 5.596035766601562e+02, 5.591067504882812e+02, 5.840424194335938e+02, 7.182059326171875e+02, 7.58961669921875e+02, 7.695000610351562e+02, 7.779588012695312e+02, 8.016348266601562e+02, 7.97617431640625e+02, 8.042606201171875e+02, 7.987064819335938e+02, 7.648935546875e+02, 6.827171630859375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.25172966003418e+02, 3.883031921386719e+02, 4.637560424804688e+02, 5.368729248046875e+02, 5.9595654296875e+02, 6.345184936523438e+02, 6.63703857421875e+02, 6.926817016601562e+02, 6.395651245117188e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.437209167480469e+02, 4.572118225097646e+02, 5.452947387695312e+02, 6.226509399414062e+02, 6.663504028320312e+02, 7.018171997070312e+02, 7.208783569335938e+02, 7.119488525390625e+02, 6.278435897827148e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.956142578125e+02, 5.325974731445312e+02, 6.208108520507805e+02, 7.058567504882801e+02, 7.548677978515625e+02, 7.85049072265625e+02, 8.6758154296875e+02, 9.05921630859375e+02, 5.056556396484375e+02, 7.04412841796875e+01, 0e+00, 0e+00, 0e+00, 0e+00, 3.114137573242174e+02, 5.157307739257785e+02, 6.479041137695312e+02, 7.435850219726562e+02, 8.291763916015625e+02, 8.705938110351562e+02, 9.225418701171875e+02, 9.49692626953125e+02, 9.002720947265625e+02, 2.260951843261719e+02, 6.453208160400391e+01, 2.037950592041016e+02, 0e+00, 0e+00, 6.289956054687462e+02, 8.61861328125e+02, 9.365799560546875e+02, 9.920287475585938e+02, 1.07346484375e+03, 1.108525268554688e+03, 1.146565063476562e+03, 1.17441455078125e+03, 1.156994873046875e+03, 1.0033466796875e+03, 9.0147509765625e+02, 9.374951171875e+02, 6.183180541992188e+02, 4.526610717773438e+02, 1.042219848632812e+03, 1.108140380859375e+03, 1.115826049804688e+03, 1.131308959960938e+03, 1.1442470703125e+03]
+bui.terUni[1].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+bui.terUni[2].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -4.99156298828125e+03, -3.108638427734375e+03, -2.66887158203125e+03, -2.434205810546875e+03, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+bui.terUni[3].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+bui.terUni[4].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+bui.terUni[5].QActCoo_flow=[0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+supHeaWat.T_in=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.terUni[1].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.terUni[2].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.terUni[3].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.terUni[4].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.terUni[5].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
+bui.disFloHea.mAct_flow[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.845898656640202e-04, 1.350489561446011e-03, 2.325789973838255e-04, 5.733694415539503e-04, 1.02209474425763e-03, 1.351879473077133e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.233939107507467e-04, 4.80929110199213e-03, 9.91169735789299e-03, 6.120652891695499e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.328729309141636e-03, 1.428393740206957e-02, 1.588063687086105e-02, 1.70874111354351e-02, 1.83561909943819e-02]
+bui.disFloHea.mAct_flow[2].y=[0e+00, 1.546873431652784e-02, 2.408263087272644e-02, 2.97983530908823e-02, 3.477893024682999e-02, 1.278864033520222e-02, 0e+00, 0e+00, 0e+00, 8.105100132524967e-03, 2.212313376367092e-02, 2.812341041862965e-02, 3.080012835562229e-02, 3.323935717344284e-02, 3.681785613298416e-02, 3.78551222383976e-02, 3.929409757256508e-02, 3.946343436837196e-02, 3.802758827805519e-02, 3.267015516757965e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.239285059273243e-02, 1.885316334664822e-02, 2.543611638247965e-02, 2.997983247041702e-02, 3.288395702838898e-02, 3.534136712551117e-02, 3.788376599550247e-02, 3.38064581155777e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.244351267814636e-02, 2.092514932155598e-02, 2.730906382203102e-02, 3.28640379011631e-02, 3.641016781330109e-02, 3.909463435411453e-02, 4.042012989521027e-02, 4.002984240651131e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.787113212049007e-02, 2.722437307238579e-02, 3.332372754812242e-02, 3.97999770939349e-02, 4.292675480246544e-02, 4.510258138179779e-02, 5.049977451562881e-02, 5.298502743244171e-02, 1.049264427274466e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.824995201081038e-03, 1.81929599493742e-02, 2.86675188690424e-02, 3.581144660711288e-02, 4.258894175291061e-02, 4.651503264904022e-02, 3.761601075530052e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.293481420725539e-02, 3.607805073261261e-02, 4.416394606232643e-02, 4.97770719230175e-02, 5.656956508755684e-02, 5.992692336440086e-02, 6.31738156080246e-02, 6.570335477590561e-02, 6.503958255052567e-02, 1.155532337725163e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.851117938756943e-02, 4.870454594492912e-02, 5.215126648545265e-02, 5.540517345070839e-02, 5.793708935379982e-02]
+bui.disFloHea.mAct_flow[3].y=[0e+00, 1.297229714691639e-02, 1.912791281938553e-02, 2.278349176049232e-02, 2.626697346568108e-02, 9.904921054840088e-03, 4.369055386632681e-03, 1.558952406048775e-02, 1.869058236479759e-02, 2.211141772568226e-02, 2.544292621314526e-02, 2.73028202354908e-02, 2.809652499854565e-02, 2.881933003664017e-02, 3.050905838608742e-02, 3.038006648421288e-02, 3.094553574919701e-02, 3.064677491784096e-02, 2.936017140746117e-02, 2.535964362323284e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.510629197582603e-03, 1.27585157752037e-02, 1.61147341132164e-02, 1.956534385681152e-02, 2.244228310883045e-02, 2.415510080754757e-02, 2.55449041724205e-02, 2.696207724511623e-02, 2.380012534558773e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.234329212456942e-02, 1.684448122978207e-02, 2.074975520372391e-02, 2.425111457705498e-02, 2.632175758481026e-02, 2.800383418798447e-02, 2.88248211145401e-02, 2.836598455905914e-02, 1.245677849510685e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.420094352215528e-02, 2.011197432875633e-02, 2.401756681501862e-02, 2.815534174442285e-02, 3.046096675097942e-02, 3.20349894464016e-02, 3.595380485057831e-02, 3.785407170653343e-02, 3.170090727508068e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082620304077859e-02, 1.930215954780566e-02, 2.545766904950142e-02, 3.003813326358795e-02, 3.412029147148132e-02, 3.623467311263084e-02, 3.884837403893471e-02, 4.020402207970619e-02, 3.01896445453167e-02, 0e+00, 0e+00, 1.183927990496159e-03, 0e+00, 4.48038947070017e-04, 2.275285124778731e-02, 3.395583108067513e-02, 3.814178332686424e-02, 4.110938310623169e-02, 4.547723382711411e-02, 4.748376086354256e-02, 4.957075417041779e-02, 5.11883869767189e-02, 5.034451559185982e-02, 1.743109710514545e-02, 2.079846523702145e-02, 3.528624027967453e-02, 3.574427589774132e-02, 3.806620836257935e-02, 4.57092821598053e-02, 4.832513630390167e-02, 4.909544810652733e-02, 5.005718022584915e-02, 5.076043307781219e-02]
+bui.disFloHea.mAct_flow[4].y=[0e+00, 2.123571187257767e-02, 2.967361733317375e-02, 3.44710536301136e-02, 3.84889543056488e-02, 3.895939886569977e-02, 3.708342462778091e-02, 3.607694059610367e-02, 3.689746186137199e-02, 3.968299925327301e-02, 4.248890280723572e-02, 4.401326179504395e-02, 4.458228126168251e-02, 4.494059830904007e-02, 4.627856612205505e-02, 4.578423500061035e-02, 4.607174172997475e-02, 4.556666314601898e-02, 4.359891638159752e-02, 3.852697461843491e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.182488398626447e-03, 1.89396794885397e-02, 2.401480078697205e-02, 2.902732789516448e-02, 3.248227760195732e-02, 3.476230427622795e-02, 3.659024089574814e-02, 3.834141790866852e-02, 3.463880717754364e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.635415479540825e-02, 2.366922423243514e-02, 2.895493805408478e-02, 3.377841413021088e-02, 3.663438558578491e-02, 3.882868215441704e-02, 3.990738093852997e-02, 3.933006152510643e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.857140474021435e-02, 2.708965353667736e-02, 3.265636414289476e-02, 3.828779980540267e-02, 4.125553742051125e-02, 4.308321699500084e-02, 4.799627140164375e-02, 5.004636943340302e-02, 2.108604833483696e-02, 7.191618205979466e-04, 0e+00, 0e+00, 0e+00, 0e+00, 2.756235376000409e-02, 3.601090982556331e-02, 4.175221920013428e-02, 4.587145149707794e-02, 4.984669759869576e-02, 5.159897357225418e-02, 5.398868396878242e-02, 5.513830110430717e-02, 5.192092806100845e-02, 1.212481968104839e-02, 3.33428056910634e-03, 1.16312587633729e-02, 1.203665626235306e-03, 3.089259145781448e-03, 3.719024732708912e-02, 4.949377849698067e-02, 5.365912616252899e-02, 5.67316822707653e-02, 6.139642745256424e-02, 6.336390227079391e-02, 6.544001400470734e-02, 6.700477749109268e-02, 6.574450433254242e-02, 5.747655779123306e-02, 5.420166254043579e-02, 5.834372341632843e-02, 5.9150580316782e-02, 5.957327038049698e-02, 6.522110104560852e-02, 6.69672042131424e-02, 6.717837601900101e-02, 6.774506717920303e-02, 6.813444942235947e-02]
+bui.disFloHea.mAct_flow[5].y=[5.434361372225671e-15, 1.483714021742344e-02, 2.09361482411623e-02, 2.441950514912605e-02, 2.772707305848598e-02, 2.753655053675175e-02, 2.394581027328968e-02, 2.140744775533676e-02, 2.138510905206203e-02, 2.251072973012924e-02, 2.872462570667267e-02, 3.066167794167995e-02, 3.116613067686558e-02, 3.157180175185204e-02, 3.271326795220375e-02, 3.251897543668747e-02, 3.284059092402458e-02, 3.257204219698906e-02, 3.09454370290041e-02, 2.705585584044456e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.790449885651469e-03, 1.394721120595932e-02, 1.71701367944479e-02, 2.038877084851265e-02, 2.305028028786182e-02, 2.481612376868725e-02, 2.616728097200394e-02, 2.752063050866127e-02, 2.504901774227619e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.209497172385454e-02, 1.688568294048305e-02, 2.0762013271451e-02, 2.426822669804096e-02, 2.628823556005955e-02, 2.794710546731949e-02, 2.88457702845335e-02, 2.842409536242485e-02, 8.380713989026845e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.425348315387964e-02, 2.019351534545422e-02, 2.41819322109222e-02, 2.813493646681303e-02, 3.045780211687088e-02, 3.190423548221588e-02, 3.592028841376305e-02, 3.781497105956078e-02, 1.899774558842182e-02, 9.831858333200216e-04, 0e+00, 0e+00, 0e+00, 0e+00, 1.077606156468386e-02, 1.944383420050132e-02, 2.542818337678909e-02, 2.991725876927376e-02, 3.403742983937263e-02, 3.606486693024635e-02, 3.86381521821022e-02, 3.999649360775948e-02, 3.753311187028885e-02, 7.37559050321579e-03, 8.694077259860933e-04, 6.447553168982267e-03, 0e+00, 0e+00, 2.455491200089437e-02, 3.563226386904716e-02, 3.93357127904892e-02, 4.212839156389236e-02, 4.629772529006004e-02, 4.81175109744072e-02, 5.01067116856575e-02, 5.157733708620071e-02, 5.065779760479927e-02, 4.270302876830101e-02, 3.758737444877625e-02, 3.938090056180954e-02, 2.4062754586339e-02, 1.668494753539562e-02, 4.46876659989357e-02, 4.809633269906044e-02, 4.849714040756226e-02, 4.930682480335236e-02, 4.9985621124506e-02]
+supChiWat.T_in=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.terUni[1].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.terUni[2].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.terUni[3].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.terUni[4].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.terUni[5].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+bui.disFloCoo.mAct_flow[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bui.disFloCoo.mAct_flow[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.560229629278183e-02, 9.560229629278183e-02, 9.560229629278183e-02, 9.560229629278183e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bui.disFloCoo.mAct_flow[3].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bui.disFloCoo.mAct_flow[4].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+bui.disFloCoo.mAct_flow[5].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeries.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Examples_CouplingTimeSeriesSingleLoop.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution1.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BenchmarkFlowDistribution2.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_BuildingWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_FlowDistributionPumpControl.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_GetPeakLoad.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_SimpleRoomODE.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_BaseClasses_Validation_TerminalUnitScaling.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Cooling_Examples_BuildingTimeSeriesWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Heating_Examples_BuildingTimeSeriesWithETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_HeaterAndFixtureDirectHeatExchangerWithElectricHeat.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_HotWater_Examples_StorageTankWithExternalHeatExchanger.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ControlVolumeCondensation.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_SteamTrap.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_BaseClasses_Examples_ValveSelfActing.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Loads_Steam_Examples_BuildingTimeSeriesAtETS.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection2PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection2PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Connections_Examples_Connection2PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Connections_Examples_Connection2PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_AgentPump1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Controls_Examples_MainPump1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution1PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution1PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution1PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution1PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution2PipeExample.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution2PipeExample.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Examples_Distribution2PipeExample.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Examples_Distribution2PipeExample.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Pipes_Validation_Pipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Pipes_Validation_Pipe.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Pipes_Validation_Pipe.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Pipes_Validation_Pipe.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_ConnectionCondensatePipe.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Networks_Steam_Examples_DistributionCondensatePipe.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StageIndex.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPlant.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Controls_BaseClasses_Validation_StagingPump.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Examples_AllElectricCWStorage.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ChillerHeatRecoveryGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_CoolingTowerGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_HeatPumpGroup.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsDp.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsFlow.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_MultiplePumpsSpeed.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Subsystems_Validation_ValveOpeningFlowBalancing.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Combined_Validation_AllElectricCWStorage.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_BaseClasses_Validation_IdealUser.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterBypass.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChilledWaterPumpSpeed.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_ChillerStage.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Controls_Validation_TankStatus.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_ElectricChillerParallel.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Examples_StoragePlantDualSource.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersParallel.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Cooling_Subsystems_Examples_CoolingTowersWithBypass.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_BoilerPolynomial.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_BaseClasses_Examples_ControlVolumeEvaporation.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_Examples_SingleBoiler.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_Examples_SingleBoiler.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Plants_Steam_Examples_SingleBoiler.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_DHC_Plants_Steam_Examples_SingleBoiler.txt
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt
index b29f152b0f4..ef10afff270 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_OnePhase_Examples_GeneratorLoadGrid.txt
@@ -1,5 +1,10 @@
-last-generated=2015-05-08
-statistics-simulation={'numerical Jacobians': '0', 'nonlinear': ' ', 'linear': '0'}
-grid.P.real=[5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 4833.33348615961403993424, 4666.66645920329392538406, 4499.99992052691322896862, 4333.33350602774044091348, 4166.6666032476086911629, 3999.99994039562170655699, 3833.33328175553242544993, 3666.66686725563204163336, 3499.99996026374765278888, 3333.3333016238038908341, 3166.6666387713808035187, 2999.99998013187405376812, 2833.33332149207581096562, 2666.66665863965272365022, 2500., 2333.33309300811561115552, 2166.66692686000988032902, 2000.00001986819847843435, 1833.33323494604542247544, 1666.66682465855183181702, 1500.0000397363978663634, 1333.33325481424390090979, 1166.66684452675031025137, 1000.00005960459634479776, 833.33321364746893777919, 666.66692542966939072357, 500.00007947265021357452, 333.33326403313640184933, 166.666433334760768048, 0.00009934086479290727, -166.6667313574441777746, -333.33356205564700758259, -499.999880790915540274, -666.66672674804385678726, -833.33351167027058181702, -999.99986092286258099193, -1166.66664584476097843435, -1333.33355283657260770269, -1499.99984105440853454638, -1666.6666259765625, -1833.33353296607856464107, -2000.00031788644605512673, -2166.66722487479773917585, -2333.33289433218396879965, -2499.99980132169957869337, -2666.66670830974044292816, -2833.3333711609780038998, -3000.00027814962095362716, -3166.66718513913656352088, -3333.33285459652279314469, -3499.9997615860384030384, -3666.66666857497239107033, -3833.33333142502760892967, -4000.0002384139615969616, -4166.66690126576304464834, -4333.33305899828701512888, -4499.99972184834223298822, -4666.66638470014368067496, -4833.33353583030293521006, -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000., -5000.]
-grid.P.apparent=[5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 5000., 4834.29100581935745140072, 4670.63325724062542576576, 4509.24943546803297067527, 4350.39356409194715524791, 4194.35263135346940543968, 4041.45185034590394934639, 3892.06228230378928856226, 3746.60361846113937644986, 3605.55123658723596236086, 3469.44339930719343101373, 3338.88419411656786905951, 3214.5502786307770293206, 3097.19120983075617914437, 2987.62885019220721005695, 2886.75146484375, 2795.49894232645283409511, 2714.8426110333616634307, 2645.75122836090895361849, 2589.15108238512266325415, 2545.87553330332912082667, 2516.61157787450383693795, 2501.85106998240507891751, 2501.85106645211772047332, 2516.61156489087488807854, 2545.87551079228933303966, 2589.15105334101372136502, 2645.75119126407798830769, 2714.84256562420250702417, 2795.49914813551959014148, 2886.75140806592980879941, 2987.62894424220849032281, 3097.19131209085890077404, 3214.55020694091172117624, 3338.88430790474740206264, 3469.44351910377417880227, 3605.55115422720064088935, 3746.60353276435625957674, 3892.06241452586073137354, 4041.45176042761931967107, 4194.3525390625, 4350.39370515641348902136, 4509.24981768563338846434, 4670.63376650683130719699, 4834.29066262712422030745, 4999.99980154434069845593, 5167.56245988334649155149, 5336.80432093938543403056, 5507.57059891875178436749, 5679.72408633097620622721, 5853.14069868674050667323, 6027.71361683476698090089, 6203.34415434489528706763, 6379.94539696952779195271, 6557.4387311864384173532, 6735.75335592334431566996, 6914.8252132104707925464, 7094.59882062216001941124, 7275.02037859018855670001, 7456.04398855378076405032, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625, 7637.6259765625]
-time=[0., 1.]
+last-generated=2024-04-04
+statistics-simulation=
+{
+  "linear": "0",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+grid.P.real=[5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 5e+03, 4.833333486159614e+03, 4.666666459203294e+03, 4.499999920526913e+03, 4.33333350602774e+03, 4.166666603247609e+03, 3.999999940395622e+03, 3.833333281755532e+03, 3.666666867255632e+03, 3.499999960263748e+03, 3.333333301623804e+03, 3.166666638771381e+03, 2.999999980131874e+03, 2.833333321492076e+03, 2.666666658639653e+03, 2.5e+03, 2.333333093008116e+03, 2.16666692686001e+03, 2.000000019868198e+03, 1.833333234946045e+03, 1.666666824658552e+03, 1.500000039736398e+03, 1.333333254814244e+03, 1.16666684452675e+03, 1.000000059604596e+03, 8.333332136474689e+02, 6.666669254296694e+02, 5.000000794726502e+02, 3.333332640331364e+02, 1.666664333347608e+02, 9.934086505580808e-05, -1.666667313574442e+02, -3.33333562055647e+02, -4.999998807909155e+02, -6.666667267480439e+02, -8.333335116702706e+02, -9.999998609228626e+02, -1.166666645844761e+03, -1.333333552836573e+03, -1.499999841054409e+03, -1.666666625976562e+03, -1.833333532966079e+03, -2.000000317886446e+03, -2.166667224874798e+03, -2.333332894332184e+03, -2.4999998013217e+03, -2.66666670830974e+03, -2.833333371160978e+03, -3.000000278149621e+03, -3.166667185139137e+03, -3.333332854596523e+03, -3.499999761586038e+03, -3.666666668574972e+03, -3.833333331425028e+03, -4.000000238413962e+03, -4.166666901265763e+03, -4.333333058998287e+03, -4.499999721848342e+03, -4.666666384700144e+03, -4.833333535830303e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03, -5e+03]
+grid.P.apparent=[5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 5.0000498046875e+03, 4.833897939385459e+03, 4.669765093045849e+03, 4.507873458652912e+03, 4.348472665687626e+03, 4.191846284056652e+03, 4.03831806104941e+03, 3.888254665240271e+03, 3.742073101415614e+03, 3.600245816472694e+03, 3.463308145654874e+03, 3.331862953278726e+03, 3.206585923045612e+03, 3.088227587210179e+03, 2.977612980471399e+03, 2.87563623046875e+03, 2.783246499818916e+03, 2.701428061505466e+03, 2.631166999984546e+03, 2.573410114638883e+03, 2.529014694770704e+03, 2.498692388666142e+03, 2.48295897948644e+03, 2.482092278465293e+03, 2.496107658888839e+03, 2.524757102270478e+03, 2.567550712158811e+03, 2.62379684570589e+03, 2.692652379995837e+03, 2.773178347249496e+03, 2.864390324087376e+03, 2.965303016534463e+03, 3.074961087647957e+03, 3.192463292764907e+03, 3.31697683724848e+03, 3.447741370925297e+03, 3.584072882551323e+03, 3.725360857011919e+03, 3.87106217064717e+03, 4.020696633241664e+03, 4.17384228515625e+03, 4.330125638978333e+03, 4.489220032971753e+03, 4.650835915600903e+03, 4.814718884806662e+03, 4.98064726222282e+03, 5.148421834833287e+03, 5.317868285926324e+03, 5.48883182970531e+03, 5.661174770411334e+03, 5.834773999037261e+03, 6.009522210340299e+03, 6.185321693328235e+03, 6.362085045482697e+03, 6.539734141559217e+03, 6.718198668772585e+03, 6.897414080026612e+03, 7.07732587117524e+03, 7.257880730058394e+03, 7.439031781552799e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03, 7.62073681640625e+03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt
index fffc3cb9653..a6d0023c17f 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Electrical_AC_ThreePhasesBalanced_Loads_Examples_ParallelLoads.txt
@@ -1,18 +1,18 @@
-last-generated=2017-04-05
+last-generated=2024-04-04
 statistics-simulation=
 {
-  "numerical Jacobians": "0", 
-  "nonlinear": " ", 
-  "linear": " "
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
 }
-varRL_P.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.399999934435024e+03, -1.299999988079095e+03, -1.200000041723167e+03, -1.099999946355929e+03, -1e+03, -8.999999046327615e+02, -8.00000107288143e+02, -7.000000119209045e+02, -5.999999165536666e+02, -5.000001192090481e+02, -4.000000238418096e+02, -2.999999284745712e+02, -2.000001311299526e+02, -1.000000357627141e+02, 5.960452410238568e-05, 9.99998569491423e+01, 1.999999523163808e+02, 3.000000476836192e+02, 4.000001430508577e+02, 4.999999403954762e+02, 6.000000357627141e+02, 7.000001311299526e+02, 7.999999284745711e+02, 9.000000238418096e+02, 1.000000119209048e+03, 1.099999916553667e+03, 1.200000011920905e+03, 1.300000107288143e+03, 1.399999904632762e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03]
-varRC_y.S[2]=[1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 5.000003278248816e+01, 1.000000059604524e+02, 1.499999791384166e+02, 2.000000268220357e+02, 2.5e+02, 3.000000476836192e+02, 3.499999463559285e+02, 3.999999940395477e+02, 4.500000417231667e+02, 4.99999940395476e+02, 5.499999880790951e+02, 6.000000357627144e+02, 6.499999344350236e+02, 6.999999821186429e+02, 7.500000298022619e+02, 7.999999284745711e+02, 8.499999761581904e+02, 9.000000238418096e+02, 9.500000715254289e+02, 9.999999701977381e+02, 1.050000017881357e+03, 1.100000065564976e+03, 1.149999964237286e+03, 1.200000011920905e+03, 1.250000059604524e+03, 1.299999958276833e+03, 1.350000005960452e+03, 1.400000053644071e+03, 1.449999952316381e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03]
-RL_pf.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.499999937929129e+03, -1.447974864060056e+03, -1.39600869359162e+03, -1.344008277962633e+03, -1.291872486319249e+03, -1.239488647460938e+03, -1.186730296092848e+03, -1.133452168157194e+03, -1.07948543988269e+03, -1.024630489678647e+03, -9.686442934328024e+02, -9.112269425571172e+02, -8.519964166702321e+02, -7.904504560227468e+02, -7.259029011267214e+02, -6.573683930384672e+02, -5.833334227618516e+02, -5.012472945322541e+02, -4.061172584754012e+02, -2.849843401512993e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00]
-varRL_P.S[1]=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.866666538556728e+03, -1.733333358128849e+03, -1.600000055630804e+03, -1.466666554451243e+03, -1.333333374023438e+03, -1.199999872843876e+03, -1.066666769027856e+03, -9.333333288828328e+02, -7.999998887381373e+02, -6.666668459568737e+02, -5.33333344777385e+02, -3.999999046327979e+02, -2.666668313342108e+02, -1.333333759306983e+02, 7.947269690840413e-05, 1.333331375126116e+02, 2.666665929160059e+02, 4.000000635781347e+02, 5.333335037229037e+02, 6.666666075389597e+02, 8.000000476836552e+02, 9.333334878283515e+02, 1.06666653060947e+03, 1.200000031789031e+03, 1.333333532968592e+03, 1.466666514714954e+03, 1.600000015894515e+03, 1.733333517074077e+03, 1.866666498820439e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03]
-varRC_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03]
-varRL_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03]
 time=[0e+00, 1e+00]
-varRL_y.S[2]=[-1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -5.000003278248816e+01, -1.000000059604524e+02, -1.499999791384166e+02, -2.000000268220357e+02, -2.5e+02, -3.000000476836192e+02, -3.499999463559285e+02, -3.999999940395477e+02, -4.500000417231667e+02, -4.99999940395476e+02, -5.499999880790951e+02, -6.000000357627144e+02, -6.499999344350236e+02, -6.999999821186429e+02, -7.500000298022619e+02, -7.999999284745711e+02, -8.499999761581904e+02, -9.000000238418096e+02, -9.500000715254289e+02, -9.999999701977381e+02, -1.050000017881357e+03, -1.100000065564976e+03, -1.149999964237286e+03, -1.200000011920905e+03, -1.250000059604524e+03, -1.299999958276833e+03, -1.350000005960452e+03, -1.400000053644071e+03, -1.449999952316381e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03]
 RL_pf.S[1]=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03]
-E.S[2]=[-3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -2.899999934435024e+03, -2.799999988079095e+03, -2.700000041723167e+03, -2.599999946355928e+03, -2.5e+03, -2.399999904632762e+03, -2.300000107288143e+03, -2.200000011920904e+03, -2.099999916553666e+03, -2.000000119209048e+03, -1.90000002384181e+03, -1.799999928474571e+03, -1.700000131129953e+03, -1.600000035762714e+03, -1.499999940395476e+03, -1.400000143050858e+03, -1.300000047683619e+03, -1.199999952316381e+03, -1.099999856949142e+03, -1.000000059604524e+03, -8.999999642372859e+02, -7.999998688700474e+02, -7.000000715254289e+02, -5.999999761581904e+02, -4.999998807909519e+02, -4.000000834463334e+02, -2.999999880790955e+02, -1.99999892711857e+02, -1.000000953672385e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.20705299981152e-05, 5.202510923677715e+01, 1.039912606323405e+02, 1.559917372955744e+02, 2.081275747154712e+02, 2.605113220214844e+02, 3.132697344248759e+02, 3.66547862359802e+02, 4.205144990834633e+02, 4.753694798044301e+02, 5.313557065671976e+02, 5.887730574428828e+02, 6.480035833297679e+02, 7.095495439772532e+02, 7.740970988732786e+02, 8.426316069615328e+02, 9.166665772381484e+02, 9.987527054677458e+02, 1.093882741524671e+03, 1.215015598813981e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03]
+RL_pf.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.499999937929129e+03, -1.447974864060056e+03, -1.39600869359162e+03, -1.344008277962633e+03, -1.291872486319249e+03, -1.239488647460938e+03, -1.186730296092848e+03, -1.133452168157194e+03, -1.07948543988269e+03, -1.024630489678647e+03, -9.686442934328024e+02, -9.112269425571172e+02, -8.519964166702321e+02, -7.904504560227468e+02, -7.259029011267214e+02, -6.573683930384672e+02, -5.833334227618516e+02, -5.012472945322541e+02, -4.061172584754012e+02, -2.849843401512993e+02, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00, -8.944338798522949e+00]
+varRL_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03]
+varRL_y.S[2]=[-1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -1.500000053056283e-07, -5.000003278248816e+01, -1.000000059604524e+02, -1.499999791384166e+02, -2.000000268220357e+02, -2.5e+02, -3.000000476836192e+02, -3.499999463559285e+02, -3.999999940395477e+02, -4.500000417231667e+02, -4.99999940395476e+02, -5.499999880790951e+02, -6.000000357627144e+02, -6.499999344350236e+02, -6.999999821186429e+02, -7.500000298022619e+02, -7.999999284745711e+02, -8.499999761581904e+02, -9.000000238418096e+02, -9.500000715254289e+02, -9.999999701977381e+02, -1.050000017881357e+03, -1.100000065564976e+03, -1.149999964237286e+03, -1.200000011920905e+03, -1.250000059604524e+03, -1.299999958276833e+03, -1.350000005960452e+03, -1.400000053644071e+03, -1.449999952316381e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03]
+varRC_y.S[1]=[-2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -2.000000023372195e-07, -6.66667078335277e+01, -1.333333361943463e+02, -1.999999721845662e+02, -2.666666922568822e+02, -3.333333435058594e+02, -4.000000635782075e+02, -4.666665849688211e+02, -5.333333050410237e+02, -6.00000055630804e+02, -6.666666075387775e+02, -7.333332970937657e+02, -8.000000476835464e+02, -8.666665995914835e+02, -9.333332891465082e+02, -1.000000039736288e+03, -1.066666530609906e+03, -1.133333342234261e+03, -1.200000031789177e+03, -1.266666721344092e+03, -1.333333334286967e+03, -1.400000023841882e+03, -1.466666713396798e+03, -1.533333326339673e+03, -1.600000015894588e+03, -1.666666705449504e+03, -1.733333318392379e+03, -1.800000007947294e+03, -1.866666697502209e+03, -1.933333310445084e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03]
+varRC_y.S[2]=[1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 1.500000053056283e-07, 5.000003278248816e+01, 1.000000059604524e+02, 1.499999791384166e+02, 2.000000268220357e+02, 2.5e+02, 3.000000476836192e+02, 3.499999463559285e+02, 3.999999940395477e+02, 4.500000417231667e+02, 4.99999940395476e+02, 5.499999880790951e+02, 6.000000357627144e+02, 6.499999344350236e+02, 6.999999821186429e+02, 7.500000298022619e+02, 7.999999284745711e+02, 8.499999761581904e+02, 9.000000238418096e+02, 9.500000715254289e+02, 9.999999701977381e+02, 1.050000017881357e+03, 1.100000065564976e+03, 1.149999964237286e+03, 1.200000011920905e+03, 1.250000059604524e+03, 1.299999958276833e+03, 1.350000005960452e+03, 1.400000053644071e+03, 1.449999952316381e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03]
+varRL_P.S[1]=[-2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -2e+03, -1.866666538556728e+03, -1.733333358128849e+03, -1.600000055630804e+03, -1.466666554451243e+03, -1.333333374023438e+03, -1.199999872843876e+03, -1.066666769027856e+03, -9.333333288828328e+02, -7.999998887381373e+02, -6.666668459568737e+02, -5.33333344777385e+02, -3.999999046327979e+02, -2.666668313342108e+02, -1.333333759306983e+02, 7.947269690840413e-05, 1.333331375126116e+02, 2.666665929160059e+02, 4.000000635781347e+02, 5.333335037229037e+02, 6.666666075389597e+02, 8.000000476836552e+02, 9.333334878283515e+02, 1.06666653060947e+03, 1.200000031789031e+03, 1.333333532968592e+03, 1.466666514714954e+03, 1.600000015894515e+03, 1.733333517074077e+03, 1.866666498820439e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03, 2e+03]
+varRL_P.S[2]=[-1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.5e+03, -1.399999934435024e+03, -1.299999988079095e+03, -1.200000041723167e+03, -1.099999946355929e+03, -1e+03, -8.999999046327615e+02, -8.00000107288143e+02, -7.000000119209045e+02, -5.999999165536666e+02, -5.000001192090481e+02, -4.000000238418096e+02, -2.999999284745712e+02, -2.000001311299526e+02, -1.000000357627141e+02, 5.960452410238568e-05, 9.99998569491423e+01, 1.999999523163808e+02, 3.000000476836192e+02, 4.000001430508577e+02, 4.999999403954762e+02, 6.000000357627141e+02, 7.000001311299526e+02, 7.999999284745711e+02, 9.000000238418096e+02, 1.000000119209048e+03, 1.099999916553667e+03, 1.200000011920905e+03, 1.300000107288143e+03, 1.399999904632762e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03, 1.5e+03]
 E.S[1]=[-6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03, -6e+03]
+E.S[2]=[-3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -3e+03, -2.899999934435024e+03, -2.799999988079095e+03, -2.700000041723167e+03, -2.599999946355928e+03, -2.5e+03, -2.399999904632762e+03, -2.300000107288143e+03, -2.200000011920904e+03, -2.099999916553666e+03, -2.000000119209048e+03, -1.90000002384181e+03, -1.799999928474571e+03, -1.700000131129953e+03, -1.600000035762714e+03, -1.499999940395476e+03, -1.400000143050858e+03, -1.300000047683619e+03, -1.199999952316381e+03, -1.099999856949142e+03, -1.000000059604524e+03, -8.999999642372859e+02, -7.999998688700474e+02, -7.000000715254289e+02, -5.999999761581904e+02, -4.999998807909519e+02, -4.000000834463334e+02, -2.999999880790955e+02, -1.99999892711857e+02, -1.000000953672385e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.20705299981152e-05, 5.202510923677715e+01, 1.039912606323405e+02, 1.559917372955744e+02, 2.081275747154712e+02, 2.605113220214844e+02, 3.132697344248759e+02, 3.66547862359802e+02, 4.205144990834633e+02, 4.753694798044301e+02, 5.313557065671976e+02, 5.887730574428828e+02, 6.480035833297679e+02, 7.095495439772532e+02, 7.740970988732786e+02, 8.426316069615328e+02, 9.166665772381484e+02, 9.987527054677458e+02, 1.093882741524671e+03, 1.215015598813981e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03, 1.4910556640625e+03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
deleted file mode 100644
index d17f0b980ec..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ1.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-last-generated=2023-01-30
-statistics-initialization=
-{
-  "nonlinear": "1, 1, 5",
-  "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
-  "linear": "0",
-  "nonlinear": "1, 5, 1",
-  "number of continuous time states": "10",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 6.048e+05]
-bui.maxTSet.y=[2.971499938964844e+02, 2.971499938964844e+02]
-bui.minTSet.y=[2.931499938964844e+02, 2.931499938964844e+02]
-bui.zon.TAir=[2.931499938964844e+02, 2.931473693847656e+02, 2.931480102539062e+02, 2.931492919921875e+02, 2.931504516601562e+02, 2.931482238769531e+02, 2.931498718261719e+02, 2.931499633789062e+02, 2.931495056152344e+02, 2.931497802734375e+02, 2.931499633789062e+02, 2.931501159667969e+02, 2.931500549316406e+02, 2.931499633789062e+02, 2.931497802734375e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931489868164062e+02, 2.931497192382812e+02, 2.943623962402344e+02, 2.94867919921875e+02, 2.948768615722656e+02, 2.955193786621094e+02, 2.957888488769531e+02, 2.948112182617188e+02, 2.940652465820312e+02, 2.9371875e+02, 2.934517822265625e+02, 2.931719360351562e+02, 2.931508483886719e+02, 2.931502990722656e+02, 2.931497802734375e+02, 2.9314990234375e+02, 2.946982116699219e+02, 2.953076171875e+02, 2.953916931152344e+02, 2.959407653808594e+02, 2.962115783691406e+02, 2.954412841796875e+02, 2.945702209472656e+02, 2.941409301757812e+02, 2.938135681152344e+02, 2.934753723144531e+02, 2.932232360839844e+02, 2.931494140625e+02, 2.931497802734375e+02, 2.931499633789062e+02, 2.943725280761719e+02, 2.951613159179688e+02, 2.955816955566406e+02, 2.957892761230469e+02, 2.96097900390625e+02, 2.960891723632812e+02, 2.946523742675781e+02, 2.941459045410156e+02, 2.938270263671875e+02, 2.934635620117188e+02, 2.931502380371094e+02, 2.931493530273438e+02, 2.931501159667969e+02, 2.93150390625e+02, 2.939641418457031e+02, 2.950294494628906e+02, 2.955462951660156e+02, 2.958534545898438e+02, 2.962309265136719e+02, 2.964024353027344e+02, 2.948607177734375e+02, 2.94292724609375e+02, 2.938360900878906e+02, 2.934384460449219e+02, 2.931499328613281e+02, 2.931505126953125e+02, 2.93150634765625e+02, 2.93150390625e+02, 2.931510314941406e+02, 2.946406860351562e+02, 2.951609497070312e+02, 2.950343627929688e+02, 2.954814758300781e+02, 2.957160034179688e+02, 2.946957397460938e+02, 2.937189636230469e+02, 2.931838989257812e+02, 2.931502380371094e+02, 2.93150390625e+02, 2.931507568359375e+02, 2.931494140625e+02, 2.931483459472656e+02, 2.931493530273438e+02, 2.93150634765625e+02, 2.93149658203125e+02, 2.931559448242188e+02, 2.9314990234375e+02, 2.931502685546875e+02, 2.931461181640625e+02, 2.931499328613281e+02, 2.931502685546875e+02, 2.931502075195312e+02, 2.931499328613281e+02]
-bui.terUni.QActHea_flow=[-0e+00, 1.369750213623047e+02, 4.203578186035156e+02, 5.98372802734375e+02, 7.337001342773438e+02, 7.101415405273438e+02, 6.222564086914062e+02, 6.229144897460938e+02, 7.08852294921875e+02, 7.710574951171875e+02, 8.509797973632812e+02, 8.923650512695312e+02, 9.115244750976562e+02, 9.213534545898438e+02, 9.39576904296875e+02, 8.606898193359375e+02, 8.7029150390625e+02, 8.794125366210938e+02, 8.024580688476562e+02, 6.052542724609375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.332792510986328e+02, 2.261280975341797e+02, 2.906262512207031e+02, 1.540489349365234e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.08649528503418e+02, 2.210073089599609e+02, 2.529266662597656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.659997367858887e+01, 1.827000579833984e+02, 3.441007385253906e+02, 4.058888549804688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.086543655395508e+01, 2.65362060546875e+02, 4.351222839355469e+02, 5.533555297851562e+02, 4.363831176757812e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.022389526367188e+02, 6.894310302734375e+02, 8.89932373046875e+02, 1.056268310546875e+03, 1.210400268554688e+03, 1.168771362304688e+03, 5.577785034179688e+02, 4.69840576171875e+02, 7.438450317382812e+02, 7.708739013671875e+02, 6.573661499023438e+02, 1.045031860351562e+03, 1.23631103515625e+03, 1.303364624023438e+03, 1.356279296875e+03, 1.40749169921875e+03]
-bui.terUni.QActCoo_flow=[-0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-supHeaWat.T_in=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.terUni.T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.disFloHea.mReq_flow[1]=[0e+00, 3.559615463018417e-03, 1.551258843392134e-02, 2.340470999479294e-02, 2.971525862812996e-02, 2.85955835133791e-02, 2.450072392821312e-02, 2.453113161027431e-02, 2.853688597679138e-02, 3.149821236729622e-02, 3.537450358271599e-02, 3.741275146603584e-02, 3.836309537291527e-02, 3.885218128561974e-02, 3.97619791328907e-02, 3.585073724389076e-02, 3.63229364156723e-02, 3.677252680063248e-02, 3.300995379686356e-02, 2.371975407004356e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.380913520231843e-03, 7.529877126216888e-03, 1.011042483150959e-02, 4.374098498374224e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.268682699650526e-03, 7.316519971936941e-03, 8.602378889918327e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.899820781545714e-04, 5.683709401637316e-03, 1.22827785089612e-02, 1.487636566162109e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.501361007802188e-04, 9.088476188480854e-03, 1.612123288214207e-02, 2.132699638605118e-02, 1.61757580935955e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.056027878075838e-02, 2.75652427226305e-02, 3.721316531300545e-02, 4.558148235082626e-02, 5.362288281321526e-02, 5.142593011260033e-02, 2.151709049940109e-02, 1.761753298342228e-02, 3.014162927865982e-02, 3.142040967941284e-02, 2.606825344264507e-02, 4.499367251992226e-02, 5.500345677137375e-02, 5.861123278737068e-02, 6.149465590715408e-02, 6.431661546230316e-02]
-bui.disFloHea.mAct_flow[1].y=[-0e+00, 3.569201333448291e-03, 1.552215497940779e-02, 2.341427467763424e-02, 2.972482144832611e-02, 2.86051481962204e-02, 2.451028674840927e-02, 2.454069629311562e-02, 2.854644879698753e-02, 3.150777518749237e-02, 3.538406640291214e-02, 3.742231428623199e-02, 3.837265819311142e-02, 3.886174038052559e-02, 3.977154195308685e-02, 3.586030006408691e-02, 3.633249923586845e-02, 3.678208962082863e-02, 3.301951661705971e-02, 2.372931875288486e-02, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, 3.390500787645578e-03, 7.539449259638786e-03, 1.011999417096376e-02, 4.383679945021868e-03, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 2.27828323841095e-03, 7.326092571020126e-03, 8.611950092017651e-03, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 2.000488748308271e-04, 5.693285726010799e-03, 1.22923469170928e-02, 1.488593220710754e-02, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 8.598050335422158e-04, 9.098046459257603e-03, 1.613079756498337e-02, 2.133656106889248e-02, 1.618532463908195e-02, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1.056984812021255e-02, 2.75748074054718e-02, 3.72227281332016e-02, 4.559104144573212e-02, 5.363244190812111e-02, 5.143548920750618e-02, 2.152665518224239e-02, 1.762709952890873e-02, 3.015119396150112e-02, 3.142997249960899e-02, 2.607781626284122e-02, 4.500323534011841e-02, 5.50130195915699e-02, 5.862079560756683e-02, 6.150421872735023e-02, 6.432617455720901e-02]
-bui.disFloHea.m_flow_nominal=[9.560229629278183e-02, 9.560229629278183e-02]
-bui.terUni.QHea_flow_nominal=[2e+03, 2e+03]
-supChiWat.T_in=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.terUni.T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.disFloCoo.mReq_flow[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-bui.disFloCoo.mAct_flow[1].y=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-bui.disFloCoo.m_flow_nominal=[9.560229629278183e-02, 9.560229629278183e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
deleted file mode 100644
index 2be6f23e1ce..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_BaseClasses_Examples_CouplingSpawnZ6.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-last-generated=2024-03-22
-statistics-initialization=
-{
-  "nonlinear": "1, 1, 1, 1, 1, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 1",
-  "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
-  "linear": "0, 0, 0, 0, 0, 0",
-  "nonlinear": "1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 1, 1",
-  "number of continuous time states": "37",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 6.048e+05]
-bui.maxTSet[1].y=[2.971499938964844e+02, 2.971499938964844e+02]
-bui.minTSet[1].y=[2.931499938964844e+02, 2.931499938964844e+02]
-bui.znAttic.TAir=[2.931499938964844e+02, 2.696248474121094e+02, 2.647601623535156e+02, 2.633650817871094e+02, 2.627608337402344e+02, 2.640186767578125e+02, 2.708359680175781e+02, 2.774660949707031e+02, 2.775525207519531e+02, 2.762177734375e+02, 2.729598388671875e+02, 2.704551391601562e+02, 2.701816101074219e+02, 2.697094421386719e+02, 2.690176391601562e+02, 2.672326965332031e+02, 2.668397521972656e+02, 2.670538024902344e+02, 2.686611633300781e+02, 2.699333801269531e+02, 2.736177673339844e+02, 2.777817687988281e+02, 2.818801574707031e+02, 2.807268676757812e+02, 2.764589538574219e+02, 2.736166381835938e+02, 2.730738830566406e+02, 2.734977111816406e+02, 2.728436279296875e+02, 2.720897521972656e+02, 2.722490539550781e+02, 2.725907287597656e+02, 2.714765625e+02, 2.700829162597656e+02, 2.717578735351562e+02, 2.752991027832031e+02, 2.779121398925781e+02, 2.783534240722656e+02, 2.760373229980469e+02, 2.716869201660156e+02, 2.700905151367188e+02, 2.694210510253906e+02, 2.694356384277344e+02, 2.694671630859375e+02, 2.694608154296875e+02, 2.694798278808594e+02, 2.6912548828125e+02, 2.690842895507812e+02, 2.708528442382812e+02, 2.746116027832031e+02, 2.781951599121094e+02, 2.799570617675781e+02, 2.777321166992188e+02, 2.72853271484375e+02, 2.699519348144531e+02, 2.686414794921875e+02, 2.68407470703125e+02, 2.661282958984375e+02, 2.652016906738281e+02, 2.647179260253906e+02, 2.622923278808594e+02, 2.5888037109375e+02, 2.59228759765625e+02, 2.652902526855469e+02, 2.734690246582031e+02, 2.759569396972656e+02, 2.744515380859375e+02, 2.704777526855469e+02, 2.675333557128906e+02, 2.65903564453125e+02, 2.640467529296875e+02, 2.625533752441406e+02, 2.612828674316406e+02, 2.6012841796875e+02, 2.580778503417969e+02, 2.569005432128906e+02, 2.567782592773438e+02, 2.617930908203125e+02, 2.6889013671875e+02, 2.697472534179688e+02, 2.683960266113281e+02, 2.654728088378906e+02, 2.591743164062501e+02, 2.559188079833984e+02, 2.535173187255859e+02, 2.530016784667969e+02, 2.525250396728516e+02, 2.517330474853516e+02, 2.507530670166016e+02, 2.499160614013672e+02, 2.483439636230469e+02, 2.536296691894531e+02, 2.641053161621094e+02, 2.707305297851562e+02, 2.714434509277344e+02, 2.664327697753906e+02, 2.591914978027344e+02, 2.552892761230469e+02, 2.529208679199219e+02, 2.512074432373047e+02, 2.501965484619141e+02]
-bui.znCore_ZN.TAir=[2.931499938964844e+02, 2.946950988769531e+02, 2.944135131835938e+02, 2.942106323242188e+02, 2.940286254882812e+02, 2.939566955566406e+02, 2.939712219238281e+02, 2.938870544433594e+02, 2.9370751953125e+02, 2.935422058105469e+02, 2.933799743652344e+02, 2.932565307617188e+02, 2.931695251464844e+02, 2.931498413085938e+02, 2.931498107910156e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.933429870605469e+02, 2.951820678710938e+02, 2.95649658203125e+02, 2.956305847167969e+02, 2.962224426269531e+02, 2.964516296386719e+02, 2.954553527832031e+02, 2.947343139648438e+02, 2.944199523925781e+02, 2.94181396484375e+02, 2.939446411132812e+02, 2.937984313964844e+02, 2.936788330078125e+02, 2.936059875488281e+02, 2.937900085449219e+02, 2.954376220703125e+02, 2.959713745117188e+02, 2.960086059570312e+02, 2.965057373046875e+02, 2.967352905273438e+02, 2.959407043457031e+02, 2.950741882324219e+02, 2.946865844726562e+02, 2.944045104980469e+02, 2.941205444335938e+02, 2.939288940429688e+02, 2.9377197265625e+02, 2.93658203125e+02, 2.936404113769531e+02, 2.951039733886719e+02, 2.958141784667969e+02, 2.961734619140625e+02, 2.963369750976562e+02, 2.966032409667969e+02, 2.965606079101562e+02, 2.951328125e+02, 2.946884765625e+02, 2.944300842285156e+02, 2.941376342773438e+02, 2.939020080566406e+02, 2.937380065917969e+02, 2.935852966308594e+02, 2.935513305664062e+02, 2.947816467285156e+02, 2.957979736328125e+02, 2.962371520996094e+02, 2.965921325683594e+02, 2.969424743652344e+02, 2.970848999023438e+02, 2.9557666015625e+02, 2.950350646972656e+02, 2.946098022460938e+02, 2.942618103027344e+02, 2.939714660644531e+02, 2.937625732421875e+02, 2.935788269042969e+02, 2.934512634277344e+02, 2.936034851074219e+02, 2.955103149414062e+02, 2.959675903320312e+02, 2.958002624511719e+02, 2.961917419433594e+02, 2.963755493164062e+02, 2.953682556152344e+02, 2.945177307128906e+02, 2.941181335449219e+02, 2.938173522949219e+02, 2.93364990234375e+02, 2.931499938964844e+02, 2.931498718261719e+02, 2.931489562988281e+02, 2.931495666503906e+02, 2.9351171875e+02, 2.9363525390625e+02, 2.933377075195312e+02, 2.932208251953125e+02, 2.933033142089844e+02, 2.931471252441406e+02, 2.931499938964844e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.931499938964844e+02]
-bui.znPerimeter_ZN_1.TAir=[2.931499938964844e+02, 2.931474914550781e+02, 2.931492004394531e+02, 2.931505126953125e+02, 2.931505737304688e+02, 2.931475219726562e+02, 2.943127136230469e+02, 2.9483984375e+02, 2.933582458496094e+02, 2.93151123046875e+02, 2.931501770019531e+02, 2.931498107910156e+02, 2.931499633789062e+02, 2.931496276855469e+02, 2.931495056152344e+02, 2.931500244140625e+02, 2.931502990722656e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931503295898438e+02, 2.937300109863281e+02, 2.942338256835938e+02, 2.942904968261719e+02, 2.946653137207031e+02, 2.945749206542969e+02, 2.933391418457031e+02, 2.931488647460938e+02, 2.931497192382812e+02, 2.931507568359375e+02, 2.931503601074219e+02, 2.931499633789062e+02, 2.931497192382812e+02, 2.931500244140625e+02, 2.931490783691406e+02, 2.936109924316406e+02, 2.942803039550781e+02, 2.943381042480469e+02, 2.9480615234375e+02, 2.948041687011719e+02, 2.935928344726562e+02, 2.931498413085938e+02, 2.931507263183594e+02, 2.931504211425781e+02, 2.931497802734375e+02, 2.931498107910156e+02, 2.93150146484375e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932991943359375e+02, 2.939285888671875e+02, 2.943627624511719e+02, 2.944831848144531e+02, 2.945306701660156e+02, 2.940908813476562e+02, 2.931520690917969e+02, 2.931500549316406e+02, 2.931487731933594e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931483459472656e+02, 2.955110778808594e+02, 3.01381591796875e+02, 3.005870666503906e+02, 2.998824768066406e+02, 2.985364074707031e+02, 2.953821105957031e+02, 2.938476867675781e+02, 2.931487426757812e+02, 2.931505737304688e+02, 2.931502990722656e+02, 2.931497192382812e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.93158935546875e+02, 2.949291687011719e+02, 2.956778564453125e+02, 2.946517639160156e+02, 2.946813354492188e+02, 2.945335083007812e+02, 2.931480712890625e+02, 2.931504516601562e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499633789062e+02, 2.93149169921875e+02, 2.931497497558594e+02, 2.931501770019531e+02, 2.931421203613281e+02, 2.943613891601562e+02, 2.951016540527344e+02, 2.951234436035156e+02, 2.940075988769531e+02, 2.931509094238281e+02, 2.931498107910156e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-bui.znPerimeter_ZN_2.TAir=[2.931499938964844e+02, 2.931479187011719e+02, 2.931498718261719e+02, 2.931506042480469e+02, 2.931499633789062e+02, 2.931528015136719e+02, 2.931493530273438e+02, 2.931502380371094e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931497497558594e+02, 2.931498413085938e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931498413085938e+02, 2.933660278320312e+02, 2.937336730957031e+02, 2.936688232421875e+02, 2.940513610839844e+02, 2.9405322265625e+02, 2.931499633789062e+02, 2.931492614746094e+02, 2.931499633789062e+02, 2.931509399414062e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499328613281e+02, 2.933926696777344e+02, 2.938340759277344e+02, 2.937544555664062e+02, 2.941476135253906e+02, 2.941908569335938e+02, 2.931890258789062e+02, 2.931505737304688e+02, 2.93150390625e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.936151733398438e+02, 2.939010925292969e+02, 2.939938354492188e+02, 2.940743408203125e+02, 2.937416381835938e+02, 2.931504211425781e+02, 2.931496276855469e+02, 2.931499328613281e+02, 2.931501770019531e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931505432128906e+02, 2.943160400390625e+02, 2.939783935546875e+02, 2.941762390136719e+02, 2.943374328613281e+02, 2.941220397949219e+02, 2.931484375e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931498718261719e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93158447265625e+02, 2.938656005859375e+02, 2.935910949707031e+02, 2.931497192382812e+02, 2.932027587890625e+02, 2.931499938964844e+02, 2.931505126953125e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931493835449219e+02, 2.931499328613281e+02, 2.931500854492188e+02, 2.931478881835938e+02, 2.931488647460938e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-bui.znPerimeter_ZN_3.TAir=[2.931499938964844e+02, 2.931475830078125e+02, 2.931493225097656e+02, 2.931505126953125e+02, 2.931504211425781e+02, 2.931501770019531e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931498413085938e+02, 2.931499938964844e+02, 2.931501159667969e+02, 2.931500549316406e+02, 2.931501770019531e+02, 2.93150146484375e+02, 2.933556823730469e+02, 2.93752197265625e+02, 2.936982421875e+02, 2.941069946289062e+02, 2.941492614746094e+02, 2.931500549316406e+02, 2.931492004394531e+02, 2.931498107910156e+02, 2.931506652832031e+02, 2.931502380371094e+02, 2.931499328613281e+02, 2.931498107910156e+02, 2.931500244140625e+02, 2.931496276855469e+02, 2.933959045410156e+02, 2.938642883300781e+02, 2.938617858886719e+02, 2.942844543457031e+02, 2.943653869628906e+02, 2.933765563964844e+02, 2.931498718261719e+02, 2.931506042480469e+02, 2.931503295898438e+02, 2.931498107910156e+02, 2.931498413085938e+02, 2.931501159667969e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.932023620605469e+02, 2.937019348144531e+02, 2.940452880859375e+02, 2.941720886230469e+02, 2.942837524414062e+02, 2.939806213378906e+02, 2.9315185546875e+02, 2.931500549316406e+02, 2.931488647460938e+02, 2.931500244140625e+02, 2.931500854492188e+02, 2.931499328613281e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.931600036621094e+02, 2.931513977050781e+02, 2.933169555664062e+02, 2.934358215332031e+02, 2.936811828613281e+02, 2.936585998535156e+02, 2.931490478515625e+02, 2.93149658203125e+02, 2.931501770019531e+02, 2.931499938964844e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93151123046875e+02, 2.931517028808594e+02, 2.931499633789062e+02, 2.931503295898438e+02, 2.93150146484375e+02, 2.931500854492188e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931494140625e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931497192382812e+02, 2.931501159667969e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-bui.znPerimeter_ZN_4.TAir=[2.931499938964844e+02, 2.931475830078125e+02, 2.931499328613281e+02, 2.931505737304688e+02, 2.931499328613281e+02, 2.931502990722656e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.9314990234375e+02, 2.931498413085938e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.932111511230469e+02, 2.93587890625e+02, 2.935616455078125e+02, 2.940156860351562e+02, 2.940275573730469e+02, 2.931502380371094e+02, 2.931492919921875e+02, 2.931499633789062e+02, 2.931508178710938e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.932061767578125e+02, 2.936568298339844e+02, 2.936614685058594e+02, 2.942024230957031e+02, 2.943663940429688e+02, 2.93226806640625e+02, 2.931505737304688e+02, 2.931504516601562e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.934985046386719e+02, 2.938359680175781e+02, 2.940107727050781e+02, 2.941534118652344e+02, 2.937653503417969e+02, 2.931504211425781e+02, 2.931495971679688e+02, 2.931499328613281e+02, 2.931501770019531e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931479187011719e+02, 2.93152099609375e+02, 2.934186706542969e+02, 2.941679077148438e+02, 2.950186157226562e+02, 2.943148498535156e+02, 2.931483154296875e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931498718261719e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931510314941406e+02, 2.931505737304688e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931820373535156e+02, 2.933412780761719e+02, 2.931505737304688e+02, 2.9314990234375e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931493530273438e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931500854492188e+02, 2.931502990722656e+02, 2.931500244140625e+02, 2.931494445800781e+02, 2.931504821777344e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
-bui.terUni[1].QActHea_flow=[-0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.962102890014648e+01, 8.625164794921874e+01, 1.946482276916504e+01, 4.608393096923828e+01, 7.232552337646489e+01, 1.130287837982178e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.495180511474609e+01, 1.671715545654297e+02, 2.898954772949219e+02, 1.962195739746094e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.499143218994141e+02, 3.964361877441406e+02, 4.3398388671875e+02, 4.620574035644531e+02, 4.911262817382812e+02]
-bui.terUni[2].QActHea_flow=[-0e+00, 4.24272705078125e+02, 6.185436401367188e+02, 7.4083203125e+02, 8.4408154296875e+02, 3.605536193847656e+02, 0e+00, 0e+00, 0e+00, 2.441546936035156e+02, 5.754978637695312e+02, 7.054749145507812e+02, 7.617570190429688e+02, 8.125055541992188e+02, 8.857003784179688e+02, 9.065148315429688e+02, 9.353187866210938e+02, 9.3873291015625e+02, 9.099721069335938e+02, 8.007279663085938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.509753723144531e+02, 5.022747192382812e+02, 6.478684082031245e+02, 7.447567749023438e+02, 8.052229614257812e+02, 8.556102294921875e+02, 9.070932006835938e+02, 8.24238525390625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.523223266601562e+02, 5.489208374023414e+02, 6.882032470703125e+02, 8.048842163085938e+02, 8.77473876953125e+02, 9.314943237304688e+02, 9.579634399414062e+02, 9.502733764648438e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.798305358886719e+02, 6.86448486328125e+02, 8.144700927734377e+02, 9.456962280273416e+02, 1.007566528320312e+03, 1.050145629882812e+03, 1.153784057617188e+03, 1.200698486328125e+03, 3.043334045410156e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.260542221069336e+02, 4.871717224121094e+02, 7.170015869140625e+02, 8.651851196289062e+02, 1.000668640136719e+03, 1.077232543945312e+03, 9.013499145507812e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.640883178710827e+02, 8.705847778320312e+02, 1.031690551757812e+03, 1.1398173828125e+03, 1.267236206054688e+03, 1.328863159179688e+03, 1.3876923828125e+03, 1.432918579101562e+03, 1.421060424804688e+03, 3.306425476074219e+02, 0e+00, 0e+00, 0e+00, 0e+00, 9.19763671875e+02, 1.119400512695312e+03, 1.1847880859375e+03, 1.245662963867188e+03, 1.292474609375e+03]
-bui.terUni[3].QActHea_flow=[-0e+00, 3.649644470214844e+02, 5.0844287109375e+02, 5.900267944335938e+02, 6.658031005859375e+02, 2.895733947753906e+02, 1.578695678710938e+02, 4.270294189453125e+02, 4.985211486816406e+02, 5.752134399414062e+02, 6.480369262695312e+02, 6.87982421875e+02, 7.048997802734375e+02, 7.202174072265625e+02, 7.557816162109375e+02, 7.530716552734375e+02, 7.649014892578125e+02, 7.586492919921875e+02, 7.31613037109375e+02, 6.462489013671875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.197572326660156e+01, 3.598150024414062e+02, 4.393463134765625e+02, 5.18344970703125e+02, 5.826580810546875e+02, 6.202590942382812e+02, 6.502948608398438e+02, 6.807874145507812e+02, 6.126284790039062e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.497358703613281e+02, 4.562608642578116e+02, 5.450174560546875e+02, 6.222740478515625e+02, 6.670717163085938e+02, 7.030756225585938e+02, 7.20435302734375e+02, 7.106903686523438e+02, 9.831692695617676e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.943265075683594e+02, 5.307631225585938e+02, 6.172062377929678e+02, 7.062969970703112e+02, 7.549385375976562e+02, 7.877448120117188e+02, 8.682628173828125e+02, 9.06727783203125e+02, 1.332209167480469e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.125549621582019e+02, 5.125210571289034e+02, 6.48508544921875e+02, 7.461336059570312e+02, 8.308818969726562e+02, 8.740469360351562e+02, 9.267603759765625e+02, 9.538132934570312e+02, 7.489530639648438e+02, 0e+00, 0e+00, 7.966452026367188e+01, 0e+00, 3.685850906372067e+01, 5.895613403320276e+02, 8.276157836914062e+02, 9.126271362304688e+02, 9.71892333984375e+02, 1.05756591796875e+03, 1.09635302734375e+03, 1.136356811523438e+03, 1.167064208984375e+03, 1.151049682617188e+03, 4.698877563476562e+02, 5.462245483398438e+02, 8.54905029296875e+02, 8.641546020507812e+02, 9.112095336914062e+02, 1.0620888671875e+03, 1.112535522460938e+03, 1.12728466796875e+03, 1.1456171875e+03, 1.158974975585938e+03]
-bui.terUni[4].QActHea_flow=[-0e+00, 5.558729248046875e+02, 7.382626342773438e+02, 8.3777783203125e+02, 9.192171630859375e+02, 9.286480712890625e+02, 8.90931884765625e+02, 8.7055322265625e+02, 8.871788330078125e+02, 9.4311376953125e+02, 9.986867065429688e+02, 1.028563232421875e+03, 1.039662963867188e+03, 1.046648803710938e+03, 1.072602905273438e+03, 1.063007690429688e+03, 1.068566162109375e+03, 1.058794555664062e+03, 1.020466796875e+03, 9.19990478515625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.950886535644531e+01, 5.042422790527344e+02, 6.1709326171875e+02, 7.245958862304684e+02, 7.969409790039062e+02, 8.4384375e+02, 8.8100048828125e+02, 9.163023071289062e+02, 8.413104248046875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.450171813964844e+02, 6.095533447265607e+02, 7.231705322265625e+02, 8.237286376953125e+02, 8.8201025390625e+02, 9.261693115234375e+02, 9.477528076171875e+02, 9.362863159179688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.958274841308594e+02, 6.835643920898438e+02, 8.006774291992191e+02, 9.154272460937482e+02, 9.746026611328125e+02, 1.010683837890625e+03, 1.105995239257812e+03, 1.1451376953125e+03, 5.522776489257812e+02, 5.577871322631836e+01, 0e+00, 0e+00, 0e+00, 0e+00, 6.937228393554698e+02, 8.69522827148435e+02, 9.845579223632812e+02, 1.065112548828125e+03, 1.141474365234375e+03, 1.17470166015625e+03, 1.219621704101562e+03, 1.241074340820312e+03, 1.180713989257812e+03, 3.444690856933594e+02, 1.366450958251953e+02, 3.324537048339844e+02, 8.057544708251953e+01, 1.315717315673838e+02, 8.934673461914023e+02, 1.1348720703125e+03, 1.21357568359375e+03, 1.27075439453125e+03, 1.356179809570312e+03, 1.39171728515625e+03, 1.428945068359375e+03, 1.456744995117188e+03, 1.434333129882812e+03, 1.284524780273438e+03, 1.223740234375e+03, 1.300587158203125e+03, 1.315287353515625e+03, 1.323046630859375e+03, 1.42504150390625e+03, 1.456106201171875e+03, 1.459848266601562e+03, 1.469873901367188e+03, 1.4767509765625e+03]
-bui.terUni[5].QActHea_flow=[0e+00, 4.094045104980469e+02, 5.490975952148438e+02, 6.258297729492188e+02, 6.970369262695312e+02, 6.929652099609375e+02, 6.155304565429688e+02, 5.596090698242188e+02, 5.591075439453125e+02, 5.840328979492188e+02, 7.182008056640625e+02, 7.589586181640625e+02, 7.695017700195312e+02, 7.779566040039062e+02, 8.016448974609375e+02, 7.976217041015625e+02, 8.042631225585938e+02, 7.987070922851562e+02, 7.648720092773438e+02, 6.827174682617188e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.251349182128906e+02, 3.883121948242188e+02, 4.637898864746094e+02, 5.368702392578125e+02, 5.960391235351562e+02, 6.34653564453125e+02, 6.637091064453125e+02, 6.927196655273438e+02, 6.396444091796875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.43699951171875e+02, 4.57213867187499e+02, 5.452909545898438e+02, 6.226463623046875e+02, 6.663508911132812e+02, 7.018671264648438e+02, 7.208778686523438e+02, 7.11920654296875e+02, 6.275896835327148e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.955726623535156e+02, 5.325949096679688e+02, 6.207913208007805e+02, 7.058627929687489e+02, 7.548711547851562e+02, 7.85028564453125e+02, 8.67580322265625e+02, 9.059395751953125e+02, 5.056842041015625e+02, 7.066323852539062e+01, 0e+00, 0e+00, 0e+00, 0e+00, 3.113062133789049e+02, 5.157238769531223e+02, 6.478724975585938e+02, 7.43592041015625e+02, 8.291785888671875e+02, 8.705960083007812e+02, 9.225440673828125e+02, 9.496784057617188e+02, 9.002711181640625e+02, 2.261002655029297e+02, 6.453108215332031e+01, 2.037944488525391e+02, 0e+00, 0e+00, 6.289967041015587e+02, 8.6190185546875e+02, 9.365623779296875e+02, 9.920344848632812e+02, 1.073463745117188e+03, 1.10852587890625e+03, 1.146557373046875e+03, 1.174415283203125e+03, 1.156993530273438e+03, 1.003324768066406e+03, 9.01484619140625e+02, 9.37541015625e+02, 6.183226928710938e+02, 4.52711181640625e+02, 1.042221313476562e+03, 1.108141479492188e+03, 1.1158310546875e+03, 1.131311401367188e+03, 1.144248168945312e+03]
-bui.terUni[1].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-bui.terUni[2].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -4.9915068359375e+03, -3.108621826171875e+03, -2.66886474609375e+03, -2.434202880859375e+03, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-bui.terUni[3].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-bui.terUni[4].QActCoo_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-bui.terUni[5].QActCoo_flow=[0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-supHeaWat.T_in=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.terUni[1].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.terUni[2].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.terUni[3].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.terUni[4].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.terUni[5].T_aHeaWat_nominal=[3.131499938964844e+02, 3.131499938964844e+02]
-bui.disFloHea.mAct_flow[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.844741779379547e-04, 1.351101091131568e-03, 2.327283727936447e-04, 5.734508740715683e-04, 1.022088574245573e-03, 1.35172507725656e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.233565123286098e-04, 4.809664096683264e-03, 9.911716915667057e-03, 6.120870821177959e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.328690193593502e-03, 1.428392808884382e-02, 1.58795490860939e-02, 1.708930172026157e-02, 1.835632137954235e-02]
-bui.disFloHea.mAct_flow[2].y=[0e+00, 1.546976901590824e-02, 2.408293075859547e-02, 2.97981146723032e-02, 3.477906063199043e-02, 1.278919819742441e-02, 0e+00, 0e+00, 0e+00, 8.105876855552197e-03, 2.212432026863098e-02, 2.812372706830502e-02, 3.079522773623466e-02, 3.323923051357269e-02, 3.682319819927216e-02, 3.785602375864983e-02, 3.929321840405464e-02, 3.946346417069435e-02, 3.802794590592384e-02, 3.267015144228935e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.239325571805239e-02, 1.88538059592247e-02, 2.543379180133341e-02, 2.998174540698528e-02, 3.288374468684196e-02, 3.533832728862762e-02, 3.788067400455475e-02, 3.380461409687996e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.244848873466253e-02, 2.092533558607091e-02, 2.730862982571125e-02, 3.286377713084221e-02, 3.641002625226974e-02, 3.909292817115784e-02, 4.042006656527519e-02, 4.003343731164932e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.786901988089085e-02, 2.722350507974625e-02, 3.332301974296571e-02, 3.979970514774311e-02, 4.292623698711395e-02, 4.51044850051403e-02, 5.049978196620941e-02, 5.298492684960365e-02, 1.04915639385581e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.831228310242295e-03, 1.819252036511898e-02, 2.866741456091404e-02, 3.581120818853378e-02, 4.258871823549271e-02, 4.651793837547302e-02, 3.761838749051094e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.293483190238431e-02, 3.607464581727982e-02, 4.416613653302193e-02, 4.97761145234108e-02, 5.656954273581505e-02, 5.99268451333046e-02, 6.317316740751266e-02, 6.570342928171158e-02, 6.503958255052567e-02, 1.155432127416134e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.851119056344032e-02, 4.870414361357689e-02, 5.214985087513924e-02, 5.540359765291214e-02, 5.793686583638191e-02]
-bui.disFloHea.mAct_flow[3].y=[0e+00, 1.297246105968952e-02, 1.912755146622658e-02, 2.278335019946098e-02, 2.626707218587399e-02, 9.905938059091568e-03, 4.370479844510555e-03, 1.558998133987188e-02, 1.869050040841103e-02, 2.21110712736845e-02, 2.544272691011429e-02, 2.730265073478222e-02, 2.809699065983295e-02, 2.881922945380211e-02, 3.050942905247211e-02, 3.03803738206625e-02, 3.09457816183567e-02, 3.064680844545364e-02, 2.935933880507946e-02, 2.535966970026493e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.511847018264234e-03, 1.275890786200762e-02, 1.611623540520668e-02, 1.956514827907085e-02, 2.244634367525578e-02, 2.416053228080273e-02, 2.554505690932274e-02, 2.696374244987965e-02, 2.381098084151745e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.234244927763939e-02, 1.684447936713692e-02, 2.074958570301533e-02, 2.425090968608856e-02, 2.63217817991972e-02, 2.800625748932362e-02, 2.882480062544346e-02, 2.836474031209946e-02, 1.245737366843969e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.419922057539225e-02, 2.011186443269253e-02, 2.401664108037945e-02, 2.815564535558218e-02, 3.04611399769783e-02, 3.203399479389191e-02, 3.595374897122383e-02, 3.785496205091476e-02, 3.169846255332232e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.082217600196595e-02, 1.930183731019484e-02, 2.545612305402756e-02, 3.003846853971481e-02, 3.412039577960968e-02, 3.62347774207592e-02, 3.884848579764366e-02, 4.020332172513008e-02, 3.018803521990776e-02, 0e+00, 0e+00, 1.184529741294682e-03, 0e+00, 4.480076895561064e-04, 2.27528773248194e-02, 3.395820781588554e-02, 3.814079239964485e-02, 4.110966622829437e-02, 4.547715932130814e-02, 4.748378694057465e-02, 4.957040026783943e-02, 5.118842795491219e-02, 5.034442991018295e-02, 1.742884144186974e-02, 2.07973662763834e-02, 3.529056534171104e-02, 3.574429452419281e-02, 3.806937485933304e-02, 4.570931941270828e-02, 4.832519218325615e-02, 4.909579083323479e-02, 5.005733668804169e-02, 5.076048150658607e-02]
-bui.disFloHea.mAct_flow[4].y=[0e+00, 2.123678661882877e-02, 2.967387810349464e-02, 3.447084873914719e-02, 3.848914057016373e-02, 3.895933926105499e-02, 3.708326444029808e-02, 3.607696667313576e-02, 3.689748793840408e-02, 3.968306258320808e-02, 4.248889163136482e-02, 4.401328414678574e-02, 4.45823036134243e-02, 4.494080692529678e-02, 4.627948254346848e-02, 4.578399285674095e-02, 4.607142508029938e-02, 4.556677117943764e-02, 4.359953105449677e-02, 3.852696344256401e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.181476749479771e-03, 1.893999613821507e-02, 2.401532605290413e-02, 2.902536094188689e-02, 3.24840247631073e-02, 3.476272895932198e-02, 3.658799827098846e-02, 3.833901509642601e-02, 3.46381850540638e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.63587499409914e-02, 2.366931363940231e-02, 2.895468845963478e-02, 3.377824276685715e-02, 3.663426265120506e-02, 3.882720693945885e-02, 3.99073027074337e-02, 3.933258727192879e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.856961287558079e-02, 2.70888302475214e-02, 3.265574946999551e-02, 3.828754276037207e-02, 4.125508666038513e-02, 4.308512061834335e-02, 4.799631610512733e-02, 5.004552379250526e-02, 2.10855770856142e-02, 7.197179365903139e-04, 0e+00, 0e+00, 0e+00, 0e+00, 2.756069786846643e-02, 3.601150959730136e-02, 4.17545847594738e-02, 4.587138816714287e-02, 4.984670877456665e-02, 5.159901827573776e-02, 5.398862063884735e-02, 5.51384910941124e-02, 5.192073062062263e-02, 1.212447229772806e-02, 3.334534121677279e-03, 1.16310641169548e-02, 1.206302084028721e-03, 3.089677542448094e-03, 3.719043359160404e-02, 4.949507489800453e-02, 5.365876480937004e-02, 5.673149973154068e-02, 6.139636412262917e-02, 6.336386501789093e-02, 6.543969362974167e-02, 6.700482219457626e-02, 6.574451178312302e-02, 5.747582390904427e-02, 5.420180037617683e-02, 5.834908783435822e-02, 5.9150580316782e-02, 5.957463011145592e-02, 6.522113084793091e-02, 6.696730852127075e-02, 6.717836856842041e-02, 6.774503737688065e-02, 6.813448667526245e-02]
-bui.disFloHea.mAct_flow[5].y=[5.434361372225671e-15, 1.483733952045441e-02, 2.093581482768059e-02, 2.441936917603016e-02, 2.7727160602808e-02, 2.753666788339615e-02, 2.394602261483669e-02, 2.140769548714161e-02, 2.138514444231987e-02, 2.251029945909977e-02, 2.872438356280327e-02, 3.066153265535831e-02, 3.116621449589729e-02, 3.157169744372368e-02, 3.271376341581345e-02, 3.251918032765388e-02, 3.284071385860443e-02, 3.257207199931145e-02, 3.094440884888172e-02, 2.705586887896061e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.788692712783813e-03, 1.394758932292461e-02, 1.717160269618034e-02, 2.038863860070705e-02, 2.305404096841812e-02, 2.482233755290508e-02, 2.616751380264759e-02, 2.752239815890789e-02, 2.505268156528473e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.209411211311817e-02, 1.688577048480506e-02, 2.076184377074242e-02, 2.426801808178425e-02, 2.628825791180134e-02, 2.794945053756237e-02, 2.884574607014656e-02, 2.842277474701405e-02, 8.376192417927086e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.425172947347164e-02, 2.019340172410011e-02, 2.418103627860542e-02, 2.813522331416601e-02, 3.045796044170856e-02, 3.190325945615768e-02, 3.592022508382797e-02, 3.781585767865181e-02, 1.899900287389755e-02, 9.87675623036921e-04, 0e+00, 0e+00, 0e+00, 0e+00, 1.077172160148615e-02, 1.9443530589342e-02, 2.542674541473389e-02, 2.991759218275547e-02, 3.403753787279129e-02, 3.606497496366501e-02, 3.863826394081116e-02, 3.999578580260277e-02, 3.753305971622467e-02, 7.375797256827354e-03, 8.693895069882274e-04, 6.447527091950178e-03, 0e+00, 0e+00, 2.45549622923134e-02, 3.563426062464714e-02, 3.933483362197876e-02, 4.212868213653564e-02, 4.629767313599586e-02, 4.811753705143929e-02, 5.010630935430527e-02, 5.15773743391037e-02, 5.0657719373703e-02, 4.270190745592117e-02, 3.758784383535385e-02, 3.938319534063339e-02, 2.406296506524086e-02, 1.668708585202694e-02, 4.468774050474167e-02, 4.809638857841492e-02, 4.849740490317345e-02, 4.93069514632225e-02, 4.998567700386047e-02]
-supChiWat.T_in=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.terUni[1].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.terUni[2].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.terUni[3].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.terUni[4].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.terUni[5].T_aChiWat_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
-bui.disFloCoo.mAct_flow[1].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-bui.disFloCoo.mAct_flow[2].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.560229629278183e-02, 9.560229629278183e-02, 9.560229629278183e-02, 9.560229629278183e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-bui.disFloCoo.mAct_flow[3].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-bui.disFloCoo.mAct_flow[4].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-bui.disFloCoo.mAct_flow[5].y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt
deleted file mode 100644
index 5ba3b6882e3..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_HotWater_Examples_HeaterAndFixtureHeatPumpWithTank.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-last-generated=2023-10-02
-statistics-simulation=
-{
-  "linear": "0",
-  "nonlinear": "12, 1",
-  "number of continuous time states": "10",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 8.64e+04]
-theMixVal.TMixSet=[3.161499938964844e+02, 3.161499938964844e+02]
-theMixVal.senTemHot.T=[3.031499938964844e+02, 3.236727905273438e+02, 3.246880798339844e+02, 3.247964172363281e+02, 3.248548889160156e+02, 3.248545837402344e+02, 3.248540344238281e+02, 3.248533630371094e+02, 3.248526000976562e+02, 3.24851806640625e+02, 3.248509521484375e+02, 3.248500671386719e+02, 3.248492736816406e+02, 3.248485107421875e+02, 3.248478088378906e+02, 3.248472900390625e+02, 3.248471374511719e+02, 3.248458251953125e+02, 3.248456726074219e+02, 3.248455200195312e+02, 3.248446044921875e+02, 3.248438110351562e+02, 3.248430480957031e+02, 3.2484228515625e+02, 3.248414916992188e+02, 3.248407287597656e+02, 3.248399658203125e+02, 3.248392028808594e+02, 3.248384094238281e+02, 3.245873107910156e+02, 3.251229858398438e+02, 3.247785949707031e+02, 3.211871337890625e+02, 3.245481567382812e+02, 3.246640625e+02, 3.246646423339844e+02, 3.246671142578125e+02, 3.249011840820312e+02, 3.252456665039062e+02, 3.252465209960938e+02, 3.252465209960938e+02, 3.252787170410156e+02, 3.252789306640625e+02, 3.252781066894531e+02, 3.252774047851562e+02, 3.252765502929688e+02, 3.252753601074219e+02, 3.252742614746094e+02, 3.252737121582031e+02, 3.252734985351562e+02, 3.252732543945312e+02, 3.252725524902344e+02, 3.252713317871094e+02, 3.252803649902344e+02, 3.252812805175781e+02, 3.252803344726562e+02, 3.254154663085938e+02, 3.254839477539062e+02, 3.255443725585938e+02, 3.256122741699219e+02, 3.256281127929688e+02, 3.256282348632812e+02, 3.256278076171875e+02, 3.25626953125e+02, 3.256283874511719e+02, 3.256276550292969e+02, 3.256275634765625e+02, 3.256256408691406e+02, 3.256336669921875e+02, 3.256452331542969e+02, 3.256450500488281e+02, 3.256456298828125e+02, 3.256458129882812e+02, 3.256448364257812e+02, 3.256440734863281e+02, 3.256449584960938e+02, 3.256458435058594e+02, 3.256450805664062e+02, 3.256442565917969e+02, 3.256433715820312e+02, 3.256425170898438e+02, 3.2564404296875e+02, 3.256431579589844e+02, 3.256421508789062e+02, 3.256418762207031e+02, 3.256454772949219e+02, 3.256451416015625e+02, 3.256444091796875e+02, 3.25645751953125e+02, 3.256473999023438e+02, 3.256669006347656e+02, 3.256665649414062e+02, 3.256666870117188e+02, 3.256661987304688e+02, 3.2566552734375e+02, 3.256730651855469e+02, 3.256736755371094e+02, 3.256734924316406e+02, 3.256729736328125e+02, 3.2567236328125e+02, 3.256716918945312e+02]
-gen.THotSouSet=[3.231499938964844e+02, 3.231499938964844e+02]
-gen.senTemHot.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.246973876953125e+02, 3.245881652832031e+02, 3.245881652832031e+02, 3.247797546386719e+02, 3.211875915527344e+02, 3.209213256835938e+02, 3.246578369140625e+02, 3.246578369140625e+02, 3.24665771484375e+02, 3.246604309082031e+02, 3.246604309082031e+02, 3.25246337890625e+02, 3.252465209960938e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252489013671875e+02, 3.252708435058594e+02, 3.252708435058594e+02, 3.252708435058594e+02, 3.252839050292969e+02, 3.254830322265625e+02, 3.255290222167969e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256122741699219e+02, 3.256272583007812e+02, 3.256272583007812e+02, 3.256272583007812e+02, 3.256269836425781e+02, 3.256269836425781e+02, 3.256269836425781e+02, 3.256269836425781e+02, 3.256455383300781e+02, 3.256455383300781e+02, 3.256455383300781e+02, 3.256441650390625e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.256446228027344e+02, 3.25642822265625e+02, 3.25642822265625e+02, 3.25642822265625e+02, 3.256416625976562e+02, 3.256416625976562e+02, 3.256416625976562e+02, 3.256416625976562e+02, 3.256444396972656e+02, 3.256471862792969e+02, 3.256471862792969e+02, 3.256471862792969e+02, 3.256664733886719e+02, 3.256664733886719e+02, 3.256664733886719e+02, 3.256662902832031e+02, 3.256662902832031e+02, 3.256662902832031e+02, 3.256662902832031e+02, 3.256675415039062e+02, 3.256675415039062e+02]
-PEle=[0e+00, 3.103510009765625e+03, -2.474682014863561e-09, 1.552031982421875e+03, 1.944002250842125e-11, 6.525877674210716e-15, 4.398963868349865e-18, 5.822399013897955e-18, 1.166643210953663e-17, 7.535764272868342e-18, 3.048205225010985e-17, 1.280367124174266e-18, 4.876936454115463e-17, 7.778041503818183e-17, 5.493829887856266e-17, 1.441374314890109e-18, 2.941320164506453e-21, -2.069310344290054e-25, 3.47378591483109e-23, -5.862849588571114e-23, -1.516877599911051e-23, -4.444972355935876e-25, 2.119356173157099e-25, 4.651089384518482e-25, 5.798669995246776e-26, 2.773663292445859e-26, 1.419189364700414e-25, 2.303862881094121e-26, 1.79945101263654e-25, 1.799028515625e+04, 4.903311037196545e-07, 3.300085546875e+04, 3.797031640625e+04, 7.786015014648438e+02, 2.24342949822921e-24, 4.540659103734817e-27, 1.446257088426935e-14, 4.91940087890625e+03, 2.388467201797084e-09, -1.048304924969661e-19, 4.003404801832859e-24, -6.344259784185624e-09, -8.486267938367931e-11, -3.732601033812344e-12, 7.824397393559925e-15, -4.323622081019163e-15, -7.394011158475742e-18, -4.151236406382457e-19, -3.576587313999392e-19, 1.310295590678498e-21, -4.412296195018552e-22, 9.065118178408998e-25, -5.504339088975896e-25, -1.394590753989178e-07, 7.333907786621907e-12, 3.619727876268521e-14, 1.865833007812413e+03, 3.951241943359298e+03, 1.760168579101562e+03, 5.50609423828125e+03, 2.844893487452538e-10, -1.324992887082694e-15, -1.041487889142246e-16, -1.106379401695934e-19, -1.35629961648066e-33, 1.694392741749711e-35, -1.517650938284789e-38, -4.203895392974451e-45, 4.925972290038855e+02, 3.461111619529183e-09, -4.751995780381609e-13, 1.992293638410931e-26, -1.216045574198428e-37, 5.061490053141239e-42, -0e+00, 2.47825390625e+03, 4.413731460317649e-07, -1.580408894030771e-11, -9.32403026315809e-13, -4.702950810904494e-13, -4.892904454539306e-15, -6.294080521911383e-03, -6.341734914983022e-10, -1.09823597698594e-12, 3.0890517578125e+03, -1.563396301307307e-09, 3.042076356443713e-12, -3.598889679920069e-15, 2.57208663970232e-03, 3.070844482421875e+03, -1.19578036361645e-08, 8.093549268284317e-12, 1.515148180148535e-24, 1.933614212272346e-27, 7.909292576847865e-28, 4.711140366708833e-10, 1.873377321326419e-11, -8.758369463707227e-14, -4.846384134526678e-15, -5.924123254978888e-23, 6.194876293692222e-30]
-theMixVal.yMixSet=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.471937119960785e-01, 4.471937119960785e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.733856439590454e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.5729418595688e-14, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt
deleted file mode 100644
index 6f3ed705dff..00000000000
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Networks_Combined_BaseClasses_Validation_Pipe.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-last-generated=2022-11-18
-statistics-initialization=
-{
-  "nonlinear": "0, 1, 0, 1",
-  "numerical Jacobians": "0"
-}
-statistics-simulation=
-{
-  "linear": " ",
-  "nonlinear": " ",
-  "numerical Jacobians": "0"
-}
-time=[0e+00, 1e+00]
-pipSta1.dh=[5.47999981790781e-03, 5.47999981790781e-03]
-pipAut1.dh=[5.476676858961582e-03, 5.476676858961582e-03]
-pipSta2.dh=[2.943000078201294e+00, 2.943000078201294e+00]
-pipAut2.dh=[2.94313907623291e+00, 2.94313907623291e+00]
-pipSta1.dp=[1.053362734375e+05, 1.053362734375e+05]
-pipAut1.dp=[1.05657125e+05, 1.05657125e+05]
-pipSta2.dp=[1.000228691101074e+01, 1.000228691101074e+01]
-pipAut2.dp=[1e+01, 1e+01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Controls_Validation_MultipleCommands.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Controls_Validation_MultipleCommands.txt
new file mode 100644
index 00000000000..b4b53de09ee
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Controls_Validation_MultipleCommands.txt
@@ -0,0 +1,14 @@
+last-generated=2024-04-04
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 2e+03]
+conCom.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conCom.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+conCom.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+conCom.y1One=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conCom.nUniOn=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+conCom.nUniOnBou=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Controls_Validation_StatusEmulator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Controls_Validation_StatusEmulator.txt
new file mode 100644
index 00000000000..e18872835f5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Controls_Validation_StatusEmulator.txt
@@ -0,0 +1,13 @@
+last-generated=2024-04-04
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "2",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+01]
+sta.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+sta.y1_actual=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+sta.fil.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.41519021987915e-01, 8.170768022537231e-01, 6.751957535743713e-01, 5.399999022483823e-01, 4.218776226043701e-01, 3.238458037376404e-01, 2.452165633440018e-01, 1.836521476507187e-01, 1.363133490085602e-01, 1.00421167910099e-01, 1.31994217634201e-01, 2.364462167024612e-01, 3.635890781879425e-01, 4.879958927631378e-01, 5.98250150680542e-01, 6.905796527862549e-01, 7.650898694992065e-01, 8.236925601959231e-01, 8.689091205596923e-01, 9.0328449010849e-01, 8.706318736076355e-01, 7.654112577438354e-01, 6.377222537994385e-01, 5.129348635673523e-01, 4.024034738540649e-01, 3.098801076412201e-01, 2.352315038442612e-01, 1.765312701463699e-01, 1.312475055456161e-01, 9.682516753673553e-02, 1.294466704130173e-01, 2.34644740819931e-01, 3.623173534870148e-01, 4.870994985103607e-01, 5.976192355155945e-01, 6.90136194229126e-01, 7.647786140441895e-01, 8.234742879867554e-01, 8.687562346458435e-01, 9.031774997711182e-01, 8.705570697784424e-01, 7.653590440750122e-01, 6.376857757568359e-01, 5.129094123840332e-01, 4.023857414722435e-01, 3.09867769479751e-01, 2.35222920775414e-01, 1.765252947807316e-01, 1.312433630228043e-01, 9.682229161262512e-02, 1.294446736574173e-01, 2.3464335501194e-01, 3.623163998126984e-01, 4.870988428592682e-01, 5.976187586784363e-01, 6.901358962059021e-01, 7.647783756256104e-01, 8.234741687774658e-01, 8.68756115436554e-01, 9.031774401664734e-01, 8.705570101737976e-01, 7.653589844703674e-01, 6.376857757568359e-01, 5.129094123840332e-01, 4.023857414722443e-01, 3.098677694797516e-01, 2.352229207754135e-01, 1.765252947807312e-01, 1.312433630228043e-01, 9.682228416204453e-02, 1.294446736574173e-01, 2.3464335501194e-01, 3.623163998126984e-01, 4.870988428592682e-01, 5.976187586784363e-01, 6.901358962059021e-01, 7.647783756256104e-01, 8.234741687774658e-01, 8.68756115436554e-01, 9.031774401664734e-01, 8.705570101737976e-01, 7.653589844703674e-01, 6.376857757568359e-01, 5.129094123840332e-01, 4.023857414722443e-01, 3.098677694797516e-01, 2.352229207754135e-01, 1.765252947807312e-01, 1.312433630228043e-01, 9.682228416204453e-02]
+sta.yLim=[5e-01, 5e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_HeatPumps_Validation_HeatPumpEquationFit.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_HeatPumps_Validation_HeatPumpEquationFit.txt
new file mode 100644
index 00000000000..def3345cdef
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_HeatPumps_Validation_HeatPumpEquationFit.txt
@@ -0,0 +1,42 @@
+last-generated=2024-04-04
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": "0, 0, 0, 0, 1",
+  "number of continuous time states": "32",
+  "numerical Jacobians": "0"
+}
+time=[1.04976e+07, 1.05056e+07]
+y1.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+y1Hea.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+weaDat.weaBus.TDryBul=[2.964500122070312e+02, 2.964202880859375e+02, 2.963903198242188e+02, 2.963601684570312e+02, 2.963298645019531e+02, 2.962994079589844e+02, 2.962688293457031e+02, 2.962382202148438e+02, 2.962075500488281e+02, 2.961768798828125e+02, 2.961462707519531e+02, 2.961156921386719e+02, 2.96085205078125e+02, 2.960548706054688e+02, 2.960246887207031e+02, 2.959946899414062e+02, 2.959649353027344e+02, 2.959354553222656e+02, 2.9590625e+02, 2.958773803710938e+02, 2.95848876953125e+02, 2.958207397460938e+02, 2.957930603027344e+02, 2.957658386230469e+02, 2.957391052246094e+02, 2.95712890625e+02, 2.956872253417969e+02, 2.956621704101562e+02, 2.956377258300781e+02, 2.956139526367188e+02, 2.955908813476562e+02, 2.955685119628906e+02, 2.955469055175781e+02, 2.955260925292969e+02, 2.95506103515625e+02, 2.954869689941406e+02, 2.954687194824219e+02, 2.95451416015625e+02, 2.954350280761719e+02, 2.954196472167969e+02, 2.954053039550781e+02, 2.953919982910156e+02, 2.953797912597656e+02, 2.953686828613281e+02, 2.953587646484375e+02, 2.953500061035156e+02, 2.953421325683594e+02, 2.953348083496094e+02, 2.953280029296875e+02, 2.953217163085938e+02, 2.953159484863281e+02, 2.953106689453125e+02, 2.953058776855469e+02, 2.953015441894531e+02, 2.952976379394531e+02, 2.952942199707031e+02, 2.952911987304688e+02, 2.952886047363281e+02, 2.95286376953125e+02, 2.952845764160156e+02, 2.952831420898438e+02, 2.952820739746094e+02, 2.952813415527344e+02, 2.952809448242188e+02, 2.952808837890625e+02, 2.952811279296875e+02, 2.952816772460938e+02, 2.952825012207031e+02, 2.952835998535156e+02, 2.952849426269531e+02, 2.952865600585938e+02, 2.952883911132812e+02, 2.952904357910156e+02, 2.952926940917969e+02, 2.952951354980469e+02, 2.952977600097656e+02, 2.953005676269531e+02, 2.953035278320312e+02, 2.953066101074219e+02, 2.953098449707031e+02, 2.953131713867188e+02, 2.953166198730469e+02, 2.953201293945312e+02, 2.9532373046875e+02, 2.95327392578125e+02, 2.953311157226562e+02, 2.953348693847656e+02, 2.953386535644531e+02, 2.953424377441406e+02, 2.953462219238281e+02, 2.953500061035156e+02, 2.953545532226562e+02, 2.953606262207031e+02, 2.953681640625e+02, 2.953770446777344e+02, 2.953872375488281e+02, 2.953986206054688e+02, 2.954111633300781e+02, 2.954247436523438e+02, 2.954393005371094e+02, 2.954547424316406e+02]
+TRet.T=[2.931499938964844e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809116821289062e+02, 2.827138061523438e+02, 2.851185913085938e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873474121094e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.8024462890625e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761901855469e+02, 3.170614624023438e+02, 3.205671997070312e+02, 3.227328186035156e+02, 3.230225830078125e+02, 3.2136474609375e+02, 3.181694641113281e+02, 3.142272033691406e+02, 3.105132446289062e+02, 3.079463500976562e+02, 3.071615295410156e+02, 3.083529663085938e+02, 3.112258911132812e+02, 3.15069580078125e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873474121094e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.802446594238281e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761596679688e+02, 2.863629760742188e+02, 2.885497131347656e+02, 2.898953857421875e+02, 2.90067138671875e+02, 2.890224304199219e+02, 2.870197448730469e+02, 2.845545349121094e+02, 2.822366027832031e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809117126464844e+02, 2.827138061523438e+02, 2.851185913085938e+02, 3.189331665039062e+02, 3.2186083984375e+02, 3.231283569335938e+02, 3.22422119140625e+02, 3.199168701171875e+02, 3.162323303222656e+02, 3.122800598144531e+02, 3.090377807617188e+02, 3.073075561523438e+02, 3.075174560546875e+02, 3.096155700683594e+02, 3.130827941894531e+02, 2.863629760742188e+02, 2.885497131347656e+02, 2.898953857421875e+02, 2.90067138671875e+02, 2.890224304199219e+02, 2.870197448730469e+02, 2.845545349121094e+02, 2.822366027832031e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809116821289062e+02, 2.827138061523438e+02, 2.851185913085938e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873168945312e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.802446594238281e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761596679688e+02, 3.170614624023438e+02, 3.205671997070312e+02, 3.227328186035156e+02, 3.230225830078125e+02, 3.2136474609375e+02, 3.181694641113281e+02, 3.142272033691406e+02, 3.105132446289062e+02]
+TSup.T=[2.931499938964844e+02, 2.803427429199219e+02, 2.801527404785156e+02, 2.801500549316406e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.810926208496094e+02, 2.8281494140625e+02, 2.837327575683594e+02, 2.83590087890625e+02, 2.824213256835938e+02, 2.805316772460938e+02, 2.801553344726562e+02, 2.801500549316406e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.111767272949219e+02, 3.223179626464844e+02, 3.230921325683594e+02, 3.231459655761719e+02, 3.231496887207031e+02, 3.231498107910156e+02, 3.231499633789062e+02, 3.231499938964844e+02, 3.222776184082031e+02, 3.210194396972656e+02, 3.21478759765625e+02, 3.229497375488281e+02, 3.231361389160156e+02, 2.875593566894531e+02, 2.889907531738281e+02, 2.9002978515625e+02, 2.898692932128906e+02, 2.885414733886719e+02, 2.863746643066406e+02, 2.803903198242188e+02, 2.801533813476562e+02, 2.801500549316406e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.802288818359375e+02, 2.819701538085938e+02, 2.833457946777344e+02, 2.837474670410156e+02, 2.830719299316406e+02, 2.814861145019531e+02, 2.801911315917969e+02, 2.801505737304688e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.199938354492188e+02, 3.229306335449219e+02, 3.231347351074219e+02, 3.231488952636719e+02, 3.231498718261719e+02, 3.2314990234375e+02, 3.231499938964844e+02, 3.230248718261719e+02, 3.214085388183594e+02, 3.209437561035156e+02, 3.22330322265625e+02, 3.230929565429688e+02, 2.906079406738281e+02, 2.881449279785156e+02, 2.896484069824219e+02, 2.901051025390625e+02, 2.893369140625e+02, 2.875329284667969e+02, 2.821788940429688e+02, 2.80178466796875e+02, 2.80150390625e+02, 2.801500244140625e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.810392456054688e+02, 2.827600402832031e+02, 2.836798400878906e+02, 2.835391845703125e+02, 2.823724975585938e+02, 2.804970703125e+02, 2.801548461914062e+02, 2.801500854492188e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.111767272949219e+02, 3.223179626464844e+02, 3.230921325683594e+02, 3.231459655761719e+02, 3.231496887207031e+02, 3.231498107910156e+02, 3.231499633789062e+02, 3.231499938964844e+02]
+hpAw.bus.TSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+hpAw.THeaWatRet_nominal=[3.151499938964844e+02, 3.151499938964844e+02]
+hpAw.TChiWatRet_nominal=[2.851499938964844e+02, 2.851499938964844e+02]
+hpAw.port_a.m_flow=[2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01]
+hpAw.mHeaWat_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+hpAw.mChiWat_flow_nominal=[2.390057373046875e+01, 2.390057373046875e+01]
+hpAw.hp.PLR=[3.862801790237427e-01, 9.248320758342743e-02, 1.93809880875051e-03, 1.500995308160782e-01, 4.792322814464569e-01, 8.770906925201416e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.722139835357666e-01, 5.754383206367493e-01, 2.186235636472702e-01, 1.729099452495575e-02, 4.758583009243011e-02, 2.972689568996429e-01, 6.742307543754578e-01, 4.44115936756134e-01, 1.874484866857529e-01, 2.91809905320406e-02, 1.056836172938347e-02, 1.366515308618546e-01, 3.747155666351318e-01, 6.639446020126343e-01, 9.323506355285645e-01, 1e+00, 1e+00, 1e+00, 8.722537159919739e-01, 5.919908881187439e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.715256929397583e-01, 2.171030640602112e-01, 1.717071235179901e-02, 4.726458340883255e-02, 2.953774333000183e-01, 6.702665686607361e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 7.695838212966919e-01, 3.814720511436462e-01, 9.131541103124619e-02, 1.913920161314309e-03, 1.483040750026703e-01, 4.738676846027374e-01, 8.680140376091003e-01, 3.096962869167328e-01, 9.340981394052505e-02, 1.186131266877055e-03, 5.714977160096169e-02, 2.466530948877335e-01, 5.206742286682129e-01, 8.099712133407593e-01, 1e+00, 1e+00, 1e+00, 9.938103556632996e-01, 7.402315139770508e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.693703770637512e-01, 3.813959062099457e-01, 9.130490571260452e-02, 1.913868472911417e-03, 1.48312583565712e-01, 4.739302694797516e-01, 8.681834936141968e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.644972085952759e-01, 5.70835292339325e-01, 2.16877743601799e-01, 1.715622842311859e-02, 4.72346656024456e-02, 2.95254647731781e-01, 6.70130729675293e-01, 4.473384618759155e-01, 1.887191832065582e-01, 2.936402894556522e-02, 1.062898989766836e-02, 1.373589634895325e-01, 3.764400482177734e-01, 6.666149497032166e-01, 9.355621337890625e-01]
+hpAw.hp.COP=[3.855911254882812e+00, 3.765768051147461e+00, 3.741452693939209e+00, 3.791316986083984e+00, 3.901784420013428e+00, 4.042954921722412e+00, 4.179367065429688e+00, 4.279999256134033e+00, 4.32415771484375e+00, 4.303699016571045e+00, 4.223483562469482e+00, 4.101130485534668e+00, 3.965426921844482e+00, 3.851535558700562e+00, 3.791903495788574e+00, 3.805106163024902e+00, 3.888369083404541e+00, 4.018719673156738e+00, 2.69718599319458e+00, 2.545557498931885e+00, 2.459955453872681e+00, 2.449547290802002e+00, 2.515149593353271e+00, 2.649962902069092e+00, 2.834804773330688e+00, 3.030953884124756e+00, 3.180360078811646e+00, 3.226307153701782e+00, 3.148895740509033e+00, 2.980265855789185e+00, 2.780696630477905e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.04672908782959e+00, 3.930779218673706e+00, 3.869130373001099e+00, 3.880440473556519e+00, 3.96190071105957e+00, 4.090414047241211e+00, 4.231660842895508e+00, 4.351269721984863e+00, 4.422911167144775e+00, 4.432118892669678e+00, 4.377309799194336e+00, 4.269803047180176e+00, 4.133172988891602e+00, 4.00035285949707e+00, 3.906673431396484e+00, 3.879101991653442e+00, 3.926051139831543e+00, 4.033791065216064e+00, 4.172181129455566e+00, 2.595913648605347e+00, 2.47684907913208e+00, 2.429303646087646e+00, 2.45784330368042e+00, 2.559810161590576e+00, 2.723207235336304e+00, 2.920002698898315e+00, 3.100940465927124e+00, 3.204751253128052e+00, 3.189046621322632e+00, 3.060587644577026e+00, 2.870043516159058e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.136658191680908e+00, 4.002727031707764e+00, 3.90798807144165e+00, 3.879407644271851e+00, 3.925390005111694e+00, 4.032198905944824e+00, 4.169692993164062e+00, 4.302241802215576e+00, 4.398781776428223e+00, 4.438654899597168e+00, 4.413759231567383e+00, 4.328968524932861e+00, 4.20190954208374e+00, 4.061423778533936e+00, 3.942800760269165e+00, 3.878642559051514e+00, 3.887608528137207e+00, 3.96677041053772e+00, 4.092916488647461e+00, 2.680455923080444e+00, 2.53066611289978e+00, 2.446566104888916e+00, 2.437340259552002e+00, 2.503877401351929e+00, 2.639484405517578e+00, 2.825112104415894e+00, 3.02217960357666e+00]
+TRet1.T=[2.931499938964844e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809116821289062e+02, 2.827138061523438e+02, 2.851185913085938e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873474121094e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.8024462890625e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761901855469e+02, 3.170614624023438e+02, 3.205671997070312e+02, 3.227328186035156e+02, 3.230225830078125e+02, 3.2136474609375e+02, 3.181694641113281e+02, 3.142272033691406e+02, 3.105132446289062e+02, 3.079463500976562e+02, 3.071615295410156e+02, 3.083529663085938e+02, 3.112258911132812e+02, 3.15069580078125e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873474121094e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.802446594238281e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761596679688e+02, 2.863629760742188e+02, 2.885497131347656e+02, 2.898953857421875e+02, 2.90067138671875e+02, 2.890224304199219e+02, 2.870197448730469e+02, 2.845545349121094e+02, 2.822366027832031e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809117126464844e+02, 2.827138061523438e+02, 2.851185913085938e+02, 3.189331665039062e+02, 3.2186083984375e+02, 3.231283569335938e+02, 3.22422119140625e+02, 3.199168701171875e+02, 3.162323303222656e+02, 3.122800598144531e+02, 3.090377807617188e+02, 3.073075561523438e+02, 3.075174560546875e+02, 3.096155700683594e+02, 3.130827941894531e+02, 2.863629760742188e+02, 2.885497131347656e+02, 2.898953857421875e+02, 2.90067138671875e+02, 2.890224304199219e+02, 2.870197448730469e+02, 2.845545349121094e+02, 2.822366027832031e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809116821289062e+02, 2.827138061523438e+02, 2.851185913085938e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873168945312e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.802446594238281e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761596679688e+02, 3.170614624023438e+02, 3.205671997070312e+02, 3.227328186035156e+02, 3.230225830078125e+02, 3.2136474609375e+02, 3.181694641113281e+02, 3.142272033691406e+02, 3.105132446289062e+02]
+TSup1.T=[2.931499938964844e+02, 2.899154357910156e+02, 2.891407165527344e+02, 2.895994262695312e+02, 2.911558227539062e+02, 2.934237060546875e+02, 2.958411865234375e+02, 2.978093872070312e+02, 2.988404846191406e+02, 2.986786193847656e+02, 2.973629150390625e+02, 2.952180480957031e+02, 2.927737731933594e+02, 2.906338806152344e+02, 2.893269348144531e+02, 2.891754150390625e+02, 2.902160034179688e+02, 2.921903686523438e+02, 3.148693542480469e+02, 3.225745544433594e+02, 3.231099853515625e+02, 3.23147216796875e+02, 3.231497802734375e+02, 3.231498718261719e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.222776184082031e+02, 3.210194396972656e+02, 3.21478759765625e+02, 3.229497375488281e+02, 3.231361389160156e+02, 2.875593566894531e+02, 2.889907531738281e+02, 2.9002978515625e+02, 2.898692932128906e+02, 2.885414733886719e+02, 2.863746643066406e+02, 2.923236999511719e+02, 2.905579833984375e+02, 2.892579345703125e+02, 2.891082153320312e+02, 2.90150634765625e+02, 2.92126953125e+02, 2.945478820800781e+02, 2.968142395019531e+02, 2.983651123046875e+02, 2.988164978027344e+02, 2.980564880371094e+02, 2.962728576660156e+02, 2.939067077636719e+02, 2.915431823730469e+02, 2.897667846679688e+02, 2.890168762207031e+02, 2.894788208007812e+02, 2.910382080078125e+02, 2.933091430664062e+02, 3.209619445800781e+02, 3.229979248046875e+02, 3.23139404296875e+02, 3.231492309570312e+02, 3.2314990234375e+02, 3.231499328613281e+02, 3.231499938964844e+02, 3.230248718261719e+02, 3.214085388183594e+02, 3.209437561035156e+02, 3.22330322265625e+02, 3.230929565429688e+02, 2.906079406738281e+02, 2.881449279785156e+02, 2.896484069824219e+02, 2.901051025390625e+02, 2.893369140625e+02, 2.875329284667969e+02, 2.907199096679688e+02, 2.914962158203125e+02, 2.897648010253906e+02, 2.890163879394531e+02, 2.894791870117188e+02, 2.910393676757812e+02, 2.933110961914062e+02, 2.957323913574219e+02, 2.977044677734375e+02, 2.987394714355469e+02, 2.985814514160156e+02, 2.972696533203125e+02, 2.95128662109375e+02, 2.926882629394531e+02, 2.9055224609375e+02, 2.892491760253906e+02, 2.891014709472656e+02, 2.901458740234375e+02, 2.921242370605469e+02, 3.148515014648438e+02, 3.225733337402344e+02, 3.231098937988281e+02, 3.23147216796875e+02, 3.231497802734375e+02, 3.231498718261719e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+hpAwNrv.bus.TSet=[3.231499938964844e+02, 3.231499938964844e+02]
+hpAwNrv.THeaWatRet_nominal=[3.151499938964844e+02, 3.151499938964844e+02]
+hpAwNrv.TChiWatRet_nominal=[2.851499938964844e+02, 2.851499938964844e+02]
+hpAwNrv.port_a.m_flow=[2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01]
+hpAwNrv.mHeaWat_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+hpAwNrv.mChiWat_flow_nominal=[0e+00, 0e+00]
+hpAwNrv.hp.PLR=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.44115936756134e-01, 1.874484866857529e-01, 2.91809905320406e-02, 1.056836172938347e-02, 1.366515308618546e-01, 3.747155666351318e-01, 6.639446020126343e-01, 9.323506355285645e-01, 1e+00, 1e+00, 1e+00, 8.722537159919739e-01, 5.919908881187439e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.096962869167328e-01, 9.340981394052505e-02, 1.186131266877055e-03, 5.714977160096169e-02, 2.466530948877335e-01, 5.206742286682129e-01, 8.099712133407593e-01, 1e+00, 1e+00, 1e+00, 9.938103556632996e-01, 7.402315139770508e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.473384618759155e-01, 1.887191832065582e-01, 2.936402894556522e-02, 1.062898989766836e-02, 1.373589634895325e-01, 3.764400482177734e-01, 6.666149497032166e-01, 9.355621337890625e-01]
+hpAwNrv.hp.COP=[6.201332092285156e+00, 6.564291954040527e+00, 6.677783012390137e+00, 6.488296031951904e+00, 6.081604957580566e+00, 5.611751556396484e+00, 5.20661449432373e+00, 4.936334133148193e+00, 4.828808784484863e+00, 4.89116907119751e+00, 5.11923885345459e+00, 5.491862773895264e+00, 5.951686382293701e+00, 6.385092735290527e+00, 6.637854099273682e+00, 6.597458839416504e+00, 6.282244682312012e+00, 5.825551986694336e+00, 2.69718599319458e+00, 2.545557498931885e+00, 2.459955453872681e+00, 2.449547290802002e+00, 2.515149593353271e+00, 2.649962902069092e+00, 2.834804773330688e+00, 3.030953884124756e+00, 3.180360078811646e+00, 3.226307153701782e+00, 3.148895740509033e+00, 2.980265855789185e+00, 2.780696630477905e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.918322086334229e+00, 6.351297855377197e+00, 6.604265213012695e+00, 6.564816474914551e+00, 6.251218795776367e+00, 5.796582221984863e+00, 5.34981632232666e+00, 5.009268283843994e+00, 4.820580959320068e+00, 4.799030303955078e+00, 4.945881843566895e+00, 5.250311374664307e+00, 5.676402568817139e+00, 6.140535831451416e+00, 6.503164768218994e+00, 6.617566108703613e+00, 6.430255889892578e+00, 6.026745319366455e+00, 5.560540676116943e+00, 2.595913648605347e+00, 2.47684907913208e+00, 2.429303646087646e+00, 2.45784330368042e+00, 2.559810161590576e+00, 2.723207235336304e+00, 2.920002698898315e+00, 3.100940465927124e+00, 3.204751253128052e+00, 3.189046621322632e+00, 3.060587644577026e+00, 2.870043516159058e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.675027847290039e+00, 6.139556407928467e+00, 6.502605438232422e+00, 6.617434501647949e+00, 6.430535793304443e+00, 6.027395248413086e+00, 5.56151008605957e+00, 5.160124778747559e+00, 4.892914295196533e+00, 4.787562370300293e+00, 4.851197719573975e+00, 5.079798698425293e+00, 5.452501773834229e+00, 5.912369251251221e+00, 6.346234321594238e+00, 6.600176334381104e+00, 6.561745166778564e+00, 6.249185562133789e+00, 5.795581340789795e+00, 2.680455923080444e+00, 2.53066611289978e+00, 2.446566104888916e+00, 2.437340259552002e+00, 2.503877401351929e+00, 2.639484405517578e+00, 2.825112104415894e+00, 3.02217960357666e+00]
+TRet2.T=[2.931499938964844e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809116821289062e+02, 2.827138061523438e+02, 2.851185913085938e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873474121094e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.8024462890625e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761901855469e+02, 3.170614624023438e+02, 3.205671997070312e+02, 3.227328186035156e+02, 3.230225830078125e+02, 3.2136474609375e+02, 3.181694641113281e+02, 3.142272033691406e+02, 3.105132446289062e+02, 3.079463500976562e+02, 3.071615295410156e+02, 3.083529663085938e+02, 3.112258911132812e+02, 3.15069580078125e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873474121094e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.802446594238281e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761596679688e+02, 2.863629760742188e+02, 2.885497131347656e+02, 2.898953857421875e+02, 2.90067138671875e+02, 2.890224304199219e+02, 2.870197448730469e+02, 2.845545349121094e+02, 2.822366027832031e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809117126464844e+02, 2.827138061523438e+02, 2.851185913085938e+02, 3.189331665039062e+02, 3.2186083984375e+02, 3.231283569335938e+02, 3.22422119140625e+02, 3.199168701171875e+02, 3.162323303222656e+02, 3.122800598144531e+02, 3.090377807617188e+02, 3.073075561523438e+02, 3.075174560546875e+02, 3.096155700683594e+02, 3.130827941894531e+02, 2.863629760742188e+02, 2.885497131347656e+02, 2.898953857421875e+02, 2.90067138671875e+02, 2.890224304199219e+02, 2.870197448730469e+02, 2.845545349121094e+02, 2.822366027832031e+02, 2.80639404296875e+02, 2.801580810546875e+02, 2.809116821289062e+02, 2.827138061523438e+02, 2.851185913085938e+02, 2.875311584472656e+02, 2.893546447753906e+02, 2.901379699707031e+02, 2.896873168945312e+02, 2.881142272949219e+02, 2.858078002929688e+02, 2.833386535644531e+02, 2.813175964355469e+02, 2.802446594238281e+02, 2.803851928710938e+02, 2.817044982910156e+02, 2.838761596679688e+02, 3.170614624023438e+02, 3.205671997070312e+02, 3.227328186035156e+02, 3.230225830078125e+02, 3.2136474609375e+02, 3.181694641113281e+02, 3.142272033691406e+02, 3.105132446289062e+02]
+TSup2.T=[2.931499938964844e+02, 2.803427429199219e+02, 2.801527404785156e+02, 2.801500549316406e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.815380859375e+02, 2.83279541015625e+02, 2.841994018554688e+02, 2.840585327148438e+02, 2.828916015625e+02, 2.809873352050781e+02, 2.801636657714844e+02, 2.801501770019531e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.111767272949219e+02, 3.223179626464844e+02, 3.230921325683594e+02, 3.231459655761719e+02, 3.231496887207031e+02, 3.231498107910156e+02, 3.231306457519531e+02, 3.205071411132812e+02, 3.176116333007812e+02, 3.161767578125e+02, 3.166280517578125e+02, 3.188587646484375e+02, 3.222110595703125e+02, 2.8754638671875e+02, 2.889905700683594e+02, 2.9002978515625e+02, 2.898692932128906e+02, 2.885414733886719e+02, 2.863746643066406e+02, 2.803903198242188e+02, 2.801533813476562e+02, 2.801500549316406e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.805690002441406e+02, 2.824849548339844e+02, 2.838635864257812e+02, 2.842657775878906e+02, 2.835906677246094e+02, 2.820052490234375e+02, 2.8026611328125e+02, 2.80151611328125e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.199938354492188e+02, 3.229306335449219e+02, 3.231347351074219e+02, 3.231488952636719e+02, 3.231498718261719e+02, 3.2314990234375e+02, 3.221104736328125e+02, 3.189296569824219e+02, 3.166711730957031e+02, 3.161618347167969e+02, 3.175462646484375e+02, 3.20483154296875e+02, 2.904985046386719e+02, 2.881434020996094e+02, 2.896483764648438e+02, 2.901051025390625e+02, 2.893369140625e+02, 2.875329284667969e+02, 2.821788940429688e+02, 2.80178466796875e+02, 2.80150390625e+02, 2.801500244140625e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.815380859375e+02, 2.83279541015625e+02, 2.841994018554688e+02, 2.840585327148438e+02, 2.828916015625e+02, 2.809873352050781e+02, 2.801637268066406e+02, 2.801502075195312e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.111767272949219e+02, 3.223179626464844e+02, 3.230921325683594e+02, 3.231459655761719e+02, 3.231496887207031e+02, 3.231498107910156e+02, 3.231303405761719e+02, 3.205071105957031e+02]
+hpWw.bus.TSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+hpWw.THeaWatRet_nominal=[3.151499938964844e+02, 3.151499938964844e+02]
+hpWw.TChiWatRet_nominal=[2.851499938964844e+02, 2.851499938964844e+02]
+hpWw.port_a.m_flow=[2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01]
+hpWw.mHeaWat_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+hpWw.mChiWat_flow_nominal=[2.390057373046875e+01, 2.390057373046875e+01]
+hpWw.hp.PLR=[4.220935702323914e-01, 1.014434173703194e-01, 2.12890119291842e-03, 1.64642333984375e-01, 5.237769484519958e-01, 9.543777108192444e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.29855751991272e-01, 2.404364794492722e-01, 1.907050237059593e-02, 5.248141288757324e-02, 3.269370794296265e-01, 7.382609844207764e-01, 6.960533261299133e-01, 2.944802045822144e-01, 4.590348899364471e-02, 1.662169024348259e-02, 2.145520895719528e-01, 5.86618959903717e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.224705696105957e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.29855751991272e-01, 2.404364794492722e-01, 1.907050237059593e-02, 5.248141288757324e-02, 3.269370794296265e-01, 7.382609844207764e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.470367193222046e-01, 4.220935702323914e-01, 1.014434173703194e-01, 2.12890119291842e-03, 1.64642333984375e-01, 5.237769484519958e-01, 9.543777108192444e-01, 4.820810854434967e-01, 1.457296013832092e-01, 1.852235873229802e-03, 8.91890749335289e-02, 3.841587603092194e-01, 8.08605968952179e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.470367193222046e-01, 4.220935702323914e-01, 1.014434173703194e-01, 2.12890119291842e-03, 1.64642333984375e-01, 5.237769484519958e-01, 9.543777108192444e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 6.29855751991272e-01, 2.404364794492722e-01, 1.907050237059593e-02, 5.248141288757324e-02, 3.269370794296265e-01, 7.382609844207764e-01, 6.960533261299133e-01, 2.944802045822144e-01, 4.590348899364471e-02, 1.662169024348259e-02, 2.145520895719528e-01, 5.86618959903717e-01, 1e+00, 1e+00]
+hpWw.hp.COP=[5.424679279327393e+00, 5.265516757965088e+00, 5.218083381652832e+00, 5.296144008636475e+00, 5.477180957794189e+00, 5.711257457733154e+00, 5.938259601593018e+00, 6.104629993438721e+00, 6.174032211303711e+00, 6.132027149200439e+00, 5.987303256988525e+00, 5.770982265472412e+00, 5.533046722412109e+00, 5.333347797393799e+00, 5.226124286651611e+00, 5.242031097412109e+00, 5.376451015472412e+00, 5.59132719039917e+00, 3.739283084869385e+00, 3.510941982269287e+00, 3.383062124252319e+00, 3.368608474731445e+00, 3.468781232833862e+00, 3.674164056777954e+00, 3.95704197883606e+00, 4.259342193603516e+00, 4.491457939147949e+00, 4.564064502716064e+00, 4.445431709289551e+00, 4.186460018157959e+00, 3.881620168685913e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.533046722412109e+00, 5.333347797393799e+00, 5.226124286651611e+00, 5.242031097412109e+00, 5.376451015472412e+00, 5.59132719039917e+00, 5.829302787780762e+00, 6.031776428222656e+00, 6.15289306640625e+00, 6.166955471038818e+00, 6.07106351852417e+00, 5.885337829589844e+00, 5.651054382324219e+00, 5.424679279327393e+00, 5.265516757965088e+00, 5.218083381652832e+00, 5.296144008636475e+00, 5.477180957794189e+00, 5.711257457733154e+00, 3.614042043685913e+00, 3.433281660079956e+00, 3.3613600730896e+00, 3.404656171798706e+00, 3.559482574462891e+00, 3.808710098266602e+00, 4.110795021057129e+00, 4.3904128074646e+00, 4.551654815673828e+00, 4.527210235595703e+00, 4.327860832214355e+00, 4.03385591506958e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.651054382324219e+00, 5.424679279327393e+00, 5.265516757965088e+00, 5.218083381652832e+00, 5.296144008636475e+00, 5.477180957794189e+00, 5.711257457733154e+00, 5.938259601593018e+00, 6.104629993438721e+00, 6.174032211303711e+00, 6.132027149200439e+00, 5.987303256988525e+00, 5.770982265472412e+00, 5.533046722412109e+00, 5.333347797393799e+00, 5.226124286651611e+00, 5.242031097412109e+00, 5.376451015472412e+00, 5.59132719039917e+00, 3.739283084869385e+00, 3.510941982269287e+00, 3.383062124252319e+00, 3.368608474731445e+00, 3.468781232833862e+00, 3.674164056777954e+00, 3.95704197883606e+00, 4.259342193603516e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt
index 2a6c1444045..8f6fc40ceab 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Dampers.txt
@@ -1,13 +1,13 @@
-last-generated=2023-09-27
+last-generated=2024-04-03
 statistics-initialization=
 {
-  "nonlinear": "0",
+  "nonlinear": "0, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": " ",
-  "nonlinear": "0, 0",
+  "nonlinear": "1, 0, 0",
   "number of continuous time states": "6",
   "numerical Jacobians": "0"
 }
@@ -17,8 +17,8 @@ mod.bus.y_actual=[0e+00, 5.273207789286971e-04, 3.93623998388648e-03, 1.24744912
 mod.m_flow=[4.687500165800884e-08, 5.008081771507022e-08, 7.64485292847894e-08, 2.12829306178719e-07, 1.176377281808527e-06, 1.155472000391455e-05, 1.393755665048957e-04, 1.112448284402491e-03, 3.472911426797509e-03, 5.339581519365311e-03, 8.273989893496037e-03, 1.287144888192415e-02, 1.994960568845272e-02, 3.061909414827824e-02, 4.630098119378093e-02, 6.865287572145462e-02, 9.928697347640991e-02, 1.390821784734726e-01, 1.868894696235657e-01, 2.377327978610992e-01, 2.829835116863251e-01, 3.227478861808777e-01, 3.629264533519745e-01, 4.032918214797974e-01, 4.433438181877136e-01, 4.826471507549286e-01, 5.208351612091064e-01, 5.576139688491821e-01, 5.927554368972779e-01, 6.261000037193297e-01, 6.575466394424438e-01, 6.870418190956116e-01, 7.145747542381287e-01, 7.401652932167053e-01, 7.63860821723938e-01, 7.857259511947632e-01, 8.058409690856934e-01, 8.242936134338379e-01, 8.411805033683777e-01, 8.565990328788757e-01, 8.706493973731995e-01, 8.834301233291626e-01, 8.950371742248535e-01, 9.055631756782532e-01, 9.150960445404053e-01, 9.237186908721924e-01, 9.315093159675598e-01, 9.385406970977783e-01, 9.448807835578918e-01, 9.505924582481384e-01, 9.557338953018188e-01, 9.603586196899414e-01, 9.645156860351562e-01, 9.682499170303345e-01, 9.716023802757263e-01, 9.746102690696716e-01, 9.773075580596924e-01, 9.797205328941345e-01, 9.81890857219696e-01, 9.838374853134155e-01, 9.855806231498718e-01, 9.871400594711304e-01, 9.885357618331909e-01, 9.89782452583313e-01, 9.908957481384277e-01, 9.918895959854126e-01, 9.927765130996704e-01, 9.935678243637085e-01, 9.942737221717834e-01, 9.949033856391907e-01, 9.954651594161987e-01, 9.959656596183777e-01, 9.964115023612976e-01, 9.96808648109436e-01, 9.971622824668884e-01, 9.974769949913025e-01, 9.977568984031677e-01, 9.980046153068542e-01, 9.982249140739441e-01, 9.984208345413208e-01, 9.985955953598022e-01, 9.987492561340332e-01, 9.988856315612793e-01, 9.990078210830688e-01, 9.99116063117981e-01, 9.99211311340332e-01, 9.992967844009399e-01, 9.993739724159241e-01, 9.994412064552307e-01, 9.995015263557434e-01, 9.995561242103577e-01, 9.996044635772705e-01, 9.996472001075745e-01, 9.996857643127441e-01, 9.997204542160034e-01, 9.997508525848389e-01, 9.99778151512146e-01, 9.998027682304382e-01, 9.998244047164917e-01, 9.998436570167542e-01, 9.99860942363739e-01]
 mod.m_flow_nominal=[1e+00, 1e+00]
 pre.bus.y=[0e+00, 2.000000029802322e-01, 4.000000059604645e-01, 6.000000238418579e-01, 8.00000011920929e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
-pre.bus.y_actual=[0e+00, 0e+00, 0e+00, 0e+00, 2.265240997076035e-01, 3.319839835166931e-01, 4.17055070400238e-01, 4.919662475585938e-01, 5.481975674629211e-01, 6.011870503425598e-01, 6.40691876411438e-01, 6.770857572555542e-01, 7.11178183555603e-01, 7.384111285209656e-01, 7.633197903633118e-01, 7.86928653717041e-01, 8.08451235294342e-01, 8.264709711074829e-01, 8.424299359321594e-01, 8.572483658790588e-01, 8.710386753082275e-01, 8.837535977363586e-01, 8.953604102134705e-01, 9.059340357780457e-01, 9.161989092826843e-01, 9.258739948272705e-01, 9.346705079078674e-01, 9.425155520439148e-01, 9.4943767786026e-01, 9.555110931396484e-01, 9.608255624771118e-01, 9.65471625328064e-01, 9.695340991020203e-01, 9.730890989303589e-01, 9.762039184570312e-01, 9.789366722106934e-01, 9.813379049301147e-01, 9.834508299827576e-01, 9.853127598762512e-01, 9.869557619094849e-01, 9.884074926376343e-01, 9.896917939186096e-01, 9.908292889595032e-01, 9.91837739944458e-01, 9.927327036857605e-01, 9.935275316238403e-01, 9.942339658737183e-01, 9.948621988296509e-01, 9.954212307929993e-01, 9.959188103675842e-01, 9.96362030506134e-01, 9.96756911277771e-01, 9.971088171005249e-01, 9.97422456741333e-01, 9.977021217346191e-01, 9.979508519172668e-01, 9.981693029403687e-01, 9.983589053153992e-01, 9.985233545303345e-01, 9.986650943756104e-01, 9.987868666648865e-01, 9.988913536071777e-01, 9.989879727363586e-01, 9.990065693855286e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01, 9.990000128746033e-01]
-pre.m_flow=[1.009988784790039e-02, 1.062656193971634e-02, 1.403130404651165e-02, 2.255905047059059e-02, 3.78597229719162e-02, 6.110644713044167e-02, 9.255589544773102e-02, 1.303281486034394e-01, 1.724038571119308e-01, 2.171599268913269e-01, 2.633039057254791e-01, 3.098255693912506e-01, 3.559456765651703e-01, 4.010687172412872e-01, 4.44750338792801e-01, 4.866698980331421e-01, 5.266064405441284e-01, 5.64419686794281e-01, 6.000353693962097e-01, 6.334290504455566e-01, 6.646136045455933e-01, 6.93631112575531e-01, 7.205469608306885e-01, 7.454436421394348e-01, 7.684146165847778e-01, 7.895610928535461e-01, 8.08987021446228e-01, 8.267984390258789e-01, 8.430989980697632e-01, 8.57992947101593e-01, 8.7158203125e-01, 8.839636445045471e-01, 8.952315449714661e-01, 9.054735898971558e-01, 9.147734642028809e-01, 9.232087731361389e-01, 9.308525323867798e-01, 9.377719759941101e-01, 9.440306425094604e-01, 9.496864676475525e-01, 9.547936916351318e-01, 9.594022631645203e-01, 9.6355801820755e-01, 9.673030972480774e-01, 9.706760048866272e-01, 9.737119078636169e-01, 9.764429330825806e-01, 9.788981676101685e-01, 9.811044931411743e-01, 9.830859899520874e-01, 9.848648905754089e-01, 9.864611029624939e-01, 9.878928065299988e-01, 9.891764521598816e-01, 9.903269410133362e-01, 9.913547039031982e-01, 9.922612905502319e-01, 9.930509328842163e-01, 9.937379360198975e-01, 9.943317770957947e-01, 9.948431849479675e-01, 9.952830076217651e-01, 9.956614971160889e-01, 9.959869384765625e-01, 9.962670803070068e-01, 9.965085983276367e-01, 9.967172145843506e-01, 9.968976974487305e-01, 9.970541596412659e-01, 9.971901178359985e-01, 9.973085522651672e-01, 9.974116683006287e-01, 9.975017309188843e-01, 9.975804686546326e-01, 9.976493716239929e-01, 9.977098107337952e-01, 9.977627992630005e-01, 9.978091716766357e-01, 9.978498816490173e-01, 9.978857636451721e-01, 9.979174733161926e-01, 9.979451298713684e-01, 9.979695081710815e-01, 9.979912042617798e-01, 9.980103373527527e-01, 9.980270862579346e-01, 9.980419874191284e-01, 9.980554580688477e-01, 9.980671405792236e-01, 9.980775713920593e-01, 9.980869889259338e-01, 9.980952739715576e-01, 9.98102605342865e-01, 9.981092214584351e-01, 9.981151223182678e-01, 9.981203079223633e-01, 9.981249570846558e-01, 9.981291890144348e-01, 9.981328248977661e-01, 9.981361031532288e-01, 9.981390237808228e-01]
+pre.bus.y_actual=[0e+00, 0e+00, 0e+00, 0e+00, 2.265240997076035e-01, 3.319839835166931e-01, 4.17055070400238e-01, 4.919662475585938e-01, 5.481975674629211e-01, 6.011870503425598e-01, 6.40691876411438e-01, 6.770857572555542e-01, 7.11178183555603e-01, 7.384111285209656e-01, 7.633193135261536e-01, 7.869190573692322e-01, 8.084173798561096e-01, 8.264009356498718e-01, 8.423044681549072e-01, 8.570487499237061e-01, 8.707494139671326e-01, 8.833633661270142e-01, 8.948614001274109e-01, 9.052993059158325e-01, 9.153833985328674e-01, 9.248979687690735e-01, 9.33552086353302e-01, 9.41270112991333e-01, 9.480782747268677e-01, 9.540486335754395e-01, 9.592692255973816e-01, 9.638289213180542e-01, 9.678114056587219e-01, 9.71291720867157e-01, 9.743364453315735e-01, 9.770030975341797e-01, 9.793416261672974e-01, 9.813948273658752e-01, 9.831999540328979e-01, 9.847886562347412e-01, 9.86188530921936e-01, 9.87423300743103e-01, 9.885134696960449e-01, 9.894768595695496e-01, 9.90328848361969e-01, 9.910827875137329e-01, 9.917504787445068e-01, 9.923419952392578e-01, 9.928663969039917e-01, 9.933313727378845e-01, 9.937439560890198e-01, 9.941101670265198e-01, 9.944353103637695e-01, 9.947240352630615e-01, 9.949805736541748e-01, 9.952085614204407e-01, 9.954111576080322e-01, 9.955909848213196e-01, 9.957515001296997e-01, 9.958944916725159e-01, 9.960217475891113e-01, 9.961349368095398e-01, 9.96235728263855e-01, 9.963253140449524e-01, 9.964049458503723e-01, 9.964758157730103e-01, 9.965388178825378e-01, 9.965948462486267e-01, 9.966446757316589e-01, 9.966889619827271e-01, 9.967284202575684e-01, 9.967635273933411e-01, 9.967947602272034e-01, 9.968224763870239e-01, 9.968471527099609e-01, 9.968690276145935e-01, 9.968885183334351e-01, 9.969057440757751e-01, 9.969210028648376e-01, 9.969345927238464e-01, 9.969467520713806e-01, 9.969573616981506e-01, 9.969668388366699e-01, 9.969752430915833e-01, 9.96982753276825e-01, 9.969893097877502e-01, 9.96995210647583e-01, 9.970005750656128e-01, 9.970052242279053e-01, 9.970093965530396e-01, 9.970131516456604e-01, 9.970164895057678e-01, 9.970194101333618e-01, 9.970220923423767e-01, 9.970244765281677e-01, 9.970265626907349e-01, 9.970284700393677e-01, 9.970301389694214e-01, 9.970316290855408e-01, 9.970329999923706e-01, 9.970341920852661e-01]
+pre.m_flow=[1.009988784790039e-02, 1.062656193971634e-02, 1.403130404651165e-02, 2.255905047059059e-02, 3.78597229719162e-02, 6.110644713044167e-02, 9.255589544773102e-02, 1.303281486034394e-01, 1.724038571119308e-01, 2.171599268913269e-01, 2.633039057254791e-01, 3.098255693912506e-01, 3.559456765651703e-01, 4.010687172412872e-01, 4.447495043277741e-01, 4.866525530815125e-01, 5.26540219783783e-01, 5.642657279968262e-01, 5.997530817985535e-01, 6.32978618144989e-01, 6.639573574066162e-01, 6.9273442029953e-01, 7.193785905838013e-01, 7.439758777618408e-01, 7.666234374046326e-01, 7.87426233291626e-01, 8.064917325973511e-01, 8.239293098449707e-01, 8.398460149765015e-01, 8.543490171432495e-01, 8.675429821014404e-01, 8.795278072357178e-01, 8.903995156288147e-01, 9.002482891082764e-01, 9.091595411300659e-01, 9.172125458717346e-01, 9.244820475578308e-01, 9.310364723205566e-01, 9.369405508041382e-01, 9.422531127929688e-01, 9.470293521881104e-01, 9.513197541236877e-01, 9.55170750617981e-01, 9.586248993873596e-01, 9.617209434509277e-01, 9.644941091537476e-01, 9.669766426086426e-01, 9.691977500915527e-01, 9.711838960647583e-01, 9.729591608047485e-01, 9.745453596115112e-01, 9.759620428085327e-01, 9.772269725799561e-01, 9.783560633659363e-01, 9.79363739490509e-01, 9.802627563476562e-01, 9.810647368431091e-01, 9.81778621673584e-01, 9.824178218841553e-01, 9.829886555671692e-01, 9.834977984428406e-01, 9.839516282081604e-01, 9.843564629554749e-01, 9.847168922424316e-01, 9.850378632545471e-01, 9.853236675262451e-01, 9.855780601501465e-01, 9.85804557800293e-01, 9.860062599182129e-01, 9.861857891082764e-01, 9.863457083702087e-01, 9.864880442619324e-01, 9.866145849227905e-01, 9.86727237701416e-01, 9.868273735046387e-01, 9.869164824485779e-01, 9.869956374168396e-01, 9.870656132698059e-01, 9.871278405189514e-01, 9.871830940246582e-01, 9.872323870658875e-01, 9.872756600379944e-01, 9.873141050338745e-01, 9.873485565185547e-01, 9.873790144920349e-01, 9.874058365821838e-01, 9.874298572540283e-01, 9.874515533447266e-01, 9.874705076217651e-01, 9.874874353408813e-01, 9.875028133392334e-01, 9.875164031982422e-01, 9.87528383731842e-01, 9.875392317771912e-01, 9.875490069389343e-01, 9.875575304031372e-01, 9.875652194023132e-01, 9.875721335411072e-01, 9.875782132148743e-01, 9.875835776329041e-01, 9.875884652137756e-01]
 pre.m_flow_nominal=[1e+00, 1e+00]
 two.bus.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
 two.bus.y1_actual=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt
index 5d4be6c01b9..5f6c93e96e0 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Fans.txt
@@ -1,4 +1,4 @@
-last-generated=2023-09-25
+last-generated=2024-04-03
 statistics-initialization=
 {
   "nonlinear": "0, 1, 1, 0, 1, 0",
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt
new file mode 100644
index 00000000000..7dd424a81f7
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_PumpMultipleRecord.txt
@@ -0,0 +1,18 @@
+last-generated=2024-04-04
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+V_flow_nominal[1]=[1.004433608613908e-03, 1.004433608613908e-03]
+V_flow_nominal[2]=[2.008867217227817e-03, 2.008867217227817e-03]
+datDef.per[1].pressure.V_flow[2]=[1.004433608613908e-03, 1.004433608613908e-03]
+datDef.per[2].pressure.V_flow[2]=[2.008867217227817e-03, 2.008867217227817e-03]
+datRed.per[1].pressure.V_flow[2]=[2.777777845039964e-03, 2.777777845039964e-03]
+datRed.per[2].pressure.V_flow[2]=[2.777777845039964e-03, 2.777777845039964e-03]
+datAss.per[1].pressure.V_flow[2]=[2.777777845039964e-03, 2.777777845039964e-03]
+datAss.per[2].pressure.V_flow[2]=[2.099483273923397e-03, 2.099483273923397e-03]
+datPre.per[1].pressure.V_flow[2]=[2.008867217227817e-03, 2.008867217227817e-03]
+datPre.per[2].pressure.V_flow[2]=[4.017734434455633e-03, 4.017734434455633e-03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt
new file mode 100644
index 00000000000..a831371d4cf
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Pumps.txt
@@ -0,0 +1,45 @@
+last-generated=2024-04-03
+statistics-initialization=
+{
+  "nonlinear": "2, 2, 2, 2",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": "2, 2, 2, 2",
+  "number of continuous time states": "48",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+02]
+pum1.bus.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pum2.bus.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pum1.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.522940769791732e-02, 5.456224083900452e-01, 9.219834208488464e-01, 1.168696045875549e+00, 1.318709015846252e+00, 1.404507637023926e+00, 1.451690316200256e+00, 1.476941823959351e+00, 1.490186214447021e+00, 1.497027039527893e+00, 1.5005202293396e+00, 1.502286195755005e+00, 1.503172278404236e+00, 1.50361180305481e+00, 1.503827452659607e+00, 1.503935813903809e+00, 1.503990650177002e+00, 1.504015564918518e+00, 1.504023909568787e+00, 1.504022359848022e+00, 1.504019141197205e+00, 1.504023194313049e+00, 1.504029989242554e+00, 1.504038095474243e+00, 1.504042387008667e+00, 1.504043221473694e+00, 1.504041910171509e+00, 1.504040956497192e+00, 1.50404167175293e+00, 1.504042983055115e+00, 1.5040442943573e+00, 1.50404417514801e+00, 1.504043579101562e+00, 1.504042744636536e+00, 1.504017353057861e+00, 1.503944873809814e+00, 1.432105422019958e+00, 1.238361835479736e+00, 1.127828598022461e+00, 1.068341135978699e+00, 1.035798668861389e+00, 1.018449544906616e+00, 1.009391784667969e+00, 1.004733800888062e+00, 1.002367377281189e+00, 1.001176357269287e+00, 1.000582098960876e+00, 1.000290036201477e+00, 1.000145196914673e+00, 1.000071406364441e+00, 1.000035762786865e+00, 1.000021457672119e+00, 1.000023484230042e+00, 1.000025033950806e+00, 1.000022888183594e+00, 1.000017404556274e+00, 1.000008225440979e+00, 1.000002264976501e+00, 9.999999403953552e-01, 1.000001192092896e+00, 1.000002264976501e+00, 1.000002264976501e+00, 1.000000715255737e+00, 9.999992847442627e-01, 9.99998927116394e-01, 9.999994039535522e-01, 1.000000357627869e+00]
+pum2.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.427804694591496e-07, -4.710836947197095e-05, -1.344406482530758e-04, -2.159968571504578e-04, -2.749889390543103e-04, -3.119241155218333e-04, -3.332262276671827e-04, -3.449155774433165e-04, -3.51127062458545e-04, -3.543570637702942e-04, -3.560121404007077e-04, -3.568503016140312e-04, -3.572712012100965e-04, -3.574801085051149e-04, -3.57582641299814e-04, -3.576341259758919e-04, -3.576602321118116e-04, -3.576720191631466e-04, -3.576760354917496e-04, -3.576752787921578e-04, -3.57673765392974e-04, -3.576757153496146e-04, -3.576789167709649e-04, -3.576827584765851e-04, -3.576848248485476e-04, -3.576852031983435e-04, -3.576845629140735e-04, -3.576841263566166e-04, -3.576844756025821e-04, -3.576850867830217e-04, -3.576856979634613e-04, -3.576856688596308e-04, -3.576853778213263e-04, -3.570440749172121e-04, -2.960120618809002e-04, -1.232153153978307e-04, 1.664569228887558e-01, 5.737265944480896e-01, 7.812778353691101e-01, 8.858883380889893e-01, 9.410350322723389e-01, 9.698337316513062e-01, 9.847030639648438e-01, 9.923052191734314e-01, 9.961557388305664e-01, 9.980908036231995e-01, 9.990555047988892e-01, 9.995294213294983e-01, 9.997643828392029e-01, 9.998841881752014e-01, 9.999420046806335e-01, 9.999652504920959e-01, 9.999619722366333e-01, 9.999594688415527e-01, 9.999628067016602e-01, 9.999716877937317e-01, 9.999866485595703e-01, 9.999963045120239e-01, 1.00000011920929e+00, 9.999979734420776e-01, 9.999962449073792e-01, 9.999964237213135e-01, 9.999988079071045e-01, 1.000001192092896e+00, 1.000001788139343e+00, 1.000000953674316e+00, 9.999994039535522e-01]
+datPum.m_flow_nominal=[1e+00, 1e+00]
+res.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.52288656681789e-02, 5.455752611160278e-01, 9.218489527702332e-01, 1.168480038642883e+00, 1.318434000015259e+00, 1.404195785522461e+00, 1.451357126235962e+00, 1.47659695148468e+00, 1.489835023880005e+00, 1.496672630310059e+00, 1.500164270401001e+00, 1.501929402351379e+00, 1.502815008163452e+00, 1.503254294395447e+00, 1.503469944000244e+00, 1.503578186035156e+00, 1.50363302230835e+00, 1.503657817840576e+00, 1.503666281700134e+00, 1.50366473197937e+00, 1.503661513328552e+00, 1.503665566444397e+00, 1.503672361373901e+00, 1.503680348396301e+00, 1.503684759140015e+00, 1.503685474395752e+00, 1.503684163093567e+00, 1.50368320941925e+00, 1.503684043884277e+00, 1.503685235977173e+00, 1.503686547279358e+00, 1.503686547279358e+00, 1.50368595123291e+00, 1.503685712814331e+00, 1.503721237182617e+00, 1.503821730613708e+00, 1.598562359809875e+00, 1.812088370323181e+00, 1.909106373786926e+00, 1.954229474067688e+00, 1.976833701133728e+00, 1.988283276557922e+00, 1.994094848632812e+00, 1.997038960456848e+00, 1.998523116111755e+00, 1.999267101287842e+00, 1.999637603759766e+00, 1.99981951713562e+00, 1.999909639358521e+00, 1.999955534934998e+00, 1.999977707862854e+00, 1.99998664855957e+00, 1.999985456466675e+00, 1.999984502792358e+00, 1.999985694885254e+00, 1.999989151954651e+00, 1.999994874000549e+00, 1.999998569488525e+00, 2e+00, 1.999999165534973e+00, 1.999998569488525e+00, 1.999998569488525e+00, 1.999999523162842e+00, 2.000000476837158e+00, 2.000000715255737e+00, 2.000000238418579e+00, 1.999999761581421e+00]
+res.m_flow_nominal=[2e+00, 2e+00]
+pumMul.bus.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumMul.bus.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumMul.pum[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.522940769791732e-02, 5.456224083900452e-01, 9.219834208488464e-01, 1.168696045875549e+00, 1.318709015846252e+00, 1.404507637023926e+00, 1.451690316200256e+00, 1.476941823959351e+00, 1.490186214447021e+00, 1.497027039527893e+00, 1.5005202293396e+00, 1.502286195755005e+00, 1.503172278404236e+00, 1.50361180305481e+00, 1.503827452659607e+00, 1.503935813903809e+00, 1.503990650177002e+00, 1.504015564918518e+00, 1.504023909568787e+00, 1.504022359848022e+00, 1.504019141197205e+00, 1.504023194313049e+00, 1.504029989242554e+00, 1.504038095474243e+00, 1.504042387008667e+00, 1.504043221473694e+00, 1.504041910171509e+00, 1.504040956497192e+00, 1.50404167175293e+00, 1.504042983055115e+00, 1.5040442943573e+00, 1.50404417514801e+00, 1.504043579101562e+00, 1.504042744636536e+00, 1.504017353057861e+00, 1.503944873809814e+00, 1.432105422019958e+00, 1.238361835479736e+00, 1.127828598022461e+00, 1.068341135978699e+00, 1.035798668861389e+00, 1.018449544906616e+00, 1.009391784667969e+00, 1.004733800888062e+00, 1.002367377281189e+00, 1.001176357269287e+00, 1.000582098960876e+00, 1.000290036201477e+00, 1.000145196914673e+00, 1.000071406364441e+00, 1.000035762786865e+00, 1.000021457672119e+00, 1.000023484230042e+00, 1.000025033950806e+00, 1.000022888183594e+00, 1.000017404556274e+00, 1.000008225440979e+00, 1.000002264976501e+00, 9.999999403953552e-01, 1.000001192092896e+00, 1.000002264976501e+00, 1.000002264976501e+00, 1.000000715255737e+00, 9.999992847442627e-01, 9.99998927116394e-01, 9.999994039535522e-01, 1.000000357627869e+00]
+pumMul.pum[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.427804694591496e-07, -4.710836947197095e-05, -1.344406482530758e-04, -2.159968571504578e-04, -2.749889390543103e-04, -3.119241155218333e-04, -3.332262276671827e-04, -3.449155774433165e-04, -3.51127062458545e-04, -3.543570637702942e-04, -3.560121404007077e-04, -3.568503016140312e-04, -3.572712012100965e-04, -3.574801085051149e-04, -3.57582641299814e-04, -3.576341259758919e-04, -3.576602321118116e-04, -3.576720191631466e-04, -3.576760354917496e-04, -3.576752787921578e-04, -3.57673765392974e-04, -3.576757153496146e-04, -3.576789167709649e-04, -3.576827584765851e-04, -3.576848248485476e-04, -3.576852031983435e-04, -3.576845629140735e-04, -3.576841263566166e-04, -3.576844756025821e-04, -3.576850867830217e-04, -3.576856979634613e-04, -3.576856688596308e-04, -3.576853778213263e-04, -3.570440749172121e-04, -2.960120618809002e-04, -1.232153153978307e-04, 1.664569228887558e-01, 5.737265944480896e-01, 7.812778353691101e-01, 8.858883380889893e-01, 9.410350322723389e-01, 9.698337316513062e-01, 9.847030639648438e-01, 9.923052191734314e-01, 9.961557388305664e-01, 9.980908036231995e-01, 9.990555047988892e-01, 9.995294213294983e-01, 9.997643828392029e-01, 9.998841881752014e-01, 9.999420046806335e-01, 9.999652504920959e-01, 9.999619722366333e-01, 9.999594688415527e-01, 9.999628067016602e-01, 9.999716877937317e-01, 9.999866485595703e-01, 9.999963045120239e-01, 1.00000011920929e+00, 9.999979734420776e-01, 9.999962449073792e-01, 9.999964237213135e-01, 9.999988079071045e-01, 1.000001192092896e+00, 1.000001788139343e+00, 1.000000953674316e+00, 9.999994039535522e-01]
+pumMul.m_flow_nominal[1]=[1e+00, 1e+00]
+pumMul.m_flow_nominal[2]=[1e+00, 1e+00]
+resMul.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.52288656681789e-02, 5.455752611160278e-01, 9.218489527702332e-01, 1.168480038642883e+00, 1.318434000015259e+00, 1.404195785522461e+00, 1.451357126235962e+00, 1.47659695148468e+00, 1.489835023880005e+00, 1.496672630310059e+00, 1.500164270401001e+00, 1.501929402351379e+00, 1.502815008163452e+00, 1.503254294395447e+00, 1.503469944000244e+00, 1.503578186035156e+00, 1.50363302230835e+00, 1.503657817840576e+00, 1.503666281700134e+00, 1.50366473197937e+00, 1.503661513328552e+00, 1.503665566444397e+00, 1.503672361373901e+00, 1.503680348396301e+00, 1.503684759140015e+00, 1.503685474395752e+00, 1.503684163093567e+00, 1.50368320941925e+00, 1.503684043884277e+00, 1.503685235977173e+00, 1.503686547279358e+00, 1.503686547279358e+00, 1.50368595123291e+00, 1.503685712814331e+00, 1.503721237182617e+00, 1.503821730613708e+00, 1.598562359809875e+00, 1.812088370323181e+00, 1.909106373786926e+00, 1.954229474067688e+00, 1.976833701133728e+00, 1.988283276557922e+00, 1.994094848632812e+00, 1.997038960456848e+00, 1.998523116111755e+00, 1.999267101287842e+00, 1.999637603759766e+00, 1.99981951713562e+00, 1.999909639358521e+00, 1.999955534934998e+00, 1.999977707862854e+00, 1.99998664855957e+00, 1.999985456466675e+00, 1.999984502792358e+00, 1.999985694885254e+00, 1.999989151954651e+00, 1.999994874000549e+00, 1.999998569488525e+00, 2e+00, 1.999999165534973e+00, 1.999998569488525e+00, 1.999998569488525e+00, 1.999999523162842e+00, 2.000000476837158e+00, 2.000000715255737e+00, 2.000000238418579e+00, 1.999999761581421e+00]
+resMul.m_flow_nominal=[2e+00, 2e+00]
+pumMulCst.bus.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumMulCst.bus.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumMulCst.pum[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.522940769791732e-02, 5.456224083900452e-01, 9.219834208488464e-01, 1.168696045875549e+00, 1.318709015846252e+00, 1.404507637023926e+00, 1.451690316200256e+00, 1.476941823959351e+00, 1.490186214447021e+00, 1.497027039527893e+00, 1.5005202293396e+00, 1.502286195755005e+00, 1.503172278404236e+00, 1.50361180305481e+00, 1.503827452659607e+00, 1.503935813903809e+00, 1.503990650177002e+00, 1.504015564918518e+00, 1.504023909568787e+00, 1.504022359848022e+00, 1.504019141197205e+00, 1.504023194313049e+00, 1.504029989242554e+00, 1.504038095474243e+00, 1.504042387008667e+00, 1.504043221473694e+00, 1.504041910171509e+00, 1.504040956497192e+00, 1.50404167175293e+00, 1.504042983055115e+00, 1.5040442943573e+00, 1.50404417514801e+00, 1.504043579101562e+00, 1.504042744636536e+00, 1.504017353057861e+00, 1.503944873809814e+00, 1.432105422019958e+00, 1.238361835479736e+00, 1.127828598022461e+00, 1.068341135978699e+00, 1.035798668861389e+00, 1.018449544906616e+00, 1.009391784667969e+00, 1.004733800888062e+00, 1.002367377281189e+00, 1.001176357269287e+00, 1.000582098960876e+00, 1.000290036201477e+00, 1.000145196914673e+00, 1.000071406364441e+00, 1.000035762786865e+00, 1.000021457672119e+00, 1.000023484230042e+00, 1.000025033950806e+00, 1.000022888183594e+00, 1.000017404556274e+00, 1.000008225440979e+00, 1.000002264976501e+00, 9.999999403953552e-01, 1.000001192092896e+00, 1.000002264976501e+00, 1.000002264976501e+00, 1.000000715255737e+00, 9.999992847442627e-01, 9.99998927116394e-01, 9.999994039535522e-01, 1.000000357627869e+00]
+pumMulCst.pum[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.427804694591496e-07, -4.710836947197095e-05, -1.344406482530758e-04, -2.159968571504578e-04, -2.749889390543103e-04, -3.119241155218333e-04, -3.332262276671827e-04, -3.449155774433165e-04, -3.51127062458545e-04, -3.543570637702942e-04, -3.560121404007077e-04, -3.568503016140312e-04, -3.572712012100965e-04, -3.574801085051149e-04, -3.57582641299814e-04, -3.576341259758919e-04, -3.576602321118116e-04, -3.576720191631466e-04, -3.576760354917496e-04, -3.576752787921578e-04, -3.57673765392974e-04, -3.576757153496146e-04, -3.576789167709649e-04, -3.576827584765851e-04, -3.576848248485476e-04, -3.576852031983435e-04, -3.576845629140735e-04, -3.576841263566166e-04, -3.576844756025821e-04, -3.576850867830217e-04, -3.576856979634613e-04, -3.576856688596308e-04, -3.576853778213263e-04, -3.570440749172121e-04, -2.960120618809002e-04, -1.232153153978307e-04, 1.664569228887558e-01, 5.737265944480896e-01, 7.812778353691101e-01, 8.858883380889893e-01, 9.410350322723389e-01, 9.698337316513062e-01, 9.847030639648438e-01, 9.923052191734314e-01, 9.961557388305664e-01, 9.980908036231995e-01, 9.990555047988892e-01, 9.995294213294983e-01, 9.997643828392029e-01, 9.998841881752014e-01, 9.999420046806335e-01, 9.999652504920959e-01, 9.999619722366333e-01, 9.999594688415527e-01, 9.999628067016602e-01, 9.999716877937317e-01, 9.999866485595703e-01, 9.999963045120239e-01, 1.00000011920929e+00, 9.999979734420776e-01, 9.999962449073792e-01, 9.999964237213135e-01, 9.999988079071045e-01, 1.000001192092896e+00, 1.000001788139343e+00, 1.000000953674316e+00, 9.999994039535522e-01]
+pumMulCst.m_flow_nominal[1]=[1e+00, 1e+00]
+pumMulCst.m_flow_nominal[2]=[1e+00, 1e+00]
+resMulCst.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.52288656681789e-02, 5.455752611160278e-01, 9.218489527702332e-01, 1.168480038642883e+00, 1.318434000015259e+00, 1.404195785522461e+00, 1.451357126235962e+00, 1.47659695148468e+00, 1.489835023880005e+00, 1.496672630310059e+00, 1.500164270401001e+00, 1.501929402351379e+00, 1.502815008163452e+00, 1.503254294395447e+00, 1.503469944000244e+00, 1.503578186035156e+00, 1.50363302230835e+00, 1.503657817840576e+00, 1.503666281700134e+00, 1.50366473197937e+00, 1.503661513328552e+00, 1.503665566444397e+00, 1.503672361373901e+00, 1.503680348396301e+00, 1.503684759140015e+00, 1.503685474395752e+00, 1.503684163093567e+00, 1.50368320941925e+00, 1.503684043884277e+00, 1.503685235977173e+00, 1.503686547279358e+00, 1.503686547279358e+00, 1.50368595123291e+00, 1.503685712814331e+00, 1.503721237182617e+00, 1.503821730613708e+00, 1.598562359809875e+00, 1.812088370323181e+00, 1.909106373786926e+00, 1.954229474067688e+00, 1.976833701133728e+00, 1.988283276557922e+00, 1.994094848632812e+00, 1.997038960456848e+00, 1.998523116111755e+00, 1.999267101287842e+00, 1.999637603759766e+00, 1.99981951713562e+00, 1.999909639358521e+00, 1.999955534934998e+00, 1.999977707862854e+00, 1.99998664855957e+00, 1.999985456466675e+00, 1.999984502792358e+00, 1.999985694885254e+00, 1.999989151954651e+00, 1.999994874000549e+00, 1.999998569488525e+00, 2e+00, 1.999999165534973e+00, 1.999998569488525e+00, 1.999998569488525e+00, 1.999999523162842e+00, 2.000000476837158e+00, 2.000000715255737e+00, 2.000000238418579e+00, 1.999999761581421e+00]
+resMulCst.m_flow_nominal=[2e+00, 2e+00]
+pumMulDed.bus.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumMulDed.bus.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumMulDed.pum[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.522940769791732e-02, 5.456224083900452e-01, 9.219834208488464e-01, 1.168696045875549e+00, 1.318709015846252e+00, 1.404507637023926e+00, 1.451690316200256e+00, 1.476941823959351e+00, 1.490186214447021e+00, 1.497027039527893e+00, 1.5005202293396e+00, 1.502286195755005e+00, 1.503172278404236e+00, 1.50361180305481e+00, 1.503827452659607e+00, 1.503935813903809e+00, 1.503990650177002e+00, 1.504015564918518e+00, 1.504023909568787e+00, 1.504022359848022e+00, 1.504019141197205e+00, 1.504023194313049e+00, 1.504029989242554e+00, 1.504038095474243e+00, 1.504042387008667e+00, 1.504043221473694e+00, 1.504041910171509e+00, 1.504040956497192e+00, 1.50404167175293e+00, 1.504042983055115e+00, 1.5040442943573e+00, 1.50404417514801e+00, 1.504043579101562e+00, 1.504042744636536e+00, 1.504017353057861e+00, 1.503944873809814e+00, 1.432105422019958e+00, 1.238361835479736e+00, 1.127828598022461e+00, 1.068341135978699e+00, 1.035798668861389e+00, 1.018449544906616e+00, 1.009391784667969e+00, 1.004733800888062e+00, 1.002367377281189e+00, 1.001176357269287e+00, 1.000582098960876e+00, 1.000290036201477e+00, 1.000145196914673e+00, 1.000071406364441e+00, 1.000035762786865e+00, 1.000021457672119e+00, 1.000023484230042e+00, 1.000025033950806e+00, 1.000022888183594e+00, 1.000017404556274e+00, 1.000008225440979e+00, 1.000002264976501e+00, 9.999999403953552e-01, 1.000001192092896e+00, 1.000002264976501e+00, 1.000002264976501e+00, 1.000000715255737e+00, 9.999992847442627e-01, 9.99998927116394e-01, 9.999994039535522e-01, 1.000000357627869e+00]
+pumMulDed.pum[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.427804694591496e-07, -4.710836947197095e-05, -1.344406482530758e-04, -2.159968571504578e-04, -2.749889390543103e-04, -3.119241155218333e-04, -3.332262276671827e-04, -3.449155774433165e-04, -3.51127062458545e-04, -3.543570637702942e-04, -3.560121404007077e-04, -3.568503016140312e-04, -3.572712012100965e-04, -3.574801085051149e-04, -3.57582641299814e-04, -3.576341259758919e-04, -3.576602321118116e-04, -3.576720191631466e-04, -3.576760354917496e-04, -3.576752787921578e-04, -3.57673765392974e-04, -3.576757153496146e-04, -3.576789167709649e-04, -3.576827584765851e-04, -3.576848248485476e-04, -3.576852031983435e-04, -3.576845629140735e-04, -3.576841263566166e-04, -3.576844756025821e-04, -3.576850867830217e-04, -3.576856979634613e-04, -3.576856688596308e-04, -3.576853778213263e-04, -3.570440749172121e-04, -2.960120618809002e-04, -1.232153153978307e-04, 1.664569228887558e-01, 5.737265944480896e-01, 7.812778353691101e-01, 8.858883380889893e-01, 9.410350322723389e-01, 9.698337316513062e-01, 9.847030639648438e-01, 9.923052191734314e-01, 9.961557388305664e-01, 9.980908036231995e-01, 9.990555047988892e-01, 9.995294213294983e-01, 9.997643828392029e-01, 9.998841881752014e-01, 9.999420046806335e-01, 9.999652504920959e-01, 9.999619722366333e-01, 9.999594688415527e-01, 9.999628067016602e-01, 9.999716877937317e-01, 9.999866485595703e-01, 9.999963045120239e-01, 1.00000011920929e+00, 9.999979734420776e-01, 9.999962449073792e-01, 9.999964237213135e-01, 9.999988079071045e-01, 1.000001192092896e+00, 1.000001788139343e+00, 1.000000953674316e+00, 9.999994039535522e-01]
+pumMulDed.m_flow_nominal[1]=[1e+00, 1e+00]
+pumMulDed.m_flow_nominal[2]=[1e+00, 1e+00]
+resMulDed.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.52288656681789e-02, 5.455752611160278e-01, 9.218489527702332e-01, 1.168480038642883e+00, 1.318434000015259e+00, 1.404195785522461e+00, 1.451357126235962e+00, 1.47659695148468e+00, 1.489835023880005e+00, 1.496672630310059e+00, 1.500164270401001e+00, 1.501929402351379e+00, 1.502815008163452e+00, 1.503254294395447e+00, 1.503469944000244e+00, 1.503578186035156e+00, 1.50363302230835e+00, 1.503657817840576e+00, 1.503666281700134e+00, 1.50366473197937e+00, 1.503661513328552e+00, 1.503665566444397e+00, 1.503672361373901e+00, 1.503680348396301e+00, 1.503684759140015e+00, 1.503685474395752e+00, 1.503684163093567e+00, 1.50368320941925e+00, 1.503684043884277e+00, 1.503685235977173e+00, 1.503686547279358e+00, 1.503686547279358e+00, 1.50368595123291e+00, 1.503685712814331e+00, 1.503721237182617e+00, 1.503821730613708e+00, 1.598562359809875e+00, 1.812088370323181e+00, 1.909106373786926e+00, 1.954229474067688e+00, 1.976833701133728e+00, 1.988283276557922e+00, 1.994094848632812e+00, 1.997038960456848e+00, 1.998523116111755e+00, 1.999267101287842e+00, 1.999637603759766e+00, 1.99981951713562e+00, 1.999909639358521e+00, 1.999955534934998e+00, 1.999977707862854e+00, 1.99998664855957e+00, 1.999985456466675e+00, 1.999984502792358e+00, 1.999985694885254e+00, 1.999989151954651e+00, 1.999994874000549e+00, 1.999998569488525e+00, 2e+00, 1.999999165534973e+00, 1.999998569488525e+00, 1.999998569488525e+00, 1.999999523162842e+00, 2.000000476837158e+00, 2.000000715255737e+00, 2.000000238418579e+00, 1.999999761581421e+00]
+resMulDed.m_flow_nominal=[2e+00, 2e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt
index 5b05d0e73d9..bdf0a3ecb19 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Components_Validation_Valves.txt
@@ -1,13 +1,13 @@
-last-generated=2023-09-27
+last-generated=2024-04-03
 statistics-initialization=
 {
-  "nonlinear": "0, 1",
+  "nonlinear": "0, 1, 1, 1, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": " ",
-  "nonlinear": "0, 0",
+  "nonlinear": "0, 0, 0, 0, 0, 0",
   "number of continuous time states": "10",
   "numerical Jacobians": "0"
 }
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Enabling_Validation_Enable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Enabling_Validation_Enable.txt
new file mode 100644
index 00000000000..551525f2412
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Enabling_Validation_Enable.txt
@@ -0,0 +1,16 @@
+last-generated=2024-04-01
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 7.2e+03]
+req.y=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+sch.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+TOut.y=[2.851499938964844e+02, 2.856926879882812e+02, 2.862342529296875e+02, 2.867736206054688e+02, 2.873096313476562e+02, 2.878412475585938e+02, 2.883673400878906e+02, 2.888868713378906e+02, 2.893987426757812e+02, 2.899019165039062e+02, 2.903953857421875e+02, 2.908781127929688e+02, 2.9134912109375e+02, 2.918074340820312e+02, 2.922521362304688e+02, 2.926822814941406e+02, 2.930970458984375e+02, 2.934955444335938e+02, 2.93876953125e+02, 2.942405090332031e+02, 2.9458544921875e+02, 2.949111022949219e+02, 2.95216796875e+02, 2.955018615722656e+02, 2.957657470703125e+02, 2.960079345703125e+02, 2.962278747558594e+02, 2.964251708984375e+02, 2.96599365234375e+02, 2.967501525878906e+02, 2.968772277832031e+02, 2.969802856445312e+02, 2.970591125488281e+02, 2.971135864257812e+02, 2.971435852050781e+02, 2.971490478515625e+02, 2.971299438476562e+02, 2.970863342285156e+02, 2.97018310546875e+02, 2.969259948730469e+02, 2.968095703125e+02, 2.966693115234375e+02, 2.965054626464844e+02, 2.963183898925781e+02, 2.961084594726562e+02, 2.958760986328125e+02, 2.956217956542969e+02, 2.953460693359375e+02, 2.950494689941406e+02, 2.947326049804688e+02, 2.943961486816406e+02, 2.94040771484375e+02, 2.936672058105469e+02, 2.932762145996094e+02, 2.928685913085938e+02, 2.924451599121094e+02, 2.920068054199219e+02, 2.91554443359375e+02, 2.910889587402344e+02, 2.90611328125e+02, 2.901224975585938e+02, 2.8962353515625e+02, 2.891153869628906e+02, 2.8859912109375e+02, 2.880758056640625e+02, 2.875465087890625e+02, 2.870123291015625e+02, 2.864743041992188e+02, 2.8593359375e+02, 2.853912658691406e+02, 2.848484497070312e+02, 2.843062438964844e+02, 2.837657470703125e+02, 2.832281188964844e+02, 2.826943969726562e+02, 2.821657104492188e+02, 2.816431274414062e+02, 2.811277465820312e+02, 2.806205749511719e+02, 2.801226501464844e+02, 2.796350402832031e+02, 2.791587219238281e+02, 2.786946411132812e+02, 2.782437744140625e+02, 2.778070373535156e+02, 2.773853149414062e+02, 2.769795227050781e+02, 2.765903930664062e+02, 2.762188110351562e+02, 2.758655090332031e+02, 2.755311889648438e+02, 2.75216552734375e+02, 2.749222717285156e+02, 2.746488952636719e+02, 2.743970031738281e+02, 2.741671142578125e+02, 2.739596862792969e+02, 2.737751770019531e+02, 2.736139221191406e+02, 2.734762878417969e+02, 2.73362548828125e+02]
+enaHea.TOutLck=[2.911499938964844e+02, 2.911499938964844e+02]
+enaCoo.TOutLck=[2.881499938964844e+02, 2.881499938964844e+02]
+enaHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+enaCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+enaCooSch.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt
new file mode 100644
index 00000000000..b74e7aa82d9
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_HeatPumps_Validation_AirToWater.txt
@@ -0,0 +1,54 @@
+last-generated=2024-04-01
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "36",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+ctl.chaStaHea.capReq.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.2e+01, 2.94e+02, 4.43625e+02, 6.9825e+02, 1.05e+03, 1.016400024414062e+03, 9.827999877929688e+02, 9.492000122070311e+02, 9.155999755859375e+02, 8.82e+02, 8.484000244140625e+02, 8.147999877929688e+02, 7.812000122070312e+02, 7.475999755859374e+02, 7.140000000000001e+02, 6.804000244140625e+02, 6.467999877929688e+02, 6.132000122070312e+02, 5.795999755859375e+02, 5.46e+02, 4.483500061035156e+02, 2.9925e+02, 1.113000030517578e+02, 1.029000015258789e+02, 1.89e+02, 3.013500061035156e+02, 3.885e+02, 3.811499938964844e+02, 4.872000122070312e+02, 4.4625e+02, 4.105499877929688e+02, 3.748500061035156e+02, 3.391499938964844e+02, 3.034500122070312e+02, 2.677499999999997e+02, 2.320500030517575e+02, 1.963500061035159e+02, 1.606499938964844e+02, 1.249499969482422e+02, 8.925e+01, 5.354999923706055e+01, 1.785000038146973e+01, 1.799999952316284e+00, 5.400000095367432e+00, 9e+00, 1.260000038146973e+01, 1.417500019073486e+01, 9.899999618530289e+00, 2.92499995231628e+00, 6.749999999999992e+00, 1.9125e+01, 3.420000076293945e+01, 5.197499847412109e+01, 7.244999694824219e+01, 9e+01, 1.032750015258789e+02, 1.109250030517578e+02, 1.185749969482422e+02, 1.262249984741211e+02, 1.33875e+02, 1.415249938964844e+02, 1.491750030517578e+02, 1.568249969482422e+02, 1.644750061035156e+02, 1.72125e+02, 1.797749938964844e+02, 1.874250030517578e+02, 1.950749969482422e+02, 2.027250061035156e+02, 2.10375e+02, 2.180249938964844e+02, 2.141999969482422e+02, 1.874250030517578e+02, 1.606499938964844e+02, 1.33875e+02, 1.070999984741211e+02, 8.032499694824219e+01, 5.354999923706055e+01, 2.677499961853027e+01, 0e+00]
+ctl.chaStaCoo.capReq.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.399999618530273e+00, 1.679999923706055e+01, 2.520000076293949e+01, 3.359999847412109e+01, 4.2e+01, 5.040000152587891e+01, 5.879999923706055e+01, 6.719999694824219e+01, 7.559999847412112e+01, 8.399999999999997e+01, 8.057279968261719e+01, 6.854399871826172e+01, 5.328960037231445e+01, 3.480960083007812e+01, 2.116799926757812e+01, 1.182719993591309e+01, 3.084480094909668e+01, 6.168960189819336e+01, 9.576000213623047e+01, 1.008000030517578e+02, 1.058399963378906e+02, 1.10879997253418e+02, 1.159199981689453e+02, 1.209599990844727e+02, 1.26e+02, 1.663200073242188e+02, 2.066399993896484e+02, 2.469600067138672e+02, 2.872799987792969e+02, 3.27600006103516e+02, 3.679200134277347e+02, 4.082399902343747e+02, 4.485599975585938e+02, 4.888800048828125e+02, 5.292000122070312e+02, 5.6952001953125e+02, 2.845920104980469e+02, 2.067599945068359e+02, 2.002799987792969e+02, 9.69e+02, 9.365999755859375e+02, 9.042000122070312e+02, 8.717999877929685e+02, 8.394000244140627e+02, 8.070000000000002e+02, 7.745999755859375e+02, 7.422000122070312e+02, 7.097999877929688e+02, 6.774000244140625e+02, 6.45e+02, 6.125999755859375e+02, 5.802000122070312e+02, 5.477999877929688e+02, 4.824143981933594e+02, 3.593519897460938e+02, 2.48731201171875e+02, 1.773168029785156e+02, 6.481439971923828e+01, 1.413599967956543e+01, 4.879199981689453e+01, 9.927839660644531e+01, 1.373231964111328e+02, 1.342799987792969e+02, 1.148399963378906e+02, 9.540000152587891e+01, 7.595999908447266e+01, 6.047999954223633e+01, 5.291999816894531e+01, 4.536000061035156e+01, 3.779999923706055e+01, 5.040000152587891e+01, 3.779999923706055e+01, 2.520000076293945e+01, 1.260000038146973e+01, 0e+00]
+capHea_nominal=[1.05e+03, 1.05e+03]
+capCoo_nominal=[1.05e+03, 1.05e+03]
+ctl.TOut=[2.78923828125e+02, 2.792105712890625e+02, 2.79501220703125e+02, 2.797954711914062e+02, 2.800930480957031e+02, 2.803936157226562e+02, 2.806969299316406e+02, 2.810026550292969e+02, 2.813104858398438e+02, 2.816201477050781e+02, 2.819313049316406e+02, 2.822436828613281e+02, 2.825569458007812e+02, 2.828707885742188e+02, 2.831849060058594e+02, 2.834989929199219e+02, 2.83812744140625e+02, 2.841258239746094e+02, 2.844379577636719e+02, 2.847488098144531e+02, 2.850580749511719e+02, 2.85365478515625e+02, 2.856706848144531e+02, 2.859734191894531e+02, 2.862733459472656e+02, 2.865701904296875e+02, 2.868636779785156e+02, 2.871535034179688e+02, 2.874393615722656e+02, 2.877209777832031e+02, 2.879981079101562e+02, 2.882704162597656e+02, 2.885377197265625e+02, 2.887996826171875e+02, 2.890560607910156e+02, 2.893066101074219e+02, 2.895510864257812e+02, 2.897892761230469e+02, 2.900208740234375e+02, 2.902456970214844e+02, 2.904635314941406e+02, 2.906741638183594e+02, 2.908773498535156e+02, 2.910729064941406e+02, 2.912606506347656e+02, 2.914403686523438e+02, 2.916119384765625e+02, 2.91775146484375e+02, 2.919298400878906e+02, 2.920758666992188e+02, 2.922130737304688e+02, 2.923413391113281e+02, 2.924605712890625e+02, 2.925705871582031e+02, 2.926712951660156e+02, 2.927626037597656e+02, 2.928444519042969e+02, 2.929167175292969e+02, 2.929793395996094e+02, 2.930322875976562e+02, 2.930754699707031e+02, 2.931088562011719e+02, 2.931323852539062e+02, 2.931460876464844e+02, 2.931499328613281e+02, 2.931439208984375e+02, 2.931280212402344e+02, 2.931022644042969e+02, 2.930667114257812e+02, 2.930213623046875e+02, 2.929662780761719e+02, 2.929014892578125e+02, 2.928270874023438e+02, 2.927431335449219e+02, 2.926497192382812e+02, 2.925469360351562e+02, 2.924348449707031e+02, 2.923136291503906e+02, 2.92183349609375e+02, 2.920441589355469e+02, 2.918962097167969e+02, 2.917395935058594e+02, 2.915745239257812e+02, 2.91401123046875e+02, 2.912196044921875e+02, 2.910301208496094e+02, 2.908328247070312e+02, 2.906279907226562e+02, 2.904157409667969e+02, 2.901963500976562e+02, 2.89969970703125e+02, 2.897369079589844e+02, 2.89497314453125e+02, 2.8925146484375e+02, 2.889995727539062e+02, 2.88741943359375e+02, 2.88478759765625e+02, 2.882103271484375e+02, 2.879369201660156e+02, 2.876587829589844e+02, 2.873761901855469e+02]
+ctl.TOutChiWatLck=[2.891499938964844e+02, 2.891499938964844e+02]
+ctl.TOutHeaWatLck=[2.941499938964844e+02, 2.941499938964844e+02]
+ctl.nReqPlaHeaWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.nReqPlaChiWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.enaHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.enaCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.idxStaHea.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.idxStaCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1Hp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.y1Hp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1Hp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1HeaHp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.y1HeaHp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1HeaHp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctl.y1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00]
+ctl.y1PumHeaWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumHeaWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.y1PumChiWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.nReqResHeaWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 3e+00, 4e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.nReqResChiWat=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctl.resHeaWat.TSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.216499938964844e+02, 3.221499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.221499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.171499938964844e+02, 3.111499938964844e+02, 3.081499938964844e+02, 3.051499938964844e+02, 3.041499938964844e+02, 2.991499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.221499938964844e+02, 3.191499938964844e+02, 3.161499938964844e+02, 3.131499938964844e+02, 3.101499938964844e+02, 3.071499938964844e+02, 3.041499938964844e+02, 3.011499938964844e+02, 2.991499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02]
+ctl.resChiWat.TSupSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.807900085449219e+02, 2.8175e+02, 2.827099914550781e+02, 2.836700134277344e+02, 2.843099975585938e+02, 2.855899963378906e+02, 2.862300109863281e+02, 2.871900024414062e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.865499877929688e+02, 2.841499938964844e+02, 2.841499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299926757812e+02, 2.823900146484375e+02, 2.830299987792969e+02, 2.843099975585938e+02, 2.849500122070312e+02, 2.859100036621094e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02]
+ctl.THeaWatSup_nominal=[3.231499938964844e+02, 3.231499938964844e+02]
+ctl.THeaWatSupSet_min=[2.981499938964844e+02, 2.981499938964844e+02]
+ctl.TChiWatSup_nominal=[2.801499938964844e+02, 2.801499938964844e+02]
+ctl.TChiWatSupSet_max=[2.881499938964844e+02, 2.881499938964844e+02]
+ctl.dpHeaWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.819719921875e+04, 3.63336015625e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04]
+ctl.dpChiWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.81363984375e+04, 4.627280078125e+04, 4.440919921875e+04, 4.25456015625e+04, 4.0682e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.47806015625e+04, 3.57123984375e+04, 3.664419921874969e+04, 3.850780078125e+04, 4.09926015625e+04, 4.471980078125e+04, 4.8447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.50303984375e+04, 4.316680078125e+04, 4.19243984375e+04, 4.006080078125e+04, 3.819719921875e+04, 3.63336015625e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04]
+ctl.dpHeaWatRemSet_max[1]=[5e+04, 5e+04]
+ctl.dpHeaWatRemSet_min=[3.447e+04, 3.447e+04]
+ctl.dpChiWatRemSet_max[1]=[5e+04, 5e+04]
+ctl.dpChiWatRemSet_min=[3.447e+04, 3.447e+04]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt
new file mode 100644
index 00000000000..53603a827d3
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ControlDifferentialPressure.txt
@@ -0,0 +1,24 @@
+last-generated=2024-04-01
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "3",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.4e+03]
+dpRemSet[1].y=[3e+03, 3.63e+03, 4.26e+03, 4.89e+03, 5.52e+03, 6.15e+03, 6.78e+03, 7.41e+03, 8.04e+03, 8.67e+03, 9.3e+03, 9.93e+03, 1.056e+04, 1.119e+04, 1.182e+04, 1.245e+04, 1.308e+04, 1.371e+04, 1.434e+04, 1.497e+04, 1.56e+04, 1.623e+04, 1.686e+04, 1.749e+04, 1.812e+04, 1.875e+04, 1.938e+04, 2.001e+04, 2.064e+04, 2.127e+04, 2.19e+04, 2.253e+04, 2.316e+04, 2.379e+04, 2.442e+04, 2.505e+04, 2.568e+04, 2.631e+04, 2.694e+04, 2.757e+04, 2.82e+04, 2.883e+04, 2.946e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 2.91e+04, 2.784e+04, 2.658e+04, 2.532e+04, 2.406e+04, 2.28e+04, 2.154e+04, 2.028e+04, 1.902e+04, 1.776e+04, 1.65e+04, 1.524e+04, 1.398e+04, 1.272e+04, 1.146e+04, 1.02e+04, 8.94e+03, 7.68e+03, 6.42e+03, 5.16e+03, 3.9e+03, 3.18e+03, 3.81e+03, 4.44e+03, 5.07e+03, 5.7e+03, 6.33e+03, 6.96e+03, 7.59e+03, 8.22e+03, 8.85e+03, 9.48e+03, 1.011e+04, 1.074e+04, 1.137e+04, 1.2e+04]
+dpRemSet[2].y=[1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 9.96e+03, 9.68e+03, 9.4e+03, 9.12e+03, 8.84e+03, 8.56e+03, 8.28e+03, 8e+03, 7.72e+03, 7.44e+03, 7.16e+03, 6.88e+03, 6.6e+03, 6.32e+03, 6.04e+03, 5.76e+03, 5.48e+03, 5.2e+03, 4.92e+03, 4.64e+03, 4.36e+03, 4.08e+03, 3.933333251953125e+03, 3.84e+03, 3.746666748046875e+03, 3.653333251953125e+03, 3.56e+03, 3.466666748046875e+03, 3.373333251953125e+03, 3.28e+03, 3.186666748046875e+03, 3.093333251953125e+03, 3e+03, 2.906666748046875e+03, 2.813333251953125e+03, 2.72e+03, 2.626666748046875e+03, 2.533333251953125e+03, 2.44e+03, 2.346666748046875e+03, 2.253333251953125e+03, 2.16e+03, 2.066666748046875e+03, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04, 1e+04]
+dpRem[1].y=[3e+03, 3.235306884765625e+03, 3.4774755859375e+03, 3.733248046875e+03, 4.00913037109375e+03, 4.31127880859375e+03, 4.64539306640625e+03, 5.01661669921875e+03, 5.42944873046875e+03, 5.88766455078125e+03, 6.39425048828125e+03, 6.95135205078125e+03, 7.56023681640625e+03, 8.221271484375e+03, 8.9339169921875e+03, 9.696736328125e+03, 1.0507419921875e+04, 1.13628271484375e+04, 1.22590400390625e+04, 1.31914296875e+04, 1.41547392578125e+04, 1.5143173828125e+04, 1.61505029296875e+04, 1.7170166015625e+04, 1.8195390625e+04, 1.9219302734375e+04, 2.023505859375e+04, 2.1235947265625e+04, 2.22155234375e+04, 2.31677109375e+04, 2.408690625e+04, 2.496808203125e+04, 2.5806873046875e+04, 2.6599650390625e+04, 2.7343580078125e+04, 2.8036685546875e+04, 2.8677869140625e+04, 2.926693359375e+04, 2.980459375e+04, 3.0292453125e+04, 3.0732984375e+04, 3.1129478515625e+04, 3.1485998046875e+04, 3.1717296875e+04, 3.1378740234375e+04, 3.1016212890625e+04, 3.0636021484375e+04, 3.0244771484375e+04, 2.9849267578125e+04, 2.94563828125e+04, 2.907294921875e+04, 2.87056328125e+04, 2.836081640625e+04, 2.8044498046875e+04, 2.776217578125e+04, 2.75187578125e+04, 2.73184765625e+04, 2.7164810546875e+04, 2.7060435546875e+04, 2.7007162109375e+04, 2.7005919921875e+04, 2.7056728515625e+04, 2.7158705078125e+04, 2.7310076171875e+04, 2.7508212890625e+04, 2.6849666015625e+04, 2.58702421875e+04, 2.49250625e+04, 2.400865234375e+04, 2.3115041015625e+04, 2.223785546875e+04, 2.13704453125e+04, 2.050598046875e+04, 1.9637587890625e+04, 1.8758458984375e+04, 1.7861970703125e+04, 1.6941806640625e+04, 1.5992056640625e+04, 1.50073271484375e+04, 1.3982833984375e+04, 1.29144814453125e+04, 1.17989384765625e+04, 1.0633693359375e+04, 9.4170986328125e+03, 8.14840087890625e+03, 6.82775048828125e+03, 5.99620166015625e+03, 6.46569384765625e+03, 6.889017578125e+03, 7.26976611328125e+03, 7.61227197265625e+03, 7.92153369140625e+03, 8.203126953125e+03, 8.4631083984375e+03, 8.7079111328125e+03, 8.944232421875e+03, 9.1789150390625e+03, 9.41883203125e+03, 9.6707646484375e+03, 9.94128515625e+03, 1.023664453125e+04]
+dpRem[2].y=[1e+04, 9.4783173828125e+03, 8.99275390625e+03, 8.5769287109375e+03, 8.2596328125e+03, 8.06283349609375e+03, 8.00015771484375e+03, 8.07594482421875e+03, 8.2849462890625e+03, 8.612693359375e+03, 9.0364921875e+03, 9.527001953125e+03, 1.0050259765625e+04, 1.05700380859375e+04, 1.1050349609375e+04, 1.14579375e+04, 1.176458203125e+04, 1.19490537109375e+04, 1.19985791015625e+04, 1.19097294921875e+04, 1.168865625e+04, 1.1350666015625e+04, 1.091916015625e+04, 1.04240146484375e+04, 9.89951171875e+03, 9.3819658203125e+03, 8.9072109375e+03, 8.5081181640625e+03, 8.2123173828125e+03, 8.0402900390625e+03, 8.00394677734375e+03, 8.10580322265625e+03, 8.33880859375e+03, 8.686828125e+03, 9.1257685546875e+03, 9.6252373046875e+03, 1.01506533203125e+04, 1.0665638671875e+04, 1.11345380859375e+04, 1.1524884765625e+04, 1.1809654296875e+04, 1.196912890625e+04, 1.1992267578125e+04, 1.18374677734375e+04, 1.13126787109375e+04, 1.067484765625e+04, 9.9487509765625e+03, 9.1652744140625e+03, 8.3592763671875e+03, 7.56717626953125e+03, 6.8244296875e+03, 6.1630751953125e+03, 5.609517578125e+03, 5.1826962890625e+03, 4.89277734375e+03, 4.740447265625e+03, 4.7168662109375e+03, 4.80428076171875e+03, 4.97725244140625e+03, 5.20441943359375e+03, 5.45066650390625e+03, 5.67955810546875e+03, 5.8558603515625e+03, 5.94798095703125e+03, 5.930154296875e+03, 5.9175625e+03, 5.8209228515625e+03, 5.58713037109375e+03, 5.22591015625e+03, 4.75581005859375e+03, 4.202916015625e+03, 3.599046142578125e+03, 2.979548828125e+03, 2.380853759765625e+03, 1.837950561523438e+03, 1.381966064453125e+03, 1.0380087890625e+03, 8.234312744140625e+02, 7.466281127929688e+02, 8.064547119140625e+02, 9.923068237304688e+02, 1.284854614257812e+03, 1.657380859375e+03, 2.077630859375e+03, 2.510046142578125e+03, 2.918225341796875e+03, 1.12941123046875e+04, 1.16470654296875e+04, 1.18859814453125e+04, 1.19943173828125e+04, 1.196457421875e+04, 1.1798810546875e+04, 1.15085029296875e+04, 1.11137509765625e+04, 1.06418876953125e+04, 1.01255810546875e+04, 9.600580078125e+03, 9.1032333984375e+03, 8.6679765625e+03, 8.3249443359375e+03, 8.09788720703125e+03]
+ctlDpRem.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.113913282752037e-01, 2.137344628572464e-01, 3.816674053668976e-01, 6.035614609718323e-01, 8.640528321266174e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.784464836120605e-01, 8.69473934173584e-01, 6.958358287811279e-01, 4.695484638214111e-01, 2.062801420688629e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.289072632789612e-01, 2.444354444742203e-01, 4.236703217029572e-01, 6.541982293128967e-01, 9.200582504272461e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.656882286071777e-01, 8.673937916755676e-01, 7.160192131996155e-01, 7.026480436325073e-01, 9.732052087783813e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.451331496238708e-01, 8.103867173194885e-01, 6.150580644607544e-01, 3.726771473884583e-01, 1.000420302152634e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlDpRem.y_min=[1.000000014901161e-01, 1.000000014901161e-01]
+ctlDpRem.y_max=[1e+00, 1e+00]
+y1Pum.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1Pum.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+dpLocSet[1].y=[1.5e+04, 1.815e+04, 2.13e+04, 2.445e+04, 2.76e+04, 3.075e+04, 3.39e+04, 3.705e+04, 4.02e+04, 4.335e+04, 4.65e+04, 4.965e+04, 5.28e+04, 5.595e+04, 5.91e+04, 6.225e+04, 6.54e+04, 6.855e+04, 7.17e+04, 7.485e+04, 7.8e+04, 8.115e+04, 8.43e+04, 8.745e+04, 9.06e+04, 9.375e+04, 9.69e+04, 1.0005e+05, 1.032e+05, 1.0635e+05, 1.095e+05, 1.1265e+05, 1.158e+05, 1.1895e+05, 1.221e+05, 1.2525e+05, 1.284e+05, 1.3155e+05, 1.347e+05, 1.3785e+05, 1.41e+05, 1.4415e+05, 1.473e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.5e+05, 1.455e+05, 1.392e+05, 1.329e+05, 1.266e+05, 1.203e+05, 1.14e+05, 1.077e+05, 1.014e+05, 9.51e+04, 8.88e+04, 8.25e+04, 7.62e+04, 6.99e+04, 6.36e+04, 5.73e+04, 5.1e+04, 4.47e+04, 3.84e+04, 3.21e+04, 2.58e+04, 1.95e+04, 1.59e+04, 1.905e+04, 2.22e+04, 2.535e+04, 2.85e+04, 3.165e+04, 3.48e+04, 3.795e+04, 4.11e+04, 4.425e+04, 4.74e+04, 5.055e+04, 5.37e+04, 5.685e+04, 6e+04]
+dpLocSet[2].y=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.98e+04, 4.84e+04, 4.7e+04, 4.56e+04, 4.42e+04, 4.28e+04, 4.14e+04, 4e+04, 3.86e+04, 3.72e+04, 3.58e+04, 3.44e+04, 3.3e+04, 3.16e+04, 3.02e+04, 2.88e+04, 2.74e+04, 2.6e+04, 2.46e+04, 2.32e+04, 2.18e+04, 2.04e+04, 1.9666666015625e+04, 1.92e+04, 1.8733333984375e+04, 1.8266666015625e+04, 1.78e+04, 1.7333333984375e+04, 1.6866666015625e+04, 1.64e+04, 1.59333330078125e+04, 1.54666669921875e+04, 1.5e+04, 1.45333330078125e+04, 1.40666669921875e+04, 1.36e+04, 1.31333330078125e+04, 1.26666669921875e+04, 1.22e+04, 1.17333330078125e+04, 1.12666669921875e+04, 1.08e+04, 1.03333330078125e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04]
+dpLoc.y=[5e+04, 4.73915859375e+04, 4.496376953125e+04, 4.288464453125e+04, 4.12981640625e+04, 4.031416796875e+04, 4.00007890625e+04, 4.037972265625e+04, 4.1424734375e+04, 4.306346875e+04, 4.518246484375e+04, 4.763501171875e+04, 5.025130078125e+04, 5.285019140625e+04, 5.525174609375e+04, 5.72896875e+04, 5.88229140625e+04, 5.974526953125e+04, 6.129519921875e+04, 6.59571484375e+04, 7.07736953125e+04, 7.57158671875e+04, 8.0752515625e+04, 8.58508359375e+04, 9.0976953125e+04, 9.6096515625e+04, 1.011752890625e+05, 1.06179734375e+05, 1.110776171875e+05, 1.158385546875e+05, 1.2043453125e+05, 1.248404140625e+05, 1.290343671875e+05, 1.3299825e+05, 1.3671790625e+05, 1.40183421875e+05, 1.4338934375e+05, 1.46334671875e+05, 1.4902296875e+05, 1.51462265625e+05, 1.53664921875e+05, 1.55647390625e+05, 1.57429984375e+05, 1.58586484375e+05, 1.56893703125e+05, 1.550810625e+05, 1.53180109375e+05, 1.51223859375e+05, 1.49246328125e+05, 1.4728190625e+05, 1.4536475e+05, 1.4352815625e+05, 1.41804078125e+05, 1.402225e+05, 1.38810890625e+05, 1.37593796875e+05, 1.36592375e+05, 1.35824046875e+05, 1.35302171875e+05, 1.350358125e+05, 1.3502959375e+05, 1.35283640625e+05, 1.3579353125e+05, 1.36550390625e+05, 1.375410625e+05, 1.34248328125e+05, 1.293512109375e+05, 1.246253125e+05, 1.20043265625e+05, 1.15575203125e+05, 1.1118928125e+05, 1.0685221875e+05, 1.025298984375e+05, 9.81879375e+04, 9.3792296875e+04, 8.9309859375e+04, 8.470903125e+04, 7.996028125e+04, 7.5036640625e+04, 6.9914171875e+04, 6.457240625e+04, 5.899469140625e+04, 5.316846484375e+04, 4.70854921875e+04, 4.074200390625e+04, 3.413875e+04, 5.647055859375e+04, 5.823532421875e+04, 5.942990625e+04, 5.997158984375e+04, 5.982287109375e+04, 5.899405078125e+04, 5.7542515625e+04, 5.55687578125e+04, 5.32094375e+04, 5.062790625e+04, 4.80028984375e+04, 4.709416015625e+04, 4.83538203125e+04, 4.970642578125e+04, 5.118322265625e+04]
+ctlDpLoc.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 2.087976485490799e-01, 6.486119031906128e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.284412622451782e-01, 3.369688391685486e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 1.000000014901161e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlDpLoc.y_min=[1.000000014901161e-01, 1.000000014901161e-01]
+ctlDpLoc.y_max=[1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt
new file mode 100644
index 00000000000..bb8d8fb79ba
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_ResetLocalDifferentialPressure.txt
@@ -0,0 +1,14 @@
+last-generated=2024-04-01
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "1",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.4e+03]
+dpRemSet.y=[3e+03, 3.63e+03, 4.26e+03, 4.89e+03, 5.52e+03, 6.15e+03, 6.78e+03, 7.41e+03, 8.04e+03, 8.67e+03, 9.3e+03, 9.93e+03, 1.056e+04, 1.119e+04, 1.182e+04, 1.245e+04, 1.308e+04, 1.371e+04, 1.434e+04, 1.497e+04, 1.56e+04, 1.623e+04, 1.686e+04, 1.749e+04, 1.812e+04, 1.875e+04, 1.938e+04, 2.001e+04, 2.064e+04, 2.127e+04, 2.19e+04, 2.253e+04, 2.316e+04, 2.379e+04, 2.442e+04, 2.505e+04, 2.568e+04, 2.631e+04, 2.694e+04, 2.757e+04, 2.82e+04, 2.883e+04, 2.946e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 3e+04, 2.91e+04, 2.784e+04, 2.658e+04, 2.532e+04, 2.406e+04, 2.28e+04, 2.154e+04, 2.028e+04, 1.902e+04, 1.776e+04, 1.65e+04, 1.524e+04, 1.398e+04, 1.272e+04, 1.146e+04, 1.02e+04, 8.94e+03, 7.68e+03, 6.42e+03, 5.16e+03, 3.9e+03, 3.18e+03, 3.81e+03, 4.44e+03, 5.07e+03, 5.7e+03, 6.33e+03, 6.96e+03, 7.59e+03, 8.22e+03, 8.85e+03, 9.48e+03, 1.011e+04, 1.074e+04, 1.137e+04, 1.2e+04]
+dpRem.y=[3e+03, 2.8474755859375e+03, 2.74913037109375e+03, 2.75539306640625e+03, 2.90944873046875e+03, 3.24425048828125e+03, 3.78023681640625e+03, 4.5239169921875e+03, 5.467419921875e+03, 6.5890400390625e+03, 7.85473876953125e+03, 9.2205029296875e+03, 1.0635390625e+04, 1.20450576171875e+04, 1.33955234375e+04, 1.463690625e+04, 1.57268740234375e+04, 1.6633580078125e+04, 1.7337869140625e+04, 1.783459375e+04, 1.8132984375e+04, 1.8255998046875e+04, 1.8238740234375e+04, 1.8126021484375e+04, 1.7969267578125e+04, 1.782294921875e+04, 1.774081640625e+04, 1.777217578125e+04, 1.79584765625e+04, 1.8330435546875e+04, 1.8905919921875e+04, 1.9688705078125e+04, 2.0668212890625e+04, 2.18202421875e+04, 2.310865234375e+04, 2.448785546875e+04, 2.590598046875e+04, 2.7308458984375e+04, 2.8641806640625e+04, 2.9857328125e+04, 3.091448046875e+04, 3.1783693359375e+04, 3.2448400390625e+04, 3.2816203125e+04, 3.2449017578125e+04, 3.1912271484375e+04, 3.1243126953125e+04, 3.0487912109375e+04, 2.96989140625e+04, 2.8930763671875e+04, 2.823664453125e+04, 2.766461328125e+04, 2.725427734375e+04, 2.7034044921875e+04, 2.7019166015625e+04, 2.7210669921875e+04, 2.7595298828125e+04, 2.8146421875e+04, 2.882587890625e+04, 2.958662890625e+04, 3.0376e+04, 3.1139337890625e+04, 3.1823791015625e+04, 3.2381970703125e+04, 3.277523046875e+04, 3.207634375e+04, 3.0811384765625e+04, 2.93406953125e+04, 2.7678865234375e+04, 2.585371484375e+04, 2.3904373046875e+04, 2.1878568359375e+04, 1.9829322265625e+04, 1.781128125e+04, 1.587692578125e+04, 1.407294921875e+04, 1.24370126953125e+04, 1.0995146484375e+04, 9.7599423828125e+03, 8.729681640625e+03, 7.88846044921875e+03, 7.20728173828125e+03, 6.6460712890625e+03, 6.1564462890625e+03, 5.6850693359375e+03, 5.177337890625e+03, 5.12116796875e+03, 6.28059765625e+03, 7.2689716796875e+03, 8.0614765625e+03, 8.646861328125e+03, 9.0282158203125e+03, 9.22275390625e+03, 9.260626953125e+03, 9.1828310546875e+03, 9.03837109375e+03, 8.8808701171875e+03, 8.7648505859375e+03, 8.74196484375e+03, 8.857416015625e+03, 9.146830078125e+03]
+resDpLoc.dpLocSet=[3.4475e+04, 3.715374609375e+04, 4.397917578125e+04, 5.44790625e+04, 6.79262734375e+04, 8.338965625e+04, 9.97984921875e+04, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 9.9925e+04, 9.6838609375e+04, 8.9638609375e+04, 7.88230390625e+04, 6.514069921875e+04, 4.95395234375e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.46589296875e+04, 3.81504609375e+04, 4.572047265625e+04, 5.684472265625e+04, 7.07529296875e+04, 8.648209375e+04, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 9.9668375e+04, 9.5772890625e+04, 8.78378984375e+04, 7.641175e+04, 6.2286109375e+04, 4.64389453125e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.499415625e+04, 3.92905234375e+04, 4.75863515625e+04, 5.930712890625e+04, 7.3641375e+04, 8.9596515625e+04, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 9.92541640625e+04, 9.455940625e+04, 8.59088046875e+04, 7.390090625e+04, 5.936703125e+04, 4.331416015625e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.548633984375e+04, 4.05762578125e+04, 4.957664453125e+04, 6.18643359375e+04, 7.658821875e+04, 9.2729046875e+04, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 9.8683828125e+04, 9.32016875e+04, 8.38574375e+04, 7.129865625e+04, 5.639444921875e+04, 4.0176484375e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.4475e+04, 3.6133953125e+04, 4.200444921875e+04, 5.168665625e+04, 6.450993359375e+04, 7.95863125e+04]
+resDpLoc.dpLocSet_min=[3.4475e+04, 3.4475e+04]
+resDpLoc.dpLocSet_max=[1e+05, 1e+05]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt
new file mode 100644
index 00000000000..65fdf50b689
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeadered.txt
@@ -0,0 +1,24 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1.08e+04]
+u1.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1.y[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ratFlo.y[1]=[0e+00, 2.999999932944775e-02, 5.999999865889549e-02, 9.000000357627869e-02, 1.19999997317791e-01, 1.500000059604645e-01, 1.800000071525574e-01, 2.099999934434891e-01, 2.39999994635582e-01, 2.700000107288361e-01, 3.00000011920929e-01, 3.300000131130219e-01, 3.600000143051147e-01, 3.899999856948853e-01, 4.199999868869782e-01, 4.49999988079071e-01, 4.799999892711639e-01, 5.099999904632569e-01, 5.400000214576721e-01, 5.699999928474426e-01, 6.000000238418579e-01, 6.299999952316284e-01, 6.600000262260437e-01, 6.899999976158142e-01, 7.200000286102295e-01, 7.5e-01, 7.799999713897705e-01, 8.100000023841858e-01, 8.399999737739564e-01, 8.700000047683716e-01, 8.999999761581421e-01, 9.300000071525574e-01, 9.599999785423279e-01, 9.900000095367432e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.399999976158142e-01, 8.799999952316284e-01, 8.199999928474426e-01, 7.599999904632568e-01, 6.999999880790705e-01, 6.399999856948847e-01, 5.799999833107e-01, 5.199999809265137e-01, 4.600000083446503e-01, 4.000000059604645e-01, 3.400000035762787e-01, 2.800000011920929e-01, 2.199999988079071e-01, 1.599999964237213e-01, 1.000000014901161e-01, 3.999999910593033e-02, 9.999999776482582e-03, 3.999999910593058e-02, 7.000000029802297e-02, 1.000000014901159e-01, 1.299999952316284e-01, 1.599999964237213e-01, 1.899999976158142e-01, 2.199999988079071e-01, 2.5e-01, 2.800000011920929e-01, 3.100000023841858e-01, 3.400000035762787e-01, 3.700000047683716e-01, 4.000000059604645e-01, 4.300000071525574e-01, 4.600000083446503e-01, 4.900000095367432e-01, 5.199999809265137e-01, 5.50000011920929e-01, 5.799999833106995e-01, 6.100000143051147e-01, 6.399999856948853e-01, 6.700000166893005e-01, 6.99999988079071e-01, 7.300000190734863e-01, 7.599999904632568e-01, 7.900000214576721e-01, 8.199999928474426e-01, 8.500000238418579e-01, 8.799999952316284e-01, 9.100000262260437e-01, 9.399999976158142e-01, 9.700000286102295e-01, 1e+00]
+staPumPriDed.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumPriDed.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumPriDed.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumPriNoDp.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumPriNoDp.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumPriNoDp.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumPriDp.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumPriDp.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumPriDp.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+staPumSecDp.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumSecDp.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+staPumSecDp.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt
new file mode 100644
index 00000000000..2f3dc2ee882
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Generic_Validation_StagingHeaderedDeltaP.txt
@@ -0,0 +1,11 @@
+last-generated=2024-04-01
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.4e+03]
+ratFlo.y[1]=[0e+00, 2.333333343267441e-02, 4.666666686534882e-02, 7.000000029802322e-02, 9.333333373069763e-02, 1.16666667163372e-01, 1.400000005960464e-01, 1.633333265781403e-01, 1.866666674613953e-01, 2.099999934434891e-01, 2.333333343267441e-01, 2.566666603088379e-01, 2.800000011920929e-01, 3.033333420753479e-01, 3.266666531562805e-01, 3.499999940395355e-01, 3.733333349227905e-01, 3.966666758060455e-01, 4.199999868869781e-01, 4.433333277702332e-01, 4.666666686534882e-01, 4.900000095367432e-01, 5.133333206176758e-01, 5.366666913032532e-01, 5.600000023841858e-01, 5.833333134651184e-01, 6.066666841506958e-01, 6.299999952316284e-01, 6.53333306312561e-01, 6.766666769981384e-01, 6.99999988079071e-01, 7.233333587646484e-01, 7.466666698455811e-01, 7.699999809265137e-01, 7.933333516120911e-01, 8.166666626930237e-01, 8.399999737739563e-01, 8.633333444595337e-01, 8.866666555404663e-01, 9.100000262260437e-01, 9.333333373069763e-01, 9.566666483879089e-01, 9.800000190734863e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.666666388511658e-01, 9.200000166893005e-01, 8.733333349227905e-01, 8.266666531562805e-01, 7.799999713897705e-01, 7.333333492279053e-01, 6.866666674613953e-01, 6.399999856948853e-01, 5.933333039283752e-01, 5.4666668176651e-01, 5e-01, 4.533333480358124e-01, 4.066666662693024e-01, 3.600000143051147e-01, 3.133333325386047e-01, 2.666666805744171e-01, 2.199999988079071e-01, 1.733333319425583e-01, 1.266666650772095e-01, 7.999999821186066e-02, 3.333333507180214e-02, 6.666666828095913e-03, 2.999999932944775e-02, 5.33333346247673e-02, 7.666666805744171e-02, 1.000000014901161e-01, 1.233333349227905e-01, 1.466666609048843e-01, 1.700000017881393e-01, 1.933333277702332e-01, 2.166666686534882e-01, 2.39999994635582e-01, 2.633333206176758e-01, 2.866666615009308e-01, 3.100000023841858e-01, 3.333333432674408e-01]
+enaLea.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+idxSta.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt
new file mode 100644
index 00000000000..99f3877a4de
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_EnableLeadHeadered.txt
@@ -0,0 +1,17 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "2",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 3e+03]
+u1ValIso[1].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1ValIso[2].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+enaParTwo.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+enaSerTwo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+uValIso[1].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -9.438283817643368e-19, -2.672174657109853e-19, -1.088377330276656e-21, -1.015507282344387e-21, -3.838040229006357e-24, -7.984095734406464e-26, -4.880568020363703e-27, -3.469851684305258e-27, -2.059135733432812e-27, -6.484194936708696e-28, 0e+00, 0e+00, 0e+00, 0e+00, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -5.545546625960115e-18, -2.695474111917579e-18, -4.815749802746044e-21, -4.581703733626853e-21, -4.347657664507662e-21, -4.113611595388471e-21, -3.879565122372497e-21, -3.645519053253306e-21, -3.411472984134115e-21, -3.177426915014924e-21, -2.943380643947342e-21, -2.709334574828151e-21, -2.47528850570896e-21, -2.241242234641377e-21, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+uValIso[2].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604639e-01, 2.5e-01, 1.000000014901161e-01, -9.588544277840923e-19, -3.32036605130956e-19, -1.010509766468278e-21, -9.484749565720476e-22, -7.715043475249963e-27, -1.799258643049971e-27, -5.549846244130479e-30, -9.230405555306867e-33, -1.535158170510631e-35, -2.362236644158017e-38, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.500000059604645e-01, 3.00000011920929e-01, 4.49999988079071e-01, 6.000000238418579e-01, 7.5e-01, 8.999999761581421e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 8.500000238418579e-01, 6.99999988079071e-01, 5.50000011920929e-01, 4.000000059604645e-01, 2.5e-01, 1.000000014901161e-01, -7.541860593982857e-19, -3.861283235300596e-19, -1.80705569656779e-20, -5.862428021303364e-22]
+enaParMod.y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+enaSerMod.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeedNoDpControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeedNoDpControl.txt
new file mode 100644
index 00000000000..decad7ab0dd
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Pumps_Primary_Validation_VariableSpeedNoDpControl.txt
@@ -0,0 +1,31 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 9e+02]
+ctlPumPriHdrHea.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdrHea.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdrHea.yPumHeaWatPriHdr=[0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdr.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdr.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdr.u1PumChiWatPri[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdr.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriHdr.yPumHeaWatPriHdr=[0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriHdr.yPumChiWatPriHdr=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
+ctlPumPriDedCom.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedCom.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedCom.u1Hea[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedCom.u1Hea[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedCom.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedCom.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.u1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.u1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.u1PumChiWatPri[1]=[1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSep.u1PumChiWatPri[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPumPriDedSep.yPumHeaWatPriDed[1]=[0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.yPumHeaWatPriDed[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 8.00000011920929e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPumPriDedSep.yPumChiWatPriDed[1]=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
+ctlPumPriDedSep.yPumChiWatPriDed[2]=[8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01, 8.999999761581421e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt
new file mode 100644
index 00000000000..f70a325231f
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Setpoints_Validation_PlantReset.txt
@@ -0,0 +1,23 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 2e+04]
+res.u1Ena=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+res.u1StaPro=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 9.999999999999887e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+res.nReqRes=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+res.triRes.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.599999785423279e-01, 9.599999785423279e-01, 9.399999976158142e-01, 9.200000166893005e-01, 9.200000166893005e-01, 8.999999761581421e-01, 8.799999952316284e-01, 8.799999952316284e-01, 8.600000143051147e-01, 8.399999737739563e-01, 8.399999737739563e-01, 8.199999928474426e-01, 8.00000011920929e-01, 8.00000011920929e-01, 7.799999713897705e-01, 7.599999904632568e-01, 7.599999904632568e-01, 7.400000095367432e-01, 7.200000286102295e-01, 7.200000286102295e-01, 6.99999988079071e-01, 6.800000071525574e-01, 6.800000071525574e-01, 6.600000262260437e-01, 6.399999856948853e-01, 6.399999856948853e-01, 6.200000047683716e-01, 6.000000238418579e-01, 6.000000238418579e-01, 5.799999833106995e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.400000214576721e-01, 5.199999809265137e-01, 5.199999809265137e-01, 5e-01, 4.799999892711639e-01, 4.799999892711639e-01, 4.600000083446503e-01, 4.399999976158142e-01, 4.399999976158142e-01, 4.199999868869781e-01, 4.000000059604645e-01, 4.000000059604645e-01, 4.399999976158142e-01, 4.799999892711639e-01, 4.799999892711639e-01, 5.199999809265137e-01, 5.600000023841858e-01, 5.600000023841858e-01, 6.000000238418579e-01, 6.100000143051147e-01, 6.100000143051147e-01, 6.200000047683716e-01, 6.299999952316284e-01, 6.299999952316284e-01, 6.399999856948853e-01, 6.499999761581421e-01, 6.499999761581421e-01, 6.299999952316284e-01, 6.100000143051147e-01, 6.100000143051147e-01, 5.899999737739563e-01, 5.699999928474426e-01, 5.699999928474417e-01, 5.50000011920929e-01, 5.299999713897705e-01, 5.299999713897705e-01, 5.099999904632568e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.699999988079071e-01, 4.49999988079071e-01, 4.49999988079071e-01, 4.300000071525574e-01, 4.099999964237213e-01, 4.099999964237213e-01, 3.899999856948853e-01, 3.700000047683716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+res.res.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.599999785423279e-01, 9.599999785423279e-01, 9.399999976158142e-01, 9.200000166893005e-01, 9.200000166893005e-01, 8.999999761581421e-01, 8.799999952316284e-01, 8.799999952316284e-01, 8.600000143051147e-01, 8.399999737739563e-01, 8.399999737739563e-01, 8.199999928474426e-01, 8.00000011920929e-01, 8.00000011920929e-01, 7.799999713897705e-01, 7.599999904632568e-01, 7.599999904632568e-01, 7.400000095367432e-01, 7.200000286102295e-01, 7.200000286102295e-01, 6.99999988079071e-01, 6.800000071525574e-01, 6.800000071525574e-01, 6.600000262260437e-01, 6.399999856948853e-01, 6.399999856948853e-01, 6.200000047683716e-01, 6.000000238418579e-01, 6.000000238418579e-01, 5.799999833106995e-01, 5.600000023841858e-01, 5.600000023841858e-01, 5.400000214576721e-01, 5.199999809265137e-01, 5.199999809265137e-01, 5.199999809265137e-01, 5.199999809265137e-01, 5.199999809265137e-01, 4.600000083446503e-01, 4.399999976158142e-01, 4.399999976158142e-01, 4.199999868869781e-01, 4.000000059604645e-01, 4.000000059604645e-01, 4.399999976158142e-01, 4.799999892711639e-01, 4.799999892711639e-01, 5.199999809265137e-01, 5.600000023841858e-01, 5.600000023841858e-01, 6.000000238418579e-01, 6.100000143051147e-01, 6.100000143051147e-01, 6.200000047683716e-01, 6.299999952316284e-01, 6.299999952316284e-01, 6.399999856948853e-01, 6.499999761581421e-01, 6.499999761581421e-01, 6.299999952316284e-01, 6.100000143051147e-01, 6.100000143051147e-01, 5.899999737739563e-01, 5.699999928474426e-01, 5.699999928474417e-01, 5.50000011920929e-01, 5.299999713897705e-01, 5.299999713897705e-01, 5.099999904632568e-01, 4.900000095367432e-01, 4.900000095367432e-01, 4.699999988079071e-01, 4.49999988079071e-01, 4.49999988079071e-01, 4.300000071525574e-01, 4.300000071525574e-01, 4.300000071525574e-01, 4.300000071525574e-01, 3.700000047683716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+res.resDp_max=[7.5e-01, 7.5e-01]
+res.resTSup_min=[2.5e-01, 2.5e-01]
+res.dpSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.979293359375e+04, 4.937880078125e+04, 4.937880078125e+04, 4.896466796875e+04, 4.855053515625e+04, 4.855053515625e+04, 4.81363984375e+04, 4.7722265625e+04, 4.7722265625e+04, 4.73081328125e+04, 4.6894e+04, 4.6894e+04, 4.64798671875e+04, 4.6065734375e+04, 4.6065734375e+04, 4.56516015625e+04, 4.523746484375e+04, 4.523746484375e+04, 4.523746484375e+04, 4.523746484375e+04, 4.523746484375e+04, 4.399506640625e+04, 4.358093359375e+04, 4.358093359375e+04, 4.316680078125e+04, 4.275266796875e+04, 4.275266796875e+04, 4.358093359375e+04, 4.440919921875e+04, 4.440919921875e+04, 4.523746484375e+04, 4.6065734375e+04, 4.6065734375e+04, 4.6894e+04, 4.710106640625e+04, 4.710106640625e+04, 4.73081328125e+04, 4.751519921875e+04, 4.751519921875e+04, 4.7722265625e+04, 4.792933203125e+04, 4.792933203125e+04, 4.751519921875e+04, 4.710106640625e+04, 4.710106640625e+04, 4.668693359375e+04, 4.627280078125e+04, 4.627280078124998e+04, 4.585866796875e+04, 4.544453515625e+04, 4.544453515625e+04, 4.50303984375e+04, 4.4616265625e+04, 4.4616265625e+04, 4.42021328125e+04, 4.3788e+04, 4.3788e+04, 4.33738671875e+04, 4.33738671875e+04, 4.33738671875e+04, 4.33738671875e+04, 4.213146484375e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04]
+res.dpSet[2]=[8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04, 7.93929296875e+04, 7.8178796875e+04, 7.8178796875e+04, 7.69646640625e+04, 7.575053125e+04, 7.575053125e+04, 7.45363984375e+04, 7.3322265625e+04, 7.3322265625e+04, 7.21081328125e+04, 7.0894e+04, 7.0894e+04, 6.96798671875e+04, 6.8465734375e+04, 6.8465734375e+04, 6.72516015625e+04, 6.603746875e+04, 6.603746875e+04, 6.603746875e+04, 6.603746875e+04, 6.603746875e+04, 6.239506640625e+04, 6.118093359375e+04, 6.118093359375e+04, 5.996680078125e+04, 5.875266796875e+04, 5.875266796875e+04, 6.118093359375e+04, 6.360919921875e+04, 6.360919921875e+04, 6.603746875e+04, 6.8465734375e+04, 6.8465734375e+04, 7.0894e+04, 7.15010703125e+04, 7.15010703125e+04, 7.21081328125e+04, 7.2715203125e+04, 7.2715203125e+04, 7.3322265625e+04, 7.39293359375e+04, 7.39293359375e+04, 7.2715203125e+04, 7.15010703125e+04, 7.15010703125e+04, 7.02869296875e+04, 6.9072796875e+04, 6.907279687499994e+04, 6.78586640625e+04, 6.664453125e+04, 6.664453125e+04, 6.54303984375e+04, 6.4216265625e+04, 6.4216265625e+04, 6.30021328125e+04, 6.1788e+04, 6.1788e+04, 6.05738671875e+04, 6.05738671875e+04, 6.05738671875e+04, 6.05738671875e+04, 5.693146484375e+04, 8e+04, 8e+04, 8e+04, 8e+04, 8e+04]
+res.dpSet_max[1]=[5e+04, 5e+04]
+res.dpSet_max[2]=[8e+04, 8e+04]
+res.dpSet_min=[3.447e+04, 3.447e+04]
+res.TSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.218166809082031e+02, 3.218166809082031e+02, 3.211499938964844e+02, 3.204833374023438e+02, 3.204833374023438e+02, 3.198166809082031e+02, 3.191499938964844e+02, 3.191499938964844e+02, 3.184833374023438e+02, 3.178166809082031e+02, 3.178166809082031e+02, 3.171499938964844e+02, 3.164833374023438e+02, 3.164833374023438e+02, 3.158166809082031e+02, 3.151499938964844e+02, 3.151499938964844e+02, 3.144833374023438e+02, 3.138166809082031e+02, 3.138166809082031e+02, 3.131499938964844e+02, 3.124833374023438e+02, 3.124833374023438e+02, 3.118166809082031e+02, 3.111499938964844e+02, 3.111499938964844e+02, 3.104833374023438e+02, 3.098166809082031e+02, 3.098166809082031e+02, 3.091499938964844e+02, 3.084833374023438e+02, 3.084833374023438e+02, 3.078166809082031e+02, 3.071499938964844e+02, 3.071499938964844e+02, 3.071499938964844e+02, 3.071499938964844e+02, 3.071499938964844e+02, 3.051499938964844e+02, 3.044833374023438e+02, 3.044833374023438e+02, 3.038166809082031e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.044833374023438e+02, 3.058166809082031e+02, 3.058166809082031e+02, 3.071499938964844e+02, 3.084833374023438e+02, 3.084833374023438e+02, 3.098166809082031e+02, 3.101499938964844e+02, 3.101499938964844e+02, 3.104833374023438e+02, 3.108166809082031e+02, 3.108166809082031e+02, 3.111499938964844e+02, 3.114833374023438e+02, 3.114833374023438e+02, 3.108166809082031e+02, 3.101499938964844e+02, 3.101499938964844e+02, 3.094833374023438e+02, 3.088166809082031e+02, 3.088166809082031e+02, 3.081499938964844e+02, 3.074833374023438e+02, 3.074833374023438e+02, 3.068166809082031e+02, 3.061499938964844e+02, 3.061499938964844e+02, 3.054833374023438e+02, 3.048166809082031e+02, 3.048166809082031e+02, 3.041499938964844e+02, 3.041499938964844e+02, 3.041499938964844e+02, 3.041499938964844e+02, 3.021499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+res.TSup_nominal=[3.231499938964844e+02, 3.231499938964844e+02]
+res.TSupSetLim=[2.981499938964844e+02, 2.981499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt
new file mode 100644
index 00000000000..97d4351c7e4
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentAvailability.txt
@@ -0,0 +1,14 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+04]
+u1_actual.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1Ava.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1Hea_actual.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00]
+avaHeaCoo.y1Hea=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaHeaCoo.y1Coo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+avaHea.y1Hea=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt
new file mode 100644
index 00000000000..9983f0f7b25
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EquipmentEnable.txt
@@ -0,0 +1,19 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 2.5e+01]
+u1AvaEqu.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1AvaEqu.y[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1AvaEqu.y[3]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+equEnaEqu.uSta=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+equEnaEqu.y1[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+equEnaEqu.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+equEnaEqu.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+equEnaOneTwo.uSta=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+equEnaOneTwo.y1[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+equEnaOneTwo.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+equEnaOneTwo.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt
new file mode 100644
index 00000000000..91ad50928c4
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_EventSequencing.txt
@@ -0,0 +1,23 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 4.5e+03]
+seqEveHea.u1Hea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHea.u1PumHeaWatPri_actual=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHea.u1PumHeaWatSec_actual=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHea.y1ValHeaWatInlIso=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHea.y1PumHeaWatPri=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.u1Hea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.u1Coo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.u1PumHeaWatPri_actual=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.y1ValHeaWatInlIso=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.y1ValHeaWatOutIso=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.y1ValChiWatInlIso=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.y1ValChiWatOutIso=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+seqEveHeaCoo.y1PumHeaWatPri=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt
new file mode 100644
index 00000000000..057e34f10a5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_SortRuntime.txt
@@ -0,0 +1,21 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+03]
+idxSta.y=[1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00]
+run[1].y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+run[2].y=[0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+run[3].y=[0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00]
+u1AvaEqu.y[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1AvaEqu.y[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1AvaEqu.y[3]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+sorRunTim.yIdx[1]=[1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+sorRunTim.yIdx[2]=[2e+00, 2e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+sorRunTim.yIdx[3]=[3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
+sorRunTim.yRunTimSta[1]=[0e+00, 5e+01, 1e+02, 1.5e+02, 2e+02, 2.5e+02, 3e+02, 3.02e+02, 3.02e+02, 3.02e+02, 3.02e+02, 3.02e+02, 3.02e+02, 3.02e+02, 3.410000000000001e+02, 3.91e+02, 4.41e+02, 4.910000000000001e+02, 5.41e+02, 5.91e+02, 6.41e+02, 6.91e+02, 7.41e+02, 7.91e+02, 8.41e+02, 8.91e+02, 9.41e+02, 9.63e+02, 9.63e+02, 9.63e+02, 9.63e+02, 9.63e+02, 9.63e+02, 9.92e+02, 1.042e+03, 1.092e+03, 1.142e+03, 1.192e+03, 1.242e+03, 1.292e+03, 1.342e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.343e+03, 1.382e+03, 1.432e+03, 1.482e+03, 1.532e+03, 1.582e+03, 1.632e+03, 1.682e+03, 1.732e+03, 1.782e+03, 1.832e+03, 1.882e+03, 1.932e+03, 1.982e+03, 2.032e+03, 2.082e+03, 2.132e+03, 2.182e+03, 2.232e+03, 2.282e+03, 2.332e+03, 2.382e+03, 2.432e+03, 2.482e+03, 2.532e+03, 2.582e+03, 2.632e+03, 2.664e+03, 2.664e+03, 2.664e+03, 2.664e+03, 2.703e+03, 2.753e+03, 2.803e+03, 2.853e+03, 2.903e+03, 2.953e+03, 3.003e+03, 3.053e+03, 3.103e+03]
+sorRunTim.yRunTimSta[2]=[0e+00, 0e+00, 3.9e+01, 8.9e+01, 1.39e+02, 1.89e+02, 2.39e+02, 2.890000000000001e+02, 3.01e+02, 3.01e+02, 3.01e+02, 3.01e+02, 3.01e+02, 3.5e+02, 4.000000000000001e+02, 4.5e+02, 5e+02, 5.500000000000001e+02, 6e+02, 6.02e+02, 6.02e+02, 6.02e+02, 6.21e+02, 6.71e+02, 7.21e+02, 7.71e+02, 8.21e+02, 8.71e+02, 9.210000000000002e+02, 9.71e+02, 1.021e+03, 1.071e+03, 1.121e+03, 1.171e+03, 1.221e+03, 1.271e+03, 1.321e+03, 1.323e+03, 1.323e+03, 1.323e+03, 1.323e+03, 1.323e+03, 1.323e+03, 1.372e+03, 1.422e+03, 1.472e+03, 1.522e+03, 1.572e+03, 1.622e+03, 1.672e+03, 1.722e+03, 1.772e+03, 1.822e+03, 1.872e+03, 1.922e+03, 1.972e+03, 2.022e+03, 2.072e+03, 2.122e+03, 2.172e+03, 2.222e+03, 2.272e+03, 2.322e+03, 2.372e+03, 2.422e+03, 2.472e+03, 2.522e+03, 2.524e+03, 2.524e+03, 2.524e+03, 2.524e+03, 2.524e+03, 2.524e+03, 2.524e+03, 2.563e+03, 2.613e+03, 2.663e+03, 2.705e+03, 2.705e+03, 2.705e+03, 2.705e+03, 2.705e+03, 2.705e+03, 2.714e+03, 2.764e+03, 2.814e+03, 2.864e+03, 2.886e+03, 2.886e+03, 2.886e+03, 2.886e+03, 2.886e+03, 2.886e+03, 2.915e+03, 2.965e+03, 3.015e+03, 3.065e+03, 3.067e+03, 3.067e+03, 3.067e+03, 3.067e+03]
+sorRunTim.yRunTimSta[3]=[0e+00, 0e+00, 0e+00, 2.9e+01, 7.9e+01, 1.29e+02, 1.79e+02, 2.290000000000001e+02, 2.79e+02, 3.29e+02, 3.79e+02, 4.29e+02, 4.79e+02, 5.29e+02, 5.790000000000001e+02, 6.29e+02, 6.79e+02, 7.21e+02, 7.21e+02, 7.21e+02, 7.21e+02, 7.21e+02, 7.21e+02, 7.3e+02, 7.8e+02, 8.3e+02, 8.8e+02, 9.3e+02, 9.62e+02, 9.62e+02, 9.62e+02, 9.62e+02, 1.001e+03, 1.051e+03, 1.101e+03, 1.151e+03, 1.201e+03, 1.251e+03, 1.263e+03, 1.263e+03, 1.263e+03, 1.313e+03, 1.363e+03, 1.413e+03, 1.463e+03, 1.513e+03, 1.563e+03, 1.613e+03, 1.663e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.665e+03, 1.694e+03, 1.744e+03, 1.794e+03, 1.844e+03, 1.894e+03, 1.906e+03, 1.906e+03, 1.906e+03, 1.906e+03, 1.906e+03, 1.955e+03, 2.005e+03, 2.055e+03, 2.105e+03, 2.155e+03, 2.205e+03, 2.207e+03, 2.207e+03, 2.207e+03, 2.226e+03, 2.276e+03, 2.326e+03, 2.376e+03, 2.426e+03, 2.476e+03, 2.526e+03, 2.576e+03, 2.626e+03, 2.676e+03, 2.726e+03, 2.776e+03, 2.826e+03, 2.876e+03, 2.926e+03, 2.976e+03, 2.988e+03, 2.988e+03, 2.988e+03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt
new file mode 100644
index 00000000000..77e9a3eb051
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageAvailability.txt
@@ -0,0 +1,19 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 7e+00]
+u1AvaEqu.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1AvaEqu.y[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+u1AvaEqu.y[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaEqu.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaEqu.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaEqu.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaOneTwo.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaOneTwo.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaOneTwo.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaOneTwo.y1[4]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+avaStaOneTwo.y1[5]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt
new file mode 100644
index 00000000000..be55bd2611b
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageChangeCommand.txt
@@ -0,0 +1,16 @@
+last-generated=2024-04-04
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "number of continuous time states": "7",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 2e+04]
+chaSta.capReq.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+04, 2.000000000000001e+04, 3e+04, 4e+04, 5e+04, 6e+04, 7e+04, 8e+04, 9.000000000000003e+04, 1e+05, 1.1e+05, 1.2e+05, 1.3e+05, 1.4e+05, 1.5e+05, 1.6e+05, 1.7e+05, 1.8e+05, 1.9e+05, 2e+05, 1.62e+05, 1.24e+05, 8.599999999999983e+04, 4.8e+04, 1e+04, 4.96e+04, 8.92e+04, 1.288e+05, 1.684000000000002e+05, 2.08e+05, 2.476e+05, 2.872e+05, 3.268e+05, 3.664e+05, 4.06e+05, 4.456e+05, 4.852e+05, 5.248e+05, 5.644e+05, 6.04e+05, 6.436e+05, 6.832e+05, 7.228e+05, 7.624e+05, 8.02e+05, 8.416e+05, 8.812e+05, 9.208e+05, 9.604e+05, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 9.666666875e+05, 9.333333125e+05, 9e+05, 8.666666875e+05, 8.333333125e+05, 8e+05, 7.666666875e+05, 7.333333124999997e+05, 7.000000000000003e+05, 6.666666875e+05, 6.333333125e+05, 6e+05, 5.666666875e+05, 5.333333125e+05, 5e+05, 4.6666665625e+05, 4.3333334375e+05, 4e+05, 3.6666665625e+05, 3.3333334375e+05, 2.999999999999997e+05, 2.6666665625e+05, 2.33333328125e+05, 2e+05, 1.66666671875e+05, 1.33333328125e+05, 1e+05, 6.66666640625e+04, 3.333333203125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+04, 2e+04, 3e+04, 4e+04, 5e+04]
+chaSta.capSta.y=[1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 1e+06, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05]
+chaSta.capStaLow.y=[1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 9e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 5.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 4.5e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05, 1e+05]
+capHea_nominal=[1e+06, 1e+06]
+y1UpHol.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1DowHol.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+idxSta.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt
new file mode 100644
index 00000000000..361b588b00c
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_StagingRotation_Validation_StageCompletion.txt
@@ -0,0 +1,15 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1.8e+03]
+comSta.uSta=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+comSta.u1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+comSta.u1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+comSta.u1_actual[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+comSta.u1_actual[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+y1ComSta.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+comSta.y1=[0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt
new file mode 100644
index 00000000000..5c31adb34cf
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_CountTrue.txt
@@ -0,0 +1,10 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+couTru.y=[2e+00, 2e+00]
+couTruAllFal.y=[0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt
new file mode 100644
index 00000000000..0b35071e0a5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_FirstTrueIndex.txt
@@ -0,0 +1,10 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+idxFirTru.y=[2e+00, 2e+00]
+idxFirTruAllFal.y=[0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt
new file mode 100644
index 00000000000..e42ccf4d1cf
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_HoldReal.txt
@@ -0,0 +1,12 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 6e+01]
+sin.y=[0e+00, 6.279051799650978e-02, 1.253332297099248e-01, 1.873813171500639e-01, 2.486898802193954e-01, 3.0901700258255e-01, 3.681245538827131e-01, 4.257793010655107e-01, 4.817536595666979e-01, 5.358267937881194e-01, 5.877852439880371e-01, 6.374239998118086e-01, 6.845471407669889e-01, 7.289686065362692e-01, 7.705132617918607e-01, 8.0901700258255e-01, 8.443279050196675e-01, 8.763066625349529e-01, 9.048270496975224e-01, 9.297765042063145e-01, 9.510565400123596e-01, 9.685831564219096e-01, 9.822872317268658e-01, 9.921147201008556e-01, 9.980267308878707e-01, 1e+00, 9.980267308878707e-01, 9.92114732243872e-01, 9.822872126442558e-01, 9.685831564219097e-01, 9.510565400123596e-01, 9.297765042063144e-01, 9.048270918772917e-01, 8.763066140947703e-01, 8.443279050196674e-01, 8.0901700258255e-01, 7.705132617918609e-01, 7.289686746244106e-01, 6.845470677103855e-01, 6.374239612180836e-01, 5.877852439880371e-01, 5.358268358468121e-01, 4.817537468979226e-01, 4.25779210544396e-01, 3.681245073871982e-01, 3.0901700258255e-01, 2.48689928536554e-01, 1.873813906341122e-01, 1.253331553426789e-01, 6.279048060618642e-02, 1.224646852585168e-16, -6.279048060618642e-02, -1.253331553426789e-01, -1.873813906341122e-01, -2.486897348961611e-01, -3.0901700258255e-01, -3.681246928124626e-01, -4.257792105432433e-01, -4.817537468990312e-01, -5.358266668072931e-01, -5.877852439880371e-01, -6.374241146312833e-01, -6.845470677094547e-01, -7.289686746252738e-01, -7.705131339006728e-01, -8.0901700258255e-01, -8.443280114032558e-01, -8.763066140941518e-01, -9.048270918778253e-01, -9.297764299814574e-01, -9.510565400123596e-01, -9.685832053625664e-01, -9.8228721264401e-01, -9.921147322440232e-01, -9.980267175951161e-01, -1e+00, -9.980267175951161e-01, -9.921147322440232e-01, -9.8228721264401e-01, -9.685832053625664e-01, -9.510565400123596e-01, -9.297764299814574e-01, -9.048270918778253e-01, -8.763066140941518e-01, -8.443280114032558e-01, -8.0901700258255e-01, -7.705131339006728e-01, -7.289686746252738e-01, -6.845470677094547e-01, -6.374241146312833e-01, -5.877852439880371e-01, -5.358266668072931e-01, -4.817537468990312e-01, -4.257792105432433e-01, -3.681246928124626e-01, -3.0901700258255e-01, -2.486897348961611e-01, -1.873813906353584e-01, -1.25333155341418e-01, -6.279067989270393e-02, -2.449293705170336e-16]
+booPul.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hol.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.374239998118086e-01, 6.845471407669889e-01, 7.289686065362692e-01, 7.705132617918607e-01, 8.0901700258255e-01, 8.443279050196675e-01, 8.763066625349529e-01, 9.048270496975224e-01, 9.297765042063145e-01, 9.510565400123596e-01, 9.685831564219096e-01, 9.822872317268658e-01, 9.921147201008556e-01, 9.980267308878707e-01, 1e+00, 9.980267308878707e-01, 9.92114732243872e-01, 9.822872126442558e-01, 9.685831564219097e-01, 9.510565400123596e-01, 9.297765042063144e-01, 9.048270918772917e-01, 8.763066140947703e-01, 8.443279050196674e-01, 8.0901700258255e-01, 7.705132617918609e-01, 7.289686746244106e-01, 6.845470677103855e-01, 6.374239612180836e-01, 5.877852439880371e-01, 5.358268358468121e-01, 4.817537468979226e-01, 4.25779210544396e-01, 3.681245073871982e-01, 3.0901700258255e-01, 2.48689928536554e-01, 1.873813906341122e-01, 1.253331553426789e-01, 6.279048060618642e-02, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, -6.374241146312833e-01, -6.845470677094547e-01, -7.289686746252738e-01, -7.705131339006728e-01, -8.0901700258255e-01, -8.443280114032558e-01, -8.763066140941518e-01, -9.048270918778253e-01, -9.297764299814574e-01, -9.510565400123596e-01, -9.685832053625664e-01, -9.8228721264401e-01, -9.921147322440232e-01, -9.980267175951161e-01, -1e+00, -9.980267175951161e-01, -9.921147322440232e-01, -9.8228721264401e-01, -9.685832053625664e-01, -9.510565400123596e-01, -9.297764299814574e-01, -9.048270918778253e-01, -8.763066140941518e-01, -8.443280114032558e-01, -8.0901700258255e-01, -7.705131339006728e-01, -7.289686746252738e-01, -6.845470677094547e-01, -6.374241146312833e-01, -5.877852439880371e-01, -5.358266668072931e-01, -4.817537468990312e-01, -4.257792105432433e-01, -3.681246928124626e-01, -3.0901700258255e-01, -2.486897348961611e-01, -1.873813906353584e-01, -1.25333155341418e-01, -6.279067989270393e-02, -2.449293705170336e-16]
+holTim.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.443279050196674e-01, 8.0901700258255e-01, 7.705132617918609e-01, 7.289686746244106e-01, 6.845470677103855e-01, 6.374239612180836e-01, 5.877852439880371e-01, 5.358268358468121e-01, 4.817537468979226e-01, 4.25779210544396e-01, 3.681245073871982e-01, 3.0901700258255e-01, 2.48689928536554e-01, 1.873813906341122e-01, 1.253331553426789e-01, 6.279048060618642e-02, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, 1.224646852585168e-16, -8.443280114032558e-01, -8.0901700258255e-01, -7.705131339006728e-01, -7.289686746252738e-01, -6.845470677094547e-01, -6.374241146312833e-01, -5.877852439880371e-01, -5.358266668072931e-01, -4.817537468990312e-01, -4.257792105432433e-01, -3.681246928124626e-01, -3.0901700258255e-01, -2.486897348961611e-01, -1.873813906353584e-01, -1.25333155341418e-01, -6.279067989270393e-02, -2.449293705170336e-16]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt
new file mode 100644
index 00000000000..29608da707b
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_LastTrueIndex.txt
@@ -0,0 +1,10 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+idxLasTru.y=[5e+00, 5e+00]
+idxLasTruAllFal.y=[0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt
new file mode 100644
index 00000000000..ffe6b584880
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMaxInteger.txt
@@ -0,0 +1,9 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+mulMax.y=[5e+00, 5e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt
new file mode 100644
index 00000000000..2e773328dbe
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_MultiMinInteger.txt
@@ -0,0 +1,9 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+mulMin.y=[1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt
new file mode 100644
index 00000000000..68ece4ee389
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderInteger.txt
@@ -0,0 +1,11 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+phNo.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+phPar.y=[1e+00, 1e+00]
+phInp.y=[2e+00, 2e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt
new file mode 100644
index 00000000000..b54c5b4aac5
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderLogical.txt
@@ -0,0 +1,11 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+phNo.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+phPar.y=[0e+00, 0e+00]
+phInp.y=[1e+00, 1e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt
new file mode 100644
index 00000000000..68ece4ee389
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_PlaceholderReal.txt
@@ -0,0 +1,11 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+phNo.y=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+phPar.y=[1e+00, 1e+00]
+phInp.y=[2e+00, 2e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt
new file mode 100644
index 00000000000..879f1f382c4
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_SortWithIndices.txt
@@ -0,0 +1,33 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1e+00]
+sorAsc.u[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorAsc.u[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.899999701977842e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
+sorAsc.u[3]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.800000298022158e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.u[4]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorAsc.u[5]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
+sorAsc.y[1]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.y[2]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.800000154972077e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorAsc.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
+sorAsc.y[4]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorAsc.y[5]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
+sorDes.y[1]=[3e+00, 2.990000009313215e+00, 2.980000018626431e+00, 2.970000027939647e+00, 2.960000037252861e+00, 2.95000004842872e+00, 2.940000055879292e+00, 2.930000067055204e+00, 2.920000074505726e+00, 2.910000089406701e+00, 2.900000096857437e+00, 2.890000104308102e+00, 2.880000111758589e+00, 2.869999880791066e+00, 2.859999895691898e+00, 2.849999910593299e+00, 2.839999910593299e+00, 2.829999925494274e+00, 2.819999940395675e+00, 2.809999940395533e+00, 2.799999955296649e+00, 2.789999955297005e+00, 2.779999970197766e+00, 2.769999985099025e+00, 2.759999985098599e+00, 2.75e+00, 2.739999999999574e+00, 2.730000029802802e+00, 2.720000029802234e+00, 2.710000029801949e+00, 2.700000059603757e+00, 2.690000059604467e+00, 2.680000059604325e+00, 2.67000008940599e+00, 2.660000089406701e+00, 2.650000089406701e+00, 2.640000119208224e+00, 2.630000119208934e+00, 2.619999880791066e+00, 2.609999880791776e+00, 2.599999910593299e+00, 2.589999910593299e+00, 2.57999991059401e+00, 2.569999940395675e+00, 2.559999940395533e+00, 2.549999940396243e+00, 2.539999970198051e+00, 2.529999970197766e+00, 2.519999970197198e+00, 2.510000000000426e+00, 2.5e+00, 2.489999999999716e+00, 2.479999999999432e+00, 2.469999999999148e+00, 2.460000059602726e+00, 2.450000059603579e+00, 2.440000059604503e+00, 2.430000059604432e+00, 2.420000059604147e+00, 2.410000059603863e+00, 2.400000119207158e+00, 2.44e+00, 2.48e+00, 2.52e+00, 2.56e+00, 2.6e+00, 2.64e+00, 2.68e+00, 2.72e+00, 2.76e+00, 2.8e+00, 2.84e+00, 2.88e+00, 2.92e+00, 2.96e+00, 3e+00, 3.04e+00, 3.08e+00, 3.12e+00, 3.16e+00, 3.2e+00, 3.24e+00, 3.28e+00, 3.32e+00, 3.36e+00, 3.4e+00, 3.44e+00, 3.48e+00, 3.52e+00, 3.56e+00, 3.6e+00, 3.64e+00, 3.68e+00, 3.72e+00, 3.76e+00, 3.8e+00, 3.84e+00, 3.88e+00, 3.92e+00, 3.96e+00, 4e+00]
+sorDes.y[2]=[2e+00, 1.960000037252901e+00, 1.919999955296513e+00, 1.879999992549417e+00, 1.840000029802316e+00, 1.799999955296522e+00, 1.759999985098829e+00, 1.720000029802327e+00, 1.679999940395462e+00, 1.64e+00, 1.600000029802322e+00, 1.559999940395391e+00, 1.519999970197678e+00, 1.48e+00, 1.440000059604609e+00, 1.4e+00, 1.36e+00, 1.320000059604538e+00, 1.28e+00, 1.24e+00, 1.200000059604467e+00, 1.159999940395355e+00, 1.12e+00, 1.080000059604645e+00, 1.039999940395355e+00, 1e+00, 1.04e+00, 1.08e+00, 1.12e+00, 1.16e+00, 1.2e+00, 1.24e+00, 1.28e+00, 1.32e+00, 1.36e+00, 1.4e+00, 1.44e+00, 1.48e+00, 1.52e+00, 1.56e+00, 1.6e+00, 1.64e+00, 1.68e+00, 1.72e+00, 1.76e+00, 1.8e+00, 1.84e+00, 1.88e+00, 1.92e+00, 1.96e+00, 2e+00, 2.04e+00, 2.08e+00, 2.12e+00, 2.16e+00, 2.2e+00, 2.24e+00, 2.28e+00, 2.32e+00, 2.36e+00, 2.4e+00, 2.390000119208011e+00, 2.380000119208863e+00, 2.369999880791137e+00, 2.359999880791989e+00, 2.349999880792842e+00, 2.339999940396137e+00, 2.329999940395853e+00, 2.319999940395568e+00, 2.309999940395497e+00, 2.299999940396421e+00, 2.289999940397274e+00, 2.280000000000852e+00, 2.270000000000568e+00, 2.260000000000284e+00, 2.25e+00, 2.239999999999716e+00, 2.229999999999432e+00, 2.219999999999148e+00, 2.210000059602726e+00, 2.200000059603579e+00, 2.190000059604503e+00, 2.180000059604432e+00, 2.170000059604147e+00, 2.160000059603863e+00, 2.150000119207158e+00, 2.140000119208011e+00, 2.130000119208863e+00, 2.119999880791137e+00, 2.109999880791989e+00, 2.099999880792842e+00, 2.089999940396137e+00, 2.079999940395853e+00, 2.069999940395568e+00, 2.059999940395497e+00, 2.049999940396421e+00, 2.039999940397274e+00, 2.030000000000852e+00, 2.020000000000568e+00, 2.010000000000284e+00, 2e+00]
+sorDes.y[3]=[0e+00, 4e-02, 8e-02, 1.2e-01, 1.6e-01, 2e-01, 2.4e-01, 2.8e-01, 3.2e-01, 3.6e-01, 4e-01, 4.4e-01, 4.8e-01, 5.2e-01, 5.600000000000001e-01, 6e-01, 6.4e-01, 6.8e-01, 7.2e-01, 7.6e-01, 8e-01, 8.4e-01, 8.8e-01, 9.2e-01, 9.6e-01, 1e+00, 9.599999403956394e-01, 9.20000059604325e-01, 8.799999999999999e-01, 8.39999940395604e-01, 8.000000596046448e-01, 7.6e-01, 7.2e-01, 6.800000596046447e-01, 6.399999999999999e-01, 6.000000000000001e-01, 5.600000596046448e-01, 5.2e-01, 4.799999701977486e-01, 4.399999403955683e-01, 4.000000298022335e-01, 3.600000000000001e-01, 3.199999403955507e-01, 2.899999845027924e-01, 3.2e-01, 3.500000298023224e-01, 3.79999970197802e-01, 4.099999999999999e-01, 4.400000298023223e-01, 4.699999701976776e-01, 5e-01, 5.299999999997158e-01, 5.60000059603508e-01, 5.900000596037922e-01, 6.199999403966343e-01, 6.499999403960659e-01, 6.799999999999291e-01, 7.099999999997867e-01, 7.400000596036499e-01, 7.700000596038631e-01, 7.999999403967762e-01, 8.299999403962078e-01, 8.600000000001421e-01, 8.899999999998579e-01, 9.200000596037922e-01, 9.500000596032238e-01, 9.799999403961369e-01, 1.009999940395853e+00, 1.039999940395995e+00, 1.070000059604645e+00, 1.100000059603579e+00, 1.130000059604005e+00, 1.159999880793268e+00, 1.190000000000568e+00, 1.220000000000284e+00, 1.25e+00, 1.279999999999716e+00, 1.309999999999432e+00, 1.340000119206732e+00, 1.369999940395995e+00, 1.399999940396421e+00, 1.429999940395355e+00, 1.460000059604005e+00, 1.490000059604147e+00, 1.520000059603863e+00, 1.549999880792842e+00, 1.580000000000426e+00, 1.610000000000142e+00, 1.639999999999858e+00, 1.669999999999574e+00, 1.700000119207158e+00, 1.729999940396137e+00, 1.759999940395853e+00, 1.789999940395995e+00, 1.820000059604645e+00, 1.850000059603579e+00, 1.880000059604005e+00, 1.909999880793268e+00, 1.940000000000568e+00, 1.970000000000284e+00, 2e+00]
+sorDes.y[4]=[-1e+00, -9.700000279396727e-01, -9.399999962747139e-01, -9.100000242143751e-01, -8.799999925494277e-01, -8.500000260770252e-01, -8.199999888241416e-01, -7.900000223517407e-01, -7.599999850988655e-01, -7.300000298022691e-01, -6.999999925493972e-01, -6.700000149011524e-01, -6.399999776482982e-01, -6.099999999999289e-01, -5.799999850988476e-01, -5.500000298022336e-01, -5.199999701977309e-01, -4.900000149011345e-01, -4.600000298022158e-01, -4.3e-01, -4.000000149011168e-01, -3.699999850988388e-01, -3.4e-01, -3.100000149011611e-01, -2.799999850988388e-01, -2.5e-01, -2.199999701977486e-01, -1.900000298022424e-01, -1.59999999999991e-01, -1.299999701977398e-01, -1.000000372528142e-01, -7.000000745056284e-02, -3.999997764831148e-02, -1.000003911547481e-02, 1.999998882415249e-02, 5.000001862641812e-02, 7.999995529662296e-02, 1.099999850988743e-01, 1.400000149011257e-01, 1.70000044703377e-01, 1.999999850988833e-01, 2.300000149011345e-01, 2.600000298023223e-01, 2.800000154972077e-01, 2.399999850988566e-01, 1.999999552966052e-01, 1.600000298022601e-01, 1.199999925494328e-01, 7.999995529659643e-02, 4.000003725283197e-02, 0e+00, 4.000003725226355e-02, 8.000007450452709e-02, 1.200001117568972e-01, 1.599999105944718e-01, 1.99999955297316e-01, 2.399999850987147e-01, 2.800000298017893e-01, 3.200000596036499e-01, 3.600001192073355e-01, 3.999999105944538e-01, 4.39999940396421e-01, 4.799999701980329e-01, 5.199999999997158e-01, 5.600000596037922e-01, 6.00000119207158e-01, 6.399998807930554e-01, 6.799999403963501e-01, 7.200000000004265e-01, 7.600000000001419e-01, 8.000000596039341e-01, 8.400000596033657e-01, 8.799998807924156e-01, 9.19999940396492e-01, 9.599999403962078e-01, 1e+00, 1.039999999999432e+00, 1.080000119208153e+00, 1.120000119207584e+00, 1.15999988079199e+00, 1.200000000000711e+00, 1.239999999999858e+00, 1.279999999999573e+00, 1.3200001192073e+00, 1.360000119207726e+00, 1.399999880792131e+00, 1.440000000000853e+00, 1.480000000000284e+00, 1.519999999999716e+00, 1.559999999999147e+00, 1.600000119207869e+00, 1.639999880792274e+00, 1.6799998807927e+00, 1.720000000000427e+00, 1.760000000000142e+00, 1.799999999999289e+00, 1.84000011920801e+00, 1.879999880792416e+00, 1.919999880791847e+00, 1.960000000000568e+00, 2e+00]
+sorDes.y[5]=[-2e+00, -1.960000037252901e+00, -1.919999955296513e+00, -1.879999992549417e+00, -1.840000029802316e+00, -1.799999955296522e+00, -1.759999985098829e+00, -1.720000029802327e+00, -1.679999940395462e+00, -1.64e+00, -1.600000029802322e+00, -1.559999940395391e+00, -1.519999970197678e+00, -1.48e+00, -1.440000059604609e+00, -1.4e+00, -1.36e+00, -1.320000059604538e+00, -1.28e+00, -1.24e+00, -1.200000059604467e+00, -1.159999940395355e+00, -1.12e+00, -1.080000059604645e+00, -1.039999940395355e+00, -1e+00, -9.599999403956394e-01, -9.20000059604325e-01, -8.799999999999999e-01, -8.39999940395604e-01, -8.000000596046448e-01, -7.6e-01, -7.2e-01, -6.800000596046447e-01, -6.399999999999999e-01, -6.000000000000001e-01, -5.600000596046448e-01, -5.2e-01, -4.799999701977486e-01, -4.399999403955683e-01, -4.000000298022335e-01, -3.600000000000001e-01, -3.199999403955507e-01, -2.800000298022158e-01, -2.399999850988566e-01, -1.999999552966052e-01, -1.600000298022601e-01, -1.199999925494328e-01, -7.999995529659643e-02, -4.000003725283197e-02, 0e+00, -4.000003725226355e-02, -8.000007450452709e-02, -1.200001117568972e-01, -1.599999105944718e-01, -1.99999955297316e-01, -2.399999850987147e-01, -2.800000298017893e-01, -3.200000596036499e-01, -3.600001192073355e-01, -3.999999105944538e-01, -4.39999940396421e-01, -4.799999701980329e-01, -5.199999999997158e-01, -5.600000596037922e-01, -6.00000119207158e-01, -6.399998807930554e-01, -6.799999403963501e-01, -7.200000000004265e-01, -7.600000000001419e-01, -8.000000596039341e-01, -8.400000596033657e-01, -8.799998807924156e-01, -9.19999940396492e-01, -9.599999403962078e-01, -1e+00, -1.039999999999432e+00, -1.080000119208153e+00, -1.120000119207584e+00, -1.15999988079199e+00, -1.200000000000711e+00, -1.239999999999858e+00, -1.279999999999573e+00, -1.3200001192073e+00, -1.360000119207726e+00, -1.399999880792131e+00, -1.440000000000853e+00, -1.480000000000284e+00, -1.519999999999716e+00, -1.559999999999147e+00, -1.600000119207869e+00, -1.639999880792274e+00, -1.6799998807927e+00, -1.720000000000427e+00, -1.760000000000142e+00, -1.799999999999289e+00, -1.84000011920801e+00, -1.879999880792416e+00, -1.919999880791847e+00, -1.960000000000568e+00, -2e+00]
+sorAsc.yIdx[1]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
+sorAsc.yIdx[2]=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2.999996423728557e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00]
+sorAsc.yIdx[3]=[5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2.000003576271443e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00]
+sorAsc.yIdx[4]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4.000011920727175e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00]
+sorAsc.yIdx[5]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999988079272825e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+sorDes.yIdx[1]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.999988079272825e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00]
+sorDes.yIdx[2]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 4.000011920727175e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 2e+00]
+sorDes.yIdx[3]=[5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 5e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2.000003576271443e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00]
+sorDes.yIdx[4]=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2.999996423728557e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4e+00]
+sorDes.yIdx[5]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt
new file mode 100644
index 00000000000..fb1522aaad9
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_StageIndex.txt
@@ -0,0 +1,19 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 1.6e+02]
+ena.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1UpHol.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1DowHol.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+u1AvaSta[1].y=[0e+00, 0e+00]
+u1AvaSta[2].y=[0e+00, 0e+00]
+u1AvaSta[3].y=[1e+00, 1e+00]
+u1AvaSta[4].y=[1e+00, 1e+00]
+idxSta.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+idxStaUna.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+idxStaRun.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+idxStaRunUna.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt
new file mode 100644
index 00000000000..2501889dc07
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TimerWithReset.txt
@@ -0,0 +1,27 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+00]
+noThr.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999976158119219e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+res.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.907304979842309e-05, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+noThr.t=[0e+00, 0e+00]
+noThr.y=[0e+00, 5e-02, 1e-01, 1.5e-01, 2e-01, 2.5e-01, 3e-01, 3.5e-01, 4e-01, 4.5e-01, 5e-01, 5.5e-01, 6e-01, 6.5e-01, 7.000000000000001e-01, 7.5e-01, 8e-01, 8.500000000000001e-01, 8.999999999999999e-01, 9.5e-01, 1e+00, 1.05e+00, 1.1e+00, 1.15e+00, 1.2e+00, 1.25e+00, 1.3e+00, 1.35e+00, 1.39999663829489e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880923e-02, 1.000000968576189e-01, 1.499999105928906e-01, 1.999999552964455e-01, 2.5e-01, 3.00000059604645e-01, 3.50000089407251e-01, 3.999999105927485e-01, 4.499999403953554e-01, 5e-01, 5.500000596046446e-01, 6.000001192092896e-01, 6.499998807907108e-01, 6.999999403953554e-01, 7.5e-01, 8.00000059604645e-01, 8.500001192092892e-01, 8.999998807907104e-01, 9.49999940395355e-01, 1e+00, 1.05e+00, 1.10000011920929e+00, 1.14999988079071e+00, 1.2e+00, 1.25e+00, 1.3e+00, 1.35000011920929e+00, 1.399999880790711e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.99998100145297e-02, 1.000000968553448e-01, 1.499999105951639e-01, 2.000001937105483e-01, 2.5e-01, 2.999998211900444e-01, 3.500000894049773e-01, 3.999999105950227e-01, 4.500001788099556e-01, 5e-01, 5.499998211906129e-01, 6.000001192070163e-01, 6.499998807929845e-01, 7.000001788093863e-01, 7.5e-01, 7.999998211906129e-01, 8.500001192070155e-01, 8.999998807929845e-01, 9.500001788093871e-01, 1e+00]
+noThrRes.y=[0e+00, 5e-02, 1e-01, 1.5e-01, 2e-01, 2.5e-01, 3e-01, 3.5e-01, 4e-01, 4.5e-01, 5e-01, 5.5e-01, 6e-01, 6.5e-01, 7.000000000000001e-01, 7.5e-01, 8e-01, 8.500000000000001e-01, 8.999999999999999e-01, 9.5e-01, 1e+00, 1.05e+00, 1.1e+00, 1.15e+00, 1.2e+00, 5.000000074505806e-02, 1.000000491738675e-01, 1.499999821185711e-01, 1.999995261426095e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880923e-02, 1.000000968576189e-01, 1.499999105928906e-01, 1.999999552964455e-01, 2.5e-01, 3.00000059604645e-01, 3.50000089407251e-01, 3.999999105927485e-01, 4.499999403953554e-01, 5e-01, 5.500000596046446e-01, 6.000001192092896e-01, 6.499998807907108e-01, 6.999999403953554e-01, 5.000000074505806e-02, 1.000000491738677e-01, 1.500001013278958e-01, 1.999999076126584e-01, 2.499999523162129e-01, 3.00000011920929e-01, 3.500000417233933e-01, 4.000001013278962e-01, 4.499998927116393e-01, 4.999999523162844e-01, 5.50000011920929e-01, 6.00000071525574e-01, 6.500000715261423e-01, 6.999998927116398e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.99998100145297e-02, 1.000000968553448e-01, 1.499999105951639e-01, 1.999963791007094e-01, 5.000000074505806e-02, 9.999981075965793e-02, 1.500001013256221e-01, 1.999999076149325e-01, 2.500001907303161e-01, 3.00000011920929e-01, 3.499998033092194e-01, 4.00000101325623e-01, 4.499998927139134e-01, 5.000001907303152e-01, 5.50000011920929e-01, 5.999998331104049e-01, 6.500000715238681e-01, 6.999998927139135e-01, 7.500001907303161e-01, 8.00000011920929e-01]
+noThr.passed=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999976158119219e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+noThrRes.passed=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999976158119219e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+thrTim.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999976158119219e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+thrTim.t=[3.00000011920929e-01, 3.00000011920929e-01]
+thrTim.y=[0e+00, 5e-02, 1e-01, 1.5e-01, 2e-01, 2.5e-01, 3e-01, 3.5e-01, 4e-01, 4.5e-01, 5e-01, 5.5e-01, 6e-01, 6.5e-01, 7.000000000000001e-01, 7.5e-01, 8e-01, 8.500000000000001e-01, 8.999999999999999e-01, 9.5e-01, 1e+00, 1.05e+00, 1.1e+00, 1.15e+00, 1.2e+00, 1.25e+00, 1.3e+00, 1.35e+00, 1.39999663829489e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880923e-02, 1.000000968576189e-01, 1.499999105928906e-01, 1.999999552964455e-01, 2.5e-01, 3.00000059604645e-01, 3.50000089407251e-01, 3.999999105927485e-01, 4.499999403953554e-01, 5e-01, 5.500000596046446e-01, 6.000001192092896e-01, 6.499998807907108e-01, 6.999999403953554e-01, 7.5e-01, 8.00000059604645e-01, 8.500001192092892e-01, 8.999998807907104e-01, 9.49999940395355e-01, 1e+00, 1.05e+00, 1.10000011920929e+00, 1.14999988079071e+00, 1.2e+00, 1.25e+00, 1.3e+00, 1.35000011920929e+00, 1.399999880790711e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.99998100145297e-02, 1.000000968553448e-01, 1.499999105951639e-01, 2.000001937105483e-01, 2.5e-01, 2.999998211900444e-01, 3.500000894049773e-01, 3.999999105950227e-01, 4.500001788099556e-01, 5e-01, 5.499998211906129e-01, 6.000001192070163e-01, 6.499998807929845e-01, 7.000001788093863e-01, 7.5e-01, 7.999998211906129e-01, 8.500001192070155e-01, 8.999998807929845e-01, 9.500001788093871e-01, 1e+00]
+thrTimRes.y=[0e+00, 5e-02, 1e-01, 1.5e-01, 2e-01, 2.5e-01, 3e-01, 3.5e-01, 4e-01, 4.5e-01, 5e-01, 5.5e-01, 6e-01, 6.5e-01, 7.000000000000001e-01, 7.5e-01, 8e-01, 8.500000000000001e-01, 8.999999999999999e-01, 9.5e-01, 1e+00, 1.05e+00, 1.1e+00, 1.15e+00, 1.2e+00, 5.000000074505806e-02, 1.000000491738675e-01, 1.499999821185711e-01, 1.999995261426095e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880923e-02, 1.000000968576189e-01, 1.499999105928906e-01, 1.999999552964455e-01, 2.5e-01, 3.00000059604645e-01, 3.50000089407251e-01, 3.999999105927485e-01, 4.499999403953554e-01, 5e-01, 5.500000596046446e-01, 6.000001192092896e-01, 6.499998807907108e-01, 6.999999403953554e-01, 5.000000074505806e-02, 1.000000491738677e-01, 1.500001013278958e-01, 1.999999076126584e-01, 2.499999523162129e-01, 3.00000011920929e-01, 3.500000417233933e-01, 4.000001013278962e-01, 4.499998927116393e-01, 4.999999523162844e-01, 5.50000011920929e-01, 6.00000071525574e-01, 6.500000715261423e-01, 6.999998927116398e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.99998100145297e-02, 1.000000968553448e-01, 1.499999105951639e-01, 1.999963791007094e-01, 5.000000074505806e-02, 9.999981075965793e-02, 1.500001013256221e-01, 1.999999076149325e-01, 2.500001907303161e-01, 3.00000011920929e-01, 3.499998033092194e-01, 4.00000101325623e-01, 4.499998927139134e-01, 5.000001907303152e-01, 5.50000011920929e-01, 5.999998331104049e-01, 6.500000715238681e-01, 6.999998927139135e-01, 7.500001907303161e-01, 8.00000011920929e-01]
+thrTim.passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999976158119219e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.768376156154474e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+thrTimRes.passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.768376156154474e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+thrTim1.u=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+thrTim1.t=[3.00000011920929e-01, 3.00000011920929e-01]
+thrTim1.y=[0e+00, 5e-02, 1e-01, 1.5e-01, 2e-01, 2.5e-01, 3e-01, 3.5e-01, 4e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880945e-02, 9.999997764824053e-02, 1.500000298023225e-01, 1.999999552964453e-01, 2.5e-01, 3.000000596046448e-01, 3.499999701976777e-01, 4.000000298023225e-01, 4.499999403953552e-01, 5e-01, 5.500000596046448e-01, 5.99999999999858e-01, 6.500000000001422e-01, 6.999999403953554e-01, 7.5e-01, 8.000000596046446e-01, 8.49999999999858e-01, 9.00000000000142e-01, 9.499999403953554e-01, 1e+00, 1.05e+00, 1.10000011920929e+00, 1.14999988079071e+00, 1.2e+00, 1.25e+00, 1.3e+00, 1.350000119209289e+00, 1.39999988079071e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880923e-02, 1.000000968576189e-01, 1.499999105928906e-01, 1.999999552964455e-01, 2.5e-01, 3.00000059604645e-01, 3.500000894072515e-01, 3.99999910592749e-01, 4.49999940395355e-01, 5e-01, 5.500000596046446e-01, 6.000001192092892e-01, 6.499998807907104e-01, 6.999999403953554e-01, 7.5e-01, 8.000000596046446e-01, 8.500001192092896e-01, 8.999998807907108e-01, 9.499999403953554e-01, 1e+00, 1.049999761585969e+00, 1.100000119207015e+00, 1.149999880792984e+00, 1.200000238414032e+00, 1.25e+00, 1.299999761585968e+00, 1.350000119207015e+00, 1.399999880792985e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+thrTim1Res.y=[0e+00, 5e-02, 1e-01, 1.5e-01, 2e-01, 2.5e-01, 3e-01, 3.5e-01, 4e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880945e-02, 9.999997764824053e-02, 1.500000298023225e-01, 1.999999552964453e-01, 5.000000074505806e-02, 1.000000491738675e-01, 1.499999821185711e-01, 2.000000268220903e-01, 2.499999523162131e-01, 3.00000011920929e-01, 3.500000417233935e-01, 3.999999821185356e-01, 4.500000119210001e-01, 4.999999523162844e-01, 5.50000011920929e-01, 6.000000715255736e-01, 6.499999523162843e-01, 7.000000119209289e-01, 7.499999523162844e-01, 8.00000011920929e-01, 8.500000715255736e-01, 9.000000715261423e-01, 9.499998927116393e-01, 9.999999523162844e-01, 1.049999952316284e+00, 1.100000071525574e+00, 1.150000071525573e+00, 1.199999952316284e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.000004842880923e-02, 1.000000968576189e-01, 1.499999105928906e-01, 1.999999552964455e-01, 2.5e-01, 3.00000059604645e-01, 3.500000894072515e-01, 3.99999910592749e-01, 4.49999940395355e-01, 5e-01, 5.500000596046446e-01, 6.000001192092892e-01, 6.499998807907104e-01, 6.999999403953554e-01, 7.5e-01, 8.000000596046446e-01, 8.500001192092896e-01, 8.999998807907108e-01, 9.499999403953554e-01, 1e+00, 1.049999761585969e+00, 1.100000119207015e+00, 1.149999880792984e+00, 1.199977350753542e+00, 5.000000074505806e-02, 9.999981075965793e-02, 1.500001013256221e-01, 1.999999076149325e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+thrTim1.passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.768376133949992e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.768376156154474e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+thrTim1Res.passed=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.768376156154474e-06, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.999809269502016e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt
new file mode 100644
index 00000000000..569c882adea
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_Controls_Utilities_Validation_TrueArrayConditional.txt
@@ -0,0 +1,17 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+00]
+truArrConSam.u=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConSam.uIdx[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConSam.uIdx[2]=[3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00]
+truArrConSam.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConSam.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConGre.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConGre.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConGre.y1[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+truArrConGre.y1[4]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_HeatPumpGroupAirToWater.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_HeatPumpGroupAirToWater.txt
new file mode 100644
index 00000000000..6e94eb3b5ba
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_HeatPumpGroupAirToWater.txt
@@ -0,0 +1,38 @@
+last-generated=2024-04-02
+statistics-initialization=
+{
+  "nonlinear": "0, 0, 0",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": "0, 0, 0, 1",
+  "number of continuous time states": "66",
+  "numerical Jacobians": "0"
+}
+time=[1.04976e+07, 1.05056e+07]
+ctlPlaAw.bus.hp[1].y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+ctlPlaAw.bus.hp[1].y1Hea=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+ctlPlaAwNrv.bus.hp[1].y1=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+weaDat.weaBus.TDryBul=[2.964500122070312e+02, 2.964202880859375e+02, 2.963903198242188e+02, 2.963601684570312e+02, 2.963298645019531e+02, 2.962994079589844e+02, 2.962688293457031e+02, 2.962382202148438e+02, 2.962075500488281e+02, 2.961768798828125e+02, 2.961462707519531e+02, 2.961156921386719e+02, 2.96085205078125e+02, 2.960548706054688e+02, 2.960246887207031e+02, 2.959946899414062e+02, 2.959649353027344e+02, 2.959354553222656e+02, 2.9590625e+02, 2.958773803710938e+02, 2.95848876953125e+02, 2.958207397460938e+02, 2.957930603027344e+02, 2.957658386230469e+02, 2.957391052246094e+02, 2.95712890625e+02, 2.956872253417969e+02, 2.956621704101562e+02, 2.956377258300781e+02, 2.956139526367188e+02, 2.955908813476562e+02, 2.955685119628906e+02, 2.955469055175781e+02, 2.955260925292969e+02, 2.95506103515625e+02, 2.954869689941406e+02, 2.954687194824219e+02, 2.95451416015625e+02, 2.954350280761719e+02, 2.954196472167969e+02, 2.954053039550781e+02, 2.953919982910156e+02, 2.953797912597656e+02, 2.953686828613281e+02, 2.953587646484375e+02, 2.953500061035156e+02, 2.953421325683594e+02, 2.953348083496094e+02, 2.953280029296875e+02, 2.953217163085938e+02, 2.953159484863281e+02, 2.953106689453125e+02, 2.953058776855469e+02, 2.953015441894531e+02, 2.952976379394531e+02, 2.952942199707031e+02, 2.952911987304688e+02, 2.952886047363281e+02, 2.95286376953125e+02, 2.952845764160156e+02, 2.952831420898438e+02, 2.952820739746094e+02, 2.952813415527344e+02, 2.952809448242188e+02, 2.952808837890625e+02, 2.952811279296875e+02, 2.952816772460938e+02, 2.952825012207031e+02, 2.952835998535156e+02, 2.952849426269531e+02, 2.952865600585938e+02, 2.952883911132812e+02, 2.952904357910156e+02, 2.952926940917969e+02, 2.952951354980469e+02, 2.952977600097656e+02, 2.953005676269531e+02, 2.953035278320312e+02, 2.953066101074219e+02, 2.953098449707031e+02, 2.953131713867188e+02, 2.953166198730469e+02, 2.953201293945312e+02, 2.9532373046875e+02, 2.95327392578125e+02, 2.953311157226562e+02, 2.953348693847656e+02, 2.953386535644531e+02, 2.953424377441406e+02, 2.953462219238281e+02, 2.953500061035156e+02, 2.953545532226562e+02, 2.953606262207031e+02, 2.953681640625e+02, 2.953770446777344e+02, 2.953872375488281e+02, 2.953986206054688e+02, 2.954111633300781e+02, 2.954247436523438e+02, 2.954393005371094e+02, 2.954547424316406e+02]
+hpAw.TSouHeaHp_nominal=[2.651499938964844e+02, 2.651499938964844e+02]
+hpAw.TSouCooHp_nominal=[3.081499938964844e+02, 3.081499938964844e+02]
+TRet[1].T=[2.931499938964844e+02, 3.079330749511719e+02, 3.071629333496094e+02, 3.083687133789062e+02, 3.112520751953125e+02, 3.150997314453125e+02, 2.875415344238281e+02, 2.893610534667969e+02, 2.901388244628906e+02, 2.896824340820312e+02, 2.881047668457031e+02, 2.85796142578125e+02, 2.833276672363281e+02, 2.813099975585938e+02, 2.802423095703125e+02, 2.803887329101562e+02, 2.817130126953125e+02, 2.838875427246094e+02, 2.863744201660156e+02, 2.885583801269531e+02, 2.898991394042969e+02, 2.900650329589844e+02, 2.890150146484375e+02, 2.870088500976562e+02, 2.845428161621094e+02, 2.822269897460938e+02, 2.806343078613281e+02, 2.801587219238281e+02, 2.809179077148438e+02, 2.827240600585938e+02, 2.8513037109375e+02, 3.189598388671875e+02, 3.218774108886719e+02, 3.231307373046875e+02, 3.224097290039062e+02, 3.198927612304688e+02, 3.162024841308594e+02, 3.122518615722656e+02, 3.090181884765625e+02, 3.073014221191406e+02, 3.075263366699219e+02, 3.0963720703125e+02, 3.131118774414062e+02, 3.170907592773438e+02, 3.205895080566406e+02, 3.227426147460938e+02, 3.230173950195312e+02, 3.213458862304688e+02, 3.181416015625e+02, 3.141972351074219e+02, 3.104885559082031e+02, 3.079330749511719e+02, 3.071629333496094e+02, 3.083687133789062e+02, 3.112520751953125e+02, 3.150997314453125e+02, 3.189598388671875e+02, 3.2187744140625e+02, 3.231307373046875e+02, 3.224097290039062e+02, 3.198927612304688e+02, 3.162024536132812e+02, 3.122518005371094e+02, 3.090181884765625e+02, 3.073014221191406e+02, 3.075263061523438e+02, 3.0963720703125e+02, 3.131118774414062e+02, 2.863744201660156e+02, 2.885583801269531e+02, 2.898991394042969e+02, 2.900650329589844e+02, 2.890150146484375e+02, 2.870088500976562e+02, 2.845428161621094e+02, 2.822269897460938e+02, 2.806343078613281e+02, 2.801587219238281e+02, 2.809179077148438e+02, 2.827240600585938e+02, 2.8513037109375e+02, 2.875415344238281e+02, 2.893610534667969e+02, 2.901388244628906e+02, 2.896824340820312e+02, 2.881047668457031e+02, 2.85796142578125e+02, 2.833276672363281e+02, 2.813099975585938e+02, 2.802423095703125e+02, 2.803887329101562e+02, 2.817130126953125e+02, 2.838875427246094e+02, 3.170907592773438e+02, 3.205895080566406e+02, 3.227426147460938e+02, 3.230173950195312e+02, 3.213458862304688e+02, 3.181416015625e+02, 3.141972351074219e+02, 3.104885559082031e+02]
+TSup[1].T=[2.931499938964844e+02, 3.202178649902344e+02, 3.209960327148438e+02, 3.216096496582031e+02, 3.229825744628906e+02, 3.231386108398438e+02, 2.817254943847656e+02, 2.828302917480469e+02, 2.837348022460938e+02, 2.835869140625e+02, 2.824138488769531e+02, 2.805238952636719e+02, 2.801552124023438e+02, 2.801500854492188e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.802488708496094e+02, 2.820090942382812e+02, 2.833800354003906e+02, 2.837755432128906e+02, 2.830939331054688e+02, 2.815033569335938e+02, 2.801923828125e+02, 2.801506042480469e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.15137939453125e+02, 3.206907958984375e+02, 3.227444763183594e+02, 3.227711486816406e+02, 3.209026184082031e+02, 3.176099853515625e+02, 3.137085876464844e+02, 3.101638488769531e+02, 3.078526000976562e+02, 3.073466796875e+02, 3.087711791992188e+02, 3.117737121582031e+02, 3.205714416503906e+02, 3.229706420898438e+02, 3.231374816894531e+02, 3.231490783691406e+02, 3.231498718261719e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.22206298828125e+02, 3.209503479003906e+02, 3.214266967773438e+02, 3.229389038085938e+02, 3.231355590820312e+02, 3.231490478515625e+02, 3.231499633789062e+02, 3.231500244140625e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.230167236328125e+02, 3.213984680175781e+02, 3.209470825195312e+02, 3.223453979492188e+02, 3.230942077636719e+02, 2.854979553222656e+02, 2.820475158691406e+02, 2.833473205566406e+02, 2.837435302734375e+02, 2.830636596679688e+02, 2.814748840332031e+02, 2.801901550292969e+02, 2.801505126953125e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.810481872558594e+02, 2.827666015625e+02, 2.836817932128906e+02, 2.835360412597656e+02, 2.82364990234375e+02, 2.804898986816406e+02, 2.801547241210938e+02, 2.801500549316406e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.064645690917969e+02, 3.186993103027344e+02, 3.219791259765625e+02, 3.230081787109375e+02, 3.2205419921875e+02, 3.193894653320312e+02, 3.156758422851562e+02, 3.118319396972656e+02]
+hpAw.bus.hp[1].TSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02]
+hpAw.THeaWatRetHp_nominal=[3.151499938964844e+02, 3.151499938964844e+02]
+hpAw.TChiWatRetHp_nominal=[2.851499938964844e+02, 2.851499938964844e+02]
+hpAw.hp[1].port_a.m_flow=[1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01]
+hpAw.mHeaWatHp_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+hpAw.mChiWatHp_flow_nominal=[2.390057373046875e+01, 2.390057373046875e+01]
+hpAw.hp[1].hp.PLR=[9.232998490333557e-01, 1e+00, 1e+00, 1e+00, 8.640075325965881e-01, 5.864202976226807e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.722139835357666e-01, 5.754383206367493e-01, 2.186235636472702e-01, 1.729099452495575e-02, 4.758583009243011e-02, 2.972689568996429e-01, 6.742307543754578e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 7.729504108428955e-01, 3.831412792205811e-01, 9.170839190483093e-02, 1.921797287650406e-03, 1.488696038722992e-01, 4.754987955093384e-01, 8.706732392311096e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.473351836204529e-01, 1.887659728527069e-01, 2.937889099121094e-02, 1.063715666532516e-02, 1.375012844800949e-01, 3.769319951534271e-01, 6.676680445671082e-01, 9.372982382774353e-01, 1e+00, 1e+00, 1e+00, 8.759474754333496e-01, 5.943548679351807e-01, 3.096962869167328e-01, 9.340981394052505e-02, 1.186131266877055e-03, 5.714977160096169e-02, 2.466530948877335e-01, 5.206742286682129e-01, 8.099712133407593e-01, 1e+00, 1e+00, 1e+00, 9.938103556632996e-01, 7.402315139770508e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 7.693703770637512e-01, 3.813959062099457e-01, 9.130490571260452e-02, 1.913868472911417e-03, 1.48312583565712e-01, 4.739302694797516e-01, 8.681834936141968e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 9.644972085952759e-01, 5.70835292339325e-01, 2.16877743601799e-01, 1.715622842311859e-02, 4.72346656024456e-02, 2.95254647731781e-01, 6.70130729675293e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hpAw.hp[1].hp.COP=[3.05595850944519e+00, 3.206130027770996e+00, 3.252182722091675e+00, 3.174124717712402e+00, 3.004279851913452e+00, 2.803272485733032e+00, 4.179367065429688e+00, 4.279999256134033e+00, 4.32415771484375e+00, 4.303699016571045e+00, 4.223483562469482e+00, 4.101130485534668e+00, 3.965426921844482e+00, 3.851535558700562e+00, 3.791903495788574e+00, 3.805106163024902e+00, 3.888369083404541e+00, 4.018719673156738e+00, 4.161962509155273e+00, 4.283787727355957e+00, 4.357864379882812e+00, 4.36965799331665e+00, 4.317523956298828e+00, 4.212776184082031e+00, 4.078973293304443e+00, 3.948997020721436e+00, 3.858093738555908e+00, 3.833158493041992e+00, 3.882591724395752e+00, 3.992718935012817e+00, 4.133473873138428e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.680472612380981e+00, 2.530121088027954e+00, 2.445485591888428e+00, 2.435705184936523e+00, 2.501621961593628e+00, 2.636510372161865e+00, 2.821307897567749e+00, 3.017457485198975e+00, 3.16709041595459e+00, 3.213615655899048e+00, 3.137128114700317e+00, 2.969633102416992e+00, 2.771225452423096e+00, 2.595913648605347e+00, 2.47684907913208e+00, 2.429303646087646e+00, 2.45784330368042e+00, 2.559810161590576e+00, 2.723207235336304e+00, 2.920002698898315e+00, 3.100940465927124e+00, 3.204751253128052e+00, 3.189046621322632e+00, 3.060587644577026e+00, 2.870043516159058e+00, 4.242838382720947e+00, 4.360990047454834e+00, 4.43127965927124e+00, 4.439209461212158e+00, 4.383158683776855e+00, 4.274448394775391e+00, 4.136658191680908e+00, 4.002727031707764e+00, 3.90798807144165e+00, 3.879407644271851e+00, 3.925390005111694e+00, 4.032198905944824e+00, 4.169692993164062e+00, 4.302241802215576e+00, 4.398781776428223e+00, 4.438654899597168e+00, 4.413759231567383e+00, 4.328968524932861e+00, 4.20190954208374e+00, 4.061423778533936e+00, 3.942800760269165e+00, 3.878642559051514e+00, 3.887608528137207e+00, 3.96677041053772e+00, 4.092916488647461e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+TRet1[1].T=[2.931499938964844e+02, 3.079330749511719e+02, 3.071629333496094e+02, 3.083687133789062e+02, 3.112520751953125e+02, 3.150997314453125e+02, 3.189598388671875e+02, 3.218774108886719e+02, 3.231307373046875e+02, 3.224097290039062e+02, 3.198927612304688e+02, 3.162024841308594e+02, 3.122518615722656e+02, 3.090181884765625e+02, 3.073014221191406e+02, 3.075263061523438e+02, 3.0963720703125e+02, 3.131118774414062e+02, 3.170907592773438e+02, 3.205895080566406e+02, 3.227426147460938e+02, 3.230173950195312e+02, 3.213458862304688e+02, 3.181416015625e+02, 3.141972351074219e+02, 3.104885559082031e+02, 3.079330749511719e+02, 3.071629333496094e+02, 3.083687133789062e+02, 3.112520751953125e+02, 3.150997314453125e+02, 3.189598388671875e+02, 3.218774108886719e+02, 3.231307373046875e+02, 3.224097290039062e+02, 3.198927612304688e+02, 3.162024841308594e+02, 3.122518615722656e+02, 3.090181884765625e+02, 3.073014221191406e+02, 3.075263366699219e+02, 3.0963720703125e+02, 3.131118774414062e+02, 3.170907592773438e+02, 3.205895080566406e+02, 3.227426147460938e+02, 3.230173950195312e+02, 3.213458862304688e+02, 3.181416015625e+02, 3.141972351074219e+02, 3.104885559082031e+02, 3.079330749511719e+02, 3.071629333496094e+02, 3.083687133789062e+02, 3.112520751953125e+02, 3.150997314453125e+02, 3.189598388671875e+02, 3.2187744140625e+02, 3.231307373046875e+02, 3.224097290039062e+02, 3.198927612304688e+02, 3.162024536132812e+02, 3.122518005371094e+02, 3.090181884765625e+02, 3.073014221191406e+02, 3.075263061523438e+02, 3.0963720703125e+02, 3.131118774414062e+02, 3.170907592773438e+02, 3.205895080566406e+02, 3.227426147460938e+02, 3.230173950195312e+02, 3.213458862304688e+02, 3.181416015625e+02, 3.141972351074219e+02, 3.104885559082031e+02, 3.079330749511719e+02, 3.071629333496094e+02, 3.083687133789062e+02, 3.112520751953125e+02, 3.150997314453125e+02, 3.189598388671875e+02, 3.218774108886719e+02, 3.231307373046875e+02, 3.224097290039062e+02, 3.198927612304688e+02, 3.162024841308594e+02, 3.122518615722656e+02, 3.090181884765625e+02, 3.073014221191406e+02, 3.075263061523438e+02, 3.0963720703125e+02, 3.131118774414062e+02, 3.170907592773438e+02, 3.205895080566406e+02, 3.227426147460938e+02, 3.230173950195312e+02, 3.213458862304688e+02, 3.181416015625e+02, 3.141972351074219e+02, 3.104885559082031e+02]
+TSup1[1].T=[2.931499938964844e+02, 3.202178649902344e+02, 3.209960327148438e+02, 3.216096496582031e+02, 3.229825744628906e+02, 3.231386108398438e+02, 3.231492004394531e+02, 3.231499328613281e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.230716247558594e+02, 3.21529541015625e+02, 3.210780944824219e+02, 3.224598693847656e+02, 3.231015014648438e+02, 3.231465759277344e+02, 3.231497497558594e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.222644653320312e+02, 3.210155944824219e+02, 3.214890747070312e+02, 3.229534301757812e+02, 3.231362915039062e+02, 3.18227294921875e+02, 3.209058532714844e+02, 3.227597045898438e+02, 3.227726745605469e+02, 3.209027404785156e+02, 3.176098937988281e+02, 3.137085266113281e+02, 3.10163818359375e+02, 3.078526000976562e+02, 3.073466796875e+02, 3.087711791992188e+02, 3.117737121582031e+02, 3.205714416503906e+02, 3.229706420898438e+02, 3.231374816894531e+02, 3.231490783691406e+02, 3.231498718261719e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.22206298828125e+02, 3.209503479003906e+02, 3.214266967773438e+02, 3.229389038085938e+02, 3.231355590820312e+02, 3.231490478515625e+02, 3.231499633789062e+02, 3.231500244140625e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.230167236328125e+02, 3.213984680175781e+02, 3.209470825195312e+02, 3.223453979492188e+02, 3.230942077636719e+02, 3.231461486816406e+02, 3.231497192382812e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.222041625976562e+02, 3.20949462890625e+02, 3.214271545410156e+02, 3.229398193359375e+02, 3.231354675292969e+02, 3.231489868164062e+02, 3.231499328613281e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.230226440429688e+02, 3.214098205566406e+02, 3.209592590332031e+02, 3.22357421875e+02, 3.230950622558594e+02, 3.181862487792969e+02, 3.195140991210938e+02, 3.22035888671875e+02, 3.230122375488281e+02, 3.220545349121094e+02, 3.193894958496094e+02, 3.156756896972656e+02, 3.118319396972656e+02]
+hpAwNrv.bus.hp[1].TSet=[3.231499938964844e+02, 3.231499938964844e+02]
+hpAwNrv.THeaWatRetHp_nominal=[3.151499938964844e+02, 3.151499938964844e+02]
+hpAwNrv.hp[1].port_a.m_flow=[1.493785858154297e+01, 1.493785858154297e+01]
+hpAwNrv.mHeaWatHp_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+hpAwNrv.hp[1].hp.PLR=[9.232998490333557e-01, 1e+00, 1e+00, 1e+00, 8.640075325965881e-01, 5.864202976226807e-01, 3.056521117687225e-01, 9.221973270177841e-02, 1.171441283077002e-03, 5.646457895636559e-02, 2.438015043735504e-01, 5.148876905441284e-01, 8.013342618942261e-01, 1e+00, 1e+00, 1e+00, 9.848197102546692e-01, 7.337988615036011e-01, 4.44115936756134e-01, 1.874484866857529e-01, 2.91809905320406e-02, 1.056836172938347e-02, 1.366515308618546e-01, 3.747155666351318e-01, 6.639446020126343e-01, 9.323506355285645e-01, 1e+00, 1e+00, 1e+00, 8.722537159919739e-01, 5.919908881187439e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.473351836204529e-01, 1.887659728527069e-01, 2.937889099121094e-02, 1.063715666532516e-02, 1.375012844800949e-01, 3.769319951534271e-01, 6.676680445671082e-01, 9.372982382774353e-01, 1e+00, 1e+00, 1e+00, 8.759474754333496e-01, 5.943548679351807e-01, 3.096962869167328e-01, 9.340981394052505e-02, 1.186131266877055e-03, 5.714977160096169e-02, 2.466530948877335e-01, 5.206742286682129e-01, 8.099712133407593e-01, 1e+00, 1e+00, 1e+00, 9.938103556632996e-01, 7.402315139770508e-01, 4.478490948677063e-01, 1.889549642801285e-01, 2.940425463020802e-02, 1.064493786543608e-02, 1.375841200351715e-01, 3.77111941576004e-01, 6.679067015647888e-01, 9.375261664390564e-01, 1e+00, 1e+00, 1e+00, 8.758046627044678e-01, 5.942032337188721e-01, 3.095898032188416e-01, 9.336978942155838e-02, 1.185528584755957e-03, 5.711650848388672e-02, 2.464928328990936e-01, 5.203038454055786e-01, 8.093493580818176e-01, 1e+00, 1e+00, 1e+00, 9.928435683250427e-01, 7.394558787345886e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hpAwNrv.hp[1].hp.COP=[3.05595850944519e+00, 3.206130027770996e+00, 3.252182722091675e+00, 3.174124717712402e+00, 3.004279851913452e+00, 2.803272485733032e+00, 2.625585794448853e+00, 2.504662275314331e+00, 2.455888748168945e+00, 2.483828544616699e+00, 2.585737228393555e+00, 2.749449729919434e+00, 2.946667671203613e+00, 3.127780914306641e+00, 3.231178283691406e+00, 3.214310646057129e+00, 3.08406138420105e+00, 2.89143180847168e+00, 2.69718599319458e+00, 2.545557498931885e+00, 2.459955453872681e+00, 2.449547290802002e+00, 2.515149593353271e+00, 2.649962902069092e+00, 2.834804773330688e+00, 3.030953884124756e+00, 3.180360078811646e+00, 3.226307153701782e+00, 3.148895740509033e+00, 2.980265855789185e+00, 2.780696630477905e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.680472612380981e+00, 2.530121088027954e+00, 2.445485591888428e+00, 2.435705184936523e+00, 2.501621961593628e+00, 2.636510372161865e+00, 2.821307897567749e+00, 3.017457485198975e+00, 3.16709041595459e+00, 3.213615655899048e+00, 3.137128114700317e+00, 2.969633102416992e+00, 2.771225452423096e+00, 2.595913648605347e+00, 2.47684907913208e+00, 2.429303646087646e+00, 2.45784330368042e+00, 2.559810161590576e+00, 2.723207235336304e+00, 2.920002698898315e+00, 3.100940465927124e+00, 3.204751253128052e+00, 3.189046621322632e+00, 3.060587644577026e+00, 2.870043516159058e+00, 2.677823781967163e+00, 2.5279221534729e+00, 2.44364333152771e+00, 2.434149265289307e+00, 2.500310897827148e+00, 2.635424137115479e+00, 2.820447206497192e+00, 3.016838550567627e+00, 3.166733980178833e+00, 3.213531732559204e+00, 3.137305974960327e+00, 2.970042705535889e+00, 2.771831035614014e+00, 2.596686363220215e+00, 2.477774381637573e+00, 2.430382966995239e+00, 2.459092140197754e+00, 2.561253309249878e+00, 2.724871873855591e+00, 2.921906471252441e+00, 3.103076219558716e+00, 3.20707631111145e+00, 3.19148850440979e+00, 3.063094615936279e+00, 2.872605800628662e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_PumpsPrimaryDedicated.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_PumpsPrimaryDedicated.txt
new file mode 100644
index 00000000000..948a7beab3a
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_PumpsPrimaryDedicated.txt
@@ -0,0 +1,43 @@
+last-generated=2024-04-02
+statistics-initialization=
+{
+  "nonlinear": "1, 1, 1, 1, 2, 2, 1, 0, 1, 0",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0, 0, 0, 0, 0, 0, 0",
+  "nonlinear": "1, 1, 1, 1, 2, 2, 1, 1",
+  "number of continuous time states": "76",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+03]
+pumPriCom.bus.pumHeaWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumPriCom.bus.pumHeaWatPri.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valHeaWatIsoCom[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.488183879852295e+01, 1.491432094573975e+01, 1.491603183746338e+01, 1.491612815856934e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613388061523e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 2.092883158444359e-11, 0e+00, 8.448687149211764e-04, 1.907894693431444e-05, 1.086429074348416e-05, 1.052080460794969e-05, 1.050241007760633e-05, 1.050382343237288e-05, 1.050466016749851e-05, 1.050374430633383e-05, 1.050310220307438e-05, 1.050297487381613e-05, 1.050303399097174e-05, 1.050259834300959e-05, 1.050235368893482e-05, 1.050242826750036e-05, 1.05020872069872e-05, 1.050268474500626e-05, 1.050276387104532e-05, 1.05029585029115e-05, 1.050316859618761e-05, 1.050325772666838e-05, 1.050321225193329e-05, 1.050318860507105e-05, 1.05031649582088e-05, 1.050311766448431e-05, 1.050307400873862e-05, 1.050306582328631e-05, 1.050311857397901e-05, 1.050307946570683e-05, 1.050302125804592e-05, 1.050297851179494e-05, 1.050296486937441e-05, 1.050299306371016e-05, 1.050307673722273e-05, 1.05031158454949e-05, 1.050311038852669e-05, 1.050310856953729e-05, 1.05031122075161e-05, 1.050312312145252e-05]
+valChiWatIsoCom[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.030309125781059e-03, 1.027848804369569e-03, 1.027713529765606e-03, 1.027705846354365e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.027705380693078e-03, 1.027705380693078e-03, 1.027705380693078e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 3.228010467378372e-17, 0e+00, 2.384834671020508e+01, 2.389784812927246e+01, 2.390041160583496e+01, 2.390055465698242e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01]
+hpCom[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.488286972045898e+01, 1.491534805297852e+01, 1.491705894470215e+01, 1.491715526580811e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.491716003417969e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 2.091874763687773e-11, 6.762821694557069e-16, 2.384919166564941e+01, 2.389786720275879e+01, 2.390042114257812e+01, 2.390056610107422e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+hpCom[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.488286972045898e+01, 1.491534805297852e+01, 1.491705894470215e+01, 1.491715526580811e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.491716003417969e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 2.091874763687773e-11, 6.762821694557069e-16, 2.384919166564941e+01, 2.389786720275879e+01, 2.390042114257812e+01, 2.390056610107422e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+datHp.mHeaWatHp_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+datHp.mChiWatHp_flow_nominal=[2.390057373046875e+01, 2.390057373046875e+01]
+pumPriHdr.bus.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumPriHdr.bus.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valHeaWatIsoHdr[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.488183879852295e+01, 1.491432094573975e+01, 1.491603183746338e+01, 1.491612815856934e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613388061523e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 1.491613292694092e+01, 2.092883158444359e-11, 0e+00, 8.448687149211764e-04, 1.907894693431444e-05, 1.086429074348416e-05, 1.052080460794969e-05, 1.050241007760633e-05, 1.050382343237288e-05, 1.050466016749851e-05, 1.050374430633383e-05, 1.050310220307438e-05, 1.050297487381613e-05, 1.050303399097174e-05, 1.050259834300959e-05, 1.050235368893482e-05, 1.050242826750036e-05, 1.05020872069872e-05, 1.050268474500626e-05, 1.050276387104532e-05, 1.05029585029115e-05, 1.050316859618761e-05, 1.050325772666838e-05, 1.050321225193329e-05, 1.050318860507105e-05, 1.05031649582088e-05, 1.050311766448431e-05, 1.050307400873862e-05, 1.050306582328631e-05, 1.050311857397901e-05, 1.050307946570683e-05, 1.050302125804592e-05, 1.050297851179494e-05, 1.050296486937441e-05, 1.050299306371016e-05, 1.050307673722273e-05, 1.05031158454949e-05, 1.050311038852669e-05, 1.050310856953729e-05, 1.05031122075161e-05, 1.050312312145252e-05]
+valChiWatIsoHdr[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.030309125781059e-03, 1.027848804369569e-03, 1.027713529765606e-03, 1.027705846354365e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.027705380693078e-03, 1.027705380693078e-03, 1.027705380693078e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 1.0277054971084e-03, 3.228010467378372e-17, 0e+00, 2.384834671020508e+01, 2.389784812927246e+01, 2.390041160583496e+01, 2.390055465698242e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01]
+hpHdr[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.488286972045898e+01, 1.491534805297852e+01, 1.491705894470215e+01, 1.491715526580811e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.491716003417969e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 2.091874763687773e-11, 6.762821694557069e-16, 2.384919166564941e+01, 2.389786720275879e+01, 2.390042114257812e+01, 2.390056610107422e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+hpHdr[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.488286972045898e+01, 1.491534805297852e+01, 1.491705894470215e+01, 1.491715526580811e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.491716003417969e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 1.4917160987854e+01, 2.091874763687773e-11, 6.762821694557069e-16, 2.384919166564941e+01, 2.389786720275879e+01, 2.390042114257812e+01, 2.390056610107422e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+pumPriSep.bus.pumHeaWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pumPriSep.bus.pumHeaWatPri.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pumPriSep.bus.pumChiWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pumPriSep.bus.pumChiWatPri.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valHeaWatIsoSep[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.486891460418701e+01, 1.493419742584229e+01, 1.493765735626221e+01, 1.493785190582275e+01, 1.493786334991455e+01, 1.493786239624023e+01, 1.493786239624023e+01, 1.493786239624023e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 1.493786334991455e+01, 6.103902539661421e-12, 1.851785414520822e-16, -5.938599933870137e-04, -2.03101517399773e-05, -1.1833705684694e-05, -1.147438251791755e-05, -1.145518035627902e-05, -1.145666919910582e-05, -1.145754504250363e-05, -1.145658461609855e-05, -1.145591159001924e-05, -1.145577971328748e-05, -1.14558406494325e-05, -1.145538499258691e-05, -1.145512942457572e-05, -1.145520764112007e-05, -1.145485020970227e-05, -1.145547594205709e-05, -1.145555870607495e-05, -1.145576243288815e-05, -1.145598253060598e-05, -1.145607529906556e-05, -1.145602800534107e-05, -1.145600253948942e-05, -1.145597798313247e-05, -1.145592887041857e-05, -1.145588248618878e-05, -1.145587430073647e-05, -1.145592977991328e-05, -1.14558888526517e-05, -1.145582700701198e-05, -1.145578244177159e-05, -1.145576879935106e-05, -1.145579881267622e-05, -1.145588612416759e-05, -1.145592614193447e-05, -1.145592068496626e-05, -1.145591886597686e-05, -1.145592250395566e-05, -1.145593432738679e-05]
+valChiWatIsoSep[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -7.094038664945401e-06, -7.156472747738007e-06, -7.159789220168022e-06, -7.159975666581886e-06, -7.159986580518307e-06, -7.159986125770956e-06, -7.159985671023605e-06, -7.159986125770956e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159987035265658e-06, -7.159987035265658e-06, -7.159987035265658e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -7.159986580518307e-06, -3.338870857094196e-19, -3.072839155599096e-22, 2.384926223754883e+01, 2.389786911010742e+01, 2.390042877197266e+01, 2.390057373046875e+01, 2.390058326721191e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058326721191e+01, 2.390058326721191e+01, 2.390058326721191e+01, 2.390058326721191e+01, 2.390058326721191e+01, 2.390058326721191e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01, 2.390058135986328e+01]
+hpSep[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.486890697479248e+01, 1.493418979644775e+01, 1.493764972686768e+01, 1.493784523010254e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.49378547668457e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785667419434e+01, 1.493785667419434e+01, 1.493785667419434e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 6.103902105980552e-12, 1.851782370496167e-16, 2.384866905212402e+01, 2.389784812927246e+01, 2.390041732788086e+01, 2.390056228637695e+01, 2.390057182312012e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01]
+hpSep[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.486890697479248e+01, 1.493418979644775e+01, 1.493764972686768e+01, 1.493784523010254e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.49378547668457e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785667419434e+01, 1.493785667419434e+01, 1.493785667419434e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 1.493785572052002e+01, 6.103902105980552e-12, 1.851782370496167e-16, 2.384866905212402e+01, 2.389784812927246e+01, 2.390041732788086e+01, 2.390056228637695e+01, 2.390057182312012e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390057182312012e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01, 2.390056991577148e+01]
+pumPriHea.bus.pumHeaWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pumPriHea.bus.pumHeaWatPri.y1[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pumPriHea.bus.pumHeaWatPri.y[1]=[8.500000238418579e-01, 8.500000238418579e-01]
+pumPriHea.bus.pumHeaWatPri.y[2]=[8.500000238418579e-01, 8.500000238418579e-01]
+priHeaWat.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.01706657409668e+01, 3.017179870605469e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 3.017180824279785e+01, 1.323356962207312e-11, 4.277547617974147e-16, 3.480861070239359e-26, 2.109944952471826e-33, 5.928473413019004e-41, -3.363116314379561e-44, 3.643376007244524e-44, -1.23314264860598e-43, -1.050973848243618e-43, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 1.401298464324817e-45, 0e+00, 1.401298464324817e-45, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hpHea[1].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.50853328704834e+01, 1.508589935302734e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 6.616784811036558e-12, 2.138773808987073e-16, 1.740430535119679e-26, 1.054972476235913e-33, 2.964166641586286e-41, -1.68155815718978e-44, 1.821688003622262e-44, -6.165713243029902e-44, -5.184804318001849e-44, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hpHea[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.50853328704834e+01, 1.508589935302734e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 1.508590412139893e+01, 6.616784811036558e-12, 2.138773808987073e-16, 1.740430535119679e-26, 1.054972476235913e-33, 2.964166641586286e-41, -1.68155815718978e-44, 1.821688003622262e-44, -6.165713243029902e-44, -5.184804318001849e-44, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt
new file mode 100644
index 00000000000..5c2b917a703
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Components_Validation_ValvesIsolation.txt
@@ -0,0 +1,39 @@
+last-generated=2024-04-02
+statistics-initialization=
+{
+  "nonlinear": "4",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": "0, 0",
+  "nonlinear": "4",
+  "number of continuous time states": "50",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 5e+03]
+valIsoCom.bus.valHeaWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+valIsoCom.bus.valHeaWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+valIsoCom.bus.valChiWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valIsoCom.bus.valChiWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valIsoCom.port_aHeaWat.m_flow=[2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.805559051921591e-05, 2.907778930664062e+01, 2.983209228515625e+01, 2.987341117858887e+01, 2.98757266998291e+01, 2.987582969665527e+01, 2.987585258483887e+01, 2.98758487701416e+01, 2.987584495544434e+01, 2.987584495544434e+01, 2.98758487701416e+01, 2.987585067749023e+01, 2.987585067749023e+01, 2.987585258483887e+01, 2.98758544921875e+01, 2.987585258483887e+01, 2.987585067749023e+01, 2.987585067749023e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.987584686279297e+01, 2.987584686279297e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 2.98758487701416e+01, 9.360809326171875e+00, 6.460335105657578e-02, 1.754832337610424e-03, 5.526585664483719e-05, 3.214812386431731e-05, 3.117730011581443e-05, 3.112421472906135e-05, 3.112946797045879e-05, 3.113295679213479e-05, 3.113135244348086e-05, 3.113032289547846e-05, 3.112990088993683e-05, 3.113018465228379e-05, 3.113033380941488e-05, 3.113026832579635e-05, 3.113026832579635e-05, 3.113034108537249e-05, 3.113045022473671e-05, 3.113046113867313e-05, 3.113047569058836e-05, 3.113048660452478e-05, 3.113049388048239e-05, 3.113050115644e-05, 3.113050479441881e-05, 3.113050843239762e-05, 3.113050843239762e-05, 3.113050479441881e-05, 3.113050115644e-05, 3.113050115644e-05, 3.113051570835523e-05, 3.113053026027046e-05, 3.113054481218569e-05, 3.113055572612211e-05, 3.113056664005853e-05, 3.113057755399495e-05, 3.113058846793137e-05, 3.113059574388899e-05, 3.11306030198466e-05, 3.113061029580422e-05, 3.113061757176183e-05]
+hpCom[1].m_flow=[1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.453886985778809e+01, 1.49160213470459e+01, 1.493668079376221e+01, 1.493783855438232e+01, 1.493789005279541e+01, 1.493790245056152e+01, 1.493789958953857e+01, 1.493789768218994e+01, 1.493789863586426e+01, 1.493789958953857e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790149688721e+01, 1.493790245056152e+01, 1.493790149688721e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 4.68038272857666e+00, 3.228082880377769e-02, 2.363654518127441e+01, 2.388632774353027e+01, 2.38997688293457e+01, 2.390052223205566e+01, 2.390056800842285e+01, 2.390056419372559e+01, 2.390056037902832e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01]
+hpCom[2].m_flow=[1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.18068765004864e-05, 1.453886985778809e+01, 1.49160213470459e+01, 1.493668079376221e+01, 1.493783855438232e+01, 1.493789005279541e+01, 1.493790245056152e+01, 1.493789958953857e+01, 1.493789768218994e+01, 1.493789863586426e+01, 1.493789958953857e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790149688721e+01, 1.493790245056152e+01, 1.493790149688721e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493790054321289e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 1.493789958953857e+01, 4.68038272857666e+00, 3.228082880377769e-02, 2.363654518127441e+01, 2.388632774353027e+01, 2.38997688293457e+01, 2.390052223205566e+01, 2.390056800842285e+01, 2.390056419372559e+01, 2.390056037902832e+01, 2.390056228637695e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056419372559e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01, 2.390056228637695e+01]
+datHp.mHeaWatHp_flow_nominal=[1.493785858154297e+01, 1.493785858154297e+01]
+valIsoCom.port_aChiWat.m_flow=[-4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.44183797299047e-06, -4.866123708779924e-05, -4.884227018919773e-05, -4.885218368144706e-05, -4.885274029220454e-05, -4.885276575805619e-05, -4.885277303401381e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.885277303401381e-05, -4.885277303401381e-05, -4.885277303401381e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.8852769396035e-05, -4.392912887851708e-05, -4.169091698713601e-05, 4.727133560180664e+01, 4.777259826660156e+01, 4.779950714111328e+01, 4.78010139465332e+01, 4.780110549926758e+01, 4.780109786987305e+01, 4.780109024047852e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109786987305e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01, 4.780109405517578e+01]
+datHp.mChiWatHp_flow_nominal=[2.390057373046875e+01, 2.390057373046875e+01]
+valIsoHeaInl.bus.valHeaWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+valIsoHeaInl.bus.valHeaWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+valIsoHeaInl.port_aHeaWat.m_flow=[9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 9.261469131160993e-06, 2.945842361450195e+01, 2.985311698913574e+01, 2.987445831298828e+01, 2.987565422058105e+01, 2.987570762634277e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.98757152557373e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.987571907043457e+01, 2.987571907043457e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 1.401859378814697e+01, 1.247987225651741e-01, 5.199505831114948e-04, 1.643824361963198e-05, 9.564101674186531e-06, 9.275388038076926e-06, 9.259601938538253e-06, 9.261164450435899e-06, 9.262200364901219e-06, 9.26172378967749e-06, 9.261418199457694e-06, 9.261292689188849e-06, 9.261376362701412e-06, 9.261420927941799e-06, 9.26140091905836e-06, 9.261401828553062e-06, 9.261423656425904e-06, 9.261455488740467e-06, 9.261459126719274e-06, 9.261462764698081e-06, 9.261466402676888e-06, 9.261469131160993e-06, 9.261470950150397e-06, 9.261471859645098e-06, 9.2614727691398e-06, 9.2614727691398e-06, 9.2614727691398e-06, 9.261470950150397e-06, 9.261470950150397e-06, 9.261475497623906e-06, 9.261479135602713e-06, 9.261483683076221e-06, 9.261487321055029e-06, 9.261490049539134e-06, 9.261493687517941e-06, 9.261496416002046e-06, 9.261499144486152e-06, 9.261501872970257e-06, 9.261503691959661e-06, 9.261505510949064e-06]
+hpHea[1].m_flow=[4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 1.472921180725098e+01, 1.492655849456787e+01, 1.493722915649414e+01, 1.493782711029053e+01, 1.493785381317139e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 7.009296894073486e+00, 6.239936128258705e-02, 2.599752915557474e-04, 8.219121809815988e-06, 4.782050837093266e-06, 4.637694019038463e-06, 4.629800969269127e-06, 4.63058222521795e-06, 4.631100182450609e-06, 4.630861894838745e-06, 4.630709099728847e-06, 4.630646344594425e-06, 4.630688181350706e-06, 4.6307104639709e-06, 4.63070045952918e-06, 4.630700914276531e-06, 4.630711828212952e-06, 4.630727744370233e-06, 4.630729563359637e-06, 4.63073138234904e-06, 4.630733201338444e-06, 4.630734565580497e-06, 4.630735475075198e-06, 4.630735929822549e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.630735475075198e-06, 4.630735475075198e-06, 4.630737748811953e-06, 4.630739567801356e-06, 4.630741841538111e-06, 4.630743660527514e-06, 4.630745024769567e-06, 4.63074684375897e-06, 4.630748208001023e-06, 4.630749572243076e-06, 4.630750936485128e-06, 4.63075184597983e-06, 4.630752755474532e-06]
+hpHea[2].m_flow=[4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 4.630734565580497e-06, 1.472921180725098e+01, 1.492655849456787e+01, 1.493722915649414e+01, 1.493782711029053e+01, 1.493785381317139e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 7.009296894073486e+00, 6.239936128258705e-02, 2.599752915557474e-04, 8.219121809815988e-06, 4.782050837093266e-06, 4.637694019038463e-06, 4.629800969269127e-06, 4.63058222521795e-06, 4.631100182450609e-06, 4.630861894838745e-06, 4.630709099728847e-06, 4.630646344594425e-06, 4.630688181350706e-06, 4.6307104639709e-06, 4.63070045952918e-06, 4.630700914276531e-06, 4.630711828212952e-06, 4.630727744370233e-06, 4.630729563359637e-06, 4.63073138234904e-06, 4.630733201338444e-06, 4.630734565580497e-06, 4.630735475075198e-06, 4.630735929822549e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.6307363845699e-06, 4.630735475075198e-06, 4.630735475075198e-06, 4.630737748811953e-06, 4.630739567801356e-06, 4.630741841538111e-06, 4.630743660527514e-06, 4.630745024769567e-06, 4.63074684375897e-06, 4.630748208001023e-06, 4.630749572243076e-06, 4.630750936485128e-06, 4.63075184597983e-06, 4.630752755474532e-06]
+valIsoSep.bus.valHeaWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+valIsoSep.bus.valHeaWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+valIsoSep.bus.valChiWatHpInlIso[1].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valIsoSep.bus.valChiWatHpInlIso[2].y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+busPumHeaWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+busPumChiWatPri.y1[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+valIsoSep.port_aHeaWat.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.967548179626465e+01, 2.986505699157715e+01, 2.987512397766113e+01, 2.987568664550781e+01, 2.987571334838867e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.98757152557373e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571907043457e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 2.987571716308594e+01, 1.200422487107611e-11, 1.279291859688299e-16, -1.933296144942031e-28, 5.557737290687775e-35, -3.70515819379185e-35, 3.018669492911634e-35, 3.676946329372115e-35, -4.890056499422401e-36, 1.112487853618165e-34, -2.463836159323515e-35, 2.336882769434708e-35, -7.593693506311977e-35, -2.218157840001657e-35, 1.504632769052528e-36, -9.215875710446734e-36, 2.93403389965243e-35, 9.968192094972998e-35, 6.770847460736376e-36, 1.175494350822288e-35, 1.88079096131566e-37, -5.078135595552068e-36, 5.416677968589101e-35, 2.275757063191949e-35, 3.502973165450417e-36, -1.072050847949926e-35, -1.755013065777675e-35, 1.292103390423858e-34, 1.278937853694649e-35, 8.087401133657338e-36, 3.31959604672214e-35, -2.313372882418262e-35, 1.410593220986745e-35, -3.385423730368188e-36, -2.849398306393225e-35, 4.607937855223367e-36, 2.557875707389298e-35, 5.679988703173293e-35, 3.573502826499754e-36, -7.899322037525772e-36, -3.526483052466863e-36]
+hpSep[1].m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1.483774089813232e+01, 1.493252849578857e+01, 1.493756198883057e+01, 1.493784332275391e+01, 1.493785667419434e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 6.002116772346744e-12, 6.424705861998956e-17, 2.381831741333008e+01, 2.3896240234375e+01, 2.390033149719238e+01, 2.390056037902832e+01, 2.390057563781738e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+hpSep[2].m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.483774089813232e+01, 1.493252849578857e+01, 1.493756198883057e+01, 1.493784332275391e+01, 1.493785667419434e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785762786865e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785953521729e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 1.493785858154297e+01, 6.002108098729364e-12, 6.367609223909115e-17, 2.381831741333008e+01, 2.3896240234375e+01, 2.390033149719238e+01, 2.390056037902832e+01, 2.390057563781738e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01, 2.390057373046875e+01]
+valIsoSep.port_aChiWat.m_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 6.817236483337054e-22, -6.041161334693668e-21, 4.763663482666016e+01, 4.779248046875e+01, 4.780066299438477e+01, 4.780112075805664e+01, 4.780115127563477e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01, 4.78011474609375e+01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt
new file mode 100644
index 00000000000..a42204dfa66
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Templates_Plants_HeatPumps_Validation_AirToWater.txt
@@ -0,0 +1,67 @@
+last-generated=2024-04-16
+statistics-initialization=
+{
+  "nonlinear": "8, 4, 0, 4, 0",
+  "numerical Jacobians": "0"
+}
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": "3, 7, 3, 1",
+  "number of continuous time states": "128",
+  "numerical Jacobians": "0"
+}
+time=[0e+00, 8.64e+04]
+pla.ctl.ctl.chaStaHea.capReq.y=[1.258794284086928e-12, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.738218875e+06, 1.395044875e+06, 2.15925075e+06, 1.408088874999999e+06, 1.612508625e+06, 1.50008725e+06, 1.428799e+06, 1.356448125e+06, 1.298150875e+06, 1.240637625e+06, 1.183244375e+06, 1.12594e+06, 1.068727375e+06, 1.0116113125e+06, 7.79978e+05, 6.89645375e+05, 4.6370609375e+05, 6.9958075e+05, 6.459871875e+05, 5.837309375e+05, 5.1896609375e+05, 4.43549375e+05, 2.43736203125e+05, 2.58046125e+05, 2.24217265625e+05, 1.94751125e+05, 1.7271053125e+05, 1.592018125e+05, 1.48163953125e+05, 1.379563125e+05, 1.280980312499999e+05, 1.190339374999999e+05, 1.112885156250001e+05, 1.02715125e+05, 9.3874875e+04, 8.50191875e+04, 7.6273234375e+04, 6.77122109375e+04, 5.940123046875e+04, 5.139734765625e+04, 4.3764953125e+04, 3.6575015625e+04, 2.999979296875e+04, 1.272487640380859e+00, 1.908457159996033e+00, 1.908457159996033e+00, 1.908457398414612e+00, 1.908457636833191e+00, 1.90845775604248e+00, 1.90845799446106e+00, 1.908458232879639e+00, 1.908458352088928e+00, 1.908458590507507e+00, 1.908458709716797e+00, 1.272305846214294e+00, 1.272305965423584e+00, 1.272305965423584e+00, 1.272306084632874e+00, 1.272306084632874e+00, 1.733322125e+06, 1.204532125e+06, 1.9518303125e+05, 1.01963375e+05, 7.68962109375e+04, 6.287693359375e+04, 5.489734375e+04, 5.10361640625e+04, 1.10550515625e+05, 8.767996875e+04, 7.177359375e+04, 6.67166484375e+04, 5.895090234375e+04, 5.121494921875e+04, 4.3714796875e+04, 3.65952578125e+04, 2.99598203125e+04]
+pla.ctl.ctl.chaStaCoo.capReq.y=[5.237759076755527e-30, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 2.072162628173828e-01, 2.072162628173828e-01, 4.144325256347656e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 6.216487884521484e-01, 4.14452463388443e-01, 1.446537625e+06, 7.168596875e+05, 2.37702328125e+05, 1.98810953125e+05, 1.9200734375e+05, 1.94089609375e+05, 2.00341609375e+05, 2.09135390625e+05, 2.1978353125e+05, 2.64065375e+05, 2.8702775e+05, 3.4537896875e+05, 4.1388971875e+05, 4.8443115625e+05, 6.120607499999986e+05, 6.204654375000007e+05, 6.924219374999998e+05, 7.6123575e+05, 8.279531875e+05, 8.988128125e+05, 9.655715625e+05, 1.0252150625e+06, 1.025217875e+06, 1.025217875e+06, 1.18901775e+06, 1.39353725e+06, 1.25993575e+06, 1.314249249999997e+06, 1.598960000000008e+06, 1.347974125000001e+06, 1.2842485e+06, 1.229854e+06, 1.17602275e+06, 1.122290875e+06, 1.068635875e+06, 1.01506125e+06, 9.287459375e+05, 8.53517875e+05, 8.64177625e+05, 7.164225625e+05, 6.672418125e+05, 6.06695e+05, 5.502411875e+05, 5.619501875e+05, 5.013804375e+05, 4.397754375e+05, 3.928755625e+05, 3.5279725e+05, 3.0261884375e+05, 2.5904590625e+05, 2.16440296875e+05, 1.7615953125e+05, 1.48169796875e+05, 1.27951359375e+05, 1.13483890625e+05, 9.97628046875e+04, 8.66303203125e+04, 7.4123625e+04, 6.232186328125e+04, 5.13290078125e+04]
+pla.capHea_nominal=[1.5e+06, 1.5e+06]
+pla.capCoo_nominal=[1.5e+06, 1.5e+06]
+pla.ctl.ctl.TOut=[2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803500061035156e+02, 2.803271179199219e+02, 2.802250061035156e+02, 2.800760803222656e+02, 2.799192504882812e+02, 2.7978515625e+02, 2.796492004394531e+02, 2.795054016113281e+02, 2.793543701171875e+02, 2.79180419921875e+02, 2.78813232421875e+02, 2.783184814453125e+02, 2.778377685546875e+02, 2.775109558105469e+02, 2.773639221191406e+02, 2.773429870605469e+02, 2.774158020019531e+02, 2.775499877929688e+02, 2.778485717773438e+02, 2.783305358886719e+02, 2.788376770019531e+02, 2.792117004394531e+02, 2.792019348144531e+02, 2.7877197265625e+02, 2.782787170410156e+02, 2.780851745605469e+02, 2.784633483886719e+02, 2.791992797851562e+02, 2.800370483398438e+02, 2.807322387695312e+02, 2.811102294921875e+02, 2.814264221191406e+02, 2.817133483886719e+02, 2.819428405761719e+02, 2.820916748046875e+02, 2.822079772949219e+02, 2.8231982421875e+02, 2.824382629394531e+02, 2.825740051269531e+02, 2.827179870605469e+02, 2.828619995117188e+02, 2.830060119628906e+02, 2.831499938964844e+02, 2.832940063476562e+02, 2.8343798828125e+02, 2.835820007324219e+02, 2.837260131835938e+02, 2.838602600097656e+02, 2.839751892089844e+02, 2.840852355957031e+02, 2.842052307128906e+02, 2.844744567871094e+02, 2.851714477539062e+02, 2.860440063476562e+02, 2.868031921386719e+02, 2.872106018066406e+02, 2.873927917480469e+02, 2.87399169921875e+02, 2.872411193847656e+02, 2.869067993164062e+02, 2.861957397460938e+02, 2.853059692382812e+02, 2.845506896972656e+02, 2.842350158691406e+02, 2.842123718261719e+02, 2.842542419433594e+02, 2.842902526855469e+02, 2.8425e+02, 2.841355285644531e+02, 2.840062255859375e+02, 2.838777770996094e+02, 2.837659301757812e+02, 2.837106323242188e+02, 2.837308044433594e+02, 2.837696838378906e+02, 2.8376904296875e+02, 2.836132202148438e+02, 2.831749877929688e+02, 2.826317749023438e+02, 2.821800842285156e+02, 2.820187072753906e+02, 2.821926574707031e+02, 2.824796752929688e+02, 2.826370239257812e+02, 2.824471740722656e+02, 2.820820007324219e+02, 2.816693420410156e+02, 2.81257568359375e+02, 2.80894287109375e+02, 2.805807189941406e+02, 2.803024597167969e+02, 2.800590515136719e+02, 2.798500061035156e+02]
+pla.ctl.ctl.TOutChiWatLck=[2.731499938964844e+02, 2.731499938964844e+02]
+pla.ctl.ctl.TOutHeaWatLck=[2.941499938964844e+02, 2.941499938964844e+02]
+pla.ctl.ctl.nReqPlaHeaWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01]
+pla.ctl.ctl.nReqPlaChiWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01]
+pla.ctl.ctl.enaHea.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.enaCoo.y1=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.idxStaHea.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.idxStaCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1Hp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1Hp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1Hp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1HeaHp[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1HeaHp[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1HeaHp[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumHeaWatPri[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1PumHeaWatPri[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1PumHeaWatPri[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumHeaWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.y1PumHeaWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumHeaWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumChiWatSec[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumChiWatSec[2]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.y1PumChiWatSec[3]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+pla.ctl.ctl.nReqResHeaWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.ctl.ctl.nReqResChiWat=[1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 1e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+dpHeaWatRem.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.019035546875e+04, 4.994772265625e+04, 4.992938671875e+04, 4.994034765625e+04, 4.99384609375e+04, 4.741953125e+04, 5.002693359375e+04, 5.001981640625e+04, 5.001912109375e+04, 5.00187578125e+04, 5.00183828125e+04, 5.001797265625e+04, 5.00175234375e+04, 5.001674609375e+04, 5.00159453125e+04, 5.00162421875e+04, 5.001988671875e+04, 5.001903515625e+04, 5.001809765625e+04, 5.001652734375e+04, 5.001485546875e+04, 5.0013453125e+04, 5.001208203125e+04, 5.00107109375e+04, 4.63125859375e+04, 4.50501640625e+04, 4.317498828125e+04, 4.130719921875e+04, 3.94449609375e+04, 3.7581859375e+04, 3.57201328125e+04, 3.4473046875e+04, 3.447319921875e+04, 3.447304296875e+04, 3.4473265625e+04, 3.44724765625e+04, 3.44722265625e+04, 3.447237890625e+04, 3.44720078125e+04, 3.447170703125e+04, 3.447162109375e+04, 3.44715625e+04, 3.44713359375e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.9609611328125e+04, 5.007026953125e+04, 5.0009453125e+04, 5.0002953125e+04, 5.000112109375e+04, 5.000033203125e+04, 4.999990234375e+04, 4.9999640625e+04, 4.99999140625e+04, 5.000084375e+04, 4.93841171875e+04, 4.751583203125e+04, 4.565595703125e+04, 4.379490234375e+04, 4.193424609375e+04, 4.008123046875e+04, 3.88200078125e+04]
+pla.bus.dpHeaWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.627280078125e+04, 4.50303984375e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.7576e+04, 3.57123984375e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.19243984375e+04, 4.006080078125e+04, 3.88183984375e+04]
+dpChiWatRem.y[1]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.627237890625e+04, 5.0071609375e+04, 5.000966015625e+04, 5.000171875e+04, 4.999914453125e+04, 4.999786328125e+04, 4.99970546875e+04, 4.99964765625e+04, 4.999601953125e+04, 4.9995625e+04, 4.935926171875e+04, 4.74794296875e+04, 4.5607703125e+04, 4.377408984375e+04, 4.25219453125e+04, 4.004271875e+04, 3.818495312500009e+04, 3.631321875e+04, 3.50575e+04, 3.4439328125e+04, 3.444573046875e+04, 3.75601171875e+04, 4.22172890625e+04, 4.686586328125e+04, 4.998576953125e+04, 4.99758515625e+04, 4.731867578125e+04, 4.863191015625004e+04, 5.00207265625e+04, 5.00182265625e+04, 5.001783984375e+04, 5.001752734375e+04, 5.001719140625e+04, 5.00168359375e+04, 5.001643359375e+04, 5.001575390625e+04, 5.00150390625e+04, 4.999158984375e+04, 5.00188515625e+04, 5.001811328125e+04, 5.0017328125e+04, 5.00163515625e+04, 5.001465625e+04, 5.00133515625e+04, 5.0012140625e+04, 4.876862890625e+04, 4.690468359375e+04, 4.691704296875e+04, 4.3191e+04, 4.13296171875e+04, 3.947559765625e+04, 3.8204234375e+04, 3.63379609375e+04, 3.44735859375e+04, 3.447212890625e+04, 3.447191015625e+04, 3.44717578125e+04, 3.447165234375e+04, 3.447158203125e+04, 3.447153515625e+04]
+pla.bus.dpChiWatRemSet[1]=[5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.937880078125e+04, 4.751519921875e+04, 4.56516015625e+04, 4.3788e+04, 4.25456015625e+04, 4.006080078125e+04, 3.819719921875009e+04, 3.63336015625e+04, 3.509119921875e+04, 3.447e+04, 3.447e+04, 3.7576e+04, 4.2235e+04, 4.6894e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 5e+04, 4.87576015625e+04, 4.6894e+04, 4.6894e+04, 4.316680078125e+04, 4.130319921875e+04, 3.94396015625e+04, 3.819719921875e+04, 3.63336015625e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04, 3.447e+04]
+pla.bus.VHeaWatPri_flow=[1.007309773032176e-20, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.494755875319242e-02, 1.494755875319242e-02, 2.98951156437397e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 4.48426716029644e-02, 2.98964586108923e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 2.989512495696545e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.21231167327096e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.818206030179681e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.212137323847173e-08, 1.488344930112362e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494757458567619e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02, 1.494756620377302e-02]
+pla.bus.VHeaWatSec_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.27068979293108e-02, 2.392168715596199e-02, 2.869600057601929e-02, 3.370730578899386e-02, 3.866399452090263e-02, 3.979230672121048e-02, 3.867768123745918e-02, 3.693468496203423e-02, 3.535657748579979e-02, 3.378832712769508e-02, 3.222274780273438e-02, 3.065956570208073e-02, 2.909888699650764e-02, 2.754084765911102e-02, 2.59858276695013e-02, 2.444655075669289e-02, 2.288700267672539e-02, 2.134236879646778e-02, 1.980366930365562e-02, 1.827108487486839e-02, 1.674598641693592e-02, 1.523003354668617e-02, 1.372553128749132e-02, 1.223562471568584e-02, 1.058720424771309e-02, 9.211184456944466e-03, 8.223206736147404e-03, 7.594768889248371e-03, 7.069556042551994e-03, 6.578564643859863e-03, 6.101504899561403e-03, 5.678171291947362e-03, 5.300253629684452e-03, 4.886162932962179e-03, 4.461185541003942e-03, 4.036272875964642e-03, 3.617116017267108e-03, 3.207257250323892e-03, 2.809646306559443e-03, 2.427103230729699e-03, 2.062753541395068e-03, 1.720024738460779e-03, 1.41066825017333e-03, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, -3.800257969453625e-21, 2.319440059363842e-02, 7.944194599986076e-03, 5.20489364862442e-03, 4.297798499464989e-03, 3.927465062588453e-03, 3.789354115724564e-03, 3.773604519665241e-03, 3.829773981124163e-03, 3.909375984221697e-03, 3.8022689986974e-03, 3.530575893819332e-03, 3.167125163599849e-03, 2.791740465909243e-03, 2.418982796370983e-03, 2.058098092675209e-03, 1.715816208161414e-03, 1.408181851729751e-03]
+datAll.pla.ctl.VHeaWatSec_flow_nominal=[4.092023521661758e-02, 4.092023521661758e-02]
+pla.bus.VChiWatPri_flow=[9.672343819892275e-38, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, 3.826573280463208e-09, 3.826573280463208e-09, 7.653146560926416e-09, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 1.147972028547883e-08, 7.653514266792172e-09, 2.460986562073231e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.461194060742855e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 4.922386258840561e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386258840561e-02, 7.383578270673752e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 7.383579015731812e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922385886311531e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 4.922386631369591e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02, 2.46119350194931e-02]
+pla.bus.VChiWatSec_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.629713505506516e-02, 1.420788839459419e-02, 1.059874333441257e-02, 9.734702296555042e-03, 9.71598457545042e-03, 1.00599518045783e-02, 1.057787332683802e-02, 1.117941550910473e-02, 1.181855890899897e-02, 1.24723082408309e-02, 1.412912458181381e-02, 1.693749986588955e-02, 2.02526580542326e-02, 2.362732402980328e-02, 2.710490301251415e-02, 2.998653426766399e-02, 3.337686136364937e-02, 3.650804236531258e-02, 3.995518013834953e-02, 4.332899302244186e-02, 4.652867838740349e-02, 5.052775517106056e-02, 5.388190969824791e-02, 5.709837377071381e-02, 5.967693030834198e-02, 6.247546523809433e-02, 6.369265913963318e-02, 6.336653977632521e-02, 6.073924899101259e-02, 5.830694362521174e-02, 5.594902113080025e-02, 5.359744653105736e-02, 5.124913528561592e-02, 4.890400916337967e-02, 4.656219109892845e-02, 4.422387853264809e-02, 4.188943654298782e-02, 3.957917168736458e-02, 3.723634779453278e-02, 3.491450473666191e-02, 3.26010137796402e-02, 3.029523603618145e-02, 2.799851261079311e-02, 2.5712875649333e-02, 2.344073355197906e-02, 2.10537500679493e-02, 1.876022480428219e-02, 1.671113818883896e-02, 1.430535223335028e-02, 1.219859533011913e-02, 1.014020759612322e-02, 8.298836648464203e-03, 7.012711837887764e-03, 6.063510198146105e-03, 5.378038622438908e-03, 4.722222685813904e-03, 4.09470172598958e-03, 3.497552126646042e-03, 2.934713382273912e-03, 2.411283319815993e-03]
+datAll.pla.ctl.VChiWatSec_flow_nominal=[6.547237932682037e-02, 6.547237932682037e-02]
+pla.hp.hp[1].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 7.113388180732721e-01, 8.197328448295593e-01, 7.587156295776367e-01, 7.290744185447693e-01, 6.983977556228638e-01, 6.710326671600342e-01, 6.374410390853881e-01, 6.00588083267212e-01, 5.636855959892273e-01, 5.290902853012085e-01, 4.979304671287537e-01, 3.770880103111267e-01, 0e+00, 1e+00, 1e+00, 3.752968609333038e-01, 3.066294491291046e-01, 2.90405660867691e-01, 2.885490357875824e-01, 2.933740019798279e-01, 3.018896281719208e-01, 3.122657537460327e-01, 3.690943121910095e-01, 3.977571725845337e-01, 4.746553003787994e-01, 5.635239481925964e-01, 6.535659432411194e-01, 4.349082410335528e-01, 4.32482779026032e-01, 4.806352853775023e-01, 5.260821580886841e-01, 5.698549747467041e-01, 6.187641620635986e-01, 6.659283041954041e-01, 7.087083458900452e-01, 7.11086094379425e-01, 7.121535539627075e-01, 8.260886669158936e-01, 9.931967854499817e-01, 9.325844645500183e-01, 9.999999999999991e-01, 8.409478068351778e-01, 7.110815644264226e-01, 6.780248880386353e-01, 6.513825654983521e-01, 6.252351999282837e-01, 5.989060401916504e-01, 5.720027685165405e-01, 5.445915460586548e-01, 4.967239499092102e-01, 4.491490721702576e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 2.833462059497833e-01, 1.389729827642441e-01, 1.024796068668365e-01, 8.279170840978622e-02, 7.169155031442642e-02, 6.540237367153168e-02, 1.478535979986191e-01, 1.167747899889946e-01, 1.005468592047691e-01, 9.516428411006927e-02, 8.466219156980515e-02, 7.40029439330101e-02, 6.352165341377258e-02, 5.343592166900635e-02, 4.38891313970089e-02]
+pla.hp.hp[2].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 7.113388180732721e-01, 8.197328448295593e-01, 7.587156295776367e-01, 7.290744185447693e-01, 6.983977556228638e-01, 6.710326671600342e-01, 6.374410390853881e-01, 6.00588083267212e-01, 5.636855959892273e-01, 5.290902853012085e-01, 4.979304671287537e-01, 3.770880103111267e-01, 4.656138718128204e-01, 3.240569233894348e-01, 4.966585040092468e-01, 4.554415047168732e-01, 4.082226455211639e-01, 3.595183789730072e-01, 3.04851770401001e-01, 1.65391206741333e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.349082112312304e-01, 4.32482779026032e-01, 4.806352853775023e-01, 5.260821580886841e-01, 5.698549747467041e-01, 6.187641620635986e-01, 6.659283041954041e-01, 7.087083458900452e-01, 7.11086094379425e-01, 7.121535539627075e-01, 8.260886669158936e-01, 9.931967854499817e-01, 9.325844645500183e-01, 9.999999999999991e-01, 8.409478068351778e-01, 7.110815644264226e-01, 6.780248880386353e-01, 6.513825654983521e-01, 6.252351999282837e-01, 5.989060401916504e-01, 5.720027685165405e-01, 5.445915460586548e-01, 4.967239499092102e-01, 4.491490721702576e-01, 6.612727046012878e-01, 5.35692572593689e-01, 4.928664863109589e-01, 4.438030421733856e-01, 3.982727825641632e-01, 4.011670351028442e-01, 3.525660932064056e-01, 3.086113035678864e-01, 2.757651507854462e-01, 4.832163453102112e-01, 4.188123047351837e-01, 3.622855544090271e-01, 3.054287135601044e-01, 2.496859580278397e-01, 2.100804299116135e-01, 1.813410371541977e-01, 1.606491357088089e-01, 1.411672830581665e-01, 1.225820779800415e-01, 1.049113944172859e-01, 8.825310319662094e-02, 7.274230569601059e-02]
+pla.hp.hp[3].hp.PLR=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.113388180732721e-01, 8.197328448295593e-01, 7.587156295776367e-01, 7.290744185447693e-01, 6.983977556228638e-01, 6.710326671600342e-01, 6.374410390853881e-01, 6.00588083267212e-01, 5.636855959892273e-01, 5.290902853012085e-01, 4.979304671287537e-01, 3.770880103111267e-01, 4.656138718128204e-01, 3.240569233894348e-01, 4.966585040092468e-01, 4.554415047168732e-01, 4.082226455211639e-01, 3.595183789730072e-01, 3.04851770401001e-01, 1.65391206741333e-01, 3.570818901062012e-01, 3.101485073566437e-01, 2.689316868782043e-01, 2.376659512519836e-01, 2.185408920049667e-01, 2.029924541711807e-01, 1.886816918849945e-01, 1.749517172574996e-01, 1.622058451175689e-01, 1.514919847249986e-01, 1.396424472332001e-01, 1.271640807390213e-01, 1.140115112066269e-01, 1.010032519698143e-01, 8.87102335691452e-02, 7.740301638841629e-02, 6.683884561061859e-02, 5.694959685206413e-02, 4.774283990263939e-02, 3.936440497636795e-02, 0e+00, 8.409476280212435e-01, 7.110815644264226e-01, 6.780248880386353e-01, 6.513825654983521e-01, 6.252351999282837e-01, 5.989060401916504e-01, 5.720027685165405e-01, 5.445915460586548e-01, 4.967239499092102e-01, 4.491490721702576e-01, 6.612727046012878e-01, 5.35692572593689e-01, 4.928664863109589e-01, 4.438030421733856e-01, 3.982727825641632e-01, 4.011670351028442e-01, 3.525660932064056e-01, 3.086113035678864e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+pla.bus.THeaWatSupSet=[3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.211499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.191499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.211499938964844e+02, 3.191499938964844e+02, 3.151499938964844e+02, 3.131499938964844e+02, 3.101499938964844e+02, 3.071499938964844e+02, 3.041499938964844e+02, 3.011499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.201499938964844e+02, 3.171499938964844e+02, 3.141499938964844e+02, 3.111499938964844e+02, 3.081499938964844e+02, 3.051499938964844e+02, 3.031499938964844e+02, 3.001499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+pla.bus.THeaWatPriSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.055133666992188e+02, 3.09009521484375e+02, 3.131914367675781e+02, 3.171499938964844e+02, 3.191256103515625e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.212217407226562e+02, 3.179152221679688e+02, 3.159583129882812e+02, 3.13150146484375e+02, 3.101505737304688e+02, 3.071518249511719e+02, 3.041559753417969e+02, 3.011696472167969e+02, 2.982141723632812e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.979535522460938e+02, 2.933735656738281e+02, 3.135010070800781e+02, 3.201606140136719e+02, 3.171797790527344e+02, 3.142301330566406e+02, 3.113530578613281e+02, 3.086184997558594e+02, 3.060284118652344e+02, 3.031508178710938e+02, 3.001526184082031e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+pla.bus.THeaWatSecSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.016728515625e+02, 3.050049133300781e+02, 3.129789123535156e+02, 3.171499938964844e+02, 3.190147705078125e+02, 3.231499633789062e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.231499938964844e+02, 3.21406982421875e+02, 3.169868774414062e+02, 3.164731750488281e+02, 3.131581420898438e+02, 3.101680603027344e+02, 3.071890258789062e+02, 3.042329406738281e+02, 3.013215942382812e+02, 2.984884338378906e+02, 2.981460266113281e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.981499633789062e+02, 2.958172607421875e+02, 3.1180712890625e+02, 3.204019470214844e+02, 3.175479736328125e+02, 3.147180480957031e+02, 3.1191943359375e+02, 3.091109313964844e+02, 3.062209167480469e+02, 3.032622680664062e+02, 3.003167724609375e+02, 2.981591796875e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02, 2.981499938964844e+02]
+pla.bus.THeaWatPriRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.952333068847656e+02, 2.98744873046875e+02, 3.028106689453125e+02, 3.096117858886719e+02, 3.105174255371094e+02, 3.151192932128906e+02, 3.155009155273438e+02, 3.158882446289062e+02, 3.162003479003906e+02, 3.165082397460938e+02, 3.168154907226562e+02, 3.171222839355469e+02, 3.174285583496094e+02, 3.177343444824219e+02, 3.169743957519531e+02, 3.136122131347656e+02, 3.114263305664062e+02, 3.075321960449219e+02, 3.049625549316406e+02, 3.024624938964844e+02, 2.999825744628906e+02, 2.975881958007812e+02, 2.961927490234375e+02, 2.940056457519531e+02, 2.945489501953125e+02, 2.950221862792969e+02, 2.953761901855469e+02, 2.955931396484375e+02, 2.957704162597656e+02, 2.959343566894531e+02, 2.960926818847656e+02, 2.962382507324219e+02, 2.963626403808594e+02, 2.965003356933594e+02, 2.96642333984375e+02, 2.967845458984375e+02, 2.969250183105469e+02, 2.970625e+02, 2.971959838867188e+02, 2.973245239257812e+02, 2.974471130371094e+02, 2.975625915527344e+02, 2.976681823730469e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518432617188e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.979518127441406e+02, 2.951920471191406e+02, 3.038046264648438e+02, 3.170152587890625e+02, 3.155124206542969e+02, 3.129150085449219e+02, 3.101401672363281e+02, 3.07268310546875e+02, 3.04330322265625e+02, 3.0137451171875e+02, 2.987418212890625e+02, 2.969972839355469e+02, 2.970784912109375e+02, 2.972032165527344e+02, 2.973274536132812e+02, 2.974479064941406e+02, 2.97562255859375e+02, 2.976688232421875e+02]
+pla.bus.THeaWatSecRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.954781494140625e+02, 2.989821472167969e+02, 3.025788879394531e+02, 3.071948547363281e+02, 3.095608825683594e+02, 3.141005249023438e+02, 3.143046875e+02, 3.143474731445312e+02, 3.14349853515625e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.143500061035156e+02, 3.135062561035156e+02, 3.100057067871094e+02, 3.094124755859375e+02, 3.051549987792969e+02, 3.021720581054688e+02, 2.992724304199219e+02, 2.963900146484375e+02, 2.937135620117188e+02, 2.931816711425781e+02, 2.931517944335938e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931499938964844e+02, 3.001830749511719e+02, 3.108709106445312e+02, 3.094364013671875e+02, 3.0666162109375e+02, 3.038128662109375e+02, 3.009473266601562e+02, 2.980517578125e+02, 2.951416931152344e+02, 2.933062744140625e+02, 2.931587829589844e+02, 2.931504821777344e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
+pla.bus.TChiWatSupSet=[2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.811099853515625e+02, 2.820700073242188e+02, 2.830299987792969e+02, 2.83989990234375e+02, 2.849500122070312e+02, 2.859100036621094e+02, 2.868699951171875e+02, 2.87510009765625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.873500061035156e+02, 2.849500122070312e+02, 2.833500061035156e+02, 2.809500122070312e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299926757812e+02, 2.8175e+02, 2.833500061035156e+02, 2.843099975585938e+02, 2.852699890136719e+02, 2.862300109863281e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
+pla.bus.TChiWatPriSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.915420532226562e+02, 2.812734985351562e+02, 2.811098022460938e+02, 2.820693664550781e+02, 2.830278625488281e+02, 2.839828796386719e+02, 2.849266052246094e+02, 2.858369445800781e+02, 2.866724243164062e+02, 2.875099792480469e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.88152587890625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.874651184082031e+02, 2.854646301269531e+02, 2.833500061035156e+02, 2.810612182617188e+02, 2.801533508300782e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804700012207031e+02, 2.814299621582031e+02, 2.8175e+02, 2.833476867675781e+02, 2.842955627441406e+02, 2.851905822753906e+02, 2.859424743652344e+02, 2.868699951171875e+02, 2.878299865722656e+02, 2.881499938964844e+02, 2.882510986328125e+02, 2.881500244140625e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
+pla.bus.TChiWatSecSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.946083068847656e+02, 2.821069946289062e+02, 2.810708923339844e+02, 2.820111083984375e+02, 2.829419250488281e+02, 2.838599243164062e+02, 2.847622680664062e+02, 2.856518249511719e+02, 2.865492248535156e+02, 2.874876708984375e+02, 2.881488952636719e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.883235473632812e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.882727661132812e+02, 2.885780944824219e+02, 2.88833984375e+02, 2.8871142578125e+02, 2.869765319824219e+02, 2.847655029296875e+02, 2.825459289550781e+02, 2.802392578125001e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.801499938964844e+02, 2.804693908691406e+02, 2.81427978515625e+02, 2.817500305175781e+02, 2.832932739257812e+02, 2.841885070800781e+02, 2.85038818359375e+02, 2.859113159179688e+02, 2.868682861328125e+02, 2.878261413574219e+02, 2.881499938964844e+02, 2.881553649902344e+02, 2.881506652832031e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02, 2.881499938964844e+02]
+pla.bus.TChiWatPriRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.942607421875e+02, 2.871422729492188e+02, 2.834285583496094e+02, 2.840092163085938e+02, 2.8490283203125e+02, 2.858831481933594e+02, 2.869041442871094e+02, 2.879499206542969e+02, 2.890137634277344e+02, 2.90085693359375e+02, 2.909496765136719e+02, 2.915188293457031e+02, 2.921871032714844e+02, 2.928751525878906e+02, 2.911350402832031e+02, 2.91176025390625e+02, 2.915269470214844e+02, 2.91862548828125e+02, 2.921879272460938e+02, 2.925335083007812e+02, 2.928591003417969e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931488647460938e+02, 2.917463073730469e+02, 2.894947204589844e+02, 2.87359619140625e+02, 2.853487548828125e+02, 2.8453271484375e+02, 2.843255310058594e+02, 2.84148681640625e+02, 2.839736633300781e+02, 2.837989501953125e+02, 2.8362451171875e+02, 2.834503173828125e+02, 2.834896850585938e+02, 2.84205078125e+02, 2.85964599609375e+02, 2.86843994140625e+02, 2.875641479492188e+02, 2.882288513183594e+02, 2.889135437011719e+02, 2.896106262207031e+02, 2.902752380371094e+02, 2.902947998046875e+02, 2.900660705566406e+02, 2.915911865234375e+02, 2.911017456054688e+02, 2.906767272949219e+02, 2.902611694335938e+02, 2.898682556152344e+02, 2.895952453613281e+02, 2.893980407714844e+02, 2.892569274902344e+02, 2.891230773925781e+02, 2.889949951171875e+02, 2.888730163574219e+02, 2.887579040527344e+02, 2.886506652832031e+02]
+pla.bus.TChiWatSecRet=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.951005554199219e+02, 2.891943359375e+02, 2.865514526367188e+02, 2.87279541015625e+02, 2.881900939941406e+02, 2.891069946289062e+02, 2.90020751953125e+02, 2.909332580566406e+02, 2.918516845703125e+02, 2.927826538085938e+02, 2.931285705566406e+02, 2.931488037109375e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931431884765625e+02, 2.9168212890625e+02, 2.894212341308594e+02, 2.872768249511719e+02, 2.86299560546875e+02, 2.8568798828125e+02, 2.85652099609375e+02, 2.856501159667969e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.856499938964844e+02, 2.858027954101562e+02, 2.866371154785156e+02, 2.872953796386719e+02, 2.883856201171875e+02, 2.893705749511719e+02, 2.902843933105469e+02, 2.912059936523438e+02, 2.921395874023438e+02, 2.929870300292969e+02, 2.931408386230469e+02, 2.931494750976562e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_AirHeating.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_AirHeating.txt
index 14d1750042f..edff9d293ac 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_AirHeating.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_AirHeating.txt
@@ -1,14 +1,14 @@
-last-generated=2024-03-22
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "6",
+  "number of continuous time states": "7",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-zon.TAir=[2.931499938964844e+02, 2.905975036621094e+02, 2.898280029296875e+02, 2.896367492675781e+02, 2.891466064453125e+02, 2.8880029296875e+02, 2.890074462890625e+02, 2.890112609863281e+02, 2.892101440429688e+02, 2.893121643066406e+02, 2.892649536132812e+02, 2.891604309082031e+02, 2.889787292480469e+02, 2.892785949707031e+02, 2.892185363769531e+02, 2.891822814941406e+02, 2.891604919433594e+02, 2.891444396972656e+02, 2.891405639648438e+02, 2.891340026855469e+02, 2.891351318359375e+02, 2.891326293945312e+02, 2.891325988769531e+02, 2.891315002441406e+02, 2.891310424804688e+02, 2.891334533691406e+02, 2.919361267089844e+02, 2.920803833007812e+02, 2.920917358398438e+02, 2.923363342285156e+02, 2.924425659179688e+02, 2.925794372558594e+02, 2.92880859375e+02, 2.932921752929688e+02, 2.937534484863281e+02, 2.942726745605469e+02, 2.947989501953125e+02, 2.953020935058594e+02, 2.953653869628906e+02, 2.953696899414062e+02, 2.953438720703125e+02, 2.953099060058594e+02, 2.952958679199219e+02, 2.9526416015625e+02, 2.952568359375e+02, 2.952338256835938e+02, 2.952240295410156e+02, 2.952077026367188e+02, 2.951955871582031e+02, 2.95178466796875e+02, 2.951644592285156e+02, 2.951530456542969e+02, 2.951441040039062e+02, 2.951437072753906e+02, 2.951455383300781e+02, 2.951422729492188e+02, 2.951449279785156e+02, 2.951461181640625e+02, 2.951452941894531e+02, 2.951436462402344e+02, 2.951432189941406e+02, 2.951404724121094e+02, 2.951318359375e+02, 2.951294555664062e+02, 2.951183776855469e+02, 2.951163024902344e+02, 2.951177673339844e+02, 2.951121826171875e+02, 2.951154479980469e+02, 2.951085205078125e+02, 2.951159362792969e+02, 2.951164855957031e+02, 2.951202087402344e+02, 2.951212158203125e+02, 2.95122314453125e+02, 2.951264038085938e+02, 2.9149951171875e+02, 2.905387878417969e+02, 2.902023315429688e+02, 2.899461364746094e+02, 2.8968798828125e+02, 2.894812622070312e+02, 2.893065185546875e+02, 2.891438598632812e+02, 2.889838562011719e+02, 2.892087707519531e+02, 2.888693237304688e+02, 2.893319091796875e+02, 2.892625427246094e+02, 2.889898071289062e+02, 2.892807006835938e+02, 2.8890185546875e+02, 2.891525573730469e+02, 2.892961120605469e+02, 2.893505859375e+02, 2.892500915527344e+02, 2.89159423828125e+02, 2.889948425292969e+02, 2.889743041992188e+02, 2.891087036132812e+02, 2.893273315429688e+02]
+zon.TAir=[2.931499938964844e+02, 2.905974426269531e+02, 2.898280029296875e+02, 2.896367492675781e+02, 2.891466064453125e+02, 2.8880029296875e+02, 2.890074768066406e+02, 2.890112609863281e+02, 2.892101135253906e+02, 2.893121643066406e+02, 2.892649536132812e+02, 2.891605529785156e+02, 2.8897509765625e+02, 2.89278564453125e+02, 2.892185363769531e+02, 2.891822509765625e+02, 2.891604614257812e+02, 2.891444396972656e+02, 2.891405639648438e+02, 2.891339721679688e+02, 2.891351318359375e+02, 2.891326293945312e+02, 2.891325988769531e+02, 2.891315002441406e+02, 2.891310424804688e+02, 2.891334533691406e+02, 2.919361267089844e+02, 2.920803833007812e+02, 2.920917358398438e+02, 2.923363342285156e+02, 2.924425659179688e+02, 2.925794372558594e+02, 2.92880859375e+02, 2.932921752929688e+02, 2.937534484863281e+02, 2.942726745605469e+02, 2.947989501953125e+02, 2.953020935058594e+02, 2.953654479980469e+02, 2.953696899414062e+02, 2.953439025878906e+02, 2.953099060058594e+02, 2.952958679199219e+02, 2.9526416015625e+02, 2.952568359375e+02, 2.952337646484375e+02, 2.952240295410156e+02, 2.952077026367188e+02, 2.951955871582031e+02, 2.95178466796875e+02, 2.951644592285156e+02, 2.951530456542969e+02, 2.951440734863281e+02, 2.951437072753906e+02, 2.951455383300781e+02, 2.951422729492188e+02, 2.951449279785156e+02, 2.951461181640625e+02, 2.951452941894531e+02, 2.951436462402344e+02, 2.951432189941406e+02, 2.951404724121094e+02, 2.951318359375e+02, 2.951294555664062e+02, 2.951183776855469e+02, 2.951163024902344e+02, 2.951177673339844e+02, 2.951121826171875e+02, 2.95115478515625e+02, 2.951085205078125e+02, 2.951159362792969e+02, 2.951164855957031e+02, 2.951202392578125e+02, 2.951212158203125e+02, 2.95122314453125e+02, 2.951264038085938e+02, 2.9149951171875e+02, 2.90538818359375e+02, 2.902023315429688e+02, 2.899461364746094e+02, 2.8968798828125e+02, 2.894812622070312e+02, 2.893064880371094e+02, 2.891438598632812e+02, 2.889838562011719e+02, 2.892088623046875e+02, 2.888693237304688e+02, 2.893319091796875e+02, 2.892625427246094e+02, 2.889898071289062e+02, 2.892807312011719e+02, 2.8890185546875e+02, 2.89152587890625e+02, 2.892961730957031e+02, 2.893504638671875e+02, 2.892499694824219e+02, 2.891589050292969e+02, 2.889938049316406e+02, 2.889754028320312e+02, 2.891094360351562e+02, 2.893273010253906e+02]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
-conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 6.204375624656677e-02, 5.000894665718079e-01, 3.240266442298889e-01, 3.34774345159532e-01, 1.555277705192566e-01, 7.339797914028168e-02, 1.270624101161957e-01, 2.352510541677475e-01, 3.963909149169922e-01, 5.715589970350266e-02, 7.086147367954257e-02, 8.346465229988098e-02, 9.554176777601242e-02, 1.110230088233948e-01, 1.188340783119202e-01, 1.317672431468964e-01, 1.38006404042244e-01, 1.478968858718872e-01, 1.561960428953171e-01, 1.657558232545853e-01, 1.75181046128273e-01, 1.815540641546249e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 7.41390585899353e-01, 5.540232062339783e-01, 4.46751743555069e-01, 3.733109533786774e-01, 3.222463726997375e-01, 2.620530426502228e-01, 2.311723828315735e-01, 1.852947622537613e-01, 1.628521829843521e-01, 1.351675987243652e-01, 1.200762093067169e-01, 1.068685501813889e-01, 1.062501668930054e-01, 1.10518679022789e-01, 1.180628091096878e-01, 1.279508769512177e-01, 1.313869655132294e-01, 1.320807486772537e-01, 1.385575085878372e-01, 1.389377117156982e-01, 1.398139894008635e-01, 1.426444351673126e-01, 1.47103562951088e-01, 1.503020823001862e-01, 1.569872498512268e-01, 1.720726937055588e-01, 1.836519986391068e-01, 2.070771008729935e-01, 2.248480618000031e-01, 2.392954528331757e-01, 2.619183361530304e-01, 2.763180434703827e-01, 3.025003075599668e-01, 3.1314417719841e-01, 3.284664154052734e-01, 3.39714378118515e-01, 3.525640070438385e-01, 3.649934530258179e-01, 3.734695017337799e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.936442896723747e-02, 2.504878342151642e-01, 1.348235011100769e-01, 4.772644639015198e-01, 3.990688920021057e-02, 1.119210571050644e-01, 3.941764533519745e-01, 1.098287329077721e-01, 5.01825749874115e-01, 2.411795258522034e-01, 1.019157841801643e-01, 5.096433684229851e-02, 1.56347319483757e-01, 2.451075911521912e-01, 4.061127603054047e-01, 4.128643870353699e-01, 2.735348045825958e-01, 5.586325377225876e-02]
-hea.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.94278157223016e-04, 6.041342616081238e-01, -2.755625727601773e-09, 3.102644541286281e-07, 6.041837930679321e-01, 6.041840314865112e-01, 6.041837930679321e-01, 1.044515300918647e-07, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 1.271782917693087e-12, 8.499571299813488e-17, -1.852140018572379e-25, -1.598136409243771e-31, 4.57674420031152e-38, 5.156778348715327e-43, 0e+00, -0e+00, 0e+00, 6.041839122772217e-01, -1.121879997924389e-15, 5.463074147701263e-02, -1.680484587041065e-07, 1.60567323326255e-11, -2.676193844308727e-06, 3.649048879742622e-02, 5.697314975350309e-08, 1.029925188049674e-04, 6.041840314865112e-01, 6.041840314865112e-01, 6.041862368583679e-01, 6.034294962882996e-01, 6.712423394894529e-10, 4.843258949449591e-08, 6.041840314865112e-01]
-hea.TSet=[2.951499938964844e+02, 2.925975036621094e+02, 2.918280029296875e+02, 2.916367492675781e+02, 2.916429748535156e+02, 2.948009948730469e+02, 2.935996704101562e+02, 2.93689453125e+02, 2.92454345703125e+02, 2.918993530273438e+02, 2.922814636230469e+02, 2.930424499511719e+02, 2.941498718261719e+02, 2.9173583984375e+02, 2.917854309082031e+02, 2.918499755859375e+02, 2.919248046875e+02, 2.920326232910156e+02, 2.920912475585938e+02, 2.921881408691406e+02, 2.922391967773438e+02, 2.923157958984375e+02, 2.923821716308594e+02, 2.924575500488281e+02, 2.925325012207031e+02, 2.925858764648438e+02, 3.019361267089844e+02, 3.020803833007812e+02, 3.020917358398438e+02, 3.023363342285156e+02, 3.024425659179688e+02, 3.025794372558594e+02, 3.02880859375e+02, 3.032921752929688e+02, 3.037534484863281e+02, 3.042726745605469e+02, 3.047989501953125e+02, 3.032332153320312e+02, 3.017975769042969e+02, 3.009436950683594e+02, 3.003303527832031e+02, 2.998878784179688e+02, 2.993923034667969e+02, 2.991135559082031e+02, 2.987391967773438e+02, 2.9853662109375e+02, 2.983053588867188e+02, 2.981683044433594e+02, 2.98050537109375e+02, 2.980284729003906e+02, 2.980486145019531e+02, 2.980975341796875e+02, 2.981676940917969e+02, 2.981947937011719e+02, 2.982021789550781e+02, 2.98250732421875e+02, 2.982564392089844e+02, 2.982646484375e+02, 2.982864685058594e+02, 2.983204650878906e+02, 2.983456420898438e+02, 2.983963623046875e+02, 2.985084228515625e+02, 2.985986633300781e+02, 2.987749938964844e+02, 2.989150695800781e+02, 2.990321350097656e+02, 2.992075500488281e+02, 2.993260192871094e+02, 2.995285339355469e+02, 2.996210632324219e+02, 2.997442016601562e+02, 2.998379211425781e+02, 2.999417419433594e+02, 3.000422668457031e+02, 3.001141662597656e+02, 2.9349951171875e+02, 2.925387878417969e+02, 2.922023315429688e+02, 2.919461364746094e+02, 2.9168798828125e+02, 2.914812622070312e+02, 2.913065185546875e+02, 2.915387573242188e+02, 2.929877624511719e+02, 2.92287353515625e+02, 2.946874694824219e+02, 2.916511535644531e+02, 2.921578979492188e+02, 2.941432189941406e+02, 2.921593322753906e+02, 2.949164428710938e+02, 2.930820007324219e+02, 2.921114501953125e+02, 2.9175830078125e+02, 2.925008544921875e+02, 2.931203002929688e+02, 2.942437438964844e+02, 2.942772216796875e+02, 2.932969970703125e+02, 2.917742309570312e+02]
+conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 6.204868853092194e-02, 5.00091016292572e-01, 3.240168392658234e-01, 3.347656130790724e-01, 1.555400490760803e-01, 7.340600341558456e-02, 1.27049595117569e-01, 2.351304292678833e-01, 4.002898037433624e-01, 5.71836456656456e-02, 7.086351513862613e-02, 8.346352726221085e-02, 9.553855657577515e-02, 1.110192462801933e-01, 1.188457831740379e-01, 1.317718327045441e-01, 1.380046904087067e-01, 1.478962153196335e-01, 1.561951339244843e-01, 1.657534241676331e-01, 1.751820147037506e-01, 1.815519034862518e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 7.413923740386963e-01, 5.539713501930237e-01, 4.467540979385376e-01, 3.732977509498596e-01, 3.222503066062927e-01, 2.620514333248138e-01, 2.311736047267914e-01, 1.852932423353195e-01, 1.62893071770668e-01, 1.351646482944489e-01, 1.200751885771751e-01, 1.068625226616859e-01, 1.062370017170906e-01, 1.105195507407188e-01, 1.180664375424385e-01, 1.279532909393311e-01, 1.313901990652084e-01, 1.320809870958328e-01, 1.385592818260193e-01, 1.389401108026504e-01, 1.398191303014754e-01, 1.426458358764648e-01, 1.471009403467178e-01, 1.50302454829216e-01, 1.569779217243195e-01, 1.7207270860672e-01, 1.836568713188171e-01, 2.070777267217636e-01, 2.248490005731583e-01, 2.392934411764145e-01, 2.619189620018005e-01, 2.763127386569977e-01, 3.025038242340085e-01, 3.131421804428101e-01, 3.284665644168854e-01, 3.397115468978882e-01, 3.525615036487579e-01, 3.649951815605164e-01, 3.734678626060486e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.93660643696785e-02, 2.504920959472656e-01, 1.347406208515167e-01, 4.772616028785706e-01, 3.9894700050354e-02, 1.119170933961868e-01, 3.941724598407745e-01, 1.098115518689156e-01, 5.018240213394165e-01, 2.411689460277557e-01, 1.018572673201561e-01, 5.10706938803196e-02, 1.564855724573135e-01, 2.456310987472534e-01, 4.071093499660492e-01, 4.116753041744232e-01, 2.727814316749573e-01, 5.592105537652969e-02]
+hea.m_flow=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.14900141954422e-04, 6.041308641433716e-01, -1.041176811433777e-09, 2.701998198517686e-07, 6.041840314865112e-01, 6.041837930679321e-01, 6.041837930679321e-01, -6.407992714230204e-08, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 1.208367943763733e+00, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 6.041839718818665e-01, 1.065116402601497e-16, 5.775404925207216e-22, -7.592093893599378e-31, 2.012641936420911e-37, 5.74532370373175e-44, 0e+00, 0e+00, 0e+00, 0e+00, 6.041856408119202e-01, 6.118621490239937e-18, 5.504528805613518e-02, 8.259397787924172e-08, -3.01185881790289e-11, -9.396091513735882e-07, 3.641384094953537e-02, 5.316572782021467e-08, 1.052836450980976e-04, 6.041836738586426e-01, 6.041842103004456e-01, 6.041836738586426e-01, 6.033806204795837e-01, -5.481779030702683e-09, -1.792093229369129e-07, 6.041840314865112e-01]
+hea.TSet=[2.951499938964844e+02, 2.925974426269531e+02, 2.918280029296875e+02, 2.916367492675781e+02, 2.916430053710938e+02, 2.94801025390625e+02, 2.93599609375e+02, 2.936893920898438e+02, 2.924544372558594e+02, 2.918993835449219e+02, 2.922813720703125e+02, 2.930415954589844e+02, 2.941774291992188e+02, 2.917360229492188e+02, 2.917854309082031e+02, 2.918499755859375e+02, 2.919247741699219e+02, 2.920325927734375e+02, 2.9209130859375e+02, 2.921881713867188e+02, 2.922391967773438e+02, 2.923157958984375e+02, 2.923821716308594e+02, 2.924575500488281e+02, 2.925325012207031e+02, 2.925858764648438e+02, 3.019361267089844e+02, 3.020803833007812e+02, 3.020917358398438e+02, 3.023363342285156e+02, 3.024425659179688e+02, 3.025794372558594e+02, 3.02880859375e+02, 3.032921752929688e+02, 3.037534484863281e+02, 3.042726745605469e+02, 3.047989501953125e+02, 3.032332458496094e+02, 3.017972106933594e+02, 3.009437255859375e+02, 3.003302612304688e+02, 2.998879089355469e+02, 2.993922729492188e+02, 2.991135559082031e+02, 2.987391662597656e+02, 2.985369262695312e+02, 2.983053588867188e+02, 2.981683044433594e+02, 2.980505065917969e+02, 2.980283813476562e+02, 2.980486145019531e+02, 2.980975646972656e+02, 2.98167724609375e+02, 2.9819482421875e+02, 2.982021789550781e+02, 2.98250732421875e+02, 2.982564697265625e+02, 2.982646789550781e+02, 2.982864685058594e+02, 2.983204650878906e+02, 2.983456420898438e+02, 2.983963012695312e+02, 2.985084228515625e+02, 2.985986938476562e+02, 2.987749938964844e+02, 2.989151000976562e+02, 2.990321044921875e+02, 2.992075500488281e+02, 2.993259582519531e+02, 2.99528564453125e+02, 2.996210632324219e+02, 2.997442016601562e+02, 2.998379211425781e+02, 2.999417114257812e+02, 3.000422668457031e+02, 3.001141662597656e+02, 2.9349951171875e+02, 2.92538818359375e+02, 2.922023315429688e+02, 2.919461364746094e+02, 2.9168798828125e+02, 2.914812622070312e+02, 2.913064880371094e+02, 2.915387878417969e+02, 2.9298779296875e+02, 2.922867736816406e+02, 2.946874389648438e+02, 2.916510925292969e+02, 2.921578979492188e+02, 2.941431884765625e+02, 2.921592102050781e+02, 2.949164428710938e+02, 2.930819396972656e+02, 2.921110534667969e+02, 2.91759033203125e+02, 2.925018310546875e+02, 2.931239318847656e+02, 2.942506713867188e+02, 2.942688293457031e+02, 2.932916870117188e+02, 2.91774658203125e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_EquipmentSchedule.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_EquipmentSchedule.txt
index 12d3681d461..2d4275c86df 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_EquipmentSchedule.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_EquipmentSchedule.txt
@@ -1,10 +1,10 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-zon.TAir=[2.931499938964844e+02, 2.89828125e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860071716308594e+02, 2.856974487304688e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.843174133300781e+02, 2.847691345214844e+02, 2.853383178710938e+02, 2.861144409179688e+02, 2.868779907226562e+02, 2.876759643554688e+02, 2.883543701171875e+02, 2.889505920410156e+02, 2.893346252441406e+02, 2.896292724609375e+02, 2.896629943847656e+02, 2.895556030273438e+02, 2.895119018554688e+02, 2.894383544921875e+02, 2.894071655273438e+02, 2.89351318359375e+02, 2.891918334960938e+02, 2.889115600585938e+02, 2.886018981933594e+02, 2.882835693359375e+02, 2.879609680175781e+02, 2.877027282714844e+02, 2.874327087402344e+02, 2.871662292480469e+02, 2.868968200683594e+02, 2.865736389160156e+02, 2.859407653808594e+02, 2.857648010253906e+02, 2.855425720214844e+02, 2.853353576660156e+02, 2.851476745605469e+02, 2.849638977050781e+02, 2.847425231933594e+02, 2.845181579589844e+02, 2.843291015625e+02, 2.841505126953125e+02, 2.842961120605469e+02, 2.8401904296875e+02, 2.83877685546875e+02, 2.837948913574219e+02, 2.83657470703125e+02, 2.834947509765625e+02, 2.833717346191406e+02, 2.832816772460938e+02, 2.832251586914062e+02, 2.832209777832031e+02, 2.831896057128906e+02, 2.831092834472656e+02, 2.828598937988281e+02, 2.827691040039062e+02, 2.835169677734375e+02, 2.843935241699219e+02, 2.847550659179688e+02, 2.851058959960938e+02, 2.854756469726562e+02, 2.858882751464844e+02, 2.86236083984375e+02, 2.865664672851562e+02, 2.869273986816406e+02, 2.872646484375e+02, 2.8756591796875e+02, 2.876624145507812e+02, 2.879025268554688e+02, 2.882265625e+02, 2.882285766601562e+02, 2.882098083496094e+02, 2.881530456542969e+02, 2.880580749511719e+02, 2.879842529296875e+02, 2.876778259277344e+02, 2.874072570800781e+02, 2.866112976074219e+02, 2.861291198730469e+02, 2.858358764648438e+02, 2.856979370117188e+02, 2.855333251953125e+02, 2.848576965332031e+02, 2.847196350097656e+02, 2.845915832519531e+02, 2.844851684570312e+02, 2.843970947265625e+02, 2.843135986328125e+02, 2.841295776367188e+02, 2.838990173339844e+02, 2.837464294433594e+02, 2.835978393554688e+02]
+zon.TAir=[2.931499938964844e+02, 2.898281555175781e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860072021484375e+02, 2.856974792480469e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.843174133300781e+02, 2.847691345214844e+02, 2.853382873535156e+02, 2.861144409179688e+02, 2.868779907226562e+02, 2.876759643554688e+02, 2.883543701171875e+02, 2.889505920410156e+02, 2.893346557617188e+02, 2.896293029785156e+02, 2.896630249023438e+02, 2.895556030273438e+02, 2.895119323730469e+02, 2.894383850097656e+02, 2.894071960449219e+02, 2.89351318359375e+02, 2.891918640136719e+02, 2.889115600585938e+02, 2.886019287109375e+02, 2.882835998535156e+02, 2.879609985351562e+02, 2.877027282714844e+02, 2.874327087402344e+02, 2.87166259765625e+02, 2.868968505859375e+02, 2.865736999511719e+02, 2.859407653808594e+02, 2.85764892578125e+02, 2.855425720214844e+02, 2.853354187011719e+02, 2.85147705078125e+02, 2.849639282226562e+02, 2.847425231933594e+02, 2.845181579589844e+02, 2.843291320800781e+02, 2.841505126953125e+02, 2.842961120605469e+02, 2.840189819335938e+02, 2.838777160644531e+02, 2.837948913574219e+02, 2.83657470703125e+02, 2.834947204589844e+02, 2.833717651367188e+02, 2.832817077636719e+02, 2.832251892089844e+02, 2.832210083007812e+02, 2.831896057128906e+02, 2.831093139648438e+02, 2.828599243164062e+02, 2.827691345214844e+02, 2.835169372558594e+02, 2.843935241699219e+02, 2.847550659179688e+02, 2.851058959960938e+02, 2.854756469726562e+02, 2.858882751464844e+02, 2.86236083984375e+02, 2.865664978027344e+02, 2.869273986816406e+02, 2.872646484375e+02, 2.8756591796875e+02, 2.876623840332031e+02, 2.879025268554688e+02, 2.882265319824219e+02, 2.882285461425781e+02, 2.882098083496094e+02, 2.881530151367188e+02, 2.8805810546875e+02, 2.879842529296875e+02, 2.876778259277344e+02, 2.874072570800781e+02, 2.866112976074219e+02, 2.861291198730469e+02, 2.858359069824219e+02, 2.856979675292969e+02, 2.855333557128906e+02, 2.848577270507812e+02, 2.847196655273438e+02, 2.845916137695312e+02, 2.844851989746094e+02, 2.843971252441406e+02, 2.843135986328125e+02, 2.841295776367188e+02, 2.838990173339844e+02, 2.837464599609375e+02, 2.835978698730469e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_HeatPumpRadiantHeatingGroundHeatTransfer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_HeatPumpRadiantHeatingGroundHeatTransfer.txt
index c103e2fcc70..763a019add4 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_HeatPumpRadiantHeatingGroundHeatTransfer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_HeatPumpRadiantHeatingGroundHeatTransfer.txt
@@ -1,4 +1,4 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-initialization=
 {
   "linear": "18",
@@ -9,16 +9,16 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0",
   "nonlinear": "1, 1, 2",
-  "number of continuous time states": "190",
+  "number of continuous time states": "191",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 livFlo.T=[2.931499938964844e+02, 2.931386413574219e+02, 2.932135009765625e+02, 2.934238586425781e+02, 2.936772766113281e+02, 2.939455261230469e+02, 2.942157592773438e+02, 2.944827270507812e+02, 2.947418518066406e+02, 2.9499169921875e+02, 2.952347106933594e+02, 2.954120788574219e+02, 2.953508911132812e+02, 2.951806945800781e+02, 2.949678649902344e+02, 2.947735595703125e+02, 2.948212890625e+02, 2.950236511230469e+02, 2.953101196289062e+02, 2.955699768066406e+02, 2.956430053710938e+02, 2.9558984375e+02, 2.9548876953125e+02, 2.953729553222656e+02, 2.95254638671875e+02, 2.951356811523438e+02, 2.950108032226562e+02, 2.948823547363281e+02, 2.947545776367188e+02, 2.946291198730469e+02, 2.945780029296875e+02, 2.946436767578125e+02, 2.948013916015625e+02, 2.949868774414062e+02, 2.951251525878906e+02, 2.951781616210938e+02, 2.951795349121094e+02, 2.951600341796875e+02, 2.951397399902344e+02, 2.951567993164062e+02, 2.952258605957031e+02, 2.953101196289062e+02, 2.953434448242188e+02, 2.953341369628906e+02, 2.9530859375e+02, 2.952753601074219e+02, 2.952375183105469e+02, 2.9520068359375e+02, 2.951979064941406e+02, 2.952459106445312e+02, 2.953140258789062e+02, 2.953460083007812e+02, 2.953350830078125e+02, 2.952965393066406e+02, 2.952532348632812e+02, 2.952217102050781e+02, 2.952251281738281e+02, 2.952646484375e+02, 2.953045654296875e+02, 2.953079223632812e+02, 2.952852172851562e+02, 2.952379455566406e+02, 2.951173400878906e+02, 2.949637451171875e+02, 2.947957763671875e+02, 2.946492004394531e+02, 2.946229248046875e+02, 2.946307373046875e+02, 2.946025390625e+02, 2.945514831542969e+02, 2.944916687011719e+02, 2.944336853027344e+02, 2.943766174316406e+02, 2.943246765136719e+02, 2.942813720703125e+02, 2.942451171875e+02, 2.942126770019531e+02, 2.941809387207031e+02, 2.941520385742188e+02, 2.941216430664062e+02, 2.940799255371094e+02, 2.940294494628906e+02, 2.93968994140625e+02, 2.938993530273438e+02, 2.938251342773438e+02, 2.938160400390625e+02, 2.939751281738281e+02, 2.942495422363281e+02, 2.945716247558594e+02, 2.948840637207031e+02, 2.9516943359375e+02, 2.953028869628906e+02, 2.952769165039062e+02, 2.951725463867188e+02, 2.950386657714844e+02, 2.948951721191406e+02, 2.94750732421875e+02, 2.946470336914062e+02, 2.946741333007812e+02, 2.9482373046875e+02, 2.950059204101562e+02]
 TSetRooHea.y=[2.931499938964844e+02, 2.931499938964844e+02]
 TOpe.y=[2.931992492675781e+02, 2.912634887695312e+02, 2.910127563476562e+02, 2.909259033203125e+02, 2.909825439453125e+02, 2.91124267578125e+02, 2.913060913085938e+02, 2.914920043945312e+02, 2.91675048828125e+02, 2.918721313476562e+02, 2.920765991210938e+02, 2.922706298828125e+02, 2.923749694824219e+02, 2.923309936523438e+02, 2.922083740234375e+02, 2.920519714355469e+02, 2.920535583496094e+02, 2.923566589355469e+02, 2.927270812988281e+02, 2.930694580078125e+02, 2.933457641601562e+02, 2.93473876953125e+02, 2.935241088867188e+02, 2.935288696289062e+02, 2.935052795410156e+02, 2.934287414550781e+02, 2.933285522460938e+02, 2.93234130859375e+02, 2.931326904296875e+02, 2.930348510742188e+02, 2.929230346679688e+02, 2.9284765625e+02, 2.928304443359375e+02, 2.928812561035156e+02, 2.929554748535156e+02, 2.929959411621094e+02, 2.930046691894531e+02, 2.929753723144531e+02, 2.929281311035156e+02, 2.928757019042969e+02, 2.928665161132812e+02, 2.929376525878906e+02, 2.930144653320312e+02, 2.930460815429688e+02, 2.930484008789062e+02, 2.930270385742188e+02, 2.929921875e+02, 2.929386901855469e+02, 2.928879699707031e+02, 2.928807983398438e+02, 2.929073181152344e+02, 2.9302685546875e+02, 2.929835510253906e+02, 2.92974609375e+02, 2.929663696289062e+02, 2.929295654296875e+02, 2.928963928222656e+02, 2.929078063964844e+02, 2.929525756835938e+02, 2.930036315917969e+02, 2.930461730957031e+02, 2.930570373535156e+02, 2.930223999023438e+02, 2.928976135253906e+02, 2.928125305175781e+02, 2.930343017578125e+02, 2.930105590820312e+02, 2.932820739746094e+02, 2.93446533203125e+02, 2.935312805175781e+02, 2.936055297851562e+02, 2.936348571777344e+02, 2.936681518554688e+02, 2.937153015136719e+02, 2.93751953125e+02, 2.937784118652344e+02, 2.937314453125e+02, 2.937510681152344e+02, 2.93778076171875e+02, 2.936586608886719e+02, 2.935556640625e+02, 2.934468688964844e+02, 2.933326721191406e+02, 2.932424926757812e+02, 2.930501708984375e+02, 2.928866577148438e+02, 2.92553466796875e+02, 2.926058044433594e+02, 2.924873352050781e+02, 2.9272119140625e+02, 2.929426574707031e+02, 2.931499633789062e+02, 2.932589721679688e+02, 2.932667846679688e+02, 2.932203369140625e+02, 2.931521606445312e+02, 2.930683288574219e+02, 2.929349365234375e+02, 2.928279113769531e+02, 2.928255310058594e+02, 2.928941345214844e+02]
-heaPum.y=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2.000000029802322e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.000000029802322e-01, 4.386834502220154e-01, 6.622923016548157e-01, 6.854492425918579e-01, 4.68999058008194e-01, 2.406446486711496e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.156168073415756e-01, 3.549061715602875e-01, 5.117077827453613e-01, 5.087332725524902e-01, 2.661902606487274e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 3.193654417991638e-01, 4.657529592514038e-01, 4.682726263999939e-01, 3.735822737216949e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.276717275381088e-01, 3.394293785095225e-01, 4.321944117546085e-01, 3.759613037109391e-01, 2.378940582275391e-01, 2.000000029802322e-01, 2.000000029802322e-01, 0e+00, 0e+00, 0e+00, 0e+00, 2.000000029802322e-01, 2.000000029802322e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.289048790931702e-01, 1e+00, 1e+00, 1e+00, 1e+00, 2.07825168967247e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.12274032831192e-01, 7.360486388206482e-01, 6.940158009529114e-01, 4.284935593605042e-01]
-livFlo.q_flow=[-2.248904943466187e+00, -3.928479909896851e+00, -1.418377685546875e+01, -1.80920467376709e+01, -2.019721984863281e+01, -2.180448722839355e+01, -2.291509437561035e+01, -2.381002235412598e+01, -2.467018127441406e+01, -2.516201591491699e+01, -2.570749855041504e+01, -2.619790840148926e+01, -2.562843322753906e+01, -2.447999572753906e+01, -2.354754829406738e+01, -2.279366874694824e+01, -2.241802024841309e+01, -2.129295539855957e+01, -1.977907752990723e+01, -1.909192085266113e+01, -1.792237281799316e+01, -1.627983093261719e+01, -1.475394821166992e+01, -1.344881439208984e+01, -1.241463088989258e+01, -1.204782295227051e+01, -1.188586330413818e+01, -1.177385902404785e+01, -1.160258007049561e+01, -1.14086856842041e+01, -1.153499031066895e+01, -1.247260570526123e+01, -1.407234764099121e+01, -1.566583251953125e+01, -1.64384708404541e+01, -1.729440116882324e+01, -1.744216728210449e+01, -1.758449172973633e+01, -1.77704029083252e+01, -1.822052955627441e+01, -1.888233947753906e+01, -1.923236274719238e+01, -1.918358612060547e+01, -1.882507514953613e+01, -1.850880432128906e+01, -1.840048408508301e+01, -1.835842323303223e+01, -1.840636253356934e+01, -1.863785362243652e+01, -1.905091285705566e+01, -1.934579277038574e+01, -1.916724967956543e+01, -1.929360008239746e+01, -1.935879516601562e+01, -1.908785438537598e+01, -1.892772483825684e+01, -1.908261299133301e+01, -1.932891273498534e+01, -1.940995407104492e+01, -1.930716705322266e+01, -1.888709449768066e+01, -1.83912353515625e+01, -1.77919807434082e+01, -1.70599250793457e+01, -1.663055992126465e+01, -1.574463748931885e+01, -1.32173547744751e+01, -1.318926429748535e+01, -1.082234859466553e+01, -9.552562713623047e+00, -8.093657493591309e+00, -7.105712890625e+00, -6.328680992126465e+00, -5.417654514312744e+00, -4.543726921081543e+00, -4.095890045166016e+00, -3.636622190475464e+00, -3.263323068618774e+00, -2.932605504989624e+00, -3.140319585800171e+00, -3.722702026367188e+00, -4.316655158996582e+00, -5.079777240753174e+00, -5.663459300994873e+00, -6.015573978424072e+00, -7.293722629547119e+00, -8.684645652770996e+00, -1.203741359710693e+01, -1.366174793243408e+01, -1.677733421325684e+01, -1.750491523742676e+01, -1.762207221984863e+01, -1.718236351013184e+01, -1.622768974304199e+01, -1.537554836273193e+01, -1.461054229736328e+01, -1.394579696655273e+01, -1.36037540435791e+01, -1.417329406738281e+01, -1.534345626831055e+01, -1.618362998962402e+01]
-COP.y=[0e+00, 5.442887783050537e+00, 5.102429866790771e+00, 4.926667213439941e+00, 4.810827732086182e+00, 4.724998950958252e+00, 4.656998634338379e+00, 4.600704669952393e+00, 4.552620410919189e+00, 4.510574340820312e+00, 4.473142623901367e+00, 4.458572387695312e+00, 4.458572387695312e+00, 4.458572387695312e+00, 4.458572387695312e+00, 4.463840961456299e+00, 4.460193634033203e+00, 4.44599437713623e+00, 4.427901268005371e+00, 4.415431976318359e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.41283655166626e+00, 4.423448085784912e+00, 4.449665069580078e+00, 4.468130111694336e+00, 4.479825496673584e+00, 4.480507373809814e+00, 4.470820903778076e+00, 4.461345195770264e+00, 4.45277738571167e+00, 4.45355224609375e+00, 4.464498043060303e+00, 4.475532531738281e+00, 4.478726863861084e+00, 4.469659805297852e+00, 4.461050510406494e+00, 4.453123569488525e+00, 4.44568920135498e+00, 4.438652515411377e+00, 4.436244964599609e+00, 4.444260120391846e+00, 4.453194141387939e+00, 4.458536624908447e+00, 4.450643062591553e+00, 4.443483829498291e+00, 4.436864852905273e+00, 4.43154239654541e+00, 4.431889057159424e+00, 4.438163280487061e+00, 4.443971157073975e+00, 4.444022178649902e+00, 4.437706470489502e+00, 4.431684494018555e+00, 4.429259300231934e+00, 4.429259300231934e+00, 4.429259300231934e+00, 4.429259300231934e+00, 4.432230949401855e+00, 4.428295135498047e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.439063549041748e+00, 4.451596260070801e+00, 4.453129291534424e+00, 4.450558185577393e+00, 4.445393085479736e+00, 4.443127632141113e+00, 4.438157558441162e+00, 4.438157558441162e+00, 4.438157558441162e+00, 4.438157558441162e+00, 4.438157558441162e+00, 4.438157558441162e+00, 4.439367771148682e+00, 4.450301170349121e+00, 4.45688533782959e+00, 4.461245536804199e+00]
-pum.P=[0e+00, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -1.566982183281592e-34, -1.566977591506784e-34, -1.566977591506784e-34, -1.566977591506784e-34, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, -1.939765953706796e-32, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -6.042039126516635e-33, -6.027473649483993e-33, -6.027473649483993e-33, -6.027473649483993e-33, 1.032388019561768e+01, 1.032388019561768e+01, 3.536564092019514e-30, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, -1.586651418013215e-32, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 6.014614843311951e-33, -3.55878034750288e-32, -3.55878034750288e-32, -3.55878034750288e-32, -3.55878034750288e-32, -3.55878034750288e-32, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01]
-heaPum.P=[0e+00, 1.953342895507812e+03, 1.968613159179688e+03, 1.9869189453125e+03, 2.0024892578125e+03, 2.016109741210938e+03, 2.028590698242188e+03, 2.040408447265625e+03, 2.05181494140625e+03, 2.0629130859375e+03, 2.073747314453125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 2.01447314453125e+03, 2.039239624023438e+03, 2.055778564453125e+03, 2.069544677734375e+03, 5.906019897460938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.717949829101562e+02, 9.206318969726562e+02, 1.321592407226562e+03, 1.38194482421875e+03, 1.002596374511719e+03, 6.415508422851555e+02, 5.815056762695312e+02, 5.806590576171875e+02, 6.006787109375e+02, 8.051149291992188e+02, 1.067131958007812e+03, 1.073031982421875e+03, 6.830924682617188e+02, 5.8354638671875e+02, 5.824688720703125e+02, 5.81787109375e+02, 5.81278076171875e+02, 5.808563232421875e+02, 7.511852416992188e+02, 9.895201416015625e+02, 1.00050048828125e+03, 8.460321044921875e+02, 5.836603393554688e+02, 5.825560913085938e+02, 5.8185302734375e+02, 6.194065551757812e+02, 7.836392211914078e+02, 9.352883300781256e+02, 8.488873901367213e+02, 6.390162963867188e+02, 5.827802124023438e+02, 5.819150390625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 5.753839721679688e+02, 5.741447143554688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.2233623046875e+03, 1.980907836914062e+03, 2.004132568359375e+03, 2.023580322265625e+03, 2.040909545898438e+03, 6.05968505859375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.765162963867188e+02, 1.462881469726562e+03, 1.40377294921875e+03, 9.344650268554688e+02]
-pumBor.P=[0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02]
+heaPum.y=[0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 2.000000029802322e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.000000029802322e-01, 4.38683420419693e-01, 6.622911691665649e-01, 6.854479908943176e-01, 4.689984917640686e-01, 2.406448870897287e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.156178206205368e-01, 3.549070060253143e-01, 5.117080807685852e-01, 5.087328553199768e-01, 2.661896049976349e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 3.193653523921967e-01, 4.65753048658371e-01, 4.682728946208954e-01, 3.735824823379517e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.000000029802322e-01, 2.276722639799118e-01, 3.39429497718812e-01, 4.321940541267398e-01, 3.759607970714585e-01, 2.378937751054764e-01, 2.000000029802322e-01, 2.000000029802322e-01, 0e+00, 0e+00, 0e+00, 0e+00, 2.000000029802322e-01, 2.000000029802322e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.289061307907104e-01, 1e+00, 1e+00, 1e+00, 1e+00, 2.07825243473053e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.122755527496338e-01, 7.360574007034302e-01, 6.940245032310486e-01, 4.284966886043549e-01]
+livFlo.q_flow=[-2.248904943466187e+00, -3.928479909896851e+00, -1.418377494812012e+01, -1.80920467376709e+01, -2.019721794128418e+01, -2.180448722839355e+01, -2.291509437561035e+01, -2.381002235412598e+01, -2.467018127441406e+01, -2.516201591491699e+01, -2.570749664306641e+01, -2.619790649414062e+01, -2.562843322753906e+01, -2.447999572753906e+01, -2.354754829406738e+01, -2.279366874694824e+01, -2.241801834106445e+01, -2.129295349121094e+01, -1.977907562255859e+01, -1.90919189453125e+01, -1.792237281799316e+01, -1.627983093261719e+01, -1.475394821166992e+01, -1.344881343841553e+01, -1.241462993621826e+01, -1.204782199859619e+01, -1.188586330413818e+01, -1.177385807037354e+01, -1.160257911682129e+01, -1.14086856842041e+01, -1.153499221801758e+01, -1.247260856628418e+01, -1.407234954833984e+01, -1.566583156585693e+01, -1.643846893310547e+01, -1.729439926147461e+01, -1.744216728210449e+01, -1.758449172973633e+01, -1.777040100097656e+01, -1.822053146362305e+01, -1.88823413848877e+01, -1.923236465454102e+01, -1.918358612060547e+01, -1.882507514953613e+01, -1.850880432128906e+01, -1.840048217773438e+01, -1.835842323303223e+01, -1.840636253356934e+01, -1.863785362243652e+01, -1.905091285705566e+01, -1.934579277038574e+01, -1.916725158691406e+01, -1.929360008239746e+01, -1.935879325866699e+01, -1.908785438537598e+01, -1.892772674560547e+01, -1.908261489868164e+01, -1.932891464233397e+01, -1.940995407104492e+01, -1.930716514587402e+01, -1.888709259033203e+01, -1.83912353515625e+01, -1.779198265075684e+01, -1.705992317199707e+01, -1.663055992126465e+01, -1.574463844299316e+01, -1.321735286712646e+01, -1.318926239013672e+01, -1.082234477996826e+01, -9.552559852600098e+00, -8.093656539916992e+00, -7.105711936950684e+00, -6.32867956161499e+00, -5.417654037475586e+00, -4.543725967407227e+00, -4.095889091491699e+00, -3.636620759963989e+00, -3.263322114944458e+00, -2.932605743408203e+00, -3.140320539474487e+00, -3.722703218460083e+00, -4.31665563583374e+00, -5.079775810241699e+00, -5.663456916809082e+00, -6.015572071075439e+00, -7.293721199035645e+00, -8.68464469909668e+00, -1.203741455078125e+01, -1.36617488861084e+01, -1.677733612060547e+01, -1.750491714477539e+01, -1.762207412719727e+01, -1.718236541748047e+01, -1.622768974304199e+01, -1.537554931640625e+01, -1.46105432510376e+01, -1.394579696655273e+01, -1.360374450683594e+01, -1.417327785491943e+01, -1.534345245361328e+01, -1.618363571166992e+01]
+COP.y=[0e+00, 5.442887783050537e+00, 5.102429866790771e+00, 4.926667213439941e+00, 4.810827732086182e+00, 4.724998950958252e+00, 4.656998634338379e+00, 4.600704669952393e+00, 4.552620410919189e+00, 4.510574340820312e+00, 4.473142623901367e+00, 4.458572387695312e+00, 4.458572387695312e+00, 4.458572387695312e+00, 4.458572387695312e+00, 4.463841438293457e+00, 4.460194110870361e+00, 4.44599437713623e+00, 4.427901744842529e+00, 4.415431976318359e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.413671970367432e+00, 4.41283655166626e+00, 4.423448085784912e+00, 4.449665069580078e+00, 4.468130111694336e+00, 4.479825496673584e+00, 4.480507373809814e+00, 4.470821380615234e+00, 4.461345195770264e+00, 4.45277738571167e+00, 4.453552722930908e+00, 4.464498519897461e+00, 4.475533008575439e+00, 4.478726863861084e+00, 4.46966028213501e+00, 4.461050510406494e+00, 4.453123569488525e+00, 4.44568920135498e+00, 4.438652515411377e+00, 4.436244964599609e+00, 4.444260120391846e+00, 4.453194618225098e+00, 4.458536624908447e+00, 4.450643062591553e+00, 4.443483829498291e+00, 4.436865329742432e+00, 4.43154239654541e+00, 4.431889533996582e+00, 4.438163757324219e+00, 4.443971157073975e+00, 4.444022178649902e+00, 4.43770694732666e+00, 4.431684494018555e+00, 4.429259300231934e+00, 4.429259300231934e+00, 4.429259300231934e+00, 4.429259300231934e+00, 4.432230949401855e+00, 4.428294658660889e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.425279140472412e+00, 4.439063549041748e+00, 4.451596260070801e+00, 4.453129291534424e+00, 4.450558185577393e+00, 4.445393085479736e+00, 4.443127632141113e+00, 4.438157081604004e+00, 4.438157081604004e+00, 4.438157081604004e+00, 4.438157081604004e+00, 4.438157081604004e+00, 4.438157081604004e+00, 4.439367771148682e+00, 4.450301170349121e+00, 4.45688533782959e+00, 4.461245536804199e+00]
+pum.P=[0e+00, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -9.387437347707721e-32, -9.387436759960545e-32, -9.387436759960545e-32, -9.387436759960545e-32, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, -4.830770441836994e-32, 1.032387924194336e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -2.97111047232474e-35, -2.97111047232474e-35, -2.97111047232474e-35, -2.97111047232474e-35, 1.032388019561768e+01, 1.032388019561768e+01, -2.78233165170141e-31, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, -4.717383726124615e-32, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, -1.808573878125717e-32, -1.815620525948515e-32, -1.815620525948515e-32, -1.815620525948515e-32, -1.815620525948515e-32, -1.815620525948515e-32, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01, 1.032388019561768e+01]
+heaPum.P=[0e+00, 1.953342895507812e+03, 1.968613159179688e+03, 1.9869189453125e+03, 2.0024892578125e+03, 2.016109741210938e+03, 2.028590698242188e+03, 2.040408447265625e+03, 2.05181494140625e+03, 2.0629130859375e+03, 2.073747314453125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 2.014473510742188e+03, 2.039239624023438e+03, 2.055778564453125e+03, 2.06954443359375e+03, 5.906019897460938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.71794677734375e+02, 9.206318359375e+02, 1.32159033203125e+03, 1.3819423828125e+03, 1.002595397949219e+03, 6.415511474609367e+02, 5.815056762695312e+02, 5.806590576171875e+02, 6.0068017578125e+02, 8.051162719726562e+02, 1.067132568359375e+03, 1.07303125e+03, 6.830914916992188e+02, 5.8354638671875e+02, 5.824688720703125e+02, 5.81787109375e+02, 5.81278076171875e+02, 5.808563232421875e+02, 7.511851196289062e+02, 9.89520263671875e+02, 1.000500854492188e+03, 8.460324096679688e+02, 5.836603393554688e+02, 5.825560913085938e+02, 5.8185302734375e+02, 6.194072875976562e+02, 7.836394042968766e+02, 9.352877807617193e+02, 8.4888659667969e+02, 6.39015869140625e+02, 5.827802124023438e+02, 5.819150390625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 5.753838500976562e+02, 5.741447143554688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.223364379882812e+03, 1.980907836914062e+03, 2.004132568359375e+03, 2.023580322265625e+03, 2.040909545898438e+03, 6.059686279296875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.76518310546875e+02, 1.462898315429688e+03, 1.403789916992188e+03, 9.344703979492188e+02]
+pumBor.P=[0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953918457031e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02, 1.029953994750977e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_LightsControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_LightsControl.txt
index 20b9f974e44..f2d41f9fd69 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_LightsControl.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_LightsControl.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 PLig.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 ligPow.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 1e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-zon.TAir=[2.931499938964844e+02, 2.897817077636719e+02, 2.890987243652344e+02, 2.884703369140625e+02, 2.879379577636719e+02, 2.874757385253906e+02, 2.870656127929688e+02, 2.866683044433594e+02, 2.862767028808594e+02, 2.859262084960938e+02, 2.85613037109375e+02, 2.853025817871094e+02, 2.849972839355469e+02, 2.847007141113281e+02, 2.84409912109375e+02, 2.841345520019531e+02, 2.841357421875e+02, 2.846520690917969e+02, 2.853709106445312e+02, 2.860831604003906e+02, 2.868332824707031e+02, 2.8746435546875e+02, 2.880144958496094e+02, 2.883548583984375e+02, 2.886094055175781e+02, 2.886017456054688e+02, 2.884586181640625e+02, 2.883844604492188e+02, 2.882760314941406e+02, 2.882126770019531e+02, 2.881267700195312e+02, 2.879358825683594e+02, 2.876266174316406e+02, 2.872908325195312e+02, 2.878955078125e+02, 2.876939697265625e+02, 2.875413818359375e+02, 2.873563537597656e+02, 2.871612548828125e+02, 2.869544677734375e+02, 2.867698974609375e+02, 2.8668603515625e+02, 2.866204223632812e+02, 2.865083923339844e+02, 2.863942260742188e+02, 2.862947692871094e+02, 2.861956481933594e+02, 2.849976501464844e+02, 2.847501220703125e+02, 2.845018615722656e+02, 2.842843627929688e+02, 2.843943176269531e+02, 2.840940856933594e+02, 2.839325561523438e+02, 2.838304443359375e+02, 2.836763305664062e+02, 2.834996032714844e+02, 2.8336376953125e+02, 2.832615051269531e+02, 2.83193603515625e+02, 2.831782836914062e+02, 2.831362915039062e+02, 2.830477600097656e+02, 2.8266552734375e+02, 2.825326843261719e+02, 2.825697326660156e+02, 2.825477905273438e+02, 2.830722045898438e+02, 2.835031127929688e+02, 2.837614135742188e+02, 2.840616455078125e+02, 2.842887573242188e+02, 2.845220642089844e+02, 2.84802490234375e+02, 2.850622863769531e+02, 2.852939758300781e+02, 2.852981567382812e+02, 2.8548779296875e+02, 2.857876586914062e+02, 2.857541809082031e+02, 2.856986389160156e+02, 2.85605224609375e+02, 2.854743957519531e+02, 2.853742370605469e+02, 2.860605163574219e+02, 2.861117553710938e+02, 2.858714599609375e+02, 2.85697265625e+02, 2.854097900390625e+02, 2.852992858886719e+02, 2.852865600585938e+02, 2.852642211914062e+02, 2.852533569335938e+02, 2.852548217773438e+02, 2.852654724121094e+02, 2.852861633300781e+02, 2.853053894042969e+02, 2.840951538085938e+02, 2.837134094238281e+02, 2.835166320800781e+02, 2.833356628417969e+02]
+zon.TAir=[2.931499938964844e+02, 2.8978173828125e+02, 2.890987243652344e+02, 2.884703369140625e+02, 2.879379577636719e+02, 2.874757385253906e+02, 2.870656127929688e+02, 2.866683044433594e+02, 2.862767028808594e+02, 2.859262390136719e+02, 2.85613037109375e+02, 2.853025817871094e+02, 2.849972839355469e+02, 2.847007446289062e+02, 2.84409912109375e+02, 2.841345520019531e+02, 2.841357421875e+02, 2.846520690917969e+02, 2.853709106445312e+02, 2.860831604003906e+02, 2.868333129882812e+02, 2.8746435546875e+02, 2.880145263671875e+02, 2.883548889160156e+02, 2.886094055175781e+02, 2.886017761230469e+02, 2.884586486816406e+02, 2.883844909667969e+02, 2.882760314941406e+02, 2.882127075195312e+02, 2.881267700195312e+02, 2.879359130859375e+02, 2.87626708984375e+02, 2.872908630371094e+02, 2.878955078125e+02, 2.876939697265625e+02, 2.875413818359375e+02, 2.873563842773438e+02, 2.871612854003906e+02, 2.869544982910156e+02, 2.867699890136719e+02, 2.866860656738281e+02, 2.866204528808594e+02, 2.865083923339844e+02, 2.863942565917969e+02, 2.862947998046875e+02, 2.861956481933594e+02, 2.849976806640625e+02, 2.847501525878906e+02, 2.845018920898438e+02, 2.842843017578125e+02, 2.84394287109375e+02, 2.840940856933594e+02, 2.839326171875e+02, 2.838304748535156e+02, 2.836763305664062e+02, 2.834996032714844e+02, 2.833638000488281e+02, 2.832615356445312e+02, 2.83193603515625e+02, 2.831782836914062e+02, 2.831363525390625e+02, 2.830477905273438e+02, 2.826655578613281e+02, 2.8253271484375e+02, 2.825697631835938e+02, 2.825477905273438e+02, 2.830722045898438e+02, 2.835031433105469e+02, 2.837614440917969e+02, 2.840616760253906e+02, 2.842887878417969e+02, 2.845220947265625e+02, 2.84802490234375e+02, 2.85062255859375e+02, 2.852939758300781e+02, 2.852981567382812e+02, 2.8548779296875e+02, 2.857876281738281e+02, 2.857541809082031e+02, 2.856986083984375e+02, 2.856052551269531e+02, 2.854744262695312e+02, 2.85374267578125e+02, 2.860602111816406e+02, 2.8611083984375e+02, 2.858702392578125e+02, 2.856959533691406e+02, 2.854085083007812e+02, 2.852980651855469e+02, 2.852854614257812e+02, 2.852631225585938e+02, 2.852522888183594e+02, 2.852538146972656e+02, 2.852644958496094e+02, 2.852852172851562e+02, 2.853045043945312e+02, 2.840942687988281e+02, 2.837125854492188e+02, 2.835158386230469e+02, 2.833348999023438e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt
index 84f8e1e42e5..f2abbe67786 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TRoom.txt
@@ -1,4 +1,4 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,21 +8,21 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "42",
+  "number of continuous time states": "43",
   "numerical Jacobians": "0"
 }
 time=[7.776e+06, 9.504e+06]
-livFlo.heaPorFro.T=[2.931499938964844e+02, 2.960780334472656e+02, 2.950413208007812e+02, 2.951487426757812e+02, 2.956312866210938e+02, 2.954673156738281e+02, 2.954487915039062e+02, 2.950174255371094e+02, 2.948150634765625e+02, 2.953916625976562e+02, 2.955462341308594e+02, 2.955426635742188e+02, 2.949651794433594e+02, 2.942884521484375e+02, 2.9470556640625e+02, 2.954602661132812e+02, 2.955827331542969e+02, 2.950266418457031e+02, 2.942203674316406e+02, 2.951222839355469e+02, 2.956576232910156e+02, 2.957528686523438e+02, 2.952177429199219e+02, 2.943841857910156e+02, 2.947477416992188e+02, 2.955362243652344e+02, 2.957449035644531e+02, 2.950894775390625e+02, 2.944745483398438e+02, 2.945801696777344e+02, 2.949626159667969e+02, 2.951348876953125e+02, 2.947064208984375e+02, 2.940063171386719e+02, 2.942662048339844e+02, 2.9433203125e+02, 2.947460021972656e+02, 2.9458203125e+02, 2.945348205566406e+02, 2.946477966308594e+02, 2.94850341796875e+02, 2.950329895019531e+02, 2.950472106933594e+02, 2.945446166992188e+02, 2.950179443359375e+02, 2.953992309570312e+02, 2.952559204101562e+02, 2.947647705078125e+02, 2.9456494140625e+02, 2.943883056640625e+02, 2.939943542480469e+02, 2.939469299316406e+02, 2.940118713378906e+02, 2.943358154296875e+02, 2.945157775878906e+02, 2.944212646484375e+02, 2.943575439453125e+02, 2.94407470703125e+02, 2.945172424316406e+02, 2.943687133789062e+02, 2.940785522460938e+02, 2.94453369140625e+02, 2.943351745605469e+02, 2.944909362792969e+02, 2.944227905273438e+02, 2.9407568359375e+02, 2.942950439453125e+02, 2.943910217285156e+02, 2.947022094726562e+02, 2.948585510253906e+02, 2.947969055175781e+02, 2.946827087402344e+02, 2.947987670898438e+02, 2.951850891113281e+02, 2.954520568847656e+02, 2.954857177734375e+02, 2.954664611816406e+02, 2.95641357421875e+02, 2.960306396484375e+02, 2.962507934570312e+02, 2.96281005859375e+02, 2.962692260742188e+02, 2.964900512695312e+02, 2.969938659667969e+02, 2.972795715332031e+02, 2.972011413574219e+02, 2.971228332519531e+02, 2.973584594726562e+02, 2.977446594238281e+02, 2.9777587890625e+02, 2.976783752441406e+02, 2.974805908203125e+02, 2.975054931640625e+02, 2.976567687988281e+02, 2.974949340820312e+02, 2.970361633300781e+02, 2.966221923828125e+02, 2.964785766601562e+02, 2.964925842285156e+02, 2.962096862792969e+02, 2.957584533691406e+02]
-zon.TAir=[2.931499938964844e+02, 2.928226623535156e+02, 2.931497192382812e+02, 2.928377990722656e+02, 2.929787902832031e+02, 2.929395446777344e+02, 2.929641723632812e+02, 2.931311645507812e+02, 2.929790344238281e+02, 2.928749084472656e+02, 2.928740234375e+02, 2.929219360351562e+02, 2.941459350585938e+02, 2.941624755859375e+02, 2.924912414550781e+02, 2.929088134765625e+02, 2.928964538574219e+02, 2.942584228515625e+02, 2.936517944335938e+02, 2.925707397460938e+02, 2.927348022460938e+02, 2.928307800292969e+02, 2.944002990722656e+02, 2.939998168945312e+02, 2.925214538574219e+02, 2.927846069335938e+02, 2.928467407226562e+02, 2.944580688476562e+02, 2.945240173339844e+02, 2.924293518066406e+02, 2.928682556152344e+02, 2.92934326171875e+02, 2.936629943847656e+02, 2.939288024902344e+02, 2.926728820800781e+02, 2.929736938476562e+02, 2.929322814941406e+02, 2.929896240234375e+02, 2.931093139648438e+02, 2.928687438964844e+02, 2.927937927246094e+02, 2.929584350585938e+02, 2.929733581542969e+02, 2.933098449707031e+02, 2.928312072753906e+02, 2.928649597167969e+02, 2.929613647460938e+02, 2.950862121582031e+02, 2.956763000488281e+02, 2.936916198730469e+02, 2.932593688964844e+02, 2.931045837402344e+02, 2.955185546875e+02, 2.962124938964844e+02, 2.94824951171875e+02, 2.94432861328125e+02, 2.942113647460938e+02, 2.957611999511719e+02, 2.954355163574219e+02, 2.934066162109375e+02, 2.931763305664062e+02, 2.930723571777344e+02, 2.953938293457031e+02, 2.958639526367188e+02, 2.936225891113281e+02, 2.930823059082031e+02, 2.931368408203125e+02, 2.958602600097656e+02, 2.965826110839844e+02, 2.952276306152344e+02, 2.950112609863281e+02, 2.941823120117188e+02, 2.955706176757812e+02, 2.96460205078125e+02, 2.960467529296875e+02, 2.957234802246094e+02, 2.953232727050781e+02, 2.964182434082031e+02, 2.972596435546875e+02, 2.968623657226562e+02, 2.963885192871094e+02, 2.96128662109375e+02, 2.982913513183594e+02, 2.991607055664062e+02, 2.977752685546875e+02, 2.970149230957031e+02, 2.970944213867188e+02, 2.992075805664062e+02, 2.997713928222656e+02, 2.983069763183594e+02, 2.97252685546875e+02, 2.970169677734375e+02, 2.988072509765625e+02, 2.986637268066406e+02, 2.962955932617188e+02, 2.957736511230469e+02, 2.952701721191406e+02, 2.971090393066406e+02, 2.968755493164062e+02, 2.948574829101562e+02, 2.944297180175781e+02]
+livFlo.heaPorFro.T=[2.931499938964844e+02, 2.960780334472656e+02, 2.950413208007812e+02, 2.951487731933594e+02, 2.956312255859375e+02, 2.954673156738281e+02, 2.954487915039062e+02, 2.950174255371094e+02, 2.948150634765625e+02, 2.953916931152344e+02, 2.955462341308594e+02, 2.955426025390625e+02, 2.949652404785156e+02, 2.942884826660156e+02, 2.947056274414062e+02, 2.954602355957031e+02, 2.955827331542969e+02, 2.950266418457031e+02, 2.942203674316406e+02, 2.951222839355469e+02, 2.956576538085938e+02, 2.957528686523438e+02, 2.952177124023438e+02, 2.943841857910156e+02, 2.947477722167969e+02, 2.955361938476562e+02, 2.957449035644531e+02, 2.950894775390625e+02, 2.944745483398438e+02, 2.945801696777344e+02, 2.949626159667969e+02, 2.951349182128906e+02, 2.947064208984375e+02, 2.940063171386719e+02, 2.942662048339844e+02, 2.9433203125e+02, 2.947460021972656e+02, 2.9458203125e+02, 2.945348205566406e+02, 2.946477966308594e+02, 2.948503723144531e+02, 2.950329895019531e+02, 2.950472106933594e+02, 2.945446472167969e+02, 2.950179748535156e+02, 2.953992309570312e+02, 2.952558898925781e+02, 2.947647705078125e+02, 2.9456494140625e+02, 2.943883056640625e+02, 2.939943542480469e+02, 2.939468994140625e+02, 2.940118103027344e+02, 2.943357849121094e+02, 2.945157470703125e+02, 2.944212646484375e+02, 2.943575134277344e+02, 2.94407470703125e+02, 2.945172119140625e+02, 2.943687133789062e+02, 2.940785522460938e+02, 2.944533996582031e+02, 2.943351745605469e+02, 2.944909362792969e+02, 2.944227905273438e+02, 2.940756530761719e+02, 2.942950439453125e+02, 2.943910522460938e+02, 2.947022399902344e+02, 2.948585510253906e+02, 2.947969055175781e+02, 2.946827087402344e+02, 2.947987670898438e+02, 2.951851196289062e+02, 2.954520874023438e+02, 2.954857177734375e+02, 2.954664611816406e+02, 2.95641357421875e+02, 2.960306396484375e+02, 2.962507934570312e+02, 2.96281005859375e+02, 2.962692260742188e+02, 2.964900512695312e+02, 2.969938659667969e+02, 2.972795715332031e+02, 2.972011413574219e+02, 2.971228332519531e+02, 2.973584594726562e+02, 2.977446594238281e+02, 2.9777587890625e+02, 2.976783752441406e+02, 2.974805908203125e+02, 2.975054931640625e+02, 2.976567687988281e+02, 2.974949340820312e+02, 2.970361633300781e+02, 2.966221923828125e+02, 2.964785766601562e+02, 2.964925537109375e+02, 2.962096862792969e+02, 2.957584533691406e+02]
+zon.TAir=[2.931499938964844e+02, 2.928226318359375e+02, 2.931497192382812e+02, 2.928377990722656e+02, 2.92978759765625e+02, 2.929395446777344e+02, 2.929641723632812e+02, 2.931311645507812e+02, 2.929790344238281e+02, 2.928749084472656e+02, 2.928740234375e+02, 2.92921875e+02, 2.941459655761719e+02, 2.941625061035156e+02, 2.924912719726562e+02, 2.929088439941406e+02, 2.928964538574219e+02, 2.942584228515625e+02, 2.936517944335938e+02, 2.925707397460938e+02, 2.927347717285156e+02, 2.928307800292969e+02, 2.944002990722656e+02, 2.939997863769531e+02, 2.925214538574219e+02, 2.927845764160156e+02, 2.928467407226562e+02, 2.944580688476562e+02, 2.945240173339844e+02, 2.924293518066406e+02, 2.928682556152344e+02, 2.92934326171875e+02, 2.936629943847656e+02, 2.939288024902344e+02, 2.926728820800781e+02, 2.929736633300781e+02, 2.929322814941406e+02, 2.929896240234375e+02, 2.931093139648438e+02, 2.928687438964844e+02, 2.927938232421875e+02, 2.929584350585938e+02, 2.929733581542969e+02, 2.933098754882812e+02, 2.928312072753906e+02, 2.928649597167969e+02, 2.929613647460938e+02, 2.950862426757812e+02, 2.956763000488281e+02, 2.93691650390625e+02, 2.932593688964844e+02, 2.931045837402344e+02, 2.955185546875e+02, 2.962124938964844e+02, 2.94824951171875e+02, 2.94432861328125e+02, 2.942113647460938e+02, 2.957611694335938e+02, 2.954354858398438e+02, 2.934066162109375e+02, 2.931763000488281e+02, 2.930723876953125e+02, 2.953938293457031e+02, 2.958639526367188e+02, 2.936225891113281e+02, 2.930823059082031e+02, 2.931368408203125e+02, 2.958602600097656e+02, 2.965826110839844e+02, 2.952276306152344e+02, 2.950112609863281e+02, 2.941823120117188e+02, 2.955706176757812e+02, 2.96460205078125e+02, 2.960467529296875e+02, 2.957234802246094e+02, 2.953232727050781e+02, 2.964182434082031e+02, 2.972596435546875e+02, 2.968623657226562e+02, 2.963885192871094e+02, 2.96128662109375e+02, 2.982913513183594e+02, 2.991607055664062e+02, 2.977752685546875e+02, 2.970149230957031e+02, 2.970944213867188e+02, 2.992075805664062e+02, 2.997713928222656e+02, 2.983069763183594e+02, 2.97252685546875e+02, 2.970169677734375e+02, 2.988072509765625e+02, 2.986637268066406e+02, 2.962955932617188e+02, 2.957736511230469e+02, 2.952701721191406e+02, 2.971090393066406e+02, 2.968755493164062e+02, 2.948574829101562e+02, 2.944297180175781e+02]
 TSetRooHea.y=[2.931499938964844e+02, 2.931499938964844e+02]
 TSetRooCoo.y=[2.991499938964844e+02, 2.991499938964844e+02]
-attFlo.heaPorBac.T=[2.931499938964844e+02, 2.933100891113281e+02, 2.935357971191406e+02, 2.935425720214844e+02, 2.936516723632812e+02, 2.936580200195312e+02, 2.936397094726562e+02, 2.936194458007812e+02, 2.935436096191406e+02, 2.93547119140625e+02, 2.935725708007812e+02, 2.935558776855469e+02, 2.935637512207031e+02, 2.934971923828125e+02, 2.933451538085938e+02, 2.934479675292969e+02, 2.934742126464844e+02, 2.935494384765625e+02, 2.934189147949219e+02, 2.932720947265625e+02, 2.933880615234375e+02, 2.934319458007812e+02, 2.935120239257812e+02, 2.934203796386719e+02, 2.932591552734375e+02, 2.933621520996094e+02, 2.934051208496094e+02, 2.935108642578125e+02, 2.935382080078125e+02, 2.934299621582031e+02, 2.935311279296875e+02, 2.935209045410156e+02, 2.934790344238281e+02, 2.933545532226562e+02, 2.931908874511719e+02, 2.932077941894531e+02, 2.932407836914062e+02, 2.93255126953125e+02, 2.932572021484375e+02, 2.932630310058594e+02, 2.933115234375e+02, 2.933577575683594e+02, 2.933989868164062e+02, 2.934601135253906e+02, 2.934482421875e+02, 2.935736083984375e+02, 2.935781555175781e+02, 2.937069702148438e+02, 2.93911376953125e+02, 2.939611206054688e+02, 2.938429565429688e+02, 2.937167053222656e+02, 2.938260192871094e+02, 2.941315002441406e+02, 2.943160705566406e+02, 2.943316650390625e+02, 2.943382568359375e+02, 2.944236450195312e+02, 2.945077819824219e+02, 2.944104919433594e+02, 2.942235412597656e+02, 2.94056396484375e+02, 2.940984497070312e+02, 2.942818298339844e+02, 2.942979125976562e+02, 2.941585083007812e+02, 2.940513000488281e+02, 2.94162109375e+02, 2.944784545898438e+02, 2.946624450683594e+02, 2.947140808105469e+02, 2.946959838867188e+02, 2.948076171875e+02, 2.951176452636719e+02, 2.953813781738281e+02, 2.955044250488281e+02, 2.95552978515625e+02, 2.957084655761719e+02, 2.960208129882812e+02, 2.962427368164062e+02, 2.963440246582031e+02, 2.963876037597656e+02, 2.965959777832031e+02, 2.970030212402344e+02, 2.972404174804688e+02, 2.972808532714844e+02, 2.972771606445312e+02, 2.974766540527344e+02, 2.972590942382812e+02, 2.973765258789062e+02, 2.975376586914062e+02, 2.975328674316406e+02, 2.976150207519531e+02, 2.977194213867188e+02, 2.97627197265625e+02, 2.973531188964844e+02, 2.9701416015625e+02, 2.967843627929688e+02, 2.966374206542969e+02, 2.963732604980469e+02, 2.960197448730469e+02]
-conHea.y=[1.13686837721616e-13, 6.547046303749084e-01, 5.563912563957274e-04, 6.244003772735596e-01, 3.424203991889954e-01, 4.208933711051941e-01, 3.716287016868591e-01, 3.766723349690437e-02, 3.41943621635437e-01, 5.501860976219177e-01, 5.519719123840332e-01, 4.561158418655396e-01, 0e+00, 0e+00, 1e+00, 4.823504090309143e-01, 5.070858001708984e-01, 0e+00, 0e+00, 1e+00, 8.304033279418945e-01, 6.384499669075012e-01, 0e+00, 0e+00, 1e+00, 7.307899594306946e-01, 6.064978837966919e-01, 0e+00, 0e+00, 1e+00, 5.63500702381134e-01, 4.313687384128571e-01, 0e+00, 0e+00, 9.5424485206604e-01, 3.526375591754913e-01, 4.354142546653748e-01, 3.207279443740845e-01, 8.139939606189728e-02, 5.624953508377075e-01, 7.124084830284119e-01, 3.831039369106293e-01, 3.533108234405518e-01, 0e+00, 6.37598991394043e-01, 5.700744986534119e-01, 3.77280592918396e-01, 0e+00, 0e+00, 0e+00, 0e+00, 9.0842604637146e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.552843749523163e-01, 0e+00, 0e+00, 0e+00, 1.354165822267532e-01, 2.629953622817993e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-conCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.141809277236462e-02, 0e+00, 0e+00, 0e+00, 1.151746585965157e-01, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-livFlo.qFro_flow=[5.663226246833801e-01, 2.250109100341797e+01, 1.153775024414062e+01, 1.36056604385376e+01, 1.772361373901367e+01, 1.637032699584961e+01, 1.622370147705078e+01, 1.17210054397583e+01, 1.080343151092529e+01, 1.620568656921387e+01, 1.735263061523438e+01, 1.764855194091797e+01, 9.585426330566406e+00, 4.070104598999023e+00, 1.205275726318359e+01, 1.70029239654541e+01, 1.821291542053223e+01, 8.694689750671387e+00, 6.103794574737549e+00, 1.55605936050415e+01, 1.913574981689453e+01, 2.007722091674805e+01, 1.011680507659912e+01, 6.312398433685303e+00, 1.253890609741211e+01, 1.80148868560791e+01, 1.993205451965332e+01, 8.366777420043945e+00, 3.945785760879517e+00, 1.088408660888672e+01, 1.286705589294434e+01, 1.418153190612793e+01, 1.021329212188721e+01, 4.373605251312256e+00, 8.47791862487793e+00, 8.789799690246582e+00, 1.159911346435547e+01, 1.002475166320801e+01, 9.465961456298828e+00, 1.102382183074951e+01, 1.291524600982666e+01, 1.361611843109131e+01, 1.331674766540527e+01, 6.804864883422852e+00, 1.306180763244629e+01, 1.590772247314453e+01, 1.498027992248535e+01, 4.195426940917969e+00, 4.706737697124481e-01, 3.716755867004395e+00, 3.022735834121704e+00, 3.522768974304199e+00, -2.101663589477539e+00, -3.537029504776001e+00, 3.193237483501434e-01, 6.046277284622192e-01, 6.10988974571228e-01, -1.713401079177856e+00, -4.166226089000702e-01, 2.877844572067261e+00, 2.311113119125366e+00, 6.191166877746582e+00, -6.547722816467285e-01, -1.949954867362976e+00, 2.889352560043335e+00, 2.906047582626343e+00, 4.981614112854004e+00, -1.871991753578186e+00, -3.544896841049194e+00, 2.802181541919708e-01, 2.302893549203873e-01, 1.163214206695557e+00, -2.836977958679199e+00, -4.142124652862549e+00, -1.171093702316284e+00, -5.135855674743652e-01, -4.313122108578682e-02, -3.122326374053955e+00, -4.286555290222168e+00, -1.398667216300964e+00, -4.585707485675812e-01, 1.207688376307487e-01, -3.853378295898438e+00, -5.419008731842041e+00, -5.937923789024353e-01, 1.836733222007751e-01, -1.45169124007225e-01, -4.152575492858887e+00, -3.77083945274353e+00, 1.449224352836609e-01, 1.50753915309906e+00, 1.109992623329163e+00, -2.773782730102539e+00, -1.730083584785461e+00, 3.463562488555908e+00, 3.101073741912842e+00, 3.27750301361084e+00, -1.42933452129364e+00, 1.109995320439339e-01, 4.093748569488525e+00, 3.61445164680481e+00]
+attFlo.heaPorBac.T=[2.931499938964844e+02, 2.933100891113281e+02, 2.935357971191406e+02, 2.935425720214844e+02, 2.936516723632812e+02, 2.936580200195312e+02, 2.936397094726562e+02, 2.936194458007812e+02, 2.935436096191406e+02, 2.93547119140625e+02, 2.935725708007812e+02, 2.935558776855469e+02, 2.935637817382812e+02, 2.934971923828125e+02, 2.933451843261719e+02, 2.93447998046875e+02, 2.934742126464844e+02, 2.935494384765625e+02, 2.934189147949219e+02, 2.932720947265625e+02, 2.933880615234375e+02, 2.934319152832031e+02, 2.935120239257812e+02, 2.934203796386719e+02, 2.932591552734375e+02, 2.933621215820312e+02, 2.934051208496094e+02, 2.935108642578125e+02, 2.935382385253906e+02, 2.934299621582031e+02, 2.935311279296875e+02, 2.935209045410156e+02, 2.934790344238281e+02, 2.933545532226562e+02, 2.931908874511719e+02, 2.93207763671875e+02, 2.932407836914062e+02, 2.93255126953125e+02, 2.932572021484375e+02, 2.932630615234375e+02, 2.933114929199219e+02, 2.933577575683594e+02, 2.933989868164062e+02, 2.934601135253906e+02, 2.934482421875e+02, 2.935736083984375e+02, 2.935781555175781e+02, 2.937069702148438e+02, 2.93911376953125e+02, 2.939611511230469e+02, 2.938429565429688e+02, 2.937167053222656e+02, 2.938260192871094e+02, 2.941315002441406e+02, 2.943160400390625e+02, 2.943316345214844e+02, 2.943382568359375e+02, 2.944236450195312e+02, 2.945077819824219e+02, 2.944104614257812e+02, 2.942235412597656e+02, 2.940563659667969e+02, 2.940984497070312e+02, 2.942818298339844e+02, 2.942979125976562e+02, 2.941585083007812e+02, 2.940512390136719e+02, 2.94162109375e+02, 2.944784545898438e+02, 2.946624450683594e+02, 2.947140808105469e+02, 2.946959838867188e+02, 2.948076171875e+02, 2.951176452636719e+02, 2.953813781738281e+02, 2.955044250488281e+02, 2.95552978515625e+02, 2.957084655761719e+02, 2.960208129882812e+02, 2.962427368164062e+02, 2.963440246582031e+02, 2.963876037597656e+02, 2.965959777832031e+02, 2.970030212402344e+02, 2.972404174804688e+02, 2.972808532714844e+02, 2.972771606445312e+02, 2.974766540527344e+02, 2.972590942382812e+02, 2.973765258789062e+02, 2.975376586914062e+02, 2.975328674316406e+02, 2.976150207519531e+02, 2.977194213867188e+02, 2.97627197265625e+02, 2.973531188964844e+02, 2.9701416015625e+02, 2.967843627929688e+02, 2.966374206542969e+02, 2.963732604980469e+02, 2.960197448730469e+02]
+conHea.y=[1.13686837721616e-13, 6.547129154205322e-01, 5.458206869661808e-04, 6.243960857391357e-01, 3.424839675426483e-01, 4.208992719650269e-01, 3.716327846050262e-01, 3.766918554902077e-02, 3.419438302516937e-01, 5.501720905303955e-01, 5.519798994064331e-01, 4.562208652496338e-01, 0e+00, 0e+00, 1e+00, 4.823423027992249e-01, 5.070762038230896e-01, 0e+00, 0e+00, 1e+00, 8.304263949394226e-01, 6.384392976760864e-01, 0e+00, 0e+00, 1e+00, 7.308271527290344e-01, 6.064999103546143e-01, 0e+00, 0e+00, 1e+00, 5.634953379631042e-01, 4.313243627548218e-01, 0e+00, 0e+00, 9.542187452316284e-01, 3.526515364646912e-01, 4.354192614555359e-01, 3.207480311393738e-01, 8.137822896242142e-02, 5.625051259994507e-01, 7.123522758483887e-01, 3.83103221654892e-01, 3.533125519752502e-01, 0e+00, 6.37580394744873e-01, 5.700657963752747e-01, 3.772976696491241e-01, 0e+00, 0e+00, 0e+00, 0e+00, 9.084748476743698e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.552397459745407e-01, 0e+00, 0e+00, 0e+00, 1.354078948497772e-01, 2.630800381302834e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+conCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.141910791397095e-02, 0e+00, 0e+00, 0e+00, 1.151742339134216e-01, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+livFlo.qFro_flow=[5.663226246833801e-01, 2.250103569030762e+01, 1.153775691986084e+01, 1.360568428039551e+01, 1.77232723236084e+01, 1.637030601501465e+01, 1.622369194030762e+01, 1.17210054397583e+01, 1.080344390869141e+01, 1.620575523376465e+01, 1.735260009765625e+01, 1.764808082580566e+01, 9.585713386535645e+00, 4.070239543914795e+00, 1.205299758911133e+01, 1.700285911560059e+01, 1.821288108825684e+01, 8.694614410400391e+00, 6.103762626647949e+00, 1.556064891815186e+01, 1.91357536315918e+01, 2.007721138000488e+01, 1.011673450469971e+01, 6.312400341033936e+00, 1.253901290893555e+01, 1.801472663879395e+01, 1.993204498291016e+01, 8.366778373718262e+00, 3.9457848072052e+00, 1.088409519195557e+01, 1.286707878112793e+01, 1.418168926239014e+01, 1.021322727203369e+01, 4.373576641082764e+00, 8.477972984313965e+00, 8.789752960205078e+00, 1.15991039276123e+01, 1.002466106414795e+01, 9.466048240661621e+00, 1.102382183074951e+01, 1.291563320159912e+01, 1.361616897583008e+01, 1.33167610168457e+01, 6.805026531219482e+00, 1.306198310852051e+01, 1.590775871276855e+01, 1.498017311096191e+01, 4.195463180541992e+00, 4.706906378269196e-01, 3.716773509979248e+00, 3.022745132446289e+00, 3.522703647613525e+00, -2.10190749168396e+00, -3.537152767181396e+00, 3.192667663097382e-01, 6.045972108840942e-01, 6.10973060131073e-01, -1.713410973548889e+00, -4.166269898414612e-01, 2.877846479415894e+00, 2.31111478805542e+00, 6.191454887390137e+00, -6.547324061393738e-01, -1.9499351978302e+00, 2.889366388320923e+00, 2.906051158905029e+00, 4.981614112854004e+00, -1.871940016746521e+00, -3.544870376586914e+00, 2.802330851554871e-01, 2.302963584661484e-01, 1.16322648525238e+00, -2.836980104446411e+00, -4.142124652862549e+00, -1.171091318130493e+00, -5.135834217071533e-01, -4.312814399600029e-02, -3.122328281402588e+00, -4.286556720733643e+00, -1.398665428161621e+00, -4.585697948932648e-01, 1.207714602351189e-01, -3.853380918502808e+00, -5.419010639190674e+00, -5.937906503677368e-01, 1.836790293455124e-01, -1.451726257801056e-01, -4.152574062347412e+00, -3.770832061767578e+00, 1.449211239814758e-01, 1.507541179656982e+00, 1.10999608039856e+00, -2.773778915405273e+00, -1.730083823204041e+00, 3.463569402694702e+00, 3.101076126098633e+00, 3.277511119842529e+00, -1.429332733154297e+00, 1.110004708170891e-01, 4.093750476837158e+00, 3.614456653594971e+00]
 livFlo.qBac_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-attFlo.qFro_flow=[7.7837890625e+01, 5.579198837280273e+01, -4.627706909179688e+01, 1.389038848876953e+01, 3.067738342285156e+01, 1.915164566040039e+01, 1.33446569442749e+01, -3.128516006469727e+01, -5.18327808380127e+00, 1.874477577209473e+01, 1.871340751647949e+01, 2.284854698181152e+01, -9.883063316345215e+00, -4.916339492797852e+01, 2.559790802001953e+01, 2.356832695007324e+01, 2.067914962768555e+01, -5.184240341186523e+01, 3.001374244689941e+00, 2.249575424194336e+01, 3.171723747253418e+01, 2.300096130371094e+01, -4.772848892211914e+01, -5.482454299926758e+00, 1.816205215454102e+01, 2.874721527099609e+01, 3.092617225646973e+01, -8.600099182128906e+01, -4.825010299682617e+01, 4.018139266967773e+01, 2.315258598327637e+01, 1.808051109313965e+01, 1.571137714385986e+01, -9.726984977722168e+00, 1.983429789543152e+00, -2.500432252883911e+00, 3.000457763671875e+00, -1.092214775085449e+01, -6.729013919830322e+00, 6.923452377319336e+00, 7.743257522583008e+00, 9.741896629333496e+00, -7.442187666893005e-01, -7.720968627929688e+01, 3.620949172973633e+01, 3.527517318725586e+01, 2.824200248718262e+01, -5.518843841552734e+01, -5.052267074584961e+01, 2.28287239074707e+01, 2.101678466796875e+01, 1.587274551391602e+01, -5.403040313720703e+01, -5.309184646606445e+01, 1.552184867858887e+01, 1.834911918640137e+01, 1.436924076080322e+01, -6.206467151641846e+00, 1.065469551086426e+01, 3.308067321777344e+01, 2.687749481201172e+01, 2.694907569885254e+01, -6.939010620117188e+01, -6.327943801879883e+01, 4.314786911010742e+01, 3.941970825195312e+01, 3.353448486328125e+01, -7.224043273925781e+01, -5.012841415405273e+01, 1.755192184448242e+01, 1.447580528259277e+01, 2.088316917419434e+01, -5.682119369506836e+01, -5.111530685424805e+01, 2.168887329101562e+01, 2.466759872436523e+01, 2.267578315734863e+01, -4.534841537475586e+01, -3.950532531738281e+01, 1.916156005859375e+01, 2.512606430053711e+01, 2.745491790771484e+01, -2.481789779663086e+01, -6.152838897705078e+01, 3.605504608154297e+01, 3.476080322265625e+01, 2.28663387298584e+01, -3.083244323730469e+01, -4.778730392456055e+01, 1.648166656494141e+01, 3.633101654052734e+01, 3.231257247924805e+01, -2.727007675170898e+01, -6.53606653213501e+00, 5.470897674560547e+01, 4.041479110717773e+01, 3.275656890869141e+01, -2.738411903381348e+01, 5.638444423675537e+00, 3.108474159240723e+01, 2.261184310913086e+01]
-attFlo.qBac_flow=[-1.34919285774231e+00, -6.434999942779541e+00, -4.853364944458008e+00, -3.361907005310059e+00, -4.196223258972168e+00, -3.353924989700317e+00, -3.413251638412476e+00, -3.573396921157837e+00, -2.658991098403931e+00, -3.533809185028076e+00, -3.882661819458008e+00, -3.804966688156128e+00, -4.325063705444336e+00, -3.524409055709839e+00, -1.335170269012451e+00, -4.099381446838379e+00, -4.265010356903076e+00, -5.951193332672119e+00, -1.588343739509583e+00, -3.054875135421753e+00, -4.703341484069824e+00, -4.989651203155518e+00, -6.93132209777832e+00, -2.977383613586426e+00, -2.020783185958862e+00, -4.523665428161621e+00, -5.046523571014404e+00, -7.313415050506592e+00, -5.394254207611084e+00, -4.618730545043945e-01, -2.415948390960693e+00, -2.868136644363403e+00, -2.108756303787231e+00, -1.855225205421448e+00, -1.219320297241211e+00, -2.330573320388794e+00, -3.613075256347656e+00, -3.364713907241821e+00, -3.56418514251709e+00, -3.072280406951904e+00, -2.837214231491089e+00, -3.788683414459229e+00, -3.952509641647339e+00, -4.37512731552124e+00, -2.976981639862061e+00, -3.494500160217285e+00, -3.010263919830322e+00, -6.865549087524414e+00, -7.364701271057129e+00, -6.956799030303955e-01, 9.825679659843445e-01, 9.932476878166199e-01, -5.290991306304932e+00, -7.453373908996582e+00, -1.860368013381958e+00, -2.676520049571991e-01, 3.605022132396698e-01, -2.683439254760742e+00, -1.210221648216248e+00, 2.478327751159668e+00, 2.967300415039062e+00, 1.638769745826721e+00, -3.913774490356445e+00, -5.311461448669434e+00, 1.102248787879944e+00, 2.831085681915283e+00, 1.595646619796753e+00, -5.534304618835449e+00, -7.709794521331787e+00, -1.922677397727966e+00, -7.170805931091309e-01, 9.601152539253235e-01, -3.175150632858276e+00, -5.852859020233154e+00, -2.329499244689941e+00, -5.152069330215454e-01, 6.454947590827942e-01, -2.90411901473999e+00, -5.354353427886963e+00, -1.92677903175354e+00, 1.895010471343994e-02, 1.081196069717407e+00, -4.300130367279053e+00, -7.394698143005371e+00, -1.38778293132782e+00, 7.884334921836853e-01, 1.203092575073242e+00, -4.52377986907959e+00, -1.092678928375244e+01, -4.520776271820068e+00, 1.183011680841446e-01, 1.254085063934326e+00, -2.689726829528809e+00, -1.846937417984009e+00, 3.6570885181427e+00, 5.036572933197021e+00, 5.89115571975708e+00, 1.354054927825928e+00, 1.348393440246582e+00, 4.440017700195312e+00, 4.963513851165771e+00]
-slaFlo.surf_a.Q_flow=[-1.052421569824219e+02, -4.18147412109375e+03, -2.144109375e+03, -2.52839794921875e+03, -3.29365478515625e+03, -3.042167724609375e+03, -3.014919921875e+03, -2.17816455078125e+03, -2.00764794921875e+03, -3.011572265625e+03, -3.224713623046875e+03, -3.279705810546875e+03, -1.78130078125e+03, -7.563649291992188e+02, -2.2398154296875e+03, -3.15972607421875e+03, -3.384583984375e+03, -1.615771484375e+03, -1.134294189453125e+03, -2.891691650390625e+03, -3.556078125e+03, -3.731035888671875e+03, -1.880049194335938e+03, -1.17306005859375e+03, -2.330158447265625e+03, -3.347783203125e+03, -3.704058837890625e+03, -1.554833984375e+03, -7.332622680664062e+02, -2.022636352539062e+03, -2.391139892578125e+03, -2.63541455078125e+03, -1.897979736328125e+03, -8.127658081054688e+02, -1.575487915039062e+03, -1.633446044921875e+03, -2.155512939453125e+03, -1.862942504882812e+03, -1.75910009765625e+03, -2.04860400390625e+03, -2.400095458984375e+03, -2.530341552734375e+03, -2.474708251953125e+03, -1.2645771484375e+03, -2.42733154296875e+03, -2.9562001953125e+03, -2.783849365234375e+03, -7.796541748046875e+02, -8.746731567382812e+01, -6.907006225585938e+02, -5.617279052734375e+02, -6.546512451171875e+02, 3.905611267089844e+02, 6.5730126953125e+02, -5.934130096435547e+01, -1.123605499267578e+02, -1.135426940917969e+02, 3.184086303710938e+02, 7.742276000976562e+01, -5.348021850585938e+02, -4.294840393066406e+02, -1.150531005859375e+03, 1.216791305541992e+02, 3.623684692382812e+02, -5.369407348632812e+02, -5.400432739257812e+02, -9.25754638671875e+02, 3.478802185058594e+02, 6.587633056640625e+02, -5.207413864135742e+01, -4.2795654296875e+01, -2.161650695800781e+02, 5.27207763671875e+02, 7.697487182617188e+02, 2.176293640136719e+02, 9.544179534912109e+01, 8.0152587890625e+00, 5.802352294921875e+02, 7.965888671875e+02, 2.599202880859375e+02, 8.521816253662109e+01, -2.244298934936523e+01, 7.160897827148438e+02, 1.00703759765625e+03, 1.103469696044922e+02, -3.413279724121094e+01, 2.69773998260498e+01, 7.716908569335938e+02, 7.00751220703125e+02, -2.693155670166016e+01, -2.801524658203125e+02, -2.062746734619141e+02, 5.154638671875e+02, 3.215088195800781e+02, -6.436486206054688e+02, -5.762858276367188e+02, -6.090723876953125e+02, 2.656193542480469e+02, -2.062751770019531e+01, -7.607587890625e+02, -6.716890258789062e+02]
-hea.Q_flow=[0e+00, 4.55610302734375e+03, 0e+00, 5.25216015625e+03, 1.937999633789062e+03, 2.81190234375e+03, 2.274638916015625e+03, 0e+00, 2.495033203125e+03, 4.23264501953125e+03, 4.14497412109375e+03, 3.10495751953125e+03, 0e+00, 0e+00, 9.33102734375e+03, 3.3648359375e+03, 3.579300048828125e+03, -0e+00, -0e+00, 8.98445703125e+03, 7.0240185546875e+03, 4.9454189453125e+03, 0e+00, 0e+00, 9.2947822265625e+03, 5.98654541015625e+03, 4.53533642578125e+03, -0e+00, -0e+00, 9.4758427734375e+03, 4.7981591796875e+03, 3.14160107421875e+03, 0e+00, 0e+00, 9.171345703125e+03, 2.9060166015625e+03, 3.4665673828125e+03, 2.360339111328125e+03, 9.107303453048665e-12, 4.97198046875e+03, 6.4231298828125e+03, 2.68434033203125e+03, 2.3735224609375e+03, 0e+00, 5.33806005859375e+03, 4.43137646484375e+03, 2.476495361328125e+03, -0e+00, -0e+00, -0e+00, -0e+00, -2.655640681317739e-12, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.079598388671875e+02, 0e+00, 0e+00, 0e+00, 4.529151305301266e-13, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
+attFlo.qFro_flow=[7.7837890625e+01, 5.579199981689453e+01, -4.627706909179688e+01, 1.389040374755859e+01, 3.067739486694336e+01, 1.915164756774902e+01, 1.334465599060059e+01, -3.128516960144043e+01, -5.183276653289795e+00, 1.874477386474609e+01, 1.871340751647949e+01, 2.284855461120605e+01, -9.883057594299316e+00, -4.916340255737305e+01, 2.559791946411133e+01, 2.356833648681641e+01, 2.067916107177734e+01, -5.184241485595703e+01, 3.001379728317261e+00, 2.249575996398926e+01, 3.171724319458008e+01, 2.30009651184082e+01, -4.772849655151367e+01, -5.482505798339844e+00, 1.816205024719238e+01, 2.874721336364746e+01, 3.092618179321289e+01, -8.600102996826172e+01, -4.825009536743164e+01, 4.018138885498047e+01, 2.315258026123047e+01, 1.808052062988281e+01, 1.571138572692871e+01, -9.726986885070801e+00, 1.983431458473206e+00, -2.500432252883911e+00, 3.000458002090454e+00, -1.092214775085449e+01, -6.729020118713379e+00, 6.923450469970703e+00, 7.743263244628906e+00, 9.741899490356445e+00, -7.442187666893005e-01, -7.720970916748047e+01, 3.620949935913086e+01, 3.527517700195312e+01, 2.824200057983398e+01, -5.518843841552734e+01, -5.052265167236328e+01, 2.282872772216797e+01, 2.101678466796875e+01, 1.587274265289307e+01, -5.403041076660156e+01, -5.309184646606445e+01, 1.552184963226318e+01, 1.83491153717041e+01, 1.436924266815186e+01, -6.206472873687744e+00, 1.065470218658447e+01, 3.308067321777344e+01, 2.687749862670898e+01, 2.694907760620117e+01, -6.939011383056641e+01, -6.32794303894043e+01, 4.314786148071289e+01, 3.941970443725586e+01, 3.353448104858398e+01, -7.224043273925781e+01, -5.012841033935547e+01, 1.755192947387695e+01, 1.447580528259277e+01, 2.08831729888916e+01, -5.682119369506836e+01, -5.111530685424805e+01, 2.168887138366699e+01, 2.466759872436523e+01, 2.267578506469727e+01, -4.534841537475586e+01, -3.950532150268555e+01, 1.916156005859375e+01, 2.512606430053711e+01, 2.745492362976074e+01, -2.481789779663086e+01, -6.152838897705078e+01, 3.605506134033203e+01, 3.476080703735352e+01, 2.28663387298584e+01, -3.083244132995605e+01, -4.778730010986328e+01, 1.648166847229004e+01, 3.633101272583008e+01, 3.231257629394531e+01, -2.727008819580078e+01, -6.536056995391846e+00, 5.4708984375e+01, 4.041479873657227e+01, 3.275657653808594e+01, -2.738413429260254e+01, 5.638452053070068e+00, 3.108474731445312e+01, 2.261184883117676e+01]
+attFlo.qBac_flow=[-1.34919285774231e+00, -6.434970855712891e+00, -4.85337495803833e+00, -3.361927509307861e+00, -4.196019172668457e+00, -3.353928089141846e+00, -3.413248062133789e+00, -3.573394536972046e+00, -2.658995628356934e+00, -3.533852338790894e+00, -3.882637739181519e+00, -3.804664373397827e+00, -4.325287342071533e+00, -3.524511098861694e+00, -1.335361123085022e+00, -4.099327087402344e+00, -4.264986991882324e+00, -5.951136112213135e+00, -1.588310837745667e+00, -3.054901599884033e+00, -4.703329563140869e+00, -4.989628791809082e+00, -6.931281089782715e+00, -2.977373838424683e+00, -2.020855188369751e+00, -4.523542881011963e+00, -5.046516895294189e+00, -7.313422679901123e+00, -5.394252777099609e+00, -4.618601202964783e-01, -2.415974140167236e+00, -2.868298292160034e+00, -2.108711957931519e+00, -1.855212330818176e+00, -1.219416379928589e+00, -2.330542802810669e+00, -3.61307430267334e+00, -3.364646196365356e+00, -3.56424617767334e+00, -3.072281837463379e+00, -2.837473392486572e+00, -3.78873085975647e+00, -3.952529430389404e+00, -4.37525463104248e+00, -2.977072715759277e+00, -3.494531631469727e+00, -3.010195970535278e+00, -6.865586757659912e+00, -7.364716053009033e+00, -6.956818699836731e-01, 9.825652241706848e-01, 9.932933449745178e-01, -5.290814399719238e+00, -7.453292369842529e+00, -1.8603196144104e+00, -2.676352858543396e-01, 3.60510528087616e-01, -2.683436393737793e+00, -1.210218191146851e+00, 2.478325366973877e+00, 2.967297792434692e+00, 1.638563394546509e+00, -3.913819313049316e+00, -5.311476230621338e+00, 1.102245092391968e+00, 2.831076622009277e+00, 1.595644474029541e+00, -5.534353733062744e+00, -7.70981502532959e+00, -1.92268431186676e+00, -7.170848250389099e-01, 9.601171016693115e-01, -3.175153493881226e+00, -5.852859497070312e+00, -2.329495906829834e+00, -5.152041912078857e-01, 6.454949975013733e-01, -2.904122114181519e+00, -5.354350566864014e+00, -1.926774621009827e+00, 1.895297132432461e-02, 1.081194758415222e+00, -4.300137519836426e+00, -7.394704341888428e+00, -1.387770771980286e+00, 7.88438618183136e-01, 1.203089356422424e+00, -4.523781299591064e+00, -1.092679786682129e+01, -4.520771503448486e+00, 1.183010190725327e-01, 1.254085540771484e+00, -2.689719200134277e+00, -1.846935510635376e+00, 3.657089471817017e+00, 5.036572456359863e+00, 5.891155242919922e+00, 1.354046106338501e+00, 1.348392724990845e+00, 4.440013408660889e+00, 4.963517665863037e+00]
+slaFlo.surf_a.Q_flow=[-1.052421569824219e+02, -4.1814638671875e+03, -2.14411083984375e+03, -2.528402587890625e+03, -3.293591552734375e+03, -3.042163818359375e+03, -3.014918212890625e+03, -2.17816455078125e+03, -2.007650268554688e+03, -3.0115849609375e+03, -3.224707763671875e+03, -3.279618408203125e+03, -1.781354125976562e+03, -7.563900146484375e+02, -2.239860107421875e+03, -3.1597138671875e+03, -3.38457763671875e+03, -1.61575732421875e+03, -1.134288208007812e+03, -2.891701904296875e+03, -3.5560791015625e+03, -3.731033935546875e+03, -1.880036010742188e+03, -1.173060302734375e+03, -2.330178466796875e+03, -3.347753662109375e+03, -3.70405712890625e+03, -1.554834106445312e+03, -7.332620849609375e+02, -2.022637939453125e+03, -2.391144287109375e+03, -2.635444091796875e+03, -1.897967651367188e+03, -8.127604370117188e+02, -1.575497924804688e+03, -1.6334375e+03, -2.155510986328125e+03, -1.862925659179688e+03, -1.7591162109375e+03, -2.04860400390625e+03, -2.40016748046875e+03, -2.530350830078125e+03, -2.474710693359375e+03, -1.264607177734375e+03, -2.4273642578125e+03, -2.956206787109375e+03, -2.78382958984375e+03, -7.79660888671875e+02, -8.747045135498047e+01, -6.907039184570312e+02, -5.617296752929688e+02, -6.546390991210938e+02, 3.906064453125e+02, 6.5732421875e+02, -5.933070755004883e+01, -1.123548889160156e+02, -1.135397338867188e+02, 3.184104919433594e+02, 7.742357635498047e+01, -5.34802490234375e+02, -4.29484375e+02, -1.15058447265625e+03, 1.216717224121094e+02, 3.623648071289062e+02, -5.36943359375e+02, -5.400438842773438e+02, -9.257546997070312e+02, 3.4787060546875e+02, 6.587584228515625e+02, -5.20769157409668e+01, -4.279695510864258e+01, -2.161673583984375e+02, 5.272081909179688e+02, 7.697487182617188e+02, 2.1762890625e+02, 9.544139862060547e+01, 8.014687538146973e+00, 5.80235595703125e+02, 7.96589111328125e+02, 2.599199829101562e+02, 8.521798706054688e+01, -2.244347763061523e+01, 7.160902709960938e+02, 1.007037963867188e+03, 1.103466567993164e+02, -3.413385772705078e+01, 2.697805023193359e+01, 7.716906127929688e+02, 7.007498779296875e+02, -2.693131256103516e+01, -2.8015283203125e+02, -2.062753143310547e+02, 5.154631958007812e+02, 3.215088500976562e+02, -6.4364990234375e+02, -5.762862548828125e+02, -6.090739135742188e+02, 2.656190185546875e+02, -2.062769317626953e+01, -7.607591552734375e+02, -6.7168994140625e+02]
+hea.Q_flow=[0e+00, 4.556185546875e+03, 0e+00, 5.25211865234375e+03, 1.938766479492188e+03, 2.811970703125e+03, 2.27468212890625e+03, -0e+00, 2.495031494140625e+03, 4.23248046875e+03, 4.14506640625e+03, 3.10614892578125e+03, -0e+00, -0e+00, 9.3310087890625e+03, 3.3647568359375e+03, 3.5792099609375e+03, -0e+00, -0e+00, 8.984447265625e+03, 7.0242587890625e+03, 4.94527587890625e+03, -0e+00, -0e+00, 9.294771484375e+03, 5.9869501953125e+03, 4.5353642578125e+03, 0e+00, 0e+00, 9.47583984375e+03, 4.79810302734375e+03, 3.141152587890625e+03, 0e+00, 0e+00, 9.1710654296875e+03, 2.906182861328125e+03, 3.466626220703125e+03, 2.36056201171875e+03, -2.262442837241974e-11, 4.9720869140625e+03, 6.4224677734375e+03, 2.684334716796875e+03, 2.37354736328125e+03, -0e+00, 5.33780517578125e+03, 4.4312841796875e+03, 2.4766904296875e+03, -0e+00, -0e+00, -0e+00, -0e+00, -6.670192176372325e-12, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.0745166015625e+02, 0e+00, 0e+00, 0e+00, 4.066645891559473e-12, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
 livFlo.heaPorBac.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931501159667969e+02, 2.931502075195312e+02, 2.931502990722656e+02, 2.931504516601562e+02, 2.931506042480469e+02, 2.931508483886719e+02, 2.931510925292969e+02, 2.931514282226562e+02, 2.931517639160156e+02, 2.931521911621094e+02, 2.931526489257812e+02, 2.931531677246094e+02, 2.931537170410156e+02, 2.931543579101562e+02, 2.93155029296875e+02, 2.931557312011719e+02, 2.93156494140625e+02, 2.931573181152344e+02, 2.931581726074219e+02, 2.931590881347656e+02, 2.931600341796875e+02, 2.931610107421875e+02, 2.931620788574219e+02, 2.931631469726562e+02, 2.931642761230469e+02, 2.931654357910156e+02, 2.931666564941406e+02, 2.931678771972656e+02, 2.931691589355469e+02, 2.931704711914062e+02, 2.931717834472656e+02, 2.931731567382812e+02, 2.931745300292969e+02, 2.931759643554688e+02, 2.931773681640625e+02, 2.931788330078125e+02, 2.931802978515625e+02, 2.931817626953125e+02, 2.931832580566406e+02, 2.931847839355469e+02, 2.931863098144531e+02, 2.931878356933594e+02, 2.931893920898438e+02, 2.931909484863281e+02, 2.931925354003906e+02, 2.931941223144531e+02, 2.931957092285156e+02, 2.931973266601562e+02, 2.931989440917969e+02, 2.932005615234375e+02, 2.932021484375e+02, 2.932037658691406e+02, 2.932053527832031e+02, 2.932069702148438e+02, 2.932085571289062e+02, 2.932101135253906e+02, 2.93211669921875e+02, 2.932132263183594e+02, 2.932147827148438e+02, 2.9321630859375e+02, 2.932178039550781e+02, 2.932192993164062e+02, 2.932207946777344e+02, 2.932222595214844e+02, 2.932237243652344e+02, 2.932251586914062e+02, 2.932265930175781e+02, 2.9322802734375e+02, 2.932294311523438e+02, 2.932308349609375e+02, 2.932322387695312e+02, 2.93233642578125e+02, 2.932350158691406e+02, 2.932363891601562e+02, 2.932377624511719e+02, 2.932391662597656e+02, 2.932405395507812e+02, 2.93241943359375e+02, 2.932433471679688e+02, 2.932447509765625e+02, 2.932461853027344e+02, 2.932476501464844e+02, 2.932491149902344e+02, 2.932506408691406e+02, 2.932521667480469e+02, 2.932537231445312e+02, 2.932553405761719e+02, 2.932569885253906e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt
index 752e52c3f90..f06f4af9b13 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_RadiantHeatingCooling_TSurface.txt
@@ -1,4 +1,4 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-initialization=
 {
   "nonlinear": "1",
@@ -8,21 +8,21 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "42",
+  "number of continuous time states": "43",
   "numerical Jacobians": "0"
 }
 time=[7.776e+06, 9.504e+06]
-livFlo.heaPorFro.T=[2.931499938964844e+02, 2.960780334472656e+02, 2.950413208007812e+02, 2.951487426757812e+02, 2.956312866210938e+02, 2.954673156738281e+02, 2.954487915039062e+02, 2.950174255371094e+02, 2.948150634765625e+02, 2.953916625976562e+02, 2.955462341308594e+02, 2.955426635742188e+02, 2.949651794433594e+02, 2.942884521484375e+02, 2.9470556640625e+02, 2.954602661132812e+02, 2.955827331542969e+02, 2.950266418457031e+02, 2.942203674316406e+02, 2.951222839355469e+02, 2.956576232910156e+02, 2.957528686523438e+02, 2.952177429199219e+02, 2.943841857910156e+02, 2.947477416992188e+02, 2.955362243652344e+02, 2.957449035644531e+02, 2.950894775390625e+02, 2.944745483398438e+02, 2.945801696777344e+02, 2.949626159667969e+02, 2.951348876953125e+02, 2.947064208984375e+02, 2.940063171386719e+02, 2.942662048339844e+02, 2.9433203125e+02, 2.947460021972656e+02, 2.9458203125e+02, 2.945348205566406e+02, 2.946477966308594e+02, 2.94850341796875e+02, 2.950329895019531e+02, 2.950472106933594e+02, 2.945446166992188e+02, 2.950179443359375e+02, 2.953992309570312e+02, 2.952559204101562e+02, 2.947647705078125e+02, 2.9456494140625e+02, 2.943883056640625e+02, 2.939943542480469e+02, 2.939469299316406e+02, 2.940118713378906e+02, 2.943356323242188e+02, 2.943468017578125e+02, 2.941839904785156e+02, 2.940931701660156e+02, 2.941329040527344e+02, 2.942411193847656e+02, 2.940975952148438e+02, 2.940505065917969e+02, 2.945402221679688e+02, 2.943493347167969e+02, 2.944462890625e+02, 2.943504638671875e+02, 2.940213012695312e+02, 2.942962951660156e+02, 2.944214477539062e+02, 2.946299743652344e+02, 2.94532958984375e+02, 2.943724060058594e+02, 2.942220153808594e+02, 2.943238830566406e+02, 2.947090759277344e+02, 2.949833068847656e+02, 2.950277709960938e+02, 2.950220031738281e+02, 2.952092590332031e+02, 2.954808349609375e+02, 2.954102783203125e+02, 2.951344909667969e+02, 2.950170593261719e+02, 2.951621704101562e+02, 2.954996643066406e+02, 2.955655212402344e+02, 2.952017822265625e+02, 2.950369873046875e+02, 2.952116088867188e+02, 2.9561279296875e+02, 2.957129821777344e+02, 2.954760437011719e+02, 2.952356567382812e+02, 2.952486267089844e+02, 2.951754760742188e+02, 2.947992553710938e+02, 2.943199157714844e+02, 2.944294738769531e+02, 2.945181579589844e+02, 2.943846130371094e+02, 2.943757934570312e+02, 2.945309753417969e+02]
-zon.TAir=[2.931499938964844e+02, 2.928226623535156e+02, 2.931497192382812e+02, 2.928377990722656e+02, 2.929787902832031e+02, 2.929395446777344e+02, 2.929641723632812e+02, 2.931311645507812e+02, 2.929790344238281e+02, 2.928749084472656e+02, 2.928740234375e+02, 2.929219360351562e+02, 2.941459350585938e+02, 2.941624755859375e+02, 2.924912414550781e+02, 2.929088134765625e+02, 2.928964538574219e+02, 2.942584228515625e+02, 2.936517944335938e+02, 2.925707397460938e+02, 2.927348022460938e+02, 2.928307800292969e+02, 2.944002990722656e+02, 2.939998168945312e+02, 2.925214538574219e+02, 2.927846069335938e+02, 2.928467407226562e+02, 2.944580688476562e+02, 2.945240173339844e+02, 2.924293518066406e+02, 2.928682556152344e+02, 2.92934326171875e+02, 2.936629943847656e+02, 2.939288024902344e+02, 2.926728820800781e+02, 2.929736938476562e+02, 2.929322814941406e+02, 2.929896240234375e+02, 2.931093139648438e+02, 2.928687438964844e+02, 2.927937927246094e+02, 2.929584350585938e+02, 2.929733581542969e+02, 2.933098449707031e+02, 2.928312072753906e+02, 2.928649597167969e+02, 2.929613647460938e+02, 2.950862121582031e+02, 2.956763000488281e+02, 2.936916198730469e+02, 2.932593688964844e+02, 2.931045837402344e+02, 2.955185546875e+02, 2.962081909179688e+02, 2.944739379882812e+02, 2.94170166015625e+02, 2.939850769042969e+02, 2.954898986816406e+02, 2.951751098632812e+02, 2.931590270996094e+02, 2.930399169921875e+02, 2.930498657226562e+02, 2.953074951171875e+02, 2.957725830078125e+02, 2.935418090820312e+02, 2.929968566894531e+02, 2.931107482910156e+02, 2.958339233398438e+02, 2.963027038574219e+02, 2.946569213867188e+02, 2.945358581542969e+02, 2.93749267578125e+02, 2.9510595703125e+02, 2.960062255859375e+02, 2.956088256835938e+02, 2.953097839355469e+02, 2.949378662109375e+02, 2.960235900878906e+02, 2.965110168457031e+02, 2.956860961914062e+02, 2.950577392578125e+02, 2.950040283203125e+02, 2.968607788085938e+02, 2.975343017578125e+02, 2.958380432128906e+02, 2.950335998535156e+02, 2.952362670898438e+02, 2.970052185058594e+02, 2.978101806640625e+02, 2.962786865234375e+02, 2.951357116699219e+02, 2.9500390625e+02, 2.965337524414062e+02, 2.960099182128906e+02, 2.937380676269531e+02, 2.93235107421875e+02, 2.930294494628906e+02, 2.950174255371094e+02, 2.948399963378906e+02, 2.92930419921875e+02, 2.929326782226562e+02]
+livFlo.heaPorFro.T=[2.931499938964844e+02, 2.960780334472656e+02, 2.950413208007812e+02, 2.951487731933594e+02, 2.956312255859375e+02, 2.954673156738281e+02, 2.954487915039062e+02, 2.950174255371094e+02, 2.948150634765625e+02, 2.953916931152344e+02, 2.955462341308594e+02, 2.955426025390625e+02, 2.949652404785156e+02, 2.942884826660156e+02, 2.947056274414062e+02, 2.954602355957031e+02, 2.955827331542969e+02, 2.950266418457031e+02, 2.942203674316406e+02, 2.951222839355469e+02, 2.956576538085938e+02, 2.957528686523438e+02, 2.952177124023438e+02, 2.943841857910156e+02, 2.947477722167969e+02, 2.955361938476562e+02, 2.957449035644531e+02, 2.950894775390625e+02, 2.944745483398438e+02, 2.945801696777344e+02, 2.949626159667969e+02, 2.951349182128906e+02, 2.947064208984375e+02, 2.940063171386719e+02, 2.942662048339844e+02, 2.9433203125e+02, 2.947460021972656e+02, 2.9458203125e+02, 2.945348205566406e+02, 2.946477966308594e+02, 2.948503723144531e+02, 2.950329895019531e+02, 2.950472106933594e+02, 2.945446472167969e+02, 2.950179748535156e+02, 2.953992309570312e+02, 2.952558898925781e+02, 2.947647705078125e+02, 2.9456494140625e+02, 2.943883056640625e+02, 2.939943542480469e+02, 2.939468994140625e+02, 2.940118103027344e+02, 2.943356018066406e+02, 2.943468017578125e+02, 2.941839904785156e+02, 2.940931701660156e+02, 2.941329040527344e+02, 2.942411193847656e+02, 2.940975952148438e+02, 2.940505065917969e+02, 2.945402221679688e+02, 2.943493347167969e+02, 2.944462890625e+02, 2.943504638671875e+02, 2.940213012695312e+02, 2.942962951660156e+02, 2.944214172363281e+02, 2.946299743652344e+02, 2.94532958984375e+02, 2.943724060058594e+02, 2.942220153808594e+02, 2.943238830566406e+02, 2.947090759277344e+02, 2.949833068847656e+02, 2.950277709960938e+02, 2.950220031738281e+02, 2.952092590332031e+02, 2.954808349609375e+02, 2.954102783203125e+02, 2.951344909667969e+02, 2.950170593261719e+02, 2.951621704101562e+02, 2.954996643066406e+02, 2.955655212402344e+02, 2.952017822265625e+02, 2.950369873046875e+02, 2.952116394042969e+02, 2.9561279296875e+02, 2.957129821777344e+02, 2.954760437011719e+02, 2.952356567382812e+02, 2.952486267089844e+02, 2.951754760742188e+02, 2.947992553710938e+02, 2.943199157714844e+02, 2.944295043945312e+02, 2.945181579589844e+02, 2.943846130371094e+02, 2.943757934570312e+02, 2.945309753417969e+02]
+zon.TAir=[2.931499938964844e+02, 2.928226318359375e+02, 2.931497192382812e+02, 2.928377990722656e+02, 2.92978759765625e+02, 2.929395446777344e+02, 2.929641723632812e+02, 2.931311645507812e+02, 2.929790344238281e+02, 2.928749084472656e+02, 2.928740234375e+02, 2.92921875e+02, 2.941459655761719e+02, 2.941625061035156e+02, 2.924912719726562e+02, 2.929088439941406e+02, 2.928964538574219e+02, 2.942584228515625e+02, 2.936517944335938e+02, 2.925707397460938e+02, 2.927347717285156e+02, 2.928307800292969e+02, 2.944002990722656e+02, 2.939997863769531e+02, 2.925214538574219e+02, 2.927845764160156e+02, 2.928467407226562e+02, 2.944580688476562e+02, 2.945240173339844e+02, 2.924293518066406e+02, 2.928682556152344e+02, 2.92934326171875e+02, 2.936629943847656e+02, 2.939288024902344e+02, 2.926728820800781e+02, 2.929736633300781e+02, 2.929322814941406e+02, 2.929896240234375e+02, 2.931093139648438e+02, 2.928687438964844e+02, 2.927938232421875e+02, 2.929584350585938e+02, 2.929733581542969e+02, 2.933098754882812e+02, 2.928312072753906e+02, 2.928649597167969e+02, 2.929613647460938e+02, 2.950862426757812e+02, 2.956763000488281e+02, 2.93691650390625e+02, 2.932593688964844e+02, 2.931045837402344e+02, 2.955185546875e+02, 2.962081604003906e+02, 2.944739379882812e+02, 2.941701354980469e+02, 2.939850463867188e+02, 2.954898986816406e+02, 2.951750793457031e+02, 2.931590270996094e+02, 2.930399169921875e+02, 2.930498657226562e+02, 2.953074951171875e+02, 2.957725830078125e+02, 2.935418090820312e+02, 2.929968566894531e+02, 2.931107482910156e+02, 2.958339233398438e+02, 2.963027038574219e+02, 2.946569213867188e+02, 2.945358581542969e+02, 2.93749267578125e+02, 2.9510595703125e+02, 2.960062255859375e+02, 2.956088256835938e+02, 2.953097534179688e+02, 2.949378356933594e+02, 2.960235900878906e+02, 2.965110168457031e+02, 2.956860961914062e+02, 2.950577392578125e+02, 2.950040283203125e+02, 2.968608093261719e+02, 2.975343017578125e+02, 2.958380432128906e+02, 2.950335998535156e+02, 2.952362670898438e+02, 2.970052185058594e+02, 2.978101806640625e+02, 2.962786865234375e+02, 2.951357116699219e+02, 2.9500390625e+02, 2.965337524414062e+02, 2.960099182128906e+02, 2.937380676269531e+02, 2.93235107421875e+02, 2.930294494628906e+02, 2.950174255371094e+02, 2.948399658203125e+02, 2.92930419921875e+02, 2.929326782226562e+02]
 TSetRooHea.y=[2.931499938964844e+02, 2.931499938964844e+02]
 conCoo.TSurSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-conCoo.TSur=[2.931499938964844e+02, 2.933100891113281e+02, 2.935357971191406e+02, 2.935425720214844e+02, 2.936516723632812e+02, 2.936580200195312e+02, 2.936397094726562e+02, 2.936194458007812e+02, 2.935436096191406e+02, 2.93547119140625e+02, 2.935725708007812e+02, 2.935558776855469e+02, 2.935637512207031e+02, 2.934971923828125e+02, 2.933451538085938e+02, 2.934479675292969e+02, 2.934742126464844e+02, 2.935494384765625e+02, 2.934189147949219e+02, 2.932720947265625e+02, 2.933880615234375e+02, 2.934319458007812e+02, 2.935120239257812e+02, 2.934203796386719e+02, 2.932591552734375e+02, 2.933621520996094e+02, 2.934051208496094e+02, 2.935108642578125e+02, 2.935382080078125e+02, 2.934299621582031e+02, 2.935311279296875e+02, 2.935209045410156e+02, 2.934790344238281e+02, 2.933545532226562e+02, 2.931908874511719e+02, 2.932077941894531e+02, 2.932407836914062e+02, 2.93255126953125e+02, 2.932572021484375e+02, 2.932630310058594e+02, 2.933115234375e+02, 2.933577575683594e+02, 2.933989868164062e+02, 2.934601135253906e+02, 2.934482421875e+02, 2.935736083984375e+02, 2.935781555175781e+02, 2.937069702148438e+02, 2.93911376953125e+02, 2.939611206054688e+02, 2.938429565429688e+02, 2.937167053222656e+02, 2.938260192871094e+02, 2.9405810546875e+02, 2.938031311035156e+02, 2.939441223144531e+02, 2.939842834472656e+02, 2.940946960449219e+02, 2.941976318359375e+02, 2.941141052246094e+02, 2.939578552246094e+02, 2.938746337890625e+02, 2.939544067382812e+02, 2.941559753417969e+02, 2.941819458007812e+02, 2.940493469238281e+02, 2.93976806640625e+02, 2.941078491210938e+02, 2.939679260253906e+02, 2.938605041503906e+02, 2.940695495605469e+02, 2.940992431640625e+02, 2.942490234375e+02, 2.945894470214844e+02, 2.948772583007812e+02, 2.950203247070312e+02, 2.950853881835938e+02, 2.952584228515625e+02, 2.949498596191406e+02, 2.945911560058594e+02, 2.945562744140625e+02, 2.947977600097656e+02, 2.947942810058594e+02, 2.94955810546875e+02, 2.947183227539062e+02, 2.945432434082031e+02, 2.947987670898438e+02, 2.948125e+02, 2.950919494628906e+02, 2.949210815429688e+02, 2.947213439941406e+02, 2.949837646484375e+02, 2.948485412597656e+02, 2.944150085449219e+02, 2.9432080078125e+02, 2.942697448730469e+02, 2.941290283203125e+02, 2.941496887207031e+02, 2.941526489257812e+02, 2.940036010742188e+02, 2.938983154296875e+02]
-conHea.y=[1.13686837721616e-13, 6.547046303749084e-01, 5.563912563957274e-04, 6.244003772735596e-01, 3.424203991889954e-01, 4.208933711051941e-01, 3.716287016868591e-01, 3.766723349690437e-02, 3.41943621635437e-01, 5.501860976219177e-01, 5.519719123840332e-01, 4.561158418655396e-01, 0e+00, 0e+00, 1e+00, 4.823504090309143e-01, 5.070858001708984e-01, 0e+00, 0e+00, 1e+00, 8.304033279418945e-01, 6.384499669075012e-01, 0e+00, 0e+00, 1e+00, 7.307899594306946e-01, 6.064978837966919e-01, 0e+00, 0e+00, 1e+00, 5.63500702381134e-01, 4.313687384128571e-01, 0e+00, 0e+00, 9.5424485206604e-01, 3.526375591754913e-01, 4.354142546653748e-01, 3.207279443740845e-01, 8.139939606189728e-02, 5.624953508377075e-01, 7.124084830284119e-01, 3.831039369106293e-01, 3.533108234405518e-01, 0e+00, 6.37598991394043e-01, 5.700744986534119e-01, 3.77280592918396e-01, 0e+00, 0e+00, 0e+00, 0e+00, 9.0842604637146e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.201810777187347e-01, 2.002845108509064e-01, 0e+00, 0e+00, 0e+00, 3.062717318534851e-01, 7.847630977630615e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.410712093114853e-01, 0e+00, 0e+00, 4.391320645809174e-01, 4.34634655714035e-01]
+conCoo.TSur=[2.931499938964844e+02, 2.933100891113281e+02, 2.935357971191406e+02, 2.935425720214844e+02, 2.936516723632812e+02, 2.936580200195312e+02, 2.936397094726562e+02, 2.936194458007812e+02, 2.935436096191406e+02, 2.93547119140625e+02, 2.935725708007812e+02, 2.935558776855469e+02, 2.935637817382812e+02, 2.934971923828125e+02, 2.933451843261719e+02, 2.93447998046875e+02, 2.934742126464844e+02, 2.935494384765625e+02, 2.934189147949219e+02, 2.932720947265625e+02, 2.933880615234375e+02, 2.934319152832031e+02, 2.935120239257812e+02, 2.934203796386719e+02, 2.932591552734375e+02, 2.933621215820312e+02, 2.934051208496094e+02, 2.935108642578125e+02, 2.935382385253906e+02, 2.934299621582031e+02, 2.935311279296875e+02, 2.935209045410156e+02, 2.934790344238281e+02, 2.933545532226562e+02, 2.931908874511719e+02, 2.93207763671875e+02, 2.932407836914062e+02, 2.93255126953125e+02, 2.932572021484375e+02, 2.932630615234375e+02, 2.933114929199219e+02, 2.933577575683594e+02, 2.933989868164062e+02, 2.934601135253906e+02, 2.934482421875e+02, 2.935736083984375e+02, 2.935781555175781e+02, 2.937069702148438e+02, 2.93911376953125e+02, 2.939611511230469e+02, 2.938429565429688e+02, 2.937167053222656e+02, 2.938260192871094e+02, 2.9405810546875e+02, 2.938031311035156e+02, 2.939441223144531e+02, 2.939842834472656e+02, 2.940946655273438e+02, 2.941976318359375e+02, 2.941140747070312e+02, 2.939578552246094e+02, 2.938746032714844e+02, 2.939544067382812e+02, 2.941559753417969e+02, 2.941819458007812e+02, 2.940493469238281e+02, 2.93976806640625e+02, 2.941078186035156e+02, 2.939679260253906e+02, 2.938605041503906e+02, 2.940695495605469e+02, 2.940992431640625e+02, 2.942489929199219e+02, 2.945894470214844e+02, 2.948772583007812e+02, 2.950203247070312e+02, 2.950853881835938e+02, 2.952584228515625e+02, 2.949498596191406e+02, 2.945911560058594e+02, 2.945562744140625e+02, 2.947977600097656e+02, 2.947942810058594e+02, 2.94955810546875e+02, 2.947183227539062e+02, 2.945432434082031e+02, 2.947987670898438e+02, 2.948125e+02, 2.950919494628906e+02, 2.949210815429688e+02, 2.947213439941406e+02, 2.949837646484375e+02, 2.948485412597656e+02, 2.944150085449219e+02, 2.9432080078125e+02, 2.942697448730469e+02, 2.941290283203125e+02, 2.941496887207031e+02, 2.941526489257812e+02, 2.940036010742188e+02, 2.938983154296875e+02]
+conHea.y=[1.13686837721616e-13, 6.547129154205322e-01, 5.458206869661808e-04, 6.243960857391357e-01, 3.424839675426483e-01, 4.208992719650269e-01, 3.716327846050262e-01, 3.766918554902077e-02, 3.419438302516937e-01, 5.501720905303955e-01, 5.519798994064331e-01, 4.562208652496338e-01, 0e+00, 0e+00, 1e+00, 4.823423027992249e-01, 5.070762038230896e-01, 0e+00, 0e+00, 1e+00, 8.304263949394226e-01, 6.384392976760864e-01, 0e+00, 0e+00, 1e+00, 7.308271527290344e-01, 6.064999103546143e-01, 0e+00, 0e+00, 1e+00, 5.634953379631042e-01, 4.313243627548218e-01, 0e+00, 0e+00, 9.542187452316284e-01, 3.526515364646912e-01, 4.354192614555359e-01, 3.207480311393738e-01, 8.137822896242142e-02, 5.625051259994507e-01, 7.123522758483887e-01, 3.83103221654892e-01, 3.533125519752502e-01, 0e+00, 6.37580394744873e-01, 5.700657963752747e-01, 3.772976696491241e-01, 0e+00, 0e+00, 0e+00, 0e+00, 9.084748476743698e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.201800048351288e-01, 2.002780884504318e-01, 0e+00, 0e+00, 0e+00, 3.062746822834015e-01, 7.847636938095093e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.410876303911209e-01, 0e+00, 0e+00, 4.391353726387024e-01, 4.346287846565247e-01]
 conCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-livFlo.qFro_flow=[5.663226246833801e-01, 2.250109100341797e+01, 1.153775024414062e+01, 1.36056604385376e+01, 1.772361373901367e+01, 1.637032699584961e+01, 1.622370147705078e+01, 1.17210054397583e+01, 1.080343151092529e+01, 1.620568656921387e+01, 1.735263061523438e+01, 1.764855194091797e+01, 9.585426330566406e+00, 4.070104598999023e+00, 1.205275726318359e+01, 1.70029239654541e+01, 1.821291542053223e+01, 8.694689750671387e+00, 6.103794574737549e+00, 1.55605936050415e+01, 1.913574981689453e+01, 2.007722091674805e+01, 1.011680507659912e+01, 6.312398433685303e+00, 1.253890609741211e+01, 1.80148868560791e+01, 1.993205451965332e+01, 8.366777420043945e+00, 3.945785760879517e+00, 1.088408660888672e+01, 1.286705589294434e+01, 1.418153190612793e+01, 1.021329212188721e+01, 4.373605251312256e+00, 8.47791862487793e+00, 8.789799690246582e+00, 1.159911346435547e+01, 1.002475166320801e+01, 9.465961456298828e+00, 1.102382183074951e+01, 1.291524600982666e+01, 1.361611843109131e+01, 1.331674766540527e+01, 6.804864883422852e+00, 1.306180763244629e+01, 1.590772247314453e+01, 1.498027992248535e+01, 4.195426940917969e+00, 4.706737697124481e-01, 3.716755867004395e+00, 3.022735834121704e+00, 3.522768974304199e+00, -2.101663589477539e+00, -3.470305442810059e+00, 1.696265697479248e+00, 1.079835653305054e+00, 8.032355308532715e-01, -1.601863265037537e+00, -3.861545920372009e-01, 2.853496313095093e+00, 3.354100465774536e+00, 7.588224411010742e+00, 1.655788421630859e-01, -1.538636445999146e+00, 3.083471536636353e+00, 3.009736776351929e+00, 5.384939193725586e+00, -1.410673022270203e+00, -1.763270258903503e+00, 2.155698537826538e+00, 9.327566027641296e-01, 1.468720316886902e+00, -2.67809009552002e+00, -4.097190380096436e+00, -1.183635354042053e+00, -5.507833957672119e-01, -1.104122698307037e-01, -3.168845891952515e+00, -2.360307455062866e+00, 1.556373238563538e+00, 1.781710267066956e+00, 8.696073293685913e-01, -2.407653570175171e+00, -3.615427017211914e+00, 2.017586946487427e+00, 2.574211835861206e+00, 6.449378728866577e-01, -2.741255283355713e+00, -4.337501525878906e+00, 9.682126641273499e-01, 3.100466966629028e+00, 1.457199692726135e+00, -1.507608532905579e+00, 8.7066251039505e-01, 4.819295883178711e+00, 3.502023935317993e+00, 5.667966365814209e+00, 1.248404026031494e+00, 1.286320090293884e+00, 5.82406759262085e+00, 7.495216846466064e+00]
+livFlo.qFro_flow=[5.663226246833801e-01, 2.250103569030762e+01, 1.153775691986084e+01, 1.360568428039551e+01, 1.77232723236084e+01, 1.637030601501465e+01, 1.622369194030762e+01, 1.17210054397583e+01, 1.080344390869141e+01, 1.620575523376465e+01, 1.735260009765625e+01, 1.764808082580566e+01, 9.585713386535645e+00, 4.070239543914795e+00, 1.205299758911133e+01, 1.700285911560059e+01, 1.821288108825684e+01, 8.694614410400391e+00, 6.103762626647949e+00, 1.556064891815186e+01, 1.91357536315918e+01, 2.007721138000488e+01, 1.011673450469971e+01, 6.312400341033936e+00, 1.253901290893555e+01, 1.801472663879395e+01, 1.993204498291016e+01, 8.366778373718262e+00, 3.9457848072052e+00, 1.088409519195557e+01, 1.286707878112793e+01, 1.418168926239014e+01, 1.021322727203369e+01, 4.373576641082764e+00, 8.477972984313965e+00, 8.789752960205078e+00, 1.15991039276123e+01, 1.002466106414795e+01, 9.466048240661621e+00, 1.102382183074951e+01, 1.291563320159912e+01, 1.361616897583008e+01, 1.33167610168457e+01, 6.805026531219482e+00, 1.306198310852051e+01, 1.590775871276855e+01, 1.498017311096191e+01, 4.195463180541992e+00, 4.706906378269196e-01, 3.716773509979248e+00, 3.022745132446289e+00, 3.522703647613525e+00, -2.10190749168396e+00, -3.470490455627441e+00, 1.696191072463989e+00, 1.079797029495239e+00, 8.03216278553009e-01, -1.601874589920044e+00, -3.861584663391113e-01, 2.8534996509552e+00, 3.3541579246521e+00, 7.588278770446777e+00, 1.655729711055756e-01, -1.538640856742859e+00, 3.083473205566406e+00, 3.009737014770508e+00, 5.384956836700439e+00, -1.410722374916077e+00, -1.763293027877808e+00, 2.155689001083374e+00, 9.327503442764282e-01, 1.468724846839905e+00, -2.678096055984497e+00, -4.097192287445068e+00, -1.183633923530579e+00, -5.507738590240479e-01, -1.104085743427277e-01, -3.168847560882568e+00, -2.360302925109863e+00, 1.55637538433075e+00, 1.78168249130249e+00, 8.696014285087585e-01, -2.407663345336914e+00, -3.615427017211914e+00, 2.017595052719116e+00, 2.574202537536621e+00, 6.449321508407593e-01, -2.741256713867188e+00, -4.337497234344482e+00, 9.682185053825378e-01, 3.100468873977661e+00, 1.457202911376953e+00, -1.507608294487e+00, 8.706607222557068e-01, 4.819300651550293e+00, 3.502024412155151e+00, 5.66799259185791e+00, 1.24834156036377e+00, 1.286291599273682e+00, 5.824084281921387e+00, 7.495254039764404e+00]
 livFlo.qBac_flow=[-0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00]
-attFlo.qFro_flow=[7.7837890625e+01, 5.579198837280273e+01, -4.627706909179688e+01, 1.389038848876953e+01, 3.067738342285156e+01, 1.915164566040039e+01, 1.33446569442749e+01, -3.128516006469727e+01, -5.18327808380127e+00, 1.874477577209473e+01, 1.871340751647949e+01, 2.284854698181152e+01, -9.883063316345215e+00, -4.916339492797852e+01, 2.559790802001953e+01, 2.356832695007324e+01, 2.067914962768555e+01, -5.184240341186523e+01, 3.001374244689941e+00, 2.249575424194336e+01, 3.171723747253418e+01, 2.300096130371094e+01, -4.772848892211914e+01, -5.482454299926758e+00, 1.816205215454102e+01, 2.874721527099609e+01, 3.092617225646973e+01, -8.600099182128906e+01, -4.825010299682617e+01, 4.018139266967773e+01, 2.315258598327637e+01, 1.808051109313965e+01, 1.571137714385986e+01, -9.726984977722168e+00, 1.983429789543152e+00, -2.500432252883911e+00, 3.000457763671875e+00, -1.092214775085449e+01, -6.729013919830322e+00, 6.923452377319336e+00, 7.743257522583008e+00, 9.741896629333496e+00, -7.442187666893005e-01, -7.720968627929688e+01, 3.620949172973633e+01, 3.527517318725586e+01, 2.824200248718262e+01, -5.518843841552734e+01, -5.052267074584961e+01, 2.28287239074707e+01, 2.101678466796875e+01, 1.587274551391602e+01, -5.403040313720703e+01, -5.309188842773438e+01, 1.550974750518799e+01, 1.830407524108887e+01, 1.430319309234619e+01, -6.275318622589111e+00, 1.057201194763184e+01, 3.299672698974609e+01, 2.680542755126953e+01, 2.687133598327637e+01, -6.946058654785156e+01, -6.334417343139648e+01, 4.308633041381836e+01, 3.937027359008789e+01, 3.349530029296875e+01, -7.227568817138672e+01, -5.015998077392578e+01, 1.749141693115234e+01, 1.437277126312256e+01, 2.07573413848877e+01, -5.695898818969727e+01, -5.126311874389648e+01, 2.153305053710938e+01, 2.451869964599609e+01, 2.253593635559082e+01, -4.547727203369141e+01, -3.964052581787109e+01, 1.897777938842773e+01, 2.486287498474121e+01, 2.712296485900879e+01, -2.516236877441406e+01, -6.191906356811523e+01, 3.558783340454102e+01, 3.425455093383789e+01, 2.228197288513184e+01, -3.142206954956055e+01, -4.842854690551758e+01, 1.581741428375244e+01, 3.564483642578125e+01, 3.169438552856445e+01, -2.789185333251953e+01, -7.25851583480835e+00, 5.390365219116211e+01, 3.962473297119141e+01, 3.196403312683105e+01, -2.810943794250488e+01, 4.88810396194458e+00, 3.031471061706543e+01, 2.190500259399414e+01]
-attFlo.qBac_flow=[-1.34919285774231e+00, -6.434999942779541e+00, -4.853364944458008e+00, -3.361907005310059e+00, -4.196223258972168e+00, -3.353924989700317e+00, -3.413251638412476e+00, -3.573396921157837e+00, -2.658991098403931e+00, -3.533809185028076e+00, -3.882661819458008e+00, -3.804966688156128e+00, -4.325063705444336e+00, -3.524409055709839e+00, -1.335170269012451e+00, -4.099381446838379e+00, -4.265010356903076e+00, -5.951193332672119e+00, -1.588343739509583e+00, -3.054875135421753e+00, -4.703341484069824e+00, -4.989651203155518e+00, -6.93132209777832e+00, -2.977383613586426e+00, -2.020783185958862e+00, -4.523665428161621e+00, -5.046523571014404e+00, -7.313415050506592e+00, -5.394254207611084e+00, -4.618730545043945e-01, -2.415948390960693e+00, -2.868136644363403e+00, -2.108756303787231e+00, -1.855225205421448e+00, -1.219320297241211e+00, -2.330573320388794e+00, -3.613075256347656e+00, -3.364713907241821e+00, -3.56418514251709e+00, -3.072280406951904e+00, -2.837214231491089e+00, -3.788683414459229e+00, -3.952509641647339e+00, -4.37512731552124e+00, -2.976981639862061e+00, -3.494500160217285e+00, -3.010263919830322e+00, -6.865549087524414e+00, -7.364701271057129e+00, -6.956799030303955e-01, 9.825679659843445e-01, 9.932476878166199e-01, -5.290991306304932e+00, -7.579689502716064e+00, -3.864677906036377e+00, -1.222162365913391e+00, -2.111504226922989e-01, -3.160115003585815e+00, -1.549428820610046e+00, 2.242206811904907e+00, 2.031450033187866e+00, 4.52073872089386e-01, -4.672988891601562e+00, -5.724748134613037e+00, 8.836979866027832e-01, 2.688459396362305e+00, 1.241047263145447e+00, -5.931610584259033e+00, -1.018827533721924e+01, -4.73008918762207e+00, -2.175734996795654e+00, 3.843235597014427e-02, -3.889999151229858e+00, -6.38840389251709e+00, -2.729459285736084e+00, -8.3681720495224e-01, 3.926643133163452e-01, -3.170149326324463e+00, -8.487874031066895e+00, -6.780771255493164e+00, -4.118410587310791e+00, -1.256352424621582e+00, -7.725509166717529e+00, -1.142383193969727e+01, -6.631005764007568e+00, -4.182579517364502e+00, -1.852086901664734e+00, -8.580103874206543e+00, -1.217687320709229e+01, -7.521750926971436e+00, -4.055293083190918e+00, -9.914403557777405e-01, -6.429099082946777e+00, -7.567604541778564e+00, -6.598305106163025e-01, 2.03030252456665e+00, 1.83421516418457e+00, -2.79723334312439e+00, -1.338408350944519e+00, 1.777824282646179e+00, 7.833066582679749e-01]
-slaFlo.surf_a.Q_flow=[-1.052421569824219e+02, -4.18147412109375e+03, -2.144109375e+03, -2.52839794921875e+03, -3.29365478515625e+03, -3.042167724609375e+03, -3.014919921875e+03, -2.17816455078125e+03, -2.00764794921875e+03, -3.011572265625e+03, -3.224713623046875e+03, -3.279705810546875e+03, -1.78130078125e+03, -7.563649291992188e+02, -2.2398154296875e+03, -3.15972607421875e+03, -3.384583984375e+03, -1.615771484375e+03, -1.134294189453125e+03, -2.891691650390625e+03, -3.556078125e+03, -3.731035888671875e+03, -1.880049194335938e+03, -1.17306005859375e+03, -2.330158447265625e+03, -3.347783203125e+03, -3.704058837890625e+03, -1.554833984375e+03, -7.332622680664062e+02, -2.022636352539062e+03, -2.391139892578125e+03, -2.63541455078125e+03, -1.897979736328125e+03, -8.127658081054688e+02, -1.575487915039062e+03, -1.633446044921875e+03, -2.155512939453125e+03, -1.862942504882812e+03, -1.75910009765625e+03, -2.04860400390625e+03, -2.400095458984375e+03, -2.530341552734375e+03, -2.474708251953125e+03, -1.2645771484375e+03, -2.42733154296875e+03, -2.9562001953125e+03, -2.783849365234375e+03, -7.796541748046875e+02, -8.746731567382812e+01, -6.907006225585938e+02, -5.617279052734375e+02, -6.546512451171875e+02, 3.905611267089844e+02, 6.449016723632812e+02, -3.152243041992188e+02, -2.006704711914062e+02, -1.492686920166016e+02, 2.976810913085938e+02, 7.176075744628906e+01, -5.302774047851562e+02, -6.233068237304688e+02, -1.410152099609375e+03, -3.077022361755371e+01, 2.85931396484375e+02, -5.730147094726562e+02, -5.59312255859375e+02, -1.000706298828125e+03, 2.621513977050781e+02, 3.276760559082031e+02, -4.006026611328125e+02, -1.733381500244141e+02, -2.729385681152344e+02, 4.97680908203125e+02, 7.613983764648438e+02, 2.199600219726562e+02, 1.023544311523438e+02, 2.051838302612305e+01, 5.888801879882812e+02, 4.386260375976562e+02, -2.892274780273438e+02, -3.311028442382812e+02, -1.616028442382812e+02, 4.47424560546875e+02, 6.718703002929688e+02, -3.749367980957031e+02, -4.783767700195312e+02, -1.198515625e+02, 5.094192199707031e+02, 8.060564575195312e+02, -1.799270935058594e+02, -5.761730346679688e+02, -2.707976684570312e+02, 2.801653442382812e+02, -1.617989349365234e+02, -8.955903930664062e+02, -6.507960815429688e+02, -1.053302490234375e+03, -2.319962615966797e+02, -2.390423736572266e+02, -1.082311401367188e+03, -1.3928681640625e+03]
-hea.Q_flow=[0e+00, 4.55610302734375e+03, 0e+00, 5.25216015625e+03, 1.937999633789062e+03, 2.81190234375e+03, 2.274638916015625e+03, 0e+00, 2.495033203125e+03, 4.23264501953125e+03, 4.14497412109375e+03, 3.10495751953125e+03, 0e+00, 0e+00, 9.33102734375e+03, 3.3648359375e+03, 3.579300048828125e+03, -0e+00, -0e+00, 8.98445703125e+03, 7.0240185546875e+03, 4.9454189453125e+03, 0e+00, 0e+00, 9.2947822265625e+03, 5.98654541015625e+03, 4.53533642578125e+03, -0e+00, -0e+00, 9.4758427734375e+03, 4.7981591796875e+03, 3.14160107421875e+03, 0e+00, 0e+00, 9.171345703125e+03, 2.9060166015625e+03, 3.4665673828125e+03, 2.360339111328125e+03, 9.107303453048665e-12, 4.97198046875e+03, 6.4231298828125e+03, 2.68434033203125e+03, 2.3735224609375e+03, 0e+00, 5.33806005859375e+03, 4.43137646484375e+03, 2.476495361328125e+03, -0e+00, -0e+00, -0e+00, -0e+00, -2.655640681317739e-12, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.781953857421875e+03, 1.09647216796875e+03, 0e+00, 0e+00, 0e+00, 2.795602783203125e+03, 1.632342671404816e-13, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.748483032226562e+03, -0e+00, -0e+00, 3.80187548828125e+03, 3.695384033203125e+03]
+attFlo.qFro_flow=[7.7837890625e+01, 5.579199981689453e+01, -4.627706909179688e+01, 1.389040374755859e+01, 3.067739486694336e+01, 1.915164756774902e+01, 1.334465599060059e+01, -3.128516960144043e+01, -5.183276653289795e+00, 1.874477386474609e+01, 1.871340751647949e+01, 2.284855461120605e+01, -9.883057594299316e+00, -4.916340255737305e+01, 2.559791946411133e+01, 2.356833648681641e+01, 2.067916107177734e+01, -5.184241485595703e+01, 3.001379728317261e+00, 2.249575996398926e+01, 3.171724319458008e+01, 2.30009651184082e+01, -4.772849655151367e+01, -5.482505798339844e+00, 1.816205024719238e+01, 2.874721336364746e+01, 3.092618179321289e+01, -8.600102996826172e+01, -4.825009536743164e+01, 4.018138885498047e+01, 2.315258026123047e+01, 1.808052062988281e+01, 1.571138572692871e+01, -9.726986885070801e+00, 1.983431458473206e+00, -2.500432252883911e+00, 3.000458002090454e+00, -1.092214775085449e+01, -6.729020118713379e+00, 6.923450469970703e+00, 7.743263244628906e+00, 9.741899490356445e+00, -7.442187666893005e-01, -7.720970916748047e+01, 3.620949935913086e+01, 3.527517700195312e+01, 2.824200057983398e+01, -5.518843841552734e+01, -5.052265167236328e+01, 2.282872772216797e+01, 2.101678466796875e+01, 1.587274265289307e+01, -5.403041076660156e+01, -5.309189224243164e+01, 1.550974750518799e+01, 1.830407333374023e+01, 1.430319499969482e+01, -6.275322914123535e+00, 1.057201862335205e+01, 3.299673080444336e+01, 2.68054313659668e+01, 2.687134170532227e+01, -6.946059417724609e+01, -6.334416580200195e+01, 4.308632659912109e+01, 3.937027359008789e+01, 3.349529647827148e+01, -7.227568817138672e+01, -5.015996932983398e+01, 1.749141502380371e+01, 1.437276840209961e+01, 2.075734329223633e+01, -5.695899200439453e+01, -5.126312255859375e+01, 2.153304672241211e+01, 2.451870727539062e+01, 2.253594398498535e+01, -4.547727203369141e+01, -3.964052200317383e+01, 1.897777938842773e+01, 2.486288070678711e+01, 2.712297058105469e+01, -2.516236686706543e+01, -6.19190673828125e+01, 3.558783721923828e+01, 3.425455093383789e+01, 2.22819709777832e+01, -3.142206954956055e+01, -4.842854690551758e+01, 1.581741523742676e+01, 3.564483642578125e+01, 3.169438934326172e+01, -2.78918628692627e+01, -7.258509635925293e+00, 5.390365600585938e+01, 3.962473297119141e+01, 3.196404457092285e+01, -2.810945129394531e+01, 4.888115406036377e+00, 3.031471633911133e+01, 2.190500450134277e+01]
+attFlo.qBac_flow=[-1.34919285774231e+00, -6.434970855712891e+00, -4.85337495803833e+00, -3.361927509307861e+00, -4.196019172668457e+00, -3.353928089141846e+00, -3.413248062133789e+00, -3.573394536972046e+00, -2.658995628356934e+00, -3.533852338790894e+00, -3.882637739181519e+00, -3.804664373397827e+00, -4.325287342071533e+00, -3.524511098861694e+00, -1.335361123085022e+00, -4.099327087402344e+00, -4.264986991882324e+00, -5.951136112213135e+00, -1.588310837745667e+00, -3.054901599884033e+00, -4.703329563140869e+00, -4.989628791809082e+00, -6.931281089782715e+00, -2.977373838424683e+00, -2.020855188369751e+00, -4.523542881011963e+00, -5.046516895294189e+00, -7.313422679901123e+00, -5.394252777099609e+00, -4.618601202964783e-01, -2.415974140167236e+00, -2.868298292160034e+00, -2.108711957931519e+00, -1.855212330818176e+00, -1.219416379928589e+00, -2.330542802810669e+00, -3.61307430267334e+00, -3.364646196365356e+00, -3.56424617767334e+00, -3.072281837463379e+00, -2.837473392486572e+00, -3.78873085975647e+00, -3.952529430389404e+00, -4.37525463104248e+00, -2.977072715759277e+00, -3.494531631469727e+00, -3.010195970535278e+00, -6.865586757659912e+00, -7.364716053009033e+00, -6.956818699836731e-01, 9.825652241706848e-01, 9.932933449745178e-01, -5.290814399719238e+00, -7.57948637008667e+00, -3.864602565765381e+00, -1.222128868103027e+00, -2.111321985721588e-01, -3.160103559494019e+00, -1.549421787261963e+00, 2.242207765579224e+00, 2.03140926361084e+00, 4.520235061645508e-01, -4.672997951507568e+00, -5.72474479675293e+00, 8.837034702301025e-01, 2.688471555709839e+00, 1.241032838821411e+00, -5.931582927703857e+00, -1.018825244903564e+01, -4.73007345199585e+00, -2.17572808265686e+00, 3.84398065507412e-02, -3.889999628067017e+00, -6.388403415679932e+00, -2.729455947875977e+00, -8.368099927902222e-01, 3.926613330841064e-01, -3.17015552520752e+00, -8.487884521484375e+00, -6.780772686004639e+00, -4.118360996246338e+00, -1.256342768669128e+00, -7.725504398345947e+00, -1.14238338470459e+01, -6.631005764007568e+00, -4.18256664276123e+00, -1.852087020874023e+00, -8.580095291137695e+00, -1.217687511444092e+01, -7.521749496459961e+00, -4.055290222167969e+00, -9.914394617080688e-01, -6.429090976715088e+00, -7.567598819732666e+00, -6.598303318023682e-01, 2.030305147171021e+00, 1.834198474884033e+00, -2.797194004058838e+00, -1.338385701179504e+00, 1.777811169624329e+00, 7.832786440849304e-01]
+slaFlo.surf_a.Q_flow=[-1.052421569824219e+02, -4.1814638671875e+03, -2.14411083984375e+03, -2.528402587890625e+03, -3.293591552734375e+03, -3.042163818359375e+03, -3.014918212890625e+03, -2.17816455078125e+03, -2.007650268554688e+03, -3.0115849609375e+03, -3.224707763671875e+03, -3.279618408203125e+03, -1.781354125976562e+03, -7.563900146484375e+02, -2.239860107421875e+03, -3.1597138671875e+03, -3.38457763671875e+03, -1.61575732421875e+03, -1.134288208007812e+03, -2.891701904296875e+03, -3.5560791015625e+03, -3.731033935546875e+03, -1.880036010742188e+03, -1.173060302734375e+03, -2.330178466796875e+03, -3.347753662109375e+03, -3.70405712890625e+03, -1.554834106445312e+03, -7.332620849609375e+02, -2.022637939453125e+03, -2.391144287109375e+03, -2.635444091796875e+03, -1.897967651367188e+03, -8.127604370117188e+02, -1.575497924804688e+03, -1.6334375e+03, -2.155510986328125e+03, -1.862925659179688e+03, -1.7591162109375e+03, -2.04860400390625e+03, -2.40016748046875e+03, -2.530350830078125e+03, -2.474710693359375e+03, -1.264607177734375e+03, -2.4273642578125e+03, -2.956206787109375e+03, -2.78382958984375e+03, -7.79660888671875e+02, -8.747045135498047e+01, -6.907039184570312e+02, -5.617296752929688e+02, -6.546390991210938e+02, 3.906064453125e+02, 6.449360961914062e+02, -3.1521044921875e+02, -2.006632995605469e+02, -1.492651062011719e+02, 2.976832275390625e+02, 7.176148223876953e+01, -5.302780151367188e+02, -6.233175048828125e+02, -1.410162231445312e+03, -3.076913452148438e+01, 2.859322204589844e+02, -5.730150146484375e+02, -5.593123168945312e+02, -1.000709594726562e+03, 2.621605834960938e+02, 3.276802978515625e+02, -4.006008911132812e+02, -1.733369903564453e+02, -2.729394226074219e+02, 4.976820373535156e+02, 7.613988037109375e+02, 2.199597473144531e+02, 1.023526611328125e+02, 2.051769828796387e+01, 5.888804931640625e+02, 4.386251831054688e+02, -2.892279052734375e+02, -3.3109765625e+02, -1.616017608642578e+02, 4.474263916015625e+02, 6.718702392578125e+02, -3.749383239746094e+02, -4.783750610351562e+02, -1.198504943847656e+02, 5.094194641113281e+02, 8.060556640625e+02, -1.799281921386719e+02, -5.761734008789062e+02, -2.707982482910156e+02, 2.801653137207031e+02, -1.617985992431641e+02, -8.955912475585938e+02, -6.50796142578125e+02, -1.053307250976562e+03, -2.319846496582031e+02, -2.390370635986328e+02, -1.082314453125e+03, -1.392875122070312e+03]
+hea.Q_flow=[0e+00, 4.556185546875e+03, 0e+00, 5.25211865234375e+03, 1.938766479492188e+03, 2.811970703125e+03, 2.27468212890625e+03, -0e+00, 2.495031494140625e+03, 4.23248046875e+03, 4.14506640625e+03, 3.10614892578125e+03, -0e+00, -0e+00, 9.3310087890625e+03, 3.3647568359375e+03, 3.5792099609375e+03, -0e+00, -0e+00, 8.984447265625e+03, 7.0242587890625e+03, 4.94527587890625e+03, -0e+00, -0e+00, 9.294771484375e+03, 5.9869501953125e+03, 4.5353642578125e+03, 0e+00, 0e+00, 9.47583984375e+03, 4.79810302734375e+03, 3.141152587890625e+03, 0e+00, 0e+00, 9.1710654296875e+03, 2.906182861328125e+03, 3.466626220703125e+03, 2.36056201171875e+03, -2.262442837241974e-11, 4.9720869140625e+03, 6.4224677734375e+03, 2.684334716796875e+03, 2.37354736328125e+03, -0e+00, 5.33780517578125e+03, 4.4312841796875e+03, 2.4766904296875e+03, -0e+00, -0e+00, -0e+00, -0e+00, -6.670192176372325e-12, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.781935424804688e+03, 1.096408813476562e+03, 0e+00, 0e+00, 0e+00, 2.795635986328125e+03, -1.373183251135446e-12, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.748628540039062e+03, 0e+00, 0e+00, 3.8019169921875e+03, 3.69531689453125e+03]
 livFlo.heaPorBac.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.931501159667969e+02, 2.931502075195312e+02, 2.931502990722656e+02, 2.931504516601562e+02, 2.931506042480469e+02, 2.931508483886719e+02, 2.931510925292969e+02, 2.931514282226562e+02, 2.931517639160156e+02, 2.931521911621094e+02, 2.931526489257812e+02, 2.931531677246094e+02, 2.931537170410156e+02, 2.931543579101562e+02, 2.93155029296875e+02, 2.931557312011719e+02, 2.93156494140625e+02, 2.931573181152344e+02, 2.931581726074219e+02, 2.931590881347656e+02, 2.931600341796875e+02, 2.931610107421875e+02, 2.931620788574219e+02, 2.931631469726562e+02, 2.931642761230469e+02, 2.931654357910156e+02, 2.931666564941406e+02, 2.931678771972656e+02, 2.931691589355469e+02, 2.931704711914062e+02, 2.931717834472656e+02, 2.931731567382812e+02, 2.931745300292969e+02, 2.931759643554688e+02, 2.931773681640625e+02, 2.931788330078125e+02, 2.931802978515625e+02, 2.931817626953125e+02, 2.931832580566406e+02, 2.931847839355469e+02, 2.931863098144531e+02, 2.931878356933594e+02, 2.931893920898438e+02, 2.931909484863281e+02, 2.931925354003906e+02, 2.931941223144531e+02, 2.931957092285156e+02, 2.931973266601562e+02, 2.931989440917969e+02, 2.932005615234375e+02, 2.932021484375e+02, 2.932037658691406e+02, 2.932053527832031e+02, 2.932069396972656e+02, 2.932085266113281e+02, 2.932101135253906e+02, 2.93211669921875e+02, 2.932131958007812e+02, 2.932147216796875e+02, 2.932162475585938e+02, 2.932177429199219e+02, 2.932192077636719e+02, 2.93220703125e+02, 2.932221374511719e+02, 2.932235717773438e+02, 2.932250061035156e+02, 2.932264099121094e+02, 2.932278137207031e+02, 2.932292175292969e+02, 2.932305908203125e+02, 2.932319641113281e+02, 2.932333068847656e+02, 2.932346496582031e+02, 2.932359924316406e+02, 2.932373046875e+02, 2.932386474609375e+02, 2.932399597167969e+02, 2.932412719726562e+02, 2.932425842285156e+02, 2.932439270019531e+02, 2.932452392578125e+02, 2.932465515136719e+02, 2.932478942871094e+02, 2.932492370605469e+02, 2.932505798339844e+02, 2.932519226074219e+02, 2.932532653808594e+02, 2.93254638671875e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Radiator.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Radiator.txt
index b7956142015..54caf775477 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Radiator.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Radiator.txt
@@ -1,18 +1,18 @@
-last-generated=2024-03-14
+last-generated=2024-03-23
 statistics-initialization=
 {
-  "nonlinear": "5, 1",
+  "nonlinear": "5",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0",
   "nonlinear": " ",
-  "number of continuous time states": "9",
+  "number of continuous time states": "10",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 2.592e+05]
-zon.TAir=[2.931499938964844e+02, 2.899257507324219e+02, 2.889377136230469e+02, 2.889046325683594e+02, 2.8911669921875e+02, 2.890871887207031e+02, 2.891220703125e+02, 2.89119140625e+02, 2.891283264160156e+02, 2.944497375488281e+02, 2.952891235351562e+02, 2.953734130859375e+02, 2.9529736328125e+02, 2.952716064453125e+02, 2.952401733398438e+02, 2.952088317871094e+02, 2.95162109375e+02, 2.950233459472656e+02, 2.951420288085938e+02, 2.951202392578125e+02, 2.951352233886719e+02, 2.950884704589844e+02, 2.950997009277344e+02, 2.950972290039062e+02, 2.951177368164062e+02, 2.951407165527344e+02, 2.921026306152344e+02, 2.909164733886719e+02, 2.902420654296875e+02, 2.896808776855469e+02, 2.891930236816406e+02, 2.889239196777344e+02, 2.888985595703125e+02, 2.891159362792969e+02, 2.89183349609375e+02, 2.891127624511719e+02, 2.891123046875e+02, 2.891165771484375e+02, 2.891485290527344e+02, 2.891369934082031e+02, 2.891210632324219e+02, 2.891220092773438e+02, 2.921175231933594e+02, 2.935379028320312e+02, 2.947660522460938e+02, 2.9539892578125e+02, 2.952979125976562e+02, 2.952254028320312e+02, 2.952177124023438e+02, 2.952369384765625e+02, 2.952294616699219e+02, 2.952261352539062e+02, 2.952168579101562e+02, 2.950770874023438e+02, 2.951177368164062e+02, 2.950856628417969e+02, 2.950008544921875e+02, 2.950239562988281e+02, 2.951805114746094e+02, 2.928735046386719e+02, 2.913516235351562e+02, 2.906559753417969e+02, 2.901734008789062e+02, 2.898004150390625e+02, 2.8949169921875e+02, 2.890782470703125e+02, 2.889305114746094e+02, 2.889656066894531e+02, 2.891085815429688e+02, 2.890979919433594e+02, 2.891159057617188e+02, 2.891063842773438e+02, 2.891311340332031e+02, 2.891438293457031e+02, 2.891417236328125e+02, 2.891424865722656e+02, 2.934129333496094e+02, 2.949033813476562e+02, 2.956629943847656e+02, 2.953042907714844e+02, 2.952491149902344e+02, 2.95224609375e+02, 2.951924438476562e+02, 2.951890869140625e+02, 2.951641540527344e+02, 2.952624206542969e+02, 2.951111145019531e+02, 2.951536254882812e+02, 2.951009216308594e+02, 2.950596313476562e+02, 2.950935974121094e+02, 2.951953735351562e+02, 2.937956848144531e+02, 2.913037719726562e+02, 2.90356201171875e+02, 2.897010803222656e+02, 2.891629943847656e+02, 2.889245910644531e+02, 2.889554443359375e+02, 2.891141967773438e+02, 2.891067504882812e+02]
+zon.TAir=[2.931499938964844e+02, 2.899293823242188e+02, 2.889393615722656e+02, 2.889011840820312e+02, 2.891205749511719e+02, 2.890854797363281e+02, 2.891228332519531e+02, 2.891193237304688e+02, 2.891284484863281e+02, 2.942598266601562e+02, 2.952836608886719e+02, 2.953818969726562e+02, 2.952974853515625e+02, 2.952729187011719e+02, 2.952422485351562e+02, 2.952101745605469e+02, 2.951599426269531e+02, 2.950205383300781e+02, 2.9514208984375e+02, 2.951198120117188e+02, 2.951352844238281e+02, 2.950879211425781e+02, 2.95099365234375e+02, 2.950969848632812e+02, 2.951183776855469e+02, 2.95140869140625e+02, 2.921319580078125e+02, 2.90948486328125e+02, 2.902675476074219e+02, 2.897027587890625e+02, 2.892128601074219e+02, 2.889281005859375e+02, 2.888889465332031e+02, 2.891149597167969e+02, 2.891861572265625e+02, 2.891083984375e+02, 2.8911474609375e+02, 2.891148986816406e+02, 2.891492919921875e+02, 2.891372375488281e+02, 2.891217346191406e+02, 2.891209411621094e+02, 2.921175537109375e+02, 2.935178833007812e+02, 2.947488403320312e+02, 2.954060974121094e+02, 2.953016052246094e+02, 2.952254943847656e+02, 2.952173767089844e+02, 2.952371520996094e+02, 2.95229736328125e+02, 2.952242431640625e+02, 2.952183227539062e+02, 2.950740661621094e+02, 2.951177978515625e+02, 2.950855102539062e+02, 2.950010375976562e+02, 2.950244750976562e+02, 2.951801452636719e+02, 2.929026794433594e+02, 2.913829040527344e+02, 2.906802062988281e+02, 2.901934204101562e+02, 2.898177185058594e+02, 2.895075073242188e+02, 2.890894165039062e+02, 2.889322814941406e+02, 2.889580688476562e+02, 2.891077575683594e+02, 2.890990295410156e+02, 2.891156311035156e+02, 2.891069030761719e+02, 2.8913037109375e+02, 2.891437683105469e+02, 2.891416931152344e+02, 2.891423950195312e+02, 2.933754272460938e+02, 2.948777465820312e+02, 2.956706848144531e+02, 2.952950134277344e+02, 2.952481384277344e+02, 2.952239990234375e+02, 2.95192138671875e+02, 2.951889953613281e+02, 2.951628112792969e+02, 2.952643432617188e+02, 2.951102905273438e+02, 2.951526489257812e+02, 2.951009826660156e+02, 2.950589294433594e+02, 2.950907897949219e+02, 2.951867980957031e+02, 2.937970581054688e+02, 2.913411254882812e+02, 2.903845825195312e+02, 2.897243041992188e+02, 2.891829528808594e+02, 2.889268188476562e+02, 2.889464416503906e+02, 2.891144409179688e+02, 2.891075134277344e+02]
 building.weaBus.TDryBul=[2.609500122070312e+02, 2.608753967285156e+02, 2.61153564453125e+02, 2.615419921875e+02, 2.619866027832031e+02, 2.620587158203125e+02, 2.62211181640625e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625875549316406e+02, 2.630865173339844e+02, 2.637460632324219e+02, 2.650023803710938e+02, 2.665859985351562e+02, 2.678099975585938e+02, 2.690339965820312e+02, 2.701971740722656e+02, 2.709069213867188e+02, 2.718607788085938e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.719675598144531e+02, 2.714500122070312e+02, 2.71072998046875e+02, 2.71330810546875e+02, 2.720211181640625e+02, 2.714658508300781e+02, 2.718775329589844e+02, 2.719024353027344e+02, 2.714362182617188e+02, 2.714799194335938e+02, 2.704067077636719e+02, 2.693314514160156e+02, 2.703369750976562e+02, 2.699765930175781e+02, 2.69929931640625e+02, 2.7044189453125e+02, 2.718394165039062e+02, 2.720597534179688e+02, 2.721641845703125e+02, 2.725382080078125e+02, 2.72480224609375e+02, 2.727900085449219e+02, 2.732219848632812e+02, 2.736539916992188e+02, 2.744635620117188e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.742786560058594e+02, 2.729716186523438e+02, 2.725348205566406e+02, 2.732835083007812e+02, 2.73848876953125e+02, 2.737291564941406e+02, 2.726629028320312e+02, 2.730917358398438e+02, 2.738507690429688e+02, 2.742042541503906e+02, 2.746334838867188e+02, 2.75053955078125e+02, 2.753359069824219e+02, 2.733910522460938e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.733664245605469e+02, 2.737350158691406e+02, 2.733141784667969e+02, 2.725339965820312e+02, 2.717420043945312e+02, 2.709500122070312e+02, 2.701579895019531e+02, 2.697578430175781e+02, 2.697198181152344e+02, 2.688186950683594e+02, 2.686510009765625e+02, 2.688980407714844e+02, 2.692734069824219e+02, 2.697075805664062e+02, 2.701607055664062e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02]
 TSet.y=[2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.951499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02, 2.891499938964844e+02]
-val.y=[0e+00, 0e+00, 8.946246653795242e-02, 3.469057381153107e-01, 3.953325748443604e-01, 4.481927454471588e-01, 4.788583517074585e-01, 5.055806040763855e-01, 5.264796018600464e-01, 1e+00, 9.42196786403656e-01, 7.628142237663269e-01, 6.134387254714966e-01, 5.127834677696228e-01, 4.147912561893463e-01, 3.305005133152008e-01, 3.152513802051544e-01, 4.084461629390717e-01, 4.534653723239899e-01, 4.867560565471649e-01, 5.058110356330872e-01, 5.521213412284851e-01, 6.050891280174255e-01, 6.51963472366333e-01, 6.774793267250061e-01, 6.903917193412781e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.481155753135681e-01, 3.931481242179871e-01, 4.546100497245789e-01, 3.932075798511505e-01, 4.576221108436584e-01, 4.738351404666901e-01, 5.148293972015381e-01, 5.200734734535217e-01, 5.284005999565125e-01, 5.463538765907288e-01, 5.7822185754776e-01, 1e+00, 1e+00, 1e+00, 8.13625156879425e-01, 6.720627546310425e-01, 5.81505298614502e-01, 5.232595801353455e-01, 4.541342854499817e-01, 3.775294423103333e-01, 3.472145795822144e-01, 2.666904032230377e-01, 3.276910185813904e-01, 3.483346104621887e-01, 4.018180370330811e-01, 4.956685304641724e-01, 5.657306909561157e-01, 6.350663900375366e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.214149944484234e-02, 1.896626651287079e-01, 3.793481588363647e-01, 4.316540658473969e-01, 4.745912551879883e-01, 5.104897022247314e-01, 5.428022146224976e-01, 5.692349076271057e-01, 5.745275020599365e-01, 5.799262523651123e-01, 5.875261425971985e-01, 1e+00, 1e+00, 7.570611834526062e-01, 6.258335709571838e-01, 5.378314852714539e-01, 4.753289520740509e-01, 4.290008842945099e-01, 3.939333856105804e-01, 3.981224596500397e-01, 3.266910016536713e-01, 3.234970271587372e-01, 3.334132730960846e-01, 3.61553966999054e-01, 4.10770058631897e-01, 5.100449919700623e-01, 6.061721444129944e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.650852560997009e-01, 3.679234683513641e-01, 4.188599288463593e-01, 4.558499753475189e-01]
+val.y=[0e+00, 0e+00, 8.83721336722374e-02, 3.497229516506195e-01, 3.971021473407745e-01, 4.495663046836853e-01, 4.800229966640472e-01, 5.063337087631226e-01, 5.272485613822937e-01, 1e+00, 9.48905348777771e-01, 7.613017559051514e-01, 6.109416484832764e-01, 5.105076432228088e-01, 4.116247594356537e-01, 3.272965252399445e-01, 3.133300244808197e-01, 4.082421958446503e-01, 4.545746743679047e-01, 4.868491888046265e-01, 5.060041546821594e-01, 5.525866746902466e-01, 6.062269806861877e-01, 6.529727578163147e-01, 6.782953143119812e-01, 6.912951469421387e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.402588784694672e-01, 3.896107971668243e-01, 4.564824402332306e-01, 3.923836052417755e-01, 4.580035209655762e-01, 4.734991192817688e-01, 5.150797963142395e-01, 5.20297646522522e-01, 5.281237363815308e-01, 5.457437038421631e-01, 5.779088735580444e-01, 1e+00, 1e+00, 1e+00, 8.14902126789093e-01, 6.693763732910156e-01, 5.791242122650146e-01, 5.217419266700745e-01, 4.52199250459671e-01, 3.75557541847229e-01, 3.462883234024048e-01, 2.650323808193207e-01, 3.270478546619415e-01, 3.492715060710907e-01, 4.022671282291412e-01, 4.962365031242371e-01, 5.676597952842712e-01, 6.394008994102478e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.800154149532318e-02, 1.829162240028381e-01, 3.770191967487335e-01, 4.32890921831131e-01, 4.744340777397156e-01, 5.105372071266174e-01, 5.424546003341675e-01, 5.694244503974915e-01, 5.749005675315857e-01, 5.803558230400085e-01, 5.880439281463623e-01, 1e+00, 1e+00, 7.586641907691956e-01, 6.257477998733521e-01, 5.365195274353027e-01, 4.741292893886566e-01, 4.27620142698288e-01, 3.929661810398102e-01, 3.976064324378967e-01, 3.257312476634979e-01, 3.220573961734772e-01, 3.33731085062027e-01, 3.612833917140961e-01, 4.114224016666412e-01, 5.122582316398621e-01, 6.098671555519104e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.580187827348709e-01, 3.659090101718903e-01, 4.201034009456635e-01, 4.555090665817261e-01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_ShadeControl.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_ShadeControl.txt
index 4f05d1ad1eb..af92d7991c5 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_ShadeControl.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_ShadeControl.txt
@@ -1,23 +1,19 @@
-last-generated=2021-06-06
-statistics-initialization=
-{
-  "linear": "0"
-}
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "10",
+  "number of continuous time states": "13",
   "numerical Jacobians": "0"
 }
 time=[8.64e+06, 8.8992e+06]
 shaT.THigh=[2.971499938964844e+02, 2.971499938964844e+02]
 shaT.TLow=[2.951499938964844e+02, 2.951499938964844e+02]
-zonWes.TAir=[2.931499938964844e+02, 2.939625549316406e+02, 2.937582397460938e+02, 2.935343322753906e+02, 2.932204284667969e+02, 2.929518737792969e+02, 2.927220764160156e+02, 2.9250146484375e+02, 2.922004089355469e+02, 2.922288513183594e+02, 2.927069702148438e+02, 2.930244750976562e+02, 2.981502075195312e+02, 2.981635131835938e+02, 2.981515808105469e+02, 2.981501770019531e+02, 2.981550903320312e+02, 2.981504211425781e+02, 2.981500854492188e+02, 2.981519165039062e+02, 2.981499938964844e+02, 2.981499328613281e+02, 2.981470642089844e+02, 2.981501159667969e+02, 2.981499938964844e+02, 2.981499328613281e+02, 2.981493225097656e+02, 2.981498413085938e+02, 2.9814990234375e+02, 2.981484680175781e+02, 2.9814990234375e+02, 2.981499328613281e+02, 2.980022277832031e+02, 2.977305297851562e+02, 2.975130615234375e+02, 2.973283386230469e+02, 2.9719384765625e+02, 2.9701513671875e+02, 2.967959289550781e+02, 2.965540771484375e+02, 2.963847961425781e+02, 2.961501159667969e+02, 2.961045227050781e+02, 2.960946044921875e+02, 2.962720947265625e+02, 2.9814794921875e+02, 2.981500244140625e+02, 2.981512756347656e+02, 2.981504516601562e+02, 2.981500244140625e+02, 2.981499328613281e+02, 2.981495971679688e+02, 2.9814990234375e+02, 2.981499633789062e+02, 2.981499328613281e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981443176269531e+02, 2.981498413085938e+02, 2.960785217285156e+02, 2.956971435546875e+02, 2.953542785644531e+02, 2.950859680175781e+02, 2.948083190917969e+02, 2.945155639648438e+02, 2.942658386230469e+02, 2.939481201171875e+02, 2.935900573730469e+02, 2.931883850097656e+02, 2.928853454589844e+02, 2.925728454589844e+02, 2.922440185546875e+02, 2.918230895996094e+02, 2.91546142578125e+02, 2.912810363769531e+02, 2.910836486816406e+02, 2.910669555664062e+02, 2.914856872558594e+02, 2.982290649414062e+02, 2.981571350097656e+02, 2.981528930664062e+02, 2.981500854492188e+02, 2.981627197265625e+02, 2.981506958007812e+02, 2.981501159667969e+02, 2.981505432128906e+02, 2.981497802734375e+02, 2.981499938964844e+02, 2.9814892578125e+02, 2.981487731933594e+02, 2.981499633789062e+02, 2.981484069824219e+02, 2.981515197753906e+02, 2.976515808105469e+02, 2.9715869140625e+02, 2.966638488769531e+02, 2.961915283203125e+02, 2.957796020507812e+02, 2.953703002929688e+02, 2.9496533203125e+02, 2.945607604980469e+02]
+zonWes.TAir=[2.931499938964844e+02, 2.939636840820312e+02, 2.937591552734375e+02, 2.935350952148438e+02, 2.932210998535156e+02, 2.929525146484375e+02, 2.9272265625e+02, 2.925019836425781e+02, 2.922008972167969e+02, 2.922301025390625e+02, 2.927122192382812e+02, 2.930292663574219e+02, 2.981502075195312e+02, 2.981635131835938e+02, 2.981515808105469e+02, 2.981501770019531e+02, 2.981551208496094e+02, 2.981504211425781e+02, 2.981500854492188e+02, 2.981519165039062e+02, 2.981499938964844e+02, 2.981499328613281e+02, 2.981470642089844e+02, 2.981501159667969e+02, 2.981499938964844e+02, 2.981499328613281e+02, 2.981493225097656e+02, 2.981498413085938e+02, 2.9814990234375e+02, 2.981484680175781e+02, 2.9814990234375e+02, 2.981499328613281e+02, 2.980030822753906e+02, 2.977312622070312e+02, 2.975138244628906e+02, 2.973291015625e+02, 2.971946105957031e+02, 2.970158996582031e+02, 2.967967529296875e+02, 2.965549621582031e+02, 2.963856506347656e+02, 2.961510620117188e+02, 2.9610693359375e+02, 2.960969848632812e+02, 2.962788696289062e+02, 2.981480102539062e+02, 2.981500244140625e+02, 2.981512756347656e+02, 2.981504516601562e+02, 2.981500244140625e+02, 2.981499328613281e+02, 2.981495971679688e+02, 2.9814990234375e+02, 2.981499633789062e+02, 2.981499328613281e+02, 2.981499328613281e+02, 2.981499633789062e+02, 2.981441955566406e+02, 2.981498413085938e+02, 2.960779113769531e+02, 2.956987915039062e+02, 2.9535595703125e+02, 2.9508740234375e+02, 2.948096618652344e+02, 2.945167846679688e+02, 2.94266845703125e+02, 2.939490966796875e+02, 2.93591064453125e+02, 2.931893920898438e+02, 2.928862915039062e+02, 2.925737609863281e+02, 2.922449035644531e+02, 2.918240051269531e+02, 2.915470275878906e+02, 2.912818603515625e+02, 2.910844421386719e+02, 2.91068359375e+02, 2.914898071289062e+02, 2.982289428710938e+02, 2.981571350097656e+02, 2.981528625488281e+02, 2.981500854492188e+02, 2.981627197265625e+02, 2.981506652832031e+02, 2.981501159667969e+02, 2.981505432128906e+02, 2.981497802734375e+02, 2.981499938964844e+02, 2.981489562988281e+02, 2.981487426757812e+02, 2.981499633789062e+02, 2.981484069824219e+02, 2.981514892578125e+02, 2.976535339355469e+02, 2.971607055664062e+02, 2.966656799316406e+02, 2.961932067871094e+02, 2.957811279296875e+02, 2.953717956542969e+02, 2.94966796875e+02, 2.94562255859375e+02]
 shaH.H=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.582524490356445e+01, 8.713308715820312e+01, 1.261498565673828e+02, 2.619668884277344e+02, 3.265712890625e+02, 3.534755249023438e+02, 3.262355346679688e+02, 2.843271789550781e+02, 2.637113342285156e+02, 2.533142852783203e+02, 2.461027679443359e+02, 1.797266693115234e+02, 8.891157531738281e+01, 2.439959716796875e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.624804973602295e+00, 3.586202561855316e-01, 1.639005661010742e+00, 7.085418701171875e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.715119361877441e+00, 7.156165313720703e+01, 1.331828765869141e+02, 1.877864532470703e+02, 1.8694580078125e+02, 1.020612564086914e+02, 2.608650512695312e+02, 3.850811462402344e+02, 4.311324462890625e+02, 3.545038146972656e+02, 2.635573425292969e+02, 1.681844177246094e+02, 6.409250640869141e+01, 1.887202835083008e+01, 1.308047652244568e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 shaH.HHigh=[2e+02, 2e+02]
 shaH.HLow=[1e+01, 1e+01]
 shaT.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00]
 shaH.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-cooWes.conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.568406671285629e-01, 3.250060677528381e-01, 4.032987058162689e-01, 4.719577431678772e-01, 5.265225172042847e-01, 5.312029719352722e-01, 5.424899458885193e-01, 5.735693573951721e-01, 5.791106224060059e-01, 5.670177340507507e-01, 5.491816997528076e-01, 5.317783355712891e-01, 5.173200368881226e-01, 5.241959691047668e-01, 9.360882639884949e-02, 7.928334921598434e-02, 6.098182871937752e-02, 3.630364313721657e-02, 2.173065766692162e-02, 7.87519384175539e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.46301943063736e-01, 3.61884742975235e-01, 3.718916177749634e-01, 3.836953341960907e-01, 3.920343518257141e-01, 3.98597776889801e-01, 3.789145052433014e-01, 3.905880749225616e-01, 3.894158899784088e-01, 3.885188102722168e-01, 3.867866992950439e-01, 3.67309957742691e-01, 3.446403443813324e-01, 3.34737628698349e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.516498446464539e-01, 1.062320172786713e-01, 2.536744475364685e-01, 2.698113918304443e-01, 3.993751406669617e-01, 4.869149923324585e-01, 5.083447098731995e-01, 5.378363132476807e-01, 5.276818871498108e-01, 5.141327977180481e-01, 4.930168986320496e-01, 4.729357659816742e-01, 4.633462429046631e-01, 4.444144666194916e-01, 7.427729666233063e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+cooWes.conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.576355397701263e-01, 3.257170021533966e-01, 4.039919376373291e-01, 4.726329445838928e-01, 5.272064208984375e-01, 5.315058827400208e-01, 5.427955985069275e-01, 5.742387175559998e-01, 5.797880887985229e-01, 5.67710816860199e-01, 5.499060750007629e-01, 5.321435332298279e-01, 5.174219012260437e-01, 5.242973566055298e-01, 9.363878518342972e-02, 7.931328564882278e-02, 6.10118992626667e-02, 3.633800521492958e-02, 2.17601265758276e-02, 7.903852500021458e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.471313118934631e-01, 3.626894354820251e-01, 3.72692197561264e-01, 3.84498655796051e-01, 3.928393423557281e-01, 3.994035124778748e-01, 3.793774843215942e-01, 3.91425222158432e-01, 3.902603685855865e-01, 3.893672227859497e-01, 3.876374661922455e-01, 3.677985966205597e-01, 3.447943925857544e-01, 3.349268138408661e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.518290162086487e-01, 1.07050359249115e-01, 2.543917894363403e-01, 2.705374658107758e-01, 4.00076687335968e-01, 4.875803291797638e-01, 5.086420178413391e-01, 5.385025143623352e-01, 5.283554792404175e-01, 5.148241519927979e-01, 4.937278926372528e-01, 4.732910394668579e-01, 4.637879729270935e-01, 4.445731043815613e-01, 7.515234872698784e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 actSha.u=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 6e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Unconditioned.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Unconditioned.txt
index c8f2d6427d1..683b58171f9 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Unconditioned.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SingleFamilyHouse_Unconditioned.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 4.32e+05]
-zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447326660156e+02, 2.883150634765625e+02, 2.887251281738281e+02, 2.884546508789062e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377014160156e+02, 2.860204162597656e+02, 2.853323364257812e+02, 2.849344787597656e+02, 2.845061950683594e+02, 2.840436706542969e+02, 2.836084594726562e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.828783874511719e+02, 2.827989807128906e+02, 2.826684265136719e+02, 2.830442199707031e+02, 2.844673461914062e+02, 2.854508666992188e+02, 2.863419799804688e+02, 2.871799621582031e+02, 2.877546081542969e+02, 2.878578796386719e+02, 2.876747741699219e+02, 2.870802917480469e+02, 2.856825866699219e+02, 2.845762634277344e+02, 2.84232666015625e+02, 2.840108032226562e+02, 2.836387939453125e+02, 2.832453918457031e+02, 2.829547119140625e+02, 2.826980895996094e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628784179688e+02, 2.832455749511719e+02, 2.840979614257812e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860324096679688e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654663085938e+02, 2.84279052734375e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338439941406e+02, 2.816460571289062e+02, 2.813206176757812e+02, 2.810276794433594e+02, 2.807495422363281e+02, 2.804705505371094e+02, 2.802008361816406e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242553710938e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079833984375e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.786509094238281e+02, 2.813306274414062e+02, 2.835545654296875e+02, 2.850451965332031e+02, 2.86462646484375e+02, 2.877089233398438e+02, 2.872904663085938e+02, 2.858002014160156e+02, 2.840639038085938e+02, 2.82319091796875e+02, 2.81323486328125e+02, 2.804435119628906e+02, 2.797223815917969e+02, 2.790178527832031e+02]
+zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447631835938e+02, 2.883150939941406e+02, 2.887251281738281e+02, 2.884546813964844e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377319335938e+02, 2.860204162597656e+02, 2.853323974609375e+02, 2.849344787597656e+02, 2.845062255859375e+02, 2.840436706542969e+02, 2.836084899902344e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.8287841796875e+02, 2.827990112304688e+02, 2.8266845703125e+02, 2.83044189453125e+02, 2.844673156738281e+02, 2.854508361816406e+02, 2.863420104980469e+02, 2.871799621582031e+02, 2.877545776367188e+02, 2.878578491210938e+02, 2.876748046875e+02, 2.87080322265625e+02, 2.856826171875e+02, 2.845762939453125e+02, 2.842326965332031e+02, 2.840108337402344e+02, 2.836388244628906e+02, 2.832453918457031e+02, 2.829547424316406e+02, 2.826981201171875e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628479003906e+02, 2.832455749511719e+02, 2.840979309082031e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860323791503906e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654968261719e+02, 2.842790832519531e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338745117188e+02, 2.816460876464844e+02, 2.813206481933594e+02, 2.810277099609375e+02, 2.807495727539062e+02, 2.804705200195312e+02, 2.802008666992188e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242248535156e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079528808594e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.7865087890625e+02, 2.813305969238281e+02, 2.835545959472656e+02, 2.850451965332031e+02, 2.864626159667969e+02, 2.877089233398438e+02, 2.872904968261719e+02, 2.858002319335938e+02, 2.840639343261719e+02, 2.823191223144531e+02, 2.813234558105469e+02, 2.804435119628906e+02, 2.79722412109375e+02, 2.79017822265625e+02]
 zon.V=[4.531383056640625e+02, 4.531383056640625e+02]
 zon.AFlo=[1.858342742919922e+02, 1.858342742919922e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Spring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Spring.txt
index 2bfce57d0a1..65ab62827cd 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Spring.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Spring.txt
@@ -1,37 +1,37 @@
-last-generated=2023-03-03
+last-generated=2024-03-23
 statistics-initialization=
 {
-  "linear": "0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "1, 3, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 1, 0, 0, 1, 1",
+  "linear": "0",
+  "nonlinear": "1, 3, 0, 0, 1, 1, 0, 2, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
   "nonlinear": "0, 5, 0, 0, 0, 2, 0, 0, 1, 0, 0, 1, 1, 1",
-  "number of continuous time states": "85",
+  "number of continuous time states": "91",
   "numerical Jacobians": "0"
 }
 time=[7.344e+06, 7.776e+06]
-flo.sou.TAir=[2.931499938964844e+02, 2.942655029296875e+02, 2.940445556640625e+02, 2.940544738769531e+02, 2.940902099609375e+02, 2.938929443359375e+02, 2.938114318847656e+02, 2.945199584960938e+02, 2.949513854980469e+02, 2.953844604492188e+02, 2.961723327636719e+02, 2.96894775390625e+02, 2.970036926269531e+02, 2.969531860351562e+02, 2.957185974121094e+02, 2.948954162597656e+02, 2.955194396972656e+02, 2.956098022460938e+02, 2.952064208984375e+02, 2.949618225097656e+02, 2.947237854003906e+02, 2.945743713378906e+02, 2.942421875e+02, 2.94058837890625e+02, 2.942578430175781e+02, 2.941693420410156e+02, 2.941303405761719e+02, 2.948477172851562e+02, 2.94952880859375e+02, 2.952469482421875e+02, 2.951986999511719e+02, 2.956100769042969e+02, 2.955388793945312e+02, 2.956234130859375e+02, 2.944418334960938e+02, 2.936931762695312e+02, 2.942558898925781e+02, 2.943793029785156e+02, 2.941961975097656e+02, 2.938880310058594e+02, 2.938578796386719e+02, 2.936846313476562e+02, 2.935391540527344e+02, 2.933275146484375e+02, 2.932624816894531e+02, 2.932543640136719e+02, 2.938280334472656e+02, 2.941990051269531e+02, 2.946712036132812e+02, 2.951486511230469e+02, 2.949842224121094e+02, 2.955618896484375e+02, 2.956144409179688e+02, 2.952214660644531e+02, 2.941095581054688e+02, 2.933054809570312e+02, 2.937840881347656e+02, 2.935468139648438e+02, 2.933094787597656e+02, 2.930567932128906e+02, 2.927683410644531e+02, 2.926117248535156e+02, 2.924317932128906e+02, 2.921907348632812e+02, 2.919946594238281e+02, 2.905084228515625e+02, 2.9370166015625e+02, 2.934754638671875e+02, 2.93834228515625e+02, 2.940428466796875e+02, 2.938881225585938e+02, 2.941557312011719e+02, 2.941600036621094e+02, 2.940696716308594e+02, 2.929049987792969e+02, 2.931446533203125e+02, 2.928341979980469e+02, 2.924904174804688e+02, 2.923617248535156e+02, 2.921455078125e+02, 2.919105834960938e+02, 2.91705322265625e+02, 2.915811767578125e+02, 2.914241333007812e+02, 2.909662475585938e+02, 2.928185424804688e+02, 2.9379248046875e+02, 2.933204345703125e+02, 2.931618041992188e+02, 2.930812377929688e+02, 2.930746459960938e+02, 2.931334533691406e+02, 2.931094360351562e+02, 2.931746826171875e+02, 2.932536926269531e+02, 2.929775390625e+02, 2.911582641601562e+02, 2.912371215820312e+02, 2.914317016601562e+02, 2.913027648925781e+02, 2.910477600097656e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.947882385253906e+02, 2.945780029296875e+02, 2.944967041015625e+02, 2.944697875976562e+02, 2.9440185546875e+02, 2.935811767578125e+02, 2.945447387695312e+02, 2.949685363769531e+02, 2.952978820800781e+02, 2.953177490234375e+02, 2.959130249023438e+02, 2.961505432128906e+02, 2.961858215332031e+02, 2.950751342773438e+02, 2.943141479492188e+02, 2.951734008789062e+02, 2.952899475097656e+02, 2.949994201660156e+02, 2.946120300292969e+02, 2.948959350585938e+02, 2.948075256347656e+02, 2.945928955078125e+02, 2.939337158203125e+02, 2.937250061035156e+02, 2.93660400390625e+02, 2.93769775390625e+02, 2.94527587890625e+02, 2.945667114257812e+02, 2.947527160644531e+02, 2.946522216796875e+02, 2.948631896972656e+02, 2.950517272949219e+02, 2.94793212890625e+02, 2.940491638183594e+02, 2.934083251953125e+02, 2.940343017578125e+02, 2.942496032714844e+02, 2.94093994140625e+02, 2.939273071289062e+02, 2.937632446289062e+02, 2.936072387695312e+02, 2.934639282226562e+02, 2.932676696777344e+02, 2.931973266601562e+02, 2.932489624023438e+02, 2.936640930175781e+02, 2.9394580078125e+02, 2.943689575195312e+02, 2.947308959960938e+02, 2.944990234375e+02, 2.950397033691406e+02, 2.950801696777344e+02, 2.94474609375e+02, 2.933299865722656e+02, 2.930413513183594e+02, 2.930698852539062e+02, 2.928084716796875e+02, 2.92619873046875e+02, 2.924012451171875e+02, 2.920650329589844e+02, 2.920460205078125e+02, 2.919633483886719e+02, 2.914089050292969e+02, 2.911435241699219e+02, 2.904075622558594e+02, 2.935771484375e+02, 2.931600952148438e+02, 2.931473388671875e+02, 2.931567077636719e+02, 2.931543273925781e+02, 2.931669921875e+02, 2.931329650878906e+02, 2.931125793457031e+02, 2.931292419433594e+02, 2.931841125488281e+02, 2.917842712402344e+02, 2.914367065429688e+02, 2.913566284179688e+02, 2.912695922851562e+02, 2.910464172363281e+02, 2.907609558105469e+02, 2.905715942382812e+02, 2.903804321289062e+02, 2.904063110351562e+02, 2.924767761230469e+02, 2.939144287109375e+02, 2.932413330078125e+02, 2.931932983398438e+02, 2.931900634765625e+02, 2.929451599121094e+02, 2.931542663574219e+02, 2.931695556640625e+02, 2.931420288085938e+02, 2.931088256835938e+02, 2.931443481445312e+02, 2.922051391601562e+02, 2.919320373535156e+02, 2.9174560546875e+02, 2.915552673339844e+02, 2.912456970214844e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.946911010742188e+02, 2.945000915527344e+02, 2.944241333007812e+02, 2.944018859863281e+02, 2.943415222167969e+02, 2.943711242675781e+02, 2.949145202636719e+02, 2.952295837402344e+02, 2.955522766113281e+02, 2.954972839355469e+02, 2.961002807617188e+02, 2.963485412597656e+02, 2.964148559570312e+02, 2.952614135742188e+02, 2.944939270019531e+02, 2.951518859863281e+02, 2.953169860839844e+02, 2.952154541015625e+02, 2.950368957519531e+02, 2.949049377441406e+02, 2.948324584960938e+02, 2.946275329589844e+02, 2.944411926269531e+02, 2.93705810546875e+02, 2.935097961425781e+02, 2.939912719726562e+02, 2.9474169921875e+02, 2.945560302734375e+02, 2.948070678710938e+02, 2.949475402832031e+02, 2.950903015136719e+02, 2.948523559570312e+02, 2.954120178222656e+02, 2.943023071289062e+02, 2.936103515625e+02, 2.940212097167969e+02, 2.94334228515625e+02, 2.941634521484375e+02, 2.939840393066406e+02, 2.938270568847656e+02, 2.933982849121094e+02, 2.935191955566406e+02, 2.931082153320312e+02, 2.932643737792969e+02, 2.932563781738281e+02, 2.938258666992188e+02, 2.941406555175781e+02, 2.945645446777344e+02, 2.949436645507812e+02, 2.947422180175781e+02, 2.952945251464844e+02, 2.953635864257812e+02, 2.949134521484375e+02, 2.937997741699219e+02, 2.932582397460938e+02, 2.936273803710938e+02, 2.927642211914062e+02, 2.924809265136719e+02, 2.922683410644531e+02, 2.919127807617188e+02, 2.9190966796875e+02, 2.916735229492188e+02, 2.913606567382812e+02, 2.911626281738281e+02, 2.904936828613281e+02, 2.939224243164062e+02, 2.933846435546875e+02, 2.93688720703125e+02, 2.932929382324219e+02, 2.932542114257812e+02, 2.93158203125e+02, 2.931461181640625e+02, 2.930589294433594e+02, 2.931612548828125e+02, 2.931531372070312e+02, 2.921560668945312e+02, 2.919970703125e+02, 2.922912292480469e+02, 2.920724792480469e+02, 2.917253723144531e+02, 2.915116882324219e+02, 2.915755615234375e+02, 2.914334106445312e+02, 2.913153686523438e+02, 2.931470947265625e+02, 2.937703857421875e+02, 2.933191223144531e+02, 2.934449768066406e+02, 2.93753662109375e+02, 2.934422912597656e+02, 2.937481994628906e+02, 2.938162231445312e+02, 2.937679748535156e+02, 2.929012756347656e+02, 2.931461181640625e+02, 2.92381103515625e+02, 2.920916442871094e+02, 2.918575744628906e+02, 2.916658020019531e+02, 2.913561706542969e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.948869018554688e+02, 2.946897888183594e+02, 2.946231384277344e+02, 2.94566650390625e+02, 2.944849243164062e+02, 2.935334777832031e+02, 2.941698303222656e+02, 2.948401184082031e+02, 2.95019287109375e+02, 2.951455078125e+02, 2.957793273925781e+02, 2.962200622558594e+02, 2.963992919921875e+02, 2.951665954589844e+02, 2.945430908203125e+02, 2.953391418457031e+02, 2.954312133789062e+02, 2.953326416015625e+02, 2.951734313964844e+02, 2.950178527832031e+02, 2.949362182617188e+02, 2.941490783691406e+02, 2.944784851074219e+02, 2.942081604003906e+02, 2.94107421875e+02, 2.936980285644531e+02, 2.945122375488281e+02, 2.945754089355469e+02, 2.947618713378906e+02, 2.947408752441406e+02, 2.951259155273438e+02, 2.950993957519531e+02, 2.952301025390625e+02, 2.941541442871094e+02, 2.934525146484375e+02, 2.941978149414062e+02, 2.942978820800781e+02, 2.938839721679688e+02, 2.935859680175781e+02, 2.933258666992188e+02, 2.932167053222656e+02, 2.929759521484375e+02, 2.928915100097656e+02, 2.929468383789062e+02, 2.928966674804688e+02, 2.936504516601562e+02, 2.938740234375e+02, 2.943024291992188e+02, 2.946564025878906e+02, 2.944147338867188e+02, 2.950251770019531e+02, 2.948734741210938e+02, 2.947776794433594e+02, 2.937960815429688e+02, 2.930257568359375e+02, 2.936977844238281e+02, 2.934371337890625e+02, 2.931935729980469e+02, 2.929493103027344e+02, 2.926628112792969e+02, 2.925357971191406e+02, 2.923459777832031e+02, 2.921068420410156e+02, 2.919248352050781e+02, 2.9031591796875e+02, 2.9358740234375e+02, 2.931246643066406e+02, 2.931550903320312e+02, 2.931448974609375e+02, 2.931565551757812e+02, 2.931526794433594e+02, 2.931542053222656e+02, 2.931498718261719e+02, 2.930929260253906e+02, 2.93158447265625e+02, 2.927580261230469e+02, 2.924495239257812e+02, 2.9227734375e+02, 2.921078491210938e+02, 2.91882568359375e+02, 2.916878967285156e+02, 2.915302429199219e+02, 2.913762817382812e+02, 2.912700500488281e+02, 2.932493591308594e+02, 2.936279907226562e+02, 2.931861877441406e+02, 2.931893310546875e+02, 2.933687438964844e+02, 2.92969970703125e+02, 2.931269836425781e+02, 2.93009521484375e+02, 2.931739807128906e+02, 2.930767517089844e+02, 2.931790771484375e+02, 2.909447021484375e+02, 2.909342651367188e+02, 2.906692810058594e+02, 2.905802917480469e+02, 2.903854370117188e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.948133850097656e+02, 2.946072387695312e+02, 2.945703125e+02, 2.945702209472656e+02, 2.944611511230469e+02, 2.942320556640625e+02, 2.948554382324219e+02, 2.952831420898438e+02, 2.955606384277344e+02, 2.956840515136719e+02, 2.96335205078125e+02, 2.9654833984375e+02, 2.965988464355469e+02, 2.954266967773438e+02, 2.946939086914062e+02, 2.954225463867188e+02, 2.956057739257812e+02, 2.954327697753906e+02, 2.951998291015625e+02, 2.950927429199219e+02, 2.949971923828125e+02, 2.9465625e+02, 2.945042724609375e+02, 2.942451782226562e+02, 2.9411474609375e+02, 2.943116455078125e+02, 2.949739074707031e+02, 2.949555969238281e+02, 2.951471557617188e+02, 2.951155395507812e+02, 2.954493713378906e+02, 2.954036865234375e+02, 2.955534973144531e+02, 2.945518188476562e+02, 2.938623352050781e+02, 2.94433837890625e+02, 2.946328430175781e+02, 2.944266052246094e+02, 2.942013854980469e+02, 2.940332336425781e+02, 2.938167419433594e+02, 2.937251586914062e+02, 2.935192565917969e+02, 2.9352392578125e+02, 2.935255737304688e+02, 2.938916320800781e+02, 2.943486938476562e+02, 2.947571105957031e+02, 2.950972900390625e+02, 2.94836181640625e+02, 2.954131164550781e+02, 2.954425048828125e+02, 2.95143798828125e+02, 2.940960998535156e+02, 2.935014038085938e+02, 2.939327697753906e+02, 2.934719848632812e+02, 2.932372131347656e+02, 2.930135192871094e+02, 2.927048645019531e+02, 2.926500549316406e+02, 2.924675903320312e+02, 2.921546325683594e+02, 2.919467163085938e+02, 2.907228393554688e+02, 2.939005432128906e+02, 2.936712951660156e+02, 2.9385546875e+02, 2.93807861328125e+02, 2.937094116210938e+02, 2.9382080078125e+02, 2.938194580078125e+02, 2.937809143066406e+02, 2.931797180175781e+02, 2.931204528808594e+02, 2.928139953613281e+02, 2.925394897460938e+02, 2.925202026367188e+02, 2.923656311035156e+02, 2.921132202148438e+02, 2.918953247070312e+02, 2.91786376953125e+02, 2.916292419433594e+02, 2.914725952148438e+02, 2.934368286132812e+02, 2.938800964355469e+02, 2.935856628417969e+02, 2.936307067871094e+02, 2.937044372558594e+02, 2.934552001953125e+02, 2.937052612304688e+02, 2.936815185546875e+02, 2.937484436035156e+02, 2.930747985839844e+02, 2.931224975585938e+02, 2.920547180175781e+02, 2.919910583496094e+02, 2.919158935546875e+02, 2.917723999023438e+02, 2.915081176757812e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.942655029296875e+02, 2.940445556640625e+02, 2.940544738769531e+02, 2.940902099609375e+02, 2.938929138183594e+02, 2.938114318847656e+02, 2.945199584960938e+02, 2.949513854980469e+02, 2.953844604492188e+02, 2.961723327636719e+02, 2.96894775390625e+02, 2.970036926269531e+02, 2.969531860351562e+02, 2.957185974121094e+02, 2.948954162597656e+02, 2.955194396972656e+02, 2.956098022460938e+02, 2.952064208984375e+02, 2.949618225097656e+02, 2.947237854003906e+02, 2.945743713378906e+02, 2.942421875e+02, 2.94058837890625e+02, 2.942578430175781e+02, 2.941693420410156e+02, 2.9413037109375e+02, 2.948477172851562e+02, 2.949528503417969e+02, 2.952469177246094e+02, 2.951986999511719e+02, 2.956100769042969e+02, 2.955388793945312e+02, 2.956234130859375e+02, 2.944418334960938e+02, 2.936931762695312e+02, 2.942558898925781e+02, 2.943793029785156e+02, 2.941961975097656e+02, 2.938880310058594e+02, 2.938578796386719e+02, 2.936846313476562e+02, 2.935391540527344e+02, 2.933275451660156e+02, 2.932624816894531e+02, 2.932543640136719e+02, 2.938280639648438e+02, 2.941990051269531e+02, 2.946712036132812e+02, 2.951486511230469e+02, 2.949842224121094e+02, 2.955619201660156e+02, 2.956144409179688e+02, 2.952214660644531e+02, 2.941095581054688e+02, 2.933054504394531e+02, 2.937840881347656e+02, 2.935468139648438e+02, 2.933094787597656e+02, 2.930567932128906e+02, 2.927683410644531e+02, 2.926117248535156e+02, 2.924317932128906e+02, 2.921907348632812e+02, 2.919946594238281e+02, 2.905083312988281e+02, 2.9370166015625e+02, 2.934754638671875e+02, 2.93834228515625e+02, 2.940428466796875e+02, 2.938881225585938e+02, 2.941557312011719e+02, 2.941600036621094e+02, 2.940696716308594e+02, 2.929049987792969e+02, 2.931446533203125e+02, 2.928341674804688e+02, 2.924904174804688e+02, 2.923617553710938e+02, 2.921455078125e+02, 2.919105834960938e+02, 2.91705322265625e+02, 2.915811767578125e+02, 2.914241333007812e+02, 2.909662475585938e+02, 2.928185424804688e+02, 2.9379248046875e+02, 2.933204650878906e+02, 2.931618041992188e+02, 2.930812377929688e+02, 2.930746459960938e+02, 2.931334533691406e+02, 2.931094360351562e+02, 2.931746826171875e+02, 2.932536926269531e+02, 2.929775085449219e+02, 2.911582641601562e+02, 2.912371215820312e+02, 2.914317016601562e+02, 2.913027648925781e+02, 2.910477600097656e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.947882385253906e+02, 2.945780029296875e+02, 2.944967041015625e+02, 2.944697875976562e+02, 2.9440185546875e+02, 2.935811767578125e+02, 2.945447387695312e+02, 2.949685363769531e+02, 2.952978820800781e+02, 2.953177490234375e+02, 2.959130249023438e+02, 2.961505432128906e+02, 2.961858215332031e+02, 2.950751342773438e+02, 2.943141479492188e+02, 2.951734313964844e+02, 2.952899475097656e+02, 2.949994201660156e+02, 2.946120300292969e+02, 2.948959045410156e+02, 2.948074951171875e+02, 2.945928955078125e+02, 2.939337158203125e+02, 2.937250061035156e+02, 2.93660400390625e+02, 2.93769775390625e+02, 2.94527587890625e+02, 2.945666809082031e+02, 2.947527160644531e+02, 2.946522521972656e+02, 2.948631896972656e+02, 2.950517272949219e+02, 2.94793212890625e+02, 2.940491638183594e+02, 2.934083251953125e+02, 2.940343017578125e+02, 2.942496032714844e+02, 2.94093994140625e+02, 2.939273071289062e+02, 2.937632446289062e+02, 2.936072387695312e+02, 2.934639282226562e+02, 2.932676696777344e+02, 2.931973266601562e+02, 2.932489624023438e+02, 2.936640930175781e+02, 2.9394580078125e+02, 2.943689575195312e+02, 2.947308959960938e+02, 2.944990234375e+02, 2.950397033691406e+02, 2.950801696777344e+02, 2.94474609375e+02, 2.933299865722656e+02, 2.930413208007812e+02, 2.930699157714844e+02, 2.928084716796875e+02, 2.92619873046875e+02, 2.924012451171875e+02, 2.920650329589844e+02, 2.920460205078125e+02, 2.919633483886719e+02, 2.914089050292969e+02, 2.911435241699219e+02, 2.904074401855469e+02, 2.935771484375e+02, 2.931600646972656e+02, 2.931473388671875e+02, 2.931567077636719e+02, 2.931543273925781e+02, 2.931669921875e+02, 2.931329650878906e+02, 2.931125793457031e+02, 2.931292419433594e+02, 2.931841125488281e+02, 2.917843017578125e+02, 2.914367065429688e+02, 2.913566284179688e+02, 2.912695922851562e+02, 2.910464172363281e+02, 2.907609558105469e+02, 2.905715942382812e+02, 2.903804321289062e+02, 2.904063110351562e+02, 2.924767761230469e+02, 2.939144287109375e+02, 2.932413330078125e+02, 2.931932983398438e+02, 2.931900634765625e+02, 2.929451599121094e+02, 2.931542663574219e+02, 2.931695556640625e+02, 2.931420288085938e+02, 2.931088256835938e+02, 2.931443481445312e+02, 2.922051391601562e+02, 2.919320373535156e+02, 2.9174560546875e+02, 2.915552673339844e+02, 2.912456970214844e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.946911010742188e+02, 2.945000915527344e+02, 2.944241333007812e+02, 2.944018859863281e+02, 2.943415222167969e+02, 2.943711242675781e+02, 2.949145202636719e+02, 2.952295837402344e+02, 2.955522766113281e+02, 2.954972839355469e+02, 2.961002807617188e+02, 2.963485412597656e+02, 2.964148559570312e+02, 2.952614135742188e+02, 2.944939270019531e+02, 2.951518859863281e+02, 2.953169860839844e+02, 2.952154541015625e+02, 2.950368957519531e+02, 2.949049377441406e+02, 2.948324584960938e+02, 2.946275024414062e+02, 2.944411926269531e+02, 2.93705810546875e+02, 2.935097961425781e+02, 2.939912719726562e+02, 2.9474169921875e+02, 2.945560302734375e+02, 2.948070678710938e+02, 2.949475402832031e+02, 2.950903015136719e+02, 2.948523559570312e+02, 2.954120178222656e+02, 2.943023071289062e+02, 2.936103515625e+02, 2.940212097167969e+02, 2.943342590332031e+02, 2.941634521484375e+02, 2.939840087890625e+02, 2.938270568847656e+02, 2.933982849121094e+02, 2.935191955566406e+02, 2.931082458496094e+02, 2.932643737792969e+02, 2.932563781738281e+02, 2.938258666992188e+02, 2.941406555175781e+02, 2.945645446777344e+02, 2.949436645507812e+02, 2.947422180175781e+02, 2.952945251464844e+02, 2.953635864257812e+02, 2.949134521484375e+02, 2.937997741699219e+02, 2.932582092285156e+02, 2.936273803710938e+02, 2.927642211914062e+02, 2.924809265136719e+02, 2.922683410644531e+02, 2.919128112792969e+02, 2.9190966796875e+02, 2.916735229492188e+02, 2.913606567382812e+02, 2.911626281738281e+02, 2.904935913085938e+02, 2.939224243164062e+02, 2.933846435546875e+02, 2.93688720703125e+02, 2.932929382324219e+02, 2.932541809082031e+02, 2.93158203125e+02, 2.931461181640625e+02, 2.930589294433594e+02, 2.931612243652344e+02, 2.931531372070312e+02, 2.921560668945312e+02, 2.919970703125e+02, 2.922912292480469e+02, 2.920724487304688e+02, 2.917253723144531e+02, 2.915116882324219e+02, 2.915755615234375e+02, 2.914334106445312e+02, 2.913153686523438e+02, 2.931470947265625e+02, 2.937703857421875e+02, 2.933191223144531e+02, 2.934449768066406e+02, 2.93753662109375e+02, 2.934422912597656e+02, 2.937481994628906e+02, 2.938162231445312e+02, 2.937679748535156e+02, 2.929012756347656e+02, 2.931461181640625e+02, 2.92381103515625e+02, 2.920916442871094e+02, 2.918575744628906e+02, 2.916658020019531e+02, 2.913561706542969e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.948869018554688e+02, 2.946897888183594e+02, 2.946231384277344e+02, 2.94566650390625e+02, 2.944849243164062e+02, 2.935334777832031e+02, 2.941698303222656e+02, 2.948401184082031e+02, 2.95019287109375e+02, 2.951455078125e+02, 2.957793273925781e+02, 2.962200622558594e+02, 2.963992919921875e+02, 2.951665954589844e+02, 2.945430908203125e+02, 2.953391418457031e+02, 2.954312133789062e+02, 2.953326416015625e+02, 2.951734313964844e+02, 2.950178527832031e+02, 2.949362182617188e+02, 2.941490783691406e+02, 2.944784240722656e+02, 2.942081604003906e+02, 2.94107421875e+02, 2.936980285644531e+02, 2.945122680664062e+02, 2.945754089355469e+02, 2.947618713378906e+02, 2.947409057617188e+02, 2.951259155273438e+02, 2.950993957519531e+02, 2.952301025390625e+02, 2.941541442871094e+02, 2.934525146484375e+02, 2.941978149414062e+02, 2.942978820800781e+02, 2.938839721679688e+02, 2.935859680175781e+02, 2.933258666992188e+02, 2.932167358398438e+02, 2.929759521484375e+02, 2.928915100097656e+02, 2.929468383789062e+02, 2.928966674804688e+02, 2.936504516601562e+02, 2.938740234375e+02, 2.943024291992188e+02, 2.946564025878906e+02, 2.944147338867188e+02, 2.950251770019531e+02, 2.948735046386719e+02, 2.947776794433594e+02, 2.937960815429688e+02, 2.930256958007812e+02, 2.936977844238281e+02, 2.934371337890625e+02, 2.931935729980469e+02, 2.929493103027344e+02, 2.926628112792969e+02, 2.925357971191406e+02, 2.923459777832031e+02, 2.921068420410156e+02, 2.919248352050781e+02, 2.903157958984375e+02, 2.9358740234375e+02, 2.931246948242188e+02, 2.931550903320312e+02, 2.931448974609375e+02, 2.931565551757812e+02, 2.931526794433594e+02, 2.931542053222656e+02, 2.931498718261719e+02, 2.930929260253906e+02, 2.93158447265625e+02, 2.927580261230469e+02, 2.924495239257812e+02, 2.9227734375e+02, 2.921078491210938e+02, 2.91882568359375e+02, 2.916878967285156e+02, 2.915302429199219e+02, 2.913762817382812e+02, 2.912700500488281e+02, 2.932493591308594e+02, 2.936279907226562e+02, 2.931861877441406e+02, 2.931893310546875e+02, 2.933687438964844e+02, 2.92969970703125e+02, 2.931269836425781e+02, 2.93009521484375e+02, 2.931739807128906e+02, 2.930767517089844e+02, 2.931790771484375e+02, 2.909446716308594e+02, 2.909342651367188e+02, 2.906692810058594e+02, 2.905802917480469e+02, 2.903854370117188e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.948133850097656e+02, 2.946072387695312e+02, 2.945703125e+02, 2.945702209472656e+02, 2.944611511230469e+02, 2.942320556640625e+02, 2.948554382324219e+02, 2.952831420898438e+02, 2.955606384277344e+02, 2.956840515136719e+02, 2.96335205078125e+02, 2.965483703613281e+02, 2.965988464355469e+02, 2.954266967773438e+02, 2.946939086914062e+02, 2.954225463867188e+02, 2.956057739257812e+02, 2.954327697753906e+02, 2.951998291015625e+02, 2.950927429199219e+02, 2.949971923828125e+02, 2.9465625e+02, 2.945042724609375e+02, 2.942451782226562e+02, 2.9411474609375e+02, 2.943116455078125e+02, 2.949739379882812e+02, 2.9495556640625e+02, 2.951471557617188e+02, 2.951155395507812e+02, 2.954493713378906e+02, 2.954036865234375e+02, 2.955534973144531e+02, 2.945518188476562e+02, 2.938623352050781e+02, 2.944338073730469e+02, 2.946328430175781e+02, 2.944266052246094e+02, 2.942013549804688e+02, 2.940332336425781e+02, 2.938167419433594e+02, 2.937251586914062e+02, 2.935192565917969e+02, 2.9352392578125e+02, 2.935255737304688e+02, 2.938916320800781e+02, 2.943486938476562e+02, 2.947571105957031e+02, 2.950972900390625e+02, 2.94836181640625e+02, 2.954131164550781e+02, 2.954425048828125e+02, 2.95143798828125e+02, 2.940960998535156e+02, 2.935013732910156e+02, 2.939327392578125e+02, 2.934719848632812e+02, 2.932372131347656e+02, 2.930135192871094e+02, 2.927048645019531e+02, 2.926500549316406e+02, 2.924675903320312e+02, 2.921546325683594e+02, 2.919467163085938e+02, 2.9072265625e+02, 2.939005432128906e+02, 2.936712951660156e+02, 2.9385546875e+02, 2.93807861328125e+02, 2.937094116210938e+02, 2.9382080078125e+02, 2.938194580078125e+02, 2.937809143066406e+02, 2.931797180175781e+02, 2.931204528808594e+02, 2.9281396484375e+02, 2.925394897460938e+02, 2.925202026367188e+02, 2.923656311035156e+02, 2.921132202148438e+02, 2.918953247070312e+02, 2.91786376953125e+02, 2.916292419433594e+02, 2.914725952148438e+02, 2.934368286132812e+02, 2.93880126953125e+02, 2.935856628417969e+02, 2.936307067871094e+02, 2.937044372558594e+02, 2.934552001953125e+02, 2.937052612304688e+02, 2.936815185546875e+02, 2.937484436035156e+02, 2.930747985839844e+02, 2.931224975585938e+02, 2.920547180175781e+02, 2.919910583496094e+02, 2.919158935546875e+02, 2.917724304199219e+02, 2.915081176757812e+02]
 hvac.TSetRoo.setPoiHea.y=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
 hvac.TSetRoo.setPoiCoo.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.44870924949646e-01, 3.123612403869629e-01, 3.078407347202301e-01, 3.074696958065033e-01, 3.075558245182037e-01, 3.076653480529785e-01, 3.075316548347473e-01, 3.07399183511734e-01, 3.074595034122467e-01, 3.074348270893097e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.523522913455963e-01, 3.149966299533844e-01, 3.122167587280273e-01, 3.120605647563934e-01, 3.120710849761963e-01, 3.118051588535309e-01, 3.118721842765808e-01, 3.12422901391983e-01, 3.118754625320435e-01, 3.121480047702789e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.817217946052551e-01, 3.161444067955017e-01, 3.113707005977631e-01, 3.086538016796112e-01, 3.075002133846283e-01, 3.074823915958405e-01, 3.076369762420654e-01, 3.102896511554718e-01, 3.139366209506989e-01, 3.345279097557068e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.312500715255737e-01, 3.98307204246521e-01, 3.404911160469055e-01, 3.545198738574982e-01, 3.529106378555298e-01, 3.790967166423798e-01, 3.799578547477722e-01, 3.804414868354797e-01, 3.803150653839111e-01, 4.335881471633911e-01, 4.445284008979797e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.369053602218628e-01, 3.928871154785156e-01, 3.558633327484131e-01, 3.787229955196381e-01, 3.813517689704895e-01, 3.786668181419373e-01, 3.79356175661087e-01, 3.796053826808929e-01, 3.807468712329865e-01, 4.341333210468292e-01, 4.428570866584778e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, 5.99982738494873e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.576289057731628e-01, 4.658661484718323e-01, 4.653637707233429e-01, 4.652483463287354e-01, 4.65124100446701e-01, 4.633804857730865e-01, 4.634665250778198e-01, 4.635697305202484e-01, 4.639767408370972e-01, 4.642956256866455e-01, 5.739283561706543e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.641611278057098e-01, 4.678802192211151e-01, 4.678112864494324e-01, 4.676850140094757e-01, 4.676371812820435e-01, 4.680309593677521e-01, 4.678608775138855e-01, 4.677851796150208e-01, 4.673840999603271e-01, 4.673820734024048e-01, 5.765151381492615e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.536370277404785e-01, 4.726848602294922e-01, 4.671514332294464e-01, 4.657743871212006e-01, 4.646450877189636e-01, 4.645960628986359e-01, 4.646441638469696e-01, 4.655943512916565e-01, 4.684015214443207e-01, 4.698138833045959e-01, 5.844812989234924e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362030267715454e-01, 5.75059711933136e-01, 4.772091507911682e-01, 4.716115295886993e-01, 4.734239876270294e-01, 4.763272404670715e-01, 4.786125421524048e-01, 4.790155589580536e-01, 4.792487025260925e-01, 6.039578914642334e-01, 6.279962658882141e-01, 7.383584976196289e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269597768783569e-01, 5.7118821144104e-01, 4.785230457782745e-01, 4.761037528514862e-01, 4.782813787460327e-01, 4.788695871829987e-01, 4.778252243995667e-01, 4.789547026157379e-01, 4.794784188270569e-01, 6.079397201538086e-01, 6.35397732257843e-01, 7.466880679130554e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, 5.999835133552551e-01, 1e+00, 1e+00, 1e+00, 1e+00, 5.3849196434021e-01, 4.702829420566559e-01, 4.6561598777771e-01, 4.652630388736725e-01, 4.65125173330307e-01, 4.633807837963104e-01, 4.634667634963989e-01, 4.635699689388275e-01, 4.639770090579987e-01, 4.642958641052246e-01, 5.739287734031677e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.194540023803711e-01, 4.709460139274597e-01, 4.679876267910004e-01, 4.676953852176666e-01, 4.676380157470703e-01, 4.680312275886536e-01, 4.67861145734787e-01, 4.677854478359222e-01, 4.673843383789062e-01, 4.673823416233063e-01, 5.765155553817749e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.573185682296753e-01, 4.728701114654541e-01, 4.671622216701508e-01, 4.657752513885498e-01, 4.646453857421875e-01, 4.645963311195374e-01, 4.646444320678711e-01, 4.65594619512558e-01, 4.684017598628998e-01, 4.698141515254974e-01, 7.141961455345154e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362030267715454e-01, 5.785120725631714e-01, 4.773806929588318e-01, 4.716216325759888e-01, 4.734248220920563e-01, 4.76327508687973e-01, 4.786128103733063e-01, 4.790157973766327e-01, 4.79248970746994e-01, 5.968360900878906e-01, 6.277462840080261e-01, 7.383419275283813e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269597768783569e-01, 5.657633543014526e-01, 4.782502949237823e-01, 6.133214831352234e-01, 6.232177019119263e-01, 6.242007613182068e-01, 6.227597594261169e-01, 6.243075132369995e-01, 6.249251365661621e-01, 6.298996806144714e-01, 6.362245082855225e-01, 7.467479705810547e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, 5.5113685131073e-01, 1e+00, 1e+00, 1e+00, 1e+00, 5.836526155471802e-01, 4.62966650724411e-01, 4.501777589321136e-01, 4.492941498756409e-01, 4.491266906261444e-01, 4.474152624607086e-01, 4.474815130233765e-01, 4.475802481174469e-01, 4.479827880859375e-01, 4.482975900173187e-01, 5.490388870239258e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.506783723831177e-01, 4.578094482421875e-01, 4.521549642086029e-01, 4.516785740852356e-01, 4.516087472438812e-01, 4.519891142845154e-01, 4.518274366855621e-01, 4.51763242483139e-01, 4.51353520154953e-01, 4.513563811779022e-01, 5.516043901443481e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.551238059997559e-01, 4.580317735671997e-01, 4.512511193752289e-01, 4.497917294502258e-01, 4.486552774906158e-01, 4.485998153686523e-01, 4.486483931541443e-01, 4.495589137077332e-01, 4.523426294326782e-01, 6.036199927330017e-01, 7.188568711280823e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.344322919845581e-01, 5.765758752822876e-01, 6.125397682189941e-01, 6.145152449607849e-01, 6.175605058670044e-01, 6.210038065910339e-01, 6.239849328994751e-01, 6.243485808372498e-01, 6.246500611305237e-01, 6.270179748535156e-01, 6.288063526153564e-01, 7.294496893882751e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.252563953399658e-01, 5.65107524394989e-01, 6.139081120491028e-01, 6.203100681304932e-01, 6.23451292514801e-01, 6.242086291313171e-01, 6.227600574493408e-01, 6.243075132369995e-01, 6.249251365661621e-01, 6.298996806144714e-01, 6.362245082855225e-01, 7.37784743309021e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, 5.999835133552551e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.606413543224335e-01, 4.660418629646301e-01, 4.65374082326889e-01, 4.652491807937622e-01, 4.651243984699249e-01, 4.63380753993988e-01, 4.634667634963989e-01, 4.635699689388275e-01, 4.639770090579987e-01, 4.642958641052246e-01, 5.739287734031677e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362337827682495e-01, 4.718239009380341e-01, 4.680379033088684e-01, 4.676982760429382e-01, 4.676381647586823e-01, 4.68031257390976e-01, 4.67861145734787e-01, 4.677854478359222e-01, 4.673843383789062e-01, 4.673823416233063e-01, 5.765155553817749e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.576574206352234e-01, 4.728870987892151e-01, 4.671632051467896e-01, 4.657753109931946e-01, 4.646453857421875e-01, 4.645963311195374e-01, 4.646444320678711e-01, 4.65594619512558e-01, 4.684017598628998e-01, 4.698141515254974e-01, 7.161726355552673e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362030267715454e-01, 5.720045566558838e-01, 4.770570993423462e-01, 4.716030359268188e-01, 4.734237492084503e-01, 6.116469502449036e-01, 6.236727237701416e-01, 6.243380308151245e-01, 6.24649703502655e-01, 6.270179748535156e-01, 6.288063526153564e-01, 7.384129166603088e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269597768783569e-01, 5.683298110961914e-01, 4.783796966075897e-01, 4.760956168174744e-01, 4.782811403274536e-01, 4.788698256015778e-01, 4.778254628181458e-01, 4.789549708366394e-01, 4.794786870479584e-01, 6.089049577713013e-01, 6.354339718818665e-01, 7.466908097267151e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, 5.5113685131073e-01, 1e+00, 1e+00, 1e+00, 1e+00, 5.829077363014221e-01, 4.841027855873108e-01, 4.514504671096802e-01, 4.493739902973175e-01, 4.491317272186279e-01, 4.474155902862549e-01, 4.474815130233765e-01, 4.475802481174469e-01, 4.479827880859375e-01, 4.482975900173187e-01, 5.490388870239258e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.538368225097656e-01, 4.579783380031586e-01, 4.521655142307281e-01, 4.516792595386505e-01, 4.51608806848526e-01, 4.519891142845154e-01, 4.518274366855621e-01, 4.51763242483139e-01, 4.51353520154953e-01, 4.513563811779022e-01, 5.516043901443481e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.574856996536255e-01, 4.581574499607086e-01, 4.512589275836945e-01, 4.49792206287384e-01, 4.486553072929382e-01, 4.485998153686523e-01, 4.486483931541443e-01, 4.495589137077332e-01, 4.523426294326782e-01, 4.940268993377686e-01, 7.118859887123108e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.315346717834473e-01, 5.847610831260681e-01, 5.075991749763489e-01, 6.11189067363739e-01, 6.174579858779907e-01, 6.210004687309265e-01, 6.239848732948303e-01, 6.243485808372498e-01, 6.246500611305237e-01, 6.270179748535156e-01, 6.288063526153564e-01, 7.294496893882751e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.252563953399658e-01, 5.659582018852234e-01, 6.139799952507019e-01, 6.203123331069946e-01, 6.234513521194458e-01, 6.242086291313171e-01, 6.227600574493408e-01, 6.243075132369995e-01, 6.249251365661621e-01, 6.298996806144714e-01, 6.362245082855225e-01, 7.37784743309021e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.856753587722778e-01, 6.164430379867554e-01, 6.545689105987549e-01, 6.56440258026123e-01, 6.564202904701233e-01, 6.584077477455139e-01, 6.573120355606079e-01, 6.556864976882935e-01, 6.562362909317017e-01, 6.554794907569885e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.819980502128601e-01, 6.242688894271851e-01, 6.891674995422363e-01, 8.571552038192749e-01, 1e+00, 1e+00, 1e+00, 6.728616952896118e-01, 5.887128114700317e-01, 5.912149548530579e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.289940595626831e-01, 5.287820100784302e-01, 5.967929363250732e-01, 5.766511559486389e-01, 5.82891583442688e-01, 5.564146041870117e-01, 5.575684309005737e-01, 5.56876540184021e-01, 5.573199391365051e-01, 5.162898898124695e-01, 5.054315328598022e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.294182300567627e-01, 5.766347646713257e-01, 5.562561750411987e-01, 5.556187629699707e-01, 6.131579279899597e-01, 5.773305892944336e-01, 5.6212317943573e-01, 5.487628579139709e-01, 5.063521265983582e-01, 5.13472318649292e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931504211425781e+02, 2.931502075195312e+02, 2.93150146484375e+02, 2.93150390625e+02, 2.841112060546875e+02, 2.851350402832031e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854031677246094e+02, 2.851617126464844e+02, 2.853078002929688e+02, 2.850339965820312e+02, 2.849782409667969e+02, 2.849057312011719e+02, 2.850116577148438e+02, 2.850113525390625e+02, 2.85011962890625e+02, 2.850130920410156e+02, 2.850103149414062e+02, 2.850091247558594e+02, 2.850068359375e+02, 2.8500390625e+02, 2.850044250488281e+02, 2.850046997070312e+02, 2.852676391601562e+02, 2.851585083007812e+02, 2.843491516113281e+02, 2.832209167480469e+02, 2.850802612304688e+02, 2.851177673339844e+02, 2.851663818359375e+02, 2.853607177734375e+02, 2.852640991210938e+02, 2.851336364746094e+02, 2.85361328125e+02, 2.853614807128906e+02, 2.85359619140625e+02, 2.85359130859375e+02, 2.853598022460938e+02, 2.853592834472656e+02, 2.85358154296875e+02, 2.85357177734375e+02, 2.853564758300781e+02, 2.853559265136719e+02, 2.882113037109375e+02, 2.852467041015625e+02, 2.851756896972656e+02, 2.857647399902344e+02, 2.853175964355469e+02, 2.852256774902344e+02, 2.848618774414062e+02, 2.840119323730469e+02, 2.851113891601562e+02, 2.842666625976562e+02, 2.860756530761719e+02, 2.860773620605469e+02, 2.860769958496094e+02, 2.860768737792969e+02, 2.860784606933594e+02, 2.860775756835938e+02, 2.860778198242188e+02, 2.860789794921875e+02, 2.860790710449219e+02, 2.884486999511719e+02, 2.9140087890625e+02, 2.848745727539062e+02, 2.85215576171875e+02, 2.85013427734375e+02, 2.8535986328125e+02, 2.851680297851562e+02, 2.850287170410156e+02, 2.851686096191406e+02, 2.876136474609375e+02, 2.928752136230469e+02, 2.870332641601562e+02, 2.870335998535156e+02, 2.870349731445312e+02, 2.870345458984375e+02, 2.870339050292969e+02, 2.870352172851562e+02, 2.870354309082031e+02, 2.870355224609375e+02, 2.87036376953125e+02, 2.968404541015625e+02, 2.956007995605469e+02, 2.878458251953125e+02, 2.905659790039062e+02, 2.881939392089844e+02, 2.884246215820312e+02, 2.851314392089844e+02, 2.919622192382812e+02, 2.910766296386719e+02, 2.94724609375e+02, 3.011189880371094e+02, 2.987498168945312e+02, 2.987496948242188e+02, 2.987484741210938e+02, 2.987494201660156e+02, 2.987500915527344e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931501159667969e+02, 2.931504821777344e+02, 2.93150146484375e+02, 2.931500549316406e+02, 2.931504211425781e+02, 2.841116333007812e+02, 2.851350708007812e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854032897949219e+02, 2.851616516113281e+02, 2.853078002929688e+02, 2.850340270996094e+02, 2.84978271484375e+02, 2.849057006835938e+02, 2.850052490234375e+02, 2.850049438476562e+02, 2.850055541992188e+02, 2.850066528320312e+02, 2.850039672851562e+02, 2.850027160644531e+02, 2.850003356933594e+02, 2.849972534179688e+02, 2.84997802734375e+02, 2.84998046875e+02, 2.852675170898438e+02, 2.851585388183594e+02, 2.843489990234375e+02, 2.832212524414062e+02, 2.850802612304688e+02, 2.851177062988281e+02, 2.851664123535156e+02, 2.853606872558594e+02, 2.852641296386719e+02, 2.851336364746094e+02, 2.853554992675781e+02, 2.853554992675781e+02, 2.853536682128906e+02, 2.853531494140625e+02, 2.853538208007812e+02, 2.853533020019531e+02, 2.853522033691406e+02, 2.853512268066406e+02, 2.853505249023438e+02, 2.853499755859375e+02, 2.888208618164062e+02, 2.852466735839844e+02, 2.851756896972656e+02, 2.857645874023438e+02, 2.853175659179688e+02, 2.852256774902344e+02, 2.848619689941406e+02, 2.840109252929688e+02, 2.851113586425781e+02, 2.909971923828125e+02, 2.865658874511719e+02, 2.865674133300781e+02, 2.86567138671875e+02, 2.865670471191406e+02, 2.865682373046875e+02, 2.865675659179688e+02, 2.865677490234375e+02, 2.865686340332031e+02, 2.865686645507812e+02, 2.908711242675781e+02, 2.918167114257812e+02, 2.93214111328125e+02, 2.924385375976562e+02, 2.914144592285156e+02, 2.927095336914062e+02, 2.906693725585938e+02, 2.901202087402344e+02, 2.920400390625e+02, 2.984043884277344e+02, 2.978807373046875e+02, 2.876557922363281e+02, 2.876559753417969e+02, 2.876566467285156e+02, 2.876564331054688e+02, 2.876561279296875e+02, 2.8765673828125e+02, 2.876568298339844e+02, 2.876568603515625e+02, 2.876571655273438e+02, 2.968404541015625e+02, 3.001508483886719e+02, 2.93199951171875e+02, 2.892410278320312e+02, 2.880512390136719e+02, 2.883934631347656e+02, 2.875927124023438e+02, 2.875997619628906e+02, 2.874334106445312e+02, 2.931835327148438e+02, 2.948674011230469e+02, 2.866414794921875e+02, 2.866414794921875e+02, 2.866417236328125e+02, 2.866415405273438e+02, 2.866414184570312e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931500854492188e+02, 2.931506042480469e+02, 2.931502990722656e+02, 2.931502075195312e+02, 2.931505432128906e+02, 2.841100463867188e+02, 2.851350708007812e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854031677246094e+02, 2.851617126464844e+02, 2.853078002929688e+02, 2.850339965820312e+02, 2.849782409667969e+02, 2.849057312011719e+02, 2.850115966796875e+02, 2.850112915039062e+02, 2.850119018554688e+02, 2.850130310058594e+02, 2.850102233886719e+02, 2.850090026855469e+02, 2.850065612792969e+02, 2.850035095214844e+02, 2.850039978027344e+02, 2.850042419433594e+02, 2.85267578125e+02, 2.851585083007812e+02, 2.843491516113281e+02, 2.832209167480469e+02, 2.850802612304688e+02, 2.851177673339844e+02, 2.851663818359375e+02, 2.853607177734375e+02, 2.852640991210938e+02, 2.851336364746094e+02, 2.85361328125e+02, 2.853614807128906e+02, 2.85359619140625e+02, 2.85359130859375e+02, 2.853598022460938e+02, 2.853592529296875e+02, 2.853581848144531e+02, 2.853572082519531e+02, 2.853565368652344e+02, 2.8535595703125e+02, 2.882528991699219e+02, 2.852467041015625e+02, 2.851756896972656e+02, 2.857647399902344e+02, 2.853175964355469e+02, 2.852256774902344e+02, 2.848618774414062e+02, 2.840119323730469e+02, 2.851113891601562e+02, 2.842666625976562e+02, 2.861300354003906e+02, 2.861317443847656e+02, 2.861314392089844e+02, 2.861313171386719e+02, 2.861326599121094e+02, 2.861319274902344e+02, 2.861321105957031e+02, 2.861331176757812e+02, 2.861332092285156e+02, 2.901050415039062e+02, 2.974653930664062e+02, 2.848745422363281e+02, 2.85215576171875e+02, 2.85013427734375e+02, 2.853597717285156e+02, 2.863358764648438e+02, 2.86021240234375e+02, 2.874728698730469e+02, 2.907002563476562e+02, 2.935158081054688e+02, 2.870864868164062e+02, 2.870867919921875e+02, 2.870880432128906e+02, 2.870876159667969e+02, 2.870870361328125e+02, 2.870882263183594e+02, 2.870884399414062e+02, 2.870885009765625e+02, 2.8708935546875e+02, 2.968404541015625e+02, 2.951255798339844e+02, 2.878232116699219e+02, 2.856366271972656e+02, 2.863702087402344e+02, 2.851602478027344e+02, 2.851314086914062e+02, 2.851466064453125e+02, 2.851181335449219e+02, 2.908396301269531e+02, 2.946142578125e+02, 2.866299438476562e+02, 2.866299438476562e+02, 2.866301879882812e+02, 2.866300048828125e+02, 2.866298828125e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931501159667969e+02, 2.931505126953125e+02, 2.93150146484375e+02, 2.931500549316406e+02, 2.93150390625e+02, 2.841116333007812e+02, 2.851350402832031e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854032897949219e+02, 2.851616516113281e+02, 2.853078002929688e+02, 2.850340270996094e+02, 2.84978271484375e+02, 2.849057006835938e+02, 2.850052795410156e+02, 2.850049743652344e+02, 2.850055847167969e+02, 2.850067138671875e+02, 2.850038757324219e+02, 2.850026245117188e+02, 2.850002136230469e+02, 2.849971618652344e+02, 2.849977111816406e+02, 2.849979553222656e+02, 2.852675170898438e+02, 2.851585388183594e+02, 2.843489990234375e+02, 2.832212524414062e+02, 2.850802612304688e+02, 2.851177062988281e+02, 2.851664123535156e+02, 2.853606872558594e+02, 2.852641296386719e+02, 2.851336364746094e+02, 2.853554992675781e+02, 2.853554992675781e+02, 2.853536682128906e+02, 2.853532104492188e+02, 2.853538208007812e+02, 2.853533325195312e+02, 2.85352294921875e+02, 2.853513488769531e+02, 2.853506774902344e+02, 2.853501586914062e+02, 2.891552124023438e+02, 2.852466735839844e+02, 2.851756896972656e+02, 2.857645874023438e+02, 2.853175659179688e+02, 2.852256774902344e+02, 2.848619689941406e+02, 2.840109252929688e+02, 2.851113586425781e+02, 2.84265625e+02, 2.864731140136719e+02, 2.864747314453125e+02, 2.864744262695312e+02, 2.864743041992188e+02, 2.864756774902344e+02, 2.864749145507812e+02, 2.864751281738281e+02, 2.864761352539062e+02, 2.864761962890625e+02, 2.8844873046875e+02, 2.915753173828125e+02, 2.859209594726562e+02, 2.865689086914062e+02, 2.8609814453125e+02, 2.875960083007812e+02, 2.853696594238281e+02, 2.850283508300781e+02, 2.85513916015625e+02, 2.912779235839844e+02, 2.931723937988281e+02, 2.870494995117188e+02, 2.870498352050781e+02, 2.870511779785156e+02, 2.8705078125e+02, 2.870501403808594e+02, 2.870514221191406e+02, 2.870516357421875e+02, 2.870517272949219e+02, 2.870525817871094e+02, 2.968404541015625e+02, 2.938012084960938e+02, 2.907076416015625e+02, 2.891116943359375e+02, 2.889907531738281e+02, 2.909295349121094e+02, 2.918908386230469e+02, 2.895431213378906e+02, 2.934630432128906e+02, 2.995661926269531e+02, 3.010472412109375e+02, 2.9596044921875e+02, 2.959603576660156e+02, 2.9595947265625e+02, 2.959601745605469e+02, 2.95960693359375e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931501159667969e+02, 2.931506652832031e+02, 2.931502990722656e+02, 2.931502380371094e+02, 2.931506042480469e+02, 2.841099853515625e+02, 2.851350708007812e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854031677246094e+02, 2.851617126464844e+02, 2.853078002929688e+02, 2.850339965820312e+02, 2.849782409667969e+02, 2.849057312011719e+02, 2.850116271972656e+02, 2.850113220214844e+02, 2.850119323730469e+02, 2.850130920410156e+02, 2.8501025390625e+02, 2.850090026855469e+02, 2.850065612792969e+02, 2.850034790039062e+02, 2.850039978027344e+02, 2.850042724609375e+02, 2.852678527832031e+02, 2.851585083007812e+02, 2.843491516113281e+02, 2.832209167480469e+02, 2.850802612304688e+02, 2.851177673339844e+02, 2.851663818359375e+02, 2.853607177734375e+02, 2.852640991210938e+02, 2.851336364746094e+02, 2.853613586425781e+02, 2.853615112304688e+02, 2.853595886230469e+02, 2.853590698242188e+02, 2.853597717285156e+02, 2.853592224121094e+02, 2.853580932617188e+02, 2.853570861816406e+02, 2.853563537597656e+02, 2.853558044433594e+02, 2.852533264160156e+02, 2.852467041015625e+02, 2.851756896972656e+02, 2.857647399902344e+02, 2.853175964355469e+02, 2.852256774902344e+02, 2.848618774414062e+02, 2.840119323730469e+02, 2.851113891601562e+02, 2.842666625976562e+02, 2.856224365234375e+02, 2.856228332519531e+02, 2.856224365234375e+02, 2.856222839355469e+02, 2.856240844726562e+02, 2.856230773925781e+02, 2.856233520507812e+02, 2.856246948242188e+02, 2.856247863769531e+02, 2.884486999511719e+02, 2.877994995117188e+02, 2.848745422363281e+02, 2.85215576171875e+02, 2.85013427734375e+02, 2.8535986328125e+02, 2.851680297851562e+02, 2.850287170410156e+02, 2.851686096191406e+02, 2.859747924804688e+02, 2.883945922851562e+02, 2.863837890625e+02, 2.863842163085938e+02, 2.863860168457031e+02, 2.863854370117188e+02, 2.863845825195312e+02, 2.863863525390625e+02, 2.863866577148438e+02, 2.863867797851562e+02, 2.863880310058594e+02, 2.968404541015625e+02, 2.889234619140625e+02, 2.850336303710938e+02, 2.856366271972656e+02, 2.863702087402344e+02, 2.851602478027344e+02, 2.851314086914062e+02, 2.851466064453125e+02, 2.851181335449219e+02, 2.86685546875e+02, 2.894349060058594e+02, 2.860470581054688e+02, 2.860470886230469e+02, 2.860473937988281e+02, 2.860471496582031e+02, 2.860469970703125e+02]
-hvac.res.EFan=[0e+00, -5.014366251998581e-06, -5.015677743358538e-06, -5.014313501305878e-06, -5.013999725633767e-06, -5.015449005441042e-06, 9.069244140625e+03, 1.29239296875e+04, 1.6782677734375e+04, 2.0642212890625e+04, 2.4501798828125e+04, 2.8361244140625e+04, 3.222084765625e+04, 3.6080453125e+04, 3.994008984375e+04, 4.379971875e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 4.702220703125e+04, 5.695701953125e+04, 6.081198828125e+04, 6.466964453125e+04, 6.8527703125e+04, 7.2385796875e+04, 7.62439296875e+04, 8.01020234375e+04, 8.3960140625e+04, 8.78181640625e+04, 9.16762578125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 9.489753125e+04, 1.0505690625e+05, 1.089141171875e+05, 1.12771734375e+05, 1.16630328125e+05, 1.204897890625e+05, 1.243493828125e+05, 1.28208984375e+05, 1.320685e+05, 1.35926453125e+05, 1.39781078125e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.4302959375e+05, 1.5038353125e+05, 1.54742453125e+05, 1.58604328125e+05, 1.62461734375e+05, 1.66320875e+05, 1.701930625e+05, 1.7408084375e+05, 1.779704375e+05, 1.81860125e+05, 1.8579721875e+05, 1.899013125e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 1.93344171875e+05, 2.00751828125e+05, 2.050458125e+05, 2.08913015625e+05, 2.1278778125e+05, 2.166756875e+05, 2.20564765625e+05, 2.24453625e+05, 2.28342359375e+05, 2.32231796875e+05, 2.3617678125e+05, 2.40275828125e+05, 2.43715046875e+05, 2.43715046875e+05, 2.43715046875e+05, 2.43715046875e+05, 2.43715046875e+05]
-hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.06062109375e+03, 1.261146875e+04, 2.1964283203125e+04, 3.0517798828125e+04, 3.666810546875e+04, 4.1639171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 4.551851171875e+04, 5.451267578125e+04, 5.57871015625e+04, 5.57923125e+04, 5.579401953125e+04, 5.579401953125e+04, 5.579401953125e+04, 5.579401953125e+04, 5.579401953125e+04, 5.579401953125e+04, 5.838028125e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 7.0288375e+04, 8.20065703125e+04, 1.41888109375e+05, 1.6636771875e+05, 1.87261140625e+05, 2.05772609375e+05, 2.26560125e+05, 2.40961328125e+05, 2.54657484375e+05, 2.720911875e+05, 3.0075703125e+05, 3.3714346875e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.721865625e+05, 3.8294696875e+05, 4.57097875e+05, 4.861593125e+05, 5.03599e+05, 5.131260625e+05, 5.2234871875e+05, 5.322086875e+05, 5.44761125e+05, 5.623481875e+05, 5.911201875e+05, 6.457219375e+05, 7.002743125e+05, 7.002743125e+05, 7.002743125e+05, 7.002743125e+05, 7.002743125e+05]
-hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.485245483398438e+03, -1.03908359375e+04, -1.9969951171875e+04, -3.45913828125e+04, -5.78199921875e+04, -8.83002578125e+04, -1.18879859375e+05, -1.57543453125e+05, -1.89573046875e+05, -2.110629375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.25712828125e+05, -2.32705890625e+05, -2.40796640625e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.448709845542908e-01, 3.123611807823181e-01, 3.078407049179077e-01, 3.074696958065033e-01, 3.075558245182037e-01, 3.076653480529785e-01, 3.075316548347473e-01, 3.07399183511734e-01, 3.074595034122467e-01, 3.074348270893097e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.523484468460083e-01, 3.149964809417725e-01, 3.122166693210602e-01, 3.120605647563934e-01, 3.120711147785187e-01, 3.118051588535309e-01, 3.118721842765808e-01, 3.12422901391983e-01, 3.118754625320435e-01, 3.121480047702789e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.817206919193268e-01, 3.161443769931793e-01, 3.113707005977631e-01, 3.086537718772888e-01, 3.075002133846283e-01, 3.074823915958405e-01, 3.076373040676117e-01, 3.102896809577942e-01, 3.139366209506989e-01, 3.345286250114441e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.312498927116394e-01, 3.98307204246521e-01, 3.404909074306488e-01, 3.545198440551758e-01, 3.529106378555298e-01, 3.790967166423798e-01, 3.799578547477722e-01, 3.804414868354797e-01, 3.803150653839111e-01, 4.335880875587463e-01, 4.445284008979797e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.369033932685852e-01, 3.92887145280838e-01, 3.558633029460907e-01, 3.787230849266052e-01, 3.813517689704895e-01, 3.786668181419373e-01, 3.79356175661087e-01, 3.796053826808929e-01, 3.807468712329865e-01, 4.341333210468292e-01, 4.428570866584778e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 5.999847054481506e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.576291441917419e-01, 4.658661484718323e-01, 4.653637707233429e-01, 4.652483463287354e-01, 4.65124100446701e-01, 4.633804857730865e-01, 4.634665250778198e-01, 4.635697305202484e-01, 4.639767408370972e-01, 4.642956256866455e-01, 5.739282965660095e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.641607999801636e-01, 4.678801596164703e-01, 4.678112268447876e-01, 4.676850140094757e-01, 4.676371812820435e-01, 4.680309593677521e-01, 4.678608775138855e-01, 4.677851796150208e-01, 4.673840999603271e-01, 4.673820734024048e-01, 5.765151381492615e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.536362528800964e-01, 4.726848304271698e-01, 4.671514332294464e-01, 4.657743871212006e-01, 4.646450877189636e-01, 4.645960628986359e-01, 4.646442234516144e-01, 4.655943512916565e-01, 4.684015214443207e-01, 4.698139429092407e-01, 5.844813585281372e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362029671669006e-01, 5.750599503517151e-01, 4.772091507911682e-01, 4.716115295886993e-01, 4.734239876270294e-01, 4.763272404670715e-01, 4.786125421524048e-01, 4.790155589580536e-01, 4.792487025260925e-01, 6.039578318595886e-01, 6.279962658882141e-01, 7.383584976196289e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269597172737122e-01, 5.711880922317505e-01, 4.785230457782745e-01, 4.761037528514862e-01, 4.782813787460327e-01, 4.788695871829987e-01, 4.778252243995667e-01, 4.789547026157379e-01, 4.794784188270569e-01, 6.079397201538086e-01, 6.35397732257843e-01, 7.466880083084106e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 5.999854803085327e-01, 1e+00, 1e+00, 1e+00, 1e+00, 5.384922623634338e-01, 4.702829420566559e-01, 4.6561598777771e-01, 4.652630388736725e-01, 4.65125173330307e-01, 4.633807837963104e-01, 4.634667634963989e-01, 4.635699689388275e-01, 4.639770090579987e-01, 4.642958641052246e-01, 5.739287137985229e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.194448232650757e-01, 4.709455072879791e-01, 4.679875373840332e-01, 4.676953852176666e-01, 4.676379859447479e-01, 4.680312275886536e-01, 4.67861145734787e-01, 4.677854478359222e-01, 4.673843383789062e-01, 4.673823416233063e-01, 5.765155553817749e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.573174953460693e-01, 4.728700816631317e-01, 4.671622216701508e-01, 4.657752513885498e-01, 4.646453857421875e-01, 4.645963311195374e-01, 4.646444916725159e-01, 4.655945897102356e-01, 4.684017598628998e-01, 4.698141813278198e-01, 7.141978144645691e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362030267715454e-01, 5.785115361213684e-01, 4.773806631565094e-01, 4.716216325759888e-01, 4.734248220920563e-01, 4.76327508687973e-01, 4.786128103733063e-01, 4.790157973766327e-01, 4.79248970746994e-01, 5.968359708786011e-01, 6.277462840080261e-01, 7.383418679237366e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269597172737122e-01, 5.657631158828735e-01, 4.782502949237823e-01, 6.13321840763092e-01, 6.23217761516571e-01, 6.242007613182068e-01, 6.227598190307617e-01, 6.243075132369995e-01, 6.249251365661621e-01, 6.298996806144714e-01, 6.362245678901672e-01, 7.467479109764099e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 5.511388182640076e-01, 1e+00, 1e+00, 1e+00, 1e+00, 5.836524367332458e-01, 4.629665613174438e-01, 4.501777589321136e-01, 4.492941200733185e-01, 4.491266906261444e-01, 4.474152624607086e-01, 4.474815130233765e-01, 4.475802481174469e-01, 4.479827880859375e-01, 4.482975900173187e-01, 5.490388870239258e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.506752133369446e-01, 4.578092396259308e-01, 4.521549046039581e-01, 4.516785740852356e-01, 4.516087472438812e-01, 4.519891142845154e-01, 4.518274366855621e-01, 4.51763242483139e-01, 4.51353520154953e-01, 4.513563811779022e-01, 5.516043901443481e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.551230907440186e-01, 4.580317437648773e-01, 4.512511193752289e-01, 4.497917294502258e-01, 4.486552774906158e-01, 4.485998153686523e-01, 4.486484527587891e-01, 4.495588839054108e-01, 4.523426294326782e-01, 6.036201119422913e-01, 7.188574075698853e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.344322323799133e-01, 5.765756368637085e-01, 6.125397682189941e-01, 6.145152449607849e-01, 6.175605058670044e-01, 6.210038065910339e-01, 6.239849328994751e-01, 6.243485808372498e-01, 6.246500611305237e-01, 6.270179748535156e-01, 6.288063526153564e-01, 7.294496893882751e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.25256335735321e-01, 5.65107524394989e-01, 6.139081120491028e-01, 6.203100681304932e-01, 6.23451292514801e-01, 6.242086291313171e-01, 6.227600574493408e-01, 6.243075132369995e-01, 6.249251365661621e-01, 6.298996806144714e-01, 6.362245678901672e-01, 7.377846837043762e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 5.999854803085327e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.606415927410126e-01, 4.660418927669525e-01, 4.65374082326889e-01, 4.652491807937622e-01, 4.651243984699249e-01, 4.63380753993988e-01, 4.634667634963989e-01, 4.635699689388275e-01, 4.639770090579987e-01, 4.642958641052246e-01, 5.739287137985229e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362247824668884e-01, 4.718234241008759e-01, 4.680378139019012e-01, 4.676982760429382e-01, 4.676381647586823e-01, 4.68031257390976e-01, 4.67861145734787e-01, 4.677854478359222e-01, 4.673843383789062e-01, 4.673823416233063e-01, 5.765155553817749e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.576565861701965e-01, 4.728870689868927e-01, 4.671631753444672e-01, 4.657753109931946e-01, 4.646453857421875e-01, 4.645963311195374e-01, 4.646444916725159e-01, 4.655945897102356e-01, 4.684017598628998e-01, 4.698141813278198e-01, 7.161737084388733e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.362030267715454e-01, 5.720043182373047e-01, 4.770570695400238e-01, 4.716030359268188e-01, 4.734237492084503e-01, 6.116470098495483e-01, 6.236727237701416e-01, 6.243380308151245e-01, 6.24649703502655e-01, 6.270179748535156e-01, 6.288063526153564e-01, 7.384129166603088e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269597172737122e-01, 5.683298110961914e-01, 4.783796966075897e-01, 4.760956466197968e-01, 4.782811403274536e-01, 4.788698256015778e-01, 4.778254628181458e-01, 4.789549708366394e-01, 4.794786870479584e-01, 6.089049577713013e-01, 6.354339718818665e-01, 7.466907501220703e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 5.511388182640076e-01, 1e+00, 1e+00, 1e+00, 1e+00, 5.82907497882843e-01, 4.841022789478302e-01, 4.514504373073578e-01, 4.493739902973175e-01, 4.491317272186279e-01, 4.474155902862549e-01, 4.474815130233765e-01, 4.475802779197693e-01, 4.479827880859375e-01, 4.482975900173187e-01, 5.490388870239258e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.53834080696106e-01, 4.579781591892242e-01, 4.521654546260834e-01, 4.516792297363281e-01, 4.51608806848526e-01, 4.519891142845154e-01, 4.518274366855621e-01, 4.51763242483139e-01, 4.51353520154953e-01, 4.513563811779022e-01, 5.516043901443481e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.5748450756073e-01, 4.581573903560638e-01, 4.512589275836945e-01, 4.49792206287384e-01, 4.486553072929382e-01, 4.485998153686523e-01, 4.486484527587891e-01, 4.495588839054108e-01, 4.523426294326782e-01, 4.940338432788849e-01, 7.118868827819824e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.315346121788025e-01, 5.847617983818054e-01, 5.075978636741638e-01, 6.111890077590942e-01, 6.174579858779907e-01, 6.210004687309265e-01, 6.239848732948303e-01, 6.243485808372498e-01, 6.246500611305237e-01, 6.270179748535156e-01, 6.288063526153564e-01, 7.294496893882751e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.25256335735321e-01, 5.659584999084473e-01, 6.139799356460571e-01, 6.203123927116394e-01, 6.234513521194458e-01, 6.242086291313171e-01, 6.227600574493408e-01, 6.243075132369995e-01, 6.249251365661621e-01, 6.298996806144714e-01, 6.362245678901672e-01, 7.377846837043762e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.856758952140808e-01, 6.164431571960449e-01, 6.545702815055847e-01, 6.564403176307678e-01, 6.564202904701233e-01, 6.584078073501587e-01, 6.573120355606079e-01, 6.556864976882935e-01, 6.562362313270569e-01, 6.554794907569885e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.819979906082153e-01, 6.242688894271851e-01, 6.891674995422363e-01, 8.571564555168152e-01, 1e+00, 1e+00, 1e+00, 6.728609204292297e-01, 5.887128114700317e-01, 5.912179350852966e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.289954602718353e-01, 5.28782069683075e-01, 5.967930555343628e-01, 5.766511559486389e-01, 5.82891583442688e-01, 5.564146041870117e-01, 5.575684309005737e-01, 5.56876540184021e-01, 5.573199391365051e-01, 5.162898898124695e-01, 5.054315328598022e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.294182896614075e-01, 5.766348242759705e-01, 5.562560558319092e-01, 5.556187629699707e-01, 6.131579875946045e-01, 5.773305892944336e-01, 5.6212317943573e-01, 5.487628579139709e-01, 5.063521265983582e-01, 5.134723782539368e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931504516601562e+02, 2.931504516601562e+02, 2.931502380371094e+02, 2.931507568359375e+02, 2.841112060546875e+02, 2.851350402832031e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854031677246094e+02, 2.851617126464844e+02, 2.853078002929688e+02, 2.850339965820312e+02, 2.849782409667969e+02, 2.849057312011719e+02, 2.850110473632812e+02, 2.850103759765625e+02, 2.850102233886719e+02, 2.850108642578125e+02, 2.850117797851562e+02, 2.850117492675781e+02, 2.850086364746094e+02, 2.850072021484375e+02, 2.850077514648438e+02, 2.850083618164062e+02, 2.852676391601562e+02, 2.851585083007812e+02, 2.8434912109375e+02, 2.832209167480469e+02, 2.85080322265625e+02, 2.851177673339844e+02, 2.851663818359375e+02, 2.853607177734375e+02, 2.852640991210938e+02, 2.851336364746094e+02, 2.853604431152344e+02, 2.853604125976562e+02, 2.853608703613281e+02, 2.853602905273438e+02, 2.853599548339844e+02, 2.853587341308594e+02, 2.853585205078125e+02, 2.853569641113281e+02, 2.853559265136719e+02, 2.8535546875e+02, 2.882112731933594e+02, 2.852467041015625e+02, 2.851756896972656e+02, 2.857647399902344e+02, 2.853175964355469e+02, 2.852256774902344e+02, 2.848618774414062e+02, 2.840118713378906e+02, 2.851113891601562e+02, 2.842664489746094e+02, 2.860717163085938e+02, 2.860734252929688e+02, 2.860730285644531e+02, 2.860729675292969e+02, 2.860750122070312e+02, 2.860740661621094e+02, 2.860744934082031e+02, 2.860756530761719e+02, 2.860762023925781e+02, 2.884486389160156e+02, 2.914008483886719e+02, 2.848745727539062e+02, 2.85215576171875e+02, 2.85013427734375e+02, 2.8535986328125e+02, 2.851680297851562e+02, 2.850287170410156e+02, 2.851686096191406e+02, 2.876136474609375e+02, 2.928752136230469e+02, 2.870343017578125e+02, 2.870347290039062e+02, 2.870358276367188e+02, 2.870362548828125e+02, 2.870348510742188e+02, 2.870359191894531e+02, 2.870355529785156e+02, 2.870354919433594e+02, 2.870365295410156e+02, 2.968403930664062e+02, 2.95600830078125e+02, 2.878457946777344e+02, 2.905660400390625e+02, 2.881939392089844e+02, 2.884246520996094e+02, 2.851314392089844e+02, 2.919622192382812e+02, 2.910766296386719e+02, 2.947246398925781e+02, 3.011189880371094e+02, 2.987480163574219e+02, 2.987486877441406e+02, 2.987437438964844e+02, 2.987452087402344e+02, 2.987459411621094e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931504821777344e+02, 2.931504821777344e+02, 2.93150146484375e+02, 2.931509399414062e+02, 2.841116333007812e+02, 2.851350708007812e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854032897949219e+02, 2.851616516113281e+02, 2.853078002929688e+02, 2.850340270996094e+02, 2.84978271484375e+02, 2.849057006835938e+02, 2.850050354003906e+02, 2.8500439453125e+02, 2.850042419433594e+02, 2.850048522949219e+02, 2.850057678222656e+02, 2.850057067871094e+02, 2.850024719238281e+02, 2.850009765625e+02, 2.850015258789062e+02, 2.850021057128906e+02, 2.852675170898438e+02, 2.851585388183594e+02, 2.843489379882812e+02, 2.832212524414062e+02, 2.85080322265625e+02, 2.851177062988281e+02, 2.851664123535156e+02, 2.853606872558594e+02, 2.852641296386719e+02, 2.851336364746094e+02, 2.853548278808594e+02, 2.853547058105469e+02, 2.853551330566406e+02, 2.853545837402344e+02, 2.853542175292969e+02, 2.853529968261719e+02, 2.853528137207031e+02, 2.853512573242188e+02, 2.853502197265625e+02, 2.853497619628906e+02, 2.888208312988281e+02, 2.852466735839844e+02, 2.851756896972656e+02, 2.857645874023438e+02, 2.853175659179688e+02, 2.852256774902344e+02, 2.848619689941406e+02, 2.840108642578125e+02, 2.851113586425781e+02, 2.909971618652344e+02, 2.865626220703125e+02, 2.865641174316406e+02, 2.865638122558594e+02, 2.865637817382812e+02, 2.865652770996094e+02, 2.865645751953125e+02, 2.865649108886719e+02, 2.865657958984375e+02, 2.86566162109375e+02, 2.908712463378906e+02, 2.918167114257812e+02, 2.93214111328125e+02, 2.924385375976562e+02, 2.914144897460938e+02, 2.927095336914062e+02, 2.906693725585938e+02, 2.901202087402344e+02, 2.920400085449219e+02, 2.984043884277344e+02, 2.978807373046875e+02, 2.876568908691406e+02, 2.876571044921875e+02, 2.876576538085938e+02, 2.876578674316406e+02, 2.876571960449219e+02, 2.876576843261719e+02, 2.876575317382812e+02, 2.876575012207031e+02, 2.876578979492188e+02, 2.968403930664062e+02, 3.0015087890625e+02, 2.93199951171875e+02, 2.892410278320312e+02, 2.880512390136719e+02, 2.883934631347656e+02, 2.875927124023438e+02, 2.875997619628906e+02, 2.874334106445312e+02, 2.931835327148438e+02, 2.948674011230469e+02, 2.866412963867188e+02, 2.866411437988281e+02, 2.866421203613281e+02, 2.86641845703125e+02, 2.866417236328125e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.93150634765625e+02, 2.93150634765625e+02, 2.931503295898438e+02, 2.931510620117188e+02, 2.841100463867188e+02, 2.851350708007812e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854031677246094e+02, 2.851617126464844e+02, 2.853078002929688e+02, 2.850339965820312e+02, 2.849782409667969e+02, 2.849057312011719e+02, 2.85010986328125e+02, 2.850103149414062e+02, 2.850101928710938e+02, 2.850108337402344e+02, 2.850117797851562e+02, 2.8501171875e+02, 2.850084533691406e+02, 2.850069885253906e+02, 2.850074462890625e+02, 2.850080261230469e+02, 2.85267578125e+02, 2.851585083007812e+02, 2.8434912109375e+02, 2.832209167480469e+02, 2.85080322265625e+02, 2.851177673339844e+02, 2.851663818359375e+02, 2.853607177734375e+02, 2.852640991210938e+02, 2.851336364746094e+02, 2.853604431152344e+02, 2.853604125976562e+02, 2.853608703613281e+02, 2.853602905273438e+02, 2.853599243164062e+02, 2.853587341308594e+02, 2.853585205078125e+02, 2.853569946289062e+02, 2.853559875488281e+02, 2.853554992675781e+02, 2.882528686523438e+02, 2.852467041015625e+02, 2.851756896972656e+02, 2.857647399902344e+02, 2.853175964355469e+02, 2.852256774902344e+02, 2.848618774414062e+02, 2.840118713378906e+02, 2.851113891601562e+02, 2.842664489746094e+02, 2.861261596679688e+02, 2.861278686523438e+02, 2.861275329589844e+02, 2.861274719238281e+02, 2.861292114257812e+02, 2.861283874511719e+02, 2.861287841796875e+02, 2.861297607421875e+02, 2.861302185058594e+02, 2.901050415039062e+02, 2.9746533203125e+02, 2.848745727539062e+02, 2.85215576171875e+02, 2.85013427734375e+02, 2.853597717285156e+02, 2.863358459472656e+02, 2.860212097167969e+02, 2.874728698730469e+02, 2.907002868652344e+02, 2.935158081054688e+02, 2.870874938964844e+02, 2.870878601074219e+02, 2.870888061523438e+02, 2.870892333984375e+02, 2.870879211425781e+02, 2.870889282226562e+02, 2.870885314941406e+02, 2.870884704589844e+02, 2.870895385742188e+02, 2.968403930664062e+02, 2.951255798339844e+02, 2.878232116699219e+02, 2.856366271972656e+02, 2.863702087402344e+02, 2.851602478027344e+02, 2.851314086914062e+02, 2.851466064453125e+02, 2.851181335449219e+02, 2.908396301269531e+02, 2.946142578125e+02, 2.866297607421875e+02, 2.866296081542969e+02, 2.86630615234375e+02, 2.866303405761719e+02, 2.866301879882812e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931505126953125e+02, 2.931505126953125e+02, 2.93150146484375e+02, 2.931509704589844e+02, 2.841116333007812e+02, 2.851350402832031e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854032897949219e+02, 2.851616516113281e+02, 2.853078002929688e+02, 2.850340270996094e+02, 2.84978271484375e+02, 2.849057006835938e+02, 2.850050659179688e+02, 2.8500439453125e+02, 2.850042419433594e+02, 2.850048828125e+02, 2.85005859375e+02, 2.850058288574219e+02, 2.850024719238281e+02, 2.850010681152344e+02, 2.850016174316406e+02, 2.850022277832031e+02, 2.852675170898438e+02, 2.851585388183594e+02, 2.843489379882812e+02, 2.832212524414062e+02, 2.85080322265625e+02, 2.851177062988281e+02, 2.851664123535156e+02, 2.853606872558594e+02, 2.852641296386719e+02, 2.851336364746094e+02, 2.853548278808594e+02, 2.853547058105469e+02, 2.853551330566406e+02, 2.853545837402344e+02, 2.85354248046875e+02, 2.853530883789062e+02, 2.853529052734375e+02, 2.853514099121094e+02, 2.853504333496094e+02, 2.853500061035156e+02, 2.891552124023438e+02, 2.852466735839844e+02, 2.851756896972656e+02, 2.857645874023438e+02, 2.853175659179688e+02, 2.852256774902344e+02, 2.848619689941406e+02, 2.840108642578125e+02, 2.851113586425781e+02, 2.842654113769531e+02, 2.864695739746094e+02, 2.864711303710938e+02, 2.864707946777344e+02, 2.864707336425781e+02, 2.864724731445312e+02, 2.864716796875e+02, 2.864720458984375e+02, 2.864730529785156e+02, 2.864735107421875e+02, 2.884486694335938e+02, 2.915753173828125e+02, 2.859205627441406e+02, 2.865688781738281e+02, 2.8609814453125e+02, 2.875960083007812e+02, 2.853696594238281e+02, 2.850283508300781e+02, 2.85513916015625e+02, 2.912779235839844e+02, 2.931723937988281e+02, 2.870505065917969e+02, 2.870509338378906e+02, 2.87052001953125e+02, 2.870524291992188e+02, 2.870510559082031e+02, 2.870521240234375e+02, 2.870517578125e+02, 2.870516967773438e+02, 2.87052734375e+02, 2.968403930664062e+02, 2.938012390136719e+02, 2.907076416015625e+02, 2.891116943359375e+02, 2.889907531738281e+02, 2.909295349121094e+02, 2.918908386230469e+02, 2.895431213378906e+02, 2.934630432128906e+02, 2.995662231445312e+02, 3.010472412109375e+02, 2.959591064453125e+02, 2.959595947265625e+02, 2.959558715820312e+02, 2.959570007324219e+02, 2.959575500488281e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931506958007812e+02, 2.931506958007812e+02, 2.931503295898438e+02, 2.931511840820312e+02, 2.841099853515625e+02, 2.851350708007812e+02, 2.853330383300781e+02, 2.852541198730469e+02, 2.854031677246094e+02, 2.851617126464844e+02, 2.853078002929688e+02, 2.850339965820312e+02, 2.849782409667969e+02, 2.849057312011719e+02, 2.850110168457031e+02, 2.850103454589844e+02, 2.850101928710938e+02, 2.850108337402344e+02, 2.850118103027344e+02, 2.850117492675781e+02, 2.850084838867188e+02, 2.850069885253906e+02, 2.850075378417969e+02, 2.850081481933594e+02, 2.852678527832031e+02, 2.851585083007812e+02, 2.8434912109375e+02, 2.832209167480469e+02, 2.85080322265625e+02, 2.851177673339844e+02, 2.851663818359375e+02, 2.853607177734375e+02, 2.852640991210938e+02, 2.851336364746094e+02, 2.853604431152344e+02, 2.853604125976562e+02, 2.853608703613281e+02, 2.853602905273438e+02, 2.853599243164062e+02, 2.853586730957031e+02, 2.853584899902344e+02, 2.853568725585938e+02, 2.853558349609375e+02, 2.853553466796875e+02, 2.852532958984375e+02, 2.852467041015625e+02, 2.851756896972656e+02, 2.857647399902344e+02, 2.853175964355469e+02, 2.852256774902344e+02, 2.848618774414062e+02, 2.840118713378906e+02, 2.851113891601562e+02, 2.842664489746094e+02, 2.856213684082031e+02, 2.856217651367188e+02, 2.85621337890625e+02, 2.856212463378906e+02, 2.8562353515625e+02, 2.856224670410156e+02, 2.856229553222656e+02, 2.856242980957031e+02, 2.856249389648438e+02, 2.884486389160156e+02, 2.877994995117188e+02, 2.848745727539062e+02, 2.85215576171875e+02, 2.85013427734375e+02, 2.8535986328125e+02, 2.851680297851562e+02, 2.850287170410156e+02, 2.851686096191406e+02, 2.859747924804688e+02, 2.883945922851562e+02, 2.863846740722656e+02, 2.863852233886719e+02, 2.863866271972656e+02, 2.863872375488281e+02, 2.863853149414062e+02, 2.863868103027344e+02, 2.863862609863281e+02, 2.863861999511719e+02, 2.863877258300781e+02, 2.968403930664062e+02, 2.889234619140625e+02, 2.850336303710938e+02, 2.856366271972656e+02, 2.863702087402344e+02, 2.851602478027344e+02, 2.851314086914062e+02, 2.851466064453125e+02, 2.851181335449219e+02, 2.866854248046875e+02, 2.894349060058594e+02, 2.860470275878906e+02, 2.860468444824219e+02, 2.860481262207031e+02, 2.860477600097656e+02, 2.860475769042969e+02]
+hvac.res.EFan=[0e+00, -8.478097583974886e-07, -8.492780239066633e-07, -8.492582423968997e-07, -8.479163398078526e-07, -8.511544820066774e-07, 9.0692275390625e+03, 1.29239130859375e+04, 1.6782662109375e+04, 2.0642197265625e+04, 2.4501783203125e+04, 2.8361228515625e+04, 3.222083203125e+04, 3.60804375e+04, 3.994007421875e+04, 4.3799703125e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 4.702219140625e+04, 5.6957e+04, 6.081196875e+04, 6.4669625e+04, 6.85276875e+04, 7.23857734375e+04, 7.624390625e+04, 8.0102e+04, 8.39601171875e+04, 8.78181484375e+04, 9.16762421875e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 9.4897515625e+04, 1.050568984375e+05, 1.089141015625e+05, 1.127717265625e+05, 1.166303203125e+05, 1.2048978125e+05, 1.24349375e+05, 1.282089765625e+05, 1.32068484375e+05, 1.359264375e+05, 1.397810625e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.43029578125e+05, 1.50383515625e+05, 1.547424375e+05, 1.586043125e+05, 1.6246171875e+05, 1.66320859375e+05, 1.70193046875e+05, 1.74080828125e+05, 1.77970421875e+05, 1.81860109375e+05, 1.85797203125e+05, 1.89901296875e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 1.9334415625e+05, 2.007518125e+05, 2.05045796875e+05, 2.08913e+05, 2.12787765625e+05, 2.16675671875e+05, 2.20564765625e+05, 2.24453625e+05, 2.2834234375e+05, 2.32231796875e+05, 2.36176765625e+05, 2.402758125e+05, 2.4371503125e+05, 2.4371503125e+05, 2.4371503125e+05, 2.4371503125e+05, 2.4371503125e+05]
+hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.0618271484375e+03, 1.26126982421875e+04, 2.196551171875e+04, 3.051902734375e+04, 3.666933203125e+04, 4.16403984375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 4.5519734375e+04, 5.45139140625e+04, 5.5788296875e+04, 5.579350390625e+04, 5.579521484375e+04, 5.579521484375e+04, 5.579521484375e+04, 5.579521484375e+04, 5.579521484375e+04, 5.579521484375e+04, 5.838148828125e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 7.02897109375e+04, 8.20078046875e+04, 1.418898125e+05, 1.66369359375e+05, 1.8726275e+05, 2.0577425e+05, 2.2656178125e+05, 2.40963e+05, 2.54659140625e+05, 2.720928125e+05, 3.0075865625e+05, 3.37145125e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.7218821875e+05, 3.8294859375e+05, 4.570995e+05, 4.8616096875e+05, 5.0360059375e+05, 5.1312765625e+05, 5.223503125e+05, 5.3221025e+05, 5.447626875e+05, 5.6234975e+05, 5.911218125e+05, 6.457235e+05, 7.002759375e+05, 7.002759375e+05, 7.002759375e+05, 7.002759375e+05, 7.002759375e+05]
+hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.485247924804688e+03, -1.03908349609375e+04, -1.9969953125e+04, -3.45913828125e+04, -5.781998828125e+04, -8.8300265625e+04, -1.18879875e+05, -1.575434375e+05, -1.8957303125e+05, -2.11062921875e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.22119109375e+05, -2.25712828125e+05, -2.32705890625e+05, -2.40796640625e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05, -2.4248153125e+05]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Summer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Summer.txt
index 08917a8b0b5..529ad4e98e8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Summer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Summer.txt
@@ -1,37 +1,37 @@
-last-generated=2023-03-03
+last-generated=2024-03-23
 statistics-initialization=
 {
-  "linear": "0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "1, 3, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 1, 0, 0, 1, 1",
+  "linear": "0",
+  "nonlinear": "1, 3, 0, 0, 1, 1, 0, 2, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
   "nonlinear": "0, 5, 0, 0, 0, 2, 0, 0, 1, 0, 0, 1, 1, 1",
-  "number of continuous time states": "85",
+  "number of continuous time states": "91",
   "numerical Jacobians": "0"
 }
 time=[1.6848e+07, 1.728e+07]
-flo.sou.TAir=[2.931499938964844e+02, 2.971818542480469e+02, 2.97238037109375e+02, 2.972068786621094e+02, 2.971779479980469e+02, 2.976251220703125e+02, 2.966869812011719e+02, 2.968606872558594e+02, 2.970982666015625e+02, 2.9716455078125e+02, 2.972295227050781e+02, 2.9720263671875e+02, 2.971302185058594e+02, 2.971512756347656e+02, 2.971924743652344e+02, 2.969734802246094e+02, 2.981372680664062e+02, 2.981038513183594e+02, 2.982400207519531e+02, 2.983847961425781e+02, 2.984718933105469e+02, 2.983818969726562e+02, 2.983671264648438e+02, 2.983589477539062e+02, 2.983493347167969e+02, 2.986290588378906e+02, 2.967978820800781e+02, 2.970139770507812e+02, 2.971401062011719e+02, 2.971584777832031e+02, 2.971487731933594e+02, 2.971480712890625e+02, 2.9713623046875e+02, 2.971444702148438e+02, 2.971419067382812e+02, 2.9712841796875e+02, 2.986394348144531e+02, 2.989168701171875e+02, 2.990353393554688e+02, 2.990524291992188e+02, 2.991806945800781e+02, 2.991852111816406e+02, 2.991572875976562e+02, 2.991261291503906e+02, 2.991438293457031e+02, 2.993743286132812e+02, 2.981611633300781e+02, 2.968620300292969e+02, 2.9719970703125e+02, 2.968875427246094e+02, 2.972218017578125e+02, 2.972307434082031e+02, 2.974044494628906e+02, 2.974750671386719e+02, 2.975377502441406e+02, 2.975361022949219e+02, 2.993241882324219e+02, 2.996984252929688e+02, 2.997967224121094e+02, 2.997457885742188e+02, 2.997276611328125e+02, 2.996740417480469e+02, 2.996261291503906e+02, 2.996042175292969e+02, 2.9955517578125e+02, 2.998236999511719e+02, 2.978829650878906e+02, 2.970482177734375e+02, 2.973074035644531e+02, 2.972911071777344e+02, 2.97502685546875e+02, 2.974693298339844e+02, 2.97550048828125e+02, 2.975024719238281e+02, 2.969570617675781e+02, 2.972462158203125e+02, 2.995098266601562e+02, 2.99770263671875e+02, 2.998582153320312e+02, 2.998565979003906e+02, 2.998225402832031e+02, 2.997966003417969e+02, 2.997127685546875e+02, 2.996634521484375e+02, 2.996664428710938e+02, 2.998424377441406e+02, 2.97630859375e+02, 2.971237487792969e+02, 2.971236267089844e+02, 2.974175720214844e+02, 2.969259948730469e+02, 2.975152282714844e+02, 2.975594177246094e+02, 2.975924377441406e+02, 2.96684814453125e+02, 2.964359741210938e+02, 2.993221740722656e+02, 2.996026916503906e+02, 2.997003784179688e+02, 2.99707275390625e+02, 2.996913146972656e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.971500244140625e+02, 2.970904541015625e+02, 2.970731201171875e+02, 2.973551940917969e+02, 2.983050842285156e+02, 2.971353759765625e+02, 2.971668090820312e+02, 2.971419982910156e+02, 2.971272277832031e+02, 2.970474853515625e+02, 2.970996398925781e+02, 2.971488647460938e+02, 2.971475830078125e+02, 2.969850463867188e+02, 2.967379150390625e+02, 2.98130615234375e+02, 2.981869201660156e+02, 2.983970336914062e+02, 2.985059204101562e+02, 2.985884094238281e+02, 2.985273132324219e+02, 2.984976806640625e+02, 2.985003356933594e+02, 2.9862548828125e+02, 2.993899230957031e+02, 2.97718994140625e+02, 2.972291870117188e+02, 2.971078796386719e+02, 2.971143493652344e+02, 2.971452331542969e+02, 2.9715283203125e+02, 2.97149658203125e+02, 2.971450805664062e+02, 2.971408081054688e+02, 2.971376953125e+02, 2.987212829589844e+02, 2.989828186035156e+02, 2.991255493164062e+02, 2.991963806152344e+02, 2.993507080078125e+02, 2.9937109375e+02, 2.993638305664062e+02, 2.993374938964844e+02, 2.994126281738281e+02, 2.998279113769531e+02, 2.985006103515625e+02, 2.97059326171875e+02, 2.972375793457031e+02, 2.973497009277344e+02, 2.968750915527344e+02, 2.97157958984375e+02, 2.971685485839844e+02, 2.971151123046875e+02, 2.972245178222656e+02, 2.974371643066406e+02, 2.994376525878906e+02, 2.997710266113281e+02, 2.999020385742188e+02, 2.998919677734375e+02, 2.998775939941406e+02, 2.998499145507812e+02, 2.998087463378906e+02, 2.997625427246094e+02, 2.998076782226562e+02, 3.002734680175781e+02, 2.98039306640625e+02, 2.973982238769531e+02, 2.969830322265625e+02, 2.970968017578125e+02, 2.973453063964844e+02, 2.971463623046875e+02, 2.971315002441406e+02, 2.971734924316406e+02, 2.968889465332031e+02, 2.972974243164062e+02, 2.994949951171875e+02, 2.998316345214844e+02, 2.999716491699219e+02, 2.999879455566406e+02, 2.999657287597656e+02, 2.999417724609375e+02, 2.998826904296875e+02, 2.998292236328125e+02, 2.998898315429688e+02, 3.003918151855469e+02, 2.971263732910156e+02, 2.970957336425781e+02, 2.972145385742188e+02, 2.97118408203125e+02, 2.971379089355469e+02, 2.970704345703125e+02, 2.971780700683594e+02, 2.971444091796875e+02, 2.970320434570312e+02, 2.971114501953125e+02, 2.994176025390625e+02, 2.996614685058594e+02, 2.998197021484375e+02, 2.998296203613281e+02, 2.998148803710938e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.971870422363281e+02, 2.971658325195312e+02, 2.972320861816406e+02, 2.973101806640625e+02, 2.978935852050781e+02, 2.96701904296875e+02, 2.968080139160156e+02, 2.969779357910156e+02, 2.970961303710938e+02, 2.969366455078125e+02, 2.969920654296875e+02, 2.970682373046875e+02, 2.971083679199219e+02, 2.969423828125e+02, 2.967126159667969e+02, 2.978583374023438e+02, 2.980832824707031e+02, 2.982135620117188e+02, 2.983252258300781e+02, 2.984186706542969e+02, 2.983466186523438e+02, 2.983204650878906e+02, 2.983396911621094e+02, 2.984204406738281e+02, 2.988123168945312e+02, 2.967820434570312e+02, 2.969702453613281e+02, 2.970338745117188e+02, 2.970558471679688e+02, 2.970890808105469e+02, 2.971541748046875e+02, 2.971515808105469e+02, 2.971466674804688e+02, 2.971436157226562e+02, 2.971288146972656e+02, 2.9848291015625e+02, 2.987439575195312e+02, 2.988827209472656e+02, 2.989636840820312e+02, 2.991275329589844e+02, 2.991621704101562e+02, 2.991625366210938e+02, 2.99143310546875e+02, 2.991982116699219e+02, 2.994739379882812e+02, 2.981336975097656e+02, 2.968754577636719e+02, 2.971066589355469e+02, 2.97215576171875e+02, 2.969889221191406e+02, 2.971925048828125e+02, 2.971891479492188e+02, 2.973151245117188e+02, 2.975644836425781e+02, 2.975042114257812e+02, 2.991919555664062e+02, 2.995704650878906e+02, 2.996954040527344e+02, 2.996904602050781e+02, 2.996839599609375e+02, 2.996686096191406e+02, 2.996327514648438e+02, 2.995902709960938e+02, 2.996148071289062e+02, 2.998854675292969e+02, 2.978524475097656e+02, 2.969711608886719e+02, 2.972383728027344e+02, 2.971114501953125e+02, 2.973097534179688e+02, 2.97140625e+02, 2.973296508789062e+02, 2.973331604003906e+02, 2.972037048339844e+02, 2.973235168457031e+02, 2.993119812011719e+02, 2.996333618164062e+02, 2.997644958496094e+02, 2.997810974121094e+02, 2.997733154296875e+02, 2.997529602050781e+02, 2.997012939453125e+02, 2.996553344726562e+02, 2.996897277832031e+02, 2.99979248046875e+02, 2.976107788085938e+02, 2.970518188476562e+02, 2.971965942382812e+02, 2.972200927734375e+02, 2.972443237304688e+02, 2.972834777832031e+02, 2.97366455078125e+02, 2.974611511230469e+02, 2.969490661621094e+02, 2.966455078125e+02, 2.992076110839844e+02, 2.995212707519531e+02, 2.996396179199219e+02, 2.99600341796875e+02, 2.995899963378906e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.974824523925781e+02, 2.975509643554688e+02, 2.975424194335938e+02, 2.975394287109375e+02, 2.979573364257812e+02, 2.965673522949219e+02, 2.967025146484375e+02, 2.968894653320312e+02, 2.97028076171875e+02, 2.968880004882812e+02, 2.970148010253906e+02, 2.9717822265625e+02, 2.971159362792969e+02, 2.971299133300781e+02, 2.968123474121094e+02, 2.98251708984375e+02, 2.983082580566406e+02, 2.984428100585938e+02, 2.985431518554688e+02, 2.986252746582031e+02, 2.985582275390625e+02, 2.985387268066406e+02, 2.984954528808594e+02, 2.984946594238281e+02, 2.987713623046875e+02, 2.966593017578125e+02, 2.970308837890625e+02, 2.971548461914062e+02, 2.97128173828125e+02, 2.971427307128906e+02, 2.972028503417969e+02, 2.971950988769531e+02, 2.97181640625e+02, 2.970634460449219e+02, 2.970796813964844e+02, 2.990978698730469e+02, 2.990885925292969e+02, 2.992661437988281e+02, 2.993290405273438e+02, 2.994461669921875e+02, 2.994576416015625e+02, 2.9944091796875e+02, 2.993940124511719e+02, 2.994097290039062e+02, 2.996297607421875e+02, 2.980440673828125e+02, 2.973771057128906e+02, 2.969630126953125e+02, 2.971348876953125e+02, 2.968837585449219e+02, 2.972201843261719e+02, 2.972676696777344e+02, 2.97508544921875e+02, 2.97995361328125e+02, 2.974112548828125e+02, 2.997196350097656e+02, 2.998918762207031e+02, 2.999989013671875e+02, 2.999580078125e+02, 2.999360656738281e+02, 2.998887634277344e+02, 2.998328247070312e+02, 2.997605285644531e+02, 2.997232971191406e+02, 2.999620666503906e+02, 2.977469787597656e+02, 2.972397766113281e+02, 2.971808166503906e+02, 2.971473083496094e+02, 2.973539733886719e+02, 2.972338256835938e+02, 2.973346862792969e+02, 2.976471862792969e+02, 2.966092224121094e+02, 2.968168334960938e+02, 2.998486938476562e+02, 2.999857482910156e+02, 3.000986022949219e+02, 3.00089599609375e+02, 3.000499877929688e+02, 3.00011474609375e+02, 2.999366149902344e+02, 2.998669128417969e+02, 2.998116455078125e+02, 3.000224304199219e+02, 2.977008666992188e+02, 2.971991882324219e+02, 2.971332397460938e+02, 2.971556091308594e+02, 2.971401062011719e+02, 2.971354675292969e+02, 2.97318115234375e+02, 2.975920104980469e+02, 2.964873352050781e+02, 2.967556762695312e+02, 2.996145324707031e+02, 2.997635192871094e+02, 2.998583374023438e+02, 2.998298950195312e+02, 2.998305053710938e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.972214660644531e+02, 2.972828979492188e+02, 2.97301513671875e+02, 2.973169250488281e+02, 2.977962951660156e+02, 2.966175537109375e+02, 2.966405334472656e+02, 2.967536315917969e+02, 2.968187255859375e+02, 2.967001342773438e+02, 2.967191467285156e+02, 2.96756591796875e+02, 2.967837219238281e+02, 2.966978759765625e+02, 2.964922485351562e+02, 2.977758178710938e+02, 2.979539489746094e+02, 2.981028442382812e+02, 2.982151184082031e+02, 2.98303466796875e+02, 2.982796630859375e+02, 2.982738037109375e+02, 2.982738647460938e+02, 2.983006591796875e+02, 2.986651306152344e+02, 2.966741638183594e+02, 2.967188110351562e+02, 2.967537841796875e+02, 2.967587280273438e+02, 2.967684936523438e+02, 2.967950744628906e+02, 2.968004760742188e+02, 2.968017883300781e+02, 2.967944030761719e+02, 2.967877807617188e+02, 2.983676452636719e+02, 2.986025390625e+02, 2.987595520019531e+02, 2.988364868164062e+02, 2.990038146972656e+02, 2.990458679199219e+02, 2.990572814941406e+02, 2.9904931640625e+02, 2.990889587402344e+02, 2.99319580078125e+02, 2.97939453125e+02, 2.972002868652344e+02, 2.969910583496094e+02, 2.971257629394531e+02, 2.969174194335938e+02, 2.97155029296875e+02, 2.971718444824219e+02, 2.971358032226562e+02, 2.973306274414062e+02, 2.973432006835938e+02, 2.990663757324219e+02, 2.994390258789062e+02, 2.995715942382812e+02, 2.995687561035156e+02, 2.995641174316406e+02, 2.995497131347656e+02, 2.995221252441406e+02, 2.994901123046875e+02, 2.99490966796875e+02, 2.997291564941406e+02, 2.97659423828125e+02, 2.97078369140625e+02, 2.971541748046875e+02, 2.971455993652344e+02, 2.973255615234375e+02, 2.971033630371094e+02, 2.971659240722656e+02, 2.971666259765625e+02, 2.970191650390625e+02, 2.969803466796875e+02, 2.991871948242188e+02, 2.995104064941406e+02, 2.996449584960938e+02, 2.996651306152344e+02, 2.996549377441406e+02, 2.996458740234375e+02, 2.996031799316406e+02, 2.995642395019531e+02, 2.995700073242188e+02, 2.998138122558594e+02, 2.974961853027344e+02, 2.970321044921875e+02, 2.971119689941406e+02, 2.971740112304688e+02, 2.971776428222656e+02, 2.971097106933594e+02, 2.971945495605469e+02, 2.9716259765625e+02, 2.97019287109375e+02, 2.967336120605469e+02, 2.990410766601562e+02, 2.993810729980469e+02, 2.995047607421875e+02, 2.995162963867188e+02, 2.995132751464844e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.971818542480469e+02, 2.97238037109375e+02, 2.972069091796875e+02, 2.971779479980469e+02, 2.976251220703125e+02, 2.966869812011719e+02, 2.968606872558594e+02, 2.970982666015625e+02, 2.971645202636719e+02, 2.972295227050781e+02, 2.9720263671875e+02, 2.971302185058594e+02, 2.971512756347656e+02, 2.971924743652344e+02, 2.969734802246094e+02, 2.981372680664062e+02, 2.981038513183594e+02, 2.982400207519531e+02, 2.983847961425781e+02, 2.984718933105469e+02, 2.983818969726562e+02, 2.983671264648438e+02, 2.983589477539062e+02, 2.983493347167969e+02, 2.986290588378906e+02, 2.967978515625e+02, 2.970139770507812e+02, 2.971401062011719e+02, 2.971584777832031e+02, 2.971487731933594e+02, 2.971480712890625e+02, 2.9713623046875e+02, 2.971444702148438e+02, 2.971419067382812e+02, 2.9712841796875e+02, 2.986394653320312e+02, 2.989168701171875e+02, 2.990353393554688e+02, 2.990524291992188e+02, 2.991807250976562e+02, 2.991852111816406e+02, 2.991572875976562e+02, 2.991261291503906e+02, 2.991438293457031e+02, 2.993743286132812e+02, 2.981611633300781e+02, 2.968620300292969e+02, 2.971996765136719e+02, 2.968875427246094e+02, 2.972217407226562e+02, 2.972307739257812e+02, 2.974044494628906e+02, 2.974750671386719e+02, 2.975377502441406e+02, 2.975361022949219e+02, 2.993241882324219e+02, 2.996983947753906e+02, 2.997966918945312e+02, 2.997457885742188e+02, 2.997276611328125e+02, 2.996740417480469e+02, 2.996261291503906e+02, 2.996042175292969e+02, 2.9955517578125e+02, 2.998236999511719e+02, 2.978829345703125e+02, 2.970482482910156e+02, 2.973074035644531e+02, 2.972911071777344e+02, 2.97502685546875e+02, 2.974693298339844e+02, 2.97550048828125e+02, 2.975024719238281e+02, 2.969570617675781e+02, 2.972461853027344e+02, 2.995098266601562e+02, 2.99770263671875e+02, 2.998582153320312e+02, 2.998565979003906e+02, 2.998225402832031e+02, 2.997966003417969e+02, 2.997127685546875e+02, 2.996634521484375e+02, 2.996664428710938e+02, 2.998424377441406e+02, 2.976308898925781e+02, 2.971237487792969e+02, 2.971236267089844e+02, 2.974175720214844e+02, 2.969259643554688e+02, 2.975152282714844e+02, 2.975594177246094e+02, 2.975924377441406e+02, 2.96684814453125e+02, 2.964359436035156e+02, 2.993222045898438e+02, 2.996026916503906e+02, 2.997003784179688e+02, 2.99707275390625e+02, 2.996913146972656e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.971500244140625e+02, 2.970904541015625e+02, 2.970731201171875e+02, 2.973551940917969e+02, 2.983050842285156e+02, 2.971353759765625e+02, 2.971668090820312e+02, 2.971419982910156e+02, 2.971272277832031e+02, 2.970474853515625e+02, 2.970996398925781e+02, 2.971488647460938e+02, 2.971475830078125e+02, 2.969850463867188e+02, 2.967379150390625e+02, 2.98130615234375e+02, 2.981869201660156e+02, 2.983970336914062e+02, 2.985059204101562e+02, 2.985884094238281e+02, 2.985273132324219e+02, 2.984976806640625e+02, 2.985003356933594e+02, 2.9862548828125e+02, 2.993899230957031e+02, 2.977189636230469e+02, 2.972291870117188e+02, 2.971078796386719e+02, 2.971143493652344e+02, 2.971452331542969e+02, 2.9715283203125e+02, 2.97149658203125e+02, 2.971450805664062e+02, 2.971408081054688e+02, 2.971376953125e+02, 2.987212829589844e+02, 2.989828186035156e+02, 2.991255493164062e+02, 2.991964111328125e+02, 2.993507080078125e+02, 2.9937109375e+02, 2.993638305664062e+02, 2.993374938964844e+02, 2.994126281738281e+02, 2.998279113769531e+02, 2.985005798339844e+02, 2.970592651367188e+02, 2.97237548828125e+02, 2.973497314453125e+02, 2.968750610351562e+02, 2.971579284667969e+02, 2.971685485839844e+02, 2.971151123046875e+02, 2.972245483398438e+02, 2.974371337890625e+02, 2.994376525878906e+02, 2.997710266113281e+02, 2.999020080566406e+02, 2.998919677734375e+02, 2.998775939941406e+02, 2.998499145507812e+02, 2.998087463378906e+02, 2.997625427246094e+02, 2.998076782226562e+02, 3.002734680175781e+02, 2.980392456054688e+02, 2.973982238769531e+02, 2.969830322265625e+02, 2.970968017578125e+02, 2.973453063964844e+02, 2.971463623046875e+02, 2.971315002441406e+02, 2.971734924316406e+02, 2.968889465332031e+02, 2.972974243164062e+02, 2.994949951171875e+02, 2.998316345214844e+02, 2.999716491699219e+02, 2.999879455566406e+02, 2.999657287597656e+02, 2.999417724609375e+02, 2.998826904296875e+02, 2.998292236328125e+02, 2.998898315429688e+02, 3.003918151855469e+02, 2.971264343261719e+02, 2.97095703125e+02, 2.972145385742188e+02, 2.97118408203125e+02, 2.971379089355469e+02, 2.970704345703125e+02, 2.971780700683594e+02, 2.971444091796875e+02, 2.970320434570312e+02, 2.971114196777344e+02, 2.994176330566406e+02, 2.996614685058594e+02, 2.998197021484375e+02, 2.998296203613281e+02, 2.998148803710938e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.971870422363281e+02, 2.971658325195312e+02, 2.972320861816406e+02, 2.973101806640625e+02, 2.978935852050781e+02, 2.967018737792969e+02, 2.968080139160156e+02, 2.969779357910156e+02, 2.970961303710938e+02, 2.969366455078125e+02, 2.969920654296875e+02, 2.970682373046875e+02, 2.971083679199219e+02, 2.969423828125e+02, 2.967126159667969e+02, 2.978583374023438e+02, 2.980832824707031e+02, 2.982135620117188e+02, 2.983252258300781e+02, 2.984186706542969e+02, 2.983466186523438e+02, 2.983204650878906e+02, 2.983396911621094e+02, 2.984204406738281e+02, 2.988123168945312e+02, 2.967820129394531e+02, 2.969702453613281e+02, 2.970338745117188e+02, 2.970558471679688e+02, 2.970890808105469e+02, 2.971541748046875e+02, 2.971515808105469e+02, 2.971466674804688e+02, 2.971436157226562e+02, 2.971288146972656e+02, 2.984829406738281e+02, 2.987439575195312e+02, 2.988827209472656e+02, 2.989636840820312e+02, 2.991275329589844e+02, 2.991621704101562e+02, 2.991625366210938e+02, 2.99143310546875e+02, 2.991982116699219e+02, 2.994739379882812e+02, 2.981336975097656e+02, 2.9687548828125e+02, 2.971065979003906e+02, 2.97215576171875e+02, 2.969888305664062e+02, 2.971924743652344e+02, 2.971891479492188e+02, 2.973151245117188e+02, 2.975644836425781e+02, 2.975042114257812e+02, 2.991919555664062e+02, 2.995704650878906e+02, 2.996954040527344e+02, 2.996904602050781e+02, 2.996839599609375e+02, 2.996686096191406e+02, 2.996327514648438e+02, 2.995902709960938e+02, 2.996148071289062e+02, 2.998854675292969e+02, 2.978524169921875e+02, 2.969711608886719e+02, 2.972383728027344e+02, 2.971114501953125e+02, 2.973097534179688e+02, 2.97140625e+02, 2.973296508789062e+02, 2.973331604003906e+02, 2.972037048339844e+02, 2.973235168457031e+02, 2.993119812011719e+02, 2.996333618164062e+02, 2.997644958496094e+02, 2.997810974121094e+02, 2.997733154296875e+02, 2.997529602050781e+02, 2.997012939453125e+02, 2.996553344726562e+02, 2.996897277832031e+02, 2.99979248046875e+02, 2.9761083984375e+02, 2.970518188476562e+02, 2.971965942382812e+02, 2.972200927734375e+02, 2.972443237304688e+02, 2.972834777832031e+02, 2.97366455078125e+02, 2.974611511230469e+02, 2.969490356445312e+02, 2.966455078125e+02, 2.992076110839844e+02, 2.995212707519531e+02, 2.996396179199219e+02, 2.99600341796875e+02, 2.995899963378906e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.974824523925781e+02, 2.975509643554688e+02, 2.975424194335938e+02, 2.975394287109375e+02, 2.979573364257812e+02, 2.965673217773438e+02, 2.967025146484375e+02, 2.968894653320312e+02, 2.97028076171875e+02, 2.968880004882812e+02, 2.970148010253906e+02, 2.9717822265625e+02, 2.971159362792969e+02, 2.971299133300781e+02, 2.968123474121094e+02, 2.98251708984375e+02, 2.983082580566406e+02, 2.984428100585938e+02, 2.985431518554688e+02, 2.986252746582031e+02, 2.985582275390625e+02, 2.985387268066406e+02, 2.984954528808594e+02, 2.984946594238281e+02, 2.987713623046875e+02, 2.966592407226562e+02, 2.970308532714844e+02, 2.971548461914062e+02, 2.97128173828125e+02, 2.971427001953125e+02, 2.972028503417969e+02, 2.971950988769531e+02, 2.97181640625e+02, 2.970634460449219e+02, 2.970796813964844e+02, 2.990978698730469e+02, 2.990885925292969e+02, 2.992661437988281e+02, 2.993290710449219e+02, 2.994461669921875e+02, 2.994576721191406e+02, 2.9944091796875e+02, 2.993939819335938e+02, 2.994097290039062e+02, 2.996297607421875e+02, 2.980440368652344e+02, 2.973771057128906e+02, 2.969630126953125e+02, 2.971349182128906e+02, 2.968837280273438e+02, 2.972201843261719e+02, 2.972676696777344e+02, 2.97508544921875e+02, 2.979953918457031e+02, 2.974112243652344e+02, 2.997196350097656e+02, 2.998918762207031e+02, 2.999989013671875e+02, 2.999580078125e+02, 2.999360656738281e+02, 2.998887634277344e+02, 2.998328247070312e+02, 2.997605285644531e+02, 2.997232971191406e+02, 2.999620666503906e+02, 2.977469482421875e+02, 2.972397766113281e+02, 2.971808166503906e+02, 2.971473083496094e+02, 2.973539733886719e+02, 2.972338256835938e+02, 2.973346862792969e+02, 2.976471862792969e+02, 2.966092224121094e+02, 2.968168029785156e+02, 2.998486938476562e+02, 2.999857482910156e+02, 3.000986022949219e+02, 3.00089599609375e+02, 3.000499877929688e+02, 3.00011474609375e+02, 2.999366149902344e+02, 2.998669128417969e+02, 2.998116455078125e+02, 3.000224304199219e+02, 2.977008666992188e+02, 2.971991882324219e+02, 2.971332397460938e+02, 2.971556091308594e+02, 2.971400756835938e+02, 2.971354675292969e+02, 2.97318115234375e+02, 2.975920104980469e+02, 2.964873046875e+02, 2.967557067871094e+02, 2.996145629882812e+02, 2.997634887695312e+02, 2.998583374023438e+02, 2.998298950195312e+02, 2.998305053710938e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.972214660644531e+02, 2.972828674316406e+02, 2.97301513671875e+02, 2.973169250488281e+02, 2.977962951660156e+02, 2.966175231933594e+02, 2.966405334472656e+02, 2.967536315917969e+02, 2.968187255859375e+02, 2.967001342773438e+02, 2.967191467285156e+02, 2.96756591796875e+02, 2.967837219238281e+02, 2.966978759765625e+02, 2.964922485351562e+02, 2.977758178710938e+02, 2.979539489746094e+02, 2.981028442382812e+02, 2.982151184082031e+02, 2.98303466796875e+02, 2.982796630859375e+02, 2.982738037109375e+02, 2.982738647460938e+02, 2.983006591796875e+02, 2.986651306152344e+02, 2.966741333007812e+02, 2.967188110351562e+02, 2.967537841796875e+02, 2.967587280273438e+02, 2.967684936523438e+02, 2.967950744628906e+02, 2.968004760742188e+02, 2.968017883300781e+02, 2.967944030761719e+02, 2.967877807617188e+02, 2.983676452636719e+02, 2.986025390625e+02, 2.987595520019531e+02, 2.988364868164062e+02, 2.990038146972656e+02, 2.990458679199219e+02, 2.990572814941406e+02, 2.9904931640625e+02, 2.990889587402344e+02, 2.993196105957031e+02, 2.979394226074219e+02, 2.972002868652344e+02, 2.969910278320312e+02, 2.971257629394531e+02, 2.969173583984375e+02, 2.97155029296875e+02, 2.971718444824219e+02, 2.971358032226562e+02, 2.973306274414062e+02, 2.973432006835938e+02, 2.990663757324219e+02, 2.994390258789062e+02, 2.995715942382812e+02, 2.995687561035156e+02, 2.995641174316406e+02, 2.995497131347656e+02, 2.995221252441406e+02, 2.994901123046875e+02, 2.99490966796875e+02, 2.997291564941406e+02, 2.976593627929688e+02, 2.970783386230469e+02, 2.971541748046875e+02, 2.971455993652344e+02, 2.973255615234375e+02, 2.971033630371094e+02, 2.971659240722656e+02, 2.971666259765625e+02, 2.970191650390625e+02, 2.969803466796875e+02, 2.991871948242188e+02, 2.995104064941406e+02, 2.996449584960938e+02, 2.996651306152344e+02, 2.996549377441406e+02, 2.996458740234375e+02, 2.996031799316406e+02, 2.995642395019531e+02, 2.995700073242188e+02, 2.998138122558594e+02, 2.974961853027344e+02, 2.970321044921875e+02, 2.971119689941406e+02, 2.971740112304688e+02, 2.971776428222656e+02, 2.971097106933594e+02, 2.971945495605469e+02, 2.9716259765625e+02, 2.97019287109375e+02, 2.967336120605469e+02, 2.990410461425781e+02, 2.993810729980469e+02, 2.995047607421875e+02, 2.995162963867188e+02, 2.995132751464844e+02]
 hvac.TSetRoo.setPoiHea.y=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
 hvac.TSetRoo.setPoiCoo.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.951503992080688e-01, 3.130294382572174e-01, 3.206693530082703e-01, 3.206324279308319e-01, 3.149732351303101e-01, 3.187950551509857e-01, 3.391874134540558e-01, 3.559437394142151e-01, 3.274239897727966e-01, 3.150059282779694e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.040854334831238e-01, 3.401825129985809e-01, 3.39058518409729e-01, 3.275282382965088e-01, 3.343941271305084e-01, 3.418198227882385e-01, 3.627618253231049e-01, 3.737976849079132e-01, 3.74996542930603e-01, 3.559428751468658e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.637272953987122e-01, 1e+00, 1e+00, 1e+00, 9.481744170188904e-01, 1e+00, 1e+00, 1e+00, 6.050555109977722e-01, 4.072940647602081e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.929788589477539e-01, 1e+00, 1e+00, 1e+00, 8.129538297653198e-01, 1e+00, 1e+00, 1e+00, 8.937150835990906e-01, 4.933751821517944e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.595212697982788e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.662395358085632e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, 5.999837517738342e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.324936866760254e-01, 4.649196863174438e-01, 4.684916734695435e-01, 4.684310257434845e-01, 4.679633975028992e-01, 4.686447978019714e-01, 4.705103635787964e-01, 4.72462922334671e-01, 4.699635803699493e-01, 4.681457579135895e-01, 5.771949887275696e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.288382232189178e-01, 4.677050411701202e-01, 4.706118106842041e-01, 4.692103564739227e-01, 4.691462516784668e-01, 4.698233008384705e-01, 4.720324277877808e-01, 4.736880958080292e-01, 4.741300344467163e-01, 4.724681973457336e-01, 5.792727470397949e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.559061229228973e-01, 5.724164843559265e-01, 7.347285747528076e-01, 5.962111949920654e-01, 6.772714853286743e-01, 6.318396329879761e-01, 6.851102113723755e-01, 7.661497592926025e-01, 3.587864637374878e-01, 5.119321942329407e-01, 6.004419922828674e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.299944043159485e-01, 6.894158124923706e-01, 6.480374336242676e-01, 6.709486842155457e-01, 5.120247006416321e-01, 7.207292318344116e-01, 7.705312967300415e-01, 7.777774930000305e-01, 3.723230361938477e-01, 4.580007195472717e-01, 6.329293847084045e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.399999380111694e-01, 7.164424061775208e-01, 6.760681867599487e-01, 7.04681396484375e-01, 5.698623657226562e-01, 7.588503956794739e-01, 7.459824681282043e-01, 8.672454357147217e-01, 4.103750884532928e-01, 5.153136253356934e-01, 6.125820279121399e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, 5.999845266342163e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.300029277801514e-01, 4.647673666477203e-01, 4.684830605983734e-01, 5.089707970619202e-01, 4.929448962211609e-01, 5.237825512886047e-01, 5.978821516036987e-01, 6.015141606330872e-01, 5.578278303146362e-01, 4.872542321681976e-01, 5.790409445762634e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.321025311946869e-01, 4.690567553043365e-01, 4.706907570362091e-01, 5.223121047019958e-01, 5.622138381004333e-01, 5.799909830093384e-01, 5.687455534934998e-01, 5.405837893486023e-01, 5.340319871902466e-01, 5.060736536979675e-01, 5.830705761909485e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.860364496707916e-01, 9.375139474868774e-01, 1e+00, 9.703229665756226e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.797927141189575e-01, 6.17487907409668e-01, 7.391396164894104e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.749867618083954e-01, 1e+00, 7.913828492164612e-01, 1e+00, 6.668900847434998e-01, 1e+00, 1e+00, 1e+00, 5.406877398490906e-01, 5.660483837127686e-01, 7.895036339759827e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.069919228553772e-01, 1e+00, 1e+00, 1e+00, 9.398226737976074e-01, 1e+00, 1e+00, 1e+00, 6.673796772956848e-01, 7.435593008995056e-01, 7.888884544372559e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, 5.511378645896912e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.386762976646423e-01, 4.719191789627075e-01, 5.345647931098938e-01, 4.839677512645721e-01, 4.540525674819946e-01, 4.527335464954376e-01, 4.586749970912933e-01, 4.638963043689728e-01, 4.546118974685669e-01, 4.521715641021729e-01, 5.522807836532593e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.529935717582703e-01, 6.758403182029724e-01, 6.443378925323486e-01, 5.23699939250946e-01, 5.012869834899902e-01, 5.123415589332581e-01, 5.231851935386658e-01, 5.099022388458252e-01, 4.978901147842407e-01, 4.708884954452515e-01, 5.558688044548035e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.248342752456665e-01, 1e+00, 1e+00, 6.388844847679138e-01, 7.668263912200928e-01, 7.007378935813904e-01, 7.615833878517151e-01, 8.105313777923584e-01, 4.371012449264526e-01, 5.612169504165649e-01, 6.547399163246155e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.217795372009277e-01, 1e+00, 1e+00, 7.673109769821167e-01, 5.737832188606262e-01, 7.648067474365234e-01, 8.336040377616882e-01, 7.945280075073242e-01, 4.708193242549896e-01, 4.700664579868317e-01, 6.660244464874268e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.759005546569824e-01, 1e+00, 7.731223702430725e-01, 8.030632138252258e-01, 6.434593200683594e-01, 8.169869780540466e-01, 8.041580319404602e-01, 8.502106666564941e-01, 5.214647650718689e-01, 5.365087985992432e-01, 6.748360395431519e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, 5.999845266342163e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.3612340092659e-01, 4.651409387588501e-01, 4.685047566890717e-01, 4.684320092201233e-01, 4.67963695526123e-01, 4.686450660228729e-01, 4.705106019973755e-01, 4.724631607532501e-01, 4.699638485908508e-01, 4.68146026134491e-01, 5.771953463554382e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.336337149143219e-01, 4.685616493225098e-01, 4.706619381904602e-01, 4.69213455915451e-01, 4.691466689109802e-01, 4.698984622955322e-01, 4.932654201984406e-01, 4.906457960605621e-01, 4.889322817325592e-01, 5.049103498458862e-01, 5.854401588439941e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.840886294841766e-01, 8.610768914222717e-01, 9.668377637863159e-01, 7.117835879325867e-01, 8.975558280944824e-01, 8.026531934738159e-01, 9.783818125724792e-01, 1e+00, 4.404503703117371e-01, 6.032454967498779e-01, 7.153895497322083e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.730394780635834e-01, 1e+00, 7.707884311676025e-01, 8.847100734710693e-01, 6.210402846336365e-01, 1e+00, 1e+00, 1e+00, 4.848519563674927e-01, 5.381717681884766e-01, 7.709863781929016e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.021651387214661e-01, 1e+00, 8.420326113700867e-01, 9.999978542327881e-01, 7.031144499778748e-01, 1e+00, 1e+00, 1e+00, 5.874620079994202e-01, 6.620135903358459e-01, 7.590232491493225e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, 5.511378645896912e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.182069003582001e-01, 4.487827718257904e-01, 4.524155557155609e-01, 4.523961246013641e-01, 4.51929122209549e-01, 4.525992274284363e-01, 5.339329242706299e-01, 6.342820525169373e-01, 4.809799790382385e-01, 4.537920951843262e-01, 5.524519681930542e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.131015837192535e-01, 4.51878547668457e-01, 4.701887667179108e-01, 4.585989415645599e-01, 4.928918778896332e-01, 5.179644227027893e-01, 6.378538608551025e-01, 7.595088481903076e-01, 7.956542372703552e-01, 6.900951862335205e-01, 6.480744481086731e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.520648717880249e-01, 6.062918305397034e-01, 7.454724907875061e-01, 6.269384026527405e-01, 7.201038002967834e-01, 6.763030886650085e-01, 8.715710639953613e-01, 1e+00, 4.951316118240356e-01, 6.724717020988464e-01, 7.121263146400452e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.238413870334625e-01, 6.571637988090515e-01, 6.509742140769958e-01, 6.853668093681335e-01, 5.427387356758118e-01, 7.204189300537109e-01, 1e+00, 1e+00, 6.121122241020203e-01, 6.6661137342453e-01, 7.380913496017456e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.456399083137512e-01, 6.817850470542908e-01, 6.933947205543518e-01, 7.404568791389465e-01, 6.228703856468201e-01, 7.784102559089661e-01, 9.47957456111908e-01, 1e+00, 6.91878080368042e-01, 6.218438744544983e-01, 6.896575093269348e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 6.425018310546875e-01, 6.332736015319824e-01, 6.297133564949036e-01, 6.469935178756714e-01, 6.351941227912903e-01, 6.014029979705811e-01, 5.789417028427124e-01, 6.110711097717285e-01, 6.393722295761108e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.47357439994812e-01, 5.924639701843262e-01, 5.941323637962341e-01, 6.120705008506775e-01, 6.050370931625366e-01, 5.930491089820862e-01, 5.701524019241333e-01, 5.584235787391663e-01, 5.55833101272583e-01, 5.732952952384949e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.849521219730377e-01, 3.524365425109863e-01, 3.601202368736267e-01, 3.552725315093994e-01, 3.714140355587006e-01, 3.533883094787598e-01, 3.504093587398529e-01, 3.488488495349884e-01, 4.525391757488251e-01, 5.202304720878601e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.245008826255798e-01, 3.504060804843903e-01, 3.526968955993652e-01, 3.514499962329865e-01, 3.933325707912445e-01, 3.50498229265213e-01, 3.492065668106079e-01, 3.492273986339569e-01, 3.832344114780426e-01, 4.540712237358093e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.874117434024811e-01, 3.503811359405518e-01, 3.517074584960938e-01, 3.509827554225922e-01, 3.560702204704285e-01, 3.498570322990417e-01, 3.496996462345123e-01, 3.488191366195679e-01, 3.626817464828491e-01, 4.287151992321014e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931502380371094e+02, 2.931497192382812e+02, 2.931495971679688e+02, 2.931494445800781e+02, 2.931494140625e+02, 2.848643188476562e+02, 2.853752136230469e+02, 2.852698974609375e+02, 2.851347045898438e+02, 2.853130187988281e+02, 2.855601806640625e+02, 2.858091735839844e+02, 2.859573669433594e+02, 2.857621459960938e+02, 2.852528381347656e+02, 2.85331787109375e+02, 2.853314208984375e+02, 2.853306274414062e+02, 2.853308410644531e+02, 2.853299255371094e+02, 2.853294677734375e+02, 2.853296508789062e+02, 2.853293762207031e+02, 2.853279113769531e+02, 2.853284301757812e+02, 2.8465673828125e+02, 2.853608093261719e+02, 2.855591735839844e+02, 2.856341247558594e+02, 2.857577819824219e+02, 2.859466857910156e+02, 2.860753479003906e+02, 2.860235900878906e+02, 2.860830078125e+02, 2.857433471679688e+02, 2.855345764160156e+02, 2.855346374511719e+02, 2.855352783203125e+02, 2.855354309082031e+02, 2.8553466796875e+02, 2.85535400390625e+02, 2.855346374511719e+02, 2.855338134765625e+02, 2.855341796875e+02, 2.855339965820312e+02, 2.856585998535156e+02, 2.893241271972656e+02, 2.894105834960938e+02, 2.893376159667969e+02, 2.891520080566406e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.861799621582031e+02, 2.857276306152344e+02, 2.858598327636719e+02, 2.858597717285156e+02, 2.858610534667969e+02, 2.858598937988281e+02, 2.858604736328125e+02, 2.858611145019531e+02, 2.858612670898438e+02, 2.858617858886719e+02, 2.8585986328125e+02, 2.85860107421875e+02, 2.867349548339844e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.89393798828125e+02, 2.881900634765625e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990539550781e+02, 2.881945190429688e+02, 2.860500793457031e+02, 2.861072387695312e+02, 2.86107177734375e+02, 2.861105041503906e+02, 2.86109375e+02, 2.861099243164062e+02, 2.86109375e+02, 2.861094665527344e+02, 2.861089477539062e+02, 2.861093444824219e+02, 2.861092834472656e+02, 2.879280395507812e+02, 2.892091064453125e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686401367188e+02, 2.892865295410156e+02, 2.868428344726562e+02, 2.86422119140625e+02, 2.864261779785156e+02, 2.864261779785156e+02, 2.864263916015625e+02, 2.864259033203125e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931502685546875e+02, 2.9314990234375e+02, 2.931498107910156e+02, 2.93149658203125e+02, 2.931496276855469e+02, 2.848646545410156e+02, 2.853752136230469e+02, 2.852698669433594e+02, 2.851347351074219e+02, 2.853128662109375e+02, 2.855601196289062e+02, 2.858091430664062e+02, 2.859572143554688e+02, 2.857621459960938e+02, 2.852529602050781e+02, 2.853257446289062e+02, 2.853254699707031e+02, 2.853246765136719e+02, 2.853248901367188e+02, 2.853239440917969e+02, 2.853235168457031e+02, 2.853236694335938e+02, 2.853233947753906e+02, 2.853219299316406e+02, 2.853224792480469e+02, 2.846550598144531e+02, 2.853610534667969e+02, 2.855591735839844e+02, 2.856341247558594e+02, 2.857577514648438e+02, 2.859466247558594e+02, 2.860753479003906e+02, 2.860235900878906e+02, 2.860830383300781e+02, 2.857434387207031e+02, 2.855272521972656e+02, 2.855273132324219e+02, 2.855279541015625e+02, 2.855281066894531e+02, 2.8552734375e+02, 2.85528076171875e+02, 2.855273132324219e+02, 2.855264892578125e+02, 2.8552685546875e+02, 2.855266418457031e+02, 2.856582946777344e+02, 2.893241271972656e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891517944335938e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.86180908203125e+02, 2.857268676757812e+02, 2.858251953125e+02, 2.858250732421875e+02, 2.858263549804688e+02, 2.858251647949219e+02, 2.858257751464844e+02, 2.85826416015625e+02, 2.858265686035156e+02, 2.858271179199219e+02, 2.858251342773438e+02, 2.858254089355469e+02, 2.867341003417969e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.893937683105469e+02, 2.881902465820312e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990234375e+02, 2.881971740722656e+02, 2.86053955078125e+02, 2.860577392578125e+02, 2.860577087402344e+02, 2.860610656738281e+02, 2.860599060058594e+02, 2.860604858398438e+02, 2.860599365234375e+02, 2.860600280761719e+02, 2.860594787597656e+02, 2.860598754882812e+02, 2.86059814453125e+02, 2.879264526367188e+02, 2.892091064453125e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686096191406e+02, 2.892870178222656e+02, 2.86847900390625e+02, 2.863751831054688e+02, 2.86378173828125e+02, 2.86378173828125e+02, 2.863783874511719e+02, 2.863778686523438e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931502380371094e+02, 2.931497192382812e+02, 2.931495971679688e+02, 2.931494445800781e+02, 2.931494140625e+02, 2.848645629882812e+02, 2.853752136230469e+02, 2.852698974609375e+02, 2.851347351074219e+02, 2.853129272460938e+02, 2.855601196289062e+02, 2.858091430664062e+02, 2.859572448730469e+02, 2.857621459960938e+02, 2.852528991699219e+02, 2.853312072753906e+02, 2.85330810546875e+02, 2.853300476074219e+02, 2.853302612304688e+02, 2.85329345703125e+02, 2.853288879394531e+02, 2.853290405273438e+02, 2.853287963867188e+02, 2.853273315429688e+02, 2.853278503417969e+02, 2.846565856933594e+02, 2.853608093261719e+02, 2.855591735839844e+02, 2.856340942382812e+02, 2.857577209472656e+02, 2.859465942382812e+02, 2.860753784179688e+02, 2.860235900878906e+02, 2.860830688476562e+02, 2.857433471679688e+02, 2.855354614257812e+02, 2.855355224609375e+02, 2.855361633300781e+02, 2.855362854003906e+02, 2.855355224609375e+02, 2.855362854003906e+02, 2.855354919433594e+02, 2.855346984863281e+02, 2.855350646972656e+02, 2.855348510742188e+02, 2.856585998535156e+02, 2.893241271972656e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891519470214844e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.861808166503906e+02, 2.857274780273438e+02, 2.85849365234375e+02, 2.858492736816406e+02, 2.858505249023438e+02, 2.85849365234375e+02, 2.858499450683594e+02, 2.858505859375e+02, 2.858507385253906e+02, 2.858512878417969e+02, 2.858493347167969e+02, 2.85849609375e+02, 2.867349853515625e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.89393798828125e+02, 2.881901550292969e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990539550781e+02, 2.88196533203125e+02, 2.860509948730469e+02, 2.861000061035156e+02, 2.860999450683594e+02, 2.861032409667969e+02, 2.861021118164062e+02, 2.861026611328125e+02, 2.861021423339844e+02, 2.861022338867188e+02, 2.861016845703125e+02, 2.861020812988281e+02, 2.8610205078125e+02, 2.879281921386719e+02, 2.892091064453125e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686401367188e+02, 2.892867431640625e+02, 2.868440551757812e+02, 2.864098205566406e+02, 2.864136962890625e+02, 2.864136962890625e+02, 2.864138793945312e+02, 2.864134216308594e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931502990722656e+02, 2.931499328613281e+02, 2.931498107910156e+02, 2.931496276855469e+02, 2.931495666503906e+02, 2.848638916015625e+02, 2.853752746582031e+02, 2.852698974609375e+02, 2.851347351074219e+02, 2.853128662109375e+02, 2.855601196289062e+02, 2.858091735839844e+02, 2.859573974609375e+02, 2.857621459960938e+02, 2.852529602050781e+02, 2.853258056640625e+02, 2.853255310058594e+02, 2.853247375488281e+02, 2.853249206542969e+02, 2.853240051269531e+02, 2.853235473632812e+02, 2.853236999511719e+02, 2.853234558105469e+02, 2.853219604492188e+02, 2.853224792480469e+02, 2.846585998535156e+02, 2.853607482910156e+02, 2.855591735839844e+02, 2.856340942382812e+02, 2.857577514648438e+02, 2.859466247558594e+02, 2.860753479003906e+02, 2.860235900878906e+02, 2.860829467773438e+02, 2.857430725097656e+02, 2.855655517578125e+02, 2.855655822753906e+02, 2.855662231445312e+02, 2.855663757324219e+02, 2.855655822753906e+02, 2.855663452148438e+02, 2.855655822753906e+02, 2.855647583007812e+02, 2.855651245117188e+02, 2.855649108886719e+02, 2.85658935546875e+02, 2.893241577148438e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891516723632812e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.861796875e+02, 2.857281494140625e+02, 2.858521118164062e+02, 2.858520202636719e+02, 2.858533020019531e+02, 2.858521423339844e+02, 2.858527221679688e+02, 2.858533630371094e+02, 2.85853515625e+02, 2.858540649414062e+02, 2.858521118164062e+02, 2.858523559570312e+02, 2.867361450195312e+02, 2.891605224609375e+02, 2.89246337890625e+02, 2.893937683105469e+02, 2.881903381347656e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990539550781e+02, 2.881926879882812e+02, 2.860478210449219e+02, 2.860901794433594e+02, 2.860901184082031e+02, 2.86093505859375e+02, 2.860923461914062e+02, 2.860928955078125e+02, 2.860923461914062e+02, 2.860924377441406e+02, 2.860919189453125e+02, 2.860923156738281e+02, 2.860922546386719e+02, 2.879300537109375e+02, 2.892090759277344e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686401367188e+02, 2.892864990234375e+02, 2.86844970703125e+02, 2.863820190429688e+02, 2.863851928710938e+02, 2.863851928710938e+02, 2.863854064941406e+02, 2.863849182128906e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931501770019531e+02, 2.93149658203125e+02, 2.931495361328125e+02, 2.931493835449219e+02, 2.931493530273438e+02, 2.848644104003906e+02, 2.853752136230469e+02, 2.852698974609375e+02, 2.851347351074219e+02, 2.853129272460938e+02, 2.855601196289062e+02, 2.858091430664062e+02, 2.859572448730469e+02, 2.857621459960938e+02, 2.852528991699219e+02, 2.853311767578125e+02, 2.85330810546875e+02, 2.853300476074219e+02, 2.853302612304688e+02, 2.85329345703125e+02, 2.853289184570312e+02, 2.853290710449219e+02, 2.853287963867188e+02, 2.853273315429688e+02, 2.85327880859375e+02, 2.846570434570312e+02, 2.853608093261719e+02, 2.855591735839844e+02, 2.856340942382812e+02, 2.857577209472656e+02, 2.859465942382812e+02, 2.860753784179688e+02, 2.860235900878906e+02, 2.860830688476562e+02, 2.857434387207031e+02, 2.855330200195312e+02, 2.855330810546875e+02, 2.855337219238281e+02, 2.855338439941406e+02, 2.855331115722656e+02, 2.855338439941406e+02, 2.855330810546875e+02, 2.855322570800781e+02, 2.855326232910156e+02, 2.855324401855469e+02, 2.856588745117188e+02, 2.893241577148438e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891515502929688e+02, 2.893955383300781e+02, 2.894341735839844e+02, 2.895083618164062e+02, 2.861833190917969e+02, 2.857259216308594e+02, 2.857962951660156e+02, 2.857962036132812e+02, 2.857974548339844e+02, 2.857962951660156e+02, 2.85796875e+02, 2.857975158691406e+02, 2.857976684570312e+02, 2.857982177734375e+02, 2.857962646484375e+02, 2.857965393066406e+02, 2.867359619140625e+02, 2.891605224609375e+02, 2.89246337890625e+02, 2.893937683105469e+02, 2.881904296875e+02, 2.895105285644531e+02, 2.895827026367188e+02, 2.894990234375e+02, 2.882029113769531e+02, 2.860546264648438e+02, 2.860384826660156e+02, 2.860384216308594e+02, 2.86041748046875e+02, 2.860406188964844e+02, 2.860411376953125e+02, 2.860406188964844e+02, 2.860407104492188e+02, 2.860401916503906e+02, 2.860405883789062e+02, 2.8604052734375e+02, 2.879302978515625e+02, 2.892090759277344e+02, 2.89284423828125e+02, 2.894944152832031e+02, 2.894513244628906e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686096191406e+02, 2.892877197265625e+02, 2.86848876953125e+02, 2.86342041015625e+02, 2.863443298339844e+02, 2.863442993164062e+02, 2.863445129394531e+02, 2.863440246582031e+02]
-hvac.res.EFan=[0e+00, -1.723294872135739e-06, -1.722831143524672e-06, -1.722677211546397e-06, -1.722463480291481e-06, -1.722379806778918e-06, 1.15659931640625e+04, 1.54269521484375e+04, 1.9282927734375e+04, 2.3137775390625e+04, 2.6993876953125e+04, 3.084921484375e+04, 3.47030078125e+04, 3.855912109375e+04, 4.241509765625e+04, 4.6269625e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 4.949053125e+04, 6.52790703125e+04, 6.913440625e+04, 7.29883828125e+04, 7.68414453125e+04, 8.06947265625e+04, 8.45479921875e+04, 8.8407140625e+04, 9.22801328125e+04, 9.61629140625e+04, 1.000299765625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.032486640625e+05, 1.198953125e+05, 1.3393446875e+05, 1.48702265625e+05, 1.6799415625e+05, 1.81548015625e+05, 2.0066484375e+05, 2.1996371875e+05, 2.3934334375e+05, 2.56985234375e+05, 2.63072875e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.6648609375e+05, 2.845855625e+05, 2.9841665625e+05, 3.1771321875e+05, 3.37005e+05, 3.5500534375e+05, 3.71558625e+05, 3.9091353125e+05, 4.103094375e+05, 4.2941328125e+05, 4.3635384375e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.39864e+05, 4.5880121875e+05, 4.72213375e+05, 4.915425625e+05, 5.1084196875e+05, 5.30113875e+05, 5.49348375e+05, 5.68715125e+05, 5.881156875e+05, 6.07423125e+05, 6.143676875e+05, 6.177433125e+05, 6.177433125e+05, 6.177433125e+05, 6.177433125e+05, 6.177433125e+05]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.951507866382599e-01, 3.130295276641846e-01, 3.206693828105927e-01, 3.206325471401215e-01, 3.149733543395996e-01, 3.187950849533081e-01, 3.391874134540558e-01, 3.559437096118927e-01, 3.274239599704742e-01, 3.150059282779694e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.040866553783417e-01, 3.401826024055481e-01, 3.39058518409729e-01, 3.275282382965088e-01, 3.343942165374756e-01, 3.418198525905609e-01, 3.627618551254272e-01, 3.737976849079132e-01, 3.749964833259583e-01, 3.559428155422211e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.637431204319e-01, 1e+00, 1e+00, 1e+00, 9.482072591781616e-01, 1e+00, 1e+00, 1e+00, 6.050510406494141e-01, 4.072964489459991e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.929890513420105e-01, 1e+00, 1e+00, 1e+00, 8.129538297653198e-01, 1e+00, 1e+00, 1e+00, 8.937157988548279e-01, 4.933783411979675e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.595019578933716e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.662431716918945e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 5.999838709831238e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.324947893619537e-01, 4.649197161197662e-01, 4.684916734695435e-01, 4.684310257434845e-01, 4.679633975028992e-01, 4.686447978019714e-01, 4.705103635787964e-01, 4.72462922334671e-01, 4.699635803699493e-01, 4.681457579135895e-01, 5.771949887275696e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.288373291492462e-01, 4.677050113677979e-01, 4.706118106842041e-01, 4.692103564739227e-01, 4.691462516784668e-01, 4.698233008384705e-01, 4.720324575901031e-01, 4.736880958080292e-01, 4.741300344467163e-01, 4.724681973457336e-01, 5.792728662490845e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.559060037136078e-01, 5.724095106124878e-01, 7.347272038459778e-01, 5.962058901786804e-01, 6.772615909576416e-01, 6.318451166152954e-01, 6.851069927215576e-01, 7.66148567199707e-01, 3.587872684001923e-01, 5.119348168373108e-01, 6.004416346549988e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.299945533275604e-01, 6.894184947013855e-01, 6.48038923740387e-01, 6.709492802619934e-01, 5.120254158973694e-01, 7.207294106483459e-01, 7.705317735671997e-01, 7.777779698371887e-01, 3.723235726356506e-01, 4.580008983612061e-01, 6.329295635223389e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.399965405464172e-01, 7.164386510848999e-01, 6.760666966438293e-01, 7.046805620193481e-01, 5.698612332344055e-01, 7.588505744934082e-01, 7.4598228931427e-01, 8.672451972961426e-01, 4.103752076625824e-01, 5.153143405914307e-01, 6.125823259353638e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 5.999846458435059e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.300040602684021e-01, 4.647674262523651e-01, 4.684830605983734e-01, 5.089714527130127e-01, 4.929457008838654e-01, 5.237827301025391e-01, 5.97882091999054e-01, 6.015140414237976e-01, 5.57827889919281e-01, 4.8725426197052e-01, 5.790409445762634e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.321016669273376e-01, 4.690567851066589e-01, 4.706907570362091e-01, 5.22312343120575e-01, 5.62214195728302e-01, 5.799909234046936e-01, 5.687456130981445e-01, 5.405837893486023e-01, 5.340319275856018e-01, 5.060736536979675e-01, 5.830706357955933e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.860349297523499e-01, 9.374967813491821e-01, 1e+00, 9.702808260917664e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.797936081886292e-01, 6.174901127815247e-01, 7.391392588615417e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.74987655878067e-01, 1e+00, 7.913892269134521e-01, 1e+00, 6.668907999992371e-01, 1e+00, 1e+00, 1e+00, 5.40688693523407e-01, 5.660502314567566e-01, 7.895041704177856e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.069862008094788e-01, 1e+00, 1e+00, 1e+00, 9.398197531700134e-01, 1e+00, 1e+00, 1e+00, 6.673769354820251e-01, 7.435608506202698e-01, 7.888882756233215e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 5.511379837989807e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.386756420135498e-01, 4.719198644161224e-01, 5.345650315284729e-01, 4.839679896831512e-01, 4.54052597284317e-01, 4.527335464954376e-01, 4.586750566959381e-01, 4.638963341712952e-01, 4.546118974685669e-01, 4.521715641021729e-01, 5.522807836532593e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.529908895492554e-01, 6.758406758308411e-01, 6.443378329277039e-01, 5.23699939250946e-01, 5.012868046760559e-01, 5.123415589332581e-01, 5.231853127479553e-01, 5.0990229845047e-01, 4.978899955749512e-01, 4.708884060382843e-01, 5.558688044548035e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.248345732688904e-01, 1e+00, 1e+00, 6.388773322105408e-01, 7.66814112663269e-01, 7.007445693016052e-01, 7.615797519683838e-01, 8.10530960559845e-01, 4.371022880077362e-01, 5.61220645904541e-01, 6.547397971153259e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.21780788898468e-01, 1e+00, 1e+00, 7.673083543777466e-01, 5.737837553024292e-01, 7.648069262504578e-01, 8.336043357849121e-01, 7.945283055305481e-01, 4.708200693130493e-01, 4.700668454170227e-01, 6.660247445106506e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.758910775184631e-01, 1e+00, 7.731205224990845e-01, 8.030620217323303e-01, 6.434583067893982e-01, 8.169874548912048e-01, 8.041578531265259e-01, 8.502107262611389e-01, 5.21465003490448e-01, 5.365095138549805e-01, 6.748363375663757e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 5.999846458435059e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.361248314380646e-01, 4.651409983634949e-01, 4.685047566890717e-01, 4.684320092201233e-01, 4.67963695526123e-01, 4.686450660228729e-01, 4.705106019973755e-01, 4.724631607532501e-01, 4.699638485908508e-01, 4.68146026134491e-01, 5.771953463554382e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.336329400539398e-01, 4.685617089271545e-01, 4.706619679927826e-01, 4.692134857177734e-01, 4.691466689109802e-01, 4.698986709117889e-01, 4.932653903961182e-01, 4.906457960605621e-01, 4.88932192325592e-01, 5.049103498458862e-01, 5.854402780532837e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.840872883796692e-01, 8.610519170761108e-01, 9.668547511100769e-01, 7.117769718170166e-01, 8.975578546524048e-01, 8.02669882774353e-01, 9.783691763877869e-01, 1e+00, 4.404511153697968e-01, 6.032483577728271e-01, 7.153893709182739e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.730398654937744e-01, 1e+00, 7.707903385162354e-01, 8.847139477729797e-01, 6.210409998893738e-01, 1e+00, 1e+00, 1e+00, 4.84853059053421e-01, 5.381717085838318e-01, 7.709870934486389e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.021594762802124e-01, 1e+00, 8.42029333114624e-01, 9.999961256980896e-01, 7.031117081642151e-01, 1e+00, 1e+00, 1e+00, 5.874645709991455e-01, 6.620145440101624e-01, 7.590233683586121e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 5.511379837989807e-01, 1e+00, 1e+00, 1e+00, 1e+00, 4.182084202766418e-01, 4.487828314304352e-01, 4.524155557155609e-01, 4.523961544036865e-01, 4.51929122209549e-01, 4.525992274284363e-01, 5.339328050613403e-01, 6.342819333076477e-01, 4.809796214103699e-01, 4.537920951843262e-01, 5.524519681930542e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.131010174751282e-01, 4.518787264823914e-01, 4.701887965202332e-01, 4.585987329483032e-01, 4.928924143314362e-01, 5.179644823074341e-01, 6.378539204597473e-01, 7.595086693763733e-01, 7.956542372703552e-01, 6.900948882102966e-01, 6.480746269226074e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.520609676837921e-01, 6.062896847724915e-01, 7.454673051834106e-01, 6.269325613975525e-01, 7.200906276702881e-01, 6.763086318969727e-01, 8.715642094612122e-01, 1e+00, 4.951335489749908e-01, 6.724753975868225e-01, 7.121261954307556e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.23842191696167e-01, 6.571662425994873e-01, 6.509761214256287e-01, 6.853671073913574e-01, 5.4273921251297e-01, 7.204192280769348e-01, 1e+00, 1e+00, 6.121136546134949e-01, 6.666127443313599e-01, 7.38091766834259e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.456362724304199e-01, 6.817827224731445e-01, 6.933931112289429e-01, 7.40456223487854e-01, 6.228694915771484e-01, 7.784107327461243e-01, 9.479576349258423e-01, 1e+00, 6.918817758560181e-01, 6.218443512916565e-01, 6.896576881408691e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 6.425014138221741e-01, 6.332735419273376e-01, 6.297131776809692e-01, 6.469933390617371e-01, 6.351941227912903e-01, 6.014029979705811e-01, 5.789417624473572e-01, 6.110711693763733e-01, 6.393722295761108e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.473541021347046e-01, 5.924637913703918e-01, 5.941323637962341e-01, 6.120705008506775e-01, 6.050369739532471e-01, 5.930491089820862e-01, 5.701524019241333e-01, 5.584235787391663e-01, 5.558331608772278e-01, 5.732952952384949e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.849474728107452e-01, 3.524367809295654e-01, 3.601163327693939e-01, 3.552730083465576e-01, 3.714072704315186e-01, 3.533880710601807e-01, 3.504094481468201e-01, 3.488488495349884e-01, 4.525399804115295e-01, 5.202303528785706e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.244978427886963e-01, 3.504060506820679e-01, 3.526967763900757e-01, 3.514499664306641e-01, 3.933325707912445e-01, 3.50498229265213e-01, 3.492065370082855e-01, 3.492273688316345e-01, 3.832345008850098e-01, 4.540703296661377e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.874154090881348e-01, 3.503811359405518e-01, 3.517074882984161e-01, 3.509827852249146e-01, 3.560703098773956e-01, 3.498570322990417e-01, 3.496996462345123e-01, 3.488191366195679e-01, 3.6268150806427e-01, 4.28714394569397e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931502075195312e+02, 2.931493225097656e+02, 2.931484985351562e+02, 2.931481628417969e+02, 2.931480712890625e+02, 2.848643798828125e+02, 2.85375244140625e+02, 2.852698974609375e+02, 2.851347045898438e+02, 2.853130187988281e+02, 2.855601806640625e+02, 2.858091735839844e+02, 2.859573669433594e+02, 2.857621459960938e+02, 2.852528381347656e+02, 2.853318176269531e+02, 2.853309631347656e+02, 2.853303527832031e+02, 2.853306884765625e+02, 2.853316650390625e+02, 2.853305053710938e+02, 2.853304748535156e+02, 2.853306274414062e+02, 2.853297729492188e+02, 2.853304443359375e+02, 2.846567993164062e+02, 2.853608093261719e+02, 2.855591735839844e+02, 2.856341247558594e+02, 2.857577819824219e+02, 2.859466857910156e+02, 2.860753479003906e+02, 2.860235900878906e+02, 2.860830078125e+02, 2.857433471679688e+02, 2.855313110351562e+02, 2.855314636230469e+02, 2.855341491699219e+02, 2.855340576171875e+02, 2.85532958984375e+02, 2.855324096679688e+02, 2.85531494140625e+02, 2.855307312011719e+02, 2.855305480957031e+02, 2.855303649902344e+02, 2.8565869140625e+02, 2.893241271972656e+02, 2.894105834960938e+02, 2.893376159667969e+02, 2.891521606445312e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.86179931640625e+02, 2.857276611328125e+02, 2.85862548828125e+02, 2.858633728027344e+02, 2.858649291992188e+02, 2.85863525390625e+02, 2.858646850585938e+02, 2.85864013671875e+02, 2.858636779785156e+02, 2.858641052246094e+02, 2.858626708984375e+02, 2.858643188476562e+02, 2.867350158691406e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.89393798828125e+02, 2.881900634765625e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990539550781e+02, 2.881945190429688e+02, 2.860501098632812e+02, 2.86108154296875e+02, 2.861082153320312e+02, 2.861111450195312e+02, 2.861103210449219e+02, 2.861099243164062e+02, 2.861098022460938e+02, 2.861096801757812e+02, 2.861092224121094e+02, 2.861082763671875e+02, 2.86108154296875e+02, 2.879279174804688e+02, 2.892091064453125e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205688476562e+02, 2.896686401367188e+02, 2.892865295410156e+02, 2.868428649902344e+02, 2.864220581054688e+02, 2.864236450195312e+02, 2.864219360351562e+02, 2.864231872558594e+02, 2.864232177734375e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931502380371094e+02, 2.931496276855469e+02, 2.931488342285156e+02, 2.931484985351562e+02, 2.931484375e+02, 2.848646850585938e+02, 2.853752136230469e+02, 2.852698669433594e+02, 2.851347351074219e+02, 2.853128662109375e+02, 2.855601196289062e+02, 2.858091430664062e+02, 2.859572143554688e+02, 2.857621459960938e+02, 2.852529602050781e+02, 2.853257446289062e+02, 2.853251342773438e+02, 2.853244934082031e+02, 2.853248596191406e+02, 2.853258361816406e+02, 2.853246765136719e+02, 2.853246459960938e+02, 2.853247985839844e+02, 2.853239135742188e+02, 2.853246154785156e+02, 2.846551208496094e+02, 2.853610534667969e+02, 2.855591735839844e+02, 2.856341247558594e+02, 2.857577514648438e+02, 2.859466247558594e+02, 2.860753479003906e+02, 2.860235900878906e+02, 2.860830383300781e+02, 2.857434387207031e+02, 2.855246276855469e+02, 2.855247497558594e+02, 2.855274353027344e+02, 2.855273742675781e+02, 2.855262145996094e+02, 2.855256958007812e+02, 2.855247497558594e+02, 2.855239868164062e+02, 2.855238037109375e+02, 2.855235900878906e+02, 2.856583862304688e+02, 2.893241271972656e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891519470214844e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.861808776855469e+02, 2.857268981933594e+02, 2.858267822265625e+02, 2.858273620605469e+02, 2.858289794921875e+02, 2.858275451660156e+02, 2.858287353515625e+02, 2.858280334472656e+02, 2.858276672363281e+02, 2.85828125e+02, 2.858266906738281e+02, 2.85828369140625e+02, 2.867341613769531e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.893937683105469e+02, 2.881902465820312e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990234375e+02, 2.881971740722656e+02, 2.860539855957031e+02, 2.860584411621094e+02, 2.860583801269531e+02, 2.860613708496094e+02, 2.86060546875e+02, 2.860601196289062e+02, 2.860599670410156e+02, 2.860598754882812e+02, 2.860594177246094e+02, 2.860584411621094e+02, 2.860583190917969e+02, 2.879263000488281e+02, 2.892091064453125e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686096191406e+02, 2.892870178222656e+02, 2.868479309082031e+02, 2.863752746582031e+02, 2.86376220703125e+02, 2.8637451171875e+02, 2.863757629394531e+02, 2.863758239746094e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931502075195312e+02, 2.931493225097656e+02, 2.931485290527344e+02, 2.931481628417969e+02, 2.931480712890625e+02, 2.848645935058594e+02, 2.85375244140625e+02, 2.852698974609375e+02, 2.851347351074219e+02, 2.853129272460938e+02, 2.855601196289062e+02, 2.858091430664062e+02, 2.859572448730469e+02, 2.857621459960938e+02, 2.852528991699219e+02, 2.853312072753906e+02, 2.853303833007812e+02, 2.853297729492188e+02, 2.853301086425781e+02, 2.853310546875e+02, 2.853299255371094e+02, 2.853298950195312e+02, 2.853300476074219e+02, 2.853291931152344e+02, 2.853298645019531e+02, 2.846566467285156e+02, 2.853608093261719e+02, 2.855591735839844e+02, 2.856340942382812e+02, 2.857577209472656e+02, 2.859465942382812e+02, 2.860753784179688e+02, 2.860235900878906e+02, 2.860830383300781e+02, 2.857433471679688e+02, 2.855321655273438e+02, 2.855323181152344e+02, 2.855349731445312e+02, 2.855348815917969e+02, 2.855337524414062e+02, 2.855332336425781e+02, 2.855322875976562e+02, 2.855315551757812e+02, 2.855313720703125e+02, 2.855311889648438e+02, 2.8565869140625e+02, 2.893241271972656e+02, 2.894105834960938e+02, 2.893376159667969e+02, 2.89152099609375e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.861807861328125e+02, 2.857275085449219e+02, 2.858516845703125e+02, 2.858524169921875e+02, 2.8585400390625e+02, 2.858526000976562e+02, 2.85853759765625e+02, 2.858530883789062e+02, 2.858527221679688e+02, 2.858531494140625e+02, 2.858517456054688e+02, 2.858533935546875e+02, 2.867350463867188e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.89393798828125e+02, 2.881901245117188e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990539550781e+02, 2.88196533203125e+02, 2.86051025390625e+02, 2.861006164550781e+02, 2.861006469726562e+02, 2.861035766601562e+02, 2.861027526855469e+02, 2.861023559570312e+02, 2.861022033691406e+02, 2.861021118164062e+02, 2.861016540527344e+02, 2.861006774902344e+02, 2.861005859375e+02, 2.879280395507812e+02, 2.892091064453125e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205688476562e+02, 2.896686401367188e+02, 2.892867431640625e+02, 2.868440856933594e+02, 2.864098205566406e+02, 2.864112548828125e+02, 2.864095458984375e+02, 2.864107666015625e+02, 2.864108276367188e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931502685546875e+02, 2.931495971679688e+02, 2.931487426757812e+02, 2.931483459472656e+02, 2.931482543945312e+02, 2.848639221191406e+02, 2.853752746582031e+02, 2.852698974609375e+02, 2.851347351074219e+02, 2.853128662109375e+02, 2.855601196289062e+02, 2.858091735839844e+02, 2.859573974609375e+02, 2.857621459960938e+02, 2.852529602050781e+02, 2.853258056640625e+02, 2.853251953125e+02, 2.853245544433594e+02, 2.853248901367188e+02, 2.853258666992188e+02, 2.8532470703125e+02, 2.853246765136719e+02, 2.853248596191406e+02, 2.85323974609375e+02, 2.853246459960938e+02, 2.846586608886719e+02, 2.853607482910156e+02, 2.855591735839844e+02, 2.856340942382812e+02, 2.857577514648438e+02, 2.859466247558594e+02, 2.860753479003906e+02, 2.860235900878906e+02, 2.860829467773438e+02, 2.857430725097656e+02, 2.855596618652344e+02, 2.855598449707031e+02, 2.855625610351562e+02, 2.855624694824219e+02, 2.855613098144531e+02, 2.85560791015625e+02, 2.855598449707031e+02, 2.8555908203125e+02, 2.855588989257812e+02, 2.855587158203125e+02, 2.856590270996094e+02, 2.893241577148438e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891518249511719e+02, 2.893955383300781e+02, 2.894342041015625e+02, 2.895083618164062e+02, 2.861796569824219e+02, 2.857281799316406e+02, 2.858545532226562e+02, 2.858553161621094e+02, 2.858569030761719e+02, 2.858554992675781e+02, 2.858566589355469e+02, 2.858559875488281e+02, 2.858556213378906e+02, 2.858560485839844e+02, 2.858546142578125e+02, 2.858562927246094e+02, 2.867362060546875e+02, 2.891605224609375e+02, 2.892463684082031e+02, 2.893937683105469e+02, 2.881903381347656e+02, 2.895105285644531e+02, 2.895826721191406e+02, 2.894990539550781e+02, 2.881926879882812e+02, 2.860478515625e+02, 2.860906066894531e+02, 2.860906066894531e+02, 2.860936279296875e+02, 2.860927734375e+02, 2.860923767089844e+02, 2.860922241210938e+02, 2.860921325683594e+02, 2.860916442871094e+02, 2.860906677246094e+02, 2.86090576171875e+02, 2.87929931640625e+02, 2.892090759277344e+02, 2.89284423828125e+02, 2.894944458007812e+02, 2.894512939453125e+02, 2.894741516113281e+02, 2.895205688476562e+02, 2.896686401367188e+02, 2.892864990234375e+02, 2.868450012207031e+02, 2.863820495605469e+02, 2.863831176757812e+02, 2.863813781738281e+02, 2.863826293945312e+02, 2.863826904296875e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931501770019531e+02, 2.931492614746094e+02, 2.931484375e+02, 2.931480712890625e+02, 2.931480102539062e+02, 2.848644409179688e+02, 2.85375244140625e+02, 2.852698974609375e+02, 2.851347351074219e+02, 2.853129272460938e+02, 2.855601196289062e+02, 2.858091430664062e+02, 2.859572448730469e+02, 2.857621459960938e+02, 2.852528991699219e+02, 2.853312072753906e+02, 2.853303833007812e+02, 2.853297729492188e+02, 2.853301086425781e+02, 2.853310546875e+02, 2.853299255371094e+02, 2.853298950195312e+02, 2.853300476074219e+02, 2.853291931152344e+02, 2.853298645019531e+02, 2.846570739746094e+02, 2.853608093261719e+02, 2.855591735839844e+02, 2.856340942382812e+02, 2.857577209472656e+02, 2.859465942382812e+02, 2.860753784179688e+02, 2.860235900878906e+02, 2.860830688476562e+02, 2.857434387207031e+02, 2.855299682617188e+02, 2.855300903320312e+02, 2.855327453613281e+02, 2.855326538085938e+02, 2.855315551757812e+02, 2.85531005859375e+02, 2.855300903320312e+02, 2.855293579101562e+02, 2.855291748046875e+02, 2.855289916992188e+02, 2.856589660644531e+02, 2.893241577148438e+02, 2.894105834960938e+02, 2.89337646484375e+02, 2.891516723632812e+02, 2.893955383300781e+02, 2.894341735839844e+02, 2.895083618164062e+02, 2.861832885742188e+02, 2.857259521484375e+02, 2.857971801757812e+02, 2.857976379394531e+02, 2.857992248535156e+02, 2.857978210449219e+02, 2.857989807128906e+02, 2.857983093261719e+02, 2.857979431152344e+02, 2.857983703613281e+02, 2.857969665527344e+02, 2.857986145019531e+02, 2.867360534667969e+02, 2.891605224609375e+02, 2.89246337890625e+02, 2.893937683105469e+02, 2.881904296875e+02, 2.895105285644531e+02, 2.895827026367188e+02, 2.894990234375e+02, 2.882029113769531e+02, 2.860546569824219e+02, 2.860392150878906e+02, 2.860391845703125e+02, 2.860420837402344e+02, 2.86041259765625e+02, 2.860408630371094e+02, 2.860407104492188e+02, 2.860406188964844e+02, 2.860401611328125e+02, 2.860391845703125e+02, 2.860390930175781e+02, 2.879301452636719e+02, 2.892090759277344e+02, 2.89284423828125e+02, 2.894944152832031e+02, 2.894513244628906e+02, 2.894741516113281e+02, 2.895205383300781e+02, 2.896686096191406e+02, 2.892877197265625e+02, 2.868489074707031e+02, 2.863421630859375e+02, 2.863428039550781e+02, 2.863410949707031e+02, 2.863423461914062e+02, 2.863423767089844e+02]
+hvac.res.EFan=[0e+00, -1.345491341453453e-06, -1.344676775261178e-06, -1.343558096777997e-06, -1.343059238934075e-06, -1.342924520031374e-06, 1.15658818359375e+04, 1.54268408203125e+04, 1.928281640625e+04, 2.31376640625e+04, 2.6993765625e+04, 3.0849103515625e+04, 3.47028984375e+04, 3.85590078125e+04, 4.2414984375e+04, 4.626951171875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 4.949041796875e+04, 6.527903125e+04, 6.91343671875e+04, 7.298834375e+04, 7.684140625e+04, 8.06946875e+04, 8.4547953125e+04, 8.84071015625e+04, 9.228009375e+04, 9.6162875e+04, 1.000299375e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.03248625e+05, 1.198953671875e+05, 1.33934453125e+05, 1.48702109375e+05, 1.67993984375e+05, 1.8154775e+05, 2.00664671875e+05, 2.19963546875e+05, 2.39343171875e+05, 2.56985046875e+05, 2.6307265625e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.66485875e+05, 2.845854375e+05, 2.9841653125e+05, 3.1771309375e+05, 3.37004875e+05, 3.5500521875e+05, 3.715585e+05, 3.9091340625e+05, 4.103093125e+05, 4.294131875e+05, 4.3635375e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.3986390625e+05, 4.5880103125e+05, 4.7221321875e+05, 4.9154240625e+05, 5.1084178125e+05, 5.301136875e+05, 5.493481875e+05, 5.687149375e+05, 5.881155625e+05, 6.074229375e+05, 6.143675e+05, 6.177431875e+05, 6.177431875e+05, 6.177431875e+05, 6.177431875e+05, 6.177431875e+05]
 hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -7.2249578125e+04, -1.49016015625e+05, -2.53484265625e+05, -3.7143028125e+05, -4.8775390625e+05, -6.13558e+05, -7.473618125e+05, -8.880349375e+05, -1.02825825e+06, -1.1575875e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.408594375e+06, -1.5315005e+06, -1.662268e+06, -1.793038875e+06, -1.9259245e+06, -2.063762375e+06, -2.207671e+06, -2.3515925e+06, -2.49699975e+06, -2.63789675e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.746969e+06, -2.91290275e+06, -3.1172785e+06, -3.32258025e+06, -3.53776025e+06, -3.739604e+06, -3.954394e+06, -4.16853475e+06, -4.3874495e+06, -4.5903255e+06, -4.74978e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -4.8711585e+06, -5.04198e+06, -5.2393895e+06, -5.450181e+06, -5.663937e+06, -5.874183e+06, -6.0870925e+06, -6.308315e+06, -6.525666e+06, -6.739166e+06, -6.9121115e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.038383e+06, -7.211134e+06, -7.4091765e+06, -7.6228715e+06, -7.837693e+06, -8.0573865e+06, -8.2764325e+06, -8.492929e+06, -8.711993e+06, -8.934688e+06, -9.117061e+06, -9.247745e+06, -9.247745e+06, -9.247745e+06, -9.247745e+06, -9.247745e+06]
+hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -7.224965625e+04, -1.49016e+05, -2.5348425e+05, -3.7143025e+05, -4.8775390625e+05, -6.13558e+05, -7.473618125e+05, -8.880349375e+05, -1.02825825e+06, -1.157587375e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.258843125e+06, -1.408594e+06, -1.531499875e+06, -1.6622675e+06, -1.793038375e+06, -1.925923875e+06, -2.063761875e+06, -2.2076705e+06, -2.351592e+06, -2.49699925e+06, -2.63789625e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.7469685e+06, -2.91290475e+06, -3.11728e+06, -3.3225815e+06, -3.53776125e+06, -3.73960525e+06, -3.954395e+06, -4.16853575e+06, -4.3874505e+06, -4.5903265e+06, -4.749781e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -4.8711595e+06, -5.04198e+06, -5.2393895e+06, -5.450181e+06, -5.6639375e+06, -5.874183e+06, -6.087093e+06, -6.3083155e+06, -6.525666e+06, -6.739166e+06, -6.912112e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.0383835e+06, -7.2111345e+06, -7.409177e+06, -7.622872e+06, -7.8376935e+06, -8.057387e+06, -8.276433e+06, -8.492929e+06, -8.711993e+06, -8.934689e+06, -9.117061e+06, -9.247746e+06, -9.247746e+06, -9.247746e+06, -9.247746e+06, -9.247746e+06]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Winter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Winter.txt
index 5e2b8b6b048..97836439d07 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Winter.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_ASHRAE2006Winter.txt
@@ -1,37 +1,37 @@
-last-generated=2023-03-03
+last-generated=2024-03-23
 statistics-initialization=
 {
-  "linear": "0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "1, 3, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1, 1, 0, 0, 1, 1",
+  "linear": "0",
+  "nonlinear": "1, 3, 0, 0, 1, 1, 0, 2, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
   "nonlinear": "0, 5, 0, 0, 0, 2, 0, 0, 1, 0, 0, 1, 1, 1",
-  "number of continuous time states": "85",
+  "number of continuous time states": "91",
   "numerical Jacobians": "0"
 }
 time=[4.32e+05, 8.64e+05]
-flo.sou.TAir=[2.931499938964844e+02, 2.928681335449219e+02, 2.924318542480469e+02, 2.919773559570312e+02, 2.915499877929688e+02, 2.879010314941406e+02, 2.929856872558594e+02, 2.934678039550781e+02, 2.942940368652344e+02, 2.943971252441406e+02, 2.938643798828125e+02, 2.936114196777344e+02, 2.935550842285156e+02, 2.935027160644531e+02, 2.931676025390625e+02, 2.931295776367188e+02, 2.915635375976562e+02, 2.909965515136719e+02, 2.906375732421875e+02, 2.901402282714844e+02, 2.896539611816406e+02, 2.891666259765625e+02, 2.888410034179688e+02, 2.884888610839844e+02, 2.88187255859375e+02, 2.923905944824219e+02, 2.905790710449219e+02, 2.9184228515625e+02, 2.93021484375e+02, 2.932590637207031e+02, 2.932239685058594e+02, 2.931541442871094e+02, 2.931038513183594e+02, 2.930555114746094e+02, 2.927264709472656e+02, 2.922473754882812e+02, 2.901192016601562e+02, 2.896575012207031e+02, 2.892042541503906e+02, 2.88880859375e+02, 2.886005249023438e+02, 2.882435607910156e+02, 2.880784301757812e+02, 2.878335571289062e+02, 2.875744018554688e+02, 2.91574462890625e+02, 2.89871337890625e+02, 2.909234924316406e+02, 2.919458923339844e+02, 2.925783996582031e+02, 2.929437255859375e+02, 2.932130126953125e+02, 2.928540649414062e+02, 2.931015625e+02, 2.924330749511719e+02, 2.921163635253906e+02, 2.893868408203125e+02, 2.889342956542969e+02, 2.884759216308594e+02, 2.879019775390625e+02, 2.878306884765625e+02, 2.876651611328125e+02, 2.873498229980469e+02, 2.87345703125e+02, 2.871341247558594e+02, 2.914645385742188e+02, 2.906442565917969e+02, 2.922250671386719e+02, 2.932701110839844e+02, 2.931046142578125e+02, 2.932909240722656e+02, 2.933104553222656e+02, 2.933385620117188e+02, 2.930940856933594e+02, 2.931383361816406e+02, 2.931761169433594e+02, 2.912832336425781e+02, 2.909548950195312e+02, 2.908470458984375e+02, 2.908894348144531e+02, 2.907090759277344e+02, 2.903351135253906e+02, 2.903711853027344e+02, 2.902293701171875e+02, 2.900897216796875e+02, 2.9197998046875e+02, 2.923567810058594e+02, 2.934721069335938e+02, 2.939683532714844e+02, 2.946038208007812e+02, 2.949250793457031e+02, 2.951832275390625e+02, 2.949650268554688e+02, 2.946621704101562e+02, 2.940813598632812e+02, 2.92955322265625e+02, 2.927147827148438e+02, 2.923252868652344e+02, 2.923266906738281e+02, 2.920805053710938e+02, 2.915798645019531e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.926209411621094e+02, 2.921845703125e+02, 2.917418212890625e+02, 2.913146362304688e+02, 2.875089416503906e+02, 2.930745849609375e+02, 2.933553771972656e+02, 2.934024047851562e+02, 2.932339477539062e+02, 2.930966491699219e+02, 2.932766723632812e+02, 2.931521301269531e+02, 2.931406860351562e+02, 2.931369323730469e+02, 2.931225891113281e+02, 2.911814880371094e+02, 2.907442321777344e+02, 2.903969421386719e+02, 2.898890991210938e+02, 2.894013366699219e+02, 2.889349975585938e+02, 2.886243591308594e+02, 2.882863159179688e+02, 2.879961853027344e+02, 2.925057067871094e+02, 2.906954040527344e+02, 2.921034545898438e+02, 2.927854614257812e+02, 2.927212219238281e+02, 2.925567016601562e+02, 2.924010925292969e+02, 2.924508056640625e+02, 2.924550170898438e+02, 2.922701110839844e+02, 2.919665832519531e+02, 2.89347412109375e+02, 2.890993041992188e+02, 2.886776733398438e+02, 2.883779602050781e+02, 2.881448364257812e+02, 2.879089965820312e+02, 2.876884765625e+02, 2.874636840820312e+02, 2.872547302246094e+02, 2.912956237792969e+02, 2.898844604492188e+02, 2.91093994140625e+02, 2.916365051269531e+02, 2.916151428222656e+02, 2.915806274414062e+02, 2.917405395507812e+02, 2.918872680664062e+02, 2.91951904296875e+02, 2.918056945800781e+02, 2.917178955078125e+02, 2.893045043945312e+02, 2.889752807617188e+02, 2.886192932128906e+02, 2.882355346679688e+02, 2.880304260253906e+02, 2.879552917480469e+02, 2.877432556152344e+02, 2.8765625e+02, 2.875245056152344e+02, 2.918366394042969e+02, 2.90700439453125e+02, 2.923954772949219e+02, 2.933716430664062e+02, 2.931700134277344e+02, 2.931638793945312e+02, 2.932373962402344e+02, 2.9316162109375e+02, 2.931492309570312e+02, 2.9313623046875e+02, 2.931372985839844e+02, 2.913644104003906e+02, 2.910626831054688e+02, 2.908470458984375e+02, 2.906594543457031e+02, 2.903804931640625e+02, 2.901509704589844e+02, 2.900800476074219e+02, 2.899211730957031e+02, 2.897782592773438e+02, 2.919443054199219e+02, 2.924073181152344e+02, 2.932780151367188e+02, 2.932522888183594e+02, 2.930797729492188e+02, 2.931665344238281e+02, 2.9336669921875e+02, 2.931687316894531e+02, 2.931088256835938e+02, 2.931055297851562e+02, 2.931368713378906e+02, 2.922483215332031e+02, 2.9196826171875e+02, 2.916841735839844e+02, 2.914320068359375e+02, 2.911537780761719e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.925523376464844e+02, 2.922672119140625e+02, 2.916805725097656e+02, 2.910460510253906e+02, 2.882522888183594e+02, 2.928503723144531e+02, 2.933726196289062e+02, 2.932748413085938e+02, 2.931903381347656e+02, 2.931764526367188e+02, 2.933239135742188e+02, 2.931560974121094e+02, 2.9313916015625e+02, 2.9312548828125e+02, 2.931321105957031e+02, 2.90488525390625e+02, 2.904153137207031e+02, 2.901609191894531e+02, 2.893457946777344e+02, 2.887468872070312e+02, 2.884433898925781e+02, 2.882401428222656e+02, 2.879349975585938e+02, 2.877740783691406e+02, 2.918746643066406e+02, 2.905e+02, 2.912593994140625e+02, 2.913837280273438e+02, 2.914196472167969e+02, 2.920506896972656e+02, 2.919499206542969e+02, 2.920334167480469e+02, 2.921058349609375e+02, 2.919681396484375e+02, 2.91672607421875e+02, 2.887465515136719e+02, 2.889428100585938e+02, 2.884896240234375e+02, 2.881055908203125e+02, 2.880643615722656e+02, 2.879547119140625e+02, 2.877311401367188e+02, 2.875083618164062e+02, 2.873418579101562e+02, 2.912715454101562e+02, 2.896670532226562e+02, 2.901624755859375e+02, 2.905955810546875e+02, 2.909361267089844e+02, 2.911637268066406e+02, 2.913577880859375e+02, 2.914663696289062e+02, 2.915978393554688e+02, 2.914562683105469e+02, 2.913840637207031e+02, 2.89290283203125e+02, 2.889296875e+02, 2.885957641601562e+02, 2.882091674804688e+02, 2.880145874023438e+02, 2.879593505859375e+02, 2.877538452148438e+02, 2.876767578125e+02, 2.875634155273438e+02, 2.916734924316406e+02, 2.904661254882812e+02, 2.919734802246094e+02, 2.928053588867188e+02, 2.929609375e+02, 2.932324829101562e+02, 2.933378601074219e+02, 2.9316552734375e+02, 2.931565551757812e+02, 2.93138671875e+02, 2.930643920898438e+02, 2.914300842285156e+02, 2.910616149902344e+02, 2.908666076660156e+02, 2.906961364746094e+02, 2.904313659667969e+02, 2.901848449707031e+02, 2.899570617675781e+02, 2.896422424316406e+02, 2.894329833984375e+02, 2.920501098632812e+02, 2.921986389160156e+02, 2.931526489257812e+02, 2.932282104492188e+02, 2.932080993652344e+02, 2.932122802734375e+02, 2.934129333496094e+02, 2.931635131835938e+02, 2.931472778320312e+02, 2.930537719726562e+02, 2.931698303222656e+02, 2.922370300292969e+02, 2.9196923828125e+02, 2.916927795410156e+02, 2.914413757324219e+02, 2.91161865234375e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.917459716796875e+02, 2.91454833984375e+02, 2.911013488769531e+02, 2.907650756835938e+02, 2.882129516601562e+02, 2.930032958984375e+02, 2.932590026855469e+02, 2.932534484863281e+02, 2.931759948730469e+02, 2.931209411621094e+02, 2.932714233398438e+02, 2.931776123046875e+02, 2.931513671875e+02, 2.931244812011719e+02, 2.931205139160156e+02, 2.911427307128906e+02, 2.902221069335938e+02, 2.898448181152344e+02, 2.898201599121094e+02, 2.893455505371094e+02, 2.885782775878906e+02, 2.882491455078125e+02, 2.877296752929688e+02, 2.874393920898438e+02, 2.918145141601562e+02, 2.906286926269531e+02, 2.913590087890625e+02, 2.91821044921875e+02, 2.92067138671875e+02, 2.9229931640625e+02, 2.924235229492188e+02, 2.929625244140625e+02, 2.931696166992188e+02, 2.924258728027344e+02, 2.919960021972656e+02, 2.893771362304688e+02, 2.887304992675781e+02, 2.883336181640625e+02, 2.883768920898438e+02, 2.879072570800781e+02, 2.876224670410156e+02, 2.873843078613281e+02, 2.871606750488281e+02, 2.869449157714844e+02, 2.911560668945312e+02, 2.898768920898438e+02, 2.903589172363281e+02, 2.908039245605469e+02, 2.911604309082031e+02, 2.914036865234375e+02, 2.917715148925781e+02, 2.923772583007812e+02, 2.926506652832031e+02, 2.919923400878906e+02, 2.917731018066406e+02, 2.889875183105469e+02, 2.886357727050781e+02, 2.883522033691406e+02, 2.876752624511719e+02, 2.874257507324219e+02, 2.874013671875e+02, 2.871161804199219e+02, 2.870307006835938e+02, 2.87030517578125e+02, 2.913962707519531e+02, 2.906568908691406e+02, 2.918801574707031e+02, 2.928232116699219e+02, 2.933089599609375e+02, 2.931041870117188e+02, 2.932354125976562e+02, 2.932452087402344e+02, 2.931311950683594e+02, 2.930628051757812e+02, 2.931357421875e+02, 2.908099365234375e+02, 2.905373840332031e+02, 2.903773193359375e+02, 2.902550659179688e+02, 2.896949768066406e+02, 2.894498596191406e+02, 2.896223449707031e+02, 2.895577697753906e+02, 2.893790588378906e+02, 2.92197021484375e+02, 2.923821411132812e+02, 2.933070373535156e+02, 2.932008056640625e+02, 2.931832580566406e+02, 2.93181640625e+02, 2.934183654785156e+02, 2.932601623535156e+02, 2.932370300292969e+02, 2.929975280761719e+02, 2.93142822265625e+02, 2.919664001464844e+02, 2.917921142578125e+02, 2.912246398925781e+02, 2.909083557128906e+02, 2.905517578125e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.930859985351562e+02, 2.927267761230469e+02, 2.922844848632812e+02, 2.918276672363281e+02, 2.881939697265625e+02, 2.932597961425781e+02, 2.936461486816406e+02, 2.938855590820312e+02, 2.938768615722656e+02, 2.937404174804688e+02, 2.9384521484375e+02, 2.937234191894531e+02, 2.937161254882812e+02, 2.936318054199219e+02, 2.930260925292969e+02, 2.916036682128906e+02, 2.912645568847656e+02, 2.90958251953125e+02, 2.904189147949219e+02, 2.899014892578125e+02, 2.894543151855469e+02, 2.891763916015625e+02, 2.888297729492188e+02, 2.885734558105469e+02, 2.928130493164062e+02, 2.912276916503906e+02, 2.920975341796875e+02, 2.924854125976562e+02, 2.926210327148438e+02, 2.929137878417969e+02, 2.928109436035156e+02, 2.928930358886719e+02, 2.929745788574219e+02, 2.928204650878906e+02, 2.924874572753906e+02, 2.898282775878906e+02, 2.897185363769531e+02, 2.893094177246094e+02, 2.890301208496094e+02, 2.888291625976562e+02, 2.886143493652344e+02, 2.884037170410156e+02, 2.881799926757812e+02, 2.879789123535156e+02, 2.922454833984375e+02, 2.904365539550781e+02, 2.910162353515625e+02, 2.914790649414062e+02, 2.918555603027344e+02, 2.920941162109375e+02, 2.923175964355469e+02, 2.923595581054688e+02, 2.925157165527344e+02, 2.922940979003906e+02, 2.921960144042969e+02, 2.898524169921875e+02, 2.894931335449219e+02, 2.891381225585938e+02, 2.886694030761719e+02, 2.884916076660156e+02, 2.884096069335938e+02, 2.881572265625e+02, 2.880915832519531e+02, 2.879610900878906e+02, 2.924789733886719e+02, 2.911510620117188e+02, 2.9268408203125e+02, 2.934706726074219e+02, 2.932234191894531e+02, 2.931597900390625e+02, 2.933643493652344e+02, 2.932245178222656e+02, 2.93150146484375e+02, 2.931456298828125e+02, 2.931598205566406e+02, 2.917827453613281e+02, 2.914505615234375e+02, 2.912809753417969e+02, 2.911490478515625e+02, 2.908441162109375e+02, 2.905880737304688e+02, 2.905378723144531e+02, 2.903458557128906e+02, 2.901766967773438e+02, 2.923953857421875e+02, 2.928095092773438e+02, 2.934153747558594e+02, 2.935744323730469e+02, 2.938045654296875e+02, 2.93954345703125e+02, 2.941845703125e+02, 2.940082397460938e+02, 2.939178161621094e+02, 2.9368701171875e+02, 2.930870056152344e+02, 2.927762756347656e+02, 2.925008544921875e+02, 2.921890869140625e+02, 2.919276428222656e+02, 2.916324157714844e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.928681335449219e+02, 2.924318542480469e+02, 2.919773559570312e+02, 2.915499877929688e+02, 2.879010620117188e+02, 2.929856872558594e+02, 2.934678039550781e+02, 2.942940368652344e+02, 2.943971252441406e+02, 2.938643798828125e+02, 2.936114196777344e+02, 2.935550842285156e+02, 2.935027160644531e+02, 2.931676025390625e+02, 2.931295776367188e+02, 2.915635375976562e+02, 2.909965515136719e+02, 2.906375732421875e+02, 2.901402282714844e+02, 2.896539611816406e+02, 2.891666259765625e+02, 2.888410034179688e+02, 2.884888610839844e+02, 2.88187255859375e+02, 2.923905639648438e+02, 2.905790710449219e+02, 2.9184228515625e+02, 2.93021484375e+02, 2.932590637207031e+02, 2.932239685058594e+02, 2.931541442871094e+02, 2.931038513183594e+02, 2.930555114746094e+02, 2.927264709472656e+02, 2.922473754882812e+02, 2.901192016601562e+02, 2.896575012207031e+02, 2.892042541503906e+02, 2.88880859375e+02, 2.886005249023438e+02, 2.882435913085938e+02, 2.880784301757812e+02, 2.878335571289062e+02, 2.875744018554688e+02, 2.91574462890625e+02, 2.89871337890625e+02, 2.909234924316406e+02, 2.919458923339844e+02, 2.925783996582031e+02, 2.929437255859375e+02, 2.932130126953125e+02, 2.928540649414062e+02, 2.931015930175781e+02, 2.924330749511719e+02, 2.921163635253906e+02, 2.893868713378906e+02, 2.889342956542969e+02, 2.884759216308594e+02, 2.879019775390625e+02, 2.878306884765625e+02, 2.876651611328125e+02, 2.873498229980469e+02, 2.87345703125e+02, 2.871341247558594e+02, 2.914644775390625e+02, 2.906442565917969e+02, 2.922250671386719e+02, 2.932701110839844e+02, 2.931046142578125e+02, 2.932909240722656e+02, 2.933104553222656e+02, 2.933385620117188e+02, 2.930940856933594e+02, 2.931383361816406e+02, 2.931761169433594e+02, 2.912832336425781e+02, 2.909548950195312e+02, 2.908470458984375e+02, 2.908894348144531e+02, 2.907090759277344e+02, 2.903350830078125e+02, 2.903711853027344e+02, 2.902293701171875e+02, 2.900897216796875e+02, 2.919799499511719e+02, 2.923567810058594e+02, 2.934720764160156e+02, 2.939683532714844e+02, 2.946038208007812e+02, 2.949250793457031e+02, 2.951832275390625e+02, 2.949650268554688e+02, 2.946621704101562e+02, 2.940813598632812e+02, 2.92955322265625e+02, 2.927147827148438e+02, 2.923252868652344e+02, 2.923266906738281e+02, 2.920806274414062e+02, 2.915798645019531e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.926209411621094e+02, 2.921845703125e+02, 2.917418212890625e+02, 2.913146362304688e+02, 2.875089721679688e+02, 2.930745849609375e+02, 2.933553771972656e+02, 2.934024047851562e+02, 2.932339477539062e+02, 2.930966491699219e+02, 2.932766723632812e+02, 2.931521301269531e+02, 2.931406860351562e+02, 2.931369323730469e+02, 2.931225891113281e+02, 2.911814880371094e+02, 2.907442321777344e+02, 2.903969421386719e+02, 2.898890991210938e+02, 2.894013366699219e+02, 2.889349975585938e+02, 2.886243591308594e+02, 2.882863159179688e+02, 2.879961853027344e+02, 2.925056762695312e+02, 2.906954040527344e+02, 2.921034545898438e+02, 2.927854614257812e+02, 2.927212219238281e+02, 2.925567016601562e+02, 2.924010925292969e+02, 2.924508056640625e+02, 2.924550170898438e+02, 2.922701110839844e+02, 2.919665832519531e+02, 2.89347412109375e+02, 2.890993041992188e+02, 2.886776733398438e+02, 2.883779602050781e+02, 2.881448364257812e+02, 2.879089965820312e+02, 2.876884765625e+02, 2.874636840820312e+02, 2.872547302246094e+02, 2.912956237792969e+02, 2.898844604492188e+02, 2.91093994140625e+02, 2.916365051269531e+02, 2.916151428222656e+02, 2.915806274414062e+02, 2.917405395507812e+02, 2.918872680664062e+02, 2.919519348144531e+02, 2.918056945800781e+02, 2.917178955078125e+02, 2.893045043945312e+02, 2.889752807617188e+02, 2.886192932128906e+02, 2.882355346679688e+02, 2.880304260253906e+02, 2.879552917480469e+02, 2.877432556152344e+02, 2.8765625e+02, 2.875245056152344e+02, 2.918366088867188e+02, 2.90700439453125e+02, 2.923954772949219e+02, 2.933716430664062e+02, 2.931700134277344e+02, 2.931638793945312e+02, 2.932373962402344e+02, 2.9316162109375e+02, 2.931492309570312e+02, 2.9313623046875e+02, 2.931372985839844e+02, 2.913644104003906e+02, 2.910626831054688e+02, 2.908470458984375e+02, 2.906594543457031e+02, 2.903804931640625e+02, 2.901509399414062e+02, 2.900800476074219e+02, 2.899211730957031e+02, 2.897782592773438e+02, 2.919442443847656e+02, 2.924073181152344e+02, 2.932779846191406e+02, 2.932522888183594e+02, 2.930797729492188e+02, 2.931665344238281e+02, 2.9336669921875e+02, 2.931687316894531e+02, 2.931088256835938e+02, 2.931055297851562e+02, 2.931368713378906e+02, 2.922483215332031e+02, 2.9196826171875e+02, 2.916841735839844e+02, 2.914320068359375e+02, 2.911537780761719e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.925523376464844e+02, 2.922672119140625e+02, 2.916805725097656e+02, 2.910460510253906e+02, 2.882523193359375e+02, 2.928503723144531e+02, 2.933726196289062e+02, 2.932748413085938e+02, 2.931903381347656e+02, 2.931764526367188e+02, 2.933239135742188e+02, 2.931560974121094e+02, 2.9313916015625e+02, 2.9312548828125e+02, 2.931321105957031e+02, 2.90488525390625e+02, 2.904153137207031e+02, 2.901609191894531e+02, 2.893457946777344e+02, 2.887468872070312e+02, 2.884433898925781e+02, 2.882401428222656e+02, 2.879349975585938e+02, 2.877740783691406e+02, 2.918746337890625e+02, 2.905e+02, 2.912594299316406e+02, 2.913837280273438e+02, 2.91419677734375e+02, 2.920506591796875e+02, 2.919499206542969e+02, 2.920334167480469e+02, 2.921058349609375e+02, 2.919681396484375e+02, 2.91672607421875e+02, 2.887465515136719e+02, 2.889428100585938e+02, 2.884896240234375e+02, 2.881055908203125e+02, 2.880643615722656e+02, 2.879547119140625e+02, 2.877311401367188e+02, 2.875083618164062e+02, 2.873418579101562e+02, 2.912715454101562e+02, 2.896670532226562e+02, 2.901624755859375e+02, 2.905955810546875e+02, 2.909361267089844e+02, 2.911637268066406e+02, 2.913577880859375e+02, 2.914663696289062e+02, 2.915978393554688e+02, 2.914562683105469e+02, 2.913840637207031e+02, 2.892903137207031e+02, 2.889296875e+02, 2.885957641601562e+02, 2.882091674804688e+02, 2.880145874023438e+02, 2.879593505859375e+02, 2.877538452148438e+02, 2.876767578125e+02, 2.875634155273438e+02, 2.916734313964844e+02, 2.904661254882812e+02, 2.919734802246094e+02, 2.928053588867188e+02, 2.929609375e+02, 2.932324829101562e+02, 2.933378601074219e+02, 2.9316552734375e+02, 2.931565551757812e+02, 2.93138671875e+02, 2.930643920898438e+02, 2.914300842285156e+02, 2.910616149902344e+02, 2.908666076660156e+02, 2.906961364746094e+02, 2.904313659667969e+02, 2.901848449707031e+02, 2.899570617675781e+02, 2.896422424316406e+02, 2.894329833984375e+02, 2.920500793457031e+02, 2.921986389160156e+02, 2.931526489257812e+02, 2.932282104492188e+02, 2.932080993652344e+02, 2.932122802734375e+02, 2.934129333496094e+02, 2.931635131835938e+02, 2.931472778320312e+02, 2.930537719726562e+02, 2.931698608398438e+02, 2.922370300292969e+02, 2.9196923828125e+02, 2.916927795410156e+02, 2.914413452148438e+02, 2.91161865234375e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.917459716796875e+02, 2.91454833984375e+02, 2.911013488769531e+02, 2.907650756835938e+02, 2.882129516601562e+02, 2.930032958984375e+02, 2.932590026855469e+02, 2.932534484863281e+02, 2.931759948730469e+02, 2.931209411621094e+02, 2.932714233398438e+02, 2.931776123046875e+02, 2.931513671875e+02, 2.931244812011719e+02, 2.931205139160156e+02, 2.911427307128906e+02, 2.902221069335938e+02, 2.898448181152344e+02, 2.898201599121094e+02, 2.893455505371094e+02, 2.885782775878906e+02, 2.882491455078125e+02, 2.877296752929688e+02, 2.874393920898438e+02, 2.918144836425781e+02, 2.906286926269531e+02, 2.913590087890625e+02, 2.91821044921875e+02, 2.92067138671875e+02, 2.9229931640625e+02, 2.924235229492188e+02, 2.929625244140625e+02, 2.931696166992188e+02, 2.924258728027344e+02, 2.919960021972656e+02, 2.893771362304688e+02, 2.887304992675781e+02, 2.883336181640625e+02, 2.883768920898438e+02, 2.879072570800781e+02, 2.876224670410156e+02, 2.873843078613281e+02, 2.871606750488281e+02, 2.869449157714844e+02, 2.911560668945312e+02, 2.898768920898438e+02, 2.903589172363281e+02, 2.908039245605469e+02, 2.911604309082031e+02, 2.914036865234375e+02, 2.917715148925781e+02, 2.923772583007812e+02, 2.926506652832031e+02, 2.919923706054688e+02, 2.917731018066406e+02, 2.889875183105469e+02, 2.886357727050781e+02, 2.883522033691406e+02, 2.876752624511719e+02, 2.874257507324219e+02, 2.874013671875e+02, 2.871161804199219e+02, 2.870307006835938e+02, 2.87030517578125e+02, 2.913962097167969e+02, 2.906568908691406e+02, 2.918801574707031e+02, 2.928232116699219e+02, 2.933089599609375e+02, 2.931041564941406e+02, 2.932354125976562e+02, 2.932452087402344e+02, 2.931311950683594e+02, 2.930628356933594e+02, 2.931357421875e+02, 2.908099365234375e+02, 2.905373840332031e+02, 2.903773193359375e+02, 2.902550964355469e+02, 2.896949768066406e+02, 2.894498291015625e+02, 2.896223449707031e+02, 2.895577697753906e+02, 2.893790588378906e+02, 2.921969909667969e+02, 2.923821411132812e+02, 2.933070068359375e+02, 2.932008056640625e+02, 2.931832275390625e+02, 2.93181640625e+02, 2.934183654785156e+02, 2.932601623535156e+02, 2.932370300292969e+02, 2.929975280761719e+02, 2.93142822265625e+02, 2.919664001464844e+02, 2.917921142578125e+02, 2.912246398925781e+02, 2.909083557128906e+02, 2.905517578125e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.930859985351562e+02, 2.927267761230469e+02, 2.922844848632812e+02, 2.918276672363281e+02, 2.881939697265625e+02, 2.932597961425781e+02, 2.936461486816406e+02, 2.938855590820312e+02, 2.938768615722656e+02, 2.937404174804688e+02, 2.9384521484375e+02, 2.937234191894531e+02, 2.937161254882812e+02, 2.936318054199219e+02, 2.930260620117188e+02, 2.916036682128906e+02, 2.912645568847656e+02, 2.90958251953125e+02, 2.904189147949219e+02, 2.899014892578125e+02, 2.894543151855469e+02, 2.891763916015625e+02, 2.888297729492188e+02, 2.885734558105469e+02, 2.928130187988281e+02, 2.912276916503906e+02, 2.920975341796875e+02, 2.924854125976562e+02, 2.926210327148438e+02, 2.929137878417969e+02, 2.928109436035156e+02, 2.928930358886719e+02, 2.929745788574219e+02, 2.928204650878906e+02, 2.924874572753906e+02, 2.898283081054688e+02, 2.897185363769531e+02, 2.893094177246094e+02, 2.890301208496094e+02, 2.888291625976562e+02, 2.886143493652344e+02, 2.884037170410156e+02, 2.881799926757812e+02, 2.879789123535156e+02, 2.922455139160156e+02, 2.904365539550781e+02, 2.910162353515625e+02, 2.914790649414062e+02, 2.918555603027344e+02, 2.920941162109375e+02, 2.923175964355469e+02, 2.923595581054688e+02, 2.925157470703125e+02, 2.922940979003906e+02, 2.921960144042969e+02, 2.898524169921875e+02, 2.894931335449219e+02, 2.891381225585938e+02, 2.886694030761719e+02, 2.884916076660156e+02, 2.884096069335938e+02, 2.881572265625e+02, 2.880915832519531e+02, 2.879610900878906e+02, 2.924788818359375e+02, 2.911510620117188e+02, 2.9268408203125e+02, 2.934706726074219e+02, 2.932234191894531e+02, 2.931597900390625e+02, 2.933643493652344e+02, 2.932245178222656e+02, 2.93150146484375e+02, 2.931456604003906e+02, 2.931598510742188e+02, 2.917827453613281e+02, 2.914505615234375e+02, 2.912809753417969e+02, 2.911490478515625e+02, 2.908441162109375e+02, 2.905880432128906e+02, 2.905378723144531e+02, 2.903458557128906e+02, 2.901766967773438e+02, 2.923953552246094e+02, 2.928095397949219e+02, 2.934153747558594e+02, 2.935744323730469e+02, 2.938045654296875e+02, 2.93954345703125e+02, 2.941845703125e+02, 2.940082397460938e+02, 2.939178161621094e+02, 2.9368701171875e+02, 2.930870056152344e+02, 2.927762451171875e+02, 2.925008544921875e+02, 2.921890869140625e+02, 2.919276428222656e+02, 2.916324157714844e+02]
 hvac.TSetRoo.setPoiHea.y=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
 hvac.TSetRoo.setPoiCoo.y=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.295213580131531e-01, 4.35914546251297e-01, 3.6481973528862e-01, 3.354253470897675e-01, 3.341241180896759e-01, 3.775826692581177e-01, 3.815067112445831e-01, 3.817471265792847e-01, 3.817578554153442e-01, 3.820632100105286e-01, 4.402248859405518e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.295517563819885e-01, 4.379238784313202e-01, 4.458456337451935e-01, 4.44857120513916e-01, 4.453961253166199e-01, 4.474765956401825e-01, 4.457626640796661e-01, 4.460229575634003e-01, 4.458774924278259e-01, 4.456301033496857e-01, 4.469924569129944e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.293700218200684e-01, 4.379233717918396e-01, 4.459855854511261e-01, 4.460355639457703e-01, 4.457968771457672e-01, 4.457273185253143e-01, 4.449307918548584e-01, 4.450978338718414e-01, 4.478797316551208e-01, 4.464242160320282e-01, 4.459293782711029e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.257124423980713e-01, 4.351615607738495e-01, 4.437256157398224e-01, 4.470770061016083e-01, 4.370954036712646e-01, 4.462876319885254e-01, 4.447901248931885e-01, 4.462332129478455e-01, 4.45060521364212e-01, 4.46525901556015e-01, 4.466884434223175e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.298147320747375e-01, 4.36905711889267e-01, 3.666760921478271e-01, 3.559110760688782e-01, 3.799600601196289e-01, 3.812050521373749e-01, 3.811405003070831e-01, 3.811092972755432e-01, 3.810736238956451e-01, 3.811469674110413e-01, 4.375787079334259e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, 5.999826192855835e-01, 1e+00, 1e+00, 1e+00, 5.359323024749756e-01, 6.175764799118042e-01, 5.372456908226013e-01, 4.739052653312683e-01, 4.700040519237518e-01, 4.7294682264328e-01, 4.737569093704224e-01, 4.739898443222046e-01, 4.737502634525299e-01, 4.736723005771637e-01, 6.140156984329224e-01, 7.345849275588989e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281051397323608e-01, 6.14786684513092e-01, 6.242771744728088e-01, 6.290854215621948e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.347184419631958e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281350612640381e-01, 6.147708296775818e-01, 6.240864992141724e-01, 6.260021924972534e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.354953289031982e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.26932418346405e-01, 6.206757426261902e-01, 6.323039531707764e-01, 6.349817514419556e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.367568016052246e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.280594229698181e-01, 6.178529858589172e-01, 5.332589149475098e-01, 4.759224355220795e-01, 4.75034087896347e-01, 4.743426442146301e-01, 4.741578996181488e-01, 4.740934371948242e-01, 4.742045998573303e-01, 4.741388857364655e-01, 6.129305958747864e-01, 7.344003915786743e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, 5.999833941459656e-01, 1e+00, 1e+00, 1e+00, 5.359323024749756e-01, 6.175764799118042e-01, 5.30987024307251e-01, 4.735785722732544e-01, 4.699855148792267e-01, 4.729459881782532e-01, 4.737571179866791e-01, 4.739900827407837e-01, 4.73750501871109e-01, 4.736725687980652e-01, 6.184113621711731e-01, 7.34870433807373e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281051397323608e-01, 6.14786684513092e-01, 6.242771744728088e-01, 6.290854215621948e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.347185611724854e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281351208686829e-01, 6.147708296775818e-01, 6.240864992141724e-01, 6.260021924972534e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.354954481124878e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269324779510498e-01, 6.206757426261902e-01, 6.323039531707764e-01, 6.349817514419556e-01, 5.949570536613464e-01, 6.295118927955627e-01, 6.312147378921509e-01, 6.354763507843018e-01, 6.303691267967224e-01, 6.314692497253418e-01, 6.28358781337738e-01, 7.367569208145142e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.280594229698181e-01, 6.178529858589172e-01, 5.378137230873108e-01, 4.761622250080109e-01, 4.75048303604126e-01, 4.743436872959137e-01, 4.741581976413727e-01, 4.740937054157257e-01, 4.742048382759094e-01, 4.741391241550446e-01, 6.088759899139404e-01, 7.341374158859253e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, 5.511367321014404e-01, 1e+00, 1e+00, 1e+00, 5.341679453849792e-01, 6.156938076019287e-01, 5.273061394691467e-01, 4.585299789905548e-01, 4.540156424045563e-01, 6.070314049720764e-01, 6.174137592315674e-01, 6.179751753807068e-01, 6.176680326461792e-01, 6.175687313079834e-01, 6.247408390045166e-01, 7.263184785842896e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263946652412415e-01, 6.147363185882568e-01, 6.242754459381104e-01, 6.2908536195755e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.257553339004517e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.264244675636292e-01, 6.147204637527466e-01, 6.240848302841187e-01, 6.260021328926086e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.265322208404541e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.164790749549866e-01, 6.203510761260986e-01, 6.322920322418213e-01, 6.349813342094421e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.277936935424805e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263492465019226e-01, 6.178014278411865e-01, 5.256235003471375e-01, 4.606189131736755e-01, 6.133551597595215e-01, 6.181829571723938e-01, 6.181713342666626e-01, 6.181040406227112e-01, 6.182547211647034e-01, 6.181562542915344e-01, 6.245316863059998e-01, 7.261910438537598e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, 5.999833941459656e-01, 1e+00, 1e+00, 1e+00, 5.359323024749756e-01, 6.175764799118042e-01, 5.428285598754883e-01, 6.083747744560242e-01, 6.125884652137756e-01, 6.169053912162781e-01, 6.177238821983337e-01, 6.1798495054245e-01, 6.176683306694031e-01, 6.175687313079834e-01, 6.247408390045166e-01, 7.352817058563232e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281051397323608e-01, 6.14786684513092e-01, 6.242771744728088e-01, 6.290854215621948e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.347185611724854e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281351208686829e-01, 6.147708296775818e-01, 6.240864992141724e-01, 6.260021924972534e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.354954481124878e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269324779510498e-01, 6.206757426261902e-01, 6.323039531707764e-01, 6.349817514419556e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.367569208145142e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.280594229698181e-01, 6.178529858589172e-01, 5.497883558273315e-01, 6.144496202468872e-01, 6.190809011459351e-01, 6.183643937110901e-01, 6.18177056312561e-01, 6.181042194366455e-01, 6.182547211647034e-01, 6.181562542915344e-01, 6.245316863059998e-01, 7.351542711257935e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, 5.511367321014404e-01, 1e+00, 1e+00, 1e+00, 5.341679453849792e-01, 6.16292417049408e-01, 5.279994010925293e-01, 4.585687816143036e-01, 4.540180861949921e-01, 6.084375977516174e-01, 6.174579858779907e-01, 6.179765462875366e-01, 6.17668092250824e-01, 6.175687313079834e-01, 6.247408390045166e-01, 7.263184785842896e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263946652412415e-01, 6.147363185882568e-01, 6.242754459381104e-01, 6.2908536195755e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.257553339004517e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.264244675636292e-01, 6.147204637527466e-01, 6.240848302841187e-01, 6.260021328926086e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.265322208404541e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.252308249473572e-01, 6.206232309341431e-01, 6.323019862174988e-01, 6.349816918373108e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.277936935424805e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263492465019226e-01, 6.178014278411865e-01, 5.370208024978638e-01, 6.129997372627258e-01, 6.190347075462341e-01, 6.183629035949707e-01, 6.18177056312561e-01, 6.181042194366455e-01, 6.182547211647034e-01, 6.181562542915344e-01, 6.245316863059998e-01, 7.261910438537598e-01, 1e+00, 1e+00, 1e+00, 1e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.595253467559814e-01, 5.093381404876709e-01, 5.19941508769989e-01, 5.307195782661438e-01, 5.354802012443542e-01, 5.345321893692017e-01, 5.317231416702271e-01, 5.326145887374878e-01, 5.289362072944641e-01, 5.187609195709229e-01, 5.033381581306458e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.627661108970642e-01, 4.754340350627899e-01, 4.940782189369202e-01, 5.052370429039001e-01, 5.056180953979492e-01, 5.119888186454773e-01, 5.13940155506134e-01, 5.106485486030579e-01, 4.998153448104858e-01, 4.919378161430359e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.614278972148895e-01, 4.714311361312866e-01, 4.927908182144165e-01, 5.068601369857788e-01, 5.128806829452515e-01, 5.255858898162842e-01, 5.101026892662048e-01, 5.036154985427856e-01, 5.024893283843994e-01, 5.030057430267334e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.380541682243347e-01, 5.111733675003052e-01, 5.067810416221619e-01, 5.133305788040161e-01, 5.046722888946533e-01, 5.062854290008545e-01, 5.079251527786255e-01, 5.052230358123779e-01, 5.049546360969543e-01, 5.027704238891602e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.115113854408264e-01, 5.448835492134094e-01, 5.762165188789368e-01, 5.534531474113464e-01, 5.505363345146179e-01, 5.505117177963257e-01, 5.504806637763977e-01, 5.506905317306519e-01, 5.504748821258545e-01, 5.104974508285522e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931501159667969e+02, 2.887655334472656e+02, 3.009779968261719e+02, 2.901768188476562e+02, 2.851715393066406e+02, 2.851520690917969e+02, 2.850647583007812e+02, 2.85148193359375e+02, 2.851473388671875e+02, 2.851505737304688e+02, 2.851505126953125e+02, 2.97703857421875e+02, 2.92570068359375e+02, 2.925707092285156e+02, 2.925702819824219e+02, 2.9257080078125e+02, 2.925696716308594e+02, 2.9256982421875e+02, 2.925697937011719e+02, 2.925693969726562e+02, 2.925691833496094e+02, 3.042689208984375e+02, 3.009804992675781e+02, 3.007393493652344e+02, 3.007459716796875e+02, 2.948800354003906e+02, 2.879418334960938e+02, 2.887785949707031e+02, 2.899002685546875e+02, 2.943943481445312e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.052850646972656e+02, 3.052854614257812e+02, 3.052860107421875e+02, 3.052862854003906e+02, 3.05286865234375e+02, 3.05286865234375e+02, 3.052911376953125e+02, 3.052912902832031e+02, 3.052955627441406e+02, 3.039203796386719e+02, 3.009820251464844e+02, 3.007391662597656e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.00623291015625e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.05578857421875e+02, 3.055798645019531e+02, 3.055801696777344e+02, 3.055802612304688e+02, 3.055826416015625e+02, 3.055823974609375e+02, 3.055794982910156e+02, 3.055831909179688e+02, 3.055787048339844e+02, 3.040523986816406e+02, 3.009960632324219e+02, 3.015936584472656e+02, 3.012111511230469e+02, 2.981932983398438e+02, 2.880419616699219e+02, 2.853291625976562e+02, 2.878641662597656e+02, 2.871105041503906e+02, 2.907528686523438e+02, 2.968074035644531e+02, 2.898380432128906e+02, 2.898381042480469e+02, 2.89837890625e+02, 2.898377685546875e+02, 2.898375549316406e+02, 2.89837890625e+02, 2.898384094238281e+02, 2.898387145996094e+02, 2.898385314941406e+02, 2.973807983398438e+02, 3.0152099609375e+02, 2.944747619628906e+02, 2.852316284179688e+02, 2.853973693847656e+02, 2.85259765625e+02, 2.853021240234375e+02, 2.851150512695312e+02, 2.84993408203125e+02, 2.849206848144531e+02, 2.8825341796875e+02, 2.862877197265625e+02, 2.862876892089844e+02, 2.862876281738281e+02, 2.862878723144531e+02, 2.86288330078125e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931501159667969e+02, 2.952878112792969e+02, 3.010255737304688e+02, 2.920842895507812e+02, 2.851715393066406e+02, 2.851520690917969e+02, 2.897965087890625e+02, 2.911338806152344e+02, 2.91192626953125e+02, 2.914673461914062e+02, 2.927425231933594e+02, 2.983614501953125e+02, 2.922183227539062e+02, 2.922189331054688e+02, 2.922185363769531e+02, 2.922190246582031e+02, 2.922179260253906e+02, 2.922180786132812e+02, 2.922180480957031e+02, 2.922176818847656e+02, 2.922174682617188e+02, 3.043013305664062e+02, 3.009817810058594e+02, 3.007393798828125e+02, 3.007460021972656e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.007060241699219e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.052837219238281e+02, 3.052840576171875e+02, 3.052846069335938e+02, 3.05284912109375e+02, 3.052854614257812e+02, 3.052854919433594e+02, 3.05289794921875e+02, 3.052899780273438e+02, 3.052942810058594e+02, 3.039536437988281e+02, 3.009833068847656e+02, 3.007391967773438e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055774841308594e+02, 3.055784912109375e+02, 3.055787963867188e+02, 3.05578857421875e+02, 3.055812072753906e+02, 3.055809936523438e+02, 3.05578125e+02, 3.055817565917969e+02, 3.055773315429688e+02, 3.042553405761719e+02, 3.01004150390625e+02, 3.015939331054688e+02, 3.012111511230469e+02, 2.978714904785156e+02, 2.968207702636719e+02, 2.953626708984375e+02, 2.949451904296875e+02, 2.946724548339844e+02, 2.948918151855469e+02, 2.987328796386719e+02, 2.919531555175781e+02, 2.919532775878906e+02, 2.919528503417969e+02, 2.919526062011719e+02, 2.919520874023438e+02, 2.919528198242188e+02, 2.91953857421875e+02, 2.919545288085938e+02, 2.919541625976562e+02, 2.976352844238281e+02, 3.015222473144531e+02, 2.961809997558594e+02, 2.852315673828125e+02, 2.876664428710938e+02, 2.884303894042969e+02, 2.883009948730469e+02, 2.871880798339844e+02, 2.87302734375e+02, 2.895020446777344e+02, 2.952549438476562e+02, 2.868078002929688e+02, 2.868078002929688e+02, 2.868077392578125e+02, 2.868079223632812e+02, 2.868081970214844e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931501159667969e+02, 2.945691223144531e+02, 3.009779968261719e+02, 2.979316101074219e+02, 2.977553100585938e+02, 2.917770690917969e+02, 2.898759155273438e+02, 2.908301086425781e+02, 2.900827026367188e+02, 2.9027783203125e+02, 2.919529724121094e+02, 3.007549743652344e+02, 2.979287414550781e+02, 2.979301452636719e+02, 2.979292297363281e+02, 2.979303588867188e+02, 2.97927978515625e+02, 2.979282836914062e+02, 2.9792822265625e+02, 2.979274597167969e+02, 2.979270324707031e+02, 3.042689208984375e+02, 3.009804992675781e+02, 3.007393493652344e+02, 3.007459716796875e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.007060241699219e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.052850341796875e+02, 3.052854309082031e+02, 3.052859802246094e+02, 3.052862854003906e+02, 3.05286865234375e+02, 3.05286865234375e+02, 3.052911987304688e+02, 3.052913513183594e+02, 3.05295654296875e+02, 3.039203796386719e+02, 3.009820251464844e+02, 3.007391662597656e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055788269042969e+02, 3.05579833984375e+02, 3.055801391601562e+02, 3.055802307128906e+02, 3.055825805664062e+02, 3.055823364257812e+02, 3.055794982910156e+02, 3.055831298828125e+02, 3.055786743164062e+02, 3.040523986816406e+02, 3.009960632324219e+02, 3.015936584472656e+02, 3.012111511230469e+02, 3.012037963867188e+02, 3.007630920410156e+02, 2.986181335449219e+02, 2.970092468261719e+02, 2.96237060546875e+02, 2.961241455078125e+02, 3.009314880371094e+02, 2.974547729492188e+02, 2.974551086425781e+02, 2.974540405273438e+02, 2.974534301757812e+02, 2.974522705078125e+02, 2.974539184570312e+02, 2.97456298828125e+02, 2.97457763671875e+02, 2.974569702148438e+02, 3.028414306640625e+02, 3.0152099609375e+02, 3.025538940429688e+02, 2.953824768066406e+02, 2.911290283203125e+02, 2.881901245117188e+02, 2.88000732421875e+02, 2.85115234375e+02, 2.856155700683594e+02, 2.873703002929688e+02, 2.974773559570312e+02, 2.916605834960938e+02, 2.916606140136719e+02, 2.916607055664062e+02, 2.91660400390625e+02, 2.916597290039062e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931498718261719e+02, 2.931498718261719e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.956057434082031e+02, 3.010104064941406e+02, 2.975242919921875e+02, 2.918737487792969e+02, 2.884898986816406e+02, 2.911775512695312e+02, 2.917998046875e+02, 2.913007202148438e+02, 2.907205200195312e+02, 2.928619689941406e+02, 2.988511962890625e+02, 2.930232543945312e+02, 2.930239868164062e+02, 2.930234680175781e+02, 2.930240783691406e+02, 2.930228271484375e+02, 2.930229797363281e+02, 2.9302294921875e+02, 2.930225219726562e+02, 2.930222778320312e+02, 3.043013305664062e+02, 3.009817810058594e+02, 3.007393798828125e+02, 3.007460021972656e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.004317016601562e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.052837219238281e+02, 3.052840576171875e+02, 3.052846374511719e+02, 3.05284912109375e+02, 3.052854919433594e+02, 3.052854919433594e+02, 3.052898559570312e+02, 3.052900085449219e+02, 3.052943725585938e+02, 3.039536437988281e+02, 3.009833068847656e+02, 3.007391967773438e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055774841308594e+02, 3.055784912109375e+02, 3.055787963867188e+02, 3.055788879394531e+02, 3.055812683105469e+02, 3.055810241699219e+02, 3.05578125e+02, 3.055818176269531e+02, 3.055773010253906e+02, 3.040852661132812e+02, 3.009973754882812e+02, 3.015937194824219e+02, 3.012111511230469e+02, 3.008252563476562e+02, 2.984389038085938e+02, 2.9739697265625e+02, 2.964475708007812e+02, 2.924236145019531e+02, 2.949131469726562e+02, 2.985531311035156e+02, 2.932344360351562e+02, 2.93234619140625e+02, 2.932340393066406e+02, 2.932336730957031e+02, 2.932329711914062e+02, 2.932339782714844e+02, 2.932353820800781e+02, 2.932362670898438e+02, 2.932357788085938e+02, 3.007312927246094e+02, 3.015222473144531e+02, 3.018131408691406e+02, 2.945743103027344e+02, 2.91561279296875e+02, 2.895040893554688e+02, 2.881525268554688e+02, 2.85115234375e+02, 2.849932250976562e+02, 2.878096008300781e+02, 2.94994873046875e+02, 2.867721557617188e+02, 2.867721557617188e+02, 2.867720947265625e+02, 2.867722473144531e+02, 2.867724914550781e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.847234191894531e+02, 2.929312744140625e+02, 2.855842895507812e+02, 2.851715393066406e+02, 2.851520690917969e+02, 2.850647583007812e+02, 2.85148193359375e+02, 2.851473388671875e+02, 2.851505737304688e+02, 2.851505126953125e+02, 2.867167663574219e+02, 2.854076232910156e+02, 2.854072570800781e+02, 2.85407470703125e+02, 2.854072265625e+02, 2.854076538085938e+02, 2.854075927734375e+02, 2.854076232910156e+02, 2.8540771484375e+02, 2.854077758789062e+02, 3.023655395507812e+02, 3.009804992675781e+02, 3.007393493652344e+02, 3.007459716796875e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.007060241699219e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.046906433105469e+02, 3.046910095214844e+02, 3.046915588378906e+02, 3.046918029785156e+02, 3.046923522949219e+02, 3.046923828125e+02, 3.046964721679688e+02, 3.046966247558594e+02, 3.047007141113281e+02, 3.039203796386719e+02, 3.009820251464844e+02, 3.007391662597656e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055788879394531e+02, 3.055798645019531e+02, 3.055801696777344e+02, 3.055802612304688e+02, 3.055825805664062e+02, 3.055823364257812e+02, 3.055795288085938e+02, 3.055831298828125e+02, 3.055787353515625e+02, 3.040523986816406e+02, 3.009960632324219e+02, 3.015936584472656e+02, 2.995682067871094e+02, 2.912057800292969e+02, 2.887038269042969e+02, 2.882833557128906e+02, 2.872133483886719e+02, 2.861101684570312e+02, 2.86046142578125e+02, 2.910778503417969e+02, 2.86119384765625e+02, 2.861193237304688e+02, 2.861195678710938e+02, 2.861196899414062e+02, 2.861199340820312e+02, 2.861196594238281e+02, 2.861192016601562e+02, 2.861189575195312e+02, 2.861190795898438e+02, 2.959841918945312e+02, 3.0152099609375e+02, 2.898893737792969e+02, 2.852316284179688e+02, 2.853973693847656e+02, 2.85259765625e+02, 2.853021240234375e+02, 2.851150512695312e+02, 2.84993408203125e+02, 2.849206848144531e+02, 2.872444763183594e+02, 2.858766174316406e+02, 2.858765869140625e+02, 2.858764953613281e+02, 2.858768005371094e+02, 2.858773193359375e+02]
-hvac.res.EFan=[0e+00, -8.930992407840677e-07, -8.93088497377903e-07, -8.928869874580414e-07, -8.926424470701022e-07, 7.353607421875e+03, 1.17139306640625e+04, 1.5776630859375e+04, 1.9630818359375e+04, 2.3483767578125e+04, 2.735010546875e+04, 3.12395546875e+04, 3.51308203125e+04, 3.9022546875e+04, 4.291436328125e+04, 4.691078515625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.773803125e+04, 6.207441796875e+04, 6.618775e+04, 7.03067265625e+04, 7.44273046875e+04, 7.85541796875e+04, 8.26804921875e+04, 8.680265625e+04, 9.0927765625e+04, 9.5051140625e+04, 9.91787109375e+04, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.026271796875e+05, 1.10016578125e+05, 1.143531015625e+05, 1.1846678125e+05, 1.22590796875e+05, 1.267146484375e+05, 1.308382265625e+05, 1.34960046875e+05, 1.39075e+05, 1.43200140625e+05, 1.47330890625e+05, 1.51456125e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.62276734375e+05, 1.665853125e+05, 1.7068809375e+05, 1.7480596875e+05, 1.78879390625e+05, 1.82991328125e+05, 1.87114171875e+05, 1.91230078125e+05, 1.9536165625e+05, 1.99483234375e+05, 2.03612171875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.14448796875e+05, 2.1876540625e+05, 2.2283225e+05, 2.26694546875e+05, 2.30572015625e+05, 2.34462484375e+05, 2.3835328125e+05, 2.42244046875e+05, 2.461346875e+05, 2.500254375e+05, 2.53995515625e+05, 2.5742928125e+05, 2.5742928125e+05, 2.5742928125e+05, 2.5742928125e+05, 2.5742928125e+05]
-hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.5894109375e+04, 1.39502390625e+05, 2.495999375e+05, 2.9903921875e+05, 3.377889375e+05, 3.7951796875e+05, 4.366455e+05, 4.9001190625e+05, 5.42521e+05, 5.973185625e+05, 6.8443225e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 7.82099e+05, 8.17112125e+05, 9.48003625e+05, 1.084492875e+06, 1.221386625e+06, 1.35655925e+06, 1.482807625e+06, 1.60610625e+06, 1.729660875e+06, 1.856635375e+06, 1.990983125e+06, 2.12840525e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.24313425e+06, 2.28461475e+06, 2.4156815e+06, 2.5521845e+06, 2.689286e+06, 2.82647975e+06, 2.963731e+06, 3.1009405e+06, 3.236265e+06, 3.36277575e+06, 3.488855e+06, 3.617142e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.724607e+06, 3.765014e+06, 3.89509375e+06, 4.02929675e+06, 4.1451995e+06, 4.235094e+06, 4.305591e+06, 4.362613e+06, 4.4054905e+06, 4.437861e+06, 4.475356e+06, 4.5391435e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.605582e+06, 4.6190975e+06, 4.7347735e+06, 4.835285e+06, 4.886622e+06, 4.9198105e+06, 4.9419195e+06, 4.9627005e+06, 4.97293e+06, 4.981845e+06, 4.9979685e+06, 5.040681e+06, 5.096815e+06, 5.096815e+06, 5.096815e+06, 5.096815e+06, 5.096815e+06]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.295214772224426e-01, 4.359145164489746e-01, 3.648197948932648e-01, 3.354252576828003e-01, 3.341241180896759e-01, 3.775826990604401e-01, 3.815067112445831e-01, 3.817471265792847e-01, 3.817578554153442e-01, 3.820632100105286e-01, 4.402248859405518e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.295518159866333e-01, 4.379238486289978e-01, 4.458456337451935e-01, 4.44857120513916e-01, 4.453961253166199e-01, 4.474766254425049e-01, 4.457626640796661e-01, 4.460229575634003e-01, 4.458774924278259e-01, 4.456301033496857e-01, 4.469924569129944e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.293712735176086e-01, 4.379233419895172e-01, 4.459855854511261e-01, 4.460355639457703e-01, 4.457968771457672e-01, 4.457273185253143e-01, 4.449307918548584e-01, 4.45097804069519e-01, 4.478797316551208e-01, 4.464242160320282e-01, 4.459294080734253e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.257126212120056e-01, 4.351615309715271e-01, 4.437256157398224e-01, 4.470770061016083e-01, 4.370953738689423e-01, 4.462876319885254e-01, 4.447901248931885e-01, 4.462332129478455e-01, 4.45060521364212e-01, 4.46525901556015e-01, 4.466884434223175e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.298147320747375e-01, 4.369056820869446e-01, 3.666760921478271e-01, 3.559110760688782e-01, 3.799600899219513e-01, 3.812050521373749e-01, 3.811405003070831e-01, 3.811092972755432e-01, 3.810736238956451e-01, 3.811469674110413e-01, 4.375787079334259e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 5.99983274936676e-01, 1e+00, 1e+00, 1e+00, 5.359322428703308e-01, 6.175764799118042e-01, 5.372457504272461e-01, 4.739052653312683e-01, 4.700040519237518e-01, 4.7294682264328e-01, 4.737569093704224e-01, 4.739898443222046e-01, 4.737502634525299e-01, 4.736723005771637e-01, 6.140156984329224e-01, 7.345848083496094e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281050801277161e-01, 6.147866249084473e-01, 6.242771744728088e-01, 6.290854215621948e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.347184419631958e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281350612640381e-01, 6.14770770072937e-01, 6.240864992141724e-01, 6.260021924972534e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.354952692985535e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269325375556946e-01, 6.206756830215454e-01, 6.323039531707764e-01, 6.349817514419556e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.367568612098694e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.280594825744629e-01, 6.178529858589172e-01, 5.332589149475098e-01, 4.759224355220795e-01, 4.75034087896347e-01, 4.743426442146301e-01, 4.741578996181488e-01, 4.740934371948242e-01, 4.742045998573303e-01, 4.741388857364655e-01, 6.129306554794312e-01, 7.344003319740295e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 5.999840497970581e-01, 1e+00, 1e+00, 1e+00, 5.359322428703308e-01, 6.175764799118042e-01, 5.309870839118958e-01, 4.73578542470932e-01, 4.699855148792267e-01, 4.729459881782532e-01, 4.737571179866791e-01, 4.739900827407837e-01, 4.73750501871109e-01, 4.736725687980652e-01, 6.184113621711731e-01, 7.348703145980835e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281051397323608e-01, 6.147866249084473e-01, 6.242771744728088e-01, 6.290854215621948e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.347185611724854e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281351208686829e-01, 6.14770770072937e-01, 6.240864992141724e-01, 6.260021924972534e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.35495388507843e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269325375556946e-01, 6.206756830215454e-01, 6.323039531707764e-01, 6.349817514419556e-01, 5.949568152427673e-01, 6.295118927955627e-01, 6.312147378921509e-01, 6.354763507843018e-01, 6.303691267967224e-01, 6.314692497253418e-01, 6.28358781337738e-01, 7.367570400238037e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.280594825744629e-01, 6.178529858589172e-01, 5.37813663482666e-01, 4.761622250080109e-01, 4.75048303604126e-01, 4.743436872959137e-01, 4.741581976413727e-01, 4.740937054157257e-01, 4.742048382759094e-01, 4.741391241550446e-01, 6.088759899139404e-01, 7.341373562812805e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 5.511374473571777e-01, 1e+00, 1e+00, 1e+00, 5.341678857803345e-01, 6.156937479972839e-01, 5.273063182830811e-01, 4.585299789905548e-01, 4.540156424045563e-01, 6.070314049720764e-01, 6.174137592315674e-01, 6.179751753807068e-01, 6.176680326461792e-01, 6.175687313079834e-01, 6.247408390045166e-01, 7.26318359375e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263946652412415e-01, 6.147363185882568e-01, 6.242754459381104e-01, 6.2908536195755e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.257553339004517e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.264244675636292e-01, 6.147204637527466e-01, 6.240848302841187e-01, 6.260021328926086e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.265321612358093e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.164793729782104e-01, 6.203510761260986e-01, 6.322920322418213e-01, 6.349813342094421e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.277937531471252e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263493061065674e-01, 6.178014278411865e-01, 5.256235003471375e-01, 4.606189131736755e-01, 6.13355278968811e-01, 6.181829571723938e-01, 6.181713342666626e-01, 6.181040406227112e-01, 6.182547211647034e-01, 6.181562542915344e-01, 6.245316863059998e-01, 7.26190984249115e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 5.999840497970581e-01, 1e+00, 1e+00, 1e+00, 5.359322428703308e-01, 6.175764799118042e-01, 5.428285598754883e-01, 6.08374297618866e-01, 6.125884652137756e-01, 6.169053912162781e-01, 6.177238821983337e-01, 6.1798495054245e-01, 6.176683306694031e-01, 6.175687313079834e-01, 6.247408390045166e-01, 7.352815866470337e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281051397323608e-01, 6.147866249084473e-01, 6.242771744728088e-01, 6.290854215621948e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.347185611724854e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.281351208686829e-01, 6.14770770072937e-01, 6.240864992141724e-01, 6.260021924972534e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.35495388507843e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.269325375556946e-01, 6.206756830215454e-01, 6.323039531707764e-01, 6.349817514419556e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.367570400238037e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.280594825744629e-01, 6.178529858589172e-01, 5.497883558273315e-01, 6.144496202468872e-01, 6.190809011459351e-01, 6.183643937110901e-01, 6.18177056312561e-01, 6.181042194366455e-01, 6.182547211647034e-01, 6.181562542915344e-01, 6.245316863059998e-01, 7.351542115211487e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 5.511374473571777e-01, 1e+00, 1e+00, 1e+00, 5.341678857803345e-01, 6.162923574447632e-01, 5.279993414878845e-01, 4.585687518119812e-01, 4.540180861949921e-01, 6.084375977516174e-01, 6.174579858779907e-01, 6.179765462875366e-01, 6.17668092250824e-01, 6.175687313079834e-01, 6.247408390045166e-01, 7.26318359375e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263946652412415e-01, 6.147363185882568e-01, 6.242754459381104e-01, 6.2908536195755e-01, 6.313730478286743e-01, 6.290780305862427e-01, 6.278290152549744e-01, 6.286910772323608e-01, 6.278507709503174e-01, 6.285103559494019e-01, 6.269790530204773e-01, 7.257553339004517e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.264244675636292e-01, 6.147204637527466e-01, 6.240848302841187e-01, 6.260021328926086e-01, 6.269663572311401e-01, 6.27406895160675e-01, 6.282696723937988e-01, 6.326285004615784e-01, 6.311566233634949e-01, 6.273233890533447e-01, 6.272001266479492e-01, 7.265321612358093e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.25230884552002e-01, 6.206232309341431e-01, 6.323019862174988e-01, 6.349816918373108e-01, 6.3027024269104e-01, 6.307975649833679e-01, 6.312614679336548e-01, 6.35478138923645e-01, 6.303691864013672e-01, 6.314693093299866e-01, 6.28358781337738e-01, 7.277937531471252e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.263493061065674e-01, 6.178014278411865e-01, 5.370208024978638e-01, 6.129997968673706e-01, 6.190347075462341e-01, 6.183629035949707e-01, 6.18177056312561e-01, 6.181042194366455e-01, 6.182547211647034e-01, 6.181562542915344e-01, 6.245316863059998e-01, 7.26190984249115e-01, 1e+00, 1e+00, 1e+00, 1e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.595253169536591e-01, 5.093381404876709e-01, 5.19941508769989e-01, 5.307196378707886e-01, 5.354802012443542e-01, 5.345318913459778e-01, 5.317231416702271e-01, 5.326145887374878e-01, 5.289362072944641e-01, 5.187609195709229e-01, 5.033381581306458e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.627661108970642e-01, 4.754340350627899e-01, 4.940782189369202e-01, 5.052370429039001e-01, 5.056180953979492e-01, 5.119888186454773e-01, 5.13940155506134e-01, 5.106485486030579e-01, 4.998153448104858e-01, 4.919378459453583e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.614278078079224e-01, 4.714311361312866e-01, 4.927908182144165e-01, 5.068601369857788e-01, 5.128806829452515e-01, 5.255858898162842e-01, 5.101027488708496e-01, 5.036154985427856e-01, 5.024893283843994e-01, 5.030057430267334e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.380541682243347e-01, 5.111733078956604e-01, 5.067810416221619e-01, 5.133305788040161e-01, 5.046722888946533e-01, 5.062854290008545e-01, 5.079251527786255e-01, 5.052230358123779e-01, 5.049546360969543e-01, 5.027704238891602e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.115113854408264e-01, 5.448836088180542e-01, 5.762165188789368e-01, 5.534531474113464e-01, 5.505363345146179e-01, 5.505117177963257e-01, 5.504806637763977e-01, 5.506905317306519e-01, 5.504748821258545e-01, 5.104973912239075e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.93150146484375e+02, 2.887655334472656e+02, 3.009779968261719e+02, 2.901768188476562e+02, 2.851715393066406e+02, 2.851520690917969e+02, 2.850647583007812e+02, 2.85148193359375e+02, 2.851473388671875e+02, 2.851505737304688e+02, 2.851505126953125e+02, 2.97703857421875e+02, 2.925661315917969e+02, 2.925664367675781e+02, 2.925657653808594e+02, 2.925671691894531e+02, 2.925662231445312e+02, 2.925664367675781e+02, 2.925667724609375e+02, 2.925664367675781e+02, 2.925667724609375e+02, 3.042688293457031e+02, 3.009804992675781e+02, 3.007393493652344e+02, 3.007459716796875e+02, 2.948800659179688e+02, 2.879418334960938e+02, 2.887785949707031e+02, 2.899002685546875e+02, 2.943943481445312e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.052840576171875e+02, 3.052838745117188e+02, 3.0528466796875e+02, 3.052841796875e+02, 3.052838745117188e+02, 3.052835998535156e+02, 3.05283447265625e+02, 3.052833862304688e+02, 3.05283203125e+02, 3.039200439453125e+02, 3.009820251464844e+02, 3.007391662597656e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.00623291015625e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055826110839844e+02, 3.055833740234375e+02, 3.055834655761719e+02, 3.055839538574219e+02, 3.055863647460938e+02, 3.055849609375e+02, 3.055827026367188e+02, 3.055860595703125e+02, 3.055809326171875e+02, 3.040523986816406e+02, 3.009960632324219e+02, 3.015936584472656e+02, 3.012111511230469e+02, 2.981933288574219e+02, 2.880419616699219e+02, 2.853291625976562e+02, 2.878641662597656e+02, 2.871104736328125e+02, 2.907529602050781e+02, 2.968074035644531e+02, 2.898392639160156e+02, 2.898405456542969e+02, 2.898403930664062e+02, 2.89840576171875e+02, 2.898399353027344e+02, 2.898395385742188e+02, 2.898398132324219e+02, 2.898405456542969e+02, 2.898399047851562e+02, 2.973806762695312e+02, 3.0152099609375e+02, 2.944747314453125e+02, 2.852316284179688e+02, 2.853973693847656e+02, 2.85259765625e+02, 2.853021240234375e+02, 2.851150512695312e+02, 2.84993408203125e+02, 2.849206848144531e+02, 2.8825341796875e+02, 2.86288330078125e+02, 2.862882995605469e+02, 2.862882385253906e+02, 2.862887878417969e+02, 2.862890625e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.93150146484375e+02, 2.952877807617188e+02, 3.010255737304688e+02, 2.920842895507812e+02, 2.851715393066406e+02, 2.851520690917969e+02, 2.897965087890625e+02, 2.911339111328125e+02, 2.91192626953125e+02, 2.914673461914062e+02, 2.927425231933594e+02, 2.983614196777344e+02, 2.922148132324219e+02, 2.922151184082031e+02, 2.922144775390625e+02, 2.922158203125e+02, 2.922149047851562e+02, 2.922151184082031e+02, 2.922154235839844e+02, 2.922151184082031e+02, 2.922154235839844e+02, 3.0430126953125e+02, 3.009817810058594e+02, 3.007393798828125e+02, 3.007460021972656e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.007060241699219e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.0528271484375e+02, 3.052825012207031e+02, 3.052832946777344e+02, 3.052828063964844e+02, 3.05282470703125e+02, 3.052821960449219e+02, 3.052820434570312e+02, 3.052820129394531e+02, 3.052818298339844e+02, 3.039533081054688e+02, 3.009833068847656e+02, 3.007391967773438e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055812683105469e+02, 3.0558203125e+02, 3.055821228027344e+02, 3.055826110839844e+02, 3.055849914550781e+02, 3.055835876464844e+02, 3.055813598632812e+02, 3.055846862792969e+02, 3.055796203613281e+02, 3.042551879882812e+02, 3.01004150390625e+02, 3.015939331054688e+02, 3.012111511230469e+02, 2.978714904785156e+02, 2.968207702636719e+02, 2.953626708984375e+02, 2.949451904296875e+02, 2.946724548339844e+02, 2.948918151855469e+02, 2.987328796386719e+02, 2.919533081054688e+02, 2.919551391601562e+02, 2.91954833984375e+02, 2.919552307128906e+02, 2.919537658691406e+02, 2.919529724121094e+02, 2.919535217285156e+02, 2.91955078125e+02, 2.919537658691406e+02, 2.976351928710938e+02, 3.015222473144531e+02, 2.961809692382812e+02, 2.852317810058594e+02, 2.876664428710938e+02, 2.884303894042969e+02, 2.883009948730469e+02, 2.871880798339844e+02, 2.87302734375e+02, 2.895020446777344e+02, 2.952549438476562e+02, 2.868080444335938e+02, 2.868080444335938e+02, 2.868079833984375e+02, 2.86808349609375e+02, 2.868085327148438e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931501770019531e+02, 2.94569091796875e+02, 3.009779968261719e+02, 2.979315795898438e+02, 2.977552795410156e+02, 2.917770690917969e+02, 2.898759155273438e+02, 2.908301391601562e+02, 2.900827026367188e+02, 2.9027783203125e+02, 2.919529724121094e+02, 3.007550048828125e+02, 2.979209289550781e+02, 2.979216613769531e+02, 2.97920166015625e+02, 2.979232177734375e+02, 2.979211730957031e+02, 2.979216613769531e+02, 2.979223022460938e+02, 2.979216613769531e+02, 2.979223022460938e+02, 3.042688293457031e+02, 3.009804992675781e+02, 3.007393493652344e+02, 3.007459716796875e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.007060241699219e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.052839050292969e+02, 3.0528369140625e+02, 3.052844848632812e+02, 3.052840270996094e+02, 3.0528369140625e+02, 3.052834167480469e+02, 3.052832641601562e+02, 3.05283203125e+02, 3.052830200195312e+02, 3.039200439453125e+02, 3.009820251464844e+02, 3.007391662597656e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055824584960938e+02, 3.055832214355469e+02, 3.055833129882812e+02, 3.055838012695312e+02, 3.05586181640625e+02, 3.055848083496094e+02, 3.055825500488281e+02, 3.055858764648438e+02, 3.05580810546875e+02, 3.040523986816406e+02, 3.009960632324219e+02, 3.015936584472656e+02, 3.012111511230469e+02, 3.012038269042969e+02, 3.007630615234375e+02, 2.986181335449219e+02, 2.970092468261719e+02, 2.96237060546875e+02, 2.961241455078125e+02, 3.009314880371094e+02, 2.974520568847656e+02, 2.974550476074219e+02, 2.97454345703125e+02, 2.974552612304688e+02, 2.974518737792969e+02, 2.974500122070312e+02, 2.974512939453125e+02, 2.974548034667969e+02, 2.974518737792969e+02, 3.028412780761719e+02, 3.0152099609375e+02, 3.025538940429688e+02, 2.953824462890625e+02, 2.911289978027344e+02, 2.881901245117188e+02, 2.88000732421875e+02, 2.85115234375e+02, 2.856156311035156e+02, 2.873703002929688e+02, 2.974773864746094e+02, 2.916578369140625e+02, 2.916578674316406e+02, 2.916579284667969e+02, 2.916572570800781e+02, 2.916568298339844e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931498413085938e+02, 2.931498413085938e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.956057434082031e+02, 3.010104064941406e+02, 2.975242919921875e+02, 2.918737182617188e+02, 2.884898986816406e+02, 2.911775512695312e+02, 2.917998352050781e+02, 2.913006896972656e+02, 2.907205200195312e+02, 2.928619995117188e+02, 2.988511962890625e+02, 2.930186767578125e+02, 2.9301904296875e+02, 2.930182189941406e+02, 2.930198974609375e+02, 2.93018798828125e+02, 2.930190734863281e+02, 2.930194396972656e+02, 2.930190734863281e+02, 2.930194396972656e+02, 3.0430126953125e+02, 3.009817810058594e+02, 3.007393798828125e+02, 3.007460021972656e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.004317016601562e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.0528271484375e+02, 3.052825012207031e+02, 3.052832946777344e+02, 3.052828063964844e+02, 3.05282470703125e+02, 3.052821960449219e+02, 3.052820434570312e+02, 3.052820129394531e+02, 3.052818298339844e+02, 3.039533081054688e+02, 3.009833068847656e+02, 3.007391967773438e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055812377929688e+02, 3.0558203125e+02, 3.055821228027344e+02, 3.055826110839844e+02, 3.055850219726562e+02, 3.055836181640625e+02, 3.055813598632812e+02, 3.05584716796875e+02, 3.0557958984375e+02, 3.040852661132812e+02, 3.009973754882812e+02, 3.015937194824219e+02, 3.012111511230469e+02, 3.008252868652344e+02, 2.984389038085938e+02, 2.9739697265625e+02, 2.964475708007812e+02, 2.924236145019531e+02, 2.949132080078125e+02, 2.985531311035156e+02, 2.932332458496094e+02, 2.932353820800781e+02, 2.932349853515625e+02, 2.932355041503906e+02, 2.932334899902344e+02, 2.932323913574219e+02, 2.93233154296875e+02, 2.932351989746094e+02, 2.932334899902344e+02, 3.007311401367188e+02, 3.015222473144531e+02, 3.018131408691406e+02, 2.945743103027344e+02, 2.915613098144531e+02, 2.895040893554688e+02, 2.881525268554688e+02, 2.85115234375e+02, 2.849932250976562e+02, 2.878096008300781e+02, 2.949948425292969e+02, 2.867724304199219e+02, 2.867723999023438e+02, 2.867723388671875e+02, 2.867726745605469e+02, 2.867728271484375e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931501159667969e+02, 2.931501159667969e+02, 2.93150146484375e+02, 2.931502380371094e+02, 2.847234497070312e+02, 2.929313049316406e+02, 2.855842895507812e+02, 2.851715393066406e+02, 2.851520690917969e+02, 2.850647583007812e+02, 2.85148193359375e+02, 2.851473388671875e+02, 2.851505737304688e+02, 2.851505126953125e+02, 2.867167358398438e+02, 2.854102172851562e+02, 2.854100341796875e+02, 2.85410400390625e+02, 2.854096984863281e+02, 2.854100646972656e+02, 2.854100036621094e+02, 2.85409912109375e+02, 2.854100036621094e+02, 2.85409912109375e+02, 3.023655395507812e+02, 3.009804992675781e+02, 3.007393493652344e+02, 3.007459716796875e+02, 3.007184753417969e+02, 3.006635131835938e+02, 3.007106018066406e+02, 3.006981201171875e+02, 3.007060241699219e+02, 3.007162475585938e+02, 3.006889953613281e+02, 3.046900939941406e+02, 3.0468994140625e+02, 3.04690673828125e+02, 3.046902465820312e+02, 3.046899108886719e+02, 3.046896667480469e+02, 3.046895141601562e+02, 3.04689453125e+02, 3.046893005371094e+02, 3.039200439453125e+02, 3.009820251464844e+02, 3.007391662597656e+02, 3.007229614257812e+02, 3.007165222167969e+02, 3.007124938964844e+02, 3.007224731445312e+02, 3.013692321777344e+02, 3.010861511230469e+02, 3.010494689941406e+02, 3.011041870117188e+02, 3.055827026367188e+02, 3.055834350585938e+02, 3.055835571289062e+02, 3.055840148925781e+02, 3.055863647460938e+02, 3.055850219726562e+02, 3.055827941894531e+02, 3.055860900878906e+02, 3.055810546875e+02, 3.040523986816406e+02, 3.009960632324219e+02, 3.015936584472656e+02, 2.995682067871094e+02, 2.912057800292969e+02, 2.887037963867188e+02, 2.882833557128906e+02, 2.872133483886719e+02, 2.861101684570312e+02, 2.860461730957031e+02, 2.910778503417969e+02, 2.861203308105469e+02, 2.861207885742188e+02, 2.861209411621094e+02, 2.861207580566406e+02, 2.861214294433594e+02, 2.861217956542969e+02, 2.861215515136719e+02, 2.861209716796875e+02, 2.861214294433594e+02, 2.959840698242188e+02, 3.0152099609375e+02, 2.898893737792969e+02, 2.852316284179688e+02, 2.853973693847656e+02, 2.85259765625e+02, 2.853021240234375e+02, 2.851150512695312e+02, 2.84993408203125e+02, 2.849206848144531e+02, 2.872444763183594e+02, 2.858775329589844e+02, 2.858775024414062e+02, 2.8587744140625e+02, 2.858780517578125e+02, 2.858783874511719e+02]
+hvac.res.EFan=[0e+00, -3.870868113153847e-06, -3.870859927701531e-06, -3.870686214213492e-06, -3.870294221997028e-06, 7.3536064453125e+03, 1.17139296875e+04, 1.57766298828125e+04, 1.9630818359375e+04, 2.3483765625e+04, 2.7350103515625e+04, 3.1239552734375e+04, 3.51308203125e+04, 3.9022546875e+04, 4.291436328125e+04, 4.691078125e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.034816015625e+04, 5.773802734375e+04, 6.20744140625e+04, 6.618775e+04, 7.03067265625e+04, 7.44273046875e+04, 7.85541796875e+04, 8.2680484375e+04, 8.68026484375e+04, 9.0927765625e+04, 9.50511328125e+04, 9.91787109375e+04, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.02627171875e+05, 1.100165703125e+05, 1.143531015625e+05, 1.1846678125e+05, 1.225907890625e+05, 1.267146484375e+05, 1.3083821875e+05, 1.34960046875e+05, 1.39075e+05, 1.43200140625e+05, 1.47330890625e+05, 1.51456125e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.549025e+05, 1.6227671875e+05, 1.66585296875e+05, 1.7068809375e+05, 1.74805953125e+05, 1.78879375e+05, 1.829913125e+05, 1.8711415625e+05, 1.91230078125e+05, 1.9536165625e+05, 1.9948321875e+05, 2.03612171875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.0705821875e+05, 2.14448796875e+05, 2.18765390625e+05, 2.22832234375e+05, 2.2669453125e+05, 2.30572e+05, 2.3446246875e+05, 2.38353265625e+05, 2.4224403125e+05, 2.46134671875e+05, 2.500254375e+05, 2.539955e+05, 2.57429265625e+05, 2.57429265625e+05, 2.57429265625e+05, 2.57429265625e+05, 2.57429265625e+05]
+hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.58941318359375e+04, 1.3950240625e+05, 2.4959996875e+05, 2.9903928125e+05, 3.37789e+05, 3.795180625e+05, 4.366455625e+05, 4.9001196875e+05, 5.425210625e+05, 5.973186875e+05, 6.844323125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 7.82099125e+05, 8.171123125e+05, 9.480038125e+05, 1.084493125e+06, 1.22138675e+06, 1.356559375e+06, 1.48280775e+06, 1.606106375e+06, 1.729661e+06, 1.8566355e+06, 1.99098325e+06, 2.12840525e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.2431345e+06, 2.284615e+06, 2.41568175e+06, 2.55218475e+06, 2.68928625e+06, 2.82648e+06, 2.96373125e+06, 3.1009405e+06, 3.23626525e+06, 3.362776e+06, 3.48885525e+06, 3.61714225e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.7246075e+06, 3.76501425e+06, 3.89509425e+06, 4.02929725e+06, 4.14519975e+06, 4.2350945e+06, 4.3055915e+06, 4.3626135e+06, 4.405491e+06, 4.4378615e+06, 4.4753565e+06, 4.539144e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.6055825e+06, 4.619098e+06, 4.734774e+06, 4.8352855e+06, 4.8866225e+06, 4.919811e+06, 4.94192e+06, 4.962701e+06, 4.972931e+06, 4.9818455e+06, 4.997969e+06, 5.0406815e+06, 5.0968155e+06, 5.0968155e+06, 5.0968155e+06, 5.0968155e+06, 5.0968155e+06]
 hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt
index d2fe15ae968..be66cea4bec 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Spring.txt
@@ -1,37 +1,37 @@
-last-generated=2023-08-29
+last-generated=2024-04-16
 statistics-initialization=
 {
-  "linear": "0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1",
+  "linear": "0",
+  "nonlinear": "1, 3, 0, 0, 1, 1, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1",
-  "number of continuous time states": "88",
+  "nonlinear": "0, 0, 0, 1, 0, 5, 0, 0, 0, 0, 0, 1, 0, 1, 1",
+  "number of continuous time states": "94",
   "numerical Jacobians": "0"
 }
 time=[7.344e+06, 7.776e+06]
-flo.sou.TAir=[2.931499938964844e+02, 2.942518005371094e+02, 2.940142517089844e+02, 2.94004638671875e+02, 2.9404052734375e+02, 2.938414001464844e+02, 2.948141174316406e+02, 2.952901000976562e+02, 2.956340942382812e+02, 2.960728454589844e+02, 2.967015686035156e+02, 2.969202880859375e+02, 2.9677490234375e+02, 2.965321350097656e+02, 2.956677551269531e+02, 2.953677978515625e+02, 2.957159729003906e+02, 2.957244567871094e+02, 2.953482971191406e+02, 2.952844543457031e+02, 2.948212890625e+02, 2.946593017578125e+02, 2.943446044921875e+02, 2.941426086425781e+02, 2.94034912109375e+02, 2.938398132324219e+02, 2.951177368164062e+02, 2.955912170410156e+02, 2.957947387695312e+02, 2.960781860351562e+02, 2.957383422851562e+02, 2.962989196777344e+02, 2.962835998535156e+02, 2.963831481933594e+02, 2.952289733886719e+02, 2.94565673828125e+02, 2.946720275878906e+02, 2.947385864257812e+02, 2.943573303222656e+02, 2.942354431152344e+02, 2.9367529296875e+02, 2.936774291992188e+02, 2.932246398925781e+02, 2.932254028320312e+02, 2.932410583496094e+02, 2.933031616210938e+02, 2.944400329589844e+02, 2.949767150878906e+02, 2.954196472167969e+02, 2.958232421875e+02, 2.9580126953125e+02, 2.963072509765625e+02, 2.964844970703125e+02, 2.959389038085938e+02, 2.947439880371094e+02, 2.941639404296875e+02, 2.93703857421875e+02, 2.935302124023438e+02, 2.931794738769531e+02, 2.929072265625e+02, 2.925633239746094e+02, 2.924517517089844e+02, 2.92049560546875e+02, 2.919580688476562e+02, 2.92232421875e+02, 2.932912902832031e+02, 2.940994262695312e+02, 2.942129516601562e+02, 2.942314758300781e+02, 2.94701171875e+02, 2.94633056640625e+02, 2.950075988769531e+02, 2.950848999023438e+02, 2.949538879394531e+02, 2.938916625976562e+02, 2.93279541015625e+02, 2.926183471679688e+02, 2.918196716308594e+02, 2.916906127929688e+02, 2.914554748535156e+02, 2.912203369140625e+02, 2.909005737304688e+02, 2.906961975097656e+02, 2.910865783691406e+02, 2.93295166015625e+02, 2.930510864257812e+02, 2.937749938964844e+02, 2.934341735839844e+02, 2.934923706054688e+02, 2.937361450195312e+02, 2.938056945800781e+02, 2.940539855957031e+02, 2.935741577148438e+02, 2.935567626953125e+02, 2.931084899902344e+02, 2.929783325195312e+02, 2.91424560546875e+02, 2.915161743164062e+02, 2.911137084960938e+02, 2.909371337890625e+02, 2.906827087402344e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.943607177734375e+02, 2.941254577636719e+02, 2.940835266113281e+02, 2.941084594726562e+02, 2.939563598632812e+02, 2.952052612304688e+02, 2.955888061523438e+02, 2.958816528320312e+02, 2.962846984863281e+02, 2.961318664550781e+02, 2.962108154296875e+02, 2.962128295898438e+02, 2.960614318847656e+02, 2.953103332519531e+02, 2.950506286621094e+02, 2.954169921875e+02, 2.954703063964844e+02, 2.951476745605469e+02, 2.947302856445312e+02, 2.948985900878906e+02, 2.947747497558594e+02, 2.944292907714844e+02, 2.939411315917969e+02, 2.938083190917969e+02, 2.938201599121094e+02, 2.951687316894531e+02, 2.955244750976562e+02, 2.957059631347656e+02, 2.959212646484375e+02, 2.954237060546875e+02, 2.957197875976562e+02, 2.960868225097656e+02, 2.957644958496094e+02, 2.950110168457031e+02, 2.944849243164062e+02, 2.945781860351562e+02, 2.946477661132812e+02, 2.943169555664062e+02, 2.93897216796875e+02, 2.935617370605469e+02, 2.937859497070312e+02, 2.931438598632812e+02, 2.933635559082031e+02, 2.931993408203125e+02, 2.932549438476562e+02, 2.944266052246094e+02, 2.9494677734375e+02, 2.953578491210938e+02, 2.956845092773438e+02, 2.955903015136719e+02, 2.960727233886719e+02, 2.962575988769531e+02, 2.9543994140625e+02, 2.941080627441406e+02, 2.937167663574219e+02, 2.935766296386719e+02, 2.932333374023438e+02, 2.930462036132812e+02, 2.927941284179688e+02, 2.924325561523438e+02, 2.924082336425781e+02, 2.925010070800781e+02, 2.916656494140625e+02, 2.918818664550781e+02, 2.935291442871094e+02, 2.938166198730469e+02, 2.935456848144531e+02, 2.933368530273438e+02, 2.9363818359375e+02, 2.935228576660156e+02, 2.93846435546875e+02, 2.939425964355469e+02, 2.936954345703125e+02, 2.931281433105469e+02, 2.931543273925781e+02, 2.920583190917969e+02, 2.915993957519531e+02, 2.913486633300781e+02, 2.91207763671875e+02, 2.909976196289062e+02, 2.906690368652344e+02, 2.903882141113281e+02, 2.906228332519531e+02, 2.928746032714844e+02, 2.930077819824219e+02, 2.939721374511719e+02, 2.932311096191406e+02, 2.938916625976562e+02, 2.942246704101562e+02, 2.941202087402344e+02, 2.943849792480469e+02, 2.944619445800781e+02, 2.943881225585938e+02, 2.932728881835938e+02, 2.931341552734375e+02, 2.918410339355469e+02, 2.916276550292969e+02, 2.90873779296875e+02, 2.907048645019531e+02, 2.904671936035156e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.944277954101562e+02, 2.942029724121094e+02, 2.941694946289062e+02, 2.941812744140625e+02, 2.940569763183594e+02, 2.950949096679688e+02, 2.955167846679688e+02, 2.958139953613281e+02, 2.961620788574219e+02, 2.96035888671875e+02, 2.961139831542969e+02, 2.960927124023438e+02, 2.959610290527344e+02, 2.952121276855469e+02, 2.950011291503906e+02, 2.953891906738281e+02, 2.954670715332031e+02, 2.952782897949219e+02, 2.949298095703125e+02, 2.948928833007812e+02, 2.947760925292969e+02, 2.945750427246094e+02, 2.942435302734375e+02, 2.937456359863281e+02, 2.935557861328125e+02, 2.950379943847656e+02, 2.954689636230469e+02, 2.954435119628906e+02, 2.95675537109375e+02, 2.955196533203125e+02, 2.957717895507812e+02, 2.956101379394531e+02, 2.962076721191406e+02, 2.95086181640625e+02, 2.945099487304688e+02, 2.945525207519531e+02, 2.9470849609375e+02, 2.944474487304688e+02, 2.941045532226562e+02, 2.938964538574219e+02, 2.93645751953125e+02, 2.935393981933594e+02, 2.933162231445312e+02, 2.9336572265625e+02, 2.933574523925781e+02, 2.944525756835938e+02, 2.949387817382812e+02, 2.953424377441406e+02, 2.956788940429688e+02, 2.955834655761719e+02, 2.960719604492188e+02, 2.962697143554688e+02, 2.956948852539062e+02, 2.944246826171875e+02, 2.9413916015625e+02, 2.941560363769531e+02, 2.93158447265625e+02, 2.928224182128906e+02, 2.925720825195312e+02, 2.921932373046875e+02, 2.921567687988281e+02, 2.918478698730469e+02, 2.915712585449219e+02, 2.917451171875e+02, 2.933019409179688e+02, 2.939558715820312e+02, 2.94140625e+02, 2.941197204589844e+02, 2.939062194824219e+02, 2.93957275390625e+02, 2.940413208007812e+02, 2.941367797851562e+02, 2.939085693359375e+02, 2.936510925292969e+02, 2.930814819335938e+02, 2.925189514160156e+02, 2.925960998535156e+02, 2.919107055664062e+02, 2.918298645019531e+02, 2.916651916503906e+02, 2.913891906738281e+02, 2.909985656738281e+02, 2.91232666015625e+02, 2.933925476074219e+02, 2.933450012207031e+02, 2.938006896972656e+02, 2.936648864746094e+02, 2.939733581542969e+02, 2.943131408691406e+02, 2.942134399414062e+02, 2.944901123046875e+02, 2.945656433105469e+02, 2.94489013671875e+02, 2.933674621582031e+02, 2.931277465820312e+02, 2.923448791503906e+02, 2.919902038574219e+02, 2.914568176269531e+02, 2.91254638671875e+02, 2.909719848632812e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.945223999023438e+02, 2.942899780273438e+02, 2.942921447753906e+02, 2.942726440429688e+02, 2.940981140136719e+02, 2.95013916015625e+02, 2.951942443847656e+02, 2.957775573730469e+02, 2.959187316894531e+02, 2.958677368164062e+02, 2.960164489746094e+02, 2.963088073730469e+02, 2.96389404296875e+02, 2.954436645507812e+02, 2.953816223144531e+02, 2.955928344726562e+02, 2.9562255859375e+02, 2.953897399902344e+02, 2.950204772949219e+02, 2.948876647949219e+02, 2.947524108886719e+02, 2.942259216308594e+02, 2.942651977539062e+02, 2.942347717285156e+02, 2.941431274414062e+02, 2.950970764160156e+02, 2.955281066894531e+02, 2.957311096191406e+02, 2.959423217773438e+02, 2.955985412597656e+02, 2.961285095214844e+02, 2.961756591796875e+02, 2.963315734863281e+02, 2.952019958496094e+02, 2.945416870117188e+02, 2.947306823730469e+02, 2.947004089355469e+02, 2.942121887207031e+02, 2.938545227050781e+02, 2.93493408203125e+02, 2.934443359375e+02, 2.930549621582031e+02, 2.930410461425781e+02, 2.930809020996094e+02, 2.930502319335938e+02, 2.942101135253906e+02, 2.948583984375e+02, 2.952793884277344e+02, 2.956333312988281e+02, 2.955497741699219e+02, 2.960603942871094e+02, 2.960413513183594e+02, 2.958512268066406e+02, 2.947388916015625e+02, 2.941790771484375e+02, 2.940501708984375e+02, 2.938433532714844e+02, 2.9354296875e+02, 2.932601318359375e+02, 2.929457397460938e+02, 2.927792663574219e+02, 2.925358581542969e+02, 2.923004760742188e+02, 2.923827514648438e+02, 2.937030944824219e+02, 2.940658874511719e+02, 2.941470947265625e+02, 2.94127685546875e+02, 2.945350952148438e+02, 2.944406433105469e+02, 2.948615417480469e+02, 2.950089416503906e+02, 2.949461364746094e+02, 2.939333190917969e+02, 2.933101806640625e+02, 2.931208190917969e+02, 2.924385986328125e+02, 2.918880004882812e+02, 2.917533874511719e+02, 2.915512084960938e+02, 2.912576904296875e+02, 2.909193115234375e+02, 2.9128173828125e+02, 2.935455932617188e+02, 2.937529296875e+02, 2.93741455078125e+02, 2.9359716796875e+02, 2.939134216308594e+02, 2.939386596679688e+02, 2.936369323730469e+02, 2.93698486328125e+02, 2.937109985351562e+02, 2.933810424804688e+02, 2.930087890625e+02, 2.9323388671875e+02, 2.912120666503906e+02, 2.911712341308594e+02, 2.906649780273438e+02, 2.905157470703125e+02, 2.902962036132812e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.947085876464844e+02, 2.944820861816406e+02, 2.944397583007812e+02, 2.944443054199219e+02, 2.943189086914062e+02, 2.952684326171875e+02, 2.956892395019531e+02, 2.960123291015625e+02, 2.963190002441406e+02, 2.962754211425781e+02, 2.963987731933594e+02, 2.963377990722656e+02, 2.961873779296875e+02, 2.95417236328125e+02, 2.952354125976562e+02, 2.956600952148438e+02, 2.957654113769531e+02, 2.955457458496094e+02, 2.9526171875e+02, 2.95140625e+02, 2.950243835449219e+02, 2.947120361328125e+02, 2.94498046875e+02, 2.942648315429688e+02, 2.941313781738281e+02, 2.953307800292969e+02, 2.958144836425781e+02, 2.959176635742188e+02, 2.961094970703125e+02, 2.957645568847656e+02, 2.9621044921875e+02, 2.962149658203125e+02, 2.964538269042969e+02, 2.954117736816406e+02, 2.948006591796875e+02, 2.949523620605469e+02, 2.950171813964844e+02, 2.946920471191406e+02, 2.944110412597656e+02, 2.940693969726562e+02, 2.940016784667969e+02, 2.936591186523438e+02, 2.936202087402344e+02, 2.935947570800781e+02, 2.936109619140625e+02, 2.946941528320312e+02, 2.952221984863281e+02, 2.956065673828125e+02, 2.959126281738281e+02, 2.95776611328125e+02, 2.962748413085938e+02, 2.964566955566406e+02, 2.960120849609375e+02, 2.948049011230469e+02, 2.943713989257812e+02, 2.942803649902344e+02, 2.938338012695312e+02, 2.935406494140625e+02, 2.932779846191406e+02, 2.929423522949219e+02, 2.928543701171875e+02, 2.925734558105469e+02, 2.923194580078125e+02, 2.923816528320312e+02, 2.935728759765625e+02, 2.944408264160156e+02, 2.944308166503906e+02, 2.943106689453125e+02, 2.945057983398438e+02, 2.944218139648438e+02, 2.947158813476562e+02, 2.948136901855469e+02, 2.946628723144531e+02, 2.93975830078125e+02, 2.935427856445312e+02, 2.930587463378906e+02, 2.925823974609375e+02, 2.922903442382812e+02, 2.921091613769531e+02, 2.918943786621094e+02, 2.916085815429688e+02, 2.913472595214844e+02, 2.914312133789062e+02, 2.936343383789062e+02, 2.9321923828125e+02, 2.942257385253906e+02, 2.939205017089844e+02, 2.941414184570312e+02, 2.943857421875e+02, 2.942860107421875e+02, 2.945604858398438e+02, 2.943697814941406e+02, 2.942889099121094e+02, 2.935816650390625e+02, 2.933213500976562e+02, 2.922751770019531e+02, 2.92176513671875e+02, 2.917010498046875e+02, 2.915051574707031e+02, 2.912328796386719e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.942518005371094e+02, 2.940142517089844e+02, 2.94004638671875e+02, 2.940405578613281e+02, 2.938414001464844e+02, 2.948141174316406e+02, 2.952901000976562e+02, 2.956340942382812e+02, 2.960728454589844e+02, 2.967015686035156e+02, 2.969202880859375e+02, 2.9677490234375e+02, 2.965321350097656e+02, 2.956677551269531e+02, 2.953677978515625e+02, 2.957159729003906e+02, 2.957244567871094e+02, 2.953482971191406e+02, 2.952844543457031e+02, 2.948212890625e+02, 2.946593017578125e+02, 2.943446044921875e+02, 2.94142578125e+02, 2.94034912109375e+02, 2.938398132324219e+02, 2.951177368164062e+02, 2.955912170410156e+02, 2.957947387695312e+02, 2.960781860351562e+02, 2.957383422851562e+02, 2.962989196777344e+02, 2.962835998535156e+02, 2.963831481933594e+02, 2.952289733886719e+02, 2.94565673828125e+02, 2.946720275878906e+02, 2.947385864257812e+02, 2.943573303222656e+02, 2.942354431152344e+02, 2.9367529296875e+02, 2.936774291992188e+02, 2.932246398925781e+02, 2.932254028320312e+02, 2.932410583496094e+02, 2.933031921386719e+02, 2.944400329589844e+02, 2.949767150878906e+02, 2.954196166992188e+02, 2.958232421875e+02, 2.9580126953125e+02, 2.963072509765625e+02, 2.964845275878906e+02, 2.959389038085938e+02, 2.947439880371094e+02, 2.941639404296875e+02, 2.93703857421875e+02, 2.935302124023438e+02, 2.931794738769531e+02, 2.929072265625e+02, 2.925633544921875e+02, 2.924517517089844e+02, 2.92049560546875e+02, 2.919580688476562e+02, 2.922322998046875e+02, 2.932908630371094e+02, 2.940993957519531e+02, 2.942129821777344e+02, 2.942314758300781e+02, 2.94701171875e+02, 2.94633056640625e+02, 2.950075988769531e+02, 2.950848999023438e+02, 2.94953857421875e+02, 2.938916625976562e+02, 2.93279541015625e+02, 2.926183471679688e+02, 2.918196716308594e+02, 2.916906127929688e+02, 2.914554748535156e+02, 2.912203369140625e+02, 2.909005737304688e+02, 2.906961669921875e+02, 2.910865173339844e+02, 2.932948303222656e+02, 2.930502624511719e+02, 2.937749328613281e+02, 2.934341125488281e+02, 2.93492431640625e+02, 2.937361755371094e+02, 2.938057250976562e+02, 2.940539855957031e+02, 2.935741577148438e+02, 2.935567932128906e+02, 2.931084899902344e+02, 2.929783325195312e+02, 2.91424560546875e+02, 2.915161743164062e+02, 2.911137084960938e+02, 2.909371643066406e+02, 2.906827392578125e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.943606872558594e+02, 2.941254577636719e+02, 2.9408349609375e+02, 2.941084594726562e+02, 2.939563598632812e+02, 2.952053527832031e+02, 2.955888061523438e+02, 2.958816528320312e+02, 2.962846984863281e+02, 2.961318359375e+02, 2.962108154296875e+02, 2.962127990722656e+02, 2.960614318847656e+02, 2.953103942871094e+02, 2.950506286621094e+02, 2.954170532226562e+02, 2.954703063964844e+02, 2.951476745605469e+02, 2.947302856445312e+02, 2.948985595703125e+02, 2.947747192382812e+02, 2.944292907714844e+02, 2.939411010742188e+02, 2.93808349609375e+02, 2.938201599121094e+02, 2.951687927246094e+02, 2.955244445800781e+02, 2.957059631347656e+02, 2.959212646484375e+02, 2.954237670898438e+02, 2.957197570800781e+02, 2.960868530273438e+02, 2.957645263671875e+02, 2.950110168457031e+02, 2.944848937988281e+02, 2.945782165527344e+02, 2.946477661132812e+02, 2.943169250488281e+02, 2.93897216796875e+02, 2.935617370605469e+02, 2.937859191894531e+02, 2.931438598632812e+02, 2.93363525390625e+02, 2.931993713378906e+02, 2.932549438476562e+02, 2.944266662597656e+02, 2.9494677734375e+02, 2.953578796386719e+02, 2.956845397949219e+02, 2.955903015136719e+02, 2.960727233886719e+02, 2.962576293945312e+02, 2.954399108886719e+02, 2.941080627441406e+02, 2.93716796875e+02, 2.9357666015625e+02, 2.932333068847656e+02, 2.930461730957031e+02, 2.927940979003906e+02, 2.924325561523438e+02, 2.92408203125e+02, 2.925009765625e+02, 2.916656494140625e+02, 2.918815612792969e+02, 2.935292663574219e+02, 2.938166809082031e+02, 2.935457153320312e+02, 2.933368530273438e+02, 2.936381530761719e+02, 2.935228576660156e+02, 2.93846435546875e+02, 2.939425964355469e+02, 2.936954040527344e+02, 2.931281127929688e+02, 2.931543579101562e+02, 2.920583190917969e+02, 2.915993957519531e+02, 2.913486328125e+02, 2.91207763671875e+02, 2.909976196289062e+02, 2.906690368652344e+02, 2.903882141113281e+02, 2.90622802734375e+02, 2.928735656738281e+02, 2.93008056640625e+02, 2.939720153808594e+02, 2.932310485839844e+02, 2.938917236328125e+02, 2.942247009277344e+02, 2.941202087402344e+02, 2.943849792480469e+02, 2.944619445800781e+02, 2.943881225585938e+02, 2.932728881835938e+02, 2.931341857910156e+02, 2.918409729003906e+02, 2.916276245117188e+02, 2.908737487792969e+02, 2.907048645019531e+02, 2.904672241210938e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.944277954101562e+02, 2.942030029296875e+02, 2.941694946289062e+02, 2.941812744140625e+02, 2.940570068359375e+02, 2.950948181152344e+02, 2.955167541503906e+02, 2.958139953613281e+02, 2.961620788574219e+02, 2.96035888671875e+02, 2.961139831542969e+02, 2.960927124023438e+02, 2.959610290527344e+02, 2.952121276855469e+02, 2.950011291503906e+02, 2.953891296386719e+02, 2.954670715332031e+02, 2.952782897949219e+02, 2.949298095703125e+02, 2.948928833007812e+02, 2.947760925292969e+02, 2.945750427246094e+02, 2.942435302734375e+02, 2.937456359863281e+02, 2.935557861328125e+02, 2.950379028320312e+02, 2.954689636230469e+02, 2.954435119628906e+02, 2.95675537109375e+02, 2.955196228027344e+02, 2.957717895507812e+02, 2.956101379394531e+02, 2.962076416015625e+02, 2.95086181640625e+02, 2.945099792480469e+02, 2.94552490234375e+02, 2.9470849609375e+02, 2.944474487304688e+02, 2.941045532226562e+02, 2.938964538574219e+02, 2.93645751953125e+02, 2.935393981933594e+02, 2.933162231445312e+02, 2.9336572265625e+02, 2.933574523925781e+02, 2.944525146484375e+02, 2.949387512207031e+02, 2.953424072265625e+02, 2.956788635253906e+02, 2.955834655761719e+02, 2.960719604492188e+02, 2.962697448730469e+02, 2.956949157714844e+02, 2.944246826171875e+02, 2.9413916015625e+02, 2.941560363769531e+02, 2.93158447265625e+02, 2.928224487304688e+02, 2.925720825195312e+02, 2.921932678222656e+02, 2.921567687988281e+02, 2.918478393554688e+02, 2.915712890625e+02, 2.917449035644531e+02, 2.933026428222656e+02, 2.939555053710938e+02, 2.94140625e+02, 2.941197204589844e+02, 2.939062194824219e+02, 2.93957275390625e+02, 2.940412902832031e+02, 2.941367797851562e+02, 2.939085693359375e+02, 2.936510925292969e+02, 2.930814819335938e+02, 2.925189819335938e+02, 2.925961303710938e+02, 2.919107055664062e+02, 2.918298645019531e+02, 2.916652221679688e+02, 2.913892517089844e+02, 2.909985961914062e+02, 2.912326354980469e+02, 2.933916931152344e+02, 2.933450012207031e+02, 2.93800537109375e+02, 2.936648559570312e+02, 2.939733581542969e+02, 2.943131408691406e+02, 2.942134399414062e+02, 2.944901428222656e+02, 2.945656433105469e+02, 2.94489013671875e+02, 2.933674926757812e+02, 2.931277465820312e+02, 2.923450317382812e+02, 2.91990234375e+02, 2.914568481445312e+02, 2.91254638671875e+02, 2.909720153808594e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.945223999023438e+02, 2.942899780273438e+02, 2.942921447753906e+02, 2.942726440429688e+02, 2.940980834960938e+02, 2.950139770507812e+02, 2.951942749023438e+02, 2.957775573730469e+02, 2.959187316894531e+02, 2.958677062988281e+02, 2.960164489746094e+02, 2.963088073730469e+02, 2.96389404296875e+02, 2.954437255859375e+02, 2.95381591796875e+02, 2.955928649902344e+02, 2.9562255859375e+02, 2.953897094726562e+02, 2.950204467773438e+02, 2.948876647949219e+02, 2.947523803710938e+02, 2.942259216308594e+02, 2.942651672363281e+02, 2.942348022460938e+02, 2.941430969238281e+02, 2.950971374511719e+02, 2.955281066894531e+02, 2.957311096191406e+02, 2.959422912597656e+02, 2.955986022949219e+02, 2.961285095214844e+02, 2.961756591796875e+02, 2.963316040039062e+02, 2.952019958496094e+02, 2.945416564941406e+02, 2.94730712890625e+02, 2.947003784179688e+02, 2.942121887207031e+02, 2.938545227050781e+02, 2.93493408203125e+02, 2.934443054199219e+02, 2.930549621582031e+02, 2.930410461425781e+02, 2.930809020996094e+02, 2.930502014160156e+02, 2.942101745605469e+02, 2.948584289550781e+02, 2.952794189453125e+02, 2.956333618164062e+02, 2.955497741699219e+02, 2.960603942871094e+02, 2.960413818359375e+02, 2.958511962890625e+02, 2.947389526367188e+02, 2.941790771484375e+02, 2.940502014160156e+02, 2.938433227539062e+02, 2.935429382324219e+02, 2.932601318359375e+02, 2.929457092285156e+02, 2.927792663574219e+02, 2.925358581542969e+02, 2.923004760742188e+02, 2.923826293945312e+02, 2.937024230957031e+02, 2.940659484863281e+02, 2.941471557617188e+02, 2.94127685546875e+02, 2.945350341796875e+02, 2.944406433105469e+02, 2.948615417480469e+02, 2.950089416503906e+02, 2.949461364746094e+02, 2.939334106445312e+02, 2.933101501464844e+02, 2.931208190917969e+02, 2.924385986328125e+02, 2.918880004882812e+02, 2.917533874511719e+02, 2.915511779785156e+02, 2.912576904296875e+02, 2.909193115234375e+02, 2.912816772460938e+02, 2.935453186035156e+02, 2.93756103515625e+02, 2.937413940429688e+02, 2.935971374511719e+02, 2.939134826660156e+02, 2.939386901855469e+02, 2.93636962890625e+02, 2.93698486328125e+02, 2.937110290527344e+02, 2.933810424804688e+02, 2.930087890625e+02, 2.932338562011719e+02, 2.912120361328125e+02, 2.911712341308594e+02, 2.906649780273438e+02, 2.905157775878906e+02, 2.902962036132812e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.947085876464844e+02, 2.944820861816406e+02, 2.944397583007812e+02, 2.944443054199219e+02, 2.943189086914062e+02, 2.952684326171875e+02, 2.956892395019531e+02, 2.960123291015625e+02, 2.963190002441406e+02, 2.962754211425781e+02, 2.963987731933594e+02, 2.963377990722656e+02, 2.961873779296875e+02, 2.95417236328125e+02, 2.952354125976562e+02, 2.956600952148438e+02, 2.957654113769531e+02, 2.955457458496094e+02, 2.9526171875e+02, 2.95140625e+02, 2.950243530273438e+02, 2.947120361328125e+02, 2.944980163574219e+02, 2.942648315429688e+02, 2.941313781738281e+02, 2.953307495117188e+02, 2.958144836425781e+02, 2.959176635742188e+02, 2.961094970703125e+02, 2.957645568847656e+02, 2.962104187011719e+02, 2.962149658203125e+02, 2.96453857421875e+02, 2.954117736816406e+02, 2.948006591796875e+02, 2.949523620605469e+02, 2.950171813964844e+02, 2.946920471191406e+02, 2.944110412597656e+02, 2.940693969726562e+02, 2.940016479492188e+02, 2.936591186523438e+02, 2.936202087402344e+02, 2.935947570800781e+02, 2.936109619140625e+02, 2.946941528320312e+02, 2.952221984863281e+02, 2.956065673828125e+02, 2.959126281738281e+02, 2.95776611328125e+02, 2.962748413085938e+02, 2.964566955566406e+02, 2.960120544433594e+02, 2.948049011230469e+02, 2.943713989257812e+02, 2.942803955078125e+02, 2.938338012695312e+02, 2.935406494140625e+02, 2.932779846191406e+02, 2.929423522949219e+02, 2.928543701171875e+02, 2.925734558105469e+02, 2.923194885253906e+02, 2.923815307617188e+02, 2.935731811523438e+02, 2.944407348632812e+02, 2.944308471679688e+02, 2.943106689453125e+02, 2.945057983398438e+02, 2.944218139648438e+02, 2.947158813476562e+02, 2.948136901855469e+02, 2.946628723144531e+02, 2.93975830078125e+02, 2.935427856445312e+02, 2.930587463378906e+02, 2.925823974609375e+02, 2.922903442382812e+02, 2.921091613769531e+02, 2.918943786621094e+02, 2.916085815429688e+02, 2.913472595214844e+02, 2.9143115234375e+02, 2.936335754394531e+02, 2.932177124023438e+02, 2.942256774902344e+02, 2.939204406738281e+02, 2.941414489746094e+02, 2.943857727050781e+02, 2.942860107421875e+02, 2.945604858398438e+02, 2.943698120117188e+02, 2.942889099121094e+02, 2.935816650390625e+02, 2.933213500976562e+02, 2.922751770019531e+02, 2.92176513671875e+02, 2.917010498046875e+02, 2.915051574707031e+02, 2.9123291015625e+02]
 hvac.TZonSet[1].TCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 hvac.TZonSet[1].THeaSet=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.621593475341797e-01, 3.046400249004364e-01, 3.050566911697388e-01, 3.004537522792816e-01, 3.012813925743103e-01, 3.02350640296936e-01, 3.014130592346191e-01, 3.030805289745331e-01, 3.01113486289978e-01, 3.010886907577515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.623462080955505e-01, 3.049413561820984e-01, 3.047096729278564e-01, 3.004977107048035e-01, 3.012484908103943e-01, 3.01452100276947e-01, 3.016365766525269e-01, 3.017139434814453e-01, 3.015846908092499e-01, 3.015652596950531e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.412124484777451e-01, 2.73864209651947e-01, 3.051108419895172e-01, 3.032629787921906e-01, 3.007001876831055e-01, 3.013338148593903e-01, 3.015822768211365e-01, 3.015322983264923e-01, 3.015077412128448e-01, 3.01438182592392e-01, 3.017248511314392e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.128307670354843e-01, 3.033965826034546e-01, 2.835886478424072e-01, 3.054105937480927e-01, 3.026190996170044e-01, 3.003063499927521e-01, 3.013795912265778e-01, 3.015655875205994e-01, 3.015499413013458e-01, 3.0158931016922e-01, 3.019299507141113e-01, 3.015898168087006e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.93301185965538e-01, 4.556096792221069e-01, 2.799579799175262e-01, 3.073553740978241e-01, 3.067490756511688e-01, 3.002641499042511e-01, 3.008609116077423e-01, 3.015637993812561e-01, 3.016895055770874e-01, 3.015410006046295e-01, 3.015746772289276e-01, 3.016996383666992e-01, 3.13677042722702e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.724461317062378e-01, 6.904553771018982e-01, 6.462987065315247e-01, 6.490709185600281e-01, 6.52013897895813e-01, 6.458005905151367e-01, 6.457748413085938e-01, 6.485350728034973e-01, 6.462972164154053e-01, 6.48808479309082e-01, 5.978871393700635e-17, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717965006828308e-01, 6.8631511926651e-01, 6.44453227519989e-01, 6.482349038124084e-01, 6.508299708366394e-01, 6.507869362831116e-01, 6.501390933990479e-01, 6.504166722297668e-01, 6.489003300666809e-01, 6.496233940124512e-01, 1.197438235260339e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560714483261108e-01, 6.732240319252014e-01, 6.714144945144653e-01, 6.440802216529846e-01, 6.479161977767944e-01, 6.493750214576721e-01, 6.489534378051758e-01, 6.492507457733154e-01, 6.493229269981384e-01, 6.51049017906189e-01, 6.500763893127441e-01, 7.474104906519659e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.262087941169739e-01, 1.527153998613358e-01, 6.745786070823669e-01, 6.633924245834351e-01, 6.433777809143066e-01, 6.492668986320496e-01, 6.521162986755371e-01, 6.514816880226135e-01, 6.516136527061462e-01, 6.515596508979797e-01, 6.503340601921082e-01, 6.490375995635986e-01, 2.034445133105037e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.126799583435059e-01, 3.987895250320435e-01, 1.607932150363922e-01, 6.853272318840027e-01, 6.414253711700439e-01, 6.466435194015503e-01, 6.528118252754211e-01, 6.51996910572052e-01, 6.508395671844482e-01, 6.511942744255066e-01, 6.513200998306274e-01, 6.512209177017212e-01, 6.733081340789795e-01, 1.259698052015674e-18, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.72446608543396e-01, 6.904558539390564e-01, 6.462991237640381e-01, 6.490713357925415e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 5.978874702423085e-17, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717969179153442e-01, 6.86315655708313e-01, 6.444536447525024e-01, 6.482353210449219e-01, 6.508303880691528e-01, 6.50787353515625e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.19743897972289e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560714483261108e-01, 6.732244491577148e-01, 6.714149117469788e-01, 6.44080638885498e-01, 6.479166150093079e-01, 6.493753790855408e-01, 6.489538550376892e-01, 6.492511630058289e-01, 6.493233442306519e-01, 6.510494351387024e-01, 6.500768065452576e-01, 7.474109538731089e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 4.909704327583313e-01, 3.229161500930786e-01, 6.776418685913086e-01, 6.634693741798401e-01, 6.433795094490051e-01, 6.49267315864563e-01, 6.521167159080505e-01, 6.51482105255127e-01, 6.516140699386597e-01, 6.515600681304932e-01, 6.503344774246216e-01, 6.490380167961121e-01, 2.034446373875956e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.988882660865784e-01, 4.436958730220795e-01, 6.542589068412781e-01, 6.943420171737671e-01, 6.415955424308777e-01, 6.466467976570129e-01, 6.528123021125793e-01, 6.519973278045654e-01, 6.508399844169617e-01, 6.5119469165802e-01, 6.513205170631409e-01, 6.512212753295898e-01, 6.868105530738831e-01, 1.445363393394146e-18, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.59711217880249e-01, 5.768917798995972e-01, 5.455539226531982e-01, 5.478203296661377e-01, 5.500791668891907e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474045872688293e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.046133601435225e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 5.592311024665833e-01, 5.740925073623657e-01, 5.441479086875916e-01, 5.471726059913635e-01, 5.491725206375122e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.010640669738919e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560714483261108e-01, 5.638733506202698e-01, 5.639806985855103e-01, 5.439099073410034e-01, 5.469261407852173e-01, 5.480526089668274e-01, 5.477262139320374e-01, 5.47956109046936e-01, 5.48012912273407e-01, 5.493409633636475e-01, 5.485901236534119e-01, 6.308543234216909e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 6.870447397232056e-01, 5.118921399116516e-01, 5.71074903011322e-01, 5.58390200138092e-01, 5.433790683746338e-01, 5.479736924171448e-01, 5.50156831741333e-01, 5.496706366539001e-01, 5.497723817825317e-01, 5.497304797172546e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.716632932582696e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 8.380963206291199e-01, 4.644355773925781e-01, 7.808363437652588e-01, 6.56373143196106e-01, 5.431829690933228e-01, 5.459580421447754e-01, 5.506948828697205e-01, 5.500637292861938e-01, 5.491763949394226e-01, 5.494512319564819e-01, 5.495472550392151e-01, 5.49470067024231e-01, 5.660238862037659e-01, 1.057458285908323e-18, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.72446608543396e-01, 6.904558539390564e-01, 6.462991237640381e-01, 6.490713357925415e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 5.978874702423085e-17, 0e+00, 0e+00, 0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.717969179153442e-01, 6.86315655708313e-01, 6.444536447525024e-01, 6.482353210449219e-01, 6.508303880691528e-01, 6.50787353515625e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.19743897972289e-17, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.560714483261108e-01, 6.732244491577148e-01, 6.714149117469788e-01, 6.44080638885498e-01, 6.479166150093079e-01, 6.493753790855408e-01, 6.489538550376892e-01, 6.492511630058289e-01, 6.493233442306519e-01, 6.510494351387024e-01, 6.500768065452576e-01, 7.474109538731089e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 7.049713134765625e-01, 5.405565500259399e-01, 6.889296174049377e-01, 6.637541055679321e-01, 6.433845162391663e-01, 6.492673754692078e-01, 6.521167159080505e-01, 6.51482105255127e-01, 6.516140699386597e-01, 6.515600681304932e-01, 6.503344774246216e-01, 6.490380167961121e-01, 2.034446373875956e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.038120627403259e-01, 4.401419460773468e-01, 6.344650983810425e-01, 6.942561864852905e-01, 6.415939331054688e-01, 6.466467976570129e-01, 6.528123021125793e-01, 6.519973278045654e-01, 6.508399844169617e-01, 6.5119469165802e-01, 6.513205170631409e-01, 6.512212753295898e-01, 6.733085513114929e-01, 1.259698879196286e-18, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.59711217880249e-01, 5.768917798995972e-01, 5.455539226531982e-01, 5.478203296661377e-01, 5.500791668891907e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474045872688293e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.046133601435225e-17, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 5.592311024665833e-01, 5.740925073623657e-01, 5.441479086875916e-01, 5.471726059913635e-01, 5.491725206375122e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.010640587020857e-17, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560714483261108e-01, 5.638733506202698e-01, 5.639806985855103e-01, 5.439099073410034e-01, 5.469261407852173e-01, 5.480526089668274e-01, 5.477262139320374e-01, 5.47956109046936e-01, 5.48012912273407e-01, 5.493409633636475e-01, 5.485901236534119e-01, 6.308543234216909e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 4.26146537065506e-01, 3.252924978733063e-01, 5.69379985332489e-01, 5.583577752113342e-01, 5.43378472328186e-01, 5.479736924171448e-01, 5.50156831741333e-01, 5.496706366539001e-01, 5.497723817825317e-01, 5.497304797172546e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.716632932582696e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.113577723503113e-01, 3.245170414447784e-01, 6.350457668304443e-01, 5.818496346473694e-01, 5.419201254844666e-01, 5.459360480308533e-01, 5.50694465637207e-01, 5.500637292861938e-01, 5.491763949394226e-01, 5.494512319564819e-01, 5.495472550392151e-01, 5.49470067024231e-01, 6.786094903945923e-01, 1.370250844280962e-18, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.542738556861877e-01, 7.344576120376587e-01, 9.552122354507446e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.540497720241547e-01, 7.341879606246948e-01, 9.553397297859192e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.353088736534119e-01, 7.895554304122925e-01, 9.86413300037384e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.402819514274597e-01, 8.539685010910034e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.736598968505859e-01, 8.750940561294556e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339294433594e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 3.006288757324219e+02, 2.922716979980469e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 3.017959594726562e+02, 2.995387878417969e+02, 2.933390502929688e+02, 2.908175659179688e+02, 2.890733337402344e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.90947021484375e+02, 2.906952819824219e+02, 2.906952819824219e+02, 2.906952819824219e+02, 2.906952819824219e+02, 2.906952819824219e+02, 2.906952819824219e+02, 2.906952819824219e+02, 3.003389282226562e+02, 3.058594665527344e+02, 3.048137512207031e+02, 2.926241760253906e+02, 2.903592224121094e+02, 2.90486572265625e+02, 2.908725280761719e+02, 2.911497192382812e+02, 2.908704223632812e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.963740844726562e+02, 3.04129638671875e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.899055480957031e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393310546875e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 3.004833679199219e+02, 2.922692260742188e+02, 2.911441040039062e+02, 2.911447143554688e+02, 2.911247253417969e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.91679931640625e+02, 2.89301513671875e+02, 2.901397705078125e+02, 2.909776916503906e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 3.015484313964844e+02, 3.063575744628906e+02, 2.941776428222656e+02, 2.908187866210938e+02, 2.890722351074219e+02, 2.905821228027344e+02, 2.909654846191406e+02, 2.910634155273438e+02, 2.910396728515625e+02, 2.910914001464844e+02, 2.971601867675781e+02, 3.017326049804688e+02, 2.961963195800781e+02, 2.961963195800781e+02, 2.961963195800781e+02, 2.961963195800781e+02, 2.961963195800781e+02, 2.961963195800781e+02, 2.961963195800781e+02, 3.01309326171875e+02, 3.04816162109375e+02, 3.041534118652344e+02, 2.988025512695312e+02, 2.903606567382812e+02, 2.904859924316406e+02, 2.908724060058594e+02, 2.911498107910156e+02, 2.908703918457031e+02, 2.909870910644531e+02, 2.909630126953125e+02, 2.900853881835938e+02, 2.941606140136719e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339294433594e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 2.912889099121094e+02, 3.007438659667969e+02, 2.922716979980469e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 2.911222839355469e+02, 3.015364379882812e+02, 3.069048767089844e+02, 2.970240478515625e+02, 2.908175659179688e+02, 2.890733337402344e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.935763244628906e+02, 2.921032104492188e+02, 2.921032104492188e+02, 2.921032104492188e+02, 2.921032104492188e+02, 2.921032104492188e+02, 2.921032104492188e+02, 2.921032104492188e+02, 3.0060302734375e+02, 3.063900756835938e+02, 2.97343017578125e+02, 2.926241760253906e+02, 2.903592224121094e+02, 2.90486572265625e+02, 2.908725280761719e+02, 2.911497192382812e+02, 2.908704223632812e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.900841674804688e+02, 2.9309130859375e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.899055480957031e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393310546875e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911916198730469e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 2.912562866210938e+02, 3.005218505859375e+02, 2.922692260742188e+02, 2.911441040039062e+02, 2.911447143554688e+02, 2.911247253417969e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.91679931640625e+02, 2.89301513671875e+02, 2.901397705078125e+02, 2.909776916503906e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 3.020602722167969e+02, 2.995390930175781e+02, 2.933377075195312e+02, 2.908187866210938e+02, 2.890722351074219e+02, 2.905821228027344e+02, 2.909654846191406e+02, 2.910634155273438e+02, 2.910396728515625e+02, 2.910914001464844e+02, 2.908975524902344e+02, 2.909468078613281e+02, 2.910097961425781e+02, 2.910097961425781e+02, 2.910097961425781e+02, 2.910097961425781e+02, 2.910097961425781e+02, 2.910097961425781e+02, 2.910097961425781e+02, 3.004205017089844e+02, 2.957412109375e+02, 2.996063537597656e+02, 2.926241455078125e+02, 2.903606567382812e+02, 2.904859924316406e+02, 2.908724060058594e+02, 2.911498107910156e+02, 2.908703918457031e+02, 2.909870910644531e+02, 2.909630126953125e+02, 3.028331909179688e+02, 3.041577758789062e+02, 2.919365234375e+02, 2.919365234375e+02, 2.919365234375e+02, 2.919365234375e+02, 2.919365234375e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339294433594e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.912234802246094e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 2.912889404296875e+02, 3.008670043945312e+02, 2.922716979980469e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.020289611816406e+02, 2.994737854003906e+02, 2.933390502929688e+02, 2.908175659179688e+02, 2.890733337402344e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.90947021484375e+02, 2.903613891601562e+02, 2.903613891601562e+02, 2.903613891601562e+02, 2.903613891601562e+02, 2.903613891601562e+02, 2.903613891601562e+02, 2.903613891601562e+02, 3.004354248046875e+02, 3.053640747070312e+02, 2.962489624023438e+02, 2.926241760253906e+02, 2.903592224121094e+02, 2.90486572265625e+02, 2.908725280761719e+02, 2.911497192382812e+02, 2.908704223632812e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.900841674804688e+02, 2.895577392578125e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02]
-hvac.res.EFan=[0e+00, -7.73899500927655e-07, -7.73899500927655e-07, -7.73899500927655e-07, -7.73899500927655e-07, -7.73899500927655e-07, 3.2322041015625e+03, 7.09593603515625e+03, 1.0951064453125e+04, 1.48078564453125e+04, 1.8665091796875e+04, 2.2521859375e+04, 2.637871875e+04, 3.0235537109375e+04, 3.40923046875e+04, 3.794944921875e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.4401421875e+04, 4.826494140625e+04, 5.212010546875e+04, 5.5976984375e+04, 5.983419140625e+04, 6.369116796875e+04, 6.75481015625e+04, 7.14050703125e+04, 7.52619140625e+04, 7.91188984375e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23466796875e+04, 8.59603359375e+04, 8.98209765625e+04, 9.36766015625e+04, 9.75336171875e+04, 1.013907421875e+05, 1.05247703125e+05, 1.091046640625e+05, 1.129616015625e+05, 1.16818625e+05, 1.206755390625e+05, 1.2389609375e+05, 1.2389609375e+05, 1.2389609375e+05, 1.2389609375e+05, 1.2389609375e+05, 1.2389609375e+05, 1.2389609375e+05, 1.2389609375e+05, 1.241194921875e+05, 1.28220171875e+05, 1.3209209375e+05, 1.35950609375e+05, 1.39806484375e+05, 1.4366359375e+05, 1.47520828125e+05, 1.51377765625e+05, 1.5523471875e+05, 1.5909165625e+05, 1.629485625e+05, 1.66805359375e+05, 1.70026e+05, 1.70026e+05, 1.70026e+05, 1.70026e+05, 1.70026e+05, 1.70026e+05, 1.70026e+05, 1.70193328125e+05, 1.75963640625e+05, 1.79834875e+05, 1.83697390625e+05, 1.87551703125e+05, 1.91408453125e+05, 1.9526584375e+05, 1.9912284375e+05, 2.0297975e+05, 2.06836703125e+05, 2.1069365625e+05, 2.1455059375e+05, 2.1840615625e+05, 2.2162415625e+05, 2.2162415625e+05, 2.2162415625e+05, 2.2162415625e+05, 2.2162415625e+05]
-hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.173773315429688e+03, 1.02888037109375e+04, 2.3567455078125e+04, 3.7294984375e+04, 4.96524140625e+04, 6.24235546875e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.33205625e+04, 7.34061171875e+04, 7.51627578125e+04, 7.51627578125e+04, 7.51627578125e+04, 7.51627578125e+04, 7.51627578125e+04, 7.51627578125e+04, 7.51627578125e+04, 7.51627578125e+04, 8.03655625e+04, 9.6738875e+04, 1.130729296875e+05, 1.130729296875e+05, 1.130729296875e+05, 1.130729296875e+05, 1.130729296875e+05, 1.130729296875e+05, 1.130729296875e+05, 1.130729296875e+05, 1.14633328125e+05, 1.56031015625e+05, 1.71469890625e+05, 1.7158203125e+05, 1.72241078125e+05, 1.8398615625e+05, 2.04856484375e+05, 2.288431875e+05, 2.5413884375e+05, 2.816105625e+05, 3.1169825e+05, 3.45586e+05, 3.794030625e+05, 3.794030625e+05, 3.794030625e+05, 3.794030625e+05, 3.794030625e+05, 3.794030625e+05, 3.794030625e+05, 3.8082690625e+05, 4.5456784375e+05, 4.9913115625e+05, 5.276831875e+05, 5.286106875e+05, 5.312834375e+05, 5.39511625e+05, 5.50885e+05, 5.638664375e+05, 5.814254375e+05, 6.020719375e+05, 6.330745e+05, 6.88050625e+05, 7.435536875e+05, 7.435536875e+05, 7.435536875e+05, 7.435536875e+05, 7.435536875e+05]
-hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.9772958984375e+03, -2.25291484375e+04, -3.690426171875e+04, -4.75458359375e+04, -5.96180859375e+04, -8.852465625e+04, -1.2727546875e+05, -1.7608096875e+05, -2.13259625e+05, -2.3414321875e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.3943840625e+05, -2.4314865625e+05, -2.54835765625e+05, -2.6234128125e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.6378596875e+05, -2.68041375e+05, -2.7601175e+05, -2.823225e+05, -2.854534375e+05, -2.882644375e+05, -2.9201771875e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.953713125e+05, -2.9655665625e+05, -2.9576309375e+05, -2.9627828125e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05, -2.96337875e+05]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.621593475341797e-01, 3.046397268772125e-01, 3.050566911697388e-01, 3.00453782081604e-01, 3.012813925743103e-01, 3.02350640296936e-01, 3.014130592346191e-01, 3.030804991722107e-01, 3.011135160923004e-01, 3.010886907577515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.623462677001953e-01, 3.049411177635193e-01, 3.047096431255341e-01, 3.004977703094482e-01, 3.012484610080719e-01, 3.014520704746246e-01, 3.016365766525269e-01, 3.017139434814453e-01, 3.015846908092499e-01, 3.015652596950531e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.412136405706406e-01, 2.738644182682037e-01, 3.051106929779053e-01, 3.032629787921906e-01, 3.007002174854279e-01, 3.013338148593903e-01, 3.015822768211365e-01, 3.015322983264923e-01, 3.015077412128448e-01, 3.01438182592392e-01, 3.017248511314392e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.12811291217804e-01, 3.034018576145172e-01, 2.835827767848969e-01, 3.054089546203613e-01, 3.026197850704193e-01, 3.003063797950745e-01, 3.01379531621933e-01, 3.015655875205994e-01, 3.015499413013458e-01, 3.0158931016922e-01, 3.019299507141113e-01, 3.015898466110229e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.932968944311142e-01, 4.556009471416473e-01, 2.799488008022308e-01, 3.073723316192627e-01, 3.067473173141479e-01, 3.002630770206451e-01, 3.008612096309662e-01, 3.015638589859009e-01, 3.01689475774765e-01, 3.015410006046295e-01, 3.015746772289276e-01, 3.016996383666992e-01, 3.13677042722702e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.724461913108826e-01, 6.904550790786743e-01, 6.462990045547485e-01, 6.490709185600281e-01, 6.52013897895813e-01, 6.458005905151367e-01, 6.457749009132385e-01, 6.485351324081421e-01, 6.462972164154053e-01, 6.488084197044373e-01, 6.301974096664258e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.717963218688965e-01, 6.863148808479309e-01, 6.444534063339233e-01, 6.482348442077637e-01, 6.508299708366394e-01, 6.507869958877563e-01, 6.501391530036926e-01, 6.504166126251221e-01, 6.489003300666809e-01, 6.496233940124512e-01, 1.617886861431652e-17, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.560745775699615e-01, 6.732233166694641e-01, 6.714142560958862e-01, 6.440804600715637e-01, 6.479161381721497e-01, 6.493749618530273e-01, 6.489534378051758e-01, 6.492507457733154e-01, 6.493229269981384e-01, 6.51049017906189e-01, 6.500763893127441e-01, 7.86722017652977e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 4.261621534824371e-01, 1.527218073606491e-01, 6.745697855949402e-01, 6.633987426757812e-01, 6.433783173561096e-01, 6.492663621902466e-01, 6.521163582801819e-01, 6.514817476272583e-01, 6.516136527061462e-01, 6.515596508979797e-01, 6.503340601921082e-01, 6.490375995635986e-01, 2.048396154521203e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 6.126395463943481e-01, 3.987316191196442e-01, 1.607946157455444e-01, 6.853180527687073e-01, 6.414136290550232e-01, 6.466457843780518e-01, 6.528124213218689e-01, 6.519966721534729e-01, 6.508395671844482e-01, 6.511942148208618e-01, 6.513200998306274e-01, 6.512209177017212e-01, 6.733072996139526e-01, 1.316534562482381e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.72446608543396e-01, 6.904555559158325e-01, 6.462993621826172e-01, 6.490712761878967e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 6.301978067131198e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.717967391014099e-01, 6.863153576850891e-01, 6.444538235664368e-01, 6.482352614402771e-01, 6.508303880691528e-01, 6.507874131202698e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.617887854048387e-17, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.560745775699615e-01, 6.732237339019775e-01, 6.714146733283997e-01, 6.440808773040771e-01, 6.479165554046631e-01, 6.493753790855408e-01, 6.489538550376892e-01, 6.492511630058289e-01, 6.493233442306519e-01, 6.510494351387024e-01, 6.500768065452576e-01, 7.86722547048569e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 4.90867555141449e-01, 3.228711783885956e-01, 6.776318550109863e-01, 6.634756922721863e-01, 6.433800458908081e-01, 6.4926677942276e-01, 6.521167755126953e-01, 6.514821648597717e-01, 6.516140699386597e-01, 6.515600681304932e-01, 6.503344774246216e-01, 6.490380167961121e-01, 2.048397395292122e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 7.988478541374207e-01, 4.43686842918396e-01, 6.54144823551178e-01, 6.94333016872406e-01, 6.415837407112122e-01, 6.466490626335144e-01, 6.528128981590271e-01, 6.519970893859863e-01, 6.508399844169617e-01, 6.511946320533752e-01, 6.513205170631409e-01, 6.512212753295898e-01, 6.868090629577637e-01, 1.510576244936296e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.59711217880249e-01, 5.768916606903076e-01, 5.455541014671326e-01, 5.478202700614929e-01, 5.500791072845459e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474046468734741e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.318830233975582e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.592309236526489e-01, 5.740923285484314e-01, 5.441480875015259e-01, 5.471725463867188e-01, 5.491724610328674e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.365500159907432e-17, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560745775699615e-01, 5.638728737831116e-01, 5.639805197715759e-01, 5.439100861549377e-01, 5.469261407852173e-01, 5.480526089668274e-01, 5.477262735366821e-01, 5.47956109046936e-01, 5.48012912273407e-01, 5.493409633636475e-01, 5.485901236534119e-01, 6.640353832925e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.869059205055237e-01, 5.118831992149353e-01, 5.710678100585938e-01, 5.583948493003845e-01, 5.433794856071472e-01, 5.479733347892761e-01, 5.50156831741333e-01, 5.496706366539001e-01, 5.49772322177887e-01, 5.497304797172546e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.728404539879938e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 8.380635976791382e-01, 4.644319415092468e-01, 7.804591655731201e-01, 6.563725471496582e-01, 5.431739091873169e-01, 5.459598302841187e-01, 5.506953597068787e-01, 5.500634908676147e-01, 5.491763949394226e-01, 5.494512319564819e-01, 5.495472550392151e-01, 5.49470067024231e-01, 5.660232901573181e-01, 1.105170167037958e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.72446608543396e-01, 6.904555559158325e-01, 6.462993621826172e-01, 6.490712761878967e-01, 6.520143151283264e-01, 6.458010077476501e-01, 6.457752585411072e-01, 6.485354900360107e-01, 6.462975740432739e-01, 6.488088369369507e-01, 6.301978067131198e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.717967391014099e-01, 6.863153576850891e-01, 6.444538235664368e-01, 6.482352614402771e-01, 6.508303880691528e-01, 6.507874131202698e-01, 6.501395106315613e-01, 6.504170298576355e-01, 6.489007472991943e-01, 6.496238112449646e-01, 1.617887854048387e-17, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560745775699615e-01, 6.732237339019775e-01, 6.714146733283997e-01, 6.440808773040771e-01, 6.479165554046631e-01, 6.493753790855408e-01, 6.489538550376892e-01, 6.492511630058289e-01, 6.493233442306519e-01, 6.510494351387024e-01, 6.500768065452576e-01, 7.86722547048569e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 7.048144340515137e-01, 5.405800938606262e-01, 6.888881921768188e-01, 6.637596487998962e-01, 6.433850526809692e-01, 6.492668986320496e-01, 6.521167755126953e-01, 6.514821648597717e-01, 6.516140699386597e-01, 6.515600681304932e-01, 6.503344774246216e-01, 6.490380167961121e-01, 2.048397395292122e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 7.037605047225952e-01, 4.401130378246307e-01, 6.332682967185974e-01, 6.94246232509613e-01, 6.415821313858032e-01, 6.466490626335144e-01, 6.528128981590271e-01, 6.519970893859863e-01, 6.508399844169617e-01, 6.511946320533752e-01, 6.513205170631409e-01, 6.512212753295898e-01, 6.733077764511108e-01, 1.31653549306057e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.59711217880249e-01, 5.768916606903076e-01, 5.455541014671326e-01, 5.478202700614929e-01, 5.500791072845459e-01, 5.452793836593628e-01, 5.452622771263123e-01, 5.474046468734741e-01, 5.4566890001297e-01, 5.476165413856506e-01, 5.318830233975582e-17, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.592309236526489e-01, 5.740923285484314e-01, 5.441480875015259e-01, 5.471725463867188e-01, 5.491724610328674e-01, 5.491392612457275e-01, 5.486395359039307e-01, 5.488508939743042e-01, 5.476860404014587e-01, 5.482432842254639e-01, 1.365500159907432e-17, 0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.560745775699615e-01, 5.638728737831116e-01, 5.639805197715759e-01, 5.439100861549377e-01, 5.469261407852173e-01, 5.480526089668274e-01, 5.477262735366821e-01, 5.47956109046936e-01, 5.48012912273407e-01, 5.493409633636475e-01, 5.485901236534119e-01, 6.640353832925e-17, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 4.261045455932617e-01, 3.252535462379456e-01, 5.69372296333313e-01, 5.583624243736267e-01, 5.433788895606995e-01, 5.479733347892761e-01, 5.50156831741333e-01, 5.496706366539001e-01, 5.49772322177887e-01, 5.497304797172546e-01, 5.487849116325378e-01, 5.47793447971344e-01, 1.728404539879938e-18, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 7.113150954246521e-01, 3.245491981506348e-01, 6.40262246131897e-01, 5.818566083908081e-01, 5.41911244392395e-01, 5.459378361701965e-01, 5.506949424743652e-01, 5.500634908676147e-01, 5.491763949394226e-01, 5.494512319564819e-01, 5.495472550392151e-01, 5.49470067024231e-01, 6.786046028137207e-01, 1.432070704347996e-18, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.542738258838654e-01, 7.344569563865662e-01, 9.552119374275208e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.540497422218323e-01, 7.341877222061157e-01, 9.553396105766296e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.353091716766357e-01, 7.895554304122925e-01, 9.864130616188049e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.402728319168091e-01, 8.539637923240662e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.737121105194092e-01, 8.751217126846313e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339599609375e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 3.006290588378906e+02, 2.92271728515625e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.017953796386719e+02, 2.995392761230469e+02, 2.933389587402344e+02, 2.90817626953125e+02, 2.890732727050781e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.90947021484375e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 2.906954040527344e+02, 3.003385925292969e+02, 3.058597717285156e+02, 3.048105773925781e+02, 2.926240539550781e+02, 2.903588256835938e+02, 2.904867858886719e+02, 2.908726196289062e+02, 2.911497497558594e+02, 2.908704528808594e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.963740234375e+02, 3.04129638671875e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02, 2.914144287109375e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.899055480957031e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393615722656e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 3.004835510253906e+02, 2.922692260742188e+02, 2.911441040039062e+02, 2.911447143554688e+02, 2.911247253417969e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.91679931640625e+02, 2.89301513671875e+02, 2.901397705078125e+02, 2.909776916503906e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 2.910887756347656e+02, 3.015476379394531e+02, 3.063577575683594e+02, 2.941777038574219e+02, 2.908188781738281e+02, 2.890721740722656e+02, 2.905821228027344e+02, 2.909654846191406e+02, 2.910634155273438e+02, 2.910396728515625e+02, 2.910914001464844e+02, 2.971597595214844e+02, 3.017329406738281e+02, 2.961970825195312e+02, 2.961970825195312e+02, 2.961970825195312e+02, 2.961970825195312e+02, 2.961970825195312e+02, 2.961970825195312e+02, 2.961970825195312e+02, 3.013092956542969e+02, 3.04815673828125e+02, 3.04154541015625e+02, 2.987994079589844e+02, 2.903602600097656e+02, 2.904862060546875e+02, 2.908724670410156e+02, 2.911498413085938e+02, 2.908703918457031e+02, 2.909870910644531e+02, 2.909630126953125e+02, 2.900853881835938e+02, 2.941607055664062e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02, 2.920526428222656e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339599609375e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 2.912890014648438e+02, 3.007440490722656e+02, 2.92271728515625e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.015356750488281e+02, 3.069110412597656e+02, 2.970212707519531e+02, 2.90817626953125e+02, 2.890732727050781e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.935762329101562e+02, 2.921036376953125e+02, 2.921036376953125e+02, 2.921036376953125e+02, 2.921036376953125e+02, 2.921036376953125e+02, 2.921036376953125e+02, 2.921036376953125e+02, 3.006029052734375e+02, 3.063835144042969e+02, 2.972600402832031e+02, 2.926240539550781e+02, 2.903588256835938e+02, 2.904867858886719e+02, 2.908726196289062e+02, 2.911497497558594e+02, 2.908704528808594e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.900841674804688e+02, 2.930912780761719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02, 2.905649108886719e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913828430175781e+02, 2.91103759765625e+02, 2.909837036132812e+02, 2.911192016601562e+02, 2.899055480957031e+02, 2.871714172363281e+02, 2.8623388671875e+02, 2.855303955078125e+02, 2.87673828125e+02, 2.904393615722656e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.91191650390625e+02, 2.911948852539062e+02, 2.913100891113281e+02, 2.9114306640625e+02, 2.902220153808594e+02, 2.898682250976562e+02, 2.907923278808594e+02, 2.911115417480469e+02, 2.913116149902344e+02, 2.911600952148438e+02, 2.911024780273438e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 2.912563171386719e+02, 3.005220336914062e+02, 2.922692260742188e+02, 2.911441040039062e+02, 2.911447143554688e+02, 2.911247253417969e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.91679931640625e+02, 2.89301513671875e+02, 2.901397705078125e+02, 2.909776916503906e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 2.910888061523438e+02, 3.020599975585938e+02, 2.995395812988281e+02, 2.933376159667969e+02, 2.908188781738281e+02, 2.890721740722656e+02, 2.905821228027344e+02, 2.909654846191406e+02, 2.910634155273438e+02, 2.910396728515625e+02, 2.910914001464844e+02, 2.908975524902344e+02, 2.909468078613281e+02, 2.910098876953125e+02, 2.910098876953125e+02, 2.910098876953125e+02, 2.910098876953125e+02, 2.910098876953125e+02, 2.910098876953125e+02, 2.910098876953125e+02, 3.004202880859375e+02, 2.957409973144531e+02, 3.045564270019531e+02, 2.926240539550781e+02, 2.903602905273438e+02, 2.904862060546875e+02, 2.908724670410156e+02, 2.911498413085938e+02, 2.908703918457031e+02, 2.909870910644531e+02, 2.909630126953125e+02, 3.028333740234375e+02, 3.041577758789062e+02, 2.919365539550781e+02, 2.919365539550781e+02, 2.919365539550781e+02, 2.919365539550781e+02, 2.919365539550781e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.913840942382812e+02, 2.911033935546875e+02, 2.909839477539062e+02, 2.911192932128906e+02, 2.899033203125e+02, 2.871707763671875e+02, 2.862330932617188e+02, 2.855311889648438e+02, 2.876746215820312e+02, 2.904339599609375e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.912235717773438e+02, 2.91195068359375e+02, 2.913098449707031e+02, 2.9114306640625e+02, 2.902205505371094e+02, 2.898688659667969e+02, 2.90792724609375e+02, 2.911115112304688e+02, 2.913117065429688e+02, 2.911600952148438e+02, 2.911025390625e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 2.912890319824219e+02, 3.008671875e+02, 2.92271728515625e+02, 2.9114404296875e+02, 2.911447143554688e+02, 2.911249084472656e+02, 2.911508178710938e+02, 2.911509094238281e+02, 2.916791687011719e+02, 2.893001708984375e+02, 2.901407470703125e+02, 2.90977783203125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 2.91122314453125e+02, 3.020283813476562e+02, 2.994743347167969e+02, 2.933389587402344e+02, 2.90817626953125e+02, 2.890732727050781e+02, 2.905823669433594e+02, 2.90965576171875e+02, 2.910634765625e+02, 2.910394897460938e+02, 2.910915222167969e+02, 2.908976135253906e+02, 2.90947021484375e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 2.903614196777344e+02, 3.004352416992188e+02, 3.05361572265625e+02, 2.962489929199219e+02, 2.926240539550781e+02, 2.903588256835938e+02, 2.904867858886719e+02, 2.908726196289062e+02, 2.911497497558594e+02, 2.908704528808594e+02, 2.909871826171875e+02, 2.909629516601562e+02, 2.900841674804688e+02, 2.895577392578125e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02, 2.891529541015625e+02]
+hvac.res.EFan=[0e+00, 3.458071091699821e-07, 3.458071091699821e-07, 3.458071091699821e-07, 3.458071091699821e-07, 3.458071091699821e-07, 3.232205078125e+03, 7.09593701171875e+03, 1.09510654296875e+04, 1.4807857421875e+04, 1.866509375e+04, 2.2521859375e+04, 2.6378720703125e+04, 3.0235537109375e+04, 3.409230859375e+04, 3.7949453125e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.117012109375e+04, 4.4401421875e+04, 4.826494140625e+04, 5.212010546875e+04, 5.5976984375e+04, 5.983419140625e+04, 6.369116796875e+04, 6.75481015625e+04, 7.14050703125e+04, 7.5261921875e+04, 7.91188984375e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23394765625e+04, 8.23466796875e+04, 8.596034375e+04, 8.9820984375e+04, 9.36766171875e+04, 9.7533625e+04, 1.013907578125e+05, 1.0524771875e+05, 1.09104671875e+05, 1.12961609375e+05, 1.168186328125e+05, 1.20675546875e+05, 1.238961015625e+05, 1.238961015625e+05, 1.238961015625e+05, 1.238961015625e+05, 1.238961015625e+05, 1.238961015625e+05, 1.238961015625e+05, 1.238961015625e+05, 1.241193984375e+05, 1.28220078125e+05, 1.32092e+05, 1.35950515625e+05, 1.39806390625e+05, 1.43663515625e+05, 1.47520734375e+05, 1.51377671875e+05, 1.55234625e+05, 1.590915625e+05, 1.62948484375e+05, 1.66805265625e+05, 1.70025921875e+05, 1.70025921875e+05, 1.70025921875e+05, 1.70025921875e+05, 1.70025921875e+05, 1.70025921875e+05, 1.70025921875e+05, 1.70193203125e+05, 1.75963640625e+05, 1.79834890625e+05, 1.83697390625e+05, 1.87551703125e+05, 1.91408453125e+05, 1.9526584375e+05, 1.9912284375e+05, 2.0297975e+05, 2.06836703125e+05, 2.1069365625e+05, 2.1455059375e+05, 2.1840615625e+05, 2.2162415625e+05, 2.2162415625e+05, 2.2162415625e+05, 2.2162415625e+05, 2.2162415625e+05]
+hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.173756958007812e+03, 1.02887685546875e+04, 2.3567427734375e+04, 3.729494921875e+04, 4.96523671875e+04, 6.242351171875e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3320578125e+04, 7.3406140625e+04, 7.51628046875e+04, 7.51628046875e+04, 7.51628046875e+04, 7.51628046875e+04, 7.51628046875e+04, 7.51628046875e+04, 7.51628046875e+04, 7.51628046875e+04, 8.036559375e+04, 9.6738890625e+04, 1.13073015625e+05, 1.13073015625e+05, 1.13073015625e+05, 1.13073015625e+05, 1.13073015625e+05, 1.13073015625e+05, 1.13073015625e+05, 1.13073015625e+05, 1.14632453125e+05, 1.56032234375e+05, 1.71468671875e+05, 1.715805e+05, 1.722394375e+05, 1.8398421875e+05, 2.048544375e+05, 2.28841109375e+05, 2.54136734375e+05, 2.8160846875e+05, 3.1169596875e+05, 3.4558371875e+05, 3.794009375e+05, 3.794009375e+05, 3.794009375e+05, 3.794009375e+05, 3.794009375e+05, 3.794009375e+05, 3.794009375e+05, 3.8082440625e+05, 4.54564875e+05, 4.9913284375e+05, 5.27685e+05, 5.286121875e+05, 5.312866875e+05, 5.39516e+05, 5.508898125e+05, 5.638715e+05, 5.81430625e+05, 6.020771875e+05, 6.330799375e+05, 6.880561875e+05, 7.43559125e+05, 7.43559125e+05, 7.43559125e+05, 7.43559125e+05, 7.43559125e+05]
+hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.9772607421875e+03, -2.2529142578125e+04, -3.690426171875e+04, -4.754584765625e+04, -5.961810546875e+04, -8.85246875e+04, -1.27275578125e+05, -1.76081109375e+05, -2.13259703125e+05, -2.34143234375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.394384375e+05, -2.431486875e+05, -2.548358125e+05, -2.623413125e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.63786e+05, -2.6804159375e+05, -2.760120625e+05, -2.8232278125e+05, -2.8545371875e+05, -2.8826475e+05, -2.9201803125e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9537159375e+05, -2.9655709375e+05, -2.957634375e+05, -2.9627865625e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05, -2.9633828125e+05]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt
index 54e5379e6b7..1d7af5dd4d2 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Summer.txt
@@ -1,37 +1,37 @@
-last-generated=2023-08-29
+last-generated=2024-03-23
 statistics-initialization=
 {
-  "linear": "0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1",
+  "linear": "0",
+  "nonlinear": "1, 3, 0, 0, 1, 1, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
   "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1",
-  "number of continuous time states": "88",
+  "number of continuous time states": "94",
   "numerical Jacobians": "0"
 }
 time=[1.6848e+07, 1.728e+07]
-flo.sou.TAir=[2.931499938964844e+02, 2.971488342285156e+02, 2.970904846191406e+02, 2.971393737792969e+02, 2.971708374023438e+02, 2.973715209960938e+02, 2.960903015136719e+02, 2.963770446777344e+02, 2.966582336425781e+02, 2.968568115234375e+02, 2.969085083007812e+02, 2.970073852539062e+02, 2.971823425292969e+02, 2.971570739746094e+02, 2.970684509277344e+02, 2.967265930175781e+02, 2.98019287109375e+02, 2.980212707519531e+02, 2.981596069335938e+02, 2.983078308105469e+02, 2.984050598144531e+02, 2.98318603515625e+02, 2.983051452636719e+02, 2.983106079101562e+02, 2.98298828125e+02, 2.974028930664062e+02, 2.9666650390625e+02, 2.966728820800781e+02, 2.9682177734375e+02, 2.969424133300781e+02, 2.9711767578125e+02, 2.971631469726562e+02, 2.971306457519531e+02, 2.971387939453125e+02, 2.971786804199219e+02, 2.970838317871094e+02, 2.985569458007812e+02, 2.988447265625e+02, 2.989735107421875e+02, 2.98980712890625e+02, 2.991301879882812e+02, 2.991422424316406e+02, 2.991198425292969e+02, 2.990957336425781e+02, 2.956469421386719e+02, 2.970759582519531e+02, 2.979975280761719e+02, 2.983571472167969e+02, 2.986758728027344e+02, 2.990056457519531e+02, 2.991374206542969e+02, 2.993533325195312e+02, 2.99387939453125e+02, 2.995101318359375e+02, 2.987188720703125e+02, 2.980447387695312e+02, 3.000171508789062e+02, 3.002728576660156e+02, 3.00316650390625e+02, 3.00226318359375e+02, 3.001732482910156e+02, 3.000767211914062e+02, 3.000093078613281e+02, 2.971092224121094e+02, 2.972830200195312e+02, 2.971499328613281e+02, 2.981148681640625e+02, 2.982740173339844e+02, 2.987023315429688e+02, 2.991179504394531e+02, 2.992443237304688e+02, 2.995338134765625e+02, 2.996026306152344e+02, 2.995534057617188e+02, 2.989526672363281e+02, 2.9839501953125e+02, 3.002760314941406e+02, 3.00459716796875e+02, 3.004801330566406e+02, 3.004254455566406e+02, 3.003442077636719e+02, 3.002889709472656e+02, 3.001663208007812e+02, 2.975650634765625e+02, 2.973158874511719e+02, 2.971589660644531e+02, 2.98091552734375e+02, 2.9834130859375e+02, 2.987803344726562e+02, 2.992686462402344e+02, 2.99393798828125e+02, 2.995188598632812e+02, 2.996377563476562e+02, 2.998189697265625e+02, 2.99336181640625e+02, 2.98670654296875e+02, 3.002952575683594e+02, 3.003683166503906e+02, 3.003975524902344e+02, 3.003070068359375e+02, 3.002548217773438e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.971684265136719e+02, 2.97109619140625e+02, 2.970796813964844e+02, 2.973669738769531e+02, 2.969353332519531e+02, 2.967883911132812e+02, 2.969532165527344e+02, 2.971699829101562e+02, 2.970716552734375e+02, 2.968973388671875e+02, 2.969721374511719e+02, 2.971185302734375e+02, 2.971464233398438e+02, 2.968911743164062e+02, 2.966604614257812e+02, 2.980807189941406e+02, 2.981101684570312e+02, 2.983236999511719e+02, 2.984344482421875e+02, 2.985226135253906e+02, 2.984579162597656e+02, 2.984412231445312e+02, 2.984230346679688e+02, 2.985397644042969e+02, 2.97317626953125e+02, 2.971984558105469e+02, 2.972479553222656e+02, 2.970129699707031e+02, 2.971020812988281e+02, 2.971531677246094e+02, 2.97161376953125e+02, 2.971424560546875e+02, 2.971964416503906e+02, 2.971748657226562e+02, 2.971352844238281e+02, 2.986807556152344e+02, 2.989608154296875e+02, 2.990980529785156e+02, 2.991845703125e+02, 2.99310302734375e+02, 2.993259887695312e+02, 2.993144836425781e+02, 2.992805480957031e+02, 2.957418823242188e+02, 2.9711279296875e+02, 2.98273193359375e+02, 2.987899169921875e+02, 2.989341735839844e+02, 2.988336791992188e+02, 2.988339233398438e+02, 2.989750366210938e+02, 2.99032470703125e+02, 2.991209411621094e+02, 2.983773803710938e+02, 2.977041015625e+02, 3.002583312988281e+02, 3.003590698242188e+02, 3.004259643554688e+02, 3.003563842773438e+02, 3.002993469238281e+02, 3.002339477539062e+02, 3.0015234375e+02, 2.96630859375e+02, 2.971543579101562e+02, 2.971923828125e+02, 2.981713256835938e+02, 2.987290954589844e+02, 2.989787902832031e+02, 2.989302978515625e+02, 2.989097595214844e+02, 2.991405944824219e+02, 2.992342529296875e+02, 2.9913720703125e+02, 2.985766296386719e+02, 2.980388793945312e+02, 3.003837280273438e+02, 3.005351257324219e+02, 3.005956726074219e+02, 3.005383911132812e+02, 3.004615173339844e+02, 3.003876037597656e+02, 3.002905578613281e+02, 2.970851745605469e+02, 2.972499084472656e+02, 2.971772766113281e+02, 2.983594665527344e+02, 2.985196838378906e+02, 2.987686462402344e+02, 2.9901806640625e+02, 2.990723571777344e+02, 2.990970458984375e+02, 2.992330017089844e+02, 2.994129943847656e+02, 2.990055541992188e+02, 2.983725280761719e+02, 3.004640502929688e+02, 3.004188232421875e+02, 3.005097351074219e+02, 3.004615783691406e+02, 3.003959045410156e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.971585998535156e+02, 2.972338562011719e+02, 2.971536865234375e+02, 2.972750549316406e+02, 2.972531127929688e+02, 2.960952453613281e+02, 2.963033142089844e+02, 2.964967346191406e+02, 2.966547241210938e+02, 2.965212707519531e+02, 2.966139221191406e+02, 2.967634887695312e+02, 2.968624267578125e+02, 2.965803527832031e+02, 2.963473510742188e+02, 2.977628173828125e+02, 2.97920166015625e+02, 2.980868225097656e+02, 2.982206420898438e+02, 2.983236389160156e+02, 2.98254150390625e+02, 2.982366333007812e+02, 2.982514343261719e+02, 2.983349609375e+02, 2.974189758300781e+02, 2.966344299316406e+02, 2.966083374023438e+02, 2.966956481933594e+02, 2.966794738769531e+02, 2.967792358398438e+02, 2.968854370117188e+02, 2.970077819824219e+02, 2.969882202148438e+02, 2.9706982421875e+02, 2.970567932128906e+02, 2.984124450683594e+02, 2.98680419921875e+02, 2.988209838867188e+02, 2.989180908203125e+02, 2.990690002441406e+02, 2.991034851074219e+02, 2.991044616699219e+02, 2.990842895507812e+02, 2.9565869140625e+02, 2.97071044921875e+02, 2.979652404785156e+02, 2.982936096191406e+02, 2.985703735351562e+02, 2.988157958984375e+02, 2.988893737792969e+02, 2.991122436523438e+02, 2.992071838378906e+02, 2.993654479980469e+02, 2.985871887207031e+02, 2.979717102050781e+02, 2.999245910644531e+02, 3.001611022949219e+02, 3.002248229980469e+02, 3.001666564941406e+02, 3.001186218261719e+02, 3.000666809082031e+02, 2.99994873046875e+02, 2.97077392578125e+02, 2.97294189453125e+02, 2.971416931152344e+02, 2.980973205566406e+02, 2.982136535644531e+02, 2.985978393554688e+02, 2.989175415039062e+02, 2.989779357910156e+02, 2.992781982421875e+02, 2.994161376953125e+02, 2.994061279296875e+02, 2.988150939941406e+02, 2.983339538574219e+02, 3.001163940429688e+02, 3.003454284667969e+02, 3.003971252441406e+02, 3.003514709472656e+02, 3.00286376953125e+02, 3.002199096679688e+02, 3.001318359375e+02, 2.975262451171875e+02, 2.973232421875e+02, 2.971530151367188e+02, 2.98117919921875e+02, 2.982820739746094e+02, 2.986876220703125e+02, 2.991202697753906e+02, 2.992027893066406e+02, 2.993134155273438e+02, 2.994771118164062e+02, 2.99693359375e+02, 2.992218933105469e+02, 2.985872192382812e+02, 3.001838073730469e+02, 3.00300537109375e+02, 3.003493957519531e+02, 3.002478637695312e+02, 3.001687622070312e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.974620361328125e+02, 2.975399780273438e+02, 2.974747924804688e+02, 2.975080261230469e+02, 2.969397583007812e+02, 2.962789001464844e+02, 2.965131225585938e+02, 2.967060241699219e+02, 2.968628540039062e+02, 2.967489929199219e+02, 2.968954162597656e+02, 2.972220153808594e+02, 2.972021179199219e+02, 2.969674072265625e+02, 2.967186584472656e+02, 2.980852966308594e+02, 2.981891479492188e+02, 2.983428955078125e+02, 2.984690246582031e+02, 2.985538635253906e+02, 2.984956359863281e+02, 2.984780883789062e+02, 2.98444091796875e+02, 2.984332580566406e+02, 2.97407470703125e+02, 2.968350830078125e+02, 2.969247741699219e+02, 2.971000671386719e+02, 2.970271911621094e+02, 2.971677551269531e+02, 2.972024536132812e+02, 2.973364868164062e+02, 2.971863708496094e+02, 2.973620300292969e+02, 2.970663757324219e+02, 2.990622863769531e+02, 2.990121459960938e+02, 2.992087707519531e+02, 2.992794494628906e+02, 2.99402587890625e+02, 2.994186096191406e+02, 2.994053344726562e+02, 2.9936181640625e+02, 2.956640319824219e+02, 2.970877685546875e+02, 2.979035949707031e+02, 2.979391784667969e+02, 2.981921691894531e+02, 2.984506225585938e+02, 2.985721740722656e+02, 2.988009033203125e+02, 2.992995910644531e+02, 2.996795043945312e+02, 2.989287414550781e+02, 2.981155395507812e+02, 3.00425048828125e+02, 3.004658508300781e+02, 3.00517333984375e+02, 3.004343872070312e+02, 3.003706970214844e+02, 3.002875366210938e+02, 3.002039489746094e+02, 2.967222900390625e+02, 2.971233520507812e+02, 2.971809387207031e+02, 2.979585266113281e+02, 2.977581787109375e+02, 2.981387634277344e+02, 2.984829711914062e+02, 2.985879821777344e+02, 2.989241027832031e+02, 2.995448303222656e+02, 2.998167114257812e+02, 2.99323486328125e+02, 2.986176147460938e+02, 3.006663208007812e+02, 3.006873474121094e+02, 3.007204895019531e+02, 3.006531372070312e+02, 3.0056396484375e+02, 3.004901733398438e+02, 3.003837890625e+02, 2.972227478027344e+02, 2.971922607421875e+02, 2.971727905273438e+02, 2.9785791015625e+02, 2.978700866699219e+02, 2.982772827148438e+02, 2.987437744140625e+02, 2.98872314453125e+02, 2.989605407714844e+02, 2.995329895019531e+02, 2.999518432617188e+02, 2.995630187988281e+02, 2.98612060546875e+02, 3.005814819335938e+02, 3.005516052246094e+02, 3.005702514648438e+02, 3.004625854492188e+02, 3.004091491699219e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.972122802734375e+02, 2.972682189941406e+02, 2.972667846679688e+02, 2.973027038574219e+02, 2.972079467773438e+02, 2.960500183105469e+02, 2.962004699707031e+02, 2.963760375976562e+02, 2.964674682617188e+02, 2.963538208007812e+02, 2.964400634765625e+02, 2.966213989257812e+02, 2.966654052734375e+02, 2.964528198242188e+02, 2.962205810546875e+02, 2.976503295898438e+02, 2.978416137695312e+02, 2.980057983398438e+02, 2.981297912597656e+02, 2.982256469726562e+02, 2.982063293457031e+02, 2.982064819335938e+02, 2.982073364257812e+02, 2.9822998046875e+02, 2.972864685058594e+02, 2.964693908691406e+02, 2.96444580078125e+02, 2.964787292480469e+02, 2.964859008789062e+02, 2.966005249023438e+02, 2.966524353027344e+02, 2.967131042480469e+02, 2.966952819824219e+02, 2.967809448242188e+02, 2.966983642578125e+02, 2.982953796386719e+02, 2.985346374511719e+02, 2.987007141113281e+02, 2.987841796875e+02, 2.989522705078125e+02, 2.989970397949219e+02, 2.99010498046875e+02, 2.990039672851562e+02, 2.955267028808594e+02, 2.971189575195312e+02, 2.978191833496094e+02, 2.980805358886719e+02, 2.983182678222656e+02, 2.985315551757812e+02, 2.985928955078125e+02, 2.988065185546875e+02, 2.988916320800781e+02, 2.990731201171875e+02, 2.982904663085938e+02, 2.976420593261719e+02, 2.9977734375e+02, 3.000108642578125e+02, 3.000907592773438e+02, 3.000435791015625e+02, 3.000014343261719e+02, 2.999511413574219e+02, 2.998937683105469e+02, 2.968173828125e+02, 2.972757873535156e+02, 2.971634216308594e+02, 2.979776306152344e+02, 2.979941101074219e+02, 2.983465576171875e+02, 2.986405944824219e+02, 2.987008056640625e+02, 2.989956359863281e+02, 2.991296997070312e+02, 2.991376342773438e+02, 2.98560302734375e+02, 2.980204772949219e+02, 3.000018615722656e+02, 3.002052917480469e+02, 3.002681579589844e+02, 3.002320861816406e+02, 3.001733703613281e+02, 3.001258850097656e+02, 3.000478820800781e+02, 2.972860717773438e+02, 2.972680358886719e+02, 2.971661376953125e+02, 2.980318603515625e+02, 2.980282897949219e+02, 2.983863525390625e+02, 2.987989501953125e+02, 2.988830261230469e+02, 2.989888916015625e+02, 2.991490173339844e+02, 2.993921813964844e+02, 2.989317932128906e+02, 2.982716674804688e+02, 3.000216979980469e+02, 3.001614074707031e+02, 3.002096557617188e+02, 3.001504516601562e+02, 3.000978393554688e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.971488342285156e+02, 2.970904846191406e+02, 2.971393432617188e+02, 2.971708374023438e+02, 2.973715209960938e+02, 2.960903015136719e+02, 2.963770446777344e+02, 2.966582336425781e+02, 2.968568115234375e+02, 2.969085083007812e+02, 2.970073852539062e+02, 2.971823425292969e+02, 2.971570739746094e+02, 2.970684509277344e+02, 2.967265930175781e+02, 2.98019287109375e+02, 2.980212707519531e+02, 2.981596069335938e+02, 2.983078308105469e+02, 2.984050598144531e+02, 2.98318603515625e+02, 2.983051452636719e+02, 2.983106079101562e+02, 2.98298828125e+02, 2.974028930664062e+02, 2.9666650390625e+02, 2.966728820800781e+02, 2.9682177734375e+02, 2.969424133300781e+02, 2.9711767578125e+02, 2.971631469726562e+02, 2.971306457519531e+02, 2.971387939453125e+02, 2.971786804199219e+02, 2.970838317871094e+02, 2.985569458007812e+02, 2.988447265625e+02, 2.989735107421875e+02, 2.98980712890625e+02, 2.991301879882812e+02, 2.991422424316406e+02, 2.991198425292969e+02, 2.990957336425781e+02, 2.956469421386719e+02, 2.970759582519531e+02, 2.979975280761719e+02, 2.983571472167969e+02, 2.986758728027344e+02, 2.990056457519531e+02, 2.991374206542969e+02, 2.993533325195312e+02, 2.99387939453125e+02, 2.995101318359375e+02, 2.987188720703125e+02, 2.980447387695312e+02, 3.000171508789062e+02, 3.002728576660156e+02, 3.00316650390625e+02, 3.00226318359375e+02, 3.001732482910156e+02, 3.000767211914062e+02, 3.000093078613281e+02, 2.971092224121094e+02, 2.972830200195312e+02, 2.971499328613281e+02, 2.981148681640625e+02, 2.982740173339844e+02, 2.987023315429688e+02, 2.991179504394531e+02, 2.992443237304688e+02, 2.995338439941406e+02, 2.996026306152344e+02, 2.995534057617188e+02, 2.989526672363281e+02, 2.9839501953125e+02, 3.002760314941406e+02, 3.00459716796875e+02, 3.004801330566406e+02, 3.004254455566406e+02, 3.003442077636719e+02, 3.002889709472656e+02, 3.001663208007812e+02, 2.975650939941406e+02, 2.973158874511719e+02, 2.971589660644531e+02, 2.98091552734375e+02, 2.9834130859375e+02, 2.987803344726562e+02, 2.992686462402344e+02, 2.99393798828125e+02, 2.995188598632812e+02, 2.996377563476562e+02, 2.998189697265625e+02, 2.99336181640625e+02, 2.98670654296875e+02, 3.002952575683594e+02, 3.003683166503906e+02, 3.003975524902344e+02, 3.003070068359375e+02, 3.002548217773438e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.971684265136719e+02, 2.97109619140625e+02, 2.970796813964844e+02, 2.973669738769531e+02, 2.969353332519531e+02, 2.967883911132812e+02, 2.969532165527344e+02, 2.971699829101562e+02, 2.970716552734375e+02, 2.968973388671875e+02, 2.969721374511719e+02, 2.971185302734375e+02, 2.971464233398438e+02, 2.968911743164062e+02, 2.966604614257812e+02, 2.980807189941406e+02, 2.981101684570312e+02, 2.983236999511719e+02, 2.984344482421875e+02, 2.985226135253906e+02, 2.984579162597656e+02, 2.984412231445312e+02, 2.984230346679688e+02, 2.985397644042969e+02, 2.97317626953125e+02, 2.971984558105469e+02, 2.972479553222656e+02, 2.970129699707031e+02, 2.971020812988281e+02, 2.971531677246094e+02, 2.97161376953125e+02, 2.971424560546875e+02, 2.971964416503906e+02, 2.971748657226562e+02, 2.971352844238281e+02, 2.986807556152344e+02, 2.989608154296875e+02, 2.990980529785156e+02, 2.991845703125e+02, 2.99310302734375e+02, 2.993259887695312e+02, 2.993144836425781e+02, 2.992805480957031e+02, 2.957418823242188e+02, 2.9711279296875e+02, 2.98273193359375e+02, 2.987899169921875e+02, 2.989341735839844e+02, 2.988336791992188e+02, 2.988339233398438e+02, 2.989750366210938e+02, 2.99032470703125e+02, 2.991209411621094e+02, 2.983773803710938e+02, 2.977041015625e+02, 3.002583312988281e+02, 3.003590698242188e+02, 3.004259643554688e+02, 3.003563842773438e+02, 3.002993469238281e+02, 3.002339477539062e+02, 3.0015234375e+02, 2.96630859375e+02, 2.971543579101562e+02, 2.971923522949219e+02, 2.981713256835938e+02, 2.987290954589844e+02, 2.989787902832031e+02, 2.989302978515625e+02, 2.989097595214844e+02, 2.991405944824219e+02, 2.992342529296875e+02, 2.9913720703125e+02, 2.985766296386719e+02, 2.980388793945312e+02, 3.003837280273438e+02, 3.005351257324219e+02, 3.005956726074219e+02, 3.005383911132812e+02, 3.004615173339844e+02, 3.003876037597656e+02, 3.002905578613281e+02, 2.970851745605469e+02, 2.972499084472656e+02, 2.971772766113281e+02, 2.983594665527344e+02, 2.985196838378906e+02, 2.987686462402344e+02, 2.9901806640625e+02, 2.990723571777344e+02, 2.990970458984375e+02, 2.992330017089844e+02, 2.994129943847656e+02, 2.990055541992188e+02, 2.983725280761719e+02, 3.004640502929688e+02, 3.004188232421875e+02, 3.005097351074219e+02, 3.004615783691406e+02, 3.003959045410156e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.971585998535156e+02, 2.972338256835938e+02, 2.971536865234375e+02, 2.972750549316406e+02, 2.972530822753906e+02, 2.960952453613281e+02, 2.963033142089844e+02, 2.964967346191406e+02, 2.966547241210938e+02, 2.965212707519531e+02, 2.966139221191406e+02, 2.967634887695312e+02, 2.968624267578125e+02, 2.965803527832031e+02, 2.963473510742188e+02, 2.977628173828125e+02, 2.97920166015625e+02, 2.980868225097656e+02, 2.982206420898438e+02, 2.983236389160156e+02, 2.98254150390625e+02, 2.982366333007812e+02, 2.982514343261719e+02, 2.983349609375e+02, 2.974189758300781e+02, 2.966344299316406e+02, 2.966083374023438e+02, 2.966956481933594e+02, 2.966794738769531e+02, 2.967792358398438e+02, 2.968854370117188e+02, 2.970077819824219e+02, 2.969882202148438e+02, 2.9706982421875e+02, 2.970567932128906e+02, 2.984124450683594e+02, 2.98680419921875e+02, 2.988209838867188e+02, 2.989180908203125e+02, 2.990690002441406e+02, 2.991034851074219e+02, 2.991044616699219e+02, 2.990842895507812e+02, 2.9565869140625e+02, 2.970710754394531e+02, 2.979652404785156e+02, 2.982936096191406e+02, 2.985703735351562e+02, 2.988157958984375e+02, 2.988893737792969e+02, 2.991122436523438e+02, 2.992071838378906e+02, 2.993654479980469e+02, 2.985871887207031e+02, 2.979717102050781e+02, 2.999245910644531e+02, 3.001611022949219e+02, 3.002248229980469e+02, 3.001666564941406e+02, 3.001185913085938e+02, 3.000666809082031e+02, 2.99994873046875e+02, 2.97077392578125e+02, 2.97294189453125e+02, 2.971416931152344e+02, 2.980973205566406e+02, 2.982136535644531e+02, 2.985978393554688e+02, 2.989175415039062e+02, 2.989779357910156e+02, 2.992781982421875e+02, 2.994161376953125e+02, 2.994061279296875e+02, 2.988150939941406e+02, 2.983339538574219e+02, 3.001163940429688e+02, 3.003454284667969e+02, 3.003971252441406e+02, 3.003514709472656e+02, 3.00286376953125e+02, 3.002199096679688e+02, 3.001318359375e+02, 2.975262451171875e+02, 2.973232421875e+02, 2.971530151367188e+02, 2.98117919921875e+02, 2.982820739746094e+02, 2.986876220703125e+02, 2.991202697753906e+02, 2.992027893066406e+02, 2.993134155273438e+02, 2.994771118164062e+02, 2.99693359375e+02, 2.992218933105469e+02, 2.985872192382812e+02, 3.001838073730469e+02, 3.00300537109375e+02, 3.003493957519531e+02, 3.002478637695312e+02, 3.001687622070312e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.974620361328125e+02, 2.975399780273438e+02, 2.974747924804688e+02, 2.975080261230469e+02, 2.969397277832031e+02, 2.962789001464844e+02, 2.965131225585938e+02, 2.967060241699219e+02, 2.968628540039062e+02, 2.967489929199219e+02, 2.968954162597656e+02, 2.972220153808594e+02, 2.972021179199219e+02, 2.969674072265625e+02, 2.967186584472656e+02, 2.980852966308594e+02, 2.981891479492188e+02, 2.983428955078125e+02, 2.984690246582031e+02, 2.985538635253906e+02, 2.984956359863281e+02, 2.984780883789062e+02, 2.98444091796875e+02, 2.984332580566406e+02, 2.97407470703125e+02, 2.968350830078125e+02, 2.969247741699219e+02, 2.971000671386719e+02, 2.970271911621094e+02, 2.971677551269531e+02, 2.972024536132812e+02, 2.973364868164062e+02, 2.971863708496094e+02, 2.973620300292969e+02, 2.970663757324219e+02, 2.990622863769531e+02, 2.990121459960938e+02, 2.992087707519531e+02, 2.992794494628906e+02, 2.99402587890625e+02, 2.994186096191406e+02, 2.994053344726562e+02, 2.9936181640625e+02, 2.956640319824219e+02, 2.970877685546875e+02, 2.979035949707031e+02, 2.979391784667969e+02, 2.981921691894531e+02, 2.984506225585938e+02, 2.985721740722656e+02, 2.988009033203125e+02, 2.992995910644531e+02, 2.996795043945312e+02, 2.989287414550781e+02, 2.981155395507812e+02, 3.00425048828125e+02, 3.004658508300781e+02, 3.00517333984375e+02, 3.004343872070312e+02, 3.003706970214844e+02, 3.002875366210938e+02, 3.002039489746094e+02, 2.967222900390625e+02, 2.971233520507812e+02, 2.971809387207031e+02, 2.979585266113281e+02, 2.977581787109375e+02, 2.981387634277344e+02, 2.984829711914062e+02, 2.985879821777344e+02, 2.989241027832031e+02, 2.995448303222656e+02, 2.998167114257812e+02, 2.99323486328125e+02, 2.986175842285156e+02, 3.006663208007812e+02, 3.006873474121094e+02, 3.007204895019531e+02, 3.006531372070312e+02, 3.0056396484375e+02, 3.004902038574219e+02, 3.003837890625e+02, 2.972227783203125e+02, 2.971922912597656e+02, 2.971727905273438e+02, 2.9785791015625e+02, 2.978700866699219e+02, 2.982772827148438e+02, 2.987437744140625e+02, 2.98872314453125e+02, 2.989605407714844e+02, 2.995329895019531e+02, 2.999518432617188e+02, 2.995630187988281e+02, 2.98612060546875e+02, 3.005814819335938e+02, 3.005515747070312e+02, 3.005702514648438e+02, 3.004625854492188e+02, 3.004091491699219e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.972122802734375e+02, 2.972682189941406e+02, 2.972667846679688e+02, 2.973027038574219e+02, 2.972079467773438e+02, 2.960500183105469e+02, 2.962004699707031e+02, 2.963760375976562e+02, 2.964674682617188e+02, 2.963538208007812e+02, 2.964400634765625e+02, 2.966213989257812e+02, 2.966654052734375e+02, 2.964528198242188e+02, 2.962205810546875e+02, 2.976503295898438e+02, 2.978416137695312e+02, 2.980057983398438e+02, 2.981297912597656e+02, 2.982256469726562e+02, 2.982063293457031e+02, 2.982064819335938e+02, 2.982073364257812e+02, 2.9822998046875e+02, 2.972864685058594e+02, 2.964693908691406e+02, 2.96444580078125e+02, 2.964787292480469e+02, 2.964859008789062e+02, 2.966005249023438e+02, 2.966524353027344e+02, 2.967131042480469e+02, 2.966952819824219e+02, 2.967809448242188e+02, 2.966983642578125e+02, 2.9829541015625e+02, 2.985346374511719e+02, 2.987007141113281e+02, 2.987841796875e+02, 2.989522705078125e+02, 2.989970397949219e+02, 2.99010498046875e+02, 2.990039367675781e+02, 2.955267028808594e+02, 2.971189575195312e+02, 2.978191833496094e+02, 2.980805358886719e+02, 2.983182678222656e+02, 2.985315551757812e+02, 2.985928955078125e+02, 2.988065185546875e+02, 2.988916320800781e+02, 2.990731201171875e+02, 2.982904663085938e+02, 2.976420593261719e+02, 2.9977734375e+02, 3.000108642578125e+02, 3.000907592773438e+02, 3.000435791015625e+02, 3.000014343261719e+02, 2.999511413574219e+02, 2.998937683105469e+02, 2.968174133300781e+02, 2.972757873535156e+02, 2.971634216308594e+02, 2.979776306152344e+02, 2.979941101074219e+02, 2.983465576171875e+02, 2.986405944824219e+02, 2.987008056640625e+02, 2.989956359863281e+02, 2.991296997070312e+02, 2.991376342773438e+02, 2.98560302734375e+02, 2.980204772949219e+02, 3.000018615722656e+02, 3.002052917480469e+02, 3.002681579589844e+02, 3.002320861816406e+02, 3.001733703613281e+02, 3.001258850097656e+02, 3.000478820800781e+02, 2.972860717773438e+02, 2.972680358886719e+02, 2.971661376953125e+02, 2.980318603515625e+02, 2.980282897949219e+02, 2.983863525390625e+02, 2.987989501953125e+02, 2.988830261230469e+02, 2.989888916015625e+02, 2.991490173339844e+02, 2.993921813964844e+02, 2.989317932128906e+02, 2.982716674804688e+02, 3.000216979980469e+02, 3.001614074707031e+02, 3.002096557617188e+02, 3.001504516601562e+02, 3.000978393554688e+02]
 hvac.TZonSet[1].TCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 hvac.TZonSet[1].THeaSet=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.720244228839874e-01, 3.385134339332581e-01, 2.931901216506958e-01, 3.032422661781311e-01, 3.063400089740753e-01, 3.032086789608002e-01, 3.031823933124542e-01, 3.068248331546783e-01, 3.414949774742126e-01, 3.440667390823364e-01, 3.004555404186249e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.530482769012451e-01, 4.226332306861877e-01, 3.045966625213623e-01, 3.394298255443573e-01, 3.465163111686707e-01, 3.281813561916351e-01, 3.037332594394684e-01, 3.196571171283722e-01, 3.530568778514862e-01, 4.293167889118195e-01, 3.961371183395386e-01, 3.697693049907684e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.134952425956726e-01, 3.112653493881226e-01, 4.314601123332977e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.597327828407288e-01, 4.327360391616821e-01, 3.223090469837189e-01, 5.530421733856201e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.855693459510803e-01, 4.746845066547394e-01, 3.39695543050766e-01, 6.051132678985596e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.173815131187439e-01, 5.454219579696655e-01, 6.434692740440369e-01, 6.586399674415588e-01, 6.489063501358032e-01, 6.473278403282166e-01, 6.501171588897705e-01, 6.611840128898621e-01, 7.073472738265991e-01, 6.252371072769165e-01, 6.283408999443054e-01, 2.194901783424438e-19, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.909985542297363e-01, 1.750157475471497e-01, 6.575450897216797e-01, 6.873359680175781e-01, 6.593189835548401e-01, 6.168034076690674e-01, 6.440595388412476e-01, 6.716515421867371e-01, 7.057816386222839e-01, 5.653907060623169e-01, 5.732524394989014e-01, 5.882961750030518e-01, 1.621879083222017e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 5.731950998306274e-01, 4.548901915550232e-01, 6.945338249206543e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.630778242373214e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 3.908332288265228e-01, 5.645137429237366e-01, 5.922465324401855e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.131983616643837e-19, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 3.716109097003937e-01, 5.793268084526062e-01, 5.795823335647583e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.663183881820758e-19, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 5.272714495658875e-01, 5.445831418037415e-01, 6.434580683708191e-01, 6.586401462554932e-01, 6.489067077636719e-01, 6.4732825756073e-01, 6.501175761222839e-01, 6.916376352310181e-01, 8.623210191726685e-01, 6.407234072685242e-01, 6.285338401794434e-01, 2.194925564867049e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.026185989379883e-01, 2.317568361759186e-01, 6.588209271430969e-01, 6.873761415481567e-01, 6.593202948570251e-01, 6.168038249015808e-01, 6.440598964691162e-01, 6.991332173347473e-01, 7.947207689285278e-01, 5.68223237991333e-01, 5.920532941818237e-01, 5.891663432121277e-01, 1.621943810104949e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.507800221443176e-01, 5.420283079147339e-01, 7.744518518447876e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.630778242373214e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 4.669311046600342e-01, 6.735016107559204e-01, 6.55687689781189e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.131983616643837e-19, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.467239081859589e-01, 6.951085925102234e-01, 6.465937495231628e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.663183881820758e-19, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 9.070101976394653e-01, 4.687309265136719e-01, 5.429610013961792e-01, 5.643296837806702e-01, 5.504711866378784e-01, 5.465186834335327e-01, 5.486264228820801e-01, 5.571298003196716e-01, 6.009698510169983e-01, 5.289404392242432e-01, 5.310139656066895e-01, 1.851576592775183e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.419018149375916e-01, 3.850985765457153e-01, 8.444095849990845e-01, 1e+00, 1e+00, 5.602813959121704e-01, 5.801603198051453e-01, 6.304534673690796e-01, 7.130300998687744e-01, 5.310848951339722e-01, 5.597831606864929e-01, 5.373527407646179e-01, 1.377781910167951e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 5.497522354125977e-01, 5.467650294303894e-01, 8.553972244262695e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.630778242373214e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.261674582958221e-01, 6.85596764087677e-01, 7.312455773353577e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.131983616643837e-19, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.07248854637146e-01, 7.20927894115448e-01, 7.048036456108093e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.663183881820758e-19, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.872310042381287e-01, 5.479670166969299e-01, 6.435047388076782e-01, 6.586410999298096e-01, 6.489067673683167e-01, 6.4732825756073e-01, 6.501175761222839e-01, 6.611844301223755e-01, 7.073478102684021e-01, 6.252374649047852e-01, 6.283413171768188e-01, 2.194903075894145e-19, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.07956001162529e-01, 2.686528265476227e-01, 6.594924926757812e-01, 6.873970627784729e-01, 6.593207716941833e-01, 6.168038249015808e-01, 6.440598964691162e-01, 6.716520190238953e-01, 7.057821750640869e-01, 5.653910040855408e-01, 5.7325279712677e-01, 5.882964730262756e-01, 1.621880117197782e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.487590670585632e-01, 5.510369539260864e-01, 7.653446793556213e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.630778242373214e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 4.655739068984985e-01, 6.913837194442749e-01, 6.479340791702271e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.131983616643837e-19, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.455063045024872e-01, 7.188551425933838e-01, 6.359292268753052e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.663183881820758e-19, 0e+00, -0e+00, -0e+00, -0e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.904370784759521e-01, 4.613791406154633e-01, 5.428323149681091e-01, 5.550857186317444e-01, 5.476581454277039e-01, 5.46469509601593e-01, 5.486255884170532e-01, 6.268006563186646e-01, 1e+00, 5.758336186408997e-01, 5.317501425743103e-01, 1.851662542010706e-19, -0e+00, -0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.254656106233597e-01, 2.273918688297272e-01, 5.53803563117981e-01, 5.753931999206543e-01, 5.554373264312744e-01, 5.221768021583557e-01, 5.701122283935547e-01, 6.481252908706665e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1.976529255336524e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 0e+00, 5.733151435852051e-01, 4.959991574287415e-01, 7.075337171554565e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3.630778242373214e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 0e+00, 1e+00, 4.265830516815186e-01, 6.00243866443634e-01, 6.064483523368835e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.131983616643837e-19, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 4.143449366092682e-01, 6.181581020355225e-01, 5.93658447265625e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.663183881820758e-19, 0e+00, -0e+00, -0e+00, -0e+00]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.720249593257904e-01, 3.385133743286133e-01, 2.931900322437286e-01, 3.032422363758087e-01, 3.063399791717529e-01, 3.032086789608002e-01, 3.031823933124542e-01, 3.068248629570007e-01, 3.414949178695679e-01, 3.440666496753693e-01, 3.00455778837204e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.530483216047287e-01, 4.226331412792206e-01, 3.045966029167175e-01, 3.394297957420349e-01, 3.465162813663483e-01, 3.281815052032471e-01, 3.037332892417908e-01, 3.196571469306946e-01, 3.530568778514862e-01, 4.293164312839508e-01, 3.961372077465057e-01, 3.697693943977356e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.134951829910278e-01, 3.112649917602539e-01, 4.314609169960022e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.597331404685974e-01, 4.327360689640045e-01, 3.223090767860413e-01, 5.530421733856201e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.855688691139221e-01, 4.746844172477722e-01, 3.39695543050766e-01, 6.051127314567566e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.173828840255737e-01, 5.454221367835999e-01, 6.434695720672607e-01, 6.586399674415588e-01, 6.489063501358032e-01, 6.473278403282166e-01, 6.501170992851257e-01, 6.611840724945068e-01, 7.0734703540802e-01, 6.252371072769165e-01, 6.283407807350159e-01, 2.090388030016246e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1.909989565610886e-01, 1.750159859657288e-01, 6.575449109077454e-01, 6.873360276222229e-01, 6.593191623687744e-01, 6.168035864830017e-01, 6.440592408180237e-01, 6.716516613960266e-01, 7.057815790176392e-01, 5.653911232948303e-01, 5.732524394989014e-01, 5.882961750030518e-01, 1.987863697680032e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.731949210166931e-01, 4.548889398574829e-01, 6.945341229438782e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 3.908333480358124e-01, 5.645139217376709e-01, 5.922463536262512e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 3.71610552072525e-01, 5.793265700340271e-01, 5.79582691192627e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 5.272731781005859e-01, 5.445833802223206e-01, 6.43458366394043e-01, 6.586401462554932e-01, 6.489067673683167e-01, 6.4732825756073e-01, 6.501175165176392e-01, 6.916379332542419e-01, 8.623199462890625e-01, 6.407234072685242e-01, 6.285337209701538e-01, 2.090410777483091e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.026190906763077e-01, 2.317573726177216e-01, 6.588206887245178e-01, 6.873762011528015e-01, 6.593204736709595e-01, 6.168039441108704e-01, 6.440596580505371e-01, 6.991335153579712e-01, 7.94720470905304e-01, 5.682237148284912e-01, 5.920532941818237e-01, 5.891663432121277e-01, 1.987943107018837e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 6.507795453071594e-01, 5.420276522636414e-01, 7.744529247283936e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.669311940670013e-01, 6.735017895698547e-01, 6.556875705718994e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.46723610162735e-01, 6.951079964637756e-01, 6.465941667556763e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 9.070120453834534e-01, 4.68731164932251e-01, 5.429611802101135e-01, 5.643301010131836e-01, 5.504712462425232e-01, 5.465186834335327e-01, 5.486264228820801e-01, 5.571298003196716e-01, 6.009697318077087e-01, 5.289404988288879e-01, 5.310138463973999e-01, 1.763410900951365e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.41902768611908e-01, 3.850986957550049e-01, 8.444077968597412e-01, 1e+00, 1e+00, 5.602819323539734e-01, 5.801599025726318e-01, 6.304535865783691e-01, 7.130299210548401e-01, 5.310854911804199e-01, 5.597833395004272e-01, 5.373526215553284e-01, 1.688684981226367e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.497517585754395e-01, 5.467649698257446e-01, 8.553982377052307e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.26167368888855e-01, 6.85596764087677e-01, 7.312452793121338e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.072486162185669e-01, 7.209271788597107e-01, 7.048041224479675e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.872322559356689e-01, 5.47967255115509e-01, 6.435050368309021e-01, 6.586410999298096e-01, 6.489067673683167e-01, 6.4732825756073e-01, 6.501175165176392e-01, 6.611844897270203e-01, 7.07347571849823e-01, 6.252375245094299e-01, 6.283411383628845e-01, 2.090389322485953e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.079565972089767e-01, 2.686534821987152e-01, 6.594922542572021e-01, 6.873971223831177e-01, 6.593208909034729e-01, 6.168039441108704e-01, 6.440596580505371e-01, 6.7165207862854e-01, 7.057820558547974e-01, 5.65391480922699e-01, 5.7325279712677e-01, 5.882964730262756e-01, 1.987864938450951e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.487588286399841e-01, 5.510364174842834e-01, 7.653457522392273e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.655740261077881e-01, 6.91383957862854e-01, 6.479339003562927e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.455059766769409e-01, 7.188546657562256e-01, 6.359295845031738e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, -0e+00, 6.904382705688477e-01, 4.6137934923172e-01, 5.428325533866882e-01, 5.550857186317444e-01, 5.476581454277039e-01, 5.46469509601593e-01, 5.486255884170532e-01, 6.268005967140198e-01, 1e+00, 5.758334994316101e-01, 5.317501425743103e-01, 1.763492714283825e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 2.254661321640015e-01, 2.273923605680466e-01, 5.538033843040466e-01, 5.753932595252991e-01, 5.55437445640564e-01, 5.221769213676453e-01, 5.701119303703308e-01, 6.481254100799561e-01, 1e+00, 1e+00, 1e+00, 1e+00, 2.422539044565676e-18, 0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 5.733148455619812e-01, 4.959995448589325e-01, 7.075345516204834e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.271481940084194e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.265831410884857e-01, 6.002438068389893e-01, 6.064480543136597e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 5.489991521659851e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 4.143446981906891e-01, 6.18157684803009e-01, 5.936586856842041e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1.710288586531385e-19, 0e+00, 0e+00, 0e+00, 0e+00]
 hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.894162902832031e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870096130371094e+02, 2.8773193359375e+02, 2.875172729492188e+02, 2.862868957519531e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.865409851074219e+02, 2.84529052734375e+02, 2.860519714355469e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875053100585938e+02, 2.881181640625e+02, 2.886089477539062e+02, 2.883871154785156e+02, 2.876546630859375e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.873763122558594e+02, 2.884548034667969e+02, 2.851038208007812e+02, 2.877890319824219e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.889963073730469e+02, 2.848204345703125e+02, 2.8512158203125e+02, 2.883201904296875e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847931213378906e+02, 2.850978698730469e+02, 2.88756103515625e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.940445556640625e+02, 2.940445556640625e+02, 2.940445556640625e+02, 2.940445556640625e+02, 2.940445556640625e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.894175720214844e+02, 2.852170104980469e+02, 2.853668212890625e+02, 2.858875427246094e+02, 2.860963745117188e+02, 2.864665832519531e+02, 2.867905883789062e+02, 2.870093078613281e+02, 2.877313842773438e+02, 2.8751806640625e+02, 2.862872314453125e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.865478515625e+02, 2.845286865234375e+02, 2.860523071289062e+02, 2.868969116210938e+02, 2.872808837890625e+02, 2.871043090820312e+02, 2.869268798828125e+02, 2.875051879882812e+02, 2.881181030273438e+02, 2.886092834472656e+02, 2.883872375488281e+02, 2.876549072265625e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.884561767578125e+02, 2.851038208007812e+02, 2.877892456054688e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.889963073730469e+02, 2.848203125e+02, 2.8512158203125e+02, 2.883209838867188e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.893143005371094e+02, 2.847929992675781e+02, 2.850978698730469e+02, 2.887567443847656e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.894173583984375e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870095520019531e+02, 2.877317504882812e+02, 2.875173645019531e+02, 2.862868957519531e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.865435791015625e+02, 2.845289001464844e+02, 2.860519714355469e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875052795410156e+02, 2.881181030273438e+02, 2.886089782714844e+02, 2.883871765136719e+02, 2.876546630859375e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.88454833984375e+02, 2.851038208007812e+02, 2.877890014648438e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.889963073730469e+02, 2.848204345703125e+02, 2.8512158203125e+02, 2.88320068359375e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847931213378906e+02, 2.850978698730469e+02, 2.887559509277344e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.894173583984375e+02, 2.852170104980469e+02, 2.853668212890625e+02, 2.858874816894531e+02, 2.860963745117188e+02, 2.864665832519531e+02, 2.867905883789062e+02, 2.870094909667969e+02, 2.877319946289062e+02, 2.875176696777344e+02, 2.862872009277344e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.865370788574219e+02, 2.845291137695312e+02, 2.860513610839844e+02, 2.868964233398438e+02, 2.872806701660156e+02, 2.871044616699219e+02, 2.869268493652344e+02, 2.875052490234375e+02, 2.881181945800781e+02, 2.886078186035156e+02, 2.8838671875e+02, 2.876541442871094e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.8742431640625e+02, 2.884557800292969e+02, 2.851037292480469e+02, 2.877887268066406e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.889963073730469e+02, 2.848203125e+02, 2.851215209960938e+02, 2.883193664550781e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847930297851562e+02, 2.850978088378906e+02, 2.887552185058594e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.894171142578125e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870095520019531e+02, 2.877317504882812e+02, 2.875173645019531e+02, 2.862868957519531e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.8653515625e+02, 2.845296325683594e+02, 2.860519409179688e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875052795410156e+02, 2.881181030273438e+02, 2.886089782714844e+02, 2.883871765136719e+02, 2.876546630859375e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.884557800292969e+02, 2.851036071777344e+02, 2.877886352539062e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.928574829101562e+02, 2.889963073730469e+02, 2.848201904296875e+02, 2.851214904785156e+02, 2.883190612792969e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.931437072753906e+02, 2.893143005371094e+02, 2.847928466796875e+02, 2.850977783203125e+02, 2.887549438476562e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02, 2.940445251464844e+02]
-hvac.res.EFan=[0e+00, -1.364738810849531e-08, -1.364738810849531e-08, -1.364738899667373e-08, -1.364738899667373e-08, 6.266332397460938e+02, 4.61116748046875e+03, 8.469466796875e+03, 1.23276337890625e+04, 1.6183240234375e+04, 2.0039287109375e+04, 2.3895822265625e+04, 2.7752056640625e+04, 3.1606216796875e+04, 3.5470296875e+04, 3.932533203125e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.25512734375e+04, 4.717125e+04, 5.10303046875e+04, 5.488444921875e+04, 5.874353125e+04, 6.2601703125e+04, 6.64567109375e+04, 7.03111171875e+04, 7.41675078125e+04, 7.81441484375e+04, 8.2127109375e+04, 8.608628125e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 9.256765625e+04, 9.7684375e+04, 1.016964921875e+05, 1.14011078125e+05, 1.3353003125e+05, 1.53048375e+05, 1.72566765625e+05, 1.9208521875e+05, 2.11603734375e+05, 2.311229375e+05, 2.5064203125e+05, 2.7016084375e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.884325e+05, 2.97039125e+05, 3.0090509375e+05, 3.064084375e+05, 3.19217625e+05, 3.38736375e+05, 3.582550625e+05, 3.7777365625e+05, 3.9729225e+05, 4.1681090625e+05, 4.3632959375e+05, 4.5584809375e+05, 4.753665625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.933118125e+05, 5.02509125e+05, 5.06404625e+05, 5.1258646875e+05, 5.25841125e+05, 5.45359375e+05, 5.648774375e+05, 5.843955e+05, 6.03914125e+05, 6.23432625e+05, 6.429505625e+05, 6.624693125e+05, 6.819879375e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894163208007812e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870096130371094e+02, 2.8773193359375e+02, 2.875172729492188e+02, 2.862868957519531e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.864781494140625e+02, 2.86541015625e+02, 2.845290832519531e+02, 2.860519409179688e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875053100585938e+02, 2.881181640625e+02, 2.886089477539062e+02, 2.883871154785156e+02, 2.876546630859375e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.873762817382812e+02, 2.884548034667969e+02, 2.851038208007812e+02, 2.877890625e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848204345703125e+02, 2.8512158203125e+02, 2.883201904296875e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893143005371094e+02, 2.847931213378906e+02, 2.850978698730469e+02, 2.88756103515625e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894176025390625e+02, 2.852170104980469e+02, 2.853668212890625e+02, 2.858875427246094e+02, 2.860963745117188e+02, 2.864665832519531e+02, 2.867905883789062e+02, 2.870093078613281e+02, 2.877313842773438e+02, 2.8751806640625e+02, 2.862872314453125e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.865478515625e+02, 2.845286865234375e+02, 2.860523071289062e+02, 2.868969116210938e+02, 2.872808837890625e+02, 2.871043090820312e+02, 2.869268798828125e+02, 2.875051879882812e+02, 2.881181030273438e+02, 2.886092834472656e+02, 2.883872375488281e+02, 2.876549072265625e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.8734130859375e+02, 2.884561767578125e+02, 2.851038208007812e+02, 2.877892761230469e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848203125e+02, 2.8512158203125e+02, 2.883209838867188e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847929992675781e+02, 2.850978698730469e+02, 2.887567443847656e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894173583984375e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870095520019531e+02, 2.877317504882812e+02, 2.875173645019531e+02, 2.862868957519531e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.865436096191406e+02, 2.845289001464844e+02, 2.860519714355469e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875052795410156e+02, 2.881181030273438e+02, 2.886089477539062e+02, 2.883871765136719e+02, 2.876546630859375e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.88454833984375e+02, 2.851038208007812e+02, 2.877890319824219e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848204345703125e+02, 2.8512158203125e+02, 2.88320068359375e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847931213378906e+02, 2.850978698730469e+02, 2.887559509277344e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.894173583984375e+02, 2.852170104980469e+02, 2.853668212890625e+02, 2.858874816894531e+02, 2.860963745117188e+02, 2.864665832519531e+02, 2.867905883789062e+02, 2.870094909667969e+02, 2.877319946289062e+02, 2.875176696777344e+02, 2.862872314453125e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.864446716308594e+02, 2.865370788574219e+02, 2.845291137695312e+02, 2.860513610839844e+02, 2.868964233398438e+02, 2.872806701660156e+02, 2.871044616699219e+02, 2.869268493652344e+02, 2.875052490234375e+02, 2.881181945800781e+02, 2.886078186035156e+02, 2.8838671875e+02, 2.876541442871094e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.874242858886719e+02, 2.884557800292969e+02, 2.851037292480469e+02, 2.877887268066406e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848203125e+02, 2.851215209960938e+02, 2.883193664550781e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.931437683105469e+02, 2.893143005371094e+02, 2.847930297851562e+02, 2.850978088378906e+02, 2.887552185058594e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.894171142578125e+02, 2.852168273925781e+02, 2.853668518066406e+02, 2.85887939453125e+02, 2.860963134765625e+02, 2.864668273925781e+02, 2.867906188964844e+02, 2.870095520019531e+02, 2.877317504882812e+02, 2.875173645019531e+02, 2.862868957519531e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.864781188964844e+02, 2.8653515625e+02, 2.845296325683594e+02, 2.860519409179688e+02, 2.86896728515625e+02, 2.872807922363281e+02, 2.871041564941406e+02, 2.86927001953125e+02, 2.875052795410156e+02, 2.881181030273438e+02, 2.886089477539062e+02, 2.883871765136719e+02, 2.876546630859375e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.873762512207031e+02, 2.884557800292969e+02, 2.851036071777344e+02, 2.877886657714844e+02, 2.937384643554688e+02, 2.937927551269531e+02, 2.940797119140625e+02, 2.944173889160156e+02, 2.941339111328125e+02, 2.941396789550781e+02, 2.941976623535156e+02, 2.938414001464844e+02, 2.932702941894531e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.928578491210938e+02, 2.88996337890625e+02, 2.848201904296875e+02, 2.851214904785156e+02, 2.883190612792969e+02, 2.929265441894531e+02, 2.934717102050781e+02, 2.940345764160156e+02, 2.944160766601562e+02, 2.944441528320312e+02, 2.944433898925781e+02, 2.941808166503906e+02, 2.942019653320312e+02, 2.938905944824219e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.931437377929688e+02, 2.893143005371094e+02, 2.847928466796875e+02, 2.850977783203125e+02, 2.887549438476562e+02, 2.93139404296875e+02, 2.935314331054688e+02, 2.943312377929688e+02, 2.947601013183594e+02, 2.941665344238281e+02, 2.943858032226562e+02, 2.948462829589844e+02, 2.95221923828125e+02, 2.946428833007812e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02, 2.9404443359375e+02]
+hvac.res.EFan=[0e+00, -3.679045335047704e-08, -3.679045335047704e-08, -3.679045335047704e-08, -3.679045335047704e-08, 6.2663671875e+02, 4.61117041015625e+03, 8.4694697265625e+03, 1.232763671875e+04, 1.61832431640625e+04, 2.00392890625e+04, 2.3895826171875e+04, 2.775205859375e+04, 3.160621875e+04, 3.547030078125e+04, 3.93253359375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.2546734375e+04, 4.25512734375e+04, 4.717125e+04, 5.10303046875e+04, 5.488444921875e+04, 5.874353125e+04, 6.2601703125e+04, 6.64567109375e+04, 7.03111171875e+04, 7.41675078125e+04, 7.81441484375e+04, 8.2127109375e+04, 8.60862734375e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 8.931440625e+04, 9.256765625e+04, 9.7684375e+04, 1.016964921875e+05, 1.140110859375e+05, 1.33530046875e+05, 1.53048390625e+05, 1.7256678125e+05, 1.9208521875e+05, 2.1160375e+05, 2.31122953125e+05, 2.5064203125e+05, 2.7016084375e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8644990625e+05, 2.8843253125e+05, 2.97039125e+05, 3.00905125e+05, 3.0640846875e+05, 3.19217625e+05, 3.3873640625e+05, 3.5825509375e+05, 3.777736875e+05, 3.9729228125e+05, 4.1681090625e+05, 4.3632959375e+05, 4.55848125e+05, 4.7536659375e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9165515625e+05, 4.9331184375e+05, 5.0250915625e+05, 5.0640465625e+05, 5.125865e+05, 5.25841125e+05, 5.45359375e+05, 5.648774375e+05, 5.843955625e+05, 6.03914125e+05, 6.234326875e+05, 6.429505625e+05, 6.624693125e+05, 6.81988e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05, 6.9827675e+05]
 hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.2779091796875e+03, -1.016896796875e+05, -2.10771109375e+05, -3.494640625e+05, -5.046763125e+05, -6.588693125e+05, -8.23447875e+05, -9.9463925e+05, -1.18176125e+06, -1.384641625e+06, -1.554558375e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.687296875e+06, -1.7757155e+06, -1.914657375e+06, -2.0850835e+06, -2.26889475e+06, -2.4545585e+06, -2.626149e+06, -2.8065725e+06, -3.00531975e+06, -3.22152625e+06, -3.437663e+06, -3.64947875e+06, -3.80843775e+06, -3.80843775e+06, -3.80843775e+06, -3.80843775e+06, -3.80843775e+06, -3.80843775e+06, -3.80843775e+06, -3.80843775e+06, -3.87255725e+06, -3.95829e+06, -4.14705225e+06, -4.455841e+06, -4.8092555e+06, -5.1659975e+06, -5.5300715e+06, -5.8898355e+06, -6.2390555e+06, -6.60172e+06, -6.9478e+06, -7.289143e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.612195e+06, -7.746181e+06, -7.8297105e+06, -8.0411705e+06, -8.334891e+06, -8.671806e+06, -9.021377e+06, -9.385388e+06, -9.750582e+06, -1.0122674e+07, -1.0473891e+07, -1.0836626e+07, -1.1195711e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.152553e+07, -1.1667792e+07, -1.1755752e+07, -1.1976254e+07, -1.2279864e+07, -1.2626705e+07, -1.2979047e+07, -1.3358788e+07, -1.3727374e+07, -1.4080346e+07, -1.444183e+07, -1.4833637e+07, -1.523004e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07]
+hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.27798779296875e+03, -1.016898046875e+05, -2.107711875e+05, -3.4946428125e+05, -5.0467653125e+05, -6.588695625e+05, -8.234481875e+05, -9.946395625e+05, -1.1817615e+06, -1.384642e+06, -1.554558625e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.687297e+06, -1.775715625e+06, -1.914657375e+06, -2.085083625e+06, -2.268895e+06, -2.4545585e+06, -2.62614925e+06, -2.80657275e+06, -3.00532e+06, -3.2215265e+06, -3.43766325e+06, -3.64947875e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.808438e+06, -3.87255725e+06, -3.95828975e+06, -4.14705225e+06, -4.455841e+06, -4.8092555e+06, -5.1659975e+06, -5.5300715e+06, -5.8898355e+06, -6.2390555e+06, -6.60172e+06, -6.9478e+06, -7.289143e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.5679835e+06, -7.6121945e+06, -7.7461805e+06, -7.8297105e+06, -8.0411705e+06, -8.3348905e+06, -8.671806e+06, -9.021377e+06, -9.385387e+06, -9.750582e+06, -1.0122674e+07, -1.0473891e+07, -1.0836626e+07, -1.1195711e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1490088e+07, -1.1525529e+07, -1.1667792e+07, -1.1755752e+07, -1.1976253e+07, -1.2279863e+07, -1.2626705e+07, -1.2979047e+07, -1.3358788e+07, -1.3727374e+07, -1.4080345e+07, -1.444183e+07, -1.4833637e+07, -1.523004e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07, -1.5553456e+07]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt
index 38de288b24f..c67b941f969 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Guideline36Winter.txt
@@ -1,37 +1,37 @@
-last-generated=2023-08-29
+last-generated=2024-03-23
 statistics-initialization=
 {
-  "linear": "0, 0, 0, 0, 0, 4, 0",
-  "nonlinear": "1, 3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1",
+  "linear": "0",
+  "nonlinear": "1, 3, 0, 0, 1, 1, 0, 0, 0, 1, 1",
   "numerical Jacobians": "0"
 }
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0",
   "nonlinear": "5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1",
-  "number of continuous time states": "88",
+  "number of continuous time states": "94",
   "numerical Jacobians": "0"
 }
 time=[4.32e+05, 8.64e+05]
-flo.sou.TAir=[2.931499938964844e+02, 2.918912353515625e+02, 2.915414123535156e+02, 2.911961975097656e+02, 2.935688171386719e+02, 2.929722290039062e+02, 2.931818237304688e+02, 2.935194091796875e+02, 2.943905944824219e+02, 2.941788330078125e+02, 2.934953002929688e+02, 2.933657531738281e+02, 2.932240600585938e+02, 2.931842956542969e+02, 2.9325830078125e+02, 2.931314392089844e+02, 2.907151489257812e+02, 2.906597595214844e+02, 2.902557373046875e+02, 2.895425720214844e+02, 2.888842163085938e+02, 2.887333679199219e+02, 2.885149536132812e+02, 2.91405517578125e+02, 2.918213806152344e+02, 2.919488220214844e+02, 2.91860595703125e+02, 2.928575439453125e+02, 2.935619201660156e+02, 2.931825866699219e+02, 2.932452087402344e+02, 2.932024841308594e+02, 2.930997924804688e+02, 2.930568542480469e+02, 2.92622802734375e+02, 2.9215380859375e+02, 2.893580322265625e+02, 2.893812561035156e+02, 2.889794616699219e+02, 2.886670837402344e+02, 2.884507141113281e+02, 2.88305908203125e+02, 2.878608093261719e+02, 2.907012939453125e+02, 2.912019653320312e+02, 2.914241333007812e+02, 2.911778564453125e+02, 2.919226379394531e+02, 2.926571960449219e+02, 2.931673583984375e+02, 2.933896789550781e+02, 2.928771362304688e+02, 2.927492065429688e+02, 2.929152221679688e+02, 2.927387084960938e+02, 2.92440185546875e+02, 2.896709289550781e+02, 2.891948547363281e+02, 2.887060241699219e+02, 2.881258850097656e+02, 2.880490112304688e+02, 2.878522644042969e+02, 2.875233459472656e+02, 2.914271850585938e+02, 2.922760620117188e+02, 2.927363586425781e+02, 2.919202270507812e+02, 2.928383483886719e+02, 2.932500610351562e+02, 2.931683959960938e+02, 2.93217529296875e+02, 2.934271240234375e+02, 2.934383544921875e+02, 2.932438354492188e+02, 2.93154296875e+02, 2.931812744140625e+02, 2.915697937011719e+02, 2.912069396972656e+02, 2.911699829101562e+02, 2.9097802734375e+02, 2.901295166015625e+02, 2.899180297851562e+02, 2.899991455078125e+02, 2.93360107421875e+02, 2.927886657714844e+02, 2.925862426757812e+02, 2.9304296875e+02, 2.932786254882812e+02, 2.944569091796875e+02, 2.951903076171875e+02, 2.957405700683594e+02, 2.960155639648438e+02, 2.960448303222656e+02, 2.9584423828125e+02, 2.951583862304688e+02, 2.936423645019531e+02, 2.932265930175781e+02, 2.927285461425781e+02, 2.922785034179688e+02, 2.91783203125e+02, 2.914182739257812e+02]
-flo.eas.TAir=[2.931499938964844e+02, 2.918328857421875e+02, 2.913311157226562e+02, 2.914444274902344e+02, 2.930054626464844e+02, 2.929416809082031e+02, 2.932752990722656e+02, 2.933260803222656e+02, 2.93696533203125e+02, 2.93164794921875e+02, 2.931953430175781e+02, 2.930741577148438e+02, 2.931898193359375e+02, 2.932205505371094e+02, 2.931316223144531e+02, 2.931358337402344e+02, 2.908370666503906e+02, 2.906790771484375e+02, 2.903252868652344e+02, 2.897119140625e+02, 2.890037536621094e+02, 2.888039245605469e+02, 2.885221252441406e+02, 2.91552490234375e+02, 2.920653686523438e+02, 2.922018737792969e+02, 2.92085205078125e+02, 2.932255554199219e+02, 2.93252685546875e+02, 2.92985107421875e+02, 2.928998718261719e+02, 2.927212524414062e+02, 2.927410583496094e+02, 2.927100219726562e+02, 2.920975036621094e+02, 2.918489990234375e+02, 2.892656555175781e+02, 2.891775207519531e+02, 2.887522583007812e+02, 2.883738098144531e+02, 2.881986083984375e+02, 2.877722778320312e+02, 2.876849060058594e+02, 2.90693359375e+02, 2.913099975585938e+02, 2.915586853027344e+02, 2.912905578613281e+02, 2.922020263671875e+02, 2.924081420898438e+02, 2.922444458007812e+02, 2.921553039550781e+02, 2.921178283691406e+02, 2.920884094238281e+02, 2.922272644042969e+02, 2.921810302734375e+02, 2.920921325683594e+02, 2.89409423828125e+02, 2.890461730957031e+02, 2.885774536132812e+02, 2.881586608886719e+02, 2.879533996582031e+02, 2.878642883300781e+02, 2.87599609375e+02, 2.914448547363281e+02, 2.924675903320312e+02, 2.929520874023438e+02, 2.92376953125e+02, 2.932731628417969e+02, 2.932173156738281e+02, 2.931849060058594e+02, 2.931714172363281e+02, 2.933299560546875e+02, 2.931777954101562e+02, 2.931329956054688e+02, 2.931437072753906e+02, 2.931629333496094e+02, 2.912839965820312e+02, 2.909725646972656e+02, 2.906961669921875e+02, 2.904494934082031e+02, 2.898046264648438e+02, 2.895269775390625e+02, 2.900078430175781e+02, 2.934615173339844e+02, 2.925427856445312e+02, 2.935433044433594e+02, 2.931413269042969e+02, 2.931567993164062e+02, 2.939071350097656e+02, 2.940409851074219e+02, 2.942001647949219e+02, 2.944251403808594e+02, 2.945552978515625e+02, 2.94568603515625e+02, 2.942767028808594e+02, 2.931150817871094e+02, 2.924555969238281e+02, 2.921793212890625e+02, 2.916071166992188e+02, 2.911979064941406e+02, 2.907852478027344e+02]
-flo.nor.TAir=[2.931499938964844e+02, 2.924403076171875e+02, 2.919325866699219e+02, 2.915895080566406e+02, 2.928287353515625e+02, 2.932696533203125e+02, 2.926865539550781e+02, 2.931692199707031e+02, 2.932223205566406e+02, 2.93156982421875e+02, 2.931036071777344e+02, 2.933170166015625e+02, 2.932613830566406e+02, 2.931449890136719e+02, 2.931340637207031e+02, 2.930214538574219e+02, 2.904002075195312e+02, 2.90409912109375e+02, 2.901719055175781e+02, 2.892454528808594e+02, 2.885898132324219e+02, 2.883495788574219e+02, 2.881746215820312e+02, 2.91306396484375e+02, 2.917586364746094e+02, 2.919061279296875e+02, 2.918312377929688e+02, 2.923080444335938e+02, 2.91701171875e+02, 2.914923095703125e+02, 2.924064025878906e+02, 2.922321166992188e+02, 2.921000366210938e+02, 2.921596984863281e+02, 2.913507995605469e+02, 2.915291137695312e+02, 2.887539978027344e+02, 2.890711364746094e+02, 2.886015319824219e+02, 2.881863403320312e+02, 2.881522521972656e+02, 2.879243469238281e+02, 2.877591552734375e+02, 2.904403991699219e+02, 2.909854431152344e+02, 2.912329406738281e+02, 2.909989318847656e+02, 2.912052001953125e+02, 2.913304443359375e+02, 2.915440979003906e+02, 2.917233581542969e+02, 2.916765441894531e+02, 2.91650146484375e+02, 2.918336486816406e+02, 2.918204956054688e+02, 2.917440185546875e+02, 2.895027160644531e+02, 2.891138916015625e+02, 2.88697265625e+02, 2.883143615722656e+02, 2.881021728515625e+02, 2.8803369140625e+02, 2.877981262207031e+02, 2.911448669433594e+02, 2.920469665527344e+02, 2.925264892578125e+02, 2.920263671875e+02, 2.929396362304688e+02, 2.932109375e+02, 2.932236022949219e+02, 2.93185546875e+02, 2.933397216796875e+02, 2.931833801269531e+02, 2.931357421875e+02, 2.931468811035156e+02, 2.931693725585938e+02, 2.914866027832031e+02, 2.911302795410156e+02, 2.908982543945312e+02, 2.906774597167969e+02, 2.902747802734375e+02, 2.899268798828125e+02, 2.900825500488281e+02, 2.93163818359375e+02, 2.928735046386719e+02, 2.932958679199219e+02, 2.928832092285156e+02, 2.933904724121094e+02, 2.931473999023438e+02, 2.934955444335938e+02, 2.940590209960938e+02, 2.943046569824219e+02, 2.944493713378906e+02, 2.944962158203125e+02, 2.942273864746094e+02, 2.93096923828125e+02, 2.925563659667969e+02, 2.9226708984375e+02, 2.918681640625e+02, 2.914708557128906e+02, 2.910967407226562e+02]
-flo.wes.TAir=[2.931499938964844e+02, 2.915511169433594e+02, 2.911672973632812e+02, 2.908944091796875e+02, 2.931470336914062e+02, 2.936444091796875e+02, 2.932617492675781e+02, 2.931777038574219e+02, 2.9314111328125e+02, 2.932147521972656e+02, 2.931008605957031e+02, 2.933157958984375e+02, 2.932986450195312e+02, 2.932360229492188e+02, 2.931309814453125e+02, 2.931326599121094e+02, 2.910447082519531e+02, 2.902111206054688e+02, 2.898226928710938e+02, 2.896853332519531e+02, 2.891651306152344e+02, 2.885693359375e+02, 2.882197875976562e+02, 2.914752197265625e+02, 2.920253295898438e+02, 2.921705322265625e+02, 2.920568237304688e+02, 2.924766235351562e+02, 2.924522399902344e+02, 2.923955688476562e+02, 2.924735412597656e+02, 2.926250610351562e+02, 2.932947692871094e+02, 2.932112426757812e+02, 2.922298889160156e+02, 2.918665771484375e+02, 2.893770751953125e+02, 2.888533630371094e+02, 2.884498901367188e+02, 2.884317016601562e+02, 2.879984436035156e+02, 2.876930236816406e+02, 2.874354553222656e+02, 2.906916809082031e+02, 2.913208618164062e+02, 2.915744018554688e+02, 2.913104553222656e+02, 2.914549865722656e+02, 2.91560791015625e+02, 2.917001647949219e+02, 2.919783935546875e+02, 2.919700012207031e+02, 2.922724304199219e+02, 2.929285278320312e+02, 2.9235595703125e+02, 2.920190124511719e+02, 2.892909240722656e+02, 2.889387512207031e+02, 2.88704833984375e+02, 2.87935302734375e+02, 2.876437377929688e+02, 2.876097717285156e+02, 2.873137817382812e+02, 2.914537048339844e+02, 2.924615783691406e+02, 2.929552307128906e+02, 2.922846069335938e+02, 2.926637573242188e+02, 2.928952026367188e+02, 2.938080139160156e+02, 2.930892944335938e+02, 2.934134826660156e+02, 2.932522888183594e+02, 2.931246643066406e+02, 2.930834045410156e+02, 2.932928771972656e+02, 2.910245666503906e+02, 2.907289733886719e+02, 2.905568542480469e+02, 2.903716735839844e+02, 2.896919250488281e+02, 2.894032592773438e+02, 2.896483459472656e+02, 2.934450988769531e+02, 2.930400390625e+02, 2.935516357421875e+02, 2.931511535644531e+02, 2.92869384765625e+02, 2.9320166015625e+02, 2.936576538085938e+02, 2.940618286132812e+02, 2.944193115234375e+02, 2.947572631835938e+02, 2.947754821777344e+02, 2.942344360351562e+02, 2.931446533203125e+02, 2.9236767578125e+02, 2.921481018066406e+02, 2.915049133300781e+02, 2.910916748046875e+02, 2.906816711425781e+02]
-flo.cor.TAir=[2.931499938964844e+02, 2.926637268066406e+02, 2.922261047363281e+02, 2.919517822265625e+02, 2.934150695800781e+02, 2.933685607910156e+02, 2.932369995117188e+02, 2.93768798828125e+02, 2.939355163574219e+02, 2.937381286621094e+02, 2.936228637695312e+02, 2.936507873535156e+02, 2.935899658203125e+02, 2.935559997558594e+02, 2.935169677734375e+02, 2.930958557128906e+02, 2.913753051757812e+02, 2.911847229003906e+02, 2.908608093261719e+02, 2.902139587402344e+02, 2.896024475097656e+02, 2.893015441894531e+02, 2.890569763183594e+02, 2.920862426757812e+02, 2.924894104003906e+02, 2.926301879882812e+02, 2.925650939941406e+02, 2.931650390625e+02, 2.929713745117188e+02, 2.927671203613281e+02, 2.932142333984375e+02, 2.9307080078125e+02, 2.930652465820312e+02, 2.931325988769531e+02, 2.92453369140625e+02, 2.923598327636719e+02, 2.897391052246094e+02, 2.897849731445312e+02, 2.893703002929688e+02, 2.890561218261719e+02, 2.888721313476562e+02, 2.886192626953125e+02, 2.883843383789062e+02, 2.912617797851562e+02, 2.917713317871094e+02, 2.920118408203125e+02, 2.917844543457031e+02, 2.920747680664062e+02, 2.922180786132812e+02, 2.924564208984375e+02, 2.926361083984375e+02, 2.925227966308594e+02, 2.924931945800781e+02, 2.926943054199219e+02, 2.926583862304688e+02, 2.925493774414062e+02, 2.900948486328125e+02, 2.897196044921875e+02, 2.893200378417969e+02, 2.888399047851562e+02, 2.886418762207031e+02, 2.885431518554688e+02, 2.882727966308594e+02, 2.919182739257812e+02, 2.927881469726562e+02, 2.93260498046875e+02, 2.926794738769531e+02, 2.935262451171875e+02, 2.93306884765625e+02, 2.934136657714844e+02, 2.934674072265625e+02, 2.936880798339844e+02, 2.93656494140625e+02, 2.936195373535156e+02, 2.9356201171875e+02, 2.931600646972656e+02, 2.919362487792969e+02, 2.916020812988281e+02, 2.914118347167969e+02, 2.911876220703125e+02, 2.90643798828125e+02, 2.903607482910156e+02, 2.905002746582031e+02, 2.938413696289062e+02, 2.930579833984375e+02, 2.933067016601562e+02, 2.932174377441406e+02, 2.935028381347656e+02, 2.938928833007812e+02, 2.94353515625e+02, 2.948096618652344e+02, 2.950734252929688e+02, 2.952104797363281e+02, 2.952080383300781e+02, 2.948401794433594e+02, 2.935589904785156e+02, 2.93131591796875e+02, 2.928216552734375e+02, 2.923764038085938e+02, 2.919848327636719e+02, 2.916190795898438e+02]
+flo.sou.TAir=[2.931499938964844e+02, 2.918912353515625e+02, 2.915414123535156e+02, 2.911961975097656e+02, 2.935688171386719e+02, 2.929722290039062e+02, 2.931818237304688e+02, 2.935194091796875e+02, 2.943905944824219e+02, 2.941788330078125e+02, 2.934952697753906e+02, 2.933657836914062e+02, 2.932240600585938e+02, 2.931842956542969e+02, 2.9325830078125e+02, 2.931314086914062e+02, 2.907151489257812e+02, 2.906597595214844e+02, 2.902557373046875e+02, 2.895425720214844e+02, 2.888842163085938e+02, 2.887333679199219e+02, 2.885149536132812e+02, 2.91405517578125e+02, 2.918213806152344e+02, 2.919488220214844e+02, 2.91860595703125e+02, 2.928575439453125e+02, 2.935619201660156e+02, 2.931826171875e+02, 2.932452392578125e+02, 2.932024841308594e+02, 2.930997924804688e+02, 2.930568542480469e+02, 2.92622802734375e+02, 2.9215380859375e+02, 2.893580322265625e+02, 2.893812561035156e+02, 2.889794616699219e+02, 2.886670532226562e+02, 2.884507141113281e+02, 2.883058776855469e+02, 2.878608093261719e+02, 2.907012634277344e+02, 2.912019653320312e+02, 2.914241333007812e+02, 2.911778564453125e+02, 2.919226379394531e+02, 2.926571960449219e+02, 2.931673583984375e+02, 2.933896789550781e+02, 2.928771667480469e+02, 2.927492370605469e+02, 2.929152221679688e+02, 2.927387084960938e+02, 2.92440185546875e+02, 2.896709289550781e+02, 2.891948547363281e+02, 2.887060241699219e+02, 2.881258850097656e+02, 2.880490112304688e+02, 2.878522644042969e+02, 2.875233459472656e+02, 2.914271850585938e+02, 2.922760620117188e+02, 2.92736328125e+02, 2.919202270507812e+02, 2.928383178710938e+02, 2.932500610351562e+02, 2.931683959960938e+02, 2.93217529296875e+02, 2.934271240234375e+02, 2.934383544921875e+02, 2.932438354492188e+02, 2.93154296875e+02, 2.931812744140625e+02, 2.915697937011719e+02, 2.912069396972656e+02, 2.911699829101562e+02, 2.9097802734375e+02, 2.901295166015625e+02, 2.899180297851562e+02, 2.899991455078125e+02, 2.93360107421875e+02, 2.927886657714844e+02, 2.925864868164062e+02, 2.9304296875e+02, 2.932786254882812e+02, 2.944569091796875e+02, 2.951903076171875e+02, 2.957405700683594e+02, 2.960155639648438e+02, 2.960448303222656e+02, 2.9584423828125e+02, 2.951583862304688e+02, 2.936423645019531e+02, 2.932265930175781e+02, 2.927285461425781e+02, 2.922785034179688e+02, 2.91783203125e+02, 2.914182739257812e+02]
+flo.eas.TAir=[2.931499938964844e+02, 2.918328552246094e+02, 2.913311157226562e+02, 2.914444274902344e+02, 2.930054626464844e+02, 2.929416809082031e+02, 2.932752990722656e+02, 2.933260803222656e+02, 2.93696533203125e+02, 2.93164794921875e+02, 2.931953125e+02, 2.930741577148438e+02, 2.931898193359375e+02, 2.932205505371094e+02, 2.931316223144531e+02, 2.931358337402344e+02, 2.908370666503906e+02, 2.906790771484375e+02, 2.903252868652344e+02, 2.897119140625e+02, 2.890037536621094e+02, 2.888039245605469e+02, 2.885221252441406e+02, 2.91552490234375e+02, 2.920653686523438e+02, 2.922018737792969e+02, 2.92085205078125e+02, 2.932255554199219e+02, 2.93252685546875e+02, 2.92985107421875e+02, 2.928998718261719e+02, 2.927212524414062e+02, 2.927410583496094e+02, 2.927100219726562e+02, 2.920974731445312e+02, 2.918489990234375e+02, 2.892656555175781e+02, 2.891775207519531e+02, 2.887522583007812e+02, 2.883738098144531e+02, 2.881986083984375e+02, 2.877722778320312e+02, 2.876849060058594e+02, 2.90693359375e+02, 2.913099975585938e+02, 2.915586853027344e+02, 2.9129052734375e+02, 2.922020263671875e+02, 2.924081420898438e+02, 2.922444458007812e+02, 2.921553039550781e+02, 2.921178283691406e+02, 2.920884094238281e+02, 2.922272644042969e+02, 2.921810302734375e+02, 2.920921325683594e+02, 2.89409423828125e+02, 2.890461730957031e+02, 2.885774536132812e+02, 2.881586303710938e+02, 2.879534301757812e+02, 2.878642883300781e+02, 2.87599609375e+02, 2.9144482421875e+02, 2.924675903320312e+02, 2.929520874023438e+02, 2.92376953125e+02, 2.932731628417969e+02, 2.932173156738281e+02, 2.931849060058594e+02, 2.931714172363281e+02, 2.933299560546875e+02, 2.931777954101562e+02, 2.931329956054688e+02, 2.931437072753906e+02, 2.931629333496094e+02, 2.912840270996094e+02, 2.909725646972656e+02, 2.906961669921875e+02, 2.904494934082031e+02, 2.898046264648438e+02, 2.895269775390625e+02, 2.900078430175781e+02, 2.934615173339844e+02, 2.925427856445312e+02, 2.935433959960938e+02, 2.931413269042969e+02, 2.931567993164062e+02, 2.939071350097656e+02, 2.940409851074219e+02, 2.942001647949219e+02, 2.944251403808594e+02, 2.945552978515625e+02, 2.94568603515625e+02, 2.942767028808594e+02, 2.931150817871094e+02, 2.924555969238281e+02, 2.921793212890625e+02, 2.916071166992188e+02, 2.911979064941406e+02, 2.907852783203125e+02]
+flo.nor.TAir=[2.931499938964844e+02, 2.924403076171875e+02, 2.919325561523438e+02, 2.915895080566406e+02, 2.928287353515625e+02, 2.932696533203125e+02, 2.926865539550781e+02, 2.931692199707031e+02, 2.932223205566406e+02, 2.93156982421875e+02, 2.931036071777344e+02, 2.933170166015625e+02, 2.932613830566406e+02, 2.931449890136719e+02, 2.931340637207031e+02, 2.930214538574219e+02, 2.904001770019531e+02, 2.90409912109375e+02, 2.901719055175781e+02, 2.892454528808594e+02, 2.885898132324219e+02, 2.883495788574219e+02, 2.881746215820312e+02, 2.91306396484375e+02, 2.917586364746094e+02, 2.919061279296875e+02, 2.918312377929688e+02, 2.923080444335938e+02, 2.91701171875e+02, 2.914923095703125e+02, 2.924063720703125e+02, 2.922321166992188e+02, 2.921000366210938e+02, 2.921596984863281e+02, 2.913507995605469e+02, 2.915291137695312e+02, 2.887539978027344e+02, 2.890711669921875e+02, 2.886015319824219e+02, 2.881863403320312e+02, 2.881522216796875e+02, 2.879243469238281e+02, 2.877591857910156e+02, 2.904403991699219e+02, 2.909854431152344e+02, 2.912329406738281e+02, 2.909989318847656e+02, 2.912052001953125e+02, 2.913304443359375e+02, 2.915440979003906e+02, 2.917233581542969e+02, 2.916765441894531e+02, 2.91650146484375e+02, 2.918336486816406e+02, 2.918204956054688e+02, 2.917440185546875e+02, 2.895027160644531e+02, 2.891138916015625e+02, 2.88697265625e+02, 2.883143615722656e+02, 2.881021728515625e+02, 2.8803369140625e+02, 2.877981262207031e+02, 2.911448669433594e+02, 2.920469665527344e+02, 2.925264892578125e+02, 2.920263671875e+02, 2.929396362304688e+02, 2.932109375e+02, 2.932236022949219e+02, 2.93185546875e+02, 2.933397216796875e+02, 2.931834106445312e+02, 2.931357421875e+02, 2.931468811035156e+02, 2.931693725585938e+02, 2.914866333007812e+02, 2.911302795410156e+02, 2.908982543945312e+02, 2.906774597167969e+02, 2.902747802734375e+02, 2.899268798828125e+02, 2.9008251953125e+02, 2.93163818359375e+02, 2.928735046386719e+02, 2.932958068847656e+02, 2.928832092285156e+02, 2.933904724121094e+02, 2.931473999023438e+02, 2.934955444335938e+02, 2.940590209960938e+02, 2.943046569824219e+02, 2.944493713378906e+02, 2.944962158203125e+02, 2.942273864746094e+02, 2.93096923828125e+02, 2.925563659667969e+02, 2.9226708984375e+02, 2.918681640625e+02, 2.914708557128906e+02, 2.910967407226562e+02]
+flo.wes.TAir=[2.931499938964844e+02, 2.915511169433594e+02, 2.911672668457031e+02, 2.908944091796875e+02, 2.931470336914062e+02, 2.936444091796875e+02, 2.932617492675781e+02, 2.931777038574219e+02, 2.931410827636719e+02, 2.932147521972656e+02, 2.931008605957031e+02, 2.933157958984375e+02, 2.932986450195312e+02, 2.932360229492188e+02, 2.931309814453125e+02, 2.931326599121094e+02, 2.910447082519531e+02, 2.902111206054688e+02, 2.898226928710938e+02, 2.89685302734375e+02, 2.891651306152344e+02, 2.885693359375e+02, 2.882198181152344e+02, 2.914752502441406e+02, 2.920253295898438e+02, 2.921705322265625e+02, 2.920568237304688e+02, 2.924766235351562e+02, 2.924522399902344e+02, 2.923955688476562e+02, 2.924735412597656e+02, 2.926250610351562e+02, 2.932947692871094e+02, 2.932112121582031e+02, 2.922298889160156e+02, 2.918665771484375e+02, 2.893770751953125e+02, 2.888533630371094e+02, 2.884498901367188e+02, 2.884316711425781e+02, 2.879984436035156e+02, 2.876930236816406e+02, 2.874354858398438e+02, 2.906916809082031e+02, 2.913208618164062e+02, 2.915744018554688e+02, 2.913104553222656e+02, 2.914549865722656e+02, 2.91560791015625e+02, 2.917001647949219e+02, 2.919783935546875e+02, 2.919700012207031e+02, 2.922724304199219e+02, 2.929285278320312e+02, 2.9235595703125e+02, 2.920190124511719e+02, 2.892909240722656e+02, 2.889387512207031e+02, 2.88704833984375e+02, 2.87935302734375e+02, 2.876437377929688e+02, 2.876097717285156e+02, 2.873137817382812e+02, 2.914537048339844e+02, 2.924615783691406e+02, 2.929552307128906e+02, 2.922846069335938e+02, 2.926637573242188e+02, 2.928952026367188e+02, 2.938080139160156e+02, 2.930892944335938e+02, 2.934134826660156e+02, 2.932522888183594e+02, 2.931246643066406e+02, 2.930834045410156e+02, 2.932928771972656e+02, 2.910245971679688e+02, 2.907289733886719e+02, 2.905568237304688e+02, 2.903716735839844e+02, 2.896919250488281e+02, 2.894032592773438e+02, 2.896483459472656e+02, 2.934450988769531e+02, 2.930400390625e+02, 2.935517272949219e+02, 2.931511535644531e+02, 2.92869384765625e+02, 2.9320166015625e+02, 2.936576538085938e+02, 2.940618286132812e+02, 2.944193115234375e+02, 2.947572631835938e+02, 2.947754821777344e+02, 2.942344360351562e+02, 2.931446533203125e+02, 2.923677062988281e+02, 2.921481018066406e+02, 2.915049133300781e+02, 2.910916748046875e+02, 2.906817016601562e+02]
+flo.cor.TAir=[2.931499938964844e+02, 2.926637268066406e+02, 2.922261047363281e+02, 2.919517822265625e+02, 2.934150695800781e+02, 2.933685607910156e+02, 2.932369995117188e+02, 2.93768798828125e+02, 2.939355163574219e+02, 2.937381286621094e+02, 2.936228637695312e+02, 2.936507873535156e+02, 2.935899658203125e+02, 2.935559997558594e+02, 2.935169372558594e+02, 2.930958251953125e+02, 2.913753051757812e+02, 2.911847229003906e+02, 2.908608093261719e+02, 2.902139587402344e+02, 2.896024780273438e+02, 2.893015441894531e+02, 2.890570068359375e+02, 2.920862426757812e+02, 2.924894104003906e+02, 2.926301879882812e+02, 2.925650939941406e+02, 2.931650390625e+02, 2.929713745117188e+02, 2.927671203613281e+02, 2.932142028808594e+02, 2.9307080078125e+02, 2.930652465820312e+02, 2.931325988769531e+02, 2.92453369140625e+02, 2.923598327636719e+02, 2.897391052246094e+02, 2.897850036621094e+02, 2.893703002929688e+02, 2.890561218261719e+02, 2.888721313476562e+02, 2.886192626953125e+02, 2.883843383789062e+02, 2.912617797851562e+02, 2.917713317871094e+02, 2.920118408203125e+02, 2.917844543457031e+02, 2.920747680664062e+02, 2.922180786132812e+02, 2.924564208984375e+02, 2.926361083984375e+02, 2.925227966308594e+02, 2.924931945800781e+02, 2.926943054199219e+02, 2.926583862304688e+02, 2.925493774414062e+02, 2.900948486328125e+02, 2.897196044921875e+02, 2.893200073242188e+02, 2.888399047851562e+02, 2.886419067382812e+02, 2.885431518554688e+02, 2.882727966308594e+02, 2.919182739257812e+02, 2.927881469726562e+02, 2.932604675292969e+02, 2.926794738769531e+02, 2.935262451171875e+02, 2.93306884765625e+02, 2.934136657714844e+02, 2.934674072265625e+02, 2.936880798339844e+02, 2.93656494140625e+02, 2.936195373535156e+02, 2.9356201171875e+02, 2.931600646972656e+02, 2.919362487792969e+02, 2.916020812988281e+02, 2.914118347167969e+02, 2.911875915527344e+02, 2.90643798828125e+02, 2.903607482910156e+02, 2.905002746582031e+02, 2.938413696289062e+02, 2.930579833984375e+02, 2.9330712890625e+02, 2.932174377441406e+02, 2.935028381347656e+02, 2.938928833007812e+02, 2.94353515625e+02, 2.948096618652344e+02, 2.950734252929688e+02, 2.952104797363281e+02, 2.952080383300781e+02, 2.948401794433594e+02, 2.935589904785156e+02, 2.93131591796875e+02, 2.928216552734375e+02, 2.923764038085938e+02, 2.919848327636719e+02, 2.916191101074219e+02]
 hvac.TZonSet[1].TCooSet=[3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 2.971499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02]
 hvac.TZonSet[1].THeaSet=[2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02, 2.851499938964844e+02]
-hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 5.946382880210876e-01, 2.816882729530334e-01, 3.092013299465179e-01, 3.312539160251617e-01, 2.999972105026245e-01, 2.99845427274704e-01, 3.02069216966629e-01, 3.019421100616455e-01, 3.016010522842407e-01, 3.017100989818573e-01, 3.015052676200867e-01, 3.017158508300781e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.609784007072449e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.661270618438721e-01, 3.471058309078217e-01, 3.586971163749695e-01, 3.828596174716949e-01, 3.931705951690674e-01, 3.884980082511902e-01, 3.650532960891724e-01, 3.64126443862915e-01, 3.966065049171448e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.613943815231323e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.662903189659119e-01, 3.586048185825348e-01, 3.892602026462555e-01, 4.05628114938736e-01, 3.908695876598358e-01, 3.841305375099182e-01, 3.978137373924255e-01, 4.050893485546112e-01, 4.028278589248657e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.606789469718933e-01, 1e+00, 1e+00, 8.932546377182007e-01, 5.591101050376892e-01, 3.216736614704132e-01, 3.305162489414215e-01, 3.025928437709808e-01, 3.077056705951691e-01, 3.025961816310883e-01, 3.012721836566925e-01, 3.018129765987396e-01, 3.072161674499512e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.594307065010071e-01, 4.586227536201477e-01, 4.091459214687347e-01, 3.419479429721832e-01, 3.441185653209686e-01, 2.982200980186462e-01, 2.994309663772583e-01, 3.022384345531464e-01, 3.017037808895111e-01, 3.015328347682953e-01, 3.015599846839905e-01, 3.015967607498169e-01, 3.015550673007965e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[5].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, 2.045790702104568e-01, 1.146090254187584e-01, 7.210951447486877e-01, 6.441739201545715e-01, 6.325563788414001e-01, 6.525150537490845e-01, 6.508560180664062e-01, 6.48665726184845e-01, 6.49313747882843e-01, 6.486014723777771e-01, 6.490941047668457e-01, 6.497209072113037e-01, 6.965027227794769e-19, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.190039336681366e-01, 7.010890245437622e-01, 7.964291572570801e-01, 8.317253589630127e-01, 7.949371337890625e-01, 7.688897252082825e-01, 7.141737341880798e-01, 8.008921146392822e-01, 8.65394115447998e-01, 2.062712582972965e-18, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972626209259e-01, 4.195817112922668e-01, 7.213320732116699e-01, 8.52422297000885e-01, 8.062042593955994e-01, 7.491652965545654e-01, 7.818188667297363e-01, 8.189293146133423e-01, 7.944256663322449e-01, 7.754309177398682e-01, 1.258572362599566e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06652694940567e-01, 3.825661540031433e-01, 6.211260557174683e-01, 6.53107762336731e-01, 6.335419416427612e-01, 6.575415730476379e-01, 6.465981602668762e-01, 6.514613032341003e-01, 6.521514058113098e-01, 6.577584743499756e-01, 1.012825998199223e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 9.812420606613159e-01, 4.380461573600769e-01, 5.858032703399658e-01, 6.577604413032532e-01, 6.240782141685486e-01, 6.288849115371704e-01, 6.549254655838013e-01, 6.50420069694519e-01, 6.481792330741882e-01, 6.48495614528656e-01, 6.486777067184448e-01, 6.48586630821228e-01, 6.487026214599609e-01, 2.956740969548853e-18, -0e+00, 0e+00, -0e+00, -0e+00]
-hvac.VAVBox[1].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, 4.37823623418808e-01, 6.528995037078857e-01, 7.636818885803223e-01, 6.463297605514526e-01, 6.325862407684326e-01, 6.525160074234009e-01, 6.508564352989197e-01, 6.486661434173584e-01, 6.493141651153564e-01, 6.486018896102905e-01, 6.490945219993591e-01, 6.497213244438171e-01, 7.363259375035588e-19, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572733879089e-01, 6.466944217681885e-01, 6.831241846084595e-01, 6.994101405143738e-01, 6.757610440254211e-01, 6.627131104469299e-01, 6.336506605148315e-01, 7.261412739753723e-01, 8.559845089912415e-01, 2.058636443709456e-18, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972626209259e-01, 4.195817112922668e-01, 7.213320732116699e-01, 8.521605134010315e-01, 7.060028910636902e-01, 6.510182023048401e-01, 7.299324870109558e-01, 8.14709484577179e-01, 7.886786460876465e-01, 7.750988006591797e-01, 1.25852490311192e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131042480469e-01, 4.174821674823761e-01, 7.014390230178833e-01, 6.563786864280701e-01, 6.335887908935547e-01, 6.575429439544678e-01, 6.465985774993896e-01, 6.51461660861969e-01, 6.521518230438232e-01, 6.57758891582489e-01, 1.012826618584682e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 5.600224733352661e-01, 6.841338872909546e-01, 7.455272078514099e-01, 6.36896550655365e-01, 6.290444135665894e-01, 6.549288630485535e-01, 6.504205465316772e-01, 6.481796503067017e-01, 6.484959721565247e-01, 6.486781239509583e-01, 6.485869884490967e-01, 6.487030386924744e-01, 2.956742830705231e-18, -0e+00, 0e+00, -0e+00, -0e+00]
-hvac.VAVBox[2].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, 4.457856118679047e-01, 6.487954258918762e-01, 7.205406427383423e-01, 5.468145608901978e-01, 5.346783995628357e-01, 5.504704713821411e-01, 5.491836667060852e-01, 5.475029945373535e-01, 5.480055809020996e-01, 5.474544167518616e-01, 5.478362441062927e-01, 5.483191013336182e-01, 7.470954154886929e-19, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.168192744255066e-01, 5.857543349266052e-01, 6.487879157066345e-01, 8.183825612068176e-01, 7.937652468681335e-01, 7.68825888633728e-01, 7.229299545288086e-01, 8.01285445690155e-01, 8.654525279998779e-01, 2.062738225571954e-18, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972626209259e-01, 4.195817112922668e-01, 7.213320732116699e-01, 8.52422297000885e-01, 8.062042593955994e-01, 7.491652965545654e-01, 7.818188667297363e-01, 8.189293146133423e-01, 7.944256663322449e-01, 7.754309177398682e-01, 1.258572362599566e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131042480469e-01, 3.684470355510712e-01, 5.217722058296204e-01, 5.506400465965271e-01, 5.354658961296082e-01, 5.542401671409607e-01, 5.458981394767761e-01, 5.496625304222107e-01, 5.501832365989685e-01, 5.544049143791199e-01, 9.027002379251643e-19, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.893684983253479e-01, 6.881518363952637e-01, 7.354048490524292e-01, 5.388424396514893e-01, 5.3160560131073e-01, 5.523101091384888e-01, 5.488433241844177e-01, 5.471275448799133e-01, 5.473734736442566e-01, 5.47514021396637e-01, 5.474433898925781e-01, 5.47533392906189e-01, 2.495536906442868e-18, -0e+00, 0e+00, -0e+00, -0e+00]
-hvac.VAVBox[3].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, 4.598281681537628e-01, 6.610661745071411e-01, 8.522540330886841e-01, 6.70340895652771e-01, 6.329163312911987e-01, 6.525220274925232e-01, 6.508564949035645e-01, 6.486661434173584e-01, 6.493141651153564e-01, 6.486018896102905e-01, 6.490945219993591e-01, 6.516532897949219e-01, 8.112694832778405e-19, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572733879089e-01, 7.010933756828308e-01, 7.964293956756592e-01, 8.343172669410706e-01, 7.951308488845825e-01, 7.689002752304077e-01, 7.229323387145996e-01, 8.012855648994446e-01, 8.654525279998779e-01, 2.062738225571954e-18, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972626209259e-01, 4.195817112922668e-01, 7.213320732116699e-01, 8.52422297000885e-01, 8.062042593955994e-01, 7.491652965545654e-01, 7.818188667297363e-01, 8.189293146133423e-01, 7.944256663322449e-01, 7.754309177398682e-01, 1.258572362599566e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131042480469e-01, 4.174821674823761e-01, 7.009593844413757e-01, 6.628630757331848e-01, 6.336812376976013e-01, 6.575447916984558e-01, 6.465985774993896e-01, 6.51461660861969e-01, 6.521518230438232e-01, 6.57758891582489e-01, 1.060429415271037e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 6.822025775909424e-01, 1e+00, 7.467341423034668e-01, 6.551654934883118e-01, 6.292712092399597e-01, 6.549330949783325e-01, 6.50420606136322e-01, 6.481796503067017e-01, 6.484959721565247e-01, 6.486781239509583e-01, 6.485869884490967e-01, 6.487030386924744e-01, 2.956742830705231e-18, -0e+00, 0e+00, -0e+00, -0e+00]
-hvac.VAVBox[4].vav.y_actual=[1e+00, -0e+00, -0e+00, -0e+00, 3.419767022132874e-01, 6.651240587234497e-01, 7.253809571266174e-01, 5.489181876182556e-01, 5.347124338150024e-01, 5.504711270332336e-01, 5.491836667060852e-01, 5.475029945373535e-01, 5.480055809020996e-01, 5.474544167518616e-01, 5.478362441062927e-01, 5.483191013336182e-01, 7.733225209781821e-19, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572733879089e-01, 7.010933756828308e-01, 7.964293956756592e-01, 8.343172669410706e-01, 7.951308488845825e-01, 7.481330633163452e-01, 5.423763990402222e-01, 7.616379857063293e-01, 8.599242568016052e-01, 2.060327821266974e-18, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972626209259e-01, 4.195817112922668e-01, 7.213320732116699e-01, 8.52422297000885e-01, 8.062042593955994e-01, 7.491652965545654e-01, 7.818188667297363e-01, 8.189293146133423e-01, 7.944256663322449e-01, 7.754309177398682e-01, 1.258572362599566e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131042480469e-01, 4.174821674823761e-01, 7.025451064109802e-01, 6.393887400627136e-01, 5.50829291343689e-01, 5.785351395606995e-01, 5.46318531036377e-01, 5.496699810028076e-01, 5.501834154129028e-01, 5.768521428108215e-01, 1.114861208299476e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.928503632545471e-01, 6.866318583488464e-01, 7.308942675590515e-01, 5.4845130443573e-01, 5.317572951316833e-01, 5.523128509521484e-01, 5.488433241844177e-01, 5.471275448799133e-01, 5.473734736442566e-01, 5.47514021396637e-01, 5.474433898925781e-01, 5.47533392906189e-01, 2.495536906442868e-18, -0e+00, 0e+00, -0e+00, -0e+00]
-hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.780628323554993e-01, 9.047805070877075e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.905739426612854e-01, 8.37580144405365e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.905739724636078e-01, 8.374778628349304e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.919002056121826e-01, 8.471654057502747e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.818440318107605e-01, 9.145872592926025e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.939777526855469e+02, 3.02369873046875e+02, 3.041305236816406e+02, 2.898221435546875e+02, 2.880273132324219e+02, 2.85049560546875e+02, 2.846658630371094e+02, 2.839360046386719e+02, 2.84556884765625e+02, 2.849538269042969e+02, 2.906395874023438e+02, 2.987103576660156e+02, 2.847205505371094e+02, 2.847205505371094e+02, 2.847205505371094e+02, 2.847205505371094e+02, 2.847205505371094e+02, 2.847205505371094e+02, 2.847205505371094e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.034772644042969e+02, 2.844204406738281e+02, 2.844121398925781e+02, 2.850966796875e+02, 2.853752746582031e+02, 2.933919677734375e+02, 3.009380493164062e+02, 2.997149963378906e+02, 2.849938049316406e+02, 2.849938049316406e+02, 2.849938049316406e+02, 2.849938049316406e+02, 2.849938049316406e+02, 2.849938049316406e+02, 2.849938049316406e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874694824219e+02, 3.014254150390625e+02, 2.999245910644531e+02, 2.878283996582031e+02, 3.018557434082031e+02, 3.015735473632812e+02, 3.015621032714844e+02, 3.016794128417969e+02, 2.887567749023438e+02, 2.887567749023438e+02, 2.887567749023438e+02, 2.887567749023438e+02, 2.887567749023438e+02, 2.887567749023438e+02, 2.887567749023438e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040245361328125e+02, 2.982036437988281e+02, 2.892540588378906e+02, 2.8955126953125e+02, 2.900813293457031e+02, 2.899855041503906e+02, 2.936684875488281e+02, 3.016212768554688e+02, 2.918310241699219e+02, 2.918310241699219e+02, 2.918310241699219e+02, 2.918310241699219e+02, 2.918310241699219e+02, 2.918310241699219e+02, 2.918310241699219e+02, 3.021380615234375e+02, 3.040391540527344e+02, 3.031139221191406e+02, 3.041330261230469e+02, 2.902835083007812e+02, 2.906953430175781e+02, 2.910461120605469e+02, 2.911763000488281e+02, 2.91248291015625e+02, 2.911309814453125e+02, 2.910402526855469e+02, 2.906621704101562e+02, 2.893165283203125e+02, 2.887044677734375e+02, 2.887044677734375e+02, 2.887044677734375e+02, 2.887044677734375e+02, 2.887044677734375e+02]
-hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.979770812988281e+02, 3.032159729003906e+02, 3.041328125e+02, 2.898218383789062e+02, 2.880292663574219e+02, 2.850503845214844e+02, 2.905409851074219e+02, 2.860731201171875e+02, 2.845894470214844e+02, 2.923238830566406e+02, 2.930718688964844e+02, 3.027149963378906e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.0400146484375e+02, 3.041561889648438e+02, 3.033364562988281e+02, 3.008494567871094e+02, 3.009437561035156e+02, 3.011666564941406e+02, 3.010037841796875e+02, 2.998899536132812e+02, 2.996435852050781e+02, 2.849784545898438e+02, 2.849784545898438e+02, 2.849784545898438e+02, 2.849784545898438e+02, 2.849784545898438e+02, 2.849784545898438e+02, 2.849784545898438e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874694824219e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850524902344e+02, 3.011646728515625e+02, 3.015357055664062e+02, 3.015022277832031e+02, 3.016756286621094e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.042090759277344e+02, 3.01397705078125e+02, 2.973089904785156e+02, 2.963679809570312e+02, 2.94861572265625e+02, 2.925547485351562e+02, 2.919843444824219e+02, 2.934400939941406e+02, 3.022164916992188e+02, 2.946036682128906e+02, 2.946036682128906e+02, 2.946036682128906e+02, 2.946036682128906e+02, 2.946036682128906e+02, 2.946036682128906e+02, 2.946036682128906e+02, 3.021380615234375e+02, 2.990712585449219e+02, 3.06309326171875e+02, 3.041246337890625e+02, 2.908138732910156e+02, 2.906951599121094e+02, 2.910459594726562e+02, 2.911762390136719e+02, 2.912483215332031e+02, 2.911309204101562e+02, 2.910403747558594e+02, 2.906626586914062e+02, 2.918108215332031e+02, 2.921497802734375e+02, 2.921497802734375e+02, 2.921497802734375e+02, 2.921497802734375e+02, 2.921497802734375e+02]
-hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.994184265136719e+02, 3.063588562011719e+02, 3.041301879882812e+02, 2.940128784179688e+02, 2.984496154785156e+02, 2.953774719238281e+02, 2.857760314941406e+02, 2.913313293457031e+02, 2.919231872558594e+02, 2.914036254882812e+02, 2.928054809570312e+02, 3.0139013671875e+02, 2.834498901367188e+02, 2.834498901367188e+02, 2.834498901367188e+02, 2.834498901367188e+02, 2.834498901367188e+02, 2.834498901367188e+02, 2.834498901367188e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.024454345703125e+02, 3.009279479980469e+02, 3.007083740234375e+02, 3.009293518066406e+02, 3.011657409667969e+02, 3.010037536621094e+02, 2.998899230957031e+02, 2.996435852050781e+02, 2.849784240722656e+02, 2.849784240722656e+02, 2.849784240722656e+02, 2.849784240722656e+02, 2.849784240722656e+02, 2.849784240722656e+02, 2.849784240722656e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874694824219e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850524902344e+02, 3.011646728515625e+02, 3.015357055664062e+02, 3.015022277832031e+02, 3.016756286621094e+02, 2.887563781738281e+02, 2.887563781738281e+02, 2.887563781738281e+02, 2.887563781738281e+02, 2.887563781738281e+02, 2.887563781738281e+02, 2.887563781738281e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.04031982421875e+02, 3.004049377441406e+02, 2.976578063964844e+02, 2.961563110351562e+02, 2.933425903320312e+02, 2.922735290527344e+02, 2.933740234375e+02, 3.023710632324219e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 3.021380615234375e+02, 3.039776306152344e+02, 3.041679077148438e+02, 3.041339721679688e+02, 2.976820983886719e+02, 2.9171044921875e+02, 2.910461120605469e+02, 2.911763000488281e+02, 2.91248291015625e+02, 2.911309814453125e+02, 2.910402526855469e+02, 2.906621704101562e+02, 2.923590393066406e+02, 2.906270446777344e+02, 2.906270446777344e+02, 2.906270446777344e+02, 2.906270446777344e+02, 2.906270446777344e+02]
-hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.938185729980469e+02, 3.07079345703125e+02, 3.041307983398438e+02, 2.941302185058594e+02, 2.880292663574219e+02, 2.903792724609375e+02, 2.9534326171875e+02, 2.91975830078125e+02, 2.913074951171875e+02, 2.914462280273438e+02, 2.933479614257812e+02, 3.036053466796875e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.024454345703125e+02, 3.009279479980469e+02, 3.007083740234375e+02, 3.009293518066406e+02, 3.014312133789062e+02, 3.0152587890625e+02, 3.003865966796875e+02, 2.996847534179688e+02, 2.849874267578125e+02, 2.849874267578125e+02, 2.849874267578125e+02, 2.849874267578125e+02, 2.849874267578125e+02, 2.849874267578125e+02, 2.849874267578125e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874694824219e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850524902344e+02, 3.011646728515625e+02, 3.015357055664062e+02, 3.015022277832031e+02, 3.016756286621094e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 2.887564086914062e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040082092285156e+02, 3.037248840332031e+02, 3.0413818359375e+02, 3.02245849609375e+02, 2.994471435546875e+02, 2.941201171875e+02, 2.994630126953125e+02, 3.035614624023438e+02, 2.916310424804688e+02, 2.916310424804688e+02, 2.916310424804688e+02, 2.916310424804688e+02, 2.916310424804688e+02, 2.916310424804688e+02, 2.916310424804688e+02, 3.021380615234375e+02, 3.059590148925781e+02, 3.063291931152344e+02, 3.041251831054688e+02, 2.932261047363281e+02, 2.931423034667969e+02, 2.910459594726562e+02, 2.911762390136719e+02, 2.912483215332031e+02, 2.911309204101562e+02, 2.910403747558594e+02, 2.906626586914062e+02, 2.917066040039062e+02, 2.919818115234375e+02, 2.919818115234375e+02, 2.919818115234375e+02, 2.919818115234375e+02, 2.919818115234375e+02]
-hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.937674560546875e+02, 2.95746826171875e+02, 2.920342102050781e+02, 2.898221435546875e+02, 2.880273132324219e+02, 2.85049560546875e+02, 2.846658630371094e+02, 2.839360046386719e+02, 2.84556884765625e+02, 2.849538269042969e+02, 2.843458557128906e+02, 2.891216125488281e+02, 2.846187744140625e+02, 2.846187744140625e+02, 2.846187744140625e+02, 2.846187744140625e+02, 2.846187744140625e+02, 2.846187744140625e+02, 2.846187744140625e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039420166015625e+02, 3.024455261230469e+02, 3.009279479980469e+02, 3.007301635742188e+02, 3.009313659667969e+02, 3.011658630371094e+02, 3.011449279785156e+02, 2.998943176269531e+02, 2.996440124511719e+02, 2.849785766601562e+02, 2.849785766601562e+02, 2.849785766601562e+02, 2.849785766601562e+02, 2.849785766601562e+02, 2.849785766601562e+02, 2.849785766601562e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874694824219e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850524902344e+02, 3.011646728515625e+02, 3.015357055664062e+02, 3.015022277832031e+02, 3.016756286621094e+02, 2.887564392089844e+02, 2.887564392089844e+02, 2.887564392089844e+02, 2.887564392089844e+02, 2.887564392089844e+02, 2.887564392089844e+02, 2.887564392089844e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.041494140625e+02, 3.042025756835938e+02, 2.893543701171875e+02, 2.882271423339844e+02, 2.892540588378906e+02, 2.8955126953125e+02, 2.900813293457031e+02, 2.899855041503906e+02, 2.892330932617188e+02, 2.889882202148438e+02, 2.895493469238281e+02, 2.895493469238281e+02, 2.895493469238281e+02, 2.895493469238281e+02, 2.895493469238281e+02, 2.895493469238281e+02, 2.895493469238281e+02, 3.021749267578125e+02, 3.034710998535156e+02, 3.046830749511719e+02, 2.969326171875e+02, 2.902834777832031e+02, 2.906953430175781e+02, 2.910461120605469e+02, 2.911763000488281e+02, 2.91248291015625e+02, 2.911309814453125e+02, 2.910402526855469e+02, 2.906621704101562e+02, 2.893165283203125e+02, 2.877333068847656e+02, 2.877333068847656e+02, 2.877333068847656e+02, 2.877333068847656e+02, 2.877333068847656e+02]
-hvac.res.EFan=[0e+00, -6.744214147147432e-07, -6.744214147147432e-07, -6.744214147147432e-07, 3.45579541015625e+03, 7.42546533203125e+03, 1.12897890625e+04, 1.5144064453125e+04, 1.8998888671875e+04, 2.28569140625e+04, 2.671394921875e+04, 3.057071875e+04, 3.442762109375e+04, 3.828451953125e+04, 4.2141453125e+04, 4.599840625e+04, 4.921791796875e+04, 4.921791796875e+04, 4.921791796875e+04, 4.921791796875e+04, 4.921791796875e+04, 4.921791796875e+04, 4.921791796875e+04, 5.12398046875e+04, 7.01381875e+04, 8.96878828125e+04, 1.03738265625e+05, 1.107933828125e+05, 1.14812640625e+05, 1.1867659375e+05, 1.225660546875e+05, 1.264943515625e+05, 1.304260625e+05, 1.3432934375e+05, 1.382009375e+05, 1.42110625e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.47467671875e+05, 1.6636759375e+05, 1.85917203125e+05, 1.9996759375e+05, 2.07022875e+05, 2.1104996875e+05, 2.14944203125e+05, 2.18905515625e+05, 2.22861875e+05, 2.26778234375e+05, 2.30709765625e+05, 2.346775e+05, 2.38652140625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.43999453125e+05, 2.6289709375e+05, 2.824471875e+05, 2.96481375e+05, 3.03523625e+05, 3.074980625e+05, 3.113515625e+05, 3.15205875e+05, 3.19061875e+05, 3.22917625e+05, 3.2677459375e+05, 3.306315625e+05, 3.344876875e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.37706625e+05, 3.39687875e+05, 3.4941621875e+05, 3.5342215625e+05, 3.573028125e+05, 3.6116734375e+05, 3.650226875e+05, 3.6888121875e+05, 3.7273821875e+05, 3.76595e+05, 3.8045196875e+05, 3.8430890625e+05, 3.8816584375e+05, 3.9202278125e+05, 3.95243375e+05, 3.95243375e+05, 3.95243375e+05, 3.95243375e+05, 3.95243375e+05]
-hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 5.43442890625e+04, 1.020912578125e+05, 1.46367859375e+05, 1.97171328125e+05, 2.3601109375e+05, 2.794003125e+05, 3.2686503125e+05, 3.82251e+05, 4.3194784375e+05, 4.78155875e+05, 5.285825625e+05, 6.131089375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.55299375e+05, 9.23369625e+05, 1.09144125e+06, 1.210680375e+06, 1.314169625e+06, 1.42673e+06, 1.5427585e+06, 1.660049375e+06, 1.77819125e+06, 1.89396375e+06, 2.00840025e+06, 2.1351975e+06, 2.279268e+06, 2.4012445e+06, 2.4012445e+06, 2.4012445e+06, 2.4012445e+06, 2.4012445e+06, 2.4012445e+06, 2.4012445e+06, 2.44607925e+06, 2.61769675e+06, 2.78880525e+06, 2.9104905e+06, 3.0167395e+06, 3.1320375e+06, 3.25895825e+06, 3.39205875e+06, 3.5179985e+06, 3.6472295e+06, 3.778685e+06, 3.90935425e+06, 4.03974875e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.18610625e+06, 4.342601e+06, 4.4968885e+06, 4.5934045e+06, 4.6753985e+06, 4.753467e+06, 4.8322115e+06, 4.889204e+06, 4.943527e+06, 4.98514e+06, 5.020652e+06, 5.0602835e+06, 5.1252195e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.2265005e+06, 5.3198875e+06, 5.395095e+06, 5.450812e+06, 5.5063165e+06, 5.5275595e+06, 5.5512655e+06, 5.57598e+06, 5.6004255e+06, 5.6245585e+06, 5.649208e+06, 5.6764375e+06, 5.7073955e+06, 5.747308e+06, 5.747308e+06, 5.747308e+06, 5.747308e+06, 5.747308e+06]
+hvac.fanSup.y=[0e+00, 0e+00, 0e+00, 0e+00, 5.946383476257324e-01, 2.816884219646454e-01, 3.092013001441956e-01, 3.312536776065826e-01, 2.999972105026245e-01, 2.998454570770264e-01, 3.02069216966629e-01, 3.019421100616455e-01, 3.016010522842407e-01, 3.017100989818573e-01, 3.015052676200867e-01, 3.017158508300781e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.609788775444031e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.661270618438721e-01, 3.471058309078217e-01, 3.586971163749695e-01, 3.828596174716949e-01, 3.931705355644226e-01, 3.884980082511902e-01, 3.650533258914948e-01, 3.641264736652374e-01, 3.966064751148224e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.613938450813293e-01, 1e+00, 1e+00, 8.93288791179657e-01, 5.662902593612671e-01, 3.586054742336273e-01, 3.892601430416107e-01, 4.056278467178345e-01, 3.90869528055191e-01, 3.84130597114563e-01, 3.978137373924255e-01, 4.050892889499664e-01, 4.028278887271881e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.606788277626038e-01, 1e+00, 1e+00, 8.932546973228455e-01, 5.59110164642334e-01, 3.216738104820251e-01, 3.30516129732132e-01, 3.025928139686584e-01, 3.077056705951691e-01, 3.025961816310883e-01, 3.012721836566925e-01, 3.018129765987396e-01, 3.072161674499512e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.594306468963623e-01, 4.586228430271149e-01, 4.091500043869019e-01, 3.419486582279205e-01, 3.441176116466522e-01, 2.982200980186462e-01, 2.994309961795807e-01, 3.02238404750824e-01, 3.017037808895111e-01, 3.015328347682953e-01, 3.015599846839905e-01, 3.015967607498169e-01, 3.015550673007965e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[5].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 2.045792043209076e-01, 1.146090552210808e-01, 7.210944294929504e-01, 6.44173800945282e-01, 6.325564980506897e-01, 6.525150537490845e-01, 6.508559584617615e-01, 6.48665726184845e-01, 6.49313747882843e-01, 6.486014723777771e-01, 6.490941047668457e-01, 6.497207880020142e-01, 1.015614734236868e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.190038740634918e-01, 7.010887861251831e-01, 7.964290976524353e-01, 8.317244648933411e-01, 7.949370145797729e-01, 7.688897252082825e-01, 7.141739726066589e-01, 8.008921146392822e-01, 8.653936386108398e-01, 9.62944835913167e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524203896522522e-01, 8.062034249305725e-01, 7.491657137870789e-01, 7.818189859390259e-01, 8.189291954040527e-01, 7.94425904750824e-01, 7.754308581352234e-01, 1.052987995082933e-18, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.066527247428894e-01, 3.825662136077881e-01, 6.211256384849548e-01, 6.531075835227966e-01, 6.335420608520508e-01, 6.575415730476379e-01, 6.465981602668762e-01, 6.514613032341003e-01, 6.521514058113098e-01, 6.577584743499756e-01, 1.143389013265205e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 9.812425971031189e-01, 4.380466043949127e-01, 5.858635902404785e-01, 6.577554941177368e-01, 6.240773797035217e-01, 6.288853883743286e-01, 6.549253463745117e-01, 6.50420069694519e-01, 6.48179292678833e-01, 6.484955549240112e-01, 6.486777067184448e-01, 6.48586630821228e-01, 6.487026214599609e-01, 5.776724168424313e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.378266930580139e-01, 6.529014706611633e-01, 7.636803388595581e-01, 6.463295817375183e-01, 6.325863599777222e-01, 6.525160074234009e-01, 6.508563756942749e-01, 6.486661434173584e-01, 6.493141651153564e-01, 6.486018896102905e-01, 6.490945219993591e-01, 6.497212052345276e-01, 1.073681779262325e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572435855865e-01, 6.466933488845825e-01, 6.831241250038147e-01, 6.99410080909729e-01, 6.757610440254211e-01, 6.627131104469299e-01, 6.336506605148315e-01, 7.261414527893066e-01, 8.559839725494385e-01, 9.610421137091419e-19, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.521586060523987e-01, 7.060020565986633e-01, 6.51018500328064e-01, 7.299326062202454e-01, 8.147094249725342e-01, 7.886790633201599e-01, 7.750987410545349e-01, 1.052948187015954e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 4.174821972846985e-01, 7.014384865760803e-01, 6.563785076141357e-01, 6.335889101028442e-01, 6.57542884349823e-01, 6.465985774993896e-01, 6.51461660861969e-01, 6.521518230438232e-01, 6.57758891582489e-01, 1.143389737048241e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 5.600224733352661e-01, 6.841458082199097e-01, 7.455188632011414e-01, 6.368951797485352e-01, 6.290448307991028e-01, 6.549287438392639e-01, 6.504205465316772e-01, 6.481796503067017e-01, 6.484959721565247e-01, 6.486781239509583e-01, 6.485869884490967e-01, 6.487030386924744e-01, 5.77672789073707e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[2].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.457857012748718e-01, 6.48798406124115e-01, 7.205387949943542e-01, 5.468144416809082e-01, 5.346785187721252e-01, 5.504704713821411e-01, 5.491836667060852e-01, 5.475029945373535e-01, 5.480055809020996e-01, 5.474544167518616e-01, 5.478362441062927e-01, 5.483190417289734e-01, 1.089385389601338e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.168193638324738e-01, 5.857542753219604e-01, 6.487879753112793e-01, 8.183825016021729e-01, 7.937651872634888e-01, 7.68825888633728e-01, 7.229300141334534e-01, 8.012853860855103e-01, 8.654520511627197e-01, 9.62956830032049e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524203896522522e-01, 8.062034249305725e-01, 7.491657137870789e-01, 7.818189859390259e-01, 8.189291954040527e-01, 7.94425904750824e-01, 7.754308581352234e-01, 1.052987995082933e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 3.684473931789398e-01, 5.217719078063965e-01, 5.506399273872375e-01, 5.354659557342529e-01, 5.542401671409607e-01, 5.458981394767761e-01, 5.496625304222107e-01, 5.501832365989685e-01, 5.544049143791199e-01, 1.019067282716088e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.893685281276703e-01, 6.881637573242188e-01, 7.353959679603577e-01, 5.388416647911072e-01, 5.316059589385986e-01, 5.523099899291992e-01, 5.488433241844177e-01, 5.471275448799133e-01, 5.473734736442566e-01, 5.47514021396637e-01, 5.474433898925781e-01, 5.47533392906189e-01, 4.875648203029473e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[3].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 4.598281681537628e-01, 6.610671877861023e-01, 8.522526621818542e-01, 6.703404784202576e-01, 6.329164505004883e-01, 6.525219678878784e-01, 6.508564949035645e-01, 6.486661434173584e-01, 6.493141651153564e-01, 6.486018896102905e-01, 6.490945219993591e-01, 6.516520977020264e-01, 1.182962367745507e-18, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572435855865e-01, 7.010931372642517e-01, 7.964293360710144e-01, 8.343172073364258e-01, 7.951307892799377e-01, 7.689002752304077e-01, 7.229323983192444e-01, 8.012855052947998e-01, 8.654520511627197e-01, 9.62956830032049e-19, -0e+00, 0e+00, 0e+00, 0e+00, -0e+00, -0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524203896522522e-01, 8.062034249305725e-01, 7.491657137870789e-01, 7.818189859390259e-01, 8.189291954040527e-01, 7.94425904750824e-01, 7.754308581352234e-01, 1.052987995082933e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 4.174821972846985e-01, 7.00958788394928e-01, 6.628628373146057e-01, 6.336813569068909e-01, 6.57544732093811e-01, 6.465985774993896e-01, 6.51461660861969e-01, 6.521518230438232e-01, 6.57758891582489e-01, 1.197128869711244e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 6.822028160095215e-01, 1e+00, 7.467259168624878e-01, 6.551638841629028e-01, 6.292716264724731e-01, 6.54932975769043e-01, 6.50420606136322e-01, 6.481796503067017e-01, 6.484959721565247e-01, 6.486781239509583e-01, 6.485869884490967e-01, 6.487030386924744e-01, 5.77672789073707e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.VAVBox[4].vav.y_actual=[1e+00, 0e+00, -0e+00, -0e+00, 3.419763147830963e-01, 6.651250720024109e-01, 7.253794074058533e-01, 5.489181280136108e-01, 5.347124934196472e-01, 5.504711270332336e-01, 5.491836667060852e-01, 5.475029945373535e-01, 5.480055809020996e-01, 5.474544167518616e-01, 5.478362441062927e-01, 5.483190417289734e-01, 1.127629775029998e-18, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.06595116853714e-01, 4.195572435855865e-01, 7.010931372642517e-01, 7.964293360710144e-01, 8.343172073364258e-01, 7.951307892799377e-01, 7.4813312292099e-01, 5.423764586448669e-01, 7.616377472877502e-01, 8.599236607551575e-01, 9.618316576038237e-19, -0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.065972924232483e-01, 4.195817112922668e-01, 7.213304042816162e-01, 8.524203896522522e-01, 8.062034249305725e-01, 7.491657137870789e-01, 7.818189859390259e-01, 8.189291954040527e-01, 7.94425904750824e-01, 7.754308581352234e-01, 1.052987995082933e-18, 0e+00, 0e+00, -0e+00, -0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 3.067131340503693e-01, 4.174821972846985e-01, 7.025445699691772e-01, 6.393885016441345e-01, 5.508294701576233e-01, 5.785350799560547e-01, 5.46318531036377e-01, 5.496699810028076e-01, 5.501834154129028e-01, 5.768521428108215e-01, 1.258577222285664e-18, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, -0e+00, 1e+00, 4.928503930568695e-01, 6.866438984870911e-01, 7.308854460716248e-01, 5.484507083892822e-01, 5.31757652759552e-01, 5.523127317428589e-01, 5.488433837890625e-01, 5.471275448799133e-01, 5.473734736442566e-01, 5.47514021396637e-01, 5.474433898925781e-01, 5.47533392906189e-01, 4.875648203029473e-18, 0e+00, -0e+00, 0e+00, 0e+00]
+hvac.damOut.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.780627727508545e-01, 9.047807455062866e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.90573912858963e-01, 8.375798463821411e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.905739724636078e-01, 8.374778032302856e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.919001460075378e-01, 8.471653461456299e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.81820547580719e-01, 9.145769476890564e-01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.VAVBox[1].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.939783020019531e+02, 3.023703308105469e+02, 3.041305541992188e+02, 2.898221435546875e+02, 2.880273132324219e+02, 2.85049560546875e+02, 2.846658630371094e+02, 2.839360046386719e+02, 2.84556884765625e+02, 2.849538269042969e+02, 2.906395874023438e+02, 2.98710205078125e+02, 2.847205810546875e+02, 2.847205810546875e+02, 2.847205810546875e+02, 2.847205810546875e+02, 2.847205810546875e+02, 2.847205810546875e+02, 2.847205810546875e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.03477294921875e+02, 2.844202270507812e+02, 2.844121398925781e+02, 2.850966796875e+02, 2.853752746582031e+02, 2.933919677734375e+02, 3.009380493164062e+02, 2.997149963378906e+02, 2.849940490722656e+02, 2.849940490722656e+02, 2.849940490722656e+02, 2.849940490722656e+02, 2.849940490722656e+02, 2.849940490722656e+02, 2.849940490722656e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874389648438e+02, 3.014254150390625e+02, 2.99924560546875e+02, 2.878278198242188e+02, 3.018557434082031e+02, 3.015735473632812e+02, 3.015621032714844e+02, 3.016794128417969e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 2.887569274902344e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040245361328125e+02, 2.982036437988281e+02, 2.892540588378906e+02, 2.8955126953125e+02, 2.900813293457031e+02, 2.899855041503906e+02, 2.936684875488281e+02, 3.016212768554688e+02, 2.918310546875e+02, 2.918310546875e+02, 2.918310546875e+02, 2.918310546875e+02, 2.918310546875e+02, 2.918310546875e+02, 2.918310546875e+02, 3.021380615234375e+02, 3.040391540527344e+02, 3.031141967773438e+02, 3.041330261230469e+02, 2.902834777832031e+02, 2.906953125e+02, 2.910460815429688e+02, 2.9117626953125e+02, 2.91248291015625e+02, 2.911309814453125e+02, 2.910402526855469e+02, 2.906621704101562e+02, 2.893165283203125e+02, 2.887045288085938e+02, 2.887045288085938e+02, 2.887045288085938e+02, 2.887045288085938e+02, 2.887045288085938e+02]
+hvac.VAVBox[2].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.979771118164062e+02, 3.032165832519531e+02, 3.041328125e+02, 2.898218383789062e+02, 2.880292663574219e+02, 2.850503845214844e+02, 2.905409851074219e+02, 2.860731506347656e+02, 2.845889282226562e+02, 2.923238830566406e+02, 2.930718688964844e+02, 3.027149047851562e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.844920654296875e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.0400146484375e+02, 3.041561889648438e+02, 3.033364562988281e+02, 3.008494567871094e+02, 3.009437561035156e+02, 3.011666564941406e+02, 3.010037841796875e+02, 2.998899536132812e+02, 2.996435852050781e+02, 2.849786987304688e+02, 2.849786987304688e+02, 2.849786987304688e+02, 2.849786987304688e+02, 2.849786987304688e+02, 2.849786987304688e+02, 2.849786987304688e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.042090759277344e+02, 3.01397705078125e+02, 2.973089904785156e+02, 2.963679809570312e+02, 2.94861572265625e+02, 2.925547485351562e+02, 2.919843444824219e+02, 2.934400939941406e+02, 3.022164916992188e+02, 2.946036071777344e+02, 2.946036071777344e+02, 2.946036071777344e+02, 2.946036071777344e+02, 2.946036071777344e+02, 2.946036071777344e+02, 2.946036071777344e+02, 3.021380615234375e+02, 2.990712280273438e+02, 3.063093566894531e+02, 3.041246337890625e+02, 2.908138427734375e+02, 2.906951599121094e+02, 2.910459594726562e+02, 2.911762390136719e+02, 2.912483215332031e+02, 2.911309204101562e+02, 2.910403747558594e+02, 2.906626586914062e+02, 2.918108215332031e+02, 2.921498718261719e+02, 2.921498718261719e+02, 2.921498718261719e+02, 2.921498718261719e+02, 2.921498718261719e+02]
+hvac.VAVBox[3].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.9941845703125e+02, 3.0635888671875e+02, 3.041301879882812e+02, 2.940128784179688e+02, 2.984496154785156e+02, 2.953775024414062e+02, 2.857759399414062e+02, 2.913313293457031e+02, 2.919232177734375e+02, 2.914036254882812e+02, 2.928054809570312e+02, 3.013901672363281e+02, 2.834499206542969e+02, 2.834499206542969e+02, 2.834499206542969e+02, 2.834499206542969e+02, 2.834499206542969e+02, 2.834499206542969e+02, 2.834499206542969e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.024454345703125e+02, 3.009279479980469e+02, 3.007083740234375e+02, 3.009293518066406e+02, 3.011657409667969e+02, 3.010037536621094e+02, 2.998899230957031e+02, 2.996435852050781e+02, 2.849786682128906e+02, 2.849786682128906e+02, 2.849786682128906e+02, 2.849786682128906e+02, 2.849786682128906e+02, 2.849786682128906e+02, 2.849786682128906e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 2.887565307617188e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.04031982421875e+02, 3.004049377441406e+02, 2.976578369140625e+02, 2.961563110351562e+02, 2.933425903320312e+02, 2.922735595703125e+02, 2.933740234375e+02, 3.0237109375e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 2.922453002929688e+02, 3.021380615234375e+02, 3.039776306152344e+02, 3.041679382324219e+02, 3.041339721679688e+02, 2.976820983886719e+02, 2.917104797363281e+02, 2.910460815429688e+02, 2.9117626953125e+02, 2.91248291015625e+02, 2.911309814453125e+02, 2.910402526855469e+02, 2.906621704101562e+02, 2.923590393066406e+02, 2.906272277832031e+02, 2.906272277832031e+02, 2.906272277832031e+02, 2.906272277832031e+02, 2.906272277832031e+02]
+hvac.VAVBox[4].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.938185119628906e+02, 3.070793762207031e+02, 3.041307983398438e+02, 2.941302185058594e+02, 2.880292663574219e+02, 2.903792419433594e+02, 2.953432922363281e+02, 2.91975830078125e+02, 2.913075256347656e+02, 2.914462280273438e+02, 2.933479614257812e+02, 3.036052551269531e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.840018005371094e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039268493652344e+02, 3.024454345703125e+02, 3.009279479980469e+02, 3.007083740234375e+02, 3.009293518066406e+02, 3.014312133789062e+02, 3.015259094238281e+02, 3.003865966796875e+02, 2.996847534179688e+02, 2.849876708984375e+02, 2.849876708984375e+02, 2.849876708984375e+02, 2.849876708984375e+02, 2.849876708984375e+02, 2.849876708984375e+02, 2.849876708984375e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 2.887565612792969e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.04149658203125e+02, 3.040452575683594e+02, 3.040082092285156e+02, 3.037248840332031e+02, 3.0413818359375e+02, 3.022458801269531e+02, 2.994471435546875e+02, 2.941201477050781e+02, 2.994630126953125e+02, 3.035614929199219e+02, 2.91631103515625e+02, 2.91631103515625e+02, 2.91631103515625e+02, 2.91631103515625e+02, 2.91631103515625e+02, 2.91631103515625e+02, 2.91631103515625e+02, 3.021380615234375e+02, 3.05958984375e+02, 3.063292236328125e+02, 3.041251831054688e+02, 2.932260437011719e+02, 2.931423034667969e+02, 2.910459594726562e+02, 2.911762390136719e+02, 2.912483215332031e+02, 2.911309204101562e+02, 2.910403747558594e+02, 2.906626586914062e+02, 2.917066040039062e+02, 2.919819030761719e+02, 2.919819030761719e+02, 2.919819030761719e+02, 2.919819030761719e+02, 2.919819030761719e+02]
+hvac.VAVBox[5].TSup=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.937674560546875e+02, 2.95746826171875e+02, 2.920342102050781e+02, 2.898221435546875e+02, 2.880273132324219e+02, 2.85049560546875e+02, 2.846658630371094e+02, 2.839360046386719e+02, 2.84556884765625e+02, 2.849538269042969e+02, 2.843458557128906e+02, 2.891217651367188e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.846188049316406e+02, 2.992807922363281e+02, 2.977381591796875e+02, 2.976910095214844e+02, 3.041517944335938e+02, 3.039420166015625e+02, 3.024455261230469e+02, 3.009279479980469e+02, 3.007301635742188e+02, 3.009313659667969e+02, 3.011658630371094e+02, 3.011449279785156e+02, 2.998943176269531e+02, 2.996440124511719e+02, 2.849788208007812e+02, 2.849788208007812e+02, 2.849788208007812e+02, 2.849788208007812e+02, 2.849788208007812e+02, 2.849788208007812e+02, 2.849788208007812e+02, 2.988273010253906e+02, 2.972947387695312e+02, 2.974202575683594e+02, 3.04152099609375e+02, 3.036708068847656e+02, 3.026874389648438e+02, 3.014235534667969e+02, 3.009118041992188e+02, 3.010850219726562e+02, 3.011646423339844e+02, 3.015357055664062e+02, 3.015022583007812e+02, 3.016756286621094e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 2.887566223144531e+02, 3.004101867675781e+02, 2.992807922363281e+02, 2.995442810058594e+02, 3.041494140625e+02, 3.042025756835938e+02, 2.893544006347656e+02, 2.882271423339844e+02, 2.892540588378906e+02, 2.8955126953125e+02, 2.900813293457031e+02, 2.899855041503906e+02, 2.892330932617188e+02, 2.889882202148438e+02, 2.895494689941406e+02, 2.895494689941406e+02, 2.895494689941406e+02, 2.895494689941406e+02, 2.895494689941406e+02, 2.895494689941406e+02, 2.895494689941406e+02, 3.021749267578125e+02, 3.034711608886719e+02, 3.046857299804688e+02, 2.969324951171875e+02, 2.90283447265625e+02, 2.906953125e+02, 2.910460815429688e+02, 2.9117626953125e+02, 2.91248291015625e+02, 2.911309814453125e+02, 2.910402526855469e+02, 2.906621704101562e+02, 2.893165283203125e+02, 2.877333374023438e+02, 2.877333374023438e+02, 2.877333374023438e+02, 2.877333374023438e+02, 2.877333374023438e+02]
+hvac.res.EFan=[0e+00, -7.024062824712018e-07, -7.024062824712018e-07, -7.024062824712018e-07, 3.45579638671875e+03, 7.4254658203125e+03, 1.12897900390625e+04, 1.51440654296875e+04, 1.8998888671875e+04, 2.28569140625e+04, 2.671394921875e+04, 3.0570720703125e+04, 3.4427625e+04, 3.828451953125e+04, 4.2141453125e+04, 4.599840625e+04, 4.9217921875e+04, 4.9217921875e+04, 4.9217921875e+04, 4.9217921875e+04, 4.9217921875e+04, 4.9217921875e+04, 4.9217921875e+04, 5.123980859375e+04, 7.0138203125e+04, 8.96878984375e+04, 1.0373828125e+05, 1.10793390625e+05, 1.148126484375e+05, 1.1867659375e+05, 1.225660625e+05, 1.264943515625e+05, 1.304260625e+05, 1.34329359375e+05, 1.382009375e+05, 1.42110625e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.4543378125e+05, 1.474676875e+05, 1.66367609375e+05, 1.85917203125e+05, 1.9996759375e+05, 2.07022890625e+05, 2.1104996875e+05, 2.14944203125e+05, 2.18905515625e+05, 2.22861875e+05, 2.26778234375e+05, 2.30709765625e+05, 2.34677484375e+05, 2.38652140625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.41963515625e+05, 2.43999453125e+05, 2.628970625e+05, 2.8244715625e+05, 2.96481375e+05, 3.03523625e+05, 3.074980625e+05, 3.113515625e+05, 3.1520584375e+05, 3.1906184375e+05, 3.2291759375e+05, 3.2677459375e+05, 3.3063153125e+05, 3.3448765625e+05, 3.3770659375e+05, 3.3770659375e+05, 3.3770659375e+05, 3.3770659375e+05, 3.3770659375e+05, 3.3770659375e+05, 3.3770659375e+05, 3.3968784375e+05, 3.494161875e+05, 3.5342215625e+05, 3.573028125e+05, 3.6116734375e+05, 3.650226875e+05, 3.6888121875e+05, 3.7273821875e+05, 3.76595e+05, 3.804519375e+05, 3.8430890625e+05, 3.8816584375e+05, 3.9202278125e+05, 3.95243375e+05, 3.95243375e+05, 3.95243375e+05, 3.95243375e+05, 3.95243375e+05]
+hvac.res.EHea=[0e+00, 0e+00, 0e+00, 0e+00, 5.4344296875e+04, 1.020912265625e+05, 1.46367890625e+05, 1.971713125e+05, 2.3601109375e+05, 2.7940034375e+05, 3.2686509375e+05, 3.822510625e+05, 4.3194790625e+05, 4.7815590625e+05, 5.285825625e+05, 6.131089375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.117704375e+05, 7.55299375e+05, 9.233696875e+05, 1.09144125e+06, 1.2106805e+06, 1.314169625e+06, 1.42673e+06, 1.5427585e+06, 1.660049375e+06, 1.77819125e+06, 1.89396375e+06, 2.00840025e+06, 2.1351975e+06, 2.279268e+06, 2.40124475e+06, 2.40124475e+06, 2.40124475e+06, 2.40124475e+06, 2.40124475e+06, 2.40124475e+06, 2.40124475e+06, 2.44607925e+06, 2.61769675e+06, 2.78880525e+06, 2.9104905e+06, 3.0167395e+06, 3.13203775e+06, 3.25895825e+06, 3.39205875e+06, 3.5179985e+06, 3.64722975e+06, 3.77868525e+06, 3.90935425e+06, 4.039749e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.147617e+06, 4.1861065e+06, 4.342601e+06, 4.4968885e+06, 4.5934045e+06, 4.6753985e+06, 4.7534675e+06, 4.8322115e+06, 4.889204e+06, 4.943527e+06, 4.9851405e+06, 5.0206525e+06, 5.060284e+06, 5.12522e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.1924665e+06, 5.2265005e+06, 5.3198875e+06, 5.3950955e+06, 5.450813e+06, 5.506316e+06, 5.527559e+06, 5.551264e+06, 5.5759785e+06, 5.600424e+06, 5.624557e+06, 5.6492065e+06, 5.6764365e+06, 5.707394e+06, 5.7473065e+06, 5.7473065e+06, 5.7473065e+06, 5.7473065e+06, 5.7473065e+06]
 hvac.res.ECoo=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSpring.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSpring.txt
index e6d0c17b88d..d1649841988 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSpring.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSpring.txt
@@ -1,35 +1,29 @@
-last-generated=2024-03-22
-statistics-initialization=
-{
-  "linear": "0, 0, 0, 0",
-  "nonlinear": "0, 0, 0, 0",
-  "numerical Jacobians": "0"
-}
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "0, 0, 0, 0",
-  "number of continuous time states": "30",
+  "number of continuous time states": "36",
   "numerical Jacobians": "0"
 }
 time=[7.344e+06, 7.776e+06]
-flo.TAirCor=[2.751499938964844e+02, 2.943737487792969e+02, 2.942283325195312e+02, 2.941929626464844e+02, 2.941863098144531e+02, 2.94050537109375e+02, 2.954223937988281e+02, 2.961046142578125e+02, 2.965856018066406e+02, 2.969960021972656e+02, 2.973057556152344e+02, 2.979960632324219e+02, 2.983598937988281e+02, 2.985502014160156e+02, 2.975053100585938e+02, 2.967086181640625e+02, 2.961927795410156e+02, 2.958807373046875e+02, 2.956991271972656e+02, 2.953933410644531e+02, 2.951892395019531e+02, 2.950516967773438e+02, 2.947527770996094e+02, 2.944844665527344e+02, 2.941231384277344e+02, 2.939104309082031e+02, 2.9540185546875e+02, 2.961809692382812e+02, 2.963902893066406e+02, 2.967417907714844e+02, 2.965982971191406e+02, 2.969089050292969e+02, 2.968213806152344e+02, 2.970149536132812e+02, 2.958980407714844e+02, 2.951802062988281e+02, 2.948484191894531e+02, 2.945535583496094e+02, 2.942899780273438e+02, 2.940689697265625e+02, 2.938534851074219e+02, 2.937543640136719e+02, 2.936038818359375e+02, 2.935363464355469e+02, 2.935205078125e+02, 2.935205688476562e+02, 2.945307312011719e+02, 2.954177551269531e+02, 2.959397583007812e+02, 2.963749694824219e+02, 2.963789978027344e+02, 2.969607238769531e+02, 2.971228637695312e+02, 2.96927978515625e+02, 2.954364624023438e+02, 2.946625061035156e+02, 2.941956787109375e+02, 2.9377294921875e+02, 2.936427612304688e+02, 2.936019287109375e+02, 2.935647277832031e+02, 2.935371704101562e+02, 2.935144958496094e+02, 2.934921875e+02, 2.934813232421875e+02, 2.934842224121094e+02, 2.939032592773438e+02, 2.944822387695312e+02, 2.947501525878906e+02, 2.947278137207031e+02, 2.945444030761719e+02, 2.947995910644531e+02, 2.948988342285156e+02, 2.946549072265625e+02, 2.939998474121094e+02, 2.936286926269531e+02, 2.935691833496094e+02, 2.93541748046875e+02, 2.935110778808594e+02, 2.934812316894531e+02, 2.934485473632812e+02, 2.934265441894531e+02, 2.933917236328125e+02, 2.933343811035156e+02, 2.933815307617188e+02, 2.933943176269531e+02, 2.938339538574219e+02, 2.942001037597656e+02, 2.944805297851562e+02, 2.9475341796875e+02, 2.946277465820312e+02, 2.949045104980469e+02, 2.946163940429688e+02, 2.944511413574219e+02, 2.937329406738281e+02, 2.935857543945312e+02, 2.935351257324219e+02, 2.935135192871094e+02, 2.934544067382812e+02, 2.934520263671875e+02, 2.933776245117188e+02]
-flo.TAirSou=[2.751499938964844e+02, 2.93819091796875e+02, 2.936720275878906e+02, 2.936803283691406e+02, 2.937129516601562e+02, 2.934879150390625e+02, 2.948705139160156e+02, 2.956150207519531e+02, 2.961017761230469e+02, 2.966607055664062e+02, 2.977468566894531e+02, 2.985452575683594e+02, 2.987769775390625e+02, 2.988381042480469e+02, 2.976308288574219e+02, 2.965562744140625e+02, 2.959887084960938e+02, 2.956583862304688e+02, 2.95472900390625e+02, 2.951999206542969e+02, 2.948576354980469e+02, 2.946220397949219e+02, 2.943274841308594e+02, 2.940837707519531e+02, 2.937861633300781e+02, 2.935868225097656e+02, 2.949987487792969e+02, 2.957756958007812e+02, 2.960531005859375e+02, 2.964342041015625e+02, 2.962769775390625e+02, 2.966170654296875e+02, 2.965365295410156e+02, 2.966843872070312e+02, 2.955055847167969e+02, 2.9476953125e+02, 2.944380187988281e+02, 2.941319274902344e+02, 2.938726806640625e+02, 2.93683349609375e+02, 2.935104064941406e+02, 2.934075012207031e+02, 2.932117919921875e+02, 2.931496887207031e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.941091003417969e+02, 2.950180053710938e+02, 2.955929870605469e+02, 2.961072998046875e+02, 2.961831970214844e+02, 2.96772216796875e+02, 2.969229736328125e+02, 2.966052856445312e+02, 2.951211242675781e+02, 2.942630920410156e+02, 2.937804260253906e+02, 2.933699340820312e+02, 2.9314892578125e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931490173339844e+02, 2.931495056152344e+02, 2.931497802734375e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.934939575195312e+02, 2.940721130371094e+02, 2.94408447265625e+02, 2.945646057128906e+02, 2.943548583984375e+02, 2.947714538574219e+02, 2.948081359863281e+02, 2.945995788574219e+02, 2.935955505371094e+02, 2.931501770019531e+02, 2.931480102539062e+02, 2.931493835449219e+02, 2.931498413085938e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931491394042969e+02, 2.931495361328125e+02, 2.931497192382812e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.932993774414062e+02, 2.936318664550781e+02, 2.937032775878906e+02, 2.939763488769531e+02, 2.940443725585938e+02, 2.942874450683594e+02, 2.936976318359375e+02, 2.936014709472656e+02, 2.931498107910156e+02, 2.93149169921875e+02, 2.931493835449219e+02, 2.931570739746094e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931499938964844e+02]
-flo.TAirNor=[2.751499938964844e+02, 2.941015625e+02, 2.939529724121094e+02, 2.939119873046875e+02, 2.939010009765625e+02, 2.937749328613281e+02, 2.951260070800781e+02, 2.957950134277344e+02, 2.962441101074219e+02, 2.966817321777344e+02, 2.969471130371094e+02, 2.976320190429688e+02, 2.98015380859375e+02, 2.981985168457031e+02, 2.971823120117188e+02, 2.963356323242188e+02, 2.958041381835938e+02, 2.954922485351562e+02, 2.953240661621094e+02, 2.950575561523438e+02, 2.948338928222656e+02, 2.947469787597656e+02, 2.945423278808594e+02, 2.941718444824219e+02, 2.935675964355469e+02, 2.932695007324219e+02, 2.949475402832031e+02, 2.956929626464844e+02, 2.957930603027344e+02, 2.961691589355469e+02, 2.961400451660156e+02, 2.963369750976562e+02, 2.9607177734375e+02, 2.965662841796875e+02, 2.954466247558594e+02, 2.947341613769531e+02, 2.944133911132812e+02, 2.941169128417969e+02, 2.938590393066406e+02, 2.936737976074219e+02, 2.935004577636719e+02, 2.933943176269531e+02, 2.932116088867188e+02, 2.93149658203125e+02, 2.931498107910156e+02, 2.931498413085938e+02, 2.941103210449219e+02, 2.949772338867188e+02, 2.955206604003906e+02, 2.959842834472656e+02, 2.960184936523438e+02, 2.965958862304688e+02, 2.967698059082031e+02, 2.964860534667969e+02, 2.949551391601562e+02, 2.942472839355469e+02, 2.937844543457031e+02, 2.9314794921875e+02, 2.931479797363281e+02, 2.931508483886719e+02, 2.931499633789062e+02, 2.931481018066406e+02, 2.931495361328125e+02, 2.931488342285156e+02, 2.931504821777344e+02, 2.931500854492188e+02, 2.931585388183594e+02, 2.940418701171875e+02, 2.943478393554688e+02, 2.939995422363281e+02, 2.939674682617188e+02, 2.940061950683594e+02, 2.941001281738281e+02, 2.937846069335938e+02, 2.934866638183594e+02, 2.931498718261719e+02, 2.931504211425781e+02, 2.931494445800781e+02, 2.9314990234375e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931492309570312e+02, 2.931495971679688e+02, 2.931497192382812e+02, 2.931500244140625e+02, 2.931500854492188e+02, 2.933263854980469e+02, 2.937564697265625e+02, 2.9412353515625e+02, 2.944608459472656e+02, 2.9434619140625e+02, 2.946166687011719e+02, 2.945279541015625e+02, 2.943561401367188e+02, 2.932466125488281e+02, 2.931501770019531e+02, 2.931483764648438e+02, 2.931494445800781e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931499938964844e+02]
-flo.TAirEas=[2.751499938964844e+02, 2.942558288574219e+02, 2.940360412597656e+02, 2.939836730957031e+02, 2.939611511230469e+02, 2.938300476074219e+02, 2.951888427734375e+02, 2.958446044921875e+02, 2.962864074707031e+02, 2.967598571777344e+02, 2.970076293945312e+02, 2.977064514160156e+02, 2.980882873535156e+02, 2.982509155273438e+02, 2.972283630371094e+02, 2.963385620117188e+02, 2.957974548339844e+02, 2.954832153320312e+02, 2.953078918457031e+02, 2.947655639648438e+02, 2.948030700683594e+02, 2.947265319824219e+02, 2.945380249023438e+02, 2.938442077636719e+02, 2.936876220703125e+02, 2.93513671875e+02, 2.950145874023438e+02, 2.957067260742188e+02, 2.959616394042969e+02, 2.962984619140625e+02, 2.960614624023438e+02, 2.962669982910156e+02, 2.96398193359375e+02, 2.96153564453125e+02, 2.953605651855469e+02, 2.946822814941406e+02, 2.943592834472656e+02, 2.940572204589844e+02, 2.937990417480469e+02, 2.936153259277344e+02, 2.934469909667969e+02, 2.933451232910156e+02, 2.931499938964844e+02, 2.931497497558594e+02, 2.931498107910156e+02, 2.931498107910156e+02, 2.94069091796875e+02, 2.949690246582031e+02, 2.955162353515625e+02, 2.959686279296875e+02, 2.960012512207031e+02, 2.965746765136719e+02, 2.967357482910156e+02, 2.961853942871094e+02, 2.945564575195312e+02, 2.938569946289062e+02, 2.933423156738281e+02, 2.931536865234375e+02, 2.931493835449219e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931491394042969e+02, 2.931495056152344e+02, 2.931449890136719e+02, 2.931508178710938e+02, 2.931501159667969e+02, 2.931554260253906e+02, 2.934268493652344e+02, 2.935674438476562e+02, 2.93694580078125e+02, 2.934723815917969e+02, 2.937779235839844e+02, 2.938708190917969e+02, 2.935419006347656e+02, 2.9315234375e+02, 2.931513671875e+02, 2.931470947265625e+02, 2.931487121582031e+02, 2.931517333984375e+02, 2.931505126953125e+02, 2.931495666503906e+02, 2.931484069824219e+02, 2.93149658203125e+02, 2.931486511230469e+02, 2.931532592773438e+02, 2.93151123046875e+02, 2.931599426269531e+02, 2.93388427734375e+02, 2.940736389160156e+02, 2.944106750488281e+02, 2.942861938476562e+02, 2.945412902832031e+02, 2.944542846679688e+02, 2.942666320800781e+02, 2.931553039550781e+02, 2.931501770019531e+02, 2.931482238769531e+02, 2.931493835449219e+02, 2.931499328613281e+02, 2.93150146484375e+02, 2.931499938964844e+02]
-flo.TAirWes=[2.751499938964844e+02, 2.943053283691406e+02, 2.940723876953125e+02, 2.940160217285156e+02, 2.939911804199219e+02, 2.938546752929688e+02, 2.951415100097656e+02, 2.95501953125e+02, 2.962503967285156e+02, 2.964692077636719e+02, 2.96762939453125e+02, 2.974337768554688e+02, 2.980360412597656e+02, 2.983944702148438e+02, 2.971852416992188e+02, 2.965088195800781e+02, 2.9589111328125e+02, 2.955623168945312e+02, 2.9538818359375e+02, 2.951271057128906e+02, 2.948967895507812e+02, 2.948121032714844e+02, 2.942067260742188e+02, 2.942302856445312e+02, 2.937517700195312e+02, 2.93556640625e+02, 2.94925048828125e+02, 2.956867980957031e+02, 2.959710998535156e+02, 2.963078918457031e+02, 2.961427917480469e+02, 2.96485595703125e+02, 2.964504699707031e+02, 2.966223754882812e+02, 2.954560241699219e+02, 2.947236328125e+02, 2.9438671875e+02, 2.940824279785156e+02, 2.938186645507812e+02, 2.93479736328125e+02, 2.93153564453125e+02, 2.931473388671875e+02, 2.931499938964844e+02, 2.931510314941406e+02, 2.931498413085938e+02, 2.931498107910156e+02, 2.939138488769531e+02, 2.948958129882812e+02, 2.9544873046875e+02, 2.959248352050781e+02, 2.9597509765625e+02, 2.965654296875e+02, 2.965367736816406e+02, 2.9651318359375e+02, 2.950978698730469e+02, 2.942557678222656e+02, 2.937406921386719e+02, 2.933387145996094e+02, 2.931494140625e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931490173339844e+02, 2.931495056152344e+02, 2.931498107910156e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93425537109375e+02, 2.939769287109375e+02, 2.942861633300781e+02, 2.944034729003906e+02, 2.941826171875e+02, 2.945679016113281e+02, 2.946927490234375e+02, 2.945526123046875e+02, 2.935772094726562e+02, 2.931501770019531e+02, 2.931479797363281e+02, 2.931494140625e+02, 2.931498718261719e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931491394042969e+02, 2.931495666503906e+02, 2.931497802734375e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.932230224609375e+02, 2.936713256835938e+02, 2.940453491210938e+02, 2.942156677246094e+02, 2.938411560058594e+02, 2.938860473632812e+02, 2.938136901855469e+02, 2.933934326171875e+02, 2.931468811035156e+02, 2.931496276855469e+02, 2.931494445800781e+02, 2.931444396972656e+02, 2.931508178710938e+02, 2.931510314941406e+02, 2.931509094238281e+02]
-hea[1].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.024520561099052e-02, 3.576654940843582e-02, 4.321841523051262e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.94953228533268e-03, 3.111184574663639e-02, 5.552755296230316e-02, 7.062691450119019e-02, 8.297744393348694e-02, 9.871357679367065e-02, 1.093244850635529e-01, 1.09523594379425e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.03176436945796e-03, 5.509809404611588e-02, 7.266220450401306e-02, 9.081391990184784e-02, 1.095258817076683e-01, 1.263901591300964e-01, 1.396070569753647e-01, 1.522709727287292e-01, 1.641659140586853e-01, 1.614257544279099e-01, 1.52677908539772e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.497471898794174e-02, 2.287232726812363e-01, 2.862037718296051e-01, 2.050467431545258e-01, 1.411478817462921e-01, 1.557347029447556e-01, 1.857356280088425e-01]
-hea[2].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.047342951409519e-04, 3.038213402032852e-02, 4.529200866818428e-02, 4.528412595391273e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.164013683795929e-02, 4.545662924647331e-02, 6.766776740550995e-02, 8.079873025417328e-02, 9.290294349193573e-02, 1.801883578300476e-01, 2.135057002305984e-01, 1.81209921836853e-01, 8.363671600818634e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.357214003801346e-01, 1.759084612131119e-01, 2.316948026418686e-01, 2.979378402233124e-01, 2.965673208236694e-01, 2.893993258476257e-01, 3.019096255302429e-01, 3.441217839717865e-01, 3.710892796516418e-01, 3.953312337398529e-01, 3.420238792896271e-01, 3.388913571834564e-01, 7.267943769693375e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.012230902910233e-02, 1.046649664640427e-01, 1.240745037794113e-01, 1.445351392030716e-01, 1.600207835435867e-01, 1.895287483930588e-01]
-hea[3].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.921829394996166e-02, 3.365363925695419e-02, 4.037996754050255e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.667160451412201e-02, 1.268085986375809e-01, 1.428033858537674e-01, 1.894754022359848e-01, 1.723886281251907e-01, 2.062569856643677e-01, 2.293517142534256e-01, 2.344726026058197e-01, 2.081872671842575e-01, 1.301274448633194e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.268250942230225e-02, 9.524670243263245e-02, 7.539866119623184e-02, 9.04700979590416e-02, 1.092991158366203e-01, 1.250373423099518e-01, 1.371459662914276e-01, 1.475263088941574e-01, 1.583748310804367e-01, 1.539513766765594e-01, 1.448219418525696e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.15129454433918e-02, 8.568685501813889e-02, 1.038035526871681e-01, 1.244369745254517e-01, 1.391017436981201e-01, 1.694286614656448e-01]
-hea[4].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.128874626010656e-02, 7.107643038034439e-02, 5.931581929326057e-02, 4.465731978416443e-02, 5.195849388837814e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.118982490152121e-02, 3.809397295117378e-02, 6.105417385697365e-02, 7.595701515674591e-02, 8.79674032330513e-02, 1.036001518368721e-01, 1.144214421510696e-01, 1.15445576608181e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.113556325435638e-02, 6.531867384910583e-02, 8.188792318105698e-02, 9.908229112625122e-02, 1.182126402854919e-01, 1.345348358154297e-01, 1.473875045776367e-01, 1.58320352435112e-01, 1.690970659255981e-01, 1.671793162822723e-01, 1.586615294218063e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.173571884632111e-01, 2.72115021944046e-01, 3.325772881507874e-01, 3.296409249305725e-01, 3.924302458763123e-01, 3.742059171199799e-01, 3.700372576713562e-01]
+flo.TAirCor=[2.751499938964844e+02, 2.94373779296875e+02, 2.942283020019531e+02, 2.941929626464844e+02, 2.941863098144531e+02, 2.94050537109375e+02, 2.954223937988281e+02, 2.961045837402344e+02, 2.965856323242188e+02, 2.969959716796875e+02, 2.973057556152344e+02, 2.979960632324219e+02, 2.983599243164062e+02, 2.985502319335938e+02, 2.975053100585938e+02, 2.967086181640625e+02, 2.961927795410156e+02, 2.958807373046875e+02, 2.956991271972656e+02, 2.953933410644531e+02, 2.951892395019531e+02, 2.950517272949219e+02, 2.94752685546875e+02, 2.944841918945312e+02, 2.941231994628906e+02, 2.939104309082031e+02, 2.954019165039062e+02, 2.96181396484375e+02, 2.96390380859375e+02, 2.967418212890625e+02, 2.965982666015625e+02, 2.969089050292969e+02, 2.968213195800781e+02, 2.970150146484375e+02, 2.958984985351562e+02, 2.951802368164062e+02, 2.948484497070312e+02, 2.945535583496094e+02, 2.942899780273438e+02, 2.940690002441406e+02, 2.93853515625e+02, 2.937543640136719e+02, 2.936038818359375e+02, 2.935363464355469e+02, 2.935205078125e+02, 2.935205688476562e+02, 2.945307006835938e+02, 2.95417724609375e+02, 2.959398498535156e+02, 2.96375e+02, 2.963789978027344e+02, 2.96960693359375e+02, 2.971229553222656e+02, 2.969280700683594e+02, 2.954364624023438e+02, 2.946625061035156e+02, 2.941957092285156e+02, 2.9377294921875e+02, 2.936427612304688e+02, 2.936019287109375e+02, 2.935647583007812e+02, 2.935372009277344e+02, 2.935144958496094e+02, 2.934921875e+02, 2.934813232421875e+02, 2.934842224121094e+02, 2.939032592773438e+02, 2.944822692871094e+02, 2.947501220703125e+02, 2.947278137207031e+02, 2.945444030761719e+02, 2.947996215820312e+02, 2.948988647460938e+02, 2.946549072265625e+02, 2.939997863769531e+02, 2.936286926269531e+02, 2.935692138671875e+02, 2.935417175292969e+02, 2.935110473632812e+02, 2.934812316894531e+02, 2.934485473632812e+02, 2.93426513671875e+02, 2.933916931152344e+02, 2.933343811035156e+02, 2.933815307617188e+02, 2.933943176269531e+02, 2.938341369628906e+02, 2.942001037597656e+02, 2.9448046875e+02, 2.9475341796875e+02, 2.946277160644531e+02, 2.949045104980469e+02, 2.946162719726562e+02, 2.94451171875e+02, 2.937328796386719e+02, 2.935857238769531e+02, 2.935351257324219e+02, 2.935135192871094e+02, 2.934543762207031e+02, 2.934520874023438e+02, 2.933776245117188e+02]
+flo.TAirSou=[2.751499938964844e+02, 2.938191528320312e+02, 2.936720581054688e+02, 2.936803283691406e+02, 2.937129516601562e+02, 2.934879150390625e+02, 2.948704833984375e+02, 2.956150207519531e+02, 2.961017761230469e+02, 2.966607360839844e+02, 2.977468566894531e+02, 2.985452880859375e+02, 2.987769470214844e+02, 2.988380737304688e+02, 2.976308288574219e+02, 2.965562744140625e+02, 2.959887084960938e+02, 2.956583862304688e+02, 2.95472900390625e+02, 2.951999206542969e+02, 2.948576354980469e+02, 2.946220397949219e+02, 2.943274230957031e+02, 2.940801391601562e+02, 2.937862243652344e+02, 2.935868530273438e+02, 2.94998779296875e+02, 2.957758178710938e+02, 2.960530700683594e+02, 2.964342346191406e+02, 2.962769775390625e+02, 2.966170959472656e+02, 2.965365600585938e+02, 2.966843872070312e+02, 2.955057067871094e+02, 2.9476953125e+02, 2.944380187988281e+02, 2.941319274902344e+02, 2.938727111816406e+02, 2.93683349609375e+02, 2.935104064941406e+02, 2.934075317382812e+02, 2.932118225097656e+02, 2.931497497558594e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.941091003417969e+02, 2.950180358886719e+02, 2.955929565429688e+02, 2.961072998046875e+02, 2.961831970214844e+02, 2.96772216796875e+02, 2.969230041503906e+02, 2.966053466796875e+02, 2.951211547851562e+02, 2.942631225585938e+02, 2.937804260253906e+02, 2.933699340820312e+02, 2.931488952636719e+02, 2.931499633789062e+02, 2.93150146484375e+02, 2.931489868164062e+02, 2.931495056152344e+02, 2.931497497558594e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.934939575195312e+02, 2.940721130371094e+02, 2.944084777832031e+02, 2.945646057128906e+02, 2.943548583984375e+02, 2.94771484375e+02, 2.948081359863281e+02, 2.945995788574219e+02, 2.935955200195312e+02, 2.931501770019531e+02, 2.931482849121094e+02, 2.931495361328125e+02, 2.931498718261719e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.93149169921875e+02, 2.931496276855469e+02, 2.931497192382812e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.932996826171875e+02, 2.936318664550781e+02, 2.937031860351562e+02, 2.939763793945312e+02, 2.940444030761719e+02, 2.942874755859375e+02, 2.936976928710938e+02, 2.936014709472656e+02, 2.931503601074219e+02, 2.931490173339844e+02, 2.931493530273438e+02, 2.931572265625e+02, 2.931498107910156e+02, 2.931499328613281e+02, 2.931500244140625e+02]
+flo.TAirNor=[2.751499938964844e+02, 2.941015625e+02, 2.939529724121094e+02, 2.939119873046875e+02, 2.939010009765625e+02, 2.937749328613281e+02, 2.951259765625e+02, 2.957950134277344e+02, 2.962441101074219e+02, 2.966817321777344e+02, 2.969471130371094e+02, 2.976320190429688e+02, 2.98015380859375e+02, 2.98198486328125e+02, 2.971823120117188e+02, 2.963356628417969e+02, 2.958041381835938e+02, 2.954922485351562e+02, 2.953240661621094e+02, 2.950575561523438e+02, 2.948338928222656e+02, 2.947470092773438e+02, 2.945423278808594e+02, 2.941722717285156e+02, 2.935676574707031e+02, 2.932695617675781e+02, 2.949475402832031e+02, 2.95694091796875e+02, 2.957930297851562e+02, 2.96169189453125e+02, 2.961400451660156e+02, 2.963370056152344e+02, 2.960718688964844e+02, 2.965662841796875e+02, 2.954476318359375e+02, 2.947341918945312e+02, 2.944134216308594e+02, 2.94116943359375e+02, 2.938590698242188e+02, 2.93673828125e+02, 2.935004577636719e+02, 2.933943176269531e+02, 2.932116394042969e+02, 2.931497192382812e+02, 2.931498107910156e+02, 2.931498413085938e+02, 2.941103210449219e+02, 2.949772644042969e+02, 2.955206298828125e+02, 2.959843139648438e+02, 2.960184936523438e+02, 2.965959167480469e+02, 2.967698669433594e+02, 2.964861450195312e+02, 2.949551696777344e+02, 2.94247314453125e+02, 2.937844848632812e+02, 2.9314794921875e+02, 2.931479797363281e+02, 2.931508483886719e+02, 2.931501159667969e+02, 2.931480712890625e+02, 2.931495361328125e+02, 2.931487731933594e+02, 2.931504821777344e+02, 2.931500854492188e+02, 2.931585693359375e+02, 2.940419616699219e+02, 2.943478393554688e+02, 2.939995422363281e+02, 2.939674682617188e+02, 2.940061950683594e+02, 2.941001586914062e+02, 2.937846069335938e+02, 2.934862060546875e+02, 2.931498718261719e+02, 2.93150634765625e+02, 2.931495666503906e+02, 2.931499328613281e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931492614746094e+02, 2.93149658203125e+02, 2.931497192382812e+02, 2.931500244140625e+02, 2.931500854492188e+02, 2.9332666015625e+02, 2.937564697265625e+02, 2.9412353515625e+02, 2.944608764648438e+02, 2.9434619140625e+02, 2.946166687011719e+02, 2.945279541015625e+02, 2.943561401367188e+02, 2.932466125488281e+02, 2.931499938964844e+02, 2.931483764648438e+02, 2.931495971679688e+02, 2.931498107910156e+02, 2.931499328613281e+02, 2.931500244140625e+02]
+flo.TAirEas=[2.751499938964844e+02, 2.942557067871094e+02, 2.940360107421875e+02, 2.93983642578125e+02, 2.939611511230469e+02, 2.938300476074219e+02, 2.951888122558594e+02, 2.958446044921875e+02, 2.962864074707031e+02, 2.967598571777344e+02, 2.970076293945312e+02, 2.977064514160156e+02, 2.980882873535156e+02, 2.982509155273438e+02, 2.972283630371094e+02, 2.963385620117188e+02, 2.957974548339844e+02, 2.954832153320312e+02, 2.953078918457031e+02, 2.947655639648438e+02, 2.948030395507812e+02, 2.947265319824219e+02, 2.945380249023438e+02, 2.938447570800781e+02, 2.936876525878906e+02, 2.935137023925781e+02, 2.950146179199219e+02, 2.957071838378906e+02, 2.959616394042969e+02, 2.962984619140625e+02, 2.960614624023438e+02, 2.962669982910156e+02, 2.963982238769531e+02, 2.96153564453125e+02, 2.953611145019531e+02, 2.946823120117188e+02, 2.943593139648438e+02, 2.940572204589844e+02, 2.937990417480469e+02, 2.936153564453125e+02, 2.93447021484375e+02, 2.933451232910156e+02, 2.931500244140625e+02, 2.931497802734375e+02, 2.931498107910156e+02, 2.931498107910156e+02, 2.94069091796875e+02, 2.949690551757812e+02, 2.955162048339844e+02, 2.959686279296875e+02, 2.960012512207031e+02, 2.965746765136719e+02, 2.967358093261719e+02, 2.961854858398438e+02, 2.945564880371094e+02, 2.938570251464844e+02, 2.933423461914062e+02, 2.931537170410156e+02, 2.931493835449219e+02, 2.931499938964844e+02, 2.931501770019531e+02, 2.931490783691406e+02, 2.931494750976562e+02, 2.931449584960938e+02, 2.931508178710938e+02, 2.931501159667969e+02, 2.931554565429688e+02, 2.934268493652344e+02, 2.935674743652344e+02, 2.93694580078125e+02, 2.934723815917969e+02, 2.937779541015625e+02, 2.938708190917969e+02, 2.935419006347656e+02, 2.9315234375e+02, 2.931513671875e+02, 2.931472778320312e+02, 2.931488647460938e+02, 2.931517639160156e+02, 2.931505126953125e+02, 2.931495666503906e+02, 2.931484069824219e+02, 2.931497497558594e+02, 2.931486511230469e+02, 2.931532592773438e+02, 2.93151123046875e+02, 2.931600952148438e+02, 2.933884582519531e+02, 2.940736083984375e+02, 2.944106750488281e+02, 2.942861938476562e+02, 2.945412902832031e+02, 2.944543151855469e+02, 2.942666320800781e+02, 2.931552734375e+02, 2.931499938964844e+02, 2.93148193359375e+02, 2.931495361328125e+02, 2.931497802734375e+02, 2.931499328613281e+02, 2.931500549316406e+02]
+flo.TAirWes=[2.751499938964844e+02, 2.943052062988281e+02, 2.940723876953125e+02, 2.940160217285156e+02, 2.939911499023438e+02, 2.938546752929688e+02, 2.951412658691406e+02, 2.955019836425781e+02, 2.962504577636719e+02, 2.964692077636719e+02, 2.96762939453125e+02, 2.974337768554688e+02, 2.980360412597656e+02, 2.983944702148438e+02, 2.971852416992188e+02, 2.965088195800781e+02, 2.9589111328125e+02, 2.955622863769531e+02, 2.9538818359375e+02, 2.951271057128906e+02, 2.948967895507812e+02, 2.948121032714844e+02, 2.942066040039062e+02, 2.942305603027344e+02, 2.937518615722656e+02, 2.935567016601562e+02, 2.94925048828125e+02, 2.956869201660156e+02, 2.959710998535156e+02, 2.963079223632812e+02, 2.961427917480469e+02, 2.96485595703125e+02, 2.964505004882812e+02, 2.966223754882812e+02, 2.954561462402344e+02, 2.947236328125e+02, 2.9438671875e+02, 2.940824584960938e+02, 2.938186950683594e+02, 2.934797668457031e+02, 2.931535949707031e+02, 2.931475219726562e+02, 2.931499633789062e+02, 2.931510925292969e+02, 2.931498413085938e+02, 2.931498107910156e+02, 2.939138488769531e+02, 2.948958435058594e+02, 2.9544873046875e+02, 2.959248352050781e+02, 2.959750671386719e+02, 2.965654296875e+02, 2.965368957519531e+02, 2.965132751464844e+02, 2.95097900390625e+02, 2.942557983398438e+02, 2.9374072265625e+02, 2.933387145996094e+02, 2.931494140625e+02, 2.931499633789062e+02, 2.93150146484375e+02, 2.931489868164062e+02, 2.931495056152344e+02, 2.931497497558594e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.934254455566406e+02, 2.939769287109375e+02, 2.942861633300781e+02, 2.944034423828125e+02, 2.941826171875e+02, 2.945679321289062e+02, 2.946927490234375e+02, 2.945526428222656e+02, 2.935771789550781e+02, 2.931501770019531e+02, 2.931482543945312e+02, 2.931495666503906e+02, 2.931499328613281e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.93149169921875e+02, 2.931496276855469e+02, 2.931497802734375e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.932232360839844e+02, 2.936713562011719e+02, 2.940453491210938e+02, 2.942156677246094e+02, 2.938411560058594e+02, 2.938860473632812e+02, 2.938138122558594e+02, 2.933934326171875e+02, 2.931474304199219e+02, 2.931495056152344e+02, 2.931494445800781e+02, 2.931445617675781e+02, 2.93150634765625e+02, 2.931508483886719e+02, 2.931509399414062e+02]
+hea[1].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.022445388138294e-02, 3.576269373297691e-02, 4.321794956922531e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.962283954024315e-03, 3.111131116747856e-02, 5.541194602847099e-02, 7.063047587871552e-02, 8.298420161008835e-02, 9.874620288610458e-02, 1.093355789780617e-01, 1.095228642225266e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.028593216091394e-03, 5.489051342010498e-02, 7.256621867418289e-02, 9.079526364803314e-02, 1.095312684774399e-01, 1.264012157917023e-01, 1.39617919921875e-01, 1.522267609834671e-01, 1.641702204942703e-01, 1.614265143871307e-01, 1.526767313480377e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.466623514890671e-02, 2.288417369127274e-01, 2.862166166305542e-01, 2.048881202936172e-01, 1.412677019834518e-01, 1.558153629302979e-01, 1.857078224420547e-01]
+hea[2].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.901217857375741e-04, 3.036301396787167e-02, 4.528848454356194e-02, 4.528204724192619e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.164248190820217e-02, 4.545651003718376e-02, 6.754067540168762e-02, 8.079899102449417e-02, 9.291091561317444e-02, 1.802206188440323e-01, 2.135187238454819e-01, 1.812075972557068e-01, 8.358853869140148e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.357336193323135e-01, 1.759060174226761e-01, 2.315440475940704e-01, 2.97826737165451e-01, 2.965503633022308e-01, 2.894057333469391e-01, 3.01920473575592e-01, 3.441343009471893e-01, 3.710479438304901e-01, 3.95335465669632e-01, 3.420241177082062e-01, 3.388907015323639e-01, 7.255703210830688e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.027791440486908e-02, 1.046790108084679e-01, 1.239701956510544e-01, 1.446701288223267e-01, 1.601126939058304e-01, 1.894973367452621e-01]
+hea[3].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.919998601078987e-02, 3.365003317594528e-02, 4.037955030798912e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.667046457529068e-02, 1.268113553524017e-01, 1.428032666444778e-01, 1.893663257360458e-01, 1.723917275667191e-01, 2.062634378671646e-01, 2.293823063373566e-01, 2.344830334186554e-01, 2.081868052482605e-01, 1.30071509629488e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.267974525690079e-02, 9.507825970649719e-02, 7.530843466520309e-02, 9.046120941638947e-02, 1.09303891658783e-01, 1.250471472740173e-01, 1.371559500694275e-01, 1.474886387586594e-01, 1.583785712718964e-01, 1.539526879787445e-01, 1.448209583759308e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.165022984147072e-02, 8.569899946451187e-02, 1.037151142954826e-01, 1.245549470186234e-01, 1.391830891370773e-01, 1.694001704454422e-01]
+hea[4].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.114305108785629e-02, 7.108335942029953e-02, 5.929755046963692e-02, 4.465551301836967e-02, 5.195805430412292e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.119173131883144e-02, 3.809363394975662e-02, 6.093203276395798e-02, 7.595797628164291e-02, 8.797492831945419e-02, 1.036358848214149e-01, 1.144343987107277e-01, 1.154450252652168e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.113298255950212e-02, 6.509755551815033e-02, 8.179114758968353e-02, 9.90624725818634e-02, 1.182193458080292e-01, 1.345470398664474e-01, 1.474010646343231e-01, 1.582760959863663e-01, 1.691017001867294e-01, 1.671814918518066e-01, 1.586604565382004e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.170594930648804e-01, 2.721956670284271e-01, 3.325910568237305e-01, 3.29557865858078e-01, 3.92558217048645e-01, 3.7429279088974e-01, 3.700076639652252e-01]
 hea[5].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-flo.sou.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.607773132324219e+02, 2.840400390625e+02, 3.432190551757812e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.136521148681641e+01, 2.470747222900391e+02, 4.409720458984375e+02, 5.608836669921875e+02, 6.589653930664062e+02, 7.83933837890625e+02, 8.682003784179688e+02, 8.697816772460938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.584275817871094e+01, 4.375614929199219e+02, 5.77046875e+02, 7.2119873046875e+02, 8.697998046875e+02, 1.003727478027344e+03, 1.108689331054688e+03, 1.209260009765625e+03, 1.303723510742188e+03, 1.281962646484375e+03, 1.212491577148438e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.542417602539062e+02, 1.816405883789062e+03, 2.27288720703125e+03, 1.628378662109375e+03, 1.120925903320312e+03, 1.236767211914062e+03, 1.47501953125e+03]
-flo.eas.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.320003271102905e+00, 1.431302337646484e+02, 2.133706665039062e+02, 2.133335266113281e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.019466857910156e+02, 2.141461944580078e+02, 3.187828369140625e+02, 3.80642822265625e+02, 4.37665771484375e+02, 8.488673706054688e+02, 1.005825317382812e+03, 8.53679931640625e+02, 3.94012565612793e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.39383544921875e+02, 8.287047119140625e+02, 1.091514282226562e+03, 1.403585205078125e+03, 1.397128662109375e+03, 1.363360229492188e+03, 1.422296264648438e+03, 1.62115771484375e+03, 1.74820166015625e+03, 1.862405517578125e+03, 1.611274536132812e+03, 1.596517211914062e+03, 3.42392822265625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.303462219238281e+02, 4.9307666015625e+02, 5.845149536132812e+02, 6.80905029296875e+02, 7.5385791015625e+02, 8.928699340820312e+02]
-flo.nor.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.526220855712891e+02, 2.672603759765625e+02, 3.20677490234375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.500575561523438e+02, 1.007050476074219e+03, 1.134073120117188e+03, 1.504718994140625e+03, 1.369024291992188e+03, 1.637989868164062e+03, 1.821396606445312e+03, 1.862064208984375e+03, 1.653319213867188e+03, 1.033407135009766e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.977931823730469e+02, 7.564016723632812e+02, 5.987784423828125e+02, 7.1846826171875e+02, 8.679989624023438e+02, 9.92984130859375e+02, 1.089144653320312e+03, 1.171580200195312e+03, 1.257733764648438e+03, 1.222604858398438e+03, 1.150103393554688e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.090900573730469e+02, 6.804821166992188e+02, 8.243558959960938e+02, 9.882161865234375e+02, 1.104676513671875e+03, 1.345517700195312e+03]
-flo.wes.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.31812858581543e+01, 3.34841064453125e+02, 2.794368286132812e+02, 2.103806304931641e+02, 2.447764587402344e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.271526336669922e+01, 1.794607086181641e+02, 2.87626220703125e+02, 3.5783349609375e+02, 4.144144287109375e+02, 4.88060302734375e+02, 5.390393676757812e+02, 5.438641357421875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.245963668823242e+01, 3.077162780761719e+02, 3.857739868164062e+02, 4.667766723632812e+02, 5.568997802734375e+02, 6.337935791015625e+02, 6.94342529296875e+02, 7.4584716796875e+02, 7.966163330078125e+02, 7.875817260742188e+02, 7.474544677734375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.0239697265625e+03, 1.281933837890625e+03, 1.566771606445312e+03, 1.552938354492188e+03, 1.848739013671875e+03, 1.762884155273438e+03, 1.74324560546875e+03]
+flo.sou.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.606125030517578e+02, 2.840094604492188e+02, 3.432153625488281e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.146647644042969e+01, 2.470704803466797e+02, 4.40053955078125e+02, 5.609119262695312e+02, 6.5901904296875e+02, 7.841929931640625e+02, 8.682885131835938e+02, 8.6977587890625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.581757354736328e+01, 4.359130249023438e+02, 5.762846069335938e+02, 7.21050537109375e+02, 8.698425903320312e+02, 1.003815307617188e+03, 1.108775756835938e+03, 1.208908813476562e+03, 1.3037578125e+03, 1.281968627929688e+03, 1.212482177734375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.517919311523438e+02, 1.817346557617188e+03, 2.2729892578125e+03, 1.627119018554688e+03, 1.12187744140625e+03, 1.23740771484375e+03, 1.474798706054688e+03]
+flo.eas.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.251163721084595e+00, 1.430401611328125e+02, 2.133540496826172e+02, 2.133237152099609e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.019577255249023e+02, 2.141456298828125e+02, 3.181841125488281e+02, 3.806440734863281e+02, 4.377033081054688e+02, 8.49019287109375e+02, 1.00588671875e+03, 8.536690063476562e+02, 3.937856292724609e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.394411010742188e+02, 8.286932373046875e+02, 1.090803955078125e+03, 1.403061767578125e+03, 1.397048828125e+03, 1.363390380859375e+03, 1.422347412109375e+03, 1.621216674804688e+03, 1.748006958007812e+03, 1.862425415039062e+03, 1.611275512695312e+03, 1.59651416015625e+03, 3.418161926269531e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.310792846679688e+02, 4.93142822265625e+02, 5.840236206054688e+02, 6.815409545898438e+02, 7.542908935546875e+02, 8.92721923828125e+02]
+flo.nor.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.524766998291016e+02, 2.672317199707031e+02, 3.206741943359375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.500484924316406e+02, 1.007072387695312e+03, 1.134072143554688e+03, 1.503852661132812e+03, 1.369048950195312e+03, 1.638041137695312e+03, 1.821639526367188e+03, 1.86214697265625e+03, 1.6533154296875e+03, 1.032962951660156e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.977712097167969e+02, 7.550640258789062e+02, 5.980619506835938e+02, 7.18397705078125e+02, 8.680368041992188e+02, 9.930619506835938e+02, 1.089223999023438e+03, 1.171281005859375e+03, 1.257763427734375e+03, 1.222615234375e+03, 1.150095581054688e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.101802978515625e+02, 6.8057861328125e+02, 8.23653564453125e+02, 9.891531372070312e+02, 1.105322509765625e+03, 1.34529150390625e+03]
+flo.wes.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.249491119384766e+01, 3.348737182617188e+02, 2.793507690429688e+02, 2.103721160888672e+02, 2.447743988037109e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.272424697875977e+01, 1.794591064453125e+02, 2.870508117675781e+02, 3.578380126953125e+02, 4.144498901367188e+02, 4.882286682128906e+02, 5.391004638671875e+02, 5.438615112304688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.244748306274414e+01, 3.066745910644531e+02, 3.85318115234375e+02, 4.666832885742188e+02, 5.569313354492188e+02, 6.3385107421875e+02, 6.944064331054688e+02, 7.456387329101562e+02, 7.966381225585938e+02, 7.875919799804688e+02, 7.474494018554688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.022567260742188e+03, 1.282313720703125e+03, 1.56683642578125e+03, 1.552547119140625e+03, 1.849341796875e+03, 1.763293212890625e+03, 1.743106079101562e+03]
 flo.cor.heaPorAir.Q_flow=[1.0476017578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-EHea.y=[0e+00, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.5334148e+07, 2.541362e+07, 2.6420464e+07, 2.8648498e+07, 3.234183e+07, 3.6783968e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 3.9269808e+07, 4.0127012e+07, 4.3158116e+07, 5.0102376e+07, 5.9561044e+07, 7.0646816e+07, 8.3329848e+07, 9.7925992e+07, 1.16196288e+08, 1.33779072e+08, 1.46635328e+08, 1.4676768e+08, 1.4676768e+08, 1.4676768e+08, 1.4676768e+08, 1.4676768e+08, 1.4676768e+08, 1.4676768e+08, 1.48763424e+08, 1.53202624e+08, 1.62174624e+08, 1.739172e+08, 1.87568992e+08, 2.0248192e+08, 2.19308512e+08, 2.37840688e+08, 2.58137664e+08, 2.79729824e+08, 3.02207616e+08, 3.22673472e+08, 3.37533376e+08, 3.37966624e+08, 3.37966624e+08, 3.37966624e+08, 3.37966624e+08, 3.37966624e+08, 3.37966624e+08, 3.37966624e+08, 3.41794752e+08, 3.55506048e+08, 3.74678304e+08, 3.95173152e+08, 4.1444416e+08, 4.3492272e+08, 4.57805408e+08]
-ECoo.y=[0e+00, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06, -2.26765925e+06]
+EHea.y=[0e+00, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5332768e+07, 2.5412218e+07, 2.6419012e+07, 2.8647008e+07, 3.23401e+07, 3.6782168e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 3.9267992e+07, 4.0125084e+07, 4.3156112e+07, 5.01001e+07, 5.95591e+07, 7.0644688e+07, 8.332752e+07, 9.7923776e+07, 1.16194064e+08, 1.33776816e+08, 1.46633136e+08, 1.46765488e+08, 1.46765488e+08, 1.46765488e+08, 1.46765488e+08, 1.46765488e+08, 1.46765488e+08, 1.46765488e+08, 1.48761376e+08, 1.53200592e+08, 1.62172736e+08, 1.73915328e+08, 1.87567088e+08, 2.02479936e+08, 2.1930664e+08, 2.37838576e+08, 2.58135648e+08, 2.79727744e+08, 3.02205536e+08, 3.2267136e+08, 3.37531936e+08, 3.37965088e+08, 3.37965088e+08, 3.37965088e+08, 3.37965088e+08, 3.37965088e+08, 3.37965088e+08, 3.37965088e+08, 3.41793536e+08, 3.5550448e+08, 3.74676736e+08, 3.95171616e+08, 4.14442144e+08, 4.34920896e+08, 4.57803776e+08]
+ECoo.y=[0e+00, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06, -2.2672895e+06]
 coo[1].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 coo[2].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 coo[3].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSummer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSummer.txt
index 24b4ab40393..e14800dade8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSummer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingSummer.txt
@@ -1,37 +1,31 @@
-last-generated=2024-03-22
-statistics-initialization=
-{
-  "linear": "0, 0, 0, 0",
-  "nonlinear": "0, 0, 0, 0",
-  "numerical Jacobians": "0"
-}
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "0, 0, 0, 0",
-  "number of continuous time states": "30",
+  "number of continuous time states": "36",
   "numerical Jacobians": "0"
 }
 time=[1.6848e+07, 1.728e+07]
-flo.TAirCor=[2.751499938964844e+02, 2.968106079101562e+02, 2.969786987304688e+02, 2.969801635742188e+02, 2.96982666015625e+02, 2.975477905273438e+02, 2.981379089355469e+02, 2.985169067382812e+02, 2.988031921386719e+02, 2.989195861816406e+02, 2.988462829589844e+02, 2.988681030273438e+02, 2.988973388671875e+02, 2.989308776855469e+02, 2.988983459472656e+02, 2.989064025878906e+02, 2.989188232421875e+02, 2.987863159179688e+02, 2.988075561523438e+02, 2.9886767578125e+02, 2.988944091796875e+02, 2.987791748046875e+02, 2.987015075683594e+02, 2.987116394042969e+02, 2.986995849609375e+02, 2.988731689453125e+02, 2.989486083984375e+02, 2.989549560546875e+02, 2.9896044921875e+02, 2.989628295898438e+02, 2.989663696289062e+02, 2.989774475097656e+02, 2.989958190917969e+02, 2.990186767578125e+02, 2.990415344238281e+02, 2.990823974609375e+02, 2.990931396484375e+02, 2.990815124511719e+02, 2.990875549316406e+02, 2.990950317382812e+02, 2.991499938964844e+02, 2.991499633789062e+02, 2.9914990234375e+02, 2.991499938964844e+02, 2.991499938964844e+02, 2.991499938964844e+02, 2.991543884277344e+02, 2.991510925292969e+02, 2.991500549316406e+02, 2.991499328613281e+02, 2.991499633789062e+02, 2.991507568359375e+02, 2.991504211425781e+02, 2.991502075195312e+02, 2.99150146484375e+02, 2.991500854492188e+02, 2.991485900878906e+02, 2.991496887207031e+02, 2.991498107910156e+02, 2.991500549316406e+02, 2.991500244140625e+02, 2.991496276855469e+02, 2.991498107910156e+02, 2.991499938964844e+02, 2.991500244140625e+02, 2.991499938964844e+02, 2.99156982421875e+02, 2.991510009765625e+02, 2.991500549316406e+02, 2.991499633789062e+02, 2.991499938964844e+02, 2.991506652832031e+02, 2.991503601074219e+02, 2.991500244140625e+02, 2.991501770019531e+02, 2.991500549316406e+02, 2.991484069824219e+02, 2.991497192382812e+02, 2.991499633789062e+02, 2.991500549316406e+02, 2.991500244140625e+02, 2.991495971679688e+02, 2.991498107910156e+02, 2.9914990234375e+02, 2.991500244140625e+02, 2.991499938964844e+02, 2.991584777832031e+02, 2.991510009765625e+02, 2.991500549316406e+02, 2.991499328613281e+02, 2.991499633789062e+02, 2.991505432128906e+02, 2.991503295898438e+02, 2.991500244140625e+02, 2.991501770019531e+02, 2.991500854492188e+02, 2.991486511230469e+02, 2.991497802734375e+02, 2.991499938964844e+02, 2.991501159667969e+02, 2.991500244140625e+02]
-flo.TAirSou=[2.751499938964844e+02, 2.966685180664062e+02, 2.968204040527344e+02, 2.9678125e+02, 2.967568969726562e+02, 2.973287353515625e+02, 2.979941101074219e+02, 2.985895690917969e+02, 2.990951843261719e+02, 2.991501159667969e+02, 2.991510925292969e+02, 2.991513671875e+02, 2.991505432128906e+02, 2.991504821777344e+02, 2.991505737304688e+02, 2.991483764648438e+02, 2.991449279785156e+02, 2.988598022460938e+02, 2.988936157226562e+02, 2.989989929199219e+02, 2.990460510253906e+02, 2.987572326660156e+02, 2.986480102539062e+02, 2.987059631347656e+02, 2.986759338378906e+02, 2.989544982910156e+02, 2.991524658203125e+02, 2.991511840820312e+02, 2.991504516601562e+02, 2.991499633789062e+02, 2.991499938964844e+02, 2.991502075195312e+02, 2.991492309570312e+02, 2.991498413085938e+02, 2.991500244140625e+02, 2.991498718261719e+02, 2.991481323242188e+02, 2.9914990234375e+02, 2.991488647460938e+02, 2.991499328613281e+02, 2.9914990234375e+02, 2.991492614746094e+02, 2.991493225097656e+02, 2.991498718261719e+02, 2.991498413085938e+02, 2.99150390625e+02, 2.991622009277344e+02, 2.991510314941406e+02, 2.991512756347656e+02, 2.991498107910156e+02, 2.991498413085938e+02, 2.991488342285156e+02, 2.991495361328125e+02, 2.991496276855469e+02, 2.991517944335938e+02, 2.991499938964844e+02, 2.991451416015625e+02, 2.991493530273438e+02, 2.991487121582031e+02, 2.991500854492188e+02, 2.991499938964844e+02, 2.991487731933594e+02, 2.991495666503906e+02, 2.991498413085938e+02, 2.991499633789062e+02, 2.991502685546875e+02, 2.991614379882812e+02, 2.991521606445312e+02, 2.991506652832031e+02, 2.991497497558594e+02, 2.9914990234375e+02, 2.991495056152344e+02, 2.991490173339844e+02, 2.991516723632812e+02, 2.9914990234375e+02, 2.991490783691406e+02, 2.991444091796875e+02, 2.991492919921875e+02, 2.991494750976562e+02, 2.991499633789062e+02, 2.991499328613281e+02, 2.991484680175781e+02, 2.991495056152344e+02, 2.991496276855469e+02, 2.991498718261719e+02, 2.991503295898438e+02, 2.991605834960938e+02, 2.99153076171875e+02, 2.991507568359375e+02, 2.991499328613281e+02, 2.991511535644531e+02, 2.991497192382812e+02, 2.991521301269531e+02, 2.991469421386719e+02, 2.991497192382812e+02, 2.991499938964844e+02, 2.991445617675781e+02, 2.991491394042969e+02, 2.991498107910156e+02, 2.991502685546875e+02, 2.991499938964844e+02]
-flo.TAirNor=[2.751499938964844e+02, 2.966736145019531e+02, 2.968299560546875e+02, 2.967989196777344e+02, 2.968220520019531e+02, 2.9749658203125e+02, 2.980355834960938e+02, 2.985643920898438e+02, 2.989973754882812e+02, 2.991502380371094e+02, 2.991502685546875e+02, 2.991512756347656e+02, 2.991505737304688e+02, 2.991503295898438e+02, 2.991499938964844e+02, 2.991495971679688e+02, 2.991470642089844e+02, 2.987695922851562e+02, 2.988095703125e+02, 2.989317321777344e+02, 2.989888610839844e+02, 2.987062377929688e+02, 2.986165466308594e+02, 2.986667175292969e+02, 2.987210693359375e+02, 2.990945739746094e+02, 2.991515502929688e+02, 2.991510314941406e+02, 2.991502990722656e+02, 2.991501159667969e+02, 2.991500549316406e+02, 2.991512451171875e+02, 2.991505126953125e+02, 2.9914990234375e+02, 2.991499938964844e+02, 2.991497802734375e+02, 2.991431579589844e+02, 2.991493835449219e+02, 2.991497497558594e+02, 2.991499328613281e+02, 2.991498718261719e+02, 2.991494140625e+02, 2.991494445800781e+02, 2.991498718261719e+02, 2.991496276855469e+02, 2.99150390625e+02, 2.991608276367188e+02, 2.991525573730469e+02, 2.991502380371094e+02, 2.991499633789062e+02, 2.991499633789062e+02, 2.991510009765625e+02, 2.991509399414062e+02, 2.991498718261719e+02, 2.99150146484375e+02, 2.991499633789062e+02, 2.9914404296875e+02, 2.991494445800781e+02, 2.991488037109375e+02, 2.991500549316406e+02, 2.991499938964844e+02, 2.9914892578125e+02, 2.991495971679688e+02, 2.991498413085938e+02, 2.99149658203125e+02, 2.991502380371094e+02, 2.991603393554688e+02, 2.991520080566406e+02, 2.991505126953125e+02, 2.991499938964844e+02, 2.991499938964844e+02, 2.991510620117188e+02, 2.991504821777344e+02, 2.991502075195312e+02, 2.991498413085938e+02, 2.9914990234375e+02, 2.991424560546875e+02, 2.991493225097656e+02, 2.991494750976562e+02, 2.991499633789062e+02, 2.991499328613281e+02, 2.991486511230469e+02, 2.991495666503906e+02, 2.99149658203125e+02, 2.991497497558594e+02, 2.991502990722656e+02, 2.991595458984375e+02, 2.991525268554688e+02, 2.99150390625e+02, 2.991500854492188e+02, 2.991499633789062e+02, 2.991507568359375e+02, 2.991509399414062e+02, 2.991497497558594e+02, 2.991500549316406e+02, 2.991499633789062e+02, 2.991450805664062e+02, 2.991492309570312e+02, 2.991498413085938e+02, 2.991502380371094e+02, 2.991499938964844e+02]
-flo.TAirEas=[2.751499938964844e+02, 2.967301635742188e+02, 2.967804260253906e+02, 2.967857666015625e+02, 2.969380187988281e+02, 2.9805908203125e+02, 2.987919616699219e+02, 2.99152587890625e+02, 2.991516418457031e+02, 2.991506042480469e+02, 2.991502685546875e+02, 2.991510620117188e+02, 2.991504821777344e+02, 2.991501770019531e+02, 2.991500244140625e+02, 2.991495971679688e+02, 2.991466369628906e+02, 2.99010009765625e+02, 2.990578002929688e+02, 2.991478881835938e+02, 2.991497192382812e+02, 2.989423828125e+02, 2.988452453613281e+02, 2.988761596679688e+02, 2.989669494628906e+02, 2.991502075195312e+02, 2.991604309082031e+02, 2.991514892578125e+02, 2.991493835449219e+02, 2.991507263183594e+02, 2.991501159667969e+02, 2.991511840820312e+02, 2.991502380371094e+02, 2.991498107910156e+02, 2.991500549316406e+02, 2.991498718261719e+02, 2.991482238769531e+02, 2.991492309570312e+02, 2.991497497558594e+02, 2.991499633789062e+02, 2.9914990234375e+02, 2.991490478515625e+02, 2.99149169921875e+02, 2.991498413085938e+02, 2.991492614746094e+02, 2.991499938964844e+02, 2.991780090332031e+02, 2.991544189453125e+02, 2.99149658203125e+02, 2.991508483886719e+02, 2.991499938964844e+02, 2.99150634765625e+02, 2.991506652832031e+02, 2.991495666503906e+02, 2.991502075195312e+02, 2.991499633789062e+02, 2.991452331542969e+02, 2.991492614746094e+02, 2.991486511230469e+02, 2.991501159667969e+02, 2.991500244140625e+02, 2.991486206054688e+02, 2.991494445800781e+02, 2.991498107910156e+02, 2.991492004394531e+02, 2.991497802734375e+02, 2.991752319335938e+02, 2.991533813476562e+02, 2.991499328613281e+02, 2.991509704589844e+02, 2.991500244140625e+02, 2.991507873535156e+02, 2.99150146484375e+02, 2.991501770019531e+02, 2.991499328613281e+02, 2.991499633789062e+02, 2.991452941894531e+02, 2.991492004394531e+02, 2.991494750976562e+02, 2.991499938964844e+02, 2.991499328613281e+02, 2.991483154296875e+02, 2.991494140625e+02, 2.991495971679688e+02, 2.991495361328125e+02, 2.991497192382812e+02, 2.991656494140625e+02, 2.991505432128906e+02, 2.991501159667969e+02, 2.991507263183594e+02, 2.991500244140625e+02, 2.991504211425781e+02, 2.991506958007812e+02, 2.991497192382812e+02, 2.991501159667969e+02, 2.991499938964844e+02, 2.991445922851562e+02, 2.991493225097656e+02, 2.991498107910156e+02, 2.991502990722656e+02, 2.991499938964844e+02]
-flo.TAirWes=[2.751499938964844e+02, 2.969512634277344e+02, 2.971341857910156e+02, 2.970968322753906e+02, 2.970584716796875e+02, 2.975748901367188e+02, 2.981943359375e+02, 2.987444763183594e+02, 2.991542663574219e+02, 2.991502075195312e+02, 2.991502685546875e+02, 2.991557006835938e+02, 2.991547546386719e+02, 2.991499633789062e+02, 2.99150390625e+02, 2.991496887207031e+02, 2.991460876464844e+02, 2.990650634765625e+02, 2.990915832519531e+02, 2.991503601074219e+02, 2.991497802734375e+02, 2.989787902832031e+02, 2.988846435546875e+02, 2.989140319824219e+02, 2.9888037109375e+02, 2.990801086425781e+02, 2.991522521972656e+02, 2.991520080566406e+02, 2.99150634765625e+02, 2.991492309570312e+02, 2.991504516601562e+02, 2.991589660644531e+02, 2.991561889648438e+02, 2.991511840820312e+02, 2.991485900878906e+02, 2.991495666503906e+02, 2.991295471191406e+02, 2.99148681640625e+02, 2.991499938964844e+02, 2.991498107910156e+02, 2.991498718261719e+02, 2.9914892578125e+02, 2.991490478515625e+02, 2.991498413085938e+02, 2.9914990234375e+02, 2.991504211425781e+02, 2.991617126464844e+02, 2.991558227539062e+02, 2.991478271484375e+02, 2.991505432128906e+02, 2.991503295898438e+02, 2.991588134765625e+02, 2.9915966796875e+02, 2.991507568359375e+02, 2.991483764648438e+02, 2.991496276855469e+02, 2.991377868652344e+02, 2.991489868164062e+02, 2.991486511230469e+02, 2.991501159667969e+02, 2.991500244140625e+02, 2.991485290527344e+02, 2.991492919921875e+02, 2.991497192382812e+02, 2.991503295898438e+02, 2.99150390625e+02, 2.991612854003906e+02, 2.991529541015625e+02, 2.991506042480469e+02, 2.991487426757812e+02, 2.991500244140625e+02, 2.99160888671875e+02, 2.991582336425781e+02, 2.991498718261719e+02, 2.991501159667969e+02, 2.991494750976562e+02, 2.991333923339844e+02, 2.991488342285156e+02, 2.991487121582031e+02, 2.991501159667969e+02, 2.991498718261719e+02, 2.991482238769531e+02, 2.991493225097656e+02, 2.991495666503906e+02, 2.991495666503906e+02, 2.991504821777344e+02, 2.991604919433594e+02, 2.991527404785156e+02, 2.991533813476562e+02, 2.991500549316406e+02, 2.991499633789062e+02, 2.991571350097656e+02, 2.991585998535156e+02, 2.991498413085938e+02, 2.991495056152344e+02, 2.991499328613281e+02, 2.991405639648438e+02, 2.991490478515625e+02, 2.991498107910156e+02, 2.991503295898438e+02, 2.991500244140625e+02]
+flo.TAirCor=[2.751499938964844e+02, 2.96810546875e+02, 2.969786376953125e+02, 2.969801330566406e+02, 2.969826354980469e+02, 2.975477600097656e+02, 2.981378784179688e+02, 2.985168762207031e+02, 2.988031616210938e+02, 2.989195861816406e+02, 2.988462829589844e+02, 2.988680725097656e+02, 2.988973388671875e+02, 2.989308776855469e+02, 2.988983459472656e+02, 2.989064025878906e+02, 2.989188232421875e+02, 2.987863159179688e+02, 2.988075561523438e+02, 2.988676452636719e+02, 2.988944091796875e+02, 2.987791748046875e+02, 2.987015075683594e+02, 2.987116088867188e+02, 2.986995849609375e+02, 2.988731689453125e+02, 2.989486389160156e+02, 2.989548645019531e+02, 2.9896044921875e+02, 2.989628295898438e+02, 2.989663696289062e+02, 2.989774475097656e+02, 2.989958190917969e+02, 2.990186767578125e+02, 2.990415344238281e+02, 2.990823974609375e+02, 2.990931396484375e+02, 2.990815124511719e+02, 2.990875549316406e+02, 2.990950317382812e+02, 2.991499938964844e+02, 2.991499633789062e+02, 2.991499328613281e+02, 2.991499938964844e+02, 2.991499938964844e+02, 2.991499938964844e+02, 2.991543884277344e+02, 2.991510925292969e+02, 2.991500549316406e+02, 2.991499328613281e+02, 2.991499633789062e+02, 2.991507568359375e+02, 2.991504211425781e+02, 2.991500244140625e+02, 2.99150146484375e+02, 2.991500854492188e+02, 2.991485900878906e+02, 2.991497802734375e+02, 2.991499938964844e+02, 2.991500549316406e+02, 2.991500244140625e+02, 2.991496276855469e+02, 2.991498107910156e+02, 2.991499938964844e+02, 2.991500244140625e+02, 2.991499938964844e+02, 2.991570129394531e+02, 2.99151123046875e+02, 2.991500549316406e+02, 2.991499633789062e+02, 2.991499938964844e+02, 2.991506652832031e+02, 2.991503601074219e+02, 2.991500244140625e+02, 2.991501770019531e+02, 2.991500549316406e+02, 2.991484069824219e+02, 2.991496276855469e+02, 2.991499633789062e+02, 2.991500549316406e+02, 2.991500244140625e+02, 2.991495971679688e+02, 2.991498107910156e+02, 2.991499938964844e+02, 2.991500244140625e+02, 2.991499938964844e+02, 2.99158447265625e+02, 2.991509094238281e+02, 2.991500549316406e+02, 2.991499328613281e+02, 2.991499938964844e+02, 2.991505432128906e+02, 2.991503295898438e+02, 2.991500854492188e+02, 2.991501770019531e+02, 2.991500854492188e+02, 2.991486206054688e+02, 2.991497497558594e+02, 2.991499633789062e+02, 2.991500854492188e+02, 2.991500244140625e+02]
+flo.TAirSou=[2.751499938964844e+02, 2.9666845703125e+02, 2.968203430175781e+02, 2.967812194824219e+02, 2.967568664550781e+02, 2.973287048339844e+02, 2.979940490722656e+02, 2.985895385742188e+02, 2.990951538085938e+02, 2.991500854492188e+02, 2.991510620117188e+02, 2.991513671875e+02, 2.991505432128906e+02, 2.991504821777344e+02, 2.991505737304688e+02, 2.991483764648438e+02, 2.991449279785156e+02, 2.988597717285156e+02, 2.988936157226562e+02, 2.989989929199219e+02, 2.990460510253906e+02, 2.987572326660156e+02, 2.986480102539062e+02, 2.987059326171875e+02, 2.986759338378906e+02, 2.989544982910156e+02, 2.991524047851562e+02, 2.991515197753906e+02, 2.991504211425781e+02, 2.991499633789062e+02, 2.991500549316406e+02, 2.991502075195312e+02, 2.991492309570312e+02, 2.991498718261719e+02, 2.991500244140625e+02, 2.991498718261719e+02, 2.991481323242188e+02, 2.9914990234375e+02, 2.991488647460938e+02, 2.991499328613281e+02, 2.9914990234375e+02, 2.991492614746094e+02, 2.991494140625e+02, 2.991498718261719e+02, 2.991498413085938e+02, 2.99150390625e+02, 2.991622009277344e+02, 2.991510620117188e+02, 2.991510314941406e+02, 2.991498107910156e+02, 2.991498107910156e+02, 2.991488342285156e+02, 2.991495361328125e+02, 2.991498413085938e+02, 2.991517944335938e+02, 2.991499938964844e+02, 2.991451416015625e+02, 2.991495361328125e+02, 2.991492004394531e+02, 2.991500244140625e+02, 2.991499633789062e+02, 2.991487731933594e+02, 2.991495666503906e+02, 2.991498107910156e+02, 2.991499633789062e+02, 2.991502685546875e+02, 2.991614990234375e+02, 2.991524047851562e+02, 2.991506958007812e+02, 2.991497497558594e+02, 2.991499328613281e+02, 2.991494750976562e+02, 2.991490173339844e+02, 2.991516723632812e+02, 2.9914990234375e+02, 2.991490783691406e+02, 2.991444091796875e+02, 2.991491088867188e+02, 2.991494750976562e+02, 2.991500244140625e+02, 2.991499328613281e+02, 2.991484680175781e+02, 2.991495361328125e+02, 2.991498413085938e+02, 2.991498718261719e+02, 2.991503295898438e+02, 2.991605529785156e+02, 2.991529235839844e+02, 2.991507568359375e+02, 2.991499633789062e+02, 2.991512756347656e+02, 2.991496887207031e+02, 2.991521301269531e+02, 2.991468505859375e+02, 2.991497192382812e+02, 2.991499938964844e+02, 2.991445007324219e+02, 2.991490783691406e+02, 2.991498107910156e+02, 2.991502075195312e+02, 2.991499938964844e+02]
+flo.TAirNor=[2.751499938964844e+02, 2.966735534667969e+02, 2.968299255371094e+02, 2.967988891601562e+02, 2.96822021484375e+02, 2.974965515136719e+02, 2.980355529785156e+02, 2.985643615722656e+02, 2.989973449707031e+02, 2.991502380371094e+02, 2.991502075195312e+02, 2.991513061523438e+02, 2.991505737304688e+02, 2.991502990722656e+02, 2.991499938964844e+02, 2.991495971679688e+02, 2.991470642089844e+02, 2.987695922851562e+02, 2.988095703125e+02, 2.989317321777344e+02, 2.989888610839844e+02, 2.987062072753906e+02, 2.986165466308594e+02, 2.986667175292969e+02, 2.987210693359375e+02, 2.990945739746094e+02, 2.991515197753906e+02, 2.991513366699219e+02, 2.991502990722656e+02, 2.991501159667969e+02, 2.991500854492188e+02, 2.991512756347656e+02, 2.991505126953125e+02, 2.9914990234375e+02, 2.991499938964844e+02, 2.991497802734375e+02, 2.991432495117188e+02, 2.991493530273438e+02, 2.991497497558594e+02, 2.991499328613281e+02, 2.991498718261719e+02, 2.991494140625e+02, 2.991495056152344e+02, 2.991498718261719e+02, 2.99149658203125e+02, 2.99150390625e+02, 2.991608581542969e+02, 2.991525573730469e+02, 2.991502075195312e+02, 2.991499633789062e+02, 2.991499328613281e+02, 2.991509704589844e+02, 2.991509399414062e+02, 2.991498718261719e+02, 2.99150146484375e+02, 2.991499633789062e+02, 2.9914404296875e+02, 2.991495971679688e+02, 2.991492309570312e+02, 2.991499938964844e+02, 2.991499633789062e+02, 2.9914892578125e+02, 2.991496276855469e+02, 2.991498107910156e+02, 2.991496887207031e+02, 2.991502380371094e+02, 2.991603698730469e+02, 2.991522521972656e+02, 2.991505126953125e+02, 2.991499938964844e+02, 2.991499938964844e+02, 2.991510925292969e+02, 2.991504821777344e+02, 2.991502075195312e+02, 2.991498413085938e+02, 2.9914990234375e+02, 2.991424560546875e+02, 2.991491394042969e+02, 2.991495056152344e+02, 2.991499938964844e+02, 2.991499328613281e+02, 2.991486511230469e+02, 2.991495971679688e+02, 2.991498413085938e+02, 2.991497192382812e+02, 2.991502990722656e+02, 2.991595153808594e+02, 2.991523742675781e+02, 2.99150390625e+02, 2.991500854492188e+02, 2.991499938964844e+02, 2.991507568359375e+02, 2.991509399414062e+02, 2.991497497558594e+02, 2.991500549316406e+02, 2.991499633789062e+02, 2.9914501953125e+02, 2.99149169921875e+02, 2.991498107910156e+02, 2.991502075195312e+02, 2.991499938964844e+02]
+flo.TAirEas=[2.751499938964844e+02, 2.967301025390625e+02, 2.967803955078125e+02, 2.967857666015625e+02, 2.9693798828125e+02, 2.9805908203125e+02, 2.987919311523438e+02, 2.991527404785156e+02, 2.991516418457031e+02, 2.99150634765625e+02, 2.991502380371094e+02, 2.991510925292969e+02, 2.991504821777344e+02, 2.991502075195312e+02, 2.991500244140625e+02, 2.991495971679688e+02, 2.991466674804688e+02, 2.990100402832031e+02, 2.990578002929688e+02, 2.991478881835938e+02, 2.991497192382812e+02, 2.989423828125e+02, 2.988452453613281e+02, 2.988761596679688e+02, 2.989669494628906e+02, 2.991502075195312e+02, 2.991602172851562e+02, 2.991520385742188e+02, 2.991494445800781e+02, 2.991507263183594e+02, 2.991501159667969e+02, 2.991511840820312e+02, 2.991502380371094e+02, 2.991498413085938e+02, 2.991500854492188e+02, 2.991498718261719e+02, 2.991482238769531e+02, 2.991492309570312e+02, 2.991497497558594e+02, 2.991499633789062e+02, 2.9914990234375e+02, 2.991490478515625e+02, 2.991492919921875e+02, 2.991498413085938e+02, 2.991492614746094e+02, 2.991499938964844e+02, 2.991780090332031e+02, 2.991544494628906e+02, 2.991496887207031e+02, 2.991508483886719e+02, 2.991499938964844e+02, 2.99150634765625e+02, 2.991506652832031e+02, 2.991498413085938e+02, 2.991502380371094e+02, 2.991499633789062e+02, 2.991452331542969e+02, 2.991494445800781e+02, 2.991492004394531e+02, 2.991500244140625e+02, 2.991499633789062e+02, 2.991486206054688e+02, 2.991494750976562e+02, 2.991498107910156e+02, 2.991492919921875e+02, 2.991497802734375e+02, 2.991753845214844e+02, 2.9915380859375e+02, 2.9914990234375e+02, 2.991510314941406e+02, 2.991500244140625e+02, 2.991507873535156e+02, 2.99150146484375e+02, 2.991501770019531e+02, 2.991499328613281e+02, 2.991499633789062e+02, 2.99145263671875e+02, 2.991489868164062e+02, 2.991494750976562e+02, 2.991500549316406e+02, 2.991499328613281e+02, 2.991483154296875e+02, 2.991494445800781e+02, 2.991498413085938e+02, 2.991495056152344e+02, 2.991497192382812e+02, 2.991655883789062e+02, 2.991505432128906e+02, 2.991501159667969e+02, 2.991506958007812e+02, 2.991500244140625e+02, 2.991504211425781e+02, 2.991506958007812e+02, 2.991495971679688e+02, 2.991501159667969e+02, 2.991499938964844e+02, 2.9914453125e+02, 2.991492614746094e+02, 2.991498107910156e+02, 2.991502380371094e+02, 2.991499938964844e+02]
+flo.TAirWes=[2.751499938964844e+02, 2.96951171875e+02, 2.971341247558594e+02, 2.970968017578125e+02, 2.970584411621094e+02, 2.975748596191406e+02, 2.981943054199219e+02, 2.987444458007812e+02, 2.991542053222656e+02, 2.991501770019531e+02, 2.991502075195312e+02, 2.991558532714844e+02, 2.991547546386719e+02, 2.991500854492188e+02, 2.991504211425781e+02, 2.991496887207031e+02, 2.991461181640625e+02, 2.990650329589844e+02, 2.990915832519531e+02, 2.991503601074219e+02, 2.991497802734375e+02, 2.989787902832031e+02, 2.988846435546875e+02, 2.989140014648438e+02, 2.9888037109375e+02, 2.990801086425781e+02, 2.991522216796875e+02, 2.991524047851562e+02, 2.991506042480469e+02, 2.991492309570312e+02, 2.991505126953125e+02, 2.991589965820312e+02, 2.991561279296875e+02, 2.991510314941406e+02, 2.991486206054688e+02, 2.991495971679688e+02, 2.991297607421875e+02, 2.991486206054688e+02, 2.991499633789062e+02, 2.991498107910156e+02, 2.991498718261719e+02, 2.9914892578125e+02, 2.991492004394531e+02, 2.991498413085938e+02, 2.9914990234375e+02, 2.991504211425781e+02, 2.991617126464844e+02, 2.991558227539062e+02, 2.991478271484375e+02, 2.991505432128906e+02, 2.991503295898438e+02, 2.991586608886719e+02, 2.9915966796875e+02, 2.991501770019531e+02, 2.991484069824219e+02, 2.991496276855469e+02, 2.991377868652344e+02, 2.991492614746094e+02, 2.991492004394531e+02, 2.991500244140625e+02, 2.991499633789062e+02, 2.991485290527344e+02, 2.991492919921875e+02, 2.991496887207031e+02, 2.991503295898438e+02, 2.99150390625e+02, 2.991613464355469e+02, 2.991532287597656e+02, 2.991506042480469e+02, 2.991487426757812e+02, 2.991500244140625e+02, 2.991611022949219e+02, 2.99158203125e+02, 2.991497802734375e+02, 2.991501159667969e+02, 2.991494750976562e+02, 2.991333618164062e+02, 2.991484680175781e+02, 2.991487121582031e+02, 2.991501770019531e+02, 2.991498718261719e+02, 2.991482238769531e+02, 2.991493530273438e+02, 2.991498413085938e+02, 2.991495666503906e+02, 2.991504821777344e+02, 2.991604614257812e+02, 2.99152587890625e+02, 2.991533508300781e+02, 2.991500549316406e+02, 2.991499938964844e+02, 2.991571960449219e+02, 2.991585388183594e+02, 2.991503601074219e+02, 2.991495056152344e+02, 2.9914990234375e+02, 2.991405029296875e+02, 2.991489562988281e+02, 2.991498107910156e+02, 2.991502685546875e+02, 2.991500244140625e+02]
 hea[1].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 hea[2].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 hea[3].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 hea[4].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 hea[5].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-flo.sou.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.316979675292969e+02, -5.886366577148438e+02, -7.237013549804688e+02, -9.045046997070312e+02, -9.706063842773438e+02, -9.624279174804688e+02, -4.4530810546875e+02, -1.957805480957031e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -6.366102600097656e+01, -2.540437164306641e+02, -4.663981323242188e+02, -7.2501953125e+02, -9.089765014648438e+02, -1.0128056640625e+03, -9.643187255859375e+02, -8.71823974609375e+02, -8.563888549804688e+02, -7.460828247070312e+02, -5.703788452148438e+02, -4.735618591308594e+02, -3.936082153320312e+02, -3.162367248535156e+02, -3.0973828125e+02, -2.426396026611328e+02, -1.747647094726562e+02, -1.085196762084961e+02, -7.225991821289062e+01, -2.308537750244141e+02, -1.400100952148438e+03, -1.898425537109375e+03, -2.222435302734375e+03, -2.54405859375e+03, -2.924488525390625e+03, -2.906344970703125e+03, -2.837924072265625e+03, -2.776365234375e+03, -2.216437744140625e+03, -1.424178344726562e+03, -1.132210083007812e+03, -9.43125e+02, -7.57805908203125e+02, -5.9246923828125e+02, -5.113541870117188e+02, -4.1173583984375e+02, -3.263892517089844e+02, -2.5379833984375e+02, -1.9717138671875e+02, -3.559554443359375e+02, -1.482555908203125e+03, -1.928527954101562e+03, -2.24897607421875e+03, -2.59699072265625e+03, -2.656242919921875e+03, -2.90894970703125e+03, -2.829197509765625e+03, -2.96367529296875e+03, -2.2539716796875e+03, -1.707789306640625e+03, -1.145263427734375e+03, -9.609161376953125e+02, -7.892099609375e+02, -6.540231323242188e+02, -5.449354248046875e+02, -4.354923095703125e+02, -3.201086730957031e+02, -2.483349151611328e+02, -2.006630401611328e+02, -3.378695678710938e+02, -1.515712158203125e+03, -1.928792602539062e+03, -2.30659716796875e+03, -2.636208984375e+03, -2.802879150390625e+03, -3.333650390625e+03, -3.5103046875e+03, -3.198216796875e+03, -2.030043090820312e+03, -1.461869018554688e+03, -1.094608032226562e+03, -7.5326806640625e+02, -6.041715698242188e+02, -4.9992333984375e+02, -4.453704528808594e+02]
-flo.eas.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -7.359207916259766e+01, -4.399565734863281e+02, -3.926595153808594e+02, -2.894987182617188e+02, -3.659395446777344e+02, -4.101295776367188e+02, -4.304210205078125e+02, -3.411317443847656e+02, -2.118855895996094e+02, -1.357461242675781e+02, 0e+00, 0e+00, 0e+00, -2.089206123352051e+01, 0e+00, 0e+00, 0e+00, 0e+00, -4.672204284667969e+02, -1.125097290039062e+03, -1.378304809570312e+03, -1.156139282226562e+03, -7.179243774414062e+02, -6.459124755859375e+02, -6.994120483398438e+02, -7.398319702148438e+02, -6.940343017578125e+02, -6.540227661132812e+02, -5.737650146484375e+02, -4.807029113769531e+02, -4.093043823242188e+02, -3.518399353027344e+02, -3.082569885253906e+02, -2.980373229980469e+02, -2.502693328857422e+02, -1.994525604248047e+02, -1.510573425292969e+02, -1.598998565673828e+02, -4.368641967773438e+02, -1.634115112304688e+03, -2.19676025390625e+03, -2.138497802734375e+03, -1.756271484375e+03, -1.620893432617188e+03, -1.7764619140625e+03, -1.81399365234375e+03, -1.794753051757812e+03, -1.299861206054688e+03, -9.636002197265625e+02, -7.974076538085938e+02, -6.809140625e+02, -5.640701904296875e+02, -4.594617004394531e+02, -4.039576721191406e+02, -3.373806457519531e+02, -2.79537841796875e+02, -2.298157043457031e+02, -2.333995361328125e+02, -5.65248779296875e+02, -1.7989794921875e+03, -2.30592626953125e+03, -2.219669677734375e+03, -1.789820556640625e+03, -1.614053588867188e+03, -1.761867797851562e+03, -1.780769165039062e+03, -1.7859794921875e+03, -1.28211083984375e+03, -9.95361572265625e+02, -7.965037841796875e+02, -6.88635986328125e+02, -5.806340942382812e+02, -4.926243896484375e+02, -4.210700378417969e+02, -3.492311706542969e+02, -2.74257568359375e+02, -2.251579437255859e+02, -2.383550262451172e+02, -6.0385546875e+02, -1.738915893554688e+03, -1.874809326171875e+03, -1.86694287109375e+03, -1.768838012695312e+03, -1.611216064453125e+03, -1.774704833984375e+03, -1.837140502929688e+03, -1.795227294921875e+03, -1.293531127929688e+03, -9.772740478515625e+02, -7.622857055664062e+02, -5.449808959960938e+02, -4.622515563964844e+02, -3.937794799804688e+02, -3.550203857421875e+02]
-flo.nor.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.760588989257812e+02, -1.074691925048828e+02, -2.692880554199219e+02, -3.599087219238281e+02, -4.204377746582031e+02, -2.932355346679688e+02, -1.052149505615234e+02, -3.22727370262146e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.119396591186523e+01, -2.101487884521484e+02, -3.42204833984375e+02, -4.065904235839844e+02, -4.720028686523438e+02, -5.831064453125e+02, -6.752167358398438e+02, -6.666822509765625e+02, -6.725580444335938e+02, -7.3096533203125e+02, -5.133571166992188e+02, -3.864778442382812e+02, -3.130162353515625e+02, -2.646390686035156e+02, -2.706283874511719e+02, -2.173856048583984e+02, -1.562340393066406e+02, -9.82213134765625e+01, -8.960043334960938e+01, -2.729890441894531e+02, -1.337475341796875e+03, -1.807141235351562e+03, -2.036326293945312e+03, -2.16972998046875e+03, -2.12229833984375e+03, -2.4126865234375e+03, -2.505404296875e+03, -2.531009521484375e+03, -1.770220458984375e+03, -1.335665771484375e+03, -1.03746240234375e+03, -8.58838623046875e+02, -6.895921630859375e+02, -5.39656494140625e+02, -4.676317443847656e+02, -3.785246887207031e+02, -3.0074609375e+02, -2.346285858154297e+02, -2.124836730957031e+02, -4.169828491210938e+02, -1.435479614257812e+03, -1.843861694335938e+03, -2.07227587890625e+03, -2.202073486328125e+03, -2.10970166015625e+03, -2.3888798828125e+03, -2.454449462890625e+03, -2.520310791015625e+03, -1.75208837890625e+03, -1.42741064453125e+03, -1.052887939453125e+03, -8.72953857421875e+02, -7.153203735351562e+02, -5.93130615234375e+02, -4.938804016113281e+02, -3.965790100097656e+02, -2.9120458984375e+02, -2.262118835449219e+02, -2.158314056396484e+02, -4.114041137695312e+02, -1.468051879882812e+03, -1.839766479492188e+03, -2.1391884765625e+03, -2.34209521484375e+03, -2.1911298828125e+03, -2.484431884765625e+03, -2.613720458984375e+03, -2.597234375e+03, -1.820616455078125e+03, -1.342504760742188e+03, -1.001347473144531e+03, -6.882442626953125e+02, -5.544973754882812e+02, -4.608647155761719e+02, -4.136322937011719e+02]
-flo.wes.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -3.282086181640625e+01, -2.274191741943359e+02, -1.933320159912109e+02, -3.265724487304688e+02, -6.712332153320312e+02, -1.01485498046875e+03, -5.68362060546875e+02, -2.667804565429688e+02, -1.640818634033203e+02, 0e+00, 0e+00, -1.95876293182373e+01, -4.208361434936523e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -9.687468719482422e+01, -2.8776806640625e+02, -4.706141967773438e+02, -4.515375366210938e+02, -5.93493408203125e+02, -7.666190185546875e+02, -1.2311494140625e+03, -1.700765258789062e+03, -1.76884033203125e+03, -1.457975341796875e+03, -6.936388549804688e+02, -4.969252319335938e+02, -4.290177612304688e+02, -4.060668640136719e+02, -3.722770080566406e+02, -3.20036865234375e+02, -2.636907043457031e+02, -2.096526489257812e+02, -1.756862030029297e+02, -2.605287475585938e+02, -9.308750610351562e+02, -1.312908569335938e+03, -1.51565185546875e+03, -1.589121948242188e+03, -1.537487182617188e+03, -1.868943359375e+03, -2.451093017578125e+03, -2.901549072265625e+03, -2.1562216796875e+03, -1.56892138671875e+03, -1.016588012695312e+03, -7.427633666992188e+02, -6.203649291992188e+02, -5.139266357421875e+02, -4.564937744140625e+02, -3.8226806640625e+02, -3.202247619628906e+02, -2.549016265869141e+02, -2.235933685302734e+02, -3.046842651367188e+02, -9.828472900390625e+02, -1.291714965820312e+03, -1.491482788085938e+03, -1.632212768554688e+03, -1.600949340820312e+03, -1.861521850585938e+03, -2.473458740234375e+03, -2.89416064453125e+03, -2.402424560546875e+03, -1.743835571289062e+03, -1.009886108398438e+03, -7.810377197265625e+02, -6.640484619140625e+02, -5.790233764648438e+02, -4.982658081054688e+02, -4.190668334960938e+02, -3.388004455566406e+02, -2.841320190429688e+02, -2.359419708251953e+02, -3.035256958007812e+02, -9.894425659179688e+02, -1.22880859375e+03, -1.456598022460938e+03, -1.561906982421875e+03, -1.47322119140625e+03, -1.711910522460938e+03, -2.2539384765625e+03, -2.78098388671875e+03, -2.157970458984375e+03, -1.348031616210938e+03, -8.837451171875e+02, -6.066788330078125e+02, -5.110842895507812e+02, -4.335971374511719e+02, -3.954605102539062e+02]
-flo.cor.heaPorAir.Q_flow=[1.0476017578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.714303207397461e+01, -6.151461791992188e+01, -5.422894668579102e+01, -4.115033721923828e+01, -4.962534713745117e+01, -9.848822021484375e+01, -1.177520141601562e+03, -1.453423950195312e+03, -1.576753173828125e+03, -1.64923681640625e+03, -1.431708129882812e+03, -1.769576782226562e+03, -1.836121459960938e+03, -1.89801318359375e+03, -1.044578247070312e+03, -6.840196533203125e+02, -5.422164306640625e+02, -4.793162536621094e+02, -4.041305236816406e+02, -3.416438903808594e+02, -2.864349365234375e+02, -2.499095764160156e+02, -2.209002532958984e+02, -1.9084033203125e+02, -1.812197875976562e+02, -2.147003021240234e+02, -1.291753540039062e+03, -1.559302124023438e+03, -1.666916625976562e+03, -1.726569458007812e+03, -1.492622314453125e+03, -1.816983642578125e+03, -1.876700439453125e+03, -1.93479248046875e+03, -1.081600708007812e+03, -7.269964599609375e+02, -5.8080615234375e+02, -5.070497436523438e+02, -4.284241638183594e+02, -3.627909240722656e+02, -3.057232360839844e+02, -2.661144409179688e+02, -2.326496276855469e+02, -2.035986785888672e+02, -1.9428662109375e+02, -2.314613952636719e+02, -1.318188354492188e+03, -1.571338256835938e+03, -1.677104736328125e+03, -1.747679565429688e+03, -1.5142119140625e+03, -1.838814208984375e+03, -1.892577514648438e+03, -1.94122314453125e+03, -1.081499145507812e+03, -6.940634765625e+02, -5.461497192382812e+02, -4.819841003417969e+02, -4.016257934570312e+02, -3.373339538574219e+02, -2.815584716796875e+02]
-EHea.y=[0e+00, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07, 1.725833e+07]
-ECoo.y=[0e+00, -1.8761915e+06, -1.8761915e+06, -1.8761915e+06, -1.8761915e+06, -1.8761915e+06, -1.8761915e+06, -1.90640575e+06, -3.07501725e+06, -6.8429285e+06, -1.0969044e+07, -1.713124e+07, -2.5847186e+07, -3.7097948e+07, -4.7746716e+07, -5.472192e+07, -5.8370084e+07, -5.876942e+07, -5.876942e+07, -5.878636e+07, -5.9060572e+07, -5.9099992e+07, -5.9099992e+07, -5.9099992e+07, -5.9099992e+07, -5.9890256e+07, -6.3692148e+07, -7.1204736e+07, -8.1387936e+07, -9.1673232e+07, -1.02195352e+08, -1.1440188e+08, -1.2876584e+08, -1.45147952e+08, -1.62353584e+08, -1.78548832e+08, -1.91295712e+08, -1.9985568e+08, -2.06993856e+08, -2.12969888e+08, -2.18953776e+08, -2.24157408e+08, -2.28393936e+08, -2.31549456e+08, -2.33911008e+08, -2.37821936e+08, -2.50289232e+08, -2.83194336e+08, -3.22919936e+08, -3.64578624e+08, -4.05049248e+08, -4.51021984e+08, -4.98552512e+08, -5.4935552e+08, -5.91759488e+08, -6.21693312e+08, -6.44556864e+08, -6.61945408e+08, -6.76949248e+08, -6.88557632e+08, -6.98254976e+08, -7.0664864e+08, -7.1357248e+08, -7.19312896e+08, -7.2387648e+08, -7.30117952e+08, -7.4481664e+08, -7.795216e+08, -8.19902528e+08, -8.62554304e+08, -9.03253632e+08, -9.4872608e+08, -9.96451328e+08, -1.047165888e+09, -1.091245696e+09, -1.123177216e+09, -1.14756032e+09, -1.165421184e+09, -1.180904704e+09, -1.193354752e+09, -1.203890816e+09, -1.212826112e+09, -1.219923584e+09, -1.225716608e+09, -1.2304512e+09, -1.23680128e+09, -1.252130688e+09, -1.285667456e+09, -1.32477568e+09, -1.367095552e+09, -1.408106112e+09, -1.45503488e+09, -1.504801664e+09, -1.558636928e+09, -1.601901696e+09, -1.630807936e+09, -1.652753024e+09, -1.66808256e+09, -1.680298752e+09, -1.690224128e+09, -1.698742912e+09]
-coo[1].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.610365003347397e-02, 1.037702336907387e-01, 1.275806725025177e-01, 1.594543308019638e-01, 1.711073368787766e-01, 1.696655601263046e-01, 7.850297540426254e-02, 3.451397642493248e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.122274622321129e-02, 4.478514194488525e-02, 8.222091943025589e-02, 1.278130561113358e-01, 1.602426618337631e-01, 1.785466223955154e-01, 1.69998899102211e-01, 1.536930799484253e-01, 1.509720385074615e-01, 1.315262764692307e-01, 1.005515828728676e-01, 8.348380029201508e-02, 6.938884407281876e-02, 5.574909225106239e-02, 5.460348725318909e-02, 4.277472198009491e-02, 3.080911561846733e-02, 1.913083717226982e-02, 1.273863669484854e-02, 4.069700837135315e-02, 2.468225657939911e-01, 3.346717655658722e-01, 3.917911350727081e-01, 4.484898149967194e-01, 5.155555009841919e-01, 5.123569965362549e-01, 5.00295102596283e-01, 4.894429445266724e-01, 3.907338380813599e-01, 2.510671317577362e-01, 1.995963156223297e-01, 1.662626713514328e-01, 1.335929334163666e-01, 1.044458821415901e-01, 9.014617651700974e-02, 7.258454710245132e-02, 5.753887444734573e-02, 4.474188387393951e-02, 3.475916758179665e-02, 6.275106966495514e-02, 2.613584697246552e-01, 3.399784862995148e-01, 3.964700102806091e-01, 4.578211903572083e-01, 4.682667255401611e-01, 5.128161311149597e-01, 4.987567365169525e-01, 5.224636793136597e-01, 3.973506689071655e-01, 3.01064670085907e-01, 2.018974721431732e-01, 1.693990528583527e-01, 1.391291171312332e-01, 1.152971535921097e-01, 9.60661843419075e-02, 7.67725482583046e-02, 5.643167346715927e-02, 4.377874359488487e-02, 3.53747084736824e-02, 5.956272780895233e-02, 2.672035694122314e-01, 3.400251269340515e-01, 4.066279530525208e-01, 4.647349715232849e-01, 4.941171109676361e-01, 5.8768630027771e-01, 6.188285350799561e-01, 5.638108253479004e-01, 3.578744828701019e-01, 2.577115893363953e-01, 1.929674744606018e-01, 1.327929645776749e-01, 1.065088659524918e-01, 8.813104033470154e-02, 7.851396501064301e-02]
-coo[2].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.186986058950424e-02, 1.307448893785477e-01, 1.166893094778061e-01, 8.603230863809586e-02, 1.087487488985062e-01, 1.218810006976128e-01, 1.279111504554749e-01, 1.013764441013336e-01, 6.296748667955399e-02, 4.03406023979187e-02, 0e+00, 0e+00, 0e+00, 6.208635866641998e-03, 0e+00, 0e+00, 0e+00, 0e+00, 1.388470828533173e-01, 3.343528211116791e-01, 4.096002578735352e-01, 3.435778021812439e-01, 2.133504897356033e-01, 1.919502019882202e-01, 2.078490406274796e-01, 2.198609262704849e-01, 2.062509059906006e-01, 1.943604052066803e-01, 1.705096662044525e-01, 1.428537666797638e-01, 1.216357722878456e-01, 1.045586764812469e-01, 9.160682559013367e-02, 8.856979012489319e-02, 7.43742436170578e-02, 5.927267670631409e-02, 4.489074274897575e-02, 4.75185327231884e-02, 1.298259198665619e-01, 4.856211543083191e-01, 6.52826189994812e-01, 6.355119943618774e-01, 5.219231843948364e-01, 4.816919565200806e-01, 5.279232859611511e-01, 5.390768647193909e-01, 5.333589911460876e-01, 3.862886130809784e-01, 2.863596379756927e-01, 2.369710803031921e-01, 2.023518830537796e-01, 1.676285862922668e-01, 1.365413665771484e-01, 1.20046854019165e-01, 1.002617105841637e-01, 8.307217061519623e-02, 6.829590350389481e-02, 6.936093419790268e-02, 1.67978823184967e-01, 5.346150398254395e-01, 6.852678060531616e-01, 6.596343517303467e-01, 5.318931937217712e-01, 4.796593189239502e-01, 5.235862731933594e-01, 5.292032957077026e-01, 5.307517051696777e-01, 3.810136020183563e-01, 2.957983911037445e-01, 2.367024719715118e-01, 2.046466618776321e-01, 1.725509911775589e-01, 1.463965475559235e-01, 1.251322478055954e-01, 1.03783406317234e-01, 8.15029963850975e-02, 6.69117197394371e-02, 7.083358615636826e-02, 1.794518381357193e-01, 5.167654752731323e-01, 5.571498870849609e-01, 5.548121333122253e-01, 5.256576538085938e-01, 4.788160920143127e-01, 5.274011492729187e-01, 5.459555983543396e-01, 5.334998965263367e-01, 3.844074606895447e-01, 2.90423184633255e-01, 2.265336513519287e-01, 1.619556844234467e-01, 1.373704373836517e-01, 1.170221343636513e-01, 1.055038273334503e-01]
-coo[3].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.103726729750633e-02, 1.894564740359783e-02, 4.747255146503448e-02, 6.34479895234108e-02, 7.411859929561615e-02, 5.169423297047615e-02, 1.854825019836426e-02, 5.689332028850913e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.024938568472862e-03, 3.704694285988808e-02, 6.032698974013329e-02, 7.167746871709824e-02, 8.320897072553635e-02, 1.027953177690506e-01, 1.190333664417267e-01, 1.175288185477257e-01, 1.185646578669548e-01, 1.288612335920334e-01, 9.049926698207855e-02, 6.813183426856995e-02, 5.51813542842865e-02, 4.665298387408257e-02, 4.770883917808533e-02, 3.832271322607994e-02, 2.754235826432705e-02, 1.731534861028194e-02, 1.579558104276657e-02, 4.81249988079071e-02, 2.357823550701141e-01, 3.185793161392212e-01, 3.589821457862854e-01, 3.824997842311859e-01, 3.741381168365479e-01, 4.253303706645966e-01, 4.416755139827728e-01, 4.461894035339355e-01, 3.120706081390381e-01, 2.354633361101151e-01, 1.828933358192444e-01, 1.514038890600204e-01, 1.215675920248032e-01, 9.513556957244873e-02, 8.24383869767189e-02, 6.672977656126022e-02, 5.301826447248459e-02, 4.1362464427948e-02, 3.745855763554573e-02, 7.350953668355942e-02, 2.53059446811676e-01, 3.250527381896973e-01, 3.65319699048996e-01, 3.882015943527222e-01, 3.719174265861511e-01, 4.211335182189941e-01, 4.326927363872528e-01, 4.443033635616302e-01, 3.08874100446701e-01, 2.516369521617889e-01, 1.856126934289932e-01, 1.538922637701035e-01, 1.261031925678253e-01, 1.045624762773514e-01, 8.706574141979218e-02, 6.991256028413773e-02, 5.133619904518127e-02, 3.987869247794151e-02, 3.804872557520866e-02, 7.252606749534607e-02, 2.588015794754028e-01, 3.243308067321777e-01, 3.771156370639801e-01, 4.128858745098114e-01, 3.862723410129547e-01, 4.379782974720001e-01, 4.60770457983017e-01, 4.578641355037689e-01, 3.209548592567444e-01, 2.366689890623093e-01, 1.765266507863998e-01, 1.213299706578255e-01, 9.775184839963913e-02, 8.124543726444244e-02, 7.291886955499649e-02]
-coo[4].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.75359883159399e-03, 6.758370995521545e-02, 5.745379254221916e-02, 9.70497652888298e-02, 1.994749456644058e-01, 3.015913665294647e-01, 1.68904036283493e-01, 7.928096503019333e-02, 4.876132681965828e-02, 0e+00, 0e+00, 5.820989608764648e-03, 1.250627543777227e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.878891304135323e-02, 8.55179950594902e-02, 1.398556232452393e-01, 1.341864913702011e-01, 1.763724684715271e-01, 2.27821409702301e-01, 3.658690750598907e-01, 5.054280161857605e-01, 5.256583690643311e-01, 4.332764744758606e-01, 2.061333954334259e-01, 1.476746648550034e-01, 1.27494141459465e-01, 1.20673656463623e-01, 1.10632099211216e-01, 9.510753303766251e-02, 7.836277037858963e-02, 6.230390816926956e-02, 5.220986530184746e-02, 7.74231031537056e-02, 2.766344845294952e-01, 3.901659846305847e-01, 4.504165947437286e-01, 4.722501933574677e-01, 4.569055438041687e-01, 5.554066300392151e-01, 7.284080386161804e-01, 8.622731566429138e-01, 6.407791376113892e-01, 4.662470519542694e-01, 3.021063804626465e-01, 2.207320630550385e-01, 1.84358075261116e-01, 1.527270823717117e-01, 1.356593668460846e-01, 1.136012077331543e-01, 9.516338258981705e-02, 7.575085759162903e-02, 6.644676625728607e-02, 9.054510295391083e-02, 2.920794188976288e-01, 3.838677406311035e-01, 4.432341158390045e-01, 4.850558042526245e-01, 4.7576504945755e-01, 5.532011389732361e-01, 7.350545525550842e-01, 8.600775003433228e-01, 7.139449119567871e-01, 5.182275176048279e-01, 3.001147508621216e-01, 2.321062982082367e-01, 1.973398178815842e-01, 1.720723211765289e-01, 1.480730473995209e-01, 1.245369464159012e-01, 1.006836444139481e-01, 8.443744480609894e-02, 7.011648267507553e-02, 9.020080417394638e-02, 2.94039398431778e-01, 3.651734292507172e-01, 4.32867169380188e-01, 4.641625583171844e-01, 4.3780717253685e-01, 5.087401270866394e-01, 6.698182821273804e-01, 8.264439702033997e-01, 6.412988305091858e-01, 4.006037712097168e-01, 2.626285552978516e-01, 1.802908778190613e-01, 1.518824100494385e-01, 1.288550198078156e-01, 1.17521695792675e-01]
-coo[5].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.636512629687786e-03, 8.220725692808628e-03, 7.247078698128462e-03, 5.499271675944328e-03, 6.631860043853521e-03, 1.316182408481836e-02, 1.573621034622192e-01, 1.942334920167923e-01, 2.107150256633759e-01, 2.204016447067261e-01, 1.913314163684845e-01, 2.364836931228638e-01, 2.453766316175461e-01, 2.536477446556091e-01, 1.395959258079529e-01, 9.141140431165695e-02, 7.246102392673492e-02, 6.405513733625412e-02, 5.400742217898369e-02, 4.565680027008057e-02, 3.827875107526779e-02, 3.339755535125732e-02, 2.95207928866148e-02, 2.550362795591354e-02, 2.421795204281807e-02, 2.869223989546299e-02, 1.726280897855759e-01, 2.083828896284103e-01, 2.227643430233002e-01, 2.30736255645752e-01, 1.994718909263611e-01, 2.428190857172012e-01, 2.507995367050171e-01, 2.585628926753998e-01, 1.445435583591461e-01, 9.715475887060165e-02, 7.761809974908829e-02, 6.776139885187149e-02, 5.725399032235146e-02, 4.848285764455795e-02, 4.085641354322433e-02, 3.55631522834301e-02, 3.109096176922321e-02, 2.720863558351994e-02, 2.596418559551239e-02, 3.093216754496098e-02, 1.761607974767685e-01, 2.099913954734802e-01, 2.241258770227432e-01, 2.335573881864548e-01, 2.023570984601974e-01, 2.457364946603775e-01, 2.529213428497314e-01, 2.594222724437714e-01, 1.445299983024597e-01, 9.275364130735397e-02, 7.29866623878479e-02, 6.441166251897812e-02, 5.367269366979599e-02, 4.508082568645477e-02, 3.762707114219666e-02]
+flo.sou.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -4.316316528320312e+02, -5.884376831054688e+02, -7.236810913085938e+02, -9.044977416992188e+02, -9.706202392578125e+02, -9.624403076171875e+02, -4.452929077148438e+02, -1.957774963378906e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -6.3705322265625e+01, -2.54705322265625e+02, -4.663971252441406e+02, -7.249898681640625e+02, -9.092804565429688e+02, -1.012797973632812e+03, -9.643728637695312e+02, -8.718171997070312e+02, -8.563950805664062e+02, -7.461017456054688e+02, -5.703226928710938e+02, -4.735406188964844e+02, -3.936057434082031e+02, -3.162525634765625e+02, -3.097598876953125e+02, -2.425599670410156e+02, -1.749575042724609e+02, -1.085606307983398e+02, -7.223238372802734e+01, -2.308459625244141e+02, -1.400062133789062e+03, -1.898672607421875e+03, -2.2211630859375e+03, -2.54432177734375e+03, -2.92439013671875e+03, -2.90624658203125e+03, -2.837921142578125e+03, -2.77702783203125e+03, -2.216534423828125e+03, -1.424162841796875e+03, -1.132221923828125e+03, -9.434776000976562e+02, -7.599063110351562e+02, -5.92335693359375e+02, -5.111575927734375e+02, -4.116790161132812e+02, -3.263976745605469e+02, -2.537962036132812e+02, -1.971647796630859e+02, -3.559507141113281e+02, -1.482194580078125e+03, -1.929249755859375e+03, -2.24886669921875e+03, -2.596782958984375e+03, -2.656342529296875e+03, -2.908988525390625e+03, -2.829210205078125e+03, -2.963702880859375e+03, -2.25398095703125e+03, -1.707790649414062e+03, -1.1452685546875e+03, -9.6055712890625e+02, -7.891848754882812e+02, -6.541459350585938e+02, -5.449356079101562e+02, -4.354983520507812e+02, -3.201348876953125e+02, -2.493044586181641e+02, -2.006571197509766e+02, -3.378681030273438e+02, -1.516013549804688e+03, -1.928371459960938e+03, -2.306459228515625e+03, -2.636287841796875e+03, -2.8034462890625e+03, -3.333624755859375e+03, -3.510322509765625e+03, -3.19762255859375e+03, -2.030095336914062e+03, -1.461827880859375e+03, -1.0948828125e+03, -7.5307470703125e+02, -6.042328491210938e+02, -4.999426574707031e+02, -4.453633117675781e+02]
+flo.eas.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -7.384370422363281e+01, -4.399255065917969e+02, -3.927025146484375e+02, -2.894358825683594e+02, -3.659031372070312e+02, -4.101259765625e+02, -4.304690246582031e+02, -3.411410522460938e+02, -2.118782196044922e+02, -1.357424774169922e+02, 0e+00, 0e+00, 0e+00, -2.088603782653809e+01, 0e+00, 0e+00, 0e+00, 0e+00, -4.6722509765625e+02, -1.12529736328125e+03, -1.379037353515625e+03, -1.156107666015625e+03, -7.1797900390625e+02, -6.459027099609375e+02, -6.994066772460938e+02, -7.398245239257812e+02, -6.940239868164062e+02, -6.540350341796875e+02, -5.737748413085938e+02, -4.8067041015625e+02, -4.092850952148438e+02, -3.518371276855469e+02, -3.082702331542969e+02, -2.980587158203125e+02, -2.502062072753906e+02, -1.996027984619141e+02, -1.511011352539062e+02, -1.596094512939453e+02, -4.368389587402344e+02, -1.634068603515625e+03, -2.19678076171875e+03, -2.138325927734375e+03, -1.756092651367188e+03, -1.620880249023438e+03, -1.776496826171875e+03, -1.813995483398438e+03, -1.795281372070312e+03, -1.299904418945312e+03, -9.635927124023438e+02, -7.974151000976562e+02, -6.811565551757812e+02, -5.654573364257812e+02, -4.593740539550781e+02, -4.038157958984375e+02, -3.373416442871094e+02, -2.795438537597656e+02, -2.298143005371094e+02, -2.329546966552734e+02, -5.652327270507812e+02, -1.798569580078125e+03, -2.30662158203125e+03, -2.219779052734375e+03, -1.79015283203125e+03, -1.614059326171875e+03, -1.761826049804688e+03, -1.780768432617188e+03, -1.786030029296875e+03, -1.282119873046875e+03, -9.953636474609375e+02, -7.96507568359375e+02, -6.883873901367188e+02, -5.806188354492188e+02, -4.927118530273438e+02, -4.210705871582031e+02, -3.492355346679688e+02, -2.742765502929688e+02, -2.258252105712891e+02, -2.383014526367188e+02, -6.038526000976562e+02, -1.739163940429688e+03, -1.874813110351562e+03, -1.866980590820312e+03, -1.768754272460938e+03, -1.61127490234375e+03, -1.774707397460938e+03, -1.837132568359375e+03, -1.794827270507812e+03, -1.293564819335938e+03, -9.7725146484375e+02, -7.624461669921875e+02, -5.448779907226562e+02, -4.622902221679688e+02, -3.937929077148438e+02, -3.550138549804688e+02]
+flo.nor.heaPorAir.Q_flow=[7.9415e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -1.760212249755859e+02, -1.072288055419922e+02, -2.692333679199219e+02, -3.599027099609375e+02, -4.203807067871094e+02, -2.932451782226562e+02, -1.052044296264648e+02, -3.207657337188721e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.121760559082031e+01, -2.107303771972656e+02, -3.422034912109375e+02, -4.065850219726562e+02, -4.721523742675781e+02, -5.831015625e+02, -6.751905517578125e+02, -6.666822509765625e+02, -6.725580444335938e+02, -7.309566650390625e+02, -5.131525268554688e+02, -3.864539184570312e+02, -3.130146789550781e+02, -2.646493225097656e+02, -2.706414489746094e+02, -2.173247985839844e+02, -1.563871459960938e+02, -9.825498962402344e+01, -8.940885925292969e+01, -2.72980712890625e+02, -1.337440063476562e+03, -1.807157958984375e+03, -2.036401611328125e+03, -2.169784912109375e+03, -2.122255615234375e+03, -2.4127744140625e+03, -2.505408447265625e+03, -2.531018310546875e+03, -1.770277709960938e+03, -1.335655517578125e+03, -1.03747802734375e+03, -8.591469116210938e+02, -6.913663940429688e+02, -5.395430908203125e+02, -4.674619445800781e+02, -3.784762573242188e+02, -3.007540893554688e+02, -2.346268005371094e+02, -2.121825714111328e+02, -4.169781799316406e+02, -1.435147705078125e+03, -1.844529907226562e+03, -2.072229248046875e+03, -2.202021240234375e+03, -2.10974853515625e+03, -2.388780517578125e+03, -2.45444189453125e+03, -2.520180908203125e+03, -1.752098388671875e+03, -1.427412719726562e+03, -1.05289599609375e+03, -8.726132202148438e+02, -7.153006591796875e+02, -5.932382202148438e+02, -4.938812866210938e+02, -3.965847778320312e+02, -2.912284240722656e+02, -2.2707275390625e+02, -2.157920684814453e+02, -4.114027404785156e+02, -1.4683291015625e+03, -1.839289428710938e+03, -2.139076904296875e+03, -2.3421376953125e+03, -2.19130078125e+03, -2.48444580078125e+03, -2.613700439453125e+03, -2.5971083984375e+03, -1.820657104492188e+03, -1.342467651367188e+03, -1.001589904785156e+03, -6.880669555664062e+02, -5.545480346679688e+02, -4.608804626464844e+02, -4.136247863769531e+02]
+flo.wes.heaPorAir.Q_flow=[4.711e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -3.263895034790039e+01, -2.274003295898438e+02, -1.931888122558594e+02, -3.264287719726562e+02, -6.7123046875e+02, -1.015098449707031e+03, -5.684480590820312e+02, -2.667683410644531e+02, -1.640761871337891e+02, 0e+00, 0e+00, -1.958494567871094e+01, -4.208476638793945e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -9.690131378173828e+01, -2.881799011230469e+02, -4.706156616210938e+02, -4.515323791503906e+02, -5.936250610351562e+02, -7.6662451171875e+02, -1.23091357421875e+03, -1.700817626953125e+03, -1.768856567382812e+03, -1.458058227539062e+03, -6.932672729492188e+02, -4.968923950195312e+02, -4.288966064453125e+02, -4.060811767578125e+02, -3.723025512695312e+02, -3.199641418457031e+02, -2.638651428222656e+02, -2.097086486816406e+02, -1.756909332275391e+02, -2.605249633789062e+02, -9.308523559570312e+02, -1.312916015625e+03, -1.515703125e+03, -1.589161254882812e+03, -1.5374619140625e+03, -1.869401977539062e+03, -2.45110546875e+03, -2.9004677734375e+03, -2.15628564453125e+03, -1.5688955078125e+03, -1.016603210449219e+03, -7.430848388671875e+02, -6.218002319335938e+02, -5.138359375e+02, -4.563420104980469e+02, -3.822250671386719e+02, -3.202310180664062e+02, -2.548993988037109e+02, -2.236184692382812e+02, -3.046819152832031e+02, -9.826476440429688e+02, -1.292147583007812e+03, -1.491450317382812e+03, -1.63216552734375e+03, -1.600978393554688e+03, -1.860972534179688e+03, -2.473390380859375e+03, -2.893353271484375e+03, -2.4024384765625e+03, -1.743842041015625e+03, -1.00989599609375e+03, -7.8041650390625e+02, -6.63963134765625e+02, -5.791170654296875e+02, -4.982669067382812e+02, -4.190719909667969e+02, -3.388222961425781e+02, -2.848805541992188e+02, -2.359419860839844e+02, -3.035250854492188e+02, -9.896182861328125e+02, -1.228541870117188e+03, -1.456524047851562e+03, -1.561936157226562e+03, -1.473329345703125e+03, -1.7120322265625e+03, -2.25379638671875e+03, -2.782638671875e+03, -2.158051025390625e+03, -1.347969116210938e+03, -8.839156494140625e+02, -6.065464477539062e+02, -5.111231689453125e+02, -4.33608642578125e+02, -3.954525451660156e+02]
+flo.cor.heaPorAir.Q_flow=[1.0476017578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, -5.713254165649414e+01, -6.150608825683594e+01, -5.426862335205078e+01, -4.116573333740234e+01, -4.961845779418945e+01, -9.848584747314453e+01, -1.177489990234375e+03, -1.45343408203125e+03, -1.5768134765625e+03, -1.6492705078125e+03, -1.431683715820312e+03, -1.769693969726562e+03, -1.836123168945312e+03, -1.89721435546875e+03, -1.044620727539062e+03, -6.8401416015625e+02, -5.422234497070312e+02, -4.794930725097656e+02, -4.050401611328125e+02, -3.415718383789062e+02, -2.86321044921875e+02, -2.498841094970703e+02, -2.209046173095703e+02, -1.908411865234375e+02, -1.812696228027344e+02, -2.147000732421875e+02, -1.291393188476562e+03, -1.559777587890625e+03, -1.666885375976562e+03, -1.72652978515625e+03, -1.492642333984375e+03, -1.816858520507812e+03, -1.876693481445312e+03, -1.934569946289062e+03, -1.08160888671875e+03, -7.269981079101562e+02, -5.808143920898438e+02, -5.068577880859375e+02, -4.284119262695312e+02, -3.628718872070312e+02, -3.057240600585938e+02, -2.661172485351562e+02, -2.326624145507812e+02, -2.040645446777344e+02, -1.942912292480469e+02, -2.314609680175781e+02, -1.318536010742188e+03, -1.5710224609375e+03, -1.677047485351562e+03, -1.74770556640625e+03, -1.514285278320312e+03, -1.838833129882812e+03, -1.89256640625e+03, -1.94168505859375e+03, -1.08152978515625e+03, -6.940418701171875e+02, -5.462879028320312e+02, -4.818894348144531e+02, -4.016605529785156e+02, -3.373485412597656e+02, -2.815550842285156e+02]
+EHea.y=[0e+00, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07, 1.7253356e+07]
+ECoo.y=[0e+00, -1.875740875e+06, -1.875740875e+06, -1.875740875e+06, -1.875740875e+06, -1.875740875e+06, -1.875740875e+06, -1.905915875e+06, -3.0745365e+06, -6.8422675e+06, -1.0968261e+07, -1.7130278e+07, -2.5846176e+07, -3.709684e+07, -4.7745568e+07, -5.4720732e+07, -5.8368832e+07, -5.8768384e+07, -5.8768384e+07, -5.8785316e+07, -5.905952e+07, -5.9098928e+07, -5.9098928e+07, -5.9098928e+07, -5.9098928e+07, -5.988918e+07, -6.3691136e+07, -7.1203264e+07, -8.1386664e+07, -9.167192e+07, -1.02193936e+08, -1.14400536e+08, -1.28764496e+08, -1.45146592e+08, -1.62352112e+08, -1.78547456e+08, -1.91294256e+08, -1.9985416e+08, -2.06992336e+08, -2.12968368e+08, -2.18952336e+08, -2.2415592e+08, -2.28392176e+08, -2.31548e+08, -2.33909632e+08, -2.3782048e+08, -2.50287776e+08, -2.83192864e+08, -3.22918528e+08, -3.64577024e+08, -4.05047744e+08, -4.51020128e+08, -4.98550688e+08, -5.49354048e+08, -5.91757376e+08, -6.216912e+08, -6.44554752e+08, -6.61942784e+08, -6.76946048e+08, -6.88555712e+08, -6.982528e+08, -7.066464e+08, -7.13570496e+08, -7.19310976e+08, -7.23874432e+08, -7.3011584e+08, -7.448144e+08, -7.79519104e+08, -8.1990048e+08, -8.62552256e+08, -9.0325184e+08, -9.4872416e+08, -9.96449472e+08, -1.047163968e+09, -1.091243776e+09, -1.123175296e+09, -1.1475584e+09, -1.16541888e+09, -1.180902144e+09, -1.193352576e+09, -1.20388864e+09, -1.212823936e+09, -1.219921408e+09, -1.225714048e+09, -1.230449152e+09, -1.23679936e+09, -1.252128768e+09, -1.285665664e+09, -1.324773632e+09, -1.367093504e+09, -1.408103936e+09, -1.455032704e+09, -1.504799616e+09, -1.55863488e+09, -1.601899648e+09, -1.630806016e+09, -1.65275072e+09, -1.668079744e+09, -1.680295936e+09, -1.69022144e+09, -1.698740096e+09]
+coo[1].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.60919600725174e-02, 1.037351563572884e-01, 1.275770962238312e-01, 1.594531089067459e-01, 1.711097806692123e-01, 1.696677505970001e-01, 7.850029319524765e-02, 3.45134399831295e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.123055443167686e-02, 4.49017733335495e-02, 8.222074061632156e-02, 1.278078258037567e-01, 1.602962464094162e-01, 1.785452514886856e-01, 1.700084358453751e-01, 1.536918878555298e-01, 1.509731262922287e-01, 1.315296143293381e-01, 1.005416885018349e-01, 8.348005264997482e-02, 6.938841193914413e-02, 5.575188621878624e-02, 5.460729822516441e-02, 4.276068136096001e-02, 3.084310330450535e-02, 1.913805678486824e-02, 1.273378357291222e-02, 4.069563001394272e-02, 2.468157261610031e-01, 3.347153067588806e-01, 3.915668725967407e-01, 4.48536217212677e-01, 5.155381560325623e-01, 5.123396515846252e-01, 5.002946257591248e-01, 4.895597696304321e-01, 3.90750914812088e-01, 2.510644197463989e-01, 1.995984017848969e-01, 1.663248389959335e-01, 1.339632123708725e-01, 1.044223308563232e-01, 9.011151641607285e-02, 7.257453352212906e-02, 5.754036083817482e-02, 4.474150761961937e-02, 3.475800156593323e-02, 6.275023519992828e-02, 2.612947523593903e-01, 3.401057422161102e-01, 3.964507281780243e-01, 4.577845335006714e-01, 4.682842791080475e-01, 5.128230452537537e-01, 4.987589418888092e-01, 5.224685668945312e-01, 3.973523080348969e-01, 3.010649085044861e-01, 2.01898381114006e-01, 1.693357676267624e-01, 1.391247063875198e-01, 1.153188124299049e-01, 9.606620669364929e-02, 7.677362114191055e-02, 5.643629655241966e-02, 4.39496636390686e-02, 3.537366539239883e-02, 5.956247076392174e-02, 2.672566771507263e-01, 3.399508893489838e-01, 4.066036641597748e-01, 4.647488296031952e-01, 4.942170381546021e-01, 5.87681770324707e-01, 6.188316345214844e-01, 5.637060403823853e-01, 3.578836917877197e-01, 2.577043473720551e-01, 1.93015918135643e-01, 1.327588707208633e-01, 1.065196767449379e-01, 8.813445270061493e-02, 7.851270586252213e-02]
+coo[2].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.194463834166527e-02, 1.307356655597687e-01, 1.167020872235298e-01, 8.601363748311996e-02, 1.087379306554794e-01, 1.218799278140068e-01, 1.279254108667374e-01, 1.013792082667351e-01, 6.296529620885849e-02, 4.033951833844185e-02, 0e+00, 0e+00, 0e+00, 6.206846330314875e-03, 0e+00, 0e+00, 0e+00, 0e+00, 1.388484686613083e-01, 3.344123065471649e-01, 4.098179638385773e-01, 3.435684144496918e-01, 2.133667171001434e-01, 1.919473111629486e-01, 2.078474462032318e-01, 2.19858705997467e-01, 2.062478363513947e-01, 1.943640559911728e-01, 1.705125719308853e-01, 1.428441107273102e-01, 1.216300427913666e-01, 1.045578345656395e-01, 9.161077439785004e-02, 8.857613801956177e-02, 7.435548305511475e-02, 5.931732431054115e-02, 4.490375518798828e-02, 4.743222892284393e-02, 1.298184096813202e-01, 4.856073260307312e-01, 6.528323292732239e-01, 6.354609131813049e-01, 5.218700170516968e-01, 4.816880226135254e-01, 5.279337167739868e-01, 5.390774011611938e-01, 5.335160493850708e-01, 3.863014578819275e-01, 2.863574326038361e-01, 2.369732856750488e-01, 2.02423945069313e-01, 1.680408120155334e-01, 1.365153193473816e-01, 1.200046986341476e-01, 1.002501174807549e-01, 8.307395130395889e-02, 6.829548627138138e-02, 6.922873109579086e-02, 1.679740697145462e-01, 5.344932079315186e-01, 6.854745149612427e-01, 6.59666895866394e-01, 5.319919586181641e-01, 4.796610176563263e-01, 5.235738754272461e-01, 5.292031168937683e-01, 5.307667255401611e-01, 3.810163140296936e-01, 2.957989871501923e-01, 2.367035895586014e-01, 2.045727670192719e-01, 1.725464463233948e-01, 1.464225351810455e-01, 1.251324117183685e-01, 1.037847027182579e-01, 8.150863647460938e-02, 6.711001694202423e-02, 7.081766426563263e-02, 1.794509887695312e-01, 5.168392062187195e-01, 5.571510195732117e-01, 5.548233389854431e-01, 5.256327390670776e-01, 4.788335561752319e-01, 5.274019241333008e-01, 5.459532141685486e-01, 5.333810448646545e-01, 3.844175040721893e-01, 2.904164791107178e-01, 2.265813201665878e-01, 1.619251072406769e-01, 1.373819410800934e-01, 1.170261204242706e-01, 1.055018901824951e-01]
+coo[3].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.103062696754932e-02, 1.890327222645283e-02, 4.746291041374207e-02, 6.344693154096603e-02, 7.41085410118103e-02, 5.169593170285225e-02, 1.854639500379562e-02, 5.654750857502222e-04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.029106236994267e-03, 3.714947402477264e-02, 6.032675132155418e-02, 7.167651504278183e-02, 8.323532342910767e-02, 1.02794460952282e-01, 1.19028739631176e-01, 1.175288185477257e-01, 1.185646578669548e-01, 1.288597136735916e-01, 9.046320617198944e-02, 6.812761723995209e-02, 5.518107861280441e-02, 4.665479436516762e-02, 4.771114513278008e-02, 3.831199556589127e-02, 2.75693517178297e-02, 1.732128486037254e-02, 1.576180942356586e-02, 4.812353104352951e-02, 2.357761114835739e-01, 3.185822665691376e-01, 3.589954376220703e-01, 3.825094699859619e-01, 3.741305470466614e-01, 4.253458678722382e-01, 4.416762292385101e-01, 4.461909532546997e-01, 3.120807111263275e-01, 2.354615330696106e-01, 1.828960925340652e-01, 1.514582484960556e-01, 1.21880367398262e-01, 9.511557966470718e-02, 8.240845054388046e-02, 6.672124564647675e-02, 5.301967263221741e-02, 4.136215150356293e-02, 3.740547969937325e-02, 7.350871711969376e-02, 2.530009150505066e-01, 3.251705467700958e-01, 3.65311473608017e-01, 3.881923854351044e-01, 3.719257116317749e-01, 4.211159944534302e-01, 4.32691365480423e-01, 4.442804753780365e-01, 3.088758885860443e-01, 2.516373097896576e-01, 1.856141090393066e-01, 1.538322120904922e-01, 1.260997205972672e-01, 1.045814380049706e-01, 8.706589788198471e-02, 6.99135810136795e-02, 5.134040117263794e-02, 4.003045335412025e-02, 3.804179280996323e-02, 7.252582162618637e-02, 2.588504552841187e-01, 3.242467045783997e-01, 3.770959675312042e-01, 4.128933846950531e-01, 3.863024711608887e-01, 4.379807412624359e-01, 4.607669413089752e-01, 4.578419327735901e-01, 3.209620416164398e-01, 2.36662432551384e-01, 1.76569402217865e-01, 1.21298722922802e-01, 9.776077419519424e-02, 8.12482088804245e-02, 7.291754335165024e-02]
+coo[4].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.69953928142786e-03, 6.757810711860657e-02, 5.741123482584953e-02, 9.700706601142883e-02, 1.994741410017014e-01, 3.01663726568222e-01, 1.689295917749405e-01, 7.927736639976501e-02, 4.875964298844337e-02, 0e+00, 0e+00, 5.82019193097949e-03, 1.250661723315716e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.879682369530201e-02, 8.564038574695587e-02, 1.398560702800751e-01, 1.341849565505981e-01, 1.764116138219833e-01, 2.278230339288712e-01, 3.657989799976349e-01, 5.054435729980469e-01, 5.256631374359131e-01, 4.333010911941528e-01, 2.060229629278183e-01, 1.476649045944214e-01, 1.274581253528595e-01, 1.206779107451439e-01, 1.106396913528442e-01, 9.508592635393143e-02, 7.841460406780243e-02, 6.232054904103279e-02, 5.221127346158028e-02, 7.742197811603546e-02, 2.766277492046356e-01, 3.901681900024414e-01, 4.504318535327911e-01, 4.72261905670166e-01, 4.568980634212494e-01, 5.555429458618164e-01, 7.284117341041565e-01, 8.619517683982849e-01, 6.407981514930725e-01, 4.662393629550934e-01, 3.021109104156494e-01, 2.208275943994522e-01, 1.847846060991287e-01, 1.527001261711121e-01, 1.356142610311508e-01, 1.135884299874306e-01, 9.516523778438568e-02, 7.57501944899559e-02, 6.645422428846359e-02, 9.054440259933472e-02, 2.920201122760773e-01, 3.83996307849884e-01, 4.432244598865509e-01, 4.850417673587799e-01, 4.757736623287201e-01, 5.530378818511963e-01, 7.350342869758606e-01, 8.59837532043457e-01, 7.139489650726318e-01, 5.182294249534607e-01, 3.001176714897156e-01, 2.319216877222061e-01, 1.973144561052322e-01, 1.72100156545639e-01, 1.480733752250671e-01, 1.245384812355042e-01, 1.006901264190674e-01, 8.465989679098129e-02, 7.011649012565613e-02, 9.020061790943146e-02, 2.940916121006012e-01, 3.650941848754883e-01, 4.328452050685883e-01, 4.641712307929993e-01, 4.378393292427063e-01, 5.087763071060181e-01, 6.697760224342346e-01, 8.269357085227966e-01, 6.413227319717407e-01, 4.005851745605469e-01, 2.62679249048233e-01, 1.802515387535095e-01, 1.518939584493637e-01, 1.288584321737289e-01, 1.175193339586258e-01]
+coo[5].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.635110523551702e-03, 8.219584822654724e-03, 7.252381183207035e-03, 5.501329433172941e-03, 6.630939431488514e-03, 1.316150743514299e-02, 1.573580801486969e-01, 1.942348480224609e-01, 2.107230871915817e-01, 2.204061448574066e-01, 1.913281679153442e-01, 2.364993691444397e-01, 2.453768700361252e-01, 2.535409927368164e-01, 1.396016180515289e-01, 9.141067415475845e-02, 7.246196269989014e-02, 6.407876312732697e-02, 5.41289858520031e-02, 4.564716666936874e-02, 3.826353698968887e-02, 3.339415416121483e-02, 2.952137589454651e-02, 2.550374157726765e-02, 2.422461099922657e-02, 2.86922100931406e-02, 1.725799292325974e-01, 2.084464430809021e-01, 2.227601706981659e-01, 2.307309508323669e-01, 1.994745880365372e-01, 2.428023666143417e-01, 2.507986426353455e-01, 2.585331499576569e-01, 1.445446461439133e-01, 9.715498238801956e-02, 7.761920243501663e-02, 6.773574650287628e-02, 5.725235491991043e-02, 4.849367588758469e-02, 4.085652530193329e-02, 3.556352481245995e-02, 3.109267167747021e-02, 2.727089263498783e-02, 2.596480213105679e-02, 3.09321116656065e-02, 1.762072443962097e-01, 2.099491804838181e-01, 2.241182178258896e-01, 2.335608601570129e-01, 2.02366903424263e-01, 2.457390129566193e-01, 2.529198527336121e-01, 2.594839930534363e-01, 1.445340812206268e-01, 9.275075793266296e-02, 7.300512492656708e-02, 6.439901143312454e-02, 5.367733910679817e-02, 4.508277401328087e-02, 3.762661665678024e-02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingWinter.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingWinter.txt
index 57b3aaf9446..ff976e21745 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingWinter.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_IdealHeatingCoolingWinter.txt
@@ -1,35 +1,29 @@
-last-generated=2024-03-22
-statistics-initialization=
-{
-  "linear": "0, 0, 0, 0",
-  "nonlinear": "0, 0, 0, 0",
-  "numerical Jacobians": "0"
-}
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "0, 0, 0, 0",
-  "number of continuous time states": "30",
+  "number of continuous time states": "36",
   "numerical Jacobians": "0"
 }
 time=[4.32e+05, 8.64e+05]
-flo.TAirCor=[2.751499938964844e+02, 2.936260681152344e+02, 2.935737915039062e+02, 2.935372924804688e+02, 2.935064086914062e+02, 2.934850769042969e+02, 2.935169982910156e+02, 2.937933654785156e+02, 2.940245666503906e+02, 2.940243835449219e+02, 2.939497680664062e+02, 2.939085998535156e+02, 2.938932189941406e+02, 2.938829956054688e+02, 2.938321533203125e+02, 2.936167297363281e+02, 2.934883728027344e+02, 2.934262390136719e+02, 2.933868103027344e+02, 2.933311462402344e+02, 2.932718505859375e+02, 2.93149169921875e+02, 2.931495361328125e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931500244140625e+02, 2.931496887207031e+02, 2.932851867675781e+02, 2.933576965332031e+02, 2.933554992675781e+02, 2.933854064941406e+02, 2.931495361328125e+02, 2.931501159667969e+02, 2.931614074707031e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931497192382812e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931497497558594e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931497802734375e+02, 2.931506042480469e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93150146484375e+02, 2.931501770019531e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931515197753906e+02, 2.935868225097656e+02, 2.936769409179688e+02, 2.93706298828125e+02, 2.938256530761719e+02, 2.938670349121094e+02, 2.938852233886719e+02, 2.938804016113281e+02, 2.937759094238281e+02, 2.935525207519531e+02, 2.934234924316406e+02, 2.933764343261719e+02, 2.933534240722656e+02, 2.933127746582031e+02, 2.932710266113281e+02, 2.932222595214844e+02, 2.93192138671875e+02, 2.931615295410156e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.9328076171875e+02, 2.937332763671875e+02, 2.940651550292969e+02, 2.945458984375e+02, 2.950185546875e+02, 2.952813720703125e+02, 2.95434326171875e+02, 2.954125366210938e+02, 2.949762268066406e+02, 2.937819213867188e+02, 2.93572998046875e+02, 2.935242614746094e+02, 2.934961242675781e+02, 2.934588317871094e+02, 2.934225463867188e+02]
-flo.TAirSou=[2.751499938964844e+02, 2.931470336914062e+02, 2.931481628417969e+02, 2.931495056152344e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931619262695312e+02, 2.939835815429688e+02, 2.942169494628906e+02, 2.9357275390625e+02, 2.933813171386719e+02, 2.93367919921875e+02, 2.933053894042969e+02, 2.931497497558594e+02, 2.931498413085938e+02, 2.931476745605469e+02, 2.931481018066406e+02, 2.931499328613281e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.931484985351562e+02, 2.931490173339844e+02, 2.931498718261719e+02, 2.931499633789062e+02, 2.931498718261719e+02, 2.931494750976562e+02, 2.931573181152344e+02, 2.931509094238281e+02, 2.931501159667969e+02, 2.93493408203125e+02, 2.9329345703125e+02, 2.931480407714844e+02, 2.931495666503906e+02, 2.931498413085938e+02, 2.931498718261719e+02, 2.931490478515625e+02, 2.931492919921875e+02, 2.931499328613281e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931489562988281e+02, 2.931496276855469e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931493530273438e+02, 2.931568908691406e+02, 2.93150634765625e+02, 2.931500549316406e+02, 2.931501159667969e+02, 2.931441955566406e+02, 2.931472778320312e+02, 2.931567993164062e+02, 2.931513366699219e+02, 2.931494140625e+02, 2.9314794921875e+02, 2.931506042480469e+02, 2.931471557617188e+02, 2.931495056152344e+02, 2.931533508300781e+02, 2.931475830078125e+02, 2.931517639160156e+02, 2.931520385742188e+02, 2.931476745605469e+02, 2.931505126953125e+02, 2.931517639160156e+02, 2.93151123046875e+02, 2.931564025878906e+02, 2.9314794921875e+02, 2.935817565917969e+02, 2.937003479003906e+02, 2.936426696777344e+02, 2.934561767578125e+02, 2.931519775390625e+02, 2.931503601074219e+02, 2.931487731933594e+02, 2.931502075195312e+02, 2.931498413085938e+02, 2.9314990234375e+02, 2.931500854492188e+02, 2.931495971679688e+02, 2.931497802734375e+02, 2.931500854492188e+02, 2.931499633789062e+02, 2.931498107910156e+02, 2.931514587402344e+02, 2.933322143554688e+02, 2.94483642578125e+02, 2.952792663574219e+02, 2.958674621582031e+02, 2.961501770019531e+02, 2.961827392578125e+02, 2.959317626953125e+02, 2.950322875976562e+02, 2.934741821289062e+02, 2.931466064453125e+02, 2.931483764648438e+02, 2.931503295898438e+02, 2.931498718261719e+02, 2.9314990234375e+02]
-flo.TAirNor=[2.751499938964844e+02, 2.931471862792969e+02, 2.931481628417969e+02, 2.931495056152344e+02, 2.931499938964844e+02, 2.931499633789062e+02, 2.931535034179688e+02, 2.931431274414062e+02, 2.93153564453125e+02, 2.931513366699219e+02, 2.931500854492188e+02, 2.931496887207031e+02, 2.931504211425781e+02, 2.93149658203125e+02, 2.931496887207031e+02, 2.931498413085938e+02, 2.931482849121094e+02, 2.931487731933594e+02, 2.931499328613281e+02, 2.931485900878906e+02, 2.931510314941406e+02, 2.93150634765625e+02, 2.931492919921875e+02, 2.9314990234375e+02, 2.931499328613281e+02, 2.931498718261719e+02, 2.931496887207031e+02, 2.931406555175781e+02, 2.931491394042969e+02, 2.931500854492188e+02, 2.931548156738281e+02, 2.931463623046875e+02, 2.931531066894531e+02, 2.931484985351562e+02, 2.93147216796875e+02, 2.931505737304688e+02, 2.93156494140625e+02, 2.931496276855469e+02, 2.931499328613281e+02, 2.931500854492188e+02, 2.931498718261719e+02, 2.931495971679688e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931497192382812e+02, 2.931517333984375e+02, 2.931504516601562e+02, 2.931501770019531e+02, 2.93150146484375e+02, 2.931500244140625e+02, 2.931501770019531e+02, 2.931499633789062e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931503601074219e+02, 2.931503295898438e+02, 2.931499633789062e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931502380371094e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931519165039062e+02, 2.931532897949219e+02, 2.931507568359375e+02, 2.931501159667969e+02, 2.931510009765625e+02, 2.931516723632812e+02, 2.931793823242188e+02, 2.931916198730469e+02, 2.931498413085938e+02, 2.931499938964844e+02, 2.931497802734375e+02, 2.93149658203125e+02, 2.931498718261719e+02, 2.931498718261719e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.931500244140625e+02, 2.931492614746094e+02, 2.931487121582031e+02, 2.931506652832031e+02, 2.931540222167969e+02, 2.931542663574219e+02, 2.932133178710938e+02, 2.936001892089844e+02, 2.941540832519531e+02, 2.943966979980469e+02, 2.945514221191406e+02, 2.945723876953125e+02, 2.942182312011719e+02, 2.931493530273438e+02, 2.931479187011719e+02, 2.931486206054688e+02, 2.931503295898438e+02, 2.9314990234375e+02, 2.9314990234375e+02]
-flo.TAirEas=[2.751499938964844e+02, 2.931463928222656e+02, 2.931479797363281e+02, 2.931495361328125e+02, 2.931500244140625e+02, 2.931499633789062e+02, 2.931502380371094e+02, 2.931559753417969e+02, 2.933720397949219e+02, 2.93218994140625e+02, 2.931500854492188e+02, 2.931492004394531e+02, 2.931500854492188e+02, 2.931497497558594e+02, 2.931497497558594e+02, 2.931498413085938e+02, 2.9314794921875e+02, 2.931482543945312e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.93148681640625e+02, 2.931491394042969e+02, 2.931498718261719e+02, 2.931499633789062e+02, 2.931498718261719e+02, 2.931495971679688e+02, 2.931559448242188e+02, 2.931503295898438e+02, 2.931503295898438e+02, 2.93150146484375e+02, 2.931498413085938e+02, 2.931497497558594e+02, 2.931498718261719e+02, 2.931497497558594e+02, 2.931498718261719e+02, 2.931496276855469e+02, 2.931495056152344e+02, 2.931499328613281e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931493835449219e+02, 2.931497802734375e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931495971679688e+02, 2.931557922363281e+02, 2.93150390625e+02, 2.931504211425781e+02, 2.93150146484375e+02, 2.931500854492188e+02, 2.931500549316406e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931502075195312e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931502075195312e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931518249511719e+02, 2.931544189453125e+02, 2.931505737304688e+02, 2.93150146484375e+02, 2.931507873535156e+02, 2.931514587402344e+02, 2.93171875e+02, 2.93166748046875e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.93149658203125e+02, 2.931496276855469e+02, 2.931498718261719e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.931498413085938e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499633789062e+02, 2.931498107910156e+02, 2.931517028808594e+02, 2.931930541992188e+02, 2.938018188476562e+02, 2.940297241210938e+02, 2.9425244140625e+02, 2.944788513183594e+02, 2.946192321777344e+02, 2.94609130859375e+02, 2.942291259765625e+02, 2.931494750976562e+02, 2.931476745605469e+02, 2.931484375e+02, 2.931503601074219e+02, 2.9314990234375e+02, 2.9314990234375e+02]
-flo.TAirWes=[2.751499938964844e+02, 2.93148193359375e+02, 2.931490173339844e+02, 2.931517333984375e+02, 2.931529846191406e+02, 2.931499633789062e+02, 2.931503295898438e+02, 2.931528015136719e+02, 2.931505737304688e+02, 2.931494445800781e+02, 2.931483764648438e+02, 2.931486206054688e+02, 2.931526184082031e+02, 2.931497802734375e+02, 2.931497802734375e+02, 2.931498413085938e+02, 2.931480407714844e+02, 2.931484069824219e+02, 2.931473999023438e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.931487731933594e+02, 2.931492004394531e+02, 2.931483764648438e+02, 2.9315185546875e+02, 2.931498718261719e+02, 2.931496276855469e+02, 2.931522521972656e+02, 2.931504821777344e+02, 2.931501770019531e+02, 2.931474914550781e+02, 2.931613159179688e+02, 2.931544189453125e+02, 2.931498413085938e+02, 2.931499328613281e+02, 2.931498718261719e+02, 2.9314990234375e+02, 2.931495971679688e+02, 2.931499328613281e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931493835449219e+02, 2.931497802734375e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931495971679688e+02, 2.931519775390625e+02, 2.931504516601562e+02, 2.931481628417969e+02, 2.931507568359375e+02, 2.931576232910156e+02, 2.931561279296875e+02, 2.931431884765625e+02, 2.931502380371094e+02, 2.931498107910156e+02, 2.931501770019531e+02, 2.931502990722656e+02, 2.931499938964844e+02, 2.931433715820312e+02, 2.931492614746094e+02, 2.931474304199219e+02, 2.931521301269531e+02, 2.931474304199219e+02, 2.931498413085938e+02, 2.93148681640625e+02, 2.931482238769531e+02, 2.931537780761719e+02, 2.931518859863281e+02, 2.931527099609375e+02, 2.931507263183594e+02, 2.931531982421875e+02, 2.931570434570312e+02, 2.931492919921875e+02, 2.931490783691406e+02, 2.931496887207031e+02, 2.931492309570312e+02, 2.931518249511719e+02, 2.931481018066406e+02, 2.931523132324219e+02, 2.931480102539062e+02, 2.931525268554688e+02, 2.931507873535156e+02, 2.931500244140625e+02, 2.931488342285156e+02, 2.931498107910156e+02, 2.931516723632812e+02, 2.931540222167969e+02, 2.931839599609375e+02, 2.937048034667969e+02, 2.941324462890625e+02, 2.944755859375e+02, 2.947951049804688e+02, 2.947913513183594e+02, 2.941781311035156e+02, 2.931495056152344e+02, 2.931477966308594e+02, 2.931485290527344e+02, 2.931451110839844e+02, 2.931504211425781e+02, 2.931492614746094e+02]
-hea[1].conPID.y=[1e+00, 1.384505331516266e-01, 1.761592924594879e-01, 2.129593193531036e-01, 2.407140582799911e-01, 2.624821662902832e-01, 2.606311738491058e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.317024558782578e-02, 1.943275332450867e-01, 2.863925695419312e-01, 3.230322897434235e-01, 3.485291004180908e-01, 3.701247572898865e-01, 4.011710584163666e-01, 4.350380003452301e-01, 4.534150063991547e-01, 4.721981883049011e-01, 4.877165853977203e-01, 5.078296661376953e-01, 5.014930367469788e-01, 2.826398611068726e-01, 1.151788979768753e-01, 1.228200737386942e-02, 0e+00, 0e+00, 2.831504121422768e-02, 1.321187019348145e-01, 2.938719689846039e-01, 3.575977683067322e-01, 3.898248076438904e-01, 4.022519588470459e-01, 4.209467768669128e-01, 4.283745586872101e-01, 4.428472220897675e-01, 4.623502790927887e-01, 4.747965037822723e-01, 4.844097495079041e-01, 4.960531890392303e-01, 5.06319522857666e-01, 5.146054029464722e-01, 3.312137126922607e-01, 2.015043646097183e-01, 1.120532155036926e-01, 6.957899779081345e-02, 9.874094277620316e-02, 2.560467422008514e-01, 2.582236528396606e-01, 2.834562063217163e-01, 3.446247577667236e-01, 3.302557766437531e-01, 3.787367641925812e-01, 4.467459321022034e-01, 5.09425163269043e-01, 4.229117035865784e-01, 4.789279699325562e-01, 5.139968991279602e-01, 4.673340320587158e-01, 5.24660587310791e-01, 4.974595308303833e-01, 4.548079371452332e-01, 2.566861212253571e-01, 1.167149692773819e-01, 8.530925214290619e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.416394766420126e-02, 1.369640082120895e-01, 1.4158795773983e-01, 1.52717188000679e-01, 1.671889275312424e-01, 1.867270320653915e-01, 2.077067345380783e-01, 2.211165577173233e-01, 2.255991697311401e-01, 2.259475290775299e-01, 2.291651219129562e-01, 2.447549998760223e-01, 2.353209108114243e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.787092283368111e-02, 8.950547873973846e-02, 1.047250032424927e-01, 1.247329786419868e-01, 1.492332369089127e-01]
-hea[2].conPID.y=[1e+00, 1.843235641717911e-01, 2.240643948316574e-01, 2.634330987930298e-01, 2.900599539279938e-01, 3.098505735397339e-01, 3.064334392547607e-01, 3.818845376372337e-02, 0e+00, 0e+00, 2.353885397315025e-02, 4.670466855168343e-02, 5.275799334049225e-02, 6.736703217029572e-02, 1.078223139047623e-01, 2.587093114852905e-01, 3.451493978500366e-01, 3.778721988201141e-01, 3.997826278209686e-01, 4.179479479789734e-01, 4.457507431507111e-01, 4.767158031463623e-01, 4.92891937494278e-01, 5.096598267555237e-01, 5.234775543212891e-01, 5.418126583099365e-01, 5.336868762969971e-01, 3.044212162494659e-01, 2.435280680656433e-01, 2.838521003723145e-01, 3.340471982955933e-01, 3.716306388378143e-01, 3.74205619096756e-01, 3.927484452724457e-01, 4.368641674518585e-01, 4.780409932136536e-01, 5.00402569770813e-01, 5.06733238697052e-01, 5.194782614707947e-01, 5.212585926055908e-01, 5.301041007041931e-01, 5.454114675521851e-01, 5.51506519317627e-01, 5.569866299629211e-01, 5.666275024414062e-01, 5.736048221588135e-01, 5.783710479736328e-01, 3.761326670646667e-01, 3.305317461490631e-01, 3.647656738758087e-01, 4.102802872657776e-01, 4.028710424900055e-01, 3.996568322181702e-01, 4.031377136707306e-01, 4.269091486930847e-01, 4.426493048667908e-01, 4.428057372570038e-01, 4.376289248466492e-01, 4.36292976140976e-01, 4.352521598339081e-01, 4.392784833908081e-01, 4.295772910118103e-01, 4.287271201610565e-01, 4.259249269962311e-01, 4.265196621417999e-01, 4.23419177532196e-01, 3.975917398929596e-01, 1.682785600423813e-01, 7.689405232667923e-02, 6.136418879032135e-02, 3.308247029781342e-02, 7.415163330733776e-03, 0e+00, 0e+00, 3.521548211574554e-02, 1.662810146808624e-01, 2.215087115764618e-01, 2.305592894554138e-01, 2.407281845808029e-01, 2.563392221927643e-01, 2.718786299228668e-01, 2.803419232368469e-01, 2.812654674053192e-01, 2.783743143081665e-01, 2.784737050533295e-01, 2.906155586242676e-01, 2.78203547000885e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.092857033014297e-02, 1.494393795728683e-01, 1.840155869722366e-01, 1.95746585726738e-01, 2.132809907197952e-01, 2.36542746424675e-01]
-hea[3].conPID.y=[1e+00, 1.700581014156342e-01, 2.063469886779785e-01, 2.431183159351349e-01, 2.683982849121094e-01, 2.866891026496887e-01, 3.784784078598022e-01, 1.511130481958389e-01, 1.589540541172028e-01, 8.82352888584137e-02, 1.92471370100975e-02, 3.632449731230736e-02, 4.16015051305294e-02, 5.355843156576157e-02, 9.306811541318893e-02, 2.485500425100327e-01, 4.910010099411011e-01, 3.645533323287964e-01, 3.844281733036041e-01, 5.096514225006104e-01, 5.888819098472595e-01, 5.190110206604004e-01, 4.701637625694275e-01, 4.849416613578796e-01, 4.968189597129822e-01, 5.130707025527954e-01, 5.032379627227783e-01, 5.148521065711975e-01, 6.198796629905701e-01, 6.294535994529724e-01, 4.041670262813568e-01, 4.598657786846161e-01, 5.101057291030884e-01, 4.985034763813019e-01, 6.117051243782043e-01, 4.819295704364777e-01, 5.854702591896057e-01, 5.011335611343384e-01, 5.106509923934937e-01, 5.098934769630432e-01, 5.161533355712891e-01, 5.298494696617126e-01, 5.322835445404053e-01, 5.357924699783325e-01, 5.449223518371582e-01, 5.502438545227051e-01, 5.534120798110962e-01, 5.19984245300293e-01, 4.773185551166534e-01, 4.565962851047516e-01, 4.473816752433777e-01, 4.403953850269318e-01, 4.3527951836586e-01, 4.297411739826202e-01, 4.432823061943054e-01, 4.514356851577759e-01, 4.47479784488678e-01, 4.396341741085052e-01, 4.358549118041992e-01, 4.324081242084503e-01, 4.341745972633362e-01, 4.221536815166473e-01, 4.195054173469543e-01, 4.152424335479736e-01, 4.142703115940094e-01, 4.09753292798996e-01, 3.826558887958527e-01, 2.009284496307373e-01, 1.234780922532082e-01, 8.466599881649017e-02, 3.195032477378845e-02, 5.209579132497311e-03, 0e+00, 0e+00, 2.403280138969421e-02, 1.605492681264877e-01, 2.158249020576477e-01, 2.244317233562469e-01, 2.33380600810051e-01, 2.480674237012863e-01, 2.626948952674866e-01, 2.697941064834595e-01, 2.697493135929108e-01, 2.959259450435638e-01, 3.358679413795471e-01, 2.935619354248047e-01, 2.705166041851044e-01, 6.517574936151505e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.115566402673721e-02, 1.557665169239044e-01, 1.887878328561783e-01, 1.986886262893677e-01, 2.146609276533127e-01, 2.359648942947388e-01]
-hea[4].conPID.y=[1e+00, 3.848369419574738e-01, 3.661881983280182e-01, 3.49805623292923e-01, 3.014639616012573e-01, 3.099938929080963e-01, 3.066680431365967e-01, 1.436007022857666e-01, 5.977477505803108e-02, 3.512023016810417e-02, 1.185835674405098e-01, 6.357044726610184e-02, 4.77195531129837e-02, 4.522912949323654e-02, 1.134841740131378e-01, 2.70617812871933e-01, 3.572845458984375e-01, 3.883801698684692e-01, 4.157457649707794e-01, 4.263258278369904e-01, 4.535448849201202e-01, 4.832387566566467e-01, 4.984418749809265e-01, 5.168972611427307e-01, 5.331319570541382e-01, 5.455949306488037e-01, 5.367363691329956e-01, 4.65410590171814e-01, 4.097729027271271e-01, 3.796805143356323e-01, 4.64396595954895e-01, 4.17581707239151e-01, 2.743622064590454e-01, 2.516860067844391e-01, 4.122489392757416e-01, 4.749057590961456e-01, 4.972363710403442e-01, 5.009514689445496e-01, 5.122683644294739e-01, 5.13393759727478e-01, 5.220675468444824e-01, 5.373700261116028e-01, 5.436294674873352e-01, 5.493032932281494e-01, 5.591291189193726e-01, 5.663102865219116e-01, 5.714067220687866e-01, 5.323165655136108e-01, 4.80702131986618e-01, 5.497924089431763e-01, 4.600694477558136e-01, 4.589420557022095e-01, 3.633818924427032e-01, 3.259691298007965e-01, 3.955005407333374e-01, 5.19584596157074e-01, 4.367301166057587e-01, 4.300544261932373e-01, 4.280815124511719e-01, 5.117830038070679e-01, 5.545253753662109e-01, 4.833332002162933e-01, 5.269026160240173e-01, 5.379040241241455e-01, 4.220253825187683e-01, 4.914365708827972e-01, 4.567930400371552e-01, 3.753156363964081e-01, 2.694387137889862e-01, 9.764823317527771e-02, 1.472375839948654e-01, 1.069664731621742e-01, 6.158327683806419e-02, 1.685955189168453e-02, 1.189635992050171e-01, 1.622548699378967e-01, 3.308576047420502e-01, 3.264543414115906e-01, 3.211146295070648e-01, 3.027496039867401e-01, 4.337849617004395e-01, 4.418616592884064e-01, 3.460744917392731e-01, 2.719829678535461e-01, 2.862321436405182e-01, 2.846663892269135e-01, 2.728786468505859e-01, 8.472871035337448e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.582267999649048e-02, 1.43987163901329e-01, 1.766519546508789e-01, 2.533907294273376e-01, 2.981928884983063e-01, 3.471668064594269e-01]
-hea[5].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.55383463203907e-03, 1.688286662101746e-02, 2.380676567554474e-02, 3.040464036166668e-02, 3.643468394875526e-02, 2.36200001090765e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.092811210080981e-03, 5.029722116887569e-03, 0e+00, 1.037642452865839e-02, 3.844170272350311e-02, 4.426976665854454e-02, 4.622022062540054e-02, 4.780248552560806e-02, 4.952972754836082e-02, 5.145769566297531e-02, 5.419090762734413e-02, 5.670066550374031e-02, 5.919979512691498e-02, 6.176723167300224e-02, 6.439902633428574e-02, 6.730517745018005e-02, 5.195440724492073e-02, 4.742830619215965e-02, 5.049233511090279e-02, 5.239469930529594e-02, 5.20591214299202e-02, 4.835112392902374e-02, 3.9499182254076e-02, 4.57310862839222e-02, 5.577651038765907e-02, 5.679437890648842e-02, 5.58781586587429e-02, 5.495084449648857e-02, 5.444436892867088e-02, 5.423079803586006e-02, 4.371743276715279e-02, 4.335734993219376e-02, 4.321062192320824e-02, 4.324047267436981e-02, 4.013341665267944e-02, 2.006938681006432e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.730924588628113e-03, 1.215681433677673e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-flo.sou.heaPorAir.Q_flow=[7.9415e+03, 1.099505004882812e+03, 1.398969116210938e+03, 1.691216430664062e+03, 1.911630615234375e+03, 2.084501953125e+03, 2.069802490234375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.634215087890625e+02, 1.543252075195312e+03, 2.274386474609375e+03, 2.56536083984375e+03, 2.76784375e+03, 2.939345703125e+03, 3.18589990234375e+03, 3.454854248046875e+03, 3.600795166015625e+03, 3.7499619140625e+03, 3.873201416015625e+03, 4.032929443359375e+03, 3.982607177734375e+03, 2.244584228515625e+03, 9.146932373046875e+02, 9.753756713867188e+01, 0e+00, 0e+00, 2.248639068603516e+02, 1.049220703125e+03, 2.333784423828125e+03, 2.839862548828125e+03, 3.095793701171875e+03, 3.19448388671875e+03, 3.342948974609375e+03, 3.401936767578125e+03, 3.51687109375e+03, 3.671754638671875e+03, 3.770596435546875e+03, 3.846940185546875e+03, 3.939406494140625e+03, 4.0209365234375e+03, 4.086738525390625e+03, 2.630333740234375e+03, 1.600246948242188e+03, 8.8987060546875e+02, 5.525615844726562e+02, 7.841511840820312e+02, 2.033395141601562e+03, 2.05068310546875e+03, 2.251067626953125e+03, 2.736837646484375e+03, 2.622726318359375e+03, 3.007738037109375e+03, 3.547832763671875e+03, 4.045599853515625e+03, 3.35855322265625e+03, 3.803406494140625e+03, 4.081906494140625e+03, 3.711333251953125e+03, 4.166591796875e+03, 3.950574951171875e+03, 3.611857177734375e+03, 2.038472778320312e+03, 9.268919677734375e+02, 6.774834594726562e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.124829940795898e+02, 1.08769970703125e+03, 1.124420776367188e+03, 1.212803466796875e+03, 1.327730834960938e+03, 1.482892700195312e+03, 1.649503051757812e+03, 1.755997192382812e+03, 1.791595825195312e+03, 1.7943623046875e+03, 1.819914916992188e+03, 1.943721801757812e+03, 1.868801025390625e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.801669311523438e+02, 7.108077392578125e+02, 8.31673583984375e+02, 9.905669555664062e+02, 1.1851357421875e+03]
-flo.eas.heaPorAir.Q_flow=[4.711e+03, 8.683483276367188e+02, 1.0555673828125e+03, 1.241033325195312e+03, 1.366472412109375e+03, 1.4597060546875e+03, 1.44360791015625e+03, 1.799058074951172e+02, 0e+00, 0e+00, 1.108915481567383e+02, 2.200256958007812e+02, 2.485429077148438e+02, 3.173660888671875e+02, 5.079508972167969e+02, 1.218779541015625e+03, 1.625998779296875e+03, 1.780156005859375e+03, 1.8833759765625e+03, 1.968952758789062e+03, 2.099931640625e+03, 2.24580810546875e+03, 2.322013916015625e+03, 2.40100732421875e+03, 2.466102783203125e+03, 2.5524794921875e+03, 2.51419873046875e+03, 1.434128295898438e+03, 1.1472607421875e+03, 1.337227294921875e+03, 1.573696411132812e+03, 1.750751953125e+03, 1.762882690429688e+03, 1.850237915039062e+03, 2.058067138671875e+03, 2.25205126953125e+03, 2.357396484375e+03, 2.38722021484375e+03, 2.447261962890625e+03, 2.4556494140625e+03, 2.497320556640625e+03, 2.56943359375e+03, 2.598147216796875e+03, 2.623964111328125e+03, 2.669382080078125e+03, 2.70225244140625e+03, 2.7247060546875e+03, 1.7719609375e+03, 1.557135009765625e+03, 1.718411010742188e+03, 1.932830322265625e+03, 1.897925537109375e+03, 1.882783325195312e+03, 1.899181762695312e+03, 2.0111689453125e+03, 2.08532080078125e+03, 2.086057861328125e+03, 2.061669921875e+03, 2.055376220703125e+03, 2.050472900390625e+03, 2.06944091796875e+03, 2.023738525390625e+03, 2.0197333984375e+03, 2.0065322265625e+03, 2.009334106445312e+03, 1.994727783203125e+03, 1.8730546875e+03, 7.927603149414062e+02, 3.622478942871094e+02, 2.890867004394531e+02, 1.558515167236328e+02, 3.493283462524414e+01, 0e+00, 0e+00, 1.659001312255859e+02, 7.83349853515625e+02, 1.043527587890625e+03, 1.086164794921875e+03, 1.134070434570312e+03, 1.207614013671875e+03, 1.280820190429688e+03, 1.320690795898438e+03, 1.325041625976562e+03, 1.31142138671875e+03, 1.311889526367188e+03, 1.369089965820312e+03, 1.310616943359375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.399244995117188e+02, 7.040089111328125e+02, 8.668974609375e+02, 9.221621704101562e+02, 1.004766723632812e+03, 1.114352905273438e+03]
-flo.nor.heaPorAir.Q_flow=[7.9415e+03, 1.350516357421875e+03, 1.638704711914062e+03, 1.93072412109375e+03, 2.13148486328125e+03, 2.276741455078125e+03, 3.005686279296875e+03, 1.200064331054688e+03, 1.262333618164062e+03, 7.007205810546875e+02, 1.528511352539062e+02, 2.884709777832031e+02, 3.303783569335938e+02, 4.253342895507812e+02, 7.391004028320312e+02, 1.973860107421875e+03, 3.899284423828125e+03, 2.895100341796875e+03, 3.052936279296875e+03, 4.047396728515625e+03, 4.67660546875e+03, 4.12172607421875e+03, 3.733805419921875e+03, 3.851164306640625e+03, 3.94548779296875e+03, 4.07455126953125e+03, 3.99646435546875e+03, 4.08869775390625e+03, 4.9227744140625e+03, 4.99880615234375e+03, 3.2096923828125e+03, 3.652024169921875e+03, 4.051004638671875e+03, 3.958865234375e+03, 4.8578564453125e+03, 3.82724365234375e+03, 4.64951220703125e+03, 3.979752197265625e+03, 4.055334716796875e+03, 4.049319091796875e+03, 4.09903173828125e+03, 4.20779931640625e+03, 4.2271298828125e+03, 4.25499609375e+03, 4.3275009765625e+03, 4.36976171875e+03, 4.394921875e+03, 4.12945458984375e+03, 3.790625244140625e+03, 3.626059326171875e+03, 3.552881591796875e+03, 3.49739990234375e+03, 3.4567724609375e+03, 3.41278955078125e+03, 3.520326416015625e+03, 3.585076416015625e+03, 3.55366064453125e+03, 3.491354736328125e+03, 3.461341552734375e+03, 3.43396923828125e+03, 3.44799755859375e+03, 3.352533447265625e+03, 3.33150244140625e+03, 3.297647705078125e+03, 3.289927734375e+03, 3.2540556640625e+03, 3.038861572265625e+03, 1.59567333984375e+03, 9.806012573242188e+02, 6.723750610351562e+02, 2.537335052490234e+02, 4.137187194824219e+01, 0e+00, 0e+00, 1.908564910888672e+02, 1.275002075195312e+03, 1.713973388671875e+03, 1.782324462890625e+03, 1.85339208984375e+03, 1.97002734375e+03, 2.08619140625e+03, 2.142570068359375e+03, 2.142214111328125e+03, 2.350095947265625e+03, 2.667295166015625e+03, 2.331322265625e+03, 2.1483076171875e+03, 5.175932006835938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.062527160644531e+02, 1.237019775390625e+03, 1.499258544921875e+03, 1.5778857421875e+03, 1.704729736328125e+03, 1.873915161132812e+03]
-flo.wes.heaPorAir.Q_flow=[4.711e+03, 1.812966796875e+03, 1.725112548828125e+03, 1.647934204101562e+03, 1.420196655273438e+03, 1.460381225585938e+03, 1.444713134765625e+03, 6.765029296875e+02, 2.815989685058594e+02, 1.65451416015625e+02, 5.586471557617188e+02, 2.994803466796875e+02, 2.248068084716797e+02, 2.130744323730469e+02, 5.346239624023438e+02, 1.274880615234375e+03, 1.68316748046875e+03, 1.829658935546875e+03, 1.958578369140625e+03, 2.008421020507812e+03, 2.13664990234375e+03, 2.27653759765625e+03, 2.34815966796875e+03, 2.43510302734375e+03, 2.511584716796875e+03, 2.570297607421875e+03, 2.52856494140625e+03, 2.19254931640625e+03, 1.930440063476562e+03, 1.7886748046875e+03, 2.1877724609375e+03, 1.967227416992188e+03, 1.292520385742188e+03, 1.185692749023438e+03, 1.942104736328125e+03, 2.237281005859375e+03, 2.34248046875e+03, 2.359982421875e+03, 2.41329638671875e+03, 2.41859814453125e+03, 2.459460205078125e+03, 2.53155029296875e+03, 2.561038330078125e+03, 2.587767578125e+03, 2.63405712890625e+03, 2.6678876953125e+03, 2.691897216796875e+03, 2.507743408203125e+03, 2.264587646484375e+03, 2.590072021484375e+03, 2.16738720703125e+03, 2.162076171875e+03, 1.71189208984375e+03, 1.535640502929688e+03, 1.863203002929688e+03, 2.447762939453125e+03, 2.057435546875e+03, 2.025986328125e+03, 2.01669189453125e+03, 2.411009765625e+03, 2.612368896484375e+03, 2.276982666015625e+03, 2.48223828125e+03, 2.53406591796875e+03, 1.98816162109375e+03, 2.31515771484375e+03, 2.151951904296875e+03, 1.768111938476562e+03, 1.26932568359375e+03, 4.600208435058594e+02, 6.9363623046875e+02, 5.039190673828125e+02, 2.901188049316406e+02, 7.942535400390625e+01, 5.604375e+02, 7.643826904296875e+02, 1.558670166015625e+03, 1.537926391601562e+03, 1.51277099609375e+03, 1.426253295898438e+03, 2.043560913085938e+03, 2.0816103515625e+03, 1.630356811523438e+03, 1.281311767578125e+03, 1.348439697265625e+03, 1.3410634765625e+03, 1.285531372070312e+03, 3.991569519042969e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.158706512451172e+02, 6.78323486328125e+02, 8.322073364257812e+02, 1.193723754882812e+03, 1.404786743164062e+03, 1.6355029296875e+03]
-flo.cor.heaPorAir.Q_flow=[1.0476017578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.961012268066406e+01, 1.768652191162109e+02, 2.494001007080078e+02, 3.185195617675781e+02, 3.816903991699219e+02, 2.474435424804688e+02, 0e+00, 0e+00, 0e+00, 0e+00, 3.240034484863281e+01, 5.269145965576172e+01, 0e+00, 1.0870361328125e+02, 4.027159423828125e+02, 4.637708740234375e+02, 4.842038879394531e+02, 5.007797241210938e+02, 5.188743286132812e+02, 5.3907177734375e+02, 5.677048950195312e+02, 5.939971923828125e+02, 6.201781616210938e+02, 6.470745849609375e+02, 6.746453247070312e+02, 7.050902099609375e+02, 5.442753295898438e+02, 4.968598022460938e+02, 5.289586181640625e+02, 5.488878173828125e+02, 5.45372314453125e+02, 5.065272521972656e+02, 4.137941589355469e+02, 4.790797119140625e+02, 5.843157348632812e+02, 5.949789428710938e+02, 5.85380615234375e+02, 5.75666015625e+02, 5.703601684570312e+02, 5.68122802734375e+02, 4.57984619140625e+02, 4.542123718261719e+02, 4.526752624511719e+02, 4.529879760742188e+02, 4.204383850097656e+02, 2.102472686767578e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.813319778442383e+01, 1.273550033569336e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
-EHea.y=[0e+00, 4.4262824e+07, 6.7593664e+07, 9.4218952e+07, 1.2339424e+08, 1.53811696e+08, 1.8712792e+08, 2.1100944e+08, 2.20119824e+08, 2.24958096e+08, 2.27994496e+08, 2.34360208e+08, 2.38446048e+08, 2.42142e+08, 2.48182128e+08, 2.69589376e+08, 3.0538896e+08, 3.45508672e+08, 3.86093216e+08, 4.30718592e+08, 4.8083952e+08, 5.34060736e+08, 5.86817344e+08, 6.40432128e+08, 6.96667072e+08, 7.54370752e+08, 8.11271296e+08, 8.61816192e+08, 9.03274688e+08, 9.39993408e+08, 9.73488896e+08, 1.00573984e+09, 1.038173056e+09, 1.070417344e+09, 1.1117952e+09, 1.163506304e+09, 1.217694976e+09, 1.271092864e+09, 1.32548864e+09, 1.380959744e+09, 1.436969216e+09, 1.494671104e+09, 1.553590272e+09, 1.613386624e+09, 1.674124288e+09, 1.736096512e+09, 1.798827264e+09, 1.85617664e+09, 1.90168128e+09, 1.942362496e+09, 1.981853824e+09, 2.019366144e+09, 2.06001984e+09, 2.100690176e+09, 2.141831296e+09, 2.188280064e+09, 2.236157184e+09, 2.284221952e+09, 2.332856832e+09, 2.384736768e+09, 2.438752768e+09, 2.489498368e+09, 2.542937344e+09, 2.595040512e+09, 2.64675072e+09, 2.69805824e+09, 2.7475136e+09, 2.788142848e+09, 2.809970176e+09, 2.821430784e+09, 2.82802176e+09, 2.834670848e+09, 2.837029632e+09, 2.837329664e+09, 2.839460864e+09, 2.854144768e+09, 2.876534272e+09, 2.900393472e+09, 2.924736512e+09, 2.95089408e+09, 2.979222528e+09, 3.010716672e+09, 3.041065216e+09, 3.070305024e+09, 3.099967744e+09, 3.13073664e+09, 3.160745728e+09, 3.180187392e+09, 3.181507072e+09, 3.181507072e+09, 3.181507072e+09, 3.181507072e+09, 3.181507072e+09, 3.181507072e+09, 3.181507072e+09, 3.182834944e+09, 3.19281536e+09, 3.207448064e+09, 3.225641216e+09, 3.246486784e+09, 3.270180864e+09]
-ECoo.y=[0e+00, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06, -2.6202895e+06]
+flo.TAirCor=[2.751499938964844e+02, 2.936260681152344e+02, 2.935738220214844e+02, 2.935372314453125e+02, 2.9350634765625e+02, 2.934850769042969e+02, 2.935169982910156e+02, 2.937933654785156e+02, 2.940245666503906e+02, 2.940243835449219e+02, 2.939497680664062e+02, 2.939085693359375e+02, 2.938933410644531e+02, 2.938829956054688e+02, 2.938321533203125e+02, 2.936167907714844e+02, 2.934883422851562e+02, 2.9342626953125e+02, 2.933868103027344e+02, 2.933311462402344e+02, 2.932718505859375e+02, 2.931492004394531e+02, 2.931497192382812e+02, 2.931499938964844e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931497192382812e+02, 2.932851867675781e+02, 2.933576965332031e+02, 2.933554992675781e+02, 2.933854064941406e+02, 2.931495361328125e+02, 2.931501159667969e+02, 2.931614074707031e+02, 2.931500549316406e+02, 2.931500244140625e+02, 2.931497802734375e+02, 2.9314990234375e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931497802734375e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931497802734375e+02, 2.931506042480469e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93150146484375e+02, 2.931503601074219e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.93151611328125e+02, 2.935868530273438e+02, 2.936769409179688e+02, 2.93706298828125e+02, 2.938256225585938e+02, 2.93866943359375e+02, 2.938852233886719e+02, 2.938804016113281e+02, 2.937759399414062e+02, 2.935525512695312e+02, 2.934234924316406e+02, 2.9337646484375e+02, 2.933534240722656e+02, 2.933127746582031e+02, 2.932710266113281e+02, 2.932222595214844e+02, 2.93192138671875e+02, 2.931615295410156e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.9328076171875e+02, 2.937333068847656e+02, 2.940651550292969e+02, 2.945459594726562e+02, 2.950185546875e+02, 2.952814331054688e+02, 2.954343566894531e+02, 2.954125671386719e+02, 2.949762573242188e+02, 2.937819213867188e+02, 2.935729675292969e+02, 2.935242614746094e+02, 2.9349609375e+02, 2.934588317871094e+02, 2.934225463867188e+02]
+flo.TAirSou=[2.751499938964844e+02, 2.931470642089844e+02, 2.931478576660156e+02, 2.93149658203125e+02, 2.931503295898438e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931619262695312e+02, 2.939835815429688e+02, 2.942169494628906e+02, 2.9357275390625e+02, 2.9338134765625e+02, 2.933678894042969e+02, 2.933053894042969e+02, 2.931496887207031e+02, 2.931499938964844e+02, 2.931478271484375e+02, 2.931480407714844e+02, 2.931499633789062e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.931484985351562e+02, 2.931493530273438e+02, 2.931498718261719e+02, 2.931499633789062e+02, 2.931498718261719e+02, 2.931494750976562e+02, 2.931572875976562e+02, 2.931509094238281e+02, 2.931501159667969e+02, 2.93493408203125e+02, 2.9329345703125e+02, 2.931480407714844e+02, 2.931495971679688e+02, 2.931498413085938e+02, 2.931499328613281e+02, 2.931492004394531e+02, 2.931488342285156e+02, 2.931497192382812e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931489868164062e+02, 2.931495971679688e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931500244140625e+02, 2.931493530273438e+02, 2.931569213867188e+02, 2.93150634765625e+02, 2.931500549316406e+02, 2.931500854492188e+02, 2.931442260742188e+02, 2.931461791992188e+02, 2.931567687988281e+02, 2.931513366699219e+02, 2.931494140625e+02, 2.9314794921875e+02, 2.931505432128906e+02, 2.931470947265625e+02, 2.931494750976562e+02, 2.931533508300781e+02, 2.931475830078125e+02, 2.931517639160156e+02, 2.931519775390625e+02, 2.931476745605469e+02, 2.931505126953125e+02, 2.931518249511719e+02, 2.93151123046875e+02, 2.931563415527344e+02, 2.931479187011719e+02, 2.935817565917969e+02, 2.937003479003906e+02, 2.936426696777344e+02, 2.934561767578125e+02, 2.931516418457031e+02, 2.931506652832031e+02, 2.931487121582031e+02, 2.931500244140625e+02, 2.931498718261719e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931495971679688e+02, 2.9314990234375e+02, 2.931501159667969e+02, 2.931499633789062e+02, 2.931498107910156e+02, 2.931515197753906e+02, 2.933322143554688e+02, 2.94483642578125e+02, 2.952792358398438e+02, 2.958674926757812e+02, 2.96150146484375e+02, 2.961827392578125e+02, 2.959317626953125e+02, 2.950322875976562e+02, 2.934742126464844e+02, 2.931465759277344e+02, 2.931483459472656e+02, 2.931502075195312e+02, 2.931500549316406e+02, 2.9314990234375e+02]
+flo.TAirNor=[2.751499938964844e+02, 2.93147216796875e+02, 2.931478576660156e+02, 2.93149658203125e+02, 2.931502380371094e+02, 2.931499633789062e+02, 2.931535034179688e+02, 2.931431274414062e+02, 2.931535949707031e+02, 2.931513366699219e+02, 2.931500854492188e+02, 2.931496887207031e+02, 2.93150390625e+02, 2.931495666503906e+02, 2.93149658203125e+02, 2.931499633789062e+02, 2.931483764648438e+02, 2.931487121582031e+02, 2.931499633789062e+02, 2.931485900878906e+02, 2.931510314941406e+02, 2.93150634765625e+02, 2.931495666503906e+02, 2.931498718261719e+02, 2.931499328613281e+02, 2.931498718261719e+02, 2.931496887207031e+02, 2.931406555175781e+02, 2.931491394042969e+02, 2.931500854492188e+02, 2.9315478515625e+02, 2.931463623046875e+02, 2.931531066894531e+02, 2.931484985351562e+02, 2.93147216796875e+02, 2.931505737304688e+02, 2.931565246582031e+02, 2.931494750976562e+02, 2.931498413085938e+02, 2.931500854492188e+02, 2.931498718261719e+02, 2.931495971679688e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931497192382812e+02, 2.931517333984375e+02, 2.931504516601562e+02, 2.93150146484375e+02, 2.93150146484375e+02, 2.931500244140625e+02, 2.931502685546875e+02, 2.931499633789062e+02, 2.931499633789062e+02, 2.931499938964844e+02, 2.931503601074219e+02, 2.931504211425781e+02, 2.931499633789062e+02, 2.931500549316406e+02, 2.931499938964844e+02, 2.931500549316406e+02, 2.931502380371094e+02, 2.931500244140625e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931520080566406e+02, 2.931532897949219e+02, 2.931507263183594e+02, 2.931501159667969e+02, 2.931510009765625e+02, 2.931517639160156e+02, 2.931793823242188e+02, 2.931916198730469e+02, 2.931498107910156e+02, 2.931502075195312e+02, 2.931497802734375e+02, 2.931494750976562e+02, 2.931498718261719e+02, 2.931498718261719e+02, 2.931499938964844e+02, 2.9314990234375e+02, 2.931500549316406e+02, 2.931492614746094e+02, 2.931487121582031e+02, 2.931506652832031e+02, 2.931540832519531e+02, 2.931542663574219e+02, 2.932133178710938e+02, 2.936001892089844e+02, 2.941541442871094e+02, 2.943966674804688e+02, 2.945514221191406e+02, 2.945723876953125e+02, 2.9421826171875e+02, 2.931493530273438e+02, 2.931478881835938e+02, 2.931485900878906e+02, 2.931502685546875e+02, 2.931500244140625e+02, 2.9314990234375e+02]
+flo.TAirEas=[2.751499938964844e+02, 2.931464538574219e+02, 2.931476135253906e+02, 2.931497497558594e+02, 2.931503601074219e+02, 2.931499633789062e+02, 2.931502380371094e+02, 2.931559448242188e+02, 2.933720397949219e+02, 2.93218994140625e+02, 2.931500854492188e+02, 2.931492309570312e+02, 2.931501159667969e+02, 2.93149658203125e+02, 2.931497192382812e+02, 2.931499938964844e+02, 2.931480712890625e+02, 2.93148193359375e+02, 2.931500244140625e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.931487121582031e+02, 2.931494445800781e+02, 2.931498718261719e+02, 2.931499633789062e+02, 2.931498718261719e+02, 2.931495971679688e+02, 2.931559448242188e+02, 2.931503295898438e+02, 2.931503601074219e+02, 2.931502380371094e+02, 2.931498413085938e+02, 2.931497497558594e+02, 2.931498718261719e+02, 2.931497497558594e+02, 2.9314990234375e+02, 2.931496887207031e+02, 2.931492309570312e+02, 2.931498107910156e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931494140625e+02, 2.931497802734375e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931495971679688e+02, 2.931558227539062e+02, 2.93150390625e+02, 2.931504211425781e+02, 2.93150146484375e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931500854492188e+02, 2.931502685546875e+02, 2.931499633789062e+02, 2.931500854492188e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931502075195312e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931519165039062e+02, 2.931544189453125e+02, 2.931505432128906e+02, 2.93150146484375e+02, 2.931507873535156e+02, 2.931515197753906e+02, 2.93171875e+02, 2.93166748046875e+02, 2.931498107910156e+02, 2.931502685546875e+02, 2.931496276855469e+02, 2.931493835449219e+02, 2.931498718261719e+02, 2.9314990234375e+02, 2.931499938964844e+02, 2.931498413085938e+02, 2.931500244140625e+02, 2.931500854492188e+02, 2.931499633789062e+02, 2.931498107910156e+02, 2.931517944335938e+02, 2.931930847167969e+02, 2.938018188476562e+02, 2.940296936035156e+02, 2.9425244140625e+02, 2.944788208007812e+02, 2.946192321777344e+02, 2.94609130859375e+02, 2.942291259765625e+02, 2.931494750976562e+02, 2.931476745605469e+02, 2.931484375e+02, 2.931502685546875e+02, 2.931500854492188e+02, 2.9314990234375e+02]
+flo.TAirWes=[2.751499938964844e+02, 2.931482238769531e+02, 2.93148681640625e+02, 2.931519165039062e+02, 2.931533203125e+02, 2.931499633789062e+02, 2.931503295898438e+02, 2.931528015136719e+02, 2.931506652832031e+02, 2.931494445800781e+02, 2.931483764648438e+02, 2.93148681640625e+02, 2.931515502929688e+02, 2.931497802734375e+02, 2.931496887207031e+02, 2.931499938964844e+02, 2.931481628417969e+02, 2.931483459472656e+02, 2.931474304199219e+02, 2.931500549316406e+02, 2.9314990234375e+02, 2.931488037109375e+02, 2.931494750976562e+02, 2.931483764648438e+02, 2.9315185546875e+02, 2.931498718261719e+02, 2.931496276855469e+02, 2.931522521972656e+02, 2.931504821777344e+02, 2.931501770019531e+02, 2.931473388671875e+02, 2.931614685058594e+02, 2.931544494628906e+02, 2.931498413085938e+02, 2.931499328613281e+02, 2.9314990234375e+02, 2.931499328613281e+02, 2.931493835449219e+02, 2.931498107910156e+02, 2.931501159667969e+02, 2.931498718261719e+02, 2.931494140625e+02, 2.931497802734375e+02, 2.931499938964844e+02, 2.931499328613281e+02, 2.931499938964844e+02, 2.931495971679688e+02, 2.931520080566406e+02, 2.931504516601562e+02, 2.931481628417969e+02, 2.931507568359375e+02, 2.931570739746094e+02, 2.931582336425781e+02, 2.931431884765625e+02, 2.931502380371094e+02, 2.931498107910156e+02, 2.931501770019531e+02, 2.93150390625e+02, 2.931499938964844e+02, 2.931433715820312e+02, 2.931492614746094e+02, 2.931474304199219e+02, 2.931521301269531e+02, 2.931474304199219e+02, 2.93149658203125e+02, 2.93148681640625e+02, 2.931483154296875e+02, 2.931537780761719e+02, 2.9315185546875e+02, 2.931528930664062e+02, 2.931507263183594e+02, 2.931533813476562e+02, 2.931570129394531e+02, 2.931494750976562e+02, 2.931488037109375e+02, 2.931499633789062e+02, 2.931492004394531e+02, 2.931515808105469e+02, 2.931481323242188e+02, 2.931523132324219e+02, 2.931479187011719e+02, 2.931525268554688e+02, 2.931508483886719e+02, 2.931499328613281e+02, 2.931488342285156e+02, 2.931498107910156e+02, 2.931517639160156e+02, 2.931540222167969e+02, 2.931839599609375e+02, 2.937047729492188e+02, 2.941324768066406e+02, 2.944755859375e+02, 2.947951049804688e+02, 2.947913513183594e+02, 2.941781616210938e+02, 2.931495056152344e+02, 2.931477661132812e+02, 2.931484985351562e+02, 2.931451110839844e+02, 2.931506042480469e+02, 2.931492614746094e+02]
+hea[1].conPID.y=[1e+00, 1.384236961603165e-01, 1.763395220041275e-01, 2.12895929813385e-01, 2.405474632978439e-01, 2.624847292900085e-01, 2.606273889541626e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.32210399210453e-02, 1.941894143819809e-01, 2.863489389419556e-01, 3.230796754360199e-01, 3.485067188739777e-01, 3.701284229755402e-01, 4.011679291725159e-01, 4.35018926858902e-01, 4.53206479549408e-01, 4.721992313861847e-01, 4.87718254327774e-01, 5.078625679016113e-01, 5.014850497245789e-01, 2.826259434223175e-01, 1.15186981856823e-01, 1.227963343262672e-02, 0e+00, 0e+00, 2.832048386335373e-02, 1.32111445069313e-01, 2.93863445520401e-01, 3.575212359428406e-01, 3.897124826908112e-01, 4.025314450263977e-01, 4.2118039727211e-01, 4.283733665943146e-01, 4.428466558456421e-01, 4.623379707336426e-01, 4.748145937919617e-01, 4.844212532043457e-01, 4.960619807243347e-01, 5.0632643699646e-01, 5.146020650863647e-01, 3.311496675014496e-01, 2.015071511268616e-01, 1.120534762740135e-01, 6.954938918352127e-02, 9.869055449962616e-02, 2.567248940467834e-01, 2.582204043865204e-01, 2.834553718566895e-01, 3.446231782436371e-01, 3.30243319272995e-01, 3.787779808044434e-01, 4.4676873087883e-01, 5.094587802886963e-01, 4.229053258895874e-01, 4.7893887758255e-01, 5.139967799186707e-01, 4.673962295055389e-01, 5.246511697769165e-01, 4.974605739116669e-01, 4.547607898712158e-01, 2.566860020160675e-01, 1.16742804646492e-01, 8.531969040632248e-02, 0e+00, 0e+00, 0e+00, 0e+00, 1.43595403060317e-02, 1.367433071136475e-01, 1.416065990924835e-01, 1.527995765209198e-01, 1.671679466962814e-01, 1.867223680019379e-01, 2.078063637018204e-01, 2.211199700832367e-01, 2.255178987979889e-01, 2.259427309036255e-01, 2.291672229766846e-01, 2.447579205036163e-01, 2.352651655673981e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.791942238807678e-02, 8.952298760414124e-02, 1.048317402601242e-01, 1.246234625577927e-01, 1.4923495054245e-01]
+hea[2].conPID.y=[1e+00, 1.842954754829407e-01, 2.242837399244308e-01, 2.633691728115082e-01, 2.898942828178406e-01, 3.098533749580383e-01, 3.06426078081131e-01, 3.819552436470985e-02, 0e+00, 0e+00, 2.353833429515362e-02, 4.671229794621468e-02, 5.272867903113365e-02, 6.742293387651443e-02, 1.078557223081589e-01, 2.585694789886475e-01, 3.451176285743713e-01, 3.779166042804718e-01, 3.997635543346405e-01, 4.17951226234436e-01, 4.457478821277618e-01, 4.766993820667267e-01, 4.927130341529846e-01, 5.096608400344849e-01, 5.234791040420532e-01, 5.418418645858765e-01, 5.336804389953613e-01, 3.044095635414124e-01, 2.435274720191956e-01, 2.838545739650726e-01, 3.339840173721313e-01, 3.71630996465683e-01, 3.742060363292694e-01, 3.927471935749054e-01, 4.368596971035004e-01, 4.780039489269257e-01, 5.003604888916016e-01, 5.068957209587097e-01, 5.196070671081543e-01, 5.212579369544983e-01, 5.301037430763245e-01, 5.454044342041016e-01, 5.515165328979492e-01, 5.569930076599121e-01, 5.666337609291077e-01, 5.736097097396851e-01, 5.783689022064209e-01, 3.760794997215271e-01, 3.305310010910034e-01, 3.647645711898804e-01, 4.102926850318909e-01, 4.028708934783936e-01, 3.996821939945221e-01, 4.031370580196381e-01, 4.269088506698608e-01, 4.42648321390152e-01, 4.428057074546814e-01, 4.375874996185303e-01, 4.362989366054535e-01, 4.352536797523499e-01, 4.392767250537872e-01, 4.295797348022461e-01, 4.28726851940155e-01, 4.259297847747803e-01, 4.265184104442596e-01, 4.234189689159393e-01, 3.975281715393066e-01, 1.682785153388977e-01, 7.690192759037018e-02, 6.136341020464897e-02, 3.308934345841408e-02, 7.413508836179972e-03, 0e+00, 0e+00, 3.526600450277328e-02, 1.660856753587723e-01, 2.215164601802826e-01, 2.307209372520447e-01, 2.407160699367523e-01, 2.563362717628479e-01, 2.71942526102066e-01, 2.803434431552887e-01, 2.81244307756424e-01, 2.783757448196411e-01, 2.784747183322906e-01, 2.906176149845123e-01, 2.781350612640381e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.092378705739975e-02, 1.494721174240112e-01, 1.840326339006424e-01, 1.958082467317581e-01, 2.131779044866562e-01, 2.365445345640182e-01]
+hea[3].conPID.y=[1e+00, 1.700336784124374e-01, 2.065238505601883e-01, 2.430625557899475e-01, 2.682612240314484e-01, 2.866916656494141e-01, 3.784740567207336e-01, 1.511153131723404e-01, 1.589265763759613e-01, 8.822942525148392e-02, 1.924673095345497e-02, 3.635748103260994e-02, 4.160525649785995e-02, 5.360134690999985e-02, 9.30902436375618e-02, 2.48443216085434e-01, 4.90967720746994e-01, 3.64602655172348e-01, 3.84411484003067e-01, 5.096538066864014e-01, 5.888792872428894e-01, 5.189984440803528e-01, 4.70089465379715e-01, 4.849431216716766e-01, 4.968203902244568e-01, 5.130956768989563e-01, 5.032332539558411e-01, 5.148524641990662e-01, 6.198799610137939e-01, 6.294530630111694e-01, 4.041662514209747e-01, 4.598665833473206e-01, 5.101056694984436e-01, 4.985028505325317e-01, 6.117019653320312e-01, 4.819833338260651e-01, 5.854331254959106e-01, 5.012305974960327e-01, 5.107252597808838e-01, 5.098931193351746e-01, 5.1615309715271e-01, 5.298447608947754e-01, 5.322898626327515e-01, 5.35796582698822e-01, 5.449274182319641e-01, 5.502473115921021e-01, 5.534105896949768e-01, 5.199726819992065e-01, 4.773187935352325e-01, 4.565962255001068e-01, 4.473817646503448e-01, 4.403892159461975e-01, 4.352257549762726e-01, 4.297410845756531e-01, 4.432823061943054e-01, 4.514351189136505e-01, 4.474860727787018e-01, 4.395627081394196e-01, 4.35854583978653e-01, 4.323997795581818e-01, 4.341747760772705e-01, 4.221533536911011e-01, 4.195051491260529e-01, 4.152286946773529e-01, 4.142720401287079e-01, 4.097525179386139e-01, 3.825891613960266e-01, 2.009284496307373e-01, 1.234863102436066e-01, 8.467106521129608e-02, 3.195806592702866e-02, 5.195623729377985e-03, 0e+00, 0e+00, 2.404355257749557e-02, 1.604070961475372e-01, 2.158283740282059e-01, 2.245562523603439e-01, 2.333723902702332e-01, 2.480654567480087e-01, 2.627596855163574e-01, 2.697949111461639e-01, 2.697404623031616e-01, 2.959274053573608e-01, 3.358688652515411e-01, 2.935632765293121e-01, 2.704499363899231e-01, 6.517355889081955e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.115059390664101e-02, 1.557949483394623e-01, 1.888015121221542e-01, 1.987145096063614e-01, 2.145811021327972e-01, 2.359663248062134e-01]
+hea[4].conPID.y=[1e+00, 3.848144114017487e-01, 3.663946986198425e-01, 3.497433662414551e-01, 3.01298588514328e-01, 3.099960684776306e-01, 3.066591918468475e-01, 1.436021327972412e-01, 5.972310528159142e-02, 3.511298447847366e-02, 1.185831427574158e-01, 6.355845183134079e-02, 4.845484346151352e-02, 4.52326275408268e-02, 1.135428845882416e-01, 2.704674303531647e-01, 3.572556376457214e-01, 3.884198367595673e-01, 4.157432913780212e-01, 4.263288080692291e-01, 4.535420536994934e-01, 4.832234680652618e-01, 4.982756972312927e-01, 5.16872763633728e-01, 5.331334471702576e-01, 5.456228256225586e-01, 5.367303490638733e-01, 4.65406745672226e-01, 4.097748696804047e-01, 3.796798884868622e-01, 4.645375609397888e-01, 4.17573869228363e-01, 2.74357795715332e-01, 2.516844570636749e-01, 4.122375547885895e-01, 4.748524129390717e-01, 4.972278773784637e-01, 5.010750889778137e-01, 5.123786330223083e-01, 5.133932828903198e-01, 5.220672488212585e-01, 5.373628735542297e-01, 5.436398983001709e-01, 5.493099689483643e-01, 5.591354966163635e-01, 5.663153529167175e-01, 5.714045763015747e-01, 5.323022603988647e-01, 4.807025790214539e-01, 5.497925281524658e-01, 4.600666463375092e-01, 4.597705900669098e-01, 3.62076461315155e-01, 3.259648978710175e-01, 3.955007493495941e-01, 5.195826888084412e-01, 4.367310702800751e-01, 4.299905598163605e-01, 4.280876219272614e-01, 5.118007063865662e-01, 5.545230507850647e-01, 4.833329319953918e-01, 5.269020199775696e-01, 5.379157066345215e-01, 4.219464063644409e-01, 4.914352893829346e-01, 4.567254185676575e-01, 3.753154575824738e-01, 2.694546580314636e-01, 9.757009893655777e-02, 1.472452729940414e-01, 1.069919392466545e-01, 6.159631907939911e-02, 1.676232181489468e-02, 1.191263049840927e-01, 1.620467752218246e-01, 3.308671712875366e-01, 3.266149461269379e-01, 3.211026191711426e-01, 3.027466833591461e-01, 4.338662326335907e-01, 4.418635964393616e-01, 3.460426330566406e-01, 2.720212638378143e-01, 2.862352430820465e-01, 2.846685945987701e-01, 2.728106677532196e-01, 8.472698926925659e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.581781104207039e-02, 1.440190076828003e-01, 1.766678690910339e-01, 2.534768879413605e-01, 2.980930507183075e-01, 3.471684753894806e-01]
+hea[5].conPID.y=[1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.542975410819054e-03, 1.677581481635571e-02, 2.3806968703866e-02, 3.040551580488682e-02, 3.644736483693123e-02, 2.361591532826424e-02, 0e+00, 0e+00, 0e+00, 0e+00, 3.091752994805574e-03, 5.029330961406231e-03, 0e+00, 1.037454325705767e-02, 3.841161727905273e-02, 4.423623532056808e-02, 4.625045880675316e-02, 4.783187806606293e-02, 4.952939599752426e-02, 5.145753920078278e-02, 5.418757721781731e-02, 5.670492351055145e-02, 5.920295044779778e-02, 6.176922470331192e-02, 6.440035998821259e-02, 6.730401515960693e-02, 5.194686353206635e-02, 4.742811620235443e-02, 5.049222707748413e-02, 5.239514634013176e-02, 5.207967013120651e-02, 4.823970049619675e-02, 3.949912264943123e-02, 4.573104903101921e-02, 5.577600002288818e-02, 5.679478123784065e-02, 5.586429312825203e-02, 5.494855344295502e-02, 5.444327369332314e-02, 5.423057079315186e-02, 4.371630400419235e-02, 4.335725679993629e-02, 4.32104729115963e-02, 4.323983564972878e-02, 4.01330329477787e-02, 2.001620084047318e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.731834374368191e-03, 1.216063508763909e-03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+flo.sou.heaPorAir.Q_flow=[7.9415e+03, 1.099291748046875e+03, 1.400400268554688e+03, 1.690713012695312e+03, 1.910307739257812e+03, 2.0845224609375e+03, 2.0697724609375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.638248901367188e+02, 1.542155151367188e+03, 2.2740400390625e+03, 2.565737060546875e+03, 2.767666015625e+03, 2.939374755859375e+03, 3.185875e+03, 3.454702880859375e+03, 3.599139404296875e+03, 3.74997021484375e+03, 3.873214599609375e+03, 4.03319091796875e+03, 3.98254345703125e+03, 2.244473876953125e+03, 9.147574462890625e+02, 9.751871490478516e+01, 0e+00, 0e+00, 2.249071197509766e+02, 1.049162963867188e+03, 2.333716552734375e+03, 2.8392548828125e+03, 3.094901611328125e+03, 3.19670361328125e+03, 3.34480419921875e+03, 3.40192724609375e+03, 3.51686669921875e+03, 3.671656982421875e+03, 3.770740234375e+03, 3.847031494140625e+03, 3.939476318359375e+03, 4.020991455078125e+03, 4.08671240234375e+03, 2.629824951171875e+03, 1.60026904296875e+03, 8.898726806640625e+02, 5.523264770507812e+02, 7.837510375976562e+02, 2.038780639648438e+03, 2.0506572265625e+03, 2.251060791015625e+03, 2.7368251953125e+03, 2.62262744140625e+03, 3.0080654296875e+03, 3.548013916015625e+03, 4.045866943359375e+03, 3.358502685546875e+03, 3.8034931640625e+03, 4.0819052734375e+03, 3.7118271484375e+03, 4.166517578125e+03, 3.950583251953125e+03, 3.61148291015625e+03, 2.038471801757812e+03, 9.271129760742188e+02, 6.775663452148438e+02, 0e+00, 0e+00, 0e+00, 0e+00, 1.140362930297852e+02, 1.085946899414062e+03, 1.124568725585938e+03, 1.213457885742188e+03, 1.327564331054688e+03, 1.482855712890625e+03, 1.650294311523438e+03, 1.756024291992188e+03, 1.790950439453125e+03, 1.79432421875e+03, 1.819931518554688e+03, 1.943744995117188e+03, 1.8683583984375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.805520935058594e+02, 7.1094677734375e+02, 8.32521240234375e+02, 9.896972045898438e+02, 1.1851494140625e+03]
+flo.eas.heaPorAir.Q_flow=[4.711e+03, 8.682160034179688e+02, 1.056600708007812e+03, 1.240732177734375e+03, 1.365692016601562e+03, 1.45971923828125e+03, 1.443573364257812e+03, 1.799391174316406e+02, 0e+00, 0e+00, 1.108890914916992e+02, 2.200616302490234e+02, 2.484048156738281e+02, 3.176294555664062e+02, 5.081083068847656e+02, 1.218120849609375e+03, 1.62584912109375e+03, 1.780365234375e+03, 1.8832861328125e+03, 1.96896826171875e+03, 2.099918212890625e+03, 2.245730712890625e+03, 2.321171142578125e+03, 2.401012451171875e+03, 2.466110107421875e+03, 2.552616943359375e+03, 2.51416845703125e+03, 1.434073364257812e+03, 1.147257934570312e+03, 1.337238891601562e+03, 1.573398681640625e+03, 1.750753662109375e+03, 1.762884521484375e+03, 1.850232055664062e+03, 2.0580458984375e+03, 2.25187646484375e+03, 2.357198486328125e+03, 2.38798583984375e+03, 2.447868896484375e+03, 2.45564599609375e+03, 2.497318603515625e+03, 2.569400146484375e+03, 2.5981943359375e+03, 2.623994140625e+03, 2.66941162109375e+03, 2.702275390625e+03, 2.72469580078125e+03, 1.771710571289062e+03, 1.557131591796875e+03, 1.718405883789062e+03, 1.932888793945312e+03, 1.8979248046875e+03, 1.882902709960938e+03, 1.899178588867188e+03, 2.011167602539062e+03, 2.08531640625e+03, 2.0860576171875e+03, 2.061474609375e+03, 2.055404296875e+03, 2.05047998046875e+03, 2.0694326171875e+03, 2.023750122070312e+03, 2.019732177734375e+03, 2.006555297851562e+03, 2.009328125e+03, 1.994726684570312e+03, 1.872755126953125e+03, 7.927600708007812e+02, 3.622849731445312e+02, 2.890830383300781e+02, 1.558838958740234e+02, 3.492504119873047e+01, 0e+00, 0e+00, 1.661381378173828e+02, 7.824296264648438e+02, 1.043564086914062e+03, 1.08692626953125e+03, 1.134013427734375e+03, 1.20760009765625e+03, 1.281121215820312e+03, 1.320697875976562e+03, 1.324942016601562e+03, 1.311428100585938e+03, 1.311894409179688e+03, 1.369099609375e+03, 1.310294189453125e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.399019622802734e+02, 7.041631469726562e+02, 8.669777221679688e+02, 9.224526977539062e+02, 1.004281127929688e+03, 1.114361328125e+03]
+flo.nor.heaPorAir.Q_flow=[7.9415e+03, 1.350322509765625e+03, 1.640109252929688e+03, 1.930281372070312e+03, 2.130396484375e+03, 2.27676171875e+03, 3.00565185546875e+03, 1.200082275390625e+03, 1.262115356445312e+03, 7.006740112304688e+02, 1.528479156494141e+02, 2.887329406738281e+02, 3.304081420898438e+02, 4.256751098632812e+02, 7.392761840820312e+02, 1.973011840820312e+03, 3.89902001953125e+03, 2.895491943359375e+03, 3.052803955078125e+03, 4.047415771484375e+03, 4.6765849609375e+03, 4.1216259765625e+03, 3.733215576171875e+03, 3.85117578125e+03, 3.945499267578125e+03, 4.074749267578125e+03, 3.9964267578125e+03, 4.088700927734375e+03, 4.9227763671875e+03, 4.99880126953125e+03, 3.209686279296875e+03, 3.6520302734375e+03, 4.05100390625e+03, 3.9588603515625e+03, 4.8578310546875e+03, 3.827670654296875e+03, 4.64921728515625e+03, 3.980522705078125e+03, 4.055924560546875e+03, 4.04931640625e+03, 4.09902978515625e+03, 4.20776220703125e+03, 4.2271796875e+03, 4.25502880859375e+03, 4.327541015625e+03, 4.36978857421875e+03, 4.39491015625e+03, 4.12936328125e+03, 3.790627197265625e+03, 3.626058837890625e+03, 3.55288232421875e+03, 3.49735107421875e+03, 3.45634521484375e+03, 3.412788818359375e+03, 3.520326416015625e+03, 3.585072021484375e+03, 3.553710693359375e+03, 3.490787109375e+03, 3.461339111328125e+03, 3.43390283203125e+03, 3.4479990234375e+03, 3.352531005859375e+03, 3.331500244140625e+03, 3.29753857421875e+03, 3.28994140625e+03, 3.254049560546875e+03, 3.038331787109375e+03, 1.59567333984375e+03, 9.806665649414062e+02, 6.72415283203125e+02, 2.537949676513672e+02, 4.126104736328125e+01, 0e+00, 0e+00, 1.909418792724609e+02, 1.273872924804688e+03, 1.714001098632812e+03, 1.7833134765625e+03, 1.853326904296875e+03, 1.970011840820312e+03, 2.0867060546875e+03, 2.142576416015625e+03, 2.142143798828125e+03, 2.350107421875e+03, 2.667302734375e+03, 2.331332763671875e+03, 2.147778076171875e+03, 5.175758056640625e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.062124328613281e+02, 1.23724560546875e+03, 1.4993671875e+03, 1.57809130859375e+03, 1.704095825195312e+03, 1.873926513671875e+03]
+flo.wes.heaPorAir.Q_flow=[4.711e+03, 1.812860717773438e+03, 1.72608544921875e+03, 1.647640991210938e+03, 1.419417724609375e+03, 1.460391479492188e+03, 1.44467138671875e+03, 6.765096435546875e+02, 2.813555603027344e+02, 1.654172821044922e+02, 5.586452026367188e+02, 2.994238586425781e+02, 2.282707672119141e+02, 2.130908966064453e+02, 5.349005126953125e+02, 1.274172119140625e+03, 1.68303125e+03, 1.829845947265625e+03, 1.958566650390625e+03, 2.00843505859375e+03, 2.136636474609375e+03, 2.2764658203125e+03, 2.347376708984375e+03, 2.434987548828125e+03, 2.511591796875e+03, 2.570428955078125e+03, 2.528536865234375e+03, 2.19253125e+03, 1.930449340820312e+03, 1.788671997070312e+03, 2.1884365234375e+03, 1.9671904296875e+03, 1.292499633789062e+03, 1.185685424804688e+03, 1.942051025390625e+03, 2.23702978515625e+03, 2.3424404296875e+03, 2.360564697265625e+03, 2.413815673828125e+03, 2.418595703125e+03, 2.459458740234375e+03, 2.5315166015625e+03, 2.561087646484375e+03, 2.58779931640625e+03, 2.63408740234375e+03, 2.66791162109375e+03, 2.691886962890625e+03, 2.507676025390625e+03, 2.26458984375e+03, 2.590072509765625e+03, 2.1673740234375e+03, 2.165979248046875e+03, 1.7057421875e+03, 1.53562060546875e+03, 1.863203979492188e+03, 2.44775390625e+03, 2.057440185546875e+03, 2.025685546875e+03, 2.016720825195312e+03, 2.41109326171875e+03, 2.612358154296875e+03, 2.2769814453125e+03, 2.4822353515625e+03, 2.534120849609375e+03, 1.987789428710938e+03, 2.315151611328125e+03, 2.15163330078125e+03, 1.768111083984375e+03, 1.26940087890625e+03, 4.596527404785156e+02, 6.936725463867188e+02, 5.040390014648438e+02, 2.901802673339844e+02, 7.896730041503906e+01, 5.612040405273438e+02, 7.6340234375e+02, 1.558715209960938e+03, 1.53868310546875e+03, 1.512714477539062e+03, 1.426239624023438e+03, 2.043943725585938e+03, 2.081619384765625e+03, 1.630206787109375e+03, 1.2814921875e+03, 1.348454223632812e+03, 1.34107373046875e+03, 1.285211059570312e+03, 3.991488342285156e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.158477020263672e+02, 6.784735717773438e+02, 8.322822875976562e+02, 1.194129516601562e+03, 1.40431640625e+03, 1.635510620117188e+03]
+flo.cor.heaPorAir.Q_flow=[1.0476017578125e+04, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.949636077880859e+01, 1.757437438964844e+02, 2.494022369384766e+02, 3.185287475585938e+02, 3.818232421875e+02, 2.474007568359375e+02, 0e+00, 0e+00, 0e+00, 0e+00, 3.238925933837891e+01, 5.268735885620117e+01, 0e+00, 1.086839065551758e+02, 4.024007873535156e+02, 4.634196166992188e+02, 4.845206298828125e+02, 5.010875854492188e+02, 5.18870849609375e+02, 5.390701293945312e+02, 5.676700439453125e+02, 5.940418090820312e+02, 6.20211181640625e+02, 6.470955200195312e+02, 6.746593627929688e+02, 7.050780639648438e+02, 5.441962890625e+02, 4.968578186035156e+02, 5.289574584960938e+02, 5.488924560546875e+02, 5.455875854492188e+02, 5.053599853515625e+02, 4.137935180664062e+02, 4.790792846679688e+02, 5.843103637695312e+02, 5.94983154296875e+02, 5.852353515625e+02, 5.756420288085938e+02, 5.703486938476562e+02, 5.681204223632812e+02, 4.579728088378906e+02, 4.542113952636719e+02, 4.526737060546875e+02, 4.529813232421875e+02, 4.204343872070312e+02, 2.096900787353516e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.814272880554199e+01, 1.273950386047363e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+EHea.y=[0e+00, 4.4264356e+07, 6.7594704e+07, 9.4221008e+07, 1.23396344e+08, 1.53813712e+08, 1.87130464e+08, 2.11011776e+08, 2.20122144e+08, 2.24960304e+08, 2.27996656e+08, 2.3436264e+08, 2.3844944e+08, 2.42145584e+08, 2.48185632e+08, 2.69593408e+08, 3.05392992e+08, 3.45513216e+08, 3.86097824e+08, 4.30721888e+08, 4.8084288e+08, 5.34063936e+08, 5.86821056e+08, 6.40435072e+08, 6.96669888e+08, 7.54373696e+08, 8.11274432e+08, 8.618192e+08, 9.03277632e+08, 9.39996352e+08, 9.73492032e+08, 1.00574304e+09, 1.038176128e+09, 1.070420416e+09, 1.111798272e+09, 1.163509376e+09, 1.21769856e+09, 1.271095808e+09, 1.325491712e+09, 1.380963072e+09, 1.436972544e+09, 1.494674816e+09, 1.553593856e+09, 1.613390208e+09, 1.674127872e+09, 1.73610048e+09, 1.798830976e+09, 1.856180352e+09, 1.901684864e+09, 1.94236608e+09, 1.981857408e+09, 2.019369856e+09, 2.06002368e+09, 2.100694016e+09, 2.141835136e+09, 2.18828416e+09, 2.236160768e+09, 2.284225536e+09, 2.332860416e+09, 2.384741632e+09, 2.438757632e+09, 2.489502976e+09, 2.542941952e+09, 2.59504512e+09, 2.646755328e+09, 2.698063616e+09, 2.747519232e+09, 2.788148224e+09, 2.809975552e+09, 2.82143616e+09, 2.82802688e+09, 2.834675968e+09, 2.837034752e+09, 2.837334784e+09, 2.839465984e+09, 2.854150144e+09, 2.876539648e+09, 2.900398336e+09, 2.924741632e+09, 2.950898944e+09, 2.979227136e+09, 3.01072128e+09, 3.04107008e+09, 3.070309632e+09, 3.099972608e+09, 3.130741504e+09, 3.160751104e+09, 3.180192768e+09, 3.181512448e+09, 3.181512448e+09, 3.181512448e+09, 3.181512448e+09, 3.181512448e+09, 3.181512448e+09, 3.181512448e+09, 3.182840064e+09, 3.192820736e+09, 3.207453184e+09, 3.225645312e+09, 3.246491392e+09, 3.270185216e+09]
+ECoo.y=[0e+00, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06, -2.6204325e+06]
 coo[1].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 coo[2].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 coo[3].conPID.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Unconditioned.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Unconditioned.txt
index e58a13b0fef..3eef518c8ca 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Unconditioned.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Examples_SmallOffice_Unconditioned.txt
@@ -1,22 +1,16 @@
-last-generated=2023-03-02
-statistics-initialization=
-{
-  "linear": "0, 0, 0, 0",
-  "nonlinear": "0, 0, 0, 0",
-  "numerical Jacobians": "0"
-}
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "0, 0, 0, 0",
-  "number of continuous time states": "18",
+  "number of continuous time states": "24",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
 weaDat.weaBus.TDryBul=[2.609500122070312e+02, 2.608676452636719e+02, 2.609342651367188e+02, 2.61153564453125e+02, 2.614064331054688e+02, 2.616917419433594e+02, 2.619866027832031e+02, 2.621011047363281e+02, 2.620299682617188e+02, 2.62211181640625e+02, 2.625067138671875e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625875549316406e+02, 2.628901062011719e+02, 2.632776489257812e+02, 2.637460632324219e+02, 2.6446923828125e+02, 2.655892028808594e+02, 2.665859985351562e+02, 2.674020080566406e+02, 2.682179870605469e+02, 2.690339965820312e+02, 2.698500061035156e+02, 2.704558715820312e+02, 2.709069213867188e+02, 2.715532531738281e+02, 2.720364685058594e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.719675598144531e+02, 2.716164855957031e+02, 2.713160400390625e+02, 2.71072998046875e+02, 2.710076599121094e+02, 2.717365112304688e+02, 2.720211181640625e+02, 2.716227111816406e+02, 2.714859924316406e+02, 2.718775329589844e+02, 2.7202783203125e+02, 2.717281494140625e+02, 2.714362182617188e+02, 2.714474182128906e+02, 2.714500122070312e+02, 2.704067077636719e+02, 2.692704162597656e+02, 2.696753845214844e+02, 2.703369750976562e+02, 2.701487121582031e+02, 2.698616027832031e+02, 2.69929931640625e+02, 2.702106018066406e+02, 2.708657531738281e+02, 2.718394165039062e+02, 2.721007690429688e+02, 2.720183410644531e+02, 2.721641845703125e+02, 2.724365844726562e+02, 2.725657043457031e+02, 2.72480224609375e+02, 2.7264599609375e+02, 2.729339904785156e+02, 2.732219848632812e+02, 2.73510009765625e+02, 2.738106079101562e+02, 2.744635620117188e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.742786560058594e+02, 2.732598266601562e+02, 2.727458801269531e+02, 2.725348205566406e+02, 2.729032287597656e+02, 2.736190795898438e+02, 2.73848876953125e+02, 2.738165588378906e+02, 2.734445495605469e+02, 2.726629028320312e+02, 2.727448425292969e+02, 2.734616394042969e+02, 2.738507690429688e+02, 2.740790100097656e+02, 2.743446655273438e+02, 2.746334838867188e+02, 2.749204406738281e+02, 2.751761474609375e+02, 2.753359069824219e+02, 2.740944213867188e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.731499938964844e+02]
-flo.att.TAir=[2.751499938964844e+02, 2.745491943359375e+02, 2.718550415039062e+02, 2.693681640625e+02, 2.675464782714844e+02, 2.662554931640625e+02, 2.653342895507812e+02, 2.646456604003906e+02, 2.64102294921875e+02, 2.636926574707031e+02, 2.634119567871094e+02, 2.632068176269531e+02, 2.630183715820312e+02, 2.628519592285156e+02, 2.627225646972656e+02, 2.626047973632812e+02, 2.627265319824219e+02, 2.634495544433594e+02, 2.647464294433594e+02, 2.663594665527344e+02, 2.685351867675781e+02, 2.70814208984375e+02, 2.731460571289062e+02, 2.751850280761719e+02, 2.768753356933594e+02, 2.777212524414062e+02, 2.777241516113281e+02, 2.775518188476562e+02, 2.7751513671875e+02, 2.774648132324219e+02, 2.771814575195312e+02, 2.765562438964844e+02, 2.757820434570312e+02, 2.749534606933594e+02, 2.740309143066406e+02, 2.729033203125e+02, 2.719960327148438e+02, 2.712330627441406e+02, 2.706087951660156e+02, 2.702200317382812e+02, 2.700163269042969e+02, 2.700069274902344e+02, 2.701102294921875e+02, 2.6996923828125e+02, 2.696339721679688e+02, 2.695575866699219e+02, 2.697357788085938e+02, 2.696833190917969e+02, 2.693262329101562e+02, 2.689372863769531e+02, 2.685931091308594e+02, 2.681056518554688e+02, 2.674418334960938e+02, 2.669859313964844e+02, 2.669165649414062e+02, 2.66911376953125e+02, 2.6675048828125e+02, 2.66581787109375e+02, 2.665540771484375e+02, 2.667217102050781e+02, 2.67242431640625e+02, 2.678531188964844e+02, 2.682842712402344e+02, 2.685548706054688e+02, 2.68865966796875e+02, 2.692108154296875e+02, 2.695677185058594e+02, 2.700899353027344e+02, 2.70879150390625e+02, 2.720466003417969e+02, 2.735314331054688e+02, 2.748746337890625e+02, 2.759403076171875e+02, 2.770601196289062e+02, 2.78327392578125e+02, 2.795667724609375e+02, 2.80728271484375e+02, 2.817684936523438e+02, 2.822939147949219e+02, 2.820474853515625e+02, 2.81136962890625e+02, 2.800486755371094e+02, 2.787626647949219e+02, 2.774829406738281e+02, 2.763472900390625e+02, 2.752391052246094e+02, 2.74533447265625e+02, 2.738520812988281e+02, 2.732513427734375e+02, 2.729901428222656e+02, 2.729458312988281e+02, 2.729627990722656e+02, 2.730225830078125e+02, 2.731437072753906e+02, 2.733085327148438e+02, 2.734564208984375e+02, 2.735606079101562e+02, 2.733249816894531e+02, 2.727307739257812e+02, 2.722709045410156e+02, 2.720926208496094e+02]
-flo.sou.TAir=[2.751499938964844e+02, 2.91910888671875e+02, 2.91265625e+02, 2.911001892089844e+02, 2.909589233398438e+02, 2.908163757324219e+02, 2.906866455078125e+02, 2.905531005859375e+02, 2.904166870117188e+02, 2.902969055175781e+02, 2.901882629394531e+02, 2.900727233886719e+02, 2.899562377929688e+02, 2.89839599609375e+02, 2.896952209472656e+02, 2.895221862792969e+02, 2.896581726074219e+02, 2.898941345214844e+02, 2.902421264648438e+02, 2.904783020019531e+02, 2.904295959472656e+02, 2.907840881347656e+02, 2.909596252441406e+02, 2.909824523925781e+02, 2.910396728515625e+02, 2.908736572265625e+02, 2.906188049316406e+02, 2.906244201660156e+02, 2.905829772949219e+02, 2.904880065917969e+02, 2.904268188476562e+02, 2.902789001464844e+02, 2.900814514160156e+02, 2.899444885253906e+02, 2.898067932128906e+02, 2.896923217773438e+02, 2.8960595703125e+02, 2.895174560546875e+02, 2.894323425292969e+02, 2.893529357910156e+02, 2.892847290039062e+02, 2.892648010253906e+02, 2.892393493652344e+02, 2.891818237304688e+02, 2.891311950683594e+02, 2.891002502441406e+02, 2.890598449707031e+02, 2.889925537109375e+02, 2.88923095703125e+02, 2.888731079101562e+02, 2.8882568359375e+02, 2.888290710449219e+02, 2.887282104492188e+02, 2.887012329101562e+02, 2.886596984863281e+02, 2.886521606445312e+02, 2.886005249023438e+02, 2.885735473632812e+02, 2.885585327148438e+02, 2.885600891113281e+02, 2.884456176757812e+02, 2.884826049804688e+02, 2.885621643066406e+02, 2.886356506347656e+02, 2.886422729492188e+02, 2.887931518554688e+02, 2.888376770019531e+02, 2.900229797363281e+02, 2.901949157714844e+02, 2.904810791015625e+02, 2.90765380859375e+02, 2.909938049316406e+02, 2.911629943847656e+02, 2.913366394042969e+02, 2.916218872070312e+02, 2.918357238769531e+02, 2.916292419433594e+02, 2.916966247558594e+02, 2.921077880859375e+02, 2.921232299804688e+02, 2.921630554199219e+02, 2.92186767578125e+02, 2.922192993164062e+02, 2.922667846679688e+02, 2.922432250976562e+02, 2.916156921386719e+02, 2.904920349121094e+02, 2.911037292480469e+02, 2.906723022460938e+02, 2.906090393066406e+02, 2.905197448730469e+02, 2.904570007324219e+02, 2.903492126464844e+02, 2.90293212890625e+02, 2.902227478027344e+02, 2.901870727539062e+02, 2.901510009765625e+02, 2.900409545898438e+02, 2.899258422851562e+02, 2.898419189453125e+02, 2.897745971679688e+02]
-flo.eas.TAir=[2.751499938964844e+02, 2.927320251464844e+02, 2.911792602539062e+02, 2.909587707519531e+02, 2.9080859375e+02, 2.906629028320312e+02, 2.905310668945312e+02, 2.903970642089844e+02, 2.902614440917969e+02, 2.901414184570312e+02, 2.900315856933594e+02, 2.899170532226562e+02, 2.8980224609375e+02, 2.896873474121094e+02, 2.895697631835938e+02, 2.894401245117188e+02, 2.895416870117188e+02, 2.89781005859375e+02, 2.90048828125e+02, 2.902179260253906e+02, 2.902967529296875e+02, 2.9028515625e+02, 2.902337341308594e+02, 2.901041564941406e+02, 2.900414428710938e+02, 2.899861755371094e+02, 2.899021911621094e+02, 2.898448181152344e+02, 2.89798583984375e+02, 2.897427062988281e+02, 2.896906433105469e+02, 2.896380310058594e+02, 2.89587890625e+02, 2.895073852539062e+02, 2.894220886230469e+02, 2.893417053222656e+02, 2.892727355957031e+02, 2.89197998046875e+02, 2.891259460449219e+02, 2.8905322265625e+02, 2.889967956542969e+02, 2.889815368652344e+02, 2.889570617675781e+02, 2.8890771484375e+02, 2.888623962402344e+02, 2.888334655761719e+02, 2.88802490234375e+02, 2.887431030273438e+02, 2.886798095703125e+02, 2.886336975097656e+02, 2.885905456542969e+02, 2.885982666015625e+02, 2.885059814453125e+02, 2.884814147949219e+02, 2.88472900390625e+02, 2.884396057128906e+02, 2.88392578125e+02, 2.883660888671875e+02, 2.883492736816406e+02, 2.883529052734375e+02, 2.883648071289062e+02, 2.883721923828125e+02, 2.883762817382812e+02, 2.884449768066406e+02, 2.884517211914062e+02, 2.886019287109375e+02, 2.886486511230469e+02, 2.898257141113281e+02, 2.900660705566406e+02, 2.904031982421875e+02, 2.906686706542969e+02, 2.908729248046875e+02, 2.910613098144531e+02, 2.912413330078125e+02, 2.914142456054688e+02, 2.915713195800781e+02, 2.913591613769531e+02, 2.914186401367188e+02, 2.918225708007812e+02, 2.918512268066406e+02, 2.918966064453125e+02, 2.919338684082031e+02, 2.919802551269531e+02, 2.919085693359375e+02, 2.916999816894531e+02, 2.919437561035156e+02, 2.908548278808594e+02, 2.90868896484375e+02, 2.905095825195312e+02, 2.904483032226562e+02, 2.903627319335938e+02, 2.903006286621094e+02, 2.901942138671875e+02, 2.901239929199219e+02, 2.899118347167969e+02, 2.898673706054688e+02, 2.89923828125e+02, 2.898828125e+02, 2.897733764648438e+02, 2.896932067871094e+02, 2.896294555664062e+02]
-flo.nor.TAir=[2.751499938964844e+02, 2.920838928222656e+02, 2.912308044433594e+02, 2.910216674804688e+02, 2.908787841796875e+02, 2.907369995117188e+02, 2.906081848144531e+02, 2.904772033691406e+02, 2.903441772460938e+02, 2.902265625e+02, 2.901193542480469e+02, 2.900066833496094e+02, 2.898932800292969e+02, 2.897799987792969e+02, 2.89664306640625e+02, 2.895325622558594e+02, 2.895217590332031e+02, 2.895897827148438e+02, 2.89698974609375e+02, 2.897751770019531e+02, 2.898173522949219e+02, 2.898466186523438e+02, 2.899039306640625e+02, 2.899075927734375e+02, 2.899239501953125e+02, 2.898840026855469e+02, 2.898122253417969e+02, 2.897708435058594e+02, 2.8973486328125e+02, 2.896851501464844e+02, 2.896406555175781e+02, 2.89595703125e+02, 2.895557556152344e+02, 2.89480712890625e+02, 2.894016418457031e+02, 2.893260803222656e+02, 2.892615356445312e+02, 2.891912536621094e+02, 2.891233520507812e+02, 2.890540771484375e+02, 2.889991149902344e+02, 2.889855651855469e+02, 2.889655151367188e+02, 2.889193725585938e+02, 2.888772583007812e+02, 2.888506164550781e+02, 2.888213500976562e+02, 2.887648010253906e+02, 2.887057495117188e+02, 2.886629333496094e+02, 2.886224060058594e+02, 2.886354064941406e+02, 2.885472717285156e+02, 2.885263977050781e+02, 2.88517333984375e+02, 2.884879150390625e+02, 2.884429321289062e+02, 2.884185791015625e+02, 2.884052734375e+02, 2.884097290039062e+02, 2.884169311523438e+02, 2.884258117675781e+02, 2.884344482421875e+02, 2.885060119628906e+02, 2.885143737792969e+02, 2.886673583984375e+02, 2.8871630859375e+02, 2.898935241699219e+02, 2.901344604492188e+02, 2.904608459472656e+02, 2.907208862304688e+02, 2.909292602539062e+02, 2.911187744140625e+02, 2.912997741699219e+02, 2.914785766601562e+02, 2.916393127441406e+02, 2.914244995117188e+02, 2.914848937988281e+02, 2.919008178710938e+02, 2.919288940429688e+02, 2.919783325195312e+02, 2.920199279785156e+02, 2.920713806152344e+02, 2.9212646484375e+02, 2.921177673339844e+02, 2.920187683105469e+02, 2.909329528808594e+02, 2.910433959960938e+02, 2.906091613769531e+02, 2.90549072265625e+02, 2.904587097167969e+02, 2.903960571289062e+02, 2.902894592285156e+02, 2.90234130859375e+02, 2.901620788574219e+02, 2.901246948242188e+02, 2.900931091308594e+02, 2.899873352050781e+02, 2.898758239746094e+02, 2.897972106933594e+02, 2.897294006347656e+02]
-flo.wes.TAir=[2.751499938964844e+02, 2.92826416015625e+02, 2.911182861328125e+02, 2.90910888671875e+02, 2.907612609863281e+02, 2.906166381835938e+02, 2.904863891601562e+02, 2.90352783203125e+02, 2.902169494628906e+02, 2.90097412109375e+02, 2.8998779296875e+02, 2.898744506835938e+02, 2.897611083984375e+02, 2.896478576660156e+02, 2.895323791503906e+02, 2.894020690917969e+02, 2.893876037597656e+02, 2.894536743164062e+02, 2.895640869140625e+02, 2.896500244140625e+02, 2.897052612304688e+02, 2.896626892089844e+02, 2.89819091796875e+02, 2.898365478515625e+02, 2.898572387695312e+02, 2.897553100585938e+02, 2.895951538085938e+02, 2.8952734375e+02, 2.8944384765625e+02, 2.894007568359375e+02, 2.894317321777344e+02, 2.8946923828125e+02, 2.895191345214844e+02, 2.894322509765625e+02, 2.893323059082031e+02, 2.892383117675781e+02, 2.891670532226562e+02, 2.890931091308594e+02, 2.890216064453125e+02, 2.889515991210938e+02, 2.888971252441406e+02, 2.88883544921875e+02, 2.888634338378906e+02, 2.888146362304688e+02, 2.887721862792969e+02, 2.887457580566406e+02, 2.887175598144531e+02, 2.886593322753906e+02, 2.886009826660156e+02, 2.885569763183594e+02, 2.885154418945312e+02, 2.885244750976562e+02, 2.884332580566406e+02, 2.884140319824219e+02, 2.88403564453125e+02, 2.883729858398438e+02, 2.883281860351562e+02, 2.88302490234375e+02, 2.882872924804688e+02, 2.8829248046875e+02, 2.883024597167969e+02, 2.883108520507812e+02, 2.883163452148438e+02, 2.883876647949219e+02, 2.883971252441406e+02, 2.885494995117188e+02, 2.885983276367188e+02, 2.897783508300781e+02, 2.900030517578125e+02, 2.903270874023438e+02, 2.905907897949219e+02, 2.908016052246094e+02, 2.909932861328125e+02, 2.911767272949219e+02, 2.9135546875e+02, 2.915165405273438e+02, 2.913086242675781e+02, 2.913790588378906e+02, 2.917922668457031e+02, 2.918316955566406e+02, 2.918862915039062e+02, 2.919251098632812e+02, 2.919710083007812e+02, 2.920283508300781e+02, 2.920178833007812e+02, 2.919154968261719e+02, 2.908419494628906e+02, 2.909319763183594e+02, 2.905027770996094e+02, 2.904383239746094e+02, 2.903477478027344e+02, 2.902846374511719e+02, 2.901780090332031e+02, 2.901226806640625e+02, 2.900511779785156e+02, 2.900137329101562e+02, 2.899794616699219e+02, 2.898729553222656e+02, 2.897610778808594e+02, 2.89682373046875e+02, 2.896136779785156e+02]
-flo.cor.TAir=[2.751499938964844e+02, 2.924154663085938e+02, 2.919115600585938e+02, 2.91722900390625e+02, 2.915805969238281e+02, 2.914371643066406e+02, 2.913060302734375e+02, 2.911744079589844e+02, 2.91041259765625e+02, 2.909217529296875e+02, 2.908117065429688e+02, 2.906981201171875e+02, 2.905843505859375e+02, 2.904708251953125e+02, 2.903502807617188e+02, 2.902088623046875e+02, 2.902311401367188e+02, 2.903403015136719e+02, 2.904883117675781e+02, 2.905763549804688e+02, 2.9060400390625e+02, 2.906196899414062e+02, 2.906856689453125e+02, 2.906719055175781e+02, 2.906771850585938e+02, 2.906030578613281e+02, 2.90493896484375e+02, 2.904397888183594e+02, 2.903859558105469e+02, 2.903266906738281e+02, 2.902926635742188e+02, 2.902576904296875e+02, 2.902272644042969e+02, 2.9014599609375e+02, 2.900585327148438e+02, 2.899752502441406e+02, 2.899067077636719e+02, 2.898352355957031e+02, 2.897662048339844e+02, 2.896981811523438e+02, 2.896407775878906e+02, 2.896189575195312e+02, 2.895935974121094e+02, 2.895455932617188e+02, 2.895015258789062e+02, 2.894712829589844e+02, 2.894398193359375e+02, 2.89384521484375e+02, 2.89326416015625e+02, 2.892816772460938e+02, 2.892393188476562e+02, 2.892612609863281e+02, 2.891805725097656e+02, 2.891541442871094e+02, 2.891332702636719e+02, 2.891085510253906e+02, 2.89064208984375e+02, 2.890368957519531e+02, 2.890188293457031e+02, 2.890158996582031e+02, 2.889930114746094e+02, 2.890024719238281e+02, 2.890227966308594e+02, 2.890928955078125e+02, 2.890966491699219e+02, 2.8924951171875e+02, 2.89294677734375e+02, 2.904798278808594e+02, 2.907344665527344e+02, 2.910471496582031e+02, 2.913069763183594e+02, 2.915145874023438e+02, 2.916928405761719e+02, 2.918655090332031e+02, 2.920600891113281e+02, 2.922291870117188e+02, 2.919893188476562e+02, 2.920582275390625e+02, 2.925007934570312e+02, 2.925370788574219e+02, 2.925910034179688e+02, 2.926346740722656e+02, 2.926825256347656e+02, 2.927190551757812e+02, 2.926786804199219e+02, 2.924949645996094e+02, 2.913564453125e+02, 2.916065979003906e+02, 2.911803894042969e+02, 2.91110107421875e+02, 2.910161437988281e+02, 2.909507751464844e+02, 2.908403015136719e+02, 2.90779296875e+02, 2.906866455078125e+02, 2.90644287109375e+02, 2.906194763183594e+02, 2.905299377441406e+02, 2.904255676269531e+02, 2.903456115722656e+02, 2.902794799804688e+02]
+flo.att.TAir=[2.751499938964844e+02, 2.745491943359375e+02, 2.718550415039062e+02, 2.693681640625e+02, 2.675464782714844e+02, 2.662554931640625e+02, 2.653342895507812e+02, 2.646456604003906e+02, 2.64102294921875e+02, 2.636926574707031e+02, 2.634119567871094e+02, 2.632068176269531e+02, 2.630183715820312e+02, 2.628519592285156e+02, 2.627225646972656e+02, 2.626047973632812e+02, 2.627265319824219e+02, 2.634495544433594e+02, 2.647464294433594e+02, 2.663594665527344e+02, 2.685351867675781e+02, 2.70814208984375e+02, 2.731460571289062e+02, 2.751850280761719e+02, 2.768753356933594e+02, 2.777212524414062e+02, 2.777241516113281e+02, 2.775518188476562e+02, 2.7751513671875e+02, 2.774648132324219e+02, 2.771814575195312e+02, 2.765562438964844e+02, 2.757820434570312e+02, 2.749534606933594e+02, 2.740309143066406e+02, 2.729033203125e+02, 2.719960327148438e+02, 2.712330627441406e+02, 2.706087951660156e+02, 2.702200317382812e+02, 2.700163269042969e+02, 2.700069274902344e+02, 2.701102294921875e+02, 2.6996923828125e+02, 2.696339721679688e+02, 2.695575866699219e+02, 2.697357788085938e+02, 2.696833190917969e+02, 2.693262329101562e+02, 2.689372863769531e+02, 2.685931091308594e+02, 2.681056518554688e+02, 2.674418334960938e+02, 2.669859313964844e+02, 2.669165649414062e+02, 2.66911376953125e+02, 2.6675048828125e+02, 2.66581787109375e+02, 2.665540771484375e+02, 2.667217102050781e+02, 2.67242431640625e+02, 2.678531188964844e+02, 2.682842712402344e+02, 2.685548706054688e+02, 2.68865966796875e+02, 2.692108154296875e+02, 2.695677185058594e+02, 2.700899353027344e+02, 2.70879150390625e+02, 2.720466003417969e+02, 2.735314331054688e+02, 2.748746337890625e+02, 2.759403076171875e+02, 2.770601196289062e+02, 2.78327392578125e+02, 2.795667724609375e+02, 2.80728271484375e+02, 2.817684936523438e+02, 2.822939147949219e+02, 2.820474853515625e+02, 2.81136962890625e+02, 2.800486755371094e+02, 2.787626342773438e+02, 2.774829406738281e+02, 2.763472900390625e+02, 2.752391052246094e+02, 2.74533447265625e+02, 2.738520812988281e+02, 2.732513427734375e+02, 2.729901428222656e+02, 2.729458312988281e+02, 2.729627990722656e+02, 2.730225830078125e+02, 2.731437072753906e+02, 2.733085327148438e+02, 2.734564208984375e+02, 2.735606079101562e+02, 2.733249816894531e+02, 2.727307739257812e+02, 2.722709045410156e+02, 2.720926208496094e+02]
+flo.sou.TAir=[2.751499938964844e+02, 2.919109191894531e+02, 2.912655944824219e+02, 2.911001892089844e+02, 2.909589538574219e+02, 2.9081640625e+02, 2.906866455078125e+02, 2.905530700683594e+02, 2.904166564941406e+02, 2.90296875e+02, 2.901882629394531e+02, 2.900727233886719e+02, 2.899562683105469e+02, 2.89839599609375e+02, 2.896952209472656e+02, 2.895221862792969e+02, 2.896578674316406e+02, 2.898942260742188e+02, 2.902421264648438e+02, 2.904783325195312e+02, 2.904296569824219e+02, 2.907841186523438e+02, 2.909595336914062e+02, 2.90982421875e+02, 2.910396423339844e+02, 2.908736572265625e+02, 2.906188049316406e+02, 2.906244201660156e+02, 2.905828857421875e+02, 2.904879760742188e+02, 2.904267883300781e+02, 2.902789001464844e+02, 2.900814208984375e+02, 2.899444885253906e+02, 2.898067932128906e+02, 2.896923217773438e+02, 2.8960595703125e+02, 2.895174560546875e+02, 2.894323120117188e+02, 2.893529357910156e+02, 2.892847290039062e+02, 2.892648010253906e+02, 2.892393493652344e+02, 2.891818237304688e+02, 2.891311645507812e+02, 2.891002502441406e+02, 2.890598449707031e+02, 2.889925537109375e+02, 2.88923095703125e+02, 2.888731079101562e+02, 2.8882568359375e+02, 2.888290710449219e+02, 2.887281799316406e+02, 2.887012329101562e+02, 2.886597290039062e+02, 2.886521606445312e+02, 2.886004943847656e+02, 2.885735473632812e+02, 2.885585327148438e+02, 2.885600891113281e+02, 2.884456176757812e+02, 2.884825134277344e+02, 2.885622253417969e+02, 2.886356506347656e+02, 2.886422424316406e+02, 2.887931518554688e+02, 2.88837646484375e+02, 2.9002294921875e+02, 2.901951293945312e+02, 2.904810485839844e+02, 2.90765380859375e+02, 2.909938049316406e+02, 2.911629943847656e+02, 2.913366394042969e+02, 2.916218872070312e+02, 2.918357238769531e+02, 2.916292419433594e+02, 2.916966247558594e+02, 2.921077575683594e+02, 2.921232299804688e+02, 2.921630554199219e+02, 2.921867370605469e+02, 2.922192993164062e+02, 2.922667846679688e+02, 2.922432250976562e+02, 2.916155395507812e+02, 2.904920349121094e+02, 2.911038208007812e+02, 2.906723022460938e+02, 2.906090393066406e+02, 2.905197448730469e+02, 2.904570007324219e+02, 2.903492126464844e+02, 2.902932434082031e+02, 2.902227478027344e+02, 2.901870727539062e+02, 2.901510314941406e+02, 2.900409545898438e+02, 2.899258422851562e+02, 2.898419189453125e+02, 2.897745971679688e+02]
+flo.eas.TAir=[2.751499938964844e+02, 2.927307434082031e+02, 2.911792602539062e+02, 2.909587707519531e+02, 2.908086242675781e+02, 2.906629028320312e+02, 2.905310668945312e+02, 2.903970642089844e+02, 2.902614440917969e+02, 2.901414184570312e+02, 2.900315551757812e+02, 2.899170532226562e+02, 2.8980224609375e+02, 2.896873474121094e+02, 2.895697326660156e+02, 2.894400939941406e+02, 2.895413818359375e+02, 2.897810668945312e+02, 2.90048828125e+02, 2.902179260253906e+02, 2.902967529296875e+02, 2.902851867675781e+02, 2.902336730957031e+02, 2.901041564941406e+02, 2.900414123535156e+02, 2.899861755371094e+02, 2.899022216796875e+02, 2.898448181152344e+02, 2.897984924316406e+02, 2.897427062988281e+02, 2.896906433105469e+02, 2.896380310058594e+02, 2.895877990722656e+02, 2.895073547363281e+02, 2.894220581054688e+02, 2.893417053222656e+02, 2.892727355957031e+02, 2.89197998046875e+02, 2.891259460449219e+02, 2.8905322265625e+02, 2.889967651367188e+02, 2.889815368652344e+02, 2.8895703125e+02, 2.8890771484375e+02, 2.888623962402344e+02, 2.888334655761719e+02, 2.88802490234375e+02, 2.887431030273438e+02, 2.886798095703125e+02, 2.886336669921875e+02, 2.885905456542969e+02, 2.885982666015625e+02, 2.885059814453125e+02, 2.884813842773438e+02, 2.88472900390625e+02, 2.884396057128906e+02, 2.88392578125e+02, 2.883660888671875e+02, 2.883492736816406e+02, 2.883529052734375e+02, 2.883644714355469e+02, 2.883721313476562e+02, 2.883762512207031e+02, 2.884449768066406e+02, 2.884516906738281e+02, 2.886019287109375e+02, 2.886486206054688e+02, 2.898257141113281e+02, 2.900662536621094e+02, 2.904031982421875e+02, 2.906686401367188e+02, 2.908728942871094e+02, 2.910613098144531e+02, 2.912413330078125e+02, 2.914142456054688e+02, 2.915712890625e+02, 2.913591918945312e+02, 2.914186401367188e+02, 2.918225708007812e+02, 2.918512268066406e+02, 2.918966064453125e+02, 2.91933837890625e+02, 2.919802551269531e+02, 2.919085693359375e+02, 2.916999206542969e+02, 2.919438171386719e+02, 2.908547973632812e+02, 2.908690795898438e+02, 2.90509765625e+02, 2.904482727050781e+02, 2.903627319335938e+02, 2.903005981445312e+02, 2.901942138671875e+02, 2.90123779296875e+02, 2.899118347167969e+02, 2.898673706054688e+02, 2.899236145019531e+02, 2.898828125e+02, 2.897733459472656e+02, 2.896932067871094e+02, 2.896294555664062e+02]
+flo.nor.TAir=[2.751499938964844e+02, 2.92083984375e+02, 2.912308044433594e+02, 2.910216674804688e+02, 2.908788146972656e+02, 2.907369995117188e+02, 2.906081848144531e+02, 2.904772033691406e+02, 2.903441772460938e+02, 2.902265625e+02, 2.901193542480469e+02, 2.900066833496094e+02, 2.89893310546875e+02, 2.897799987792969e+02, 2.89664306640625e+02, 2.895325622558594e+02, 2.895216369628906e+02, 2.8958984375e+02, 2.896989440917969e+02, 2.89775146484375e+02, 2.898173522949219e+02, 2.898466491699219e+02, 2.899037780761719e+02, 2.899075622558594e+02, 2.899239501953125e+02, 2.89884033203125e+02, 2.89812255859375e+02, 2.897708435058594e+02, 2.897348022460938e+02, 2.896851501464844e+02, 2.896406555175781e+02, 2.89595703125e+02, 2.895556640625e+02, 2.89480712890625e+02, 2.894016418457031e+02, 2.893260803222656e+02, 2.892615356445312e+02, 2.891912536621094e+02, 2.891233520507812e+02, 2.890540771484375e+02, 2.889991149902344e+02, 2.889855651855469e+02, 2.889655151367188e+02, 2.889193725585938e+02, 2.888772583007812e+02, 2.888506164550781e+02, 2.888213500976562e+02, 2.887648010253906e+02, 2.887057495117188e+02, 2.886629333496094e+02, 2.886224060058594e+02, 2.886354064941406e+02, 2.885472717285156e+02, 2.885263977050781e+02, 2.88517333984375e+02, 2.884879150390625e+02, 2.884429016113281e+02, 2.884185485839844e+02, 2.884052734375e+02, 2.884097290039062e+02, 2.884165954589844e+02, 2.884257507324219e+02, 2.884344482421875e+02, 2.885060119628906e+02, 2.885143432617188e+02, 2.886673278808594e+02, 2.8871630859375e+02, 2.898935241699219e+02, 2.901347351074219e+02, 2.904608459472656e+02, 2.907208557128906e+02, 2.9092919921875e+02, 2.911187744140625e+02, 2.912997741699219e+02, 2.914785766601562e+02, 2.916393127441406e+02, 2.914245300292969e+02, 2.914848937988281e+02, 2.919007873535156e+02, 2.919288940429688e+02, 2.919783325195312e+02, 2.920198974609375e+02, 2.920713500976562e+02, 2.9212646484375e+02, 2.921177368164062e+02, 2.920186767578125e+02, 2.909329223632812e+02, 2.910433654785156e+02, 2.906091613769531e+02, 2.905490417480469e+02, 2.904587097167969e+02, 2.903960571289062e+02, 2.902894592285156e+02, 2.90234130859375e+02, 2.901620788574219e+02, 2.901246643066406e+02, 2.900931091308594e+02, 2.899873352050781e+02, 2.898758239746094e+02, 2.897972106933594e+02, 2.897294006347656e+02]
+flo.wes.TAir=[2.751499938964844e+02, 2.928255310058594e+02, 2.911182861328125e+02, 2.90910888671875e+02, 2.907612915039062e+02, 2.906166381835938e+02, 2.904863891601562e+02, 2.90352783203125e+02, 2.902169494628906e+02, 2.90097412109375e+02, 2.8998779296875e+02, 2.898744506835938e+02, 2.897611083984375e+02, 2.896478881835938e+02, 2.895323791503906e+02, 2.894020385742188e+02, 2.893874816894531e+02, 2.894537353515625e+02, 2.895640563964844e+02, 2.896499938964844e+02, 2.897052917480469e+02, 2.896626892089844e+02, 2.898189392089844e+02, 2.898365173339844e+02, 2.898572387695312e+02, 2.897552490234375e+02, 2.895951843261719e+02, 2.8952734375e+02, 2.894437561035156e+02, 2.894007568359375e+02, 2.894317321777344e+02, 2.8946923828125e+02, 2.895191345214844e+02, 2.894322509765625e+02, 2.893323059082031e+02, 2.892383117675781e+02, 2.891670532226562e+02, 2.890931091308594e+02, 2.890216064453125e+02, 2.889515991210938e+02, 2.888971252441406e+02, 2.88883544921875e+02, 2.888634033203125e+02, 2.888146362304688e+02, 2.887721862792969e+02, 2.887457580566406e+02, 2.887175598144531e+02, 2.886593322753906e+02, 2.886009826660156e+02, 2.885569763183594e+02, 2.885154418945312e+02, 2.885244750976562e+02, 2.884332580566406e+02, 2.884140014648438e+02, 2.884035339355469e+02, 2.883730163574219e+02, 2.883281860351562e+02, 2.88302490234375e+02, 2.882872924804688e+02, 2.8829248046875e+02, 2.883021240234375e+02, 2.88310791015625e+02, 2.883163146972656e+02, 2.883876342773438e+02, 2.883970947265625e+02, 2.885494995117188e+02, 2.885982971191406e+02, 2.897783508300781e+02, 2.900032653808594e+02, 2.903270874023438e+02, 2.905907592773438e+02, 2.908015441894531e+02, 2.909932861328125e+02, 2.911767272949219e+02, 2.9135546875e+02, 2.915165405273438e+02, 2.913086242675781e+02, 2.913790588378906e+02, 2.917922668457031e+02, 2.918316955566406e+02, 2.918862915039062e+02, 2.919250793457031e+02, 2.919710083007812e+02, 2.920283203125e+02, 2.920178527832031e+02, 2.919154052734375e+02, 2.908419494628906e+02, 2.909319458007812e+02, 2.905027770996094e+02, 2.904383239746094e+02, 2.903477478027344e+02, 2.902846374511719e+02, 2.901780090332031e+02, 2.901227111816406e+02, 2.900511779785156e+02, 2.900137329101562e+02, 2.899794921875e+02, 2.898729553222656e+02, 2.897610778808594e+02, 2.89682373046875e+02, 2.896136779785156e+02]
+flo.cor.TAir=[2.751499938964844e+02, 2.924163208007812e+02, 2.919115295410156e+02, 2.91722900390625e+02, 2.915805358886719e+02, 2.914371337890625e+02, 2.913060302734375e+02, 2.911744689941406e+02, 2.910412902832031e+02, 2.909217834472656e+02, 2.908117065429688e+02, 2.906981201171875e+02, 2.905843505859375e+02, 2.904707946777344e+02, 2.903502807617188e+02, 2.902088623046875e+02, 2.902316589355469e+02, 2.903401489257812e+02, 2.904883422851562e+02, 2.905763854980469e+02, 2.906039428710938e+02, 2.906197509765625e+02, 2.906855773925781e+02, 2.906719055175781e+02, 2.906772155761719e+02, 2.906030578613281e+02, 2.904938659667969e+02, 2.904397888183594e+02, 2.903858947753906e+02, 2.903266906738281e+02, 2.902926330566406e+02, 2.902576904296875e+02, 2.902271728515625e+02, 2.9014599609375e+02, 2.900585021972656e+02, 2.899752502441406e+02, 2.899066772460938e+02, 2.898352355957031e+02, 2.897662353515625e+02, 2.896981506347656e+02, 2.896407470703125e+02, 2.896189575195312e+02, 2.895935974121094e+02, 2.895455932617188e+02, 2.895014953613281e+02, 2.894712829589844e+02, 2.894398193359375e+02, 2.89384521484375e+02, 2.89326416015625e+02, 2.892816772460938e+02, 2.892393188476562e+02, 2.892612609863281e+02, 2.891805725097656e+02, 2.891541442871094e+02, 2.891332702636719e+02, 2.891085205078125e+02, 2.89064208984375e+02, 2.890368957519531e+02, 2.890188293457031e+02, 2.890158996582031e+02, 2.889927368164062e+02, 2.890023803710938e+02, 2.890227661132812e+02, 2.890928649902344e+02, 2.890966491699219e+02, 2.892494812011719e+02, 2.89294677734375e+02, 2.904798278808594e+02, 2.907340087890625e+02, 2.91047119140625e+02, 2.913069458007812e+02, 2.915146484375e+02, 2.916928100585938e+02, 2.91865478515625e+02, 2.920600891113281e+02, 2.922291870117188e+02, 2.919891662597656e+02, 2.920582275390625e+02, 2.925007934570312e+02, 2.925370483398438e+02, 2.925909729003906e+02, 2.926346740722656e+02, 2.926824951171875e+02, 2.927190551757812e+02, 2.926786499023438e+02, 2.92494873046875e+02, 2.913565368652344e+02, 2.916066589355469e+02, 2.911803894042969e+02, 2.91110107421875e+02, 2.910161437988281e+02, 2.909507751464844e+02, 2.908403015136719e+02, 2.907793273925781e+02, 2.906866149902344e+02, 2.90644287109375e+02, 2.906194152832031e+02, 2.905299377441406e+02, 2.904255676269531e+02, 2.903456115722656e+02, 2.902794799804688e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt
index 30ed0da87af..bf9ba7f06ca 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_ThreeZonesTwoBuildings.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "9",
+  "number of continuous time states": "12",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-zon1.zon.TAir=[2.931499938964844e+02, 2.905976867675781e+02, 2.898281555175781e+02, 2.896369018554688e+02, 2.891467895507812e+02, 2.888004760742188e+02, 2.885250244140625e+02, 2.882528076171875e+02, 2.879981994628906e+02, 2.877625122070312e+02, 2.875408630371094e+02, 2.873328247070312e+02, 2.871351928710938e+02, 2.869407348632812e+02, 2.867419738769531e+02, 2.865452880859375e+02, 2.863540954589844e+02, 2.861722106933594e+02, 2.860071716308594e+02, 2.858495483398438e+02, 2.856974487304688e+02, 2.855458374023438e+02, 2.853902893066406e+02, 2.852376403808594e+02, 2.850880432128906e+02, 2.849419250488281e+02, 2.847944641113281e+02, 2.846495361328125e+02, 2.845064392089844e+02, 2.84365478515625e+02, 2.842337646484375e+02, 2.84147705078125e+02, 2.842373046875e+02, 2.844678955078125e+02, 2.847561645507812e+02, 2.851071472167969e+02, 2.854774780273438e+02, 2.858269958496094e+02, 2.861921997070312e+02, 2.865724792480469e+02, 2.869447021484375e+02, 2.872733459472656e+02, 2.875782775878906e+02, 2.878722229003906e+02, 2.881309814453125e+02, 2.883150634765625e+02, 2.884737243652344e+02, 2.886122131347656e+02, 2.8873046875e+02, 2.887612609863281e+02, 2.8872509765625e+02, 2.886725158691406e+02, 2.88583984375e+02, 2.885289611816406e+02, 2.885116271972656e+02, 2.884546508789062e+02, 2.884052734375e+02, 2.883761901855469e+02, 2.883439636230469e+02, 2.882919311523438e+02, 2.882599487304688e+02, 2.881893310546875e+02, 2.880711669921875e+02, 2.879383850097656e+02, 2.877638549804688e+02, 2.875870666503906e+02, 2.874298095703125e+02, 2.872620239257812e+02, 2.870847473144531e+02, 2.868921203613281e+02, 2.867377319335938e+02, 2.865995178222656e+02, 2.864553527832031e+02, 2.863089599609375e+02, 2.861634826660156e+02, 2.860204162597656e+02, 2.858768920898438e+02, 2.857324829101562e+02, 2.855896911621094e+02, 2.854497985839844e+02, 2.853322143554688e+02, 2.852430114746094e+02, 2.851710815429688e+02, 2.851019287109375e+02, 2.850246887207031e+02, 2.849345092773438e+02, 2.848416442871094e+02, 2.847516479492188e+02, 2.846654052734375e+02, 2.845837707519531e+02, 2.845062561035156e+02, 2.844313049316406e+02, 2.843477783203125e+02, 2.842505798339844e+02, 2.841477966308594e+02, 2.84043701171875e+02, 2.839424133300781e+02, 2.838531188964844e+02, 2.837708435058594e+02, 2.836900939941406e+02, 2.836084899902344e+02]
-zon2.zon1.TAir=[2.931499938964844e+02, 2.908261108398438e+02, 2.892806091308594e+02, 2.884714965820312e+02, 2.88026123046875e+02, 2.876891784667969e+02, 2.874082946777344e+02, 2.871693420410156e+02, 2.869660339355469e+02, 2.867908325195312e+02, 2.866402587890625e+02, 2.86509765625e+02, 2.863953552246094e+02, 2.862935485839844e+02, 2.861983032226562e+02, 2.861058044433594e+02, 2.860179748535156e+02, 2.85939208984375e+02, 2.858729248046875e+02, 2.85817626953125e+02, 2.8576953125e+02, 2.857225036621094e+02, 2.856731262207031e+02, 2.85624267578125e+02, 2.855773620605469e+02, 2.855327758789062e+02, 2.854900817871094e+02, 2.854494018554688e+02, 2.854104614257812e+02, 2.853731994628906e+02, 2.8533837890625e+02, 2.853102416992188e+02, 2.852910766601562e+02, 2.852843322753906e+02, 2.852897338867188e+02, 2.85298095703125e+02, 2.853119201660156e+02, 2.853309631347656e+02, 2.853585205078125e+02, 2.853987121582031e+02, 2.854504089355469e+02, 2.855110168457031e+02, 2.855680541992188e+02, 2.856235656738281e+02, 2.856753540039062e+02, 2.857267761230469e+02, 2.857767333984375e+02, 2.85826171875e+02, 2.858765563964844e+02, 2.859231567382812e+02, 2.859691162109375e+02, 2.860091552734375e+02, 2.860446472167969e+02, 2.860747375488281e+02, 2.861056213378906e+02, 2.861393432617188e+02, 2.861795959472656e+02, 2.862257690429688e+02, 2.862685241699219e+02, 2.863013610839844e+02, 2.863243408203125e+02, 2.86343017578125e+02, 2.863589782714844e+02, 2.863733215332031e+02, 2.863861694335938e+02, 2.863983459472656e+02, 2.864105834960938e+02, 2.864228515625e+02, 2.864347534179688e+02, 2.864460754394531e+02, 2.864577331542969e+02, 2.864698181152344e+02, 2.864794616699219e+02, 2.8648193359375e+02, 2.864776000976562e+02, 2.864688720703125e+02, 2.864612731933594e+02, 2.864533386230469e+02, 2.86446044921875e+02, 2.864384765625e+02, 2.864343566894531e+02, 2.864481506347656e+02, 2.864820861816406e+02, 2.865222473144531e+02, 2.865526428222656e+02, 2.865609130859375e+02, 2.865532531738281e+02, 2.86539306640625e+02, 2.865302429199219e+02, 2.865342712402344e+02, 2.865500183105469e+02, 2.865706787109375e+02, 2.865842590332031e+02, 2.865855102539062e+02, 2.865757141113281e+02, 2.865593566894531e+02, 2.865418701171875e+02, 2.8652880859375e+02, 2.865225524902344e+02, 2.865210266113281e+02, 2.865191955566406e+02]
-zon2.zon2.TAir=[2.931499938964844e+02, 2.90826416015625e+02, 2.892814331054688e+02, 2.884721984863281e+02, 2.880267028808594e+02, 2.876897583007812e+02, 2.874088745117188e+02, 2.871699523925781e+02, 2.869666442871094e+02, 2.867914428710938e+02, 2.866408996582031e+02, 2.865104064941406e+02, 2.8639599609375e+02, 2.86294189453125e+02, 2.861989440917969e+02, 2.861064453125e+02, 2.860186157226562e+02, 2.859398498535156e+02, 2.858735656738281e+02, 2.858182678222656e+02, 2.857701721191406e+02, 2.857231140136719e+02, 2.856737670898438e+02, 2.856249084472656e+02, 2.855779724121094e+02, 2.855333862304688e+02, 2.854906921386719e+02, 2.854499816894531e+02, 2.854110412597656e+02, 2.85373779296875e+02, 2.853389587402344e+02, 2.853113098144531e+02, 2.85296142578125e+02, 2.852919616699219e+02, 2.852951049804688e+02, 2.853019409179688e+02, 2.853150634765625e+02, 2.853336791992188e+02, 2.853609313964844e+02, 2.854009094238281e+02, 2.85452392578125e+02, 2.855128784179688e+02, 2.855697937011719e+02, 2.856252136230469e+02, 2.856769409179688e+02, 2.857283020019531e+02, 2.857781982421875e+02, 2.8582763671875e+02, 2.858779907226562e+02, 2.85924560546875e+02, 2.859705200195312e+02, 2.860105590820312e+02, 2.860460510253906e+02, 2.860761413574219e+02, 2.861070251464844e+02, 2.861407165527344e+02, 2.861809692382812e+02, 2.862271423339844e+02, 2.862698974609375e+02, 2.86302734375e+02, 2.8632568359375e+02, 2.863443908691406e+02, 2.863603210449219e+02, 2.863746948242188e+02, 2.863875122070312e+02, 2.863996887207031e+02, 2.864119262695312e+02, 2.864241638183594e+02, 2.8643603515625e+02, 2.864473571777344e+02, 2.864590148925781e+02, 2.864710693359375e+02, 2.864806823730469e+02, 2.86483154296875e+02, 2.864788208007812e+02, 2.864700622558594e+02, 2.864624328613281e+02, 2.864544982910156e+02, 2.864471740722656e+02, 2.864396057128906e+02, 2.864354553222656e+02, 2.864492492675781e+02, 2.864831848144531e+02, 2.865233154296875e+02, 2.865537109375e+02, 2.865619812011719e+02, 2.865542907714844e+02, 2.865403442382812e+02, 2.8653125e+02, 2.865352783203125e+02, 2.86551025390625e+02, 2.865716552734375e+02, 2.865852355957031e+02, 2.865864562988281e+02, 2.8657666015625e+02, 2.865602722167969e+02, 2.865427856445312e+02, 2.865296936035156e+02, 2.865234375e+02, 2.865219116210938e+02, 2.865200500488281e+02]
+zon1.zon.TAir=[2.931499938964844e+02, 2.905977172851562e+02, 2.898281555175781e+02, 2.896369018554688e+02, 2.891467895507812e+02, 2.888004760742188e+02, 2.885250244140625e+02, 2.882528076171875e+02, 2.879981994628906e+02, 2.877625122070312e+02, 2.875408630371094e+02, 2.873328247070312e+02, 2.871351928710938e+02, 2.869407348632812e+02, 2.867420043945312e+02, 2.865452880859375e+02, 2.863540954589844e+02, 2.861722106933594e+02, 2.860072021484375e+02, 2.858495788574219e+02, 2.856974792480469e+02, 2.855458374023438e+02, 2.853902893066406e+02, 2.852376403808594e+02, 2.850880737304688e+02, 2.849419250488281e+02, 2.847944641113281e+02, 2.846495361328125e+02, 2.845064392089844e+02, 2.843655090332031e+02, 2.842337951660156e+02, 2.84147705078125e+02, 2.842373046875e+02, 2.844678955078125e+02, 2.847561645507812e+02, 2.851071472167969e+02, 2.854774780273438e+02, 2.858269958496094e+02, 2.861921997070312e+02, 2.865724792480469e+02, 2.869447021484375e+02, 2.872733459472656e+02, 2.875782775878906e+02, 2.878722229003906e+02, 2.881309814453125e+02, 2.883150634765625e+02, 2.884737243652344e+02, 2.886122436523438e+02, 2.8873046875e+02, 2.887612915039062e+02, 2.887251281738281e+02, 2.886725463867188e+02, 2.885840148925781e+02, 2.885289916992188e+02, 2.885116271972656e+02, 2.884546813964844e+02, 2.884053039550781e+02, 2.88376220703125e+02, 2.883440856933594e+02, 2.882919616699219e+02, 2.882599792480469e+02, 2.881893615722656e+02, 2.880711975097656e+02, 2.879384460449219e+02, 2.877638854980469e+02, 2.875870971679688e+02, 2.874298400878906e+02, 2.872620544433594e+02, 2.870847778320312e+02, 2.868921813964844e+02, 2.867377624511719e+02, 2.865995483398438e+02, 2.864553833007812e+02, 2.863089904785156e+02, 2.861634826660156e+02, 2.860204467773438e+02, 2.858768920898438e+02, 2.857324829101562e+02, 2.855896911621094e+02, 2.854498291015625e+02, 2.853322448730469e+02, 2.852430725097656e+02, 2.851711120605469e+02, 2.851019592285156e+02, 2.850246887207031e+02, 2.849345092773438e+02, 2.848416442871094e+02, 2.847516479492188e+02, 2.846654663085938e+02, 2.845838012695312e+02, 2.845062866210938e+02, 2.844313354492188e+02, 2.843477783203125e+02, 2.842505798339844e+02, 2.841477966308594e+02, 2.840437316894531e+02, 2.839424133300781e+02, 2.838531188964844e+02, 2.837708435058594e+02, 2.836901245117188e+02, 2.836084899902344e+02]
+zon2.zon1.TAir=[2.931499938964844e+02, 2.908261413574219e+02, 2.892806091308594e+02, 2.884715270996094e+02, 2.880261535644531e+02, 2.87689208984375e+02, 2.874082946777344e+02, 2.871693725585938e+02, 2.869660339355469e+02, 2.867908325195312e+02, 2.866402587890625e+02, 2.86509765625e+02, 2.863953552246094e+02, 2.862935485839844e+02, 2.861983032226562e+02, 2.861058044433594e+02, 2.860179748535156e+02, 2.85939208984375e+02, 2.858729248046875e+02, 2.85817626953125e+02, 2.8576953125e+02, 2.857225036621094e+02, 2.856731567382812e+02, 2.856242980957031e+02, 2.855773620605469e+02, 2.855327758789062e+02, 2.854900817871094e+02, 2.854494018554688e+02, 2.854104614257812e+02, 2.853731994628906e+02, 2.8533837890625e+02, 2.853102416992188e+02, 2.852910766601562e+02, 2.852843627929688e+02, 2.852897338867188e+02, 2.852981262207031e+02, 2.853119506835938e+02, 2.853309936523438e+02, 2.853585510253906e+02, 2.853987426757812e+02, 2.85450439453125e+02, 2.855110473632812e+02, 2.855680847167969e+02, 2.856235961914062e+02, 2.856753845214844e+02, 2.85726806640625e+02, 2.857767333984375e+02, 2.858262023925781e+02, 2.858765869140625e+02, 2.859231872558594e+02, 2.859691467285156e+02, 2.860091857910156e+02, 2.86044677734375e+02, 2.860747680664062e+02, 2.861056823730469e+02, 2.861393737792969e+02, 2.861796264648438e+02, 2.862257995605469e+02, 2.862686462402344e+02, 2.863014221191406e+02, 2.863243408203125e+02, 2.863430480957031e+02, 2.863589782714844e+02, 2.863733520507812e+02, 2.863861999511719e+02, 2.863983764648438e+02, 2.864106140136719e+02, 2.864228515625e+02, 2.864347534179688e+02, 2.864460754394531e+02, 2.86457763671875e+02, 2.864698181152344e+02, 2.864794616699219e+02, 2.864819030761719e+02, 2.864776000976562e+02, 2.864688415527344e+02, 2.864612426757812e+02, 2.864533386230469e+02, 2.864460144042969e+02, 2.864384765625e+02, 2.86434326171875e+02, 2.864481811523438e+02, 2.864820861816406e+02, 2.865222473144531e+02, 2.865526428222656e+02, 2.865608825683594e+02, 2.865531921386719e+02, 2.865392761230469e+02, 2.865302429199219e+02, 2.865343017578125e+02, 2.86550048828125e+02, 2.865706787109375e+02, 2.865842590332031e+02, 2.865854797363281e+02, 2.8657568359375e+02, 2.86559326171875e+02, 2.865418395996094e+02, 2.865287780761719e+02, 2.865225524902344e+02, 2.865210266113281e+02, 2.865191650390625e+02]
+zon2.zon2.TAir=[2.931499938964844e+02, 2.908264465332031e+02, 2.892814331054688e+02, 2.884721984863281e+02, 2.880267028808594e+02, 2.876897583007812e+02, 2.874088745117188e+02, 2.871699523925781e+02, 2.869666442871094e+02, 2.867914733886719e+02, 2.866408996582031e+02, 2.865104064941406e+02, 2.8639599609375e+02, 2.86294189453125e+02, 2.861989440917969e+02, 2.861064453125e+02, 2.860186157226562e+02, 2.859398498535156e+02, 2.858735656738281e+02, 2.858182678222656e+02, 2.857701721191406e+02, 2.857231140136719e+02, 2.856737670898438e+02, 2.856249084472656e+02, 2.855779724121094e+02, 2.855333862304688e+02, 2.854906921386719e+02, 2.854500122070312e+02, 2.854110412597656e+02, 2.85373779296875e+02, 2.853389587402344e+02, 2.853113403320312e+02, 2.852961730957031e+02, 2.852919921875e+02, 2.852951049804688e+02, 2.853019409179688e+02, 2.853150939941406e+02, 2.853337097167969e+02, 2.853609619140625e+02, 2.854009399414062e+02, 2.854524536132812e+02, 2.855129089355469e+02, 2.8556982421875e+02, 2.85625244140625e+02, 2.856769714355469e+02, 2.857283325195312e+02, 2.857782287597656e+02, 2.858276672363281e+02, 2.858780517578125e+02, 2.859246215820312e+02, 2.859705810546875e+02, 2.860105895996094e+02, 2.860460815429688e+02, 2.86076171875e+02, 2.861070556640625e+02, 2.861407775878906e+02, 2.861809997558594e+02, 2.862272033691406e+02, 2.8627001953125e+02, 2.863027648925781e+02, 2.863257141113281e+02, 2.863443908691406e+02, 2.863603515625e+02, 2.863746948242188e+02, 2.863875122070312e+02, 2.863996887207031e+02, 2.864119262695312e+02, 2.864241638183594e+02, 2.8643603515625e+02, 2.864473571777344e+02, 2.864590148925781e+02, 2.864710693359375e+02, 2.864806823730469e+02, 2.864831237792969e+02, 2.864787902832031e+02, 2.864700317382812e+02, 2.864624328613281e+02, 2.864544677734375e+02, 2.864471435546875e+02, 2.864395751953125e+02, 2.864354553222656e+02, 2.864492797851562e+02, 2.864831848144531e+02, 2.865233154296875e+02, 2.865537109375e+02, 2.865619201660156e+02, 2.865542297363281e+02, 2.865403137207031e+02, 2.8653125e+02, 2.865352783203125e+02, 2.86551025390625e+02, 2.865716552734375e+02, 2.86585205078125e+02, 2.865864562988281e+02, 2.865766296386719e+02, 2.865602416992188e+02, 2.865427551269531e+02, 2.865296936035156e+02, 2.865234375e+02, 2.865219116210938e+02, 2.865200500488281e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt
index 59af08ec530..f74339fc0bf 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalOneZoneBuildings.txt
@@ -1,11 +1,11 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0, 0",
   "nonlinear": " ",
-  "number of continuous time states": "6",
+  "number of continuous time states": "8",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-bui[1].zon.TAir=[2.931499938964844e+02, 2.89828125e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860071716308594e+02, 2.856974487304688e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.842337646484375e+02, 2.842373046875e+02, 2.847561645507812e+02, 2.854774780273438e+02, 2.861921997070312e+02, 2.869447326660156e+02, 2.875782775878906e+02, 2.881309814453125e+02, 2.884737243652344e+02, 2.8873046875e+02, 2.8872509765625e+02, 2.88583984375e+02, 2.885115966796875e+02, 2.884052734375e+02, 2.883439636230469e+02, 2.882599487304688e+02, 2.880711059570312e+02, 2.877637329101562e+02, 2.874297485351562e+02, 2.87084716796875e+02, 2.867377014160156e+02, 2.86455322265625e+02, 2.861634521484375e+02, 2.858768615722656e+02, 2.855896911621094e+02, 2.853321228027344e+02, 2.851710815429688e+02, 2.85024658203125e+02, 2.848415832519531e+02, 2.846653747558594e+02, 2.845061950683594e+02, 2.843477172851562e+02, 2.841477355957031e+02, 2.839423522949219e+02, 2.837708129882812e+02, 2.836084594726562e+02, 2.837765808105469e+02, 2.8351220703125e+02, 2.833832397460938e+02, 2.83313720703125e+02, 2.831880798339844e+02, 2.830352172851562e+02, 2.829215393066406e+02, 2.828407287597656e+02, 2.827934265136719e+02, 2.827989807128906e+02, 2.827770385742188e+02, 2.827039489746094e+02, 2.824579162597656e+02, 2.823704833984375e+02, 2.830442199707031e+02, 2.833937683105469e+02, 2.840579833984375e+02, 2.846080932617188e+02, 2.85009765625e+02, 2.854508361816406e+02, 2.858143615722656e+02, 2.861561279296875e+02, 2.865264282226562e+02, 2.868716735839844e+02, 2.871799621582031e+02, 2.872827453613281e+02, 2.875290222167969e+02, 2.878594360351562e+02, 2.8786865234375e+02, 2.878578796386719e+02, 2.87806396484375e+02, 2.877159423828125e+02, 2.876463623046875e+02, 2.873435363769531e+02, 2.870802917480469e+02, 2.862915649414062e+02, 2.858121032714844e+02, 2.850321960449219e+02, 2.847362365722656e+02, 2.845762634277344e+02, 2.844200134277344e+02, 2.84289794921875e+02, 2.841806335449219e+02, 2.840879516601562e+02, 2.840108032226562e+02, 2.839365234375e+02, 2.837594299316406e+02, 2.835333251953125e+02, 2.833870849609375e+02, 2.832453918457031e+02]
-bui[2].zon.TAir=[2.931499938964844e+02, 2.89828125e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860071716308594e+02, 2.856974487304688e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.842337646484375e+02, 2.842373046875e+02, 2.847561645507812e+02, 2.854774780273438e+02, 2.861921997070312e+02, 2.869447326660156e+02, 2.875782775878906e+02, 2.881309814453125e+02, 2.884737243652344e+02, 2.8873046875e+02, 2.8872509765625e+02, 2.88583984375e+02, 2.885115966796875e+02, 2.884052734375e+02, 2.883439636230469e+02, 2.882599487304688e+02, 2.880711059570312e+02, 2.877637329101562e+02, 2.874297485351562e+02, 2.87084716796875e+02, 2.867377014160156e+02, 2.86455322265625e+02, 2.861634521484375e+02, 2.858768615722656e+02, 2.855896911621094e+02, 2.853321228027344e+02, 2.851710815429688e+02, 2.85024658203125e+02, 2.848415832519531e+02, 2.846653747558594e+02, 2.845061950683594e+02, 2.843477172851562e+02, 2.841477355957031e+02, 2.839423522949219e+02, 2.837708129882812e+02, 2.836084594726562e+02, 2.837765808105469e+02, 2.8351220703125e+02, 2.833832397460938e+02, 2.83313720703125e+02, 2.831880798339844e+02, 2.830352172851562e+02, 2.829215393066406e+02, 2.828407287597656e+02, 2.827934265136719e+02, 2.827989807128906e+02, 2.827770385742188e+02, 2.827039489746094e+02, 2.824579162597656e+02, 2.823704833984375e+02, 2.830442199707031e+02, 2.833937683105469e+02, 2.840579833984375e+02, 2.846080932617188e+02, 2.85009765625e+02, 2.854508361816406e+02, 2.858143615722656e+02, 2.861561279296875e+02, 2.865264282226562e+02, 2.868716735839844e+02, 2.871799621582031e+02, 2.872827453613281e+02, 2.875290222167969e+02, 2.878594360351562e+02, 2.8786865234375e+02, 2.878578796386719e+02, 2.87806396484375e+02, 2.877159423828125e+02, 2.876463623046875e+02, 2.873435363769531e+02, 2.870802917480469e+02, 2.862915649414062e+02, 2.858121032714844e+02, 2.850321960449219e+02, 2.847362365722656e+02, 2.845762634277344e+02, 2.844200134277344e+02, 2.84289794921875e+02, 2.841806335449219e+02, 2.840879516601562e+02, 2.840108032226562e+02, 2.839365234375e+02, 2.837594299316406e+02, 2.835333251953125e+02, 2.833870849609375e+02, 2.832453918457031e+02]
+bui[1].zon.TAir=[2.931499938964844e+02, 2.898281555175781e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860072021484375e+02, 2.856974792480469e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.842337951660156e+02, 2.842373046875e+02, 2.847561645507812e+02, 2.854774780273438e+02, 2.861921997070312e+02, 2.869447326660156e+02, 2.875782775878906e+02, 2.881309814453125e+02, 2.884737243652344e+02, 2.8873046875e+02, 2.887251281738281e+02, 2.88583984375e+02, 2.885116271972656e+02, 2.884053039550781e+02, 2.883439636230469e+02, 2.882599487304688e+02, 2.880711364746094e+02, 2.877638244628906e+02, 2.874297790527344e+02, 2.870847473144531e+02, 2.867377319335938e+02, 2.864553527832031e+02, 2.861634521484375e+02, 2.858768920898438e+02, 2.855897216796875e+02, 2.853322143554688e+02, 2.851711120605469e+02, 2.850246887207031e+02, 2.848415832519531e+02, 2.846654052734375e+02, 2.845062255859375e+02, 2.843477478027344e+02, 2.841477355957031e+02, 2.839423828125e+02, 2.837708435058594e+02, 2.836084594726562e+02, 2.837765808105469e+02, 2.835121459960938e+02, 2.833832702636719e+02, 2.83313720703125e+02, 2.831880798339844e+02, 2.830352172851562e+02, 2.829215698242188e+02, 2.828407592773438e+02, 2.8279345703125e+02, 2.827990112304688e+02, 2.827770690917969e+02, 2.827039794921875e+02, 2.824579467773438e+02, 2.823705139160156e+02, 2.830442199707031e+02, 2.833937683105469e+02, 2.840579833984375e+02, 2.846080932617188e+02, 2.85009765625e+02, 2.854508361816406e+02, 2.858143615722656e+02, 2.861561279296875e+02, 2.865264282226562e+02, 2.868716735839844e+02, 2.871799621582031e+02, 2.8728271484375e+02, 2.875290222167969e+02, 2.878594360351562e+02, 2.878686218261719e+02, 2.878578491210938e+02, 2.87806396484375e+02, 2.877159729003906e+02, 2.876463928222656e+02, 2.873435668945312e+02, 2.870802917480469e+02, 2.862915649414062e+02, 2.858121032714844e+02, 2.850322265625e+02, 2.847362670898438e+02, 2.845762939453125e+02, 2.844200439453125e+02, 2.842898254394531e+02, 2.841806640625e+02, 2.840879821777344e+02, 2.840108337402344e+02, 2.839365234375e+02, 2.837593994140625e+02, 2.835333251953125e+02, 2.833870849609375e+02, 2.832453918457031e+02]
+bui[2].zon.TAir=[2.931499938964844e+02, 2.898281555175781e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860072021484375e+02, 2.856974792480469e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.842337951660156e+02, 2.842373046875e+02, 2.847561645507812e+02, 2.854774780273438e+02, 2.861921997070312e+02, 2.869447326660156e+02, 2.875782775878906e+02, 2.881309814453125e+02, 2.884737243652344e+02, 2.8873046875e+02, 2.887251281738281e+02, 2.88583984375e+02, 2.885116271972656e+02, 2.884053039550781e+02, 2.883439636230469e+02, 2.882599487304688e+02, 2.880711364746094e+02, 2.877638244628906e+02, 2.874297790527344e+02, 2.870847473144531e+02, 2.867377319335938e+02, 2.864553527832031e+02, 2.861634521484375e+02, 2.858768920898438e+02, 2.855897216796875e+02, 2.853322143554688e+02, 2.851711120605469e+02, 2.850246887207031e+02, 2.848415832519531e+02, 2.846654052734375e+02, 2.845062255859375e+02, 2.843477478027344e+02, 2.841477355957031e+02, 2.839423828125e+02, 2.837708435058594e+02, 2.836084594726562e+02, 2.837765808105469e+02, 2.835121459960938e+02, 2.833832702636719e+02, 2.83313720703125e+02, 2.831880798339844e+02, 2.830352172851562e+02, 2.829215698242188e+02, 2.828407592773438e+02, 2.8279345703125e+02, 2.827990112304688e+02, 2.827770690917969e+02, 2.827039794921875e+02, 2.824579467773438e+02, 2.823705139160156e+02, 2.830442199707031e+02, 2.833937683105469e+02, 2.840579833984375e+02, 2.846080932617188e+02, 2.85009765625e+02, 2.854508361816406e+02, 2.858143615722656e+02, 2.861561279296875e+02, 2.865264282226562e+02, 2.868716735839844e+02, 2.871799621582031e+02, 2.8728271484375e+02, 2.875290222167969e+02, 2.878594360351562e+02, 2.878686218261719e+02, 2.878578491210938e+02, 2.87806396484375e+02, 2.877159729003906e+02, 2.876463928222656e+02, 2.873435668945312e+02, 2.870802917480469e+02, 2.862915649414062e+02, 2.858121032714844e+02, 2.850322265625e+02, 2.847362670898438e+02, 2.845762939453125e+02, 2.844200439453125e+02, 2.842898254394531e+02, 2.841806640625e+02, 2.840879821777344e+02, 2.840108337402344e+02, 2.839365234375e+02, 2.837593994140625e+02, 2.835333251953125e+02, 2.833870849609375e+02, 2.832453918457031e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt
index bf78e24dade..be9737380f9 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_MultipleBuildings_TwoIdenticalTwoZoneBuildings.txt
@@ -1,15 +1,15 @@
-last-generated=2021-04-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0",
   "nonlinear": "1, 1",
-  "number of continuous time states": "12",
+  "number of continuous time states": "16",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-bui[1].zon1.TAir=[2.931499938964844e+02, 2.8930419921875e+02, 2.880307312011719e+02, 2.874117126464844e+02, 2.869685668945312e+02, 2.866422119140625e+02, 2.863968811035156e+02, 2.861995239257812e+02, 2.860189514160156e+02, 2.858737182617188e+02, 2.857702026367188e+02, 2.856736755371094e+02, 2.855778198242188e+02, 2.85490478515625e+02, 2.854107666015625e+02, 2.853386535644531e+02, 2.85291259765625e+02, 2.852898864746094e+02, 2.8531201171875e+02, 2.853585510253906e+02, 2.854504089355469e+02, 2.855680541992188e+02, 2.856753540039062e+02, 2.857766723632812e+02, 2.858764953613281e+02, 2.859690551757812e+02, 2.860446472167969e+02, 2.861055908203125e+02, 2.861795349121094e+02, 2.862685852050781e+02, 2.863244018554688e+02, 2.863590393066406e+02, 2.8638623046875e+02, 2.8641064453125e+02, 2.864347839355469e+02, 2.864577941894531e+02, 2.864796142578125e+02, 2.86477783203125e+02, 2.8646142578125e+02, 2.864461975097656e+02, 2.864343872070312e+02, 2.864820861816406e+02, 2.865526733398438e+02, 2.865533447265625e+02, 2.865302124023438e+02, 2.865499877929688e+02, 2.865842590332031e+02, 2.865758056640625e+02, 2.865419311523438e+02, 2.865225524902344e+02, 2.865192260742188e+02, 2.865813598632812e+02, 2.864647827148438e+02, 2.864183654785156e+02, 2.864683227539062e+02, 2.864834289550781e+02, 2.864515991210938e+02, 2.864328308105469e+02, 2.864419860839844e+02, 2.864811401367188e+02, 2.865722351074219e+02, 2.867186584472656e+02, 2.867772216796875e+02, 2.868552856445312e+02, 2.869363098144531e+02, 2.87265625e+02, 2.875433044433594e+02, 2.88821533203125e+02, 2.901580505371094e+02, 2.906165466308594e+02, 2.909628295898438e+02, 2.912308654785156e+02, 2.914660034179688e+02, 2.91675537109375e+02, 2.918228454589844e+02, 2.919413146972656e+02, 2.916140747070312e+02, 2.916087646484375e+02, 2.920169372558594e+02, 2.920485534667969e+02, 2.920641479492188e+02, 2.920918273925781e+02, 2.921502380371094e+02, 2.922581787109375e+02, 2.92352783203125e+02, 2.924148864746094e+02, 2.919508056640625e+02, 2.916971130371094e+02, 2.910311889648438e+02, 2.906117553710938e+02, 2.904809875488281e+02, 2.90392822265625e+02, 2.899686889648438e+02, 2.894686889648438e+02, 2.893279724121094e+02, 2.892476196289062e+02, 2.890524291992188e+02, 2.884640808105469e+02, 2.881356811523438e+02, 2.878862915039062e+02, 2.877714538574219e+02]
-bui[1].zon2.TAir=[2.931499938964844e+02, 2.893045654296875e+02, 2.880312805175781e+02, 2.874123229980469e+02, 2.869691772460938e+02, 2.86642822265625e+02, 2.863975219726562e+02, 2.862001647949219e+02, 2.860195922851562e+02, 2.858743591308594e+02, 2.857708129882812e+02, 2.8567431640625e+02, 2.855784301757812e+02, 2.854910583496094e+02, 2.85411376953125e+02, 2.853392333984375e+02, 2.852963562011719e+02, 2.852952575683594e+02, 2.853151550292969e+02, 2.853609619140625e+02, 2.85452392578125e+02, 2.855697937011719e+02, 2.856769409179688e+02, 2.857781677246094e+02, 2.858779296875e+02, 2.859704895019531e+02, 2.860460510253906e+02, 2.861069641113281e+02, 2.86180908203125e+02, 2.862699584960938e+02, 2.863257751464844e+02, 2.863603820800781e+02, 2.863875732421875e+02, 2.864119567871094e+02, 2.864360961914062e+02, 2.864590454101562e+02, 2.864808349609375e+02, 2.864789733886719e+02, 2.864625854492188e+02, 2.864473266601562e+02, 2.864354858398438e+02, 2.864831848144531e+02, 2.865537109375e+02, 2.865543823242188e+02, 2.865312194824219e+02, 2.865509948730469e+02, 2.865852355957031e+02, 2.865767517089844e+02, 2.865428466796875e+02, 2.865234680175781e+02, 2.865201110839844e+02, 2.865822143554688e+02, 2.864656066894531e+02, 2.86419189453125e+02, 2.864691162109375e+02, 2.864842224121094e+02, 2.864523620605469e+02, 2.864335632324219e+02, 2.864426879882812e+02, 2.864818420410156e+02, 2.865729064941406e+02, 2.867192993164062e+02, 2.867778625488281e+02, 2.868559265136719e+02, 2.869369506835938e+02, 2.872662658691406e+02, 2.875440063476562e+02, 2.88822265625e+02, 2.901588134765625e+02, 2.906172790527344e+02, 2.909635314941406e+02, 2.912315673828125e+02, 2.914666748046875e+02, 2.916761779785156e+02, 2.918234558105469e+02, 2.919419250488281e+02, 2.916146850585938e+02, 2.916093444824219e+02, 2.920175170898438e+02, 2.920491027832031e+02, 2.920646667480469e+02, 2.920923461914062e+02, 2.921507263183594e+02, 2.922586669921875e+02, 2.923532409667969e+02, 2.924153442382812e+02, 2.919512634277344e+02, 2.916975402832031e+02, 2.910316162109375e+02, 2.906121826171875e+02, 2.904814147949219e+02, 2.903932189941406e+02, 2.899690856933594e+02, 2.894690551757812e+02, 2.893283081054688e+02, 2.892479553222656e+02, 2.890527648925781e+02, 2.884643859863281e+02, 2.881359558105469e+02, 2.878865661621094e+02, 2.877716979980469e+02]
-bui[1].TAirEnePlu.y=[2.862900085449219e+02, 2.861799926757812e+02, 2.856400146484375e+02, 2.851499938964844e+02, 2.85e+02, 2.849200134277344e+02, 2.848800048828125e+02, 2.848500061035156e+02, 2.848099975585938e+02, 2.847799987792969e+02, 2.847699890136719e+02, 2.84760009765625e+02, 2.847300109863281e+02, 2.847000122070312e+02, 2.846700134277344e+02, 2.846400146484375e+02, 2.846300048828125e+02, 2.846400146484375e+02, 2.846900024414062e+02, 2.84760009765625e+02, 2.848699951171875e+02, 2.85010009765625e+02, 2.851600036621094e+02, 2.852999877929688e+02, 2.854299926757812e+02, 2.855199890136719e+02, 2.856300048828125e+02, 2.857200012207031e+02, 2.858200073242188e+02, 2.859200134277344e+02, 2.86010009765625e+02, 2.860599975585938e+02, 2.861099853515625e+02, 2.861400146484375e+02, 2.861700134277344e+02, 2.862000122070312e+02, 2.862300109863281e+02, 2.86239990234375e+02, 2.862300109863281e+02, 2.862200012207031e+02, 2.862099914550781e+02, 2.86260009765625e+02, 2.863099975585938e+02, 2.863399963378906e+02, 2.863299865722656e+02, 2.863399963378906e+02, 2.863800048828125e+02, 2.863900146484375e+02, 2.863599853515625e+02, 2.863399963378906e+02, 2.863399963378906e+02, 2.863699951171875e+02, 2.863200073242188e+02, 2.86239990234375e+02, 2.86260009765625e+02, 2.862900085449219e+02, 2.862699890136719e+02, 2.8625e+02, 2.862699890136719e+02, 2.862900085449219e+02, 2.863599853515625e+02, 2.864800109863281e+02, 2.865899963378906e+02, 2.866499938964844e+02, 2.8675e+02, 2.869200134277344e+02, 2.873099975585938e+02, 2.873999938964844e+02, 2.886000061035156e+02, 2.898999938964844e+02, 2.904299926757812e+02, 2.907999877929688e+02, 2.910899963378906e+02, 2.913399963378906e+02, 2.915400085449219e+02, 2.916400146484375e+02, 2.915299987792969e+02, 2.914299926757812e+02, 2.916700134277344e+02, 2.918299865722656e+02, 2.918599853515625e+02, 2.919100036621094e+02, 2.919599914550781e+02, 2.920700073242188e+02, 2.921400146484375e+02, 2.922200012207031e+02, 2.921099853515625e+02, 2.916600036621094e+02, 2.913099975585938e+02, 2.906400146484375e+02, 2.904400024414062e+02, 2.903299865722656e+02, 2.902799987792969e+02, 2.896300048828125e+02, 2.893599853515625e+02, 2.89239990234375e+02, 2.891700134277344e+02, 2.885799865722656e+02, 2.881900024414062e+02, 2.878999938964844e+02, 2.877900085449219e+02]
-bui[2].zon1.TAir=[2.931499938964844e+02, 2.8930419921875e+02, 2.880307312011719e+02, 2.874117126464844e+02, 2.869685668945312e+02, 2.866422119140625e+02, 2.863968811035156e+02, 2.861995239257812e+02, 2.860189514160156e+02, 2.858737182617188e+02, 2.857702026367188e+02, 2.856736755371094e+02, 2.855778198242188e+02, 2.85490478515625e+02, 2.854107666015625e+02, 2.853386535644531e+02, 2.85291259765625e+02, 2.852898864746094e+02, 2.8531201171875e+02, 2.853585510253906e+02, 2.854504089355469e+02, 2.855680541992188e+02, 2.856753540039062e+02, 2.857766723632812e+02, 2.858764953613281e+02, 2.859690551757812e+02, 2.860446472167969e+02, 2.861055908203125e+02, 2.861795349121094e+02, 2.862685852050781e+02, 2.863244018554688e+02, 2.863590393066406e+02, 2.8638623046875e+02, 2.8641064453125e+02, 2.864347839355469e+02, 2.864577941894531e+02, 2.864796142578125e+02, 2.86477783203125e+02, 2.8646142578125e+02, 2.864461975097656e+02, 2.864343872070312e+02, 2.864820861816406e+02, 2.865526733398438e+02, 2.865533447265625e+02, 2.865302124023438e+02, 2.865499877929688e+02, 2.865842590332031e+02, 2.865758056640625e+02, 2.865419311523438e+02, 2.865225524902344e+02, 2.865192260742188e+02, 2.865813598632812e+02, 2.864647827148438e+02, 2.864183654785156e+02, 2.864683227539062e+02, 2.864834289550781e+02, 2.864515991210938e+02, 2.864328308105469e+02, 2.864419860839844e+02, 2.864811401367188e+02, 2.865722351074219e+02, 2.867186584472656e+02, 2.867772216796875e+02, 2.868552856445312e+02, 2.869363098144531e+02, 2.87265625e+02, 2.875433044433594e+02, 2.88821533203125e+02, 2.901580505371094e+02, 2.906165466308594e+02, 2.909628295898438e+02, 2.912308654785156e+02, 2.914660034179688e+02, 2.91675537109375e+02, 2.918228454589844e+02, 2.919413146972656e+02, 2.916140747070312e+02, 2.916087646484375e+02, 2.920169372558594e+02, 2.920485534667969e+02, 2.920641479492188e+02, 2.920918273925781e+02, 2.921502380371094e+02, 2.922581787109375e+02, 2.92352783203125e+02, 2.924148864746094e+02, 2.919508056640625e+02, 2.916971130371094e+02, 2.910311889648438e+02, 2.906117553710938e+02, 2.904809875488281e+02, 2.90392822265625e+02, 2.899686889648438e+02, 2.894686889648438e+02, 2.893279724121094e+02, 2.892476196289062e+02, 2.890524291992188e+02, 2.884640808105469e+02, 2.881356811523438e+02, 2.878862915039062e+02, 2.877714538574219e+02]
-bui[2].zon2.TAir=[2.931499938964844e+02, 2.893045654296875e+02, 2.880312805175781e+02, 2.874123229980469e+02, 2.869691772460938e+02, 2.86642822265625e+02, 2.863975219726562e+02, 2.862001647949219e+02, 2.860195922851562e+02, 2.858743591308594e+02, 2.857708129882812e+02, 2.8567431640625e+02, 2.855784301757812e+02, 2.854910583496094e+02, 2.85411376953125e+02, 2.853392333984375e+02, 2.852963562011719e+02, 2.852952575683594e+02, 2.853151550292969e+02, 2.853609619140625e+02, 2.85452392578125e+02, 2.855697937011719e+02, 2.856769409179688e+02, 2.857781677246094e+02, 2.858779296875e+02, 2.859704895019531e+02, 2.860460510253906e+02, 2.861069641113281e+02, 2.86180908203125e+02, 2.862699584960938e+02, 2.863257751464844e+02, 2.863603820800781e+02, 2.863875732421875e+02, 2.864119567871094e+02, 2.864360961914062e+02, 2.864590454101562e+02, 2.864808349609375e+02, 2.864789733886719e+02, 2.864625854492188e+02, 2.864473266601562e+02, 2.864354858398438e+02, 2.864831848144531e+02, 2.865537109375e+02, 2.865543823242188e+02, 2.865312194824219e+02, 2.865509948730469e+02, 2.865852355957031e+02, 2.865767517089844e+02, 2.865428466796875e+02, 2.865234680175781e+02, 2.865201110839844e+02, 2.865822143554688e+02, 2.864656066894531e+02, 2.86419189453125e+02, 2.864691162109375e+02, 2.864842224121094e+02, 2.864523620605469e+02, 2.864335632324219e+02, 2.864426879882812e+02, 2.864818420410156e+02, 2.865729064941406e+02, 2.867192993164062e+02, 2.867778625488281e+02, 2.868559265136719e+02, 2.869369506835938e+02, 2.872662658691406e+02, 2.875440063476562e+02, 2.88822265625e+02, 2.901588134765625e+02, 2.906172790527344e+02, 2.909635314941406e+02, 2.912315673828125e+02, 2.914666748046875e+02, 2.916761779785156e+02, 2.918234558105469e+02, 2.919419250488281e+02, 2.916146850585938e+02, 2.916093444824219e+02, 2.920175170898438e+02, 2.920491027832031e+02, 2.920646667480469e+02, 2.920923461914062e+02, 2.921507263183594e+02, 2.922586669921875e+02, 2.923532409667969e+02, 2.924153442382812e+02, 2.919512634277344e+02, 2.916975402832031e+02, 2.910316162109375e+02, 2.906121826171875e+02, 2.904814147949219e+02, 2.903932189941406e+02, 2.899690856933594e+02, 2.894690551757812e+02, 2.893283081054688e+02, 2.892479553222656e+02, 2.890527648925781e+02, 2.884643859863281e+02, 2.881359558105469e+02, 2.878865661621094e+02, 2.877716979980469e+02]
-bui[2].TAirEnePlu.y=[2.862900085449219e+02, 2.861799926757812e+02, 2.856400146484375e+02, 2.851499938964844e+02, 2.85e+02, 2.849200134277344e+02, 2.848800048828125e+02, 2.848500061035156e+02, 2.848099975585938e+02, 2.847799987792969e+02, 2.847699890136719e+02, 2.84760009765625e+02, 2.847300109863281e+02, 2.847000122070312e+02, 2.846700134277344e+02, 2.846400146484375e+02, 2.846300048828125e+02, 2.846400146484375e+02, 2.846900024414062e+02, 2.84760009765625e+02, 2.848699951171875e+02, 2.85010009765625e+02, 2.851600036621094e+02, 2.852999877929688e+02, 2.854299926757812e+02, 2.855199890136719e+02, 2.856300048828125e+02, 2.857200012207031e+02, 2.858200073242188e+02, 2.859200134277344e+02, 2.86010009765625e+02, 2.860599975585938e+02, 2.861099853515625e+02, 2.861400146484375e+02, 2.861700134277344e+02, 2.862000122070312e+02, 2.862300109863281e+02, 2.86239990234375e+02, 2.862300109863281e+02, 2.862200012207031e+02, 2.862099914550781e+02, 2.86260009765625e+02, 2.863099975585938e+02, 2.863399963378906e+02, 2.863299865722656e+02, 2.863399963378906e+02, 2.863800048828125e+02, 2.863900146484375e+02, 2.863599853515625e+02, 2.863399963378906e+02, 2.863399963378906e+02, 2.863699951171875e+02, 2.863200073242188e+02, 2.86239990234375e+02, 2.86260009765625e+02, 2.862900085449219e+02, 2.862699890136719e+02, 2.8625e+02, 2.862699890136719e+02, 2.862900085449219e+02, 2.863599853515625e+02, 2.864800109863281e+02, 2.865899963378906e+02, 2.866499938964844e+02, 2.8675e+02, 2.869200134277344e+02, 2.873099975585938e+02, 2.873999938964844e+02, 2.886000061035156e+02, 2.898999938964844e+02, 2.904299926757812e+02, 2.907999877929688e+02, 2.910899963378906e+02, 2.913399963378906e+02, 2.915400085449219e+02, 2.916400146484375e+02, 2.915299987792969e+02, 2.914299926757812e+02, 2.916700134277344e+02, 2.918299865722656e+02, 2.918599853515625e+02, 2.919100036621094e+02, 2.919599914550781e+02, 2.920700073242188e+02, 2.921400146484375e+02, 2.922200012207031e+02, 2.921099853515625e+02, 2.916600036621094e+02, 2.913099975585938e+02, 2.906400146484375e+02, 2.904400024414062e+02, 2.903299865722656e+02, 2.902799987792969e+02, 2.896300048828125e+02, 2.893599853515625e+02, 2.89239990234375e+02, 2.891700134277344e+02, 2.885799865722656e+02, 2.881900024414062e+02, 2.878999938964844e+02, 2.877900085449219e+02]
+bui[1].zon1.TAir=[2.931499938964844e+02, 2.892806091308594e+02, 2.880261535644531e+02, 2.874082946777344e+02, 2.869660339355469e+02, 2.866402587890625e+02, 2.863953552246094e+02, 2.861983032226562e+02, 2.860179748535156e+02, 2.858729248046875e+02, 2.8576953125e+02, 2.856731567382812e+02, 2.855773620605469e+02, 2.854900817871094e+02, 2.854104614257812e+02, 2.853384094238281e+02, 2.852910766601562e+02, 2.852897338867188e+02, 2.853119201660156e+02, 2.853585205078125e+02, 2.85450439453125e+02, 2.855680847167969e+02, 2.856753845214844e+02, 2.857767333984375e+02, 2.858765869140625e+02, 2.859691467285156e+02, 2.860447082519531e+02, 2.861056823730469e+02, 2.861796569824219e+02, 2.862686462402344e+02, 2.863243408203125e+02, 2.863589477539062e+02, 2.863861694335938e+02, 2.864105834960938e+02, 2.864347534179688e+02, 2.864577331542969e+02, 2.864793090820312e+02, 2.864775695800781e+02, 2.864612731933594e+02, 2.86446044921875e+02, 2.864343566894531e+02, 2.864821472167969e+02, 2.865524597167969e+02, 2.865531921386719e+02, 2.865302429199219e+02, 2.865501098632812e+02, 2.865842590332031e+02, 2.865757141113281e+02, 2.865418701171875e+02, 2.865225524902344e+02, 2.865191650390625e+02, 2.865812072753906e+02, 2.864646606445312e+02, 2.8641845703125e+02, 2.864683532714844e+02, 2.864833068847656e+02, 2.864514465332031e+02, 2.864328918457031e+02, 2.864420471191406e+02, 2.864812316894531e+02, 2.865722961425781e+02, 2.867186279296875e+02, 2.86777099609375e+02, 2.868555908203125e+02, 2.869368591308594e+02, 2.872663879394531e+02, 2.875441284179688e+02, 2.888238220214844e+02, 2.90162841796875e+02, 2.906224060058594e+02, 2.90969482421875e+02, 2.912380981445312e+02, 2.914737243652344e+02, 2.916836242675781e+02, 2.918312683105469e+02, 2.919499816894531e+02, 2.916206359863281e+02, 2.916149291992188e+02, 2.920250549316406e+02, 2.920572814941406e+02, 2.920732116699219e+02, 2.921011657714844e+02, 2.92159912109375e+02, 2.922678833007812e+02, 2.923625793457031e+02, 2.924249877929688e+02, 2.919600830078125e+02, 2.917057800292969e+02, 2.910388793945312e+02, 2.906185607910156e+02, 2.904874572753906e+02, 2.903987731933594e+02, 2.899735412597656e+02, 2.894718322753906e+02, 2.8933056640625e+02, 2.892498474121094e+02, 2.890544128417969e+02, 2.88465576171875e+02, 2.881369323730469e+02, 2.878874206542969e+02, 2.877723999023438e+02]
+bui[1].zon2.TAir=[2.931499938964844e+02, 2.892814331054688e+02, 2.880267028808594e+02, 2.874088745117188e+02, 2.869666442871094e+02, 2.866408996582031e+02, 2.8639599609375e+02, 2.861989440917969e+02, 2.860186157226562e+02, 2.858735656738281e+02, 2.857701721191406e+02, 2.856737670898438e+02, 2.855779724121094e+02, 2.854906921386719e+02, 2.854110412597656e+02, 2.853389892578125e+02, 2.852961730957031e+02, 2.852951049804688e+02, 2.853150634765625e+02, 2.853609313964844e+02, 2.854524230957031e+02, 2.8556982421875e+02, 2.856769714355469e+02, 2.857782287597656e+02, 2.858780212402344e+02, 2.859705810546875e+02, 2.860461120605469e+02, 2.861070861816406e+02, 2.861810302734375e+02, 2.8627001953125e+02, 2.863257141113281e+02, 2.863603210449219e+02, 2.863875122070312e+02, 2.864118957519531e+02, 2.8643603515625e+02, 2.864590148925781e+02, 2.864805603027344e+02, 2.864787902832031e+02, 2.864624328613281e+02, 2.864471740722656e+02, 2.864354858398438e+02, 2.864832458496094e+02, 2.865535278320312e+02, 2.865542297363281e+02, 2.8653125e+02, 2.865510864257812e+02, 2.865852355957031e+02, 2.8657666015625e+02, 2.865427856445312e+02, 2.865234680175781e+02, 2.865200500488281e+02, 2.865820922851562e+02, 2.864655151367188e+02, 2.864192504882812e+02, 2.864691162109375e+02, 2.864841003417969e+02, 2.864522094726562e+02, 2.864336547851562e+02, 2.864427795410156e+02, 2.8648193359375e+02, 2.865729675292969e+02, 2.867192687988281e+02, 2.867777709960938e+02, 2.868562316894531e+02, 2.869375e+02, 2.872669982910156e+02, 2.875448303222656e+02, 2.888245544433594e+02, 2.901636047363281e+02, 2.906231384277344e+02, 2.909701843261719e+02, 2.9123876953125e+02, 2.914743957519531e+02, 2.916842651367188e+02, 2.918318786621094e+02, 2.919505920410156e+02, 2.916212463378906e+02, 2.916155090332031e+02, 2.92025634765625e+02, 2.920578308105469e+02, 2.9207373046875e+02, 2.921016540527344e+02, 2.921604309082031e+02, 2.922683715820312e+02, 2.923630676269531e+02, 2.924254455566406e+02, 2.919605102539062e+02, 2.917062072753906e+02, 2.91039306640625e+02, 2.906189880371094e+02, 2.904878845214844e+02, 2.903992004394531e+02, 2.899739379882812e+02, 2.894721984863281e+02, 2.893309020996094e+02, 2.892501831054688e+02, 2.890547485351562e+02, 2.884658813476562e+02, 2.8813720703125e+02, 2.878876647949219e+02, 2.877726440429688e+02]
+bui[1].TAirEnePlu.y=[2.862900085449219e+02, 2.861900024414062e+02, 2.856400146484375e+02, 2.851499938964844e+02, 2.85e+02, 2.849200134277344e+02, 2.848800048828125e+02, 2.848500061035156e+02, 2.848099975585938e+02, 2.847799987792969e+02, 2.847699890136719e+02, 2.84760009765625e+02, 2.847300109863281e+02, 2.847000122070312e+02, 2.846700134277344e+02, 2.846400146484375e+02, 2.846300048828125e+02, 2.846400146484375e+02, 2.846900024414062e+02, 2.84760009765625e+02, 2.848699951171875e+02, 2.85010009765625e+02, 2.851600036621094e+02, 2.852999877929688e+02, 2.854299926757812e+02, 2.855199890136719e+02, 2.856300048828125e+02, 2.857200012207031e+02, 2.858200073242188e+02, 2.859200134277344e+02, 2.86010009765625e+02, 2.860599975585938e+02, 2.861099853515625e+02, 2.861400146484375e+02, 2.861700134277344e+02, 2.862000122070312e+02, 2.862300109863281e+02, 2.86239990234375e+02, 2.862300109863281e+02, 2.862200012207031e+02, 2.862200012207031e+02, 2.86260009765625e+02, 2.863099975585938e+02, 2.863500061035156e+02, 2.863299865722656e+02, 2.863399963378906e+02, 2.863800048828125e+02, 2.863900146484375e+02, 2.863599853515625e+02, 2.863500061035156e+02, 2.863399963378906e+02, 2.863699951171875e+02, 2.863200073242188e+02, 2.86239990234375e+02, 2.86260009765625e+02, 2.862900085449219e+02, 2.862699890136719e+02, 2.8625e+02, 2.862699890136719e+02, 2.862900085449219e+02, 2.863599853515625e+02, 2.864800109863281e+02, 2.865899963378906e+02, 2.866499938964844e+02, 2.8675e+02, 2.869200134277344e+02, 2.873099975585938e+02, 2.873999938964844e+02, 2.886000061035156e+02, 2.898999938964844e+02, 2.904299926757812e+02, 2.907999877929688e+02, 2.910899963378906e+02, 2.913399963378906e+02, 2.915400085449219e+02, 2.916400146484375e+02, 2.915299987792969e+02, 2.914299926757812e+02, 2.916700134277344e+02, 2.918299865722656e+02, 2.918599853515625e+02, 2.919100036621094e+02, 2.919599914550781e+02, 2.920700073242188e+02, 2.921400146484375e+02, 2.922200012207031e+02, 2.921099853515625e+02, 2.916600036621094e+02, 2.913099975585938e+02, 2.906400146484375e+02, 2.904400024414062e+02, 2.903299865722656e+02, 2.902799987792969e+02, 2.896300048828125e+02, 2.893599853515625e+02, 2.89239990234375e+02, 2.891700134277344e+02, 2.885799865722656e+02, 2.881900024414062e+02, 2.878999938964844e+02, 2.877900085449219e+02]
+bui[2].zon1.TAir=[2.931499938964844e+02, 2.892806091308594e+02, 2.880261535644531e+02, 2.874082946777344e+02, 2.869660339355469e+02, 2.866402587890625e+02, 2.863953552246094e+02, 2.861983032226562e+02, 2.860179748535156e+02, 2.858729248046875e+02, 2.8576953125e+02, 2.856731567382812e+02, 2.855773620605469e+02, 2.854900817871094e+02, 2.854104614257812e+02, 2.853384094238281e+02, 2.852910766601562e+02, 2.852897338867188e+02, 2.853119201660156e+02, 2.853585205078125e+02, 2.85450439453125e+02, 2.855680847167969e+02, 2.856753845214844e+02, 2.857767333984375e+02, 2.858765869140625e+02, 2.859691467285156e+02, 2.860447082519531e+02, 2.861056823730469e+02, 2.861796569824219e+02, 2.862686462402344e+02, 2.863243408203125e+02, 2.863589477539062e+02, 2.863861694335938e+02, 2.864105834960938e+02, 2.864347534179688e+02, 2.864577331542969e+02, 2.864793090820312e+02, 2.864775695800781e+02, 2.864612731933594e+02, 2.86446044921875e+02, 2.864343566894531e+02, 2.864821472167969e+02, 2.865524597167969e+02, 2.865531921386719e+02, 2.865302429199219e+02, 2.865501098632812e+02, 2.865842590332031e+02, 2.865757141113281e+02, 2.865418701171875e+02, 2.865225524902344e+02, 2.865191650390625e+02, 2.865812072753906e+02, 2.864646606445312e+02, 2.8641845703125e+02, 2.864683532714844e+02, 2.864833068847656e+02, 2.864514465332031e+02, 2.864328918457031e+02, 2.864420471191406e+02, 2.864812316894531e+02, 2.865722961425781e+02, 2.867186279296875e+02, 2.86777099609375e+02, 2.868555908203125e+02, 2.869368591308594e+02, 2.872663879394531e+02, 2.875441284179688e+02, 2.888238220214844e+02, 2.90162841796875e+02, 2.906224060058594e+02, 2.90969482421875e+02, 2.912380981445312e+02, 2.914737243652344e+02, 2.916836242675781e+02, 2.918312683105469e+02, 2.919499816894531e+02, 2.916206359863281e+02, 2.916149291992188e+02, 2.920250549316406e+02, 2.920572814941406e+02, 2.920732116699219e+02, 2.921011657714844e+02, 2.92159912109375e+02, 2.922678833007812e+02, 2.923625793457031e+02, 2.924249877929688e+02, 2.919600830078125e+02, 2.917057800292969e+02, 2.910388793945312e+02, 2.906185607910156e+02, 2.904874572753906e+02, 2.903987731933594e+02, 2.899735412597656e+02, 2.894718322753906e+02, 2.8933056640625e+02, 2.892498474121094e+02, 2.890544128417969e+02, 2.88465576171875e+02, 2.881369323730469e+02, 2.878874206542969e+02, 2.877723999023438e+02]
+bui[2].zon2.TAir=[2.931499938964844e+02, 2.892814331054688e+02, 2.880267028808594e+02, 2.874088745117188e+02, 2.869666442871094e+02, 2.866408996582031e+02, 2.8639599609375e+02, 2.861989440917969e+02, 2.860186157226562e+02, 2.858735656738281e+02, 2.857701721191406e+02, 2.856737670898438e+02, 2.855779724121094e+02, 2.854906921386719e+02, 2.854110412597656e+02, 2.853389892578125e+02, 2.852961730957031e+02, 2.852951049804688e+02, 2.853150634765625e+02, 2.853609313964844e+02, 2.854524230957031e+02, 2.8556982421875e+02, 2.856769714355469e+02, 2.857782287597656e+02, 2.858780212402344e+02, 2.859705810546875e+02, 2.860461120605469e+02, 2.861070861816406e+02, 2.861810302734375e+02, 2.8627001953125e+02, 2.863257141113281e+02, 2.863603210449219e+02, 2.863875122070312e+02, 2.864118957519531e+02, 2.8643603515625e+02, 2.864590148925781e+02, 2.864805603027344e+02, 2.864787902832031e+02, 2.864624328613281e+02, 2.864471740722656e+02, 2.864354858398438e+02, 2.864832458496094e+02, 2.865535278320312e+02, 2.865542297363281e+02, 2.8653125e+02, 2.865510864257812e+02, 2.865852355957031e+02, 2.8657666015625e+02, 2.865427856445312e+02, 2.865234680175781e+02, 2.865200500488281e+02, 2.865820922851562e+02, 2.864655151367188e+02, 2.864192504882812e+02, 2.864691162109375e+02, 2.864841003417969e+02, 2.864522094726562e+02, 2.864336547851562e+02, 2.864427795410156e+02, 2.8648193359375e+02, 2.865729675292969e+02, 2.867192687988281e+02, 2.867777709960938e+02, 2.868562316894531e+02, 2.869375e+02, 2.872669982910156e+02, 2.875448303222656e+02, 2.888245544433594e+02, 2.901636047363281e+02, 2.906231384277344e+02, 2.909701843261719e+02, 2.9123876953125e+02, 2.914743957519531e+02, 2.916842651367188e+02, 2.918318786621094e+02, 2.919505920410156e+02, 2.916212463378906e+02, 2.916155090332031e+02, 2.92025634765625e+02, 2.920578308105469e+02, 2.9207373046875e+02, 2.921016540527344e+02, 2.921604309082031e+02, 2.922683715820312e+02, 2.923630676269531e+02, 2.924254455566406e+02, 2.919605102539062e+02, 2.917062072753906e+02, 2.91039306640625e+02, 2.906189880371094e+02, 2.904878845214844e+02, 2.903992004394531e+02, 2.899739379882812e+02, 2.894721984863281e+02, 2.893309020996094e+02, 2.892501831054688e+02, 2.890547485351562e+02, 2.884658813476562e+02, 2.8813720703125e+02, 2.878876647949219e+02, 2.877726440429688e+02]
+bui[2].TAirEnePlu.y=[2.862900085449219e+02, 2.861900024414062e+02, 2.856400146484375e+02, 2.851499938964844e+02, 2.85e+02, 2.849200134277344e+02, 2.848800048828125e+02, 2.848500061035156e+02, 2.848099975585938e+02, 2.847799987792969e+02, 2.847699890136719e+02, 2.84760009765625e+02, 2.847300109863281e+02, 2.847000122070312e+02, 2.846700134277344e+02, 2.846400146484375e+02, 2.846300048828125e+02, 2.846400146484375e+02, 2.846900024414062e+02, 2.84760009765625e+02, 2.848699951171875e+02, 2.85010009765625e+02, 2.851600036621094e+02, 2.852999877929688e+02, 2.854299926757812e+02, 2.855199890136719e+02, 2.856300048828125e+02, 2.857200012207031e+02, 2.858200073242188e+02, 2.859200134277344e+02, 2.86010009765625e+02, 2.860599975585938e+02, 2.861099853515625e+02, 2.861400146484375e+02, 2.861700134277344e+02, 2.862000122070312e+02, 2.862300109863281e+02, 2.86239990234375e+02, 2.862300109863281e+02, 2.862200012207031e+02, 2.862200012207031e+02, 2.86260009765625e+02, 2.863099975585938e+02, 2.863500061035156e+02, 2.863299865722656e+02, 2.863399963378906e+02, 2.863800048828125e+02, 2.863900146484375e+02, 2.863599853515625e+02, 2.863500061035156e+02, 2.863399963378906e+02, 2.863699951171875e+02, 2.863200073242188e+02, 2.86239990234375e+02, 2.86260009765625e+02, 2.862900085449219e+02, 2.862699890136719e+02, 2.8625e+02, 2.862699890136719e+02, 2.862900085449219e+02, 2.863599853515625e+02, 2.864800109863281e+02, 2.865899963378906e+02, 2.866499938964844e+02, 2.8675e+02, 2.869200134277344e+02, 2.873099975585938e+02, 2.873999938964844e+02, 2.886000061035156e+02, 2.898999938964844e+02, 2.904299926757812e+02, 2.907999877929688e+02, 2.910899963378906e+02, 2.913399963378906e+02, 2.915400085449219e+02, 2.916400146484375e+02, 2.915299987792969e+02, 2.914299926757812e+02, 2.916700134277344e+02, 2.918299865722656e+02, 2.918599853515625e+02, 2.919100036621094e+02, 2.919599914550781e+02, 2.920700073242188e+02, 2.921400146484375e+02, 2.922200012207031e+02, 2.921099853515625e+02, 2.916600036621094e+02, 2.913099975585938e+02, 2.906400146484375e+02, 2.904400024414062e+02, 2.903299865722656e+02, 2.902799987792969e+02, 2.896300048828125e+02, 2.893599853515625e+02, 2.89239990234375e+02, 2.891700134277344e+02, 2.885799865722656e+02, 2.881900024414062e+02, 2.878999938964844e+02, 2.877900085449219e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_NoOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_NoOutputVariable.txt
index 011eb116f0d..4b8b0f479eb 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_NoOutputVariable.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_NoOutputVariable.txt
@@ -1,10 +1,10 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-zon.TAir=[2.931499938964844e+02, 2.905977172851562e+02, 2.89828125e+02, 2.896369018554688e+02, 2.891467895507812e+02, 2.888004760742188e+02, 2.885250244140625e+02, 2.882528076171875e+02, 2.879981994628906e+02, 2.877625122070312e+02, 2.875408630371094e+02, 2.873328247070312e+02, 2.871351928710938e+02, 2.869407348632812e+02, 2.867419738769531e+02, 2.865452880859375e+02, 2.863540954589844e+02, 2.861722106933594e+02, 2.860071716308594e+02, 2.858495483398438e+02, 2.856974487304688e+02, 2.855458374023438e+02, 2.853902893066406e+02, 2.852376403808594e+02, 2.850880432128906e+02, 2.849419250488281e+02, 2.847944641113281e+02, 2.846495361328125e+02, 2.845064392089844e+02, 2.84365478515625e+02, 2.842337646484375e+02, 2.84147705078125e+02, 2.842373046875e+02, 2.844678955078125e+02, 2.847561645507812e+02, 2.851071472167969e+02, 2.854774780273438e+02, 2.858269958496094e+02, 2.861921997070312e+02, 2.865725402832031e+02, 2.869447326660156e+02, 2.872733764648438e+02, 2.875782775878906e+02, 2.878722229003906e+02, 2.881309814453125e+02, 2.883150634765625e+02, 2.884737243652344e+02, 2.886122436523438e+02, 2.8873046875e+02, 2.887612609863281e+02, 2.8872509765625e+02, 2.886725158691406e+02, 2.885839538574219e+02, 2.885289306640625e+02, 2.885115966796875e+02, 2.884546508789062e+02, 2.884052734375e+02, 2.883761901855469e+02, 2.883439636230469e+02, 2.882919311523438e+02, 2.882599487304688e+02, 2.881893005371094e+02, 2.880711059570312e+02, 2.879382629394531e+02, 2.877637329101562e+02, 2.875870056152344e+02, 2.874297485351562e+02, 2.872618713378906e+02, 2.87084716796875e+02, 2.868921203613281e+02, 2.867377014160156e+02, 2.865994873046875e+02, 2.86455322265625e+02, 2.863089599609375e+02, 2.861634521484375e+02, 2.860204162597656e+02, 2.858768615722656e+02, 2.857324829101562e+02, 2.855896911621094e+02, 2.854498596191406e+02, 2.853321228027344e+02, 2.85242919921875e+02, 2.851710815429688e+02, 2.851019287109375e+02, 2.85024658203125e+02, 2.849344482421875e+02, 2.848415832519531e+02, 2.847515563964844e+02, 2.846653747558594e+02, 2.845836181640625e+02, 2.845061950683594e+02, 2.844311218261719e+02, 2.843477172851562e+02, 2.842505493164062e+02, 2.841477355957031e+02, 2.840436706542969e+02, 2.839423522949219e+02, 2.838530883789062e+02, 2.837708129882812e+02, 2.836900634765625e+02, 2.836084594726562e+02]
+zon.TAir=[2.931499938964844e+02, 2.905976867675781e+02, 2.898281555175781e+02, 2.896369018554688e+02, 2.891467895507812e+02, 2.888004760742188e+02, 2.885250244140625e+02, 2.882528076171875e+02, 2.879981994628906e+02, 2.877625122070312e+02, 2.875408630371094e+02, 2.873328247070312e+02, 2.871351928710938e+02, 2.869407348632812e+02, 2.867419738769531e+02, 2.865452880859375e+02, 2.863540954589844e+02, 2.861722106933594e+02, 2.860072021484375e+02, 2.858495788574219e+02, 2.856974792480469e+02, 2.855458374023438e+02, 2.853902893066406e+02, 2.852376403808594e+02, 2.850880432128906e+02, 2.849419250488281e+02, 2.847944641113281e+02, 2.846495361328125e+02, 2.845064392089844e+02, 2.84365478515625e+02, 2.842337951660156e+02, 2.84147705078125e+02, 2.842373046875e+02, 2.844678955078125e+02, 2.847561645507812e+02, 2.851071472167969e+02, 2.854774780273438e+02, 2.858269958496094e+02, 2.861921997070312e+02, 2.865725402832031e+02, 2.869447631835938e+02, 2.872733764648438e+02, 2.875782775878906e+02, 2.878722534179688e+02, 2.881309814453125e+02, 2.883150939941406e+02, 2.884737243652344e+02, 2.886122436523438e+02, 2.887304992675781e+02, 2.887612915039062e+02, 2.887251281738281e+02, 2.886725463867188e+02, 2.88583984375e+02, 2.885289611816406e+02, 2.885116271972656e+02, 2.884546813964844e+02, 2.884053039550781e+02, 2.883761901855469e+02, 2.883439636230469e+02, 2.882919616699219e+02, 2.882599487304688e+02, 2.881893005371094e+02, 2.880711364746094e+02, 2.879382629394531e+02, 2.877638244628906e+02, 2.875870361328125e+02, 2.874297790527344e+02, 2.872619018554688e+02, 2.870847473144531e+02, 2.868921508789062e+02, 2.867377319335938e+02, 2.865995178222656e+02, 2.864553527832031e+02, 2.863089599609375e+02, 2.861634521484375e+02, 2.860204162597656e+02, 2.858768920898438e+02, 2.857325134277344e+02, 2.855896911621094e+02, 2.854498901367188e+02, 2.853322143554688e+02, 2.852429504394531e+02, 2.851711120605469e+02, 2.851019592285156e+02, 2.85024658203125e+02, 2.849344482421875e+02, 2.848415832519531e+02, 2.847515563964844e+02, 2.846654052734375e+02, 2.845837707519531e+02, 2.845062255859375e+02, 2.8443115234375e+02, 2.843477478027344e+02, 2.842505493164062e+02, 2.841477661132812e+02, 2.840436706542969e+02, 2.839423828125e+02, 2.838530883789062e+02, 2.837708435058594e+02, 2.836900939941406e+02, 2.836084594726562e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariable.txt
index a5947ab3d23..4c4b22cf6ea 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariable.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariable.txt
@@ -1,11 +1,11 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 4.32e+05]
-zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447326660156e+02, 2.883150634765625e+02, 2.887251281738281e+02, 2.884546508789062e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377014160156e+02, 2.860204162597656e+02, 2.853323364257812e+02, 2.849344787597656e+02, 2.845061950683594e+02, 2.840436706542969e+02, 2.836084594726562e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.828783874511719e+02, 2.827989807128906e+02, 2.826684265136719e+02, 2.830442199707031e+02, 2.844673461914062e+02, 2.854508666992188e+02, 2.863419799804688e+02, 2.871799621582031e+02, 2.877546081542969e+02, 2.878578796386719e+02, 2.876747741699219e+02, 2.870802917480469e+02, 2.856825866699219e+02, 2.845762634277344e+02, 2.84232666015625e+02, 2.840108032226562e+02, 2.836387939453125e+02, 2.832453918457031e+02, 2.829547119140625e+02, 2.826980895996094e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628784179688e+02, 2.832455749511719e+02, 2.840979614257812e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860324096679688e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654663085938e+02, 2.84279052734375e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338439941406e+02, 2.816460571289062e+02, 2.813206176757812e+02, 2.810276794433594e+02, 2.807495422363281e+02, 2.804705505371094e+02, 2.802008361816406e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242553710938e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079833984375e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.786509094238281e+02, 2.813306274414062e+02, 2.835545654296875e+02, 2.850451965332031e+02, 2.86462646484375e+02, 2.877089233398438e+02, 2.872904663085938e+02, 2.858002014160156e+02, 2.840639038085938e+02, 2.82319091796875e+02, 2.81323486328125e+02, 2.804435119628906e+02, 2.797223815917969e+02, 2.790178527832031e+02]
+zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447631835938e+02, 2.883150939941406e+02, 2.887251281738281e+02, 2.884546813964844e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377319335938e+02, 2.860204162597656e+02, 2.853323974609375e+02, 2.849344787597656e+02, 2.845062255859375e+02, 2.840436706542969e+02, 2.836084899902344e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.8287841796875e+02, 2.827990112304688e+02, 2.8266845703125e+02, 2.83044189453125e+02, 2.844673156738281e+02, 2.854508361816406e+02, 2.863420104980469e+02, 2.871799621582031e+02, 2.877545776367188e+02, 2.878578491210938e+02, 2.876748046875e+02, 2.87080322265625e+02, 2.856826171875e+02, 2.845762939453125e+02, 2.842326965332031e+02, 2.840108337402344e+02, 2.836388244628906e+02, 2.832453918457031e+02, 2.829547424316406e+02, 2.826981201171875e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628479003906e+02, 2.832455749511719e+02, 2.840979309082031e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860323791503906e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654968261719e+02, 2.842790832519531e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338745117188e+02, 2.816460876464844e+02, 2.813206481933594e+02, 2.810277099609375e+02, 2.807495727539062e+02, 2.804705200195312e+02, 2.802008666992188e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242248535156e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079528808594e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.7865087890625e+02, 2.813305969238281e+02, 2.835545959472656e+02, 2.850451965332031e+02, 2.864626159667969e+02, 2.877089233398438e+02, 2.872904968261719e+02, 2.858002319335938e+02, 2.840639343261719e+02, 2.823191223144531e+02, 2.813234558105469e+02, 2.804435119628906e+02, 2.79722412109375e+02, 2.79017822265625e+02]
 equEle.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.999999999999757e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt
index a23c790cda1..ac6e1c2c2be 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneOneOutputVariableSummer.txt
@@ -1,11 +1,11 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[1.87488e+07, 1.93536e+07]
-zon.TAir=[2.931499938964844e+02, 2.96802001953125e+02, 2.965333557128906e+02, 2.962769165039062e+02, 2.986618347167969e+02, 3.004882202148438e+02, 3.008164978027344e+02, 3.002284851074219e+02, 3.014297180175781e+02, 3.012243041992188e+02, 3.006149597167969e+02, 3.005467529296875e+02, 2.988036499023438e+02, 2.976460876464844e+02, 2.967989501953125e+02, 2.963974609375e+02, 2.961048278808594e+02, 2.955403442382812e+02, 2.971171875e+02, 3.009947204589844e+02, 3.044538269042969e+02, 3.060851135253906e+02, 3.069453430175781e+02, 3.088172912597656e+02, 3.096212768554688e+02, 3.089326171875e+02, 3.051031188964844e+02, 3.0312451171875e+02, 3.017460632324219e+02, 3.006868591308594e+02, 2.998819274902344e+02, 2.990196228027344e+02, 2.992771606445312e+02, 3.027532348632812e+02, 3.065614929199219e+02, 3.08730224609375e+02, 3.099847412109375e+02, 3.109104919433594e+02, 3.114662780761719e+02, 3.10470947265625e+02, 3.07165771484375e+02, 3.055403137207031e+02, 3.043985290527344e+02, 3.035751037597656e+02, 3.029111328125e+02, 3.022861328125e+02, 3.017460021972656e+02, 3.037137756347656e+02, 3.08374755859375e+02, 3.111650085449219e+02, 3.125538024902344e+02, 3.135804748535156e+02, 3.1421435546875e+02, 3.132473754882812e+02, 3.100519409179688e+02, 3.080708312988281e+02, 3.067640686035156e+02, 3.055877990722656e+02, 3.047356872558594e+02, 3.039806518554688e+02, 3.03322509765625e+02, 3.0421826171875e+02, 3.083318481445312e+02, 3.116838684082031e+02, 3.136138000488281e+02, 3.1532080078125e+02, 3.163895568847656e+02, 3.143331604003906e+02, 3.111504821777344e+02, 3.091903686523438e+02, 3.082007446289062e+02, 3.070743713378906e+02, 3.060701599121094e+02, 3.052151184082031e+02, 3.043768310546875e+02, 3.047974548339844e+02, 3.087459106445312e+02, 3.123893432617188e+02, 3.143661499023438e+02, 3.137335205078125e+02, 3.141177368164062e+02, 3.158883972167969e+02, 3.157444763183594e+02, 3.118968200683594e+02, 3.098226928710938e+02, 3.08334228515625e+02, 3.072488098144531e+02, 3.062562866210938e+02, 3.053087768554688e+02, 3.046937866210938e+02, 3.0637060546875e+02, 3.093526306152344e+02, 3.117742919921875e+02, 3.130282287597656e+02, 3.133759155273438e+02, 3.127914428710938e+02, 3.112675170898438e+02, 3.095706176757812e+02, 3.079865112304688e+02, 3.067621765136719e+02, 3.056951904296875e+02]
+zon.TAir=[2.931499938964844e+02, 2.968019104003906e+02, 2.965332641601562e+02, 2.962767944335938e+02, 2.986617736816406e+02, 3.004881286621094e+02, 3.008163757324219e+02, 3.002283935546875e+02, 3.014296264648438e+02, 3.012242126464844e+02, 3.006148681640625e+02, 3.005466613769531e+02, 2.988035583496094e+02, 2.976460266113281e+02, 2.967988891601562e+02, 2.963973999023438e+02, 2.961047668457031e+02, 2.95540283203125e+02, 2.971171264648438e+02, 3.009946594238281e+02, 3.044537658691406e+02, 3.060850524902344e+02, 3.069452819824219e+02, 3.088172302246094e+02, 3.096212463378906e+02, 3.089325561523438e+02, 3.051030883789062e+02, 3.031244812011719e+02, 3.017460327148438e+02, 3.006868286132812e+02, 2.998818664550781e+02, 2.990195922851562e+02, 2.992771301269531e+02, 3.027532043457031e+02, 3.065614624023438e+02, 3.087301940917969e+02, 3.099847412109375e+02, 3.109104309082031e+02, 3.114662475585938e+02, 3.10470947265625e+02, 3.071657104492188e+02, 3.05540283203125e+02, 3.043985290527344e+02, 3.035751037597656e+02, 3.029111328125e+02, 3.022860717773438e+02, 3.017459716796875e+02, 3.037137451171875e+02, 3.083747253417969e+02, 3.111650085449219e+02, 3.125632629394531e+02, 3.135804748535156e+02, 3.142143249511719e+02, 3.132473449707031e+02, 3.100519104003906e+02, 3.0807080078125e+02, 3.067640380859375e+02, 3.055877685546875e+02, 3.047356872558594e+02, 3.039806213378906e+02, 3.03322509765625e+02, 3.0421826171875e+02, 3.083318481445312e+02, 3.11683837890625e+02, 3.1361376953125e+02, 3.153207702636719e+02, 3.163895263671875e+02, 3.143331298828125e+02, 3.111504516601562e+02, 3.091903991699219e+02, 3.082007446289062e+02, 3.070743408203125e+02, 3.060701293945312e+02, 3.05215087890625e+02, 3.043768310546875e+02, 3.047974548339844e+02, 3.087459106445312e+02, 3.123893432617188e+02, 3.143917236328125e+02, 3.137335205078125e+02, 3.141175537109375e+02, 3.158882141113281e+02, 3.157443237304688e+02, 3.118966369628906e+02, 3.09822509765625e+02, 3.083340759277344e+02, 3.072486572265625e+02, 3.062561340332031e+02, 3.053086242675781e+02, 3.046936340332031e+02, 3.063704528808594e+02, 3.093524780273438e+02, 3.117741394042969e+02, 3.13028076171875e+02, 3.133757934570312e+02, 3.127912902832031e+02, 3.112673950195312e+02, 3.095704956054688e+02, 3.079863586425781e+02, 3.067620544433594e+02, 3.056950988769531e+02]
 equEle.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt
index 135c07debfe..4f2331f6a4b 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoDifferentOutputVariables.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 4.32e+05]
-zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447326660156e+02, 2.883150634765625e+02, 2.887251281738281e+02, 2.884546508789062e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377014160156e+02, 2.860204162597656e+02, 2.853323364257812e+02, 2.849344787597656e+02, 2.845061950683594e+02, 2.840436706542969e+02, 2.836084594726562e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.828783874511719e+02, 2.827989807128906e+02, 2.826684265136719e+02, 2.830442199707031e+02, 2.844673461914062e+02, 2.854508666992188e+02, 2.863419799804688e+02, 2.871799621582031e+02, 2.877546081542969e+02, 2.878578796386719e+02, 2.876747741699219e+02, 2.870802917480469e+02, 2.856825866699219e+02, 2.845762634277344e+02, 2.84232666015625e+02, 2.840108032226562e+02, 2.836387939453125e+02, 2.832453918457031e+02, 2.829547119140625e+02, 2.826980895996094e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628784179688e+02, 2.832455749511719e+02, 2.840979614257812e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860324096679688e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654663085938e+02, 2.84279052734375e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338439941406e+02, 2.816460571289062e+02, 2.813206176757812e+02, 2.810276794433594e+02, 2.807495422363281e+02, 2.804705505371094e+02, 2.802008361816406e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242553710938e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079833984375e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.786509094238281e+02, 2.813306274414062e+02, 2.835545654296875e+02, 2.850451965332031e+02, 2.86462646484375e+02, 2.877089233398438e+02, 2.872904663085938e+02, 2.858002014160156e+02, 2.840639038085938e+02, 2.82319091796875e+02, 2.81323486328125e+02, 2.804435119628906e+02, 2.797223815917969e+02, 2.790178527832031e+02]
+zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447631835938e+02, 2.883150939941406e+02, 2.887251281738281e+02, 2.884546813964844e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377319335938e+02, 2.860204162597656e+02, 2.853323974609375e+02, 2.849344787597656e+02, 2.845062255859375e+02, 2.840436706542969e+02, 2.836084899902344e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.8287841796875e+02, 2.827990112304688e+02, 2.8266845703125e+02, 2.83044189453125e+02, 2.844673156738281e+02, 2.854508361816406e+02, 2.863420104980469e+02, 2.871799621582031e+02, 2.877545776367188e+02, 2.878578491210938e+02, 2.876748046875e+02, 2.87080322265625e+02, 2.856826171875e+02, 2.845762939453125e+02, 2.842326965332031e+02, 2.840108337402344e+02, 2.836388244628906e+02, 2.832453918457031e+02, 2.829547424316406e+02, 2.826981201171875e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628479003906e+02, 2.832455749511719e+02, 2.840979309082031e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860323791503906e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654968261719e+02, 2.842790832519531e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338745117188e+02, 2.816460876464844e+02, 2.813206481933594e+02, 2.810277099609375e+02, 2.807495727539062e+02, 2.804705200195312e+02, 2.802008666992188e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242248535156e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079528808594e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.7865087890625e+02, 2.813305969238281e+02, 2.835545959472656e+02, 2.850451965332031e+02, 2.864626159667969e+02, 2.877089233398438e+02, 2.872904968261719e+02, 2.858002319335938e+02, 2.840639343261719e+02, 2.823191223144531e+02, 2.813234558105469e+02, 2.804435119628906e+02, 2.79722412109375e+02, 2.79017822265625e+02]
 equEle.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.999999999999757e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 incBeaSou.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.6083740234375e+02, 4.752333679199219e+02, 5.500250244140625e+02, 3.016527404785156e+02, 6.030509567260742e+01, 7.141791534423828e+01, 1.89294548034668e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.28510570526123e+00, 7.870273590087891e-01, 1.159778714179988e+00, 2.244440078735352e+00, 4.297275245189667e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.57021164894104e-01, 0e+00, 2.899446785449982e-01, 8.977760076522827e-01, 8.594550490379333e-01, 7.679345607757568e-01, 5.258182287216187e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.870273590087891e-01, 8.698340058326721e-01, 4.488880038261414e-01, 7.162125706672668e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.752918701171875e+02, 5.779404296875e+02, 7.309505004882812e+02, 7.7074072265625e+02, 6.4502099609375e+02, 4.285074768066406e+02, 1.048481521606445e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt
index c4bcbde0239..9823588f0c8 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_OutputVariable_OneZoneTwoIdenticalOutputVariables.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 4.32e+05]
-zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447326660156e+02, 2.883150634765625e+02, 2.887251281738281e+02, 2.884546508789062e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377014160156e+02, 2.860204162597656e+02, 2.853323364257812e+02, 2.849344787597656e+02, 2.845061950683594e+02, 2.840436706542969e+02, 2.836084594726562e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.828783874511719e+02, 2.827989807128906e+02, 2.826684265136719e+02, 2.830442199707031e+02, 2.844673461914062e+02, 2.854508666992188e+02, 2.863419799804688e+02, 2.871799621582031e+02, 2.877546081542969e+02, 2.878578796386719e+02, 2.876747741699219e+02, 2.870802917480469e+02, 2.856825866699219e+02, 2.845762634277344e+02, 2.84232666015625e+02, 2.840108032226562e+02, 2.836387939453125e+02, 2.832453918457031e+02, 2.829547119140625e+02, 2.826980895996094e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628784179688e+02, 2.832455749511719e+02, 2.840979614257812e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860324096679688e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654663085938e+02, 2.84279052734375e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338439941406e+02, 2.816460571289062e+02, 2.813206176757812e+02, 2.810276794433594e+02, 2.807495422363281e+02, 2.804705505371094e+02, 2.802008361816406e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242553710938e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079833984375e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.786509094238281e+02, 2.813306274414062e+02, 2.835545654296875e+02, 2.850451965332031e+02, 2.86462646484375e+02, 2.877089233398438e+02, 2.872904663085938e+02, 2.858002014160156e+02, 2.840639038085938e+02, 2.82319091796875e+02, 2.81323486328125e+02, 2.804435119628906e+02, 2.797223815917969e+02, 2.790178527832031e+02]
+zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447631835938e+02, 2.883150939941406e+02, 2.887251281738281e+02, 2.884546813964844e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377319335938e+02, 2.860204162597656e+02, 2.853323974609375e+02, 2.849344787597656e+02, 2.845062255859375e+02, 2.840436706542969e+02, 2.836084899902344e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.8287841796875e+02, 2.827990112304688e+02, 2.8266845703125e+02, 2.83044189453125e+02, 2.844673156738281e+02, 2.854508361816406e+02, 2.863420104980469e+02, 2.871799621582031e+02, 2.877545776367188e+02, 2.878578491210938e+02, 2.876748046875e+02, 2.87080322265625e+02, 2.856826171875e+02, 2.845762939453125e+02, 2.842326965332031e+02, 2.840108337402344e+02, 2.836388244628906e+02, 2.832453918457031e+02, 2.829547424316406e+02, 2.826981201171875e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817339477539062e+02, 2.817628479003906e+02, 2.832455749511719e+02, 2.840979309082031e+02, 2.849918518066406e+02, 2.856445922851562e+02, 2.860323791503906e+02, 2.864435424804688e+02, 2.86423583984375e+02, 2.856654968261719e+02, 2.842790832519531e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338745117188e+02, 2.816460876464844e+02, 2.813206481933594e+02, 2.810277099609375e+02, 2.807495727539062e+02, 2.804705200195312e+02, 2.802008666992188e+02, 2.7997705078125e+02, 2.80275146484375e+02, 2.819242248535156e+02, 2.829451904296875e+02, 2.838786315917969e+02, 2.846118774414062e+02, 2.851133117675781e+02, 2.854571228027344e+02, 2.853258972167969e+02, 2.84503662109375e+02, 2.82911376953125e+02, 2.814379272460938e+02, 2.808878479003906e+02, 2.804505615234375e+02, 2.798975524902344e+02, 2.793079528808594e+02, 2.788959045410156e+02, 2.785968933105469e+02, 2.781374206542969e+02, 2.773388061523438e+02, 2.764811096191406e+02, 2.763219299316406e+02, 2.7865087890625e+02, 2.813305969238281e+02, 2.835545959472656e+02, 2.850451965332031e+02, 2.864626159667969e+02, 2.877089233398438e+02, 2.872904968261719e+02, 2.858002319335938e+02, 2.840639343261719e+02, 2.823191223144531e+02, 2.813234558105469e+02, 2.804435119628906e+02, 2.79722412109375e+02, 2.79017822265625e+02]
 equEle.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.999999999999757e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 equEle2.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 4.999999999999757e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_Schedule_EquipmentScheduleOutputVariable.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_Schedule_EquipmentScheduleOutputVariable.txt
index b9d1aae44a2..f2337c33511 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_Schedule_EquipmentScheduleOutputVariable.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_Schedule_EquipmentScheduleOutputVariable.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-zon.TAir=[2.931499938964844e+02, 2.89828125e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860071716308594e+02, 2.856974487304688e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.843174133300781e+02, 2.847691345214844e+02, 2.853383178710938e+02, 2.861144409179688e+02, 2.868779907226562e+02, 2.876759643554688e+02, 2.883543701171875e+02, 2.889505920410156e+02, 2.893346252441406e+02, 2.896292724609375e+02, 2.896629943847656e+02, 2.895556030273438e+02, 2.895119018554688e+02, 2.894383544921875e+02, 2.894071655273438e+02, 2.89351318359375e+02, 2.891918334960938e+02, 2.889115600585938e+02, 2.886018981933594e+02, 2.882835693359375e+02, 2.879609680175781e+02, 2.877027282714844e+02, 2.874327087402344e+02, 2.871662292480469e+02, 2.868968200683594e+02, 2.865736389160156e+02, 2.859407653808594e+02, 2.857648010253906e+02, 2.855425720214844e+02, 2.853353576660156e+02, 2.851476745605469e+02, 2.849638977050781e+02, 2.847425231933594e+02, 2.845181579589844e+02, 2.843291015625e+02, 2.841505126953125e+02, 2.842961120605469e+02, 2.8401904296875e+02, 2.83877685546875e+02, 2.837948913574219e+02, 2.83657470703125e+02, 2.834947509765625e+02, 2.833717346191406e+02, 2.832816772460938e+02, 2.832251586914062e+02, 2.832209777832031e+02, 2.831896057128906e+02, 2.831092834472656e+02, 2.828598937988281e+02, 2.827691040039062e+02, 2.835169677734375e+02, 2.843935241699219e+02, 2.847550659179688e+02, 2.851058959960938e+02, 2.854756469726562e+02, 2.858882751464844e+02, 2.86236083984375e+02, 2.865664672851562e+02, 2.869273986816406e+02, 2.872646484375e+02, 2.8756591796875e+02, 2.876624145507812e+02, 2.879025268554688e+02, 2.882265625e+02, 2.882285766601562e+02, 2.882098083496094e+02, 2.881530456542969e+02, 2.880580749511719e+02, 2.879842529296875e+02, 2.876778259277344e+02, 2.874072570800781e+02, 2.866112976074219e+02, 2.861291198730469e+02, 2.858358764648438e+02, 2.856979370117188e+02, 2.855333251953125e+02, 2.848576965332031e+02, 2.847196350097656e+02, 2.845915832519531e+02, 2.844851684570312e+02, 2.843970947265625e+02, 2.843135986328125e+02, 2.841295776367188e+02, 2.838990173339844e+02, 2.837464294433594e+02, 2.835978393554688e+02]
+zon.TAir=[2.931499938964844e+02, 2.898281555175781e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860072021484375e+02, 2.856974792480469e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.843174133300781e+02, 2.847691345214844e+02, 2.853382873535156e+02, 2.861144409179688e+02, 2.868779907226562e+02, 2.876759643554688e+02, 2.883543701171875e+02, 2.889505920410156e+02, 2.893346557617188e+02, 2.896293029785156e+02, 2.896630249023438e+02, 2.895556030273438e+02, 2.895119323730469e+02, 2.894383850097656e+02, 2.894071960449219e+02, 2.89351318359375e+02, 2.891918640136719e+02, 2.889115600585938e+02, 2.886019287109375e+02, 2.882835998535156e+02, 2.879609985351562e+02, 2.877027282714844e+02, 2.874327087402344e+02, 2.87166259765625e+02, 2.868968505859375e+02, 2.865736999511719e+02, 2.859407653808594e+02, 2.85764892578125e+02, 2.855425720214844e+02, 2.853354187011719e+02, 2.85147705078125e+02, 2.849639282226562e+02, 2.847425231933594e+02, 2.845181579589844e+02, 2.843291320800781e+02, 2.841505126953125e+02, 2.842961120605469e+02, 2.840189819335938e+02, 2.838777160644531e+02, 2.837948913574219e+02, 2.83657470703125e+02, 2.834947204589844e+02, 2.833717651367188e+02, 2.832817077636719e+02, 2.832251892089844e+02, 2.832210083007812e+02, 2.831896057128906e+02, 2.831093139648438e+02, 2.828599243164062e+02, 2.827691345214844e+02, 2.835169372558594e+02, 2.843935241699219e+02, 2.847550659179688e+02, 2.851058959960938e+02, 2.854756469726562e+02, 2.858882751464844e+02, 2.86236083984375e+02, 2.865664978027344e+02, 2.869273986816406e+02, 2.872646484375e+02, 2.8756591796875e+02, 2.876623840332031e+02, 2.879025268554688e+02, 2.882265319824219e+02, 2.882285461425781e+02, 2.882098083496094e+02, 2.881530151367188e+02, 2.8805810546875e+02, 2.879842529296875e+02, 2.876778259277344e+02, 2.874072570800781e+02, 2.866112976074219e+02, 2.861291198730469e+02, 2.858359069824219e+02, 2.856979675292969e+02, 2.855333557128906e+02, 2.848577270507812e+02, 2.847196655273438e+02, 2.845916137695312e+02, 2.844851989746094e+02, 2.843971252441406e+02, 2.843135986328125e+02, 2.841295776367188e+02, 2.838990173339844e+02, 2.837464599609375e+02, 2.835978698730469e+02]
 schInt.u=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 equEle.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 5e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_Infiltration.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_Infiltration.txt
index bc767c8de46..f0418cddac6 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_Infiltration.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_Infiltration.txt
@@ -1,4 +1,4 @@
-last-generated=2022-12-06
+last-generated=2024-03-22
 statistics-initialization=
 {
   "nonlinear": "1, 1",
@@ -8,10 +8,10 @@ statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0",
   "nonlinear": "1, 1",
-  "number of continuous time states": "84",
+  "number of continuous time states": "86",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-defInf.attFlo.heaPorFro.T=[2.931499938964844e+02, 2.923511657714844e+02, 2.917656555175781e+02, 2.91218017578125e+02, 2.906691284179688e+02, 2.901038818359375e+02, 2.895399780273438e+02, 2.889964904785156e+02, 2.884769897460938e+02, 2.87975341796875e+02, 2.874934387207031e+02, 2.870249328613281e+02, 2.865715026855469e+02, 2.861307678222656e+02, 2.85700927734375e+02, 2.852800598144531e+02, 2.84865234375e+02, 2.844590759277344e+02, 2.840593872070312e+02, 2.83670654296875e+02, 2.83291015625e+02, 2.829217224121094e+02, 2.82561767578125e+02, 2.822090148925781e+02, 2.818639831542969e+02, 2.815244140625e+02, 2.811928405761719e+02, 2.808664245605469e+02, 2.805467834472656e+02, 2.802326965332031e+02, 2.799246215820312e+02, 2.79623046875e+02, 2.793321228027344e+02, 2.790709533691406e+02, 2.788416748046875e+02, 2.786564331054688e+02, 2.785018615722656e+02, 2.783783264160156e+02, 2.782740783691406e+02, 2.781866760253906e+02, 2.781184692382812e+02, 2.780633239746094e+02, 2.780215454101562e+02, 2.779882202148438e+02, 2.779735717773438e+02, 2.779741821289062e+02, 2.779873962402344e+02, 2.780089721679688e+02, 2.780363464355469e+02, 2.780680541992188e+02, 2.780936584472656e+02, 2.781047668457031e+02, 2.781050415039062e+02, 2.780941162109375e+02, 2.780798034667969e+02, 2.780673828125e+02, 2.780571899414062e+02, 2.780491027832031e+02, 2.780425415039062e+02, 2.780360107421875e+02, 2.7802587890625e+02, 2.780102844238281e+02, 2.779851989746094e+02, 2.779496765136719e+02, 2.779040832519531e+02, 2.778475036621094e+02, 2.777831115722656e+02, 2.777104797363281e+02, 2.776324462890625e+02, 2.775423889160156e+02, 2.774395141601562e+02, 2.773284912109375e+02, 2.772149353027344e+02, 2.771012573242188e+02, 2.769879455566406e+02, 2.768753662109375e+02, 2.767633972167969e+02, 2.766548461914062e+02, 2.765523986816406e+02, 2.764546203613281e+02, 2.763605041503906e+02, 2.76271484375e+02, 2.761883239746094e+02, 2.761126708984375e+02, 2.760423583984375e+02, 2.759749450683594e+02, 2.759041748046875e+02, 2.758276977539062e+02, 2.757445983886719e+02, 2.756587829589844e+02, 2.755795288085938e+02, 2.755093383789062e+02, 2.754493103027344e+02, 2.753932495117188e+02, 2.753340148925781e+02, 2.752684936523438e+02, 2.751959228515625e+02, 2.751177368164062e+02, 2.750375671386719e+02, 2.749573059082031e+02, 2.748776245117188e+02]
-higInf.attFlo.heaPorFro.T=[2.931499938964844e+02, 2.919859924316406e+02, 2.910997619628906e+02, 2.902529296875e+02, 2.894083862304688e+02, 2.885452880859375e+02, 2.877220153808594e+02, 2.869503479003906e+02, 2.862257690429688e+02, 2.855322875976562e+02, 2.848755493164062e+02, 2.842431945800781e+02, 2.836388549804688e+02, 2.830579833984375e+02, 2.824966125488281e+02, 2.819532165527344e+02, 2.814234924316406e+02, 2.809127807617188e+02, 2.804162292480469e+02, 2.799417114257812e+02, 2.794838256835938e+02, 2.790444946289062e+02, 2.786210327148438e+02, 2.782091674804688e+02, 2.778106689453125e+02, 2.774217224121094e+02, 2.770469055175781e+02, 2.766812133789062e+02, 2.763277282714844e+02, 2.759840698242188e+02, 2.75651123046875e+02, 2.753312683105469e+02, 2.750263977050781e+02, 2.747524719238281e+02, 2.745089416503906e+02, 2.7431005859375e+02, 2.741426696777344e+02, 2.740081176757812e+02, 2.738960876464844e+02, 2.738069458007812e+02, 2.737437744140625e+02, 2.736983337402344e+02, 2.736724548339844e+02, 2.736580505371094e+02, 2.73664306640625e+02, 2.736866760253906e+02, 2.7372314453125e+02, 2.737699279785156e+02, 2.738246154785156e+02, 2.738863220214844e+02, 2.739445495605469e+02, 2.739927978515625e+02, 2.740322875976562e+02, 2.740634460449219e+02, 2.740932312011719e+02, 2.7412646484375e+02, 2.741630554199219e+02, 2.742025146484375e+02, 2.742444763183594e+02, 2.742871704101562e+02, 2.743248596191406e+02, 2.743555603027344e+02, 2.743761901855469e+02, 2.743863830566406e+02, 2.7438671875e+02, 2.743763427734375e+02, 2.74358642578125e+02, 2.743330688476562e+02, 2.743020935058594e+02, 2.742595520019531e+02, 2.742049255371094e+02, 2.74142333984375e+02, 2.740763244628906e+02, 2.7400830078125e+02, 2.739388732910156e+02, 2.738690185546875e+02, 2.737982482910156e+02, 2.7373046875e+02, 2.736683044433594e+02, 2.736102600097656e+02, 2.735555725097656e+02, 2.735091552734375e+02, 2.734710998535156e+02, 2.734424133300781e+02, 2.734199523925781e+02, 2.733972778320312e+02, 2.733678894042969e+02, 2.73329833984375e+02, 2.73282958984375e+02, 2.732342224121094e+02, 2.731947021484375e+02, 2.731657104492188e+02, 2.731478271484375e+02, 2.731328125e+02, 2.731119689941406e+02, 2.730835266113281e+02, 2.730471496582031e+02, 2.730050354003906e+02, 2.729617919921875e+02, 2.729187927246094e+02, 2.728764343261719e+02]
+defInf.attFlo.heaPorFro.T=[2.931499938964844e+02, 2.923503723144531e+02, 2.917640991210938e+02, 2.912159423828125e+02, 2.906666564941406e+02, 2.901010437011719e+02, 2.895368041992188e+02, 2.889930114746094e+02, 2.884731750488281e+02, 2.879712219238281e+02, 2.87489013671875e+02, 2.870202026367188e+02, 2.865664978027344e+02, 2.8612548828125e+02, 2.856954040527344e+02, 2.852742919921875e+02, 2.848592834472656e+02, 2.844529418945312e+02, 2.840531311035156e+02, 2.836642456054688e+02, 2.832845153808594e+02, 2.829151611328125e+02, 2.825551147460938e+02, 2.822023315429688e+02, 2.818572998046875e+02, 2.815177307128906e+02, 2.811862182617188e+02, 2.8085986328125e+02, 2.805403137207031e+02, 2.802263488769531e+02, 2.799184265136719e+02, 2.796170654296875e+02, 2.793263549804688e+02, 2.790653991699219e+02, 2.788363037109375e+02, 2.786513977050781e+02, 2.784971008300781e+02, 2.783740844726562e+02, 2.782701721191406e+02, 2.781830139160156e+02, 2.781151733398438e+02, 2.780604248046875e+02, 2.780191040039062e+02, 2.779861755371094e+02, 2.779720458984375e+02, 2.7797314453125e+02, 2.779869079589844e+02, 2.780089416503906e+02, 2.780369262695312e+02, 2.780691833496094e+02, 2.780953979492188e+02, 2.781071166992188e+02, 2.781080322265625e+02, 2.780976867675781e+02, 2.78083984375e+02, 2.780722045898438e+02, 2.780626525878906e+02, 2.780552062988281e+02, 2.780492553710938e+02, 2.780433349609375e+02, 2.780338439941406e+02, 2.780188293457031e+02, 2.779943542480469e+02, 2.779593811035156e+02, 2.779142761230469e+02, 2.778583374023438e+02, 2.7779443359375e+02, 2.77722412109375e+02, 2.776448669433594e+02, 2.775552062988281e+02, 2.774527893066406e+02, 2.773420104980469e+02, 2.772288513183594e+02, 2.771156921386719e+02, 2.770027770996094e+02, 2.768905944824219e+02, 2.767789611816406e+02, 2.766707458496094e+02, 2.765686340332031e+02, 2.7647119140625e+02, 2.763774108886719e+02, 2.762886657714844e+02, 2.762057495117188e+02, 2.761303405761719e+02, 2.760602722167969e+02, 2.759931335449219e+02, 2.75922607421875e+02, 2.758463439941406e+02, 2.75763427734375e+02, 2.756777954101562e+02, 2.755986633300781e+02, 2.755286254882812e+02, 2.754687805175781e+02, 2.754128723144531e+02, 2.753537902832031e+02, 2.752883605957031e+02, 2.752158508300781e+02, 2.751377258300781e+02, 2.750577087402344e+02, 2.749775390625e+02, 2.7489794921875e+02]
+higInf.attFlo.heaPorFro.T=[2.931499938964844e+02, 2.919854125976562e+02, 2.910985107421875e+02, 2.902510681152344e+02, 2.894062194824219e+02, 2.885428466796875e+02, 2.877193603515625e+02, 2.869474792480469e+02, 2.862226867675781e+02, 2.855289916992188e+02, 2.848720703125e+02, 2.842395324707031e+02, 2.836350402832031e+02, 2.83053955078125e+02, 2.82492431640625e+02, 2.819489440917969e+02, 2.814190979003906e+02, 2.809082946777344e+02, 2.804116821289062e+02, 2.799371643066406e+02, 2.79479248046875e+02, 2.790399475097656e+02, 2.786165161132812e+02, 2.782046813964844e+02, 2.778063049316406e+02, 2.774174499511719e+02, 2.770427551269531e+02, 2.766772155761719e+02, 2.763239135742188e+02, 2.759804382324219e+02, 2.75647705078125e+02, 2.753280944824219e+02, 2.750235595703125e+02, 2.747499084472656e+02, 2.74506591796875e+02, 2.7430810546875e+02, 2.741410217285156e+02, 2.740070495605469e+02, 2.738954162597656e+02, 2.738065490722656e+02, 2.737438049316406e+02, 2.736987609863281e+02, 2.736734008789062e+02, 2.736593933105469e+02, 2.736661682128906e+02, 2.736889953613281e+02, 2.737260131835938e+02, 2.737732238769531e+02, 2.738285217285156e+02, 2.738907775878906e+02, 2.739496154785156e+02, 2.739984436035156e+02, 2.740385437011719e+02, 2.740702819824219e+02, 2.741007080078125e+02, 2.741345825195312e+02, 2.741718139648438e+02, 2.742118835449219e+02, 2.742544555664062e+02, 2.742977600097656e+02, 2.743360595703125e+02, 2.743673400878906e+02, 2.743885192871094e+02, 2.743992614746094e+02, 2.744000244140625e+02, 2.743902893066406e+02, 2.743731079101562e+02, 2.743480834960938e+02, 2.74317626953125e+02, 2.742754516601562e+02, 2.7422119140625e+02, 2.741588745117188e+02, 2.740932312011719e+02, 2.740256652832031e+02, 2.739566345214844e+02, 2.738870849609375e+02, 2.738166198730469e+02, 2.737491149902344e+02, 2.736872253417969e+02, 2.736294555664062e+02, 2.735750732421875e+02, 2.735288696289062e+02, 2.734910278320312e+02, 2.734625244140625e+02, 2.734402770996094e+02, 2.734178466796875e+02, 2.733886413574219e+02, 2.733507385253906e+02, 2.733040466308594e+02, 2.732554016113281e+02, 2.732160034179688e+02, 2.731871032714844e+02, 2.731693725585938e+02, 2.731544494628906e+02, 2.731337280273438e+02, 2.731053161621094e+02, 2.730689086914062e+02, 2.730268249511719e+02, 2.729837036132812e+02, 2.729407958984375e+02, 2.728984680175781e+02]
 defInf.bou.weaBus.TDryBul=[2.609500122070312e+02, 2.608970947265625e+02, 2.608676452636719e+02, 2.608753967285156e+02, 2.609342651367188e+02, 2.610378723144531e+02, 2.61153564453125e+02, 2.612774658203125e+02, 2.614064331054688e+02, 2.615419921875e+02, 2.616917419433594e+02, 2.618442077636719e+02, 2.619866027832031e+02, 2.62093017578125e+02, 2.621011047363281e+02, 2.620587158203125e+02, 2.620299682617188e+02, 2.620775451660156e+02, 2.62211181640625e+02, 2.623743591308594e+02, 2.625067138671875e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.625875549316406e+02, 2.627120666503906e+02, 2.628901062011719e+02, 2.630865173339844e+02, 2.632776489257812e+02, 2.634906005859375e+02, 2.637460632324219e+02, 2.640627746582031e+02, 2.6446923828125e+02, 2.650023803710938e+02, 2.655892028808594e+02, 2.661426086425781e+02, 2.665859985351562e+02, 2.669939880371094e+02, 2.674020080566406e+02, 2.678099975585938e+02, 2.682179870605469e+02, 2.686260070800781e+02, 2.690339965820312e+02, 2.694419860839844e+02, 2.698500061035156e+02, 2.701971740722656e+02, 2.704558715820312e+02, 2.706758728027344e+02, 2.709069213867188e+02, 2.712052001953125e+02, 2.715532531738281e+02, 2.718607788085938e+02, 2.720364685058594e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.720480651855469e+02, 2.719675598144531e+02, 2.718063354492188e+02, 2.716164855957031e+02, 2.714500122070312e+02, 2.713160400390625e+02, 2.711899108886719e+02, 2.71072998046875e+02, 2.709666137695312e+02, 2.710076599121094e+02, 2.71330810546875e+02, 2.717365112304688e+02, 2.720188903808594e+02, 2.720211181640625e+02, 2.718473815917969e+02, 2.716227111816406e+02, 2.714658508300781e+02, 2.714859924316406e+02, 2.716591491699219e+02, 2.718775329589844e+02, 2.720336303710938e+02, 2.7202783203125e+02, 2.719024353027344e+02, 2.717281494140625e+02, 2.715556945800781e+02, 2.714362182617188e+02, 2.714127502441406e+02, 2.714474182128906e+02, 2.714799194335938e+02, 2.714500122070312e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_InternalGain.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_InternalGain.txt
index a20b973db31..62f5bc59246 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_InternalGain.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_InternalGain.txt
@@ -1,25 +1,25 @@
-last-generated=2024-03-14
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0",
   "nonlinear": " ",
-  "number of continuous time states": "12",
+  "number of continuous time states": "16",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-noGai.bui.zon.TAir=[2.931499938964844e+02, 2.773311767578125e+02, 2.716109924316406e+02, 2.703233642578125e+02, 2.696348266601562e+02, 2.691604614257812e+02, 2.688211364746094e+02, 2.684726257324219e+02, 2.680582275390625e+02, 2.67822265625e+02, 2.677020263671875e+02, 2.674762573242188e+02, 2.672464599609375e+02, 2.670359497070312e+02, 2.668434143066406e+02, 2.666835021972656e+02, 2.668314514160156e+02, 2.672297973632812e+02, 2.677493286132812e+02, 2.684027099609375e+02, 2.693031311035156e+02, 2.701209716796875e+02, 2.707865295410156e+02, 2.713845520019531e+02, 2.719629211425781e+02, 2.724485778808594e+02, 2.727777709960938e+02, 2.730675354003906e+02, 2.734486999511719e+02, 2.737904968261719e+02, 2.738253173828125e+02, 2.737822570800781e+02, 2.736921997070312e+02, 2.736043701171875e+02, 2.735042114257812e+02, 2.734094543457031e+02, 2.732985229492188e+02, 2.730086669921875e+02, 2.7273681640625e+02, 2.725042114257812e+02, 2.723592529296875e+02, 2.72783935546875e+02, 2.729906616210938e+02, 2.727059631347656e+02, 2.725504455566406e+02, 2.727672424316406e+02, 2.728795471191406e+02, 2.726619873046875e+02, 2.724187927246094e+02, 2.723772277832031e+02, 2.723557739257812e+02, 2.717982482910156e+02, 2.709447937011719e+02, 2.710758972167969e+02, 2.714861450195312e+02, 2.713582458496094e+02, 2.711170654296875e+02, 2.711100463867188e+02, 2.712589721679688e+02, 2.716565551757812e+02, 2.723458862304688e+02, 2.726007385253906e+02, 2.725592041015625e+02, 2.72570068359375e+02, 2.727826538085938e+02, 2.732403869628906e+02, 2.73196533203125e+02, 2.736151428222656e+02, 2.738804626464844e+02, 2.741920471191406e+02, 2.745101623535156e+02, 2.748074645996094e+02, 2.753419799804688e+02, 2.757840576171875e+02, 2.758839416503906e+02, 2.759727478027344e+02, 2.75995849609375e+02, 2.760623168945312e+02, 2.758409729003906e+02, 2.751488952636719e+02, 2.747568359375e+02, 2.745216369628906e+02, 2.746436462402344e+02, 2.750800170898438e+02, 2.751364135742188e+02, 2.750646362304688e+02, 2.745838623046875e+02, 2.739902648925781e+02, 2.737085876464844e+02, 2.741412353515625e+02, 2.744105529785156e+02, 2.745567016601562e+02, 2.747368469238281e+02, 2.749439697265625e+02, 2.751614074707031e+02, 2.753683471679688e+02, 2.755326538085938e+02, 2.746981811523438e+02, 2.73880126953125e+02, 2.738482360839844e+02, 2.738113098144531e+02]
-radOnl.bui.zon.TAir=[2.931499938964844e+02, 2.7698095703125e+02, 2.717461547851562e+02, 2.705364685058594e+02, 2.698775939941406e+02, 2.694246520996094e+02, 2.691025695800781e+02, 2.687680358886719e+02, 2.683664855957031e+02, 2.681416625976562e+02, 2.680306396484375e+02, 2.678138732910156e+02, 2.6759228515625e+02, 2.673890075683594e+02, 2.672029724121094e+02, 2.670488891601562e+02, 2.672046813964844e+02, 2.676101684570312e+02, 2.681372680664062e+02, 2.687963562011719e+02, 2.696995849609375e+02, 2.705198059082031e+02, 2.711882629394531e+02, 2.717879943847656e+02, 2.723671875e+02, 2.728515625e+02, 2.731793518066406e+02, 2.734708557128906e+02, 2.738514404296875e+02, 2.7419287109375e+02, 2.74232421875e+02, 2.741919555664062e+02, 2.741028442382812e+02, 2.740164184570312e+02, 2.739167175292969e+02, 2.738231811523438e+02, 2.737142944335938e+02, 2.734302368164062e+02, 2.73162841796875e+02, 2.729326782226562e+02, 2.727901000976562e+02, 2.732070922851562e+02, 2.734065551757812e+02, 2.731319274902344e+02, 2.729838562011719e+02, 2.7319482421875e+02, 2.73302978515625e+02, 2.730931396484375e+02, 2.728570251464844e+02, 2.728165588378906e+02, 2.727940979003906e+02, 2.722456665039062e+02, 2.714122924804688e+02, 2.715378723144531e+02, 2.719346313476562e+02, 2.718080444335938e+02, 2.715728454589844e+02, 2.715654907226562e+02, 2.717106018066406e+02, 2.720995178222656e+02, 2.727652893066406e+02, 2.730071716308594e+02, 2.729785461425781e+02, 2.729960327148438e+02, 2.732029724121094e+02, 2.7365673828125e+02, 2.736177673339844e+02, 2.740504455566406e+02, 2.743046569824219e+02, 2.746257019042969e+02, 2.749509887695312e+02, 2.752503051757812e+02, 2.757764587402344e+02, 2.762090454101562e+02, 2.763279724121094e+02, 2.764286499023438e+02, 2.76464599609375e+02, 2.765359191894531e+02, 2.763217468261719e+02, 2.756511535644531e+02, 2.752641906738281e+02, 2.750274963378906e+02, 2.751407775878906e+02, 2.755596313476562e+02, 2.756051330566406e+02, 2.755292663574219e+02, 2.750570068359375e+02, 2.744767761230469e+02, 2.74198486328125e+02, 2.746123046875e+02, 2.748657836914062e+02, 2.750061340332031e+02, 2.751788330078125e+02, 2.753753356933594e+02, 2.755802917480469e+02, 2.757729187011719e+02, 2.759227905273438e+02, 2.751553039550781e+02, 2.743846130371094e+02, 2.743440551757812e+02, 2.74301025390625e+02]
-conOnl.bui.zon.TAir=[2.931499938964844e+02, 2.775589904785156e+02, 2.719854736328125e+02, 2.707306823730469e+02, 2.700592041015625e+02, 2.69597900390625e+02, 2.69269287109375e+02, 2.689292297363281e+02, 2.685222473144531e+02, 2.682933044433594e+02, 2.681793518066406e+02, 2.679590148925781e+02, 2.677340087890625e+02, 2.675277404785156e+02, 2.673390502929688e+02, 2.671827087402344e+02, 2.673328552246094e+02, 2.677334289550781e+02, 2.682550964355469e+02, 2.689107360839844e+02, 2.698136291503906e+02, 2.706339416503906e+02, 2.713015441894531e+02, 2.719017028808594e+02, 2.724822387695312e+02, 2.729704895019531e+02, 2.733021240234375e+02, 2.735933837890625e+02, 2.739767456054688e+02, 2.743206481933594e+02, 2.743565368652344e+02, 2.743150939941406e+02, 2.742270812988281e+02, 2.741410522460938e+02, 2.740431213378906e+02, 2.739494018554688e+02, 2.738396606445312e+02, 2.735505065917969e+02, 2.732790222167969e+02, 2.730467834472656e+02, 2.729029235839844e+02, 2.733291931152344e+02, 2.735376586914062e+02, 2.732531127929688e+02, 2.730981140136719e+02, 2.733161010742188e+02, 2.734294128417969e+02, 2.732113952636719e+02, 2.729678649902344e+02, 2.729269104003906e+02, 2.729063110351562e+02, 2.723482971191406e+02, 2.714932250976562e+02, 2.716258239746094e+02, 2.720382690429688e+02, 2.71910888671875e+02, 2.716697387695312e+02, 2.7166357421875e+02, 2.718136901855469e+02, 2.722130126953125e+02, 2.729059143066406e+02, 2.731637878417969e+02, 2.731207580566406e+02, 2.731313171386719e+02, 2.733455810546875e+02, 2.738047180175781e+02, 2.737609252929688e+02, 2.741780090332031e+02, 2.744462890625e+02, 2.747564697265625e+02, 2.750729064941406e+02, 2.753701782226562e+02, 2.759063415527344e+02, 2.763508605957031e+02, 2.764475708007812e+02, 2.765347900390625e+02, 2.765565795898438e+02, 2.76623046875e+02, 2.764006652832031e+02, 2.7570556640625e+02, 2.753131713867188e+02, 2.750787963867188e+02, 2.752023620605469e+02, 2.756417236328125e+02, 2.756989135742188e+02, 2.756270446777344e+02, 2.751456909179688e+02, 2.745513610839844e+02, 2.742706298828125e+02, 2.747049255371094e+02, 2.749761352539062e+02, 2.751233825683594e+02, 2.753048400878906e+02, 2.755138244628906e+02, 2.757340393066406e+02, 2.759461364746094e+02, 2.761096496582031e+02, 2.752695922851562e+02, 2.744430541992188e+02, 2.744117736816406e+02, 2.743755187988281e+02]
-latOnl.bui.zon.TAir=[2.931499938964844e+02, 2.773355712890625e+02, 2.716210021972656e+02, 2.703346252441406e+02, 2.696466674804688e+02, 2.691727294921875e+02, 2.68833740234375e+02, 2.684855346679688e+02, 2.680714111328125e+02, 2.67835693359375e+02, 2.677156372070312e+02, 2.674900512695312e+02, 2.672604370117188e+02, 2.670500793457031e+02, 2.668576965332031e+02, 2.666979064941406e+02, 2.668458557128906e+02, 2.672442321777344e+02, 2.677637634277344e+02, 2.684171447753906e+02, 2.693174743652344e+02, 2.701353149414062e+02, 2.708008117675781e+02, 2.713988037109375e+02, 2.719771423339844e+02, 2.724627990722656e+02, 2.727919921875e+02, 2.730817260742188e+02, 2.73462890625e+02, 2.738047180175781e+02, 2.738395385742188e+02, 2.737965393066406e+02, 2.737065124511719e+02, 2.736187438964844e+02, 2.735186767578125e+02, 2.734239501953125e+02, 2.733130493164062e+02, 2.730232543945312e+02, 2.727514343261719e+02, 2.725188598632812e+02, 2.723739929199219e+02, 2.727986450195312e+02, 2.730054016113281e+02, 2.72720703125e+02, 2.725652465820312e+02, 2.727820434570312e+02, 2.728943481445312e+02, 2.726768188476562e+02, 2.724336242675781e+02, 2.7239208984375e+02, 2.723706665039062e+02, 2.71813232421875e+02, 2.709598388671875e+02, 2.710909729003906e+02, 2.71501220703125e+02, 2.713733825683594e+02, 2.711322021484375e+02, 2.711252136230469e+02, 2.712741394042969e+02, 2.716717224121094e+02, 2.723610534667969e+02, 2.726159362792969e+02, 2.725743713378906e+02, 2.725852355957031e+02, 2.727978515625e+02, 2.732555236816406e+02, 2.73211669921875e+02, 2.736301879882812e+02, 2.738955383300781e+02, 2.742070007324219e+02, 2.745250549316406e+02, 2.748222961425781e+02, 2.753567504882812e+02, 2.757987976074219e+02, 2.758986206054688e+02, 2.759873657226562e+02, 2.760104370117188e+02, 2.76076904296875e+02, 2.758555603027344e+02, 2.751634826660156e+02, 2.747715148925781e+02, 2.745363464355469e+02, 2.746583862304688e+02, 2.750947570800781e+02, 2.751511840820312e+02, 2.750794067382812e+02, 2.745986938476562e+02, 2.740051574707031e+02, 2.737235412597656e+02, 2.741561889648438e+02, 2.744255065917969e+02, 2.745716552734375e+02, 2.747518005371094e+02, 2.749589233398438e+02, 2.751763916015625e+02, 2.753833923339844e+02, 2.755477294921875e+02, 2.747131042480469e+02, 2.738950500488281e+02, 2.738631896972656e+02, 2.738262939453125e+02]
-noGai.bui.zon.TRad=[2.928583374023438e+02, 2.844588012695312e+02, 2.826945495605469e+02, 2.805917663574219e+02, 2.789975891113281e+02, 2.777726745605469e+02, 2.768009338378906e+02, 2.759667358398438e+02, 2.751984252929688e+02, 2.7475390625e+02, 2.742034301757812e+02, 2.737086486816406e+02, 2.7323583984375e+02, 2.727981262207031e+02, 2.723934631347656e+02, 2.72025390625e+02, 2.721317749023438e+02, 2.724497680664062e+02, 2.730707702636719e+02, 2.737132568359375e+02, 2.744361267089844e+02, 2.751137390136719e+02, 2.756664123535156e+02, 2.760781555175781e+02, 2.763791198730469e+02, 2.76449951171875e+02, 2.764903564453125e+02, 2.765952453613281e+02, 2.766563720703125e+02, 2.767844848632812e+02, 2.768404846191406e+02, 2.767230834960938e+02, 2.764783020019531e+02, 2.762391662597656e+02, 2.760591125488281e+02, 2.758028259277344e+02, 2.756142272949219e+02, 2.753970947265625e+02, 2.751598510742188e+02, 2.74932373046875e+02, 2.747413635253906e+02, 2.747142639160156e+02, 2.747348937988281e+02, 2.746595458984375e+02, 2.745232543945312e+02, 2.744732971191406e+02, 2.744623413085938e+02, 2.743650207519531e+02, 2.742217102050781e+02, 2.741085205078125e+02, 2.7404931640625e+02, 2.739330749511719e+02, 2.735482177734375e+02, 2.733074035644531e+02, 2.732808227539062e+02, 2.732021484375e+02, 2.730547485351562e+02, 2.7295556640625e+02, 2.72914306640625e+02, 2.729411315917969e+02, 2.730979919433594e+02, 2.732564697265625e+02, 2.733267822265625e+02, 2.733618469238281e+02, 2.734325561523438e+02, 2.73636962890625e+02, 2.738297729492188e+02, 2.740042114257812e+02, 2.743594055175781e+02, 2.747687683105469e+02, 2.751870422363281e+02, 2.755253601074219e+02, 2.758934020996094e+02, 2.763245239257812e+02, 2.766825561523438e+02, 2.76878173828125e+02, 2.771223449707031e+02, 2.773209533691406e+02, 2.774500732421875e+02, 2.773109436035156e+02, 2.771022033691406e+02, 2.768318176269531e+02, 2.766183776855469e+02, 2.765639343261719e+02, 2.764800109863281e+02, 2.762991333007812e+02, 2.760606384277344e+02, 2.757508850097656e+02, 2.754244995117188e+02, 2.753277282714844e+02, 2.753145446777344e+02, 2.753059997558594e+02, 2.753140258789062e+02, 2.753477783203125e+02, 2.753979797363281e+02, 2.754552917480469e+02, 2.754966125488281e+02, 2.754104919433594e+02, 2.751278686523438e+02, 2.749788513183594e+02, 2.749010009765625e+02]
-radOnl.bui.zon.TRad=[2.928583374023438e+02, 2.849105529785156e+02, 2.830551147460938e+02, 2.81020751953125e+02, 2.794891662597656e+02, 2.783147888183594e+02, 2.773855285644531e+02, 2.76587890625e+02, 2.758510131835938e+02, 2.754257202148438e+02, 2.749023132324219e+02, 2.744320068359375e+02, 2.739814147949219e+02, 2.735638122558594e+02, 2.731775817871094e+02, 2.728270568847656e+02, 2.729473876953125e+02, 2.732738952636719e+02, 2.73905517578125e+02, 2.745570983886719e+02, 2.7528857421875e+02, 2.759750061035156e+02, 2.765365295410156e+02, 2.769572143554688e+02, 2.772678527832031e+02, 2.773460083007812e+02, 2.773982543945312e+02, 2.775135803222656e+02, 2.775870971679688e+02, 2.777280578613281e+02, 2.777944030761719e+02, 2.776877746582031e+02, 2.774549560546875e+02, 2.772283935546875e+02, 2.770579223632812e+02, 2.768172302246094e+02, 2.766417846679688e+02, 2.764339599609375e+02, 2.762021484375e+02, 2.75978271484375e+02, 2.757915954589844e+02, 2.757773132324219e+02, 2.758081970214844e+02, 2.757442321777344e+02, 2.75615478515625e+02, 2.755717468261719e+02, 2.75569580078125e+02, 2.754770812988281e+02, 2.753365478515625e+02, 2.752282104492188e+02, 2.751732482910156e+02, 2.750599060058594e+02, 2.746680297851562e+02, 2.744271545410156e+02, 2.744093017578125e+02, 2.743372802734375e+02, 2.741931457519531e+02, 2.740993347167969e+02, 2.740663757324219e+02, 2.741004638671875e+02, 2.742781066894531e+02, 2.744609069824219e+02, 2.7454248046875e+02, 2.745856323242188e+02, 2.746700134277344e+02, 2.748923034667969e+02, 2.750904235839844e+02, 2.752645263671875e+02, 2.756308288574219e+02, 2.7604052734375e+02, 2.764575805664062e+02, 2.767955627441406e+02, 2.771696472167969e+02, 2.776084899902344e+02, 2.779613952636719e+02, 2.781532592773438e+02, 2.783905639648438e+02, 2.78584716796875e+02, 2.787041320800781e+02, 2.785459289550781e+02, 2.783250427246094e+02, 2.780484008789062e+02, 2.778345336914062e+02, 2.777881164550781e+02, 2.777085876464844e+02, 2.775328979492188e+02, 2.772960205078125e+02, 2.769844970703125e+02, 2.766564025878906e+02, 2.765712585449219e+02, 2.765731506347656e+02, 2.765786437988281e+02, 2.765966491699219e+02, 2.766473693847656e+02, 2.767179260253906e+02, 2.768002624511719e+02, 2.76870849609375e+02, 2.767694091796875e+02, 2.764662780761719e+02, 2.763060913085938e+02, 2.7622412109375e+02]
-conOnl.bui.zon.TRad=[2.928583374023438e+02, 2.84637939453125e+02, 2.828837585449219e+02, 2.808161315917969e+02, 2.792500305175781e+02, 2.78047119140625e+02, 2.770934753417969e+02, 2.762748718261719e+02, 2.755197448730469e+02, 2.750830078125e+02, 2.745431213378906e+02, 2.740577697753906e+02, 2.735934143066406e+02, 2.731632385253906e+02, 2.72765380859375e+02, 2.724035339355469e+02, 2.725162963867188e+02, 2.728381652832031e+02, 2.734645080566406e+02, 2.741116638183594e+02, 2.748381652832031e+02, 2.755191040039062e+02, 2.760751037597656e+02, 2.764898071289062e+02, 2.767933044433594e+02, 2.768655395507812e+02, 2.76907958984375e+02, 2.770150756835938e+02, 2.77078125e+02, 2.772080383300781e+02, 2.772662353515625e+02, 2.7715087890625e+02, 2.769079895019531e+02, 2.766709899902344e+02, 2.764922790527344e+02, 2.762396850585938e+02, 2.760538024902344e+02, 2.758389282226562e+02, 2.756029052734375e+02, 2.753760986328125e+02, 2.751854553222656e+02, 2.751591796875e+02, 2.751803894042969e+02, 2.75107421875e+02, 2.749734191894531e+02, 2.749232788085938e+02, 2.749123229980469e+02, 2.748162231445312e+02, 2.746743774414062e+02, 2.745623779296875e+02, 2.745038757324219e+02, 2.743896179199219e+02, 2.740076904296875e+02, 2.737681274414062e+02, 2.737418823242188e+02, 2.736642456054688e+02, 2.735182800292969e+02, 2.734201965332031e+02, 2.733796997070312e+02, 2.734061584472656e+02, 2.735611267089844e+02, 2.737170715332031e+02, 2.737870788574219e+02, 2.738223571777344e+02, 2.738925170898438e+02, 2.740954895019531e+02, 2.742884521484375e+02, 2.744632263183594e+02, 2.748167419433594e+02, 2.752264404296875e+02, 2.756461181640625e+02, 2.759853210449219e+02, 2.7635302734375e+02, 2.76783447265625e+02, 2.771438598632812e+02, 2.773410949707031e+02, 2.775884399414062e+02, 2.777897338867188e+02, 2.779199829101562e+02, 2.777830200195312e+02, 2.775765686035156e+02, 2.773078918457031e+02, 2.770946655273438e+02, 2.770391845703125e+02, 2.769551696777344e+02, 2.767738952636719e+02, 2.765361022949219e+02, 2.762284240722656e+02, 2.759028015136719e+02, 2.758063049316406e+02, 2.757923889160156e+02, 2.75782958984375e+02, 2.757901916503906e+02, 2.758221130371094e+02, 2.7586962890625e+02, 2.759224548339844e+02, 2.759612121582031e+02, 2.758829956054688e+02, 2.756038208007812e+02, 2.754557495117188e+02, 2.753781127929688e+02]
-latOnl.bui.zon.TRad=[2.928583374023438e+02, 2.844639892578125e+02, 2.826997680664062e+02, 2.805979309082031e+02, 2.790045776367188e+02, 2.777803039550781e+02, 2.768091125488281e+02, 2.759753723144531e+02, 2.752074584960938e+02, 2.7476318359375e+02, 2.742130432128906e+02, 2.737185668945312e+02, 2.732460327148438e+02, 2.728085327148438e+02, 2.724040832519531e+02, 2.720362243652344e+02, 2.721427917480469e+02, 2.724609069824219e+02, 2.7308203125e+02, 2.737246398925781e+02, 2.744475402832031e+02, 2.751251831054688e+02, 2.756779174804688e+02, 2.760896606445312e+02, 2.763906555175781e+02, 2.764614868164062e+02, 2.765018920898438e+02, 2.766068115234375e+02, 2.766679382324219e+02, 2.767960815429688e+02, 2.768520812988281e+02, 2.767347412109375e+02, 2.764899597167969e+02, 2.762508850097656e+02, 2.760708312988281e+02, 2.758146362304688e+02, 2.756260986328125e+02, 2.754090270996094e+02, 2.751718444824219e+02, 2.749443969726562e+02, 2.747533874511719e+02, 2.74726318359375e+02, 2.747469482421875e+02, 2.746716613769531e+02, 2.745354309082031e+02, 2.744854736328125e+02, 2.744745178222656e+02, 2.743772277832031e+02, 2.742339782714844e+02, 2.741208190917969e+02, 2.740616455078125e+02, 2.739454650878906e+02, 2.735607299804688e+02, 2.733199768066406e+02, 2.732933959960938e+02, 2.732147521972656e+02, 2.730674133300781e+02, 2.729682922363281e+02, 2.729270324707031e+02, 2.729538269042969e+02, 2.731106262207031e+02, 2.7326904296875e+02, 2.733393249511719e+02, 2.733743591308594e+02, 2.73445068359375e+02, 2.736494140625e+02, 2.738422241210938e+02, 2.740166625976562e+02, 2.743717956542969e+02, 2.747811584472656e+02, 2.751994323730469e+02, 2.755377502441406e+02, 2.759057312011719e+02, 2.763368225097656e+02, 2.766948547363281e+02, 2.768905334472656e+02, 2.771347351074219e+02, 2.773334045410156e+02, 2.774625244140625e+02, 2.773234558105469e+02, 2.771147766113281e+02, 2.768444519042969e+02, 2.766310119628906e+02, 2.765765075683594e+02, 2.764926147460938e+02, 2.763117065429688e+02, 2.760732116699219e+02, 2.757635192871094e+02, 2.754372253417969e+02, 2.753404235839844e+02, 2.753272399902344e+02, 2.753186340332031e+02, 2.7532666015625e+02, 2.753603515625e+02, 2.754104919433594e+02, 2.754677124023438e+02, 2.755089111328125e+02, 2.754229125976562e+02, 2.751404724121094e+02, 2.749914855957031e+02, 2.749136657714844e+02]
-noGai.bui.zon.phi=[6.920281648635864e-01, 2.036810517311096e-01, 2.898201942443848e-01, 3.283909559249878e-01, 3.558623492717743e-01, 3.7977534532547e-01, 4.015040993690491e-01, 4.2001673579216e-01, 4.327856302261353e-01, 4.461892247200012e-01, 4.630818068981171e-01, 4.761196076869965e-01, 4.85672801733017e-01, 4.961572885513306e-01, 5.190706849098206e-01, 5.398673415184021e-01, 5.478512644767761e-01, 5.41878879070282e-01, 5.215301513671875e-01, 4.977319836616516e-01, 4.631098508834839e-01, 4.40134733915329e-01, 4.532929062843323e-01, 4.762746393680573e-01, 4.87481027841568e-01, 5.015851259231567e-01, 5.162221193313599e-01, 5.240710973739624e-01, 5.302332043647766e-01, 5.312849879264832e-01, 5.365118384361267e-01, 5.523368716239929e-01, 5.748662352561951e-01, 6.018373966217041e-01, 6.179794669151306e-01, 6.181705594062805e-01, 6.280043125152588e-01, 6.387878060340881e-01, 6.486760973930359e-01, 6.606326103210449e-01, 6.711527109146118e-01, 6.654968857765198e-01, 6.691490411758423e-01, 6.961856484413147e-01, 7.144483923912048e-01, 7.081679105758667e-01, 7.024731636047363e-01, 7.121663093566895e-01, 7.229906320571899e-01, 7.03271746635437e-01, 6.741169691085815e-01, 7.000576853752136e-01, 7.439725399017334e-01, 7.300251722335815e-01, 7.117053270339966e-01, 7.114513516426086e-01, 7.073644399642944e-01, 7.07564890384674e-01, 7.129844427108765e-01, 7.148897647857666e-01, 6.979463696479797e-01, 6.910303831100464e-01, 6.928752660751343e-01, 6.918548345565796e-01, 6.776159405708313e-01, 6.557018160820007e-01, 6.542569398880005e-01, 6.394339203834534e-01, 6.42483651638031e-01, 6.428520083427429e-01, 6.358668804168702e-01, 6.237340569496155e-01, 6.008155941963196e-01, 5.823666453361511e-01, 5.837593078613281e-01, 5.909803509712219e-01, 6.008988618850708e-01, 6.121340394020081e-01, 6.704962849617004e-01, 7.854266762733459e-01, 8.249561786651611e-01, 8.341177701950073e-01, 8.246393203735352e-01, 8.069214224815369e-01, 8.153360486030579e-01, 8.33328902721405e-01, 8.71928870677948e-01, 9.017583131790161e-01, 9.210159778594971e-01, 8.998658657073975e-01, 8.805761337280273e-01, 8.679447174072266e-01, 8.652628660202026e-01, 8.701326251029968e-01, 8.746315836906433e-01, 8.782745599746704e-01, 8.81180465221405e-01, 9.064832925796509e-01, 9.16775643825531e-01, 9.158568978309631e-01, 9.182142019271851e-01]
-radOnl.bui.zon.phi=[6.920281648635864e-01, 2.087643444538116e-01, 2.865777015686035e-01, 3.225628733634949e-01, 3.486413061618805e-01, 3.713677525520325e-01, 3.920185565948486e-01, 4.095803201198578e-01, 4.215368628501892e-01, 4.341577589511871e-01, 4.502287805080414e-01, 4.625260233879089e-01, 4.714504182338715e-01, 4.81304943561554e-01, 5.032297968864441e-01, 5.231095552444458e-01, 5.305048227310181e-01, 5.244508385658264e-01, 5.044932961463928e-01, 4.813193082809448e-01, 4.478320479393005e-01, 4.256182909011841e-01, 4.383078515529633e-01, 4.605331420898438e-01, 4.71298485994339e-01, 4.849608540534973e-01, 4.998932182788849e-01, 5.082741975784302e-01, 5.15188992023468e-01, 5.163447856903076e-01, 5.212158560752869e-01, 5.365291833877563e-01, 5.584366321563721e-01, 5.845669507980347e-01, 6.001244187355042e-01, 6.000906825065613e-01, 6.092718839645386e-01, 6.184917092323303e-01, 6.268283724784851e-01, 6.375346183776855e-01, 6.472773551940918e-01, 6.43399178981781e-01, 6.48088276386261e-01, 6.726239919662476e-01, 6.893284320831299e-01, 6.843542456626892e-01, 6.79520308971405e-01, 6.876229643821716e-01, 6.96954071521759e-01, 6.778083443641663e-01, 6.49731457233429e-01, 6.74490213394165e-01, 7.154433727264404e-01, 7.023763656616211e-01, 6.856095790863037e-01, 6.852663159370422e-01, 6.809373497962952e-01, 6.81146204471588e-01, 6.866127848625183e-01, 6.890248656272888e-01, 6.737328171730042e-01, 6.683222055435181e-01, 6.692938208580017e-01, 6.67984664440155e-01, 6.552544832229614e-01, 6.359456777572632e-01, 6.341792941093445e-01, 6.200792789459229e-01, 6.233582496643066e-01, 6.231120824813843e-01, 6.160827279090882e-01, 6.042933464050293e-01, 5.825235843658447e-01, 5.650865435600281e-01, 5.65691351890564e-01, 5.722242593765259e-01, 5.812751054763794e-01, 5.919517278671265e-01, 6.4804607629776e-01, 7.578027844429016e-01, 7.955501675605774e-01, 8.044096231460571e-01, 7.957929372787476e-01, 7.797744274139404e-01, 7.885094285011292e-01, 8.061279058456421e-01, 8.428226113319397e-01, 8.708118796348572e-01, 8.896155953407288e-01, 8.698750138282776e-01, 8.522619605064392e-01, 8.404222726821899e-01, 8.383137583732605e-01, 8.437204957008362e-01, 8.48885178565979e-01, 8.533360362052917e-01, 8.570718765258789e-01, 8.772920966148376e-01, 8.843561410903931e-01, 8.840672969818115e-01, 8.867855072021484e-01]
-conOnl.bui.zon.phi=[6.920281648635864e-01, 2.004487961530685e-01, 2.809318900108337e-01, 3.173492848873138e-01, 3.433429300785065e-01, 3.659639954566956e-01, 3.865141272544861e-01, 4.040046036243439e-01, 4.159736335277557e-01, 4.285701513290405e-01, 4.445409178733826e-01, 4.568123817443848e-01, 4.657531976699829e-01, 4.756019711494446e-01, 4.973722696304322e-01, 5.171132683753967e-01, 5.246865749359131e-01, 5.189340114593506e-01, 4.994408190250397e-01, 4.766608774662018e-01, 4.435391426086426e-01, 4.215603172779083e-01, 4.341799020767212e-01, 4.561992287635803e-01, 4.667288064956665e-01, 4.803102910518646e-01, 4.952352046966553e-01, 5.037846565246582e-01, 5.106667280197144e-01, 5.116087794303894e-01, 5.165725350379944e-01, 5.317862033843994e-01, 5.534642338752747e-01, 5.793991684913635e-01, 5.947960019111633e-01, 5.947870016098022e-01, 6.039091944694519e-01, 6.130938529968262e-01, 6.212774515151978e-01, 6.317452788352966e-01, 6.413277387619019e-01, 6.374673843383789e-01, 6.419062614440918e-01, 6.663795113563538e-01, 6.831169128417969e-01, 6.780715584754944e-01, 6.731531620025635e-01, 6.813433170318604e-01, 6.907235383987427e-01, 6.71737015247345e-01, 6.437948346138e-01, 6.686830520629883e-01, 7.106266617774963e-01, 6.972444653511047e-01, 6.797301173210144e-01, 6.794275641441345e-01, 6.754603385925293e-01, 6.755995750427245e-01, 6.807435750961304e-01, 6.825527548789978e-01, 6.66010320186615e-01, 6.601530909538269e-01, 6.618107557296753e-01, 6.608937978744507e-01, 6.48213267326355e-01, 6.293232440948486e-01, 6.277681589126587e-01, 6.14447295665741e-01, 6.170392632484436e-01, 6.172957420349121e-01, 6.107339262962342e-01, 5.99149227142334e-01, 5.771769285202026e-01, 5.594502687454224e-01, 5.609350800514221e-01, 5.679550170898438e-01, 5.775107145309448e-01, 5.883214473724365e-01, 6.444441676139832e-01, 7.548766136169434e-01, 7.927747368812561e-01, 8.014622926712036e-01, 7.922990918159485e-01, 7.75230884552002e-01, 7.832611799240112e-01, 8.005313873291016e-01, 8.3748859167099e-01, 8.661535382270813e-01, 8.850037455558777e-01, 8.6411052942276e-01, 8.455530405044556e-01, 8.334037065505981e-01, 8.308058381080627e-01, 8.35430920124054e-01, 8.396512269973755e-01, 8.429029583930969e-01, 8.45788300037384e-01, 8.701679110527039e-01, 8.806466460227966e-01, 8.797683119773865e-01, 8.820439577102661e-01]
-latOnl.bui.zon.phi=[6.920281648635864e-01, 2.5064417719841e-01, 3.621875643730164e-01, 4.089449644088745e-01, 4.411978423595428e-01, 4.685779511928558e-01, 4.928734302520752e-01, 5.141146779060364e-01, 5.302628874778748e-01, 5.456368327140808e-01, 5.635321736335754e-01, 5.785192251205444e-01, 5.901058912277222e-01, 6.024894714355469e-01, 6.271527409553528e-01, 6.494237184524536e-01, 6.559934616088867e-01, 6.463531255722046e-01, 6.214425563812256e-01, 5.922122597694397e-01, 5.506307482719421e-01, 5.218064785003662e-01, 5.304727554321289e-01, 5.496273636817932e-01, 5.573399066925049e-01, 5.685988664627075e-01, 5.813838243484497e-01, 5.877281427383423e-01, 5.920881032943726e-01, 5.916486978530884e-01, 5.967195630073547e-01, 6.127063632011414e-01, 6.355901956558228e-01, 6.62903368473053e-01, 6.794588565826416e-01, 6.80070698261261e-01, 6.903954148292542e-01, 7.025551199913025e-01, 7.13839590549469e-01, 7.270634174346924e-01, 7.383963465690613e-01, 7.303785681724548e-01, 7.329546213150024e-01, 7.614359259605408e-01, 7.805275321006775e-01, 7.730683088302612e-01, 7.66791045665741e-01, 7.776278853416443e-01, 7.898023128509521e-01, 7.703527212142944e-01, 7.413657307624817e-01, 7.705262899398804e-01, 8.19642961025238e-01, 8.048786520957947e-01, 7.840310335159302e-01, 7.845614552497864e-01, 7.819868326187134e-01, 7.822296619415282e-01, 7.867041826248169e-01, 7.861704230308533e-01, 7.651981115341187e-01, 7.568384408950806e-01, 7.589141726493835e-01, 7.578352093696594e-01, 7.424574494361877e-01, 7.182925343513489e-01, 7.170554995536804e-01, 7.003703713417053e-01, 7.022775411605835e-01, 7.013043761253357e-01, 6.929904818534852e-01, 6.796526908874512e-01, 6.546391844749451e-01, 6.345229148864746e-01, 6.35543167591095e-01, 6.42426609992981e-01, 6.522472500801086e-01, 6.632227897644043e-01, 7.223296761512756e-01, 8.397703766822815e-01, 8.80820095539093e-01, 8.90935480594635e-01, 8.809636235237122e-01, 8.615021705627441e-01, 8.696786761283875e-01, 8.879325389862061e-01, 9.284282922744751e-01, 9.607431292533875e-01, 9.811755418777466e-01, 9.581876993179321e-01, 9.377791881561279e-01, 9.245549440383911e-01, 9.211347103118896e-01, 9.251573085784912e-01, 9.287817478179932e-01, 9.316045641899109e-01, 9.338696002960205e-01, 9.624594449996948e-01, 9.762113094329834e-01, 9.754275679588318e-01, 9.779370427131653e-01]
-noGai.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.026989775709808e-03, 9.539246093481779e-04, 9.704637341201305e-04, 9.923506295308471e-04, 1.017352798953652e-03, 1.04502122849226e-03, 1.061247778125107e-03, 1.055484521202743e-03, 1.066420809365809e-03, 1.095465268008411e-03, 1.104696188122034e-03, 1.104814582504332e-03, 1.108388765715063e-03, 1.140500768087804e-03, 1.169944880530238e-03, 1.202538260258734e-03, 1.231000176630914e-03, 1.238850061781704e-03, 1.250277971848845e-03, 1.255868119187653e-03, 1.27896445337683e-03, 1.393043901771307e-03, 1.538858166895807e-03, 1.652877894230187e-03, 1.771390321664512e-03, 1.874289475381374e-03, 1.947964425198734e-03, 2.028922783210874e-03, 2.08342750556767e-03, 2.109120599925518e-03, 2.164833014830947e-03, 2.238931832835078e-03, 2.329475712031126e-03, 2.37479037605226e-03, 2.359063131734729e-03, 2.376853721216321e-03, 2.363914391025901e-03, 2.347894478589296e-03, 2.344907261431217e-03, 2.353200223296881e-03, 2.418301533907652e-03, 2.472875639796257e-03, 2.513644518330693e-03, 2.546173054724932e-03, 2.570048673078418e-03, 2.573004923760891e-03, 2.561992732807994e-03, 2.548063406720757e-03, 2.469743601977825e-03, 2.362912520766258e-03, 2.342362888157368e-03, 2.318158512935042e-03, 2.299767220392823e-03, 2.32021464034915e-03, 2.294738078489899e-03, 2.235973719507455e-03, 2.235296182334423e-03, 2.280680695548654e-03, 2.363979583606124e-03, 2.444514539092779e-03, 2.473066793754697e-03, 2.470998093485832e-03, 2.469622762873769e-03, 2.462147269397974e-03, 2.470911713317037e-03, 2.457176567986608e-03, 2.477126196026802e-03, 2.536185551434756e-03, 2.594526624307036e-03, 2.625888679176569e-03, 2.631421433761716e-03, 2.633645432069898e-03, 2.634548116475344e-03, 2.659728983417153e-03, 2.709770575165749e-03, 2.759858267381787e-03, 2.824881579726934e-03, 3.046308644115925e-03, 3.397234948351979e-03, 3.469477873295546e-03, 3.44915734604001e-03, 3.439995693042874e-03, 3.473203163594007e-03, 3.523724619299173e-03, 3.583155805245042e-03, 3.622061805799603e-03, 3.589578671380877e-03, 3.594210604205728e-03, 3.620800795033574e-03, 3.612623549997807e-03, 3.598424140363932e-03, 3.634135471656919e-03, 3.709477838128805e-03, 3.787364577874541e-03, 3.860005410388112e-03, 3.918609581887722e-03, 3.797078970819712e-03, 3.621245734393597e-03, 3.60948545858264e-03, 3.60938417725265e-03]
-radOnl.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.026989775709808e-03, 9.539246093481779e-04, 9.704637341201305e-04, 9.923506295308471e-04, 1.017352798953652e-03, 1.04502122849226e-03, 1.061247778125107e-03, 1.055484521202743e-03, 1.066420809365809e-03, 1.095465268008411e-03, 1.104696188122034e-03, 1.104814582504332e-03, 1.108388765715063e-03, 1.140500768087804e-03, 1.169944880530238e-03, 1.202538260258734e-03, 1.231000176630914e-03, 1.238850061781704e-03, 1.250277971848845e-03, 1.255868119187653e-03, 1.27896445337683e-03, 1.393043901771307e-03, 1.538858166895807e-03, 1.652877894230187e-03, 1.771390321664512e-03, 1.874289475381374e-03, 1.947964425198734e-03, 2.028922783210874e-03, 2.08342750556767e-03, 2.109120599925518e-03, 2.164833014830947e-03, 2.238931832835078e-03, 2.329475712031126e-03, 2.37479037605226e-03, 2.359063131734729e-03, 2.376853721216321e-03, 2.363914391025901e-03, 2.347894478589296e-03, 2.344907261431217e-03, 2.353200223296881e-03, 2.418301533907652e-03, 2.472875639796257e-03, 2.513644518330693e-03, 2.546173054724932e-03, 2.570048673078418e-03, 2.573004923760891e-03, 2.561992732807994e-03, 2.548063406720757e-03, 2.469743601977825e-03, 2.362912520766258e-03, 2.342349849641323e-03, 2.318074461072683e-03, 2.299666637554765e-03, 2.320145489647985e-03, 2.29467311874032e-03, 2.235891064628958e-03, 2.235206542536616e-03, 2.280597807839513e-03, 2.363915322348475e-03, 2.444495912641287e-03, 2.473077969625592e-03, 2.471010433509946e-03, 2.469624858349562e-03, 2.462149364873767e-03, 2.470929408445954e-03, 2.457202412188053e-03, 2.477178815752268e-03, 2.53627565689385e-03, 2.594640245661139e-03, 2.626027213409543e-03, 2.63158162124455e-03, 2.633834723383188e-03, 2.634766511619091e-03, 2.6599639095366e-03, 2.71002110093832e-03, 2.759989351034164e-03, 2.82501638866961e-03, 3.046577330678701e-03, 3.397467546164989e-03, 3.469677641987801e-03, 3.449334995821118e-03, 3.440168919041753e-03, 3.473397577181458e-03, 3.523830091580749e-03, 3.583255223929882e-03, 3.622084157541394e-03, 3.589592641219497e-03, 3.594307927414775e-03, 3.620923962444067e-03, 3.61276650801301e-03, 3.598574316129088e-03, 3.63429426215589e-03, 3.709646640345454e-03, 3.787543158978224e-03, 3.860191674903035e-03, 3.918800037354231e-03, 3.797251265496016e-03, 3.621377050876617e-03, 3.60960466787219e-03, 3.609497798606753e-03]
-conOnl.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.026989775709808e-03, 9.539246093481779e-04, 9.704637341201305e-04, 9.923506295308471e-04, 1.017352798953652e-03, 1.04502122849226e-03, 1.061247778125107e-03, 1.055484521202743e-03, 1.066420809365809e-03, 1.095465268008411e-03, 1.104696188122034e-03, 1.104814582504332e-03, 1.108388765715063e-03, 1.140500768087804e-03, 1.169944880530238e-03, 1.202538260258734e-03, 1.231000176630914e-03, 1.238850061781704e-03, 1.250277971848845e-03, 1.255868119187653e-03, 1.27896445337683e-03, 1.393043901771307e-03, 1.538858166895807e-03, 1.652877894230187e-03, 1.771390321664512e-03, 1.874289475381374e-03, 1.947964425198734e-03, 2.028922783210874e-03, 2.08342750556767e-03, 2.109120599925518e-03, 2.164833014830947e-03, 2.238931832835078e-03, 2.329475712031126e-03, 2.37479037605226e-03, 2.359063131734729e-03, 2.376853721216321e-03, 2.363914391025901e-03, 2.347894478589296e-03, 2.344907261431217e-03, 2.353200223296881e-03, 2.418301533907652e-03, 2.472875639796257e-03, 2.513644518330693e-03, 2.546173054724932e-03, 2.570048673078418e-03, 2.573004923760891e-03, 2.561992732807994e-03, 2.548063406720757e-03, 2.469743601977825e-03, 2.362912520766258e-03, 2.342351246625185e-03, 2.318062586709857e-03, 2.299652202054858e-03, 2.32013501226902e-03, 2.294662408530712e-03, 2.235877327620983e-03, 2.235191641375422e-03, 2.28058360517025e-03, 2.363904379308224e-03, 2.444496145471931e-03, 2.473089145496488e-03, 2.471021376550198e-03, 2.469626720994711e-03, 2.462150761857629e-03, 2.470938488841057e-03, 2.457215916365385e-03, 2.477200701832771e-03, 2.536313841119409e-03, 2.594681922346353e-03, 2.626071684062481e-03, 2.631630748510361e-03, 2.633892931044102e-03, 2.634844044223428e-03, 2.660039579495788e-03, 2.710087923333049e-03, 2.760018687695265e-03, 2.825044095516205e-03, 3.046629717573524e-03, 3.397499909624457e-03, 3.469699528068304e-03, 3.449354553595185e-03, 3.440190572291613e-03, 3.473429940640926e-03, 3.523852908983827e-03, 3.58327804133296e-03, 3.622089512646198e-03, 3.589595202356577e-03, 3.594325389713049e-03, 3.620948642492294e-03, 3.612803295254707e-03, 3.598617156967521e-03, 3.634342923760414e-03, 3.709704149514437e-03, 3.787611611187458e-03, 3.860273631289601e-03, 3.918895963579416e-03, 3.797329962253571e-03, 3.621398936957121e-03, 3.609622363001108e-03, 3.60951735638082e-03]
-latOnl.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.264357939362526e-03, 1.193284057080746e-03, 1.20983982924372e-03, 1.23172695748508e-03, 1.256729126907885e-03, 1.284397556446493e-03, 1.300623989664018e-03, 1.294860849156976e-03, 1.30579702090472e-03, 1.334841595962644e-03, 1.344072399660945e-03, 1.344190910458565e-03, 1.347764977253973e-03, 1.379877096042037e-03, 1.409321208484471e-03, 1.441914588212967e-03, 1.470376388169825e-03, 1.478226389735937e-03, 1.489654299803078e-03, 1.495244447141886e-03, 1.518340781331062e-03, 1.63242022972554e-03, 1.778234494850039e-03, 1.89225422218442e-03, 2.010766649618745e-03, 2.113665686920285e-03, 2.187340753152966e-03, 2.268299227580429e-03, 2.322803949937224e-03, 2.348496811464429e-03, 2.404209459200501e-03, 2.478308277204633e-03, 2.568852156400681e-03, 2.614166587591171e-03, 2.598439576104283e-03, 2.616229932755232e-03, 2.603290835395455e-03, 2.587270690128207e-03, 2.584283472970128e-03, 2.592576434835792e-03, 2.657677745446563e-03, 2.712251851335168e-03, 2.753020729869604e-03, 2.785549266263843e-03, 2.809425117447972e-03, 2.812381368130445e-03, 2.801368944346905e-03, 2.787439851090312e-03, 2.70912004634738e-03, 2.602288732305169e-03, 2.581738401204348e-03, 2.557531464844942e-03, 2.539139939472079e-03, 2.559588057920337e-03, 2.53411172889173e-03, 2.475346671417355e-03, 2.474668901413679e-03, 2.520053880289197e-03, 2.603353234007955e-03, 2.683889819309115e-03, 2.712443005293608e-03, 2.710374537855387e-03, 2.70899897441268e-03, 2.701523480936885e-03, 2.710288390517235e-03, 2.696553478017449e-03, 2.716503804549575e-03, 2.775564789772034e-03, 2.833906328305602e-03, 2.865269314497709e-03, 2.870802534744143e-03, 2.873027697205544e-03, 2.873931545764208e-03, 2.899112878367305e-03, 2.9491544701159e-03, 2.99923843704164e-03, 3.064261749386787e-03, 3.285692539066076e-03, 3.636617679148912e-03, 3.70885943993926e-03, 3.688538214191794e-03, 3.679376561194658e-03, 3.712584730237722e-03, 3.763103857636452e-03, 3.82253504358232e-03, 3.861438715830445e-03, 3.828955348581076e-03, 3.833589376881719e-03, 3.860180266201496e-03, 3.852003952488303e-03, 3.837804775685072e-03, 3.873516572639346e-03, 3.94885940477252e-03, 4.026746843010187e-03, 4.099388141185045e-03, 4.157993011176586e-03, 4.036461003124714e-03, 3.860625438392162e-03, 3.848864696919918e-03, 3.848763415589929e-03]
+noGai.bui.zon.TAir=[2.931499938964844e+02, 2.773317260742188e+02, 2.716111145019531e+02, 2.703234252929688e+02, 2.696347351074219e+02, 2.691603698730469e+02, 2.688210144042969e+02, 2.684725036621094e+02, 2.680580444335938e+02, 2.678224182128906e+02, 2.677020263671875e+02, 2.6747607421875e+02, 2.672463684082031e+02, 2.670357971191406e+02, 2.668432922363281e+02, 2.6668310546875e+02, 2.66831298828125e+02, 2.672297668457031e+02, 2.677493591308594e+02, 2.684026489257812e+02, 2.6930322265625e+02, 2.701207580566406e+02, 2.707865295410156e+02, 2.713843994140625e+02, 2.719632263183594e+02, 2.724490051269531e+02, 2.727781982421875e+02, 2.730676879882812e+02, 2.734487915039062e+02, 2.737902526855469e+02, 2.738254089355469e+02, 2.737821960449219e+02, 2.736922912597656e+02, 2.736044006347656e+02, 2.735041809082031e+02, 2.73409423828125e+02, 2.732984924316406e+02, 2.730087280273438e+02, 2.727369995117188e+02, 2.725043334960938e+02, 2.72359130859375e+02, 2.727839050292969e+02, 2.729906311035156e+02, 2.727057800292969e+02, 2.725503845214844e+02, 2.727673645019531e+02, 2.728794250488281e+02, 2.726620178222656e+02, 2.724189147949219e+02, 2.723771667480469e+02, 2.723557434082031e+02, 2.717981567382812e+02, 2.709446105957031e+02, 2.710757751464844e+02, 2.71486083984375e+02, 2.713583679199219e+02, 2.711170959472656e+02, 2.7110986328125e+02, 2.712588500976562e+02, 2.716566467285156e+02, 2.723460693359375e+02, 2.726007080078125e+02, 2.72559326171875e+02, 2.72570068359375e+02, 2.727825317382812e+02, 2.732403869628906e+02, 2.731965637207031e+02, 2.736148986816406e+02, 2.738805541992188e+02, 2.741920776367188e+02, 2.745101928710938e+02, 2.748077087402344e+02, 2.753418273925781e+02, 2.757843322753906e+02, 2.758839416503906e+02, 2.759725952148438e+02, 2.759957275390625e+02, 2.760625305175781e+02, 2.758411254882812e+02, 2.751491394042969e+02, 2.747569885253906e+02, 2.745214538574219e+02, 2.746434936523438e+02, 2.750799560546875e+02, 2.75136474609375e+02, 2.750645751953125e+02, 2.745838928222656e+02, 2.739903564453125e+02, 2.737084045410156e+02, 2.741412048339844e+02, 2.74410400390625e+02, 2.74556640625e+02, 2.747369689941406e+02, 2.749440612792969e+02, 2.751614074707031e+02, 2.753681945800781e+02, 2.755325012207031e+02, 2.746981506347656e+02, 2.738802185058594e+02, 2.738482055664062e+02, 2.73811279296875e+02]
+radOnl.bui.zon.TAir=[2.931499938964844e+02, 2.775381774902344e+02, 2.718059997558594e+02, 2.705455932617188e+02, 2.698822021484375e+02, 2.694281311035156e+02, 2.691054077148438e+02, 2.687704162597656e+02, 2.683684387207031e+02, 2.681436462402344e+02, 2.680321655273438e+02, 2.678150329589844e+02, 2.675933227539062e+02, 2.673898620605469e+02, 2.672036743164062e+02, 2.670492248535156e+02, 2.672052001953125e+02, 2.676106872558594e+02, 2.681378479003906e+02, 2.687967224121094e+02, 2.697000732421875e+02, 2.705198974609375e+02, 2.711885681152344e+02, 2.717881164550781e+02, 2.723677368164062e+02, 2.728521728515625e+02, 2.731799621582031e+02, 2.734712219238281e+02, 2.738516845703125e+02, 2.741927795410156e+02, 2.742326354980469e+02, 2.741919860839844e+02, 2.7410302734375e+02, 2.740165100097656e+02, 2.739167785644531e+02, 2.738232421875e+02, 2.7371435546875e+02, 2.734303588867188e+02, 2.731630859375e+02, 2.72932861328125e+02, 2.727900390625e+02, 2.732071228027344e+02, 2.734065551757812e+02, 2.731317749023438e+02, 2.729837951660156e+02, 2.731949768066406e+02, 2.733029479980469e+02, 2.730932006835938e+02, 2.728572082519531e+02, 2.728164978027344e+02, 2.727940979003906e+02, 2.7224560546875e+02, 2.714121398925781e+02, 2.715377502441406e+02, 2.719345703125e+02, 2.718081665039062e+02, 2.715729064941406e+02, 2.715653381347656e+02, 2.717105102539062e+02, 2.720996704101562e+02, 2.727655029296875e+02, 2.730072021484375e+02, 2.729787292480469e+02, 2.729960632324219e+02, 2.732028503417969e+02, 2.736566467285156e+02, 2.736178283691406e+02, 2.740502319335938e+02, 2.743048706054688e+02, 2.746257629394531e+02, 2.749510498046875e+02, 2.752505493164062e+02, 2.757762756347656e+02, 2.762093505859375e+02, 2.763280029296875e+02, 2.76428466796875e+02, 2.764645080566406e+02, 2.765361633300781e+02, 2.763219299316406e+02, 2.756513977050781e+02, 2.752643737792969e+02, 2.750272827148438e+02, 2.75140625e+02, 2.755595703125e+02, 2.75605224609375e+02, 2.755292053222656e+02, 2.750570678710938e+02, 2.744768981933594e+02, 2.741983337402344e+02, 2.746122436523438e+02, 2.748656311035156e+02, 2.750060729980469e+02, 2.751789855957031e+02, 2.753754272460938e+02, 2.75580322265625e+02, 2.757727355957031e+02, 2.759226379394531e+02, 2.751552734375e+02, 2.743847045898438e+02, 2.743440246582031e+02, 2.74301025390625e+02]
+conOnl.bui.zon.TAir=[2.931499938964844e+02, 2.775595397949219e+02, 2.71985595703125e+02, 2.707307434082031e+02, 2.700591125488281e+02, 2.695977783203125e+02, 2.692691650390625e+02, 2.689291381835938e+02, 2.685220947265625e+02, 2.6829345703125e+02, 2.681793212890625e+02, 2.679588317871094e+02, 2.677339172363281e+02, 2.67527587890625e+02, 2.673388977050781e+02, 2.671823120117188e+02, 2.673327026367188e+02, 2.677333984375e+02, 2.68255126953125e+02, 2.6891064453125e+02, 2.698137512207031e+02, 2.706336975097656e+02, 2.713015747070312e+02, 2.719015808105469e+02, 2.724825439453125e+02, 2.729708862304688e+02, 2.733025207519531e+02, 2.735935668945312e+02, 2.739768371582031e+02, 2.743204345703125e+02, 2.743566589355469e+02, 2.743150024414062e+02, 2.742271728515625e+02, 2.741410522460938e+02, 2.740430908203125e+02, 2.739493713378906e+02, 2.738396301269531e+02, 2.73550537109375e+02, 2.732792053222656e+02, 2.730469055175781e+02, 2.729028015136719e+02, 2.733291625976562e+02, 2.735376281738281e+02, 2.732529296875e+02, 2.730980529785156e+02, 2.733162231445312e+02, 2.734292907714844e+02, 2.732114562988281e+02, 2.72968017578125e+02, 2.729268188476562e+02, 2.729062805175781e+02, 2.723482055664062e+02, 2.714930725097656e+02, 2.716257019042969e+02, 2.720381774902344e+02, 2.719110107421875e+02, 2.716697692871094e+02, 2.716634216308594e+02, 2.718135986328125e+02, 2.722131042480469e+02, 2.729060974121094e+02, 2.731637573242188e+02, 2.731209106445312e+02, 2.731313171386719e+02, 2.733454284667969e+02, 2.738047485351562e+02, 2.737609558105469e+02, 2.741777648925781e+02, 2.744463806152344e+02, 2.747565002441406e+02, 2.750729370117188e+02, 2.753703918457031e+02, 2.759061889648438e+02, 2.763511352539062e+02, 2.764476013183594e+02, 2.765346374511719e+02, 2.765564575195312e+02, 2.766232604980469e+02, 2.764008178710938e+02, 2.75705810546875e+02, 2.753133239746094e+02, 2.7507861328125e+02, 2.752022094726562e+02, 2.756416625976562e+02, 2.756990051269531e+02, 2.756269836425781e+02, 2.75145751953125e+02, 2.745514526367188e+02, 2.742704467773438e+02, 2.747048645019531e+02, 2.749760131835938e+02, 2.751233215332031e+02, 2.75304931640625e+02, 2.75513916015625e+02, 2.757340393066406e+02, 2.759459838867188e+02, 2.761094970703125e+02, 2.752695007324219e+02, 2.744431457519531e+02, 2.744117736816406e+02, 2.7437548828125e+02]
+latOnl.bui.zon.TAir=[2.931499938964844e+02, 2.773361206054688e+02, 2.716211242675781e+02, 2.70334716796875e+02, 2.696465759277344e+02, 2.69172607421875e+02, 2.688336181640625e+02, 2.684854125976562e+02, 2.680712280273438e+02, 2.678358459472656e+02, 2.677156372070312e+02, 2.674898986816406e+02, 2.672603454589844e+02, 2.670499267578125e+02, 2.668575439453125e+02, 2.66697509765625e+02, 2.66845703125e+02, 2.672442016601562e+02, 2.677637939453125e+02, 2.684170532226562e+02, 2.693175659179688e+02, 2.701350708007812e+02, 2.708008117675781e+02, 2.713986511230469e+02, 2.719774475097656e+02, 2.724631958007812e+02, 2.727924499511719e+02, 2.730819091796875e+02, 2.734629821777344e+02, 2.738044738769531e+02, 2.738396301269531e+02, 2.737964477539062e+02, 2.737066040039062e+02, 2.736187438964844e+02, 2.735186157226562e+02, 2.734239196777344e+02, 2.733130187988281e+02, 2.730233154296875e+02, 2.727516174316406e+02, 2.725189819335938e+02, 2.723738708496094e+02, 2.727986145019531e+02, 2.730053405761719e+02, 2.727205200195312e+02, 2.72565185546875e+02, 2.727821655273438e+02, 2.728942565917969e+02, 2.726768493652344e+02, 2.724337768554688e+02, 2.723920288085938e+02, 2.723706665039062e+02, 2.718131408691406e+02, 2.709596557617188e+02, 2.710908203125e+02, 2.715011596679688e+02, 2.713734741210938e+02, 2.711322326660156e+02, 2.711250305175781e+02, 2.712740478515625e+02, 2.716718139648438e+02, 2.723612365722656e+02, 2.726159057617188e+02, 2.725744934082031e+02, 2.725852355957031e+02, 2.727976989746094e+02, 2.732555236816406e+02, 2.732117004394531e+02, 2.736299438476562e+02, 2.738956298828125e+02, 2.7420703125e+02, 2.745250854492188e+02, 2.748225402832031e+02, 2.753565979003906e+02, 2.75799072265625e+02, 2.758986206054688e+02, 2.759872131347656e+02, 2.760103149414062e+02, 2.760770874023438e+02, 2.75855712890625e+02, 2.751637268066406e+02, 2.747716369628906e+02, 2.745361633300781e+02, 2.74658203125e+02, 2.750946960449219e+02, 2.751512451171875e+02, 2.750793151855469e+02, 2.745987243652344e+02, 2.740052490234375e+02, 2.737233581542969e+02, 2.741561279296875e+02, 2.744253540039062e+02, 2.745715942382812e+02, 2.747519226074219e+02, 2.749590148925781e+02, 2.751763916015625e+02, 2.753832397460938e+02, 2.755475769042969e+02, 2.747130737304688e+02, 2.738951416015625e+02, 2.738631896972656e+02, 2.738262634277344e+02]
+noGai.bui.zon.TRad=[2.928583374023438e+02, 2.844587707519531e+02, 2.826946105957031e+02, 2.805918579101562e+02, 2.789977111816406e+02, 2.777727661132812e+02, 2.768010559082031e+02, 2.75966796875e+02, 2.751984558105469e+02, 2.747538757324219e+02, 2.742034912109375e+02, 2.737087707519531e+02, 2.732358703613281e+02, 2.727981262207031e+02, 2.723934326171875e+02, 2.720253601074219e+02, 2.721317749023438e+02, 2.724497680664062e+02, 2.730707092285156e+02, 2.737132568359375e+02, 2.744361267089844e+02, 2.751138610839844e+02, 2.756664733886719e+02, 2.760781860351562e+02, 2.763793029785156e+02, 2.764501037597656e+02, 2.764905700683594e+02, 2.765954284667969e+02, 2.766565551757812e+02, 2.767846984863281e+02, 2.768406066894531e+02, 2.767232055664062e+02, 2.764784240722656e+02, 2.762392578125e+02, 2.760591735839844e+02, 2.758029174804688e+02, 2.756142578125e+02, 2.753970947265625e+02, 2.75159912109375e+02, 2.749324645996094e+02, 2.747413940429688e+02, 2.747143249511719e+02, 2.747348937988281e+02, 2.746595458984375e+02, 2.745233154296875e+02, 2.74473388671875e+02, 2.744623413085938e+02, 2.743650512695312e+02, 2.742217712402344e+02, 2.741085510253906e+02, 2.740493469238281e+02, 2.739330749511719e+02, 2.735481872558594e+02, 2.733074035644531e+02, 2.732808837890625e+02, 2.732021484375e+02, 2.730547485351562e+02, 2.7295556640625e+02, 2.72914306640625e+02, 2.729411315917969e+02, 2.730980529785156e+02, 2.732565002441406e+02, 2.733268127441406e+02, 2.733619079589844e+02, 2.734326171875e+02, 2.73636962890625e+02, 2.738297729492188e+02, 2.740042419433594e+02, 2.743594055175781e+02, 2.74768798828125e+02, 2.751870422363281e+02, 2.75525390625e+02, 2.758934326171875e+02, 2.763245239257812e+02, 2.766825561523438e+02, 2.768782043457031e+02, 2.771223449707031e+02, 2.773209533691406e+02, 2.774500732421875e+02, 2.773109436035156e+02, 2.771021728515625e+02, 2.768318176269531e+02, 2.766183471679688e+02, 2.7656396484375e+02, 2.764801025390625e+02, 2.762991638183594e+02, 2.760606384277344e+02, 2.757508850097656e+02, 2.754244995117188e+02, 2.753277587890625e+02, 2.753146057128906e+02, 2.753060302734375e+02, 2.753140563964844e+02, 2.753478393554688e+02, 2.753980407714844e+02, 2.75455322265625e+02, 2.754966430664062e+02, 2.754104614257812e+02, 2.751278991699219e+02, 2.749788818359375e+02, 2.749010009765625e+02]
+radOnl.bui.zon.TRad=[2.928583374023438e+02, 2.8465576171875e+02, 2.830493469238281e+02, 2.810315856933594e+02, 2.794981384277344e+02, 2.783218688964844e+02, 2.773913269042969e+02, 2.765927124023438e+02, 2.758551025390625e+02, 2.754293212890625e+02, 2.749054870605469e+02, 2.74434814453125e+02, 2.739837646484375e+02, 2.735658264160156e+02, 2.731793212890625e+02, 2.728285522460938e+02, 2.729486999511719e+02, 2.732750854492188e+02, 2.73906494140625e+02, 2.745580139160156e+02, 2.752893981933594e+02, 2.75975830078125e+02, 2.765372314453125e+02, 2.769578247070312e+02, 2.772685241699219e+02, 2.773466186523438e+02, 2.773988647460938e+02, 2.775140991210938e+02, 2.775876159667969e+02, 2.777285461425781e+02, 2.777947692871094e+02, 2.776881103515625e+02, 2.774552917480469e+02, 2.772286682128906e+02, 2.770581665039062e+02, 2.768175048828125e+02, 2.766419677734375e+02, 2.764341125488281e+02, 2.762023620605469e+02, 2.759784851074219e+02, 2.75791748046875e+02, 2.757774658203125e+02, 2.758083190917969e+02, 2.757443542480469e+02, 2.756156311035156e+02, 2.755719299316406e+02, 2.755696716308594e+02, 2.754771728515625e+02, 2.75336669921875e+02, 2.752283325195312e+02, 2.7517333984375e+02, 2.750599670410156e+02, 2.746680603027344e+02, 2.7442724609375e+02, 2.74409423828125e+02, 2.743373718261719e+02, 2.741932373046875e+02, 2.74099365234375e+02, 2.740664367675781e+02, 2.741005249023438e+02, 2.742782287597656e+02, 2.744609375e+02, 2.745425415039062e+02, 2.745857543945312e+02, 2.746701354980469e+02, 2.748923645019531e+02, 2.750904846191406e+02, 2.752645874023438e+02, 2.756308898925781e+02, 2.760406188964844e+02, 2.764576416015625e+02, 2.767956237792969e+02, 2.771697082519531e+02, 2.776085510253906e+02, 2.7796142578125e+02, 2.781533203125e+02, 2.783905944824219e+02, 2.785847473144531e+02, 2.787041931152344e+02, 2.785459594726562e+02, 2.783250427246094e+02, 2.780484313964844e+02, 2.778345642089844e+02, 2.777881774902344e+02, 2.777087097167969e+02, 2.775329284667969e+02, 2.772960205078125e+02, 2.769845581054688e+02, 2.766564331054688e+02, 2.765713195800781e+02, 2.765732116699219e+02, 2.765787048339844e+02, 2.765966796875e+02, 2.766474609375e+02, 2.76718017578125e+02, 2.7680029296875e+02, 2.76870849609375e+02, 2.767693481445312e+02, 2.764663391113281e+02, 2.7630615234375e+02, 2.7622412109375e+02]
+conOnl.bui.zon.TRad=[2.928583374023438e+02, 2.846378784179688e+02, 2.828838195800781e+02, 2.808162231445312e+02, 2.792501220703125e+02, 2.780472106933594e+02, 2.770935974121094e+02, 2.7627490234375e+02, 2.755198059082031e+02, 2.750829772949219e+02, 2.745431823730469e+02, 2.74057861328125e+02, 2.735934448242188e+02, 2.731632690429688e+02, 2.72765380859375e+02, 2.724035034179688e+02, 2.725162963867188e+02, 2.728381652832031e+02, 2.734644470214844e+02, 2.741116638183594e+02, 2.748381958007812e+02, 2.755192260742188e+02, 2.760751647949219e+02, 2.764898681640625e+02, 2.767934875488281e+02, 2.768656921386719e+02, 2.769081726074219e+02, 2.770152282714844e+02, 2.770783081054688e+02, 2.772082214355469e+02, 2.772663269042969e+02, 2.771509704589844e+02, 2.769081115722656e+02, 2.766710815429688e+02, 2.764923400878906e+02, 2.762397766113281e+02, 2.760538330078125e+02, 2.758389587402344e+02, 2.756029357910156e+02, 2.753761596679688e+02, 2.751855163574219e+02, 2.751592407226562e+02, 2.751803894042969e+02, 2.751074523925781e+02, 2.749734802246094e+02, 2.749233703613281e+02, 2.749123229980469e+02, 2.748162536621094e+02, 2.746744384765625e+02, 2.745624084472656e+02, 2.7450390625e+02, 2.743895874023438e+02, 2.740076599121094e+02, 2.737681274414062e+02, 2.737419128417969e+02, 2.736642761230469e+02, 2.73518310546875e+02, 2.734201965332031e+02, 2.733797302246094e+02, 2.734061584472656e+02, 2.735611572265625e+02, 2.737170715332031e+02, 2.73787109375e+02, 2.738224182128906e+02, 2.738925476074219e+02, 2.740955200195312e+02, 2.742884521484375e+02, 2.744632263183594e+02, 2.748167724609375e+02, 2.752264709472656e+02, 2.756461181640625e+02, 2.759853515625e+02, 2.763530578613281e+02, 2.767834777832031e+02, 2.771438598632812e+02, 2.773410949707031e+02, 2.775884094238281e+02, 2.777897338867188e+02, 2.779200134277344e+02, 2.777830200195312e+02, 2.775765686035156e+02, 2.773078918457031e+02, 2.770946655273438e+02, 2.770392150878906e+02, 2.769552307128906e+02, 2.7677392578125e+02, 2.765361022949219e+02, 2.762284545898438e+02, 2.759028015136719e+02, 2.758063354492188e+02, 2.757924499511719e+02, 2.757830200195312e+02, 2.757902221679688e+02, 2.758221435546875e+02, 2.758696899414062e+02, 2.759224548339844e+02, 2.759612121582031e+02, 2.758829956054688e+02, 2.756038513183594e+02, 2.754557800292969e+02, 2.753781433105469e+02]
+latOnl.bui.zon.TRad=[2.928583374023438e+02, 2.844639587402344e+02, 2.826998291015625e+02, 2.805980224609375e+02, 2.790046997070312e+02, 2.777803955078125e+02, 2.768092346191406e+02, 2.759754333496094e+02, 2.752074890136719e+02, 2.747631530761719e+02, 2.742131042480469e+02, 2.737186584472656e+02, 2.732460632324219e+02, 2.728085327148438e+02, 2.724040832519531e+02, 2.720361938476562e+02, 2.721427917480469e+02, 2.724609069824219e+02, 2.730819702148438e+02, 2.737246398925781e+02, 2.744475708007812e+02, 2.751253051757812e+02, 2.75677978515625e+02, 2.760897216796875e+02, 2.763908386230469e+02, 2.764616394042969e+02, 2.765021057128906e+02, 2.766069641113281e+02, 2.766681213378906e+02, 2.767962646484375e+02, 2.768522033691406e+02, 2.767348327636719e+02, 2.764900817871094e+02, 2.762509765625e+02, 2.760708923339844e+02, 2.758147277832031e+02, 2.756261291503906e+02, 2.754090576171875e+02, 2.751719055175781e+02, 2.749444580078125e+02, 2.7475341796875e+02, 2.747263793945312e+02, 2.747469482421875e+02, 2.746716918945312e+02, 2.745354919433594e+02, 2.744855651855469e+02, 2.744745178222656e+02, 2.743772583007812e+02, 2.742340393066406e+02, 2.74120849609375e+02, 2.740616455078125e+02, 2.739454650878906e+02, 2.735606994628906e+02, 2.733199768066406e+02, 2.7329345703125e+02, 2.732147827148438e+02, 2.730674133300781e+02, 2.729682922363281e+02, 2.729270324707031e+02, 2.72953857421875e+02, 2.731106872558594e+02, 2.7326904296875e+02, 2.7333935546875e+02, 2.733744506835938e+02, 2.734451293945312e+02, 2.736494445800781e+02, 2.738422241210938e+02, 2.740166625976562e+02, 2.743717956542969e+02, 2.747811889648438e+02, 2.751994323730469e+02, 2.755377807617188e+02, 2.7590576171875e+02, 2.763368225097656e+02, 2.766948547363281e+02, 2.768905334472656e+02, 2.771347351074219e+02, 2.773334045410156e+02, 2.774625244140625e+02, 2.773234558105469e+02, 2.7711474609375e+02, 2.768444519042969e+02, 2.766310119628906e+02, 2.765765380859375e+02, 2.7649267578125e+02, 2.763117370605469e+02, 2.760732116699219e+02, 2.757635498046875e+02, 2.754372253417969e+02, 2.753404541015625e+02, 2.753272705078125e+02, 2.753186950683594e+02, 2.753266906738281e+02, 2.753604125976562e+02, 2.754105529785156e+02, 2.754677124023438e+02, 2.755089111328125e+02, 2.754228820800781e+02, 2.751405029296875e+02, 2.749915466308594e+02, 2.749136962890625e+02]
+noGai.bui.zon.phi=[6.920281648635864e-01, 2.036649137735367e-01, 2.898170351982117e-01, 3.283891379833221e-01, 3.558652698993683e-01, 3.79779040813446e-01, 4.015084505081177e-01, 4.20021116733551e-01, 4.327912628650665e-01, 4.461832046508789e-01, 4.630829989910126e-01, 4.761262834072113e-01, 4.856762588024139e-01, 4.96162623167038e-01, 5.19076943397522e-01, 5.398881435394287e-01, 5.478581786155701e-01, 5.418815612792969e-01, 5.21527886390686e-01, 4.977359473705292e-01, 4.631052613258362e-01, 4.401397705078125e-01, 4.532922506332397e-01, 4.762829542160034e-01, 4.874678254127502e-01, 5.01567542552948e-01, 5.162035822868347e-01, 5.240623354911804e-01, 5.30229926109314e-01, 5.312950015068054e-01, 5.365034341812134e-01, 5.523396134376526e-01, 5.748618841171265e-01, 6.018391847610474e-01, 6.179831624031067e-01, 6.181696653366089e-01, 6.280052065849304e-01, 6.387843489646912e-01, 6.486645340919495e-01, 6.606245040893555e-01, 6.711580157279968e-01, 6.654981374740601e-01, 6.691538095474243e-01, 6.961975693702698e-01, 7.144540548324585e-01, 7.081615328788757e-01, 7.024836540222168e-01, 7.121647596359253e-01, 7.229836583137512e-01, 7.032774090766907e-01, 6.741179823875427e-01, 7.000637054443359e-01, 7.439832091331482e-01, 7.300335764884949e-01, 7.117108106613159e-01, 7.114477157592773e-01, 7.073572278022766e-01, 7.075726389884948e-01, 7.129889726638794e-01, 7.148835062980652e-01, 6.979366540908813e-01, 6.910353302955627e-01, 6.928677558898926e-01, 6.918579339981079e-01, 6.7762291431427e-01, 6.557059288024902e-01, 6.542532444000244e-01, 6.394450664520264e-01, 6.424797177314758e-01, 6.428536772727966e-01, 6.358676552772523e-01, 6.237246990203857e-01, 6.008234024047852e-01, 5.823560953140259e-01, 5.837578773498535e-01, 5.909883379936218e-01, 6.009028553962708e-01, 6.121245622634888e-01, 6.704851984977722e-01, 7.854128479957581e-01, 8.249492645263672e-01, 8.341304659843445e-01, 8.246484994888306e-01, 8.069252967834473e-01, 8.153316974639893e-01, 8.333331346511841e-01, 8.719266653060913e-01, 9.017525911331177e-01, 9.210256338119507e-01, 8.998700380325317e-01, 8.805860280990601e-01, 8.679455518722534e-01, 8.652586936950684e-01, 8.701275587081909e-01, 8.746317028999329e-01, 8.782848119735718e-01, 8.811874985694885e-01, 9.064823389053345e-01, 9.167653322219849e-01, 9.158584475517273e-01, 9.182152152061462e-01]
+radOnl.bui.zon.phi=[6.920281648635864e-01, 2.007336765527725e-01, 2.851540446281433e-01, 3.223158419132233e-01, 3.485057651996613e-01, 3.712579309940338e-01, 3.919243514537811e-01, 4.09497857093811e-01, 4.21466052532196e-01, 4.340850114822388e-01, 4.50170636177063e-01, 4.62479829788208e-01, 4.714074432849884e-01, 4.81268972158432e-01, 5.031984448432922e-01, 5.230953693389893e-01, 5.304807424545288e-01, 5.244278907775879e-01, 5.044688582420349e-01, 4.813050627708435e-01, 4.478129744529724e-01, 4.256107807159424e-01, 4.382963180541992e-01, 4.605309069156647e-01, 4.712764024734497e-01, 4.849362075328827e-01, 4.998693764209747e-01, 5.082600712776184e-01, 5.151808261871338e-01, 5.163499116897583e-01, 5.212022662162781e-01, 5.365275740623474e-01, 5.584282875061035e-01, 5.845648646354675e-01, 6.001242995262146e-01, 6.000865697860718e-01, 6.092691421508789e-01, 6.184852719306946e-01, 6.268141269683838e-01, 6.375230550765991e-01, 6.472791433334351e-01, 6.433977484703064e-01, 6.480900049209595e-01, 6.726328134536743e-01, 6.893318295478821e-01, 6.843467950820923e-01, 6.795273423194885e-01, 6.87619686126709e-01, 6.969450116157532e-01, 6.77811861038208e-01, 6.497305035591125e-01, 6.744949221611023e-01, 7.15451717376709e-01, 7.023831009864807e-01, 6.856138706207275e-01, 6.852606534957886e-01, 6.809285283088684e-01, 6.811526417732238e-01, 6.866160035133362e-01, 6.890170574188232e-01, 6.737221479415894e-01, 6.683245897293091e-01, 6.692837476730347e-01, 6.679853200912476e-01, 6.552603840827942e-01, 6.359531283378601e-01, 6.341745853424072e-01, 6.200892925262451e-01, 6.233483552932739e-01, 6.231128573417664e-01, 6.160825490951539e-01, 6.042830348014832e-01, 5.825316309928894e-01, 5.650748610496521e-01, 5.656893849372864e-01, 5.722324252128601e-01, 5.812786221504211e-01, 5.919415354728699e-01, 6.480339765548706e-01, 7.577881217002869e-01, 7.955423593521118e-01, 8.0442214012146e-01, 7.9580157995224e-01, 7.797783613204956e-01, 7.885050177574158e-01, 8.061308264732361e-01, 8.428184986114502e-01, 8.708050847053528e-01, 8.896233439445496e-01, 8.69878888130188e-01, 8.52272093296051e-01, 8.404231071472168e-01, 8.383085131645203e-01, 8.437147736549377e-01, 8.48885178565979e-01, 8.533472418785095e-01, 8.570783138275146e-01, 8.772916793823242e-01, 8.84346067905426e-01, 8.840686082839966e-01, 8.867861032485962e-01]
+conOnl.bui.zon.phi=[6.920281648635864e-01, 2.004331052303314e-01, 2.80928909778595e-01, 3.173475563526154e-01, 3.433457016944885e-01, 3.659674823284149e-01, 3.865182101726532e-01, 4.040087163448334e-01, 4.159789383411407e-01, 4.285644888877869e-01, 4.445420801639557e-01, 4.568186402320862e-01, 4.657564461231232e-01, 4.756069183349609e-01, 4.973781108856202e-01, 5.171327590942383e-01, 5.246929526329041e-01, 5.189366340637207e-01, 4.994385838508606e-01, 4.766646921634674e-01, 4.43534791469574e-01, 4.215649366378784e-01, 4.34179276227951e-01, 4.562071263790131e-01, 4.667160212993622e-01, 4.802943766117096e-01, 4.952190816402435e-01, 5.037769079208374e-01, 5.106637477874756e-01, 5.116185545921326e-01, 5.165640115737915e-01, 5.317888259887695e-01, 5.534600019454956e-01, 5.79400897026062e-01, 5.947993993759155e-01, 5.947860479354858e-01, 6.039099097251892e-01, 6.130907535552979e-01, 6.212670803070068e-01, 6.317377686500549e-01, 6.413322687149048e-01, 6.374684572219849e-01, 6.419106125831604e-01, 6.663900017738342e-01, 6.83121919631958e-01, 6.780661344528198e-01, 6.731626987457275e-01, 6.813420057296753e-01, 6.907172799110413e-01, 6.717421412467957e-01, 6.437957286834717e-01, 6.686888337135315e-01, 7.106367945671082e-01, 6.972523927688599e-01, 6.797353029251099e-01, 6.794241070747375e-01, 6.754533648490906e-01, 6.756067872047423e-01, 6.807478070259094e-01, 6.82546854019165e-01, 6.66001558303833e-01, 6.601576805114746e-01, 6.618043780326843e-01, 6.608967781066895e-01, 6.482190489768982e-01, 6.293264627456665e-01, 6.277648210525513e-01, 6.144580841064453e-01, 6.170355677604675e-01, 6.172974109649658e-01, 6.107346415519715e-01, 5.991404056549072e-01, 5.771842002868652e-01, 5.594401955604553e-01, 5.609336495399475e-01, 5.679624676704407e-01, 5.775145292282104e-01, 5.883123278617859e-01, 6.444336175918579e-01, 7.54863440990448e-01, 7.927680611610413e-01, 8.014740347862244e-01, 7.923077344894409e-01, 7.752344608306885e-01, 7.832569479942322e-01, 8.005354404449463e-01, 8.374865055084229e-01, 8.661479353904724e-01, 8.850129842758179e-01, 8.6411452293396e-01, 8.455623388290405e-01, 8.334044218063354e-01, 8.308019638061523e-01, 8.354260921478271e-01, 8.396512269973755e-01, 8.429109454154968e-01, 8.457950353622437e-01, 8.701698184013367e-01, 8.806365728378296e-01, 8.797698020935059e-01, 8.820449709892273e-01]
+latOnl.bui.zon.phi=[6.920281648635864e-01, 2.506264448165894e-01, 3.621837198734283e-01, 4.08942699432373e-01, 4.412014782428741e-01, 4.685825109481812e-01, 4.928787648677826e-01, 5.141199827194214e-01, 5.302698612213135e-01, 5.456295013427734e-01, 5.635335445404053e-01, 5.785274505615234e-01, 5.901100635528564e-01, 6.02496325969696e-01, 6.27160370349884e-01, 6.494482159614563e-01, 6.560018062591553e-01, 6.463561654090881e-01, 6.214399933815002e-01, 5.922167897224426e-01, 5.506254434585571e-01, 5.218131542205811e-01, 5.304720401763916e-01, 5.496364235877991e-01, 5.573249459266663e-01, 5.685790181159973e-01, 5.813630223274231e-01, 5.877184867858887e-01, 5.920844078063965e-01, 5.916597247123718e-01, 5.967106819152832e-01, 6.127094626426697e-01, 6.355854272842407e-01, 6.629051566123962e-01, 6.79462730884552e-01, 6.800698637962341e-01, 6.903964281082153e-01, 7.025514245033264e-01, 7.138271331787109e-01, 7.270546555519104e-01, 7.384023666381836e-01, 7.303799390792847e-01, 7.329595685005188e-01, 7.614488005638123e-01, 7.805335521697998e-01, 7.730613350868225e-01, 7.668020129203796e-01, 7.77626097202301e-01, 7.897945642471313e-01, 7.703588008880615e-01, 7.413669228553772e-01, 7.705327868461609e-01, 8.196547031402588e-01, 8.048879504203796e-01, 7.840370535850525e-01, 7.845571637153625e-01, 7.819794416427612e-01, 7.822385430335997e-01, 7.867093682289124e-01, 7.861635088920593e-01, 7.651873826980591e-01, 7.568434476852417e-01, 7.589060068130493e-01, 7.578383684158325e-01, 7.424651980400085e-01, 7.182966470718384e-01, 7.170516848564148e-01, 7.003825306892395e-01, 7.022732496261597e-01, 7.013059258460999e-01, 6.92991077899933e-01, 6.796424388885498e-01, 6.546476483345032e-01, 6.345112919807434e-01, 6.355416774749756e-01, 6.424351334571838e-01, 6.522516012191772e-01, 6.632125377655029e-01, 7.223180532455444e-01, 8.397555947303772e-01, 8.808125853538513e-01, 8.909489512443542e-01, 8.809734582901001e-01, 8.615062832832336e-01, 8.696739673614502e-01, 8.87937068939209e-01, 9.284259676933289e-01, 9.607370495796204e-01, 9.811859726905823e-01, 9.581921100616455e-01, 9.377896785736084e-01, 9.245560765266418e-01, 9.211301207542419e-01, 9.251518845558167e-01, 9.287818670272827e-01, 9.316153526306152e-01, 9.338772892951965e-01, 9.624585509300232e-01, 9.762006402015686e-01, 9.754291176795959e-01, 9.77938175201416e-01]
+noGai.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.026948099024594e-03, 9.539233287796378e-04, 9.704637341201305e-04, 9.923506295308471e-04, 1.017352682538331e-03, 1.045021344907582e-03, 1.061248360201716e-03, 1.055483473464847e-03, 1.066420925781131e-03, 1.095465966500342e-03, 1.104695489630103e-03, 1.104814582504332e-03, 1.108384807594121e-03, 1.14049983676523e-03, 1.169949886389077e-03, 1.202537794597447e-03, 1.231002388522029e-03, 1.238849246874452e-03, 1.25028018373996e-03, 1.255866140127182e-03, 1.2789536267519e-03, 1.393043319694698e-03, 1.538868760690093e-03, 1.652875915169716e-03, 1.771388109773397e-03, 1.874288427643478e-03, 1.947958720847964e-03, 2.028925344347954e-03, 2.083431929349899e-03, 2.109102439135313e-03, 2.164831617847085e-03, 2.238929504528642e-03, 2.32948362827301e-03, 2.374796662479639e-03, 2.359056612476707e-03, 2.376851625740528e-03, 2.363910898566246e-03, 2.347886795178056e-03, 2.344902139157057e-03, 2.353193005546927e-03, 2.418301533907652e-03, 2.472885185852647e-03, 2.513648942112923e-03, 2.546178875491023e-03, 2.570052398368716e-03, 2.573020989075303e-03, 2.561994595453143e-03, 2.54806992597878e-03, 2.469748025760055e-03, 2.36291135661304e-03, 2.342368243262172e-03, 2.318158745765686e-03, 2.299766289070249e-03, 2.320216270163655e-03, 2.294746227562427e-03, 2.235954860225319e-03, 2.23528640344739e-03, 2.280676038935781e-03, 2.363980514928699e-03, 2.444517565891147e-03, 2.473077736794949e-03, 2.47099925763905e-03, 2.469632076099515e-03, 2.462144242599607e-03, 2.470926381647587e-03, 2.45716841891408e-03, 2.477127825841308e-03, 2.536185318604112e-03, 2.594537567347288e-03, 2.625899156555533e-03, 2.631423063576221e-03, 2.633647294715047e-03, 2.634552773088217e-03, 2.65972618944943e-03, 2.709775231778622e-03, 2.759856637567282e-03, 2.824879949912429e-03, 3.046291181817651e-03, 3.397233551368117e-03, 3.469485323876143e-03, 3.449162468314171e-03, 3.439993131905794e-03, 3.473202930763364e-03, 3.523725783452392e-03, 3.583155106753111e-03, 3.622061805799603e-03, 3.589581698179245e-03, 3.594202222302556e-03, 3.620804753154516e-03, 3.612625878304243e-03, 3.5984106361866e-03, 3.634145716205239e-03, 3.709478303790092e-03, 3.787365276366472e-03, 3.860007273033261e-03, 3.918596543371677e-03, 3.797064768150449e-03, 3.621227573603392e-03, 3.609488718211651e-03, 3.60938417725265e-03]
+radOnl.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.026948099024594e-03, 9.539233287796378e-04, 9.704637341201305e-04, 9.923506295308471e-04, 1.017352682538331e-03, 1.045021344907582e-03, 1.061248360201716e-03, 1.055483473464847e-03, 1.066420925781131e-03, 1.095465966500342e-03, 1.104695489630103e-03, 1.104814582504332e-03, 1.108384807594121e-03, 1.14049983676523e-03, 1.169949886389077e-03, 1.202537794597447e-03, 1.231002388522029e-03, 1.238849246874452e-03, 1.25028018373996e-03, 1.255866140127182e-03, 1.2789536267519e-03, 1.393043319694698e-03, 1.538868760690093e-03, 1.652875915169716e-03, 1.771388109773397e-03, 1.874288427643478e-03, 1.947958720847964e-03, 2.028925344347954e-03, 2.083431929349899e-03, 2.109102439135313e-03, 2.164831617847085e-03, 2.238929504528642e-03, 2.32948362827301e-03, 2.374796662479639e-03, 2.359056612476707e-03, 2.376851625740528e-03, 2.363910898566246e-03, 2.347886795178056e-03, 2.344902139157057e-03, 2.353193005546927e-03, 2.418301533907652e-03, 2.472885185852647e-03, 2.513648942112923e-03, 2.546178875491023e-03, 2.570052398368716e-03, 2.573020989075303e-03, 2.561994595453143e-03, 2.54806992597878e-03, 2.469748025760055e-03, 2.36291135661304e-03, 2.342354971915483e-03, 2.318074926733971e-03, 2.29966570623219e-03, 2.32014711946249e-03, 2.294681267812848e-03, 2.235872205346822e-03, 2.235196763649583e-03, 2.280592918395996e-03, 2.363916020840406e-03, 2.444498939439654e-03, 2.473089145496488e-03, 2.471011597663164e-03, 2.469634171575308e-03, 2.462146338075399e-03, 2.470944309607148e-03, 2.457194495946169e-03, 2.477180445566773e-03, 2.536275424063206e-03, 2.594651188701391e-03, 2.626037690788507e-03, 2.631583483889699e-03, 2.633836586028337e-03, 2.63477093540132e-03, 2.659961115568876e-03, 2.71002552472055e-03, 2.759987721219659e-03, 2.825014991685748e-03, 3.046559868380427e-03, 3.397466149181128e-03, 3.469685092568398e-03, 3.449340118095279e-03, 3.440166357904673e-03, 3.473397577181458e-03, 3.523831255733967e-03, 3.583254525437951e-03, 3.622084157541394e-03, 3.589595435187221e-03, 3.594299778342247e-03, 3.620927920565009e-03, 3.612768836319447e-03, 3.598560811951756e-03, 3.634304273873568e-03, 3.709647106006742e-03, 3.787543624639511e-03, 3.860193537548184e-03, 3.918786998838186e-03, 3.797237062826753e-03, 3.621358657255769e-03, 3.609607927501202e-03, 3.609497798606753e-03]
+conOnl.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.026948099024594e-03, 9.539233287796378e-04, 9.704637341201305e-04, 9.923506295308471e-04, 1.017352682538331e-03, 1.045021344907582e-03, 1.061248360201716e-03, 1.055483473464847e-03, 1.066420925781131e-03, 1.095465966500342e-03, 1.104695489630103e-03, 1.104814582504332e-03, 1.108384807594121e-03, 1.14049983676523e-03, 1.169949886389077e-03, 1.202537794597447e-03, 1.231002388522029e-03, 1.238849246874452e-03, 1.25028018373996e-03, 1.255866140127182e-03, 1.2789536267519e-03, 1.393043319694698e-03, 1.538868760690093e-03, 1.652875915169716e-03, 1.771388109773397e-03, 1.874288427643478e-03, 1.947958720847964e-03, 2.028925344347954e-03, 2.083431929349899e-03, 2.109102439135313e-03, 2.164831617847085e-03, 2.238929504528642e-03, 2.32948362827301e-03, 2.374796662479639e-03, 2.359056612476707e-03, 2.376851625740528e-03, 2.363910898566246e-03, 2.347886795178056e-03, 2.344902139157057e-03, 2.353193005546927e-03, 2.418301533907652e-03, 2.472885185852647e-03, 2.513648942112923e-03, 2.546178875491023e-03, 2.570052398368716e-03, 2.573020989075303e-03, 2.561994595453143e-03, 2.54806992597878e-03, 2.469748025760055e-03, 2.36291135661304e-03, 2.342356368899345e-03, 2.318063052371144e-03, 2.299651270732284e-03, 2.320136642083526e-03, 2.29467055760324e-03, 2.235858468338847e-03, 2.235182095319033e-03, 2.280578715726733e-03, 2.363905310630798e-03, 2.444498939439654e-03, 2.473100321367383e-03, 2.471022540703416e-03, 2.469636034220457e-03, 2.462147735059261e-03, 2.470953390002251e-03, 2.457207767292857e-03, 2.477202098816633e-03, 2.536313841119409e-03, 2.594692865386605e-03, 2.626082161441445e-03, 2.63163261115551e-03, 2.633894793689251e-03, 2.634848700836301e-03, 2.660036785528064e-03, 2.710092579945922e-03, 2.760017057880759e-03, 2.825042465701699e-03, 3.046612488105893e-03, 3.397498512640595e-03, 3.469706978648901e-03, 3.449359675869346e-03, 3.440188011154532e-03, 3.473429940640926e-03, 3.523854073137045e-03, 3.583277342841029e-03, 3.622089512646198e-03, 3.589598229154944e-03, 3.594317007809877e-03, 3.62095283344388e-03, 3.612805856391788e-03, 3.598603885620832e-03, 3.634353168308735e-03, 3.709704615175724e-03, 3.787612076848745e-03, 3.860275493934751e-03, 3.918882459402084e-03, 3.797315759584308e-03, 3.621380543336272e-03, 3.609625622630119e-03, 3.60951735638082e-03]
+latOnl.bui.zon.ports[1].Xi_outflow[1]=[9.999999776482582e-03, 1.264317310415208e-03, 1.193282776512206e-03, 1.209839945659041e-03, 1.231726841069758e-03, 1.256729010492563e-03, 1.284397556446493e-03, 1.300624688155949e-03, 1.294859801419079e-03, 1.305797253735363e-03, 1.334842294454575e-03, 1.344071701169014e-03, 1.344190910458565e-03, 1.347761135548353e-03, 1.379876164719462e-03, 1.409326214343309e-03, 1.44191412255168e-03, 1.47037860006094e-03, 1.478225574828684e-03, 1.489656511694193e-03, 1.495242468081415e-03, 1.518329954706132e-03, 1.632419647648931e-03, 1.778245088644326e-03, 1.892252243123949e-03, 2.010764321312308e-03, 2.113664755597711e-03, 2.187334932386875e-03, 2.268301788717509e-03, 2.32280814088881e-03, 2.348478883504868e-03, 2.404207829385996e-03, 2.478305948898196e-03, 2.568860072642565e-03, 2.61417287401855e-03, 2.598433056846261e-03, 2.616228070110083e-03, 2.603287110105157e-03, 2.587263006716967e-03, 2.584278583526611e-03, 2.592569449916482e-03, 2.657677978277206e-03, 2.712261397391558e-03, 2.753025153651834e-03, 2.785555087029934e-03, 2.809428609907627e-03, 2.812397200614214e-03, 2.801370806992054e-03, 2.787446137517691e-03, 2.709124470129609e-03, 2.602287568151951e-03, 2.581743523478508e-03, 2.557531930506229e-03, 2.539138775318861e-03, 2.559589687734842e-03, 2.534119877964258e-03, 2.475328044965863e-03, 2.474659355357289e-03, 2.52004899084568e-03, 2.603354165330529e-03, 2.683892613276839e-03, 2.712453948333859e-03, 2.710375702008605e-03, 2.709008287638426e-03, 2.701520454138517e-03, 2.710303291678429e-03, 2.696545328944921e-03, 2.71650543436408e-03, 2.77556455694139e-03, 2.833917504176497e-03, 2.865279791876674e-03, 2.870804397389293e-03, 2.873029327020049e-03, 2.873935969546437e-03, 2.899110084399581e-03, 2.949159126728773e-03, 2.999236807227135e-03, 3.064260119572282e-03, 3.285675309598446e-03, 3.636616282165051e-03, 3.708866890519857e-03, 3.688543336465955e-03, 3.679374000057578e-03, 3.712584730237722e-03, 3.763105254620314e-03, 3.822534345090389e-03, 3.861438948661089e-03, 3.828958375379443e-03, 3.833580994978547e-03, 3.860184224322438e-03, 3.852006513625383e-03, 3.837791504338384e-03, 3.873526817187667e-03, 3.948859870433807e-03, 4.026747308671474e-03, 4.099390003830194e-03, 4.157979506999254e-03, 4.036447033286095e-03, 3.860607277601957e-03, 3.848867956548929e-03, 3.848763415589929e-03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt
index 54196af93a3..0f9c754f159 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneCompareZoneTemperatureOutput.txt
@@ -1,11 +1,11 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1.728e+05]
-zon.TAir=[2.931499938964844e+02, 2.89828125e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860071716308594e+02, 2.856974487304688e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.842337646484375e+02, 2.842373046875e+02, 2.847561645507812e+02, 2.854774780273438e+02, 2.861921997070312e+02, 2.869447326660156e+02, 2.875782775878906e+02, 2.881309814453125e+02, 2.884737243652344e+02, 2.8873046875e+02, 2.8872509765625e+02, 2.88583984375e+02, 2.885115966796875e+02, 2.884052734375e+02, 2.883439636230469e+02, 2.882599487304688e+02, 2.880711059570312e+02, 2.877637329101562e+02, 2.874297485351562e+02, 2.87084716796875e+02, 2.867377014160156e+02, 2.86455322265625e+02, 2.861634521484375e+02, 2.858768615722656e+02, 2.855896911621094e+02, 2.853321228027344e+02, 2.851710815429688e+02, 2.85024658203125e+02, 2.848415832519531e+02, 2.846653747558594e+02, 2.845061950683594e+02, 2.843477172851562e+02, 2.841477355957031e+02, 2.839423522949219e+02, 2.837708129882812e+02, 2.836084594726562e+02, 2.837765808105469e+02, 2.8351220703125e+02, 2.833832397460938e+02, 2.83313720703125e+02, 2.831880798339844e+02, 2.830352172851562e+02, 2.829215393066406e+02, 2.828407287597656e+02, 2.827934265136719e+02, 2.827989807128906e+02, 2.827770385742188e+02, 2.827039489746094e+02, 2.824579162597656e+02, 2.823704833984375e+02, 2.830442199707031e+02, 2.833937683105469e+02, 2.840579833984375e+02, 2.846080932617188e+02, 2.85009765625e+02, 2.854508361816406e+02, 2.858143615722656e+02, 2.861561279296875e+02, 2.865264282226562e+02, 2.868716735839844e+02, 2.871799621582031e+02, 2.872827453613281e+02, 2.875290222167969e+02, 2.878594360351562e+02, 2.8786865234375e+02, 2.878578796386719e+02, 2.87806396484375e+02, 2.877159423828125e+02, 2.876463623046875e+02, 2.873435363769531e+02, 2.870802917480469e+02, 2.862915649414062e+02, 2.858121032714844e+02, 2.850321960449219e+02, 2.847362365722656e+02, 2.845762634277344e+02, 2.844200134277344e+02, 2.84289794921875e+02, 2.841806335449219e+02, 2.840879516601562e+02, 2.840108032226562e+02, 2.839365234375e+02, 2.837594299316406e+02, 2.835333251953125e+02, 2.833870849609375e+02, 2.832453918457031e+02]
-zonMeaAirTem.y=[2.931499938964844e+02, 2.898396911621094e+02, 2.894094848632812e+02, 2.886500549316406e+02, 2.8808837890625e+02, 2.876016845703125e+02, 2.871734619140625e+02, 2.867643127441406e+02, 2.86359375e+02, 2.861113586425781e+02, 2.857823486328125e+02, 2.854642333984375e+02, 2.85146240234375e+02, 2.848397827148438e+02, 2.845384216308594e+02, 2.842515563964844e+02, 2.842255249023438e+02, 2.845551452636719e+02, 2.852675476074219e+02, 2.860062561035156e+02, 2.868001403808594e+02, 2.874783935546875e+02, 2.880802307128906e+02, 2.884486694335938e+02, 2.887267150878906e+02, 2.887627868652344e+02, 2.886537780761719e+02, 2.885216064453125e+02, 2.884242858886719e+02, 2.883582458496094e+02, 2.882716064453125e+02, 2.880967712402344e+02, 2.877847900390625e+02, 2.874344177246094e+02, 2.8719970703125e+02, 2.868174743652344e+02, 2.865244140625e+02, 2.862195739746094e+02, 2.859210815429688e+02, 2.856211547851562e+02, 2.853462219238281e+02, 2.851753540039062e+02, 2.850793151855469e+02, 2.84895263671875e+02, 2.847082824707031e+02, 2.845388793945312e+02, 2.843784484863281e+02, 2.841734313964844e+02, 2.839578857421875e+02, 2.837777404785156e+02, 2.836658020019531e+02, 2.83845458984375e+02, 2.835740356445312e+02, 2.834025268554688e+02, 2.83328369140625e+02, 2.832090454101562e+02, 2.830492858886719e+02, 2.829267578125e+02, 2.82841796875e+02, 2.828016967773438e+02, 2.827962341308594e+02, 2.827913208007812e+02, 2.827186889648438e+02, 2.82497802734375e+02, 2.8237548828125e+02, 2.829873046875e+02, 2.833898315429688e+02, 2.834927673339844e+02, 2.845289611816406e+02, 2.849010925292969e+02, 2.853640747070312e+02, 2.857587280273438e+02, 2.861112365722656e+02, 2.864966430664062e+02, 2.868578796386719e+02, 2.870765075683594e+02, 2.872030639648438e+02, 2.874695129394531e+02, 2.878343200683594e+02, 2.878731689453125e+02, 2.878584594726562e+02, 2.878153991699219e+02, 2.877218017578125e+02, 2.876474914550781e+02, 2.874519958496094e+02, 2.871398620605469e+02, 2.864907836914062e+02, 2.85870849609375e+02, 2.851677856445312e+02, 2.8475341796875e+02, 2.845884094238281e+02, 2.844241027832031e+02, 2.843305358886719e+02, 2.842109375e+02, 2.841097717285156e+02, 2.840264892578125e+02, 2.839537353515625e+02, 2.837866516113281e+02, 2.835470886230469e+02, 2.833931274414062e+02, 2.832942504882812e+02]
+zon.TAir=[2.931499938964844e+02, 2.898281555175781e+02, 2.891467895507812e+02, 2.885250244140625e+02, 2.879981994628906e+02, 2.875408630371094e+02, 2.871351928710938e+02, 2.867419738769531e+02, 2.863540954589844e+02, 2.860072021484375e+02, 2.856974792480469e+02, 2.853902893066406e+02, 2.850880432128906e+02, 2.847944641113281e+02, 2.845064392089844e+02, 2.842337951660156e+02, 2.842373046875e+02, 2.847561645507812e+02, 2.854774780273438e+02, 2.861921997070312e+02, 2.869447326660156e+02, 2.875782775878906e+02, 2.881309814453125e+02, 2.884737243652344e+02, 2.8873046875e+02, 2.887251281738281e+02, 2.88583984375e+02, 2.885116271972656e+02, 2.884053039550781e+02, 2.883439636230469e+02, 2.882599487304688e+02, 2.880711364746094e+02, 2.877638244628906e+02, 2.874297790527344e+02, 2.870847473144531e+02, 2.867377319335938e+02, 2.864553527832031e+02, 2.861634521484375e+02, 2.858768920898438e+02, 2.855897216796875e+02, 2.853322143554688e+02, 2.851711120605469e+02, 2.850246887207031e+02, 2.848415832519531e+02, 2.846654052734375e+02, 2.845062255859375e+02, 2.843477478027344e+02, 2.841477355957031e+02, 2.839423828125e+02, 2.837708435058594e+02, 2.836084594726562e+02, 2.837765808105469e+02, 2.835121459960938e+02, 2.833832702636719e+02, 2.83313720703125e+02, 2.831880798339844e+02, 2.830352172851562e+02, 2.829215698242188e+02, 2.828407592773438e+02, 2.8279345703125e+02, 2.827990112304688e+02, 2.827770690917969e+02, 2.827039794921875e+02, 2.824579467773438e+02, 2.823705139160156e+02, 2.830442199707031e+02, 2.833937683105469e+02, 2.840579833984375e+02, 2.846080932617188e+02, 2.85009765625e+02, 2.854508361816406e+02, 2.858143615722656e+02, 2.861561279296875e+02, 2.865264282226562e+02, 2.868716735839844e+02, 2.871799621582031e+02, 2.8728271484375e+02, 2.875290222167969e+02, 2.878594360351562e+02, 2.878686218261719e+02, 2.878578491210938e+02, 2.87806396484375e+02, 2.877159729003906e+02, 2.876463928222656e+02, 2.873435668945312e+02, 2.870802917480469e+02, 2.862915649414062e+02, 2.858121032714844e+02, 2.850322265625e+02, 2.847362670898438e+02, 2.845762939453125e+02, 2.844200439453125e+02, 2.842898254394531e+02, 2.841806640625e+02, 2.840879821777344e+02, 2.840108337402344e+02, 2.839365234375e+02, 2.837593994140625e+02, 2.835333251953125e+02, 2.833870849609375e+02, 2.832453918457031e+02]
+zonMeaAirTem.y=[2.931499938964844e+02, 2.898396911621094e+02, 2.894094848632812e+02, 2.886500549316406e+02, 2.8808837890625e+02, 2.876016845703125e+02, 2.871734619140625e+02, 2.867643127441406e+02, 2.863594055175781e+02, 2.861113891601562e+02, 2.857823486328125e+02, 2.854642333984375e+02, 2.85146240234375e+02, 2.848397827148438e+02, 2.845384216308594e+02, 2.842515563964844e+02, 2.842255249023438e+02, 2.845551452636719e+02, 2.852675476074219e+02, 2.860062561035156e+02, 2.868001403808594e+02, 2.874783935546875e+02, 2.880802307128906e+02, 2.884486999511719e+02, 2.887267150878906e+02, 2.887628173828125e+02, 2.8865380859375e+02, 2.885216064453125e+02, 2.8842431640625e+02, 2.883582458496094e+02, 2.882716064453125e+02, 2.880968017578125e+02, 2.877848815917969e+02, 2.874344177246094e+02, 2.871997375488281e+02, 2.868175048828125e+02, 2.865244445800781e+02, 2.862195739746094e+02, 2.859210815429688e+02, 2.856211547851562e+02, 2.853463134765625e+02, 2.851753845214844e+02, 2.85079345703125e+02, 2.84895263671875e+02, 2.847083129882812e+02, 2.845389099121094e+02, 2.843784790039062e+02, 2.841734619140625e+02, 2.839578857421875e+02, 2.837777404785156e+02, 2.836658020019531e+02, 2.838454284667969e+02, 2.835740661621094e+02, 2.834025573730469e+02, 2.83328369140625e+02, 2.832090454101562e+02, 2.830492553710938e+02, 2.829267883300781e+02, 2.828418273925781e+02, 2.828017272949219e+02, 2.827962646484375e+02, 2.827913513183594e+02, 2.827186889648438e+02, 2.824978332519531e+02, 2.8237548828125e+02, 2.829873046875e+02, 2.833898315429688e+02, 2.834927673339844e+02, 2.845289611816406e+02, 2.849010925292969e+02, 2.853640441894531e+02, 2.857587280273438e+02, 2.861112365722656e+02, 2.864966125488281e+02, 2.868578796386719e+02, 2.870764770507812e+02, 2.872030639648438e+02, 2.87469482421875e+02, 2.878342895507812e+02, 2.878731384277344e+02, 2.878584594726562e+02, 2.878153991699219e+02, 2.877218017578125e+02, 2.876474914550781e+02, 2.874519653320312e+02, 2.871398620605469e+02, 2.864907531738281e+02, 2.85870849609375e+02, 2.851678161621094e+02, 2.8475341796875e+02, 2.845884094238281e+02, 2.844241333007812e+02, 2.8433056640625e+02, 2.842109375e+02, 2.841097717285156e+02, 2.840265197753906e+02, 2.839537353515625e+02, 2.837866516113281e+02, 2.83547119140625e+02, 2.833931274414062e+02, 2.832942504882812e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneOneYear.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneOneYear.txt
index 4aab13bc779..d507ae9bd0c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneOneYear.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_OneZoneOneYear.txt
@@ -1,10 +1,10 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "4",
+  "number of continuous time states": "5",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 3.1536e+07]
-TAirMea.y=[0e+00, 2.825983581542969e+02, 2.730756530761719e+02, 2.8312744140625e+02, 2.769714050292969e+02, 2.869824829101562e+02, 2.8375439453125e+02, 2.820562133789062e+02, 2.718554382324219e+02, 2.771228942871094e+02, 2.748612060546875e+02, 2.844999084472656e+02, 2.863029174804688e+02, 2.847507019042969e+02, 2.819076843261719e+02, 2.894292907714844e+02, 2.825966491699219e+02, 2.862310180664062e+02, 2.854764709472656e+02, 2.964141845703125e+02, 2.91286865234375e+02, 2.904748229980469e+02, 2.942588806152344e+02, 2.876712341308594e+02, 2.938710632324219e+02, 2.861567687988281e+02, 2.870419006347656e+02, 2.869631652832031e+02, 2.993965454101562e+02, 3.090080871582031e+02, 3.066840515136719e+02, 2.95281494140625e+02, 2.969550170898438e+02, 2.947122802734375e+02, 3.078475341796875e+02, 3.001766052246094e+02, 3.033675231933594e+02, 3.015992126464844e+02, 3.009010009765625e+02, 3.086333312988281e+02, 3.083643798828125e+02, 3.078685913085938e+02, 3.10225830078125e+02, 3.112720336914062e+02, 3.091247863769531e+02, 3.082919921875e+02, 3.124841918945312e+02, 3.123182983398438e+02, 3.060498962402344e+02, 3.134604187011719e+02, 3.04813232421875e+02, 3.149393310546875e+02, 3.093801574707031e+02, 3.098539123535156e+02, 3.136572875976562e+02, 3.176686706542969e+02, 3.135605773925781e+02, 3.153508605957031e+02, 3.128939208984375e+02, 3.162317199707031e+02, 3.084239501953125e+02, 3.1052978515625e+02, 3.076678771972656e+02, 3.101630249023438e+02, 3.111210327148438e+02, 3.09801025390625e+02, 3.086894836425781e+02, 3.090810852050781e+02, 3.117093200683594e+02, 3.08712158203125e+02, 3.077208557128906e+02, 3.042322998046875e+02, 3.009418334960938e+02, 3.014975280761719e+02, 3.088783264160156e+02, 3.021427612304688e+02, 3.003684997558594e+02, 2.939296875e+02, 2.987499389648438e+02, 2.898831787109375e+02, 2.953387756347656e+02, 2.973695983886719e+02, 2.959579467773438e+02, 2.975739135742188e+02, 2.996260070800781e+02, 2.950267639160156e+02, 2.925527954101562e+02, 2.872812194824219e+02, 2.911785583496094e+02, 2.881097717285156e+02, 2.853121643066406e+02, 2.787710571289062e+02, 2.804164123535156e+02, 2.85761474609375e+02, 2.802783508300781e+02, 2.821504821777344e+02, 2.759117736816406e+02, 2.762675476074219e+02, 2.789262084960938e+02, 2.801004943847656e+02, 2.754611511230469e+02]
+TAirMea.y=[0e+00, 2.825983276367188e+02, 2.730755920410156e+02, 2.831275329589844e+02, 2.769714050292969e+02, 2.86982421875e+02, 2.837543640136719e+02, 2.820561218261719e+02, 2.71855224609375e+02, 2.771227111816406e+02, 2.748612976074219e+02, 2.844999084472656e+02, 2.863029174804688e+02, 2.847506713867188e+02, 2.819075927734375e+02, 2.894292602539062e+02, 2.825966491699219e+02, 2.862309875488281e+02, 2.854764404296875e+02, 2.964140930175781e+02, 2.912867736816406e+02, 2.904748229980469e+02, 2.942587890625e+02, 2.876712646484375e+02, 2.938711242675781e+02, 2.861567993164062e+02, 2.870419311523438e+02, 2.869631652832031e+02, 2.993965454101562e+02, 3.090080261230469e+02, 3.066839904785156e+02, 2.952817077636719e+02, 2.969549865722656e+02, 2.947123107910156e+02, 3.078486328125e+02, 3.00176513671875e+02, 3.033675537109375e+02, 3.015990905761719e+02, 3.009010314941406e+02, 3.086357116699219e+02, 3.083641357421875e+02, 3.078685302734375e+02, 3.10225830078125e+02, 3.112752990722656e+02, 3.091243591308594e+02, 3.082919006347656e+02, 3.124841613769531e+02, 3.123182983398438e+02, 3.060498657226562e+02, 3.134615173339844e+02, 3.048131713867188e+02, 3.14939208984375e+02, 3.093801574707031e+02, 3.098539428710938e+02, 3.136583862304688e+02, 3.176681213378906e+02, 3.135622863769531e+02, 3.153523254394531e+02, 3.128969421386719e+02, 3.162312927246094e+02, 3.084238586425781e+02, 3.105310668945312e+02, 3.076676330566406e+02, 3.101629943847656e+02, 3.111211547851562e+02, 3.098010559082031e+02, 3.086894836425781e+02, 3.090810546875e+02, 3.117110900878906e+02, 3.087121887207031e+02, 3.077207641601562e+02, 3.042322387695312e+02, 3.009418029785156e+02, 3.014975891113281e+02, 3.088783264160156e+02, 3.021427612304688e+02, 3.003684997558594e+02, 2.939296264648438e+02, 2.987499389648438e+02, 2.898831787109375e+02, 2.953387756347656e+02, 2.973695678710938e+02, 2.959578552246094e+02, 2.975740356445312e+02, 2.996259765625e+02, 2.950267944335938e+02, 2.925527648925781e+02, 2.872812805175781e+02, 2.911784973144531e+02, 2.881098327636719e+02, 2.853119812011719e+02, 2.787709350585938e+02, 2.804163818359375e+02, 2.857615051269531e+02, 2.802782287597656e+02, 2.821504821777344e+02, 2.759116516113281e+02, 2.762674865722656e+02, 2.789261779785156e+02, 2.801004333496094e+02, 2.754611511230469e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_RefBldgSmallOffice.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_RefBldgSmallOffice.txt
index 6d8395b0ad1..4f5c45d34b7 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_RefBldgSmallOffice.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_RefBldgSmallOffice.txt
@@ -1,19 +1,19 @@
-last-generated=2022-01-10
+last-generated=2024-03-23
 statistics-simulation=
 {
   "linear": "0, 0, 0, 0, 0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "18",
+  "number of continuous time states": "24",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6.048e+05]
 building.weaBus.TDryBul=[2.609500122070312e+02, 2.612774658203125e+02, 2.621011047363281e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.634906005859375e+02, 2.665859985351562e+02, 2.694419860839844e+02, 2.715532531738281e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.711899108886719e+02, 2.720211181640625e+02, 2.720336303710938e+02, 2.714474182128906e+02, 2.693314514160156e+02, 2.698616027832031e+02, 2.713856811523438e+02, 2.721641845703125e+02, 2.72510986328125e+02, 2.73510009765625e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.725921325683594e+02, 2.73848876953125e+02, 2.725499877929688e+02, 2.740790100097656e+02, 2.75053955078125e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.733664245605469e+02, 2.7306201171875e+02, 2.712139892578125e+02, 2.697578430175781e+02, 2.687122497558594e+02, 2.691380004882812e+02, 2.701607055664062e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.700260009765625e+02, 2.698500061035156e+02, 2.703376159667969e+02, 2.707337341308594e+02, 2.714786071777344e+02, 2.720499877929688e+02, 2.726159973144531e+02, 2.7205712890625e+02, 2.703059997558594e+02, 2.684580078125e+02, 2.684077453613281e+02, 2.6806201171875e+02, 2.662139892578125e+02, 2.661690368652344e+02, 2.658251953125e+02, 2.615640869140625e+02, 2.582152099609375e+02, 2.592766723632812e+02, 2.610854797363281e+02, 2.64716796875e+02, 2.666700134277344e+02, 2.690650634765625e+02, 2.692225952148438e+02, 2.680060119628906e+02, 2.665409545898438e+02, 2.646900024414062e+02, 2.639419860839844e+02, 2.62093994140625e+02, 2.614129638671875e+02, 2.591625671386719e+02, 2.5875e+02, 2.582370910644531e+02, 2.594412841796875e+02, 2.609939880371094e+02, 2.616118469238281e+02, 2.618193054199219e+02, 2.608738708496094e+02, 2.578509826660156e+02, 2.558468933105469e+02, 2.543108673095703e+02, 2.552683868408203e+02, 2.542709197998047e+02, 2.536540069580078e+02, 2.5264599609375e+02, 2.515209808349609e+02, 2.503481140136719e+02, 2.545215454101562e+02, 2.581070861816406e+02, 2.589879760742188e+02, 2.603697204589844e+02, 2.595094604492188e+02, 2.568208923339844e+02, 2.548866882324219e+02, 2.541324615478516e+02, 2.532756500244141e+02, 2.531499938964844e+02]
-att.TAir=[2.931499938964844e+02, 2.696248168945312e+02, 2.647601623535156e+02, 2.63364990234375e+02, 2.6276025390625e+02, 2.640167846679688e+02, 2.708334655761719e+02, 2.774606323242188e+02, 2.775429382324219e+02, 2.76203369140625e+02, 2.729412231445312e+02, 2.704309692382812e+02, 2.701553039550781e+02, 2.6967822265625e+02, 2.689847717285156e+02, 2.671961059570312e+02, 2.667991638183594e+02, 2.670057373046875e+02, 2.686084594726562e+02, 2.698638000488281e+02, 2.73572021484375e+02, 2.777263488769531e+02, 2.818173828125e+02, 2.806719055175781e+02, 2.763956909179688e+02, 2.735576782226562e+02, 2.730130920410156e+02, 2.734389343261719e+02, 2.727853088378906e+02, 2.720330200195312e+02, 2.721970520019531e+02, 2.72544677734375e+02, 2.71431640625e+02, 2.700368957519531e+02, 2.717043762207031e+02, 2.752597351074219e+02, 2.778642578125e+02, 2.78311767578125e+02, 2.75982177734375e+02, 2.716326293945312e+02, 2.700375366210938e+02, 2.693694458007812e+02, 2.693882751464844e+02, 2.694241333007812e+02, 2.694200134277344e+02, 2.694412231445312e+02, 2.690862426757812e+02, 2.690427551269531e+02, 2.708045654296875e+02, 2.745776672363281e+02, 2.781505432128906e+02, 2.799072875976562e+02, 2.776781616210938e+02, 2.728068542480469e+02, 2.699087524414062e+02, 2.68599609375e+02, 2.683686218261719e+02, 2.660908203125e+02, 2.651639099121094e+02, 2.646791076660156e+02, 2.622530822753906e+02, 2.588396911621094e+02, 2.591715087890625e+02, 2.652519226074219e+02, 2.734272766113281e+02, 2.759183959960938e+02, 2.743995361328125e+02, 2.704246520996094e+02, 2.674799194335938e+02, 2.658499755859375e+02, 2.639935302734375e+02, 2.624991149902344e+02, 2.612293090820312e+02, 2.600739135742188e+02, 2.580213317871094e+02, 2.568417358398438e+02, 2.567158203125e+02, 2.617373352050781e+02, 2.688350524902344e+02, 2.696946411132812e+02, 2.683190612792969e+02, 2.653942260742187e+02, 2.591013488769532e+02, 2.558493347167969e+02, 2.534477386474609e+02, 2.529349517822266e+02, 2.524608001708984e+02, 2.516675262451172e+02, 2.506843414306641e+02, 2.498428802490234e+02, 2.482627716064453e+02, 2.535536956787109e+02, 2.640339050292969e+02, 2.706552124023438e+02, 2.713716735839844e+02, 2.663323669433594e+02, 2.590909423828125e+02, 2.551817626953125e+02, 2.528053436279297e+02, 2.510861053466797e+02, 2.500682220458984e+02]
-cor.TAir=[2.931499938964844e+02, 2.946612243652344e+02, 2.942890014648438e+02, 2.939961547851562e+02, 2.937220153808594e+02, 2.935696411132812e+02, 2.935811767578125e+02, 2.934848937988281e+02, 2.9327685546875e+02, 2.930759582519531e+02, 2.928512878417969e+02, 2.926496276855469e+02, 2.924866638183594e+02, 2.923476257324219e+02, 2.922124328613281e+02, 2.922347412109375e+02, 2.921414184570312e+02, 2.920442504882812e+02, 2.920669555664062e+02, 2.9226611328125e+02, 2.942557983398438e+02, 2.948258056640625e+02, 2.948675842285156e+02, 2.955279541015625e+02, 2.958116149902344e+02, 2.948515014648438e+02, 2.941166687011719e+02, 2.937766723632812e+02, 2.9351416015625e+02, 2.932376708984375e+02, 2.930482482910156e+02, 2.928856811523438e+02, 2.927669372558594e+02, 2.929190673828125e+02, 2.946564331054688e+02, 2.95287353515625e+02, 2.953828125e+02, 2.959354858398438e+02, 2.962112426757812e+02, 2.954524230957031e+02, 2.945853271484375e+02, 2.941593933105469e+02, 2.938352661132812e+02, 2.934993896484375e+02, 2.932486267089844e+02, 2.930323181152344e+02, 2.928570251464844e+02, 2.927946472167969e+02, 2.942975158691406e+02, 2.951254272460938e+02, 2.955548400878906e+02, 2.957681274414062e+02, 2.960804138183594e+02, 2.960763549804688e+02, 2.946496276855469e+02, 2.941460571289062e+02, 2.938298645019531e+02, 2.934697875976562e+02, 2.931517333984375e+02, 2.929133911132812e+02, 2.92677734375e+02, 2.925504760742188e+02, 2.937321166992188e+02, 2.949187316894531e+02, 2.954620361328125e+02, 2.957833251953125e+02, 2.961712036132812e+02, 2.963545532226562e+02, 2.948268432617188e+02, 2.942656555175781e+02, 2.938153686523438e+02, 2.934230651855469e+02, 2.930596313476562e+02, 2.927709045410156e+02, 2.924992980957031e+02, 2.922813720703125e+02, 2.923861999511719e+02, 2.944410705566406e+02, 2.950157470703125e+02, 2.949147033691406e+02, 2.953789367675781e+02, 2.956273498535156e+02, 2.946245727539062e+02, 2.936611938476562e+02, 2.931385192871094e+02, 2.927167053222656e+02, 2.921520080566406e+02, 2.917774047851562e+02, 2.914512023925781e+02, 2.9114794921875e+02, 2.911347351074219e+02, 2.917422790527344e+02, 2.919601440429688e+02, 2.917020874023438e+02, 2.916015014648438e+02, 2.917107849121094e+02, 2.912449951171875e+02, 2.908651123046875e+02, 2.906582946777344e+02, 2.904928588867188e+02, 2.903379211425781e+02]
-sou.TAir=[2.931499938964844e+02, 2.92421875e+02, 2.918773803710938e+02, 2.914576110839844e+02, 2.9106689453125e+02, 2.918707580566406e+02, 2.937628784179688e+02, 2.943664245605469e+02, 2.929219055175781e+02, 2.923279113769531e+02, 2.916216125488281e+02, 2.912415466308594e+02, 2.910020446777344e+02, 2.907896118164062e+02, 2.905245361328125e+02, 2.903668823242188e+02, 2.902007446289062e+02, 2.900948181152344e+02, 2.901056823730469e+02, 2.903158264160156e+02, 2.924110107421875e+02, 2.931375427246094e+02, 2.933236389160156e+02, 2.938154907226562e+02, 2.938170166015625e+02, 2.926510925292969e+02, 2.91894287109375e+02, 2.9157763671875e+02, 2.912824401855469e+02, 2.909677429199219e+02, 2.907462463378906e+02, 2.905545043945312e+02, 2.903434753417969e+02, 2.904351501464844e+02, 2.923927001953125e+02, 2.933087158203125e+02, 2.934971618652344e+02, 2.940661010742188e+02, 2.941452026367188e+02, 2.930067443847656e+02, 2.920397338867188e+02, 2.916015625e+02, 2.912350769042969e+02, 2.908858032226562e+02, 2.906175842285156e+02, 2.903739318847656e+02, 2.901930541992188e+02, 2.901307678222656e+02, 2.918236083984375e+02, 2.928612976074219e+02, 2.934598083496094e+02, 2.936887817382812e+02, 2.938273010253906e+02, 2.934613037109375e+02, 2.918004455566406e+02, 2.912657165527344e+02, 2.909080810546875e+02, 2.904566650390625e+02, 2.901311950683594e+02, 2.898796691894531e+02, 2.894338684082031e+02, 2.891077880859375e+02, 2.910697631835938e+02, 2.940804443359375e+02, 2.962381591796875e+02, 2.971511840820312e+02, 2.967525939941406e+02, 2.952981567382812e+02, 2.932055969238281e+02, 2.924154357910156e+02, 2.917691040039062e+02, 2.912294311523438e+02, 2.90686279296875e+02, 2.902763061523438e+02, 2.898291015625e+02, 2.894817199707031e+02, 2.897055358886719e+02, 2.933710632324219e+02, 2.943819274902344e+02, 2.935234985351562e+02, 2.936824645996094e+02, 2.93646484375e+02, 2.91824951171875e+02, 2.906639709472656e+02, 2.900305786132812e+02, 2.895203857421875e+02, 2.8888037109375e+02, 2.88403076171875e+02, 2.879455871582031e+02, 2.875332641601562e+02, 2.8737060546875e+02, 2.899198913574219e+02, 2.921669616699219e+02, 2.931800231933594e+02, 2.933677062988281e+02, 2.923376770019531e+02, 2.899028625488281e+02, 2.891161193847656e+02, 2.886781005859375e+02, 2.882858581542969e+02, 2.879447326660156e+02]
-eas.TAir=[2.931499938964844e+02, 2.921372680664062e+02, 2.915515747070312e+02, 2.911182556152344e+02, 2.9072412109375e+02, 2.915217895507812e+02, 2.920741271972656e+02, 2.913970336914062e+02, 2.910994567871094e+02, 2.908009643554688e+02, 2.904820251464844e+02, 2.902317504882812e+02, 2.900582275390625e+02, 2.899082641601562e+02, 2.897019348144531e+02, 2.896083984375e+02, 2.894848327636719e+02, 2.894236755371094e+02, 2.89463134765625e+02, 2.896893920898438e+02, 2.916908264160156e+02, 2.923573913574219e+02, 2.924624328613281e+02, 2.929997863769531e+02, 2.931219177246094e+02, 2.920706787109375e+02, 2.913795166015625e+02, 2.910891723632812e+02, 2.908273315429688e+02, 2.905445556640625e+02, 2.903497924804688e+02, 2.901825256347656e+02, 2.900002746582031e+02, 2.901192016601562e+02, 2.919681701660156e+02, 2.927094421386719e+02, 2.927837524414062e+02, 2.932982177734375e+02, 2.934373779296875e+02, 2.925169067382812e+02, 2.916135559082031e+02, 2.912058410644531e+02, 2.908673706054688e+02, 2.905380249023438e+02, 2.902903442382812e+02, 2.900650634765625e+02, 2.898985290527344e+02, 2.898448486328125e+02, 2.914692077636719e+02, 2.924077453613281e+02, 2.928857116699219e+02, 2.931039428710938e+02, 2.932891540527344e+02, 2.930412902832031e+02, 2.914882202148438e+02, 2.909746704101562e+02, 2.906333312988281e+02, 2.902090148925781e+02, 2.89896240234375e+02, 2.896545715332031e+02, 2.892414245605469e+02, 2.889335021972656e+02, 2.909841003417969e+02, 2.927372436523438e+02, 2.926841735839844e+02, 2.929714050292969e+02, 2.932442932128906e+02, 2.931224365234375e+02, 2.914635314941406e+02, 2.908642578125e+02, 2.903469543457031e+02, 2.899219970703125e+02, 2.894924621582031e+02, 2.8917529296875e+02, 2.888219604492188e+02, 2.885515441894531e+02, 2.889232482910156e+02, 2.919521484375e+02, 2.920168762207031e+02, 2.916380615234375e+02, 2.919815063476562e+02, 2.920008239746094e+02, 2.907257385253906e+02, 2.896919250488281e+02, 2.891330261230469e+02, 2.886857604980469e+02, 2.881218872070312e+02, 2.876904296875e+02, 2.872847290039062e+02, 2.869169616699219e+02, 2.867852783203125e+02, 2.891118469238281e+02, 2.893342590332031e+02, 2.88480712890625e+02, 2.883985290527344e+02, 2.882043762207031e+02, 2.874505920410156e+02, 2.870141906738281e+02, 2.867465209960938e+02, 2.864963684082031e+02, 2.862818908691406e+02]
-nor.TAir=[2.931499938964844e+02, 2.921422424316406e+02, 2.915905151367188e+02, 2.911855773925781e+02, 2.908181762695312e+02, 2.906332702636719e+02, 2.906513366699219e+02, 2.906286315917969e+02, 2.905281066894531e+02, 2.90322021484375e+02, 2.900848388671875e+02, 2.898917541503906e+02, 2.897552185058594e+02, 2.896461791992188e+02, 2.894900207519531e+02, 2.894389343261719e+02, 2.893599548339844e+02, 2.8932373046875e+02, 2.894036865234375e+02, 2.896426696777344e+02, 2.916192321777344e+02, 2.923140258789062e+02, 2.924345703125e+02, 2.930042114257812e+02, 2.931718139648438e+02, 2.921351623535156e+02, 2.914553527832031e+02, 2.911787109375e+02, 2.9093994140625e+02, 2.906822814941406e+02, 2.904993286132812e+02, 2.903448181152344e+02, 2.901830444335938e+02, 2.903032531738281e+02, 2.920399169921875e+02, 2.927794799804688e+02, 2.929208374023438e+02, 2.934577026367188e+02, 2.936299438476562e+02, 2.927186889648438e+02, 2.918193054199219e+02, 2.914160461425781e+02, 2.91091796875e+02, 2.907745056152344e+02, 2.905402526855469e+02, 2.903287353515625e+02, 2.901693725585938e+02, 2.901243286132812e+02, 2.916714172363281e+02, 2.925851745605469e+02, 2.930994567871094e+02, 2.93338623046875e+02, 2.935455017089844e+02, 2.933200073242188e+02, 2.9175e+02, 2.912492370605469e+02, 2.909166870117188e+02, 2.905172119140625e+02, 2.902155151367188e+02, 2.899931335449219e+02, 2.895974426269531e+02, 2.893198852539062e+02, 2.905598449707031e+02, 2.915216369628906e+02, 2.920575256347656e+02, 2.923406372070312e+02, 2.927020263671875e+02, 2.927828979492188e+02, 2.912128601074219e+02, 2.906663818359375e+02, 2.902052307128906e+02, 2.898322143554688e+02, 2.894504699707031e+02, 2.891834106445312e+02, 2.8888037109375e+02, 2.886536560058594e+02, 2.887217712402344e+02, 2.906198120117188e+02, 2.912462158203125e+02, 2.912280578613281e+02, 2.916887817382812e+02, 2.917722778320312e+02, 2.905793151855469e+02, 2.895868530273438e+02, 2.890897827148438e+02, 2.886886901855469e+02, 2.881648864746094e+02, 2.87783935546875e+02, 2.874224853515625e+02, 2.870997619628906e+02, 2.870196838378906e+02, 2.875623168945312e+02, 2.878627319335938e+02, 2.875903015136719e+02, 2.874757995605469e+02, 2.874317626953125e+02, 2.869140319824219e+02, 2.866058349609375e+02, 2.864278259277344e+02, 2.862537536621094e+02, 2.8610595703125e+02]
-wes.TAir=[2.931499938964844e+02, 2.920123291015625e+02, 2.914208984375e+02, 2.909886779785156e+02, 2.905983581542969e+02, 2.904259948730469e+02, 2.906114501953125e+02, 2.907469177246094e+02, 2.906876220703125e+02, 2.90580078125e+02, 2.901177062988281e+02, 2.8984814453125e+02, 2.896900634765625e+02, 2.895624694824219e+02, 2.893911437988281e+02, 2.893073425292969e+02, 2.892152709960938e+02, 2.891571960449219e+02, 2.892290954589844e+02, 2.894627685546875e+02, 2.914038391113281e+02, 2.921035766601562e+02, 2.922639465332031e+02, 2.928885803222656e+02, 2.930318603515625e+02, 2.919343566894531e+02, 2.912509460449219e+02, 2.909693298339844e+02, 2.907199096679688e+02, 2.904552917480469e+02, 2.902620849609375e+02, 2.900978698730469e+02, 2.89921875e+02, 2.900171203613281e+02, 2.917182006835938e+02, 2.924844970703125e+02, 2.926517333984375e+02, 2.933215942382812e+02, 2.935866394042969e+02, 2.925321655273438e+02, 2.916123352050781e+02, 2.911903991699219e+02, 2.908544006347656e+02, 2.905263061523438e+02, 2.902824401855469e+02, 2.900604858398438e+02, 2.8989111328125e+02, 2.898353271484375e+02, 2.913466796875e+02, 2.92271240234375e+02, 2.928075256347656e+02, 2.931098937988281e+02, 2.933594665527344e+02, 2.930579528808594e+02, 2.914804992675781e+02, 2.909651794433594e+02, 2.906177062988281e+02, 2.90204345703125e+02, 2.898922729492188e+02, 2.896595153808594e+02, 2.892422485351562e+02, 2.889348449707031e+02, 2.901800537109375e+02, 2.912568664550781e+02, 2.920216674804688e+02, 2.928950805664062e+02, 2.938681335449219e+02, 2.932700805664062e+02, 2.914343872070312e+02, 2.908268432617188e+02, 2.903216247558594e+02, 2.899072570800781e+02, 2.894803466796875e+02, 2.8917236328125e+02, 2.888259887695312e+02, 2.885591125488281e+02, 2.885868225097656e+02, 2.905338745117188e+02, 2.912831115722656e+02, 2.912276306152344e+02, 2.918319396972656e+02, 2.921600341796875e+02, 2.905587463378906e+02, 2.895014953613281e+02, 2.889638671875e+02, 2.885280151367188e+02, 2.87977783203125e+02, 2.875628356933594e+02, 2.871687316894531e+02, 2.868160705566406e+02, 2.866976318359375e+02, 2.873036193847656e+02, 2.878534240722656e+02, 2.877991943359375e+02, 2.888508605957031e+02, 2.894764404296875e+02, 2.876384582519531e+02, 2.870565185546875e+02, 2.867971496582031e+02, 2.865636596679688e+02, 2.863592529296875e+02]
+att.TAir=[2.931499938964844e+02, 2.696248474121094e+02, 2.647601623535156e+02, 2.63364990234375e+02, 2.6276025390625e+02, 2.640167846679688e+02, 2.708334655761719e+02, 2.774606323242188e+02, 2.775429382324219e+02, 2.76203369140625e+02, 2.729412231445312e+02, 2.704309997558594e+02, 2.701553039550781e+02, 2.6967822265625e+02, 2.689847717285156e+02, 2.671961364746094e+02, 2.667991638183594e+02, 2.670057373046875e+02, 2.686084899902344e+02, 2.698638305664062e+02, 2.73572021484375e+02, 2.777263488769531e+02, 2.818173828125e+02, 2.806719360351562e+02, 2.763956909179688e+02, 2.735576782226562e+02, 2.730131225585938e+02, 2.7343896484375e+02, 2.727853088378906e+02, 2.720330505371094e+02, 2.721970520019531e+02, 2.725447082519531e+02, 2.714316711425781e+02, 2.700368957519531e+02, 2.717044067382812e+02, 2.75259765625e+02, 2.778642883300781e+02, 2.783117980957031e+02, 2.759822082519531e+02, 2.716326599121094e+02, 2.700375671386719e+02, 2.693694763183594e+02, 2.693883056640625e+02, 2.694241638183594e+02, 2.694200439453125e+02, 2.694412536621094e+02, 2.690862731933594e+02, 2.690428161621094e+02, 2.708045959472656e+02, 2.745776977539062e+02, 2.781505737304688e+02, 2.799073486328125e+02, 2.7767822265625e+02, 2.728069152832031e+02, 2.699088134765625e+02, 2.685996704101562e+02, 2.6836865234375e+02, 2.660908813476562e+02, 2.651639404296875e+02, 2.646791381835938e+02, 2.622531433105469e+02, 2.588397521972656e+02, 2.591716003417969e+02, 2.652519836425781e+02, 2.734273071289062e+02, 2.759184265136719e+02, 2.743995971679688e+02, 2.704247131347656e+02, 2.6747998046875e+02, 2.658500366210938e+02, 2.639935913085938e+02, 2.624991760253906e+02, 2.612293701171875e+02, 2.60073974609375e+02, 2.580214233398438e+02, 2.568418273925781e+02, 2.567159118652344e+02, 2.617373962402344e+02, 2.688351135253906e+02, 2.696947326660156e+02, 2.683191528320312e+02, 2.653943481445312e+02, 2.591014709472657e+02, 2.558494415283203e+02, 2.534478454589844e+02, 2.5293505859375e+02, 2.524609222412109e+02, 2.516676483154297e+02, 2.506844635009766e+02, 2.498430023193359e+02, 2.482629089355469e+02, 2.535538330078125e+02, 2.640340270996094e+02, 2.706553039550781e+02, 2.713717651367188e+02, 2.6633251953125e+02, 2.590910949707031e+02, 2.551819152832031e+02, 2.528054962158203e+02, 2.510862579345703e+02, 2.500683746337891e+02]
+cor.TAir=[2.931499938964844e+02, 2.946612854003906e+02, 2.942891235351562e+02, 2.93996337890625e+02, 2.937222290039062e+02, 2.935698547363281e+02, 2.935813598632812e+02, 2.934850769042969e+02, 2.932770385742188e+02, 2.930761413574219e+02, 2.928515014648438e+02, 2.926498413085938e+02, 2.924869079589844e+02, 2.923478698730469e+02, 2.922126770019531e+02, 2.922349853515625e+02, 2.921416625976562e+02, 2.920444946289062e+02, 2.920671997070312e+02, 2.92266357421875e+02, 2.942560424804688e+02, 2.948260498046875e+02, 2.948677978515625e+02, 2.955281982421875e+02, 2.958118591308594e+02, 2.948517761230469e+02, 2.941170043945312e+02, 2.937770080566406e+02, 2.935144958496094e+02, 2.93238037109375e+02, 2.930486145019531e+02, 2.928860778808594e+02, 2.92767333984375e+02, 2.929194946289062e+02, 2.946568298339844e+02, 2.952877502441406e+02, 2.953832397460938e+02, 2.959359130859375e+02, 2.962117004394531e+02, 2.954529113769531e+02, 2.945858764648438e+02, 2.941599731445312e+02, 2.938358764648438e+02, 2.935000610351562e+02, 2.932492980957031e+02, 2.930330200195312e+02, 2.928577270507812e+02, 2.927953796386719e+02, 2.942981262207031e+02, 2.951260681152344e+02, 2.955554809570312e+02, 2.957687683105469e+02, 2.960810546875e+02, 2.960770568847656e+02, 2.946504821777344e+02, 2.9414697265625e+02, 2.93830810546875e+02, 2.934707946777344e+02, 2.931528015136719e+02, 2.929144897460938e+02, 2.926788940429688e+02, 2.925516967773438e+02, 2.937333679199219e+02, 2.949198608398438e+02, 2.954631042480469e+02, 2.957843627929688e+02, 2.961722106933594e+02, 2.963555908203125e+02, 2.948280639648438e+02, 2.942669677734375e+02, 2.938167419433594e+02, 2.934245300292969e+02, 2.930611877441406e+02, 2.927725524902344e+02, 2.925010070800781e+02, 2.922830810546875e+02, 2.923879699707031e+02, 2.944426574707031e+02, 2.950172424316406e+02, 2.949162292480469e+02, 2.953804931640625e+02, 2.956289367675781e+02, 2.946263427734375e+02, 2.936631774902344e+02, 2.931406555175781e+02, 2.927189331054688e+02, 2.921541137695312e+02, 2.917796325683594e+02, 2.914534606933594e+02, 2.911502685546875e+02, 2.911371154785156e+02, 2.917445983886719e+02, 2.919623718261719e+02, 2.917043151855469e+02, 2.91603515625e+02, 2.917127380371094e+02, 2.912469177246094e+02, 2.908672485351562e+02, 2.906604919433594e+02, 2.904950866699219e+02, 2.903401794433594e+02]
+sou.TAir=[2.931499938964844e+02, 2.924233703613281e+02, 2.918788757324219e+02, 2.914591064453125e+02, 2.910684509277344e+02, 2.9187158203125e+02, 2.937631530761719e+02, 2.943667297363281e+02, 2.929228515625e+02, 2.923289184570312e+02, 2.916227111816406e+02, 2.9124267578125e+02, 2.910031433105469e+02, 2.907907104492188e+02, 2.905256958007812e+02, 2.903681335449219e+02, 2.902020263671875e+02, 2.900960388183594e+02, 2.901068725585938e+02, 2.903169555664062e+02, 2.924120788574219e+02, 2.931385498046875e+02, 2.933246459960938e+02, 2.938168334960938e+02, 2.938186950683594e+02, 2.926532897949219e+02, 2.918963012695312e+02, 2.915794982910156e+02, 2.912843322753906e+02, 2.909696655273438e+02, 2.907482299804688e+02, 2.905565490722656e+02, 2.903456420898438e+02, 2.904374694824219e+02, 2.923949279785156e+02, 2.933107604980469e+02, 2.934992980957031e+02, 2.940683898925781e+02, 2.941478271484375e+02, 2.930105590820312e+02, 2.920432434082031e+02, 2.916049194335938e+02, 2.912384948730469e+02, 2.908891296386719e+02, 2.906209411621094e+02, 2.903773193359375e+02, 2.901964111328125e+02, 2.901340637207031e+02, 2.918268127441406e+02, 2.928641052246094e+02, 2.934625549316406e+02, 2.93691650390625e+02, 2.938307495117188e+02, 2.934657897949219e+02, 2.918051452636719e+02, 2.912706909179688e+02, 2.909131469726562e+02, 2.904619445800781e+02, 2.901363525390625e+02, 2.898848266601562e+02, 2.894397277832031e+02, 2.891141357421875e+02, 2.910740661621094e+02, 2.940824584960938e+02, 2.962393188476562e+02, 2.971524353027344e+02, 2.967556457519531e+02, 2.953046875e+02, 2.932134704589844e+02, 2.924229431152344e+02, 2.917767028808594e+02, 2.912370300292969e+02, 2.906941833496094e+02, 2.902841796875e+02, 2.898372497558594e+02, 2.894899597167969e+02, 2.897127990722656e+02, 2.93374755859375e+02, 2.9438720703125e+02, 2.935304260253906e+02, 2.936896667480469e+02, 2.936548767089844e+02, 2.918359985351562e+02, 2.906749572753906e+02, 2.9004150390625e+02, 2.895313110351562e+02, 2.888912963867188e+02, 2.884140319824219e+02, 2.879567260742188e+02, 2.875444641113281e+02, 2.873820495605469e+02, 2.899255065917969e+02, 2.921701354980469e+02, 2.93182373046875e+02, 2.93370361328125e+02, 2.9234326171875e+02, 2.899132690429688e+02, 2.891267700195312e+02, 2.886887817382812e+02, 2.882966918945312e+02, 2.879555969238281e+02]
+eas.TAir=[2.931499938964844e+02, 2.921385498046875e+02, 2.915528869628906e+02, 2.911195983886719e+02, 2.907254943847656e+02, 2.915224914550781e+02, 2.920748291015625e+02, 2.913980712890625e+02, 2.911004028320312e+02, 2.908019409179688e+02, 2.904829711914062e+02, 2.902327575683594e+02, 2.900592041015625e+02, 2.899092712402344e+02, 2.897029724121094e+02, 2.896095275878906e+02, 2.894859924316406e+02, 2.894247741699219e+02, 2.894642333984375e+02, 2.896903686523438e+02, 2.916917419433594e+02, 2.923583374023438e+02, 2.924634399414062e+02, 2.930010375976562e+02, 2.931234436035156e+02, 2.920724792480469e+02, 2.913812255859375e+02, 2.910907897949219e+02, 2.908289489746094e+02, 2.905461730957031e+02, 2.903515014648438e+02, 2.901842651367188e+02, 2.900021362304688e+02, 2.901211853027344e+02, 2.91969970703125e+02, 2.927113952636719e+02, 2.927859191894531e+02, 2.933004760742188e+02, 2.934398498535156e+02, 2.925201416015625e+02, 2.916165161132812e+02, 2.912086181640625e+02, 2.908701782226562e+02, 2.905408325195312e+02, 2.902931518554688e+02, 2.900679321289062e+02, 2.899013671875e+02, 2.898477172851562e+02, 2.914713134765625e+02, 2.924103393554688e+02, 2.928883666992188e+02, 2.931066589355469e+02, 2.932922973632812e+02, 2.930451965332031e+02, 2.914925537109375e+02, 2.909789123535156e+02, 2.906376647949219e+02, 2.902135314941406e+02, 2.899006652832031e+02, 2.896589660644531e+02, 2.892464294433594e+02, 2.889389953613281e+02, 2.909877014160156e+02, 2.927401123046875e+02, 2.926889953613281e+02, 2.92976318359375e+02, 2.932491149902344e+02, 2.931278076171875e+02, 2.914701232910156e+02, 2.908700866699219e+02, 2.903529663085938e+02, 2.899280395507812e+02, 2.894987487792969e+02, 2.891816101074219e+02, 2.888284912109375e+02, 2.885581970214844e+02, 2.889287414550781e+02, 2.919559631347656e+02, 2.920228271484375e+02, 2.916444396972656e+02, 2.919882202148438e+02, 2.920084838867188e+02, 2.907344055175781e+02, 2.897005004882812e+02, 2.891415710449219e+02, 2.886943664550781e+02, 2.881305541992188e+02, 2.876991271972656e+02, 2.872936096191406e+02, 2.869259033203125e+02, 2.8679443359375e+02, 2.891169738769531e+02, 2.893396606445312e+02, 2.884883422851562e+02, 2.884061889648438e+02, 2.882123718261719e+02, 2.874590759277344e+02, 2.870227355957031e+02, 2.867550964355469e+02, 2.865050659179688e+02, 2.862906188964844e+02]
+nor.TAir=[2.931499938964844e+02, 2.921434326171875e+02, 2.915917358398438e+02, 2.911867980957031e+02, 2.908194274902344e+02, 2.906344909667969e+02, 2.906524658203125e+02, 2.906295776367188e+02, 2.905289916992188e+02, 2.903229064941406e+02, 2.90085693359375e+02, 2.898926696777344e+02, 2.897561340332031e+02, 2.896470947265625e+02, 2.894909973144531e+02, 2.894400024414062e+02, 2.893610534667969e+02, 2.893247985839844e+02, 2.894046630859375e+02, 2.896435546875e+02, 2.916201171875e+02, 2.923149108886719e+02, 2.924354553222656e+02, 2.9300537109375e+02, 2.931731872558594e+02, 2.921368408203125e+02, 2.914570617675781e+02, 2.911802368164062e+02, 2.909414978027344e+02, 2.906838073730469e+02, 2.905009155273438e+02, 2.903464660644531e+02, 2.901848449707031e+02, 2.9030517578125e+02, 2.920417785644531e+02, 2.927813110351562e+02, 2.929227905273438e+02, 2.93459716796875e+02, 2.936321716308594e+02, 2.927216796875e+02, 2.918221435546875e+02, 2.914187622070312e+02, 2.910945434570312e+02, 2.907772827148438e+02, 2.905429992675781e+02, 2.903315124511719e+02, 2.90172119140625e+02, 2.901270751953125e+02, 2.916741333007812e+02, 2.925877075195312e+02, 2.931019287109375e+02, 2.933411254882812e+02, 2.935483703613281e+02, 2.933236389160156e+02, 2.917540283203125e+02, 2.912533569335938e+02, 2.909209289550781e+02, 2.905215759277344e+02, 2.902198181152344e+02, 2.899974365234375e+02, 2.896022644042969e+02, 2.893251953125e+02, 2.905646667480469e+02, 2.915264892578125e+02, 2.920625305175781e+02, 2.923452758789062e+02, 2.927066955566406e+02, 2.927879943847656e+02, 2.912186279296875e+02, 2.906718139648438e+02, 2.902108154296875e+02, 2.898377990722656e+02, 2.894563293457031e+02, 2.891892395019531e+02, 2.888864135742188e+02, 2.886597900390625e+02, 2.8872802734375e+02, 2.906256713867188e+02, 2.912519226074219e+02, 2.912338256835938e+02, 2.916947937011719e+02, 2.917790222167969e+02, 2.905877075195312e+02, 2.895946960449219e+02, 2.890975646972656e+02, 2.88696533203125e+02, 2.881727905273438e+02, 2.877918701171875e+02, 2.874306030273438e+02, 2.8710791015625e+02, 2.87028076171875e+02, 2.875705261230469e+02, 2.878703002929688e+02, 2.875974731445312e+02, 2.874826354980469e+02, 2.874388732910156e+02, 2.869215393066406e+02, 2.86613525390625e+02, 2.864355163574219e+02, 2.862615356445312e+02, 2.8611376953125e+02]
+wes.TAir=[2.931499938964844e+02, 2.920135803222656e+02, 2.914221496582031e+02, 2.909899597167969e+02, 2.905996704101562e+02, 2.904272766113281e+02, 2.906126403808594e+02, 2.907479553222656e+02, 2.906884765625e+02, 2.905809020996094e+02, 2.901186218261719e+02, 2.8984912109375e+02, 2.896910400390625e+02, 2.895634460449219e+02, 2.893921508789062e+02, 2.893084716796875e+02, 2.892163696289062e+02, 2.891582946777344e+02, 2.89230224609375e+02, 2.894637145996094e+02, 2.914047546386719e+02, 2.921045227050781e+02, 2.922649230957031e+02, 2.928897705078125e+02, 2.930332946777344e+02, 2.919360961914062e+02, 2.912526550292969e+02, 2.909708862304688e+02, 2.907214965820312e+02, 2.904568786621094e+02, 2.902637329101562e+02, 2.900995788574219e+02, 2.899237365722656e+02, 2.900192260742188e+02, 2.917201232910156e+02, 2.924864807128906e+02, 2.926538696289062e+02, 2.933236694335938e+02, 2.935888061523438e+02, 2.925352783203125e+02, 2.91615234375e+02, 2.911931762695312e+02, 2.908572082519531e+02, 2.905291137695312e+02, 2.902852172851562e+02, 2.900633239746094e+02, 2.898939208984375e+02, 2.898381652832031e+02, 2.913489685058594e+02, 2.9227392578125e+02, 2.928101806640625e+02, 2.931124572753906e+02, 2.933623962402344e+02, 2.930618591308594e+02, 2.914848022460938e+02, 2.909693908691406e+02, 2.906220397949219e+02, 2.902088317871094e+02, 2.898966674804688e+02, 2.896638488769531e+02, 2.892472229003906e+02, 2.889402465820312e+02, 2.901850280761719e+02, 2.912618713378906e+02, 2.920266723632812e+02, 2.928984069824219e+02, 2.9387109375e+02, 2.932754516601562e+02, 2.914410095214844e+02, 2.908325500488281e+02, 2.903275146484375e+02, 2.899131774902344e+02, 2.894865417480469e+02, 2.891785583496094e+02, 2.888323974609375e+02, 2.885656127929688e+02, 2.885934143066406e+02, 2.905401306152344e+02, 2.912891845703125e+02, 2.912337036132812e+02, 2.91837646484375e+02, 2.921667175292969e+02, 2.905670166015625e+02, 2.89509765625e+02, 2.889721069335938e+02, 2.885363159179688e+02, 2.879862060546875e+02, 2.875712280273438e+02, 2.871773071289062e+02, 2.8682470703125e+02, 2.867064514160156e+02, 2.87312255859375e+02, 2.878613586425781e+02, 2.878066101074219e+02, 2.888549194335938e+02, 2.894804077148438e+02, 2.876463317871094e+02, 2.87064697265625e+02, 2.86805419921875e+02, 2.865720520019531e+02, 2.8636767578125e+02]
 TOutEP=[2.697000122070312e+02, 2.612799987792969e+02, 2.620499877929688e+02, 2.625499877929688e+02, 2.625499877929688e+02, 2.635169982910156e+02, 2.664500122070312e+02, 2.692829895019531e+02, 2.713169860839844e+02, 2.720499877929688e+02, 2.720499877929688e+02, 2.712829895019531e+02, 2.720499877929688e+02, 2.719500122070312e+02, 2.714500122070312e+02, 2.694330139160156e+02, 2.699330139160156e+02, 2.712000122070312e+02, 2.721329956054688e+02, 2.725499877929688e+02, 2.734500122070312e+02, 2.748500061035156e+02, 2.748500061035156e+02, 2.728500061035156e+02, 2.7375e+02, 2.7275e+02, 2.740833129882812e+02, 2.750169982910156e+02, 2.731499938964844e+02, 2.731499938964844e+02, 2.733500061035156e+02, 2.731499938964844e+02, 2.713169860839844e+02, 2.698500061035156e+02, 2.6875e+02, 2.690830078125e+02, 2.700169982910156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.703500061035156e+02, 2.701000061035156e+02, 2.698500061035156e+02, 2.702669982910156e+02, 2.706499938964844e+02, 2.714500122070312e+02, 2.719500122070312e+02, 2.725499877929688e+02, 2.720499877929688e+02, 2.703500061035156e+02, 2.685169982910156e+02, 2.683500061035156e+02, 2.681499938964844e+02, 2.663169860839844e+02, 2.661170043945312e+02, 2.659500122070312e+02, 2.620499877929688e+02, 2.585499877929688e+02, 2.5925e+02, 2.610799865722656e+02, 2.645499877929688e+02, 2.666329956054688e+02, 2.689670104980469e+02, 2.692999877929688e+02, 2.680499877929688e+02, 2.666329956054688e+02, 2.647999877929688e+02, 2.640669860839844e+02, 2.622300109863281e+02, 2.615e+02, 2.5925e+02, 2.588299865722656e+02, 2.583500061035156e+02, 2.594500122070312e+02, 2.609500122070312e+02, 2.616499938964844e+02, 2.618500061035156e+02, 2.609500122070312e+02, 2.579500122070313e+02, 2.559499969482422e+02, 2.5425e+02, 2.551799926757812e+02, 2.5425e+02, 2.5375e+02, 2.526499938964844e+02, 2.515e+02, 2.505299987792969e+02, 2.542799987792969e+02, 2.578999938964844e+02, 2.589299926757812e+02, 2.602699890136719e+02, 2.595499877929688e+02, 2.569500122070312e+02, 2.551199951171875e+02, 2.543000030517578e+02, 2.5325e+02, 2.5325e+02]
 TAttEP=[2.68625e+02, 2.6352099609375e+02, 2.618299865722656e+02, 2.615199890136719e+02, 2.614700012207031e+02, 2.62510009765625e+02, 2.686199951171875e+02, 2.7510400390625e+02, 2.758450012207031e+02, 2.752359924316406e+02, 2.727752990722656e+02, 2.702579956054688e+02, 2.700050048828125e+02, 2.696849975585938e+02, 2.691919860839844e+02, 2.674920043945312e+02, 2.671679992675781e+02, 2.673829956054688e+02, 2.6910400390625e+02, 2.7027099609375e+02, 2.730220947265625e+02, 2.766260070800781e+02, 2.800260009765625e+02, 2.793789978027344e+02, 2.763789978027344e+02, 2.736754150390625e+02, 2.730619506835938e+02, 2.735857849121094e+02, 2.729950866699219e+02, 2.721911926269531e+02, 2.723002014160156e+02, 2.72668212890625e+02, 2.7156201171875e+02, 2.700899963378906e+02, 2.709129943847656e+02, 2.736022033691406e+02, 2.760169982910156e+02, 2.768399963378906e+02, 2.750679931640625e+02, 2.714880065917969e+02, 2.700509948730469e+02, 2.694880065917969e+02, 2.69489990234375e+02, 2.695570068359375e+02, 2.695409851074219e+02, 2.695710144042969e+02, 2.6922900390625e+02, 2.6918701171875e+02, 2.704729919433594e+02, 2.73423095703125e+02, 2.7656201171875e+02, 2.783110046386719e+02, 2.768760070800781e+02, 2.728453979492188e+02, 2.699049987792969e+02, 2.685710144042969e+02, 2.683909912109375e+02, 2.664289855957032e+02, 2.652850036621094e+02, 2.65010986328125e+02, 2.628200073242188e+02, 2.59260009765625e+02, 2.587900085449219e+02, 2.639159851074219e+02, 2.715010070800781e+02, 2.7435400390625e+02, 2.738160095214844e+02, 2.706820068359375e+02, 2.677149963378906e+02, 2.661329956054688e+02, 2.643599853515625e+02, 2.628500061035156e+02, 2.616099853515625e+02, 2.605e+02, 2.585199890136719e+02, 2.573099975585938e+02, 2.569200134277344e+02, 2.607799987792969e+02, 2.671820068359375e+02, 2.680780029296875e+02, 2.671589965820312e+02, 2.650809936523438e+02, 2.594700012207032e+02, 2.561400146484375e+02, 2.539400024414062e+02, 2.532299957275391e+02, 2.528399963378906e+02, 2.521399993896484e+02, 2.510599975585938e+02, 2.502299957275391e+02, 2.487599945068359e+02, 2.526699981689453e+02, 2.620700073242188e+02, 2.682539978027344e+02, 2.699179992675781e+02, 2.660780029296875e+02, 2.596600036621094e+02, 2.556199951171875e+02, 2.533099975585938e+02, 2.516000061035156e+02, 2.507100067138672e+02]
 TCorEP=[2.907999877929688e+02, 2.90760009765625e+02, 2.907000122070312e+02, 2.906499938964844e+02, 2.906000061035156e+02, 2.906199951171875e+02, 2.908099975585938e+02, 2.909200134277344e+02, 2.909200134277344e+02, 2.908999938964844e+02, 2.908599853515625e+02, 2.908200073242188e+02, 2.908099975585938e+02, 2.908099975585938e+02, 2.908099975585938e+02, 2.909299926757812e+02, 2.909500122070312e+02, 2.909500122070312e+02, 2.910400085449219e+02, 2.913099975585938e+02, 2.9325e+02, 2.939500122070312e+02, 2.941300048828125e+02, 2.948099975585938e+02, 2.951600036621094e+02, 2.944100036621094e+02, 2.936600036621094e+02, 2.933500061035156e+02, 2.931300048828125e+02, 2.928800048828125e+02, 2.927300109863281e+02, 2.925899963378906e+02, 2.925e+02, 2.926199951171875e+02, 2.94260009765625e+02, 2.949700012207031e+02, 2.951799926757812e+02, 2.956900024414062e+02, 2.96010009765625e+02, 2.953800048828125e+02, 2.94510009765625e+02, 2.940799865722656e+02, 2.937699890136719e+02, 2.934500122070312e+02, 2.931900024414062e+02, 2.929800109863281e+02, 2.928099975585938e+02, 2.9275e+02, 2.941099853515625e+02, 2.949599914550781e+02, 2.954299926757812e+02, 2.957000122070312e+02, 2.96e+02, 2.962099914550781e+02, 2.947000122070312e+02, 2.941900024414062e+02, 2.938599853515625e+02, 2.935e+02, 2.931799926757812e+02, 2.929400024414062e+02, 2.927200012207031e+02, 2.925700073242188e+02, 2.926700134277344e+02, 2.948099975585938e+02, 2.953900146484375e+02, 2.956000061035156e+02, 2.961099853515625e+02, 2.963299865722656e+02, 2.950199890136719e+02, 2.943200073242188e+02, 2.938699951171875e+02, 2.934800109863281e+02, 2.931199951171875e+02, 2.928299865722656e+02, 2.925599975585938e+02, 2.923399963378906e+02, 2.924100036621094e+02, 2.943299865722656e+02, 2.949599914550781e+02, 2.949299926757812e+02, 2.953500061035156e+02, 2.956000061035156e+02, 2.94760009765625e+02, 2.937699890136719e+02, 2.932300109863281e+02, 2.927999877929688e+02, 2.922799987792969e+02, 2.918699951171875e+02, 2.91510009765625e+02, 2.912099914550781e+02, 2.911799926757812e+02, 2.917000122070312e+02, 2.919700012207031e+02, 2.918999938964844e+02, 2.916400146484375e+02, 2.917200012207031e+02, 2.914500122070312e+02, 2.909500122070312e+02, 2.907200012207031e+02, 2.905499877929688e+02, 2.903900146484375e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_TwoIdenticalZones.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_TwoIdenticalZones.txt
index 21f07c2f137..28962511272 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_TwoIdenticalZones.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_TwoIdenticalZones.txt
@@ -1,20 +1,20 @@
-last-generated=2022-09-10
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0, 0",
   "nonlinear": "1",
-  "number of continuous time states": "6",
+  "number of continuous time states": "8",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6.048e+05]
-zon1.TAir=[2.931499938964844e+02, 2.871693725585938e+02, 2.861983337402344e+02, 2.857225036621094e+02, 2.854104614257812e+02, 2.85298095703125e+02, 2.855680236816406e+02, 2.859231567382812e+02, 2.861795959472656e+02, 2.863733215332031e+02, 2.864577331542969e+02, 2.864533386230469e+02, 2.865524597167969e+02, 2.865706787109375e+02, 2.865225524902344e+02, 2.864235229492188e+02, 2.864515380859375e+02, 2.865218200683594e+02, 2.868555603027344e+02, 2.875838623046875e+02, 2.909694519042969e+02, 2.917626342773438e+02, 2.916149291992188e+02, 2.920852661132812e+02, 2.923625793457031e+02, 2.916405334472656e+02, 2.903987426757812e+02, 2.892860412597656e+02, 2.88136962890625e+02, 2.876087341308594e+02, 2.87443115234375e+02, 2.873640441894531e+02, 2.871903076171875e+02, 2.875203857421875e+02, 2.905589904785156e+02, 2.912638549804688e+02, 2.912080688476562e+02, 2.917674560546875e+02, 2.919480590820312e+02, 2.913617248535156e+02, 2.899376831054688e+02, 2.886665649414062e+02, 2.876629333496094e+02, 2.870983581542969e+02, 2.868641967773438e+02, 2.867179870605469e+02, 2.866588134765625e+02, 2.868088684082031e+02, 2.900367126464844e+02, 2.911514587402344e+02, 2.916265563964844e+02, 2.918130493164062e+02, 2.920262451171875e+02, 2.919500427246094e+02, 2.899060668945312e+02, 2.886430053710938e+02, 2.878654174804687e+02, 2.866370849609375e+02, 2.862191467285156e+02, 2.860260009765625e+02, 2.854656982421875e+02, 2.85033203125e+02, 2.867774963378906e+02, 2.889793090820312e+02, 2.898477783203125e+02, 2.900752563476562e+02, 2.908487243652344e+02, 2.9118115234375e+02, 2.897245178222656e+02, 2.88804931640625e+02, 2.872823181152344e+02, 2.860919799804688e+02, 2.854797973632812e+02, 2.8515625e+02, 2.847049560546875e+02, 2.845836181640625e+02, 2.850697021484375e+02, 2.882251281738281e+02, 2.889241943359375e+02, 2.887520141601562e+02, 2.893645324707031e+02, 2.894655456542969e+02, 2.884527893066406e+02, 2.867904968261719e+02, 2.853169860839844e+02, 2.843656616210938e+02, 2.836122131347656e+02, 2.832206420898438e+02, 2.828782043457031e+02, 2.825765075683594e+02, 2.826189575195312e+02, 2.844351196289062e+02, 2.852631225585938e+02, 2.856684875488281e+02, 2.860324401855469e+02, 2.845478210449219e+02, 2.838694763183594e+02, 2.8343701171875e+02, 2.832437438964844e+02, 2.82996337890625e+02, 2.828768615722656e+02]
-zon2.TAir=[2.931499938964844e+02, 2.871699523925781e+02, 2.86198974609375e+02, 2.8572314453125e+02, 2.854110412597656e+02, 2.853019409179688e+02, 2.855697631835938e+02, 2.85924560546875e+02, 2.861809997558594e+02, 2.863746643066406e+02, 2.864590148925781e+02, 2.864544982910156e+02, 2.865535278320312e+02, 2.865716552734375e+02, 2.865234375e+02, 2.864243469238281e+02, 2.864523010253906e+02, 2.865225219726562e+02, 2.86856201171875e+02, 2.875846252441406e+02, 2.909701843261719e+02, 2.917632751464844e+02, 2.916155090332031e+02, 2.920857849121094e+02, 2.923630676269531e+02, 2.916409606933594e+02, 2.90399169921875e+02, 2.89286376953125e+02, 2.881372375488281e+02, 2.876089477539062e+02, 2.874433288574219e+02, 2.873642272949219e+02, 2.871904907226562e+02, 2.875209655761719e+02, 2.905601196289062e+02, 2.912645874023438e+02, 2.91208740234375e+02, 2.917681274414062e+02, 2.919486999511719e+02, 2.913623046875e+02, 2.899382019042969e+02, 2.886669616699219e+02, 2.876632995605469e+02, 2.870986938476562e+02, 2.86864501953125e+02, 2.867182312011719e+02, 2.866590270996094e+02, 2.868091125488281e+02, 2.900380249023438e+02, 2.911522216796875e+02, 2.916272277832031e+02, 2.918136596679688e+02, 2.920268249511719e+02, 2.919505920410156e+02, 2.899065856933594e+02, 2.886434020996094e+02, 2.878657836914062e+02, 2.866374206542969e+02, 2.862194519042969e+02, 2.860262451171875e+02, 2.854659423828125e+02, 2.850334167480469e+02, 2.867842712402344e+02, 2.889815979003906e+02, 2.898497314453125e+02, 2.900771484375e+02, 2.908505859375e+02, 2.91182861328125e+02, 2.897261047363281e+02, 2.888061828613281e+02, 2.872833557128906e+02, 2.860929565429688e+02, 2.854806518554688e+02, 2.851570129394531e+02, 2.847056579589844e+02, 2.845842590332031e+02, 2.850769348144531e+02, 2.882282104492188e+02, 2.889264221191406e+02, 2.88754150390625e+02, 2.893666381835938e+02, 2.894675598144531e+02, 2.884545288085938e+02, 2.867918701171875e+02, 2.85318359375e+02, 2.84366943359375e+02, 2.836134033203125e+02, 2.832217102050781e+02, 2.82879150390625e+02, 2.82577392578125e+02, 2.826197509765625e+02, 2.844411926269531e+02, 2.852669677734375e+02, 2.856722106933594e+02, 2.860360717773438e+02, 2.845509948730469e+02, 2.83872314453125e+02, 2.834399108886719e+02, 2.832463684082031e+02, 2.829987487792969e+02, 2.828789978027344e+02]
-zon1.zon.TRad=[2.919393005371094e+02, 2.890994567871094e+02, 2.880359497070312e+02, 2.874804382324219e+02, 2.871177978515625e+02, 2.869196166992188e+02, 2.869207153320312e+02, 2.870100402832031e+02, 2.87092041015625e+02, 2.87244140625e+02, 2.873571166992188e+02, 2.874426879882812e+02, 2.874901733398438e+02, 2.875172424316406e+02, 2.875026245117188e+02, 2.874656677246094e+02, 2.8743408203125e+02, 2.874087219238281e+02, 2.874821166992188e+02, 2.877063598632812e+02, 2.890874328613281e+02, 2.897333679199219e+02, 2.89906494140625e+02, 2.902008361816406e+02, 2.903961181640625e+02, 2.903182373046875e+02, 2.897743225097656e+02, 2.892718811035156e+02, 2.88830322265625e+02, 2.884521484375e+02, 2.882602844238281e+02, 2.88158447265625e+02, 2.880450744628906e+02, 2.880347900390625e+02, 2.890468444824219e+02, 2.896681823730469e+02, 2.898707275390625e+02, 2.900631408691406e+02, 2.902497863769531e+02, 2.901795349121094e+02, 2.896222534179688e+02, 2.890653686523438e+02, 2.88572998046875e+02, 2.881474914550781e+02, 2.878948059082031e+02, 2.8773876953125e+02, 2.876204833984375e+02, 2.876155090332031e+02, 2.884078979492188e+02, 2.893702697753906e+02, 2.897938232421875e+02, 2.899673767089844e+02, 2.902009887695312e+02, 2.903014831542969e+02, 2.897039489746094e+02, 2.891183471679688e+02, 2.885973205566406e+02, 2.879993286132812e+02, 2.876071472167969e+02, 2.873789672851562e+02, 2.871006469726562e+02, 2.867834777832031e+02, 2.868245849609375e+02, 2.881607971191406e+02, 2.887261047363281e+02, 2.889164428710938e+02, 2.89303955078125e+02, 2.895535888671875e+02, 2.893092346191406e+02, 2.887606201171875e+02, 2.881094360351562e+02, 2.875396423339844e+02, 2.870899353027344e+02, 2.867789611816406e+02, 2.864825134277344e+02, 2.862674560546875e+02, 2.862579650878906e+02, 2.874819641113281e+02, 2.880267944335938e+02, 2.881158752441406e+02, 2.88392578125e+02, 2.885482482910156e+02, 2.883033447265625e+02, 2.875914916992188e+02, 2.868894958496094e+02, 2.862781677246094e+02, 2.857383117675781e+02, 2.853257446289062e+02, 2.8498095703125e+02, 2.8471533203125e+02, 2.845822143554688e+02, 2.850661926269531e+02, 2.856257629394531e+02, 2.85980224609375e+02, 2.86267333984375e+02, 2.858832397460938e+02, 2.856694641113281e+02, 2.854455261230469e+02, 2.852957458496094e+02, 2.851074829101562e+02, 2.849480895996094e+02]
-zon2.zon.TRad=[2.919397277832031e+02, 2.891001281738281e+02, 2.880366821289062e+02, 2.874811706542969e+02, 2.871184997558594e+02, 2.869234924316406e+02, 2.869228210449219e+02, 2.870119934082031e+02, 2.870939025878906e+02, 2.872459106445312e+02, 2.873587341308594e+02, 2.874441833496094e+02, 2.874915771484375e+02, 2.875184936523438e+02, 2.875037841796875e+02, 2.874667663574219e+02, 2.874350891113281e+02, 2.874096374511719e+02, 2.874829711914062e+02, 2.877071533203125e+02, 2.89088134765625e+02, 2.897340087890625e+02, 2.899070739746094e+02, 2.902013549804688e+02, 2.903965759277344e+02, 2.903186950683594e+02, 2.897747192382812e+02, 2.892722473144531e+02, 2.888306579589844e+02, 2.884524841308594e+02, 2.882605590820312e+02, 2.881587219238281e+02, 2.880453186035156e+02, 2.880366516113281e+02, 2.890478820800781e+02, 2.896689147949219e+02, 2.898714294433594e+02, 2.900637817382812e+02, 2.902503967285156e+02, 2.901801147460938e+02, 2.89622802734375e+02, 2.890658874511719e+02, 2.885734558105469e+02, 2.8814794921875e+02, 2.878952026367188e+02, 2.877391357421875e+02, 2.876208190917969e+02, 2.876158142089844e+02, 2.884091186523438e+02, 2.893710021972656e+02, 2.897944946289062e+02, 2.89968017578125e+02, 2.902015686035156e+02, 2.903020324707031e+02, 2.897044677734375e+02, 2.891188354492188e+02, 2.885977478027344e+02, 2.879997253417969e+02, 2.876075134277344e+02, 2.873793029785156e+02, 2.871009521484375e+02, 2.867837524414062e+02, 2.868305053710938e+02, 2.881631164550781e+02, 2.887280883789062e+02, 2.889183654785156e+02, 2.893057861328125e+02, 2.895552673339844e+02, 2.89310791015625e+02, 2.887620239257812e+02, 2.881107482910156e+02, 2.875408020019531e+02, 2.870909729003906e+02, 2.867799072265625e+02, 2.864833984375e+02, 2.862682495117188e+02, 2.862704162597656e+02, 2.874850158691406e+02, 2.880291748046875e+02, 2.881182250976562e+02, 2.883948059082031e+02, 2.885503540039062e+02, 2.883052978515625e+02, 2.875933532714844e+02, 2.868912048339844e+02, 2.862797241210938e+02, 2.8573974609375e+02, 2.853270263671875e+02, 2.849821472167969e+02, 2.847164001464844e+02, 2.845832214355469e+02, 2.850726623535156e+02, 2.85630126953125e+02, 2.859845275878906e+02, 2.862715759277344e+02, 2.858873596191406e+02, 2.8567333984375e+02, 2.854490051269531e+02, 2.852988891601562e+02, 2.851103515625e+02, 2.849507141113281e+02]
+zon1.TAir=[2.931499938964844e+02, 2.871693725585938e+02, 2.861983337402344e+02, 2.857225036621094e+02, 2.854104614257812e+02, 2.85298095703125e+02, 2.855680847167969e+02, 2.859231872558594e+02, 2.861796569824219e+02, 2.863733215332031e+02, 2.864577331542969e+02, 2.864533386230469e+02, 2.865524597167969e+02, 2.865706787109375e+02, 2.865225524902344e+02, 2.864235534667969e+02, 2.864514465332031e+02, 2.865218505859375e+02, 2.868555603027344e+02, 2.875838928222656e+02, 2.909694519042969e+02, 2.917626647949219e+02, 2.916149291992188e+02, 2.920852661132812e+02, 2.923625793457031e+02, 2.916405334472656e+02, 2.903987731933594e+02, 2.892860412597656e+02, 2.881369323730469e+02, 2.876087341308594e+02, 2.874431457519531e+02, 2.87364013671875e+02, 2.871902770996094e+02, 2.875203552246094e+02, 2.905589599609375e+02, 2.912638854980469e+02, 2.912080688476562e+02, 2.917674560546875e+02, 2.919480590820312e+02, 2.913617553710938e+02, 2.899377136230469e+02, 2.886665649414062e+02, 2.876629638671875e+02, 2.87098388671875e+02, 2.868641967773438e+02, 2.867179565429688e+02, 2.866587829589844e+02, 2.868088989257812e+02, 2.900366821289062e+02, 2.911514587402344e+02, 2.916265869140625e+02, 2.918130187988281e+02, 2.920262145996094e+02, 2.919500427246094e+02, 2.89906005859375e+02, 2.8864306640625e+02, 2.878653259277343e+02, 2.866368408203125e+02, 2.862191772460938e+02, 2.860258178710938e+02, 2.854656066894531e+02, 2.850328674316406e+02, 2.867774658203125e+02, 2.889794311523438e+02, 2.898480224609375e+02, 2.900753173828125e+02, 2.908489990234375e+02, 2.911811218261719e+02, 2.897246093749999e+02, 2.888047180175781e+02, 2.872820739746094e+02, 2.860917663574219e+02, 2.854794921875e+02, 2.851560363769531e+02, 2.84704833984375e+02, 2.845833435058594e+02, 2.850696105957031e+02, 2.882250366210938e+02, 2.889244384765625e+02, 2.887518615722656e+02, 2.893644409179688e+02, 2.894652709960938e+02, 2.884525756835938e+02, 2.867904968261719e+02, 2.853169555664062e+02, 2.843658142089844e+02, 2.836123046875e+02, 2.832204895019531e+02, 2.828779602050781e+02, 2.825762329101562e+02, 2.826187133789062e+02, 2.844351806640625e+02, 2.852633361816406e+02, 2.856686401367188e+02, 2.860325317382812e+02, 2.84547607421875e+02, 2.838695983886719e+02, 2.834367980957031e+02, 2.832434997558594e+02, 2.829964294433594e+02, 2.828766479492188e+02]
+zon2.TAir=[2.931499938964844e+02, 2.871699829101562e+02, 2.86198974609375e+02, 2.8572314453125e+02, 2.854110412597656e+02, 2.853019409179688e+02, 2.8556982421875e+02, 2.859246215820312e+02, 2.861810302734375e+02, 2.863746643066406e+02, 2.864590148925781e+02, 2.864544677734375e+02, 2.865535278320312e+02, 2.865716552734375e+02, 2.865234375e+02, 2.864243774414062e+02, 2.864522094726562e+02, 2.865225524902344e+02, 2.868562316894531e+02, 2.875846557617188e+02, 2.909701843261719e+02, 2.917632751464844e+02, 2.916155090332031e+02, 2.920857849121094e+02, 2.923630676269531e+02, 2.916409606933594e+02, 2.903992004394531e+02, 2.89286376953125e+02, 2.8813720703125e+02, 2.876089782714844e+02, 2.87443359375e+02, 2.873642272949219e+02, 2.871904602050781e+02, 2.875209655761719e+02, 2.905600891113281e+02, 2.912645874023438e+02, 2.912087707519531e+02, 2.917681274414062e+02, 2.919486694335938e+02, 2.913623046875e+02, 2.899382019042969e+02, 2.886669921875e+02, 2.87663330078125e+02, 2.870986938476562e+02, 2.86864501953125e+02, 2.867182006835938e+02, 2.866590270996094e+02, 2.868091125488281e+02, 2.900379943847656e+02, 2.911521911621094e+02, 2.916272277832031e+02, 2.918136596679688e+02, 2.920267944335938e+02, 2.919505920410156e+02, 2.899065246582031e+02, 2.886434631347656e+02, 2.878656921386718e+02, 2.866371459960938e+02, 2.862194519042969e+02, 2.860260925292969e+02, 2.854658508300781e+02, 2.850330810546875e+02, 2.867842102050781e+02, 2.889817504882812e+02, 2.898499755859375e+02, 2.900772094726562e+02, 2.908508605957031e+02, 2.911828002929688e+02, 2.897261962890624e+02, 2.888059387207031e+02, 2.872831420898438e+02, 2.860927429199219e+02, 2.854803771972656e+02, 2.851567993164062e+02, 2.847055358886719e+02, 2.84583984375e+02, 2.850768432617188e+02, 2.882280883789062e+02, 2.889266662597656e+02, 2.887540283203125e+02, 2.893665466308594e+02, 2.8946728515625e+02, 2.884543151855469e+02, 2.867918701171875e+02, 2.853183288574219e+02, 2.843670959472656e+02, 2.836134948730469e+02, 2.832215270996094e+02, 2.8287890625e+02, 2.825771179199219e+02, 2.826194763183594e+02, 2.844412536621094e+02, 2.852671813964844e+02, 2.856723327636719e+02, 2.860361938476562e+02, 2.845508117675781e+02, 2.838724365234375e+02, 2.834396667480469e+02, 2.832461242675781e+02, 2.829988403320312e+02, 2.828787841796875e+02]
+zon1.zon.TRad=[2.919393005371094e+02, 2.890994567871094e+02, 2.880359191894531e+02, 2.874804382324219e+02, 2.871177978515625e+02, 2.869196472167969e+02, 2.869207458496094e+02, 2.870100708007812e+02, 2.87092041015625e+02, 2.872441711425781e+02, 2.873571166992188e+02, 2.874426879882812e+02, 2.874902038574219e+02, 2.875172424316406e+02, 2.875026245117188e+02, 2.874656677246094e+02, 2.874340515136719e+02, 2.874087219238281e+02, 2.874821166992188e+02, 2.877063598632812e+02, 2.890874328613281e+02, 2.897333679199219e+02, 2.89906494140625e+02, 2.902008361816406e+02, 2.903961181640625e+02, 2.903182373046875e+02, 2.897743225097656e+02, 2.892718811035156e+02, 2.88830322265625e+02, 2.884521789550781e+02, 2.882602844238281e+02, 2.881584777832031e+02, 2.880450744628906e+02, 2.880347900390625e+02, 2.890468139648438e+02, 2.896681823730469e+02, 2.898707275390625e+02, 2.900631408691406e+02, 2.902497863769531e+02, 2.901795349121094e+02, 2.896222839355469e+02, 2.890653991699219e+02, 2.88572998046875e+02, 2.881475219726562e+02, 2.878948059082031e+02, 2.8773876953125e+02, 2.876204833984375e+02, 2.876155090332031e+02, 2.884078674316406e+02, 2.893702697753906e+02, 2.897938232421875e+02, 2.899673767089844e+02, 2.902009582519531e+02, 2.903014526367188e+02, 2.897039489746094e+02, 2.891183471679688e+02, 2.885972900390625e+02, 2.879992370605469e+02, 2.876071166992188e+02, 2.873789367675781e+02, 2.871006164550781e+02, 2.867833862304688e+02, 2.868245239257812e+02, 2.881608276367188e+02, 2.887261962890625e+02, 2.8891650390625e+02, 2.893040466308594e+02, 2.895536499023438e+02, 2.893092651367188e+02, 2.887605590820312e+02, 2.881094055175781e+02, 2.875396118164062e+02, 2.870898132324219e+02, 2.867789001464844e+02, 2.86482421875e+02, 2.862673950195312e+02, 2.862579040527344e+02, 2.874819641113281e+02, 2.8802685546875e+02, 2.881159057617188e+02, 2.883926086425781e+02, 2.885481872558594e+02, 2.883032836914062e+02, 2.875914306640625e+02, 2.868894348144531e+02, 2.862781982421875e+02, 2.857383117675781e+02, 2.853257141113281e+02, 2.849808654785156e+02, 2.847152099609375e+02, 2.845820922851562e+02, 2.85066162109375e+02, 2.856258239746094e+02, 2.85980224609375e+02, 2.862674255371094e+02, 2.858832397460938e+02, 2.8566943359375e+02, 2.854454345703125e+02, 2.852956848144531e+02, 2.851073608398438e+02, 2.849480285644531e+02]
+zon2.zon.TRad=[2.919397277832031e+02, 2.891001281738281e+02, 2.880366821289062e+02, 2.874811706542969e+02, 2.871184997558594e+02, 2.869234924316406e+02, 2.869228515625e+02, 2.870119934082031e+02, 2.870939331054688e+02, 2.872459106445312e+02, 2.873587341308594e+02, 2.874441833496094e+02, 2.874915771484375e+02, 2.875184936523438e+02, 2.875037841796875e+02, 2.874667663574219e+02, 2.8743505859375e+02, 2.874096374511719e+02, 2.874829711914062e+02, 2.877071838378906e+02, 2.89088134765625e+02, 2.897340087890625e+02, 2.899070739746094e+02, 2.902013549804688e+02, 2.903966064453125e+02, 2.903186645507812e+02, 2.897747497558594e+02, 2.892722778320312e+02, 2.888306579589844e+02, 2.884524841308594e+02, 2.882605590820312e+02, 2.881587219238281e+02, 2.880453186035156e+02, 2.8803662109375e+02, 2.890478820800781e+02, 2.896689147949219e+02, 2.898714294433594e+02, 2.900637817382812e+02, 2.902503967285156e+02, 2.901801147460938e+02, 2.89622802734375e+02, 2.890658874511719e+02, 2.885734558105469e+02, 2.8814794921875e+02, 2.878952026367188e+02, 2.877391357421875e+02, 2.876208190917969e+02, 2.876158142089844e+02, 2.884090881347656e+02, 2.893710021972656e+02, 2.897944946289062e+02, 2.89968017578125e+02, 2.902015380859375e+02, 2.90302001953125e+02, 2.897044677734375e+02, 2.891188354492188e+02, 2.885977172851562e+02, 2.879996643066406e+02, 2.876074829101562e+02, 2.873792724609375e+02, 2.871008911132812e+02, 2.867836608886719e+02, 2.868304748535156e+02, 2.881631469726562e+02, 2.887281494140625e+02, 2.8891845703125e+02, 2.893058776855469e+02, 2.895553283691406e+02, 2.89310791015625e+02, 2.887619934082031e+02, 2.881106872558594e+02, 2.87540771484375e+02, 2.870908813476562e+02, 2.867798461914062e+02, 2.864832763671875e+02, 2.862681579589844e+02, 2.862703552246094e+02, 2.874849853515625e+02, 2.880292358398438e+02, 2.881182250976562e+02, 2.883948059082031e+02, 2.8855029296875e+02, 2.883052368164062e+02, 2.875932922363281e+02, 2.868911437988281e+02, 2.862797546386719e+02, 2.8573974609375e+02, 2.853269958496094e+02, 2.849820556640625e+02, 2.847162780761719e+02, 2.845830688476562e+02, 2.850726623535156e+02, 2.856301879882812e+02, 2.859845275878906e+02, 2.862716674804688e+02, 2.858873291015625e+02, 2.856733093261719e+02, 2.854489135742188e+02, 2.85298828125e+02, 2.851102294921875e+02, 2.849506530761719e+02]
 TAirEnePlu.y=[2.862900085449219e+02, 2.850299987792969e+02, 2.848500061035156e+02, 2.84760009765625e+02, 2.846700134277344e+02, 2.846700134277344e+02, 2.85010009765625e+02, 2.854800109863281e+02, 2.858200073242188e+02, 2.860799865722656e+02, 2.862000122070312e+02, 2.862300109863281e+02, 2.863099975585938e+02, 2.863699951171875e+02, 2.863500061035156e+02, 2.8625e+02, 2.862699890136719e+02, 2.863299865722656e+02, 2.866499938964844e+02, 2.873699951171875e+02, 2.904299926757812e+02, 2.914200134277344e+02, 2.914299926757812e+02, 2.918800048828125e+02, 2.921400146484375e+02, 2.915899963378906e+02, 2.903299865722656e+02, 2.892699890136719e+02, 2.881900024414062e+02, 2.875799865722656e+02, 2.873800048828125e+02, 2.872900085449219e+02, 2.870899963378906e+02, 2.871900024414062e+02, 2.898399963378906e+02, 2.908299865722656e+02, 2.910599975585938e+02, 2.914400024414062e+02, 2.916799926757812e+02, 2.9125e+02, 2.898599853515625e+02, 2.886199951171875e+02, 2.876799926757812e+02, 2.87010009765625e+02, 2.867300109863281e+02, 2.865799865722656e+02, 2.864599914550781e+02, 2.866300048828125e+02, 2.891600036621094e+02, 2.907099914550781e+02, 2.913200073242188e+02, 2.915599975585938e+02, 2.918299865722656e+02, 2.918500061035156e+02, 2.900899963378906e+02, 2.887900085449219e+02, 2.878800048828125e+02, 2.865499877929688e+02, 2.860599975585938e+02, 2.858399963378906e+02, 2.852999877929688e+02, 2.847200012207031e+02, 2.850700073242188e+02, 2.883399963378906e+02, 2.893299865722656e+02, 2.895499877929688e+02, 2.904700012207031e+02, 2.908800048828125e+02, 2.898800048828125e+02, 2.886700134277344e+02, 2.871499938964844e+02, 2.86e+02, 2.852999877929688e+02, 2.849200134277344e+02, 2.844299926757812e+02, 2.84239990234375e+02, 2.845799865722656e+02, 2.874800109863281e+02, 2.883299865722656e+02, 2.883099975585938e+02, 2.888500061035156e+02, 2.889700012207031e+02, 2.880499877929688e+02, 2.863699951171875e+02, 2.849200134277344e+02, 2.839700012207031e+02, 2.832200012207031e+02, 2.827260131835938e+02, 2.82302001953125e+02, 2.819580078125e+02, 2.819119873046875e+02, 2.83489990234375e+02, 2.845599975585938e+02, 2.850599975585938e+02, 2.854599914550781e+02, 2.841499938964844e+02, 2.835799865722656e+02, 2.82947998046875e+02, 2.826889953613281e+02, 2.823930053710938e+02, 2.822630004882812e+02]
 relHumEnePlu.y=[2.606000006198883e-01, 2.28300005197525e-01, 1.852000057697296e-01, 1.617999970912933e-01, 1.506000012159348e-01, 1.476999968290329e-01, 1.456999927759171e-01, 1.541000008583069e-01, 1.748999953269958e-01, 1.959999948740005e-01, 2.178000062704086e-01, 2.327000051736832e-01, 2.41799995303154e-01, 2.542000114917755e-01, 2.61599987745285e-01, 2.590000033378601e-01, 2.538000047206879e-01, 2.504000067710876e-01, 2.511000037193298e-01, 2.465000003576279e-01, 2.282000035047531e-01, 2.431000024080276e-01, 2.567000091075897e-01, 2.809999883174896e-01, 3.041999936103821e-01, 3.312000036239624e-01, 3.488999903202057e-01, 3.605000078678131e-01, 3.779999911785126e-01, 3.794000148773193e-01, 3.759999871253967e-01, 3.693000078201294e-01, 3.465000092983246e-01, 3.11599999666214e-01, 2.57099986076355e-01, 2.495999932289124e-01, 2.533999979496002e-01, 2.5e-01, 2.563000023365021e-01, 2.687000036239624e-01, 2.777000069618225e-01, 2.818999886512756e-01, 2.856999933719635e-01, 2.86300003528595e-01, 2.800000011920929e-01, 2.761000096797943e-01, 2.736999988555908e-01, 2.711000144481659e-01, 2.457000017166138e-01, 2.508000135421753e-01, 2.689000070095062e-01, 2.784000039100647e-01, 2.931999862194061e-01, 2.978000044822693e-01, 3.04500013589859e-01, 2.85400003194809e-01, 2.682999968528748e-01, 2.529999911785131e-01, 2.234999984502792e-01, 2.071000039577484e-01, 1.922000050544739e-01, 1.632999926805496e-01, 1.360999941825867e-01, 1.251000016927719e-01, 1.361999958753586e-01, 1.465000063180923e-01, 1.627999991178513e-01, 1.808999925851822e-01, 2.002999931573868e-01, 2.010000050067903e-01, 1.964000016450882e-01, 1.83899998664856e-01, 1.692000031471252e-01, 1.53999999165535e-01, 1.404000073671341e-01, 1.275999993085861e-01, 1.101000010967255e-01, 9.131000190973282e-02, 9.830000251531601e-02, 1.050999984145164e-01, 1.089999973773956e-01, 1.159000024199486e-01, 1.22299998998642e-01, 1.164999976754189e-01, 1.01000003516674e-01, 8.540000021457672e-02, 7.383999973535538e-02, 6.473000347614288e-02, 5.889999866485596e-02, 5.569000169634819e-02, 5.198999866843224e-02, 4.912000149488449e-02, 5.61399981379509e-02, 6.313999742269516e-02, 6.86199963092804e-02, 7.214999943971634e-02, 7.083000242710114e-02, 6.75399973988533e-02, 6.373000144958496e-02, 6.089000031352043e-02, 5.781999975442886e-02]
-zon1.phi=[6.920281648635864e-01, 6.550365090370178e-01, 4.669249951839447e-01, 3.392241299152374e-01, 2.598594725131989e-01, 2.131691128015518e-01, 1.828178614377975e-01, 1.753138601779938e-01, 1.865610182285309e-01, 2.015236914157867e-01, 2.196935713291168e-01, 2.324153482913971e-01, 2.402506619691849e-01, 2.516057193279266e-01, 2.592773139476776e-01, 2.567754685878754e-01, 2.515727281570435e-01, 2.482226341962814e-01, 2.486884593963623e-01, 2.441578507423401e-01, 2.299057692289352e-01, 2.46593177318573e-01, 2.597547471523285e-01, 2.865593135356903e-01, 3.081097602844238e-01, 3.357425630092621e-01, 3.523375391960144e-01, 3.644512891769409e-01, 3.830036520957947e-01, 3.815383315086365e-01, 3.759629130363464e-01, 3.686167895793915e-01, 3.439635336399078e-01, 3.056111335754395e-01, 2.517800331115722e-01, 2.508393824100494e-01, 2.569966316223145e-01, 2.539308369159698e-01, 2.603501379489899e-01, 2.745511829853058e-01, 2.808314859867096e-01, 2.852528989315033e-01, 2.899366319179535e-01, 2.87742406129837e-01, 2.805819809436798e-01, 2.76111900806427e-01, 2.721570134162903e-01, 2.707760035991669e-01, 2.398263514041901e-01, 2.552381157875061e-01, 2.744505703449249e-01, 2.818654775619507e-01, 2.971657514572144e-01, 3.033356368541718e-01, 3.091852962970734e-01, 2.905832827091217e-01, 2.723440825939181e-01, 2.54908621311188e-01, 2.243693470954895e-01, 2.077976614236832e-01, 1.923559755086899e-01, 1.626200377941132e-01, 1.276765018701553e-01, 1.29258006811142e-01, 1.415240168571472e-01, 1.508139967918396e-01, 1.679176539182663e-01, 1.8609219789505e-01, 2.085753679275515e-01, 2.042299807071687e-01, 1.987720131874084e-01, 1.866430938243866e-01, 1.704681515693665e-01, 1.543721407651901e-01, 1.399437785148621e-01, 1.267296671867371e-01, 1.101168617606163e-01, 9.388247132301331e-02, 1.034528091549873e-01, 1.104250773787498e-01, 1.155005544424057e-01, 1.228022649884225e-01, 1.294911354780198e-01, 1.207386255264282e-01, 1.053032949566841e-01, 8.937688171863556e-02, 7.686591148376465e-02, 6.645745038986206e-02, 6.004434451460838e-02, 5.590740591287613e-02, 5.16337938606739e-02, 4.893532022833824e-02, 5.727868154644966e-02, 6.471496075391769e-02, 7.059279829263687e-02, 7.310699671506882e-02, 7.155989110469818e-02, 6.697701662778854e-02, 6.267698109149933e-02, 5.945401266217232e-02, 5.632632970809937e-02]
-zon2.phi=[6.920281648635864e-01, 6.550111174583435e-01, 4.669054746627808e-01, 3.392102420330048e-01, 2.598493695259094e-01, 2.131152451038361e-01, 1.827970445156097e-01, 1.752974390983582e-01, 1.865441054105759e-01, 2.015059739351273e-01, 2.196754813194275e-01, 2.323978841304779e-01, 2.402340769767761e-01, 2.515896558761597e-01, 2.592621147632599e-01, 2.567616403102875e-01, 2.51560240983963e-01, 2.482113838195801e-01, 2.486780732870102e-01, 2.441464066505432e-01, 2.298989146947861e-01, 2.465883940458298e-01, 2.597503066062927e-01, 2.865554392337799e-01, 3.081061542034149e-01, 3.357386589050293e-01, 3.523325324058533e-01, 3.64446610212326e-01, 3.829990029335023e-01, 3.815340101718903e-01, 3.759585320949554e-01, 3.686124086380005e-01, 3.43959778547287e-01, 3.05599719285965e-01, 2.51767486333847e-01, 2.508350014686584e-01, 2.569925487041473e-01, 2.539272010326385e-01, 2.603471577167511e-01, 2.745482921600342e-01, 2.80828446149826e-01, 2.85249650478363e-01, 2.89932906627655e-01, 2.877383828163147e-01, 2.805778980255127e-01, 2.761079072952271e-01, 2.721532583236694e-01, 2.707721889019012e-01, 2.398103177547455e-01, 2.552325427532196e-01, 2.744460999965668e-01, 2.818605899810791e-01, 2.97161340713501e-01, 3.033318519592285e-01, 3.091815412044525e-01, 2.905802130699158e-01, 2.723409831523898e-01, 2.549054622650149e-01, 2.243664562702179e-01, 2.077950239181519e-01, 1.923534721136093e-01, 1.626180410385132e-01, 1.276266574859619e-01, 1.292577534914017e-01, 1.415263116359711e-01, 1.508139967918396e-01, 1.679171472787857e-01, 1.860919147729874e-01, 2.085731476545337e-01, 2.042285650968553e-01, 1.987690329551697e-01, 1.866385787725449e-01, 1.70463040471077e-01, 1.543671041727066e-01, 1.399390250444412e-01, 1.267254799604416e-01, 1.100655868649483e-01, 9.388282150030136e-02, 1.034600734710693e-01, 1.104312464594841e-01, 1.155064329504967e-01, 1.228090450167657e-01, 1.294991225004197e-01, 1.207463443279266e-01, 1.053072959184647e-01, 8.937845379114151e-02, 7.686591893434525e-02, 6.645646691322327e-02, 6.004277989268303e-02, 5.59055469930172e-02, 5.163222178816795e-02, 4.892867803573608e-02, 5.728158727288246e-02, 6.471782177686691e-02, 7.059529423713684e-02, 7.310623675584793e-02, 7.155676186084747e-02, 6.69705793261528e-02, 6.266993284225464e-02, 5.944692343473434e-02, 5.631964281201363e-02]
+zon1.phi=[6.920281648635864e-01, 6.550378203392029e-01, 4.669269025325775e-01, 3.392278254032135e-01, 2.598644495010376e-01, 2.131734937429428e-01, 1.828206181526184e-01, 1.753165721893311e-01, 1.865633875131607e-01, 2.015258520841599e-01, 2.196949571371078e-01, 2.324160933494568e-01, 2.40251287817955e-01, 2.516056299209595e-01, 2.592758238315582e-01, 2.567737996578217e-01, 2.515713572502136e-01, 2.482216954231262e-01, 2.486870884895325e-01, 2.44156613945961e-01, 2.299046367406845e-01, 2.465897798538208e-01, 2.597532868385315e-01, 2.865584194660187e-01, 3.081077933311462e-01, 3.357400596141815e-01, 3.523356914520264e-01, 3.64451140165329e-01, 3.830041289329529e-01, 3.815393447875977e-01, 3.759644329547882e-01, 3.686170876026154e-01, 3.439636528491974e-01, 3.056114315986633e-01, 2.517802715301513e-01, 2.508378922939301e-01, 2.569958567619324e-01, 2.539301514625549e-01, 2.603488266468048e-01, 2.745499014854431e-01, 2.808313369750977e-01, 2.85254180431366e-01, 2.899381518363953e-01, 2.877431213855743e-01, 2.805838286876678e-01, 2.761144936084747e-01, 2.721594870090485e-01, 2.707788646221161e-01, 2.398273199796677e-01, 2.55236953496933e-01, 2.744483351707458e-01, 2.818597853183746e-01, 2.971590459346771e-01, 3.033280372619629e-01, 3.091843724250793e-01, 2.905880510807037e-01, 2.723563313484195e-01, 2.549198567867282e-01, 2.243828177452087e-01, 2.078116983175278e-01, 1.923626959323883e-01, 1.626264154911041e-01, 1.276861429214478e-01, 1.29257470369339e-01, 1.415227502584457e-01, 1.508151590824127e-01, 1.679123342037201e-01, 1.860855519771576e-01, 2.085665911436084e-01, 2.042341977357865e-01, 1.987787485122681e-01, 1.866521835327148e-01, 1.704829186201096e-01, 1.543888598680496e-01, 1.399569362401962e-01, 1.267413645982742e-01, 1.101156994700432e-01, 9.387943893671036e-02, 1.034429147839546e-01, 1.104208454489708e-01, 1.154913231730461e-01, 1.227936893701554e-01, 1.294851005077363e-01, 1.20740681886673e-01, 1.053143888711929e-01, 8.938928693532944e-02, 7.688044756650925e-02, 6.647991389036179e-02, 6.006684154272079e-02, 5.592723190784454e-02, 5.164812877774239e-02, 4.894439503550529e-02, 5.728256702423096e-02, 6.471167504787445e-02, 7.058814167976379e-02, 7.311112433671951e-02, 7.156486064195633e-02, 6.698543578386307e-02, 6.268526613712311e-02, 5.946210771799088e-02, 5.633310601115227e-02]
+zon2.phi=[6.920281648635864e-01, 6.550123691558838e-01, 4.669073820114136e-01, 3.392139077186584e-01, 2.598543465137482e-01, 2.131196111440659e-01, 1.827997863292694e-01, 1.753001511096954e-01, 1.865464746952057e-01, 2.015081495046616e-01, 2.196768671274185e-01, 2.323986291885376e-01, 2.402347028255463e-01, 2.515895962715149e-01, 2.592606246471405e-01, 2.567600011825562e-01, 2.515588700771332e-01, 2.482104450464249e-01, 2.486767023801804e-01, 2.441451698541641e-01, 2.298977673053741e-01, 2.465850114822388e-01, 2.597488462924957e-01, 2.865545451641083e-01, 3.081042170524597e-01, 3.357361555099487e-01, 3.523306548595428e-01, 3.644464313983917e-01, 3.829994797706605e-01, 3.815349936485291e-01, 3.759600222110748e-01, 3.686127066612244e-01, 3.439598977565765e-01, 3.056000173091888e-01, 2.517677545547485e-01, 2.508335411548615e-01, 2.569917738437653e-01, 2.539265155792236e-01, 2.603458166122437e-01, 2.745470106601715e-01, 2.808282673358917e-01, 2.852509319782257e-01, 2.899343967437744e-01, 2.87739098072052e-01, 2.805797159671783e-01, 2.761104702949524e-01, 2.721557319164276e-01, 2.707750499248505e-01, 2.398112863302231e-01, 2.552313804626465e-01, 2.744438648223877e-01, 2.818548977375031e-01, 2.971546351909637e-01, 3.033242523670197e-01, 3.091806173324585e-01, 2.905849516391754e-01, 2.723532319068911e-01, 2.549166977405551e-01, 2.243799120187759e-01, 2.078090608119965e-01, 1.923601776361465e-01, 1.626244187355042e-01, 1.276362985372543e-01, 1.292572170495987e-01, 1.415250599384308e-01, 1.508151441812515e-01, 1.679118275642395e-01, 1.860852688550949e-01, 2.085643708705905e-01, 2.042327970266343e-01, 1.987757682800293e-01, 1.866476684808731e-01, 1.704778075218201e-01, 1.543838232755661e-01, 1.399521678686142e-01, 1.267371773719788e-01, 1.100644320249557e-01, 9.387977421283722e-02, 1.03450171649456e-01, 1.10427014529705e-01, 1.154972016811371e-01, 1.22800461947918e-01, 1.294930875301362e-01, 1.207484006881714e-01, 1.053183898329735e-01, 8.939085155725479e-02, 7.688046246767044e-02, 6.647893786430359e-02, 6.006528064608574e-02, 5.592537671327591e-02, 5.164656043052673e-02, 4.893769323825836e-02, 5.728543922305107e-02, 6.471452116966248e-02, 7.059063017368317e-02, 7.311036437749863e-02, 7.156173139810562e-02, 6.697899848222733e-02, 6.267822533845901e-02, 5.94550222158432e-02, 5.632642284035683e-02]
 zon1.zon.AFlo=[5.945794677734375e+02, 5.945794677734375e+02]
 zon2.zon.AFlo=[5.945794677734375e+02, 5.945794677734375e+02]
 zon1.zon.V=[2.718417236328125e+03, 2.718417236328125e+03]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneCapacitanceMultiplier.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneCapacitanceMultiplier.txt
index 9a8005ed78f..26a71ffc30d 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneCapacitanceMultiplier.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneCapacitanceMultiplier.txt
@@ -1,11 +1,11 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0, 0",
   "nonlinear": " ",
-  "number of continuous time states": "6",
+  "number of continuous time states": "8",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 4.32e+05]
-defCap.zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865452880859375e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337646484375e+02, 2.85107177734375e+02, 2.869447021484375e+02, 2.883150634765625e+02, 2.8872509765625e+02, 2.884546508789062e+02, 2.882599487304688e+02, 2.875870361328125e+02, 2.867377014160156e+02, 2.860204162597656e+02, 2.853323669433594e+02, 2.849344787597656e+02, 2.845061645507812e+02, 2.840436706542969e+02, 2.836084594726562e+02, 2.834299011230469e+02, 2.831880798339844e+02, 2.828783569335938e+02, 2.827989196777344e+02, 2.826683654785156e+02, 2.83044189453125e+02, 2.8446728515625e+02, 2.854508056640625e+02, 2.863419494628906e+02, 2.871799621582031e+02, 2.877545776367188e+02, 2.878578491210938e+02, 2.876748352050781e+02, 2.87080322265625e+02, 2.856826171875e+02, 2.845762634277344e+02, 2.84232666015625e+02, 2.840107727050781e+02, 2.836387939453125e+02, 2.83245361328125e+02, 2.829546813964844e+02, 2.826980285644531e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817340087890625e+02, 2.817627868652344e+02, 2.832456665039062e+02, 2.840979614257812e+02, 2.849918823242188e+02, 2.856445922851562e+02, 2.860323791503906e+02, 2.864435729980469e+02, 2.864235534667969e+02, 2.856654968261719e+02, 2.84279052734375e+02, 2.829777221679688e+02, 2.824683532714844e+02, 2.820337829589844e+02, 2.816459655761719e+02, 2.813206176757812e+02, 2.81027587890625e+02, 2.807494506835938e+02, 2.804706115722656e+02, 2.802007446289062e+02, 2.799769287109375e+02, 2.802752075195312e+02, 2.819242248535156e+02, 2.829451904296875e+02, 2.838786926269531e+02, 2.846118469238281e+02, 2.851133117675781e+02, 2.854572143554688e+02, 2.853259582519531e+02, 2.845036926269531e+02, 2.829114379882812e+02, 2.814379272460938e+02, 2.808877868652344e+02, 2.804506225585938e+02, 2.798975830078125e+02, 2.7930810546875e+02, 2.788958435058594e+02, 2.785968933105469e+02, 2.781375732421875e+02, 2.773388671875e+02, 2.764812316894531e+02, 2.763219604492188e+02, 2.786509704589844e+02, 2.81330810546875e+02, 2.835544738769531e+02, 2.850451965332031e+02, 2.864626159667969e+02, 2.877088623046875e+02, 2.8729052734375e+02, 2.858002319335938e+02, 2.840639038085938e+02, 2.823191223144531e+02, 2.813235168457031e+02, 2.804435729980469e+02, 2.797223815917969e+02, 2.790180053710938e+02]
-mulCap.zon.TAir=[2.931499938964844e+02, 2.915985717773438e+02, 2.90232666015625e+02, 2.8912890625e+02, 2.88184814453125e+02, 2.873669128417969e+02, 2.866230163574219e+02, 2.86281982421875e+02, 2.86843017578125e+02, 2.877457275390625e+02, 2.884181518554688e+02, 2.886168518066406e+02, 2.886207275390625e+02, 2.884357604980469e+02, 2.880132446289062e+02, 2.875103454589844e+02, 2.869743041992188e+02, 2.865044860839844e+02, 2.860811462402344e+02, 2.856754455566406e+02, 2.852612915039062e+02, 2.849759216308594e+02, 2.846757202148438e+02, 2.843726501464844e+02, 2.841314697265625e+02, 2.839518737792969e+02, 2.837806091308594e+02, 2.841346435546875e+02, 2.847322692871094e+02, 2.853433837890625e+02, 2.859762268066406e+02, 2.865227661132812e+02, 2.869814147949219e+02, 2.87227783203125e+02, 2.872654724121094e+02, 2.868617553710938e+02, 2.861856384277344e+02, 2.856778869628906e+02, 2.852946166992188e+02, 2.849727478027344e+02, 2.846173095703125e+02, 2.842909545898438e+02, 2.839949340820312e+02, 2.837452392578125e+02, 2.834781494140625e+02, 2.831637573242188e+02, 2.827957153320312e+02, 2.83030517578125e+02, 2.835294189453125e+02, 2.84094970703125e+02, 2.846555786132812e+02, 2.851129150390625e+02, 2.855789489746094e+02, 2.858701171875e+02, 2.858895568847656e+02, 2.854530944824219e+02, 2.847098083496094e+02, 2.840939636230469e+02, 2.835834655761719e+02, 2.831417541503906e+02, 2.827577209472656e+02, 2.824201965332031e+02, 2.821116943359375e+02, 2.818237915039062e+02, 2.815406188964844e+02, 2.812823181152344e+02, 2.8103955078125e+02, 2.813995361328125e+02, 2.820290832519531e+02, 2.826776733398438e+02, 2.833124389648438e+02, 2.838421020507812e+02, 2.843532409667969e+02, 2.846714782714844e+02, 2.84693603515625e+02, 2.841883544921875e+02, 2.833482971191406e+02, 2.826422119140625e+02, 2.820806884765625e+02, 2.815656433105469e+02, 2.810467224121094e+02, 2.805634155273438e+02, 2.801667785644531e+02, 2.797833251953125e+02, 2.792904357910156e+02, 2.786534729003906e+02, 2.779938659667969e+02, 2.782848815917969e+02, 2.795636901855469e+02, 2.811613159179688e+02, 2.82600341796875e+02, 2.838629455566406e+02, 2.851335754394531e+02, 2.858522033691406e+02, 2.857567138671875e+02, 2.850455322265625e+02, 2.840333862304688e+02, 2.83140625e+02, 2.82314697265625e+02, 2.815628051757812e+02, 2.808884887695312e+02]
+defCap.zon.TAir=[2.931499938964844e+02, 2.888004760742188e+02, 2.875408630371094e+02, 2.865453186035156e+02, 2.856974792480469e+02, 2.849419250488281e+02, 2.842337951660156e+02, 2.851071472167969e+02, 2.869447326660156e+02, 2.883150939941406e+02, 2.887251281738281e+02, 2.884546813964844e+02, 2.882599792480469e+02, 2.875870666503906e+02, 2.867377624511719e+02, 2.860204467773438e+02, 2.853324279785156e+02, 2.849344787597656e+02, 2.845061950683594e+02, 2.840436706542969e+02, 2.836084899902344e+02, 2.83429931640625e+02, 2.831880798339844e+02, 2.828783569335938e+02, 2.827989501953125e+02, 2.826683959960938e+02, 2.83044189453125e+02, 2.8446728515625e+02, 2.854508056640625e+02, 2.863419799804688e+02, 2.87179931640625e+02, 2.877545471191406e+02, 2.878578491210938e+02, 2.876748657226562e+02, 2.870803527832031e+02, 2.856826171875e+02, 2.845762939453125e+02, 2.842326965332031e+02, 2.840108032226562e+02, 2.836387939453125e+02, 2.832453918457031e+02, 2.829547119140625e+02, 2.826980590820312e+02, 2.825072937011719e+02, 2.821558227539062e+02, 2.817340087890625e+02, 2.817627868652344e+02, 2.832456359863281e+02, 2.840979614257812e+02, 2.849918823242188e+02, 2.856445922851562e+02, 2.860323486328125e+02, 2.864435729980469e+02, 2.864235534667969e+02, 2.856654968261719e+02, 2.842791442871094e+02, 2.829777526855469e+02, 2.824683837890625e+02, 2.820338134765625e+02, 2.8164599609375e+02, 2.813206176757812e+02, 2.810276184082031e+02, 2.807494506835938e+02, 2.804706420898438e+02, 2.802007446289062e+02, 2.799769287109375e+02, 2.802751770019531e+02, 2.819242248535156e+02, 2.829451904296875e+02, 2.83878662109375e+02, 2.846118469238281e+02, 2.851133117675781e+02, 2.854572143554688e+02, 2.853259582519531e+02, 2.845036926269531e+02, 2.829114379882812e+02, 2.814379577636719e+02, 2.808877868652344e+02, 2.804506225585938e+02, 2.798975830078125e+02, 2.7930810546875e+02, 2.788958435058594e+02, 2.785968933105469e+02, 2.781375732421875e+02, 2.773388671875e+02, 2.764812316894531e+02, 2.763219604492188e+02, 2.786509399414062e+02, 2.81330810546875e+02, 2.835544738769531e+02, 2.85045166015625e+02, 2.864625854492188e+02, 2.877088928222656e+02, 2.872905578613281e+02, 2.858002319335938e+02, 2.840639343261719e+02, 2.823191223144531e+02, 2.813235168457031e+02, 2.804435729980469e+02, 2.797223815917969e+02, 2.790180053710938e+02]
+mulCap.zon.TAir=[2.931499938964844e+02, 2.915985717773438e+02, 2.902326965332031e+02, 2.8912890625e+02, 2.88184814453125e+02, 2.873669128417969e+02, 2.866230163574219e+02, 2.86281982421875e+02, 2.868430480957031e+02, 2.877457275390625e+02, 2.884181823730469e+02, 2.886168518066406e+02, 2.886207580566406e+02, 2.88435791015625e+02, 2.880132446289062e+02, 2.875103454589844e+02, 2.869743347167969e+02, 2.865045166015625e+02, 2.860811767578125e+02, 2.856754455566406e+02, 2.852612915039062e+02, 2.849759216308594e+02, 2.846757507324219e+02, 2.843726501464844e+02, 2.841315002441406e+02, 2.83951904296875e+02, 2.837806396484375e+02, 2.841346740722656e+02, 2.847322692871094e+02, 2.853434143066406e+02, 2.859762573242188e+02, 2.865227661132812e+02, 2.869814147949219e+02, 2.87227783203125e+02, 2.872654724121094e+02, 2.868617553710938e+02, 2.861856384277344e+02, 2.856778869628906e+02, 2.852946472167969e+02, 2.849727478027344e+02, 2.846173400878906e+02, 2.842909851074219e+02, 2.839949645996094e+02, 2.837452392578125e+02, 2.834781799316406e+02, 2.831637573242188e+02, 2.827957153320312e+02, 2.830305480957031e+02, 2.835294189453125e+02, 2.84094970703125e+02, 2.846555786132812e+02, 2.851129455566406e+02, 2.855789489746094e+02, 2.858701171875e+02, 2.858895568847656e+02, 2.854530944824219e+02, 2.847098388671875e+02, 2.84093994140625e+02, 2.8358349609375e+02, 2.831417846679688e+02, 2.827577514648438e+02, 2.824202270507812e+02, 2.821117248535156e+02, 2.818237915039062e+02, 2.815406494140625e+02, 2.812823486328125e+02, 2.8103955078125e+02, 2.813995361328125e+02, 2.820290832519531e+02, 2.826776733398438e+02, 2.833124389648438e+02, 2.838421325683594e+02, 2.843532409667969e+02, 2.846714782714844e+02, 2.84693603515625e+02, 2.841883544921875e+02, 2.833482666015625e+02, 2.826422119140625e+02, 2.820806884765625e+02, 2.815656433105469e+02, 2.810467224121094e+02, 2.805634155273438e+02, 2.801668090820312e+02, 2.797833251953125e+02, 2.792904357910156e+02, 2.786534729003906e+02, 2.779938659667969e+02, 2.782848815917969e+02, 2.795636901855469e+02, 2.811613159179688e+02, 2.826003723144531e+02, 2.838629455566406e+02, 2.851335754394531e+02, 2.858522033691406e+02, 2.857567138671875e+02, 2.850455322265625e+02, 2.840333862304688e+02, 2.83140625e+02, 2.82314697265625e+02, 2.815627746582031e+02, 2.808884887695312e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneTemperatureInitialization.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneTemperatureInitialization.txt
index 95e32e2a0ca..6501542f813 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneTemperatureInitialization.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ThermalZone_ZoneTemperatureInitialization.txt
@@ -1,12 +1,12 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 8.64e+04]
-zon.TAir=[3.031499938964844e+02, 2.925547485351562e+02, 2.905053100585938e+02, 2.899739379882812e+02, 2.896164245605469e+02, 2.891991577148438e+02, 2.88879150390625e+02, 2.885838317871094e+02, 2.883069763183594e+02, 2.880532836914062e+02, 2.878172912597656e+02, 2.875969543457031e+02, 2.873887329101562e+02, 2.871849975585938e+02, 2.869779357910156e+02, 2.867738342285156e+02, 2.865758361816406e+02, 2.863877258300781e+02, 2.862169799804688e+02, 2.860539855957031e+02, 2.858968811035156e+02, 2.857405700683594e+02, 2.8558056640625e+02, 2.854237670898438e+02, 2.852702331542969e+02, 2.85120361328125e+02, 2.849692993164062e+02, 2.848209533691406e+02, 2.846745910644531e+02, 2.84530517578125e+02, 2.843958740234375e+02, 2.843070373535156e+02, 2.843941955566406e+02, 2.84622314453125e+02, 2.84908203125e+02, 2.852569885253906e+02, 2.856251525878906e+02, 2.859725036621094e+02, 2.863356628417969e+02, 2.867139282226562e+02, 2.870840454101562e+02, 2.874106140136719e+02, 2.877135620117188e+02, 2.880056762695312e+02, 2.882626037597656e+02, 2.8844482421875e+02, 2.886017456054688e+02, 2.88738525390625e+02, 2.888551025390625e+02, 2.888841857910156e+02, 2.888464050292969e+02, 2.887923278808594e+02, 2.887023010253906e+02, 2.886459655761719e+02, 2.886273803710938e+02, 2.885691223144531e+02, 2.885185546875e+02, 2.884883422851562e+02, 2.884550170898438e+02, 2.884019165039062e+02, 2.883689270019531e+02, 2.882972717285156e+02, 2.881781311035156e+02, 2.880443725585938e+02, 2.878689575195312e+02, 2.876914367675781e+02, 2.87533447265625e+02, 2.873648071289062e+02, 2.871868896484375e+02, 2.869935913085938e+02, 2.868385314941406e+02, 2.866996459960938e+02, 2.865547790527344e+02, 2.864077453613281e+02, 2.862615966796875e+02, 2.86117919921875e+02, 2.859737243652344e+02, 2.858286743164062e+02, 2.856851806640625e+02, 2.85544677734375e+02, 2.854263305664062e+02, 2.853364868164062e+02, 2.852640380859375e+02, 2.851942443847656e+02, 2.851164245605469e+02, 2.850257263183594e+02, 2.849324340820312e+02, 2.848419494628906e+02, 2.847552795410156e+02, 2.846729736328125e+02, 2.845949096679688e+02, 2.845192565917969e+02, 2.844352722167969e+02, 2.843375854492188e+02, 2.842343139648438e+02, 2.841297302246094e+02, 2.840279846191406e+02, 2.83938232421875e+02, 2.838554992675781e+02, 2.837742919921875e+02, 2.836922302246094e+02]
-TRad.y=[2.9438818359375e+02, 2.932073669433594e+02, 2.927248840332031e+02, 2.917034912109375e+02, 2.913559875488281e+02, 2.9077978515625e+02, 2.905249633789062e+02, 2.900660705566406e+02, 2.898550109863281e+02, 2.896559143066406e+02, 2.892872314453125e+02, 2.891156616210938e+02, 2.887939147949219e+02, 2.886365356445312e+02, 2.883316955566406e+02, 2.881837768554688e+02, 2.878967590332031e+02, 2.877611694335938e+02, 2.876296691894531e+02, 2.87378173828125e+02, 2.872572326660156e+02, 2.870210266113281e+02, 2.869043884277344e+02, 2.866755676269531e+02, 2.865635986328125e+02, 2.864531860351562e+02, 2.862333679199219e+02, 2.861249694824219e+02, 2.859114990234375e+02, 2.858062438964844e+02, 2.856079406738281e+02, 2.855692443847656e+02, 2.857413024902344e+02, 2.859087219238281e+02, 2.861129455566406e+02, 2.866192321777344e+02, 2.868676452636719e+02, 2.873829345703125e+02, 2.876455078125e+02, 2.881818542480469e+02, 2.88421875e+02, 2.8887060546875e+02, 2.890830688476562e+02, 2.892866821289062e+02, 2.896269226074219e+02, 2.897584838867188e+02, 2.899839172363281e+02, 2.900648803710938e+02, 2.901809692382812e+02, 2.901872253417969e+02, 2.901445922851562e+02, 2.900613708496094e+02, 2.899703674316406e+02, 2.898982238769531e+02, 2.898673400878906e+02, 2.897584533691406e+02, 2.897118530273438e+02, 2.896357421875e+02, 2.895962829589844e+02, 2.895483703613281e+02, 2.894860229492188e+02, 2.894174499511719e+02, 2.892439575195312e+02, 2.891432189941406e+02, 2.888733520507812e+02, 2.88749755859375e+02, 2.884996337890625e+02, 2.883679504394531e+02, 2.882322387695312e+02, 2.879541931152344e+02, 2.8783740234375e+02, 2.876174011230469e+02, 2.87510009765625e+02, 2.873001098632812e+02, 2.871974792480469e+02, 2.870963745117188e+02, 2.868918151855469e+02, 2.867897338867188e+02, 2.865882873535156e+02, 2.864897155761719e+02, 2.863207702636719e+02, 2.862438659667969e+02, 2.861044006347656e+02, 2.860404357910156e+02, 2.859771118164062e+02, 2.858540954589844e+02, 2.857937622070312e+02, 2.856730041503906e+02, 2.85609375e+02, 2.854790954589844e+02, 2.854144897460938e+02, 2.852889404296875e+02, 2.852234802246094e+02, 2.851573181152344e+02, 2.850228271484375e+02, 2.849547119140625e+02, 2.848215026855469e+02, 2.847577819824219e+02, 2.846328735351562e+02, 2.845712890625e+02, 2.845100708007812e+02]
-zon.TRad=[2.9438818359375e+02, 2.932073669433594e+02, 2.927248840332031e+02, 2.917034912109375e+02, 2.913559875488281e+02, 2.9077978515625e+02, 2.905249633789062e+02, 2.900660705566406e+02, 2.898550109863281e+02, 2.896559143066406e+02, 2.892872314453125e+02, 2.891156616210938e+02, 2.887939147949219e+02, 2.886365356445312e+02, 2.883316955566406e+02, 2.881837768554688e+02, 2.878967590332031e+02, 2.877611694335938e+02, 2.876296691894531e+02, 2.87378173828125e+02, 2.872572326660156e+02, 2.870210266113281e+02, 2.869043884277344e+02, 2.866755676269531e+02, 2.865635986328125e+02, 2.864531860351562e+02, 2.862333679199219e+02, 2.861249694824219e+02, 2.859114990234375e+02, 2.858062438964844e+02, 2.856079406738281e+02, 2.855692443847656e+02, 2.857413024902344e+02, 2.859087219238281e+02, 2.861129455566406e+02, 2.866192321777344e+02, 2.868676452636719e+02, 2.873829345703125e+02, 2.876455078125e+02, 2.881818542480469e+02, 2.88421875e+02, 2.8887060546875e+02, 2.890830688476562e+02, 2.892866821289062e+02, 2.896269226074219e+02, 2.897584838867188e+02, 2.899839172363281e+02, 2.900648803710938e+02, 2.901809692382812e+02, 2.901872253417969e+02, 2.901445922851562e+02, 2.900613708496094e+02, 2.899703674316406e+02, 2.898982238769531e+02, 2.898673400878906e+02, 2.897584533691406e+02, 2.897118530273438e+02, 2.896357421875e+02, 2.895962829589844e+02, 2.895483703613281e+02, 2.894860229492188e+02, 2.894174499511719e+02, 2.892439575195312e+02, 2.891432189941406e+02, 2.888733520507812e+02, 2.88749755859375e+02, 2.884996337890625e+02, 2.883679504394531e+02, 2.882322387695312e+02, 2.879541931152344e+02, 2.8783740234375e+02, 2.876174011230469e+02, 2.87510009765625e+02, 2.873001098632812e+02, 2.871974792480469e+02, 2.870963745117188e+02, 2.868918151855469e+02, 2.867897338867188e+02, 2.865882873535156e+02, 2.864897155761719e+02, 2.863207702636719e+02, 2.862438659667969e+02, 2.861044006347656e+02, 2.860404357910156e+02, 2.859771118164062e+02, 2.858540954589844e+02, 2.857937622070312e+02, 2.856730041503906e+02, 2.85609375e+02, 2.854790954589844e+02, 2.854144897460938e+02, 2.852889404296875e+02, 2.852234802246094e+02, 2.851573181152344e+02, 2.850228271484375e+02, 2.849547119140625e+02, 2.848215026855469e+02, 2.847577819824219e+02, 2.846328735351562e+02, 2.845712890625e+02, 2.845100708007812e+02]
+zon.TAir=[3.031499938964844e+02, 2.925547180175781e+02, 2.9050537109375e+02, 2.899739379882812e+02, 2.896164245605469e+02, 2.891991577148438e+02, 2.88879150390625e+02, 2.885838317871094e+02, 2.883069763183594e+02, 2.880533142089844e+02, 2.878172912597656e+02, 2.875969543457031e+02, 2.873887329101562e+02, 2.871849975585938e+02, 2.869779357910156e+02, 2.867738342285156e+02, 2.865758666992188e+02, 2.863877258300781e+02, 2.862169799804688e+02, 2.860540161132812e+02, 2.858968811035156e+02, 2.857405700683594e+02, 2.855805969238281e+02, 2.854237670898438e+02, 2.852702331542969e+02, 2.85120361328125e+02, 2.849692993164062e+02, 2.848209533691406e+02, 2.846745910644531e+02, 2.84530517578125e+02, 2.843958740234375e+02, 2.843070373535156e+02, 2.843941955566406e+02, 2.84622314453125e+02, 2.84908203125e+02, 2.852569580078125e+02, 2.856251220703125e+02, 2.859725036621094e+02, 2.863356628417969e+02, 2.867139282226562e+02, 2.870840759277344e+02, 2.8741064453125e+02, 2.877135925292969e+02, 2.880057067871094e+02, 2.882626037597656e+02, 2.884448547363281e+02, 2.886017456054688e+02, 2.887385559082031e+02, 2.888551025390625e+02, 2.888842163085938e+02, 2.888464050292969e+02, 2.887923278808594e+02, 2.887023315429688e+02, 2.8864599609375e+02, 2.886273803710938e+02, 2.885691528320312e+02, 2.885185852050781e+02, 2.884883728027344e+02, 2.884550170898438e+02, 2.884019470214844e+02, 2.883689575195312e+02, 2.882973022460938e+02, 2.881781311035156e+02, 2.880444030761719e+02, 2.878690490722656e+02, 2.876914672851562e+02, 2.87533447265625e+02, 2.873648376464844e+02, 2.871869201660156e+02, 2.869935913085938e+02, 2.868385314941406e+02, 2.866996459960938e+02, 2.865548095703125e+02, 2.864077453613281e+02, 2.862615966796875e+02, 2.86117919921875e+02, 2.859737548828125e+02, 2.858287048339844e+02, 2.856852111816406e+02, 2.855447082519531e+02, 2.854264221191406e+02, 2.853365173339844e+02, 2.852640686035156e+02, 2.851942749023438e+02, 2.851164245605469e+02, 2.850257263183594e+02, 2.849324340820312e+02, 2.848419494628906e+02, 2.847553100585938e+02, 2.846731262207031e+02, 2.84594970703125e+02, 2.84519287109375e+02, 2.84435302734375e+02, 2.843376159667969e+02, 2.842343139648438e+02, 2.841297607421875e+02, 2.840280151367188e+02, 2.839382629394531e+02, 2.838555297851562e+02, 2.837743225097656e+02, 2.836922302246094e+02]
+TRad.y=[2.9438818359375e+02, 2.932073364257812e+02, 2.92724853515625e+02, 2.917034912109375e+02, 2.913559875488281e+02, 2.907797546386719e+02, 2.905249328613281e+02, 2.900660705566406e+02, 2.898550109863281e+02, 2.896559143066406e+02, 2.892872314453125e+02, 2.891156616210938e+02, 2.887939147949219e+02, 2.886365356445312e+02, 2.883316955566406e+02, 2.881837768554688e+02, 2.878967590332031e+02, 2.877611389160156e+02, 2.876296691894531e+02, 2.87378173828125e+02, 2.872572326660156e+02, 2.870210266113281e+02, 2.869043884277344e+02, 2.866755676269531e+02, 2.865635986328125e+02, 2.864531860351562e+02, 2.862333679199219e+02, 2.861249694824219e+02, 2.859114990234375e+02, 2.858062438964844e+02, 2.856079406738281e+02, 2.855692443847656e+02, 2.857413024902344e+02, 2.859087219238281e+02, 2.861129455566406e+02, 2.866192321777344e+02, 2.868676452636719e+02, 2.873829345703125e+02, 2.876455078125e+02, 2.881818542480469e+02, 2.88421875e+02, 2.8887060546875e+02, 2.890830688476562e+02, 2.892866821289062e+02, 2.896269226074219e+02, 2.897584838867188e+02, 2.899839477539062e+02, 2.900649108886719e+02, 2.901809692382812e+02, 2.90187255859375e+02, 2.901445922851562e+02, 2.900613708496094e+02, 2.899703979492188e+02, 2.898982238769531e+02, 2.898673400878906e+02, 2.897584533691406e+02, 2.897118530273438e+02, 2.896357421875e+02, 2.895962829589844e+02, 2.895484008789062e+02, 2.894860229492188e+02, 2.8941748046875e+02, 2.892439575195312e+02, 2.891432189941406e+02, 2.888733825683594e+02, 2.887497863769531e+02, 2.884996337890625e+02, 2.883679809570312e+02, 2.882322692871094e+02, 2.879542236328125e+02, 2.878374328613281e+02, 2.87617431640625e+02, 2.875100402832031e+02, 2.873001098632812e+02, 2.871974792480469e+02, 2.870963745117188e+02, 2.86891845703125e+02, 2.867897338867188e+02, 2.865883178710938e+02, 2.864897155761719e+02, 2.863207702636719e+02, 2.86243896484375e+02, 2.861044311523438e+02, 2.860404663085938e+02, 2.859771118164062e+02, 2.858540954589844e+02, 2.857937622070312e+02, 2.856730041503906e+02, 2.856094055175781e+02, 2.854791259765625e+02, 2.854145202636719e+02, 2.852889709472656e+02, 2.852235107421875e+02, 2.851573486328125e+02, 2.850228271484375e+02, 2.849547119140625e+02, 2.84821533203125e+02, 2.847578125e+02, 2.846329040527344e+02, 2.845713195800781e+02, 2.845101013183594e+02]
+zon.TRad=[2.9438818359375e+02, 2.932073364257812e+02, 2.92724853515625e+02, 2.917034912109375e+02, 2.913559875488281e+02, 2.907797546386719e+02, 2.905249328613281e+02, 2.900660705566406e+02, 2.898550109863281e+02, 2.896559143066406e+02, 2.892872314453125e+02, 2.891156616210938e+02, 2.887939147949219e+02, 2.886365356445312e+02, 2.883316955566406e+02, 2.881837768554688e+02, 2.878967590332031e+02, 2.877611389160156e+02, 2.876296691894531e+02, 2.87378173828125e+02, 2.872572326660156e+02, 2.870210266113281e+02, 2.869043884277344e+02, 2.866755676269531e+02, 2.865635986328125e+02, 2.864531860351562e+02, 2.862333679199219e+02, 2.861249694824219e+02, 2.859114990234375e+02, 2.858062438964844e+02, 2.856079406738281e+02, 2.855692443847656e+02, 2.857413024902344e+02, 2.859087219238281e+02, 2.861129455566406e+02, 2.866192321777344e+02, 2.868676452636719e+02, 2.873829345703125e+02, 2.876455078125e+02, 2.881818542480469e+02, 2.88421875e+02, 2.8887060546875e+02, 2.890830688476562e+02, 2.892866821289062e+02, 2.896269226074219e+02, 2.897584838867188e+02, 2.899839477539062e+02, 2.900649108886719e+02, 2.901809692382812e+02, 2.90187255859375e+02, 2.901445922851562e+02, 2.900613708496094e+02, 2.899703979492188e+02, 2.898982238769531e+02, 2.898673400878906e+02, 2.897584533691406e+02, 2.897118530273438e+02, 2.896357421875e+02, 2.895962829589844e+02, 2.895484008789062e+02, 2.894860229492188e+02, 2.8941748046875e+02, 2.892439575195312e+02, 2.891432189941406e+02, 2.888733825683594e+02, 2.887497863769531e+02, 2.884996337890625e+02, 2.883679809570312e+02, 2.882322692871094e+02, 2.879542236328125e+02, 2.878374328613281e+02, 2.87617431640625e+02, 2.875100402832031e+02, 2.873001098632812e+02, 2.871974792480469e+02, 2.870963745117188e+02, 2.86891845703125e+02, 2.867897338867188e+02, 2.865883178710938e+02, 2.864897155761719e+02, 2.863207702636719e+02, 2.86243896484375e+02, 2.861044311523438e+02, 2.860404663085938e+02, 2.859771118164062e+02, 2.858540954589844e+02, 2.857937622070312e+02, 2.856730041503906e+02, 2.856094055175781e+02, 2.854791259765625e+02, 2.854145202636719e+02, 2.852889709472656e+02, 2.852235107421875e+02, 2.851573486328125e+02, 2.850228271484375e+02, 2.849547119140625e+02, 2.84821533203125e+02, 2.847578125e+02, 2.846329040527344e+02, 2.845713195800781e+02, 2.845101013183594e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt
index ba436fb9b54..87561a59626 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneConstantFloorTemperature.txt
@@ -1,15 +1,15 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "3",
+  "number of continuous time states": "4",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 4.32e+05]
-zon.TAir=[2.931499938964844e+02, 2.938889465332031e+02, 2.939502563476562e+02, 2.939796752929688e+02, 2.940084228515625e+02, 2.940189514160156e+02, 2.940131225585938e+02, 2.945214538574219e+02, 2.948373107910156e+02, 2.950447387695312e+02, 2.951716003417969e+02, 2.952153930664062e+02, 2.952512512207031e+02, 2.951486206054688e+02, 2.950681762695312e+02, 2.949915161132812e+02, 2.948948364257812e+02, 2.949771423339844e+02, 2.949779052734375e+02, 2.949203186035156e+02, 2.948962707519531e+02, 2.949202270507812e+02, 2.949644165039062e+02, 2.949719543457031e+02, 2.950934143066406e+02, 2.951356811523438e+02, 2.957652282714844e+02, 2.965053100585938e+02, 2.966730041503906e+02, 2.968687438964844e+02, 2.970297546386719e+02, 2.971091918945312e+02, 2.968687744140625e+02, 2.967387084960938e+02, 2.964970703125e+02, 2.959107971191406e+02, 2.954219360351562e+02, 2.954609985351562e+02, 2.955244140625e+02, 2.954602355957031e+02, 2.953722839355469e+02, 2.953540344238281e+02, 2.953218688964844e+02, 2.953211669921875e+02, 2.952301330566406e+02, 2.9510400390625e+02, 2.95559326171875e+02, 2.962443542480469e+02, 2.963014221191406e+02, 2.964617309570312e+02, 2.965694885253906e+02, 2.966474304199219e+02, 2.966251220703125e+02, 2.9655859375e+02, 2.962564392089844e+02, 2.957416076660156e+02, 2.951568603515625e+02, 2.951472473144531e+02, 2.951170654296875e+02, 2.950822448730469e+02, 2.950804443359375e+02, 2.950709228515625e+02, 2.950473327636719e+02, 2.950165710449219e+02, 2.950060119628906e+02, 2.950107421875e+02, 2.955983276367188e+02, 2.963309326171875e+02, 2.964825744628906e+02, 2.966489868164062e+02, 2.967644348144531e+02, 2.968548583984375e+02, 2.968164367675781e+02, 2.96632568359375e+02, 2.961954345703125e+02, 2.955457458496094e+02, 2.948764953613281e+02, 2.948714599609375e+02, 2.94853759765625e+02, 2.947515258789062e+02, 2.946411437988281e+02, 2.946271057128906e+02, 2.946653137207031e+02, 2.945690307617188e+02, 2.942496032714844e+02, 2.9399169921875e+02, 2.944680480957031e+02, 2.954653015136719e+02, 2.95780029296875e+02, 2.960482482910156e+02, 2.961953735351562e+02, 2.963890075683594e+02, 2.965607604980469e+02, 2.964297790527344e+02, 2.959880676269531e+02, 2.953980407714844e+02, 2.947791137695312e+02, 2.9464013671875e+02, 2.945300903320312e+02, 2.944839172363281e+02, 2.943837280273438e+02]
-zon.TRad=[2.932485046386719e+02, 2.954401550292969e+02, 2.954859313964844e+02, 2.954971313476562e+02, 2.9550830078125e+02, 2.955205993652344e+02, 2.955198059082031e+02, 2.961242370605469e+02, 2.964369201660156e+02, 2.96597412109375e+02, 2.966624755859375e+02, 2.966199035644531e+02, 2.965825805664062e+02, 2.964331359863281e+02, 2.962938232421875e+02, 2.962199401855469e+02, 2.961401977539062e+02, 2.961758728027344e+02, 2.961823120117188e+02, 2.961443481445312e+02, 2.961230163574219e+02, 2.960870361328125e+02, 2.960800170898438e+02, 2.960912170410156e+02, 2.961297912597656e+02, 2.961700134277344e+02, 2.962791137695312e+02, 2.965087280273438e+02, 2.967901306152344e+02, 2.969615173339844e+02, 2.971441650390625e+02, 2.972517700195312e+02, 2.971422729492188e+02, 2.969414367675781e+02, 2.967079467773438e+02, 2.965614318847656e+02, 2.964405517578125e+02, 2.964447021484375e+02, 2.964747009277344e+02, 2.964886779785156e+02, 2.964192810058594e+02, 2.963876037597656e+02, 2.963554382324219e+02, 2.963470458984375e+02, 2.963153686523438e+02, 2.962501220703125e+02, 2.962485656738281e+02, 2.965495300292969e+02, 2.968029174804688e+02, 2.969809265136719e+02, 2.970600891113281e+02, 2.971252746582031e+02, 2.970895385742188e+02, 2.96968505859375e+02, 2.966968078613281e+02, 2.965050964355469e+02, 2.963288879394531e+02, 2.963069763183594e+02, 2.962766418457031e+02, 2.962432250976562e+02, 2.962372436523438e+02, 2.962244567871094e+02, 2.962022399902344e+02, 2.96185302734375e+02, 2.961765747070312e+02, 2.961763305664062e+02, 2.962388610839844e+02, 2.965568237304688e+02, 2.967859191894531e+02, 2.969888610839844e+02, 2.970906982421875e+02, 2.971502990722656e+02, 2.971157836914062e+02, 2.969271850585938e+02, 2.966273193359375e+02, 2.963846130371094e+02, 2.961553955078125e+02, 2.961169128417969e+02, 2.960902709960938e+02, 2.960416870117188e+02, 2.959796142578125e+02, 2.959452514648438e+02, 2.959587097167969e+02, 2.959161071777344e+02, 2.957535705566406e+02, 2.955943298339844e+02, 2.955645141601562e+02, 2.963019714355469e+02, 2.966844787597656e+02, 2.968662719726562e+02, 2.969501037597656e+02, 2.970869140625e+02, 2.971845703125e+02, 2.969276733398438e+02, 2.965362548828125e+02, 2.962813110351562e+02, 2.960673522949219e+02, 2.959759216308594e+02, 2.959104919433594e+02, 2.958652038574219e+02, 2.958106994628906e+02]
+zon.TAir=[2.931499938964844e+02, 2.938889465332031e+02, 2.939502563476562e+02, 2.939796752929688e+02, 2.940084228515625e+02, 2.940189514160156e+02, 2.940131225585938e+02, 2.945214538574219e+02, 2.948373107910156e+02, 2.950447387695312e+02, 2.951715698242188e+02, 2.952154235839844e+02, 2.952512512207031e+02, 2.951486206054688e+02, 2.950681762695312e+02, 2.949915161132812e+02, 2.948948364257812e+02, 2.949771118164062e+02, 2.949779052734375e+02, 2.949202880859375e+02, 2.948962707519531e+02, 2.949202575683594e+02, 2.949644165039062e+02, 2.949719848632812e+02, 2.950934448242188e+02, 2.951356811523438e+02, 2.957651977539062e+02, 2.965053100585938e+02, 2.966730041503906e+02, 2.968687744140625e+02, 2.970297546386719e+02, 2.971091613769531e+02, 2.968687744140625e+02, 2.967387390136719e+02, 2.964970703125e+02, 2.959107971191406e+02, 2.954219360351562e+02, 2.954609985351562e+02, 2.955244445800781e+02, 2.95460205078125e+02, 2.953722839355469e+02, 2.953540649414062e+02, 2.953218688964844e+02, 2.953211669921875e+02, 2.952301330566406e+02, 2.9510400390625e+02, 2.955592956542969e+02, 2.962443542480469e+02, 2.963014221191406e+02, 2.964617614746094e+02, 2.965694885253906e+02, 2.966474304199219e+02, 2.966251220703125e+02, 2.965586242675781e+02, 2.962564392089844e+02, 2.957416076660156e+02, 2.951568603515625e+02, 2.951472473144531e+02, 2.951170654296875e+02, 2.950822448730469e+02, 2.950804443359375e+02, 2.950709533691406e+02, 2.950473327636719e+02, 2.950165710449219e+02, 2.950060119628906e+02, 2.950107421875e+02, 2.955983276367188e+02, 2.963309326171875e+02, 2.964826049804688e+02, 2.966489868164062e+02, 2.967644348144531e+02, 2.968548583984375e+02, 2.9681640625e+02, 2.966325988769531e+02, 2.961954345703125e+02, 2.955457153320312e+02, 2.948764953613281e+02, 2.948714904785156e+02, 2.948537292480469e+02, 2.947515258789062e+02, 2.946411437988281e+02, 2.946271362304688e+02, 2.94665283203125e+02, 2.945690307617188e+02, 2.942496337890625e+02, 2.9399169921875e+02, 2.94468017578125e+02, 2.954653015136719e+02, 2.95780029296875e+02, 2.960482788085938e+02, 2.961953735351562e+02, 2.963890075683594e+02, 2.965607604980469e+02, 2.964298095703125e+02, 2.959880676269531e+02, 2.953980102539062e+02, 2.947791137695312e+02, 2.9464013671875e+02, 2.945300903320312e+02, 2.944839172363281e+02, 2.943837280273438e+02]
+zon.TRad=[2.932485046386719e+02, 2.954401550292969e+02, 2.954859313964844e+02, 2.954971313476562e+02, 2.9550830078125e+02, 2.955205993652344e+02, 2.955198059082031e+02, 2.961242370605469e+02, 2.964369201660156e+02, 2.96597412109375e+02, 2.966624755859375e+02, 2.966199035644531e+02, 2.965825805664062e+02, 2.964331359863281e+02, 2.962938232421875e+02, 2.962199401855469e+02, 2.961401977539062e+02, 2.961758728027344e+02, 2.961823120117188e+02, 2.961443481445312e+02, 2.961230163574219e+02, 2.960870361328125e+02, 2.960800170898438e+02, 2.960912170410156e+02, 2.961297912597656e+02, 2.961700134277344e+02, 2.962791137695312e+02, 2.965087280273438e+02, 2.967901306152344e+02, 2.969615173339844e+02, 2.971441650390625e+02, 2.972517700195312e+02, 2.971422729492188e+02, 2.969414672851562e+02, 2.967079467773438e+02, 2.965614318847656e+02, 2.964405517578125e+02, 2.964447021484375e+02, 2.964747009277344e+02, 2.964886779785156e+02, 2.964192810058594e+02, 2.963876037597656e+02, 2.963554382324219e+02, 2.963470458984375e+02, 2.963153686523438e+02, 2.962501220703125e+02, 2.962485656738281e+02, 2.965494995117188e+02, 2.968029174804688e+02, 2.969809265136719e+02, 2.970600891113281e+02, 2.971252746582031e+02, 2.970895385742188e+02, 2.96968505859375e+02, 2.966968078613281e+02, 2.965050964355469e+02, 2.963288879394531e+02, 2.963069763183594e+02, 2.962766418457031e+02, 2.962432250976562e+02, 2.962372436523438e+02, 2.962244567871094e+02, 2.962022399902344e+02, 2.96185302734375e+02, 2.961765747070312e+02, 2.961763305664062e+02, 2.962388610839844e+02, 2.965568237304688e+02, 2.967859191894531e+02, 2.969888610839844e+02, 2.970906982421875e+02, 2.971502990722656e+02, 2.971157836914062e+02, 2.969271850585938e+02, 2.966273193359375e+02, 2.963846130371094e+02, 2.961553955078125e+02, 2.961169128417969e+02, 2.960902709960938e+02, 2.960416870117188e+02, 2.959796142578125e+02, 2.959452514648438e+02, 2.959587097167969e+02, 2.959161071777344e+02, 2.957535705566406e+02, 2.955943298339844e+02, 2.955645141601562e+02, 2.963019714355469e+02, 2.966844787597656e+02, 2.968662719726562e+02, 2.969501342773438e+02, 2.970869140625e+02, 2.971845703125e+02, 2.969276733398438e+02, 2.965362548828125e+02, 2.962813110351562e+02, 2.960673217773438e+02, 2.959759216308594e+02, 2.959104919433594e+02, 2.958652038574219e+02, 2.958106994628906e+02]
 flo.T=[2.981499938964844e+02, 2.981499938964844e+02]
-flo.q_flow=[-2.248904943466187e+00, -3.082844924926758e+01, -2.991803932189941e+01, -2.966490936279297e+01, -2.959497833251953e+01, -2.94101448059082e+01, -2.94481029510498e+01, -2.449257469177246e+01, -2.027652168273926e+01, -1.819508171081543e+01, -1.684476280212402e+01, -1.718344116210938e+01, -1.74210205078125e+01, -1.879840850830078e+01, -2.034112548828125e+01, -2.118634986877441e+01, -2.220263481140137e+01, -2.181740379333496e+01, -2.163757133483887e+01, -2.198012542724609e+01, -2.228623390197754e+01, -2.243956565856934e+01, -2.237340545654297e+01, -2.24052791595459e+01, -2.189629173278809e+01, -2.132977676391602e+01, -2.077093887329102e+01, -1.59725170135498e+01, -1.269618988037109e+01, -1.086189937591554e+01, -8.958688735961914e+00, -7.843380928039551e+00, -8.753082275390625e+00, -1.066968441009521e+01, -1.302541160583496e+01, -1.597990894317627e+01, -1.844042015075684e+01, -1.83778190612793e+01, -1.804109573364258e+01, -1.785212326049805e+01, -1.858950614929199e+01, -1.897908973693848e+01, -1.93365650177002e+01, -1.93614501953125e+01, -1.973718070983887e+01, -2.050155258178711e+01, -2.142313003540039e+01, -1.601369667053223e+01, -1.331040668487549e+01, -1.133481693267822e+01, -1.038292789459229e+01, -9.859992980957031e+00, -9.83933162689209e+00, -1.089653015136719e+01, -1.360928249359131e+01, -1.682321548461915e+01, -1.997308540344238e+01, -2.023593711853027e+01, -2.047717094421386e+01, -2.083060836791992e+01, -2.093479919433594e+01, -2.100601768493652e+01, -2.123618316650391e+01, -2.141606903076172e+01, -2.157927513122559e+01, -2.157435035705566e+01, -2.149490356445312e+01, -1.598212146759033e+01, -1.307084846496582e+01, -1.095708274841309e+01, -9.792617797851562e+00, -9.218334197998047e+00, -9.227764129638672e+00, -1.094327831268311e+01, -1.403168106079102e+01, -1.796822738647461e+01, -2.18986759185791e+01, -2.236520195007324e+01, -2.253411483764648e+01, -2.31102123260498e+01, -2.387382125854492e+01, -2.440421485900879e+01, -2.41908130645752e+01, -2.453606033325195e+01, -2.630323791503906e+01, -2.846276664733887e+01, -2.98497257232666e+01, -2.065973281860352e+01, -1.573742961883545e+01, -1.330941104888916e+01, -1.202330303192139e+01, -1.087473773956299e+01, -9.3612060546875e+00, -1.109856224060059e+01, -1.50830774307251e+01, -1.917815971374512e+01, -2.281040382385254e+01, -2.38974552154541e+01, -2.475815200805664e+01, -2.535908699035645e+01, -2.59277229309082e+01]
+flo.q_flow=[-2.248904943466187e+00, -3.082846450805664e+01, -2.991803359985352e+01, -2.96649055480957e+01, -2.95949764251709e+01, -2.94101448059082e+01, -2.944807243347168e+01, -2.449256324768066e+01, -2.02765064239502e+01, -1.819504737854004e+01, -1.68447151184082e+01, -1.718339729309082e+01, -1.742100715637207e+01, -1.879839706420898e+01, -2.034111595153809e+01, -2.118635749816895e+01, -2.220264625549316e+01, -2.181756591796875e+01, -2.163753128051758e+01, -2.198015403747559e+01, -2.228622436523438e+01, -2.243955039978027e+01, -2.23734188079834e+01, -2.240525817871094e+01, -2.189623832702637e+01, -2.132978630065918e+01, -2.077090644836426e+01, -1.597248458862305e+01, -1.26961555480957e+01, -1.086185455322267e+01, -8.958704948425293e+00, -7.843387126922607e+00, -8.753111839294434e+00, -1.066936206817627e+01, -1.302538585662842e+01, -1.59799976348877e+01, -1.844040107727051e+01, -1.837777709960938e+01, -1.804106521606445e+01, -1.785209846496582e+01, -1.858948707580566e+01, -1.897908401489258e+01, -1.933651351928711e+01, -1.936145973205566e+01, -1.97371711730957e+01, -2.050158500671387e+01, -2.142323303222656e+01, -1.601375007629395e+01, -1.331044578552246e+01, -1.133479595184326e+01, -1.038290214538574e+01, -9.859981536865234e+00, -9.839326858520508e+00, -1.089651393890381e+01, -1.360927104949951e+01, -1.682331466674805e+01, -1.997305870056152e+01, -2.023593521118164e+01, -2.047716522216797e+01, -2.083060455322266e+01, -2.093479919433594e+01, -2.100600814819336e+01, -2.123616790771484e+01, -2.14161262512207e+01, -2.157927322387695e+01, -2.15743522644043e+01, -2.149488067626953e+01, -1.598219013214111e+01, -1.307082653045654e+01, -1.095710849761963e+01, -9.792590141296387e+00, -9.218304634094238e+00, -9.227779388427734e+00, -1.094326782226562e+01, -1.403170585632324e+01, -1.796828651428223e+01, -2.189868927001953e+01, -2.236518287658691e+01, -2.253409957885742e+01, -2.311023712158203e+01, -2.387386131286621e+01, -2.440421104431152e+01, -2.419078636169434e+01, -2.453610610961914e+01, -2.630328941345215e+01, -2.846279716491699e+01, -2.98497200012207e+01, -2.065944671630859e+01, -1.573738765716553e+01, -1.330934715270996e+01, -1.202323722839355e+01, -1.087470722198486e+01, -9.361169815063477e+00, -1.109852504730225e+01, -1.508310317993164e+01, -1.917821311950684e+01, -2.281040382385254e+01, -2.38974609375e+01, -2.475817680358887e+01, -2.535905265808105e+01, -2.592776679992676e+01]
 building.weaBus.HDirNor=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.499014854431152e+00, 3.686282958984378e+02, 6.0210009765625e+02, 6.716237182617188e+02, 3.283700256347656e+02, 6.140927505493164e+01, 9.55174560546875e+01, 3.161209106445312e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.86000013351441e+00, 9.585999846458418e-01, 1.29999995231628e+00, 2.5e+00, 7.110000252723694e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.720000028610229e-01, 0e+00, 2.894999980926514e-01, 1e+00, 1e+00, 1e+00, 9.720000028610229e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1e+00, 1e+00, 5.416666865348816e-01, 8.119999766349792e-01, 2.500000037252903e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.432712173461914e+01, 3.844699096679688e+02, 7.35454345703125e+02, 8.419392700195312e+02, 8.67183349609375e+02, 7.74879638671875e+02, 5.776929931640625e+02, 1.692739868164062e+02, 3.76297721862793e+01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
 building.weaBus.HDifHor=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.644347667694092e+00, 4.38395805358887e+01, 7.274771881103516e+01, 9.493162536621094e+01, 1.593369750976562e+02, 1.699525299072266e+02, 9.878334808349609e+01, 3.836141204833984e+01, 1.758235335350022e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.385499954223633e+00, 4.009344863891621e+01, 1.252859191894532e+02, 1.454430389404295e+02, 1.845002899169922e+02, 1.744263000488281e+02, 1.274956817626953e+02, 4.824441528320312e+01, 4.900000095367432e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.000045490264893e+01, 7.366361236572266e+01, 1.731710815429688e+02, 2.172069396972656e+02, 2.166393127441406e+02, 2.118868408203125e+02, 1.55064208984375e+02, 7.001911163330078e+01, 4.334272861480553e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.91349983215332e+00, 7.161975860595703e+01, 1.333693389892578e+02, 1.902389678955078e+02, 1.952490844726562e+02, 1.681414642333984e+02, 1.337733459472656e+02, 5.53447380065918e+01, 7.031499862670898e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.286250019073486e+01, 4.765687561035156e+01, 5.679437637329102e+01, 6.598562622070312e+01, 6.916741180419922e+01, 7.217269134521484e+01, 8.858499145507812e+01, 4.994123077392578e+01, 4.998000144958496e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt
index 24e950e3095..3c0c6691cae 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_ThermalZones_EnergyPlus_9_6_0_Validation_ZoneSurface_OneZoneControlledFloorTemperature.txt
@@ -1,16 +1,16 @@
-last-generated=2024-03-14
+last-generated=2024-03-22
 statistics-simulation=
 {
   "linear": "0",
   "nonlinear": " ",
-  "number of continuous time states": "5",
+  "number of continuous time states": "6",
   "numerical Jacobians": "0"
 }
 time=[1.08e+07, 1.1232e+07]
-zon.TAir=[2.931499938964844e+02, 2.928616027832031e+02, 2.930783081054688e+02, 2.931238403320312e+02, 2.931531066894531e+02, 2.933252258300781e+02, 2.935324401855469e+02, 2.944109802246094e+02, 2.954651489257812e+02, 2.965337829589844e+02, 2.97457763671875e+02, 2.972770080566406e+02, 2.970561828613281e+02, 2.969985961914062e+02, 2.968655090332031e+02, 2.963812561035156e+02, 2.952093200683594e+02, 2.938277282714844e+02, 2.927986145019531e+02, 2.930676879882812e+02, 2.929828796386719e+02, 2.931475219726562e+02, 2.930772399902344e+02, 2.931333312988281e+02, 2.931913757324219e+02, 2.933504028320312e+02, 2.933582458496094e+02, 2.933539123535156e+02, 2.933793029785156e+02, 2.929645690917969e+02, 2.932396240234375e+02, 2.936211547851562e+02, 2.939174194335938e+02, 2.935519714355469e+02, 2.930196533203125e+02, 2.929062194824219e+02, 2.929601745605469e+02, 2.93130615234375e+02, 2.930850830078125e+02, 2.931358032226562e+02, 2.931729125976562e+02, 2.931527709960938e+02, 2.931365051269531e+02, 2.931452026367188e+02, 2.93124267578125e+02, 2.931999206542969e+02, 2.939571228027344e+02, 2.953827819824219e+02, 2.974354553222656e+02, 2.972292175292969e+02, 2.971095275878906e+02, 2.973545227050781e+02, 2.972844543457031e+02, 2.971041564941406e+02, 2.968980102539062e+02, 2.960611572265625e+02, 2.93519287109375e+02, 2.928890075683594e+02, 2.930552368164062e+02, 2.931807861328125e+02, 2.930619506835938e+02, 2.930217895507812e+02, 2.930870361328125e+02, 2.931640014648438e+02, 2.931609497070312e+02, 2.933648071289062e+02, 2.941240234375e+02, 2.962801208496094e+02, 2.978283996582031e+02, 2.973013916015625e+02, 2.971529846191406e+02, 2.973926696777344e+02, 2.972199401855469e+02, 2.97113525390625e+02, 2.969495239257812e+02, 2.967061157226562e+02, 2.95031494140625e+02, 2.936629943847656e+02, 2.927912902832031e+02, 2.93150146484375e+02, 2.930763854980469e+02, 2.931857299804688e+02, 2.931845397949219e+02, 2.931595764160156e+02, 2.931789245605469e+02, 2.932237548828125e+02, 2.939053344726562e+02, 2.962925109863281e+02, 2.978737182617188e+02, 2.974202880859375e+02, 2.972627563476562e+02, 2.972767944335938e+02, 2.96939697265625e+02, 2.970185546875e+02, 2.969994812011719e+02, 2.963251953125e+02, 2.942122802734375e+02, 2.935232849121094e+02, 2.929873657226562e+02, 2.930014953613281e+02, 2.930682678222656e+02]
-flo.T=[2.931499938964844e+02, 2.940960083007812e+02, 2.944703674316406e+02, 2.946249694824219e+02, 2.946798400878906e+02, 2.942899169921875e+02, 2.935324401855469e+02, 2.944109802246094e+02, 2.954651489257812e+02, 2.965337829589844e+02, 2.968524475097656e+02, 2.960755310058594e+02, 2.959217834472656e+02, 2.964847717285156e+02, 2.968655090332031e+02, 2.963812561035156e+02, 2.952093200683594e+02, 2.938277282714844e+02, 2.941051025390625e+02, 2.945654602050781e+02, 2.949381408691406e+02, 2.949972229003906e+02, 2.951965942382812e+02, 2.95340576171875e+02, 2.95349853515625e+02, 2.948657836914062e+02, 2.942053833007812e+02, 2.93580810546875e+02, 2.933793029785156e+02, 2.933290405273438e+02, 2.934761352539062e+02, 2.936211547851562e+02, 2.939174194335938e+02, 2.935519714355469e+02, 2.932425842285156e+02, 2.940602722167969e+02, 2.946514892578125e+02, 2.948616943359375e+02, 2.949197692871094e+02, 2.950726623535156e+02, 2.950318298339844e+02, 2.946796569824219e+02, 2.947234802246094e+02, 2.947474060058594e+02, 2.948053283691406e+02, 2.947296142578125e+02, 2.941793518066406e+02, 2.953827819824219e+02, 2.968718872070312e+02, 2.962476196289062e+02, 2.961885681152344e+02, 2.961358032226562e+02, 2.956531372070312e+02, 2.953908386230469e+02, 2.960555114746094e+02, 2.960611572265625e+02, 2.93519287109375e+02, 2.940264892578125e+02, 2.942923889160156e+02, 2.944384155273438e+02, 2.945344848632812e+02, 2.948989868164062e+02, 2.952432861328125e+02, 2.952139282226562e+02, 2.952475280761719e+02, 2.947012329101562e+02, 2.941240234375e+02, 2.962801208496094e+02, 2.959109497070312e+02, 2.947714538574219e+02, 2.948434448242188e+02, 2.945553894042969e+02, 2.941329956054688e+02, 2.940546569824219e+02, 2.945603637695312e+02, 2.961693420410156e+02, 2.95031494140625e+02, 2.936629943847656e+02, 2.937245483398438e+02, 2.942232055664062e+02, 2.943106689453125e+02, 2.94256103515625e+02, 2.942515258789062e+02, 2.940556030273438e+02, 2.940464477539062e+02, 2.938900756835938e+02, 2.939053344726562e+02, 2.962925109863281e+02, 2.957701416015625e+02, 2.94578857421875e+02, 2.940938110351562e+02, 2.938585510253906e+02, 2.941361999511719e+02, 2.94724853515625e+02, 2.952040100097656e+02, 2.963251953125e+02, 2.942122802734375e+02, 2.935232849121094e+02, 2.933910217285156e+02, 2.937731628417969e+02, 2.941003723144531e+02]
+zon.TAir=[2.931499938964844e+02, 2.928616027832031e+02, 2.930783081054688e+02, 2.931238403320312e+02, 2.931531066894531e+02, 2.933252563476562e+02, 2.935324401855469e+02, 2.944109802246094e+02, 2.954651489257812e+02, 2.965337829589844e+02, 2.97457763671875e+02, 2.972770080566406e+02, 2.9705615234375e+02, 2.969986267089844e+02, 2.968655395507812e+02, 2.963812561035156e+02, 2.952093505859375e+02, 2.938276977539062e+02, 2.927986145019531e+02, 2.930676879882812e+02, 2.929828796386719e+02, 2.931475219726562e+02, 2.930772399902344e+02, 2.931333312988281e+02, 2.931913757324219e+02, 2.933503723144531e+02, 2.933582458496094e+02, 2.933538818359375e+02, 2.933793029785156e+02, 2.929645690917969e+02, 2.932396240234375e+02, 2.936211547851562e+02, 2.939173889160156e+02, 2.935519409179688e+02, 2.930196533203125e+02, 2.929062194824219e+02, 2.929601745605469e+02, 2.93130615234375e+02, 2.930851135253906e+02, 2.931358032226562e+02, 2.931728820800781e+02, 2.931527709960938e+02, 2.931365051269531e+02, 2.931452026367188e+02, 2.931242980957031e+02, 2.93199951171875e+02, 2.939571228027344e+02, 2.953827819824219e+02, 2.974354248046875e+02, 2.972292175292969e+02, 2.971095275878906e+02, 2.973545227050781e+02, 2.972844543457031e+02, 2.971041259765625e+02, 2.968980102539062e+02, 2.960611572265625e+02, 2.93519287109375e+02, 2.928890075683594e+02, 2.930552368164062e+02, 2.931807861328125e+02, 2.930619506835938e+02, 2.930217895507812e+02, 2.930870361328125e+02, 2.931640014648438e+02, 2.931609497070312e+02, 2.933648071289062e+02, 2.941239624023438e+02, 2.962800903320312e+02, 2.978284301757812e+02, 2.973013916015625e+02, 2.971530151367188e+02, 2.973926391601562e+02, 2.972199401855469e+02, 2.97113525390625e+02, 2.969495239257812e+02, 2.967061157226562e+02, 2.95031494140625e+02, 2.936629943847656e+02, 2.927912902832031e+02, 2.93150146484375e+02, 2.930763854980469e+02, 2.931856994628906e+02, 2.931845397949219e+02, 2.931595458984375e+02, 2.931789245605469e+02, 2.932237548828125e+02, 2.939053344726562e+02, 2.962925109863281e+02, 2.978737182617188e+02, 2.974202880859375e+02, 2.972627563476562e+02, 2.972767639160156e+02, 2.96939697265625e+02, 2.970185852050781e+02, 2.969994812011719e+02, 2.963252258300781e+02, 2.942123413085938e+02, 2.935232849121094e+02, 2.929873352050781e+02, 2.930014953613281e+02, 2.930682678222656e+02]
+flo.T=[2.931499938964844e+02, 2.940960083007812e+02, 2.944703979492188e+02, 2.946249694824219e+02, 2.946798400878906e+02, 2.942898559570312e+02, 2.935324401855469e+02, 2.944109802246094e+02, 2.954651489257812e+02, 2.965337829589844e+02, 2.968524475097656e+02, 2.960755615234375e+02, 2.959217834472656e+02, 2.964848022460938e+02, 2.968655395507812e+02, 2.963812561035156e+02, 2.952093505859375e+02, 2.938276977539062e+02, 2.941051330566406e+02, 2.945654602050781e+02, 2.949381713867188e+02, 2.949972229003906e+02, 2.951965942382812e+02, 2.95340576171875e+02, 2.95349853515625e+02, 2.948657531738281e+02, 2.942053833007812e+02, 2.93580810546875e+02, 2.933793029785156e+02, 2.933290405273438e+02, 2.934761352539062e+02, 2.936211547851562e+02, 2.939173889160156e+02, 2.935519409179688e+02, 2.932425842285156e+02, 2.940602722167969e+02, 2.946515502929688e+02, 2.948616943359375e+02, 2.949197998046875e+02, 2.950726623535156e+02, 2.950318298339844e+02, 2.946796569824219e+02, 2.947234802246094e+02, 2.947474060058594e+02, 2.948053588867188e+02, 2.947296142578125e+02, 2.941793518066406e+02, 2.953827819824219e+02, 2.968719177246094e+02, 2.962476196289062e+02, 2.961885681152344e+02, 2.961358032226562e+02, 2.956531066894531e+02, 2.953908386230469e+02, 2.960555114746094e+02, 2.960611572265625e+02, 2.93519287109375e+02, 2.940264892578125e+02, 2.942923889160156e+02, 2.944384155273438e+02, 2.945345153808594e+02, 2.948989868164062e+02, 2.952433166503906e+02, 2.952139282226562e+02, 2.952475280761719e+02, 2.947012023925781e+02, 2.941239624023438e+02, 2.962800903320312e+02, 2.959109802246094e+02, 2.947714538574219e+02, 2.948434448242188e+02, 2.945553588867188e+02, 2.941329956054688e+02, 2.940546569824219e+02, 2.945603637695312e+02, 2.961693725585938e+02, 2.95031494140625e+02, 2.936629943847656e+02, 2.937245483398438e+02, 2.942231750488281e+02, 2.943106994628906e+02, 2.94256103515625e+02, 2.942514953613281e+02, 2.940556030273438e+02, 2.9404638671875e+02, 2.938900451660156e+02, 2.939053344726562e+02, 2.962925109863281e+02, 2.957701416015625e+02, 2.945788269042969e+02, 2.940938110351562e+02, 2.938585510253906e+02, 2.941361999511719e+02, 2.94724853515625e+02, 2.952040100097656e+02, 2.963252258300781e+02, 2.942123413085938e+02, 2.935232849121094e+02, 2.933909912109375e+02, 2.937731628417969e+02, 2.941003723144531e+02]
 TSetRooHea.y=[2.931499938964844e+02, 2.931499938964844e+02]
 TSetRooCoo.y=[2.971499938964844e+02, 2.971499938964844e+02]
-flo.q_flow=[3.291399955749512e+00, -4.766197204589844e+00, -6.797330856323242e+00, -7.738743782043457e+00, -8.213536262512207e+00, -3.894943714141846e+00, 4.389634609222412e+00, 4.894981384277344e+00, 5.232762813568115e+00, 4.697790622711182e+00, 4.808038711547852e+00, 1.100391483306885e+01, 1.10291051864624e+01, 7.024250030517578e+00, 3.682201385498047e+00, 2.474747180938721e+00, 1.687898755073547e+00, 1.889990925788879e+00, -3.833529949188232e+00, -7.221603870391846e+00, -9.487571716308594e+00, -1.014522075653076e+01, -1.186219310760498e+01, -1.298947620391846e+01, -1.321613311767578e+01, -8.095817565917969e+00, -1.016143321990967e+00, 4.142803192138672e+00, 6.91670560836792e+00, 5.250490665435791e+00, 3.681019067764282e+00, 6.528171539306641e+00, 5.564521312713623e+00, 5.499058246612549e+00, 5.013123989105225e+00, -2.167125701904297e+00, -8.08348560333252e+00, -9.813186645507812e+00, -1.003724002838135e+01, -1.136123752593994e+01, -1.110498237609863e+01, -8.947978019714355e+00, -9.578680038452148e+00, -9.788058280944824e+00, -1.024082183837891e+01, -8.815196990966797e+00, -5.23335599899292e+00, 7.737992703914642e-02, -6.929776668548584e-01, 3.818992853164673e+00, 3.935697555541992e+00, 4.468759536743164e+00, 7.702310562133789e+00, 8.899859428405762e+00, 3.824976444244385e+00, -3.608830273151398e-01, 2.162182331085205e+00, -4.563973903656006e+00, -6.105047225952148e+00, -7.336946487426758e+00, -7.737788677215576e+00, -1.069473648071289e+01, -1.33204460144043e+01, -1.297139739990234e+01, -1.335809230804443e+01, -7.453544139862061e+00, 7.959550619125366e-01, -3.630787134170532e-02, 6.027043342590332e+00, 1.435327625274658e+01, 1.135319805145264e+01, 1.408270072937012e+01, 1.70050220489502e+01, 1.673341941833496e+01, 1.272951412200928e+01, 3.695979118347168e+00, 1.106348395347595e+00, 1.372374176979065e+00, -2.02808952331543e+00, -6.286548137664795e+00, -6.215596675872803e+00, -5.893360614776611e+00, -6.078153133392334e+00, -4.689414024353027e+00, -4.949531078338623e+00, -3.656055688858032e+00, -1.414536833763123e+00, -2.214761018753052e+00, 5.432446479797363e+00, 1.29884672164917e+01, 1.540370082855225e+01, 1.698639106750488e+01, 1.401732635498047e+01, 9.726449012756348e+00, 6.565999031066895e+00, -2.323696374893188e+00, 1.475343227386475e+00, 8.992286920547485e-01, -2.370951622724533e-01, -2.967341661453247e+00, -5.176552295684814e+00]
-conHea.y=[1.4210854715202e-14, 2.46879056096077e-01, 2.784160673618317e-01, 3.002256453037262e-01, 3.053441941738129e-01, 1.92935898900032e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.613007426261902e-01, 2.995527982711792e-01, 3.910542130470276e-01, 3.699374496936798e-01, 4.238702356815338e-01, 4.414494633674622e-01, 4.316942989826202e-01, 3.030766248703003e-01, 1.69426828622818e-01, 4.537766426801682e-02, 0e+00, 7.28982537984848e-02, 4.730347916483879e-02, 0e+00, 0e+00, 0e+00, 4.458544030785561e-02, 2.308101505041122e-01, 3.382673561573029e-01, 3.462168276309967e-01, 3.669402301311493e-01, 3.873750269412994e-01, 3.717832863330841e-01, 3.053737580776215e-01, 3.173900842666626e-01, 3.204426467418671e-01, 3.362106680870056e-01, 3.059360384941101e-01, 4.44466806948185e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.27495864033699e-01, 2.474312633275986e-01, 2.515276968479156e-01, 2.945062220096588e-01, 3.754370808601379e-01, 4.312489032745361e-01, 4.099861979484558e-01, 4.173153936862946e-01, 2.672847509384155e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.866491585969925e-01, 2.146078050136566e-01, 2.468599677085876e-01, 2.140772640705109e-01, 2.133974879980087e-01, 1.792052686214447e-01, 1.734996438026428e-01, 1.332596987485886e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.073287457227707e-02, 1.543346047401428e-01, 2.064188122749329e-01]
-conCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.210622265934944e-01, 2.402951568365097e-01, 2.268781512975693e-01, 1.027638614177704e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.1270921677351e-01, 1.963239461183548e-01, 1.841922849416733e-01, 2.437441200017929e-01, 3.262642323970795e-01, 3.426636159420013e-01, 1.684981733560562e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.834934830665588e-01, 5.059869885444641e-01, 4.619097113609314e-01, 5.674569010734558e-01, 6.173899173736572e-01, 6.117756962776184e-01, 4.778352081775665e-01, 1.073499917984009e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.207165539264679e-01, 5.682855248451233e-01, 6.337890028953552e-01, 6.836459040641785e-01, 5.607019066810608e-01, 4.587455689907074e-01, 3.590918183326721e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+flo.q_flow=[3.291357755661011e+00, -4.766343116760254e+00, -6.797435283660889e+00, -7.738792419433594e+00, -8.213642120361328e+00, -3.894956350326538e+00, 4.389596462249756e+00, 4.895005702972412e+00, 5.232739925384521e+00, 4.697754383087158e+00, 4.808057308197021e+00, 1.10038366317749e+01, 1.102917098999023e+01, 7.024209022521973e+00, 3.682127475738525e+00, 2.474728107452393e+00, 1.687840819358826e+00, 1.890082120895386e+00, -3.833624601364136e+00, -7.221662998199463e+00, -9.487679481506348e+00, -1.014521217346191e+01, -1.186227130889893e+01, -1.298944759368896e+01, -1.32161340713501e+01, -8.095757484436035e+00, -1.016136527061462e+00, 4.142833232879639e+00, 6.916704177856445e+00, 5.25047779083252e+00, 3.681044340133667e+00, 6.52817440032959e+00, 5.56453800201416e+00, 5.499063014984131e+00, 5.013128757476807e+00, -2.167181491851807e+00, -8.083723068237305e+00, -9.813140869140625e+00, -1.003750705718994e+01, -1.136117935180664e+01, -1.110494327545166e+01, -8.948020935058594e+00, -9.578676223754883e+00, -9.788052558898926e+00, -1.024110889434814e+01, -8.815184593200684e+00, -5.233286380767822e+00, 7.737889140844345e-02, -6.929886341094971e-01, 3.818993091583252e+00, 3.935707569122314e+00, 4.468790054321289e+00, 7.702316761016846e+00, 8.899825096130371e+00, 3.824968099594116e+00, -3.608812689781189e-01, 2.16217565536499e+00, -4.564013004302979e+00, -6.105118274688721e+00, -7.3368821144104e+00, -7.737834930419922e+00, -1.069477653503418e+01, -1.332044219970703e+01, -1.29713773727417e+01, -1.335813331604004e+01, -7.453466892242432e+00, 7.961514592170715e-01, -3.630030900239944e-02, 6.026950359344482e+00, 1.435328197479248e+01, 1.135322856903076e+01, 1.408274269104004e+01, 1.700507354736328e+01, 1.67333927154541e+01, 1.272947025299072e+01, 3.695954084396362e+00, 1.106347918510437e+00, 1.372394204139709e+00, -2.028217077255249e+00, -6.286452293395996e+00, -6.215641498565674e+00, -5.893310070037842e+00, -6.078133583068848e+00, -4.689435482025146e+00, -4.949397563934326e+00, -3.656078577041626e+00, -1.414532899856567e+00, -2.214751958847046e+00, 5.432412147521973e+00, 1.29885311126709e+01, 1.540371704101562e+01, 1.698641395568848e+01, 1.401730632781982e+01, 9.726449012756348e+00, 6.56601095199585e+00, -2.323678016662598e+00, 1.475327253341675e+00, 8.992277979850769e-01, -2.369906008243561e-01, -2.967368602752686e+00, -5.17655086517334e+00]
+conHea.y=[1.4210854715202e-14, 2.468831241130829e-01, 2.78418242931366e-01, 3.002254664897919e-01, 3.053460121154785e-01, 1.929228156805038e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.613004446029663e-01, 2.995537221431732e-01, 3.910552561283112e-01, 3.699392080307007e-01, 4.238726794719696e-01, 4.41448986530304e-01, 4.31694358587265e-01, 3.030742704868317e-01, 1.69425755739212e-01, 4.53820712864399e-02, 0e+00, 7.289955019950867e-02, 4.73022498190403e-02, 0e+00, 0e+00, 0e+00, 4.458794742822647e-02, 2.308103889226913e-01, 3.382740616798401e-01, 3.462156653404236e-01, 3.669426739215851e-01, 3.873735964298248e-01, 3.717848062515259e-01, 3.053744733333588e-01, 3.173896372318268e-01, 3.204425573348999e-01, 3.362145721912384e-01, 3.05934727191925e-01, 4.444494843482971e-02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.274953424930573e-01, 2.474348843097687e-01, 2.51526266336441e-01, 2.945097386837006e-01, 3.754388988018036e-01, 4.312537014484406e-01, 4.099867045879364e-01, 4.173157513141632e-01, 2.672813236713409e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.866516619920731e-01, 2.146071791648865e-01, 2.468603998422623e-01, 2.140783816576004e-01, 2.13394358754158e-01, 1.792071908712387e-01, 1.734925955533981e-01, 1.332599818706512e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.073142170906067e-02, 1.543384045362473e-01, 2.064201682806015e-01]
+conCoo.y=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.210632175207138e-01, 2.402950525283813e-01, 2.268769294023514e-01, 1.02763831615448e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.127063408493996e-01, 1.963250190019608e-01, 1.841916292905807e-01, 2.437439858913422e-01, 3.262684047222137e-01, 3.426608443260193e-01, 1.684992015361786e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.834908306598663e-01, 5.05986750125885e-01, 4.619130790233612e-01, 5.67457377910614e-01, 6.173931360244751e-01, 6.117749810218811e-01, 4.77834552526474e-01, 1.073493808507919e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.207173883914948e-01, 5.682885050773621e-01, 6.337906122207642e-01, 6.836450695991516e-01, 5.606986284255981e-01, 4.587463438510895e-01, 3.590922951698303e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_IO_Files_Validation_WeeklyScheduleWindowsLineEndings.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_IO_Files_Validation_WeeklyScheduleWindowsLineEndings.txt
new file mode 100644
index 00000000000..cb6e638234b
--- /dev/null
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_IO_Files_Validation_WeeklyScheduleWindowsLineEndings.txt
@@ -0,0 +1,12 @@
+last-generated=2024-04-02
+statistics-simulation=
+{
+  "linear": " ",
+  "nonlinear": " ",
+  "numerical Jacobians": "0"
+}
+time=[-1e+04, 1e+06]
+weeSchLin.y[1]=[1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.2e+01, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02, 1.23e+02]
+weeSchLin.y[2]=[1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 3e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00]
+weeSchLin.y[3]=[4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 1e+00, 4.5e+01, 4.5e+01, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4e+00, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01, 4.5e+01]
+weeSchLin.y[4]=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt
index e19ac89667e..909b08df26c 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Utilities_Plotters_Examples_SingleZoneVAV.txt
@@ -1,4 +1,4 @@
-last-generated=2023-06-16
+last-generated=2024-04-01
 statistics-initialization=
 {
   "linear": "19",
@@ -13,4 +13,4 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[1.5552e+07, 1.5984e+07]
-hvac.PFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.330735683441162e+00, 1.505723190307617e+01, 3.092379379272461e+01, 3.843521499633789e+01, 3.176835823059082e+01, 1.667304420471191e+01, 8.65913200378418e+00, 4.104891777038574e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.462905645370483e+00, 1.487477970123291e+01, 3.047177314758301e+01, 3.909217071533203e+01, 3.18489818572998e+01, 1.813684844970703e+01, 9.817239761352539e+00, 6.499245643615723e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 6.720651626586914e+00, 2.241079711914062e+01, 3.547736740112305e+01, 3.558864212036133e+01, 2.822850227355957e+01, 1.649150276184082e+01, 9.09346866607666e+00, 4.777174949645996e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 4.284562110900879e+00, 8.46577262878418e+00, 8.218067169189453e+00, 5.322678089141846e+00, 3.283688068389893e+00, 2.010621786117554e+00, 9.306935667991638e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 2.323882341384888e+00, 9.79957389831543e+00, 1.343301868438721e+01, 1.082698726654053e+01, 4.26008129119873e+00, 1.369602203369141e+00, 8.739606738090515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
+hvac.PFan=[0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.330735683441162e+00, 1.505723190307617e+01, 3.092379379272461e+01, 3.843521499633789e+01, 3.176835823059082e+01, 1.667304420471191e+01, 8.65913200378418e+00, 4.104892253875732e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 2.462905645370483e+00, 1.487477970123291e+01, 3.047177314758301e+01, 3.909217071533203e+01, 3.18489818572998e+01, 1.813684272766113e+01, 9.817237854003906e+00, 6.499245166778564e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 6.720760822296143e+00, 2.24108715057373e+01, 3.547740173339844e+01, 3.558865737915039e+01, 2.822850608825684e+01, 1.649150466918945e+01, 9.09346866607666e+00, 4.777174949645996e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 4.284562587738037e+00, 8.46577262878418e+00, 8.218067169189453e+00, 5.322678089141846e+00, 3.283688068389893e+00, 2.010621786117554e+00, 9.306936860084534e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 0e+00, 8.739606738090515e-01, 8.739606738090515e-01, 2.277922630310059e+00, 9.743946075439453e+00, 1.340563774108887e+01, 1.081786823272705e+01, 4.258317470550537e+00, 1.369292616844177e+00, 8.739606738090515e-01, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00]
diff --git a/Buildings/Resources/Scripts/BuildingsPy/conf.yml b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
index 10e9c947d86..ccd20a9fe7e 100644
--- a/Buildings/Resources/Scripts/BuildingsPy/conf.yml
+++ b/Buildings/Resources/Scripts/BuildingsPy/conf.yml
@@ -29,10 +29,82 @@
 - model_name: Buildings.Controls.DemandResponse.Examples.ClientLBNL90
   openmodelica:
     comment: 'TimeoutExpired: omc timed out after 300 seconds'
+    time_out: 600
+- model_name: Buildings.DHC.ETS.Combined.Validation.ChillerBorefield
+  openmodelica:
+    comment: Timeout on travis after 900 seconds, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261271
+    simulate: false
+- model_name: Buildings.DHC.ETS.Cooling.Examples.Indirect
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization.
+    simulate: false
+- model_name: Buildings.DHC.Examples.Combined.SeriesConstantFlow
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Examples.Combined.SeriesVariableFlow
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+  optimica:
+    comment: FMUException Failed to update the events at time 0.000000E+00.
+    simulate: false
+- model_name: Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+  optimica:
+    comment: 'The system is structurally singular. Modelon #2023012739000252'
     translate: false
-- model_name: Buildings.Electrical.AC.ThreePhasesBalanced.Loads.Examples.ParallelLoads
+- model_name: Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries
+  openmodelica:
+    comment: 'simulation terminated by an assertion at initialization, Invalid root: (0)^(-1.5), corrected in OMC 1.23.0~dev-206-g00d3636'
+    simulate: false
+- model_name: Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS
   openmodelica:
-    comment: 'division leads to inf or nan at time 0.901, (a=nan) / (b=230400), where divisor b is: varRL_P.v[1] ^ 2.0 + varRL_P.v[2] ^ 2.0'
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization [works ok in Ubuntu 20 with OM 1.22.0]
+    simulate: false
+- model_name: Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
+    simulate: false
+- model_name: Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant
+  openmodelica:
+    comment: Internal error BackendDAETransform.analyseStrongComponentBlock failed (Purely discrete algebraic loops cannot be solved by iterative processes. Try to break them open using the delay() operator.)
+    translate: false
+- model_name: Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage
+  dymola:
+    time_out: 600
+  openmodelica:
+    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
+    translate: false
+  optimica:
+    time_out: 600
+- model_name: Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage
+  openmodelica:
+    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
+    translate: false
+  optimica:
+    time_out: 600
+- model_name: Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource
+  openmodelica:
+    comment: 'Could not evaluate structural parameter (or constant): mChi_flow_nominal'
+    translate: false
+- model_name: Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation
+  openmodelica:
+    comment: simulation terminated by an assertion at initialization
     simulate: false
 - model_name: Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BalancedStepDown.DD
   openmodelica:
@@ -99,82 +171,6 @@
   optimica:
     comment: timeout on travis after 300s, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/618700275
     time_out: 600
-- model_name: Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield
-  openmodelica:
-    comment: Timeout on travis after 900 seconds, https://app.travis-ci.com/github/lbl-srg/modelica-buildings/jobs/615261271
-    simulate: false
-- model_name: Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization.
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-  optimica:
-    comment: FMUException Failed to update the events at time 0.000000E+00.
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-  optimica:
-    comment: 'The system is structurally singular. Modelon #2023012739000252'
-    translate: false
-- model_name: Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries
-  openmodelica:
-    comment: 'simulation terminated by an assertion at initialization, Invalid root: (0)^(-1.5), corrected in OMC 1.23.0~dev-206-g00d3636'
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization [works ok in Ubuntu 20 with OM 1.22.0]
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant
-  openmodelica:
-    comment: Internal error BackendDAETransform.analyseStrongComponentBlock failed (Purely discrete algebraic loops cannot be solved by iterative processes. Try to break them open using the delay() operator.)
-    translate: false
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage
-  dymola:
-    time_out: 600
-  openmodelica:
-    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
-    translate: false
-  optimica:
-    time_out: 600
-- model_name: Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage
-  openmodelica:
-    comment: Internal error NFCeval.evalBinaryMul failed to evaluate {0.0, 0.03359309597916374, 0.06718619195832748, 0.09151222697772191}[pressure.n] * 0.0
-    translate: false
-  optimica:
-    time_out: 600
-- model_name: Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource
-  openmodelica:
-    comment: 'Could not evaluate structural parameter (or constant): mChi_flow_nominal'
-    translate: false
-- model_name: Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation
-  openmodelica:
-    comment: simulation terminated by an assertion at initialization
-    simulate: false
 - model_name: Buildings.Fluid.Examples.FlowSystem.Basic
   openmodelica:
     comment: '''omc'' caused ''simulation terminated by an assertion at initialization''.'
@@ -273,57 +269,59 @@
     comment: simulation terminated by an assertion at initialization
     simulate: false
     time_out: 600
-- model_name: Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter
-  dymola:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
-    translate: false
-  openmodelica:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
-    translate: false
+- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone
   optimica:
-    comment: See https://github.com/lbl-srg/modelica-buildings/issues/2235
-    translate: false
-- model_name: Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom
-  dymola:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
+    comment: Array size mismatch in modification of the attribute quantity for the variable TZon. This is a bug in OCT tracked under Modelon#2023022839000276.
     translate: false
   openmodelica:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
+    comment: Translation failed.
     translate: false
-  optimica:
-    comment: See https://github.com/lbl-srg/modelica-buildings/issues/2235
+- model_name: Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit
+  openmodelica:
+    comment: Translation failed.
     translate: false
-- model_name: Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange
-  dymola:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
+- model_name: Buildings.Templates.Components.Validation.Fans
+  openmodelica:
+    comment: Translation failed.
     translate: false
+- model_name: Buildings.Templates.Components.Validation.PumpMultipleRecord
   openmodelica:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
+    comment: Translation failed.
     translate: false
-  optimica:
-    comment: See https://github.com/lbl-srg/modelica-buildings/issues/2235
+- model_name: Buildings.Templates.Components.Validation.Pumps
+  openmodelica:
+    comment: Translation failed.
     translate: false
-- model_name: Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject
-  dymola:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
+- model_name: Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater
+  openmodelica:
+    comment: Translation failed.
     translate: false
+- model_name: Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl
   openmodelica:
-    comment: Python 3.6 is not supported on Ubuntu 20.04, will be upgraded to more recent version
+    comment: Translation failed.
     translate: false
-  optimica:
-    comment: See https://github.com/lbl-srg/modelica-buildings/issues/2235
+- model_name: Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatPumpGroupAirToWater
+  openmodelica:
+    comment: Translation failed.
     translate: false
-- model_name: Buildings.Templates.AirHandlersFans.Validation.VAVMultiZone
-  optimica:
-    comment: Array size mismatch in modification of the attribute quantity for the variable TZon. This is a bug in OCT tracked under Modelon#2023022839000276.
+- model_name: Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated
+  openmodelica:
+    comment: Translation failed.
     translate: false
+- model_name: Buildings.Templates.Plants.HeatPumps.Components.Validation.ValvesIsolation
   openmodelica:
     comment: Translation failed.
     translate: false
-- model_name: Buildings.Templates.Components.Validation.Fans
+  optimica:
+    comment: See https://github.com/lbl-srg/modelica-buildings/issues/3759
+    simulate: false
+- model_name: Buildings.Templates.Plants.HeatPumps.Validation.AirToWater
   openmodelica:
     comment: Translation failed.
     translate: false
+  optimica:
+    comment: See https://github.com/lbl-srg/modelica-buildings/issues/3759
+    translate: false
 - model_name: Buildings.Templates.ZoneEquipment.Validation.VAVBoxCoolingOnly
   openmodelica:
     comment: Translation failed.
@@ -499,12 +497,17 @@
   openmodelica:
     comment: returned non-zero exit status 255.
     simulate: false
+  optimica:
+    rtol: 1.0e-07
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.IdealHeatingCoolingWinter
   openmodelica:
     comment: returned non-zero exit status 255.
     simulate: false
   optimica:
     rtol: 1.0e-08
+- model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Unconditioned
+  optimica:
+    rtol: 1.0e-08
 - model_name: Buildings.ThermalZones.EnergyPlus_9_6_0.Validation.MultipleBuildings.TwoIdenticalTwoZoneBuildings
   openmodelica:
     comment: returned non-zero exit status 139.
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
index 500908d7aee..2f84bbf9c00 100644
--- 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
@@ -5,6 +5,10 @@ clear
 
 convertClear();
 
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3689
+convertClass("Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset",
+             "Buildings.Controls.OBC.CDL.Logical.TrueHold");
+
 // Conversion of hot water load
 convertElement("Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger",
                "loaSHW", "QReqHotWat_flow");
@@ -31,7 +35,7 @@ convertElement("Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.R
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3536
 convertClass("Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleCommands",
              "Buildings.Templates.Components.Controls.MultipleCommands");
- 
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3595
 convertClass("Buildings.Controls.OBC.CDL.Logical.Or3",
              "Buildings.Obsolete.Controls.OBC.CDL.Logical.Or3");
@@ -46,10 +50,9 @@ convertClass("Buildings.Controls.OBC.CDL.Logical.ZeroCrossing",
 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");
-             
+convertClass("Buildings.Experimental.DHC.Plants.Reservoir.BoreField",
+             "Buildings.DHC.ETS.Combined.Subsystems.Borefield");
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3431
 convertClass("Buildings.Fluid.Geothermal.BuriedPipes","Buildings.Fluid.FixedResistances.BuriedPipes");
 
@@ -57,4 +60,15 @@ convertClass("Buildings.Fluid.Geothermal.BuriedPipes","Buildings.Fluid.FixedResi
 convertClass("Buildings.Airflow.Multizone.BaseClasses.interpolate",
              "Buildings.Utilities.Math.Functions.interpolate");
 convertClass("Buildings.Airflow.Multizone.BaseClasses.Examples.Interpolate",
-             "Buildings.Utilities.Math.Functions.Examples.Interpolate");
\ No newline at end of file
+             "Buildings.Utilities.Math.Functions.Examples.Interpolate");
+
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3694
+convertClass("Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow", "Buildings.DHC.Networks.Distribution2PipePlugFlow_v");
+convertClass("Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow", "Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v");
+convertClass("Buildings.Experimental.DHC.Networks.Controls.MainPump", "Buildings.DHC.Networks.Controls.MainPump1Pipe");
+convertClass("Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize", "Buildings.DHC.Networks.Pipes.PipeAutosize");
+convertClass("Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard", "Buildings.DHC.Networks.Pipes.PipeStandard");
+
+// Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3727
+convertClass("Buildings.Experimental.DHC", "Buildings.DHC");
+convertClass("Buildings.Experimental.DHC.EnergyTransferStations", "Buildings.DHC.ETS");
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
new file mode 100644
index 00000000000..2278d93a18a
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHold.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold", stopTime=15000.0, method="Cvode", tolerance=1e-06, resultFile="TrueHold");
+createPlot(id=1, position={37, 75, 723, 422}, y={"truHol.u", "truHol.y"}, range={0.0, 260.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}});
+createPlot(id=2, position={41, 551, 725, 578}, y={"booPul1.y", "truHol1.y"}, range={0.0, 260.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}});
+createPlot(id=3, position={785, 74, 698, 428}, y={"truHol2.u", "truHol2.y"}, range={0.0, 15000.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}});
+createPlot(id=4, position={797, 558, 685, 559}, y={"truHol3.u", "truHol3.y"}, range={0.0, 15000.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mos
deleted file mode 100644
index 4b3364fb5d6..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Logical/Validation/TrueHoldWithReset.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-simulateModel("Buildings.Controls.OBC.CDL.Logical.Validation.TrueHoldWithReset", stopTime=15000.0, method="Cvode", tolerance=1e-06, resultFile="TrueHoldWithReset");
-createPlot(id=1, position={37, 75, 723, 422}, y={"truHol.u", "truHol.y"}, range={0.0, 260.0, -0.5, 1.5}, grid=true, colors={{28,108,200}, {28,108,200}});
-createPlot(id=2, position={41, 551, 725, 578}, y={"booPul1.y", "truHol1.y"}, range={0.0, 260.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {28,108,200}});
-createPlot(id=3, position={785, 74, 698, 428}, y={"truHol2.u", "truHol2.y"}, range={0.0, 15000.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}});
-createPlot(id=4, position={797, 558, 685, 559}, y={"truHol3.u", "truHol3.y"}, range={0.0, 15000.0, -0.2, 1.2000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos
index 2ae546a6364..c7df5162ee2 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/CDL/Reals/Validation/Sort.mos
@@ -1,4 +1,8 @@
 simulateModel("Buildings.Controls.OBC.CDL.Reals.Validation.Sort", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="Sort1");
-createPlot(id=1, position={53, 14, 959, 905}, y={"sorAsc.u[1]", "sorAsc.u[2]", "sorAsc.u[3]", "sorAsc.u[4]", "sorAsc.u[5]"}, range={0.0, 0.0, -4.0, 6.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
-createPlot(id=1, position={53, 14, 959, 299}, y={"sorAsc.y[1]", "sorAsc.y[2]", "sorAsc.y[3]", "sorAsc.y[4]", "sorAsc.y[5]"}, range={0.0, 0.0, -6.0, 6.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
-createPlot(id=1, position={53, 14, 959, 299}, y={"sorDes.y[1]", "sorDes.y[2]", "sorDes.y[3]", "sorDes.y[4]", "sorDes.y[5]"}, range={0.0, 0.0, -6.0, 6.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}});
+createPlot(id=1, position={24, 14, 959, 865}, y={"sorAsc.u[1]", "sorAsc.u[2]", "sorAsc.u[3]", "sorAsc.u[4]", "sorAsc.u[5]"}, range={0.0, 1.0, -4.0, 6.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s");
+createPlot(id=1, position={24, 14, 959, 865}, y={"sorAsc.y[1]", "sorAsc.y[2]", "sorAsc.y[3]", "sorAsc.y[4]", "sorAsc.y[5]"}, range={0.0, 1.0, -4.0, 6.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s");
+createPlot(id=1, position={24, 14, 959, 865}, y={"sorDes.y[1]", "sorDes.y[2]", "sorDes.y[3]", "sorDes.y[4]", "sorDes.y[5]"}, range={0.0, 1.0, -6.0, 6.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s");
+createPlot(id=2, position={1001, 330, 1147, 549}, y={"sorAsc.yIdx[1]", "sorAsc.yIdx[2]", "sorAsc.yIdx[3]", "sorAsc.yIdx[4]", "sorAsc.yIdx[5]"}, range={0.0, 1.0, 0.0, 6.0}, grid=true, subPlot=101, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="s");
+createPlot(id=2, position={1001, 330, 1147, 549}, y={"sorDes.yIdx[1]", "sorDes.yIdx[2]", "sorDes.yIdx[3]", "sorDes.yIdx[4]", "sorDes.yIdx[5]"}, range={0.0, 1.0, 0.0, 6.0}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}, {28,108,200}}, timeUnit="s");
+
+
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos
similarity index 91%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos
index d9196c64735..2866c6ee688 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/BaseClasses/Validation/CollectorDistributor.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/BaseClasses/Validation/CollectorDistributor.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor",
+simulateModel("Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor",
     method="cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos
new file mode 100644
index 00000000000..a558be90d41
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerBorefield.mos
@@ -0,0 +1,95 @@
+simulateModel("Buildings.DHC.ETS.Combined.Examples.ChillerBorefield",
+    method="Cvode",
+    tolerance=1e-6,
+    startTime=6.5E6,
+    stopTime=7E6,
+    resultFile="ChillerBorefieldExamples");
+Advanced.FilenameInLegend = true;
+createPlot(
+    id=1,
+    position={4, 5, 546, 906},
+    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]", "ets.conSup.yAmb[2]"},
+    subPlot=3,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.borFie.pum.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal", "ets.borFie.m_flow_nominal"},
+    position={560, 7, 539, 607},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
+    position={1115, 7, 545, 518},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    position={1672, 8, 557, 898},
+    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
+    grid=true);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=2);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.PLR2"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=3);
+createPlot(
+    id=5,
+    position={1117, 559, 545, 347},
+    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+plotExpression(apply( -ChillerBorefieldExamples.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
+plotExpression(apply( -ChillerBorefieldExamples.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos
new file mode 100644
index 00000000000..77e4a9be157
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Examples/ChillerOnly.mos
@@ -0,0 +1,96 @@
+simulateModel("Buildings.DHC.ETS.Combined.Examples.ChillerOnly",
+    method="Cvode",
+    tolerance=1e-6,
+    startTime=6.5E6,
+    stopTime=7E6,
+    resultFile="ChillerOnlyExamples");
+Advanced.FilenameInLegend = true;
+createPlot(id=1,
+    position={4, 5, 546, 906},
+    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(id=1,
+    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(id=1,
+    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]"},
+    subPlot=3,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal"},
+    position={560, 7, 539, 607},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
+    position={1115, 7, 545, 518},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    position={1672, 8, 557, 898},
+    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=2);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.PLR2"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=3);
+createPlot(
+    id=5,
+    position={1117, 559, 545, 347},
+    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+plotExpression(apply( -ChillerOnlyExamples.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
+plotExpression(apply( -ChillerOnlyExamples.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos
index 5bcc0524196..7ad018c7d11 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Borefield.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Borefield.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield",
     method="Cvode",
     tolerance=1e-6,
     stopTime=20000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos
similarity index 91%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos
index 5e31bd18e8d..18231c8da37 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/Chiller.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/Chiller.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller",
     method="Cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos
index 76d2cbce6eb..e5814873737 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger",
     method="Cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos
index 602db1c60ab..602d1e430c0 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPump.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPump.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
index d472224865f..54d7d57db44 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos
similarity index 83%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos
index 1de81ae637f..451619eee55 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/SwitchBox.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/SwitchBox.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos
index 1ce5aabd673..ffa4e6cfd76 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/WatersideEconomizer.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Subsystems/Validation/WatersideEconomizer.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer",
+simulateModel("Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer",
     method="Cvode",
     tolerance=1e-6,
     stopTime=5000,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos
new file mode 100644
index 00000000000..7c23a9bfa3a
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerBorefield.mos
@@ -0,0 +1,93 @@
+simulateModel("Buildings.DHC.ETS.Combined.Validation.ChillerBorefield",
+    method="Cvode",
+    tolerance=1e-6,
+    stopTime=360000,
+    resultFile="ChillerBorefield");
+createPlot(
+    id=1,
+    position={4, 5, 546, 906},
+    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]", "ets.conSup.yAmb[2]"},
+    subPlot=3,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.borFie.pum.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal", "ets.borFie.m_flow_nominal"},
+    position={560, 7, 539, 607},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
+    position={1115, 7, 545, 518},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    position={1672, 8, 557, 898},
+    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
+    grid=true);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=2);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.PLR2"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=3);
+createPlot(
+    id=5,
+    position={1117, 559, 545, 347},
+    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+plotExpression(apply( -ChillerBorefield.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
+plotExpression(apply( -ChillerBorefield.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos
new file mode 100644
index 00000000000..7cc9d56c68d
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerOnly.mos
@@ -0,0 +1,94 @@
+simulateModel("Buildings.DHC.ETS.Combined.Validation.ChillerOnly",
+    method="Cvode",
+    tolerance=1e-6,
+    stopTime=360000,
+    resultFile="ChillerOnly");
+createPlot(id=1,
+    position={4, 5, 546, 906},
+    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(id=1,
+    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(id=1,
+    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]"},
+    subPlot=3,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal"},
+    position={560, 7, 539, 607},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
+    subPlot=2,
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
+    position={1115, 7, 545, 518},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    position={1672, 8, 557, 898},
+    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=2);
+createPlot(
+    id=4,
+    y={"ets.chi.chi.PLR2"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true,
+    subPlot=3);
+createPlot(
+    id=5,
+    position={1117, 559, 545, 347},
+    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+plotExpression(apply( -ChillerOnly.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
+plotExpression(apply( -ChillerOnly.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos
index 8779347cce7..be7f8d971b1 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerWSE.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Combined/Validation/ChillerWSE.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE",
+simulateModel("Buildings.DHC.ETS.Combined.Validation.ChillerWSE",
     method="Cvode",
     tolerance=1e-6,
     stopTime=360000,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos
new file mode 100644
index 00000000000..68a6fba34a6
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Direct.mos
@@ -0,0 +1,39 @@
+// Simulate
+simulateModel("Buildings.DHC.ETS.Cooling.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
+// Plot commands
+createPlot(id=1, 
+  position={11, 19, 713, 564}, 
+  y={"cooETS.senTDisSup.T", "cooETS.senTBuiSup.T", "cooETS.senTBuiRet.T", "cooETS.senTDisRet.T"}, 
+  range={0.0, 24.0, 6.0, 18.0}, 
+  grid=true, 
+  filename="Direct.mat",
+  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+  timeUnit="h", 
+  displayUnits={"degC", "degC", "degC", "degC"}); 
+createPlot(id=1, 
+  position={11, 19, 713, 280}, 
+  y={"cooETS.port_aSerCoo.m_flow", "cooETS.ports_aChiWat[1].m_flow", "cooETS.cheVal.m_flow"}, 
+  range={0.0, 24.0, -0.1, 0.6}, 
+  grid=true, 
+  subPlot=2, 
+  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
+  timeUnit="h");
+createPlot(id=2, 
+  position={734, 19, 720, 561}, 
+  y={"cooETS.conVal.y"}, 
+  range={0.0, 24.0, -0.2, 1.2}, 
+  grid=true, 
+  colors={{28,108,200}}, 
+  timeUnit="h");
+createPlot(id=2, 
+  position={734, 19, 720, 278}, 
+  y={"cooETS.Q_flow", "cooETS.Q"}, 
+  range={0.0, 24.0, -5.0, 30.0}, 
+  grid=true, 
+  subPlot=2, 
+  colors={{28,108,200}, {0,140,72}}, 
+  range2={-100.0, 700.0}, 
+  axes={1, 2}, 
+  timeUnit="h", 
+  displayUnits={"kW", "kWh"});
+  
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos
new file mode 100644
index 00000000000..c9b2c061610
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Cooling/Examples/Indirect.mos
@@ -0,0 +1,54 @@
+// Simulate
+simulateModel("Buildings.DHC.ETS.Cooling.Examples.Indirect", 
+    stopTime=86400, 
+    tolerance=1e-06, 
+    numberOfIntervals=500,
+    resultFile="Indirect");
+// Plot commands
+createPlot(id=1, 
+  position={11, 19, 713, 564},	
+  y={"cooETS.senTDisSup.T", "cooETS.senTDisRet.T", "cooETS.senTBuiSup.T", "cooETS.senTBuiRet.T"}, 
+  range={0.0, 24.0, 0.0, 20.0}, 
+  grid=true, 
+  filename="Indirect.mat",
+  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+  timeUnit="h", 
+  displayUnits={"degC", "degC", "degC", "degC"});
+createPlot(id=1, 
+  position={11, 19, 713, 186}, 
+	y={"cooETS.hex.m1_flow", "cooETS.hex.m2_flow", "loa.m_flow"}, 
+	range={0.0, 24.0, -0.2, 0.6}, 
+	grid=true, 
+	subPlot=2, 
+	bottomTitleType=0, 
+	colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
+	timeUnit="h");
+createPlot(id=1, 
+	position={11, 19, 713, 185}, 
+	y={"cooETS.conVal.y"}, 
+	range={0.0, 24.0, -0.05, 0.1}, 
+	grid=true, 
+	subPlot=3, 
+	colors={{28,108,200}}, 
+	timeUnit="h");
+createPlot(id=2, 
+	position={733, 18, 719, 568}, 
+	y={"cooETS.hex.port_a1.p", "cooETS.hex.port_b1.p", "cooETS.hex.port_a2.p", "cooETS.hex.port_b2.p"}, 
+	range={0.0, 24.0, 3, 3}, 
+	grid=true, 
+	bottomTitleType=0, 
+	colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+	timeUnit="h", 
+	displayUnits={"bar", "bar", "bar", "bar"});
+createPlot(id=2, 
+	position={733, 18, 719, 187}, 
+	y={"cooETS.Q_flow", "cooETS.Q"}, 
+	autoscale=true,
+	range={0.0, 24.0, -10.0, 30.0}, 
+	grid=true, 
+	subPlot=2, 
+	colors={{28,108,200}, {238,46,47}}, 
+	axes={1,2},
+	displayUnits={"kW", "kWh"},
+	timeUnit="h");
+	
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos
new file mode 100644
index 00000000000..4d8924976b7
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Direct.mos
@@ -0,0 +1,39 @@
+// Simulate
+simulateModel("Buildings.DHC.ETS.Heating.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
+// Plot commands
+createPlot(id=1, 
+  position={11, 19, 713, 564}, 
+  y={"heaETS.senTDisSup.T", "heaETS.senTBuiSup.T", "heaETS.senTBuiRet.T", "heaETS.senTDisRet.T"}, 
+  range={0.0, 24.0, 6.0, 18.0}, 
+  grid=true, 
+  filename="Direct.mat",
+  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+  timeUnit="h", 
+  displayUnits={"degC", "degC", "degC", "degC"}); 
+createPlot(id=1, 
+  position={11, 19, 713, 280}, 
+  y={"heaETS.port_aSerHea.m_flow", "heaETS.ports_aHeaWat[1].m_flow", "heaETS.cheVal.m_flow"}, 
+  range={0.0, 24.0, -0.1, 0.6}, 
+  grid=true, 
+  subPlot=2, 
+  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
+  timeUnit="h");
+createPlot(id=2, 
+  position={734, 19, 720, 561}, 
+  y={"heaETS.conVal.y"}, 
+  range={0.0, 24.0, -0.2, 1.2}, 
+  grid=true, 
+  colors={{28,108,200}}, 
+  timeUnit="h");
+createPlot(id=2, 
+  position={734, 19, 720, 278}, 
+  y={"heaETS.Q_flow", "heaETS.Q"}, 
+  range={0.0, 24.0, -5.0, 30.0}, 
+  grid=true, 
+  subPlot=2, 
+  colors={{28,108,200}, {0,140,72}}, 
+  range2={-100.0, 700.0}, 
+  axes={1, 2}, 
+  timeUnit="h", 
+  displayUnits={"kW", "kWh"});
+  
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos
new file mode 100644
index 00000000000..f8b74595951
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/ETS/Heating/Examples/Indirect.mos
@@ -0,0 +1,54 @@
+// Simulate
+simulateModel("Buildings.DHC.ETS.Heating.Examples.Indirect", 
+    stopTime=86400, 
+    tolerance=1e-06, 
+    numberOfIntervals=500,
+    resultFile="Indirect");
+// Plot commands
+createPlot(id=1, 
+  position={11, 19, 713, 564},	
+  y={"heaETS.senTDisSup.T", "heaETS.senTDisRet.T", "heaETS.senTBuiSup.T", "heaETS.senTBuiRet.T"}, 
+  range={0.0, 24.0, 0.0, 20.0}, 
+  grid=true, 
+  filename="Indirect.mat",
+  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+  timeUnit="h", 
+  displayUnits={"degC", "degC", "degC", "degC"});
+createPlot(id=1, 
+  position={11, 19, 713, 186}, 
+	y={"heaETS.hex.m1_flow", "heaETS.hex.m2_flow", "loa.m_flow"}, 
+	range={0.0, 24.0, -0.2, 0.6}, 
+	grid=true, 
+	subPlot=2, 
+	bottomTitleType=0, 
+	colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
+	timeUnit="h");
+createPlot(id=1, 
+	position={11, 19, 713, 185}, 
+	y={"heaETS.conVal.y"}, 
+	range={0.0, 24.0, -0.05, 0.1}, 
+	grid=true, 
+	subPlot=3, 
+	colors={{28,108,200}}, 
+	timeUnit="h");
+createPlot(id=2, 
+	position={733, 18, 719, 568}, 
+	y={"heaETS.hex.port_a1.p", "heaETS.hex.port_b1.p", "heaETS.hex.port_a2.p", "heaETS.hex.port_b2.p"}, 
+	range={0.0, 24.0, 3, 3}, 
+	grid=true, 
+	bottomTitleType=0, 
+	colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+	timeUnit="h", 
+	displayUnits={"bar", "bar", "bar", "bar"});
+createPlot(id=2, 
+	position={733, 18, 719, 187}, 
+	y={"heaETS.Q_flow", "heaETS.Q"}, 
+	autoscale=true,
+	range={0.0, 24.0, -10.0, 30.0}, 
+	grid=true, 
+	subPlot=2, 
+	colors={{28,108,200}, {238,46,47}}, 
+	axes={1,2},
+	displayUnits={"kW", "kWh"},
+	timeUnit="h");
+	
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos
similarity index 98%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos
index 1c2cb5c762c..2aaf6e93dbd 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesConstantFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesConstantFlow.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow",
+simulateModel("Buildings.DHC.Examples.Combined.SeriesConstantFlow",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos
similarity index 98%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos
index 60865332993..a5f1d8ca68f 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlow.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow",
+simulateModel("Buildings.DHC.Examples.Combined.SeriesVariableFlow",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
similarity index 97%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
index 15c5bf2fbb6..eea5b448c71 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Combined/SeriesVariableFlowAgentControl.mos
@@ -1,5 +1,5 @@
 removePlots();
-simulateModel("Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl",
+simulateModel("Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
similarity index 79%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
index 234843485bd..2ddf0102fcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Cooling/ElectricChillersDirectETS.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS", tolerance=1e-6, startTime=15724800, stopTime=16329600, method="CVode", resultFile="ElectricChillersDirectETS");
+simulateModel("Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS", tolerance=1e-6, startTime=15724800, stopTime=16329600, method="CVode", resultFile="ElectricChillersDirectETS");
 // Plot commands
 removePlots(true);
 createPlot(id=1,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos
new file mode 100644
index 00000000000..ec6e941e5f4
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Examples/Steam/SingleBoiler.mos
@@ -0,0 +1,86 @@
+// Simulate
+simulateModel("Buildings.DHC.Examples.Steam.SingleBoiler", stopTime=86400, method="Dassl", tolerance=1e-06, resultFile="SingleBoiler");
+// Plot commands
+createPlot(id=1, position={10, 18, 570, 506}, 
+  y={"pla.QFue_flow"}, 
+  range={0.0, 90000.0, 30000.0, 70000.0}, 
+  grid=true, 
+  filename="SingleBoiler.mat", 
+  colors={{238,46,47}}, 
+  timeUnit="s", 
+  displayUnits={"W"});
+createPlot(id=1, position={10, 18, 570, 506}, 
+  y={"bld[1].Q_flow", "bld[3].Q_flow"}, 
+  range={0.0, 90000.0, 5.0, 25.0}, 
+  grid=true, 
+  subPlot=102, 
+  colors={{28,108,200}, {238,46,47}}, 
+  timeUnit="s", 
+  displayUnits={"kW", "kW"});
+createPlot(id=1, position={10, 18, 570, 506}, 
+  y={"pla.port_aSerHea.m_flow", "bld[1].port_a.m_flow", "bld[3].port_a.m_flow"}, 
+  range={0.0, 90000.0, -0.01, 0.03}, 
+  grid=true, 
+  subPlot=103, 
+  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
+  timeUnit="s", 
+  displayUnits={"kg/s", "kg/s", "kg/s"});
+createPlot(id=2, position={399, 58, 782, 679}, 
+  y={"pla.port_bSerHea.p"}, 
+  range={0.0, 90000.0, 3.996, 4.002}, 
+  grid=true, 
+  colors={{238,46,47}}, 
+  timeUnit="s", 
+  displayUnits={"bar"});  
+createPlot(id=2, position={399, 58, 782, 679}, 
+  y={"pla.port_aSerHea.p", "bld[1].port_b.p", "bld[3].port_b.p"}, 
+  range={0.0, 90000.0, 1.0, 1.3}, 
+  grid=true, 
+  subPlot=102, 
+  colors={{28,108,200}, {0,140,72}, {217,67,180}}, 
+  timeUnit="s", 
+  displayUnits={"bar", "bar", "bar"});
+createPlot(id=2, position={399, 58, 782, 679}, 
+  y={"bld[1].sta_a.T", "bld[1].sta_b.T", "bld[3].sta_a.T", "bld[3].sta_b.T"}, 
+  range={0.0, 90000.0, 80.0, 160.0}, 
+  grid=true, 
+  subPlot=103, 
+  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+  timeUnit="s", 
+  displayUnits={"degC", "degC", "degC", "degC"});
+createPlot(id=2, position={399, 58, 782, 679}, 
+  y={"pla.port_aSerHea.h_outflow", "pla.port_bSerHea.h_outflow", "bld[1].port_a.h_outflow","bld[1].port_b.h_outflow"}, 
+  range={0.0, 90000.0, 0.0, 3000000.0}, 
+  grid=true, 
+  subPlot=104, 
+  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
+  timeUnit="s", 
+  displayUnits={"J/kg", "J/kg", "J/kg", "J/kg"});
+createPlot(id=3, position={59, 456, 584, 361}, 
+  y={"pla.conPum.u_s", "pla.conPum.u_m"}, 
+  range={0.0, 100000.0, 0.99994, 1.00002}, 
+  grid=true, 
+  colors={{28,108,200}, {238,46,47}}, 
+  timeUnit="s");
+createPlot(id=3, position={59, 456, 584, 361}, 
+  y={"pla.conBoi.u_s", "pla.conBoi.u_m"}, 
+  range={0.0, 100000.0, 0.999, 1.0005}, 
+  grid=true, 
+  subPlot=201, 
+  colors={{28,108,200}, {238,46,47}}, 
+  timeUnit="s");
+createPlot(id=3, position={59, 456, 584, 361}, 
+  y={"pla.conPum.y"}, 
+  range={0.0, 100000.0, 0.69, 0.72}, 
+  grid=true, 
+  subPlot=102, 
+  colors={{28,108,200}}, 
+  timeUnit="s");
+createPlot(id=3, position={59, 456, 584, 361}, 
+  y={"pla.conBoi.y"}, 
+  range={0.0, 100000.0, 0.4, 1.0}, 
+  grid=true, 
+  subPlot=202, 
+  colors={{28,108,200}}, 
+  timeUnit="s");
+
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
similarity index 91%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
index 4308b3e6d48..df5ea0a0418 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Controls/Validation/MixingValveControl.mos
@@ -1,6 +1,6 @@
 old_flag = Advanced.StoreProtectedVariables;
 Advanced.StoreProtectedVariables = true;
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
index 5ff2dd48151..3273e5889ff 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ1Valve.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
index 060f25f3b71..8ef5fb11963 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingRCZ6.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
index 9abd145501f..1141f22082c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ1.mos
@@ -1,6 +1,6 @@
 old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation;
 Hidden.AvoidDoubleComputation=true;
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
similarity index 96%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
index 8674924f22b..5f18e94f648 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingSpawnZ6.mos
@@ -1,6 +1,6 @@
 old_hidden_avoid_double_computation=Hidden.AvoidDoubleComputation;
 Hidden.AvoidDoubleComputation=true;
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
index e78833d4fc5..0bb06cbcb28 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeries.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries",
     method="cvode",
     tolerance=1e-6,
     stopTime=604800.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
index fc58000de1e..2d33b59bf5c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Examples/CouplingTimeSeriesSingleLoop.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
index 79a5be3e420..33fa94c87cd 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution1.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
index d6c0362ec31..b2e784cf22e 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BenchmarkFlowDistribution2.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
index 11a16de72c6..f64a80d0f73 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/BuildingWithETS.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS",
     method="Cvode",
     tolerance=1e-6,
     stopTime=1.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
similarity index 87%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
index e363d07a88b..5fe5ac8f61c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/FlowDistributionPumpControl.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
similarity index 79%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
index 48aa30d635f..ac6db86475e 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/GetPeakLoad.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad",
     method="Cvode",
     tolerance=1e-6,
     stopTime=1.0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
index 4e957d8d2df..c105973e771 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/SimpleRoomODE.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE",
     method="cvode",
     tolerance=1e-6,
     numberOfIntervals=500,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
index 41d2f65c723..0b9a7477906 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/BaseClasses/Validation/TerminalUnitScaling.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling",
+simulateModel("Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling",
     method="cvode",
     tolerance=1e-6,
     stopTime=1000.0,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
new file mode 100644
index 00000000000..f9f48a32ee9
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
@@ -0,0 +1,6 @@
+simulateModel("Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETS");
+createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHeaWat.heaPum.QCon_flow_nominal", "bui.ets.proHeaWat.heaPum.QCon_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
+createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHotWat.heaPum.QCon_flow_nominal", "bui.ets.proHotWat.heaPum.QCon_flow"}, range={0.0, 10.0, -2000.0, 4000.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
+createPlot(id=1, position={540, 9, 784, 617}, y={"bui.PHea", "bui.PPum"}, range={0.0, 10.0, -50000.0, 100000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
+createPlot(id=1, position={540, 9, 784, 617}, y={"bui.bui.QReqHea_flow", "bui.bui.QReqCoo_flow", "bui.bui.QHea_flow", "bui.bui.QCoo_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
+
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
similarity index 92%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
index 7bf0c32967e..74a93c1f496 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETSDHWTank");
+simulateModel("Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETSDHWTank");
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHeaWat.heaPum.QCon_flow_nominal", "bui.ets.proHeaWat.heaPum.QCon_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.bui.QReqHea_flow", "bui.bui.QReqCoo_flow", "bui.bui.QHea_flow", "bui.bui.QCoo_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.PHea", "bui.PPum"}, range={0.0, 10.0, -50000.0, 100000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
new file mode 100644
index 00000000000..442d9d74aaf
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
@@ -0,0 +1,5 @@
+simulateModel("Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
+createPlot(id=1, position={11, 19, 713, 558}, y={"buiWitETS.bui.loa.y[1]", "buiWitETS.ets.Q_flow"}, range={30.0, 42.0, -30.0, 10.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kW", "kW"});
+createPlot(id=1, position={11, 19, 713, 558}, y={"senMasFlo.m_flow", "buiWitETS.ets.senMasFlo.m_flow"}, range={30.0, 42.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kg/s", "kg/s"});
+createPlot(id=2, position={211, 7, 1250, 715}, y={"supChiWat.T", "buiWitETS.ets.senTDisSup.T", "buiWitETS.ets.senTDisRet.T", "buiWitETS.ets.senTBuiSup.T"}, range={30.0, 42.0, 6.0, 24.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"});
+
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
new file mode 100644
index 00000000000..2a1a9a88c4f
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
@@ -0,0 +1,4 @@
+simulateModel("Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
+createPlot(id=1, position={11, 19, 713, 558}, y={"buiWitETS.bui.loa.y[2]", "buiWitETS.ets.Q_flow"}, range={30.0, 42.0, -30.0, 10.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kW", "kW"});
+createPlot(id=1, position={11, 19, 713, 558}, y={"senMasFlo.m_flow", "buiWitETS.ets.senMasFlo.m_flow"}, range={30.0, 42.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kg/s", "kg/s"});
+createPlot(id=2, position={211, 7, 1250, 715}, y={"buiWitETS.ets.senTDisSup.T", "buiWitETS.ets.senTDisRet.T"}, range={30.0, 42.0, 6.0, 24.0}, grid=true, colors={{238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"degC", "degC"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
similarity index 75%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
index 577826ef250..460edc68649 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat", stopTime=172800, numberOfIntervals=0, outputInterval=60, tolerance=1e-06, resultFile="HeaterAndFixtureDirectHeatExchangerWithElectricHeat");
+simulateModel("Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat", stopTime=172800, numberOfIntervals=0, outputInterval=60, tolerance=1e-06, resultFile="HeaterAndFixtureDirectHeatExchangerWithElectricHeat");
 createPlot(id=1, position={560, 11, 592, 621}, y={"theMixValNoEle.conPID.y", "theMixVal.conPID.y"}, range={0.0, 900000.0, 0.7000000000000001, 1.1}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="s");
 createPlot(id=1, position={560, 11, 592, 621}, y={"genNoEle.THexOut", "souDisHot.T"}, range={0.0, 900000.0, 290.0, 330.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"", "K"});
 createPlot(id=1, position={560, 11, 592, 621}, y={"gen.PEle", "genNoEle.PEle"}, range={0.0, 900000.0, -20000.0, 80000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
index 985230bc842..4dd956b9a76 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger", stopTime=172800, tolerance=1e-06, resultFile="StorageTankWithExternalHeatExchanger");
+simulateModel("Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger", stopTime=172800, tolerance=1e-06, resultFile="StorageTankWithExternalHeatExchanger");
 createPlot(id=1, position={532, 19, 592, 614}, y={"theMixVal.TMixSet", "theMixVal.senTMix.T", "domHotWatTan.senTemHot.T", "domHotWatTan.TTanTop.T", "domHotWatTan.TTanBot.T", "domHotWatTan.conCha.TTanTopSet"}, range={0.0, 180000.0, 0.0, 60.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={532, 19, 592, 614}, y={"hea.Q_flow"}, range={0.0, 180000.0, -500.0, 1000.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
 createPlot(id=1, position={532, 19, 592, 614}, y={"domHotWatTan.PEle"}, range={0.0, 180000.0, 0.0, 1.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
index 269e6b6f8b9..075dd90a76d 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ControlVolumeCondensation.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeCondensation");
+simulateModel("Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeCondensation");
 // Plot
 createPlot(id=1, position={27, 10, 521, 446}, 
 	y={"volDyn.port_a.m_flow", "volSte.port_a.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
similarity index 86%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
index ce89e6dcee7..b342dfdc76d 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/SteamTrap.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap", stopTime=180, tolerance=1e-06, method="dassl", resultFile="SteamTrap");
+simulateModel("Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap", stopTime=180, tolerance=1e-06, method="dassl", resultFile="SteamTrap");
 // Plot commands
 removePlots(false);
 createPlot(id=1, position={15, 15, 874, 421}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
index 5a21849cac0..53c97e609c4 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/BaseClasses/Examples/ValveSelfActing.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing", stopTime=15, method="dassl", tolerance=1e-06, resultFile="ValveSelfActing");
+simulateModel("Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing", stopTime=15, method="dassl", tolerance=1e-06, resultFile="ValveSelfActing");
 // Plot commands
 removePlots(false);
 createPlot(id=1, position={11, 59, 631, 388}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
similarity index 87%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
index 24d352c5030..4f262b02243 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Loads/Steam/Examples/BuildingTimeSeriesAtETS.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS", startTime=1728000, stopTime=1814400, tolerance=1e-06, method="dassl", resultFile="BuildingTimeSeriesAtETS");
+simulateModel("Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS", startTime=1728000, stopTime=1814400, tolerance=1e-06, method="dassl", resultFile="BuildingTimeSeriesAtETS");
 // Plot commands
 createPlot(id=1, position={15, 10, 624, 496}, 
 	y={"bui.Q_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
similarity index 80%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
index 863231c1433..12117facbcc 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection1PipeExample");
+simulateModel("Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection1PipeExample");
 // Plot commands
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.m_flow_actual", "pumDisPlugFlow.m_flow_actual","pumConPipe_R.m_flow_actual", "pumConPlugFlow.m_flow_actual"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"kg/s", "kg/s", "kg/s", "kg/s"});
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.port_a.p", "pumDisPipe_R.port_b.p", "pumDisPlugFlow.port_a.p", "pumDisPlugFlow.port_b.p"}, range={0.0, 3600.0, 2.0, 3.1}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"bar", "bar", "bar", "bar"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
similarity index 80%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
index 1a66e4fcdfb..403e5a5211b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Connections/Examples/Connection2PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection2PipeExample");
+simulateModel("Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Connection2PipeExample");
 // Plot commands
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.m_flow_actual", "pumDisPlugFlow.m_flow_actual","pumConPipe_R.m_flow_actual", "pumConPlugFlow.m_flow_actual"}, range={0.0, 3600.0, -0.2, 1.2000000000000002}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"kg/s", "kg/s", "kg/s", "kg/s"});
 createPlot(id=1, position={52, 10, 1644, 1131}, y={"pumDisPipe_R.port_a.p", "pumDisPipe_R.port_b.p", "pumDisPlugFlow.port_a.p", "pumDisPlugFlow.port_b.p"}, range={0.0, 3600.0, 2.0, 3.1}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s", displayUnits={"bar", "bar", "bar", "bar"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
similarity index 76%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
index 3c9d92753a8..f2bbf8e2202 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/AgentPump1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="AgentPump1PipeExample");
+simulateModel("Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="AgentPump1PipeExample");
 // Plot commands
 createPlot(id=1, position={55, 55, 1174, 550}, y={"AgentPump.TSouIn", "AgentPump.TSouOut", "AgentPump.TSou", "AgentPump.TSupDis", "AgentPump.TRetDis"}, range={0.0, 3600.0, 6.0, 14.0}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={55, 55, 1174, 550}, y={"AgentPump.y"}, range={0.0, 3600.0, -0.1, 0.6000000000000001}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"1"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
similarity index 81%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
index 4e86b58947b..fee045bdbcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Controls/Examples/MainPump1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="MainPump1PipeExample");
+simulateModel("Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="MainPump1PipeExample");
 // Plot commands
 createPlot(id=1, position={55, 55, 1212, 838}, y={"conPum.TMix[1]", "conPum.TSouIn[1]", "conPum.TSouOut[1]", "conPum.TMin_lower.y", "conPum.TMax_upper.y"}, range={0.0, 3600.0, 0.0, 20.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={55, 55, 1212, 838}, y={"conPum.QCoo_flow[1]"}, range={0.0, 3600.0, -100.0, 600.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos
index e3aa6d2675b..f596246d6cd 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution1PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution1PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution1PipeExample");
+simulateModel("Buildings.DHC.Networks.Examples.Distribution1PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution1PipeExample");
 // Plot commands
 createPlot( id=1,position={1, 20, 492, 682},  y={"terAutoSize[1].TLoaODE.TAir", "minTSet.y"}, grid=true, color=true, displayUnits={"degC", "degC"});
 createPlot( id=1,y={"terAutoSize[1].QReqHea_flow", "terAutoSize[1].QActHea_flow"},grid=true,color=true, subPlot=2);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos
similarity index 82%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos
index b3dd6ed8066..6a1b3a0835c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Examples/Distribution2PipeExample.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Examples/Distribution2PipeExample.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution2PipeExample");
+simulateModel("Buildings.DHC.Networks.Examples.Distribution2PipeExample", stopTime=3600,method="Cvode", tolerance=1e-06, resultFile="Distribution2PipeExample");
 // Plot commands
 createPlot( id=1,position={1, 20, 492, 682},  y={"terAutoSize[1].TLoaODE.TAir", "minTSet.y"}, grid=true, color=true, displayUnits={"degC", "degC"});
 createPlot( id=1,y={"terAutoSize[1].QReqHea_flow", "terAutoSize[1].QActHea_flow"},grid=true,color=true, subPlot=2);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos
index dfdaea24f75..978feb257ab 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Pipes/Validation/Pipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Pipes/Validation/Pipe.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe", 
+simulateModel("Buildings.DHC.Networks.Pipes.Validation.Pipe", 
     stopTime=1, 
     method="Cvode", 
     tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
index 45f44313936..20bb80e346c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/ConnectionCondensatePipe.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="ConnectionCondensatePipe");
+simulateModel("Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="ConnectionCondensatePipe");
 // Plot commands
 createPlot(id=1, position={26, 43, 764, 418}, 
   y={"con.port_aDisSup.m_flow", "con.port_bDisRet.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
index cd16e5bae5b..720f8e69b8b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Networks/Steam/Examples/DistributionCondensatePipe.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="DistributionCondensatePipe");
+simulateModel("Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="DistributionCondensatePipe");
 // Plot commands
 createPlot(id=1, position={26, 51, 1285, 632}, 
   y={"dis.ports_aCon[1].m_flow", "dis.ports_aCon[2].m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
new file mode 100644
index 00000000000..a3fd1857b98
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
@@ -0,0 +1,25 @@
+simulateModel("Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex",
+    method="Cvode",
+    tolerance=1e-6,
+    startTime=0,
+    stopTime=1000,
+    resultFile="StageIndex");
+
+createPlot(
+    id=1,
+    position={24, 21, 592, 515},
+    y={"sta.u1", "sta.u1Up", "sta.u1Dow"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"sta.idxSta"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
similarity index 92%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
index c12e851d111..8dea391fb79 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPlant.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant",
+simulateModel("Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
index b628097b586..b8e604d9dcb 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Controls/BaseClasses/Validation/StagingPump.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump",
+simulateModel("Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
new file mode 100644
index 00000000000..d6508f44a04
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
@@ -0,0 +1,11 @@
+simulateModel("Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage",
+    method="Radau",
+    tolerance=1e-6,
+    startTime=3024000,
+    stopTime=3456000,
+    resultFile="AllElectricCWStorage");
+// Plot commands
+createPlot(id=1, position={413, 4, 775, 634}, y={"loaHea[1].bui.QReqHea_flow", "loaHea[1].bui.QHea_flow", "loaHea[2].bui.QReqHea_flow","loaHea[2].bui.QHea_flow"}, range={35, 40, -500000.0, 1000000.0}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
+createPlot(id=1, position={413, 4, 775, 634}, y={"loaCoo[1].bui.QReqCoo_flow", "loaCoo[1].bui.QCoo_flow", "loaCoo[2].bui.QReqCoo_flow","loaCoo[2].bui.QCoo_flow"}, range={35, 40, -40000.0, 20000.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
+createPlot(id=1, position={413, 4, 775, 634}, y={"pla.PHea", "pla.PCoo", "pla.PFan", "pla.PPum"}, range={35, 40, -500000.0, 1000000.0}, autoscale=false, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
+createPlot(id=1, position={413, 4, 775, 634}, y={"pla.THeaWatSup.T", "pla.THeaWatPriRet.T", "pla.TChiWatSup.T", "pla.TChiWatPriRet.T"}, range={35, 40, 0.0, 100.0}, autoscale=false, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
index 02a151a3e7e..b6ffeb11e45 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
index d17ab9478ea..80030c12319 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ChillerHeatRecoveryGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
index fce32ca5208..d6df05805f2 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/CoolingTowerGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
index 5adb5c66dde..eed5b914f3b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/HeatPumpGroup.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
index 4be87254d08..912a871293c 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsDp.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
index e975b2fd4d7..c7e8cbfe064 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsFlow.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
similarity index 90%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
index 6ff9145656b..891f4a85c3b 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/MultiplePumpsSpeed.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
similarity index 84%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
index eb2c2466bf5..06b5e3118ad 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Subsystems/Validation/ValveOpeningFlowBalancing.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing",
+simulateModel("Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing",
     method="Cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
new file mode 100644
index 00000000000..a80ca79a0e7
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
@@ -0,0 +1,240 @@
+simulateModel("Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage",
+    method="Cvode",
+    tolerance=1e-6,
+    startTime=0,
+    stopTime=345600,
+    resultFile="AllElectricCWStorage");
+createPlot(
+    id=1,
+    position={8, 9, 504, 530},
+    y={"pla.chi.y1[1]", "pla.chi.y1[2]"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"pla.chiHea.y1[1]", "pla.chiHea.y1Coo[1]", "pla.ctl.y1HeaCooChiHea[1]", "pla.chiHea.y1[2]", "pla.chiHea.y1Coo[2]", "pla.ctl.y1HeaCooChiHea[2]"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"pla.ctl.cycTan.idxCycTan", "pla.ctl.modConLoo.mode"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    position={38, 10, 442, 494},
+    y={"pla.chi.m1_flow", "pla.chi.m2_flow", "pla.chiHea.m1_flow", "pla.chiHea.m2_flow", "pla.chiHea.m3_flow", "pla.chiHea.m4_flow"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"pla.chi.chi.m2_flow", "pla.chiHea.chi[1].m2_flow", "pla.chiHea.chi[2].m2_flow", "pla.chi.mChiWatUni_flow_nominal", "pla.chiHea.mChiWatUni_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"pla.TChiWatSupSet", "pla.TChiWatPriRet.T", "pla.TChiWatSup.T", "pla.chiHea.TEvaLvg[1]", "pla.chiHea.TEvaLvg[2]"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    position={66, 80, 442, 494},
+    y={"pla.pumChiWat.y1[1]", "pla.pumChiWat.y1[2]","pla.pumChiWat.pum.y_actual"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"pla.dpChiWatSet", "pla.dpChiWat.p_rel", "pla.pumChiWat.pum.dpMachine", "pla.pumChiWat.dpPum_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"pla.mChiWatPri_flow.m_flow", "pla.mChiWat_flow_nominal", "pla.chi.m2_flow", "pla.chiHea.m4_flow", "pla.mChiWatChi_flow_min"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    position={463, 12, 443, 466},
+    y={"pla.chiHea.m1_flow", "pla.chiHea.m2_flow", "pla.chiHea.m3_flow", "pla.chiHea.m4_flow"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"pla.chiHea.chi[1].m1_flow", "pla.chiHea.chi[2].m1_flow", "pla.chiHea.mConWatUni_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=4,
+    subPlot=3,
+    y={"pla.THeaWatSupSet", "pla.THeaWatPriRet.T", "pla.THeaWatSup.T", "pla.chiHea.TConLvg[1]", "pla.chiHea.TConLvg[2]"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=5,
+    position={517, 80, 443, 495},
+    y={"pla.pumHeaWat.y1[1]", "pla.pumHeaWat.y1[2]", "pla.pumHeaWat.pum.y_actual"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=5,
+    subPlot=2,
+    y={"pla.dpHeaWatSet", "pla.dpHeaWat.p_rel", "pla.pumHeaWat.pum.dpMachine", "pla.pumHeaWat.dpPum_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=5,
+    subPlot=3,
+    y={"pla.mHeaWatPri_flow.m_flow", "pla.mHeaWat_flow_nominal", "pla.chiHea.m1_flow", "pla.mHeaWatChiHea_flow_min"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=6,
+    position={915, 12, 407, 496},
+    y={"pla.pumConWatCon.y1[1]", "pla.pumConWatCon.y1[2]", "pla.pumConWatCon.y"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=6,
+    subPlot=2,
+    y={"pla.chi.m1_flow", "pla.chiHea.m3_flow", "pla.chiHea.m3_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=6,
+    subPlot=3,
+    y={"pla.pumConWatEva.y1[1]", "pla.pumConWatEva.y1[2]", "pla.pumConWatEva.y"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=6,
+    subPlot=4,
+    y={"pla.chiHea.m2_flow", "pla.chiHea.m2_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=7,
+    position={981, 81, 443, 524},
+    y={"pla.heaPum.y1[1]", "pla.heaPum.y1[2]"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=7,
+    subPlot=2,
+    y={"pla.ctl.THeaPumSet", "pla.TConWatHeaPumEnt.T", "pla.TConWatHeaPumLvg.T"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=7,
+    subPlot=3,
+    y={"pla.heaPum.heaPum.m1_flow", "pla.heaPum.heaPum.m1_flow_nominal"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=7,
+    subPlot=4,
+    y={"pla.TTan[1].T", "pla.TTan[5].T", "pla.TTan[10].T"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=8,
+    position={593, 26, 592, 396},
+    y={"pla.chiHea.valConSwi[1].y_actual", "pla.chiHea.valConSwi[2].y_actual"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=8,
+    subPlot=2,
+    y={"pla.chiHea.valEvaSwi[1].y_actual", "pla.chiHea.valEvaSwi[2].y_actual"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
+createPlot(
+    id=9,
+    position={75, 75, 584, 361},
+    y={"pla.TConWatConChiEnt.T", "pla.TConWatConChiLvg.T", "pla.TConWatConRet.T", "pla.TConWatHexCooEnt.T", "pla.TConWatHexCooLvg.T"},
+    autoscale=true,
+    autoerase=true,
+    autoreplot=true,
+    grid=true,
+    color=true);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
similarity index 85%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
index 48650223020..56e1bd9a130 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/BaseClasses/Validation/IdealUser.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser",
+simulateModel("Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser",
  stopTime=3600,
  tolerance=1e-06,
  method="dassl",
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
index 4e39d74a8db..181b22c40a2 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterBypass.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass", 
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass", 
     stopTime=1200, 
     method="Cvode", 
     tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
index 4934e3f066b..c713ce2b136 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChilledWaterPumpSpeed.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed",
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed",
 	stopTime=1200,
 	method="Cvode",
 	tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
similarity index 88%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
index 03219290697..5d1949f488a 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/ChillerStage.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage",
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage",
     stopTime=1200,
     method="Cvode",
     tolerance=1e-06,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
similarity index 87%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
index 7341fe817fe..e3cb4d0eb56 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Controls/Validation/TankStatus.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus",
+simulateModel("Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus",
     stopTime=1, method="Dassl", tolerance=1e-06, resultFile="TankStatus");
 // Plot commands
 removePlots(false);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
similarity index 95%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
index d9867f3e5dc..e949d5e6c72 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/ElectricChillerParallel.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel", 
+simulateModel("Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel", 
     stopTime=86400, 
     method="cvode",
     tolerance=1e-06, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
similarity index 94%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
index 8642a3ada31..d797d44d199 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Examples/StoragePlantDualSource.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource",
+simulateModel("Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource",
  stopTime=9000,
  tolerance=1e-06,
  method="radau",
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
similarity index 89%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
index 8017cda4463..6bf0c6f1346 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersParallel.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel", 
+simulateModel("Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel", 
 	startTime=15552000, 
 	stopTime=15724800, 
 	method="cvode", 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
similarity index 93%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
index 04b74a08720..d3de7d9d2e7 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Cooling/Subsystems/Examples/CoolingTowersWithBypass.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass", 
+simulateModel("Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass", 
 	startTime=10368000, 
 	stopTime=10540800, 
 	method="cvode", 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
index 4d03fcd876d..dcd928dcf86 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/BoilerPolynomial.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial", stopTime=3600, tolerance=1e-06, method="dassl", resultFile="BoilerPolynomial");
+simulateModel("Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial", stopTime=3600, tolerance=1e-06, method="dassl", resultFile="BoilerPolynomial");
 // Plot commands
 createPlot(id=1, position={33, 21, 614, 476}, 
 	y={"y.y"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
similarity index 78%
rename from Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
rename to Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
index 7eda5f07b15..e637fe125ce 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/BaseClasses/Examples/ControlVolumeEvaporation.mos
@@ -1,5 +1,5 @@
 // Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeEvaporation");
+simulateModel("Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation", tolerance=1e-06, stopTime=1.0, method="dassl", resultFile="ControlVolumeEvaporation");
 // Plot
 createPlot(id=1, position={27, 10, 521, 446}, 
 	y={"volDyn.port_a.m_flow", "volSte.port_a.m_flow"}, 
diff --git a/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos
new file mode 100644
index 00000000000..c904bc6944d
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/DHC/Plants/Steam/Examples/SingleBoiler.mos
@@ -0,0 +1,24 @@
+// Simulate
+simulateModel("Buildings.DHC.Plants.Steam.Examples.SingleBoiler", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="SingleBoiler");
+// Plot commands
+createPlot(id=1, position={55, 34, 558, 505}, 
+  y={"vol.m_flow"}, 
+  range={0.0, 90000.0, -0.5, 1.5}, 
+  grid=true, 
+  filename="SingleBoiler.mat", 
+  colors={{28,108,200}}, 
+  displayUnits={"kg/s"});
+createPlot(id=1, position={55, 34, 558, 505}, 
+  y={"pla.QFue_flow", "pla.PPum", "pumCNR.P"}, 
+  range={0.0, 90000.0, -1000000.0, 3000000.0}, 
+  grid=true, 
+  subPlot=102, 
+  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
+  displayUnits={"W", "W", "W"});
+createPlot(id=1, position={55, 34, 558, 505}, 
+  y={"pla.boi.port_b.p", "steTra.port_b.p"}, 
+  range={0.0, 90000.0, 0.0, 4.0}, 
+  grid=true, 
+  subPlot=103, 
+  colors={{28,108,200}, {238,46,47}}, 
+  displayUnits={"bar", "bar"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos
deleted file mode 100644
index d77507dfd9c..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerBorefield.mos
+++ /dev/null
@@ -1,95 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield",
-    method="Cvode",
-    tolerance=1e-6,
-    startTime=6.5E6,
-    stopTime=7E6,
-    resultFile="ChillerBorefieldExamples");
-Advanced.FilenameInLegend = true;
-createPlot(
-    id=1,
-    position={4, 5, 546, 906},
-    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]", "ets.conSup.yAmb[2]"},
-    subPlot=3,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.borFie.pum.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal", "ets.borFie.m_flow_nominal"},
-    position={560, 7, 539, 607},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
-    position={1115, 7, 545, 518},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    position={1672, 8, 557, 898},
-    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
-    grid=true);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=2);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.PLR2"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=3);
-createPlot(
-    id=5,
-    position={1117, 559, 545, 347},
-    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-plotExpression(apply( -ChillerBorefieldExamples.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
-plotExpression(apply( -ChillerBorefieldExamples.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos
deleted file mode 100644
index c98c9e466a3..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Examples/ChillerOnly.mos
+++ /dev/null
@@ -1,96 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly",
-    method="Cvode",
-    tolerance=1e-6,
-    startTime=6.5E6,
-    stopTime=7E6,
-    resultFile="ChillerOnlyExamples");
-Advanced.FilenameInLegend = true;
-createPlot(id=1,
-    position={4, 5, 546, 906},
-    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(id=1,
-    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(id=1,
-    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]"},
-    subPlot=3,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal"},
-    position={560, 7, 539, 607},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
-    position={1115, 7, 545, 518},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    position={1672, 8, 557, 898},
-    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=2);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.PLR2"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=3);
-createPlot(
-    id=5,
-    position={1117, 559, 545, 347},
-    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-plotExpression(apply( -ChillerOnlyExamples.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
-plotExpression(apply( -ChillerOnlyExamples.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos
deleted file mode 100644
index 27795952786..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerBorefield.mos
+++ /dev/null
@@ -1,93 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield",
-    method="Cvode",
-    tolerance=1e-6,
-    stopTime=360000,
-    resultFile="ChillerBorefield");
-createPlot(
-    id=1,
-    position={4, 5, 546, 906},
-    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]", "ets.conSup.yAmb[2]"},
-    subPlot=3,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.borFie.pum.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal", "ets.borFie.m_flow_nominal"},
-    position={560, 7, 539, 607},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
-    position={1115, 7, 545, 518},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    position={1672, 8, 557, 898},
-    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
-    grid=true);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=2);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.PLR2"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=3);
-createPlot(
-    id=5,
-    position={1117, 559, 545, 347},
-    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-plotExpression(apply( -ChillerBorefield.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
-plotExpression(apply( -ChillerBorefield.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos
deleted file mode 100644
index cfa3e0bc5f9..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Validation/ChillerOnly.mos
+++ /dev/null
@@ -1,94 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly",
-    method="Cvode",
-    tolerance=1e-6,
-    stopTime=360000,
-    resultFile="ChillerOnly");
-createPlot(id=1,
-    position={4, 5, 546, 906},
-    y={"ets.tanHeaWat.TTop", "ets.tanHeaWat.TBot", "senTHeaWatSup.T", "senTHeaWatRet.T", "ets.conSup.THeaWatSupPreSet", "ets.conSup.THeaWatSupSet"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(id=1,
-    y={"ets.tanChiWat.TTop", "ets.tanChiWat.TBot", "senTChiWatSup.T", "senTChiWatRet.T", "ets.conSup.TChiWatSupPreSet", "ets.conSup.TChiWatSupSet"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(id=1,
-    y={"ets.conSup.yHea", "ets.conSup.yCoo", "ets.conSup.yAmb[1]"},
-    subPlot=3,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.chi.pumCon.m_flow", "ets.chi.pumEva.m_flow", "ets.hex.pum1.m_flow",  "ets.hex.pum2.m_flow", "ets.hex.m1_flow_nominal", "ets.hex.m2_flow_nominal"},
-    position={560, 7, 539, 607},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    y={"ets.valIsoEva.y_actual", "ets.valIsoCon.y_actual"},
-    subPlot=2,
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    y={"senTDisWatSup.T", "senTDisWatRet.T", "ets.hex.senT2WatEnt.T", "ets.hex.senT2WatLvg.T"},
-    position={1115, 7, 545, 518},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    position={1672, 8, 557, 898},
-    y={"ets.chi.senTConEnt.T", "ets.chi.senTConLvg.T", "ets.chi.senTEvaEnt.T",  "ets.chi.senTEvaLvg.T", "ets.conSup.THeaWatSupSet", "ets.conSup.TChiWatSupSet"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.COP", "ets.datChi.COP_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=2);
-createPlot(
-    id=4,
-    y={"ets.chi.chi.PLR2"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true,
-    subPlot=3);
-createPlot(
-    id=5,
-    position={1117, 559, 545, 347},
-    y={"ets.QChiWat_flow_nominal", "ets.QHeaWat_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-plotExpression(apply( -ChillerOnly.loaCoo.Q_flow), false, "-loaCoo.Q_flow", 5);
-plotExpression(apply( -ChillerOnly.loaHea.Q_flow), false, "-loaHea.Q_flow", 5);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos
deleted file mode 100644
index 166ee358e44..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Direct.mos
+++ /dev/null
@@ -1,39 +0,0 @@
-// Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
-// Plot commands
-createPlot(id=1, 
-  position={11, 19, 713, 564}, 
-  y={"cooETS.senTDisSup.T", "cooETS.senTBuiSup.T", "cooETS.senTBuiRet.T", "cooETS.senTDisRet.T"}, 
-  range={0.0, 24.0, 6.0, 18.0}, 
-  grid=true, 
-  filename="Direct.mat",
-  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-  timeUnit="h", 
-  displayUnits={"degC", "degC", "degC", "degC"}); 
-createPlot(id=1, 
-  position={11, 19, 713, 280}, 
-  y={"cooETS.port_aSerCoo.m_flow", "cooETS.ports_aChiWat[1].m_flow", "cooETS.cheVal.m_flow"}, 
-  range={0.0, 24.0, -0.1, 0.6}, 
-  grid=true, 
-  subPlot=2, 
-  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
-  timeUnit="h");
-createPlot(id=2, 
-  position={734, 19, 720, 561}, 
-  y={"cooETS.conVal.y"}, 
-  range={0.0, 24.0, -0.2, 1.2}, 
-  grid=true, 
-  colors={{28,108,200}}, 
-  timeUnit="h");
-createPlot(id=2, 
-  position={734, 19, 720, 278}, 
-  y={"cooETS.Q_flow", "cooETS.Q"}, 
-  range={0.0, 24.0, -5.0, 30.0}, 
-  grid=true, 
-  subPlot=2, 
-  colors={{28,108,200}, {0,140,72}}, 
-  range2={-100.0, 700.0}, 
-  axes={1, 2}, 
-  timeUnit="h", 
-  displayUnits={"kW", "kWh"});
-  
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos
deleted file mode 100644
index 39714511ad5..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Cooling/Examples/Indirect.mos
+++ /dev/null
@@ -1,54 +0,0 @@
-// Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect", 
-    stopTime=86400, 
-    tolerance=1e-06, 
-    numberOfIntervals=500,
-    resultFile="Indirect");
-// Plot commands
-createPlot(id=1, 
-  position={11, 19, 713, 564},	
-  y={"cooETS.senTDisSup.T", "cooETS.senTDisRet.T", "cooETS.senTBuiSup.T", "cooETS.senTBuiRet.T"}, 
-  range={0.0, 24.0, 0.0, 20.0}, 
-  grid=true, 
-  filename="Indirect.mat",
-  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-  timeUnit="h", 
-  displayUnits={"degC", "degC", "degC", "degC"});
-createPlot(id=1, 
-  position={11, 19, 713, 186}, 
-	y={"cooETS.hex.m1_flow", "cooETS.hex.m2_flow", "loa.m_flow"}, 
-	range={0.0, 24.0, -0.2, 0.6}, 
-	grid=true, 
-	subPlot=2, 
-	bottomTitleType=0, 
-	colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
-	timeUnit="h");
-createPlot(id=1, 
-	position={11, 19, 713, 185}, 
-	y={"cooETS.conVal.y"}, 
-	range={0.0, 24.0, -0.05, 0.1}, 
-	grid=true, 
-	subPlot=3, 
-	colors={{28,108,200}}, 
-	timeUnit="h");
-createPlot(id=2, 
-	position={733, 18, 719, 568}, 
-	y={"cooETS.hex.port_a1.p", "cooETS.hex.port_b1.p", "cooETS.hex.port_a2.p", "cooETS.hex.port_b2.p"}, 
-	range={0.0, 24.0, 3, 3}, 
-	grid=true, 
-	bottomTitleType=0, 
-	colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-	timeUnit="h", 
-	displayUnits={"bar", "bar", "bar", "bar"});
-createPlot(id=2, 
-	position={733, 18, 719, 187}, 
-	y={"cooETS.Q_flow", "cooETS.Q"}, 
-	autoscale=true,
-	range={0.0, 24.0, -10.0, 30.0}, 
-	grid=true, 
-	subPlot=2, 
-	colors={{28,108,200}, {238,46,47}}, 
-	axes={1,2},
-	displayUnits={"kW", "kWh"},
-	timeUnit="h");
-	
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos
deleted file mode 100644
index a293e1ae956..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Direct.mos
+++ /dev/null
@@ -1,39 +0,0 @@
-// Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct", tolerance=1e-6, stopTime=86400, numberOfIntervals=500, resultFile="Direct");
-// Plot commands
-createPlot(id=1, 
-  position={11, 19, 713, 564}, 
-  y={"heaETS.senTDisSup.T", "heaETS.senTBuiSup.T", "heaETS.senTBuiRet.T", "heaETS.senTDisRet.T"}, 
-  range={0.0, 24.0, 6.0, 18.0}, 
-  grid=true, 
-  filename="Direct.mat",
-  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-  timeUnit="h", 
-  displayUnits={"degC", "degC", "degC", "degC"}); 
-createPlot(id=1, 
-  position={11, 19, 713, 280}, 
-  y={"heaETS.port_aSerHea.m_flow", "heaETS.ports_aHeaWat[1].m_flow", "heaETS.cheVal.m_flow"}, 
-  range={0.0, 24.0, -0.1, 0.6}, 
-  grid=true, 
-  subPlot=2, 
-  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
-  timeUnit="h");
-createPlot(id=2, 
-  position={734, 19, 720, 561}, 
-  y={"heaETS.conVal.y"}, 
-  range={0.0, 24.0, -0.2, 1.2}, 
-  grid=true, 
-  colors={{28,108,200}}, 
-  timeUnit="h");
-createPlot(id=2, 
-  position={734, 19, 720, 278}, 
-  y={"heaETS.Q_flow", "heaETS.Q"}, 
-  range={0.0, 24.0, -5.0, 30.0}, 
-  grid=true, 
-  subPlot=2, 
-  colors={{28,108,200}, {0,140,72}}, 
-  range2={-100.0, 700.0}, 
-  axes={1, 2}, 
-  timeUnit="h", 
-  displayUnits={"kW", "kWh"});
-  
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos
deleted file mode 100644
index fea7c029f51..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Heating/Examples/Indirect.mos
+++ /dev/null
@@ -1,54 +0,0 @@
-// Simulate
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect", 
-    stopTime=86400, 
-    tolerance=1e-06, 
-    numberOfIntervals=500,
-    resultFile="Indirect");
-// Plot commands
-createPlot(id=1, 
-  position={11, 19, 713, 564},	
-  y={"heaETS.senTDisSup.T", "heaETS.senTDisRet.T", "heaETS.senTBuiSup.T", "heaETS.senTBuiRet.T"}, 
-  range={0.0, 24.0, 0.0, 20.0}, 
-  grid=true, 
-  filename="Indirect.mat",
-  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-  timeUnit="h", 
-  displayUnits={"degC", "degC", "degC", "degC"});
-createPlot(id=1, 
-  position={11, 19, 713, 186}, 
-	y={"heaETS.hex.m1_flow", "heaETS.hex.m2_flow", "loa.m_flow"}, 
-	range={0.0, 24.0, -0.2, 0.6}, 
-	grid=true, 
-	subPlot=2, 
-	bottomTitleType=0, 
-	colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
-	timeUnit="h");
-createPlot(id=1, 
-	position={11, 19, 713, 185}, 
-	y={"heaETS.conVal.y"}, 
-	range={0.0, 24.0, -0.05, 0.1}, 
-	grid=true, 
-	subPlot=3, 
-	colors={{28,108,200}}, 
-	timeUnit="h");
-createPlot(id=2, 
-	position={733, 18, 719, 568}, 
-	y={"heaETS.hex.port_a1.p", "heaETS.hex.port_b1.p", "heaETS.hex.port_a2.p", "heaETS.hex.port_b2.p"}, 
-	range={0.0, 24.0, 3, 3}, 
-	grid=true, 
-	bottomTitleType=0, 
-	colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-	timeUnit="h", 
-	displayUnits={"bar", "bar", "bar", "bar"});
-createPlot(id=2, 
-	position={733, 18, 719, 187}, 
-	y={"heaETS.Q_flow", "heaETS.Q"}, 
-	autoscale=true,
-	range={0.0, 24.0, -10.0, 30.0}, 
-	grid=true, 
-	subPlot=2, 
-	colors={{28,108,200}, {238,46,47}}, 
-	axes={1,2},
-	displayUnits={"kW", "kWh"},
-	timeUnit="h");
-	
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos
deleted file mode 100644
index 33458012062..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Examples/Steam/SingleBoiler.mos
+++ /dev/null
@@ -1,86 +0,0 @@
-// Simulate
-simulateModel("Buildings.Experimental.DHC.Examples.Steam.SingleBoiler", stopTime=86400, method="Dassl", tolerance=1e-06, resultFile="SingleBoiler");
-// Plot commands
-createPlot(id=1, position={10, 18, 570, 506}, 
-  y={"pla.QFue_flow"}, 
-  range={0.0, 90000.0, 30000.0, 70000.0}, 
-  grid=true, 
-  filename="SingleBoiler.mat", 
-  colors={{238,46,47}}, 
-  timeUnit="s", 
-  displayUnits={"W"});
-createPlot(id=1, position={10, 18, 570, 506}, 
-  y={"bld[1].Q_flow", "bld[3].Q_flow"}, 
-  range={0.0, 90000.0, 5.0, 25.0}, 
-  grid=true, 
-  subPlot=102, 
-  colors={{28,108,200}, {238,46,47}}, 
-  timeUnit="s", 
-  displayUnits={"kW", "kW"});
-createPlot(id=1, position={10, 18, 570, 506}, 
-  y={"pla.port_aSerHea.m_flow", "bld[1].port_a.m_flow", "bld[3].port_a.m_flow"}, 
-  range={0.0, 90000.0, -0.01, 0.03}, 
-  grid=true, 
-  subPlot=103, 
-  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
-  timeUnit="s", 
-  displayUnits={"kg/s", "kg/s", "kg/s"});
-createPlot(id=2, position={399, 58, 782, 679}, 
-  y={"pla.port_bSerHea.p"}, 
-  range={0.0, 90000.0, 3.996, 4.002}, 
-  grid=true, 
-  colors={{238,46,47}}, 
-  timeUnit="s", 
-  displayUnits={"bar"});  
-createPlot(id=2, position={399, 58, 782, 679}, 
-  y={"pla.port_aSerHea.p", "bld[1].port_b.p", "bld[3].port_b.p"}, 
-  range={0.0, 90000.0, 1.0, 1.3}, 
-  grid=true, 
-  subPlot=102, 
-  colors={{28,108,200}, {0,140,72}, {217,67,180}}, 
-  timeUnit="s", 
-  displayUnits={"bar", "bar", "bar"});
-createPlot(id=2, position={399, 58, 782, 679}, 
-  y={"bld[1].sta_a.T", "bld[1].sta_b.T", "bld[3].sta_a.T", "bld[3].sta_b.T"}, 
-  range={0.0, 90000.0, 80.0, 160.0}, 
-  grid=true, 
-  subPlot=103, 
-  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-  timeUnit="s", 
-  displayUnits={"degC", "degC", "degC", "degC"});
-createPlot(id=2, position={399, 58, 782, 679}, 
-  y={"pla.port_aSerHea.h_outflow", "pla.port_bSerHea.h_outflow", "bld[1].port_a.h_outflow","bld[1].port_b.h_outflow"}, 
-  range={0.0, 90000.0, 0.0, 3000000.0}, 
-  grid=true, 
-  subPlot=104, 
-  colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, 
-  timeUnit="s", 
-  displayUnits={"J/kg", "J/kg", "J/kg", "J/kg"});
-createPlot(id=3, position={59, 456, 584, 361}, 
-  y={"pla.conPum.u_s", "pla.conPum.u_m"}, 
-  range={0.0, 100000.0, 0.99994, 1.00002}, 
-  grid=true, 
-  colors={{28,108,200}, {238,46,47}}, 
-  timeUnit="s");
-createPlot(id=3, position={59, 456, 584, 361}, 
-  y={"pla.conBoi.u_s", "pla.conBoi.u_m"}, 
-  range={0.0, 100000.0, 0.999, 1.0005}, 
-  grid=true, 
-  subPlot=201, 
-  colors={{28,108,200}, {238,46,47}}, 
-  timeUnit="s");
-createPlot(id=3, position={59, 456, 584, 361}, 
-  y={"pla.conPum.y"}, 
-  range={0.0, 100000.0, 0.69, 0.72}, 
-  grid=true, 
-  subPlot=102, 
-  colors={{28,108,200}}, 
-  timeUnit="s");
-createPlot(id=3, position={59, 456, 584, 361}, 
-  y={"pla.conBoi.y"}, 
-  range={0.0, 100000.0, 0.4, 1.0}, 
-  grid=true, 
-  subPlot=202, 
-  colors={{28,108,200}}, 
-  timeUnit="s");
-
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
deleted file mode 100644
index 3a744c9fd35..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETS.mos
+++ /dev/null
@@ -1,6 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETS");
-createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHeaWat.heaPum.QCon_flow_nominal", "bui.ets.proHeaWat.heaPum.QCon_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
-createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHotWat.heaPum.QCon_flow_nominal", "bui.ets.proHotWat.heaPum.QCon_flow"}, range={0.0, 10.0, -2000.0, 4000.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
-createPlot(id=1, position={540, 9, 784, 617}, y={"bui.PHea", "bui.PPum"}, range={0.0, 10.0, -50000.0, 100000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
-createPlot(id=1, position={540, 9, 784, 617}, y={"bui.bui.QReqHea_flow", "bui.bui.QReqCoo_flow", "bui.bui.QHea_flow", "bui.bui.QCoo_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
-
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
deleted file mode 100644
index 888800902e9..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Cooling/Examples/BuildingTimeSeriesWithETS.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
-createPlot(id=1, position={11, 19, 713, 558}, y={"buiWitETS.bui.loa.y[1]", "buiWitETS.ets.Q_flow"}, range={30.0, 42.0, -30.0, 10.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kW", "kW"});
-createPlot(id=1, position={11, 19, 713, 558}, y={"senMasFlo.m_flow", "buiWitETS.ets.senMasFlo.m_flow"}, range={30.0, 42.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kg/s", "kg/s"});
-createPlot(id=2, position={211, 7, 1250, 715}, y={"supChiWat.T", "buiWitETS.ets.senTDisSup.T", "buiWitETS.ets.senTDisRet.T", "buiWitETS.ets.senTBuiSup.T"}, range={30.0, 42.0, 6.0, 24.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"});
-
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
deleted file mode 100644
index b3c2278d44c..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Heating/Examples/BuildingTimeSeriesWithETS.mos
+++ /dev/null
@@ -1,4 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS", startTime=2592000, stopTime=3628800, method="Cvode", tolerance=1e-06, resultFile="BuildingTimeSeriesWithETS");
-createPlot(id=1, position={11, 19, 713, 558}, y={"buiWitETS.bui.loa.y[2]", "buiWitETS.ets.Q_flow"}, range={30.0, 42.0, -30.0, 10.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kW", "kW"});
-createPlot(id=1, position={11, 19, 713, 558}, y={"senMasFlo.m_flow", "buiWitETS.ets.senMasFlo.m_flow"}, range={30.0, 42.0, -0.1, 0.4}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"kg/s", "kg/s"});
-createPlot(id=2, position={211, 7, 1250, 715}, y={"buiWitETS.ets.senTDisSup.T", "buiWitETS.ets.senTDisRet.T"}, range={30.0, 42.0, 6.0, 24.0}, grid=true, colors={{238,46,47}, {0,140,72}}, timeUnit="d", displayUnits={"degC", "degC"});
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
deleted file mode 100644
index 1fd71036b50..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Controls/BaseClasses/Validation/StageIndex.mos
+++ /dev/null
@@ -1,25 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex",
-    method="Cvode",
-    tolerance=1e-6,
-    startTime=0,
-    stopTime=1000,
-    resultFile="StageIndex");
-
-createPlot(
-    id=1,
-    position={24, 21, 592, 515},
-    y={"sta.u1", "sta.u1Up", "sta.u1Dow"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    subPlot=2,
-    y={"sta.idxSta"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
deleted file mode 100644
index acbcadaac02..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Examples/AllElectricCWStorage.mos
+++ /dev/null
@@ -1,11 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage",
-    method="Radau",
-    tolerance=1e-6,
-    startTime=3024000,
-    stopTime=3456000,
-    resultFile="AllElectricCWStorage");
-// Plot commands
-createPlot(id=1, position={413, 4, 775, 634}, y={"loaHea[1].bui.QReqHea_flow", "loaHea[1].bui.QHea_flow", "loaHea[2].bui.QReqHea_flow","loaHea[2].bui.QHea_flow"}, range={35, 40, -500000.0, 1000000.0}, autoscale=false, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
-createPlot(id=1, position={413, 4, 775, 634}, y={"loaCoo[1].bui.QReqCoo_flow", "loaCoo[1].bui.QCoo_flow", "loaCoo[2].bui.QReqCoo_flow","loaCoo[2].bui.QCoo_flow"}, range={35, 40, -40000.0, 20000.0}, autoscale=false, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
-createPlot(id=1, position={413, 4, 775, 634}, y={"pla.PHea", "pla.PCoo", "pla.PFan", "pla.PPum"}, range={35, 40, -500000.0, 1000000.0}, autoscale=false, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
-createPlot(id=1, position={413, 4, 775, 634}, y={"pla.THeaWatSup.T", "pla.THeaWatPriRet.T", "pla.TChiWatSup.T", "pla.TChiWatPriRet.T"}, range={35, 40, 0.0, 100.0}, autoscale=false, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"degC", "degC", "degC", "degC"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
deleted file mode 100644
index b8cd7757fb6..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Combined/Validation/AllElectricCWStorage.mos
+++ /dev/null
@@ -1,240 +0,0 @@
-simulateModel("Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage",
-    method="Cvode",
-    tolerance=1e-6,
-    startTime=0,
-    stopTime=345600,
-    resultFile="AllElectricCWStorage");
-createPlot(
-    id=1,
-    position={8, 9, 504, 530},
-    y={"pla.chi.y1[1]", "pla.chi.y1[2]"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    subPlot=2,
-    y={"pla.chiHea.y1[1]", "pla.chiHea.y1Coo[1]", "pla.ctl.y1HeaCooChiHea[1]", "pla.chiHea.y1[2]", "pla.chiHea.y1Coo[2]", "pla.ctl.y1HeaCooChiHea[2]"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=1,
-    subPlot=3,
-    y={"pla.ctl.cycTan.idxCycTan", "pla.ctl.modConLoo.mode"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    position={38, 10, 442, 494},
-    y={"pla.chi.m1_flow", "pla.chi.m2_flow", "pla.chiHea.m1_flow", "pla.chiHea.m2_flow", "pla.chiHea.m3_flow", "pla.chiHea.m4_flow"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    subPlot=2,
-    y={"pla.chi.chi.m2_flow", "pla.chiHea.chi[1].m2_flow", "pla.chiHea.chi[2].m2_flow", "pla.chi.mChiWatUni_flow_nominal", "pla.chiHea.mChiWatUni_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=2,
-    subPlot=3,
-    y={"pla.TChiWatSupSet", "pla.TChiWatPriRet.T", "pla.TChiWatSup.T", "pla.chiHea.TEvaLvg[1]", "pla.chiHea.TEvaLvg[2]"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    position={66, 80, 442, 494},
-    y={"pla.pumChiWat.y1[1]", "pla.pumChiWat.y1[2]","pla.pumChiWat.pum.y_actual"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    subPlot=2,
-    y={"pla.dpChiWatSet", "pla.dpChiWat.p_rel", "pla.pumChiWat.pum.dpMachine", "pla.pumChiWat.dpPum_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=3,
-    subPlot=3,
-    y={"pla.mChiWatPri_flow.m_flow", "pla.mChiWat_flow_nominal", "pla.chi.m2_flow", "pla.chiHea.m4_flow", "pla.mChiWatChi_flow_min"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    position={463, 12, 443, 466},
-    y={"pla.chiHea.m1_flow", "pla.chiHea.m2_flow", "pla.chiHea.m3_flow", "pla.chiHea.m4_flow"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    subPlot=2,
-    y={"pla.chiHea.chi[1].m1_flow", "pla.chiHea.chi[2].m1_flow", "pla.chiHea.mConWatUni_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=4,
-    subPlot=3,
-    y={"pla.THeaWatSupSet", "pla.THeaWatPriRet.T", "pla.THeaWatSup.T", "pla.chiHea.TConLvg[1]", "pla.chiHea.TConLvg[2]"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=5,
-    position={517, 80, 443, 495},
-    y={"pla.pumHeaWat.y1[1]", "pla.pumHeaWat.y1[2]", "pla.pumHeaWat.pum.y_actual"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=5,
-    subPlot=2,
-    y={"pla.dpHeaWatSet", "pla.dpHeaWat.p_rel", "pla.pumHeaWat.pum.dpMachine", "pla.pumHeaWat.dpPum_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=5,
-    subPlot=3,
-    y={"pla.mHeaWatPri_flow.m_flow", "pla.mHeaWat_flow_nominal", "pla.chiHea.m1_flow", "pla.mHeaWatChiHea_flow_min"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=6,
-    position={915, 12, 407, 496},
-    y={"pla.pumConWatCon.y1[1]", "pla.pumConWatCon.y1[2]", "pla.pumConWatCon.y"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=6,
-    subPlot=2,
-    y={"pla.chi.m1_flow", "pla.chiHea.m3_flow", "pla.chiHea.m3_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=6,
-    subPlot=3,
-    y={"pla.pumConWatEva.y1[1]", "pla.pumConWatEva.y1[2]", "pla.pumConWatEva.y"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=6,
-    subPlot=4,
-    y={"pla.chiHea.m2_flow", "pla.chiHea.m2_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=7,
-    position={981, 81, 443, 524},
-    y={"pla.heaPum.y1[1]", "pla.heaPum.y1[2]"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=7,
-    subPlot=2,
-    y={"pla.ctl.THeaPumSet", "pla.TConWatHeaPumEnt.T", "pla.TConWatHeaPumLvg.T"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=7,
-    subPlot=3,
-    y={"pla.heaPum.heaPum.m1_flow", "pla.heaPum.heaPum.m1_flow_nominal"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=7,
-    subPlot=4,
-    y={"pla.TTan[1].T", "pla.TTan[5].T", "pla.TTan[10].T"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=8,
-    position={593, 26, 592, 396},
-    y={"pla.chiHea.valConSwi[1].y_actual", "pla.chiHea.valConSwi[2].y_actual"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=8,
-    subPlot=2,
-    y={"pla.chiHea.valEvaSwi[1].y_actual", "pla.chiHea.valEvaSwi[2].y_actual"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
-createPlot(
-    id=9,
-    position={75, 75, 584, 361},
-    y={"pla.TConWatConChiEnt.T", "pla.TConWatConChiLvg.T", "pla.TConWatConRet.T", "pla.TConWatHexCooEnt.T", "pla.TConWatHexCooLvg.T"},
-    autoscale=true,
-    autoerase=true,
-    autoreplot=true,
-    grid=true,
-    color=true);
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos
deleted file mode 100644
index 33a37bc6124..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Plants/Steam/Examples/SingleBoiler.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// Simulate
-simulateModel("Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler", stopTime=86400, tolerance=1e-6, method="dassl", resultFile="SingleBoiler");
-// Plot commands
-createPlot(id=1, position={55, 34, 558, 505}, 
-  y={"vol.m_flow"}, 
-  range={0.0, 90000.0, -0.5, 1.5}, 
-  grid=true, 
-  filename="SingleBoiler.mat", 
-  colors={{28,108,200}}, 
-  displayUnits={"kg/s"});
-createPlot(id=1, position={55, 34, 558, 505}, 
-  y={"pla.QFue_flow", "pla.PPum", "pumCNR.P"}, 
-  range={0.0, 90000.0, -1000000.0, 3000000.0}, 
-  grid=true, 
-  subPlot=102, 
-  colors={{28,108,200}, {238,46,47}, {0,140,72}}, 
-  displayUnits={"W", "W", "W"});
-createPlot(id=1, position={55, 34, 558, 505}, 
-  y={"pla.boi.port_b.p", "steTra.port_b.p"}, 
-  range={0.0, 90000.0, 0.0, 4.0}, 
-  grid=true, 
-  subPlot=103, 
-  colors={{28,108,200}, {238,46,47}}, 
-  displayUnits={"bar", "bar"});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mos
deleted file mode 100644
index fc02def8cc0..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/KalmanFilter.mos
+++ /dev/null
@@ -1,24 +0,0 @@
-// Setting 64-bit compilation is due to
-// https://github.com/lbl-srg/modelica-buildings/issues/559
-Advanced_CompileWith64_ori=Advanced.CompileWith64;
-Advanced.CompileWith64 = 2;
-simulateModel("Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter", method="dassl", resultFile="KalmanFilter", tolerance=1e-6, stopTime=1);
-createPlot(id = 1,
- position = {15, 10, 592, 414},
- y = {"kalFil.uR[1]", "kalFil.yR[1]", "sine.y"},
- range = {0.0, 1.0, -2.0, 2.0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- description = false,
- grid = true,
- color = true,
- online = false,
- filename = "KalmanFilter.mat",
- leftTitleType = 1,
- bottomTitleType = 1,
- colors = {{0,0,255}, {255,0,0}, {0,128,0}},
- patterns = {LinePattern.None, LinePattern.Solid, LinePattern.Solid},
- markers = {MarkerStyle.Dot, MarkerStyle.None, MarkerStyle.None},
- thicknesses = {0.25, 1.0, 0.5});
-Advanced.CompileWith64 = Advanced_CompileWith64_ori;
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mos
deleted file mode 100644
index f4e70b12ee9..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Examples/SimpleRoom.mos
+++ /dev/null
@@ -1,3 +0,0 @@
-simulateModel("Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom", stopTime=86400, method="dassl", tolerance=1e-06, resultFile="SimpleRoom");
-createPlot(id=1, position={136, 30, 2125, 957}, y={"TAmb.y", "onOffCon.u"}, range={0.0, 1.0, 0.0, 25.0}, grid=true, colors={{238,46,47}, {28,108,200}});
-createPlot(id=1, position={136, 30, 2125, 476}, y={"pyt.yR[2]"}, range={0.0, 1.0, -2000.0, 10000.0}, grid=true, subPlot=2, colors={{28,108,200}});
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mos
deleted file mode 100644
index f980b8f6e9f..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/Exchange.mos
+++ /dev/null
@@ -1,23 +0,0 @@
-// Setting 64-bit compilation is due to
-// https://github.com/lbl-srg/modelica-buildings/issues/559
-Advanced_CompileWith64_ori=Advanced.CompileWith64;
-Advanced.CompileWith64 = 2;
-simulateModel("Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange", method="Euler", fixedstepsize=1, tolerance=1e-6, stopTime=1.0, resultFile="Exchange");
-createPlot(id = 1,
- position = {15, 10, 407, 281},
- y = {"yR1[1]", "yI1[1]", "yR2[1]", "yR2[2]", "yI2[1]", "yI2[2]"},
- range = {0.0, 1.0, 0.0, 7.0},
- autoscale = true,
- autoerase = true,
- autoreplot = true,
- description = false,
- grid = true,
- color = true,
- online = false,
- filename = "Exchange.mat",
- leftTitleType = 1,
- bottomTitleType = 1,
- colors = {{0,0,255}, {255,0,0}, {0,128,0}, {255,0,255}, {0,0,0}, {0,0,255}},
- markers = {MarkerStyle.None, MarkerStyle.None, MarkerStyle.None, MarkerStyle.None,
-MarkerStyle.None, MarkerStyle.Cross});
-Advanced.CompileWith64 = Advanced_CompileWith64_ori;
diff --git a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos b/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos
deleted file mode 100644
index 942be185a1a..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Obsolete/Utilities/IO/Python36/Functions/Examples/ExchangeWithPassPythonObject.mos
+++ /dev/null
@@ -1,7 +0,0 @@
-// Setting 64-bit compilation is due to
-// https://github.com/lbl-srg/modelica-buildings/issues/559
-Advanced_CompileWith64_ori=Advanced.CompileWith64;
-Advanced.CompileWith64 = 2;
-simulateModel("Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject", method="Euler", fixedstepsize=1, tolerance=1e-6, stopTime=1.0, resultFile="ExchangeWithPassPythonObject");
-createPlot(id=3, position={0, 0, 2411, 1036}, y={"yR1[1]", "yR2[1]"}, range={0.0, 1.2000000000000002E-05, 2.0, 17.0}, grid=true, colors={{28,108,200}, {238,46,47}});
-Advanced.CompileWith64 = Advanced_CompileWith64_ori;
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/MultipleCommands.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/MultipleCommands.mos
new file mode 100644
index 00000000000..62a2c832f25
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/MultipleCommands.mos
@@ -0,0 +1,26 @@
+simulateModel("Buildings.Templates.Components.Controls.Validation.MultipleCommands",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=2000.0,
+    resultFile="MultipleCommands");
+createPlot(
+    id=1,
+    position={5, 5, 300, 600},
+    y={"conCom.y1[1]", "conCom.y1[2]", "conCom.y1[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"conCom.y1One"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"conCom.nUniOn", "conCom.nUniOnBou"},
+    autoscale=true,
+    grid=true
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/StatusEmulator.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/StatusEmulator.mos
new file mode 100644
index 00000000000..5f98c77a334
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/StatusEmulator.mos
@@ -0,0 +1,19 @@
+simulateModel("Buildings.Templates.Components.Controls.Validation.StatusEmulator",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=50.0,
+    resultFile="StatusEmulator");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    y={"sta.y1", "sta.y1_actual"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"sta.fil.y", "sta.yLim"},
+    autoscale=true,
+    grid=true
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mos
new file mode 100644
index 00000000000..e035b0ec9df
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mos
@@ -0,0 +1,86 @@
+simulateModel("Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=10497600.0,
+    stopTime=10505600.0,
+    resultFile="HeatPumpEquationFit");
+createPlot(
+    id=1,
+    position={5, 5, 300, 400},
+    y={"y1.y[1]", "y1Hea.y[1]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"weaDat.weaBus.TDryBul"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 600},
+    subPlot=1,
+    y={"TRet.T", "TSup.T", "hpAw.bus.TSet", "hpAw.THeaWatRet_nominal", "hpAw.TChiWatRet_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"hpAw.port_a.m_flow", "hpAw.mHeaWat_flow_nominal", "hpAw.mChiWat_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"hpAw.hp.PLR", "hpAw.hp.COP"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 600},
+    subPlot=1,
+    y={"TRet1.T", "TSup1.T", "hpAwNrv.bus.TSet", "hpAwNrv.THeaWatRet_nominal", "hpAwNrv.TChiWatRet_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"hpAwNrv.port_a.m_flow", "hpAwNrv.mHeaWat_flow_nominal", "hpAwNrv.mChiWat_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"hpAwNrv.hp.PLR", "hpAwNrv.hp.COP"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    position={920, 5, 300, 600},
+    subPlot=1,
+    y={"TRet2.T", "TSup2.T", "hpWw.bus.TSet", "hpWw.THeaWatRet_nominal", "hpWw.TChiWatRet_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"hpWw.port_a.m_flow", "hpWw.mHeaWat_flow_nominal", "hpWw.mChiWat_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=3,
+    y={"hpWw.hp.PLR", "hpWw.hp.COP"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/PumpMultipleRecord.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/PumpMultipleRecord.mos
new file mode 100644
index 00000000000..26e42444490
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/PumpMultipleRecord.mos
@@ -0,0 +1,31 @@
+simulateModel("Buildings.Templates.Components.Validation.PumpMultipleRecord",
+  method="cvode",
+  tolerance=1e-6,
+  stopTime=1.0,
+  resultFile="PumpMultipleRecord");
+createPlot(id=1,
+  position={19, 10, 476, 550},
+  y={"V_flow_nominal[1]", "V_flow_nominal[2]"},
+  subPlot=1,
+  autoscale=true,
+  grid=true);
+createPlot(id=1,
+  y={"datDef.per[1].pressure.V_flow[2]", "datDef.per[2].pressure.V_flow[2]"},
+  subPlot=2,
+  autoscale=true,
+  grid=true);
+createPlot(id=1,
+  y={"datRed.per[1].pressure.V_flow[2]", "datRed.per[2].pressure.V_flow[2]"},
+  subPlot=3,
+  autoscale=true,
+  grid=true);
+createPlot(id=1,
+  y={"datAss.per[1].pressure.V_flow[2]", "datAss.per[2].pressure.V_flow[2]"},
+  subPlot=4,
+  autoscale=true,
+  grid=true);
+createPlot(id=1,
+  y={"datPre.per[1].pressure.V_flow[2]", "datPre.per[2].pressure.V_flow[2]"},
+  subPlot=5,
+  autoscale=true,
+  grid=true);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Pumps.mos b/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Pumps.mos
new file mode 100644
index 00000000000..2ae37c0fe63
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Pumps.mos
@@ -0,0 +1,89 @@
+simulateModel("Buildings.Templates.Components.Validation.Pumps",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=300.0,
+    resultFile="Pumps");
+createPlot(
+    id=1,
+    position={5, 5, 300, 600},
+    y={"pum1.bus.y1", "pum2.bus.y1"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"pum1.m_flow", "pum2.m_flow", "datPum.m_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"res.m_flow", "res.m_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 600},
+    y={"pumMul.bus.y1[1]", "pumMul.bus.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"pumMul.pum[1].m_flow", "pumMul.pum[2].m_flow", "pumMul.m_flow_nominal[1]", "pumMul.m_flow_nominal[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"resMul.m_flow", "resMul.m_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 600},
+    y={"pumMulCst.bus.y1[1]", "pumMulCst.bus.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"pumMulCst.pum[1].m_flow", "pumMulCst.pum[2].m_flow", "pumMulCst.m_flow_nominal[1]", "pumMulCst.m_flow_nominal[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"resMulCst.m_flow", "resMulCst.m_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    position={920, 5, 300, 600},
+    y={"pumMulDed.bus.y1[1]", "pumMulDed.bus.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"pumMulDed.pum[1].m_flow", "pumMulDed.pum[2].m_flow", "pumMulDed.m_flow_nominal[1]", "pumMulDed.m_flow_nominal[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=3,
+    y={"resMulDed.m_flow", "resMulDed.m_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Enabling/Validation/Enable.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Enabling/Validation/Enable.mos
new file mode 100644
index 00000000000..356e3ef79e3
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Enabling/Validation/Enable.mos
@@ -0,0 +1,30 @@
+simulateModel("Buildings.Templates.Plants.Controls.Enabling.Validation.Enable",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=7200.0,
+    resultFile="TemplatesPlantsEnable");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 500},
+    y={"req.y", "sch.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"TOut.y", "enaHea.TOutLck", "enaCoo.TOutLck"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"enaHea.y1", "enaCoo.y1", "enaCooSch.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos
new file mode 100644
index 00000000000..9c7d052f9f1
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos
@@ -0,0 +1,112 @@
+simulateModel("Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=86400.0,
+    resultFile="AirToWaterControls");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    y={"ctl.chaStaHea.capReq.y", "ctl.chaStaCoo.capReq.y", "capHea_nominal", "capCoo_nominal"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ctl.TOut", "ctl.TOutChiWatLck", "ctl.TOutHeaWatLck"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 500},
+    y={"ctl.nReqPlaHeaWat", "ctl.nReqPlaChiWat", "ctl.enaHea.y1", "ctl.enaCoo.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"ctl.idxStaHea.y", "ctl.idxStaCoo.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 500},
+    subPlot=1,
+    y={"ctl.y1Hp[1]", "ctl.y1Hp[2]", "ctl.y1Hp[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"ctl.y1HeaHp[1]", "ctl.y1HeaHp[2]", "ctl.y1HeaHp[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    position={920, 5, 300, 600},
+    subPlot=1,
+    y={"ctl.y1PumHeaWatPri[1]", "ctl.y1PumHeaWatPri[2]", "ctl.y1PumHeaWatPri[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"ctl.y1PumHeaWatSec[1]", "ctl.y1PumHeaWatSec[2]", "ctl.y1PumHeaWatSec[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    subPlot=3,
+    y={"ctl.y1PumChiWatPri[1]", "ctl.y1PumChiWatPri[2]", "ctl.y1PumChiWatPri[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    subPlot=4,
+    y={"ctl.y1PumChiWatSec[1]", "ctl.y1PumChiWatSec[2]", "ctl.y1PumChiWatSec[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=5,
+    position={1225, 5, 300, 600},
+    subPlot=1,
+    y={"ctl.nReqResHeaWat", "ctl.nReqResChiWat"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=5,
+    subPlot=2,
+    y={"ctl.resHeaWat.TSupSet", "ctl.resChiWat.TSupSet", "ctl.THeaWatSup_nominal", "ctl.THeaWatSupSet_min", "ctl.TChiWatSup_nominal", "ctl.TChiWatSupSet_max"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=5,
+    subPlot=3,
+    y={"ctl.dpHeaWatRemSet[1]", "ctl.dpChiWatRemSet[1]", "ctl.dpHeaWatRemSet_max[1]", "ctl.dpHeaWatRemSet_min", "ctl.dpChiWatRemSet_max[1]", "ctl.dpChiWatRemSet_min"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mos
new file mode 100644
index 00000000000..697d8ea93b9
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mos
@@ -0,0 +1,47 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ControlDifferentialPressure",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=8400.0,
+    resultFile="ControlDifferentialPressure");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 600},
+    y={"dpRemSet[1].y", "dpRemSet[2].y", "dpRem[1].y", "dpRem[2].y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ctlDpRem.y", "ctlDpRem.y_min", "ctlDpRem.y_max"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"y1Pum.y[1]", "y1Pum.y[2]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={410, 5, 400, 400},
+    y={"dpLocSet[1].y", "dpLocSet[2].y", "dpLoc.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"ctlDpLoc.y", "ctlDpLoc.y_min", "ctlDpLoc.y_max"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mos
new file mode 100644
index 00000000000..f871edba7cb
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mos
@@ -0,0 +1,22 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ResetLocalDifferentialPressure",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=8400.0,
+    resultFile="ResetLocalDifferentialPressure");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 400},
+    y={"dpRemSet.y", "dpRem.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"resDpLoc.dpLocSet", "resDpLoc.dpLocSet_min", "resDpLoc.dpLocSet_max"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mos
new file mode 100644
index 00000000000..d529650ed99
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mos
@@ -0,0 +1,55 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeadered",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=10800.0,
+    resultFile="StagingHeadered");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 300, 400},
+    y={"u1.y[1]", "u1.y[2]", "u1.y[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ratFlo.y[1]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={315, 5, 300, 600},
+    y={"staPumPriDed.y1[1]", "staPumPriDed.y1[2]", "staPumPriDed.y1[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"staPumPriNoDp.y1[1]", "staPumPriNoDp.y1[2]", "staPumPriNoDp.y1[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"staPumPriDp.y1[1]", "staPumPriDp.y1[2]", "staPumPriDp.y1[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=3,
+    position={620, 5, 300, 200},
+    y={"staPumSecDp.y1[1]", "staPumSecDp.y1[2]", "staPumSecDp.y1[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos
new file mode 100644
index 00000000000..c191d4fc52c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos
@@ -0,0 +1,22 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=8400.0,
+    resultFile="StagingHeaderedDeltaP");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 400},
+    y={"ratFlo.y[1]", "enaLea.y[1]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"idxSta.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mos
new file mode 100644
index 00000000000..c6bbc5b48b3
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mos
@@ -0,0 +1,39 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.EnableLeadHeadered",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=3000.0,
+    resultFile="EnableLeadHeadered");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 400},
+    y={"u1ValIso[1].y", "u1ValIso[2].y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"enaParTwo.y1", "enaSerTwo.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={410, 5, 400, 400},
+    y={"uValIso[1].y", "uValIso[2].y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"enaParMod.y1", "enaSerMod.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos
new file mode 100644
index 00000000000..3a32beddc67
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos
@@ -0,0 +1,65 @@
+simulateModel("Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=900.0,
+    resultFile="VariableSpeedNoDpControl");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 300, 400},
+    y={"ctlPumPriHdrHea.u1PumHeaWatPri[1]", "ctlPumPriHdrHea.u1PumHeaWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"ctlPumPriHdrHea.yPumHeaWatPriHdr"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={315, 5, 300, 400},
+    y={"ctlPumPriHdr.u1PumHeaWatPri[1]", "ctlPumPriHdr.u1PumHeaWatPri[2]", "ctlPumPriHdr.u1PumChiWatPri[1]", "ctlPumPriHdr.u1PumChiWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"ctlPumPriHdr.yPumHeaWatPriHdr", "ctlPumPriHdr.yPumChiWatPriHdr"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=1,
+    position={620, 5, 300, 400},
+    y={"ctlPumPriDedCom.u1PumHeaWatPri[1]", "ctlPumPriDedCom.u1PumHeaWatPri[2]", "ctlPumPriDedCom.u1Hea[1]", "ctlPumPriDedCom.u1Hea[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"ctlPumPriDedCom.yPumHeaWatPriDed[1]", "ctlPumPriDedCom.yPumHeaWatPriDed[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=1,
+    position={925, 5, 300, 400},
+    y={"ctlPumPriDedSep.u1PumHeaWatPri[1]", "ctlPumPriDedSep.u1PumHeaWatPri[2]", "ctlPumPriDedSep.u1PumChiWatPri[1]", "ctlPumPriDedSep.u1PumChiWatPri[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"ctlPumPriDedSep.yPumHeaWatPriDed[1]", "ctlPumPriDedSep.yPumHeaWatPriDed[2]","ctlPumPriDedSep.yPumChiWatPriDed[1]", "ctlPumPriDedSep.yPumChiWatPriDed[2]"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mos
new file mode 100644
index 00000000000..c080243f10d
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mos
@@ -0,0 +1,37 @@
+simulateModel("Buildings.Templates.Plants.Controls.Setpoints.Validation.PlantReset",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=20000.0,
+    resultFile="PlantReset");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    y={"res.u1Ena", "res.u1StaPro", "res.nReqRes"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"res.triRes.y", "res.res.y", "res.resDp_max", "res.resTSup_min"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 500},
+    y={"res.dpSet[1]", "res.dpSet[2]", "res.dpSet_max[1]", "res.dpSet_max[2]", "res.dpSet_min"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"res.TSupSet", "res.TSup_nominal", "res.TSupSetLim"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mos
new file mode 100644
index 00000000000..fe5be3a5daf
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mos
@@ -0,0 +1,19 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentAvailability",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=10000.0,
+    resultFile="EquipmentAvailability");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    y={"u1_actual.y[1]", "u1Ava.y[1]", "u1Hea_actual.y[1]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"avaHeaCoo.y1Hea", "avaHeaCoo.y1Coo", "avaHea.y1Hea"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mos
new file mode 100644
index 00000000000..1ee192c5540
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mos
@@ -0,0 +1,42 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentEnable",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=25.0,
+    resultFile="EquipmentEnable");
+createPlot(
+    id=1,
+    position={5, 5, 300, 250},
+    y={"u1AvaEqu.y[1]", "u1AvaEqu.y[2]", "u1AvaEqu.y[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={310, 5, 300, 500},
+    y={"equEnaEqu.uSta"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"equEnaEqu.y1[1]", "equEnaEqu.y1[2]", "equEnaEqu.y1[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=1,
+    position={615, 5, 300, 500},
+    y={"equEnaOneTwo.uSta"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"equEnaOneTwo.y1[1]", "equEnaOneTwo.y1[2]", "equEnaOneTwo.y1[3]"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mos
new file mode 100644
index 00000000000..6bda24b6a31
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mos
@@ -0,0 +1,39 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.EventSequencing",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=4500.0,
+    resultFile="EventSequencing");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    subPlot=1,
+    y={"seqEveHea.u1Hea", "seqEveHea.u1PumHeaWatPri_actual", "seqEveHea.u1PumHeaWatSec_actual"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"seqEveHea.y1", "seqEveHea.y1ValHeaWatInlIso", "seqEveHea.y1PumHeaWatPri"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    position={315, 5, 300, 500},
+    subPlot=1,
+    y={"seqEveHeaCoo.u1Hea", "seqEveHeaCoo.u1Coo", "seqEveHeaCoo.u1PumHeaWatPri_actual"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"seqEveHeaCoo.y1", "seqEveHeaCoo.y1ValHeaWatInlIso", "seqEveHeaCoo.y1ValHeaWatOutIso", "seqEveHeaCoo.y1ValChiWatInlIso", "seqEveHeaCoo.y1ValChiWatOutIso", "seqEveHeaCoo.y1PumHeaWatPri"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mos
new file mode 100644
index 00000000000..db415c5825f
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mos
@@ -0,0 +1,34 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.SortRuntime",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=5000.0,
+    resultFile="SortRuntime");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    subPlot=1,
+    y={"idxSta.y", "run[1].y", "run[2].y", "run[3].y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"u1AvaEqu.y[1]", "u1AvaEqu.y[2]", "u1AvaEqu.y[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 500},
+    y={"sorRunTim.yIdx[1]", "sorRunTim.yIdx[2]", "sorRunTim.yIdx[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"sorRunTim.yRunTimSta[1]", "sorRunTim.yRunTimSta[2]", "sorRunTim.yRunTimSta[3]"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mos
new file mode 100644
index 00000000000..6b114ea52ef
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mos
@@ -0,0 +1,28 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageAvailability",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=7.0,
+    resultFile="StageAvailability");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 300, 400},
+    y={"u1AvaEqu.y[1]", "u1AvaEqu.y[2]", "u1AvaEqu.y[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"avaStaEqu.y1[1]", "avaStaEqu.y1[2]", "avaStaEqu.y1[3]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={310, 5, 300, 400},
+    y={"avaStaOneTwo.y1[1]", "avaStaOneTwo.y1[2]", "avaStaOneTwo.y1[3]", "avaStaOneTwo.y1[4]", "avaStaOneTwo.y1[5]"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos
new file mode 100644
index 00000000000..4a77cfe0bca
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos
@@ -0,0 +1,30 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=20000.0,
+    resultFile="StageChangeCommand");
+createPlot(
+    id=1,
+    position={5, 5, 300, 600},
+    subPlot=1,
+    y={"chaSta.capReq.y", "chaSta.capSta.y", "chaSta.capStaLow.y", "capHea_nominal"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"y1UpHol.y", "y1DowHol.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"idxSta.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mos
new file mode 100644
index 00000000000..d10a24aaf63
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mos
@@ -0,0 +1,22 @@
+simulateModel("Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageCompletion",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1800.0,
+    resultFile="StageCompletion");
+createPlot(
+    id=1,
+    position={5, 5, 300, 600},
+    subPlot=1,
+    y={"comSta.uSta", "comSta.u1[1]", "comSta.u1[2]", "comSta.u1_actual[1]", "comSta.u1_actual[2]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"y1ComSta.y", "comSta.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="min"
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/CountTrue.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/CountTrue.mos
new file mode 100644
index 00000000000..05d2953d7a0
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/CountTrue.mos
@@ -0,0 +1,12 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.CountTrue",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="CountTrue");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"couTru.y", "couTruAllFal.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mos
new file mode 100644
index 00000000000..2d004c19814
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mos
@@ -0,0 +1,12 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.FirstTrueIndex",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="FirstTrueIndex");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"idxFirTru.y", "idxFirTruAllFal.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/HoldReal.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/HoldReal.mos
new file mode 100644
index 00000000000..5a00ec34b3c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/HoldReal.mos
@@ -0,0 +1,20 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.HoldReal",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=60.0,
+    resultFile="HoldReal");
+createPlot(
+    id=1,
+    position={5, 5, 400, 500},
+    subPlot=1,
+    y={"sin.y", "booPul.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"hol.y", "holTim.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mos
new file mode 100644
index 00000000000..9dfc88d603c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mos
@@ -0,0 +1,12 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.LastTrueIndex",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="LastTrueIndex");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"idxLasTru.y", "idxLasTruAllFal.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mos
new file mode 100644
index 00000000000..4bf2552c42c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mos
@@ -0,0 +1,12 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMaxInteger",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="MultiMaxInteger");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"mulMax.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mos
new file mode 100644
index 00000000000..a7504226f10
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mos
@@ -0,0 +1,12 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMinInteger",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="MultiMinInteger");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"mulMin.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mos
new file mode 100644
index 00000000000..5c5c791ed49
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mos
@@ -0,0 +1,13 @@
+
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderInteger",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="PlaceholderInteger");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"phNo.y", "phPar.y", "phInp.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mos
new file mode 100644
index 00000000000..15bfed074fd
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mos
@@ -0,0 +1,13 @@
+
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderLogical",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="PlaceholderLogical");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"phNo.y", "phPar.y", "phInp.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mos
new file mode 100644
index 00000000000..44f80f79b6c
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mos
@@ -0,0 +1,13 @@
+
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderReal",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=1.0,
+    resultFile="PlaceholderReal");
+createPlot(
+    id=1,
+    position={5, 5, 400, 300},
+    y={"phNo.y", "phPar.y", "phInp.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mos
new file mode 100644
index 00000000000..e5798f7dc57
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mos
@@ -0,0 +1,6 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.SortWithIndices", method="Cvode", tolerance=1e-06, stopTime=1.0, resultFile="SortWithIndices");
+createPlot(id=1, position={15, 15, 300, 600}, y={"sorAsc.u[1]", "sorAsc.u[2]", "sorAsc.u[3]", "sorAsc.u[4]", "sorAsc.u[5]"}, range={0.0, 0.0, -4.0, 6.0}, grid=true);
+createPlot(id=1, y={"sorAsc.y[1]", "sorAsc.y[2]", "sorAsc.y[3]", "sorAsc.y[4]", "sorAsc.y[5]"}, range={0.0, 0.0, -6.0, 6.0}, grid=true, subPlot=2);
+createPlot(id=1, y={"sorDes.y[1]", "sorDes.y[2]", "sorDes.y[3]", "sorDes.y[4]", "sorDes.y[5]"}, range={0.0, 0.0, -6.0, 6.0}, grid=true, subPlot=3);
+createPlot(id=2, position={325, 15, 300, 500}, y={"sorAsc.yIdx[1]", "sorAsc.yIdx[2]", "sorAsc.yIdx[3]", "sorAsc.yIdx[4]", "sorAsc.yIdx[5]"}, autoscale=true, grid=true, color=true, subPlot=1);
+createPlot(id=2, y={"sorDes.yIdx[1]", "sorDes.yIdx[2]", "sorDes.yIdx[3]", "sorDes.yIdx[4]", "sorDes.yIdx[5]"}, autoscale=true, grid=true, color=true, subPlot=2);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/StageIndex.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/StageIndex.mos
new file mode 100644
index 00000000000..3ab612c65c3
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/StageIndex.mos
@@ -0,0 +1,56 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.StageIndex",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=160.0,
+    resultFile="StageIndex");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 400, 500},
+    y={"ena.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"u1UpHol.y", "u1DowHol.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"u1AvaSta[1].y", "u1AvaSta[2].y", "u1AvaSta[3].y", "u1AvaSta[4].y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=1,
+    position={410, 5, 400, 500},
+    y={"idxSta.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"idxStaUna.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"idxStaRun.y"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=4,
+    y={"idxStaRunUna.y"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mos
new file mode 100644
index 00000000000..d4ffb9a738f
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mos
@@ -0,0 +1,10 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.TimerWithReset", stopTime=5.0, method="Cvode", tolerance=1e-06, resultFile="TimerWithReset");
+createPlot(id=1, position={15, 15, 300, 500}, y={"noThr.u", "res.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=1);
+createPlot(id=1, position={15, 15, 300, 500}, y={"noThr.t", "noThr.y", "noThrRes.y"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=2);
+createPlot(id=1, position={15, 15, 300, 500}, y={"noThr.passed", "noThrRes.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3);
+createPlot(id=2, position={325, 15, 300, 500}, y={"thrTim.u", "res.y"}, range={0.0, 5.0, -0.2, 1.2}, grid=true, subPlot=1);
+createPlot(id=2, position={325, 15, 300, 500}, y={"thrTim.t", "thrTim.y", "thrTimRes.y"}, range={0.0, 5.0, -0.5, 2.0}, grid=true, subPlot=2);
+createPlot(id=2, position={325, 15, 300, 500}, y={"thrTim.passed", "thrTimRes.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3);
+createPlot(id=3, position={630, 15, 300, 500}, y={"thrTim1.u", "res.y"}, range={0.0, 5.0, -0.2, 1.2}, grid=true, subPlot=1);
+createPlot(id=3, position={630, 15, 300, 500}, y={"thrTim1.t", "thrTim1.y", "thrTim1Res.y"}, range={0.0, 5.0, -0.5, 2.0}, grid=true, subPlot=2);
+createPlot(id=3, position={630, 15, 300, 500}, y={"thrTim1.passed", "thrTim1Res.passed"}, range={0.0, 5.0, -0.5, 1.5}, grid=true, subPlot=3);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mos
new file mode 100644
index 00000000000..4d683b1a2a8
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mos
@@ -0,0 +1,27 @@
+simulateModel("Buildings.Templates.Plants.Controls.Utilities.Validation.TrueArrayConditional",
+    method="cvode",
+    tolerance=1e-6,
+    stopTime=5.0,
+    resultFile="TrueArrayConditional");
+createPlot(
+    id=1,
+    subPlot=1,
+    position={5, 5, 300, 600},
+    y={"truArrConSam.u", "truArrConSam.uIdx[1]", "truArrConSam.uIdx[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"truArrConSam.y1[1]", "truArrConSam.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"truArrConGre.y1[1]", "truArrConGre.y1[2]", "truArrConGre.y1[3]", "truArrConGre.y1[4]"},
+    autoscale=true,
+    grid=true
+);
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mos
new file mode 100644
index 00000000000..4bfa53225d7
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mos
@@ -0,0 +1,64 @@
+simulateModel("Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatPumpGroupAirToWater",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=10497600.0,
+    stopTime=10505600.0,
+    resultFile="HeatPumpGroupAirToWater");
+createPlot(
+    id=1,
+    position={5, 5, 300, 400},
+    y={"ctlPlaAw.bus.hp[1].y1", "ctlPlaAw.bus.hp[1].y1Hea", "ctlPlaAwNrv.bus.hp[1].y1"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"weaDat.weaBus.TDryBul", "hpAw.TSouHeaHp_nominal", "hpAw.TSouCooHp_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 600},
+    subPlot=1,
+    y={"TRet[1].T", "TSup[1].T", "hpAw.bus.hp[1].TSet", "hpAw.THeaWatRetHp_nominal", "hpAw.TChiWatRetHp_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"hpAw.hp[1].port_a.m_flow", "hpAw.mHeaWatHp_flow_nominal", "hpAw.mChiWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=3,
+    y={"hpAw.hp[1].hp.PLR", "hpAw.hp[1].hp.COP"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 600},
+    subPlot=1,
+    y={"TRet1[1].T", "TSup1[1].T", "hpAwNrv.bus.hp[1].TSet", "hpAwNrv.THeaWatRetHp_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"hpAwNrv.hp[1].port_a.m_flow", "hpAwNrv.mHeaWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"hpAwNrv.hp[1].hp.PLR", "hpAwNrv.hp[1].hp.COP"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mos
new file mode 100644
index 00000000000..8f95987e8ca
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mos
@@ -0,0 +1,69 @@
+simulateModel("Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=0.0,
+    stopTime=5000.0,
+    resultFile="PumpsPrimaryDedicated");
+createPlot(
+    id=1,
+    position={5, 5, 300, 400},
+    y={"pumPriCom.bus.pumHeaWatPri.y1[1]", "pumPriCom.bus.pumHeaWatPri.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"valHeaWatIsoCom[1].m_flow", "valChiWatIsoCom[1].m_flow", "hpCom[1].m_flow", "hpCom[2].m_flow", "datHp.mHeaWatHp_flow_nominal", "datHp.mChiWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 400},
+    y={"pumPriHdr.bus.y1[1]", "pumPriHdr.bus.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"valHeaWatIsoHdr[1].m_flow", "valChiWatIsoHdr[1].m_flow", "hpHdr[1].m_flow", "hpHdr[2].m_flow", "datHp.mHeaWatHp_flow_nominal", "datHp.mChiWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 400},
+    y={"pumPriSep.bus.pumHeaWatPri.y1[1]", "pumPriSep.bus.pumHeaWatPri.y1[2]", "pumPriSep.bus.pumChiWatPri.y1[1]", "pumPriSep.bus.pumChiWatPri.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"valHeaWatIsoSep[1].m_flow", "valChiWatIsoSep[1].m_flow", "hpSep[1].m_flow", "hpSep[2].m_flow", "datHp.mHeaWatHp_flow_nominal", "datHp.mChiWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    position={920, 5, 300, 600},
+    y={"pumPriHea.bus.pumHeaWatPri.y1[1]", "pumPriHea.bus.pumHeaWatPri.y1[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"pumPriHea.bus.pumHeaWatPri.y[1]", "pumPriHea.bus.pumHeaWatPri.y[2]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=4,
+    subPlot=3,
+    y={"priHeaWat.m_flow", "hpHea[1].m_flow", "hpHea[2].m_flow", "datHp.mHeaWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mos
new file mode 100644
index 00000000000..127f9297d2b
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mos
@@ -0,0 +1,62 @@
+simulateModel("Buildings.Templates.Plants.HeatPumps.Components.Validation.ValvesIsolation",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=0.0,
+    stopTime=5000.0,
+    resultFile="ValvesIsolation");
+createPlot(
+    id=1,
+    position={5, 5, 300, 600},
+    y={"valIsoCom.bus.valHeaWatHpInlIso[1].y1", "valIsoCom.bus.valHeaWatHpInlIso[2].y1", "valIsoCom.bus.valChiWatHpInlIso[1].y1", "valIsoCom.bus.valChiWatHpInlIso[2].y1"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"valIsoCom.port_aHeaWat.m_flow", "hpCom[1].m_flow", "hpCom[2].m_flow", "datHp.mHeaWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=1,
+    subPlot=3,
+    y={"valIsoCom.port_aChiWat.m_flow", "datHp.mChiWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 400},
+    y={"valIsoHeaInl.bus.valHeaWatHpInlIso[1].y1", "valIsoHeaInl.bus.valHeaWatHpInlIso[2].y1"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"valIsoHeaInl.port_aHeaWat.m_flow", "hpHea[1].m_flow", "hpHea[2].m_flow", "datHp.mHeaWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 600},
+    y={"valIsoSep.bus.valHeaWatHpInlIso[1].y1", "valIsoSep.bus.valHeaWatHpInlIso[2].y1", "valIsoSep.bus.valChiWatHpInlIso[1].y1", "valIsoSep.bus.valChiWatHpInlIso[2].y1", "busPumHeaWatPri.y1[1]", "busPumChiWatPri.y1[1]"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"valIsoSep.port_aHeaWat.m_flow", "hpSep[1].m_flow", "hpSep[2].m_flow", "datHp.mHeaWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
+createPlot(
+    id=3,
+    subPlot=3,
+    y={"valIsoSep.port_aChiWat.m_flow", "datHp.mChiWatHp_flow_nominal"},
+    autoscale=true,
+    grid=true
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos
new file mode 100644
index 00000000000..3cba92dd9a6
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos
@@ -0,0 +1,137 @@
+simulateModel("Buildings.Templates.Plants.HeatPumps.Validation.AirToWater",
+    method="cvode",
+    tolerance=1e-6,
+    startTime=0.0,
+    stopTime=86400.0,
+    resultFile="AirToWaterPlant");
+createPlot(
+    id=1,
+    position={5, 5, 300, 500},
+    y={"pla.ctl.ctl.chaStaHea.capReq.y", "pla.ctl.ctl.chaStaCoo.capReq.y", "pla.capHea_nominal", "pla.capCoo_nominal"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=1,
+    subPlot=2,
+    y={"pla.ctl.ctl.TOut", "pla.ctl.ctl.TOutChiWatLck", "pla.ctl.ctl.TOutHeaWatLck"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=2,
+    position={310, 5, 300, 500},
+    y={"pla.ctl.ctl.nReqPlaHeaWat", "pla.ctl.ctl.nReqPlaChiWat", "pla.ctl.ctl.enaHea.y1", "pla.ctl.ctl.enaCoo.y1"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=2,
+    subPlot=2,
+    y={"pla.ctl.ctl.idxStaHea.y", "pla.ctl.ctl.idxStaCoo.y"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=3,
+    position={615, 5, 300, 500},
+    subPlot=1,
+    y={"pla.ctl.ctl.y1Hp[1]", "pla.ctl.ctl.y1Hp[2]", "pla.ctl.ctl.y1Hp[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=3,
+    subPlot=2,
+    y={"pla.ctl.ctl.y1HeaHp[1]", "pla.ctl.ctl.y1HeaHp[2]", "pla.ctl.ctl.y1HeaHp[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    position={920, 5, 300, 600},
+    subPlot=1,
+    y={"pla.ctl.ctl.y1PumHeaWatPri[1]", "pla.ctl.ctl.y1PumHeaWatPri[2]", "pla.ctl.ctl.y1PumHeaWatPri[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    subPlot=2,
+    y={"pla.ctl.ctl.y1PumHeaWatSec[1]", "pla.ctl.ctl.y1PumHeaWatSec[2]", "pla.ctl.ctl.y1PumHeaWatSec[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=4,
+    subPlot=3,
+    y={"pla.ctl.ctl.y1PumChiWatSec[1]", "pla.ctl.ctl.y1PumChiWatSec[2]", "pla.ctl.ctl.y1PumChiWatSec[3]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=5,
+    position={1225, 5, 300, 500},
+    subPlot=1,
+    y={"pla.ctl.ctl.nReqResHeaWat", "pla.ctl.ctl.nReqResChiWat"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=5,
+    subPlot=2,
+    y={"dpHeaWatRem.y[1]", "pla.bus.dpHeaWatRemSet[1]", "dpChiWatRem.y[1]", "pla.bus.dpHeaWatRemSet[1]", "pla.bus.dpChiWatRemSet[1]"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=6,
+    position={40, 40, 300, 600},
+    y={"pla.bus.VHeaWatPri_flow", "pla.bus.VHeaWatSec_flow", "datAll.pla.ctl.VHeaWatSec_flow_nominal"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=6,
+    subPlot=2,
+    y={"pla.bus.VChiWatPri_flow", "pla.bus.VChiWatSec_flow", "datAll.pla.ctl.VChiWatSec_flow_nominal"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=6,
+    subPlot=3,
+    y={"pla.hp.hp[1].hp.PLR", "pla.hp.hp[2].hp.PLR", "pla.hp.hp[3].hp.PLR"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=7,
+    position={345, 40, 300, 500},
+    y={"pla.bus.THeaWatSupSet", "pla.bus.THeaWatPriSup", "pla.bus.THeaWatSecSup", "pla.bus.THeaWatPriRet", "pla.bus.THeaWatSecRet"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
+createPlot(
+    id=7,
+    subPlot=2,
+    y={"pla.bus.TChiWatSupSet", "pla.bus.TChiWatPriSup", "pla.bus.TChiWatSecSup", "pla.bus.TChiWatPriRet", "pla.bus.TChiWatSecRet"},
+    autoscale=true,
+    grid=true,
+    timeUnit="h"
+);
\ No newline at end of file
diff --git a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Radiator.mos b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Radiator.mos
index 75da8392542..60b012434fb 100644
--- a/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Radiator.mos
+++ b/Buildings/Resources/Scripts/Dymola/ThermalZones/EnergyPlus_9_6_0/Examples/SingleFamilyHouse/Radiator.mos
@@ -1,10 +1,3 @@
-// Change the setting for automatic differentiation.
-// Without this change, the model has a numerical Jacobian,
-// and BuildingsPy flags this as a problem in the CI test,
-// which causes them to fail.
-ori = Advanced.AllowNumericDifferentiation;
-Advanced.AllowNumericDifferentiation = true;
 simulateModel("Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator", stopTime=259200, method="Cvode", tolerance=1e-06, resultFile="Radiator");
 createPlot(id=1, position={44, 37, 1046, 619}, y={"zon.TAir", "building.weaBus.TDryBul", "TSet.y"}, range={0.0, 260000.0, -15.0, 25.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="s", displayUnits={"degC", "degC", "degC"});
 createPlot(id=1, position={44, 37, 1046, 619}, y={"val.y"}, range={0.0, 260000.0, -0.2, 1.2}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s");
-Advanced.AllowNumericDifferentiation = ori;
diff --git a/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mos b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mos
new file mode 100644
index 00000000000..c7ea3551da3
--- /dev/null
+++ b/Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mos
@@ -0,0 +1,2 @@
+simulateModel("Buildings.Utilities.IO.Files.Validation.WeeklyScheduleWindowsLineEndings", startTime=-10000, stopTime=1000000, tolerance=1e-6, method="dassl", resultFile="WeeklyScheduleWindowsLineEndings");
+createPlot(id=1, position={15, 15, 592, 364}, y={"weeSchLin.y[1]", "weeSchLin.y[2]", "weeSchLin.y[3]", "weeSchLin.y[4]"}, range={-100000.0, 1000000.0, -20.0, 140.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="s");
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TrueHoldWithReset.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TrueHoldWithReset.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Logical.Validation.TrueHold.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos
index a3673ef0c7f..bf0c4455b56 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.CDL.Reals.Validation.Sort.mos
@@ -14,5 +14,15 @@ compareVars :=
     "sorDes.y[2]",
     "sorDes.y[3]",
     "sorDes.y[4]",
-    "sorDes.y[5]"
+    "sorDes.y[5]",
+    "sorAsc.yIdx[1]",
+    "sorAsc.yIdx[2]",
+    "sorAsc.yIdx[3]",
+    "sorAsc.yIdx[4]",
+    "sorAsc.yIdx[5]",
+    "sorDes.yIdx[1]",
+    "sorDes.yIdx[2]",
+    "sorDes.yIdx[3]",
+    "sorDes.yIdx[4]",
+    "sorDes.yIdx[5]"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerBorefield.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerBorefield.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerBorefield.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerOnly.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Examples.ChillerOnly.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Examples.ChillerOnly.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Borefield.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Borefield.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.Chiller.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.Chiller.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatExchanger.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatExchanger.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.SwitchBox.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.SwitchBox.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.WatersideEconomizer.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Subsystems.Validation.WatersideEconomizer.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerBorefield.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerBorefield.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerBorefield.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerOnly.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerOnly.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerOnly.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerWSE.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Combined.Validation.ChillerWSE.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Combined.Validation.ChillerWSE.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Direct.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Direct.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Direct.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Indirect.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Examples.Indirect.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Cooling.Examples.Indirect.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Direct.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Direct.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Direct.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Indirect.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.EnergyTransferStations.Heating.Examples.Indirect.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.ETS.Heating.Examples.Indirect.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesConstantFlow.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesConstantFlow.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlow.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlow.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Cooling.ElectricChillersDirectETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Cooling.ElectricChillersDirectETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Steam.SingleBoiler.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Steam.SingleBoiler.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Examples.Steam.SingleBoiler.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Examples.Steam.SingleBoiler.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Controls.Validation.MixingValveControl.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ1Valve.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingRCZ6.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ1.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingSpawnZ6.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeries.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Examples.CouplingTimeSeriesSingleLoop.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution1.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BenchmarkFlowDistribution2.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.BuildingWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.GetPeakLoad.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.SimpleRoomODE.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.BaseClasses.Validation.TerminalUnitScaling.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Cooling.Examples.BuildingTimeSeriesWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Heating.Examples.BuildingTimeSeriesWithETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ControlVolumeCondensation.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.SteamTrap.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.BaseClasses.Examples.ValveSelfActing.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Loads.Steam.Examples.BuildingTimeSeriesAtETS.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution1PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution1PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution1PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution2PipeExample.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Examples.Distribution2PipeExample.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Examples.Distribution2PipeExample.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Pipes.Validation.Pipe.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Pipes.Validation.Pipe.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.ConnectionCondensatePipe.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Networks.Steam.Examples.DistributionCondensatePipe.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StageIndex.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPlant.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Controls.BaseClasses.Validation.StagingPump.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Examples.AllElectricCWStorage.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ChillerHeatRecoveryGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.CoolingTowerGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.HeatPumpGroup.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsDp.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsFlow.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.MultiplePumpsSpeed.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Subsystems.Validation.ValveOpeningFlowBalancing.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Combined.Validation.AllElectricCWStorage.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterBypass.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChilledWaterPumpSpeed.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.ChillerStage.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersWithBypass.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.BoilerPolynomial.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.BaseClasses.Examples.ControlVolumeEvaporation.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.Examples.SingleBoiler.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Plants.Steam.Examples.SingleBoiler.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.DHC.Plants.Steam.Examples.SingleBoiler.mos
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter.mos
deleted file mode 100644
index 09c615ffc7b..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Examples.KalmanFilter.mos
+++ /dev/null
@@ -1,6 +0,0 @@
-compareVars :=
-  {
-    "kalFil.uR[1]",
-    "kalFil.yR[1]",
-    "sine.y"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom.mos
deleted file mode 100644
index 4286dbacc40..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Examples.SimpleRoom.mos
+++ /dev/null
@@ -1,6 +0,0 @@
-compareVars :=
-  {
-    "TAmb.y",
-    "onOffCon.u",
-    "pyt.yR[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange.mos
deleted file mode 100644
index 738866fc902..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.Exchange.mos
+++ /dev/null
@@ -1,9 +0,0 @@
-compareVars :=
-  {
-    "yR1[1]",
-    "yI1[1]",
-    "yR2[1]",
-    "yR2[2]",
-    "yI2[1]",
-    "yI2[2]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject.mos
deleted file mode 100644
index c8f060a9f66..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Obsolete.Utilities.IO.Python36.Functions.Examples.ExchangeWithPassPythonObject.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "yR1[1]",
-    "yR2[1]"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Controls.Validation.MultipleCommands.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Controls.Validation.MultipleCommands.mos
new file mode 100644
index 00000000000..a645aab1532
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Controls.Validation.MultipleCommands.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "conCom.y1[1]",
+    "conCom.y1[2]",
+    "conCom.y1[3]",
+    "conCom.y1One",
+    "conCom.nUniOn",
+    "conCom.nUniOnBou"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Controls.Validation.StatusEmulator.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Controls.Validation.StatusEmulator.mos
new file mode 100644
index 00000000000..a5f6bcef654
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Controls.Validation.StatusEmulator.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "sta.y1",
+    "sta.y1_actual",
+    "sta.fil.y",
+    "sta.yLim"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit.mos
new file mode 100644
index 00000000000..f20f3b919ad
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.HeatPumps.Validation.HeatPumpEquationFit.mos
@@ -0,0 +1,36 @@
+compareVars :=
+  {
+    "y1.y[1]",
+    "y1Hea.y[1]",
+    "weaDat.weaBus.TDryBul",
+    "TRet.T",
+    "TSup.T",
+    "hpAw.bus.TSet",
+    "hpAw.THeaWatRet_nominal",
+    "hpAw.TChiWatRet_nominal",
+    "hpAw.port_a.m_flow",
+    "hpAw.mHeaWat_flow_nominal",
+    "hpAw.mChiWat_flow_nominal",
+    "hpAw.hp.PLR",
+    "hpAw.hp.COP",
+    "TRet1.T",
+    "TSup1.T",
+    "hpAwNrv.bus.TSet",
+    "hpAwNrv.THeaWatRet_nominal",
+    "hpAwNrv.TChiWatRet_nominal",
+    "hpAwNrv.port_a.m_flow",
+    "hpAwNrv.mHeaWat_flow_nominal",
+    "hpAwNrv.mChiWat_flow_nominal",
+    "hpAwNrv.hp.PLR",
+    "hpAwNrv.hp.COP",
+    "TRet2.T",
+    "TSup2.T",
+    "hpWw.bus.TSet",
+    "hpWw.THeaWatRet_nominal",
+    "hpWw.TChiWatRet_nominal",
+    "hpWw.port_a.m_flow",
+    "hpWw.mHeaWat_flow_nominal",
+    "hpWw.mChiWat_flow_nominal",
+    "hpWw.hp.PLR",
+    "hpWw.hp.COP"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.PumpMultipleRecord.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.PumpMultipleRecord.mos
new file mode 100644
index 00000000000..8194aa2f271
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.PumpMultipleRecord.mos
@@ -0,0 +1,13 @@
+compareVars :=
+  {
+    "V_flow_nominal[1]",
+    "V_flow_nominal[2]",
+    "datDef.per[1].pressure.V_flow[2]",
+    "datDef.per[2].pressure.V_flow[2]",
+    "datRed.per[1].pressure.V_flow[2]",
+    "datRed.per[2].pressure.V_flow[2]",
+    "datAss.per[1].pressure.V_flow[2]",
+    "datAss.per[2].pressure.V_flow[2]",
+    "datPre.per[1].pressure.V_flow[2]",
+    "datPre.per[2].pressure.V_flow[2]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.Pumps.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.Pumps.mos
new file mode 100644
index 00000000000..695e42cea33
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Components.Validation.Pumps.mos
@@ -0,0 +1,34 @@
+compareVars :=
+  {
+    "pum1.bus.y1",
+    "pum2.bus.y1",
+    "pum1.m_flow",
+    "pum2.m_flow",
+    "datPum.m_flow_nominal",
+    "res.m_flow",
+    "res.m_flow_nominal",
+    "pumMul.bus.y1[1]",
+    "pumMul.bus.y1[2]",
+    "pumMul.pum[1].m_flow",
+    "pumMul.pum[2].m_flow",
+    "pumMul.m_flow_nominal[1]",
+    "pumMul.m_flow_nominal[2]",
+    "resMul.m_flow",
+    "resMul.m_flow_nominal",
+    "pumMulCst.bus.y1[1]",
+    "pumMulCst.bus.y1[2]",
+    "pumMulCst.pum[1].m_flow",
+    "pumMulCst.pum[2].m_flow",
+    "pumMulCst.m_flow_nominal[1]",
+    "pumMulCst.m_flow_nominal[2]",
+    "resMulCst.m_flow",
+    "resMulCst.m_flow_nominal",
+    "pumMulDed.bus.y1[1]",
+    "pumMulDed.bus.y1[2]",
+    "pumMulDed.pum[1].m_flow",
+    "pumMulDed.pum[2].m_flow",
+    "pumMulDed.m_flow_nominal[1]",
+    "pumMulDed.m_flow_nominal[2]",
+    "resMulDed.m_flow",
+    "resMulDed.m_flow_nominal"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Enabling.Validation.Enable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Enabling.Validation.Enable.mos
new file mode 100644
index 00000000000..d9b890de1fb
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Enabling.Validation.Enable.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "req.y",
+    "sch.y",
+    "TOut.y",
+    "enaHea.TOutLck",
+    "enaCoo.TOutLck",
+    "enaHea.y1",
+    "enaCoo.y1",
+    "enaCooSch.y1"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos
new file mode 100644
index 00000000000..fbf8b1cfdcd
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.HeatPumps.Validation.AirToWater.mos
@@ -0,0 +1,48 @@
+compareVars :=
+  {
+    "ctl.chaStaHea.capReq.y",
+    "ctl.chaStaCoo.capReq.y",
+    "capHea_nominal",
+    "capCoo_nominal",
+    "ctl.TOut",
+    "ctl.TOutChiWatLck",
+    "ctl.TOutHeaWatLck",
+    "ctl.nReqPlaHeaWat",
+    "ctl.nReqPlaChiWat",
+    "ctl.enaHea.y1",
+    "ctl.enaCoo.y1",
+    "ctl.idxStaHea.y",
+    "ctl.idxStaCoo.y",
+    "ctl.y1Hp[1]",
+    "ctl.y1Hp[2]",
+    "ctl.y1Hp[3]",
+    "ctl.y1HeaHp[1]",
+    "ctl.y1HeaHp[2]",
+    "ctl.y1HeaHp[3]",
+    "ctl.y1PumHeaWatPri[1]",
+    "ctl.y1PumHeaWatPri[2]",
+    "ctl.y1PumHeaWatPri[3]",
+    "ctl.y1PumHeaWatSec[1]",
+    "ctl.y1PumHeaWatSec[2]",
+    "ctl.y1PumHeaWatSec[3]",
+    "ctl.y1PumChiWatPri[1]",
+    "ctl.y1PumChiWatPri[2]",
+    "ctl.y1PumChiWatPri[3]",
+    "ctl.y1PumChiWatSec[1]",
+    "ctl.y1PumChiWatSec[2]",
+    "ctl.y1PumChiWatSec[3]",
+    "ctl.nReqResHeaWat",
+    "ctl.nReqResChiWat",
+    "ctl.resHeaWat.TSupSet",
+    "ctl.resChiWat.TSupSet",
+    "ctl.THeaWatSup_nominal",
+    "ctl.THeaWatSupSet_min",
+    "ctl.TChiWatSup_nominal",
+    "ctl.TChiWatSupSet_max",
+    "ctl.dpHeaWatRemSet[1]",
+    "ctl.dpChiWatRemSet[1]",
+    "ctl.dpHeaWatRemSet_max[1]",
+    "ctl.dpHeaWatRemSet_min",
+    "ctl.dpChiWatRemSet_max[1]",
+    "ctl.dpChiWatRemSet_min"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ControlDifferentialPressure.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ControlDifferentialPressure.mos
new file mode 100644
index 00000000000..b6b695e4cdd
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ControlDifferentialPressure.mos
@@ -0,0 +1,18 @@
+compareVars :=
+  {
+    "dpRemSet[1].y",
+    "dpRemSet[2].y",
+    "dpRem[1].y",
+    "dpRem[2].y",
+    "ctlDpRem.y",
+    "ctlDpRem.y_min",
+    "ctlDpRem.y_max",
+    "y1Pum.y[1]",
+    "y1Pum.y[2]",
+    "dpLocSet[1].y",
+    "dpLocSet[2].y",
+    "dpLoc.y",
+    "ctlDpLoc.y",
+    "ctlDpLoc.y_min",
+    "ctlDpLoc.y_max"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ResetLocalDifferentialPressure.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ResetLocalDifferentialPressure.mos
new file mode 100644
index 00000000000..83b8b827efa
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.ResetLocalDifferentialPressure.mos
@@ -0,0 +1,8 @@
+compareVars :=
+  {
+    "dpRemSet.y",
+    "dpRem.y",
+    "resDpLoc.dpLocSet",
+    "resDpLoc.dpLocSet_min",
+    "resDpLoc.dpLocSet_max"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeadered.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeadered.mos
new file mode 100644
index 00000000000..dc56bc0ae88
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeadered.mos
@@ -0,0 +1,19 @@
+compareVars :=
+  {
+    "u1.y[1]",
+    "u1.y[2]",
+    "u1.y[3]",
+    "ratFlo.y[1]",
+    "staPumPriDed.y1[1]",
+    "staPumPriDed.y1[2]",
+    "staPumPriDed.y1[3]",
+    "staPumPriNoDp.y1[1]",
+    "staPumPriNoDp.y1[2]",
+    "staPumPriNoDp.y1[3]",
+    "staPumPriDp.y1[1]",
+    "staPumPriDp.y1[2]",
+    "staPumPriDp.y1[3]",
+    "staPumSecDp.y1[1]",
+    "staPumSecDp.y1[2]",
+    "staPumSecDp.y1[3]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos
new file mode 100644
index 00000000000..f9bc5dd37cd
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Generic.Validation.StagingHeaderedDeltaP.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "ratFlo.y[1]",
+    "enaLea.y[1]",
+    "idxSta.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.EnableLeadHeadered.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.EnableLeadHeadered.mos
new file mode 100644
index 00000000000..23873b95e3c
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.EnableLeadHeadered.mos
@@ -0,0 +1,11 @@
+compareVars :=
+  {
+    "u1ValIso[1].y",
+    "u1ValIso[2].y",
+    "enaParTwo.y1",
+    "enaSerTwo.y1",
+    "uValIso[1].y",
+    "uValIso[2].y",
+    "enaParMod.y1",
+    "enaSerMod.y1"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl.mos
new file mode 100644
index 00000000000..c72bd48f2d3
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Pumps.Primary.Validation.VariableSpeedNoDpControl.mos
@@ -0,0 +1,26 @@
+compareVars :=
+  {
+    "ctlPumPriHdrHea.u1PumHeaWatPri[1]",
+    "ctlPumPriHdrHea.u1PumHeaWatPri[2]",
+    "ctlPumPriHdrHea.yPumHeaWatPriHdr",
+    "ctlPumPriHdr.u1PumHeaWatPri[1]",
+    "ctlPumPriHdr.u1PumHeaWatPri[2]",
+    "ctlPumPriHdr.u1PumChiWatPri[1]",
+    "ctlPumPriHdr.u1PumChiWatPri[2]",
+    "ctlPumPriHdr.yPumHeaWatPriHdr",
+    "ctlPumPriHdr.yPumChiWatPriHdr",
+    "ctlPumPriDedCom.u1PumHeaWatPri[1]",
+    "ctlPumPriDedCom.u1PumHeaWatPri[2]",
+    "ctlPumPriDedCom.u1Hea[1]",
+    "ctlPumPriDedCom.u1Hea[2]",
+    "ctlPumPriDedCom.yPumHeaWatPriDed[1]",
+    "ctlPumPriDedCom.yPumHeaWatPriDed[2]",
+    "ctlPumPriDedSep.u1PumHeaWatPri[1]",
+    "ctlPumPriDedSep.u1PumHeaWatPri[2]",
+    "ctlPumPriDedSep.u1PumChiWatPri[1]",
+    "ctlPumPriDedSep.u1PumChiWatPri[2]",
+    "ctlPumPriDedSep.yPumHeaWatPriDed[1]",
+    "ctlPumPriDedSep.yPumHeaWatPriDed[2]",
+    "ctlPumPriDedSep.yPumChiWatPriDed[1]",
+    "ctlPumPriDedSep.yPumChiWatPriDed[2]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Setpoints.Validation.PlantReset.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Setpoints.Validation.PlantReset.mos
new file mode 100644
index 00000000000..1242d162eaa
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Setpoints.Validation.PlantReset.mos
@@ -0,0 +1,18 @@
+compareVars :=
+  {
+    "res.u1Ena",
+    "res.u1StaPro",
+    "res.nReqRes",
+    "res.triRes.y",
+    "res.res.y",
+    "res.resDp_max",
+    "res.resTSup_min",
+    "res.dpSet[1]",
+    "res.dpSet[2]",
+    "res.dpSet_max[1]",
+    "res.dpSet_max[2]",
+    "res.dpSet_min",
+    "res.TSupSet",
+    "res.TSup_nominal",
+    "res.TSupSetLim"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentAvailability.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentAvailability.mos
new file mode 100644
index 00000000000..0fd12ead1e3
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentAvailability.mos
@@ -0,0 +1,9 @@
+compareVars :=
+  {
+    "u1_actual.y[1]",
+    "u1Ava.y[1]",
+    "u1Hea_actual.y[1]",
+    "avaHeaCoo.y1Hea",
+    "avaHeaCoo.y1Coo",
+    "avaHea.y1Hea"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentEnable.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentEnable.mos
new file mode 100644
index 00000000000..02eae008290
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EquipmentEnable.mos
@@ -0,0 +1,14 @@
+compareVars :=
+  {
+    "u1AvaEqu.y[1]",
+    "u1AvaEqu.y[2]",
+    "u1AvaEqu.y[3]",
+    "equEnaEqu.uSta",
+    "equEnaEqu.y1[1]",
+    "equEnaEqu.y1[2]",
+    "equEnaEqu.y1[3]",
+    "equEnaOneTwo.uSta",
+    "equEnaOneTwo.y1[1]",
+    "equEnaOneTwo.y1[2]",
+    "equEnaOneTwo.y1[3]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EventSequencing.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EventSequencing.mos
new file mode 100644
index 00000000000..81acad83fed
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.EventSequencing.mos
@@ -0,0 +1,18 @@
+compareVars :=
+  {
+    "seqEveHea.u1Hea",
+    "seqEveHea.u1PumHeaWatPri_actual",
+    "seqEveHea.u1PumHeaWatSec_actual",
+    "seqEveHea.y1",
+    "seqEveHea.y1ValHeaWatInlIso",
+    "seqEveHea.y1PumHeaWatPri",
+    "seqEveHeaCoo.u1Hea",
+    "seqEveHeaCoo.u1Coo",
+    "seqEveHeaCoo.u1PumHeaWatPri_actual",
+    "seqEveHeaCoo.y1",
+    "seqEveHeaCoo.y1ValHeaWatInlIso",
+    "seqEveHeaCoo.y1ValHeaWatOutIso",
+    "seqEveHeaCoo.y1ValChiWatInlIso",
+    "seqEveHeaCoo.y1ValChiWatOutIso",
+    "seqEveHeaCoo.y1PumHeaWatPri"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.SortRuntime.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.SortRuntime.mos
new file mode 100644
index 00000000000..501b93196e1
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.SortRuntime.mos
@@ -0,0 +1,16 @@
+compareVars :=
+  {
+    "idxSta.y",
+    "run[1].y",
+    "run[2].y",
+    "run[3].y",
+    "u1AvaEqu.y[1]",
+    "u1AvaEqu.y[2]",
+    "u1AvaEqu.y[3]",
+    "sorRunTim.yIdx[1]",
+    "sorRunTim.yIdx[2]",
+    "sorRunTim.yIdx[3]",
+    "sorRunTim.yRunTimSta[1]",
+    "sorRunTim.yRunTimSta[2]",
+    "sorRunTim.yRunTimSta[3]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageAvailability.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageAvailability.mos
new file mode 100644
index 00000000000..34a330b07d1
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageAvailability.mos
@@ -0,0 +1,14 @@
+compareVars :=
+  {
+    "u1AvaEqu.y[1]",
+    "u1AvaEqu.y[2]",
+    "u1AvaEqu.y[3]",
+    "avaStaEqu.y1[1]",
+    "avaStaEqu.y1[2]",
+    "avaStaEqu.y1[3]",
+    "avaStaOneTwo.y1[1]",
+    "avaStaOneTwo.y1[2]",
+    "avaStaOneTwo.y1[3]",
+    "avaStaOneTwo.y1[4]",
+    "avaStaOneTwo.y1[5]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos
new file mode 100644
index 00000000000..f4f67d4ff3d
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageChangeCommand.mos
@@ -0,0 +1,10 @@
+compareVars :=
+  {
+    "chaSta.capReq.y",
+    "chaSta.capSta.y",
+    "chaSta.capStaLow.y",
+    "capHea_nominal",
+    "y1UpHol.y",
+    "y1DowHol.y",
+    "idxSta.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageCompletion.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageCompletion.mos
new file mode 100644
index 00000000000..fc6a0853377
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.StagingRotation.Validation.StageCompletion.mos
@@ -0,0 +1,10 @@
+compareVars :=
+  {
+    "comSta.uSta",
+    "comSta.u1[1]",
+    "comSta.u1[2]",
+    "comSta.u1_actual[1]",
+    "comSta.u1_actual[2]",
+    "y1ComSta.y",
+    "comSta.y1"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.CountTrue.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.CountTrue.mos
new file mode 100644
index 00000000000..0e7d41e2321
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.CountTrue.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "couTru.y",
+    "couTruAllFal.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.FirstTrueIndex.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.FirstTrueIndex.mos
new file mode 100644
index 00000000000..7a07bdfae1b
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.FirstTrueIndex.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "idxFirTru.y",
+    "idxFirTruAllFal.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.HoldReal.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.HoldReal.mos
new file mode 100644
index 00000000000..f2c99796637
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.HoldReal.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "sin.y",
+    "booPul.y",
+    "hol.y",
+    "holTim.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.LastTrueIndex.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.LastTrueIndex.mos
new file mode 100644
index 00000000000..7a3b9156e93
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.LastTrueIndex.mos
@@ -0,0 +1,5 @@
+compareVars :=
+  {
+    "idxLasTru.y",
+    "idxLasTruAllFal.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMaxInteger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMaxInteger.mos
new file mode 100644
index 00000000000..5f563a56a6d
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMaxInteger.mos
@@ -0,0 +1,4 @@
+compareVars :=
+  {
+    "mulMax.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMinInteger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMinInteger.mos
new file mode 100644
index 00000000000..c02eeda2ee7
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.MultiMinInteger.mos
@@ -0,0 +1,4 @@
+compareVars :=
+  {
+    "mulMin.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderInteger.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderInteger.mos
new file mode 100644
index 00000000000..c82fbe07212
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderInteger.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "phNo.y",
+    "phPar.y",
+    "phInp.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderLogical.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderLogical.mos
new file mode 100644
index 00000000000..c82fbe07212
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderLogical.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "phNo.y",
+    "phPar.y",
+    "phInp.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderReal.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderReal.mos
new file mode 100644
index 00000000000..c82fbe07212
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.PlaceholderReal.mos
@@ -0,0 +1,6 @@
+compareVars :=
+  {
+    "phNo.y",
+    "phPar.y",
+    "phInp.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.SortWithIndices.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.SortWithIndices.mos
new file mode 100644
index 00000000000..bf0c4455b56
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.SortWithIndices.mos
@@ -0,0 +1,28 @@
+compareVars :=
+  {
+    "sorAsc.u[1]",
+    "sorAsc.u[2]",
+    "sorAsc.u[3]",
+    "sorAsc.u[4]",
+    "sorAsc.u[5]",
+    "sorAsc.y[1]",
+    "sorAsc.y[2]",
+    "sorAsc.y[3]",
+    "sorAsc.y[4]",
+    "sorAsc.y[5]",
+    "sorDes.y[1]",
+    "sorDes.y[2]",
+    "sorDes.y[3]",
+    "sorDes.y[4]",
+    "sorDes.y[5]",
+    "sorAsc.yIdx[1]",
+    "sorAsc.yIdx[2]",
+    "sorAsc.yIdx[3]",
+    "sorAsc.yIdx[4]",
+    "sorAsc.yIdx[5]",
+    "sorDes.yIdx[1]",
+    "sorDes.yIdx[2]",
+    "sorDes.yIdx[3]",
+    "sorDes.yIdx[4]",
+    "sorDes.yIdx[5]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.StageIndex.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.StageIndex.mos
new file mode 100644
index 00000000000..64bb45940cc
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.StageIndex.mos
@@ -0,0 +1,14 @@
+compareVars :=
+  {
+    "ena.y",
+    "u1UpHol.y",
+    "u1DowHol.y",
+    "u1AvaSta[1].y",
+    "u1AvaSta[2].y",
+    "u1AvaSta[3].y",
+    "u1AvaSta[4].y",
+    "idxSta.y",
+    "idxStaUna.y",
+    "idxStaRun.y",
+    "idxStaRunUna.y"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.TimerWithReset.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.TimerWithReset.mos
new file mode 100644
index 00000000000..46c0f8b6370
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.TimerWithReset.mos
@@ -0,0 +1,24 @@
+compareVars :=
+  {
+    "noThr.u",
+    "res.y",
+    "noThr.t",
+    "noThr.y",
+    "noThrRes.y",
+    "noThr.passed",
+    "noThrRes.passed",
+    "thrTim.u",
+    "res.y",
+    "thrTim.t",
+    "thrTim.y",
+    "thrTimRes.y",
+    "thrTim.passed",
+    "thrTimRes.passed",
+    "thrTim1.u",
+    "res.y",
+    "thrTim1.t",
+    "thrTim1.y",
+    "thrTim1Res.y",
+    "thrTim1.passed",
+    "thrTim1Res.passed"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.TrueArrayConditional.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.TrueArrayConditional.mos
new file mode 100644
index 00000000000..0ab0da0cf6e
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.Controls.Utilities.Validation.TrueArrayConditional.mos
@@ -0,0 +1,12 @@
+compareVars :=
+  {
+    "truArrConSam.u",
+    "truArrConSam.uIdx[1]",
+    "truArrConSam.uIdx[2]",
+    "truArrConSam.y1[1]",
+    "truArrConSam.y1[2]",
+    "truArrConGre.y1[1]",
+    "truArrConGre.y1[2]",
+    "truArrConGre.y1[3]",
+    "truArrConGre.y1[4]"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatPumpGroupAirToWater.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatPumpGroupAirToWater.mos
new file mode 100644
index 00000000000..1d953e43b9c
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.HeatPumpGroupAirToWater.mos
@@ -0,0 +1,27 @@
+compareVars :=
+  {
+    "ctlPlaAw.bus.hp[1].y1",
+    "ctlPlaAw.bus.hp[1].y1Hea",
+    "ctlPlaAwNrv.bus.hp[1].y1",
+    "weaDat.weaBus.TDryBul",
+    "hpAw.TSouHeaHp_nominal",
+    "hpAw.TSouCooHp_nominal",
+    "TRet[1].T",
+    "TSup[1].T",
+    "hpAw.bus.hp[1].TSet",
+    "hpAw.THeaWatRetHp_nominal",
+    "hpAw.TChiWatRetHp_nominal",
+    "hpAw.hp[1].port_a.m_flow",
+    "hpAw.mHeaWatHp_flow_nominal",
+    "hpAw.mChiWatHp_flow_nominal",
+    "hpAw.hp[1].hp.PLR",
+    "hpAw.hp[1].hp.COP",
+    "TRet1[1].T",
+    "TSup1[1].T",
+    "hpAwNrv.bus.hp[1].TSet",
+    "hpAwNrv.THeaWatRetHp_nominal",
+    "hpAwNrv.hp[1].port_a.m_flow",
+    "hpAwNrv.mHeaWatHp_flow_nominal",
+    "hpAwNrv.hp[1].hp.PLR",
+    "hpAwNrv.hp[1].hp.COP"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated.mos
new file mode 100644
index 00000000000..4fc23df9fb0
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated.mos
@@ -0,0 +1,37 @@
+compareVars :=
+  {
+    "pumPriCom.bus.pumHeaWatPri.y1[1]",
+    "pumPriCom.bus.pumHeaWatPri.y1[2]",
+    "valHeaWatIsoCom[1].m_flow",
+    "valChiWatIsoCom[1].m_flow",
+    "hpCom[1].m_flow",
+    "hpCom[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal",
+    "datHp.mChiWatHp_flow_nominal",
+    "pumPriHdr.bus.y1[1]",
+    "pumPriHdr.bus.y1[2]",
+    "valHeaWatIsoHdr[1].m_flow",
+    "valChiWatIsoHdr[1].m_flow",
+    "hpHdr[1].m_flow",
+    "hpHdr[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal",
+    "datHp.mChiWatHp_flow_nominal",
+    "pumPriSep.bus.pumHeaWatPri.y1[1]",
+    "pumPriSep.bus.pumHeaWatPri.y1[2]",
+    "pumPriSep.bus.pumChiWatPri.y1[1]",
+    "pumPriSep.bus.pumChiWatPri.y1[2]",
+    "valHeaWatIsoSep[1].m_flow",
+    "valChiWatIsoSep[1].m_flow",
+    "hpSep[1].m_flow",
+    "hpSep[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal",
+    "datHp.mChiWatHp_flow_nominal",
+    "pumPriHea.bus.pumHeaWatPri.y1[1]",
+    "pumPriHea.bus.pumHeaWatPri.y1[2]",
+    "pumPriHea.bus.pumHeaWatPri.y[1]",
+    "pumPriHea.bus.pumHeaWatPri.y[2]",
+    "priHeaWat.m_flow",
+    "hpHea[1].m_flow",
+    "hpHea[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.ValvesIsolation.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.ValvesIsolation.mos
new file mode 100644
index 00000000000..f042004edf2
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Components.Validation.ValvesIsolation.mos
@@ -0,0 +1,31 @@
+compareVars :=
+  {
+    "valIsoCom.bus.valHeaWatHpInlIso[1].y1",
+    "valIsoCom.bus.valHeaWatHpInlIso[2].y1",
+    "valIsoCom.bus.valChiWatHpInlIso[1].y1",
+    "valIsoCom.bus.valChiWatHpInlIso[2].y1",
+    "valIsoCom.port_aHeaWat.m_flow",
+    "hpCom[1].m_flow",
+    "hpCom[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal",
+    "valIsoCom.port_aChiWat.m_flow",
+    "datHp.mChiWatHp_flow_nominal",
+    "valIsoHeaInl.bus.valHeaWatHpInlIso[1].y1",
+    "valIsoHeaInl.bus.valHeaWatHpInlIso[2].y1",
+    "valIsoHeaInl.port_aHeaWat.m_flow",
+    "hpHea[1].m_flow",
+    "hpHea[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal",
+    "valIsoSep.bus.valHeaWatHpInlIso[1].y1",
+    "valIsoSep.bus.valHeaWatHpInlIso[2].y1",
+    "valIsoSep.bus.valChiWatHpInlIso[1].y1",
+    "valIsoSep.bus.valChiWatHpInlIso[2].y1",
+    "busPumHeaWatPri.y1[1]",
+    "busPumChiWatPri.y1[1]",
+    "valIsoSep.port_aHeaWat.m_flow",
+    "hpSep[1].m_flow",
+    "hpSep[2].m_flow",
+    "datHp.mHeaWatHp_flow_nominal",
+    "valIsoSep.port_aChiWat.m_flow",
+    "datHp.mChiWatHp_flow_nominal"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos
new file mode 100644
index 00000000000..ceb60a193f5
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Templates.Plants.HeatPumps.Validation.AirToWater.mos
@@ -0,0 +1,57 @@
+compareVars :=
+  {
+    "pla.ctl.ctl.chaStaHea.capReq.y",
+    "pla.ctl.ctl.chaStaCoo.capReq.y",
+    "pla.capHea_nominal",
+    "pla.capCoo_nominal",
+    "pla.ctl.ctl.TOut",
+    "pla.ctl.ctl.TOutChiWatLck",
+    "pla.ctl.ctl.TOutHeaWatLck",
+    "pla.ctl.ctl.nReqPlaHeaWat",
+    "pla.ctl.ctl.nReqPlaChiWat",
+    "pla.ctl.ctl.enaHea.y1",
+    "pla.ctl.ctl.enaCoo.y1",
+    "pla.ctl.ctl.idxStaHea.y",
+    "pla.ctl.ctl.idxStaCoo.y",
+    "pla.ctl.ctl.y1Hp[1]",
+    "pla.ctl.ctl.y1Hp[2]",
+    "pla.ctl.ctl.y1Hp[3]",
+    "pla.ctl.ctl.y1HeaHp[1]",
+    "pla.ctl.ctl.y1HeaHp[2]",
+    "pla.ctl.ctl.y1HeaHp[3]",
+    "pla.ctl.ctl.y1PumHeaWatPri[1]",
+    "pla.ctl.ctl.y1PumHeaWatPri[2]",
+    "pla.ctl.ctl.y1PumHeaWatPri[3]",
+    "pla.ctl.ctl.y1PumHeaWatSec[1]",
+    "pla.ctl.ctl.y1PumHeaWatSec[2]",
+    "pla.ctl.ctl.y1PumHeaWatSec[3]",
+    "pla.ctl.ctl.y1PumChiWatSec[1]",
+    "pla.ctl.ctl.y1PumChiWatSec[2]",
+    "pla.ctl.ctl.y1PumChiWatSec[3]",
+    "pla.ctl.ctl.nReqResHeaWat",
+    "pla.ctl.ctl.nReqResChiWat",
+    "dpHeaWatRem.y[1]",
+    "pla.bus.dpHeaWatRemSet[1]",
+    "dpChiWatRem.y[1]",
+    "pla.bus.dpHeaWatRemSet[1]",
+    "pla.bus.dpChiWatRemSet[1]",
+    "pla.bus.VHeaWatPri_flow",
+    "pla.bus.VHeaWatSec_flow",
+    "datAll.pla.ctl.VHeaWatSec_flow_nominal",
+    "pla.bus.VChiWatPri_flow",
+    "pla.bus.VChiWatSec_flow",
+    "datAll.pla.ctl.VChiWatSec_flow_nominal",
+    "pla.hp.hp[1].hp.PLR",
+    "pla.hp.hp[2].hp.PLR",
+    "pla.hp.hp[3].hp.PLR",
+    "pla.bus.THeaWatSupSet",
+    "pla.bus.THeaWatPriSup",
+    "pla.bus.THeaWatSecSup",
+    "pla.bus.THeaWatPriRet",
+    "pla.bus.THeaWatSecRet",
+    "pla.bus.TChiWatSupSet",
+    "pla.bus.TChiWatPriSup",
+    "pla.bus.TChiWatSecSup",
+    "pla.bus.TChiWatPriRet",
+    "pla.bus.TChiWatSecRet"
+  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Files.Validation.WeeklyScheduleWindowsLineEndings.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Files.Validation.WeeklyScheduleWindowsLineEndings.mos
new file mode 100644
index 00000000000..13f6cca86b5
--- /dev/null
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Utilities.IO.Files.Validation.WeeklyScheduleWindowsLineEndings.mos
@@ -0,0 +1,7 @@
+compareVars :=
+  {
+    "weeSchLin.y[1]",
+    "weeSchLin.y[2]",
+    "weeSchLin.y[3]",
+    "weeSchLin.y[4]"
+  };
diff --git a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
index 5aab7c11fb6..3c71bb07d2b 100644
--- a/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
+++ b/Buildings/Resources/Scripts/travis/templates/AirHandlersFans.checksum
@@ -1 +1 @@
-b3f8f8af4103182b26def7919d0b09ef
+fd7661952d04322c883930bfdccc0026
diff --git a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
index a1ed2676c3b..6c0861a640b 100755
--- a/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
+++ b/Buildings/Resources/Scripts/travis/templates/checkandrun.sh
@@ -126,7 +126,7 @@ for type in "${!test_script[@]}"; do
     fi
 
     # Diff/master
-    diff_checksum="$(git diff --name-only origin/master | grep Resources/Scripts/travis/templates/$type.checksum)"
+    diff_checksum="$(git diff --name-only origin/master Resources/Scripts/travis/templates | grep Resources/Scripts/travis/templates/$type.checksum)"
     if (( $? == 0 ));  then
       echo "Computed checksum does not match checksum on master."
       if [ "$SKIP" = false ]; then
diff --git a/Buildings/Resources/src/fluid/heatpumps/calibration/doc/requirements.txt b/Buildings/Resources/src/fluid/heatpumps/calibration/doc/requirements.txt
index ba0007ce6e0..061dc436838 100644
--- a/Buildings/Resources/src/fluid/heatpumps/calibration/doc/requirements.txt
+++ b/Buildings/Resources/src/fluid/heatpumps/calibration/doc/requirements.txt
@@ -3,7 +3,7 @@ Babel==2.9.1
 certifi==2023.7.22
 charset-normalizer==2.0.12
 docutils==0.17.1
-idna==3.3
+idna==3.7
 imagesize==1.3.0
 Jinja2==3.1.3
 latexcodec==2.0.1
diff --git a/Buildings/Templates/Components/Actuators/Damper.mo b/Buildings/Templates/Components/Actuators/Damper.mo
index 1863b080892..d64a0055381 100644
--- a/Buildings/Templates/Components/Actuators/Damper.mo
+++ b/Buildings/Templates/Components/Actuators/Damper.mo
@@ -37,6 +37,16 @@ model Damper "Multiple-configuration damper"
     annotation(Dialog(tab="Dynamics", group="Filtered opening",
     enable=use_inputFilter and typ<>Buildings.Templates.Components.Types.Damper.None));
 
+  parameter Boolean from_dp = false
+    "= true, use m_flow = f(dp) else dp = f(m_flow)"
+    annotation (Evaluate=true, Dialog(tab="Advanced",
+    enable=typ<>Buildings.Templates.Components.Types.Damper.None));
+  parameter Boolean linearized = false
+    "= true, use linear relation between m_flow and dp for any flow rate"
+    annotation(Evaluate=true, Dialog(tab="Advanced",
+    enable=typ<>Buildings.Templates.Components.Types.Damper.None and
+    typ<>Buildings.Templates.Components.Types.Damper.PressureIndependent));
+
   parameter Buildings.Templates.Components.Types.DamperBlades typBla=
     if typ==Buildings.Templates.Components.Types.Damper.TwoPosition then
       Buildings.Templates.Components.Types.DamperBlades.Opposed
@@ -75,7 +85,9 @@ model Damper "Multiple-configuration damper"
     final init=init,
     final y_start=y_start,
     final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T)
+    final show_T=show_T,
+    final from_dp=from_dp,
+    final linearized=linearized)
     if typ==Buildings.Templates.Components.Types.Damper.Modulating or
        typ==Buildings.Templates.Components.Types.Damper.TwoPosition
     "Damper with exponential characteristic"
@@ -90,7 +102,8 @@ model Damper "Multiple-configuration damper"
     final init=init,
     final y_start=y_start,
     final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T)
+    final show_T=show_T,
+    final from_dp=from_dp)
     if typ==Buildings.Templates.Components.Types.Damper.PressureIndependent
     "Pressure independent damper"
     annotation (Placement(transformation(extent={{50,-10},{70,10}})));
diff --git a/Buildings/Templates/Components/Actuators/Valve.mo b/Buildings/Templates/Components/Actuators/Valve.mo
index 1bf9dde3091..d7caac83624 100644
--- a/Buildings/Templates/Components/Actuators/Valve.mo
+++ b/Buildings/Templates/Components/Actuators/Valve.mo
@@ -148,6 +148,18 @@ model Valve "Multiple-configuration valve"
       typ==Buildings.Templates.Components.Types.Valve.ThreeWayTwoPosition),
       __ctrlFlow(enable=false));
 
+  parameter Boolean from_dp = false
+    "= true, use m_flow = f(dp) else dp = f(m_flow)"
+    annotation (Evaluate=true, Dialog(tab="Advanced",
+    enable=typ<>Buildings.Templates.Components.Types.Valve.None));
+  parameter Boolean linearized = false
+    "= true, use linear relation between m_flow and dp for any flow rate"
+    annotation(Evaluate=true, Dialog(tab="Advanced",
+    enable=typ<>Buildings.Templates.Components.Types.Valve.None and
+    (if typ==Buildings.Templates.Components.Types.Valve.TwoWayModulating then
+    chaTwo<>Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.PressureIndependent
+    else true)));
+
   parameter Integer text_rotation = 0
     "Text rotation angle in icon layer"
     annotation(Dialog(tab="Graphics", enable=false));
@@ -230,7 +242,9 @@ model Valve "Multiple-configuration valve"
     final init=init,
     final y_start=y_start,
     final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T)
+    final show_T=show_T,
+    final from_dp=from_dp,
+    final linearized=linearized)
     if is_twoWay
     and chaTwo==Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.EqualPercentage
     "Two-way valve with equal percentage characteristic"
@@ -251,7 +265,9 @@ model Valve "Multiple-configuration valve"
     final init=init,
     final y_start=y_start,
     final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T)
+    final show_T=show_T,
+    final from_dp=from_dp,
+    final linearized=linearized)
     if is_twoWay
     and chaTwo==Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.Linear
     "Two-way valve with linear characteristic"
@@ -272,7 +288,8 @@ model Valve "Multiple-configuration valve"
     final init=init,
     final y_start=y_start,
     final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T)
+    final show_T=show_T,
+    final from_dp=from_dp)
     if is_twoWay
     and chaTwo==Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.PressureIndependent
     "Pressure independent two-way valve"
@@ -294,7 +311,9 @@ model Valve "Multiple-configuration valve"
     final init=init,
     final y_start=y_start,
     final allowFlowReversal=allowFlowReversal,
-    final show_T=show_T)
+    final show_T=show_T,
+    final from_dp=from_dp,
+    final linearized=linearized)
     if is_twoWay
     and chaTwo==Buildings.Templates.Components.Types.ValveCharacteristicTwoWay.Table
     "Pressure independent two-way valve"
@@ -325,7 +344,9 @@ model Valve "Multiple-configuration valve"
       else Modelica.Fluid.Types.PortFlowDirection.Leaving,
     final portFlowDirection_3=if allowFlowReversal then
       Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-    else Modelica.Fluid.Types.PortFlowDirection.Entering)
+    else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final from_dp=from_dp,
+    final linearized={linearized, linearized})
     if is_thrWay
     and chaThr==Buildings.Templates.Components.Types.ValveCharacteristicThreeWay.EqualPercentageLinear
     "Three-way valve with equal percentage and linear characteristics"
@@ -353,7 +374,9 @@ model Valve "Multiple-configuration valve"
     final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
          else Modelica.Fluid.Types.PortFlowDirection.Leaving,
     final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering)
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final from_dp=from_dp,
+    final linearized={linearized, linearized})
     if is_thrWay
     and chaThr==Buildings.Templates.Components.Types.ValveCharacteristicThreeWay.Linear
     "Three-way valve with linear characteristics"
@@ -383,7 +406,9 @@ model Valve "Multiple-configuration valve"
     final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
          else Modelica.Fluid.Types.PortFlowDirection.Leaving,
     final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
-         else Modelica.Fluid.Types.PortFlowDirection.Entering)
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final from_dp=from_dp,
+    final linearized={linearized, linearized})
     if is_thrWay
     and chaThr==Buildings.Templates.Components.Types.ValveCharacteristicThreeWay.Table
     "Three-way valve with table-specified characteristics"
diff --git a/Buildings/Templates/Components/Controls/MultipleCommands.mo b/Buildings/Templates/Components/Controls/MultipleCommands.mo
index 0be6ad00d19..f3d8bd0ac38 100644
--- a/Buildings/Templates/Components/Controls/MultipleCommands.mo
+++ b/Buildings/Templates/Components/Controls/MultipleCommands.mo
@@ -59,7 +59,9 @@ equation
         color={255,0,255}));
   connect(y1One, mulOr.y)
     annotation (Line(points={{120,60},{-38,60}}, color={255,0,255}));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+  annotation (
+  defaultComponentName="conCom",
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
             {100,100}}),                                        graphics={
         Rectangle(
           extent={{-100,-100},{100,100}},
diff --git a/Buildings/Templates/Components/Controls/StatusEmulator.mo b/Buildings/Templates/Components/Controls/StatusEmulator.mo
new file mode 100644
index 00000000000..d5748ff650d
--- /dev/null
+++ b/Buildings/Templates/Components/Controls/StatusEmulator.mo
@@ -0,0 +1,88 @@
+within Buildings.Templates.Components.Controls;
+block StatusEmulator "Block that emulates the status of an equipment"
+  parameter Modelica.Units.SI.Time yLim=0.5
+    "Value of filtered signal above which the equipment reports on status";
+  parameter Modelica.Units.SI.Time riseTime=10
+    "Rise time of the filter (time to reach 99.6 % of the speed)";
+  parameter Modelica.Blocks.Types.Init initType=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization (1: no init, 2: steady state, 3: initial state, 4: initial output)"
+    annotation (
+      Evaluate=true,
+      Dialog(group="Initialization"));
+  parameter Real y_start=0.0
+    "Initial value of output (remaining states are in steady state)"
+    annotation(Dialog(enable=initType == Modelica.Blocks.Types.Init.InitialOutput, group=
+          "Initialization"));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1 "Equipment run command"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+        iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1_actual
+    "Equipment status" annotation (Placement(transformation(extent={{100,-20},{140,
+            20}}), iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(final realTrue=1,
+      final realFalse=0) "Convert to real"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Fluid.BaseClasses.ActuatorFilter fil(
+    final f=fCut,
+    final initType=initType,
+    final y_start=y_start)
+    "Filter signal"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr(final t=yLim)
+    "Compare filtered signal to zero to trigger true status"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+protected
+  final parameter Modelica.Units.SI.Frequency fCut=5/(2*Modelica.Constants.pi*
+      riseTime) "Cut-off frequency of filter";
+equation
+  connect(y1, booToRea.u)
+    annotation (Line(points={{-120,0},{-72,0}}, color={255,0,255}));
+  connect(booToRea.y,fil. u)
+    annotation (Line(points={{-48,0},{-12,0}}, color={0,0,127}));
+  connect(greThr.y, y1_actual) annotation (Line(points={{72,0},{120,0}},
+               color={255,0,255}));
+  connect(fil.y, greThr.u)
+    annotation (Line(points={{11,0},{48,0}}, color={0,0,127}));
+  annotation (
+  defaultComponentName="sta",
+  Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},
+            {100,100}}),                                        graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(info="<html>
+<p>
+This block emulates the status of an equipment, i.e.,
+the current on/off state as reported by the hardware itself.
+</p>
+<p>
+The implementation is based on
+<a href=\"modelica://Buildings.Fluid.BaseClasses.ActuatorFilter\">
+Buildings.Fluid.BaseClasses.ActuatorFilter</a>
+and the model is configured with <code>yLim=0.5</code> so that 
+the delay between the on command and the on status is 
+equal to the delay between the off command and the off status
+(about <i>2</i>&nbsp;s with the default parameter settings).
+Note that this delay may not be representative of the actual 
+dynamics of certain equipment such as chillers or heat pumps.
+In addition, this block uses the equipment command signal to 
+generate the status signal, which in turn can lead to inconsistencies 
+with certain equipment that run cyclically at low load and 
+where the status then comes and goes.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StatusEmulator;
diff --git a/Buildings/Templates/Components/Controls/Validation/MultipleCommands.mo b/Buildings/Templates/Components/Controls/Validation/MultipleCommands.mo
new file mode 100644
index 00000000000..697a16215f5
--- /dev/null
+++ b/Buildings/Templates/Components/Controls/Validation/MultipleCommands.mo
@@ -0,0 +1,31 @@
+within Buildings.Templates.Components.Controls.Validation;
+model MultipleCommands "Validation model for converter of multiple commands"
+  extends Modelica.Icons.Example;
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse y1[3](
+    width={0.5,0.6,0.4},
+    each period=600,
+    shift={100,200,300})
+                       "Enable command"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Components.Controls.MultipleCommands conCom(nUni=3)
+    "Converter of multiple commands"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+equation
+  connect(y1.y, conCom.y1)
+    annotation (Line(points={{-58,0},{-12,0}}, color={255,0,255}));
+    annotation (
+ __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/MultipleCommands.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=2000.0),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Components.Controls.MultipleCommands\">
+Buildings.Templates.Components.Controls.MultipleCommands</a>.
+</p>
+</html>"));
+end MultipleCommands;
diff --git a/Buildings/Templates/Components/Controls/Validation/StatusEmulator.mo b/Buildings/Templates/Components/Controls/Validation/StatusEmulator.mo
new file mode 100644
index 00000000000..e16ad5a62e1
--- /dev/null
+++ b/Buildings/Templates/Components/Controls/Validation/StatusEmulator.mo
@@ -0,0 +1,28 @@
+within Buildings.Templates.Components.Controls.Validation;
+model StatusEmulator "Validation model for status emulator"
+  extends Modelica.Icons.Example;
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse y1(period=10)
+    "Enable command"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Components.Controls.StatusEmulator sta(y_start=1)
+    "Generate status"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+equation
+  connect(y1.y, sta.y1)
+    annotation (Line(points={{-58,0},{-12,0}}, color={255,0,255}));
+    annotation (
+ __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/Controls/Validation/StatusEmulator.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=50.0),
+    Documentation(info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Components.Controls.StatusEmulator\">
+Buildings.Templates.Components.Controls.StatusEmulator</a>.
+</p>
+</html>"));
+end StatusEmulator;
diff --git a/Buildings/Templates/Components/Controls/Validation/package.mo b/Buildings/Templates/Components/Controls/Validation/package.mo
new file mode 100644
index 00000000000..12e27a66a5a
--- /dev/null
+++ b/Buildings/Templates/Components/Controls/Validation/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Templates.Components.Controls;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  annotation (Documentation(info="<html>
+<p>
+This package contains validation models for the classes within
+<a href=\"modelica://Buildings.Templates.Components.Controls\">
+Buildings.Templates.Components.Controls</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Components/Controls/Validation/package.order b/Buildings/Templates/Components/Controls/Validation/package.order
new file mode 100644
index 00000000000..2134d98ddf7
--- /dev/null
+++ b/Buildings/Templates/Components/Controls/Validation/package.order
@@ -0,0 +1,2 @@
+MultipleCommands
+StatusEmulator
diff --git a/Buildings/Templates/Components/Controls/package.order b/Buildings/Templates/Components/Controls/package.order
index 2dc29dcab9c..55af62bc1e9 100644
--- a/Buildings/Templates/Components/Controls/package.order
+++ b/Buildings/Templates/Components/Controls/package.order
@@ -1 +1,3 @@
 MultipleCommands
+StatusEmulator
+Validation
diff --git a/Buildings/Templates/Components/Data/HeatPump.mo b/Buildings/Templates/Components/Data/HeatPump.mo
new file mode 100644
index 00000000000..0ac75bdbb64
--- /dev/null
+++ b/Buildings/Templates/Components/Data/HeatPump.mo
@@ -0,0 +1,195 @@
+within Buildings.Templates.Components.Data;
+record HeatPump "Record for heat pump model"
+  extends Modelica.Icons.Record;
+
+  parameter Buildings.Templates.Components.Types.HeatPump typ
+    "Equipment type"
+    annotation (Evaluate=true, Dialog(group="Configuration", enable=false));
+  parameter Boolean is_rev
+    "Set to true for reversible heat pumps, false for heating only"
+    annotation (Evaluate=true, Dialog(group="Configuration", enable=false));
+  parameter Buildings.Templates.Components.Types.HeatPumpModel typMod
+    "Type of heat pump model"
+    annotation (Evaluate=true, Dialog(group="Configuration", enable=false));
+
+  // Default fluid properties
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpHeaWat_default=
+    Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "HW default specific heat capacity"
+    annotation (Dialog(group="Configuration", enable=false));
+  /*
+  cpChiWat_default is for internal use only.
+  It is the same as cpChiWat_default for reversible HP.
+  Non-reversible HP that can be controlled to produce either HW or CHW
+  shall be modeled with chiller components (as a chiller/heater).
+  */
+  final parameter Modelica.Units.SI.SpecificHeatCapacity cpChiWat_default=
+    cpHeaWat_default
+    "CHW default specific heat capacity";
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpSou_default=
+    if typ==Buildings.Templates.Components.Types.HeatPump.AirToWater then
+       Buildings.Utilities.Psychrometrics.Constants.cpAir else
+       Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "Source fluid default specific heat capacity"
+    annotation (Dialog(group="Configuration", enable=false));
+
+  parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal(
+    final min=0)
+    "HW mass flow rate"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpHeaWat_nominal(
+    min=0,
+    start=Buildings.Templates.Data.Defaults.dpChiWatChi)
+    "Pressure drop at design HW mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate capHea_nominal
+    "Heating capacity"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal(
+    final min=273.15)
+    "(Highest) HW supply temperature"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
+    THeaWatSup_nominal-abs(capHea_nominal)/cpHeaWat_default/mHeaWat_flow_nominal
+    "HW return temperature"
+    annotation(Dialog(group="Nominal condition"));
+
+  parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal(
+    start=0,
+    final min=0)
+    "CHW mass flow rate"
+    annotation(Dialog(group="Nominal condition", enable=is_rev));
+  final parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal=
+    dpHeaWat_nominal * (mChiWat_flow_nominal/mHeaWat_flow_nominal)^2
+    "Pressure drop at design CHW mass flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate capCoo_nominal(
+    start=0)
+    "Cooling capacity"
+    annotation(Dialog(group="Nominal condition", enable=is_rev));
+  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal(
+    start=Buildings.Templates.Data.Defaults.TChiWatSup,
+    final min=253.15)
+    "(Lowest) CHW supply temperature"
+    annotation(Dialog(group="Nominal condition", enable=is_rev));
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=
+    if is_rev then
+    TChiWatSup_nominal+abs(capCoo_nominal)/cpChiWat_default/mChiWat_flow_nominal
+    else Buildings.Templates.Data.Defaults.TChiWatRet
+    "CHW return temperature"
+    annotation(Dialog(group="Nominal condition", enable=is_rev));
+  parameter Modelica.Units.SI.Temperature TSouHea_nominal(
+    start=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    final min=220)
+    "OAT or source fluid supply temperature (evaporator entering) in heating mode"
+    annotation(Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mSouWwHea_flow_nominal(
+    start=mHeaWat_flow_nominal,
+    final min=0)
+    "Source fluid mass flow rate in heating mode"
+    annotation(Dialog(group="Nominal condition",
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+  parameter Modelica.Units.SI.PressureDifference dpSouWwHea_nominal(
+    min=0,
+    start=Buildings.Templates.Data.Defaults.dpChiWatChi)
+    "Source fluid pressure drop in heating mode"
+    annotation (Dialog(group="Nominal condition",
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+  final parameter Modelica.Units.SI.MassFlowRate mSouHea_flow_nominal=
+    if typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater then
+      mSouWwHea_flow_nominal else
+      Buildings.Templates.Data.Defaults.mAirFloByCapChi * abs(capHea_nominal)
+    "Source fluid mass flow rate in heating mode";
+  final parameter Modelica.Units.SI.PressureDifference dpSouHea_nominal=
+    if typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater then
+      dpSouWwHea_nominal else Buildings.Templates.Data.Defaults.dpAirChi
+    "Source fluid pressure drop in heating mode";
+  parameter Modelica.Units.SI.Temperature TSouCoo_nominal(
+    start=Buildings.Templates.Data.Defaults.TOutHpCoo,
+    final min=273.15)
+    "OAT or source fluid supply temperature (condenser entering) in cooling mode"
+    annotation(Dialog(group="Nominal condition",
+    enable=is_rev));
+  parameter Modelica.Units.SI.MassFlowRate mSouWwCoo_flow_nominal(
+    start=mChiWat_flow_nominal,
+    final min=0)
+    "Source fluid mass flow rate in cooling mode"
+    annotation(Dialog(group="Nominal condition",
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater and
+    is_rev));
+  final parameter Modelica.Units.SI.MassFlowRate mSouCoo_flow_nominal=
+    if typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater then
+      mSouWwCoo_flow_nominal else
+      Buildings.Templates.Data.Defaults.mAirFloByCapChi * abs(capCoo_nominal)
+    "Source fluid mass flow rate in cooling mode";
+  final parameter Modelica.Units.SI.PressureDifference dpSouCoo_nominal=
+    dpSouHea_nominal * (mSouCoo_flow_nominal/mSouHea_flow_nominal)^2
+    "Source fluid pressure drop in cooling mode";
+  replaceable parameter
+    Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic perFit(
+    dpHeaLoa_nominal=dpHeaWat_nominal,
+    dpHeaSou_nominal=dpSouHea_nominal,
+    hea(
+      Q_flow=abs(capHea_nominal),
+      P=0,
+      mLoa_flow=mHeaWat_flow_nominal,
+      mSou_flow=mSouHea_flow_nominal,
+      coeQ={1,0,0,0,0},
+      coeP={1,0,0,0,0},
+      TRefLoa=THeaWatRet_nominal,
+      TRefSou=TSouHea_nominal),
+    coo(
+      Q_flow=if is_rev then -abs(capCoo_nominal) else -1,
+      P=0,
+      mLoa_flow=mChiWat_flow_nominal,
+      mSou_flow=mSouCoo_flow_nominal,
+      coeQ={1,0,0,0,0},
+      coeP={1,0,0,0,0},
+      TRefLoa=TChiWatRet_nominal,
+      TRefSou=TSouCoo_nominal)) constrainedby
+    Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic
+    "Performance data - Equation fit model"
+    annotation (
+    Dialog(enable=typMod == Buildings.Templates.Components.Types.HeatPumpModel.EquationFit),
+    choicesAllMatching=true,
+    Placement(transformation(extent={{-8,-40},{8,-24}})));
+
+annotation (
+  defaultComponentPrefixes="parameter",
+  defaultComponentName="dat",
+  Documentation(info="<html>
+<p>
+This record provides the set of sizing and operating parameters for
+heat pump models that can be found within
+<a href=\"modelica://Buildings.Templates.Components.HeatPumps\">
+Buildings.Templates.Components.HeatPumps</a>.
+</p>
+<h4>Performance data for the equation fit model</h4>
+<p>When using
+<code>typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit</code>,
+the design values declared at the top-level
+are propagated by default to the performance data record <code>per</code>
+under the assumption that the reference conditions used for assessing the
+performance data match the design conditions.
+This avoids duplicate parameter assignments when manually entering
+the performance curve coefficients.
+</p>
+<p>
+Note that this propagation does not persist when redeclaring or
+reassigning the record.
+This is because the equation fit method uses reference values that
+must match the ones used to compute the performance curve coefficients.
+</p>
+<p>
+Also note that placeholders values are assigned to the performance curves,
+the reference source temperature and the input power in
+cooling mode to avoid assigning these parameters in case of non-reversible
+heat pumps.
+These values are unrealistic and must be overwritten for reversible heat pumps, which
+is always the case when redeclaring or
+reassigning the performance record <code>per</code>.
+Models that use this record will issue a warning if these placeholders values
+are not overwritten in case of reversible heat pumps.
+</p>
+</html>"));
+end HeatPump;
diff --git a/Buildings/Templates/Components/Data/PumpMultiple.mo b/Buildings/Templates/Components/Data/PumpMultiple.mo
new file mode 100644
index 00000000000..8db05d478a8
--- /dev/null
+++ b/Buildings/Templates/Components/Data/PumpMultiple.mo
@@ -0,0 +1,90 @@
+within Buildings.Templates.Components.Data;
+record PumpMultiple "Record for multiple-pump models"
+  extends Modelica.Icons.Record;
+
+  parameter Buildings.Templates.Components.Types.Pump typ
+    "Equipment type"
+    annotation (Evaluate=true, Dialog(group="Configuration", enable=false));
+  parameter Integer nPum(
+    final min=0,
+    start=0)
+    "Number of pumps"
+    annotation (Dialog(group="Configuration", enable=false));
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nPum](
+    each start=1,
+    each final min=0)
+    "Mass flow rate - Each pump"
+    annotation (Evaluate=true,
+    Dialog(group="Nominal condition",
+    enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  parameter Modelica.Units.SI.PressureDifference dp_nominal[nPum](
+    each start=0,
+    each final min=0)
+    "Total pressure rise - Each pump"
+    annotation (Dialog(group="Nominal condition",
+    enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  // To avoid missing support for zero-sized record in case of nPum=0 we use max(nPum, 1).
+  replaceable parameter Fluid.Movers.Data.Generic per[max(nPum, 1)](
+    pressure(
+      V_flow=if typ<>Buildings.Templates.Components.Types.Pump.None then
+      {{0, 1, 2} * m_flow_nominal[i] / rho_default for i in 1:nPum} else [0],
+      dp=if typ<>Buildings.Templates.Components.Types.Pump.None then
+      {{1.14, 1, 0.42} * dp_nominal[i] for i in 1:nPum} else [0]))
+    constrainedby Buildings.Fluid.Movers.Data.Generic
+    "Performance data - Each pump"
+    annotation(Dialog(enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+
+  parameter Modelica.Units.SI.Density rho_default=
+    Modelica.Media.Water.ConstantPropertyLiquidWater.d_const
+    "Default medium density"
+    annotation(Dialog(enable=false));
+
+  annotation (
+  defaultComponentName="datPum", Documentation(info="<html>
+<p>
+This record provides the set of sizing and operating parameters for 
+the multiple-pump model
+<a href=\"modelica://Buildings.Templates.Components.Pumps.Multiple\">
+Buildings.Templates.Components.Pumps.Multiple</a>.
+</p>
+<p>
+A default flow characteristic is provided, which goes through
+the design operating point and spans over
+<i>0</i> and twice the design flow rate at maximum speed.
+This default characteristic is based on a least squares
+polynomial fit of the characteristics from
+<a href=\"modelica://Buildings.Fluid.Movers.Data.Pumps.Wilo\">
+Buildings.Fluid.Movers.Data.Pumps.Wilo</a>.
+The user may refer to the documentation of 
+<a href=\"modelica://Buildings.Fluid.HydronicConfigurations.UsersGuide.ModelParameters\">
+Buildings.Fluid.HydronicConfigurations.UsersGuide.ModelParameters</a>
+for further details.
+Note that a default medium density is used to parameterize 
+the pump characteristic. So models that use this record should
+overwrite this default value with the density of the medium
+in use, especially in the case of a water/glycol mix. 
+</p>
+<p>
+In order to modify the default characteristic, one may use either
+of the following methods.
+</p>
+<ul>
+<li>Assign the whole subrecord <code>per</code> or
+only its component <code>per.pressure</code>.
+In this case the elements <code>per[i]</code> may differ one from another.
+This is the recommended approach for unequally sized units 
+such as dedicated pumps.</li>
+<li>Redeclare the component <code>per</code>.
+In this case the elements <code>per[i]</code> are all equal to the redeclared
+record instance.
+This is the recommended approach for equally sized units 
+such as headered pumps.</li>
+</ul>
+<p>
+Those various use cases are illustrated in
+<a href=\"modelica://Buildings.Templates.Components.Validation.PumpMultipleRecord\">
+Buildings.Templates.Components.Validation.PumpMultipleRecord</a>.
+</p>
+</html>"));
+end PumpMultiple;
diff --git a/Buildings/Templates/Components/Data/PumpSingle.mo b/Buildings/Templates/Components/Data/PumpSingle.mo
new file mode 100644
index 00000000000..4442b7755b2
--- /dev/null
+++ b/Buildings/Templates/Components/Data/PumpSingle.mo
@@ -0,0 +1,50 @@
+within Buildings.Templates.Components.Data;
+record PumpSingle "Record for single pump model"
+  extends Modelica.Icons.Record;
+
+  parameter Buildings.Templates.Components.Types.Pump typ
+    "Equipment type"
+    annotation (Evaluate=true, Dialog(group="Configuration", enable=false));
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal(
+    start=1,
+    final min=0)
+    "Mass flow rate"
+    annotation (Dialog(group="Nominal condition",
+    enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  parameter Modelica.Units.SI.PressureDifference dp_nominal(
+    start=0,
+    final min=0)
+    "Total pressure rise"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  replaceable parameter Buildings.Fluid.Movers.Data.Generic per(
+    pressure(
+      V_flow={0, 1, 2} * m_flow_nominal / rho_default,
+      dp={1.14, 1, 0.42} * dp_nominal))
+    constrainedby Buildings.Fluid.Movers.Data.Generic
+    "Performance data"
+    annotation(Dialog(enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+
+  parameter Modelica.Units.SI.Density rho_default=
+    Modelica.Media.Water.ConstantPropertyLiquidWater.d_const
+    "Default medium density"
+    annotation(Dialog(enable=false));
+
+  annotation (
+  defaultComponentName="datPum", Documentation(info="<html>
+<p>
+This record provides the set of sizing and operating parameters for 
+the single pump model
+<a href=\"modelica://Buildings.Templates.Components.Pumps.Single\">
+Buildings.Templates.Components.Pumps.Single</a>.
+</p>
+<p>
+A default flow characteristic is provided and can be overwritten as
+described in the documentation of 
+<a href=\"modelica://Buildings.Templates.Components.Data.PumpMultiple\">
+Buildings.Templates.Components.Data.PumpMultiple</a>
+in the more generic case of multiple units.
+</p>
+</html>"));
+end PumpSingle;
diff --git a/Buildings/Templates/Components/Data/package.order b/Buildings/Templates/Components/Data/package.order
index 96dad205471..4c65b6dc152 100644
--- a/Buildings/Templates/Components/Data/package.order
+++ b/Buildings/Templates/Components/Data/package.order
@@ -1,4 +1,7 @@
 Coil
 Damper
 Fan
+HeatPump
+PumpMultiple
+PumpSingle
 Valve
diff --git a/Buildings/Templates/Components/HeatPumps/AirToWater.mo b/Buildings/Templates/Components/HeatPumps/AirToWater.mo
new file mode 100644
index 00000000000..d5ac01bd975
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/AirToWater.mo
@@ -0,0 +1,67 @@
+within Buildings.Templates.Components.HeatPumps;
+model AirToWater
+  "Air-to-water heat pump - Equation fit model"
+  extends Buildings.Templates.Components.Interfaces.PartialHeatPumpEquationFit(
+    redeclare final package MediumSou=MediumAir,
+    final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+    final allowFlowReversalSou=false);
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter mAir_flow(
+    final k=mSouHea_flow_nominal)
+    "Air mass flow rate"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={60,-60})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal y1Rea
+    "Convert on/off command into real"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={60,90})));
+  Fluid.Movers.BaseClasses.IdealSource floSou(
+    redeclare final package Medium=MediumAir,
+    final m_flow_small=1E-4 * mSouHea_flow_nominal,
+    final allowFlowReversal=allowFlowReversalSou,
+    final control_m_flow=true,
+    final control_dp=false)
+    "Air flow source"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={80,-90})));
+equation
+  connect(y1Rea.y, mAir_flow.u)
+    annotation (Line(points={{60,78},{60,-48}},color={0,0,127}));
+  connect(floSou.port_b, TSouEnt.port_a)
+    annotation (Line(points={{80,-80},{80,-20},{40,-20}},color={0,127,255}));
+  connect(port_aSou, floSou.port_a)
+    annotation (Line(points={{80,-140},{80,-100}},color={0,127,255}));
+  connect(mAir_flow.y, floSou.m_flow_in)
+    annotation (Line(points={{60,-72},{60,-96},{72,-96}},color={0,0,127}));
+  connect(bus.y1, y1Rea.u)
+    annotation (Line(points={{0,160},{0,110},{60,110},{60,102}},color={255,204,51},thickness=0.5));
+  annotation (
+    defaultComponentName="hp",
+    Documentation(
+      info="<html>
+<p>
+This is a model for an air-to-water heat pump where the capacity
+and input power are computed based on the equation fit method.
+The model can be configured to represent either a non-reversible heat pump 
+(<code>is_rev=false</code>) or a reversible heat pump (<code>is_rev=true</code>).
+This model uses
+<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
+Buildings.Fluid.HeatPumps.EquationFitReversible</a>,
+which the user may refer to for the modeling assumptions.
+</p>
+<h4>Control points</h4>
+<p>
+Refer to the documentation of the interface class
+<a href=\"modelica://Buildings.Templates.Components.Interfaces.PartialHeatPumpEquationFit\">
+Buildings.Templates.Components.Interfaces.PartialHeatPumpEquationFit</a>
+for a description of the available control input and output
+variables.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AirToWater;
diff --git a/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo b/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo
new file mode 100644
index 00000000000..d61e7670dae
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mo
@@ -0,0 +1,427 @@
+within Buildings.Templates.Components.HeatPumps.Validation;
+model HeatPumpEquationFit
+  "Validation model for heat pump component with equation fit model"
+  extends Modelica.Icons.Example;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "HW or CHW medium";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Buildings.Templates.Components.Data.HeatPump datHpAwNrv(
+    final cpHeaWat_default=hpAwNrv.cpHeaWat_default,
+    final cpSou_default=hpAwNrv.cpSou_default,
+    final typ=hpAwNrv.typ,
+    final is_rev=hpAwNrv.is_rev,
+    final typMod=hpAwNrv.typMod,
+    mHeaWat_flow_nominal=datHpAw.capHea_nominal/abs(datHpAw.THeaWatSup_nominal -
+        Buildings.Templates.Data.Defaults.THeaWatRetMed)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWat_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHea_nominal=500E3,
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TSouHea_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    perFit(hea(
+        P=datHpAwNrv.capHea_nominal/Buildings.Templates.Data.Defaults.COPHpAwHea,
+        coeQ={-4.2670305442,-0.7381077035,6.0049480456,0,0},
+        coeP={-4.9107455513,5.3665308366,0.5447612754,0,0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpHeaLow)))
+    "Non-reversible AWHP parameters"
+    annotation (Placement(transformation(extent={{120,100},{140,120}})));
+
+  parameter Buildings.Templates.Components.Data.HeatPump datHpAw(
+    final cpHeaWat_default=hpAw.cpHeaWat_default,
+    final cpSou_default=hpAw.cpSou_default,
+    final typ=hpAw.typ,
+    final is_rev=hpAw.is_rev,
+    final typMod=hpAw.typMod,
+    mHeaWat_flow_nominal=datHpAw.capHea_nominal/abs(datHpAw.THeaWatSup_nominal -
+        Buildings.Templates.Data.Defaults.THeaWatRetMed)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWat_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHea_nominal=500E3,
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    mChiWat_flow_nominal=datHpAw.capCoo_nominal/abs(datHpAw.TChiWatSup_nominal -
+        Buildings.Templates.Data.Defaults.TChiWatRet)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    capCoo_nominal=500E3,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TSouCoo_nominal=Buildings.Templates.Data.Defaults.TOutHpCoo,
+    TSouHea_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    perFit(hea(
+        P=datHpAw.capHea_nominal/Buildings.Templates.Data.Defaults.COPHpAwHea,
+        coeQ={-4.2670305442,-0.7381077035,6.0049480456,0,0},
+        coeP={-4.9107455513,5.3665308366,0.5447612754,0,0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpHeaLow), coo(
+        P=datHpAw.capCoo_nominal/Buildings.Templates.Data.Defaults.COPHpAwCoo,
+        coeQ={-2.2545246871,6.9089257665,-3.6548225094,0,0},
+        coeP={-5.8086010402,1.6894933858,5.1167787436,0,0},
+        TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpCoo)))
+    "Reversible AWHP parameters parameters"
+    annotation (Placement(transformation(extent={{120,22},{140,42}})));
+
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet(k=datHpAw.TChiWatSup_nominal,
+      y(final unit="K", displayUnit="degC")) "CHWST setpoint" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-80,120})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet(k=datHpAw.THeaWatSup_nominal,
+      y(final unit="K", displayUnit="degC")) "HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-90,150},{-70,170}})));
+  AirToWater hpAw(
+    is_rev=true,
+    show_T=true,
+    redeclare final package MediumHeaWat = Medium,
+    final dat=datHpAw,
+    final energyDynamics=energyDynamics) "Reversible AWHP"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin THeaWatRet(
+    amplitude=datHpAw.THeaWatSup_nominal - datHpAw.THeaWatRet_nominal,
+    freqHz=3/3000,
+    y(final unit="K", displayUnit="degC"),
+    offset=datHpAw.THeaWatRet_nominal,
+    startTime=0) "HW return temperature value"
+    annotation (Placement(transformation(extent={{-90,72},{-70,92}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[
+      0, 0;
+      0.5, 1],
+    timeScale=1000,
+    period=3000)
+    "Heat pump Enable signal"
+    annotation (Placement(transformation(extent={{-180,130},{-160,150}})));
+  Fluid.Sensors.TemperatureTwoPort TSup(redeclare final package Medium = Medium,
+      final m_flow_nominal=datHpAw.mChiWat_flow_nominal) "Supply temperature"
+    annotation (Placement(transformation(extent={{130,-10},{150,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Hea(
+    table=[
+      0, 0;
+      2, 1],
+    timeScale=1000,
+    period=3000)
+    "Heat pump heating mode signal"
+    annotation (Placement(transformation(extent={{-180,90},{-160,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TSetAct(
+    y(final unit="K",
+      displayUnit="degC"))
+    "Active supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-40,90},{-20,110}})));
+  Fluid.Sources.Boundary_pT sup(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=3)
+    "Boundary condition at distribution system supply"
+    annotation (Placement(transformation(extent={{190,30},{170,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet(
+    amplitude=datHpAw.TChiWatRet_nominal - datHpAw.TChiWatSup_nominal,
+    freqHz=3/3000,
+    y(final unit="K", displayUnit="degC"),
+    offset=datHpAw.TChiWatRet_nominal,
+    startTime=0) "CHW return temperature value"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+  Fluid.Sources.Boundary_pT inlHp(
+    redeclare final package Medium = Medium,
+    use_p_in=true,
+    use_T_in=true,
+    nPorts=3) "Boundary conditions of CHW/HW at HP inlet"
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TRetAct
+    "Active return temperature"
+    annotation (Placement(transformation(extent={{-40,50},{-20,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch pInl_rel
+    "Active inlet gaupe pressure"
+    annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pHeaWatInl(
+    k=sup.p + hpAw.dpHeaWat_nominal)
+    "HW inlet pressure"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pChiWatInl(
+    k=sup.p + hpAw.dpChiWat_nominal)
+    "CHW inlet pressure"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-80,-40})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={180,140})));
+  Fluid.Sensors.TemperatureTwoPort TRet(redeclare final package Medium = Medium,
+      final m_flow_nominal=datHpAw.mChiWat_flow_nominal) "Return temperature"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+  AirToWater hpAwNrv(
+    is_rev=false,
+    final energyDynamics=energyDynamics,
+    final dat=datHpAwNrv) "Non reversible AWHP"
+    annotation (Placement(transformation(extent={{100,70},{120,90}})));
+  Fluid.Sensors.TemperatureTwoPort TRet1(redeclare final package Medium =
+        Medium, final m_flow_nominal=datHpAw.mChiWat_flow_nominal)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{50,70},{70,90}})));
+  Fluid.Sensors.TemperatureTwoPort TSup1(redeclare final package Medium =
+        Medium, final m_flow_nominal=datHpAw.mChiWat_flow_nominal)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{130,70},{150,90}})));
+  WaterToWater hpWw(
+    is_rev=true,
+    show_T=true,
+    redeclare final package MediumHeaWat = Medium,
+    final dat=datHpWw,
+    final energyDynamics=energyDynamics,
+    have_preDroChiHeaWat=false,
+    have_preDroSou=false)
+    "Reversible WWHP - CHW/HW and source fluid pressure drops computed externally"
+    annotation (Placement(transformation(extent={{100,-90},{120,-70}})));
+  parameter Data.HeatPump datHpWw(
+    final cpHeaWat_default=hpWw.cpHeaWat_default,
+    final cpSou_default=hpWw.cpSou_default,
+    final typ=hpWw.typ,
+    final is_rev=hpWw.is_rev,
+    final typMod=hpWw.typMod,
+    mHeaWat_flow_nominal=datHpAw.capHea_nominal/abs(datHpAw.THeaWatSup_nominal -
+        Buildings.Templates.Data.Defaults.THeaWatRetMed)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWat_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHea_nominal=500E3,
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    mChiWat_flow_nominal=datHpAw.capCoo_nominal/abs(datHpAw.TChiWatSup_nominal -
+        Buildings.Templates.Data.Defaults.TChiWatRet)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    capCoo_nominal=500E3,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TSouCoo_nominal=Buildings.Templates.Data.Defaults.TSouHpCoo,
+    TSouHea_nominal=Buildings.Templates.Data.Defaults.TSouHpHea,
+    dpSouWwHea_nominal=Buildings.Templates.Data.Defaults.dpChiWatChi,
+    mSouWwCoo_flow_nominal=datHpWw.mSouWwHea_flow_nominal,
+    mSouWwHea_flow_nominal=datHpWw.mHeaWat_flow_nominal,
+    perFit(hea(
+        P=datHpAw.capHea_nominal/Buildings.Templates.Data.Defaults.COPHpWwHea,
+        coeQ={-4.2670305442,-0.7381077035,6.0049480456,0,0},
+        coeP={-4.9107455513,5.3665308366,0.5447612754,0,0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TSouHpHea), coo(
+        P=datHpAw.capCoo_nominal/Buildings.Templates.Data.Defaults.COPHpWwCoo,
+        coeQ={-2.2545246871,6.9089257665,-3.6548225094,0,0},
+        coeP={-5.8086010402,1.6894933858,5.1167787436,0,0},
+        TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
+        TRefSou=Buildings.Templates.Data.Defaults.TSouHpCoo)))
+    "Reversible WWHP parameters parameters"
+    annotation (Placement(transformation(extent={{120,-60},{140,-40}})));
+
+  Fluid.Sensors.TemperatureTwoPort TRet2(redeclare final package Medium =
+        Medium, final m_flow_nominal=datHpAw.mChiWat_flow_nominal)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{50,-90},{70,-70}})));
+  Fluid.Sensors.TemperatureTwoPort TSup2(redeclare final package Medium =
+        Medium, final m_flow_nominal=datHpAw.mChiWat_flow_nominal)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{130,-90},{150,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSouHea(
+    y(final unit="K", displayUnit="degC"),
+    height=4,
+    duration=500,
+    offset=datHpWw.TSouHea_nominal,
+    startTime=2400) "Source fluid supply temperature value"
+    annotation (Placement(transformation(extent={{-92,-90},{-72,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp TSouCoo(
+    y(final unit="K", displayUnit="degC"),
+    height=-4,
+    duration=500,
+    offset=datHpWw.TSouCoo_nominal,
+    startTime=1400) "Source fluid supply temperature value"
+    annotation (Placement(transformation(extent={{-92,-130},{-72,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TSouAct
+    "Active source fluid supply temperature"
+    annotation (Placement(transformation(extent={{-40,-92},{-20,-72}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch pInl_rel1
+    "Active inlet gaupe pressure"
+    annotation (Placement(transformation(extent={{-40,-150},{-20,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pSouInlHea(k=retSou.p +
+        hpWw.dpSouHea_nominal) "Source fluid inlet pressure"
+    annotation (Placement(transformation(extent={{-130,-130},{-110,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pSouInlCoo(k=retSou.p +
+        hpWw.dpSouCoo_nominal) "Source fluid inlet pressure" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-120,-160})));
+  Fluid.Sources.Boundary_pT inlHpSou(
+    redeclare final package Medium = Medium,
+    use_p_in=true,
+    use_T_in=true,
+    nPorts=1) "Boundary conditions or source side fluid at HP inlet"
+    annotation (Placement(transformation(extent={{10,-110},{30,-90}})));
+  Fluid.Sources.Boundary_pT retSou(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=1)
+    "Boundary condition at source system return"
+    annotation (Placement(transformation(extent={{190,-130},{170,-110}})));
+  Fluid.FixedResistances.PressureDrop res(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=datHpWw.mHeaWat_flow_nominal,
+    final dp_nominal=datHpWw.dpHeaWat_nominal)
+    "CHW/HW pressure drop computed externally"
+    annotation (Placement(transformation(extent={{70,-90},{90,-70}})));
+  Fluid.FixedResistances.PressureDrop resSou(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=datHpWw.mSouWwHea_flow_nominal,
+    final dp_nominal=datHpWw.dpSouWwHea_nominal)
+    "Source fluid pressure drop computed externally"
+    annotation (Placement(transformation(extent={{70,-110},{90,-90}})));
+protected
+  Interfaces.Bus bus "HP control bus"
+    annotation (Placement(transformation(extent={{60,20},{100,60}}),
+      iconTransformation(extent={{-276,6},{-236,46}})));
+protected
+  Interfaces.Bus bus1 "HP control bus"
+    annotation (Placement(transformation(extent={{60,100},{100,140}}),
+      iconTransformation(extent={{-276,6},{-236,46}})));
+protected
+  Interfaces.Bus bus2 "HP control bus"
+    annotation (Placement(transformation(extent={{60,-60},{100,-20}}),
+      iconTransformation(extent={{-276,6},{-236,46}})));
+equation
+  connect(y1Hea.y[1], TSetAct.u2)
+    annotation (Line(points={{-158,100},{-42,100}},color={255,0,255}));
+  connect(TChiWatSupSet.y, TSetAct.u3)
+    annotation (Line(points={{-68,120},{-64,120},{-64,92},{-42,92}},color={0,0,127}));
+  connect(THeaWatSupSet.y, TSetAct.u1)
+    annotation (Line(points={{-68,160},{-60,160},{-60,108},{-42,108}},color={0,0,127}));
+  connect(TSup.port_b, sup.ports[1])
+    annotation (Line(points={{150,0},{170,0},{170,38.6667}},color={0,127,255}));
+  connect(THeaWatRet.y, TRetAct.u1)
+    annotation (Line(points={{-68,82},{-60,82},{-60,68},{-42,68}},color={0,0,127}));
+  connect(y1Hea.y[1], TRetAct.u2)
+    annotation (Line(points={{-158,100},{-50,100},{-50,60},{-42,60}},color={255,0,255}));
+  connect(TChiWatRet.y, TRetAct.u3)
+    annotation (Line(points={{-68,40},{-50,40},{-50,52},{-42,52}},color={0,0,127}));
+  connect(hpAw.port_b, TSup.port_a)
+    annotation (Line(points={{120,0},{130,0}},color={0,127,255}));
+  connect(TRetAct.y, inlHp.T_in) annotation (Line(points={{-18,60},{-10,60},{-10,
+          4},{8,4}}, color={0,0,127}));
+  connect(y1Hea.y[1], bus.y1Hea)
+    annotation (Line(points={{-158,100},{-50,100},{-50,120},{80,120},{80,40}},
+      color={255,0,255}));
+  connect(y1.y[1], bus.y1)
+    annotation (Line(points={{-158,140},{-50,140},{-50,120},{80,120},{80,40}},
+      color={255,0,255}));
+  connect(TSetAct.y, bus.TSet)
+    annotation (Line(points={{-18,100},{80,100},{80,40},{80,40}},      color={0,0,127}));
+  connect(pInl_rel.y, inlHp.p_in)
+    annotation (Line(points={{-18,-20},{0,-20},{0,8},{8,8}}, color={0,0,127}));
+  connect(pHeaWatInl.y, pInl_rel.u1)
+    annotation (Line(points={{-68,0},{-58,0},{-58,-12},{-42,-12}},color={0,0,127}));
+  connect(pChiWatInl.y, pInl_rel.u3)
+    annotation (Line(points={{-68,-40},{-46,-40},{-46,-28},{-42,-28}},color={0,0,127}));
+  connect(y1Hea.y[1], pInl_rel.u2)
+    annotation (Line(points={{-158,100},{-158,100.526},{-50,100.526},{-50,-20},{-42,-20}},
+      color={255,0,255}));
+  connect(bus, hpAw.bus)
+    annotation (Line(points={{80,40},{110,40},{110,10}},color={255,204,51},thickness=0.5));
+  connect(weaDat.weaBus, hpAw.busWea)
+    annotation (Line(points={{170,140},{160,140},{160,16},{104,16},{104,10}},
+      color={255,204,51},thickness=0.5));
+  connect(inlHp.ports[1], TRet.port_a) annotation (Line(points={{30,-1.33333},{
+          40,-1.33333},{40,0},{50,0}}, color={0,127,255}));
+  connect(TRet.port_b, hpAw.port_a)
+    annotation (Line(points={{70,0},{100,0}},color={0,127,255}));
+  connect(bus1, hpAwNrv.bus)
+    annotation (Line(points={{80,120},{110,120},{110,90}},color={255,204,51},thickness=0.5));
+  connect(y1.y[1], bus1.y1)
+    annotation (Line(points={{-158,140},{-50,140},{-50,120},{80,120}},color={255,0,255}));
+  connect(hpAwNrv.port_b, TSup1.port_a)
+    annotation (Line(points={{120,80},{130,80}},color={0,127,255}));
+  connect(TRet1.port_b, hpAwNrv.port_a)
+    annotation (Line(points={{70,80},{100,80}},color={0,127,255}));
+  connect(TSup1.port_b, sup.ports[2])
+    annotation (Line(points={{150,80},{170,80},{170,40}},color={0,127,255}));
+  connect(inlHp.ports[2], TRet1.port_a) annotation (Line(points={{30,0},{40,0},
+          {40,80},{50,80}}, color={0,127,255}));
+  connect(weaDat.weaBus, hpAwNrv.busWea)
+    annotation (Line(points={{170,140},{160,140},{160,94},{104,94},{104,90}},
+      color={255,204,51},thickness=0.5));
+  connect(THeaWatSupSet.y, bus1.TSet)
+    annotation (Line(points={{-68,160},{80,160},{80,120}},      color={0,0,127}));
+  connect(hpWw.port_b, TSup2.port_a)
+    annotation (Line(points={{120,-80},{130,-80}}, color={0,127,255}));
+  connect(TSup2.port_b, sup.ports[3])
+    annotation (Line(points={{150,-80},{170,-80},{170,41.3333}},color={0,127,255}));
+  connect(inlHp.ports[3], TRet2.port_a) annotation (Line(points={{30,1.33333},{
+          30,0},{40,0},{40,-80},{50,-80}}, color={0,127,255}));
+  connect(bus2, hpWw.bus) annotation (Line(
+      points={{80,-40},{110,-40},{110,-70}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(TSouHea.y, TSouAct.u1)
+    annotation (Line(points={{-70,-80},{-56,-80},{-56,-74},{-42,-74}},color={0,0,127}));
+  connect(y1Hea.y[1], TSouAct.u2)
+    annotation (Line(points={{-158,100},{-50,100},{-50,-82},{-42,-82}},color={255,0,255}));
+  connect(TSouCoo.y, TSouAct.u3)
+    annotation (Line(points={{-70,-120},{-46,-120},{-46,-90},{-42,-90}},color={0,0,127}));
+  connect(pSouInlHea.y, pInl_rel1.u1)
+    annotation (Line(points={{-108,-120},{-102,-120},{-102,-140},{-60,-140},{-60,-132},{-42,-132}},
+      color={0,0,127}));
+  connect(pSouInlCoo.y, pInl_rel1.u3)
+    annotation (Line(points={{-108,-160},{-60,-160},{-60,-148},{-42,-148}},color={0,0,127}));
+  connect(y1Hea.y[1], pInl_rel1.u2)
+    annotation (Line(points={{-158,100},{-50,100},{-50,-140},{-42,-140}},color={255,0,255}));
+  connect(retSou.ports[1], hpWw.port_bSou) annotation (Line(points={{170,-120},{
+          94,-120},{94,-90},{100,-90}},  color={0,127,255}));
+  connect(TSouAct.y, inlHpSou.T_in) annotation (Line(points={{-18,-82},{0,-82},
+          {0,-96},{8,-96}}, color={0,0,127}));
+  connect(pInl_rel1.y, inlHpSou.p_in) annotation (Line(points={{-18,-140},{-20,
+          -140},{-20,-92},{8,-92}}, color={0,0,127}));
+  connect(TSetAct.y, bus2.TSet)
+    annotation (Line(points={{-18,100},{80,100},{80,50},{80,50},{80,-40}},
+      color={0,0,127}));
+  connect(y1.y[1], bus2.y1)
+    annotation (Line(points={{-158,140},{-50,140},{-50,-40},{80,-40}},color={255,0,255}));
+  connect(y1Hea.y[1], bus2.y1Hea)
+    annotation (Line(points={{-158,100},{-50,100},{-50,-40},{80,-40}},color={255,0,255}));
+  connect(TRet2.port_b, res.port_a)
+    annotation (Line(points={{70,-80},{70,-80}}, color={0,127,255}));
+  connect(res.port_b, hpWw.port_a)
+    annotation (Line(points={{90,-80},{100,-80}}, color={0,127,255}));
+  connect(hpWw.port_aSou, resSou.port_b) annotation (Line(points={{120,-90},{126,
+          -90},{126,-100},{90,-100}}, color={0,127,255}));
+  connect(inlHpSou.ports[1], resSou.port_a) annotation (Line(points={{30,-100},
+          {50,-100},{50,-100},{70,-100}}, color={0,127,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-180},{200,180}})),
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/HeatPumps/Validation/HeatPumpEquationFit.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StartTime=10497600.0,
+      StopTime=10505600.0),
+    Documentation(
+      info="<html>
+<p>
+This model validates the models
+<a href=\"modelica://Buildings.Templates.Components.HeatPumps.AirToWater\">
+Buildings.Templates.Components.HeatPumps.AirToWater</a>
+and 
+<a href=\"modelica://Buildings.Templates.Components.HeatPumps.WaterToWater\">
+Buildings.Templates.Components.HeatPumps.WaterToWater</a>
+in a configuration in which the heat pump components are exposed
+to a constant differential pressure and a varying
+return temperature.
+</p>
+<p>
+The AWHP model is configured to represent either a non-reversible heat pump
+(suffix <code>Nrv</code>) or a reversible heat pump
+that switches between cooling and heating mode.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HeatPumpEquationFit;
diff --git a/Buildings/Templates/Components/HeatPumps/Validation/package.mo b/Buildings/Templates/Components/HeatPumps/Validation/package.mo
new file mode 100644
index 00000000000..393eb756c0b
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/Validation/package.mo
@@ -0,0 +1,9 @@
+within Buildings.Templates.Components.HeatPumps;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Components/HeatPumps/Validation/package.order b/Buildings/Templates/Components/HeatPumps/Validation/package.order
new file mode 100644
index 00000000000..4f21dc83d0b
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/Validation/package.order
@@ -0,0 +1 @@
+HeatPumpEquationFit
diff --git a/Buildings/Templates/Components/HeatPumps/WaterToWater.mo b/Buildings/Templates/Components/HeatPumps/WaterToWater.mo
new file mode 100644
index 00000000000..2798e0d1610
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/WaterToWater.mo
@@ -0,0 +1,40 @@
+within Buildings.Templates.Components.HeatPumps;
+model WaterToWater
+  "Water-to-water heat pump - Equation fit model"
+  extends Buildings.Templates.Components.Interfaces.PartialHeatPumpEquationFit(
+    final typ=Buildings.Templates.Components.Types.HeatPump.WaterToWater);
+equation
+  connect(port_aSou, TSouEnt.port_a)
+    annotation (Line(points={{80,-140},{80,-20},{40,-20}},color={0,127,255}));
+  annotation (
+    defaultComponentName="hp",
+    Documentation(
+      info="<html>
+<p>
+This is a model for a water-to-water heat pump where the capacity
+and input power are computed based on the equation fit method.
+The model can be configured with the parameter <code>is_rev</code>
+to represent either a non-reversible heat pump (heating only) or a
+reversible heat pump.
+This model uses
+<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
+Buildings.Fluid.HeatPumps.EquationFitReversible</a>,
+which the user may refer to for the modeling assumptions.
+</p>
+<h4>Control points</h4>
+<p>
+Refer to the documentation of the interface class
+<a href=\"modelica://Buildings.Templates.Components.Interfaces.PartialHeatPumpEquationFit\">
+Buildings.Templates.Components.Interfaces.PartialHeatPumpEquationFit</a>
+for a description of the available control input and output
+variables.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end WaterToWater;
diff --git a/Buildings/Templates/Components/HeatPumps/package.mo b/Buildings/Templates/Components/HeatPumps/package.mo
new file mode 100644
index 00000000000..5b1c797e920
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/package.mo
@@ -0,0 +1,9 @@
+within Buildings.Templates.Components;
+package HeatPumps "Heat pump models"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains models for heat pumps.
+</p>
+</html>"));
+end HeatPumps;
diff --git a/Buildings/Templates/Components/HeatPumps/package.order b/Buildings/Templates/Components/HeatPumps/package.order
new file mode 100644
index 00000000000..c64de8a7909
--- /dev/null
+++ b/Buildings/Templates/Components/HeatPumps/package.order
@@ -0,0 +1,3 @@
+AirToWater
+WaterToWater
+Validation
diff --git a/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo b/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo
new file mode 100644
index 00000000000..95f88a90d38
--- /dev/null
+++ b/Buildings/Templates/Components/Interfaces/PartialHeatPump.mo
@@ -0,0 +1,235 @@
+within Buildings.Templates.Components.Interfaces;
+model PartialHeatPump
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    redeclare final package Medium=MediumHeaWat,
+    final m_flow_nominal=max(mHeaWat_flow_nominal, mChiWat_flow_nominal));
+
+  replaceable package MediumHeaWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "HW medium"
+    annotation(__ctrlFlow(enable=false));
+  /*
+  MediumChiWat is for internal use only.
+  It is the same as MediumHeaWat for reversible HP.
+  Non-reversible HP that can be controlled to produce either HW or CHW
+  shall be modeled with chiller components (as a chiller/heater).
+  */
+  final package MediumChiWat=MediumHeaWat
+    "CHW medium";
+  /*
+  Derived classes representing AWHP shall use: 
+  redeclare final package MediumSou = MediumAir
+  */
+  replaceable package MediumSou=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Source-side medium"
+    annotation(Dialog(enable=
+    typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater),
+    __ctrlFlow(enable=false));
+  replaceable package MediumAir=Buildings.Media.Air
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Air medium"
+    annotation(Dialog(enable=
+    typ==Buildings.Templates.Components.Types.HeatPump.AirToWater),
+    __ctrlFlow(enable=false));
+
+  parameter Buildings.Templates.Components.Types.HeatPump typ
+    "Equipment type"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  parameter Boolean is_rev
+    "Set to true for reversible heat pumps, false for heating only"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  parameter Buildings.Templates.Components.Types.HeatPumpModel typMod=
+    Buildings.Templates.Components.Types.HeatPumpModel.EquationFit
+    "Type of heat pump model"
+    annotation (Evaluate=true, Dialog(group="Configuration"),
+    __ctrlFlow(enable=false));
+
+  parameter Buildings.Templates.Components.Data.HeatPump dat(
+    typ=typ,
+    is_rev=is_rev,
+    typMod=typMod,
+    cpHeaWat_default=cpHeaWat_default,
+    cpSou_default=cpSou_default)
+    "Design and operating parameters"
+    annotation (
+    Placement(transformation(extent={{70,140},{90,160}})),
+    __ctrlFlow(enable=false));
+
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal=
+    dat.mHeaWat_flow_nominal
+    "Design HW mass flow rate";
+  final parameter Modelica.Units.SI.HeatFlowRate capHea_nominal=
+    dat.capHea_nominal
+    "Design heating capacity";
+  final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
+    abs(capHea_nominal)
+    "Design heating heat flow rate";
+  final parameter Modelica.Units.SI.PressureDifference dpHeaWat_nominal=
+    dat.dpHeaWat_nominal
+    "Design HW pressure drop";
+  final parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=
+    dat.THeaWatSup_nominal
+    "Design HW supply temperature";
+  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
+    dat.THeaWatRet_nominal
+    "Design HW return temperature";
+  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal=
+    dat.mChiWat_flow_nominal
+    "Design CHW mass flow rate"
+    annotation(Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal=
+    dat.dpChiWat_nominal
+    "Design CHW pressure drop";
+  final parameter Modelica.Units.SI.HeatFlowRate capCoo_nominal=
+    dat.capCoo_nominal
+    "Design cooling capacity";
+  final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=
+    -abs(capCoo_nominal)
+    "Design cooling heat flow rate";
+  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=
+    dat.TChiWatSup_nominal
+    "Design CHW supply temperature";
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=
+    dat.TChiWatRet_nominal
+    "Design CHW return temperature";
+  final parameter Modelica.Units.SI.MassFlowRate mSouHea_flow_nominal=
+    dat.mSouHea_flow_nominal
+    "Design source fluid mass flow rate in heating mode";
+  final parameter Modelica.Units.SI.PressureDifference dpSouHea_nominal=
+    dat.dpSouHea_nominal
+    "Design source fluid pressure drop in heating mode";
+  final parameter Modelica.Units.SI.MassFlowRate mSouCoo_flow_nominal=
+    dat.mSouCoo_flow_nominal
+    "Design source fluid mass flow rate in cooling mode";
+  final parameter Modelica.Units.SI.PressureDifference dpSouCoo_nominal=
+    dat.dpSouCoo_nominal
+    "Designs source fluid pressure drop in cooling mode";
+  final parameter Modelica.Units.SI.Temperature TSouCoo_nominal=
+    dat.TSouCoo_nominal
+    "Design OAT or source fluid supply temperature (condenser entering) in cooling mode";
+  final parameter Modelica.Units.SI.Temperature TSouHea_nominal=
+    dat.TSouHea_nominal
+    "Design OAT or source fluid supply temperature (evaporator entering) in heating mode";
+
+  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 allowFlowReversalSou = true
+    "Source side flow reversal: false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation(Dialog(tab="Assumptions",
+    enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater), Evaluate=true);
+  parameter Boolean have_preDroChiHeaWat=true
+    "Set to true for CHW/HW pressure drop computed by this model, false for external computation"
+    annotation (Evaluate=true,
+    Dialog(tab="Assumptions"));
+  parameter Boolean have_preDroSou=true
+    "Set to true for source fluid pressure drop computed by this model, false for external computation"
+    annotation (Evaluate=true,
+    Dialog(tab="Assumptions",
+    enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+
+  final parameter MediumHeaWat.SpecificHeatCapacity cpHeaWat_default=
+    MediumHeaWat.specificHeatCapacityCp(staHeaWat_default)
+    "HW default specific heat capacity";
+  final parameter MediumHeaWat.ThermodynamicState staHeaWat_default=
+    MediumHeaWat.setState_pTX(
+      T=THeaWatSup_nominal,
+      p=MediumHeaWat.p_default,
+      X=MediumHeaWat.X_default)
+    "HW default state";
+  final parameter MediumChiWat.SpecificHeatCapacity cpChiWat_default=
+    MediumChiWat.specificHeatCapacityCp(staChiWat_default)
+    "CHW default specific heat capacity";
+  final parameter MediumChiWat.ThermodynamicState staChiWat_default=
+    MediumChiWat.setState_pTX(
+      T=TChiWatSup_nominal,
+      p=MediumChiWat.p_default,
+      X=MediumChiWat.X_default)
+    "CHW default state";
+  final parameter MediumSou.SpecificHeatCapacity cpSou_default=
+    MediumSou.specificHeatCapacityCp(staSou_default)
+    "Source fluid default specific heat capacity";
+  final parameter MediumSou.ThermodynamicState staSou_default=
+    MediumSou.setState_pTX(
+      T=TSouHea_nominal,
+      p=MediumSou.p_default,
+      X=MediumSou.X_default)
+    "Source fluid default state";
+
+  Modelica.Fluid.Interfaces.FluidPort_a port_aSou(
+    redeclare final package Medium = MediumSou)
+    "Fluid connector a (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(
+      iconVisible=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater,
+      transformation(extent={{70,-150},{90,-130}}),
+      iconTransformation(extent={{90,-110},{110,-90}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bSou(
+    redeclare final package Medium = MediumSou)
+    "Fluid connector b (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(
+      iconVisible=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater,
+      transformation(extent={{-70,-150},{-90,-130}}),
+      iconTransformation(extent={{-90,-110},{-110,-90}})));
+  Buildings.Templates.Components.Interfaces.Bus bus
+    "Control bus"
+    annotation (Placement(transformation(extent={{-20,140},{20,180}}),
+     iconTransformation(extent={{-20,80},{20, 120}})));
+  Buildings.BoundaryConditions.WeatherData.Bus busWea
+    if typ==Buildings.Templates.Components.Types.HeatPump.AirToWater
+    "Weather bus"
+    annotation (Placement(transformation(extent={{-60,-160},{-20,-120}}),
+        iconTransformation(extent={{-80,80},{-40,120}})));
+  Fluid.Sources.Outside air(redeclare final package Medium = MediumAir, nPorts=
+        2)
+    if typ == Buildings.Templates.Components.Types.HeatPump.AirToWater
+    "Outdoor air" annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=-90,
+        origin={0,-130})));
+
+  // Diagnostics
+  MediumSou.ThermodynamicState sta_aSou=
+      MediumSou.setState_phX(port_aSou.p,
+                          noEvent(actualStream(port_aSou.h_outflow)),
+                          noEvent(actualStream(port_aSou.Xi_outflow)))
+      if show_T "Source medium properties in port_aSou";
+  MediumSou.ThermodynamicState sta_bSou=
+      MediumSou.setState_phX(port_bSou.p,
+                          noEvent(actualStream(port_bSou.h_outflow)),
+                          noEvent(actualStream(port_bSou.Xi_outflow)))
+      if show_T "Source medium properties in port_bSou";
+equation
+  connect(busWea, air.weaBus) annotation (Line(
+      points={{-40,-140},{0.2,-140}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(port_aSou, air.ports[1]) annotation (Line(points={{80,-140},{80,-120},
+          {-1,-120}}, color={0,127,255}));
+  connect(port_bSou, air.ports[2]) annotation (Line(points={{-80,-140},{-80,
+          -120},{1,-120}}, color={0,127,255}));
+annotation (
+Icon(graphics={
+    Rectangle(
+          extent={{100,60},{-100,-100}},
+          lineColor={0,0,0},
+          lineThickness=1),
+    Bitmap(extent={{-20,60},{20,100}}, fileName=
+    "modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg"),
+    Text( extent={{-60,0},{60,-40}},
+          textColor={0,0,0},
+          textString="HP")}), Documentation(info="<html>
+<p>
+This partial class provides a standard interface for heat pump models.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(coordinateSystem(extent={{-100,-140},{100,160}})));
+end PartialHeatPump;
diff --git a/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo b/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo
new file mode 100644
index 00000000000..d96af2a33bc
--- /dev/null
+++ b/Buildings/Templates/Components/Interfaces/PartialHeatPumpEquationFit.mo
@@ -0,0 +1,196 @@
+within Buildings.Templates.Components.Interfaces;
+model PartialHeatPumpEquationFit
+  "Interface for heat pump using equation fit model"
+  extends Buildings.Templates.Components.Interfaces.PartialHeatPump(
+    final typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit);
+
+  final parameter Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic datPerFit(
+    dpHeaSou_nominal = if have_preDroSou then dat.perFit.dpHeaSou_nominal else 0,
+    dpHeaLoa_nominal = if have_preDroChiHeaWat then dat.perFit.dpHeaLoa_nominal else 0,
+    hea(
+      TRefLoa = dat.perFit.hea.TRefLoa,
+      TRefSou = dat.perFit.hea.TRefSou,
+      Q_flow = dat.perFit.hea.Q_flow,
+      P = dat.perFit.hea.P,
+      mSou_flow = dat.perFit.hea.mSou_flow,
+      mLoa_flow = dat.perFit.hea.mLoa_flow,
+      coeQ = dat.perFit.hea.coeQ,
+      coeP = dat.perFit.hea.coeP),
+    coo(
+      TRefSou = dat.perFit.coo.TRefSou,
+      TRefLoa =  dat.perFit.coo.TRefLoa,
+      Q_flow = dat.perFit.coo.Q_flow,
+      P = dat.perFit.coo.P,
+      coeQ = dat.perFit.coo.coeQ,
+      coeP = dat.perFit.coo.coeP))
+  "Performance data - Equation fit model";
+
+  Modelica.Blocks.Routing.BooleanPassThrough y1Hea if is_rev
+    "Operating mode command: true=heating, false=cooling"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-80,130})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant y1HeaNonRev(
+    final k=true) if not is_rev
+    "Placeholder signal for non-reversible heat pumps"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-40,130})));
+  Controls.StatusEmulator y1_actual
+    "Compute heat pump status"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={40,130})));
+  Fluid.Sensors.MassFlowRate mChiHeaWat_flow(redeclare final package Medium =
+        MediumHeaWat) "CHW/HW mass flow rate"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Fluid.Sensors.TemperatureTwoPort TChiHeaWatEnt(redeclare final package Medium =
+        MediumHeaWat, final m_flow_nominal=max(mChiWat_flow_nominal,
+        mHeaWat_flow_nominal)) "CHW/HW entering temperature"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Fluid.Sensors.TemperatureTwoPort TChiHeaWatLvg(redeclare final package Medium =
+        MediumHeaWat, final m_flow_nominal=max(mChiWat_flow_nominal,
+        mHeaWat_flow_nominal)) "CHW/HW leaving temperature"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Fluid.Sensors.TemperatureTwoPort TSouEnt(
+    redeclare final package Medium = MediumSou, final m_flow_nominal=
+        mSouHea_flow_nominal) "Source fluid entering temperature"
+    annotation (Placement(transformation(extent={{40,-30},{20,-10}})));
+  Fluid.Sensors.TemperatureTwoPort TSouLvg(
+    redeclare final package Medium = MediumSou,
+    final m_flow_nominal=
+        mSouHea_flow_nominal) "Source fluid leaving temperature"
+    annotation (Placement(transformation(
+        extent={{10,-10},{-10,10}},
+        rotation=0,
+        origin={-30,-20})));
+  Buildings.Fluid.HeatPumps.EquationFitReversible hp(
+    uMod(start=0),
+    redeclare final package Medium1 = MediumHeaWat,
+    redeclare final package Medium2 = MediumSou,
+    final per=datPerFit,
+    final energyDynamics=energyDynamics) "Heat pump"
+    annotation (Placement(transformation(extent={{-10,-16},{10,4}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger y1Int
+    "Convert on/off command into integer"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-20,90})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger y1HeaInt(
+    y(start=0),
+    final integerTrue=1,
+    final integerFalse=-1)
+    "Convert heating mode command into integer"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-80,90})));
+  Buildings.Controls.OBC.CDL.Integers.Multiply mulInt
+    "Combine on/off and operating mode command signals"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-20,50})));
+equation
+  /* Control point connection - start */
+  /* Control point connection - stop */
+  connect(bus.y1Hea, y1Hea.u) annotation (Line(
+      points={{0,160},{0,156},{-80,156},{-80,142}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(port_a, mChiHeaWat_flow.port_a)
+    annotation (Line(points={{-100,0},{-90,0}}, color={0,127,255}));
+  connect(mChiHeaWat_flow.port_b, TChiHeaWatEnt.port_a)
+    annotation (Line(points={{-70,0},{-60,0}}, color={0,127,255}));
+  connect(TChiHeaWatLvg.port_b, port_b)
+    annotation (Line(points={{90,0},{100,0}}, color={0,127,255}));
+  connect(TSouLvg.port_b, port_bSou) annotation (Line(points={{-40,-20},{-80,-20},
+          {-80,-140}},      color={0,127,255}));
+  connect(y1Hea.y, y1HeaInt.u) annotation (Line(points={{-80,119},{-80,110.5},{-80,
+          110.5},{-80,102}}, color={255,0,255}));
+  connect(y1HeaNonRev.y, y1HeaInt.u) annotation (Line(points={{-40,118},{-40,110},
+          {-80,110},{-80,102}}, color={255,0,255}));
+  connect(y1HeaInt.y, mulInt.u2) annotation (Line(points={{-80,78},{-80,70},{-26,
+          70},{-26,62}}, color={255,127,0}));
+  connect(y1Int.y, mulInt.u1) annotation (Line(points={{-20,78},{-20,70},{-14,70},
+          {-14,62}}, color={255,127,0}));
+  connect(TChiHeaWatEnt.port_b, hp.port_a1)
+    annotation (Line(points={{-40,0},{-10,0}}, color={0,127,255}));
+  connect(hp.port_b1, TChiHeaWatLvg.port_a)
+    annotation (Line(points={{10,0},{70,0}}, color={0,127,255}));
+  connect(TSouLvg.port_a, hp.port_b2) annotation (Line(points={{-20,-20},{-20,-12},
+          {-10,-12}}, color={0,127,255}));
+  connect(TSouEnt.port_b, hp.port_a2)
+    annotation (Line(points={{20,-20},{20,-12},{10,-12}}, color={0,127,255}));
+  connect(bus.y1, y1Int.u) annotation (Line(
+      points={{0,160},{0,110},{-20,110},{-20,102}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(bus.TSet, hp.TSet) annotation (Line(
+      points={{0,160},{0,86},{0,86},{0,10},{-16,10},{-16,3},{-11.4,3}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(mulInt.y, hp.uMod)
+    annotation (Line(points={{-20,38},{-20,-6},{-11,-6}}, color={255,127,0}));
+  connect(y1_actual.y1_actual, bus.y1_actual)
+    annotation (Line(points={{40,142},{40,156},{0,156},{0,160}},
+                                                         color={255,0,255}));
+  connect(bus.y1, y1_actual.y1) annotation (Line(
+      points={{0,160},{0,110},{40,110},{40,118}},
+      color={255,204,51},
+      thickness=0.5));
+  annotation (
+  defaultComponentName="heaPum",
+  Documentation(info="<html>
+<p>
+This is a model for an air-to-water heat pump where the capacity
+and drawn power are computed based on the equation fit method.
+The model can be configured with the parameter <code>is_rev</code>
+to represent either a non-reversible heat pump (heating only) or a 
+reversible heat pump.
+This model uses 
+<a href=\"modelica://Buildings.Fluid.HeatPumps.EquationFitReversible\">
+Buildings.Fluid.HeatPumps.EquationFitReversible</a>,
+which the user may refer to for the modeling assumptions.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Heat pump on/off command signal <code>y1</code>:
+DO signal, with a dimensionality of zero
+</li>
+<li>For reversible heat pumps only (<code>is_rev=true</code>),
+Heat pump operating mode command signal <code>y1Hea</code>:
+DO signal, with a dimensionality of zero<br/>
+(<code>y1Hea=true</code> for heating mode, 
+<code>y1Hea=false</code> for cooling mode)
+</li>
+<li>
+Heat pump supply temperature setpoint <code>TSet</code>:
+AO signal, with a dimensionality of zero<br/>
+(for reversible heat pumps, the setpoint value must be
+switched externally between HW and CHW supply temperature)
+</li>
+<li>
+Heat pump status <code>y1_actual</code>:
+DI signal, with a dimensionality of zero
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialHeatPumpEquationFit;
diff --git a/Buildings/Templates/Components/Interfaces/PartialPump.mo b/Buildings/Templates/Components/Interfaces/PartialPump.mo
new file mode 100644
index 00000000000..1d1ab7160c3
--- /dev/null
+++ b/Buildings/Templates/Components/Interfaces/PartialPump.mo
@@ -0,0 +1,97 @@
+within Buildings.Templates.Components.Interfaces;
+model PartialPump "Base class for all pump models"
+  parameter Buildings.Templates.Components.Types.Pump typ
+    "Equipment type"
+    annotation (Evaluate=true, Dialog(group="Configuration", enable=false));
+
+  parameter Boolean have_var=true
+    "Set to true for variable speed pump, false for constant speed pump"
+    annotation (Evaluate=true, Dialog(group="Configuration",
+    enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  parameter Boolean have_varCom=true
+    "Set to true for single common speed signal, false for dedicated signals"
+    annotation (Evaluate=true, Dialog(group="Configuration",
+    enable=typ==Buildings.Templates.Components.Types.Pump.Multiple and have_var));
+
+  parameter Boolean have_valChe=true
+    "Set to true to include a check valve in pump line"
+    annotation (Evaluate=true, Dialog(group="Configuration",
+    enable=typ<>Buildings.Templates.Components.Types.Pump.None),
+    __Linkage(enable=false));
+
+  parameter Boolean addPowerToMedium=false
+    "Set to false to avoid any power (=heat and flow work) being added to medium (may give simpler equations)"
+    annotation(__Linkage(enable=false));
+
+  parameter Modelica.Units.SI.Time tau=1
+    "Time constant of fluid volume for nominal flow, used if energy or mass balance is dynamic"
+    annotation (Dialog(
+      tab="Dynamics",
+      group="Nominal condition",
+      enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
+      __Linkage(enable=false));
+  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"),
+      __Linkage(enable=false));
+  parameter Boolean allowFlowReversal = true
+    "= false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation(Dialog(tab="Assumptions"), Evaluate=true, __Linkage(enable=false));
+
+  parameter Integer text_rotation = 0
+    "Text rotation angle in icon layer"
+    annotation(Dialog(tab="Graphics", enable=false));
+  parameter Boolean text_flip = false
+    "True to flip text horizontally in icon layer"
+    annotation(Dialog(tab="Graphics", enable=false));
+
+  Buildings.Templates.Components.Interfaces.Bus bus
+    "Control bus"
+    annotation (
+      Placement(transformation(
+        extent={{-20,-20},{20,20}},
+        rotation=0,
+        origin={0,100}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={0,100})));
+
+  annotation (                   Documentation(info="<html>
+<p>
+This partial class provides a standard interface for pump models.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 28, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"), Icon(graphics={
+    Line( points={{-100,0},{100,0}},
+          color={0,0,0},
+          thickness=5),
+    Bitmap(
+      visible=typ <> Buildings.Templates.Components.Types.Pump.None and
+          have_valChe,
+      extent={{20,-40},{100,40}},
+      fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg"),
+    Bitmap(
+          visible=typ <> Buildings.Templates.Components.Types.Pump.None,
+          extent={{-100,-70},{0,30}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_var,
+        extent={{-100,60},{0,160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and not have_var,
+        extent={{-100,60},{0,160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Line( visible=typ <> Buildings.Templates.Components.Types.Pump.None,
+          points={{-50,60},{-50,22}},
+          color={0,0,0})}));
+end PartialPump;
diff --git a/Buildings/Templates/Components/Interfaces/PartialPumpMultiple.mo b/Buildings/Templates/Components/Interfaces/PartialPumpMultiple.mo
new file mode 100644
index 00000000000..c8dd8374704
--- /dev/null
+++ b/Buildings/Templates/Components/Interfaces/PartialPumpMultiple.mo
@@ -0,0 +1,220 @@
+within Buildings.Templates.Components.Interfaces;
+partial model PartialPumpMultiple
+  "Interface class for multiple pumps in parallel arrangement"
+  extends Buildings.Templates.Components.Interfaces.PartialPump;
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium in the component"
+    annotation(__Linkage(enable=false));
+
+  parameter Integer nPum(
+    final min=0,
+    start=1)
+    "Number of pumps"
+    annotation (Dialog(group="Configuration",
+    enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+
+  parameter Buildings.Templates.Components.Data.PumpMultiple dat(
+    final nPum=nPum,
+    final typ=typ)
+    "Design and operating parameters"
+    annotation(__Linkage(enable=false));
+
+  final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nPum](
+    each final min=0)=dat.m_flow_nominal
+    "Nominal mass flow rate"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  final parameter Modelica.Units.SI.PressureDifference dp_nominal[nPum](
+    each final min=0,
+    each displayUnit="Pa")=dat.dp_nominal
+    "Pump head at design conditions"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+  // This parameter is declared outside the parameter record dat as
+  // it is considered to be an advanced parameter for which a default
+  // value can probably be used.
+  parameter Modelica.Units.SI.PressureDifference dpValChe_nominal[nPum](
+    each final min=0,
+    each start=Buildings.Templates.Data.Defaults.dpValChe,
+    each displayUnit="Pa")=fill(Buildings.Templates.Data.Defaults.dpValChe, nPum)
+    "Check valve pressure drop at design conditions"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Pump.None
+      and have_valChe));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_a[nPum](
+    redeclare each final package Medium = Medium,
+     each m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
+     each h_outflow(start = Medium.h_default, nominal = Medium.h_default),
+    each p(start=Medium.p_default))
+     "Vectorized fluid connector a (positive design flow direction is from port(s)_a to port(s)_b)"
+     annotation (Placement(
+        transformation(extent={{-110,-40},{-90,40}}), iconTransformation(extent={{-110,
+            -40},{-90,40}})));
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_b[nPum](
+    redeclare each final package Medium = Medium,
+     each m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
+     each h_outflow(start = Medium.h_default, nominal = Medium.h_default),
+    each p(start=Medium.p_default))
+     "Vectorized fluid connector b (positive design flow direction is from port(s)_a to port(s)_b)"
+     annotation (Placement(
+        transformation(extent={{90,-40},{110,40}}), iconTransformation(extent={{90,-40},
+            {110,40}})));
+
+  parameter Integer icon_dy = 300
+    "Distance in y-direction between each unit in icon layer"
+    annotation(Dialog(tab="Graphics", enable=false));
+
+  annotation (Documentation(info="<html>
+<p>
+This partial class provides a standard interface for models
+of multiple pumps in parallel arrangement.
+Note that the inlet and outlet manifolds are not included
+in this model. This way, the same interface can be used to model
+both headered pumps and dedicated pumps.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 28, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"), Icon(graphics={
+    Text(
+      extent={{-149,-114},{151,-154}},
+      textColor={0,0,255},
+      textString="%name"),
+    Line( visible=typ <> Buildings.Templates.Components.Types.Pump.None and
+              nPum >= 2,
+          points={{-100,icon_dy},{100,icon_dy}},
+          color={0,0,0},
+          thickness=5),
+    Line( visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=2,
+          points={{-50,icon_dy+60},{-50,icon_dy+22}},
+          color={0,0,0}),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=2,
+        extent={{-100,icon_dy-70},{0,icon_dy+30}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_valChe and nPum>=2,
+        extent={{20,icon_dy-40},{100,icon_dy+40}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_var and nPum>=2,
+        extent={{-100,icon_dy+60},{0,icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and not have_var and nPum>=2,
+        extent={{-100,icon_dy+60},{0,icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Line(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=3,
+      points={{-100,2*icon_dy},{100,2*icon_dy}},
+      color={0,0,0},
+      thickness=5),
+    Line( visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=3,
+          points={{-50,2*icon_dy+60},{-50,2*icon_dy+22}},
+          color={0,0,0}),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=3,
+        extent={{-100,2*icon_dy-70},{0,2*icon_dy+30}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_valChe and nPum>=3,
+        extent={{20, 2*icon_dy-40},{100, 2*icon_dy+40}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_var and nPum>=3,
+        extent={{-100, 2*icon_dy+60},{0, 2*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and not have_var and nPum>=3,
+        extent={{-100, 2*icon_dy+60},{0, 2*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Line(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=4,
+      points={{-100, 3*icon_dy},{100, 3*icon_dy}},
+      color={0,0,0},
+      thickness=5),
+    Line( visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=4,
+          points={{-50, 3*icon_dy+60},{-50, 3*icon_dy+22}},
+          color={0,0,0}),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=4,
+        extent={{-100, 3*icon_dy-70},{0, 3*icon_dy+30}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_valChe and nPum>=4,
+        extent={{20, 3*icon_dy-40},{100, 3*icon_dy+40}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_var and nPum>=4,
+        extent={{-100, 3*icon_dy+60},{0, 3*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and not have_var and nPum>=4,
+        extent={{-100, 3*icon_dy+60},{0, 3*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Line(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=5,
+      points={{-100, 4*icon_dy},{100, 4*icon_dy}},
+      color={0,0,0},
+      thickness=5),
+    Line( visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=5,
+          points={{-50, 4*icon_dy+60},{-50, 4*icon_dy+22}},
+          color={0,0,0}),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=5,
+        extent={{-100, 4*icon_dy-70},{0, 4*icon_dy+30}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_valChe and nPum>=5,
+        extent={{20, 4*icon_dy-40},{100, 4*icon_dy+40}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_var and nPum>=5,
+        extent={{-100, 4*icon_dy+60},{0, 4*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and not have_var and nPum>=5,
+        extent={{-100, 4*icon_dy+60},{0, 4*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Line(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=6,
+      points={{-100, 5*icon_dy},{100, 5*icon_dy}},
+      color={0,0,0},
+      thickness=5),
+    Line( visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=6,
+          points={{-50, 5*icon_dy+60},{-50, 5*icon_dy+22}},
+          color={0,0,0}),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and nPum>=6,
+        extent={{-100, 5*icon_dy-70},{0, 5*icon_dy+30}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_valChe and nPum>=6,
+        extent={{20, 5*icon_dy-40},{100, 5*icon_dy+40}},
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and have_var and nPum>=6,
+        extent={{-100, 5*icon_dy+60},{0, 5*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+    Bitmap(
+      visible=typ<>Buildings.Templates.Components.Types.Pump.None and not have_var and nPum>=6,
+        extent={{-100, 5*icon_dy+60},{0, 5*icon_dy+160}},
+        rotation=text_rotation,
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg")}));
+
+end PartialPumpMultiple;
diff --git a/Buildings/Templates/Components/Interfaces/PartialPumpSingle.mo b/Buildings/Templates/Components/Interfaces/PartialPumpSingle.mo
new file mode 100644
index 00000000000..6b210d8825a
--- /dev/null
+++ b/Buildings/Templates/Components/Interfaces/PartialPumpSingle.mo
@@ -0,0 +1,48 @@
+within Buildings.Templates.Components.Interfaces;
+partial model PartialPumpSingle "Interface class for single pump"
+  extends Buildings.Templates.Components.Interfaces.PartialPump;
+  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
+    redeclare replaceable package Medium=Buildings.Media.Water,
+    final m_flow_nominal(min=0)=dat.m_flow_nominal)
+    annotation(__Linkage(enable=false));
+
+  parameter Buildings.Templates.Components.Data.PumpSingle dat(
+    final typ=typ)
+    "Design and operating parameters"
+    annotation(__Linkage(enable=false));
+
+  final parameter Modelica.Units.SI.PressureDifference dp_nominal(
+    final min=0,
+    displayUnit="Pa")=dat.dp_nominal
+    "Pump head at design conditions"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Pump.None));
+
+  // This parameter is declared outside the parameter record dat as
+  // it is considered to be an advanced parameter for which a default
+  // value can probably be used.
+  parameter Modelica.Units.SI.PressureDifference dpValChe_nominal(
+    final min=0,
+    start=Buildings.Templates.Data.Defaults.dpValChe,
+    displayUnit="Pa")=Buildings.Templates.Data.Defaults.dpValChe
+    "Check valve pressure drop at design conditions"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ<>Buildings.Templates.Components.Types.Pump.None
+      and have_valChe));
+
+  annotation (
+  Icon(coordinateSystem(preserveAspectRatio=false)),
+  Documentation(info="<html>
+<p>
+This partial class provides a standard interface for 
+single pump models.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+April 28, 2023, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialPumpSingle;
diff --git a/Buildings/Templates/Components/Interfaces/PartialSensor.mo b/Buildings/Templates/Components/Interfaces/PartialSensor.mo
index a714f4d78a3..bc8a979f99b 100644
--- a/Buildings/Templates/Components/Interfaces/PartialSensor.mo
+++ b/Buildings/Templates/Components/Interfaces/PartialSensor.mo
@@ -1,7 +1,7 @@
 within Buildings.Templates.Components.Interfaces;
 partial model PartialSensor "Interface class for sensor"
   extends Buildings.Fluid.Interfaces.PartialTwoPortInterface
-    annotation(__ctrlFlow(enable=false));
+    annotation(__Linkage(enable=false));
 
   parameter Boolean have_sen=true
     "Set to true for sensor, false for direct pass through"
@@ -16,6 +16,10 @@ partial model PartialSensor "Interface class for sensor"
   parameter Boolean text_flip = false
     "True to flip text horizontally in icon layer"
     annotation(Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
+    Buildings.Templates.Components.Types.IconPipe.None
+    "Pipe symbol"
+    annotation(Dialog(tab="Graphics", enable=false));
 
   Buildings.Controls.OBC.CDL.Interfaces.RealOutput y if have_sen
     "Connector for measured value"
@@ -42,12 +46,16 @@ equation
 
   annotation (
     Icon(coordinateSystem(preserveAspectRatio=false),
-      graphics={
-      Line(
-        visible=(not have_sen) and (not isDifPreSen),
-          points={{-100,0},{100,0}},
-          color={28,108,200},
-          thickness=1)}),
+    graphics={Line(
+        visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None
+        or (not have_sen) and (not isDifPreSen),
+        points={{-100,0},{100,0}},
+        color=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.None
+        then {28,108,200} else {0,0,0},
+        thickness=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.None
+        then 1 else 5,
+        pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Return
+        then LinePattern.Dash else LinePattern.Solid)}),
     Diagram(coordinateSystem(preserveAspectRatio=false)),
     Documentation(info="<html>
 <p>
diff --git a/Buildings/Templates/Components/Interfaces/package.order b/Buildings/Templates/Components/Interfaces/package.order
index 7fc811573cd..c90cefc1586 100644
--- a/Buildings/Templates/Components/Interfaces/package.order
+++ b/Buildings/Templates/Components/Interfaces/package.order
@@ -1,4 +1,9 @@
 Bus
 PartialCoil
 PartialFan
+PartialHeatPump
+PartialHeatPumpEquationFit
+PartialPump
+PartialPumpMultiple
+PartialPumpSingle
 PartialSensor
diff --git a/Buildings/Templates/Components/Pumps/Multiple.mo b/Buildings/Templates/Components/Pumps/Multiple.mo
new file mode 100644
index 00000000000..31d36eae8ea
--- /dev/null
+++ b/Buildings/Templates/Components/Pumps/Multiple.mo
@@ -0,0 +1,179 @@
+within Buildings.Templates.Components.Pumps;
+model Multiple "Multiple pumps in parallel"
+  extends Buildings.Templates.Components.Interfaces.PartialPumpMultiple(
+    final typ=Buildings.Templates.Components.Types.Pump.Multiple);
+
+  replaceable Buildings.Fluid.Movers.SpeedControlled_y pum[nPum](
+    redeclare each final package Medium=Medium,
+    final per=dat.per,
+    each final inputType=Buildings.Fluid.Types.InputType.Continuous,
+    each final addPowerToMedium=addPowerToMedium,
+    each final energyDynamics=energyDynamics,
+    each final tau=tau,
+    each final allowFlowReversal=allowFlowReversal)
+    "Pumps"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Fluid.FixedResistances.CheckValve valChe[nPum](
+    redeclare each final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final dpValve_nominal=dpValChe_nominal)
+    if have_valChe "Check valve"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Routing.PassThroughFluid pas[nPum](
+    redeclare each final package Medium = Medium) if not have_valChe
+    "Fluid pass through if no check valve"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal sigSta[nPum]
+    "Start/stop signal"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-60,70})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply sigCon[nPum]
+    "Resulting control signal"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={0,30})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaSpe(
+    final nout=nPum) if have_var and have_varCom
+    "Replicate signal in case of common unique commanded speed" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-20,70})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant speCst[nPum](
+    final k=fill(1, nPum)) if not have_var
+    "Constant signal in case of constant speed pump" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={60,70})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasSpe(
+    final nin=nPum,
+    final nout=nPum) if have_var and not have_varCom
+    "Direct pass through for dedicated speed signals" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={20,70})));
+  Controls.StatusEmulator sta[nPum] "Emulate pump status"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+equation
+  connect(pum.port_b,valChe. port_a)
+    annotation (Line(points={{10,0},{30,0},{30,20},{40,20}}, color={0,127,255}));
+  connect(sigSta.y, sigCon.u2)
+    annotation (Line(points={{-60,58},{-60,46},{-6,46},{-6,42}},
+      color={0,0,127}));
+  connect(sigCon.y, pum.y)
+    annotation (Line(points={{0,18},{0,15},{0,12}}, color={0,0,127}));
+  connect(valChe.port_b, ports_b)
+    annotation (Line(points={{60,20},{70,20},{70,0},{100,0}}, color={0,127,255}));
+  connect(ports_a, pum.port_a)
+    annotation (Line(points={{-100,0},{-10,0}}, color={0,127,255}));
+  connect(bus.y1, sigSta.u) annotation (Line(
+      points={{0,100},{0,88},{-60,88},{-60,82}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{-3,6},{-3,6}},
+      horizontalAlignment=TextAlignment.Right));
+  connect(reaSpe.y, sigCon.u1) annotation (Line(points={{-20,58},{-20,50},{6,50},
+          {6,42}}, color={0,0,127}));
+  connect(bus.y, reaSpe.u) annotation (Line(
+      points={{0,100},{0,88},{-20,88},{-20,82}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{-3,6},{-3,6}},
+      horizontalAlignment=TextAlignment.Right));
+  connect(speCst.y, sigCon.u1)
+    annotation (Line(points={{60,58},{60,50},{6,50},{6,42}}, color={0,0,127}));
+  connect(bus.y, pasSpe.u) annotation (Line(
+      points={{0,100},{0,88},{20,88},{20,82}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{-6,3},{-6,3}},
+      horizontalAlignment=TextAlignment.Right));
+  connect(pasSpe.y, sigCon.u1)
+    annotation (Line(points={{20,58},{20,50},{6,50},{6,42}}, color={0,0,127}));
+  connect(pum.port_b, pas.port_a) annotation (Line(points={{10,0},{30,0},{30,-20},
+          {40,-20}}, color={0,127,255}));
+  connect(pas.port_b, ports_b) annotation (Line(points={{60,-20},{70,-20},{70,0},
+          {100,0}}, color={0,127,255}));
+  connect(sta.y1_actual, bus.y1_actual) annotation (Line(points={{12,-60},{80,
+          -60},{80,96},{0,96},{0,100}}, color={255,0,255}));
+  connect(bus.y1, sta.y1) annotation (Line(
+      points={{0,100},{0,88},{-80,88},{-80,-60},{-12,-60}},
+      color={255,204,51},
+      thickness=0.5));
+  annotation (
+  defaultComponentName="pum",
+  Documentation(info="<html>
+<p>
+This is a model for a parallel arrangement of <code>nPum</code> pumps
+with optional check valves (depending on the value of the parameter
+<code>have_valChe</code>).
+</p>
+<p>
+Note that the inlet and outlet manifolds are not included in this model.
+The manifolds may be modeled with
+<a href=\"modelica://Buildings.Templates.Components.Routing.MultipleToMultiple\">
+Buildings.Templates.Components.Routing.MultipleToMultiple</a>.
+This allows representing both headered and dedicated arrangements.
+</p>
+<p>
+By default, variable speed pumps are modeled.
+Constant speed pumps can be modeled by setting the parameter
+<code>have_var</code> to <code>false</code>.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Pump Start/Stop command (VFD Run or motor starter contact)
+<code>y1</code>:
+DO signal dedicated to each unit, with a dimensionality of one
+</li>
+<li>
+Pump speed command (VFD Speed) <code>y</code> for variable speed pumps only:
+<ul>
+<li>
+If <code>have_varCom</code>: AO signal common to all units,
+with a dimensionality of zero
+</li>
+<li>
+If <code>not have_varCom</code>: AO signal dedicated to each unit,
+with a dimensionality of one
+</li>
+</ul>
+</li>
+<li>
+Pump status (through VFD interface, VFD status contact,
+or current switch) <code>y1_actual</code>:
+DI signal dedicated to each unit, with a dimensionality of one
+</li>
+</ul>
+<h4>Model parameters</h4>
+<p>
+The design parameters and the pump characteristics are specified with an instance of
+<a href=\"modelica://Buildings.Templates.Components.Data.PumpMultiple\">
+Buildings.Templates.Components.Data.PumpMultiple</a>.
+The documentation of this record class provides further details on how to
+properly parameterize the model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+November 18, 2022, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Multiple;
diff --git a/Buildings/Templates/Components/Pumps/Single.mo b/Buildings/Templates/Components/Pumps/Single.mo
new file mode 100644
index 00000000000..1a524680de3
--- /dev/null
+++ b/Buildings/Templates/Components/Pumps/Single.mo
@@ -0,0 +1,148 @@
+within Buildings.Templates.Components.Pumps;
+model Single "Single pump"
+  extends Buildings.Templates.Components.Interfaces.PartialPumpSingle(
+    final typ=Buildings.Templates.Components.Types.Pump.Single);
+
+  replaceable Buildings.Fluid.Movers.SpeedControlled_y pum(
+    redeclare final package Medium=Medium,
+    final per=dat.per,
+    final inputType=Buildings.Fluid.Types.InputType.Continuous,
+    final addPowerToMedium=addPowerToMedium,
+    final energyDynamics=energyDynamics,
+    final tau=tau,
+    final allowFlowReversal=allowFlowReversal)
+    "Pump"
+    annotation (
+      Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal sigSta
+    "Start/stop signal"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={-60,70})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply sigCon
+    "Resulting control signal"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={0,30})));
+  Fluid.FixedResistances.CheckValve valChe(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=dat.m_flow_nominal,
+    final dpValve_nominal=dpValChe_nominal)
+    if have_valChe
+    "Check valve"
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
+  Routing.PassThroughFluid pas(
+    redeclare final package Medium=Medium) if not have_valChe
+    "Fluid pass through if no check valve"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant speCst(
+    final k=1) if not have_var
+    "Constant signal in case of constant speed pump"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={60,70})));
+  Modelica.Blocks.Routing.RealPassThrough pasSpe if have_var
+    "Direct pass through for variable speed signal"
+    annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={0,70})));
+  Controls.StatusEmulator sta "Emulate pump status"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+equation
+  connect(sigSta.y, sigCon.u2)
+    annotation (Line(points={{-60,58},{-60,50},{-6,50},{-6,42}},
+      color={0,0,127}));
+  connect(sigCon.y, pum.y)
+    annotation (Line(points={{0,18},{0,15},{0,12}}, color={0,0,127}));
+  connect(port_a, pum.port_a)
+    annotation (Line(points={{-100,0},{-10,0}}, color={0,127,255}));
+  connect(bus.y, pasSpe.u) annotation (Line(
+      points={{0,100},{2.22045e-15,100},{2.22045e-15,82}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{-3,6},{-3,6}},
+      horizontalAlignment=TextAlignment.Right));
+  connect(pasSpe.y, sigCon.u1)
+    annotation (Line(points={{0,59},{0,50},{6,50},{6,42}}, color={0,0,127}));
+  connect(speCst.y, sigCon.u1)
+    annotation (Line(points={{60,58},{60,50},{6,50},{6,42}}, color={0,0,127}));
+  connect(bus.y1, sigSta.u) annotation (Line(
+      points={{0,100},{0,88},{-60,88},{-60,82}},
+      color={255,204,51},
+      thickness=0.5), Text(
+      string="%first",
+      index=-1,
+      extent={{6,3},{6,3}},
+      horizontalAlignment=TextAlignment.Left));
+  connect(pum.port_b, valChe.port_a) annotation (Line(points={{10,0},{28,0},{28,
+          20},{40,20}}, color={0,127,255}));
+  connect(valChe.port_b, port_b) annotation (Line(points={{60,20},{70,20},{70,0},
+          {100,0}}, color={0,127,255}));
+  connect(pum.port_b, pas.port_a) annotation (Line(points={{10,0},{28,0},{28,-20},
+          {40,-20}}, color={0,127,255}));
+  connect(pas.port_b, port_b) annotation (Line(points={{60,-20},{70,-20},{70,0},
+          {100,0}}, color={0,127,255}));
+  connect(bus.y1, sta.y1) annotation (Line(
+      points={{0,100},{0,88},{-80,88},{-80,-60},{-12,-60}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(sta.y1_actual, bus.y1_actual) annotation (Line(points={{12,-60},{80,
+          -60},{80,96},{0,96},{0,100}}, color={255,0,255}));
+  annotation (
+  defaultComponentName="pum",
+  Documentation(info="<html>
+<p>
+This is a model for a single pump
+with an optional check valve (depending on the value of the parameter
+<code>have_valChe</code>).
+</p>
+<p>
+By default, a variable speed pump is modeled.
+A constant speed pump can be modeled by setting the parameter
+<code>have_var</code> to <code>false</code>.
+</p>
+<h4>Control points</h4>
+<p>
+The following input and output points are available.
+</p>
+<ul>
+<li>
+Pump Start/Stop command (VFD Run or motor starter contact)
+<code>y1</code>:
+DO signal
+</li>
+<li>
+Pump speed command (VFD Speed) <code>y</code> for variable speed pumps only:
+AO signal
+</li>
+<li>
+Pump status (through VFD interface, VFD status contact,
+or current switch) <code>y1_actual</code>:
+DI signal
+</li>
+</ul>
+<h4>Model parameters</h4>
+<p>
+The design parameters and the pump characteristics are specified with an instance of
+<a href=\"modelica://Buildings.Templates.Components.Data.PumpSingle\">
+Buildings.Templates.Components.Data.PumpSingle</a>.
+The documentation of this record class provides further details on how to
+properly parameterize the model.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+November 18, 2022, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Single;
diff --git a/Buildings/Templates/Components/Pumps/package.mo b/Buildings/Templates/Components/Pumps/package.mo
new file mode 100644
index 00000000000..d1f4ec5215f
--- /dev/null
+++ b/Buildings/Templates/Components/Pumps/package.mo
@@ -0,0 +1,15 @@
+within Buildings.Templates.Components;
+package Pumps "Pump models"
+  extends Modelica.Icons.VariantsPackage;
+
+
+
+
+
+
+annotation (Documentation(info="<html>
+<p>
+This package contains models for pumps.
+</p>
+</html>"));
+end Pumps;
diff --git a/Buildings/Templates/Components/Pumps/package.order b/Buildings/Templates/Components/Pumps/package.order
new file mode 100644
index 00000000000..b8bb7e28f05
--- /dev/null
+++ b/Buildings/Templates/Components/Pumps/package.order
@@ -0,0 +1,2 @@
+Multiple
+Single
diff --git a/Buildings/Templates/Components/Routing/Junction.mo b/Buildings/Templates/Components/Routing/Junction.mo
new file mode 100644
index 00000000000..d7831a4cce2
--- /dev/null
+++ b/Buildings/Templates/Components/Routing/Junction.mo
@@ -0,0 +1,56 @@
+within Buildings.Templates.Components.Routing;
+model Junction "Flow splitter with fixed resistance at each port"
+  extends Buildings.Fluid.FixedResistances.Junction
+  annotation (
+    IconMap(primitivesVisible = false));
+
+  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe1 =
+    Buildings.Templates.Components.Types.IconPipe.Supply
+    "Pipe symbol - Branch 1"
+    annotation(Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe2 = icon_pipe1
+    "Pipe symbol - Branch 2"
+    annotation(Dialog(tab="Graphics", enable=false));
+  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe3 = icon_pipe1
+    "Pipe symbol - Branch 3"
+    annotation(Dialog(tab="Graphics", enable=false));
+  annotation (Icon(graphics={
+  Line(
+    points={{-100,0},{0,0}},
+    color={0,0,0},
+    thickness=5,
+    pattern=if icon_pipe1==Buildings.Templates.Components.Types.IconPipe.Supply then
+    LinePattern.Solid elseif icon_pipe1==Buildings.Templates.Components.Types.IconPipe.Return
+    then LinePattern.Dash else LinePattern.None),
+  Line(
+    points={{0,0},{100,0}},
+    color={0,0,0},
+    thickness=5,
+    pattern=if icon_pipe2==Buildings.Templates.Components.Types.IconPipe.Supply then
+    LinePattern.Solid elseif icon_pipe2==Buildings.Templates.Components.Types.IconPipe.Return
+    then LinePattern.Dash else LinePattern.None),
+  Line(
+    points={{0,0},{0,-100}},
+    color={0,0,0},
+    thickness=5,
+    pattern=if icon_pipe3==Buildings.Templates.Components.Types.IconPipe.Supply then
+    LinePattern.Solid elseif icon_pipe3==Buildings.Templates.Components.Types.IconPipe.Return
+    then LinePattern.Dash else LinePattern.None)}), Documentation(info="<html>
+<p>
+This is a model of a flow junction with an optional fixed resistance 
+in each flow leg and an optional mixing volume at the junction.
+This model is identical to 
+<a href=\"modelica://Buildings.Fluid.FixedResistances.Junction\">
+Buildings.Fluid.FixedResistances.Junction</a>
+except for the icon which has been changed for better integration
+into the templates.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Junction;
diff --git a/Buildings/Templates/Components/Routing/MultipleToMultiple.mo b/Buildings/Templates/Components/Routing/MultipleToMultiple.mo
index e23e8ac3d7c..c94efade48e 100644
--- a/Buildings/Templates/Components/Routing/MultipleToMultiple.mo
+++ b/Buildings/Templates/Components/Routing/MultipleToMultiple.mo
@@ -42,16 +42,17 @@ model MultipleToMultiple
     annotation (
       Dialog(tab="Advanced", group="Diagnostics"), HideResult=true);
 
-  parameter Integer icon_extend = 0
-    "Extend lines by this amount in x-direction in icon layer: >0 at outlet, <0 at inlet"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Integer icon_dy = 100
-    "Distance in y-direction between each branch in icon layer"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
+  constant Integer icon_xinl = -100
+    "Minimum x-coordinate of inlet connection lines";
+  constant Integer icon_xout = 100
+    "Maximum x-coordinate of outlet connection lines";
+  constant Integer icon_offset = 0
+    "Offset in y-direction between inlet and outlet in icon layer";
+  constant Integer icon_dy = 100
+    "Distance in y-direction between each branch in icon layer";
+  constant Buildings.Templates.Components.Types.IconPipe icon_pipe =
     Buildings.Templates.Components.Types.IconPipe.Supply
-    "Pipe symbol"
-    annotation(Dialog(tab="Graphics", enable=false));
+    "Pipe symbol";
 
   Modelica.Fluid.Interfaces.FluidPorts_a ports_a[nPorts_a](
     redeclare each final package Medium = Medium,
@@ -160,49 +161,84 @@ equation
     Text( extent={{-149,-114},{151,-154}},
           textColor={0,0,255},
           textString="%name"),
-    Line( points={{-100 + min(0,icon_extend), 0}, {100 + max(0, icon_extend),0}},
+    Line( points={{-100, 0}, {100, 0}},
+          color={0,127,255},
+          visible=icon_pipe==Buildings.Templates.Components.Types.IconPipe.None),
+    Line( points={{icon_xinl, 0}, {0,0}},
           color={0,0,0},
           thickness=5,
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=2,
-          points=if have_comLeg then
-            {{-100 + min(0,icon_extend), icon_dy}, {-40,icon_dy}, {-40, 0}}
-            else {{-100 + min(0,icon_extend),icon_dy}, {100 + max(0, icon_extend),icon_dy}},
+    Line( visible=nPorts_a>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{icon_xinl, icon_dy}, {0,icon_dy}},
           color={0,0,0},
           thickness=5,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=3,
-          points=if have_comLeg then
-            {{-100 + min(0,icon_extend), 2*icon_dy}, {-40, 2*icon_dy}, {-40, icon_dy}}
-            else {{-100 + min(0,icon_extend),2*icon_dy}, {100 + max(0, icon_extend),2*icon_dy}},
+    Line( visible=nPorts_a>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{icon_xinl, 2*icon_dy}, {0, 2*icon_dy}},
           color={0,0,0},
           thickness=5,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_a>=4,
-          points=if have_comLeg then
-            {{-100 + min(0,icon_extend), 3*icon_dy}, {-40, 3*icon_dy}, {-40, 2*icon_dy}}
-            else {{-100 + min(0,icon_extend),3*icon_dy}, {100 + max(0, icon_extend),3*icon_dy}},
+    Line( visible=nPorts_a>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{icon_xinl, 3*icon_dy}, {0, 3*icon_dy}},
           color={0,0,0},
           thickness=5,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=2 and have_comLeg,
-          points={{40, 0}, {40, icon_dy}, {100 + max(0, icon_extend), icon_dy}},
+    Line( visible=nPorts_a>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{icon_xinl, 4*icon_dy}, {0, 4*icon_dy}},
           color={0,0,0},
           thickness=5,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=3 and have_comLeg,
-          points={{40, icon_dy}, {40, 2*icon_dy}, {100 + max(0, icon_extend), 2*icon_dy}},
+    Line( visible=nPorts_a>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{icon_xinl, 5*icon_dy}, {0, 5*icon_dy}},
           color={0,0,0},
           thickness=5,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts_b>=4 and have_comLeg,
-          points={{40, 2*icon_dy}, {40, 3*icon_dy}, {100 + max(0, icon_extend), 3*icon_dy}},
+    Line( points={{0, icon_offset}, {icon_xout,icon_offset}},
+          color={0,0,0},
+          thickness=5,
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash),
+    Line( visible=nPorts_b>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{0, icon_offset + 1*icon_dy}, {icon_xout,icon_offset + 1*icon_dy}},
+          color={0,0,0},
+          thickness=5,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash),
+    Line( visible=nPorts_b>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{0, icon_offset + 2*icon_dy}, {icon_xout,icon_offset + 2*icon_dy}},
+          color={0,0,0},
+          thickness=5,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash),
+    Line( visible=nPorts_b>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{0, icon_offset + 3*icon_dy}, {icon_xout,icon_offset + 3*icon_dy}},
+          color={0,0,0},
+          thickness=5,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash),
+    Line( visible=nPorts_b>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{0, icon_offset + 4*icon_dy}, {icon_xout,icon_offset + 4*icon_dy}},
+          color={0,0,0},
+          thickness=5,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash),
+    Line( visible=nPorts_b>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points={{0, icon_offset + 5*icon_dy}, {icon_xout,icon_offset + 5*icon_dy}},
+          color={0,0,0},
+          thickness=5,
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash),
+    Line( visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None and
+          max(nPorts_a, nPorts_b)>=2 and have_comLeg,
+          points={{0, 0}, {0, icon_offset + (max(nPorts_a, nPorts_b)-1)*icon_dy}},
           color={0,0,0},
           thickness=5,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
@@ -221,7 +257,7 @@ First implementation.
 This is a model of a many-to-many fluid connector with an
 optional control volume, and an optional mixing port (common leg).
 It is typically used to connect parallel pumps with parallel
-chillers or boilers. 
+chillers or boilers.
 Selecting a mixing port allows modeling a headered pumping arrangement.
 Without any mixing port, a dedicated pumping arrangement is modeled.
 </p>
diff --git a/Buildings/Templates/Components/Routing/MultipleToSingle.mo b/Buildings/Templates/Components/Routing/MultipleToSingle.mo
index df088e2bfe3..a42b8bcda4e 100644
--- a/Buildings/Templates/Components/Routing/MultipleToSingle.mo
+++ b/Buildings/Templates/Components/Routing/MultipleToSingle.mo
@@ -35,16 +35,13 @@ model MultipleToSingle "Multiple inlet port, single outlet ports"
       Dialog(tab="Advanced", group="Diagnostics"),
       HideResult=true);
 
-  parameter Integer icon_offset = 0
-    "Offset in y-direction between inlet and outlet in icon layer"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Integer icon_dy = 100
-    "Distance in y-direction between each branch in icon layer"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.Supply
-    "Pipe symbol"
-    annotation(Dialog(tab="Graphics", enable=false));
+  constant Integer icon_offset = 0
+    "Offset in y-direction between inlet and outlet in icon layer";
+  constant Integer icon_dy = 100
+    "Distance in y-direction between each branch in icon layer";
+  constant Buildings.Templates.Components.Types.IconPipe icon_pipe =
+    Buildings.Templates.Components.Types.IconPipe.None
+    "Pipe symbol";
 
   Modelica.Fluid.Interfaces.FluidPorts_a ports_a[nPorts](
     redeclare each final package Medium = Medium,
@@ -100,8 +97,7 @@ equation
           -20,20},{-10,20}}, color={0,127,255}));
   end for;
   connect(ports_a, del.ports[1:nPorts]) annotation (Line(points={{-100,0},{-20,0},
-          {-20,-20},{0,-20}},
-                          color={0,127,255}));
+          {-20,-20},{0,-20}}, color={0,127,255}));
   connect(del.ports[nPorts+1], port_b) annotation (Line(points={{0,-20},{20,-20},
           {20,0},{100,0}}, color={0,127,255}));
   connect(pasSte.port_b, port_b) annotation (Line(points={{10,20},{20,20},{20,0},
@@ -112,12 +108,16 @@ equation
     Text( extent={{-149,-114},{151,-154}},
           textColor={0,0,255},
           textString="%name"),
+    Line( points={{-100, 0}, {100, 0}},
+          color={0,127,255},
+          visible=icon_pipe==Buildings.Templates.Components.Types.IconPipe.None),
     Line( points={{-100, icon_offset}, {0, icon_offset}, {0,0}, {100,0}},
           color={0,0,0},
           thickness=5,
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts>=2,
+    Line( visible=nPorts>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           points=if icon_offset*icon_dy>=0 then
             {{0,icon_offset},{0,icon_offset+icon_dy},{-100,icon_offset+icon_dy}}
             elseif icon_offset>0 and icon_offset+icon_dy<0 or icon_offset<0 and icon_offset+icon_dy>0 then
@@ -127,7 +127,7 @@ equation
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=3,
+    Line( visible=nPorts>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+icon_dy},{0, icon_offset+2*icon_dy},{-100, icon_offset+2*icon_dy}}
             elseif icon_offset>0 and icon_offset+2*icon_dy<0 or icon_offset<0 and icon_offset+2*icon_dy>0 then
@@ -137,7 +137,7 @@ equation
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=4,
+    Line( visible=nPorts>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+2*icon_dy},{0, icon_offset+3*icon_dy},{-100, icon_offset+3*icon_dy}}
             elseif icon_offset>0 and icon_offset+3*icon_dy<0 or icon_offset<0 and icon_offset+3*icon_dy>0 then
@@ -146,6 +146,26 @@ equation
           color={0,0,0},
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash,
+          thickness=5),
+    Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points=if icon_offset*icon_dy>=0 then
+            {{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}
+            elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then
+            {{0, 0},{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}}
+            else {{0, icon_offset+4*icon_dy},{-100, icon_offset+4*icon_dy}},
+          color={0,0,0},
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash,
+          thickness=5),
+    Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points=if icon_offset*icon_dy>=0 then
+            {{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}
+            elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then
+            {{0, 0},{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}}
+            else {{0, icon_offset+5*icon_dy},{-100, icon_offset+5*icon_dy}},
+          color={0,0,0},
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash,
           thickness=5)}),
     Diagram(
       coordinateSystem(preserveAspectRatio=false)),
diff --git a/Buildings/Templates/Components/Routing/PassThroughFluid.mo b/Buildings/Templates/Components/Routing/PassThroughFluid.mo
index 410acee7d08..cd00c5dcfd0 100644
--- a/Buildings/Templates/Components/Routing/PassThroughFluid.mo
+++ b/Buildings/Templates/Components/Routing/PassThroughFluid.mo
@@ -1,6 +1,13 @@
 within Buildings.Templates.Components.Routing;
 model PassThroughFluid "Direct fluid pass-through"
-  extends Buildings.Fluid.Interfaces.PartialTwoPort;
+  extends Buildings.Fluid.Interfaces.PartialTwoPort
+    annotation (
+    IconMap(primitivesVisible = false));
+
+  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
+    Buildings.Templates.Components.Types.IconPipe.Supply
+    "Pipe symbol"
+    annotation(Dialog(tab="Graphics", enable=false));
 
 equation
   connect(port_a, port_b) annotation (Line(points={{-100,0},{0,0},{0,0},{100,0}},
@@ -8,10 +15,14 @@ equation
   annotation (
     defaultComponentName="pas",
     Icon(coordinateSystem(preserveAspectRatio=false),
-    graphics={Line(
-          points={{-100,0},{100,0}},
-          color={28,108,200},
-          thickness=1)}), Diagram(coordinateSystem(preserveAspectRatio=false)),
+    graphics={
+    Line(
+    points={{-100,0},{100,0}},
+    color={0,0,0},
+    thickness=5,
+    visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+    pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply then
+    LinePattern.Solid else LinePattern.Dash)}),
     Documentation(info="<html>
 <p>
 This is a model of a direct fluid pass-through used for
diff --git a/Buildings/Templates/Components/Routing/SingleToMultiple.mo b/Buildings/Templates/Components/Routing/SingleToMultiple.mo
index 0c8996d1449..6bfd895ae96 100644
--- a/Buildings/Templates/Components/Routing/SingleToMultiple.mo
+++ b/Buildings/Templates/Components/Routing/SingleToMultiple.mo
@@ -35,16 +35,13 @@ model SingleToMultiple "Single inlet port, multiple outlet ports"
       Dialog(tab="Advanced", group="Diagnostics"),
       HideResult=true);
 
-  parameter Integer icon_offset = 0
-    "Offset in y-direction between inlet and outlet in icon layer"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Integer icon_dy = 100
-    "Distance in y-direction between each branch in icon layer"
-    annotation(Dialog(tab="Graphics", enable=false));
-  parameter Buildings.Templates.Components.Types.IconPipe icon_pipe =
-    Buildings.Templates.Components.Types.IconPipe.Supply
-    "Pipe symbol"
-    annotation(Dialog(tab="Graphics", enable=false));
+  constant Integer icon_offset = 0
+    "Offset in y-direction between inlet and outlet in icon layer";
+  constant Integer icon_dy = 100
+    "Distance in y-direction between each branch in icon layer";
+  constant Buildings.Templates.Components.Types.IconPipe icon_pipe =
+    Buildings.Templates.Components.Types.IconPipe.None
+    "Pipe symbol";
 
   Modelica.Fluid.Interfaces.FluidPort_a port_a(
     redeclare final package Medium = Medium,
@@ -114,12 +111,16 @@ equation
     Text( extent={{-149,-114},{151,-154}},
           textColor={0,0,255},
           textString="%name"),
+    Line( points={{-100, 0}, {100, 0}},
+          color={0,127,255},
+          visible=icon_pipe==Buildings.Templates.Components.Types.IconPipe.None),
     Line( points={{-100,0},{0,0},{0,icon_offset},{100,icon_offset}},
           color={0,0,0},
           thickness=5,
+          visible=icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash),
-    Line( visible=nPorts>=2,
+    Line( visible=nPorts>=2 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset}, {0,icon_offset+icon_dy}, {100,icon_offset+icon_dy}}
             elseif icon_offset>0 and icon_offset+icon_dy<0 or icon_offset<0 and icon_offset+icon_dy>0 then
@@ -129,7 +130,7 @@ equation
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=3,
+    Line( visible=nPorts>=3 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+icon_dy},{0, icon_offset+2*icon_dy},{100, icon_offset+2*icon_dy}}
             elseif icon_offset>0 and icon_offset+2*icon_dy<0 or icon_offset<0 and icon_offset+2*icon_dy>0 then
@@ -139,7 +140,7 @@ equation
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash,
           thickness=5),
-    Line( visible=nPorts>=4,
+    Line( visible=nPorts>=4 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
           points=if icon_offset*icon_dy>=0 then
             {{0, icon_offset+2*icon_dy},{0, icon_offset+3*icon_dy},{100, icon_offset+3*icon_dy}}
             elseif icon_offset>0 and icon_offset+3*icon_dy<0 or icon_offset<0 and icon_offset+3*icon_dy>0 then
@@ -148,6 +149,26 @@ equation
           color={0,0,0},
           pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
           then LinePattern.Solid else LinePattern.Dash,
+          thickness=5),
+    Line( visible=nPorts>=5 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points=if icon_offset*icon_dy>=0 then
+            {{0, icon_offset+3*icon_dy},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}
+            elseif icon_offset>0 and icon_offset+4*icon_dy<0 or icon_offset<0 and icon_offset+4*icon_dy>0 then
+            {{0, 0},{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}}
+            else {{0, icon_offset+4*icon_dy},{100, icon_offset+4*icon_dy}},
+          color={0,0,0},
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash,
+          thickness=5),
+    Line( visible=nPorts>=6 and icon_pipe<>Buildings.Templates.Components.Types.IconPipe.None,
+          points=if icon_offset*icon_dy>=0 then
+            {{0, icon_offset+4*icon_dy},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}
+            elseif icon_offset>0 and icon_offset+5*icon_dy<0 or icon_offset<0 and icon_offset+5*icon_dy>0 then
+            {{0, 0},{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}}
+            else {{0, icon_offset+5*icon_dy},{100, icon_offset+5*icon_dy}},
+          color={0,0,0},
+          pattern=if icon_pipe==Buildings.Templates.Components.Types.IconPipe.Supply
+          then LinePattern.Solid else LinePattern.Dash,
           thickness=5)}),
     Diagram(
         coordinateSystem(preserveAspectRatio=false)),
diff --git a/Buildings/Templates/Components/Routing/package.order b/Buildings/Templates/Components/Routing/package.order
index cb417ce6c69..3aed6c23d3f 100644
--- a/Buildings/Templates/Components/Routing/package.order
+++ b/Buildings/Templates/Components/Routing/package.order
@@ -1,3 +1,4 @@
+Junction
 MultipleToMultiple
 MultipleToSingle
 PassThroughFluid
diff --git a/Buildings/Templates/Components/Sensors/Temperature.mo b/Buildings/Templates/Components/Sensors/Temperature.mo
index 812a4f07e1e..f1265a767a2 100644
--- a/Buildings/Templates/Components/Sensors/Temperature.mo
+++ b/Buildings/Templates/Components/Sensors/Temperature.mo
@@ -11,13 +11,11 @@ model Temperature "Temperature sensor"
 
   Buildings.Fluid.Sensors.TemperatureTwoPort senTem(
     redeclare final package Medium=Medium,
-    final m_flow_nominal=m_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) if have_sen
+    final m_flow_nominal=m_flow_nominal) if have_sen
     "Temperature sensor"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Templates.Components.Routing.PassThroughFluid pas(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal) if not have_sen "Pass through"
+  Buildings.Templates.Components.Routing.PassThroughFluid pas(redeclare final
+      package Medium = Medium) if not have_sen "Pass through"
     annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
 equation
 
@@ -45,12 +43,12 @@ equation
       Bitmap(extent={{-100,-160},{100,40}},
         visible=have_sen and typ==Buildings.Templates.Components.Types.SensorTemperature.Averaging,
         fileName="modelica://Buildings/Resources/Images/Templates/Components/Sensors/ProbeAveraging.svg"),
-      Bitmap(extent={{-100,-160},{100,40}},
-        visible=have_sen and typ==Buildings.Templates.Components.Types.SensorTemperature.Standard,
-        fileName="modelica://Buildings/Resources/Images/Templates/Components/Sensors/ProbeStandard.svg"),
       Bitmap(extent={{-100,-40},{100,160}},
         visible=have_sen and typ==Buildings.Templates.Components.Types.SensorTemperature.InWell,
-        fileName="modelica://Buildings/Resources/Images/Templates/Components/Sensors/ProbeInWell.svg")}),
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Sensors/ProbeInWell.svg"),
+      Bitmap(extent={{-100,-160},{100,40}},
+        visible=have_sen and typ==Buildings.Templates.Components.Types.SensorTemperature.Standard,
+        fileName="modelica://Buildings/Resources/Images/Templates/Components/Sensors/ProbeStandard.svg")}),
     Diagram(coordinateSystem(preserveAspectRatio=false)),
     Documentation(info="<html>
 <p>
diff --git a/Buildings/Templates/Components/Sensors/VolumeFlowRate.mo b/Buildings/Templates/Components/Sensors/VolumeFlowRate.mo
index 4f4ed3158d0..a69f91cecf4 100644
--- a/Buildings/Templates/Components/Sensors/VolumeFlowRate.mo
+++ b/Buildings/Templates/Components/Sensors/VolumeFlowRate.mo
@@ -10,13 +10,11 @@ model VolumeFlowRate "Volume flow rate sensor"
 
   Buildings.Fluid.Sensors.VolumeFlowRate senVolFlo(
     redeclare final package Medium=Medium,
-    final m_flow_nominal=m_flow_nominal,
-    final allowFlowReversal=allowFlowReversal) if have_sen
+    final m_flow_nominal=m_flow_nominal) if have_sen
     "Volume flow rate sensor"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
-  Buildings.Templates.Components.Routing.PassThroughFluid pas(
-    redeclare final package Medium = Medium,
-    final allowFlowReversal=allowFlowReversal) if not have_sen "Pass through"
+  Buildings.Templates.Components.Routing.PassThroughFluid pas(redeclare final
+      package Medium = Medium) if not have_sen "Pass through"
     annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
 equation
 
diff --git a/Buildings/Templates/Components/Types.mo b/Buildings/Templates/Components/Types.mo
index abcc68c0f20..b2e5f8e32c1 100644
--- a/Buildings/Templates/Components/Types.mo
+++ b/Buildings/Templates/Components/Types.mo
@@ -67,6 +67,16 @@ package Types "Package with type definitions"
       Propeller
       "Propeller fan")
     "Enumeration to specify the type of single fan";
+  type HeatPump = enumeration(
+      AirToWater
+      "Air-to-water heat pump",
+      WaterToWater
+      "Water(or brine)-to-water heat pump")
+    "Enumeration to specify the type of heat pump";
+  type HeatPumpModel = enumeration(
+      EquationFit
+      "Heat pump model based on the equation fit method")
+    "Enumeration to specify the heat pump model";
   type IconPipe = enumeration(
       None
       "No line",
@@ -75,6 +85,17 @@ package Types "Package with type definitions"
       Supply
       "Supply pipe - Solid line")
     "Enumeration to specify the pipe symbol";
+  type Pump = enumeration(
+      None
+      "No pump",
+      Single
+      "Single pump",
+      Multiple
+      "Multiple pumps in parallel")
+    "Enumeration to configure the pump";
+  type PumpArrangement = enumeration(
+      Dedicated "Dedicated pumps",
+      Headered "Headered pumps") "Enumeration to specify the pump arrangement";
   type Sensor = enumeration(
       DifferentialPressure
       "Differential pressure",
diff --git a/Buildings/Templates/Components/Validation/Coils.mo b/Buildings/Templates/Components/Validation/Coils.mo
index 437d93b1f9f..14a59d07332 100644
--- a/Buildings/Templates/Components/Validation/Coils.mo
+++ b/Buildings/Templates/Components/Validation/Coils.mo
@@ -129,9 +129,8 @@ model Coils "Validation model for coil components"
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant XOut(k=0.015)
     "Water mass fraction in outdoor air"
     annotation (Placement(transformation(extent={{-130,-150},{-110,-130}})));
-  Utilities.Psychrometrics.TWetBul_TDryBulXi wetBul(
-    redeclare final package Medium = MediumAir)
-    "Compute wet bulb temperature"
+  Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi wetBul(redeclare final
+      package Medium = MediumAir) "Compute wet bulb temperature"
     annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant pOut(k=101325)
     "Outdoor pressure"
@@ -143,7 +142,7 @@ model Coils "Validation model for coil components"
     T=coiEva.dat.datCoi.sta[1].nomVal.TEvaIn_nominal,
     nPorts=2) "Boundary conditions for entering air"
     annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
-  Utilities.Psychrometrics.X_pTphi x_pTphi(use_p_in=false)
+  Buildings.Utilities.Psychrometrics.X_pTphi x_pTphi(use_p_in=false)
     "Compute wet bulb temperature"
     annotation (Placement(transformation(extent={{-88,-10},{-68,10}})));
   Buildings.Controls.OBC.CDL.Reals.Sources.Constant TAirEnt(k=coiEva.dat.datCoi.sta[
diff --git a/Buildings/Templates/Components/Validation/PumpMultipleRecord.mo b/Buildings/Templates/Components/Validation/PumpMultipleRecord.mo
new file mode 100644
index 00000000000..21f723c721b
--- /dev/null
+++ b/Buildings/Templates/Components/Validation/PumpMultipleRecord.mo
@@ -0,0 +1,96 @@
+within Buildings.Templates.Components.Validation;
+model PumpMultipleRecord "Validation model for parameter propagation with the multiple-pump record"
+  extends Modelica.Icons.Example;
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Fluid medium";
+
+  parameter Integer nPum(
+    final min=0,
+    start=1)=2
+    "Number of pumps"
+    annotation (Dialog(group="Configuration", enable=false));
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal[nPum](
+    each start=1,
+    each final min=0)={1, 2}
+    "Mass flow rate - Each pump";
+  final parameter Modelica.Units.SI.VolumeFlowRate V_flow_nominal[nPum]=
+    m_flow_nominal ./ datDef.rho_default
+    "Mass flow rate - Each pump";
+  parameter Modelica.Units.SI.PressureDifference dp_nominal[nPum](
+    each start=0,
+    each final min=0)={1, 2} .* 1E4
+    "Total pressure rise - Each pump";
+
+  parameter Buildings.Templates.Components.Data.PumpMultiple datDef(
+    final typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    final nPum=nPum,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dp_nominal)
+    "Parameter record - Default bindings for subrecord per"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+
+  parameter Buildings.Templates.Components.Data.PumpMultiple datRed(
+    final typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    final nPum=nPum,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dp_nominal,
+    redeclare Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos80slash1to12 per)
+    "Parameter record - Redeclaration of subrecord per"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+
+  parameter Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos80slash1to12 per1;
+  parameter Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos50slash1to12 per2;
+
+  parameter Buildings.Templates.Components.Data.PumpMultiple datAss(
+    final typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    final nPum=nPum,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dp_nominal,
+    per={per1, per2})
+    "Parameter record - Assignment of subrecord per"
+    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPre(
+    final typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    final nPum=nPum,
+    final m_flow_nominal=m_flow_nominal,
+    final dp_nominal=dp_nominal,
+    per(pressure(
+      V_flow={{0, 2, 4} * m_flow_nominal[i] / datPre.rho_default for i in 1:nPum},
+      dp={{2, 1.5, 0.8} * dp_nominal[i] for i in 1:nPum})))
+    "Parameter record - Assignment of pressure inside the subrecord per"
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+
+  annotation (
+  experiment(
+    StopTime=1,
+    Tolerance=1e-06),
+  __Dymola_Commands(file=
+  "modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/PumpMultipleRecord.mos"
+  "Simulate and plot"),
+  Documentation(info="<html>
+<p>
+This model validates the parameter propagation within the record class
+<a href=\"modelica://Buildings.Templates.Components.Data.PumpMultiple\">
+Buildings.Templates.Components.Data.PumpMultiple</a>.
+</p>
+<p>
+The instance <code>datDef</code> illustrates the default pressure curve
+assignment based on the design parameters.
+</p>
+<p>
+The instance <code>datRed</code> illustrates the modification of the 
+pressure curve by redeclaring the subrecord <code>per</code>.
+In this case, all elements <code>per[i]</code> are equal.
+</p>
+<p>
+The instances <code>datAss</code> and <code>datPre</code> illustrate
+the modification of the pressure curve by assigning either the whole 
+subrecord <code>per</code> or its component <code>per.pressure</code>.
+This allows assigning different pressure curves to the elements <code>per[i]</code>.
+</p>
+</html>"));
+end PumpMultipleRecord;
diff --git a/Buildings/Templates/Components/Validation/Pumps.mo b/Buildings/Templates/Components/Validation/Pumps.mo
new file mode 100644
index 00000000000..aedb697a8ae
--- /dev/null
+++ b/Buildings/Templates/Components/Validation/Pumps.mo
@@ -0,0 +1,349 @@
+within Buildings.Templates.Components.Validation;
+model Pumps "Validation model for pump components"
+  extends Modelica.Icons.Example;
+
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Liquid medium";
+  parameter Data.PumpSingle datPum(
+    final typ=pum1.typ,
+    m_flow_nominal=1,
+    dp_nominal=1E5) "Single pump parameters"
+    annotation (Placement(transformation(extent={{60,-160},{80,-140}})));
+  parameter Data.PumpMultiple datPumMul(
+    final typ=pumMul.typ,
+    final nPum=pumMul.nPum,
+    m_flow_nominal=fill(1, datPumMul.nPum),
+    dp_nominal=fill(1E5, datPumMul.nPum))
+    "Multiple pump parameters"
+    annotation (Placement(transformation(extent={{60,-42},{80,-22}})));
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=
+    Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation(Evaluate=true, Dialog(tab = "Dynamics", group="Conservation equations"));
+
+  Buildings.Templates.Components.Pumps.Multiple pumMul(
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium=Medium,
+    nPum=2,
+    final dat=datPumMul)
+    "Two variable speed pumps in parallel with common speed command signal"
+    annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
+  Buildings.Templates.Components.Pumps.Single pum1(
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium = Medium,
+    final dat=datPum) "Single variable speed pump"
+    annotation (Placement(transformation(extent={{0,-190},{20,-170}})));
+  Buildings.Templates.Components.Pumps.Single pum2(
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium=Medium,
+    final dat=datPum) "Single variable speed pump"
+    annotation (Placement(transformation(extent={{0,-150},{20,-130}})));
+  Fluid.FixedResistances.Junction junInl(
+    redeclare final package Medium=Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal) * {1,-1,-1},
+    final dp_nominal=fill(0,3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{-30,-170},{-10,-190}})));
+  Fluid.FixedResistances.Junction junOut(
+    redeclare final package Medium=Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal) * {1,-1,1},
+    final dp_nominal=fill(0,3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{30,-170},{50,-190}})));
+  Fluid.FixedResistances.PressureDrop res(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=pum1.m_flow_nominal + pum2.m_flow_nominal,
+    final dp_nominal=pum1.dp_nominal - pum1.dpValChe_nominal)
+    "Fixed flow resistance"
+    annotation (Placement(transformation(extent={{70,-190},{90,-170}})));
+
+  Fluid.FixedResistances.Junction junInl1(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal)*{1,-1,-1},
+    final dp_nominal=fill(0, 3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{-30,-50},{-10,-70}})));
+  Fluid.FixedResistances.Junction junOut1(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal)*{1,-1,1},
+    final dp_nominal=fill(0, 3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{30,-50},{50,-70}})));
+  Fluid.FixedResistances.PressureDrop resMul(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=sum(pumMul.m_flow_nominal),
+    final dp_nominal=max(pumMul.dp_nominal .- pumMul.dpValChe_nominal))
+    "Fixed flow resistance"
+    annotation (Placement(transformation(extent={{70,-70},{90,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1(
+    table=[
+      0, 0, 0;
+      1, 1, 0;
+      2, 1, 1;
+      3, 0, 0],
+    timeScale=100,
+    period=300) "Pump enable signal"
+    annotation (Placement(transformation(extent={{-130,-52},{-110,-32}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant y(k=1) "Pump speed command"
+    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
+
+  Fluid.Sources.Boundary_pT bou(
+    redeclare final package Medium=Medium, nPorts=1)
+    "Pressure boundary condition" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-40,-200})));
+  Fluid.Sources.Boundary_pT bou1(redeclare final package Medium = Medium,
+      nPorts=1)
+    "Pressure boundary condition" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-40,-82})));
+  Buildings.Templates.Components.Pumps.Multiple pumMulCst(
+    have_var=false,
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium = Medium,
+    nPum=2,
+    final dat=datPumMul) "Two constant speed pumps in parallel"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Fluid.FixedResistances.Junction junInl2(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal)*{1,-1,-1},
+    final dp_nominal=fill(0, 3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{-30,50},{-10,30}})));
+  Fluid.FixedResistances.Junction junOut2(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal)*{1,-1,1},
+    final dp_nominal=fill(0, 3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{30,50},{50,30}})));
+  Fluid.FixedResistances.PressureDrop resMulCst(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=sum(pumMulCst.m_flow_nominal),
+    final dp_nominal=max(pumMulCst.dp_nominal .- pumMulCst.dpValChe_nominal))
+    "Fixed flow resistance"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Fluid.Sources.Boundary_pT bou2(redeclare final package Medium = Medium,
+      nPorts=1)
+    "Pressure boundary condition" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-40,20})));
+  Buildings.Templates.Components.Pumps.Multiple pumMulDed(
+    have_varCom=false,
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium = Medium,
+    nPum=2,
+    final dat=datPumMul)
+    "Two variable speed pumps in parallel with dedicated speed command signal"
+    annotation (Placement(transformation(extent={{0,130},{20,150}})));
+  Fluid.FixedResistances.Junction junInl3(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal)*{1,-1,-1},
+    final dp_nominal=fill(0, 3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{-30,150},{-10,130}})));
+  Fluid.FixedResistances.Junction junOut3(
+    redeclare final package Medium = Medium,
+    final energyDynamics=energyDynamics,
+    final m_flow_nominal=sum(datPumMul.m_flow_nominal)*{1,-1,1},
+    final dp_nominal=fill(0, 3))
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{30,150},{50,130}})));
+  Fluid.FixedResistances.PressureDrop resMulDed(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=sum(pumMulDed.m_flow_nominal),
+    final dp_nominal=max(pumMulDed.dp_nominal .- pumMulDed.dpValChe_nominal))
+    "Fixed flow resistance"
+    annotation (Placement(transformation(extent={{70,130},{90,150}})));
+  Fluid.Sources.Boundary_pT bou3(redeclare final package Medium = Medium,
+      nPorts=1)
+    "Pressure boundary condition" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-40,120})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yDed[pumMulDed.nPum](each k
+      =1) "Pump speed command"
+    annotation (Placement(transformation(extent={{-130,140},{-110,160}})));
+protected
+  Interfaces.Bus bus "Pump control bus" annotation (Placement(transformation(
+          extent={{-80,-190},{-40,-150}}),
+                                         iconTransformation(extent={{-318,-118},
+            {-278,-78}})));
+  Interfaces.Bus bus1 "Pump control bus" annotation (Placement(transformation(
+          extent={{-80,-150},{-40,-110}}),
+                                        iconTransformation(extent={{-26,-20},{14,
+            20}})));
+  Interfaces.Bus bus2 "Pump control bus" annotation (Placement(transformation(
+          extent={{-80,-70},{-40,-30}}),
+                                       iconTransformation(extent={{-318,-118},{-278,
+            -78}})));
+  Interfaces.Bus bus3 "Pump control bus" annotation (Placement(transformation(
+          extent={{-80,30},{-40,70}}), iconTransformation(extent={{-318,-118},{-278,
+            -78}})));
+  Interfaces.Bus bus4 "Pump control bus" annotation (Placement(transformation(
+          extent={{-80,130},{-40,170}}),
+                                       iconTransformation(extent={{-318,-118},{-278,
+            -78}})));
+equation
+  connect(pum1.port_b, junOut.port_1)
+    annotation (Line(points={{20,-180},{30,-180}}, color={0,127,255}));
+  connect(junInl.port_2, pum1.port_a)
+    annotation (Line(points={{-10,-180},{0,-180}}, color={0,127,255}));
+  connect(junInl.port_3, pum2.port_a) annotation (Line(points={{-20,-170},{-20,
+          -140},{0,-140}}, color={0,127,255}));
+  connect(pum2.port_b, junOut.port_3) annotation (Line(points={{20,-140},{40,
+          -140},{40,-170}},
+                      color={0,127,255}));
+  connect(junOut.port_2, res.port_a)
+    annotation (Line(points={{50,-180},{70,-180}}, color={0,127,255}));
+  connect(res.port_b, junInl.port_1) annotation (Line(points={{90,-180},{100,
+          -180},{100,-120},{-40,-120},{-40,-180},{-30,-180}},
+                                                  color={0,127,255}));
+  connect(junOut1.port_2, resMul.port_a)
+    annotation (Line(points={{50,-60},{70,-60}}, color={0,127,255}));
+  connect(junInl1.port_2, pumMul.ports_a[1]) annotation (Line(points={{-10,-60},
+          {-6,-60},{-6,-61},{0,-61}},
+                                  color={0,127,255}));
+  connect(pumMul.ports_b[1], junOut1.port_1) annotation (Line(points={{20,-61},
+          {26,-61},{26,-60},{30,-60}},
+                                color={0,127,255}));
+  connect(pumMul.ports_b[2], junOut1.port_3) annotation (Line(points={{20,-59},
+          {20,-32},{40,-32},{40,-50}},
+                                color={0,127,255}));
+  connect(junInl1.port_3, pumMul.ports_a[2]) annotation (Line(points={{-20,-50},
+          {-20,-32},{0,-32},{0,-59}},
+                                  color={0,127,255}));
+  connect(resMul.port_b, junInl1.port_1) annotation (Line(points={{90,-60},{100,
+          -60},{100,0},{-40,0},{-40,-60},{-30,-60}}, color={0,127,255}));
+  connect(bus1, pum2.bus) annotation (Line(
+      points={{-60,-130},{10,-130}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(y1.y[2], bus1.y1) annotation (Line(points={{-108,-42},{-80,-42},{-80,
+          -130},{-60,-130}},
+                      color={255,0,255}));
+  connect(y.y, bus1.y) annotation (Line(points={{-108,-100},{-100,-100},{-100,
+          -130},{-60,-130}},
+                 color={0,0,127}));
+  connect(y1.y[1], bus.y1) annotation (Line(points={{-108,-42},{-80,-42},{-80,
+          -170},{-60,-170}},
+                      color={255,0,255}));
+  connect(y.y, bus.y) annotation (Line(points={{-108,-100},{-100,-100},{-100,
+          -170},{-60,-170}},
+                 color={0,0,127}));
+  connect(bus, pum1.bus) annotation (Line(
+      points={{-60,-170},{10,-170}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(bus2, pumMul.bus) annotation (Line(
+      points={{-60,-50},{10,-50}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(y1.y[1:2], bus2.y1) annotation (Line(points={{-108,-42},{-80,-42},{
+          -80,-50},{-60,-50}},
+                color={255,0,255}));
+  connect(y.y, bus2.y) annotation (Line(points={{-108,-100},{-100,-100},{-100,
+          -50},{-60,-50}},
+                color={0,0,127}));
+  connect(bou.ports[1], junInl.port_1) annotation (Line(points={{-40,-190},{-40,
+          -180},{-30,-180}},
+                      color={0,127,255}));
+  connect(bou1.ports[1], junInl1.port_1)
+    annotation (Line(points={{-40,-72},{-40,-60},{-30,-60}},
+                                                          color={0,127,255}));
+  connect(junOut2.port_2, resMulCst.port_a)
+    annotation (Line(points={{50,40},{70,40}}, color={0,127,255}));
+  connect(junInl2.port_2, pumMulCst.ports_a[1]) annotation (Line(points={{-10,40},
+          {-6,40},{-6,39},{0,39}},     color={0,127,255}));
+  connect(pumMulCst.ports_b[1], junOut2.port_1) annotation (Line(points={{20,39},
+          {26,39},{26,40},{30,40}}, color={0,127,255}));
+  connect(pumMulCst.ports_b[2], junOut2.port_3) annotation (Line(points={{20,41},
+          {20,70},{40,70},{40,50}}, color={0,127,255}));
+  connect(junInl2.port_3, pumMulCst.ports_a[2]) annotation (Line(points={{-20,50},
+          {-20,70},{0,70},{0,41}},     color={0,127,255}));
+  connect(resMulCst.port_b, junInl2.port_1) annotation (Line(points={{90,40},{
+          100,40},{100,100},{-40,100},{-40,40},{-30,40}}, color={0,127,255}));
+  connect(bus3, pumMulCst.bus) annotation (Line(
+      points={{-60,50},{10,50}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(bou2.ports[1],junInl2. port_1)
+    annotation (Line(points={{-40,30},{-40,40},{-30,40}}, color={0,127,255}));
+  connect(y1.y[1:2], bus3.y1) annotation (Line(points={{-108,-42},{-80,-42},{
+          -80,50},{-60,50}}, color={255,0,255}));
+  connect(junOut3.port_2, resMulDed.port_a)
+    annotation (Line(points={{50,140},{70,140}}, color={0,127,255}));
+  connect(junInl3.port_2, pumMulDed.ports_a[1]) annotation (Line(points={{-10,140},
+          {-6,140},{-6,139},{0,139}},      color={0,127,255}));
+  connect(pumMulDed.ports_b[1], junOut3.port_1) annotation (Line(points={{20,139},
+          {26,139},{26,140},{30,140}},      color={0,127,255}));
+  connect(pumMulDed.ports_b[2], junOut3.port_3) annotation (Line(points={{20,141},
+          {20,170},{40,170},{40,150}},      color={0,127,255}));
+  connect(junInl3.port_3, pumMulDed.ports_a[2]) annotation (Line(points={{-20,150},
+          {-20,170},{0,170},{0,141}},      color={0,127,255}));
+  connect(resMulDed.port_b, junInl3.port_1) annotation (Line(points={{90,140},{
+          100,140},{100,200},{-40,200},{-40,140},{-30,140}}, color={0,127,255}));
+  connect(bus4, pumMulDed.bus) annotation (Line(
+      points={{-60,150},{10,150}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(bou3.ports[1],junInl3. port_1)
+    annotation (Line(points={{-40,130},{-40,140},{-30,140}},
+                                                          color={0,127,255}));
+  connect(y1.y, bus4.y1) annotation (Line(points={{-108,-42},{-80,-42},{-80,150},
+          {-60,150}}, color={255,0,255}));
+  connect(yDed.y, bus4.y)
+    annotation (Line(points={{-108,150},{-60,150}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+  file="modelica://Buildings/Resources/Scripts/Dymola/Templates/Components/Validation/Pumps.mos"
+  "Simulate and plot"),
+  experiment(Tolerance=1e-6, StopTime=300),
+    Diagram(coordinateSystem(extent={{-140,-220},{140,220}})),
+    Documentation(info="<html>
+<p>
+This model validates the models within
+<a href=\"modelica://Buildings.Templates.Components.Pumps\">
+Buildings.Templates.Components.Pumps</a>
+by connecting each pump component to a water loop with a 
+fixed flow resistance, which
+is sized based on the pump's nominal operating point.
+Two identical parallel pumps are modeled with either 
+one instance of 
+<a href=\"modelica://Buildings.Templates.Components.Pumps.Multiple\">
+Buildings.Templates.Components.Pumps.Multiple</a>
+or two instances of
+<a href=\"modelica://Buildings.Templates.Components.Pumps.Single\">
+Buildings.Templates.Components.Pumps.Single</a>.
+The multiple pump component is configured to represent
+variable speed pumps with dedicated speed command signals
+(component <code>pumMulDed</code>), 
+variable speed pumps with common speed command
+signal (component <code>pumMul</code>) or constant speed pumps
+(component <code>pumMulCst</code>).
+The single pump components (<code>pum1</code> and <code>pum2</code>) 
+are configured to represent variable speed pumps.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Pumps;
diff --git a/Buildings/Templates/Components/Validation/package.order b/Buildings/Templates/Components/Validation/package.order
index 07f6cebf6fd..1c996f732a4 100644
--- a/Buildings/Templates/Components/Validation/package.order
+++ b/Buildings/Templates/Components/Validation/package.order
@@ -1,6 +1,8 @@
 Coils
 Dampers
 Fans
+PumpMultipleRecord
+Pumps
 Routing
 Sensors
 Valves
diff --git a/Buildings/Templates/Components/package.order b/Buildings/Templates/Components/package.order
index 7ee7d4cb40d..fcbf4ac61e6 100644
--- a/Buildings/Templates/Components/package.order
+++ b/Buildings/Templates/Components/package.order
@@ -2,6 +2,8 @@ Actuators
 Coils
 Controls
 Fans
+HeatPumps
+Pumps
 Routing
 Sensors
 Data
diff --git a/Buildings/Templates/Data/Defaults.mo b/Buildings/Templates/Data/Defaults.mo
new file mode 100644
index 00000000000..31727c09285
--- /dev/null
+++ b/Buildings/Templates/Data/Defaults.mo
@@ -0,0 +1,165 @@
+within Buildings.Templates.Data;
+package Defaults
+  "Package with default sizing parameters"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+  constant Modelica.Units.SI.Temperature TChiWatSup=7 + 273.15
+    "CHW supply temperature (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TChiWatSup_max=16 + 273.15
+    "Maximum CHW supply temperature (typical)";
+  constant Modelica.Units.SI.Temperature TChiWatRet=12 + 273.15
+    "CHW return temperature (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TConWatSup=30 + 273.15
+    "CW supply temperature (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TConWatRet=35 + 273.15
+    "CW return temperature (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TOutChi=35 + 273.15
+    "Outdoor air temperature for air-cooled chiller (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TConEnt_min=13 + 273.15
+    "Minimum condenser entering fluid temperature (air or water)";
+  constant Modelica.Units.SI.Temperature TConEnt_max=45 + 273.15
+    "Maximum condenser entering fluid temperature (air or water)";
+  constant Modelica.Units.SI.Temperature TChiWatEcoEnt=18 + 273.15
+    "WSE entering CHW temperature";
+  constant Modelica.Units.SI.Temperature TChiWatEcoLvg=11 + 273.15
+    "WSE leaving CHW temperature";
+  constant Modelica.Units.SI.Temperature TConWatEcoEnt=9 + 273.15
+    "WSE entering CW temperature";
+  constant Modelica.Units.SI.Temperature TConWatEcoLvg=16 + 273.15
+    "WSE leaving CW temperature";
+  constant Modelica.Units.SI.Temperature TOutChiWatLck=16 + 273.15
+    "Outdoor air lockout temperature below which the CHW system is prevented from operating";
+  constant Modelica.Units.SI.TemperatureDifference dTLifChi_min=5
+    "Minimum chiller lift at minimum load";
+  constant Modelica.Units.SI.Temperature TOutDryCoo=TOutChi
+    "Dry cooler entering air drybulb temperature";
+  constant Modelica.Units.SI.Temperature TWetBulTowEnt=24 + 273.15
+    "CT entering air wetbulb temperature";
+  constant Real PFanByFloConWatTow(
+    unit="W/(kg/s)")=340
+    "CT fan power divided by CW mass flow rate";
+  constant Real mConWatFloByAirTow(
+    unit="1")=1.45
+    "CT CW mass flow rate divided by air mass flow rate";
+  constant Modelica.Units.SI.PressureDifference dpConWatFriTow=1E4
+    "CW flow-friction losses through open-circuit tower and piping only (without elevation head or valve)";
+  constant Modelica.Units.SI.PressureDifference dpConWatStaTow=3E4
+    "CW elevation head (for open cooling towers only)";
+  constant Modelica.Units.SI.PressureDifference dpConWatTowClo=5E4
+    "CW flow-friction losses through closed-circuit tower and piping only (without valve)";
+  constant Real mAirFloByCapChi(
+    unit="(kg/s)/W")=1E-4
+    "Air mass flow rate divided by capacity for air-cooled chiller";
+  constant Real COPChiAirCoo(
+    unit="1")=2.99
+    "Air-cooled chiller COP (ASHRAE 90.1 2022 at 7 °C CHWST, 35 °C OAT)";
+  constant Real COPChiWatCoo(
+    unit="1")=5.33
+    "Water-cooled chiller COP (ASHRAE 90.1 2022 at 7 °C CHWST, 35 °C source LWT)";
+  constant Modelica.Units.SI.PressureDifference dpValIso=1E3
+    "Isolation or bypass valve pressure drop";
+  constant Modelica.Units.SI.PressureDifference dpValBypMin=3E4
+    "Minimum flow bypass valve pressure drop at design minimum flow for the largest chiller";
+  constant Modelica.Units.SI.PressureDifference dpValChe=1E4
+    "Check valve pressure drop";
+  constant Modelica.Units.SI.PressureDifference dpChiWatChi=4E4
+    "Chiller CHW pressure drop";
+  constant Modelica.Units.SI.PressureDifference dpChiWatSet_min=5 * 6894
+    "Minimum CHW differential pressure setpoint used in CHW plant reset logic";
+  constant Modelica.Units.SI.PressureDifference dpChiWatRemSet_max=5E4
+    "Maximum CHW differential pressure setpoint remote from the CHW plant";
+  constant Modelica.Units.SI.PressureDifference dpChiWatLocSet_max=15E4
+    "Maximum CHW differential pressure setpoint local to the CHW plant";
+  constant Modelica.Units.SI.PressureDifference dpConWatChi=4E4
+    "Chiller CW pressure drop (water-cooled)";
+  constant Modelica.Units.SI.PressureDifference dpAirChi=500
+    "Chiller air pressure drop across condenser (air-cooled)";
+  constant Modelica.Units.SI.PressureDifference dpChiWatEco=3E4
+    "WSE CHW pressure drop";
+  constant Modelica.Units.SI.PressureDifference dpConWatEco=3E4
+    "WSE CW pressure drop";
+  constant Modelica.Units.SI.PressureDifference pChiWat_rel_nominal=1.0E5
+    "CHW system gauge pressure at design conditions";
+  constant Modelica.Units.SI.PressureDifference pHeaWat_rel_nominal=2.5E5
+    "HHW system gauge pressure at design conditions";
+  constant Modelica.Units.SI.PressureDifference dpHeaWatBoi=5E3
+    "Boiler HW pressure drop";
+  constant Modelica.Units.SI.Temperature THeaWatSup=80 + 273.15
+    "HW supply temperature";
+  constant Modelica.Units.SI.Temperature THeaWatConSup=65 + 273.15
+    "HW supply temperature for condensing boilers";
+  constant Modelica.Units.SI.Temperature THeaWatRet=55 + 273.15
+    "HW return temperature";
+  constant Modelica.Units.SI.Temperature TOutHeaWatLck=21 + 273.15
+    "Outdoor air lockout temperature above which the HW system is prevented from operating";
+  constant Modelica.Units.SI.PressureDifference dpHeaWatSet_min=5 * 6894
+    "Minimum HW differential pressure setpoint used in HW plant reset logic";
+  constant Modelica.Units.SI.PressureDifference dpHeaWatRemSet_max=5E4
+    "Maximum HW differential pressure setpoint remote from the HW plant";
+  constant Modelica.Units.SI.PressureDifference dpHeaWatLocSet_max=15E4
+    "Maximum HW differential pressure setpoint local to the CHW plant";
+  constant Modelica.Units.SI.PressureDifference dpHeaWatHp=3E4
+    "Heat pump HW pressure drop across condenser barrel";
+  constant Modelica.Units.SI.Temperature THeaWatSupHig=60 + 273.15
+    "HW supply temperature - High temperature level (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature THeaWatRetHig=50 + 273.15
+    "HW return temperature - High temperature level (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature THeaWatSupMed=50 + 273.15
+    "HW supply temperature - Medium temperature level (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature THeaWatRetMed=42 + 273.15
+    "HW return temperature - Medium temperature level (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature THeaWatSupLow=40 + 273.15
+    "HW supply temperature - Low temperature level (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature THeaWatRetLow=35 + 273.15
+    "HW return temperature - Low temperature level (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TOutHpCoo=TOutChi
+    "Outdoor air temperature for air-to-water heat pump rating - Cooling (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TOutHpHeaHig=8 + 273.15
+    "Outdoor air temperature for air-to-water heat pump rating - High heating (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TOutHpHeaLow=-8 + 273.15
+    "Outdoor air temperature for air-to-water heat pump rating - Low heating (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TSouHpCoo=30 + 273.15
+    "Source fluid entering temperature for water-to-water heat pump rating - Cooling (AHRI 551/591)";
+  constant Modelica.Units.SI.Temperature TSouHpHea=12 + 273.15
+    "Source fluid entering temperature for water-to-water heat pump rating - Heating (AHRI 551/591)";
+  constant Real COPHpAwHea(
+    unit="1")=1.75
+    "Air-to-water heat pump heating COP (ASHRAE 90.1 2022 at 50 °C HWST, -8 °C OAT)";
+  constant Real COPHpAwCoo(
+    unit="1")=2.84
+    "Air-to-water heat pump cooling COP (ASHRAE 90.1 2022 at 7 °C CHWST, 35 °C OAT)";
+  constant Real COPHpWwHea(
+    unit="1")=3.61
+    "Water(brine)-to-water heat pump heating COP (ASHRAE 90.1 2022 at 50 °C HWST, 7 °C source LWT)";
+  constant Real COPHpWwCoo(
+    unit="1")=5.07
+    "Water(brine)-to-water heat pump cooling COP (ASHRAE 90.1 2022 at 7 °C CHWST, 35 °C source LWT)";
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package defines some constants that are either
+</p>
+<ul>
+<li>
+typical values used as default parameter values
+for models inside the package
+<a href=\"modelica://Buildings.Templates\">
+Buildings.Templates</a>, or
+</li>
+<li>
+arbitrary values used for validation purposes only.
+Those are typically project-specific characteristics (e.g.,
+chiller COP at nominal conditions) and should not
+be considered as generic default values.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+November 18, 2022, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Defaults;
diff --git a/Buildings/Templates/Data/package.order b/Buildings/Templates/Data/package.order
index 3831742ec60..4cd15e62047 100644
--- a/Buildings/Templates/Data/package.order
+++ b/Buildings/Templates/Data/package.order
@@ -1 +1,2 @@
 AllSystems
+Defaults
diff --git a/Buildings/Templates/Plants/Controls/Enabling/Enable.mo b/Buildings/Templates/Plants/Controls/Enabling/Enable.mo
new file mode 100644
index 00000000000..582094ad756
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Enabling/Enable.mo
@@ -0,0 +1,286 @@
+within Buildings.Templates.Plants.Controls.Enabling;
+block Enable
+  "Plant enable"
+  parameter Buildings.Templates.Plants.Controls.Types.Application typ
+    "Type of application"
+    annotation (Evaluate=true);
+  parameter Boolean have_inpSch=false
+    "Set to true to provide schedule via software input point"
+    annotation (Evaluate=true);
+  parameter Real sch[:, 2]=[
+    0, 1;
+    24 * 3600, 1]
+    "Enable schedule"
+    annotation (Dialog(enable=not have_inpSch));
+  parameter Real TOutLck(
+    final min=100,
+    final unit="K")=if typ == Buildings.Templates.Plants.Controls.Types.Application.Heating
+    then 18 + 273.15 else 15 + 273.15
+    "Outdoor air lockout temperature";
+  parameter Real dTOutLck(
+    final min=0,
+    final unit="K")=0.5
+    "Hysteresis for outdoor air lockout temperature";
+  parameter Integer nReqIgn(
+    min=0)=0
+    "Number of ignored requests";
+  parameter Real dtRun(
+    final min=0,
+    final unit="s")=15 * 60
+    "Minimum runtime of enable and disable states";
+  parameter Real dtReq(
+    final min=0,
+    final unit="s")=3 * 60
+    "Runtime with low number of request before disabling";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Sch
+    if have_inpSch
+    "System enable via schedule"
+    annotation (Placement(transformation(extent={{-200,80},{-160,120}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqPla
+    "Number of plant requests" annotation (Placement(transformation(extent={{-200,
+            -20},{-160,20}}), iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TOut(
+    final unit="K",
+    final quantity="ThermodynamicTemperature",
+    displayUnit="degC")
+    "Outdoor air temperature"
+    annotation (Placement(transformation(extent={{-200,-120},{-160,-80}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Enable command"
+    annotation (Placement(transformation(extent={{160,-20},{200,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable schEna(
+    final table=sch,
+    final period=max(sch[:, 1]))
+    if not have_inpSch
+    "Enable schedule"
+    annotation (Placement(transformation(extent={{-150,50},{-130,70}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold greIgn(
+    final t=nReqIgn)
+    "Return true if number of requests > number of ignored requests"
+    annotation (Placement(transformation(extent={{-120,-10},{-100,10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greLck(
+    final t=TOutLck)
+    if typ == Buildings.Templates.Plants.Controls.Types.Application.Cooling
+    "Return true if OAT > lockout temperature"
+    annotation (Placement(transformation(extent={{-120,-90},{-100,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lesLck(
+    final t=TOutLck)
+    if typ == Buildings.Templates.Plants.Controls.Types.Application.Heating
+    "Return true if OAT < lockout temperature"
+    annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre preEna
+    "Left limit (in discrete-time) of enable signal"
+    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timEna(
+    final t=dtRun)
+    "Return true if system has been enabled for specified duration"
+    annotation (Placement(transformation(extent={{0,110},{20,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Not dis
+    "Return true if disabled"
+    annotation (Placement(transformation(extent={{-40,90},{-20,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer runDis(
+    final t=dtRun)
+    "Return true if system has been disabled for specified duration"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd mulAnd(
+    nin=4)
+    "Combine enable conditions"
+    annotation (Placement(transformation(extent={{50,30},{70,50}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr mulOr(
+    nin=3)
+    "Combine disable conditions"
+    annotation (Placement(transformation(extent={{50,-50},{70,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not disSch
+    "Return true if disabled by schedule"
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+  Buildings.Controls.OBC.CDL.Integers.LessEqualThreshold lowIgn(
+    final t=nReqIgn)
+    "Return true if number of requests ≤ number of ignored requests"
+    annotation (Placement(transformation(extent={{-120,-50},{-100,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timLowReq(
+    final t=dtReq)
+    "Return true if low number of requests for specified duration"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold lowLckHys(
+    final t=TOutLck - dTOutLck)
+    if typ == Buildings.Templates.Plants.Controls.Types.Application.Cooling
+    "Return true if OAT < lockout temperature - hysteresis"
+    annotation (Placement(transformation(extent={{-80,-110},{-60,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greLckHys(
+    final t=TOutLck + dTOutLck)
+    if typ == Buildings.Templates.Plants.Controls.Types.Application.Heating
+    "Return true if OAT > lockout temperature + hysteresis"
+    annotation (Placement(transformation(extent={{-80,-150},{-60,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.And andRun
+    "Disable conditions met AND enable minimum runtime exceeded"
+    annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lat
+    "Clear enable signal if disable conditions are met"
+    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
+equation
+  connect(nReqPla, greIgn.u)
+    annotation (Line(points={{-180,0},{-122,0}}, color={255,127,0}));
+  connect(TOut, greLck.u)
+    annotation (Line(points={{-180,-100},{-140,-100},{-140,-80},{-122,-80}},
+      color={0,0,127}));
+  connect(TOut, lesLck.u)
+    annotation (Line(points={{-180,-100},{-140,-100},{-140,-120},{-122,-120}},
+      color={0,0,127}));
+  connect(preEna.y, dis.u)
+    annotation (Line(points={{-58,120},{-50,120},{-50,100},{-42,100}},color={255,0,255}));
+  connect(dis.y, runDis.u)
+    annotation (Line(points={{-18,100},{-10,100},{-10,80},{-2,80}},color={255,0,255}));
+  connect(preEna.y, timEna.u)
+    annotation (Line(points={{-58,120},{-2,120}},color={255,0,255}));
+  connect(runDis.passed, mulAnd.u[1])
+    annotation (Line(points={{22,72},{40,72},{40,37.375},{48,37.375}},color={255,0,255}));
+  connect(schEna.y[1], mulAnd.u[2])
+    annotation (Line(points={{-128,60},{-100,60},{-100,39.125},{48,39.125}},
+      color={255,0,255}));
+  connect(u1Sch, mulAnd.u[2])
+    annotation (Line(points={{-180,100},{-100,100},{-100,40},{48,40},{48,39.125}},
+      color={255,0,255}));
+  connect(greIgn.y, mulAnd.u[3])
+    annotation (Line(points={{-98,0},{40,0},{40,40.875},{48,40.875}},color={255,0,255}));
+  connect(schEna.y[1], disSch.u)
+    annotation (Line(points={{-128,60},{-82,60}},color={255,0,255}));
+  connect(u1Sch, disSch.u)
+    annotation (Line(points={{-180,100},{-100,100},{-100,60},{-82,60}},color={255,0,255}));
+  connect(disSch.y, mulOr.u[1])
+    annotation (Line(points={{-58,60},{0,60},{0,-42.3333},{48,-42.3333}},color={255,0,255}));
+  connect(nReqPla, lowIgn.u) annotation (Line(points={{-180,0},{-140,0},{-140,-40},
+          {-122,-40}}, color={255,127,0}));
+  connect(lowIgn.y, timLowReq.u)
+    annotation (Line(points={{-98,-40},{-82,-40}},color={255,0,255}));
+  connect(timLowReq.passed, mulOr.u[2])
+    annotation (Line(points={{-58,-48},{-40,-48},{-40,-40},{48,-40}},color={255,0,255}));
+  connect(greLck.y, mulAnd.u[4])
+    annotation (Line(points={{-98,-80},{20,-80},{20,42.625},{48,42.625}},color={255,0,255}));
+  connect(lesLck.y, mulAnd.u[4])
+    annotation (Line(points={{-98,-120},{20,-120},{20,42.625},{48,42.625}},color={255,0,255}));
+  connect(TOut, lowLckHys.u)
+    annotation (Line(points={{-180,-100},{-82,-100}},color={0,0,127}));
+  connect(lowLckHys.y, mulOr.u[3])
+    annotation (Line(points={{-58,-100},{40,-100},{40,-37.6667},{48,-37.6667}},
+      color={255,0,255}));
+  connect(TOut, greLckHys.u)
+    annotation (Line(points={{-180,-100},{-140,-100},{-140,-140},{-82,-140}},
+      color={0,0,127}));
+  connect(greLckHys.y, mulOr.u[3])
+    annotation (Line(points={{-58,-140},{40,-140},{40,-37.6667},{48,-37.6667}},
+      color={255,0,255}));
+  connect(timEna.passed, andRun.u1)
+    annotation (Line(points={{22,112},{80,112},{80,-40},{88,-40}},color={255,0,255}));
+  connect(mulOr.y, andRun.u2)
+    annotation (Line(points={{72,-40},{76,-40},{76,-48},{88,-48}},color={255,0,255}));
+  connect(y1, lat.y)
+    annotation (Line(points={{180,0},{142,0}},color={255,0,255}));
+  connect(mulAnd.y, lat.u)
+    annotation (Line(points={{72,40},{114,40},{114,0},{118,0}},color={255,0,255}));
+  connect(andRun.y, lat.clr)
+    annotation (Line(points={{112,-40},{114,-40},{114,-6},{118,-6}},color={255,0,255}));
+  connect(y1, preEna.u)
+    annotation (Line(points={{180,0},{150,0},{150,140},{-100,140},{-100,120},{-82,120}},
+      color={255,0,255}));
+  annotation (
+    defaultComponentName="ena",
+    Icon(
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineThickness=0.1),
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={28,108,200},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          lineThickness=5,
+          borderPattern=BorderPattern.Raised),
+        Ellipse(
+          extent={{-80,80},{80,-80}},
+          lineColor={28,108,200},
+          fillColor={170,255,213},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-90,90},{90,-90}},
+          lineColor={28,108,200}),
+        Rectangle(
+          extent={{-75,2},{75,-2}},
+          lineColor={28,108,200},
+          fillColor={28,108,200},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-66,46},{76,10}},
+          textColor={28,108,200},
+          textString="START"),
+        Text(
+          extent={{-66,-8},{76,-44}},
+          textColor={28,108,200},
+          textString="STOP"),
+        Text(
+          extent={{-150,150},{150,110}},
+          textColor={0,0,255},
+          textString="%name")},
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}})),
+    Documentation(
+      info="<html>
+<p>
+The plant is enabled when it has been disabled for at least the duration <code>dtRun</code> and:
+</p>
+<ul>
+<li>
+Number of plant requests &gt; number of ignored requests <code>nReqIgn</code>, and
+</li>
+<li>
+<b>For cooling systems</b>: outdoor air temperature &gt; outdoor air lockout 
+temperature <code>TOutLck</code>, and
+</li>
+<li>
+<b>For heating systems</b>: outdoor air temperature &lt; outdoor air lockout 
+temperature <code>TOutLck</code>, and
+</li>
+<li>
+The enable schedule is active.
+</li>
+</ul>
+<p>
+The plant is disabled when it has been enabled for at least the duration 
+<code>dtRun</code> and:
+</p>
+<ul>
+<li>
+Number of plant requests &le; number of ignored requests <code>nReqIgn</code> 
+for at least the duration <code>dtReq</code>, or
+</li>
+<li>
+<b>For cooling systems</b>: outdoor air temperature &lt; outdoor air lockout 
+temperature <code>TOutLck</code> minus hysteresis <code>dTOutLck</code>, or
+</li>
+<li>
+<b>For heating systems</b>: outdoor air temperature &gt; outdoor air lockout 
+temperature <code>TOutLck</code> plus hysteresis <code>dTOutLck</code>, or
+</li>
+<li>
+The plant enable schedule is inactive.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-160,-160},{160,160}})));
+end Enable;
diff --git a/Buildings/Templates/Plants/Controls/Enabling/Validation/Enable.mo b/Buildings/Templates/Plants/Controls/Enabling/Validation/Enable.mo
new file mode 100644
index 00000000000..112320152fb
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Enabling/Validation/Enable.mo
@@ -0,0 +1,99 @@
+within Buildings.Templates.Plants.Controls.Enabling.Validation;
+model Enable
+  "Validation model for system enabling logic"
+  Buildings.Templates.Plants.Controls.Enabling.Enable enaHea(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    nReqIgn=1)
+    "Enable heating system"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Pulse req(
+    amplitude=1,
+    period=60 * 20,
+    offset=1)
+    "System request"
+    annotation (Placement(transformation(extent={{-60,50},{-40,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TOut(
+    y(displayUnit="degC",
+      unit="K"),
+    final amplitude=12,
+    final freqHz=1 /(10000),
+    final offset=285.15)
+    "Outdoor air temperature"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Templates.Plants.Controls.Enabling.Enable enaCoo(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    nReqIgn=1)
+    "Enable cooling system"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Templates.Plants.Controls.Enabling.Enable enaCooSch(
+    typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    have_inpSch=true,
+    nReqIgn=1)
+    "Enable cooling system with input schedule"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse sch(
+    width=0.4,
+    period=120 * 60,
+    shift=25 * 60)
+    "Enable schedule"
+    annotation (Placement(transformation(extent={{-60,-70},{-40,-50}})));
+equation
+  connect(req.y, enaHea.nReqPla)
+    annotation (Line(points={{-38,60},{18,60}}, color={255,127,0}));
+  connect(TOut.y, enaHea.TOut)
+    annotation (Line(points={{-38,0},{-20,0},{-20,56},{18,56}},color={0,0,127}));
+  connect(req.y, enaCoo.nReqPla) annotation (Line(points={{-38,60},{0,60},{0,0},
+          {18,0}}, color={255,127,0}));
+  connect(TOut.y, enaCoo.TOut)
+    annotation (Line(points={{-38,0},{-20,0},{-20,-4},{18,-4}},color={0,0,127}));
+  connect(TOut.y, enaCooSch.TOut)
+    annotation (Line(points={{-38,0},{-20,0},{-20,-64},{18,-64}},color={0,0,127}));
+  connect(req.y, enaCooSch.nReqPla) annotation (Line(points={{-38,60},{0,60},{0,
+          -60},{18,-60}}, color={255,127,0}));
+  connect(sch.y, enaCooSch.u1Sch)
+    annotation (Line(points={{-38,-60},{-30,-60},{-30,-56},{18,-56}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Enabling/Validation/Enable.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=7200.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Enabling.Enable\">
+Buildings.Templates.Plants.Controls.Enable.Enable</a>
+in a heating configuration, in a cooling configuration, and in
+a cooling configuration with the enable schedule provided via
+an input point.
+All these configurations have the same setting for the minimum number
+of ignored requests: <code>nReqIgn=1</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Enable;
diff --git a/Buildings/Templates/Plants/Controls/Enabling/Validation/package.mo b/Buildings/Templates/Plants/Controls/Enabling/Validation/package.mo
new file mode 100644
index 00000000000..0d38c01291f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Enabling/Validation/package.mo
@@ -0,0 +1,29 @@
+within Buildings.Templates.Plants.Controls.Enabling;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/Enabling/Validation/package.order b/Buildings/Templates/Plants/Controls/Enabling/Validation/package.order
new file mode 100644
index 00000000000..bc0ba0e9217
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Enabling/Validation/package.order
@@ -0,0 +1 @@
+Enable
diff --git a/Buildings/Templates/Plants/Controls/Enabling/package.mo b/Buildings/Templates/Plants/Controls/Enabling/package.mo
new file mode 100644
index 00000000000..0b50ad9137f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Enabling/package.mo
@@ -0,0 +1,44 @@
+within Buildings.Templates.Plants.Controls;
+package Enabling "Plant enable/disable"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}), Documentation(info="<html>
+<p>
+This package contains control sequences to enable or disable
+chilled water or hot water plants.
+</p>
+</html>"));
+end Enabling;
diff --git a/Buildings/Templates/Plants/Controls/Enabling/package.order b/Buildings/Templates/Plants/Controls/Enabling/package.order
new file mode 100644
index 00000000000..ff54e1e7178
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Enabling/package.order
@@ -0,0 +1,2 @@
+Enable
+Validation
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo b/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo
new file mode 100644
index 00000000000..2048e9d1a06
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/AirToWater.mo
@@ -0,0 +1,1582 @@
+within Buildings.Templates.Plants.Controls.HeatPumps;
+block AirToWater
+  "Controller for AWHP plant"
+  parameter Boolean have_heaWat
+    "Set to true for plants that provide HW"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_chiWat
+    "Set to true for plants that provide CHW"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_valHpInlIso
+    "Set to true for plants with isolation valves at heat pump inlet"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_valHpOutIso
+    "Set to true for plants with isolation valves at heat pump outlet"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  final parameter Boolean have_pumHeaWatPri=have_heaWat
+    "Set to true for plants with primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumChiWatPriDed_select(start=false)=false
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_chiWat and not have_pumPriHdr, group="Plant configuration"));
+  final parameter Boolean have_pumChiWatPriDed=
+    if have_chiWat and not have_pumPriHdr then have_pumChiWatPriDed_select else false
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true);
+  final parameter Boolean have_pumChiWatPri=
+    have_chiWat and (have_pumPriHdr or have_pumChiWatPriDed)
+    "Set to true for plants with separate primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumPriHdr
+    "Set to true for headered primary pumps, false for dedicated pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_pumHeaWatPriVar(start=true)=true
+    "Set to true for variable speed primary HW pumps, false for constant speed pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration", enable=have_heaWat));
+  parameter Boolean have_pumChiWatPriVar(start=true)=true
+    "Set to true for variable speed primary CHW pumps, false for constant speed pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration", enable=have_chiWat and
+    (have_pumPriHdr or have_pumChiWatPriDed)));
+  // Only constant primary is supported for AWHP.
+  final parameter Boolean have_pumPriCtlDp=false
+    "Set to true for primary headered variable speed pumps using ∆p pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_pumHeaWatSec_select(start=false)
+    "Set to true for plants with secondary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_heaWat,group="Plant configuration"));
+  final parameter Boolean have_pumHeaWatSec=
+    if have_heaWat then have_pumHeaWatSec_select else false
+    "Set to true for plants with secondary HW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumChiWatSec_select(start=false)
+    "Set to true for plants with secondary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_chiWat,group="Plant configuration"));
+  final parameter Boolean have_pumChiWatSec=
+    if have_chiWat then have_pumChiWatSec_select else false
+    "Set to true for plants with secondary CHW pumps"
+    annotation (Evaluate=true);
+  // Only headered arrangements are supported for secondary pumps.
+  final parameter Boolean have_pumSecHdr=true
+    "Set to true for headered secondary pumps, false for dedicated pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  // Only ∆p controlled variable speed pumps are supported for secondary pumps.
+  final parameter Boolean have_pumSecCtlDp=have_pumHeaWatSec or have_pumChiWatSec
+    "Set to true for secondary headered variable speed pumps using ∆p pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  // RFE(AntoineGautier): Add option for sidestream HRC. Always excluded for now.
+  final parameter Boolean have_hrc(
+    start=false)=false
+    "Set to true for plants with a sidestream heat recovery chiller"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+    enable=have_heaWat and have_chiWat));
+  parameter Boolean have_senVHeaWatPri_select(start=false)
+    "Set to true for plants with primary HW flow sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_heaWat and not have_hrc and have_senVHeaWatSec));
+  final parameter Boolean have_senVHeaWatPri=have_heaWat and
+    (if have_hrc or not have_senVHeaWatSec then true else have_senVHeaWatPri_select)
+    "Set to true for plants with primary HW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  // Secondary flow sensor required for secondary HW pump staging.
+  final parameter Boolean have_senVHeaWatSec=have_pumHeaWatSec
+    "Set to true for plants with secondary HW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  parameter Boolean have_senVChiWatPri_select(start=false)
+    "Set to true for plants with primary CHW flow sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_chiWat and not have_hrc and have_senVChiWatSec));
+  final parameter Boolean have_senVChiWatPri=have_chiWat and
+    (if have_hrc or not have_senVChiWatSec then true
+    else have_senVChiWatPri_select)
+    "Set to true for plants with primary CHW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  // Secondary flow sensor required for secondary CHW pump staging.
+  final parameter Boolean have_senVChiWatSec(start=false)=have_pumChiWatSec
+    "Set to true for plants with secondary CHW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  parameter Boolean have_senTHeaWatPriRet_select(start=false)
+    "Set to true for plants with primary HW return temperature sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_heaWat and not have_hrc and have_senTHeaWatSecRet));
+  final parameter Boolean have_senTHeaWatPriRet=have_heaWat and
+    (if have_hrc or not have_senTHeaWatSecRet then true else have_senTHeaWatPriRet_select)
+    "Set to true for plants with primary HW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  parameter Boolean have_senTChiWatPriRet_select(start=false)
+    "Set to true for plants with primary CHW return temperature sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_chiWat and not have_hrc and have_senTChiWatSecRet));
+  final parameter Boolean have_senTChiWatPriRet=have_chiWat and
+    (if have_hrc or not have_senTChiWatSecRet then true else have_senTChiWatPriRet_select)
+    "Set to true for plants with primary CHW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  // For primary-secondary plants, SHWST sensor is required for plant staging.
+  final parameter Boolean have_senTHeaWatSecSup=have_pumHeaWatSec
+    "Set to true for plants with secondary HW supply temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  // For primary-secondary plants, SCHWST sensor is required for plant staging.
+  final parameter Boolean have_senTChiWatSecSup=have_pumChiWatSec
+    "Set to true for plants with secondary CHW supply temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors"));
+  parameter Boolean have_senTHeaWatSecRet(start=false)
+    "Set to true for plants with secondary HW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors", enable=have_pumHeaWatSec));
+  parameter Boolean have_senTChiWatSecRet(start=false)
+    "Set to true for plants with secondary CHW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Sensors", enable=have_pumChiWatSec));
+  parameter Integer nHp(final min=1)
+    "Number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Integer nPumHeaWatPri(
+    final min=if have_pumHeaWatPri then 1 else 0,
+    start=0)=nHp
+    "Number of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_pumHeaWatPri));
+  parameter Integer nPumChiWatPri(
+    final min=if have_pumChiWatPri then 1 else 0,
+    start=if have_pumChiWatPri then nHp else 0)=if have_pumChiWatPri then nHp
+     else 0
+    "Number of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_pumChiWatPri));
+  parameter Integer nPumHeaWatSec(
+    final min=if have_pumHeaWatSec then 1 else 0,
+    start=0)=nHp
+    "Number of secondary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_pumHeaWatSec));
+  parameter Integer nPumChiWatSec(
+    final min=if have_pumChiWatSec then 1 else 0,
+    start=0)=nHp
+    "Number of secondary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_pumChiWatSec));
+  parameter Boolean have_senDpHeaWatRemWir(start=true)=true
+    "Set to true for remote HW differential pressure sensor(s) hardwired to plant or pump controller"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Integer nSenDpHeaWatRem(final min=if have_heaWat and have_pumHeaWatSec
+         then 1 else 0, start=0)
+    "Number of remote HW differential pressure sensors used for HW pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Boolean have_senDpChiWatRemWir(start=true)=true
+    "Set to true for remote CHW differential pressure sensor(s) hardwired to plant or pump controller"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Integer nSenDpChiWatRem(final min=if have_chiWat and have_pumChiWatSec
+         then 1 else 0, start=0)
+    "Number of remote CHW differential pressure sensors used for CHW pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Sensors",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real THeaWatSup_nominal(
+    final min=273.15,
+    start=50 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Design HW supply temperature (maximum setpoint)"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_heaWat));
+  parameter Real THeaWatSupSet_min(
+    final min=273.15,
+    start=25 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Minimum value to which the HW supply temperature can be reset"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_heaWat));
+  parameter Real TOutHeaWatLck(
+    final min=273.15,
+    start=21 + 273.15,
+    final unit="K",
+    displayUnit="degC")=294.15
+    "Outdoor air lockout temperature above which the HW loop is prevented from operating"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_heaWat));
+  parameter Real capHeaHp_nominal[nHp](
+    final min=fill(0, nHp),
+    start=fill(1, nHp),
+    final unit=fill("W", nHp))
+    "Design heating capacity - Each heat pump"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_heaWat));
+  parameter Real VHeaWatSec_flow_nominal(
+    final min=0,
+    start=1E-6,
+    final unit="m3/s")
+    "Design secondary HW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_heaWat and have_pumHeaWatSec and have_pumSecCtlDp));
+  parameter Real dpHeaWatRemSet_max[nSenDpHeaWatRem](
+    final min=fill(0, nSenDpHeaWatRem),
+    start=fill(5E4, nSenDpHeaWatRem),
+    final unit=fill("Pa", nSenDpHeaWatRem))
+    "Maximum HW differential pressure setpoint - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real dpHeaWatRemSet_min(
+    final min=0,
+    start=5*6894,
+    final unit="Pa")=5*6894
+    "Minimum value to which the HW differential pressure can be reset - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by designer",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real yPumHeaWatPriSet(
+    final max=1,
+    final min=0,
+    start=1,
+    final unit="1")
+    "Primary pump speed providing design heat pump flow in heating mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_heaWat and have_pumHeaWatPriVar));
+  parameter Real TChiWatSup_nominal(
+    final min=273.15,
+    start=7 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Design CHW supply temperature (minimum setpoint)"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_chiWat));
+  parameter Real TChiWatSupSet_max(
+    final min=273.15,
+    start=15 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Maximum value to which the CHW supply temperature can be reset"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_chiWat));
+  parameter Real TOutChiWatLck(
+    final min=273.15,
+    start=16 + 273.15,
+    final unit="K",
+    displayUnit="degC")=289.15
+    "Outdoor air lockout temperature below which the CHW loop is prevented from operating"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_chiWat));
+  parameter Real capCooHp_nominal[nHp](
+    final min=fill(0, nHp),
+    start=fill(1, nHp),
+    final unit=fill("W", nHp))
+    "Design cooling capacity - Each heat pump"
+    annotation (Dialog(group="Information provided by designer",
+      enable=have_chiWat));
+  parameter Real VChiWatSec_flow_nominal(
+    final min=0,
+    start=1E-6,
+    final unit="m3/s")
+    "Design secondary CHW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer",
+      enable=have_chiWat and have_pumChiWatSec and have_pumSecCtlDp));
+  parameter Real dpChiWatRemSet_max[nSenDpChiWatRem](
+    final min=fill(0, nSenDpChiWatRem),
+    start=fill(5E4, nSenDpChiWatRem),
+    final unit=fill("Pa", nSenDpChiWatRem))
+    "Maximum CHW differential pressure setpoint - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real dpChiWatRemSet_min(
+    final min=0,
+    start=5*6894,
+    final unit="Pa")=5*6894
+    "Minimum value to which the CHW differential pressure can be reset - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by designer",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real yPumChiWatPriSet(
+    final max=1,
+    final min=0,
+    start=1,
+    final unit="1")
+    "Primary pump speed providing design heat pump flow in cooling mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_chiWat and have_pumChiWatPriVar));
+  parameter Real cp_default(
+    final min=0,
+    final unit="J/(kg.K)")=4184
+    "Default specific heat capacity used to compute required capacity"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer"));
+  parameter Real rho_default(
+    final min=0,
+    final unit="kg/m3")=996
+    "Default density used to compute required capacity"
+    annotation (Evaluate=true,
+    Dialog(group="Information provided by designer"));
+  parameter Boolean have_inpSch=false
+    "Set to true to provide schedule via software input point"
+    annotation (Dialog(group="Plant enable"),
+    Evaluate=true);
+  parameter Real schHea[:, 2](start=[0,1; 24*3600,1])=[0,1; 24*3600,1]
+    "Heating mode enable schedule"
+    annotation (Dialog(enable=not have_inpSch,group="Plant enable"));
+  parameter Real schCoo[:, 2](start=[0,1; 24*3600,1])=[0,1; 24*3600,1]
+    "Cooling mode enable schedule"
+    annotation (Dialog(enable=not have_inpSch,group="Plant enable"));
+  parameter Integer nReqIgnHeaWat(final min=0)=0
+    "Number of ignored HW plant requests"
+    annotation (Dialog(tab="Advanced",group="Plant enable"));
+  parameter Integer nReqIgnChiWat(final min=0)=0
+    "Number of ignored CHW plant requests"
+    annotation (Dialog(tab="Advanced",group="Plant enable"));
+  parameter Real dTOutLck(
+    final min=0,
+    final unit="K")=0.5
+    "Hysteresis for outdoor air lockout temperature"
+    annotation (Dialog(tab="Advanced",group="Plant enable"));
+  parameter Real dtRunEna(
+    final min=0,
+    final unit="s")=15*60
+    "Minimum runtime of enable and disable states"
+    annotation (Dialog(tab="Advanced",group="Plant enable"));
+  parameter Real dtReqDis(
+    final min=0,
+    final unit="s")=3*60
+    "Runtime with low number of request before disabling"
+    annotation (Dialog(tab="Advanced",group="Plant enable"));
+  parameter Real staEqu[:, nHp](
+    each final max=1,
+    each final min=0,
+    each final unit="1")
+    "Staging matrix – Equipment required for each stage"
+    annotation (Dialog(group="Equipment staging and rotation"));
+  final parameter Integer nSta(
+    final min=1)=size(staEqu, 1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  final parameter Integer nEquAlt(
+    final min=0)=max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1 then 1 else 0) for j in 1:nHp}) for i in 1:nSta})
+    "Number of lead/lag alternate equipment"
+    annotation (Evaluate=true);
+  parameter Integer idxEquAlt[nEquAlt](
+    each final min=1)
+    "Indices of lead/lag alternate equipment"
+    annotation (Evaluate=true,
+    Dialog(group="Equipment staging and rotation"));
+  parameter Real dtVal(
+    final min=0,
+    start=90,
+    final unit="s")=90
+    "Nominal valve timing"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation",
+      enable=have_valHpInlIso or have_valHpOutIso));
+  parameter Real dtHp(
+    final min=0,
+    final unit="s")=180
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
+  parameter Real plrSta(
+    final max=1,
+    final min=0,
+    start=0.9,
+    final unit="1")=0.9
+    "Staging part load ratio"
+    annotation (Dialog(group="Equipment staging and rotation"));
+  parameter Real dtRunSta(
+    final min=0,
+    final unit="s",
+    displayUnit="min")=900
+    "Minimum runtime of each stage"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
+  parameter Real dtOff(
+    final min=0,
+    final unit="s")=900
+    "Off time required before equipment is deemed available again"
+    annotation (Dialog(tab="Advanced",group="Equipment staging and rotation"));
+  parameter Real dtRunPumSta(
+    final min=0,
+    start=600,
+    final unit="s")=600
+    "Runtime before triggering stage command"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real dVOffUpPumSta(
+    final max=1,
+    final min=0,
+    start=0.03,
+    final unit="1")=0.03
+    "Stage up flow point offset"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real dVOffDowPumSta(
+    final max=1,
+    final min=0,
+    start=0.03,
+    final unit="1")=dVOffUpPumSta
+    "Stage down flow point offset"
+    annotation (Dialog(tab="Advanced",group="Pump staging",
+      enable=have_pumPriHdr and have_pumPriCtlDp or have_pumSecHdr and have_pumSecCtlDp));
+  parameter Real dtHol(
+    final min=0,
+    final unit="s")=900
+    "Minimum hold time during stage change"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+  parameter Real resDpHeaWat_max(
+    final max=1,
+    final min=0,
+    final unit="1")=0.5
+    "Upper limit of plant reset interval for HW differential pressure reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real resTHeaWatSup_min(
+    final max=1,
+    final min=0,
+    final unit="1")=resDpHeaWat_max
+    "Lower limit of plant reset interval for HW supply temperature reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real resDpChiWat_max(
+    final max=1,
+    final min=0,
+    final unit="1")=0.5
+    "Upper limit of plant reset interval for CHW differential pressure reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real resTChiWatSup_min(
+    final max=1,
+    final min=0,
+    final unit="1")=resDpChiWat_max
+    "Lower limit of plant reset interval for CHW supply temperature reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real res_init(
+    final max=1,
+    final min=0,
+    final unit="1")=1
+    "Initial reset value"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+  parameter Real res_min(
+    final max=1,
+    final min=0,
+    final unit="1")=0
+    "Minimum reset value"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+  parameter Real res_max(
+    final max=1,
+    final min=0,
+    final unit="1")=1
+    "Maximum reset value"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+  parameter Real dtDel(
+    final min=100*1E-15,
+    final unit="s")=900
+    "Delay time before the reset begins"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec or have_chiWat and have_pumChiWatSec));
+  parameter Real dtResHeaWat(
+    final min=1E-3,
+    final unit="s")=300
+    "Reset period for HW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Integer nReqResIgnHeaWat(final min=0)=2
+    "Number of ignored requests for HW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real triHeaWat(
+    final max=0,
+    final unit="1")=-0.02
+    "Trim amount for HW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real rspHeaWat(
+    final min=0,
+    final unit="1")=0.03
+    "Respond amount for HW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real rspHeaWat_max(
+    final min=0,
+    final unit="1")=0.07
+    "Maximum response per reset period for HW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_heaWat and have_pumHeaWatSec));
+  parameter Real dtResChiWat(
+    final min=1E-3,
+    final unit="s")=300
+    "Reset period for CHW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Integer nReqResIgnChiWat(final min=0)=2
+    "Number of ignored requests for CHW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real triChiWat(
+    final max=0,
+    final unit="1")=-0.02
+    "Trim amount for CHW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real rspChiWat(
+    final min=0,
+    final unit="1")=0.03
+    "Respond amount for CHW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real rspChiWat_max(
+    final min=0,
+    final unit="1")=0.07
+    "Maximum response per reset period for CHW plant reset"
+    annotation (Dialog(tab="Advanced",group="Plant reset",
+      enable=have_chiWat and have_pumChiWatSec));
+  parameter Real yPumHeaWatSec_min(
+    final max=1,
+    final min=0,
+    start=0.1,
+    final unit="1")=0.1
+    "Minimum pump speed"
+    annotation (Dialog(tab="Advanced",group="Secondary HW pumps",
+      enable=have_pumHeaWatSec));
+  parameter Real kPumHeaWatSec(
+    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    start=1)=1
+    "Gain of controller"
+    annotation (Dialog(tab="Advanced",group="Secondary HW pumps",
+      enable=have_pumHeaWatSec));
+  parameter Real TiPumHeaWatSec(
+    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    start=60,
+    final unit="s")=60
+    "Time constant of integrator block"
+    annotation (Dialog(tab="Advanced",group="Secondary HW pumps",
+      enable=have_pumHeaWatSec));
+  parameter Real yPumChiWatSec_min(
+    final max=1,
+    final min=0,
+    start=0.1,
+    final unit="1")=0.1
+    "Minimum pump speed"
+    annotation (Dialog(tab="Advanced",group="Secondary CHW pumps",
+      enable=have_pumChiWatSec));
+  parameter Real kPumChiWatSec(
+    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    start=1)=1
+    "Gain of controller"
+    annotation (Dialog(tab="Advanced",group="Secondary CHW pumps",
+      enable=have_pumChiWatSec));
+  parameter Real TiPumChiWatSec(
+    final min=100*Buildings.Controls.OBC.CDL.Constants.eps,
+    start=60,
+    final unit="s")=60
+    "Time constant of integrator block"
+    annotation (Dialog(tab="Advanced",group="Secondary CHW pumps",
+      enable=have_pumChiWatSec));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaHp[nHp](each k=true)
+    "Heat pump available signal – Block does not handle faulted equipment yet"
+    annotation (Placement(transformation(extent={{-250,250},{-230,270}}),
+        iconTransformation(extent={{-240,220},{-200,260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqPlaHeaWat
+    if have_heaWat
+    "Number of HW plant requests" annotation (Placement(transformation(extent={
+            {-300,320},{-260,360}}), iconTransformation(extent={{-240,120},{-200,
+            160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TOut(
+    final unit="K",
+    final quantity="ThermodynamicTemperature",
+    displayUnit="degC")
+    "Outdoor air temperature"
+    annotation (Placement(transformation(extent={{-300,60},{-260,100}}),
+      iconTransformation(extent={{-240,20},{-200,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1SchHea
+    if have_heaWat and have_inpSch
+    "Heating mode enable via schedule"
+    annotation (Placement(transformation(extent={{-300,360},{-260,400}}),
+      iconTransformation(extent={{-240,300},{-200,340}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqPlaChiWat
+    if have_chiWat
+    "Number of CHW plant requests" annotation (Placement(transformation(extent=
+            {{-300,300},{-260,340}}), iconTransformation(extent={{-240,100},{-200,
+            140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1SchCoo
+    if have_chiWat and have_inpSch
+    "Cooling mode enable via schedule"
+    annotation (Placement(transformation(extent={{-300,340},{-260,380}}),
+      iconTransformation(extent={{-240,280},{-200,320}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqResHeaWat
+    if have_heaWat
+    "Sum of HW reset requests of all heating loads served"
+    annotation (Placement(transformation(extent={{-300,-360},{-260,-320}}),
+      iconTransformation(extent={{-240,80},{-200,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqResChiWat
+    if have_chiWat
+    "Sum of CHW reset requests of all heating loads served"
+    annotation (Placement(transformation(extent={{-300,-380},{-260,-340}}),
+      iconTransformation(extent={{-240,60},{-200,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri_actual[nPumHeaWatPri]
+    if have_heaWat and have_pumHeaWatPri
+    "Primary HW pump status"
+    annotation (Placement(transformation(extent={{-300,180},{-260,220}}),
+      iconTransformation(extent={{-240,220},{-200,260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri_actual[nPumChiWatPri]
+    if have_chiWat and have_pumChiWatPri
+    "Primary CHW pump status"
+    annotation (Placement(transformation(extent={{-300,160},{-260,200}}),
+      iconTransformation(extent={{-240,200},{-200,240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatSec_actual[nPumHeaWatSec]
+    if have_heaWat and have_pumHeaWatSec
+    "Secondary HW pump status"
+    annotation (Placement(transformation(extent={{-300,140},{-260,180}}),
+      iconTransformation(extent={{-240,180},{-200,220}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatSec_actual[nPumChiWatSec]
+    if have_chiWat and have_pumChiWatSec
+    "Secondary CHW pump status"
+    annotation (Placement(transformation(extent={{-300,120},{-260,160}}),
+      iconTransformation(extent={{-240,160},{-200,200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriRet(
+    final unit="K",
+    displayUnit="degC") if have_heaWat and have_senTHeaWatPriRet
+    "Primary HW return temperature"
+    annotation (Placement(transformation(extent={{-300,20},{-260,60}}),
+      iconTransformation(extent={{-240,-20},{-200,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatPri_flow(
+    final unit="m3/s") if have_heaWat and have_senVHeaWatPri
+    "Primary HW volume flow rate"
+    annotation (Placement(transformation(extent={{-300,0},{-260,40}}),
+      iconTransformation(extent={{-240,-40},{-200,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatLoc(
+    final unit="Pa")
+    if have_heaWat and not have_senDpHeaWatRemWir
+    "Local HW differential pressure"
+    annotation (Placement(transformation(extent={{-300,-260},{-260,-220}}),
+      iconTransformation(extent={{-240,-280},{-200,-240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatLocSet[nSenDpHeaWatRem](
+    each final unit="Pa")
+    if have_heaWat and not have_senDpHeaWatRemWir
+    "Local HW differential pressure setpoint output from each of the remote loops"
+    annotation (Placement(transformation(extent={{-300,-240},{-260,-200}}),
+      iconTransformation(extent={{-240,-260},{-200,-220}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpHeaWatRem[nSenDpHeaWatRem](
+    each final unit="Pa")
+    if have_heaWat and have_senDpHeaWatRemWir
+    "Remote HW differential pressure"
+    annotation (Placement(transformation(extent={{-300,-220},{-260,-180}}),
+      iconTransformation(extent={{-240,-240},{-200,-200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatLoc(
+    final unit="Pa")
+    if have_chiWat and not have_senDpChiWatRemWir
+    "Local CHW differential pressure"
+    annotation (Placement(transformation(extent={{-300,-320},{-260,-280}}),
+      iconTransformation(extent={{-240,-340},{-200,-300}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatLocSet[nSenDpChiWatRem](
+    each final unit="Pa")
+    if have_chiWat and not have_senDpChiWatRemWir
+    "Local CHW differential pressure setpoint output from each of the remote loops"
+    annotation (Placement(transformation(extent={{-300,-300},{-260,-260}}),
+      iconTransformation(extent={{-240,-320},{-200,-280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpChiWatRem[nSenDpChiWatRem](
+    each final unit="Pa")
+    if have_chiWat and have_senDpChiWatRemWir
+    "Remote CHW differential pressure"
+    annotation (Placement(transformation(extent={{-300,-280},{-260,-240}}),
+      iconTransformation(extent={{-240,-300},{-200,-260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValHeaWatHpInlIso[nHp]
+    if have_heaWat and have_valHpInlIso
+    "Heat pump inlet HW inlet isolation valve command" annotation (Placement(
+        transformation(extent={{260,300},{300,340}}), iconTransformation(extent
+          ={{200,180},{240,220}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValHeaWatHpOutIso[nHp]
+    if have_heaWat and have_valHpOutIso
+    "Heat pump outlet HW isolation valve command" annotation (Placement(
+        transformation(extent={{260,280},{300,320}}), iconTransformation(extent
+          ={{200,160},{240,200}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValChiWatHpInlIso[nHp]
+    if have_chiWat and have_valHpInlIso
+    "Heat pump inlet CHW isolation valve command" annotation (Placement(
+        transformation(extent={{260,260},{300,300}}), iconTransformation(extent
+          ={{200,140},{240,180}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValChiWatHpOutIso[nHp]
+    if have_chiWat and have_valHpOutIso
+    "Heat pump outlet CHW isolation valve command" annotation (Placement(
+        transformation(extent={{260,240},{300,280}}), iconTransformation(extent
+          ={{200,120},{240,160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWatPri[nPumHeaWatPri]
+    if have_pumHeaWatPri
+    "Primary HW pump start command"
+    annotation (Placement(transformation(extent={{260,180},{300,220}}),
+      iconTransformation(extent={{200,80},{240,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWatPri[nPumChiWatPri]
+    if have_pumChiWatPri and have_chiWat
+    "Primary CHW pump start command"
+    annotation (Placement(transformation(extent={{260,160},{300,200}}),
+      iconTransformation(extent={{200,60},{240,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWatSec[nPumHeaWatSec]
+    if have_pumHeaWatSec
+    "Secondary HW pump start command"
+    annotation (Placement(transformation(extent={{260,140},{300,180}}),
+      iconTransformation(extent={{200,20},{240,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWatSec[nPumChiWatSec]
+    if have_pumChiWatSec and have_chiWat
+    "Secondary CHW pump start command"
+    annotation (Placement(transformation(extent={{260,120},{300,160}}),
+      iconTransformation(extent={{200,0},{240,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Hp[nHp]
+    "Heat pump enable command"
+    annotation (Placement(transformation(extent={{260,360},{300,400}}),
+      iconTransformation(extent={{200,240},{240,280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1HeaHp[nHp]
+    if have_heaWat and have_chiWat
+    "Heat pump heating/cooling mode command: true=heating, false=cooling"
+    annotation (Placement(transformation(extent={{260,340},{300,380}}),
+      iconTransformation(extent={{200,220},{240,260}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpHeaWatRemSet[nSenDpHeaWatRem](
+    each final min=0,
+    each final unit="Pa") if have_heaWat
+    "HW differential pressure setpoint"
+    annotation (Placement(transformation(extent={{260,-80},{300,-40}}),
+      iconTransformation(extent={{200,-180},{240,-140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpChiWatRemSet[nSenDpChiWatRem](
+    each final min=0,
+    each final unit="Pa") if have_chiWat
+    "CHW differential pressure setpoint"
+    annotation (Placement(transformation(extent={{260,-100},{300,-60}}),
+      iconTransformation(extent={{200,-200},{240,-160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriHdr(
+    final unit="1")
+    if have_heaWat and have_pumHeaWatPriVar and have_pumPriHdr
+    "Primary headered HW pump speed command"
+    annotation (Placement(transformation(extent={{260,80},{300,120}}),
+      iconTransformation(extent={{200,-40},{240,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriHdr(
+    final unit="1") if have_chiWat and have_pumChiWatPri and
+    have_pumChiWatPriVar and have_pumPriHdr
+    "Primary headered CHW pump speed command"
+    annotation (Placement(transformation(extent={{260,60},{300,100}}),
+      iconTransformation(extent={{200,-60},{240,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatSec(
+    final unit="1")
+    if have_heaWat and have_pumHeaWatSec
+    "Primary HW pump speed command"
+    annotation (Placement(transformation(extent={{260,-20},{300,20}}),
+      iconTransformation(extent={{200,-120},{240,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatSec(
+    final unit="1")
+    if have_chiWat and have_pumChiWatSec
+    "Primary CHW pump speed command"
+    annotation (Placement(transformation(extent={{260,-40},{300,0}}),
+      iconTransformation(extent={{200,-140},{240,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TChiWatSupSet(
+    final unit="K",
+    displayUnit="degC") if have_chiWat
+    "CHW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{260,-200},{300,-160}}),
+      iconTransformation(extent={{200,-280},{240,-240}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput THeaWatSupSet(
+    final unit="K",
+    displayUnit="degC") if have_heaWat
+    "HW supply temperature setpoint"
+    annotation (Placement(transformation(extent={{260,-180},{300,-140}}),
+      iconTransformation(extent={{200,-260},{240,-220}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriRet(
+    final unit="K",
+    displayUnit="degC") if have_chiWat and have_senTChiWatPriRet
+    "Primary CHW return temperature"
+    annotation (Placement(transformation(extent={{-300,-40},{-260,0}}),
+      iconTransformation(extent={{-240,-80},{-200,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatPri_flow(
+    final unit="m3/s") if have_chiWat and have_senVChiWatPri
+    "Primary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{-300,-60},{-260,-20}}),
+      iconTransformation(extent={{-240,-100},{-200,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hp_actual[nHp]
+    "Heat pump status"
+    annotation (Placement(transformation(extent={{-300,280},{-260,320}}),
+      iconTransformation(extent={{-240,240},{-200,280}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriDed[nPumHeaWatPri](
+    each final unit="1")
+    if have_heaWat and have_pumHeaWatPriVar and not have_pumPriHdr
+    "Primary dedicated HW pump speed command"
+    annotation (Placement(transformation(extent={{260,40},{300,80}}),
+      iconTransformation(extent={{200,-80},{240,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriDed[nPumChiWatPri](
+    each final unit="1")
+    if have_chiWat and have_pumChiWatPriDed and have_pumChiWatPriVar
+    "Primary dedicated CHW pump speed command"
+    annotation (Placement(transformation(extent={{260,20},{300,60}}),
+      iconTransformation(extent={{200,-100},{240,-60}})));
+  Enabling.Enable enaHea(
+    final typ=Buildings.Templates.Plants.Controls.Types.Application.Heating,
+    final TOutLck=TOutHeaWatLck,
+    final dTOutLck=dTOutLck,
+    final dtReq=dtReqDis,
+    final dtRun=dtRunEna,
+    final have_inpSch=have_inpSch,
+    final nReqIgn=nReqIgnHeaWat,
+    final sch=schHea)
+    if have_heaWat
+    "Heating mode enable"
+    annotation (Placement(transformation(extent={{-110,350},{-90,370}})));
+  Utilities.StageIndex idxStaHea(
+    final nSta=nSta,
+    final dtRun=dtRunSta)
+    if have_heaWat
+    "Compute heating stage index"
+    annotation (Placement(transformation(extent={{-10,350},{10,370}})));
+  StagingRotation.StageAvailability avaStaHea(
+    final staEqu=staEqu)
+    if have_heaWat
+    "Evaluate heating stage availability"
+    annotation (Placement(transformation(extent={{-110,320},{-90,340}})));
+  StagingRotation.EquipmentEnable enaEquHea(
+    final staEqu=staEqu)
+    if have_heaWat
+    "Compute enable command for equipment in heating mode"
+    annotation (Placement(transformation(extent={{40,350},{60,370}})));
+  StagingRotation.EventSequencing seqEve[nHp](
+    each final have_heaWat=have_heaWat,
+    each final have_chiWat=have_chiWat,
+    each final have_valInlIso=have_valHpInlIso,
+    each final have_valOutIso=have_valHpOutIso,
+    each final have_pumHeaWatPri=have_pumHeaWatPri,
+    each final have_pumChiWatPri=have_pumChiWatPri,
+    each final have_pumHeaWatSec=have_pumHeaWatSec,
+    each final have_pumChiWatSec=have_pumChiWatSec,
+    each final dtVal=dtVal,
+    each final dtOff=dtHp) "Event sequencing"
+    annotation (Placement(transformation(extent={{140,284},{160,312}})));
+  StagingRotation.StageAvailability avaStaCoo(
+    final staEqu=staEqu)
+    if have_chiWat
+    "Evaluate cooling stage availability"
+    annotation (Placement(transformation(extent={{-110,60},{-90,80}})));
+  StagingRotation.StageChangeCommand chaStaHea(
+    final have_inpPlrSta=false,
+    final plrSta=plrSta,
+    final staEqu=staEqu,
+    final capEqu=capHeaHp_nominal,
+    final dtRun=dtRunSta,
+    final cp_default=cp_default,
+    final rho_default=rho_default)
+    if have_heaWat
+    "Generate heating stage transition command"
+    annotation (Placement(transformation(extent={{-40,308},{-20,332}})));
+  StagingRotation.SortRuntime sorRunTimHea(
+    idxEquAlt=idxEquAlt,
+    nin=nHp)
+    if have_heaWat
+    "Sort lead/lag alternate equipment by staging runtime – Heating mode"
+    annotation (Placement(transformation(extent={{-40,280},{-20,300}})));
+  Enabling.Enable enaCoo(
+    final typ=Buildings.Templates.Plants.Controls.Types.Application.Cooling,
+    final TOutLck=TOutChiWatLck,
+    final dTOutLck=dTOutLck,
+    final dtReq=dtReqDis,
+    final dtRun=dtRunEna,
+    final have_inpSch=have_inpSch,
+    final nReqIgn=nReqIgnChiWat,
+    final sch=schCoo)
+    if have_chiWat
+    "Cooling mode enable"
+    annotation (Placement(transformation(extent={{-110,90},{-90,110}})));
+  StagingRotation.StageChangeCommand chaStaCoo(
+    final have_inpPlrSta=false,
+    final plrSta=plrSta,
+    final staEqu=staEqu,
+    final capEqu=capCooHp_nominal,
+    final dtRun=dtRunSta,
+    final cp_default=cp_default,
+    final rho_default=rho_default)
+    if have_chiWat
+    "Generate cooling stage transition command"
+    annotation (Placement(transformation(extent={{-40,50},{-20,74}})));
+  Utilities.StageIndex idxStaCoo(
+    final nSta=nSta,
+    final dtRun=dtRunSta)
+    if have_chiWat
+    "Compute cooling stage index"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  StagingRotation.EquipmentEnable enaEquCoo(
+    final staEqu=staEqu)
+    if have_chiWat
+    "Compute enable command for equipment in cooling mode"
+    annotation (Placement(transformation(extent={{40,90},{60,110}})));
+  StagingRotation.EquipmentAvailability avaEquHeaCoo[nHp](
+    each final have_heaWat=have_heaWat,
+    each final have_chiWat=have_chiWat,
+    each final dtOff=dtOff)
+    "Evaluate equipment availability in heating or cooling mode"
+    annotation (Placement(transformation(extent={{-152,210},{-132,230}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre y1HeaPre[nHp]
+    if have_heaWat and have_chiWat
+    "Left-limit of command signal to break algebraic loop"
+    annotation (Placement(transformation(extent={{230,350},{210,370}})));
+  StagingRotation.SortRuntime sorRunTimCoo(
+    final idxEquAlt=idxEquAlt,
+    nin=nHp)
+    if have_chiWat
+    "Sort lead/lag alternate equipment by staging runtime – Cooling mode"
+    annotation (Placement(transformation(extent={{-40,20},{-20,40}})));
+  Pumps.Generic.StagingHeadered staPumHeaWatPri(
+    final is_pri=true,
+    final have_valInlIso=have_valHpInlIso,
+    final have_valOutIso=have_valHpOutIso,
+    final nEqu=nHp,
+    final nPum=nPumHeaWatPri,
+    final is_hdr=have_pumPriHdr,
+    final is_ctlDp=have_pumPriCtlDp,
+    final dtRun=dtRunPumSta,
+    final dVOffUp=dVOffUpPumSta,
+    final dVOffDow=dVOffDowPumSta) if have_pumHeaWatPri
+    "Primary HW pump staging"
+    annotation (Placement(transformation(extent={{140,190},{160,210}})));
+  Pumps.Generic.StagingHeadered staPumChiWatPri(
+    final is_pri=true,
+    final have_valInlIso=have_valHpInlIso,
+    final have_valOutIso=have_valHpOutIso,
+    final nEqu=nHp,
+    final nPum=nPumChiWatPri,
+    final is_hdr=have_pumPriHdr,
+    final is_ctlDp=have_pumPriCtlDp,
+    final dtRun=dtRunPumSta,
+    final dVOffUp=dVOffUpPumSta,
+    final dVOffDow=dVOffDowPumSta) if have_pumChiWatPri and have_chiWat
+    "Primary CHW pump staging"
+    annotation (Placement(transformation(extent={{190,170},{210,190}})));
+  Pumps.Generic.StagingHeadered staPumChiWatSec(
+    final is_pri=false,
+    final nEqu=nHp,
+    final nPum=nPumChiWatSec,
+    final is_hdr=have_pumSecHdr,
+    final is_ctlDp=have_pumSecCtlDp,
+    final V_flow_nominal=VChiWatSec_flow_nominal,
+    final dtRun=dtRunPumSta,
+    final dVOffUp=dVOffUpPumSta,
+    final dVOffDow=dVOffDowPumSta) if have_pumChiWatSec and have_chiWat
+    "Secondary CHW pump staging"
+    annotation (Placement(transformation(extent={{190,130},{210,150}})));
+  Pumps.Generic.StagingHeadered staPumHeaWatSec(
+    final is_pri=false,
+    final nEqu=nHp,
+    final nPum=nPumHeaWatSec,
+    final is_hdr=have_pumSecHdr,
+    final is_ctlDp=have_pumSecCtlDp,
+    final V_flow_nominal=VHeaWatSec_flow_nominal,
+    final dtRun=dtRunPumSta,
+    final dVOffUp=dVOffUpPumSta,
+    final dVOffDow=dVOffDowPumSta) if have_pumHeaWatSec
+    "Secondary HW pump staging"
+    annotation (Placement(transformation(extent={{140,150},{160,170}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSecRet(
+    final unit="K",
+    displayUnit="degC") if have_heaWat and have_senTHeaWatSecRet
+    "Secondary HW return temperature"
+    annotation (Placement(transformation(extent={{-300,-100},{-260,-60}}),
+      iconTransformation(extent={{-240,-140},{-200,-100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VHeaWatSec_flow(
+    final unit="m3/s") if have_heaWat and have_senVHeaWatSec
+    "Secondary HW volume flow rate"
+    annotation (Placement(transformation(extent={{-300,-120},{-260,-80}}),
+      iconTransformation(extent={{-240,-160},{-200,-120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSecRet(
+    final unit="K",
+    displayUnit="degC") if have_chiWat and have_senTChiWatSecRet
+    "Secondary CHW return temperature"
+    annotation (Placement(transformation(extent={{-300,-160},{-260,-120}}),
+      iconTransformation(extent={{-240,-200},{-200,-160}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput VChiWatSec_flow(
+    final unit="m3/s") if have_chiWat and have_senVChiWatSec
+    "Secondary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{-300,-180},{-260,-140}}),
+      iconTransformation(extent={{-240,-220},{-200,-180}})));
+  Utilities.PlaceholderReal THeaWatRet(have_inp=have_heaWat and
+        have_senTHeaWatPriRet,
+      have_inpPh=true) if have_heaWat "Select HW return temperature sensor"
+    annotation (Placement(transformation(extent={{-230,30},{-210,50}})));
+  Utilities.PlaceholderReal VHeaWat_flow(have_inp=have_heaWat and
+        have_senVHeaWatPri,
+      have_inpPh=true) if have_heaWat "Select HW flow sensor"
+    annotation (Placement(transformation(extent={{-200,10},{-180,30}})));
+  Utilities.PlaceholderReal TChiWatRet(have_inp=have_chiWat and
+        have_senTChiWatPriRet,
+      have_inpPh=true) if have_chiWat "Select CHW return temperature sensor"
+    annotation (Placement(transformation(extent={{-230,-30},{-210,-10}})));
+  Utilities.PlaceholderReal VChiWat_flow(have_inp=have_chiWat and
+        have_senVChiWatPri,
+      have_inpPh=true) if have_chiWat "Select CHW flow sensor"
+    annotation (Placement(transformation(extent={{-200,-50},{-180,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre y1HpPre[nHp]
+    "Left-limit of command signal to break algebraic loop"
+    annotation (Placement(transformation(extent={{200,370},{180,390}})));
+  StagingRotation.StageCompletion comStaCoo(
+    nin=nHp)
+    if have_chiWat
+    "Check successful completion of cooling stage change"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  StagingRotation.StageCompletion comStaHea(
+    nin=nHp)
+    if have_heaWat
+    "Check successful completion of heating stage change"
+    annotation (Placement(transformation(extent={{-40,250},{-20,270}})));
+  Setpoints.PlantReset resHeaWat(
+    final TSup_nominal=THeaWatSup_nominal,
+    final TSupSetLim=THeaWatSupSet_min,
+    final dpSet_max=dpHeaWatRemSet_max,
+    final dpSet_min=dpHeaWatRemSet_min,
+    final dtDel=dtDel,
+    final dtHol=dtHol,
+    final dtRes=dtResHeaWat,
+    final nReqResIgn=nReqResIgnHeaWat,
+    final nSenDpRem=nSenDpHeaWatRem,
+    final resDp_max=resDpHeaWat_max,
+    final resTSup_min=resTHeaWatSup_min,
+    final res_init=res_init,
+    final res_max=res_max,
+    final res_min=res_min,
+    final rsp=rspHeaWat,
+    final rsp_max=rspHeaWat_max,
+    final tri=triHeaWat) if have_heaWat "HW plant reset"
+    annotation (Placement(transformation(extent={{90,230},{110,250}})));
+  Setpoints.PlantReset resChiWat(
+    final TSup_nominal=TChiWatSup_nominal,
+    final TSupSetLim=TChiWatSupSet_max,
+    final dpSet_max=dpChiWatRemSet_max,
+    final dpSet_min=dpChiWatRemSet_min,
+    final dtDel=dtDel,
+    final dtHol=dtHol,
+    final dtRes=dtResChiWat,
+    final nReqResIgn=nReqResIgnChiWat,
+    final nSenDpRem=nSenDpChiWatRem,
+    final resDp_max=resDpChiWat_max,
+    final resTSup_min=resTChiWatSup_min,
+    final res_init=res_init,
+    final res_max=res_max,
+    final res_min=res_min,
+    final rsp=rspChiWat,
+    final rsp_max=rspChiWat_max,
+    final tri=triChiWat) if have_chiWat "CHW plant reset"
+    annotation (Placement(transformation(extent={{90,-50},{110,-30}})));
+  Pumps.Primary.VariableSpeedNoDpControl ctlPumPri(
+    final have_heaWat=have_heaWat,
+    final have_chiWat=have_chiWat,
+    final have_pumChiWatPriDed=have_pumChiWatPriDed,
+    final have_pumPriHdr=have_pumPriHdr,
+    final nEqu=nHp,
+    final nPumHeaWatPri=nPumHeaWatPri,
+    final nPumChiWatPri=nPumChiWatPri,
+    final yPumHeaWatPriSet=yPumHeaWatPriSet,
+    final yPumChiWatPriSet=yPumChiWatPriSet)
+    "Primary pump speed control"
+    annotation (Placement(transformation(extent={{190,70},{210,90}})));
+  Pumps.Generic.ControlDifferentialPressure ctlPumHeaWatSec(
+    final have_senDpRemWir=have_senDpHeaWatRemWir,
+    nPum=nPumHeaWatSec,
+    final nSenDpRem=nSenDpHeaWatRem,
+    final y_min=yPumHeaWatSec_min,
+    final k=kPumHeaWatSec,
+    final Ti=TiPumHeaWatSec)
+    if have_pumHeaWatSec
+    "Secondary HW pump speed control"
+    annotation (Placement(transformation(extent={{140,-10},{160,10}})));
+  Pumps.Generic.ControlDifferentialPressure ctlPumChiWatSec(
+    final have_senDpRemWir=have_senDpChiWatRemWir,
+    final nPum=nPumChiWatSec,
+    final nSenDpRem=nSenDpChiWatRem,
+    final y_min=yPumChiWatSec_min,
+    final k=kPumChiWatSec,
+    final Ti=TiPumChiWatSec) if have_chiWat and have_pumChiWatSec
+    "Secondary CHW pump speed control"
+    annotation (Placement(transformation(extent={{190,-30},{210,-10}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSet[nHp](
+    each final unit="K",
+    each final quantity="ThermodynamicTemperature",
+    each displayUnit="degC")
+    "Active HP supply temperature setpoint"
+    annotation (Placement(transformation(extent={{260,-140},{300,-100}}),
+        iconTransformation(extent={{200,-240},{240,-200}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swiTSupSet[nHp]
+    if have_heaWat and have_chiWat
+    "Select supply temperature setpoint based on operating mode"
+    annotation (Placement(transformation(extent={{190,-130},{210,-110}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTChiWatSupSet(final
+      nout=nHp) if have_chiWat "Replicate CHWST setpoint"
+    annotation (Placement(transformation(extent={{150,-150},{170,-130}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator repTHeaWatSupSet(final
+      nout=nHp) if have_heaWat "Replicate HWST setpoint"
+    annotation (Placement(transformation(extent={{150,-110},{170,-90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatPriSup(final unit="K",
+      displayUnit="degC") if have_heaWat "Primary HW supply temperature"
+    annotation (Placement(transformation(extent={{-300,40},{-260,80}}),
+        iconTransformation(extent={{-240,0},{-200,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatPriSup(final unit="K",
+      displayUnit="degC") if have_chiWat "Primary CHW return temperature"
+    annotation (Placement(transformation(extent={{-300,-20},{-260,20}}),
+        iconTransformation(extent={{-240,-60},{-200,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput THeaWatSecSup(final unit="K",
+      displayUnit="degC") if have_chiWat and have_senTHeaWatSecSup
+    "Secondary HW supply temperature" annotation (Placement(transformation(
+          extent={{-300,-80},{-260,-40}}), iconTransformation(extent={{-240,-120},
+            {-200,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TChiWatSecSup(final unit="K",
+      displayUnit="degC") if have_chiWat and have_senTChiWatSecSup
+    "Secondary CHW return temperature" annotation (Placement(transformation(
+          extent={{-300,-140},{-260,-100}}), iconTransformation(extent={{-240,-180},
+            {-200,-140}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasTHeaWatSupSet(final nin
+      =nHp,                                                             final
+      nout=nHp) if have_heaWat and not have_chiWat
+    "Direct pass through for HWST setpoint"
+    annotation (Placement(transformation(extent={{220,-110},{240,-90}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractSignal pasTChiWatSupSet(final nin
+      =nHp, final nout=nHp) if have_chiWat and not have_heaWat
+    "Direct pass through for CHWST setpoint"
+    annotation (Placement(transformation(extent={{220,-150},{240,-130}})));
+equation
+  connect(u1SchHea, enaHea.u1Sch)
+    annotation (Line(points={{-280,380},{-180,380},{-180,364},{-112,364}},color={255,0,255}));
+  connect(nReqPlaHeaWat, enaHea.nReqPla) annotation (Line(points={{-280,340},{-178,
+          340},{-178,360},{-112,360}}, color={255,127,0}));
+  connect(TOut, enaHea.TOut)
+    annotation (Line(points={{-280,80},{-170,80},{-170,356},{-112,356}},color={0,0,127}));
+  connect(enaHea.y1, idxStaHea.u1Lea)
+    annotation (Line(points={{-88,360},{-56,360},{-56,366},{-12,366}},color={255,0,255}));
+  connect(avaStaHea.y1, idxStaHea.u1AvaSta)
+    annotation (Line(points={{-88,330},{-56,330},{-56,354},{-12,354}},color={255,0,255}));
+  connect(idxStaHea.y, enaEquHea.uSta)
+    annotation (Line(points={{12,360},{38,360}},color={255,127,0}));
+  connect(seqEve.y1, y1Hp) annotation (Line(points={{162,310},{238,310},{238,
+          380},{280,380}}, color={255,0,255}));
+  connect(seqEve.y1Hea, y1HeaHp) annotation (Line(points={{162,308},{240,308},{
+          240,360},{280,360}}, color={255,0,255}));
+  connect(seqEve.y1ValHeaWatOutIso, y1ValHeaWatHpOutIso) annotation (Line(
+        points={{162,298},{240,298},{240,300},{280,300}}, color={255,0,255}));
+  connect(seqEve.y1ValHeaWatInlIso, y1ValHeaWatHpInlIso) annotation (Line(
+        points={{162,300},{242,300},{242,320},{280,320}}, color={255,0,255}));
+  connect(seqEve.y1ValChiWatInlIso, y1ValChiWatHpInlIso) annotation (Line(
+        points={{162,296},{238,296},{238,280},{280,280}}, color={255,0,255}));
+  connect(seqEve.y1ValChiWatOutIso, y1ValChiWatHpOutIso) annotation (Line(
+        points={{162,294},{236,294},{236,260},{280,260}}, color={255,0,255}));
+  connect(idxStaHea.y, chaStaHea.uSta)
+    annotation (Line(points={{12,360},{20,360},{20,340},{-50,340},{-50,330},{-42,330}},
+      color={255,127,0}));
+  connect(chaStaHea.y1Dow, idxStaHea.u1Dow)
+    annotation (Line(points={{-18,316},{-14,316},{-14,358},{-12,358}},color={255,0,255}));
+  connect(chaStaHea.y1Up, idxStaHea.u1Up)
+    annotation (Line(points={{-18,324},{-16,324},{-16,362},{-12,362}},color={255,0,255}));
+  connect(avaStaHea.y1, chaStaHea.u1AvaSta)
+    annotation (Line(points={{-88,330},{-56,330},{-56,326},{-42,326}},color={255,0,255}));
+  connect(sorRunTimHea.yIdx, enaEquHea.uIdxAltSor)
+    annotation (Line(points={{-18,284},{32,284},{32,366},{38,366}},color={255,127,0}));
+  connect(nReqPlaChiWat, enaCoo.nReqPla) annotation (Line(points={{-280,320},{-182,
+          320},{-182,100},{-112,100}}, color={255,127,0}));
+  connect(TOut, enaCoo.TOut)
+    annotation (Line(points={{-280,80},{-170,80},{-170,96},{-112,96}},color={0,0,127}));
+  connect(u1SchCoo, enaCoo.u1Sch)
+    annotation (Line(points={{-280,360},{-180,360},{-180,104},{-112,104}},color={255,0,255}));
+  connect(avaStaCoo.y1, chaStaCoo.u1AvaSta)
+    annotation (Line(points={{-88,70},{-56,70},{-56,68},{-42,68}},color={255,0,255}));
+  connect(enaCoo.y1, idxStaCoo.u1Lea)
+    annotation (Line(points={{-88,100},{-56,100},{-56,106},{-12,106}},color={255,0,255}));
+  connect(chaStaCoo.y1Up, idxStaCoo.u1Up)
+    annotation (Line(points={{-18,66},{-16,66},{-16,102},{-12,102}},color={255,0,255}));
+  connect(chaStaCoo.y1Dow, idxStaCoo.u1Dow)
+    annotation (Line(points={{-18,58},{-14,58},{-14,98},{-12,98}},color={255,0,255}));
+  connect(idxStaCoo.y, enaEquCoo.uSta)
+    annotation (Line(points={{12,100},{38,100}},color={255,127,0}));
+  connect(enaEquHea.y1, seqEve.u1Hea) annotation (Line(points={{62,360},{80,360},
+          {80,310},{138,310}}, color={255,0,255}));
+  connect(enaEquCoo.y1, seqEve.u1Coo) annotation (Line(points={{62,100},{80,100},
+          {80,306},{138,306}}, color={255,0,255}));
+  connect(y1HeaHp, y1HeaPre.u)
+    annotation (Line(points={{280,360},{232,360}},color={255,0,255}));
+  connect(y1HeaPre.y, avaEquHeaCoo.u1Hea)
+    annotation (Line(points={{208,360},{160,360},{160,378},{-156,378},{-156,214},{-154,214}},
+      color={255,0,255}));
+  connect(avaEquHeaCoo.y1Hea, avaStaHea.u1Ava)
+    annotation (Line(points={{-130,226},{-120,226},{-120,330},{-112,330}},color={255,0,255}));
+  connect(avaEquHeaCoo.y1Coo, avaStaCoo.u1Ava)
+    annotation (Line(points={{-130,214},{-120,214},{-120,70},{-112,70}},color={255,0,255}));
+  connect(avaStaCoo.y1, idxStaCoo.u1AvaSta)
+    annotation (Line(points={{-88,70},{-56,70},{-56,94},{-12,94}},color={255,0,255}));
+  connect(avaEquHeaCoo.y1Hea, enaEquHea.u1Ava)
+    annotation (Line(points={{-130,226},{36,226},{36,354},{38,354}},color={255,0,255}));
+  connect(avaEquHeaCoo.y1Coo, enaEquCoo.u1Ava)
+    annotation (Line(points={{-130,214},{36,214},{36,94},{38,94}},color={255,0,255}));
+  connect(sorRunTimCoo.yIdx, enaEquCoo.uIdxAltSor)
+    annotation (Line(points={{-18,24},{32,24},{32,106},{38,106}},color={255,127,0}));
+  connect(idxStaCoo.y, chaStaCoo.uSta)
+    annotation (Line(points={{12,100},{20,100},{20,80},{-48,80},{-48,72},{-42,72}},
+      color={255,127,0}));
+  connect(avaEquHeaCoo.y1Hea, sorRunTimHea.u1Ava)
+    annotation (Line(points={{-130,226},{-120,226},{-120,284},{-42,284}},color={255,0,255}));
+  connect(avaEquHeaCoo.y1Coo, sorRunTimCoo.u1Ava)
+    annotation (Line(points={{-130,214},{-120,214},{-120,24},{-42,24}},color={255,0,255}));
+  connect(staPumChiWatPri.y1, y1PumChiWatPri)
+    annotation (Line(points={{212,180},{280,180}},color={255,0,255}));
+  connect(staPumChiWatPri.y1_actual, seqEve.u1PumChiWatPri_actual) annotation (
+      Line(points={{212,186},{220,186},{220,262},{122,262},{122,296},{138,296}},
+        color={255,0,255}));
+  connect(seqEve.y1PumChiWatPri, staPumChiWatPri.u1Pum) annotation (Line(points
+        ={{162,288},{178,288},{178,178},{188,178}}, color={255,0,255}));
+  connect(u1PumChiWatPri_actual, staPumChiWatPri.u1Pum_actual)
+    annotation (Line(points={{-280,180},{170,180},{170,176},{188,176}},color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, staPumHeaWatPri.u1Pum_actual)
+    annotation (Line(points={{-280,200},{128,200},{128,196},{138,196}},color={255,0,255}));
+  connect(staPumHeaWatPri.y1_actual, seqEve.u1PumHeaWatPri_actual) annotation (
+      Line(points={{162,206},{164,206},{164,260},{120,260},{120,298},{138,298}},
+        color={255,0,255}));
+  connect(staPumHeaWatSec.y1, y1PumHeaWatSec)
+    annotation (Line(points={{162,160},{280,160}},color={255,0,255}));
+  connect(staPumChiWatSec.y1, y1PumChiWatSec)
+    annotation (Line(points={{212,140},{280,140}},color={255,0,255}));
+  connect(u1PumHeaWatSec_actual, staPumHeaWatSec.u1Pum_actual)
+    annotation (Line(points={{-280,160},{120,160},{120,156},{138,156}},color={255,0,255}));
+  connect(u1PumChiWatSec_actual, staPumChiWatSec.u1Pum_actual)
+    annotation (Line(points={{-280,140},{180,140},{180,136},{188,136}},color={255,0,255}));
+  connect(staPumHeaWatPri.y1, y1PumHeaWatPri)
+    annotation (Line(points={{162,200},{216,200},{216,200},{280,200}},color={255,0,255}));
+  connect(staPumChiWatSec.y1_actual, seqEve.u1PumChiWatSec_actual) annotation (
+      Line(points={{212,146},{222,146},{222,266},{126,266},{126,290},{138,290}},
+        color={255,0,255}));
+  connect(seqEve.y1PumHeaWatPri, staPumHeaWatPri.u1Pum) annotation (Line(points
+        ={{162,290},{162,220},{130,220},{130,198},{138,198}}, color={255,0,255}));
+  connect(staPumHeaWatSec.y1_actual, seqEve.u1PumHeaWatSec_actual) annotation (
+      Line(points={{162,166},{166,166},{166,264},{124,264},{124,292},{138,292}},
+        color={255,0,255}));
+  connect(VHeaWatSec_flow, staPumHeaWatSec.V_flow)
+    annotation (Line(points={{-280,-100},{-156,-100},{-156,152},{138,152}},color={0,0,127}));
+  connect(VChiWatSec_flow, staPumChiWatSec.V_flow)
+    annotation (Line(points={{-280,-160},{-154,-160},{-154,132},{188,132}},color={0,0,127}));
+  connect(THeaWatPriRet, THeaWatRet.u)
+    annotation (Line(points={{-280,40},{-232,40}},color={0,0,127}));
+  connect(THeaWatRet.y, chaStaHea.TRet)
+    annotation (Line(points={{-208,40},{-168,40},{-168,306},{-50,306},{-50,314},{-42,314}},
+      color={0,0,127}));
+  connect(THeaWatSecRet, THeaWatRet.uPh) annotation (Line(points={{-280,-80},{-240,
+          -80},{-240,34},{-232,34}}, color={0,0,127}));
+  connect(VHeaWatPri_flow, VHeaWat_flow.u)
+    annotation (Line(points={{-280,20},{-202,20}},color={0,0,127}));
+  connect(VHeaWat_flow.y, chaStaHea.V_flow)
+    annotation (Line(points={{-178,20},{-166,20},{-166,304},{-48,304},{-48,312},{-42,312}},
+      color={0,0,127}));
+  connect(VHeaWatSec_flow, VHeaWat_flow.uPh) annotation (Line(points={{-280,-100},
+          {-206,-100},{-206,14},{-202,14}}, color={0,0,127}));
+  connect(TChiWatPriRet, TChiWatRet.u)
+    annotation (Line(points={{-280,-20},{-232,-20}},color={0,0,127}));
+  connect(TChiWatRet.y, chaStaCoo.TRet)
+    annotation (Line(points={{-208,-20},{-164,-20},{-164,48},{-50,48},{-50,56},{-42,56}},
+      color={0,0,127}));
+  connect(TChiWatSecRet, TChiWatRet.uPh) annotation (Line(points={{-280,-140},{-238,
+          -140},{-238,-26},{-232,-26}},      color={0,0,127}));
+  connect(VChiWatPri_flow, VChiWat_flow.u)
+    annotation (Line(points={{-280,-40},{-202,-40}},color={0,0,127}));
+  connect(VChiWat_flow.y, chaStaCoo.V_flow)
+    annotation (Line(points={{-178,-40},{-162,-40},{-162,38},{-48,38},{-48,54},{-42,54}},
+      color={0,0,127}));
+  connect(VChiWatSec_flow, VChiWat_flow.uPh) annotation (Line(points={{-280,-160},
+          {-204,-160},{-204,-46},{-202,-46}}, color={0,0,127}));
+  connect(enaHea.y1, staPumHeaWatSec.u1Pla)
+    annotation (Line(points={{-88,360},{-80,360},{-80,162},{128,162},{128,168},
+          {138,168}},
+      color={255,0,255}));
+  connect(enaCoo.y1, staPumChiWatSec.u1Pla)
+    annotation (Line(points={{-88,100},{-80,100},{-80,138},{186,138},{186,148},
+          {188,148}},
+      color={255,0,255}));
+  connect(seqEve.y1ValHeaWatInlIso, staPumHeaWatPri.u1ValInlIso) annotation (
+      Line(points={{162,300},{170,300},{170,216},{134,216},{134,204},{138,204}},
+        color={255,0,255}));
+  connect(seqEve.y1ValHeaWatOutIso, staPumHeaWatPri.u1ValOutIso) annotation (
+      Line(points={{162,298},{168,298},{168,218},{132,218},{132,202},{138,202}},
+        color={255,0,255}));
+  connect(seqEve.y1ValChiWatInlIso, staPumChiWatPri.u1ValInlIso) annotation (
+      Line(points={{162,296},{182,296},{182,184},{188,184}}, color={255,0,255}));
+  connect(seqEve.y1ValChiWatOutIso, staPumChiWatPri.u1ValOutIso) annotation (
+      Line(points={{162,294},{180,294},{180,182},{188,182}}, color={255,0,255}));
+  connect(u1Hp_actual, sorRunTimHea.u1Run)
+    annotation (Line(points={{-280,300},{-60,300},{-60,296},{-42,296}},color={255,0,255}));
+  connect(u1Hp_actual, sorRunTimCoo.u1Run)
+    annotation (Line(points={{-280,300},{-60,300},{-60,36},{-42,36}},color={255,0,255}));
+  connect(y1Hp, y1HpPre.u)
+    annotation (Line(points={{280,380},{202,380}},color={255,0,255}));
+  connect(y1HpPre.y, avaEquHeaCoo.u1)
+    annotation (Line(points={{178,380},{-158,380},{-158,226},{-154,226}},color={255,0,255}));
+  connect(idxStaCoo.y, comStaCoo.uSta)
+    annotation (Line(points={{12,100},{20,100},{20,-12},{-46,-12},{-46,4},{-42,4}},
+      color={255,127,0}));
+  connect(comStaCoo.y1, chaStaCoo.u1StaPro)
+    annotation (Line(points={{-18,-6},{-10,-6},{-10,48},{-46,48},{-46,64},{-42,64}},
+      color={255,0,255}));
+  connect(u1Hp_actual, comStaCoo.u1_actual)
+    annotation (Line(points={{-280,300},{-60,300},{-60,-4},{-42,-4}},color={255,0,255}));
+  connect(y1HpPre.y, comStaCoo.u1)
+    annotation (Line(points={{178,380},{-158,380},{-158,0},{-42,0}},color={255,0,255}));
+  connect(idxStaHea.y, comStaHea.uSta)
+    annotation (Line(points={{12,360},{20,360},{20,248},{-44,248},{-44,264},{-42,264}},
+      color={255,127,0}));
+  connect(u1Hp_actual, comStaHea.u1_actual)
+    annotation (Line(points={{-280,300},{-60,300},{-60,256},{-42,256}},color={255,0,255}));
+  connect(y1HpPre.y, comStaHea.u1)
+    annotation (Line(points={{178,380},{-60,380},{-60,260},{-42,260}},color={255,0,255}));
+  connect(comStaHea.y1, chaStaHea.u1StaPro)
+    annotation (Line(points={{-18,254},{-10,254},{-10,306},{-44,306},{-44,322},{-42,322}},
+      color={255,0,255}));
+  connect(resHeaWat.dpSet, dpHeaWatRemSet)
+    annotation (Line(points={{112,246},{242,246},{242,-60},{280,-60}},color={0,0,127}));
+  connect(resChiWat.dpSet, dpChiWatRemSet)
+    annotation (Line(points={{112,-34},{238,-34},{238,-80},{280,-80}},color={0,0,127}));
+  connect(nReqResHeaWat,resHeaWat.nReqRes)
+    annotation (Line(points={{-280,-340},{76,-340},{76,246},{88,246}},color={255,127,0}));
+  connect(nReqResChiWat,resChiWat.nReqRes)
+    annotation (Line(points={{-280,-360},{80,-360},{80,-34},{88,-34}},color={255,127,0}));
+  connect(enaCoo.y1, resChiWat.u1Ena)
+    annotation (Line(points={{-88,100},{-80,100},{-80,-40},{88,-40}},color={255,0,255}));
+  connect(enaHea.y1, resHeaWat.u1Ena)
+    annotation (Line(points={{-88,360},{-80,360},{-80,240},{88,240}},color={255,0,255}));
+  connect(comStaHea.y1, resHeaWat.u1StaPro)
+    annotation (Line(points={{-18,254},{-10,254},{-10,234},{88,234}},color={255,0,255}));
+  connect(comStaCoo.y1, resChiWat.u1StaPro)
+    annotation (Line(points={{-18,-6},{-10,-6},{-10,-46},{88,-46}},color={255,0,255}));
+  connect(resChiWat.TSupSet, chaStaCoo.TSupSet)
+    annotation (Line(points={{112,-46},{116,-46},{116,-20},{-52,-20},{-52,58},{-42,
+          58}},
+      color={0,0,127}));
+  connect(resHeaWat.TSupSet, chaStaHea.TSupSet)
+    annotation (Line(points={{112,234},{118,234},{118,220},{-52,220},{-52,316},{
+          -42,316}},
+      color={0,0,127}));
+  connect(ctlPumPri.yPumHeaWatPriHdr, yPumHeaWatPriHdr)
+    annotation (Line(points={{212,86},{222,86},{222,100},{280,100}},color={0,0,127}));
+  connect(ctlPumPri.yPumChiWatPriHdr, yPumChiWatPriHdr)
+    annotation (Line(points={{212,82},{220,82},{220,80},{280,80}},color={0,0,127}));
+  connect(ctlPumPri.yPumHeaWatPriDed, yPumHeaWatPriDed)
+    annotation (Line(points={{212,78},{220,78},{220,60},{280,60},{280,60}},color={0,0,127}));
+  connect(ctlPumPri.yPumChiWatPriDed, yPumChiWatPriDed)
+    annotation (Line(points={{212,74},{216,74},{216,40},{280,40}},color={0,0,127}));
+  connect(staPumHeaWatPri.y1, ctlPumPri.u1PumHeaWatPri)
+    annotation (Line(points={{162,200},{172,200},{172,86},{188,86}},color={255,0,255}));
+  connect(staPumChiWatPri.y1, ctlPumPri.u1PumChiWatPri)
+    annotation (Line(points={{212,180},{220,180},{220,100},{184,100},{184,80},{188,
+          80}},
+      color={255,0,255}));
+  connect(seqEve.y1Hea, ctlPumPri.u1Hea) annotation (Line(points={{162,308},{
+          174,308},{174,74},{188,74}}, color={255,0,255}));
+  connect(ctlPumHeaWatSec.y, yPumHeaWatSec)
+    annotation (Line(points={{161.8,0},{280,0}},                  color={0,0,127}));
+  connect(ctlPumChiWatSec.y, yPumChiWatSec)
+    annotation (Line(points={{211.8,-20},{280,-20}},                color={0,0,127}));
+  connect(u1PumHeaWatSec_actual, ctlPumHeaWatSec.y1_actual)
+    annotation (Line(points={{-280,160},{120,160},{120,8},{138,8}},  color={255,0,255}));
+  connect(u1PumChiWatSec_actual, ctlPumChiWatSec.y1_actual)
+    annotation (Line(points={{-280,140},{180,140},{180,-12},{188,-12}},
+                                                                   color={255,0,255}));
+  connect(resChiWat.dpSet, ctlPumChiWatSec.dpRemSet)
+    annotation (Line(points={{112,-34},{178,-34},{178,-16},{188,-16}},
+                                                                  color={0,0,127}));
+  connect(dpHeaWatRem, ctlPumHeaWatSec.dpRem)
+    annotation (Line(points={{-280,-200},{130,-200},{130,0},{138,0}},  color={0,0,127}));
+  connect(resHeaWat.dpSet, ctlPumHeaWatSec.dpRemSet)
+    annotation (Line(points={{112,246},{122,246},{122,4},{138,4}},  color={0,0,127}));
+  connect(dpHeaWatLoc, ctlPumHeaWatSec.dpLoc)
+    annotation (Line(points={{-280,-240},{134,-240},{134,-8},{138,-8}},color={0,0,127}));
+  connect(dpHeaWatLocSet, ctlPumHeaWatSec.dpLocSet)
+    annotation (Line(points={{-280,-220},{132,-220},{132,-4},{138,-4}},color={0,0,127}));
+  connect(dpChiWatRem, ctlPumChiWatSec.dpRem)
+    annotation (Line(points={{-280,-260},{180,-260},{180,-20},{188,-20}},
+                                                                     color={0,0,127}));
+  connect(dpChiWatLocSet, ctlPumChiWatSec.dpLocSet)
+    annotation (Line(points={{-280,-280},{182,-280},{182,-24},{188,-24}},
+                                                                       color={0,0,127}));
+  connect(dpChiWatLoc, ctlPumChiWatSec.dpLoc)
+    annotation (Line(points={{-280,-300},{184,-300},{184,-28},{188,-28}},
+                                                                       color={0,0,127}));
+  connect(u1AvaHp.y, avaEquHeaCoo.u1Ava) annotation (Line(points={{-228,260},{
+          -200,260},{-200,220},{-154,220}}, color={255,0,255}));
+  connect(repTChiWatSupSet.y, swiTSupSet.u3) annotation (Line(points={{172,-140},
+          {178,-140},{178,-128},{188,-128}}, color={0,0,127}));
+  connect(repTHeaWatSupSet.y, swiTSupSet.u1) annotation (Line(points={{172,-100},
+          {178,-100},{178,-112},{188,-112}}, color={0,0,127}));
+  connect(resChiWat.TSupSet, repTChiWatSupSet.u) annotation (Line(points={{112,-46},
+          {116,-46},{116,-140},{148,-140}}, color={0,0,127}));
+  connect(resHeaWat.TSupSet, repTHeaWatSupSet.u) annotation (Line(points={{112,234},
+          {118,234},{118,-100},{148,-100}}, color={0,0,127}));
+  connect(seqEve.y1Hea, swiTSupSet.u2) annotation (Line(points={{162,308},{176,
+          308},{176,-120},{188,-120}}, color={255,0,255}));
+  connect(swiTSupSet.y, TSupSet) annotation (Line(points={{212,-120},{242,-120},
+          {242,-120},{280,-120}}, color={0,0,127}));
+  connect(pasTChiWatSupSet.y, TSupSet) annotation (Line(points={{242,-140},{250,
+          -140},{250,-120},{280,-120}}, color={0,0,127}));
+  connect(pasTHeaWatSupSet.y, TSupSet) annotation (Line(points={{242,-100},{250,
+          -100},{250,-120},{280,-120}}, color={0,0,127}));
+  connect(repTChiWatSupSet.y, pasTChiWatSupSet.u)
+    annotation (Line(points={{172,-140},{218,-140}}, color={0,0,127}));
+  connect(repTHeaWatSupSet.y, pasTHeaWatSupSet.u)
+    annotation (Line(points={{172,-100},{218,-100}}, color={0,0,127}));
+  connect(resChiWat.TSupSet, TChiWatSupSet) annotation (Line(points={{112,-46},
+          {116,-46},{116,-180},{280,-180}}, color={0,0,127}));
+  connect(resHeaWat.TSupSet, THeaWatSupSet) annotation (Line(points={{112,234},
+          {118,234},{118,-160},{280,-160}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="ctl",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-200,-340},{200,340}}),
+      graphics={
+        Rectangle(
+          extent={{-200,340},{200,-340}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,390},{150,350}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-260,-400},{260,400}})),
+    Documentation(
+      info="<html>
+<p>
+This block implements the sequence of operation for plants with 
+air-to-water heat pumps.
+Most parts of the sequence of operation are similar to that 
+described in ASHRAE, 2021 for chiller plants.
+</p>
+<p>
+The supported plant configurations are enumerated in the table below.<br/>
+</p>
+<table summary=\"summary\" border=\"1\">
+<tr><th>Configuration parameter</th><th>Options</th><th>Notes</th></tr>
+<tr><td>Function</td>
+<td>
+Heating and cooling<br/>
+Heating-only<br/>
+Cooling-only
+</td>
+<td>
+</td>
+</tr>
+<tr><td>Type of distribution</td>
+<td>
+Constant primary-variable secondary centralized
+</td>
+<td>
+\"Centralized secondary pumps\" refers to configurations with a single 
+group of secondary pumps that is typically integrated into the plant.<br/>
+Distributed secondary pumps with multiple secondary loops served 
+by dedicated secondary pumps are currently not supported.<br/>
+Options are limited to constant primary distributions because most 
+AWHPs on the market use a reverse cycle for defrosting.
+This requires maximum primary flow during defrost cycles and hinders
+variable primary distributions.<br/>
+An option for constant primary-only distributions with ∆p-controlled
+variable speed pumps will be added in a next release. 
+</td>
+</tr>
+<tr><td>Type of primary pump arrangement</td>
+<td>
+Dedicated<br/>
+Headered
+</td>
+<td>It is assumed that the HW and the CHW loops have the 
+same type of primary pump arrangement, as specified by this parameter.
+</td>
+</tr>
+<tr><td>Separate dedicated primary CHW pumps</td>
+<td>
+False<br/>
+True
+</td>
+<td>This option is only available for heating and cooling plants 
+with dedicated primary pumps.
+If this option is not selected, each AWHP uses
+a common dedicated primary pump for HW and CHW. 
+Otherwise, each AWHP relies on a separate dedicated HW pump 
+and a separate dedicated CHW pump.
+</td>
+</tr>
+<tr><td>Type of primary HW pumps</td>
+<td>
+Variable speed<br/>
+Constant speed
+</td>
+<td>
+For constant primary-variable secondary distributions, the variable
+speed primary pumps are commanded at fixed speeds, determined during the
+Testing, Adjusting and Balancing phase to provide design AWHP flow in 
+heating and cooling modes.
+The same intent is achieved with constant speed primary pumps through the 
+use of balancing valves.
+</td>
+</tr>
+<tr><td>Type of primary CHW pumps</td>
+<td>
+Variable speed<br/>
+Constant speed
+</td>
+<td>See the note above on primary HW pumps.</td>
+</tr>
+</table>
+<h4>Details</h4>
+<p>
+A staging matrix <code>staEqu</code> is required as a parameter. 
+See the documentation of 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable\">
+Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable</a>
+for the associated definition and requirements.
+</p>
+<p>
+Depending on the plant configuration, the term \"primary HW pumps\"
+(and the corresponding variables containing <code>*pumHeaWatPri*</code>)
+refers either to primary HW pumps for plants with separate primary
+HW and CHW pumps (either headered or dedicated)
+or to dedicated primary pumps for plants with common primary pumps
+serving both the HW and CHW loops.
+</p>
+<p>
+At its current stage of development, this controller contains no
+logic for handling faulted equipment.
+It is therefore assumed that any equipment is available at all times.
+</p>
+<h4>References</h4>
+<ul>
+<li id=\"ASHRAE2021\">
+ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
+for HVAC Systems. Atlanta, GA.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AirToWater;
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo
new file mode 100644
index 00000000000..075e68506d6
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mo
@@ -0,0 +1,381 @@
+within Buildings.Templates.Plants.Controls.HeatPumps.Validation;
+model AirToWater
+  final parameter Real capHea_nominal(
+    final unit="W")=sum(ctl.capHeaHp_nominal)
+    "Installed heating capacity"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real THeaWatSup_nominal(
+    unit="K",
+    displayUnit="degC")=323.15
+    "Design HW supply temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real THeaWatRet_nominal(
+    unit="K",
+    displayUnit="degC")=315.15
+    "Design HW return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real VHeaWat_flow_nominal(unit="m3/s")=capHea_nominal/abs(
+    THeaWatSup_nominal - THeaWatRet_nominal)/ctl.cp_default/ctl.rho_default
+    "Design HW volume flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Real capCoo_nominal(
+    final unit="W")=sum(ctl.capCooHp_nominal)
+    "Installed cooling capacity"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real TChiWatSup_nominal(
+    unit="K",
+    displayUnit="degC")=280.15
+    "Design CHW supply temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real TChiWatRet_nominal(
+    unit="K",
+    displayUnit="degC")=285.15
+    "Design CHW return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real VChiWat_flow_nominal(unit="m3/s")=capHea_nominal/abs(
+    TChiWatSup_nominal - TChiWatRet_nominal)/ctl.cp_default/ctl.rho_default
+    "Design CHW volume flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  Buildings.Templates.Plants.Controls.HeatPumps.AirToWater ctl(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_valHpInlIso=true,
+    have_valHpOutIso=true,
+    have_pumChiWatPriDed_select=true,
+    have_pumHeaWatSec_select=true,
+    have_pumPriHdr=false,
+    have_pumChiWatSec_select=true,
+    have_senVHeaWatPri_select=false,
+    have_senVChiWatPri_select=false,
+    have_senTHeaWatPriRet_select=false,
+    have_senTChiWatPriRet_select=false,
+    have_senTHeaWatSecRet=true,
+    have_senTChiWatSecRet=false,
+    nHp=3,
+    have_senDpHeaWatRemWir=false,
+    nSenDpHeaWatRem=1,
+    have_senDpChiWatRemWir=false,
+    nSenDpChiWatRem=1,
+    final THeaWatSup_nominal=THeaWatSup_nominal,
+    THeaWatSupSet_min=298.15,
+    final VHeaWatSec_flow_nominal=VHeaWat_flow_nominal,
+    capHeaHp_nominal=fill(350, ctl.nHp),
+    dpHeaWatRemSet_max={5E4},
+    final TChiWatSup_nominal=TChiWatSup_nominal,
+    TChiWatSupSet_max=288.15,
+    final VChiWatSec_flow_nominal=VChiWat_flow_nominal,
+    capCooHp_nominal=fill(350, ctl.nHp),
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.7,
+    dpChiWatRemSet_max={5E4},
+    staEqu=[1/3,1/3,1/3; 2/3,2/3,2/3; 1,1,1],
+    idxEquAlt={1,2,3}) "Plant controller"
+    annotation (Placement(transformation(extent={{0,0},{40,68}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratV_flow(
+    table=[
+      0, 0, 0;
+      5, 0, 0;
+      6, 1, 0;
+      12, 0.2, 0.2;
+      15, 0, 1;
+      22, 0.1, 0.1;
+      24, 0, 0],
+    timeScale=3600)
+    "Source signal for volume flow rate ratio – Index 1 for HW, 2 for CHW"
+    annotation (Placement(transformation(extent={{-160,-30},{-140,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatRet(
+    final k=THeaWatRet_nominal) "HWRT"
+    annotation (Placement(transformation(extent={{-150,50},{-130,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatRet(
+    final k=TChiWatRet_nominal) "CHWRT"
+    annotation (Placement(transformation(extent={{-150,10},{-130,30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VHeaWat_flow(
+    final k=VHeaWat_flow_nominal)
+    "Scale by design flow"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VChiWat_flow(
+    final k=VChiWat_flow_nominal)
+    "Scale by design flow"
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Components.Controls.StatusEmulator y1Hp_actual[ctl.nHp]
+    "HP status"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Components.Controls.StatusEmulator y1PumHeaWatPri_actual1[ctl.nPumHeaWatPri]
+    if ctl.have_heaWat and ctl.have_pumHeaWatPri
+    "Primary HW pump status"
+    annotation (Placement(transformation(extent={{100,50},{120,70}})));
+  Components.Controls.StatusEmulator y1PumChiWatPri_actual[ctl.nPumChiWatPri]
+    if ctl.have_chiWat and ctl.have_pumChiWatPri
+    "Primary CHW pump status"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Components.Controls.StatusEmulator y1PumHeaWatSec_actual[ctl.nPumHeaWatSec]
+    if ctl.have_heaWat and ctl.have_pumHeaWatSec
+    "Secondary HW pump status"
+    annotation (Placement(transformation(extent={{100,10},{120,30}})));
+  Components.Controls.StatusEmulator y1PumChiWatSec_actual[ctl.nPumChiWatSec]
+    if ctl.have_chiWat and ctl.have_pumChiWatSec
+    "Secondary CHW pump status"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TOut(
+    amplitude=10,
+    freqHz=0.5 / 24 / 3600,
+    phase=- 0.43633231299858,
+    offset=10 + 273.15)
+    "OAT"
+    annotation (Placement(transformation(extent={{-160,110},{-140,130}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isDemHea(
+    t=1E-2,
+    h=0.5E-2)
+    "Return true if heating demand"
+    annotation (Placement(transformation(extent={{-110,170},{-90,190}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isDemCoo(
+    t=1E-2,
+    h=0.5E-2)
+    "Return true if cooling demand"
+    annotation (Placement(transformation(extent={{-110,130},{-90,150}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger reqPlaHeaWat
+    "Generate HW plant request"
+    annotation (Placement(transformation(extent={{-80,170},{-60,190}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger reqPlaChiWat
+    "Generate CHW plant request"
+    annotation (Placement(transformation(extent={{-80,130},{-60,150}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter gai[2](
+    each k=5)
+    "Use fraction of flow rate as a proxy for plant reset request"
+    annotation (Placement(transformation(extent={{-108,90},{-88,110}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger reqResHeaWat
+    "Generate HW reset request"
+    annotation (Placement(transformation(extent={{-80,90},{-60,110}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger reqResChiWat
+    "Generate CHW reset request"
+    annotation (Placement(transformation(extent={{-80,60},{-60,80}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin[1](
+    amplitude=0.1 * ctl.dpHeaWatRemSet_max,
+    freqHz={4 / 8000},
+    each phase=3.1415926535898)
+    if ctl.have_heaWat
+    "Source signal used to generate measurement values"
+    annotation (Placement(transformation(extent={{-160,-76},{-140,-56}})));
+  Buildings.Controls.OBC.CDL.Reals.Add dpHeaWatRem[1]
+    if ctl.have_heaWat
+    "Differential pressure at remote location"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Add dpChiWatRem[1]
+    if ctl.have_chiWat
+    "Differential pressure at remote location"
+    annotation (Placement(transformation(extent={{-80,-110},{-60,-90}})));
+  Pumps.Generic.ResetLocalDifferentialPressure resDpHeaWatLoc[1](each
+      dpLocSet_max=20E4)
+    if ctl.have_heaWat
+    "Local HW DP reset"
+    annotation (Placement(transformation(extent={{-40,-130},{-20,-110}})));
+  Pumps.Generic.ResetLocalDifferentialPressure resDpChiWatLoc[1](each
+      dpLocSet_max=15E4)
+    if ctl.have_chiWat
+    "Local CHW DP reset"
+    annotation (Placement(transformation(extent={{-40,-170},{-20,-150}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin1[1](
+    amplitude=0.1 * ctl.dpChiWatRemSet_max,
+    freqHz={3 / 8000},
+    each phase=3.1415926535898)
+    "Source signal used to generate measurement values"
+    annotation (Placement(transformation(extent={{-160,-116},{-140,-96}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpHeaWatLoc(final k=4)
+    if ctl.have_heaWat
+    "Differential pressure local to the plant"
+    annotation (Placement(transformation(extent={{-80,-150},{-60,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpChiWatLoc(final k=3)
+    if ctl.have_chiWat
+    "Differential pressure local to the plant"
+    annotation (Placement(transformation(extent={{-80,-190},{-60,-170}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSup(final k=
+        THeaWatSup_nominal) "HWST"
+    annotation (Placement(transformation(extent={{-180,70},{-160,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSup(final k=
+        TChiWatSup_nominal) "CHWST"
+    annotation (Placement(transformation(extent={{-180,30},{-160,50}})));
+equation
+  connect(ratV_flow.y[1], VHeaWat_flow.u)
+    annotation (Line(points={{-138,-20},{-120,-20},{-120,0},{-112,0}},color={0,0,127}));
+  connect(ratV_flow.y[2], VChiWat_flow.u)
+    annotation (Line(points={{-138,-20},{-82,-20}},color={0,0,127}));
+  connect(ctl.y1Hp, y1Hp_actual.y1)
+    annotation (Line(points={{42,60},{58,60},{58,80},{68,80}},color={255,0,255}));
+  connect(y1Hp_actual.y1_actual, ctl.u1Hp_actual)
+    annotation (Line(points={{92,80},{100,80},{100,100},{-4,100},{-4,60},{-2,60}},
+      color={255,0,255}));
+  connect(ctl.y1PumHeaWatPri, y1PumHeaWatPri_actual1.y1)
+    annotation (Line(points={{42,44},{60,44},{60,60},{98,60}},color={255,0,255}));
+  connect(ctl.y1PumChiWatPri, y1PumChiWatPri_actual.y1)
+    annotation (Line(points={{42,42},{60,42},{60,40},{68,40}},color={255,0,255}));
+  connect(ctl.y1PumHeaWatSec, y1PumHeaWatSec_actual.y1)
+    annotation (Line(points={{42,38},{60,38},{60,20},{98,20}},color={255,0,255}));
+  connect(ctl.y1PumChiWatSec, y1PumChiWatSec_actual.y1)
+    annotation (Line(points={{42,36},{58,36},{58,0},{68,0}},color={255,0,255}));
+  connect(y1PumHeaWatPri_actual1.y1_actual, ctl.u1PumHeaWatPri_actual)
+    annotation (Line(points={{122,60},{134,60},{134,102},{-6,102},{-6,58},{-2,
+          58}},
+      color={255,0,255}));
+  connect(y1PumHeaWatSec_actual.y1_actual, ctl.u1PumHeaWatSec_actual)
+    annotation (Line(points={{122,20},{138,20},{138,106},{-10,106},{-10,54},{-2,
+          54}},
+      color={255,0,255}));
+  connect(y1PumChiWatPri_actual.y1_actual, ctl.u1PumChiWatPri_actual)
+    annotation (Line(points={{92,40},{136,40},{136,104},{-8,104},{-8,56},{-2,56}},
+      color={255,0,255}));
+  connect(y1PumChiWatSec_actual.y1_actual, ctl.u1PumChiWatSec_actual)
+    annotation (Line(points={{92,0},{140,0},{140,108},{-12,108},{-12,52},{-2,52}},
+      color={255,0,255}));
+  connect(TOut.y, ctl.TOut)
+    annotation (Line(points={{-138,120},{-122,120},{-122,38},{-2,38}},  color={0,0,127}));
+  connect(ratV_flow.y[1], isDemHea.u)
+    annotation (Line(points={{-138,-20},{-120,-20},{-120,180},{-112,180}},color={0,0,127}));
+  connect(ratV_flow.y[2], isDemCoo.u)
+    annotation (Line(points={{-138,-20},{-120,-20},{-120,140},{-112,140}},color={0,0,127}));
+  connect(isDemCoo.y, reqPlaChiWat.u)
+    annotation (Line(points={{-88,140},{-82,140}},color={255,0,255}));
+  connect(isDemHea.y, reqPlaHeaWat.u)
+    annotation (Line(points={{-88,180},{-82,180}},color={255,0,255}));
+  connect(reqPlaHeaWat.y, ctl.nReqPlaHeaWat) annotation (Line(points={{-58,180},
+          {-40,180},{-40,48},{-2,48}}, color={255,127,0}));
+  connect(reqPlaChiWat.y, ctl.nReqPlaChiWat) annotation (Line(points={{-58,140},
+          {-40,140},{-40,46},{-2,46}}, color={255,127,0}));
+  connect(THeaWatRet.y, ctl.THeaWatSecRet)
+    annotation (Line(points={{-128,60},{-100,60},{-100,22},{-2,22}},  color={0,0,127}));
+  connect(THeaWatRet.y, ctl.THeaWatPriRet)
+    annotation (Line(points={{-128,60},{-100,60},{-100,34},{-2,34}},  color={0,0,127}));
+  connect(TChiWatRet.y, ctl.TChiWatSecRet)
+    annotation (Line(points={{-128,20},{-28,20},{-28,16},{-2,16}},color={0,0,127}));
+  connect(TChiWatRet.y, ctl.TChiWatPriRet)
+    annotation (Line(points={{-128,20},{-28,20},{-28,28},{-2,28}},    color={0,0,127}));
+  connect(VHeaWat_flow.y, ctl.VHeaWatPri_flow)
+    annotation (Line(points={{-88,0},{-26,0},{-26,32},{-2,32}},    color={0,0,127}));
+  connect(VHeaWat_flow.y, ctl.VHeaWatSec_flow)
+    annotation (Line(points={{-88,0},{-26,0},{-26,20},{-2,20}},color={0,0,127}));
+  connect(VChiWat_flow.y, ctl.VChiWatPri_flow)
+    annotation (Line(points={{-58,-20},{-24,-20},{-24,26},{-2,26}},    color={0,0,127}));
+  connect(VChiWat_flow.y, ctl.VChiWatSec_flow)
+    annotation (Line(points={{-58,-20},{-22,-20},{-22,14},{-2,14}},color={0,0,127}));
+  connect(ratV_flow.y, gai.u)
+    annotation (Line(points={{-138,-20},{-120,-20},{-120,100},{-110,100}},
+                                                                        color={0,0,127}));
+  connect(gai[1].y, reqResHeaWat.u)
+    annotation (Line(points={{-86,100},{-82,100}},
+                                                color={0,0,127}));
+  connect(gai[2].y, reqResChiWat.u)
+    annotation (Line(points={{-86,100},{-84,100},{-84,70},{-82,70}},
+                                                                  color={0,0,127}));
+  connect(reqResHeaWat.y,ctl.nReqResHeaWat)
+    annotation (Line(points={{-58,100},{-38,100},{-38,44},{-2,44}},
+                                                                 color={255,127,0}));
+  connect(reqResChiWat.y,ctl.nReqResChiWat)
+    annotation (Line(points={{-58,70},{-36,70},{-36,42},{-2,42}},color={255,127,0}));
+  connect(sin.y, dpHeaWatRem.u2)
+    annotation (Line(points={{-138,-66},{-82,-66}},color={0,0,127}));
+  connect(dpChiWatRem.y, ctl.dpChiWatRem)
+    annotation (Line(points={{-58,-100},{-18,-100},{-18,6},{-2,6}},color={0,0,127}));
+  connect(dpHeaWatRem.y, ctl.dpHeaWatRem)
+    annotation (Line(points={{-58,-60},{-20,-60},{-20,12},{-2,12}},color={0,0,127}));
+  connect(ctl.dpHeaWatRemSet, dpHeaWatRem.u1)
+    annotation (Line(points={{42,18},{50,18},{50,-40},{-100,-40},{-100,-54},{
+          -82,-54}},
+      color={0,0,127}));
+  connect(ctl.dpChiWatRemSet, dpChiWatRem.u1)
+    annotation (Line(points={{42,16},{48,16},{48,-80},{-90,-80},{-90,-94},{-82,
+          -94}},
+      color={0,0,127}));
+  connect(sin1.y, dpChiWatRem.u2)
+    annotation (Line(points={{-138,-106},{-82,-106}},color={0,0,127}));
+  connect(dpHeaWatRem[1].y, dpHeaWatLoc.u)
+    annotation (Line(points={{-58,-60},{-52,-60},{-52,-120},{-86,-120},{-86,-140},{-82,-140}},
+      color={0,0,127}));
+  connect(ctl.dpHeaWatRemSet, resDpHeaWatLoc.dpRemSet)
+    annotation (Line(points={{42,18},{50,18},{50,-40},{-100,-40},{-100,-114},{
+          -42,-114}},
+      color={0,0,127}));
+  connect(dpChiWatRem[1].y, dpChiWatLoc.u)
+    annotation (Line(points={{-58,-100},{-54,-100},{-54,-160},{-90,-160},{-90,-180},{-82,-180}},
+      color={0,0,127}));
+  connect(ctl.dpChiWatRemSet, resDpChiWatLoc.dpRemSet)
+    annotation (Line(points={{42,16},{47.9167,16},{47.9167,-80},{-90,-80},{-90,
+          -154},{-42,-154}},
+      color={0,0,127}));
+  connect(dpHeaWatRem.y, resDpHeaWatLoc.dpRem)
+    annotation (Line(points={{-58,-60},{-52,-60},{-52,-126},{-42,-126}},color={0,0,127}));
+  connect(dpChiWatRem.y, resDpChiWatLoc.dpRem)
+    annotation (Line(points={{-58,-100},{-54,-100},{-54,-166},{-42,-166}},color={0,0,127}));
+  connect(resDpChiWatLoc.dpLocSet, ctl.dpChiWatLocSet)
+    annotation (Line(points={{-18.2,-160},{-14,-160},{-14,4},{-2,4}},color={0,0,127}));
+  connect(dpChiWatLoc.y, ctl.dpChiWatLoc)
+    annotation (Line(points={{-58,-180},{-12,-180},{-12,2},{-2,2}},color={0,0,127}));
+  connect(dpHeaWatLoc.y, ctl.dpHeaWatLoc)
+    annotation (Line(points={{-58,-140},{-16,-140},{-16,8},{-2,8}},color={0,0,127}));
+  connect(resDpHeaWatLoc.dpLocSet, ctl.dpHeaWatLocSet)
+    annotation (Line(points={{-18.2,-120},{-10,-120},{-10,10},{-2,10}},color={0,0,127}));
+  connect(TChiWatSup.y, ctl.TChiWatPriSup) annotation (Line(points={{-158,40},{
+          -102,40},{-102,30},{-2,30}}, color={0,0,127}));
+  connect(THeaWatSup.y, ctl.THeaWatPriSup) annotation (Line(points={{-158,80},{
+          -98,80},{-98,36},{-2,36}}, color={0,0,127}));
+  connect(TChiWatSup.y, ctl.TChiWatSecSup) annotation (Line(points={{-158,40},{
+          -102,40},{-102,18},{-2,18}}, color={0,0,127}));
+  connect(THeaWatSup.y, ctl.THeaWatSecSup) annotation (Line(points={{-158,80},{
+          -98,80},{-98,24},{-2,24}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/HeatPumps/Validation/AirToWater.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=86400.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-240},{200,240}})),
+    Documentation(revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatPumps.AirToWater\">
+Buildings.Templates.Plants.Controls.HeatPumps.AirToWater</a>
+in a configuration with three equally sized lead/lag alternate
+heat pumps.
+</p>
+<p>
+Simulating this model shows how the controller responds to a varying load by 
+</p>
+<ul>
+<li>
+staging or unstaging the AWHPs and associated primary pumps,
+</li>
+<li>
+rotating lead/lag alternate equipment to ensure even wear,
+</li>
+<li>
+resetting the supply temperature and remote differential pressure 
+in both the CHW and HW loops based on the valve position,
+</li>
+<li>
+staging the secondary pumps.
+</li>
+</ul>
+</html>"));
+end AirToWater;
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo
new file mode 100644
index 00000000000..d1394bc2049
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.mo
@@ -0,0 +1,27 @@
+within Buildings.Templates.Plants.Controls.HeatPumps;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}), Documentation(info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.order b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.order
new file mode 100644
index 00000000000..971b641363f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/Validation/package.order
@@ -0,0 +1 @@
+AirToWater
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/package.mo b/Buildings/Templates/Plants/Controls/HeatPumps/package.mo
new file mode 100644
index 00000000000..af3c9fb29f4
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/package.mo
@@ -0,0 +1,8 @@
+within Buildings.Templates.Plants.Controls;
+package HeatPumps
+  annotation (Documentation(info="<html>
+<p>
+This package contains control sequences for heat pump plants.
+</p>
+</html>"));
+end HeatPumps;
diff --git a/Buildings/Templates/Plants/Controls/HeatPumps/package.order b/Buildings/Templates/Plants/Controls/HeatPumps/package.order
new file mode 100644
index 00000000000..8df76113296
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/HeatPumps/package.order
@@ -0,0 +1,2 @@
+AirToWater
+Validation
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo
new file mode 100644
index 00000000000..f731cf30b09
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/ControlDifferentialPressure.mo
@@ -0,0 +1,233 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic;
+block ControlDifferentialPressure
+  "Differential pressure control for variable speed pumps"
+  parameter Boolean have_senDpRemWir
+    "Set to true for remote differential pressure sensor(s) hardwired to controller"
+    annotation (Evaluate=true);
+  parameter Integer nPum(
+    min=1)
+    "Number of pumps that operate at design conditions"
+    annotation (Evaluate=true);
+  parameter Integer nSenDpRem(
+    min=1)
+    "Number of remote loop differential pressure sensors used for pump speed control"
+    annotation (Evaluate=true);
+  parameter Real y_min(
+    max=1,
+    min=0,
+    unit="1")=0.1
+    "Minimum pump speed";
+  final parameter Real y_max(
+    final unit="1",
+    final min=0,
+    final max=1)=1
+    "Maximum pump speed";
+  parameter Real k(
+    min=100 * Buildings.Controls.OBC.CDL.Constants.eps)=1
+    "Gain of controller"
+    annotation (Dialog(group="Control gains"));
+  parameter Real Ti(
+    min=100 * Buildings.Controls.OBC.CDL.Constants.eps,
+    unit="s")=60
+    "Time constant of integrator block"
+    annotation (Dialog(group="Control gains"));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput y1_actual[nPum]
+    "Pump status"
+    annotation (Placement(transformation(extent={{-140,60},{-100,100}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpRemSet[nSenDpRem](
+    each final unit="Pa")
+    if have_senDpRemWir
+    "Remote differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpLoc(
+    final unit="Pa")
+    if not have_senDpRemWir
+    "Loop differential pressure local to the plant"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpRem[nSenDpRem](
+    each final unit="Pa")
+    if have_senDpRemWir
+    "Remote loop differential pressure"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpLocSet[nSenDpRem](
+    each final unit="Pa")
+    if not have_senDpRemWir
+    "Local differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(
+    final unit="1")
+    "Pump speed command"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{98,-20},{138,20}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyOn(
+    final nin=nPum)
+    "Return true when any pump is proven on"
+    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator repEna(
+    final nout=nSenDpRem)
+    "Replicate"
+    annotation (Placement(transformation(extent={{-50,70},{-30,90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiMax maxSet(
+    nin=nSenDpRem)
+    if not have_senDpRemWir
+    "Maximum DP setpoint"
+    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+  Utilities.PIDWithEnable ctlDpRem[nSenDpRem](
+    each final k=k,
+    each final Ti=Ti,
+    each r=dpSca,
+    each final yMin=y_min,
+    each final yMax=y_max,
+    each final y_reset=y_min,
+    each final y_neutral=0)
+    if have_senDpRemWir
+    "Remote differential pressure control"
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
+  Utilities.PIDWithEnable ctlDpLoc(
+    final k=k,
+    final Ti=Ti,
+    final r=dpSca,
+    final yMin=y_min,
+    final yMax=y_max,
+    final y_reset=y_min,
+    final y_neutral=0)
+    if not have_senDpRemWir
+    "Local differential pressure control"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiMax maxY(
+    nin=nSenDpRem)
+    if have_senDpRemWir
+    "Maximum control loop output"
+    annotation (Placement(transformation(extent={{40,30},{60,50}})));
+protected
+  parameter Real dpSca(
+    final unit="Pa",
+    final min=0)=1E4
+    "Differential pressure used as a scaling factor for PI control";
+equation
+  connect(y1_actual, anyOn.u)
+    annotation (Line(points={{-120,80},{-92,80}},color={255,0,255}));
+  connect(anyOn.y, repEna.u)
+    annotation (Line(points={{-68,80},{-52,80}},color={255,0,255}));
+  connect(dpLocSet, maxSet.u)
+    annotation (Line(points={{-120,-40},{-92,-40}},color={0,0,127}));
+  connect(dpRemSet, ctlDpRem.u_s)
+    annotation (Line(points={{-120,40},{-12,40}},color={0,0,127}));
+  connect(maxSet.y, ctlDpLoc.u_s)
+    annotation (Line(points={{-68,-40},{-12,-40}},color={0,0,127}));
+  connect(dpRem, ctlDpRem.u_m)
+    annotation (Line(points={{-120,0},{0,0},{0,28}},color={0,0,127}));
+  connect(repEna.y, ctlDpRem.uEna)
+    annotation (Line(points={{-28,80},{-20,80},{-20,20},{-4,20},{-4,28}},color={255,0,255}));
+  connect(dpLoc, ctlDpLoc.u_m)
+    annotation (Line(points={{-120,-80},{0,-80},{0,-52}},color={0,0,127}));
+  connect(anyOn.y, ctlDpLoc.uEna)
+    annotation (Line(points={{-68,80},{-60,80},{-60,-60},{-4,-60},{-4,-52}},
+      color={255,0,255}));
+  connect(ctlDpRem.y, maxY.u)
+    annotation (Line(points={{12,40},{38,40}},color={0,0,127}));
+  connect(ctlDpLoc.y, y)
+    annotation (Line(points={{12,-40},{80,-40},{80,0},{120,0}},color={0,0,127}));
+  connect(maxY.y, y)
+    annotation (Line(points={{62,40},{80,40},{80,0},{120,0}},color={0,0,127}));
+  annotation (
+    defaultComponentName="ctlDp",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+For plants where a remote DP sensor(s) is hardwired to the pump controller
+(<code>have_senDpRemHar=true</code>):
+</p>
+<ul>
+<li>
+When any pump is proven on, the pump speed is controlled by a reverse acting PI loop
+maintaining the differential pressure signal at setpoint.
+All pumps receive the same speed signal.
+</li>
+<li>
+Where multiple DP sensors exist, a PI loop runs for each sensor.
+The pumps are controlled to the highest signal output of all DP sensor loops.
+</li>
+</ul>
+<p>
+For plants where the remote DP sensor(s) is not hardwired to the plant controller, but
+a local DP sensor is hardwired to the plant controller
+(<code>have_senDpRemHar=false</code>):
+</p>
+<ul>
+<li>
+When any pump is proven on, the pump speed is controlled by a reverse acting PI
+loop maintaining the local DP signal at the DP setpoint output from the
+remote sensor control loop (see
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure</a>).
+All pumps receive the same speed signal.
+</li>
+<li>
+Where multiple remote DP sensors exist, a PI loop shall run for each sensor.
+The DP setpoint for the local DP sensor is the highest DP setpoint output
+from each of the remote loops.
+</li>
+</ul>
+<h4>Details</h4>
+<p>This logic is prescribed in ASHRAE, 2021 for:
+</p>
+<ul>
+<li>
+variable speed primary pumps in primary-only chiller and boiler plants
+where the remote DP sensor(s) is hardwired to the plant controller,
+</li>
+<li>
+variable speed primary pumps in primary-only chiller and boiler plants
+where the remote DP sensor(s) is not hardwired to the plant controller, but
+a local DP sensor is hardwired to the plant controller,
+</li>
+<li>
+variable speed secondary pumps in primary-secondary chiller and boiler
+plants where a remote DP sensor(s) is hardwired to the secondary pump controller,
+</li>
+<li>
+variable speed secondary pumps in primary-secondary chiller and boiler plants
+where a remote DP sensor is not hardwired to the secondary pump controller,
+but a local DP sensor is hardwired to the secondary pump controller.
+</li>
+</ul>
+<h4>References</h4>
+<ul>
+<li id=\"ASHRAE2021\">
+ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
+for HVAC Systems. Atlanta, GA.
+</li>
+</ul>
+</html>
+", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-100,-100},{100,100}})));
+end ControlDifferentialPressure;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/ResetLocalDifferentialPressure.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/ResetLocalDifferentialPressure.mo
new file mode 100644
index 00000000000..ef5defaf7d5
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/ResetLocalDifferentialPressure.mo
@@ -0,0 +1,153 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic;
+block ResetLocalDifferentialPressure
+  "Local differential pressure reset"
+  parameter Real dpLocSet_min(
+    start=0,
+    final unit="Pa",
+    final min=0)=5 * 6895
+    "Minimum loop differential pressure setpoint local to the plant";
+  parameter Real dpLocSet_max(
+    start=1E5,
+    final unit="Pa",
+    final min=0)
+    "Maximum loop differential pressure setpoint local to the plant";
+  parameter Real k(
+    final min=100 * Buildings.Controls.OBC.CDL.Constants.eps)=1
+    "Gain of controller"
+    annotation (Dialog(group="Control gains"));
+  parameter Real Ti(
+    final unit="s",
+    final min=100 * Buildings.Controls.OBC.CDL.Constants.eps)=60
+    "Time constant of integrator block"
+    annotation (Dialog(group="Control gains"));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpRemSet(
+    final unit="Pa")
+    "Remote loop differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput dpRem(
+    final unit="Pa")
+    "Remote loop differential pressure"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpLocSet(
+    final unit="Pa")
+    "Local differential pressure setpoint "
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{98,-20},{138,20}})));
+  Buildings.Controls.OBC.CDL.Reals.PID ctlDpRem(
+    final k=k,
+    final Ti=Ti,
+    final r=dpLocSet_max)
+    "Remote loop differential pressure controller"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Line dpLocRes
+    "Local loop differential pressure reset"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    final k=0)
+    "Constant"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
+    final k=1)
+    "Constant"
+    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpLocSetMin(
+    final k=dpLocSet_min)
+    "Constant"
+    annotation (Placement(transformation(extent={{60,24},{40,44}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpLocSetMax(
+    final k=dpLocSet_max)
+    "Constant"
+    annotation (Placement(transformation(extent={{60,-40},{40,-20}})));
+equation
+  connect(dpRem, ctlDpRem.u_m)
+    annotation (Line(points={{-120,-40},{-60,-40},{-60,-12}},color={0,0,127}));
+  connect(zer.y, dpLocRes.x1)
+    annotation (Line(points={{22,40},{30,40},{30,8},{38,8}},color={0,0,127}));
+  connect(dpLocSetMin.y, dpLocRes.f1)
+    annotation (Line(points={{38,34},{34,34},{34,4},{38,4}},color={0,0,127}));
+  connect(one.y, dpLocRes.x2)
+    annotation (Line(points={{22,-20},{30,-20},{30,-4},{38,-4}},color={0,0,127}));
+  connect(dpLocSetMax.y, dpLocRes.f2)
+    annotation (Line(points={{38,-30},{34,-30},{34,-8},{38,-8}},color={0,0,127}));
+  connect(dpRemSet, ctlDpRem.u_s)
+    annotation (Line(points={{-120,0},{-72,0}},color={0,0,127}));
+  connect(ctlDpRem.y, dpLocRes.u)
+    annotation (Line(points={{-48,0},{38,0}},color={0,0,127}));
+  connect(dpLocRes.y, dpLocSet)
+    annotation (Line(points={{62,0},{120,0}},color={0,0,127}));
+  annotation (
+    defaultComponentName="resDpLoc",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+For plants where the remote DP sensor(s) is not hardwired to the plant controller, but
+a local DP sensor is hardwired to the plant controller,
+remote DP is maintained at setpoint by a reverse acting PI loop <i>running in the controller
+to which the remote sensor is wired</i>.
+</p>
+<p>
+The loop output is a DP setpoint for the local primary loop DP sensor hardwired to the
+plant controller.
+</p>
+<p>
+The local DP setpoint is reset from <code>dpLocSet_min</code> at <i>0&nbsp;%</i> loop output
+to <code>dpLocSet_max</code> at <i>100&nbsp;%</i> loop output.
+</p>
+<p>
+The minimum local differential pressure setpoint <code>dpLocSet_min</code> is
+dictated by minimum flow control in primary-only plants but has no lower
+limit in primary-secondary plants.
+In primary-only plants, the minimum setpoint needs to be high enough to drive design
+minimum flow for the largest equipment through the minimum flow bypass valve.
+</p>
+<h4>Details</h4>
+<p>This logic is prescribed in ASHRAE, 2021 for:
+</p>
+<ul>
+<li>
+variable speed primary pumps in primary-only chiller and boiler plants
+where the remote DP sensor(s) is not hardwired to the plant controller, but
+a local DP sensor is hardwired to the plant controller,
+</li>
+<li>
+variable speed secondary pumps in primary-secondary chiller and boiler plants
+where a remote DP sensor is not hardwired to the secondary pump controller,
+but a local DP sensor is hardwired to the secondary pump controller.
+</li>
+</ul>
+<h4>References</h4>
+<ul>
+<li id=\"ASHRAE2021\">
+ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
+for HVAC Systems. Atlanta, GA.
+</li>
+</ul>
+</html>
+", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-100,-100},{100,100}})));
+end ResetLocalDifferentialPressure;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo
new file mode 100644
index 00000000000..add1f3d443d
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeadered.mo
@@ -0,0 +1,352 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic;
+block StagingHeadered "Generic staging logic for headered pumps"
+  parameter Boolean is_pri(start=true)
+    "Set to true for primary pumps, false for secondary pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=nPum > 0));
+  parameter Boolean is_hdr(start=false)
+    "Set to true for headered pumps, false for dedicated pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=nPum > 0));
+  parameter Boolean is_ctlDp(start=false)
+    "Set to true for headered variable speed pumps using ∆p pump speed control"
+    annotation (Evaluate=true,
+    Dialog(enable=is_hdr));
+  parameter Boolean have_valInlIso(start=false)
+    "Set to true if the system as inlet isolation valves"
+    annotation (Evaluate=true,
+    Dialog(enable=is_pri));
+  parameter Boolean have_valOutIso(start=false)
+    "Set to true if the system as outlet isolation valves"
+    annotation (Evaluate=true,
+    Dialog(enable=is_pri));
+  parameter Integer nEqu
+    "Number of equipment"
+    annotation (Evaluate=true);
+  parameter Integer nPum
+    "Number of pumps"
+    annotation (Evaluate=true);
+  parameter Real V_flow_nominal(
+    min=1E-6,
+    start=1E-6,
+    unit="m3/s")
+    "Design flow rate"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real dtRun(
+    min=0,
+    start=600,
+    unit="s")=600
+    "Runtime before triggering stage command"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real dVOffUp(
+    max=1,
+    min=0,
+    start=0.03,
+    unit="1")=0.03
+    "Stage up flow point offset"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  parameter Real dVOffDow(
+    max=1,
+    min=0,
+    start=0.03,
+    unit="1")=dVOffUp
+    "Stage down flow point offset"
+    annotation (Dialog(enable=is_hdr and is_ctlDp));
+  final parameter Real staPum[nPum, nPum](
+    each unit="1",
+    each min=0,
+    each max=1)={fill(i / nPum, nPum) for i in 1:nPum}
+    "Pump staging matrix"
+    annotation(Evaluate=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Pum[nEqu]
+    if is_pri and (not is_hdr or is_hdr and not is_ctlDp)
+    "Pump command from equipment enable logic"
+    annotation (Placement(transformation(extent={{-200,80},{-160,120}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Pum_actual[nPum]
+    "Pump status – Hardware point"
+    annotation (Placement(transformation(extent={{-200,0},{-160,40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nPum]
+    "Pump command – Hardware point"
+    annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1_actual[nEqu]
+    "Pump status to equipment enable logic"
+    annotation (Placement(transformation(extent={{160,40},{200,80}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Utilities.StageIndex nPumHdrDp(
+    final have_inpAva=false,
+    final nSta=nPum,
+    final dtRun=dtRun)
+    if is_hdr and is_ctlDp
+    "Compute number of pumps to be staged on – Headered pumps using ∆p control"
+    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+  Generic.StagingHeaderedDeltaP staHdrDp(
+    final nPum=nPum,
+    final V_flow_nominal=V_flow_nominal,
+    final dtRun=dtRun,
+    final dVOffUp=dVOffUp,
+    final dVOffDow=dVOffDow)
+    if is_hdr and is_ctlDp
+    "Stage headered variable speed pumps using ∆p control"
+    annotation (Placement(transformation(extent={{-130,-30},{-110,-10}})));
+  StagingRotation.SortRuntime sorRunTimHdr(
+    nin=nPum)
+    if is_hdr
+    "Sort by increasing staging runtime"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nEqu](
+    each final integerTrue=1,
+    each final integerFalse=0)
+    if is_pri and is_hdr and not is_ctlDp
+    "Convert to integer"
+    annotation (Placement(transformation(extent={{-140,90},{-120,110}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum nPumHdrPriNotDp0(
+    nin=nEqu)
+    if is_pri and is_hdr and not is_ctlDp
+    "Compute number of pumps to be staged on – Headered primary pumps not using ∆p control"
+    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Ava[nPum](
+    each final k=true)
+    if is_hdr
+    "Pump available signal – Block does not handle faulted equipment yet"
+    annotation (Placement(transformation(extent={{-10,-110},{10,-90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput V_flow(
+    final unit="m3/s")
+    if is_hdr and is_ctlDp
+    "Flow rate"
+    annotation (Placement(transformation(extent={{-200,-40},{-160,0}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal sigPumPriDed(final nin
+      =nEqu, final nout=nPum)
+    if is_pri and not is_hdr
+    "Extract dedicated primary pump command signal assuming nEqu=nPum"
+    annotation (Placement(transformation(extent={{-10,-150},{10,-130}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal y1Ded_actual(
+    nin=nPum,
+    nout=nEqu)
+    if not is_hdr
+    "Extract dedicated pump status assuming nEqu=nPum"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractor y1LeaHdr_actual(
+    final nin=nPum)
+    if is_hdr
+    "Lead headered pump status"
+    annotation (Placement(transformation(extent={{30,30},{50,50}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booScaRep(
+    final nout=nEqu)
+    if is_hdr
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValInlIso[nEqu]
+    if is_pri and is_hdr and have_valInlIso
+    "Equipment inlet isolation valve command"
+    annotation (Placement(transformation(extent={{-200,-100},{-160,-60}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValOutIso[nEqu]
+    if is_pri and is_hdr and have_valOutIso
+    "Equipment outlet isolation valve command"
+    annotation (Placement(transformation(extent={{-200,-140},{-160,-100}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Primary.EnableLeadHeadered enaLeaHdrPri(
+    final typCon=Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel,
+    final typValIso=Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition,
+    final nValIso=2 * nEqu)
+    if is_pri and is_hdr
+    "Enable/disable lead primary headered pump"
+    annotation (Placement(transformation(extent={{-70,-110},{-50,-90}})));
+  Utilities.PlaceholderLogical phValInlIso[nEqu](each final have_inp=
+        have_valInlIso, each final have_inpPh=true) if is_pri and is_hdr
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{-130,-90},{-110,-70}})));
+  Utilities.PlaceholderLogical phValOutIso[nEqu](each final have_inp=
+        have_valOutIso, each final have_inpPh=true) if is_pri and is_hdr
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{-130,-130},{-110,-110}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Pla
+    if not is_pri and is_hdr
+    "Plant enable signal"
+    annotation (Placement(transformation(extent={{-200,120},{-160,160}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt1(
+    final integerTrue=1,
+    final integerFalse=0)
+    if is_pri and is_hdr and not is_ctlDp
+    "Convert lead pump enable signal to integer"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-40,-50})));
+  Buildings.Controls.OBC.CDL.Integers.Multiply nPumHdrPriNotDp
+    if is_pri and is_hdr and not is_ctlDp
+    "Reset number of enabled pumps to zero if lead pump disabled"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  StagingRotation.EquipmentEnable enaHdr(
+    final staEqu=staPum)
+    if is_hdr
+    "Enable headered pumps"
+    annotation (Placement(transformation(extent={{50,-30},{70,-10}})));
+equation
+  connect(u1Pum_actual, staHdrDp.u1_actual)
+    annotation (Line(points={{-180,20},{-152,20},{-152,-14},{-132,-14}},
+                                                                    color={255,0,255}));
+  connect(staHdrDp.y1Up, nPumHdrDp.u1Up)
+    annotation (Line(points={{-108,-14},{-100,-14},{-100,-18},{-12,-18}},
+                                                                   color={255,0,255}));
+  connect(staHdrDp.y1Dow, nPumHdrDp.u1Dow)
+    annotation (Line(points={{-108,-26},{-100,-26},{-100,-22},{-12,-22}},
+                                                                       color={255,0,255}));
+  connect(u1Pum, booToInt.u)
+    annotation (Line(points={{-180,100},{-142,100}},color={255,0,255}));
+  connect(booToInt.y, nPumHdrPriNotDp0.u)
+    annotation (Line(points={{-118,100},{-102,100}},color={255,127,0}));
+  connect(u1Ava.y, sorRunTimHdr.u1Ava)
+    annotation (Line(points={{12,-100},{20,-100},{20,-60},{-18,-60},{-18,14},{
+          -12,14}},                                                color={255,0,255}));
+  connect(V_flow, staHdrDp.V_flow)
+    annotation (Line(points={{-180,-20},{-146,-20},{-146,-26},{-132,-26}},
+                                                                    color={0,0,127}));
+  connect(u1Pum, sigPumPriDed.u)
+    annotation (Line(points={{-180,100},{-156,100},{-156,-140},{-12,-140}},
+      color={255,0,255}));
+  connect(u1Pum_actual, y1Ded_actual.u)
+    annotation (Line(points={{-180,20},{-152,20},{-152,80},{68,80}},color={255,0,255}));
+  connect(y1Ded_actual.y, y1_actual)
+    annotation (Line(points={{92,80},{140,80},{140,60},{180,60}},color={255,0,255}));
+  connect(u1Pum_actual, y1LeaHdr_actual.u)
+    annotation (Line(points={{-180,20},{-152,20},{-152,40},{28,40}},color={255,0,255}));
+  connect(y1LeaHdr_actual.y, booScaRep.u)
+    annotation (Line(points={{52,40},{68,40}},color={255,0,255}));
+  connect(booScaRep.y, y1_actual)
+    annotation (Line(points={{92,40},{140,40},{140,60},{180,60}},color={255,0,255}));
+  connect(u1ValInlIso, phValInlIso.u)
+    annotation (Line(points={{-180,-80},{-132,-80}}, color={255,0,255}));
+  connect(enaLeaHdrPri.y1, nPumHdrDp.u1Lea)
+    annotation (Line(points={{-48,-100},{-20,-100},{-20,-14},{-12,-14}},
+                                                                      color={255,0,255}));
+  connect(phValInlIso.y, enaLeaHdrPri.u1ValIso[1:nEqu]) annotation (Line(points={{-108,
+          -80},{-80,-80},{-80,-100},{-72,-100}},     color={255,0,255}));
+  connect(phValOutIso.y, enaLeaHdrPri.u1ValIso[nEqu + 1:2*nEqu])
+    annotation (Line(points={{-108,-120},{-80,-120},{-80,-100},{-72,-100}},
+                                                   color={255,0,255}));
+  connect(u1ValOutIso, phValOutIso.u)
+    annotation (Line(points={{-180,-120},{-132,-120}},
+                                                     color={255,0,255}));
+  connect(u1ValOutIso, phValInlIso.uPh) annotation (Line(points={{-180,-120},{
+          -146,-120},{-146,-86},{-132,-86}},
+                                       color={255,0,255}));
+  connect(u1ValInlIso, phValOutIso.uPh) annotation (Line(points={{-180,-80},{
+          -152,-80},{-152,-126},{-132,-126}},
+                                       color={255,0,255}));
+  connect(u1Pla, nPumHdrDp.u1Lea)
+    annotation (Line(points={{-180,140},{-20,140},{-20,-14},{-12,-14}},color={255,0,255}));
+  connect(enaLeaHdrPri.y1, booToInt1.u)
+    annotation (Line(points={{-48,-100},{-40,-100},{-40,-62}},
+                                                           color={255,0,255}));
+  connect(nPumHdrPriNotDp0.y, nPumHdrPriNotDp.u1)
+    annotation (Line(points={{-78,100},{-60,100},{-60,106},{-12,106}},color={255,127,0}));
+  connect(booToInt1.y, nPumHdrPriNotDp.u2)
+    annotation (Line(points={{-40,-38},{-40,94},{-12,94}},  color={255,127,0}));
+  connect(sorRunTimHdr.yIdx[1], y1LeaHdr_actual.index)
+    annotation (Line(points={{12,14},{40,14},{40,28}},color={255,127,0}));
+  connect(u1Pum_actual, sorRunTimHdr.u1Run)
+    annotation (Line(points={{-180,20},{-16,20},{-16,26},{-12,26}},color={255,0,255}));
+  connect(enaHdr.y1, y1)
+    annotation (Line(points={{72,-20},{140,-20},{140,-60},{180,-60}},color={255,0,255}));
+  connect(nPumHdrDp.y, enaHdr.uSta)
+    annotation (Line(points={{12,-20},{48,-20}},color={255,127,0}));
+  connect(nPumHdrPriNotDp.y, enaHdr.uSta)
+    annotation (Line(points={{12,100},{20,100},{20,-20},{48,-20}},color={255,127,0}));
+  connect(u1Ava.y, enaHdr.u1Ava)
+    annotation (Line(points={{12,-100},{20,-100},{20,-26},{48,-26}},
+      color={255,0,255}));
+  connect(sorRunTimHdr.yIdx, enaHdr.uIdxAltSor)
+    annotation (Line(points={{12,14},{40,14},{40,-14},{48,-14}},color={255,127,0}));
+  connect(sigPumPriDed.y, y1) annotation (Line(points={{12,-140},{140,-140},{
+          140,-60},{180,-60}}, color={255,0,255}));
+  annotation (
+    defaultComponentName="staPum",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-160,-160},{160,160}})),
+    Documentation(
+      info="<html>
+<h5>Plants with headered primary pumps that are not controlled to maintain differential pressure or flow setpoint</h5>
+<p>
+Primary pumps are lead/lag alternated as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime\">
+Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime</a>.
+</p>
+<p>
+The lead primary pump is enabled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered</a>.
+</p>
+<p>
+The number of operating primary pumps matches the number of operating
+equipment.
+</p>
+<h5>Plants with headered primary pumps that are controlled to maintain differential pressure or flow setpoint</h5>
+<p>
+Primary pumps are lead/lag alternated as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime\">
+Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime</a>.
+</p>
+<p>
+The lead primary pump is enabled as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered</a>.
+<p>
+Primary pumps are staged as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP</a>.
+</p>
+<h5>Plants with headered secondary pumps</h5>
+<p>
+Secondary pumps are lead/lag alternated as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime\">
+Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime</a>.
+</p>
+<p>
+The lead secondary pump is enabled when the plant is enabled. 
+Otherwise, the lead secondary pump is disabled.
+<p>
+Secondary pumps are staged as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP</a>.
+</p>
+<h4>Details</h4>
+<p>
+At its current stage of development, this block contains no
+logic for handling faulted equipment. 
+It is therefore assumed that all pumps are available at all times.
+</p>
+<p>
+To simplify integration into the plant controller this block also
+serves as a pass-through for the dedicated primary pump command signal 
+that is generated in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing\">
+Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing</a>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StagingHeadered;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo
new file mode 100644
index 00000000000..3775466401a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/StagingHeaderedDeltaP.mo
@@ -0,0 +1,230 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic;
+block StagingHeaderedDeltaP
+  "Staging logic for headered variable speed pumps using ∆p pump speed control"
+  parameter Integer nPum(
+    final min=1)
+    "Number of pumps that operate at design conditions"
+    annotation (Evaluate=true);
+  parameter Real V_flow_nominal(
+    final min=1E-6,
+    final unit="m3/s")
+    "Design flow rate";
+  parameter Real dtRun(
+    final min=0,
+    final unit="s")=10 * 60
+    "Runtime before triggering stage command";
+  parameter Real dVOffUp(
+    final min=0,
+    final max=1,
+    final unit="1")=0.03
+    "Stage up flow point offset";
+  parameter Real dVOffDow(
+    final min=0,
+    final max=1,
+    final unit="1")=dVOffUp
+    "Stage down flow point offset";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput V_flow(
+    final unit="m3/s")
+    "Flow rate"
+    annotation (Placement(transformation(extent={{-160,-20},{-120,20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Up
+    "Stage up command"
+    annotation (Placement(transformation(extent={{120,20},{160,60}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Dow
+    "Stage down command"
+    annotation (Placement(transformation(extent={{120,-60},{160,-20}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1_actual[nPum]
+    "Pump status"
+    annotation (Placement(transformation(extent={{-160,80},{-120,120}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter norV(
+    final k=1 / V_flow_nominal)
+    "Normalize to design value"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter norN(
+    final k=1 / nPum)
+    "Normalize to design value"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nPum]
+    "Convert to real value"
+    annotation (Placement(transformation(extent={{-90,90},{-70,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Greater gre
+    "Compare to stage up flow point"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Less les
+    "Compare to stage down flow point"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter poiDow(
+    p=- 1 / nPum - dVOffDow)
+    "Calculate stage down flow point"
+    annotation (Placement(transformation(extent={{-20,10},{0,30}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter poiUp(
+    p=- dVOffUp)
+    "Calculate stage up flow point"
+    annotation (Placement(transformation(extent={{-20,50},{0,70}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset runUp(
+    final t=dtRun)
+    "Return true if stage up condition is true for specified duration"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset runDow(
+    final t=dtRun)
+    "Return true if stage down condition is true for specified duration"
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Change cha[nPum]
+    "Return true when pump status changes"
+    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum nOpe(
+    nin=nPum)
+    "Return number of operating pumps"
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyCha(
+    nin=nPum)
+    "Return true when any pump status changes"
+    annotation (Placement(transformation(extent={{-50,-70},{-30,-50}})));
+equation
+  connect(norN.y, poiDow.u)
+    annotation (Line(points={{-38,40},{-30,40},{-30,20},{-22,20}},color={0,0,127}));
+  connect(norN.y, poiUp.u)
+    annotation (Line(points={{-38,40},{-30,40},{-30,60},{-22,60}},color={0,0,127}));
+  connect(norV.y, gre.u1)
+    annotation (Line(points={{-38,0},{28,0}},color={0,0,127}));
+  connect(poiUp.y, gre.u2)
+    annotation (Line(points={{2,60},{20,60},{20,-8},{28,-8}},color={0,0,127}));
+  connect(poiDow.y, les.u2)
+    annotation (Line(points={{2,20},{10,20},{10,-48},{28,-48}},color={0,0,127}));
+  connect(norV.y, les.u1)
+    annotation (Line(points={{-38,0},{0,0},{0,-40},{28,-40}},color={0,0,127}));
+  connect(les.y, runDow.u)
+    annotation (Line(points={{52,-40},{68,-40}},color={255,0,255}));
+  connect(V_flow, norV.u)
+    annotation (Line(points={{-140,0},{-62,0}},color={0,0,127}));
+  connect(gre.y, runUp.u)
+    annotation (Line(points={{52,0},{68,0}},color={255,0,255}));
+  connect(runUp.passed, y1Up)
+    annotation (Line(points={{92,-8},{100,-8},{100,40},{140,40}},color={255,0,255}));
+  connect(runDow.passed, y1Dow)
+    annotation (Line(points={{92,-48},{100,-48},{100,-40},{140,-40}},color={255,0,255}));
+  connect(booToRea.y, nOpe.u)
+    annotation (Line(points={{-68,100},{-62,100}},color={0,0,127}));
+  connect(u1_actual, booToRea.u)
+    annotation (Line(points={{-140,100},{-92,100}},color={255,0,255}));
+  connect(u1_actual, cha.u)
+    annotation (Line(points={{-140,100},{-100,100},{-100,-60},{-92,-60}},color={255,0,255}));
+  connect(nOpe.y, norN.u)
+    annotation (Line(points={{-38,100},{-30,100},{-30,70},{-70,70},{-70,40},{-62,40}},
+      color={0,0,127}));
+  connect(cha.y, anyCha.u)
+    annotation (Line(points={{-68,-60},{-52,-60}},color={255,0,255}));
+  connect(anyCha.y, runUp.reset)
+    annotation (Line(points={{-28,-60},{60,-60},{60,-8},{68,-8}},color={255,0,255}));
+  connect(anyCha.y, runDow.reset)
+    annotation (Line(points={{-28,-60},{60,-60},{60,-48},{68,-48}},color={255,0,255}));
+  annotation (
+    defaultComponentName="staPum",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<p>
+Pumps are staged as a function of the ratio <i>ratV_flow</i>
+of current volume flow rate <i>V_flow</i> to design volume 
+flow rate <i>V_flow_nominal</i>,
+the number of operating pumps <i>nPum_actual</i> 
+and the number of pumps that operate at design conditions
+<i>nPum</i>. 
+Pumps are assumed to be equally sized.
+<p>
+<i>FR = V_flow / V_flow_nominal</i>
+</p>
+<p>
+The next lag pump is enabled whenever the following is true for 
+<code>dtRun</code>:
+</p>
+<p>
+<i>FR &gt; nPum_actual / nPum − dVOffUp</i>
+</p>
+<p>
+The last lag pump is disabled whenever the following is true for 
+<code>dtRun</code>:
+</p>
+<p>
+<i>FR &lt; (nPum_actual - 1) / nPum − dVOffDow</i>
+</p>
+<p>
+If desired, the stage down flow point <code>dVOffDow</code> can be
+offset slightly below the stage up point <code>dVOffUp</code> to
+prevent cycling between pump stages in applications with highly variable loads.
+</p>
+<p>
+The timers are reset to zero when the status of a pump changes.
+This is necessary to ensure the minimum pump runtime with rapidly changing loads.
+</p>
+<h4>Details</h4>
+<p>This logic is prescribed in ASHRAE, 2021 for:</p>
+<ul>
+<li>
+headered variable speed primary pumps in primary-only chiller
+and boiler plants using differential pressure pump speed control,
+</li>
+<li>
+variable speed secondary pumps in primary-secondary chiller plants
+with one or more sets of secondary loop pumps serving downstream
+control valves,
+</li>
+<li>
+variable speed secondary pumps in primary-secondary boiler
+plants with serving a secondary loop with a flow meter.
+</li>
+</ul>
+<p>
+For other plant configurations, the pumps are staged with the equipment,
+i.e., the number of pumps matches the number of chillers or boilers.
+The actual logic for generating the pump enable commands is part of the
+staging event sequencing.
+</p>
+<p>
+A \"if\" condition is used to generate the stage up and down command as opposed
+to a \"when\" condition. This means that the command remains true as long as the
+condition is verified. This is necessary, for example, if no higher stage is 
+available when a stage up command is triggered. Using a \"when\" condition &ndash;
+which is only valid at the point in time at which the condition becomes true &ndash; 
+would prevent the plant from staging when a higher stage becomes available again.
+To avoid multiple consecutive stage changes, the block that receives the stage up
+and down command and computes the stage index must enforce a minimum stage runtime
+of <code>dtRun</code>.
+</p>
+<h4>References</h4>
+<ul>
+<li id=\"ASHRAE2021\">
+ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
+for HVAC Systems. Atlanta, GA.
+</li>
+</ul>
+</html>
+", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-120,-120},{120,120}})));
+end StagingHeaderedDeltaP;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mo
new file mode 100644
index 00000000000..e1a3f325eac
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mo
@@ -0,0 +1,152 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic.Validation;
+model ControlDifferentialPressure
+  "Validation model for the differential pressure control of variable speed pumps"
+  parameter Integer nPum=4
+    "Number of primary pumps that operate at design conditions";
+  parameter Real VPri_flow_nominal=0.1
+    "Design primary flow rate";
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratDp(
+    table=[
+      0, 0.1, 0.5;
+      1, 1, 0.5;
+      1.5, 1, 0.2;
+      2, 0.1, 0.1],
+    timeScale=3600)
+    "Differential pressure ratio to design value"
+    annotation (Placement(transformation(extent={{-90,10},{-70,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Pum(
+    table=[
+      0, 0, 0;
+      2000, 1, 0;
+      6000, 0, 1;
+      8000, 0, 0],
+    period=8400)
+    "Pump status"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpRemSet[2](
+    k={3E4, 2E4})
+    "Differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-48,10},{-28,30}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure ctlDpRem(
+    have_senDpRemWir=true,
+    nPum=2,
+    nSenDpRem=2)
+    "Differential pressure control with remote sensors hardwired to the plant controller"
+    annotation (Placement(transformation(extent={{70,10},{90,30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiMax mulMax(
+    nin=2)
+    "Maximum value"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpLoc(
+    final k=5)
+    "Differential pressure local to the plant"
+    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure ctlDpLoc(
+    have_senDpRemWir=false,
+    nPum=2,
+    nSenDpRem=2)
+    "Differential pressure control without remote sensors hardwired to the plant controller"
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin[2](
+    amplitude=0.1 * dpRemSet.k,
+    freqHz={2 / 8000, 4 / 8000},
+    each phase=3.1415926535898)
+    "Source signal used to generate measurement values"
+    annotation (Placement(transformation(extent={{-88,-50},{-68,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Add dpRem[2]
+    "Differential pressure at remote location"
+    annotation (Placement(transformation(extent={{-48,-30},{-28,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpLocSet[2](
+    each final k=5)
+    "Local differential pressure setpoint"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+equation
+  connect(y1Pum.y, ctlDpRem.y1_actual)
+    annotation (Line(points={{-68,60},{60,60},{60,28},{68,28}},color={255,0,255}));
+  connect(mulMax.y, dpLoc.u)
+    annotation (Line(points={{12,-80},{28,-80}},color={0,0,127}));
+  connect(y1Pum.y, ctlDpLoc.y1_actual)
+    annotation (Line(points={{-68,60},{60,60},{60,-32},{68,-32}},color={255,0,255}));
+  connect(dpLoc.y, ctlDpLoc.dpLoc)
+    annotation (Line(points={{52,-80},{60,-80},{60,-48},{68,-48}},color={0,0,127}));
+  connect(ratDp.y, dpRemSet.u)
+    annotation (Line(points={{-68,20},{-50,20}},color={0,0,127}));
+  connect(sin.y, dpRem.u2)
+    annotation (Line(points={{-66,-40},{-60,-40},{-60,-26},{-50,-26}},color={0,0,127}));
+  connect(dpRemSet.y, dpRem.u1)
+    annotation (Line(points={{-26,20},{-20,20},{-20,0},{-60,0},{-60,-14},{-50,-14}},
+      color={0,0,127}));
+  connect(dpRemSet.y, ctlDpRem.dpRemSet)
+    annotation (Line(points={{-26,20},{40,20},{40,24},{68,24}},color={0,0,127}));
+  connect(dpRem.y, ctlDpRem.dpRem)
+    annotation (Line(points={{-26,-20},{50,-20},{50,20},{68,20}},color={0,0,127}));
+  connect(dpRem.y, mulMax.u)
+    annotation (Line(points={{-26,-20},{-20,-20},{-20,-80},{-12,-80}},color={0,0,127}));
+  connect(dpRemSet.y, dpLocSet.u)
+    annotation (Line(points={{-26,20},{20,20},{20,-40},{28,-40}},color={0,0,127}));
+  connect(dpLocSet.y, ctlDpLoc.dpLocSet)
+    annotation (Line(points={{52,-40},{60,-40},{60,-44},{68,-44}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ControlDifferentialPressure.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=8400.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ControlDifferentialPressure</a>
+in a configuration with two pumps and two remote DP sensors that either are
+hardwired to the controller (component <code>ctlDpRem</code>)
+or are not hardwired to the controller, which uses a local DP sensor instead
+(component <code>ctlDpLoc</code>).
+</p>
+<p>
+The simulation of this model shows that when any pump is proven on,
+the controller is enabled and its output is
+initially set to the minimum pump speed <code>y_min</code>.
+The minimum pump speed sets the lower limit of the controller output
+for the entire time that the controller is enabled.
+The output of the controller <code>ctlDpRem</code> is driven by the most
+demanding remote DP control loop, e.g.,
+the controller output only drops when both loop input measurements are
+above setpoints.
+Without remote sensors hardwired to the controller, the pump speed is
+driven by the highest local DP setpoint.
+</p>
+<p>
+When no pump is proven on, the controller is disabled and its output
+is set to <i>0&nbsp;%</i>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end ControlDifferentialPressure;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mo
new file mode 100644
index 00000000000..756bdd1a10f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mo
@@ -0,0 +1,97 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic.Validation;
+model ResetLocalDifferentialPressure
+  "Validation model for the local differential pressure reset"
+  parameter Integer nPum=4
+    "Number of primary pumps that operate at design conditions";
+  parameter Real VPri_flow_nominal=0.1
+    "Design primary flow rate";
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratDp(
+    table=[
+      0, 0.1;
+      1, 1;
+      1.5, 1;
+      2, 0.1],
+    timeScale=3600)
+    "Differential pressure ratio to design value"
+    annotation (Placement(transformation(extent={{-90,10},{-70,30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter dpRemSet(
+    k=3E4)
+    "Differential pressure setpoint"
+    annotation (Placement(transformation(extent={{-48,10},{-28,30}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure resDpLoc(
+    dpLocSet_max=1E5,
+    Ti=10)
+    "Local differential pressure reset"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin(
+    amplitude=0.1 * dpRemSet.k,
+    freqHz=4 / 8000,
+    phase=3.1415926535898)
+    "Source signal used to generate measurement values"
+    annotation (Placement(transformation(extent={{-88,-50},{-68,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Add dpRem
+    "Differential pressure at remote location"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+equation
+  connect(sin.y, dpRem.u2)
+    annotation (Line(points={{-66,-40},{0,-40},{0,-26},{18,-26}},color={0,0,127}));
+  connect(dpRemSet.y, resDpLoc.dpRemSet)
+    annotation (Line(points={{-26,20},{60,20},{60,6},{68,6}},color={0,0,127}));
+  connect(dpRem.y, resDpLoc.dpRem)
+    annotation (Line(points={{42,-20},{60,-20},{60,-6},{68,-6}},
+                                                              color={0,0,127}));
+  connect(dpRemSet.y, dpRem.u1)
+    annotation (Line(points={{-26,20},{0,20},{0,-14},{18,-14}},color={0,0,127}));
+  connect(ratDp.y[1], dpRemSet.u)
+    annotation (Line(points={{-68,20},{-50,20}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/ResetLocalDifferentialPressure.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=8400.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.ResetLocalDifferentialPressure</a>.
+</p>
+<p>
+The simulation of this model shows how the local DP
+setpoint is reset by the controller <code>resDpLoc</code>
+based on the variation of the remote differential pressure
+around its setpoint.
+The local DP setpoint remains bounded by
+<code>resDpLoc.dpLocSet_min</code> and <code>resDpLoc.dpLocSet_max</code>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end ResetLocalDifferentialPressure;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo
new file mode 100644
index 00000000000..177119415fb
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mo
@@ -0,0 +1,181 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic.Validation;
+model StagingHeadered
+  "Validation model for staging of headered pumps"
+  parameter Integer nEqu=3
+    "Number of plant equipment";
+  parameter Integer nPum=nEqu
+    "Number of pumps that operate at design conditions";
+  parameter Real V_flow_nominal=0.1
+    "Design flow rate";
+  Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered staPumPriDp(
+    is_pri=true,
+    is_hdr=true,
+    is_ctlDp=true,
+    have_valInlIso=true,
+    have_valOutIso=true,
+    final nEqu=nEqu,
+    final nPum=nPum,
+    final V_flow_nominal=V_flow_nominal)
+    "Pump staging – Headered primary pumps with ∆p control"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(table=[0,0; 1,1; 1.5,
+        1; 2,0], timeScale=3600) "Flow ratio to design value"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VPri_flow(final k=
+        V_flow_nominal)
+    "Flow rate"
+    annotation (Placement(transformation(extent={{-68,-10},{-48,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nPum]
+    "Convert command signal to real value"
+    annotation (Placement(transformation(extent={{80,70},{60,90}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol[nPum](each
+      samplePeriod=1)
+    "Hold signal value"
+    annotation (Placement(transformation(extent={{50,70},{30,90}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr[nPum]
+    "Compare to zero to compute equipment status"
+    annotation (Placement(transformation(extent={{20,70},{0,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
+    table=[0,0,0,0; 0.1,1,0,0; 0.5,1,1,0; 1,1,1,1; 1.5,1,1,1; 2,0,1,1; 2.5,0,0,1;
+        3,0,0,0],
+    timeScale=3600,
+    period=10800)
+    "Command signal – Plant, equipment or isolation valve depending on tested configuration"
+    annotation (Placement(transformation(extent={{-110,30},{-90,50}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered staPumSecDp(
+    is_pri=false,
+    is_hdr=true,
+    is_ctlDp=true,
+    have_valInlIso=true,
+    have_valOutIso=true,
+    final nEqu=nEqu,
+    final nPum=nPum,
+    final V_flow_nominal=V_flow_nominal)
+    "Pump staging – Headered primary pumps with ∆p control"
+    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered staPumPriNoDp(
+    is_pri=true,
+    is_hdr=true,
+    is_ctlDp=false,
+    have_valInlIso=true,
+    have_valOutIso=false,
+    final nEqu=nEqu,
+    final nPum=nPum,
+    final V_flow_nominal=V_flow_nominal)
+    "Pump staging – Headered primary pumps without ∆p control"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered staPumPriDed(
+    is_pri=true,
+    is_hdr=false,
+    is_ctlDp=false,
+    have_valInlIso=true,
+    have_valOutIso=false,
+    final nEqu=nEqu,
+    final nPum=nPum,
+    final V_flow_nominal=V_flow_nominal)
+    "Pump staging – Dedicated primary pumps"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+equation
+  connect(ratFlo.y[1],VPri_flow. u)
+    annotation (Line(points={{-88,0},{-70,0}},color={0,0,127}));
+  connect(VPri_flow.y, staPumPriDp.V_flow) annotation (Line(points={{-46,0},{-40,
+          0},{-40,-48},{-2,-48}}, color={0,0,127}));
+  connect(booToRea.y,zerOrdHol. u)
+    annotation (Line(points={{58,80},{52,80}},
+                                             color={0,0,127}));
+  connect(zerOrdHol.y,greThr. u)
+    annotation (Line(points={{28,80},{22,80}},  color={0,0,127}));
+  connect(staPumPriDp.y1, booToRea.u) annotation (Line(points={{22,-40},{100,-40},
+          {100,80},{82,80}}, color={255,0,255}));
+  connect(greThr.y, staPumPriDp.u1Pum_actual) annotation (Line(points={{-2,80},{
+          -20,80},{-20,-44},{-2,-44}}, color={255,0,255}));
+  connect(u1.y, staPumPriDp.u1ValInlIso) annotation (Line(points={{-88,40},{-30,
+          40},{-30,-36},{-2,-36}}, color={255,0,255}));
+  connect(u1.y, staPumPriDp.u1ValOutIso) annotation (Line(points={{-88,40},{-30,
+          40},{-30,-38},{-2,-38}}, color={255,0,255}));
+  connect(u1.y[1], staPumSecDp.u1Pla) annotation (Line(points={{-88,40},{-30,40},
+          {-30,-72},{-2,-72}}, color={255,0,255}));
+  connect(greThr.y, staPumSecDp.u1Pum_actual) annotation (Line(points={{-2,80},{
+          -20,80},{-20,-84},{-2,-84}}, color={255,0,255}));
+  connect(VPri_flow.y, staPumSecDp.V_flow) annotation (Line(points={{-46,0},{-40,
+          0},{-40,-88},{-2,-88}}, color={0,0,127}));
+  connect(u1.y, staPumPriNoDp.u1ValInlIso) annotation (Line(points={{-88,40},{-30,
+          40},{-30,4},{-2,4}}, color={255,0,255}));
+  connect(u1.y, staPumPriNoDp.u1Pum) annotation (Line(points={{-88,40},{-30,40},
+          {-30,-2},{-2,-2}}, color={255,0,255}));
+  connect(greThr.y, staPumPriNoDp.u1Pum_actual) annotation (Line(points={{-2,80},
+          {-20,80},{-20,-4},{-2,-4}}, color={255,0,255}));
+  connect(u1.y, staPumPriDed.u1Pum) annotation (Line(points={{-88,40},{-30,40},{
+          -30,38},{-2,38}}, color={255,0,255}));
+  connect(greThr.y, staPumPriDed.u1Pum_actual) annotation (Line(points={{-2,80},
+          {-20,80},{-20,36},{-2,36}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeadered.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=10800.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered</a>
+with three plant equipment and three pumps and for the following configurations.
+</p>
+<ul>
+<li>
+Dedicated primary pumps (component <code>staPumPriDed</code>):
+the number of pumps commanded on matches the number of operating
+equipment with a one-to-one relationship.
+</li>
+<li>
+Headered primary pumps without ∆p control (component <code>staPumPriNoDp</code>):
+the number of pumps commanded on matches the number of operating
+equipment without a one-to-one relationship.
+</li>
+<li>
+Headered primary pumps with ∆p control (component <code>staPumPriDp</code>):
+the number of pumps commanded on does not match the number of operating
+equipment but is rather related to the fractional flow rate. 
+The simulation also exhibits the lead/lag rotation of the primary pumps.
+</li>
+<li>
+Headered secondary pumps with ∆p control (component <code>staPumSecDp</code>):
+the number of pumps commanded on does not match the number of operating
+equipment but is rather related to the fractional flow rate.
+All pumps are disabled when the plant is disabled.
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-120,-100},{120,100}}),
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end StagingHeadered;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo
new file mode 100644
index 00000000000..2811f125c7a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mo
@@ -0,0 +1,138 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic.Validation;
+model StagingHeaderedDeltaP
+  "Validation model for staging of headered variable speed pumps using ∆p pump speed control"
+  parameter Integer nPum=4
+    "Number of pumps that operate at design conditions";
+  parameter Real V_flow_nominal=0.1
+    "Design flow rate";
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(
+    table=[
+      0, 0;
+      1, 1;
+      1.5, 1;
+      2, 0],
+    timeScale=3600)
+    "Flow ratio to design value"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable enaLea(
+    table=[
+      0, 1;
+      8000, 0],
+    period=8400)
+    "Lead pump enable signal"
+    annotation (Placement(transformation(extent={{-110,30},{-90,50}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter VPri_flow(
+    final k=V_flow_nominal)
+    "Flow rate"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP staPum(
+    final nPum=nPum,
+    final V_flow_nominal=V_flow_nominal)
+    "Pump staging"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Utilities.StageIndex idxSta(
+    have_inpAva=false,
+    final nSta=nPum,
+    final dtRun=staPum.dtRun)
+    "Calculate stage index = number of enabled pumps"
+    annotation (Placement(transformation(extent={{50,-10},{70,10}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold y1[nPum](
+    final t={i for i in 1:nPum})
+    "Pump command"
+    annotation (Placement(transformation(extent={{62,50},{42,70}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator rep(
+    nout=nPum)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{92,50},{72,70}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[nPum]
+    "Convert command signal to real value"
+    annotation (Placement(transformation(extent={{32,50},{12,70}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol[nPum](
+    each samplePeriod=1)
+    "Hold signal value"
+    annotation (Placement(transformation(extent={{2,50},{-18,70}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr[nPum]
+    "Compare to zero to compute equipment status"
+    annotation (Placement(transformation(extent={{-28,50},{-48,70}})));
+equation
+  connect(ratFlo.y[1], VPri_flow.u)
+    annotation (Line(points={{-88,0},{-42,0}},color={0,0,127}));
+  connect(VPri_flow.y, staPum.V_flow)
+    annotation (Line(points={{-18,0},{-10,0},{-10,-6},{-2,-6}},color={0,0,127}));
+  connect(staPum.y1Up, idxSta.u1Up)
+    annotation (Line(points={{22,6},{40,6},{40,2},{48,2}},color={255,0,255}));
+  connect(staPum.y1Dow, idxSta.u1Dow)
+    annotation (Line(points={{22,-6},{40,-6},{40,-2},{48,-2}},color={255,0,255}));
+  connect(rep.y, y1.u)
+    annotation (Line(points={{70,60},{64,60}},color={255,127,0}));
+  connect(enaLea.y[1], idxSta.u1Lea)
+    annotation (Line(points={{-88,40},{40,40},{40,6},{48,6}},color={255,0,255}));
+  connect(idxSta.y, rep.u)
+    annotation (Line(points={{72,0},{100,0},{100,60},{94,60}},color={255,127,0}));
+  connect(y1.y, booToRea.u)
+    annotation (Line(points={{40,60},{34,60}},color={255,0,255}));
+  connect(booToRea.y, zerOrdHol.u)
+    annotation (Line(points={{10,60},{4,60}},color={0,0,127}));
+  connect(zerOrdHol.y, greThr.u)
+    annotation (Line(points={{-20,60},{-26,60}},color={0,0,127}));
+  connect(greThr.y, staPum.u1_actual)
+    annotation (Line(points={{-50,60},{-60,60},{-60,20},{-10,20},{-10,6},{-2,6}},
+      color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Generic/Validation/StagingHeaderedDeltaP.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=8400.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeaderedDeltaP</a>
+in a configuration with four pumps.
+</p>
+<p>
+The simulation of this model shows that when the lead pump is enabled,
+the output of the staging controller is greater than or equal to one.
+The number of enabled pumps increases and decreases with the varying
+flow rate and under the condition of a minimum runtime of <i>10</i>&nbsp;min.
+It remains greater than or equal to one as long as the lead pump remains
+enabled.
+</p>
+<p>
+When the lead pump is disabled, the number of enabled pumps is set
+to <i>0</i>. This transition is not subject to the minimum runtime.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-120,-100},{120,100}}),
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end StagingHeaderedDeltaP;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/package.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/package.mo
new file mode 100644
index 00000000000..7651e5bcdb1
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/package.mo
@@ -0,0 +1,29 @@
+within Buildings.Templates.Plants.Controls.Pumps.Generic;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/package.order b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/package.order
new file mode 100644
index 00000000000..6071ceab043
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/Validation/package.order
@@ -0,0 +1,4 @@
+ControlDifferentialPressure
+ResetLocalDifferentialPressure
+StagingHeadered
+StagingHeaderedDeltaP
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/package.mo b/Buildings/Templates/Plants/Controls/Pumps/Generic/package.mo
new file mode 100644
index 00000000000..6d707adf50c
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/package.mo
@@ -0,0 +1,8 @@
+within Buildings.Templates.Plants.Controls.Pumps;
+package Generic
+  annotation (Documentation(info="<html>
+<p>
+This package contains control sequences for primary or secondary pumps.
+</p>
+</html>"));
+end Generic;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Generic/package.order b/Buildings/Templates/Plants/Controls/Pumps/Generic/package.order
new file mode 100644
index 00000000000..530b96ee682
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Generic/package.order
@@ -0,0 +1,5 @@
+ControlDifferentialPressure
+ResetLocalDifferentialPressure
+StagingHeadered
+StagingHeaderedDeltaP
+Validation
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/EnableLeadHeadered.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/EnableLeadHeadered.mo
new file mode 100644
index 00000000000..ed16681af43
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/EnableLeadHeadered.mo
@@ -0,0 +1,199 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary;
+block EnableLeadHeadered
+  "Lead primary pump enable/disable for plants with headered primary pumps"
+  parameter Buildings.Templates.Plants.Controls.Types.EquipmentConnection typCon
+    "Type of connection between equipment and primary loop"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Plants.Controls.Types.Actuator typValIso=
+    Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition
+    "Type of isolation valve"
+    annotation (Evaluate=true);
+  parameter Integer nValIso(
+    final min=1)
+    "Number of isolation valves"
+    annotation (Evaluate=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1ValIso[nValIso]
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition
+    "Isolation valve command"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uValIso[nValIso]
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.Modulating
+    "Isolation valve command"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Lead pump enable signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyOpePar(
+    nin=nValIso)
+    if typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel
+    "Return true if any valve is commanded open - Parallel piped equipment"
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd allCloPar(
+    nin=nValIso)
+    if typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel
+    "Return true if all valves are commanded closed - Parallel piped equipment"
+    annotation (Placement(transformation(extent={{10,-50},{30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not cloParMod[nValIso]
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.Modulating
+      and typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel
+    "Return true if valve is commanded closed"
+    annotation (Placement(transformation(extent={{-30,-50},{-10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold opeParMod[nValIso](
+    each final t=0)
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.Modulating
+      and typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel
+    "Return true if valve commanded > 0 % open"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lat
+    "Clear enable signal if disable conditions are met"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyCloSer(
+    nin=nValIso)
+    if typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Series
+    "Return true if any valve is commanded closed - Series piped equipment"
+    annotation (Placement(transformation(extent={{10,70},{30,90}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd allOpeSer(
+    nin=nValIso)
+    if typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Series
+    "Return true if all valves are commanded open - Series piped equipment"
+    annotation (Placement(transformation(extent={{10,30},{30,50}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold cloSerMod[nValIso](
+    each final t=0.99)
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.Modulating
+      and typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Series
+    "Return true if valve commanded < 99 % open"
+    annotation (Placement(transformation(extent={{-80,-90},{-60,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Not opeSerMod[nValIso]
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.Modulating
+      and typCon == Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Series
+    "Return true if valve is commanded open"
+    annotation (Placement(transformation(extent={{-30,-90},{-10,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Not cloTwo[nValIso]
+    if typValIso == Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition
+    "Return true if valve is commanded closed"
+    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
+equation
+  connect(uValIso, opeParMod.u)
+    annotation (Line(points={{-120,-40},{-82,-40}},color={0,0,127}));
+  connect(opeParMod.y, cloParMod.u)
+    annotation (Line(points={{-58,-40},{-32,-40}},color={255,0,255}));
+  connect(lat.y, y1)
+    annotation (Line(points={{92,0},{120,0}},color={255,0,255}));
+  connect(anyOpePar.y, lat.u)
+    annotation (Line(points={{32,0},{68,0}},color={255,0,255}));
+  connect(allCloPar.y, lat.clr)
+    annotation (Line(points={{32,-40},{50,-40},{50,-6},{68,-6}},color={255,0,255}));
+  connect(allOpeSer.y, lat.clr)
+    annotation (Line(points={{32,40},{50,40},{50,-6},{68,-6}},color={255,0,255}));
+  connect(anyCloSer.y, lat.u)
+    annotation (Line(points={{32,80},{60,80},{60,0},{68,0}},color={255,0,255}));
+  connect(uValIso, cloSerMod.u)
+    annotation (Line(points={{-120,-40},{-90,-40},{-90,-80},{-82,-80}},color={0,0,127}));
+  connect(cloSerMod.y, opeSerMod.u)
+    annotation (Line(points={{-58,-80},{-32,-80}},color={255,0,255}));
+  connect(u1ValIso, cloTwo.u)
+    annotation (Line(points={{-120,0},{-60,0},{-60,20},{-32,20}},color={255,0,255}));
+  connect(cloTwo.y, anyCloSer.u)
+    annotation (Line(points={{-8,20},{0,20},{0,80},{8,80}},color={255,0,255}));
+  connect(u1ValIso, anyOpePar.u)
+    annotation (Line(points={{-120,0},{8,0}},color={255,0,255}));
+  connect(cloTwo.y, allCloPar.u)
+    annotation (Line(points={{-8,20},{0,20},{0,-40},{8,-40}},color={255,0,255}));
+  connect(u1ValIso, allOpeSer.u)
+    annotation (Line(points={{-120,0},{0,0},{0,40},{8,40}},color={255,0,255}));
+  connect(cloParMod.y, allCloPar.u)
+    annotation (Line(points={{-8,-40},{0,-40},{0,-40},{8,-40}},color={255,0,255}));
+  connect(cloSerMod.y, anyCloSer.u)
+    annotation (Line(points={{-58,-80},{-40,-80},{-40,80},{8,80}},color={255,0,255}));
+  connect(opeSerMod.y, allOpeSer.u)
+    annotation (Line(points={{-8,-80},{0,-80},{0,40},{8,40}},color={255,0,255}));
+  connect(opeParMod.y, anyOpePar.u)
+    annotation (Line(points={{-58,-40},{-40,-40},{-40,0},{8,0}},color={255,0,255}));
+  annotation (
+    defaultComponentName="enaLea",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(
+      info="<html>
+<h5>
+Plants with parallel piped equipment
+</h5>
+<p>
+The lead primary pump is enabled when any equipment isolation valve is commanded open.
+</p>
+<p>
+The lead primary pump is disabled when all equipment isolation valves are commanded closed.
+</p>
+<p>
+For modulating valves, the \"valve commanded open\"
+condition is evaluated based on a command signal <i>&gt;&nbsp;0&nbsp;%</i>.
+The \"valve commanded closed\" condition is evaluated as the negation of the previous condition.
+</p>
+<h5>
+Plants with series piped equipment
+</h5>
+<p>
+The lead primary pump is enabled when any equipment isolation valve is commanded closed.
+</p>
+<p>
+The lead primary pump is disabled when all equipment isolation valves are commanded open.
+</p>
+<p>
+For modulating valves, the \"valve commanded closed\"
+condition is evaluated based on a command signal <i>&lt;&nbsp;100&nbsp;%</i>.
+The \"valve commanded open\" condition is evaluated as the negation of the previous condition.
+</p>
+<h4>Details</h4>
+<p>This logic is prescribed in ASHRAE, 2021 for:
+</p>
+<ul>
+<li>
+headered primary pumps in chiller plants with parallel chillers
+and without a waterside economizer,
+</li>
+<li>
+primary pumps in chiller plants with series chillers
+and without a waterside economizer,
+</li>
+<li>
+headered primary pumps in boiler plants.
+</li>
+</ul>
+<p>
+The valve <i>command</i> is used in contrast to the feedback of the
+valve position or the end switch status, as prescribed by Guideline 36.
+This is for the sake of simplicity, as there is no harm in deadheading the pump 
+for a couple seconds and it simplifies the programming.
+</p>
+<p>
+For modulating valves, the \"valve commanded open/closed\" condition is
+evaluated without hysteresis because the
+valve command signal is generated by the
+enabling or staging logic and both use minimum runtime conditions.
+Therefore, the valve command signal is not subject to any oscillatory
+behavior.
+</p>
+<h4>References</h4>
+<ul>
+<li id=\"ASHRAE2021\">
+ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
+for HVAC Systems. Atlanta, GA.
+</li>
+</ul>
+</html>"));
+end EnableLeadHeadered;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mo
new file mode 100644
index 00000000000..72d39cf6bca
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mo
@@ -0,0 +1,96 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary.Validation;
+model EnableLeadHeadered
+  "Validation model for the enabling logic of headered primary pumps"
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse u1ValIso[2](
+    period=60 * {20, 30})
+    "Isolation valve command"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered enaSerTwo(
+    typCon=Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Series,
+    typValIso=Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition,
+    nValIso=2)
+    "Enable lead pump - Series piped equipment with two-position isolation valves"
+    annotation (Placement(transformation(extent={{50,-30},{70,-10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[2]
+    "Convert to real"
+    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.LimitSlewRate uValIso[2](
+    each raisingSlewRate=1 / 200)
+    "Compute valve command"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered enaSerMod(
+    typCon=Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Series,
+    typValIso=Buildings.Templates.Plants.Controls.Types.Actuator.Modulating,
+    nValIso=2)
+    "Enable lead pump - Series piped equipment with modulating isolation valves"
+    annotation (Placement(transformation(extent={{50,-70},{70,-50}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered enaParTwo(
+    typCon=Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel,
+    typValIso=Buildings.Templates.Plants.Controls.Types.Actuator.TwoPosition,
+    nValIso=2)
+    "Enable lead pump - Parallel piped equipment with two-position isolation valves"
+    annotation (Placement(transformation(extent={{52,50},{72,70}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered enaParMod(
+    typCon=Buildings.Templates.Plants.Controls.Types.EquipmentConnection.Parallel,
+    typValIso=Buildings.Templates.Plants.Controls.Types.Actuator.Modulating,
+    nValIso=2)
+    "Enable lead pump - Parallel piped equipment with modulating isolation valves"
+    annotation (Placement(transformation(extent={{52,10},{72,30}})));
+equation
+  connect(u1ValIso.y, booToRea.u)
+    annotation (Line(points={{-58,0},{-50,0},{-50,-40},{-42,-40}},color={255,0,255}));
+  connect(booToRea.y, uValIso.u)
+    annotation (Line(points={{-18,-40},{-2,-40}},color={0,0,127}));
+  connect(u1ValIso.y, enaSerTwo.u1ValIso)
+    annotation (Line(points={{-58,0},{40,0},{40,-20},{48,-20}},color={255,0,255}));
+  connect(uValIso.y, enaSerMod.uValIso)
+    annotation (Line(points={{22,-40},{40,-40},{40,-66},{48,-66}},color={0,0,127}));
+  connect(u1ValIso.y, enaParTwo.u1ValIso)
+    annotation (Line(points={{-58,0},{40,0},{40,60},{50,60}},color={255,0,255}));
+  connect(uValIso.y, enaParMod.uValIso)
+    annotation (Line(points={{22,-40},{30,-40},{30,14},{50,14}},color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/EnableLeadHeadered.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=3000.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.EnableLeadHeadered</a>
+in a configuration with two production units, either parallel piped
+or series piped, with either two-position or modulating isolation valves.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end EnableLeadHeadered;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mo
new file mode 100644
index 00000000000..397ff499750
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mo
@@ -0,0 +1,129 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary.Validation;
+model VariableSpeedNoDpControl
+  "Validation model for the control logic of variable speed primary pumps without ∆p control"
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl
+    ctlPumPriHdrHea(
+    have_heaWat=true,
+    have_chiWat=false,
+    have_pumPriHdr=true,
+    nPumHeaWatPri=2,
+    yPumHeaWatPriSet=0.8) "Headered primary pumps – Heating-only plant"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
+    table=[0,0,0; 0.1,1,0; 0.5,1,1; 1,1,1; 1.5,1,1; 2,0,1; 2.5,0,0; 3,0,0],
+    timeScale=300,
+    period=900)
+    "Command signal – Plant, equipment or isolation valve depending on tested configuration"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl ctlPumPriHdr(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumPriHdr=true,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    nPumChiWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9)
+    "Headered primary pumps – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{20,10},{40,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Not u1Coo[2]
+    "Opposite signal to generate cooling system commands"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl ctlPumPriDedCom(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumChiWatPriDed=false,
+    have_pumPriHdr=false,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9)
+    "Common dedicated primary pumps – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+  Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl ctlPumPriDedSep(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_pumChiWatPriDed=true,
+    have_pumPriHdr=false,
+    nEqu=2,
+    nPumHeaWatPri=2,
+    nPumChiWatPri=2,
+    yPumHeaWatPriSet=0.8,
+    yPumChiWatPriSet=0.9)
+    "Separate dedicated primary pumps – Heating and cooling plant"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+equation
+  connect(u1.y,ctlPumPriHdrHea. u1PumHeaWatPri) annotation (Line(points={{-58,0},
+          {-40,0},{-40,66},{18,66}}, color={255,0,255}));
+  connect(u1.y, u1Coo.u)
+    annotation (Line(points={{-58,0},{-32,0}}, color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriHdr.u1PumChiWatPri)
+    annotation (Line(points={{-8,0},{0,0},{0,20},{18,20}}, color={255,0,255}));
+  connect(u1.y, ctlPumPriHdr.u1PumHeaWatPri) annotation (Line(points={{-58,0},{-40,
+          0},{-40,26},{18,26}}, color={255,0,255}));
+  connect(u1.y, ctlPumPriDedCom.u1PumHeaWatPri) annotation (Line(points={{-58,0},
+          {-40,0},{-40,-14},{18,-14}}, color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriDedCom.u1Hea) annotation (Line(points={{-8,0},{0,0},
+          {0,-26},{18,-26}}, color={255,0,255}));
+  connect(u1.y, ctlPumPriDedSep.u1PumHeaWatPri) annotation (Line(points={{-58,0},
+          {-40,0},{-40,-54},{18,-54}},          color={255,0,255}));
+  connect(u1Coo.y, ctlPumPriDedSep.u1PumChiWatPri) annotation (Line(points={{-8,
+          0},{0,0},{0,-60},{18,-60}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Pumps/Primary/Validation/VariableSpeedNoDpControl.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=900.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl\">
+Buildings.Templates.Plants.Controls.Pumps.Primary.VariableSpeedNoDpControl</a>
+with two plant equipment and two primary pumps and for the following configurations.
+</p>
+<ul>
+<li>
+Heating-only plant with headered primary pumps (component <code>ctlPumPriHdrHea</code>)
+</li>
+<li>
+Heating and cooling plant with headered primary pumps (component <code>ctlPumPriHdr</code>)
+</li>
+<li>
+Heating and cooling plant with common dedicated primary pumps (component <code>ctlPumPriDedCom</code>)
+</li>
+<li>
+Heating and cooling plant with separate dedicated primary pumps (component <code>ctlPumPriDedSep</code>)
+</li>
+</ul>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      graphics={
+        Polygon(
+          points={{214,66},{214,66}},
+          lineColor={28,108,200})}));
+end VariableSpeedNoDpControl;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.mo
new file mode 100644
index 00000000000..c10f41cb32a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.mo
@@ -0,0 +1,29 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order
new file mode 100644
index 00000000000..7de919ee9d0
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/Validation/package.order
@@ -0,0 +1,2 @@
+EnableLeadHeadered
+VariableSpeedNoDpControl
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeedNoDpControl.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeedNoDpControl.mo
new file mode 100644
index 00000000000..6001958af8c
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/VariableSpeedNoDpControl.mo
@@ -0,0 +1,281 @@
+within Buildings.Templates.Plants.Controls.Pumps.Primary;
+block VariableSpeedNoDpControl
+  "Variable speed primary pumps without differential pressure control"
+  parameter Boolean have_heaWat
+    "Set to true for plants that provide HW"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Boolean have_chiWat
+    "Set to true for plants that provide CHW"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  final parameter Boolean have_pumHeaWatPri=have_heaWat
+    "Set to true for plants with primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumChiWatPriDed(start=false)
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_chiWat and not have_pumPriHdr));
+  final parameter Boolean have_pumChiWatPri=
+    have_chiWat and (have_pumPriHdr or have_pumChiWatPriDed)
+    "Set to true for plants with separate primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumPriHdr
+    "Set to true for headered primary pumps, false for dedicated pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Integer nEqu(start=0)
+    "Number of equipment"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_heaWat and have_chiWat));
+  parameter Integer nPumHeaWatPri
+    "Number of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration"));
+  parameter Integer nPumChiWatPri(start=if have_chiWat and have_pumChiWatPri
+         then nEqu else 0)
+    "Number of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Plant configuration",
+      enable=have_pumChiWatPri));
+  parameter Real yPumHeaWatPriSet(
+    max=1,
+    min=0,
+    start=1,
+    unit="1")
+    "Primary pump speed providing design heat pump flow in heating mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_heaWat));
+  parameter Real yPumChiWatPriSet(
+    max=1,
+    min=0,
+    start=1,
+    unit="1")
+    "Primary pump speed providing design heat pump flow in cooling mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=have_chiWat));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri[nPumHeaWatPri]
+    if have_heaWat and have_pumHeaWatPri
+    "Primary HW pump start command"
+    annotation (Placement(transformation(extent={{-180,40},{-140,80}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriHdr
+    if have_heaWat and have_pumHeaWatPri and have_pumPriHdr
+    "Headered primary HW pump speed command"
+    annotation (Placement(transformation(extent={{140,80},{180,120}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri[nPumChiWatPri]
+    if have_chiWat and have_pumChiWatPri
+    "Primary CHW pump start command"
+    annotation (Placement(transformation(extent={{-180,-20},{-140,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriHdr
+    if have_chiWat and have_pumChiWatPri and have_pumPriHdr
+    "Headered primary CHW pump speed command"
+    annotation (Placement(transformation(extent={{140,40},{180,80}}),
+      iconTransformation(extent={{100,0},{140,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumHeaWatPriDed[nPumHeaWatPri]
+    if have_heaWat and have_pumHeaWatPri and not have_pumPriHdr
+    "Dedicated primary HW pump speed command"
+    annotation (Placement(transformation(extent={{140,-80},{180,-40}}),
+      iconTransformation(extent={{100,-40},{140,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yPumChiWatPriDed[nPumChiWatPri]
+    if have_chiWat and have_pumChiWatPri and not have_pumPriHdr
+    "Dedicated primary CHW pump speed command"
+    annotation (Placement(transformation(extent={{140,-120},{180,-80}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea[nEqu] if have_heaWat
+     and have_chiWat and not have_pumChiWatPriDed and not have_pumPriHdr
+    "Heating/cooling mode command"
+    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumChiWatPriDed[nPumChiWatPri]
+    if have_chiWat and have_pumChiWatPri and not have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{110,-110},{130,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    final k=0)
+    "Constant"
+    annotation (Placement(transformation(extent={{-110,-90},{-90,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant spePumChiWatPri(
+    final k=yPumChiWatPriSet)
+    if have_chiWat
+    "Constant"
+    annotation (Placement(transformation(extent={{-110,-130},{-90,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumHeaWatPriDed[nPumHeaWatPri]
+    if have_heaWat and have_pumHeaWatPri and not have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
+    nout=nPumHeaWatPri)
+    if have_heaWat and have_pumHeaWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep1(
+    nout=nPumChiWatPri)
+    if have_chiWat and have_pumChiWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-60,-130},{-40,-110}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep2(
+    nout=nPumChiWatPri)
+    if have_chiWat and have_pumChiWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-60,-90},{-40,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant spePumHeaWatPri(
+    final k=yPumHeaWatPriSet)
+    if have_heaWat and have_pumHeaWatPri
+    "Constant"
+    annotation (Placement(transformation(extent={{-110,110},{-90,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumChiWatPriHdr
+    if have_chiWat and have_pumChiWatPri and have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{110,50},{130,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch setPumHeaWatPriHdr
+    if have_heaWat and have_pumHeaWatPri and have_pumPriHdr
+    "Set prescribed speed when pump is enabled"
+    annotation (Placement(transformation(extent={{110,90},{130,110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumChiWatPri(
+    nin=nPumChiWatPri)
+    if have_chiWat and have_pumChiWatPri
+    "Return true if any pump is enabled"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyPumHeaWatPri(
+    nin=nPumHeaWatPri)
+    if have_heaWat and have_pumHeaWatPri
+    "Return true if any pump is enabled"
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch selSpeHea[nPumHeaWatPri] if
+    have_heaWat and have_chiWat and not have_pumChiWatPri and not
+    have_pumPriHdr
+    "Select prescribed pump speed depending on heating/cooling mode – Case with common CHW and HW dedicated pumps"
+    annotation (Placement(transformation(extent={{40,-50},{60,-30}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep3(
+    nout=nPumHeaWatPri)
+    if have_heaWat and have_pumHeaWatPri
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-60,20},{-40,40}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep4(
+    nout=nPumHeaWatPri) if have_heaWat and have_chiWat and not
+    have_pumChiWatPri and not have_pumPriHdr
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-30,2},{-10,22}})));
+  Utilities.PlaceholderReal ph[nPumHeaWatPri](
+    each final have_inp=have_heaWat and have_chiWat and not have_pumChiWatPri
+         and not have_pumPriHdr,
+    each final have_inpPh=false,
+    each final u_internal=yPumHeaWatPriSet)
+    if have_heaWat and have_pumHeaWatPri and not have_pumPriHdr
+    "Always use HW pump speed in case of separate dedicated CHW pumps "
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+equation
+  connect(u1PumChiWatPri, setPumChiWatPriDed.u2)
+    annotation (Line(points={{-160,0},{-126,0},{-126,-100},{108,-100}},color={255,0,255}));
+  connect(setPumChiWatPriDed.y, yPumChiWatPriDed)
+    annotation (Line(points={{132,-100},{160,-100}},color={0,0,127}));
+  connect(setPumHeaWatPriDed.y, yPumHeaWatPriDed)
+    annotation (Line(points={{132,-60},{160,-60}},color={0,0,127}));
+  connect(zer.y, rep.u)
+    annotation (Line(points={{-88,-80},{-70,-80},{-70,-20},{-62,-20}},color={0,0,127}));
+  connect(spePumChiWatPri.y, rep1.u)
+    annotation (Line(points={{-88,-120},{-62,-120}},color={0,0,127}));
+  connect(zer.y, rep2.u)
+    annotation (Line(points={{-88,-80},{-62,-80}},color={0,0,127}));
+  connect(setPumHeaWatPriHdr.y, yPumHeaWatPriHdr)
+    annotation (Line(points={{132,100},{160,100}},color={0,0,127}));
+  connect(setPumChiWatPriHdr.y, yPumChiWatPriHdr)
+    annotation (Line(points={{132,60},{160,60}},color={0,0,127}));
+  connect(rep2.y, setPumChiWatPriDed.u3)
+    annotation (Line(points={{-38,-80},{-20,-80},{-20,-108},{108,-108}},color={0,0,127}));
+  connect(rep1.y, setPumChiWatPriDed.u1)
+    annotation (Line(points={{-38,-120},{80,-120},{80,-92},{108,-92}},color={0,0,127}));
+  connect(zer.y, setPumChiWatPriHdr.u3)
+    annotation (Line(points={{-88,-80},{-70,-80},{-70,52},{108,52}},color={0,0,127}));
+  connect(rep.y, setPumHeaWatPriDed.u3)
+    annotation (Line(points={{-38,-20},{-20,-20},{-20,-68},{108,-68}},color={0,0,127}));
+  connect(zer.y, setPumHeaWatPriHdr.u3)
+    annotation (Line(points={{-88,-80},{-70,-80},{-70,92},{108,92}},color={0,0,127}));
+  connect(spePumChiWatPri.y, setPumChiWatPriHdr.u1)
+    annotation (Line(points={{-88,-120},{-80,-120},{-80,68},{108,68}},color={0,0,127}));
+  connect(u1PumChiWatPri, anyPumChiWatPri.u)
+    annotation (Line(points={{-160,0},{-112,0}},color={255,0,255}));
+  connect(u1PumHeaWatPri, anyPumHeaWatPri.u)
+    annotation (Line(points={{-160,60},{-136,60},{-136,60},{-112,60}},color={255,0,255}));
+  connect(anyPumHeaWatPri.y, setPumHeaWatPriHdr.u2)
+    annotation (Line(points={{-88,60},{60,60},{60,100},{108,100}},color={255,0,255}));
+  connect(spePumHeaWatPri.y, setPumHeaWatPriHdr.u1)
+    annotation (Line(points={{-88,120},{40,120},{40,108},{108,108}},color={0,0,127}));
+  connect(anyPumChiWatPri.y, setPumChiWatPriHdr.u2)
+    annotation (Line(points={{-88,0},{80,0},{80,60},{108,60}},color={255,0,255}));
+  connect(u1PumHeaWatPri, setPumHeaWatPriDed.u2)
+    annotation (Line(points={{-160,60},{-120,60},{-120,-60},{108,-60}},color={255,0,255}));
+  connect(u1Hea, selSpeHea.u2)
+    annotation (Line(points={{-160,-60},{-132,-60},{-132,-40},{38,-40}},color={255,0,255}));
+  connect(spePumHeaWatPri.y, rep3.u)
+    annotation (Line(points={{-88,120},{-84,120},{-84,30},{-62,30}},
+      color={0,0,127}));
+  connect(rep3.y, selSpeHea.u1)
+    annotation (Line(points={{-38,30},{30,30},{30,-32},{38,-32}},color={0,0,127}));
+  connect(rep4.y, selSpeHea.u3)
+    annotation (Line(points={{-8,12},{20,12},{20,-48},{38,-48}},color={0,0,127}));
+  connect(spePumChiWatPri.y, rep4.u)
+    annotation (Line(points={{-88,-120},{-80,-120},{-80,12},{-32,12}},color={0,0,127}));
+  connect(ph.y, setPumHeaWatPriDed.u1) annotation (Line(points={{92,-40},{100,-40},
+          {100,-52},{108,-52}}, color={0,0,127}));
+  connect(selSpeHea.y, ph.u)
+    annotation (Line(points={{62,-40},{68,-40}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="ctlPumPri",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-140,-140},{140,140}})),
+    Documentation(info="<html>
+<h5>
+Heating-only plants with variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint
+</h5>
+<p>
+When commanded on, the primary HW pumps are commanded at a fixed
+speed <code>yPumHeaWatPriSet</code>, as determined during the Testing, Adjusting, 
+and Balancing phase to provide the design heat pump flow.
+</p>
+<h5>
+Heating and cooling plants with common variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint
+</h5>
+<p>
+When commanded on, the primary pumps are commanded at a fixed
+speed <code>yPumHeaWatPriSet</code> in heating mode or 
+<code>yPumChiWatPriSet</code> in cooling mode, as determined during the
+Testing, Adjusting, and Balancing phase to provide the design heat pump flow
+in heating mode or cooling mode.
+</p>
+<h5>
+Heating and cooling plants with separate variable speed primary pumps that are not controlled to maintain differential pressure or flow setpoint
+</h5>
+<p>
+When commanded on, the primary HW pumps are commanded at a fixed
+speed <code>yPumHeaWatPriSet</code>.
+When commanded on, the primary CHW pumps are commanded at a fixed
+speed <code>yPumChiWatPriSet</code>.
+The pump speed <code>yPumHeaWatPriSet</code> or <code>yPumChiWatPriSet</code> 
+is determined during the Testing, Adjusting, and Balancing phase to provide 
+the design heat pump flow in heating mode or cooling mode.
+</p>
+</html>"));
+end VariableSpeedNoDpControl;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/package.mo b/Buildings/Templates/Plants/Controls/Pumps/Primary/package.mo
new file mode 100644
index 00000000000..bf4fbb8346b
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/package.mo
@@ -0,0 +1,8 @@
+within Buildings.Templates.Plants.Controls.Pumps;
+package Primary "Sequences for primary pumps"
+  annotation (Documentation(info="<html>
+<p>
+This package contains control sequences for primary pumps.
+</p>
+</html>"));
+end Primary;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order b/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order
new file mode 100644
index 00000000000..f1ce062b461
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/Primary/package.order
@@ -0,0 +1,3 @@
+EnableLeadHeadered
+VariableSpeedNoDpControl
+Validation
diff --git a/Buildings/Templates/Plants/Controls/Pumps/package.mo b/Buildings/Templates/Plants/Controls/Pumps/package.mo
new file mode 100644
index 00000000000..c0a653e65ea
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/package.mo
@@ -0,0 +1,43 @@
+within Buildings.Templates.Plants.Controls;
+package Pumps "Package of sequences for primary and secondary pumps"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}), Documentation(info="<html>
+<p>
+This package contains control sequences for HW and CHW pumps.
+</p>
+</html>"));
+end Pumps;
diff --git a/Buildings/Templates/Plants/Controls/Pumps/package.order b/Buildings/Templates/Plants/Controls/Pumps/package.order
new file mode 100644
index 00000000000..67246907683
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Pumps/package.order
@@ -0,0 +1,2 @@
+Generic
+Primary
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo b/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo
new file mode 100644
index 00000000000..b62059f874e
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Setpoints/PlantReset.mo
@@ -0,0 +1,261 @@
+within Buildings.Templates.Plants.Controls.Setpoints;
+block PlantReset
+  "Plant reset logic"
+  parameter Integer nSenDpRem(final min=1)
+    "Number of remote loop differential pressure sensors used for pump speed control"
+    annotation (Evaluate=true);
+  parameter Real dpSet_max[nSenDpRem](
+    each final min=5*6894,
+    each unit="Pa")
+    "Maximum differential pressure setpoint";
+  parameter Real dpSet_min(
+    final min=0,
+    final unit="Pa")=5*6894
+    "Minimum value to which the differential pressure can be reset";
+  parameter Real TSup_nominal(
+    final min=273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Design supply temperature";
+  parameter Real TSupSetLim(
+    final min=273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Limit value to which the supply temperature can be reset";
+  parameter Real dtHol(
+    final min=0,
+    final unit="s")=900
+    "Minimum hold time during stage change"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real resDp_max(
+    final max=1,
+    final min=0,
+    final unit="1")=0.5
+    "Upper limit of plant reset interval for differential pressure reset"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real resTSup_min(
+    final max=1,
+    final min=0,
+    final unit="1")=resDp_max
+    "Lower limit of plant reset interval for supply temperature reset"
+    annotation (Dialog(tab="Advanced"));
+  parameter Real res_init(
+    final max=1,
+    final min=0,
+    final unit="1")=1
+    "Initial reset value"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real res_min(
+    final max=1,
+    final min=0,
+    final unit="1")=0
+    "Minimum reset value"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real res_max(
+    final max=1,
+    final min=0,
+    final unit="1")=1
+    "Maximum reset value"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real dtDel(
+    final min=100*1E-15,
+    final unit="s")=900
+    "Delay time before the reset begins"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real dtRes(
+    final min=1E-3,
+    final unit="s")=300
+    "Sample period of component"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Integer nReqResIgn(min=0)=2
+    "Number of ignored requests"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real tri(
+    final max=0,
+    final unit="1")=-0.02
+    "Trim amount"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real rsp(
+    final min=0,
+    final unit="1")=0.03
+    "Respond amount (must have opposite sign of trim amount)"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  parameter Real rsp_max(
+    final min=0,
+    final unit="1")=0.07
+    "Maximum response per reset period (must have same sign as respond amount)"
+    annotation (Dialog(tab="Advanced",group="Trim and respond"));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput nReqRes
+    "Sum of reset requests of all loads served"
+    annotation (Placement(transformation(extent={{-200,120},{-160,160}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Ena
+    "Plant enable"
+    annotation (Placement(transformation(extent={{-200,80},{-160,120}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1StaPro
+    "Staging process in progress"
+    annotation (Placement(transformation(extent={{-200,20},{-160,60}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Supply temperature setpoint"
+    annotation (Placement(transformation(extent={{160,-120},{200,-80}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput dpSet[nSenDpRem](
+    each final min=0,
+    each final unit="Pa")
+    "Differential pressure setpoint"
+    annotation (Placement(transformation(extent={{160,-40},{200,0}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.ASHRAE.G36.Generic.TrimAndRespond triRes(
+    final delTim=dtDel,
+    final iniSet=res_init,
+    final maxRes=rsp_max,
+    final maxSet=res_max,
+    final minSet=res_min,
+    final numIgnReq=nReqResIgn,
+    final resAmo=rsp,
+    final samplePeriod=dtRes,
+    final triAmo=tri)
+    "Compute plant reset with trim and respond logic "
+    annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
+    final duration=dtHol)
+    "Hold true value of input signal for given time"
+    annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
+  Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam
+    "Fixed value at stage change"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch res
+    "Switch between actual and fixed value to compute actual reset"
+    annotation (Placement(transformation(extent={{30,50},{50,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Line resTSup
+    "Supply temperature reset"
+    annotation (Placement(transformation(extent={{120,-110},{140,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Line resDp[nSenDpRem]
+    "Differential pressure reset"
+    annotation (Placement(transformation(extent={{120,-30},{140,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant zer(
+    final k=0)
+    "Constant"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant one(
+    final k=1)
+    "Constant"
+    annotation (Placement(transformation(extent={{-10,-130},{10,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant resDpMax(
+    final k=resDp_max)
+    "Constant"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep(
+    final nout=nSenDpRem)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep1(
+    final nout=nSenDpRem)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep2(
+    final nout=nSenDpRem)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpSetMax[nSenDpRem](
+    final k=dpSet_max)
+    "Constant"
+    annotation (Placement(transformation(extent={{-90,-70},{-70,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant resTSupMin(
+    final k=resTSup_min)
+    "Constant"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSetNom(
+    final k=TSup_nominal)
+    "Constant"
+    annotation (Placement(transformation(extent={{-90,-150},{-70,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant dpSetMin(
+    final k=dpSet_min)
+    "Constant"
+    annotation (Placement(transformation(extent={{-90,10},{-70,30}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator rep3(
+    final nout=nSenDpRem)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-50,10},{-30,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSetMinMax(final k=
+        TSupSetLim) "Constant"
+    annotation (Placement(transformation(extent={{-90,-110},{-70,-90}})));
+equation
+  connect(u1StaPro, truHol.u)
+    annotation (Line(points={{-180,40},{-132,40}},color={255,0,255}));
+  connect(triRes.y, triSam.u)
+    annotation (Line(points={{-28,100},{-12,100}},color={0,0,127}));
+  connect(u1StaPro, triSam.trigger)
+    annotation (Line(points={{-180,40},{-140,40},{-140,80},{0,80},{0,88}},color={255,0,255}));
+  connect(truHol.y, res.u2)
+    annotation (Line(points={{-108,40},{20,40},{20,60},{28,60}},color={255,0,255}));
+  connect(triSam.y, res.u1)
+    annotation (Line(points={{12,100},{20,100},{20,68},{28,68}},color={0,0,127}));
+  connect(triRes.y, res.u3)
+    annotation (Line(points={{-28,100},{-20,100},{-20,52},{28,52}},color={0,0,127}));
+  connect(nReqRes, triRes.numOfReq)
+    annotation (Line(points={{-180,140},{-80,140},{-80,92},{-52,92}},color={255,127,0}));
+  connect(resTSup.y, TSupSet)
+    annotation (Line(points={{142,-100},{180,-100}},color={0,0,127}));
+  connect(resDp.y, dpSet)
+    annotation (Line(points={{142,-20},{180,-20}},color={0,0,127}));
+  connect(one.y, resTSup.x2)
+    annotation (Line(points={{12,-120},{100,-120},{100,-104},{118,-104}},color={0,0,127}));
+  connect(res.y, resTSup.u)
+    annotation (Line(points={{52,60},{104,60},{104,-100},{118,-100}},color={0,0,127}));
+  connect(zer.y, rep.u)
+    annotation (Line(points={{12,0},{28,0}},color={0,0,127}));
+  connect(rep.y, resDp.x1)
+    annotation (Line(points={{52,0},{80,0},{80,-12},{118,-12}},color={0,0,127}));
+  connect(res.y, rep1.u)
+    annotation (Line(points={{52,60},{60,60},{60,40},{68,40}},color={0,0,127}));
+  connect(rep1.y, resDp.u)
+    annotation (Line(points={{92,40},{100,40},{100,-20},{118,-20}},color={0,0,127}));
+  connect(rep2.y, resDp.x2)
+    annotation (Line(points={{52,-40},{80,-40},{80,-24},{118,-24}},color={0,0,127}));
+  connect(dpSetMax.y, resDp.f2)
+    annotation (Line(points={{-68,-60},{100,-60},{100,-28},{118,-28}},color={0,0,127}));
+  connect(TSupSetNom.y, resTSup.f2)
+    annotation (Line(points={{-68,-140},{104,-140},{104,-108},{118,-108}},color={0,0,127}));
+  connect(dpSetMin.y, rep3.u)
+    annotation (Line(points={{-68,20},{-52,20}},color={0,0,127}));
+  connect(rep3.y, resDp.f1)
+    annotation (Line(points={{-28,20},{76,20},{76,-16},{118,-16}},color={0,0,127}));
+  connect(TSupSetMinMax.y, resTSup.f1)
+    annotation (Line(points={{-68,-100},{80,-100},{80,-96},{118,-96}},color={0,0,127}));
+  connect(resTSupMin.y, resTSup.x1)
+    annotation (Line(points={{12,-80},{80,-80},{80,-92},{118,-92}},color={0,0,127}));
+  connect(resDpMax.y, rep2.u)
+    annotation (Line(points={{12,-40},{28,-40}},color={0,0,127}));
+  connect(u1Ena, triRes.uDevSta) annotation (Line(points={{-180,100},{-60,100},
+          {-60,108},{-52,108}}, color={255,0,255}));
+  annotation (
+    defaultComponentName="res",
+    Icon(
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-160,-160},{160,160}})),
+    Documentation(info="<html>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PlantReset;
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mo b/Buildings/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mo
new file mode 100644
index 00000000000..049ec3b6d6c
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mo
@@ -0,0 +1,97 @@
+within Buildings.Templates.Plants.Controls.Setpoints.Validation;
+model PlantReset
+  Buildings.Templates.Plants.Controls.Setpoints.PlantReset res(
+    nSenDpRem=2,
+    dpSet_max={5E4,8E4},
+    TSup_nominal=323.15,
+    TSupSetLim=298.15,
+    resDp_max=0.75,
+    resTSup_min=0.25) "Plant reset"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger reaToInt
+    "Convert real to integer"
+    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable ena(
+    table=[
+      0, 0;
+      2, 1;
+      19, 0],
+    timeScale=1000,
+    final period=20000)
+    "Plant enable"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable timTabLin(
+    final smoothness=Buildings.Controls.OBC.CDL.Types.Smoothness.ConstantSegments,
+    final table=[
+      0, 0;
+      150, 0;
+      300, 0;
+      450, 0;
+      600, 0;
+      750, 0;
+      900, 0;
+      1050, 0;
+      1200, 4;
+      1350, 3;
+      1500, 2;
+      1650, 1;
+      1800, 0],
+    timeScale=10)
+    "Time table with smoothness method of constant segments"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse staPro(
+    width=0.1,
+    final period=8000,
+    shift=2000)
+    "Staging process in progress"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+equation
+  connect(timTabLin.y[1], reaToInt.u)
+    annotation (Line(points={{-58,40},{-42,40}},color={0,0,127}));
+  connect(reaToInt.y,res.nReqRes)
+    annotation (Line(points={{-18,40},{0,40},{0,6},{18,6}},color={255,127,0}));
+  connect(staPro.y, res.u1StaPro)
+    annotation (Line(points={{-58,-40},{0,-40},{0,-6},{18,-6}},color={255,0,255}));
+  connect(ena.y[1], res.u1Ena)
+    annotation (Line(points={{-58,0},{18,0}},color={255,0,255}));
+  annotation (
+    experiment(
+      StopTime=20000.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Setpoints/Validation/PlantReset.mos"
+        "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Setpoints.PlantReset\">
+Buildings.Templates.Plants.Controls.Setpoints.PlantReset</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)));
+end PlantReset;
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/Validation/package.mo b/Buildings/Templates/Plants/Controls/Setpoints/Validation/package.mo
new file mode 100644
index 00000000000..8ebc63da230
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Setpoints/Validation/package.mo
@@ -0,0 +1,29 @@
+within Buildings.Templates.Plants.Controls.Setpoints;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/Validation/package.order b/Buildings/Templates/Plants/Controls/Setpoints/Validation/package.order
new file mode 100644
index 00000000000..f8522085d40
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Setpoints/Validation/package.order
@@ -0,0 +1 @@
+PlantReset
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/package.mo b/Buildings/Templates/Plants/Controls/Setpoints/package.mo
new file mode 100644
index 00000000000..8e7dcd0d270
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Setpoints/package.mo
@@ -0,0 +1,27 @@
+within Buildings.Templates.Plants.Controls;
+package Setpoints "Plant reset logic"
+  annotation (
+    preferredView="info",
+    Documentation(
+      info="<html>
+<p>
+This package contains plant reset sequences.
+</p>
+</html>"),
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Text(
+          extent={{-100,100},{100,-100}},
+          textColor={0,0,0},
+          textString="S")}));
+end Setpoints;
diff --git a/Buildings/Templates/Plants/Controls/Setpoints/package.order b/Buildings/Templates/Plants/Controls/Setpoints/package.order
new file mode 100644
index 00000000000..e6f148a661f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Setpoints/package.order
@@ -0,0 +1,2 @@
+PlantReset
+Validation
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo
new file mode 100644
index 00000000000..c22062208e8
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentAvailability.mo
@@ -0,0 +1,239 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block EquipmentAvailability
+  "Equipment availability for heating and cooling applications"
+  parameter Boolean have_heaWat
+    "Set to true for plants that provide HW"
+    annotation (Evaluate=true);
+  parameter Boolean have_chiWat
+    "Set to true for plants that provide CHW"
+    annotation (Evaluate=true);
+  parameter Real dtOff(
+    final min=0,
+    final unit="s")=900
+    "Off time required before equipment is deemed available again";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{-240,-20},{-200,20}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Hea
+    if have_heaWat
+    "Equipment available for heating"
+    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    if have_heaWat and have_chiWat
+    "Equipment operating mode command"
+    annotation (Placement(transformation(extent={{-240,-140},{-200,-100}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Coo
+    if have_chiWat
+    "Equipment available for cooling"
+    annotation (Placement(transformation(extent={{200,-140},{240,-100}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Logical.And onAndHea
+    "Return true if equipment on and in heating mode"
+    annotation (Placement(transformation(extent={{-110,-150},{-90,-130}})));
+  Buildings.Controls.OBC.CDL.Logical.And onAndCoo
+    "Return true if equipment on and in cooling mode"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not coo
+    "Return true if equipment in cooling mode"
+    annotation (Placement(transformation(extent={{-150,-110},{-130,-90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Ava
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-240,-80},{-200,-40}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Utilities.PlaceholderLogical phHea(final have_inp=have_heaWat and have_chiWat,
+      final u_internal=have_heaWat or not have_chiWat)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{-190,-130},{-170,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Not off
+    "Return true if equipment is off"
+    annotation (Placement(transformation(extent={{-150,-50},{-130,-30}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    annotation (Placement(transformation(extent={{-160,160},{-140,180}})));
+  Modelica.StateGraph.StepWithSignal onHea(
+    nOut=2,
+    nIn=1)
+    annotation (Placement(transformation(extent={{10,150},{30,170}})));
+  Modelica.StateGraph.InitialStepWithSignal avaMod(
+    nOut=3,
+    nIn=2)
+    "Initial state – Equipment available for all modes"
+    annotation (Placement(transformation(extent={{-70,150},{-50,170}})));
+  Modelica.StateGraph.TransitionWithSignal trnToOff
+    "Transition to off state"
+    annotation (Placement(transformation(extent={{50,150},{70,170}})));
+  Modelica.StateGraph.StepWithSignal onCoo(
+    nOut=2,
+    nIn=1)
+    annotation (Placement(transformation(extent={{70,110},{90,130}})));
+  Modelica.StateGraph.TransitionWithSignal trnToCoo
+    "Transition to cooling mode"
+    annotation (Placement(transformation(extent={{-10,110},{10,130}})));
+  Modelica.StateGraph.TransitionWithSignal trnToHea
+    "Transition to heating mode"
+    annotation (Placement(transformation(extent={{-30,150},{-10,170}})));
+  Modelica.StateGraph.TransitionWithSignal trnToOff1
+    "Transition to off state"
+    annotation (Placement(transformation(extent={{110,110},{130,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Or avaAllHea
+    "Return true if equipment available for all modes or in heating mode"
+    annotation (Placement(transformation(extent={{150,-10},{170,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Or avaAllCoo
+    "Return true if equipment available for all modes or in cooling mode"
+    annotation (Placement(transformation(extent={{170,-130},{190,-110}})));
+  Modelica.StateGraph.Step offSta(
+    nOut=1,
+    nIn=2)
+    "Off state"
+    annotation (Placement(transformation(extent={{140,130},{160,150}})));
+  Modelica.StateGraph.Transition trnToAvaTim(
+    enableTimer=true,
+    final waitTime=dtOff)
+    "Transition back to available state after off time elapsed"
+    annotation (Placement(transformation(extent={{160,170},{140,190}})));
+  Modelica.StateGraph.Step unaSta(
+    nOut=1,
+    nIn=3)
+    "Unavailable state"
+    annotation (Placement(transformation(extent={{140,90},{160,110}})));
+  Modelica.StateGraph.TransitionWithSignal trnToUna
+    "Transition to unavailable state"
+    annotation (Placement(transformation(extent={{-36,70},{-16,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Not una
+    "Return true if equipment is unavailable"
+    annotation (Placement(transformation(extent={{-110,-90},{-90,-70}})));
+  Modelica.StateGraph.TransitionWithSignal trnToAva
+    "Transition back to available state"
+    annotation (Placement(transformation(extent={{170,90},{190,110}})));
+  Modelica.StateGraph.TransitionWithSignal trnToUna2
+    "Transition to unavailable state"
+    annotation (Placement(transformation(extent={{30,90},{50,110}})));
+  Modelica.StateGraph.TransitionWithSignal trnToUna3
+    "Transition to unavailable state"
+    annotation (Placement(transformation(extent={{90,70},{110,90}})));
+equation
+  connect(coo.y, onAndCoo.u2)
+    annotation (Line(points={{-128,-100},{-116,-100},{-116,-8},{-112,-8}},color={255,0,255}));
+  connect(u1, onAndHea.u1)
+    annotation (Line(points={{-220,0},{-120,0},{-120,-140},{-112,-140}},color={255,0,255}));
+  connect(u1, onAndCoo.u1)
+    annotation (Line(points={{-220,0},{-112,0}},color={255,0,255}));
+  connect(u1Hea, phHea.u)
+    annotation (Line(points={{-220,-120},{-192,-120}}, color={255,0,255}));
+  connect(phHea.y, onAndHea.u2) annotation (Line(points={{-168,-120},{-140,-120},
+          {-140,-148},{-112,-148}}, color={255,0,255}));
+  connect(phHea.y, coo.u) annotation (Line(points={{-168,-120},{-160,-120},{-160,
+          -100},{-152,-100}}, color={255,0,255}));
+  connect(u1, off.u)
+    annotation (Line(points={{-220,0},{-160,0},{-160,-40},{-152,-40}},color={255,0,255}));
+  connect(avaMod.outPort[1], trnToCoo.inPort)
+    annotation (Line(points={{-49.5,159.833},{-40,159.833},{-40,120},{-4,120}},
+      color={0,0,0}));
+  connect(onAndCoo.y, trnToCoo.condition)
+    annotation (Line(points={{-88,0},{-80,0},{-80,40},{0,40},{0,108}},color={255,0,255}));
+  connect(onHea.outPort[1], trnToOff.inPort)
+    annotation (Line(points={{30.5,159.875},{44,159.875},{44,160},{56,160}},
+      color={0,0,0}));
+  connect(off.y, trnToOff.condition)
+    annotation (Line(points={{-128,-40},{60,-40},{60,148}},color={255,0,255}));
+  connect(onCoo.outPort[1], trnToOff1.inPort)
+    annotation (Line(points={{90.5,119.875},{104,119.875},{104,120},{116,120}},
+      color={0,0,0}));
+  connect(trnToCoo.outPort, onCoo.inPort[1])
+    annotation (Line(points={{1.5,120},{69,120}},color={0,0,0}));
+  connect(onAndHea.y, trnToHea.condition)
+    annotation (Line(points={{-88,-140},{-20,-140},{-20,148}},color={255,0,255}));
+  connect(avaMod.outPort[2], trnToHea.inPort)
+    annotation (Line(points={{-49.5,160},{-24,160}},color={0,0,0}));
+  connect(avaMod.active, avaAllHea.u1)
+    annotation (Line(points={{-60,149},{-60,0},{148,0}},color={255,0,255}));
+  connect(onHea.active, avaAllHea.u2)
+    annotation (Line(points={{20,149},{20,-8},{148,-8}},color={255,0,255}));
+  connect(avaAllHea.y, y1Hea)
+    annotation (Line(points={{172,0},{220,0}},color={255,0,255}));
+  connect(avaAllCoo.y, y1Coo)
+    annotation (Line(points={{192,-120},{220,-120}},color={255,0,255}));
+  connect(off.y, trnToOff1.condition)
+    annotation (Line(points={{-128,-40},{120,-40},{120,108}},color={255,0,255}));
+  connect(trnToHea.outPort, onHea.inPort[1])
+    annotation (Line(points={{-18.5,160},{9,160}},color={0,0,0}));
+  connect(offSta.outPort[1], trnToAvaTim.inPort)
+    annotation (Line(points={{160.5,140},{170,140},{170,180},{154,180}},color={0,0,0}));
+  connect(trnToOff.outPort, offSta.inPort[1])
+    annotation (Line(points={{61.5,160},{130,160},{130,139.75},{139,139.75}},
+      color={0,0,0}));
+  connect(trnToOff1.outPort, offSta.inPort[2])
+    annotation (Line(points={{121.5,120},{130,120},{130,140},{134,140},{134,140.25},{139,140.25}},
+      color={0,0,0}));
+  connect(trnToAvaTim.outPort, avaMod.inPort[1])
+    annotation (Line(points={{148.5,180},{-80,180},{-80,159.75},{-71,159.75}},
+      color={0,0,0}));
+  connect(u1Ava, una.u)
+    annotation (Line(points={{-220,-60},{-140,-60},{-140,-80},{-112,-80}},color={255,0,255}));
+  connect(avaMod.outPort[3], trnToUna.inPort)
+    annotation (Line(points={{-49.5,160.167},{-49.5,160},{-40,160},{-40,80},{
+          -30,80}},
+      color={0,0,0}));
+  connect(una.y, trnToUna.condition)
+    annotation (Line(points={{-88,-80},{-26,-80},{-26,68}},color={255,0,255}));
+  connect(trnToUna.outPort, unaSta.inPort[1])
+    annotation (Line(points={{-24.5,80},{50,80},{50,99.6667},{139,99.6667}},
+      color={0,0,0}));
+  connect(unaSta.outPort[1], trnToAva.inPort)
+    annotation (Line(points={{160.5,100},{176,100}},color={0,0,0}));
+  connect(u1Ava, trnToAva.condition)
+    annotation (Line(points={{-220,-60},{180,-60},{180,88}},color={255,0,255}));
+  connect(trnToAva.outPort, avaMod.inPort[2])
+    annotation (Line(points={{181.5,100},{190,100},{190,190},{-90,190},{-90,160.25},{-71,160.25}},
+      color={0,0,0}));
+  connect(avaMod.active, avaAllCoo.u1)
+    annotation (Line(points={{-60,149},{-60,-120},{168,-120}},color={255,0,255}));
+  connect(onCoo.active, avaAllCoo.u2)
+    annotation (Line(points={{80,109},{80,-128},{168,-128}},color={255,0,255}));
+  connect(onHea.outPort[2], trnToUna2.inPort)
+    annotation (Line(points={{30.5,160.125},{32,160.125},{32,100},{36,100}},
+      color={0,0,0}));
+  connect(trnToUna2.outPort, unaSta.inPort[2])
+    annotation (Line(points={{41.5,100},{90,100},{90,100},{139,100}},color={0,0,0}));
+  connect(una.y, trnToUna2.condition)
+    annotation (Line(points={{-88,-80},{40,-80},{40,88}},color={255,0,255}));
+  connect(onCoo.outPort[2], trnToUna3.inPort)
+    annotation (Line(points={{90.5,120.125},{92,120.125},{92,80},{96,80}},color={0,0,0}));
+  connect(trnToUna3.outPort, unaSta.inPort[3])
+    annotation (Line(points={{101.5,80},{130,80},{130,100.333},{139,100.333}},
+      color={0,0,0}));
+  connect(una.y, trnToUna3.condition)
+    annotation (Line(points={{-88,-80},{100,-80},{100,68}},color={255,0,255}));
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="avaHeaCoo",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-200,-200},{200,200}})),
+    Documentation(
+      info="<html>
+<p>
+If a heat pump is commanded enabled in either heating or cooling mode, 
+it is removed from the staging order of the opposite mode until it has 
+been off for <code>dtOff</code>.
+</p>
+</html>"));
+end EquipmentAvailability;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo
new file mode 100644
index 00000000000..b98bbce7707
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/EquipmentEnable.mo
@@ -0,0 +1,308 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block EquipmentEnable
+  "Return array of equipment to be enabled at given stage"
+  parameter Real staEqu[:,:](
+    each unit="1",
+    each min=0,
+    each max=1)
+    "Staging matrix – Equipment required for each stage"
+    annotation (Evaluate=true);
+  final parameter Integer nEquAlt=max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1
+    then 1 else 0) for j in 1:nEqu}) for i in 1:nSta})
+    "Number of lead/lag alternate equipment"
+    annotation (Evaluate=true);
+  final parameter Integer nSta=size(staEqu, 1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  final parameter Integer nEqu=size(staEqu, 2)
+    "Number of equipment"
+    annotation (Evaluate=true);
+  final parameter Real traStaEqu[nEqu, nSta]={{staEqu[i, j] for i in 1:nSta} for j in 1:nEqu}
+    "Transpose of staging matrix";
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uIdxAltSor[nEquAlt]
+    "Indices of lead/lag alternate equipment sorted by increasing runtime"
+    annotation (Placement(transformation(extent={{-240,80},{-200,120}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uSta
+    "Stage index"
+    annotation (Placement(transformation(extent={{-240,-20},{-200,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Ava[nEqu]
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-240,-100},{-200,-60}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant traMatStaEqu[nEqu, nSta](
+    final k=traStaEqu)
+    "Transpose of staging matrix"
+    annotation (Placement(transformation(extent={{-190,70},{-170,90}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nEqu]
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractor reqEquSta[nEqu](
+    each final nin=nSta)
+    "Extract equipment required at given stage"
+    annotation (Placement(transformation(extent={{-160,70},{-140,90}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep(
+    final nout=nEqu)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum nEquStaRea(
+    nin=nEqu)
+    "Return the number of equipment required"
+    annotation (Placement(transformation(extent={{-60,70},{-40,90}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isReq[nEqu](
+    each final t=0.99)
+    "Return true if equipment required without lead/lag alternate"
+    annotation (Placement(transformation(extent={{-60,-50},{-40,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.And isReqAva[nEqu]
+    "Return true if equipment required without lead/lag alternate and available"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isReqPosAlt[nEqu](
+      each final t=1E-4)
+    "Return true if equipment required (with or without lead/lag alternate)"
+    annotation (Placement(transformation(extent={{-60,30},{-40,50}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold isNotReqNoAlt[nEqu](
+      each final t=0.9999)
+    "Return true if equipment not required or required with lead/lag alternate"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd isReqAltAva[nEqu](
+    each final nin=3)
+    "Return true if lead/lag alternate equipment required and available"
+    annotation (Placement(transformation(extent={{-10,30},{10,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Or ena[nEqu]
+    "Enable equipment required without lead/lag alternate and available or lead/lag alternate equipment to meet stage requirement"
+    annotation (Placement(transformation(extent={{110,-10},{130,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger nEquSta
+    "Number of equipment required"
+    annotation (Placement(transformation(extent={{-10,70},{10,90}})));
+  Buildings.Controls.OBC.CDL.Integers.Subtract nAltReq
+    "Number of lead/lag alternate equipment to run to meet stage requirement"
+    annotation (Placement(transformation(extent={{60,30},{80,50}})));
+  Buildings.Controls.OBC.CDL.Logical.And isReqAltAvaNee[nEqu]
+    "Return true if equipment required with lead/lag alternate and available and needed to meet stage requirement"
+    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Change cha
+    "Detect stage index change"
+    annotation (Placement(transformation(extent={{30,-70},{50,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Pre y1Pre[nEqu]
+    "Left limit of signal in discrete time"
+    annotation (Placement(transformation(extent={{180,-70},{160,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Switch logSwi[nEqu]
+    "Switch to newly computed value at stage change"
+    annotation (Placement(transformation(extent={{160,-10},{180,10}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator booScaRep(
+    final nout=nEqu)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
+  Utilities.CountTrue nReq(
+    nin=nEqu)
+    "Count the number of required equipment without lead/lag alternate, not necessarily available"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Utilities.CountTrue nEnaAvaPre(
+    nin=nEqu)
+    "Count the number of previously enabled equipment that are available"
+    annotation (Placement(transformation(extent={{100,-110},{80,-90}})));
+  Buildings.Controls.OBC.CDL.Integers.Less intLes
+    "Compare to required number of equipment"
+    annotation (Placement(transformation(extent={{30,-110},{50,-90}})));
+  Buildings.Controls.OBC.CDL.Logical.Or swiEna
+    "Evaluate condition to switch to newly computed enable signal"
+    annotation (Placement(transformation(extent={{80,-70},{100,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.And isEnaPreAva[nEqu]
+    "Return true if equipment previously enabled and available"
+    annotation (Placement(transformation(extent={{130,-110},{110,-90}})));
+  Utilities.TrueArrayConditional truArrCon(
+    final nout=nEqu,
+    final nin=nEquAlt)
+    "Generate array of size nEqu with nAltReq true elements at uIdxAltSor indices "
+    annotation (Placement(transformation(extent={{100,30},{120,50}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant one(
+    final k=1)
+    "Constant"
+    annotation (Placement(transformation(extent={{-190,10},{-170,30}})));
+  Buildings.Controls.OBC.CDL.Integers.Max maxInt
+    "Maximum between stage index and 1"
+    annotation (Placement(transformation(extent={{-160,-10},{-140,10}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterThreshold greZer(
+    final t=0)
+    "Check if stage index is greater than zero"
+    annotation (Placement(transformation(extent={{-170,-50},{-150,-30}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea(
+    final realTrue=1,
+    final realFalse=0)
+    "Cast to real"
+    annotation (Placement(transformation(extent={{-140,-50},{-120,-30}})));
+  Buildings.Controls.OBC.CDL.Routing.RealScalarReplicator reaScaRep(
+    final nout=nEqu)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply voiStaZer[nEqu]
+    "Void if stage is equal to zero"
+    annotation (Placement(transformation(extent={{-100,70},{-80,90}})));
+equation
+  connect(intScaRep.y, reqEquSta.index)
+    annotation (Line(points={{-108,0},{-100,0},{-100,60},{-150,60},{-150,68}},
+      color={255,127,0}));
+  connect(traMatStaEqu.y, reqEquSta.u)
+    annotation (Line(points={{-168,80},{-162,80}},color={0,0,127}));
+  connect(isReq.y, isReqAva.u1)
+    annotation (Line(points={{-38,-40},{-12,-40}},color={255,0,255}));
+  connect(u1Ava, isReqAva.u2)
+    annotation (Line(points={{-220,-80},{-30,-80},{-30,-48},{-12,-48}},color={255,0,255}));
+  connect(isReqPosAlt.y, isReqAltAva.u[1])
+    annotation (Line(points={{-38,40},{-30,40},{-30,37.6667},{-12,37.6667}},
+      color={255,0,255}));
+  connect(isNotReqNoAlt.y, isReqAltAva.u[2])
+    annotation (Line(points={{-38,0},{-32,0},{-32,40},{-12,40}},color={255,0,255}));
+  connect(u1Ava, isReqAltAva.u[3])
+    annotation (Line(points={{-220,-80},{-30,-80},{-30,42.3333},{-12,42.3333}},
+      color={255,0,255}));
+  connect(isReqAva.y, ena.u2)
+    annotation (Line(points={{12,-40},{104,-40},{104,-8},{108,-8}},color={255,0,255}));
+  connect(nEquStaRea.y, nEquSta.u)
+    annotation (Line(points={{-38,80},{-12,80}},color={0,0,127}));
+  connect(nEquSta.y, nAltReq.u1)
+    annotation (Line(points={{12,80},{50,80},{50,46},{58,46}},color={255,127,0}));
+  connect(isReqAltAva.y, isReqAltAvaNee.u2)
+    annotation (Line(points={{12,40},{30,40},{30,-8},{78,-8}},color={255,0,255}));
+  connect(isReqAltAvaNee.y, ena.u1)
+    annotation (Line(points={{102,0},{108,0}},color={255,0,255}));
+  connect(uSta, cha.u)
+    annotation (Line(points={{-220,0},{-190,0},{-190,-60},{28,-60}},color={255,127,0}));
+  connect(logSwi.y, y1)
+    annotation (Line(points={{182,0},{220,0}},color={255,0,255}));
+  connect(y1, y1Pre.u)
+    annotation (Line(points={{220,0},{190,0},{190,-60},{182,-60}},color={255,0,255}));
+  connect(y1Pre.y, logSwi.u3)
+    annotation (Line(points={{158,-60},{150,-60},{150,-8},{158,-8}},color={255,0,255}));
+  connect(ena.y, logSwi.u1)
+    annotation (Line(points={{132,0},{138,0},{138,8},{158,8}},color={255,0,255}));
+  connect(booScaRep.y, logSwi.u2)
+    annotation (Line(points={{132,-60},{144,-60},{144,0},{158,0}},color={255,0,255}));
+  connect(nReq.y, nAltReq.u2)
+    annotation (Line(points={{12,0},{50,0},{50,34},{58,34}},color={255,127,0}));
+  connect(isReq.y, nReq.u1)
+    annotation (Line(points={{-38,-40},{-20,-40},{-20,0},{-12,0}},color={255,0,255}));
+  connect(nEnaAvaPre.y, intLes.u1)
+    annotation (Line(points={{78,-100},{70,-100},{70,-84},{24,-84},{24,-100},{28,-100}},
+      color={255,127,0}));
+  connect(nEquSta.y, intLes.u2)
+    annotation (Line(points={{12,80},{20,80},{20,-108},{28,-108}},color={255,127,0}));
+  connect(swiEna.y, booScaRep.u)
+    annotation (Line(points={{102,-60},{108,-60}},color={255,0,255}));
+  connect(cha.y, swiEna.u1)
+    annotation (Line(points={{52,-60},{78,-60}},color={255,0,255}));
+  connect(intLes.y, swiEna.u2)
+    annotation (Line(points={{52,-100},{60,-100},{60,-68},{78,-68}},color={255,0,255}));
+  connect(isEnaPreAva.y, nEnaAvaPre.u1)
+    annotation (Line(points={{108,-100},{102,-100}},color={255,0,255}));
+  connect(y1Pre.y, isEnaPreAva.u2)
+    annotation (Line(points={{158,-60},{150,-60},{150,-108},{132,-108}},color={255,0,255}));
+  connect(u1Ava, isEnaPreAva.u1)
+    annotation (Line(points={{-220,-80},{140,-80},{140,-100},{132,-100}},color={255,0,255}));
+  connect(nAltReq.y, truArrCon.u)
+    annotation (Line(points={{82,40},{98,40}},color={255,127,0}));
+  connect(uIdxAltSor, truArrCon.uIdx)
+    annotation (Line(points={{-220,100},{90,100},{90,34},{98,34}},color={255,127,0}));
+  connect(truArrCon.y1, isReqAltAvaNee.u1)
+    annotation (Line(points={{122,40},{130,40},{130,20},{70,20},{70,0},{78,0}},
+      color={255,0,255}));
+  connect(one.y, maxInt.u1)
+    annotation (Line(points={{-168,20},{-166,20},{-166,6},{-162,6}},color={255,127,0}));
+  connect(uSta, maxInt.u2)
+    annotation (Line(points={{-220,0},{-166,0},{-166,-6},{-162,-6}},color={255,127,0}));
+  connect(maxInt.y, intScaRep.u)
+    annotation (Line(points={{-138,0},{-132,0}},color={255,127,0}));
+  connect(uSta, greZer.u)
+    annotation (Line(points={{-220,0},{-190,0},{-190,-40},{-172,-40}},color={255,127,0}));
+  connect(greZer.y, booToRea.u)
+    annotation (Line(points={{-148,-40},{-142,-40}},color={255,0,255}));
+  connect(booToRea.y, reaScaRep.u)
+    annotation (Line(points={{-118,-40},{-112,-40}},color={0,0,127}));
+  connect(reqEquSta.y, voiStaZer.u1)
+    annotation (Line(points={{-138,80},{-120,80},{-120,86},{-102,86}},color={0,0,127}));
+  connect(reaScaRep.y, voiStaZer.u2)
+    annotation (Line(points={{-88,-40},{-80,-40},{-80,64},{-110,64},{-110,74},{-102,74}},
+      color={0,0,127}));
+  connect(voiStaZer.y, nEquStaRea.u)
+    annotation (Line(points={{-78,80},{-62,80}},color={0,0,127}));
+  connect(voiStaZer.y, isReqPosAlt.u)
+    annotation (Line(points={{-78,80},{-70,80},{-70,40},{-62,40}},color={0,0,127}));
+  connect(voiStaZer.y, isNotReqNoAlt.u)
+    annotation (Line(points={{-78,80},{-70,80},{-70,0},{-62,0}},color={0,0,127}));
+  connect(voiStaZer.y, isReq.u)
+    annotation (Line(points={{-78,80},{-70,80},{-70,-40},{-62,-40}},color={0,0,127}));
+  annotation (
+    defaultComponentName="enaEqu",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-120},{200,120}})),
+    Documentation(
+      info="<html>
+<p>
+This block generates the equipment enable commands based on the
+active stage index <code>uSta</code>, the equipment available
+signal <code>u1Ava</code> and the indices of lead/lag alternate
+equipment, sorted by increasing staging runtime.
+</p>
+<p>
+A staging matrix <code>staEqu</code> is required as a parameter.
+</p>
+<ul>
+<li>Each row of this matrix corresponds to a given stage.</li>
+<li>Each column of this matrix corresponds to a given equipment.</li>
+<li>A coefficient <code>staEqu[i, j]</code> equal to <i>0</i>
+means that equipment <code>j</code> shall not be enabled at
+stage <code>i</code>.</li>
+<li>A coefficient <code>staEqu[i, j]</code> equal to <i>1</i>
+means that equipment <code>j</code> is required at stage <code>i</code>.
+If equipment <code>j</code> is unavailable, stage <code>i</code> is
+deemed unavailable.
+</li>
+<li>A coefficient <code>staEqu[i, j]</code> strictly lower than <i>1</i>
+and strictly greater than <i>0</i> means that equipment <code>j</code>
+may be enabled at stage <code>i</code> as a lead/lag alternate equipment.
+If equipment <code>j</code> is unavailable but another lead/lag alternate
+equipment is available, then the latter equipment is enabled.
+Stage <code>i</code> is only deemed unavailable if all
+lead/lag alternate equipment specified for stage <code>i</code>
+are unavailable.
+</li>
+<li>
+The sum of the coefficients in a given row <code>∑_j staEqu[i, j]</code>
+gives the number of equipment required at stage <code>i</code>.
+If this number cannot be achieved with the available equipment,
+stage <code>i</code> is deemed unavailable.
+</li>
+<li>
+The condition <code>∑_j staEqu[i+1, j] &ge; ∑_j staEqu[i, j]</code>
+is required for all <code>i &lt; size(staEqu, 1)</code>.
+</li>
+</ul>
+<p>
+The state of the enable signals is only updated at stage change, or
+if the number of previously enabled equipment that is available is
+strictly less than the number of equipment required to run.
+This avoids hot swapping equipment, e.g., an equipment would not be started
+and another stopped during operation just to fulfill the priority order.
+However, when a lead/lag alternate equipment becomes unavailable and another
+lead/lag alternate equipment can be enabled to meet the number of required
+equipment, then the state of the enable signals is updated.
+</p>
+</html>"));
+end EquipmentEnable;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/EventSequencing.mo b/Buildings/Templates/Plants/Controls/StagingRotation/EventSequencing.mo
new file mode 100644
index 00000000000..33aeb99a775
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/EventSequencing.mo
@@ -0,0 +1,405 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block EventSequencing "Staging event sequencing"
+  parameter Boolean have_heaWat
+    "Set to true for plants that provide HW"
+    annotation (Evaluate=true);
+  parameter Boolean have_chiWat
+    "Set to true for plants that provide CHW"
+    annotation (Evaluate=true);
+  parameter Boolean have_valInlIso
+    "Set to true if the system as inlet isolation valves"
+    annotation (Evaluate=true);
+  parameter Boolean have_valOutIso
+    "Set to true if the system as outlet isolation valves"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumHeaWatPri(start=false)
+    "Set to true for plants with primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_heaWat));
+  parameter Boolean have_pumChiWatPri(
+    start=false)
+    "Set to true for plants with separate primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_chiWat));
+  parameter Boolean have_pumHeaWatSec(start=false)
+    "Set to true for plants with secondary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_heaWat));
+  parameter Boolean have_pumChiWatSec(start=false)
+    "Set to true for plants with secondary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(enable=have_chiWat));
+  parameter Real dtVal(
+    min=0,
+    start=90,
+    unit="s")=90
+    "Nominal valve timing"
+    annotation (Dialog(enable=have_valInlIso or have_valOutIso));
+  parameter Real dtOff(
+    min=0,
+    unit="s") = 180
+    "Heat pump internal shutdown cycle timing";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Hea
+    if have_heaWat
+    "Enable command from heating mode sequence"
+    annotation (Placement(transformation(extent={{-200,120},{-160,160}}),
+      iconTransformation(extent={{-140,100},{-100,140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatPri_actual
+    if have_heaWat and have_pumHeaWatPri
+    "Primary HW pump status (dedicated or lead headered pump)"
+    annotation (Placement(transformation(extent={{-200,-30},{-160,10}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatPri_actual
+    if have_chiWat and have_pumChiWatPri
+    "Primary CHW pump status – Dedicated or lead headered pump"
+    annotation (Placement(transformation(extent={{-200,-70},{-160,-30}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumHeaWatSec_actual
+    if have_heaWat and have_pumHeaWatSec
+    "Lead headered secondary HW pump status"
+    annotation (Placement(transformation(extent={{-200,-110},{-160,-70}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1PumChiWatSec_actual
+    if have_chiWat and have_pumChiWatSec
+    "Lead headered secondary CHW pump status"
+    annotation (Placement(transformation(extent={{-200,-150},{-160,-110}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValHeaWatInlIso
+    if have_heaWat and have_valInlIso
+    "Inlet HW inlet isolation valve command"
+    annotation (Placement(transformation(extent={{160,20},{200,60}}),
+      iconTransformation(extent={{100,0},{140,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValHeaWatOutIso
+    if have_heaWat and have_valOutIso
+    "Outlet HW isolation valve command"
+    annotation (Placement(transformation(extent={{160,0},{200,40}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValChiWatInlIso
+    if have_chiWat and have_valInlIso
+    "Inlet CHW isolation valve command"
+    annotation (Placement(transformation(extent={{160,-20},{200,20}}),
+      iconTransformation(extent={{100,-40},{140,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1ValChiWatOutIso
+    if have_chiWat and have_valOutIso
+    "Outlet CHW isolation valve command"
+    annotation (Placement(transformation(extent={{160,-40},{200,0}}),
+      iconTransformation(extent={{100,-60},{140,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumHeaWatPri
+    if have_heaWat and have_pumHeaWatPri
+    "Primary HW pump start command – Dedicated or lead headered pump"
+    annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
+      iconTransformation(extent={{100,-100},{140,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1PumChiWatPri
+    if have_chiWat and have_pumChiWatPri
+    "Primary CHW pump start command – Dedicated or lead headered pump"
+    annotation (Placement(transformation(extent={{160,-120},{200,-80}}),
+      iconTransformation(extent={{100,-120},{140,-80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{160,120},{200,160}}),
+      iconTransformation(extent={{100,100},{140,140}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Hea
+    if have_heaWat and have_chiWat
+    "Heating/cooling mode command: true=heating, false=cooling"
+    annotation (Placement(transformation(extent={{160,100},{200,140}}),
+      iconTransformation(extent={{100,80},{140,120}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timVal(
+    final t=dtVal)
+    "Return true when nominal valve timing elapsed"
+    annotation (Placement(transformation(extent={{-50,90},{-30,110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd heaValPum(
+    nin=3)
+    "Return true if heating AND valve timing elapsed AND lead HW pumps on"
+    annotation (Placement(transformation(extent={{60,110},{80,130}})));
+  Buildings.Controls.OBC.CDL.Logical.Or ena
+    "Return true if enabled"
+    annotation (Placement(transformation(extent={{90,90},{110,110}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd cooValPum(
+    nin=4)
+    "Return true if cooling AND valve timing elapsed AND lead CHW pumps on"
+    annotation (Placement(transformation(extent={{60,70},{80,90}})));
+  Utilities.PlaceholderLogical u1PumChiWatSec_internal(
+    final have_inp=have_chiWat and have_pumChiWatSec,
+    final have_inpPh=false,
+    final u_internal=true)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-150,-140},{-130,-120}})));
+  Utilities.PlaceholderLogical timVal_internal(
+    final have_inp=have_valInlIso or have_valOutIso,
+    final have_inpPh=true,
+    final u_internal=true)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  Utilities.PlaceholderLogical u1PumHeaWatSec_internal(
+    final have_inp=have_heaWat and have_pumHeaWatSec,
+    final have_inpPh=false,
+    final u_internal=true)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-150,-100},{-130,-80}})));
+  Utilities.PlaceholderLogical u1PumChiWatPri_internal(
+    final have_inp=have_chiWat and have_pumChiWatPri,
+    final have_inpPh=false,
+    final u_internal=true)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-150,-60},{-130,-40}})));
+  Utilities.PlaceholderLogical u1PumHeaWatPri_internal(
+    final have_inp=have_heaWat and have_pumHeaWatPri,
+    final have_inpPh=false,
+    final u_internal=true)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-150,-20},{-130,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Coo
+    if have_chiWat
+    "Enable command from cooling mode sequence"
+    annotation (Placement(transformation(extent={{-200,60},{-160,100}}),
+      iconTransformation(extent={{-140,60},{-100,100}})));
+  Utilities.PlaceholderLogical u1Coo_internal(
+    final have_inp=have_chiWat,
+    final have_inpPh=false,
+    final u_internal=false)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-150,70},{-130,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Or u1HeaOrCoo
+    "Return true if enabled from heating or cooling mode sequence"
+    annotation (Placement(transformation(extent={{-90,110},{-70,130}})));
+  Utilities.PlaceholderLogical u1Hea_internal(
+    final have_inp=have_heaWat,
+    final have_inpPh=false,
+    final u_internal=false)
+    "Replace with placeholder value if input signal is not available"
+    annotation (Placement(transformation(extent={{-150,130},{-130,150}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1AndHea
+    if have_heaWat
+    "Equipment commanded on in heating mode"
+    annotation (Placement(transformation(extent={{160,80},{200,120}}),
+      iconTransformation(extent={{100,60},{140,100}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1AndCoo
+    if have_chiWat
+    "Equipment commanded on in cooling mode"
+    annotation (Placement(transformation(extent={{160,60},{200,100}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Logical.And enaAndHea
+    "Return true if enabled in heating mode"
+    annotation (Placement(transformation(extent={{130,90},{150,110}})));
+  Buildings.Controls.OBC.CDL.Logical.And enaAndCoo
+    "Return true if enabled in cooling mode"
+    annotation (Placement(transformation(extent={{130,60},{150,80}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rou(
+    final nout=1)
+    if have_pumChiWatPri
+    "Signal routing for plants with dedicated primary CHW pumps"
+    annotation (Placement(transformation(extent={{60,-76},{80,-56}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rou1(
+    final nout=1)
+    if not have_pumChiWatPri
+    "Signal routing for plants without dedicated primary CHW pumps"
+    annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Nor off
+    "Return true if disabled from heating and cooling mode sequence"
+    annotation (Placement(transformation(extent={{-52,10},{-32,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timHp(final t=dtOff)
+    "Return true when heat pump internal shutdown cycle times out"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch latValHeaWatIso
+    if have_heaWat
+    "Keep valve open until heat pump internal shutdown cycle times out"
+    annotation (Placement(transformation(extent={{100,30},{120,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch latValChiWatIso
+    if have_chiWat
+    "Keep valve open until heat pump internal shutdown cycle times out"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch latPumHeaWatPri
+    if have_heaWat
+    "Keep pump running until heat pump internal shutdown cycle times out"
+    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch latPumChiWatPri
+    if have_chiWat and have_pumChiWatPri
+    "Keep pump running until heat pump internal shutdown cycle times out"
+    annotation (Placement(transformation(extent={{110,-110},{130,-90}})));
+equation
+  connect(heaValPum.y, ena.u1)
+    annotation (Line(points={{82,120},{84,120},{84,100},{88,100}},color={255,0,255}));
+  connect(cooValPum.y, ena.u2)
+    annotation (Line(points={{82,80},{84,80},{84,92},{88,92}},color={255,0,255}));
+  connect(timVal.passed, timVal_internal.u)
+    annotation (Line(points={{-28,92},{-16,92},{-16,100},{-12,100}},color={255,0,255}));
+  connect(timVal_internal.y, heaValPum.u[1])
+    annotation (Line(points={{12,100},{52,100},{52,117.667},{58,117.667}},color={255,0,255}));
+  connect(u1PumChiWatSec_actual, u1PumChiWatSec_internal.u)
+    annotation (Line(points={{-180,-130},{-152,-130}},color={255,0,255}));
+  connect(u1PumHeaWatPri_actual, u1PumHeaWatPri_internal.u)
+    annotation (Line(points={{-180,-10},{-152,-10}},color={255,0,255}));
+  connect(u1PumChiWatPri_actual, u1PumChiWatPri_internal.u)
+    annotation (Line(points={{-180,-50},{-152,-50}},color={255,0,255}));
+  connect(u1PumHeaWatSec_actual, u1PumHeaWatSec_internal.u)
+    annotation (Line(points={{-180,-90},{-152,-90}},color={255,0,255}));
+  connect(u1PumHeaWatPri_internal.y, heaValPum.u[2])
+    annotation (Line(points={{-128,-10},{46,-10},{46,120},{58,120}},color={255,0,255}));
+  connect(u1PumHeaWatSec_internal.y, heaValPum.u[3])
+    annotation (Line(points={{-128,-90},{50,-90},{50,122},{56,122},{56,122.333},
+          {58,122.333}},
+      color={255,0,255}));
+  connect(timVal_internal.y, cooValPum.u[1])
+    annotation (Line(points={{12,100},{48,100},{48,77.375},{58,77.375}},color={255,0,255}));
+  connect(u1PumChiWatPri_internal.y, cooValPum.u[2])
+    annotation (Line(points={{-128,-50},{48,-50},{48,79.125},{58,79.125}},color={255,0,255}));
+  connect(u1PumChiWatSec_internal.y, cooValPum.u[3])
+    annotation (Line(points={{-128,-130},{52,-130},{52,80.875},{58,80.875}},
+      color={255,0,255}));
+  connect(ena.y, y1)
+    annotation (Line(points={{112,100},{124,100},{124,140},{180,140}},color={255,0,255}));
+  connect(u1Hea, u1Hea_internal.u)
+    annotation (Line(points={{-180,140},{-152,140}},color={255,0,255}));
+  connect(u1Coo_internal.y, u1HeaOrCoo.u2)
+    annotation (Line(points={{-128,80},{-100,80},{-100,112},{-92,112}},color={255,0,255}));
+  connect(u1Hea_internal.y, u1HeaOrCoo.u1)
+    annotation (Line(points={{-128,140},{-120,140},{-120,120},{-92,120}},color={255,0,255}));
+  connect(u1HeaOrCoo.y, timVal.u)
+    annotation (Line(points={{-68,120},{-60,120},{-60,100},{-52,100}},color={255,0,255}));
+  connect(u1HeaOrCoo.y, timVal_internal.uPh) annotation (Line(points={{-68,120},
+          {-20,120},{-20,94},{-12,94}}, color={255,0,255}));
+  connect(u1Coo, u1Coo_internal.u)
+    annotation (Line(points={{-180,80},{-152,80}},color={255,0,255}));
+  connect(u1Coo_internal.y, cooValPum.u[4])
+    annotation (Line(points={{-128,80},{58,80},{58,82.625}},color={255,0,255}));
+  connect(u1Hea_internal.y, y1Hea)
+    annotation (Line(points={{-128,140},{120,140},{120,120},{180,120}},color={255,0,255}));
+  connect(ena.y, enaAndHea.u1)
+    annotation (Line(points={{112,100},{128,100}},color={255,0,255}));
+  connect(u1Hea_internal.y, enaAndHea.u2)
+    annotation (Line(points={{-128,140},{120,140},{120,92},{128,92}},color={255,0,255}));
+  connect(enaAndHea.y, y1AndHea)
+    annotation (Line(points={{152,100},{180,100}},color={255,0,255}));
+  connect(ena.y, enaAndCoo.u1)
+    annotation (Line(points={{112,100},{124,100},{124,70},{128,70}},color={255,0,255}));
+  connect(u1Coo_internal.y, enaAndCoo.u2)
+    annotation (Line(points={{-128,80},{-100,80},{-100,48},{60,48},{60,62},{128,62}},
+      color={255,0,255}));
+  connect(enaAndCoo.y, y1AndCoo)
+    annotation (Line(points={{152,70},{156,70},{156,80},{180,80}},color={255,0,255}));
+  connect(u1Hea_internal.y, rou.u)
+    annotation (Line(points={{-128,140},{-120,140},{-120,-66},{58,-66}},color={255,0,255}));
+  connect(u1HeaOrCoo.y, rou1.u)
+    annotation (Line(points={{-68,120},{44,120},{44,-40},{58,-40}},  color={255,0,255}));
+  connect(u1Hea_internal.y, off.u1)
+    annotation (Line(points={{-128,140},{-120,140},{-120,20},{-54,20}},color={255,0,255}));
+  connect(u1Coo_internal.y, off.u2)
+    annotation (Line(points={{-128,80},{-100,80},{-100,12},{-54,12}},color={255,0,255}));
+  connect(off.y, timHp.u)
+    annotation (Line(points={{-30,20},{-12,20}},color={255,0,255}));
+  connect(timHp.passed, latValHeaWatIso.clr)
+    annotation (Line(points={{12,12},{40,12},{40,34},{98,34}}, color={255,0,255}));
+  connect(latValHeaWatIso.y, y1ValHeaWatInlIso)
+    annotation (Line(points={{122,40},{180,40}},color={255,0,255}));
+  connect(u1Hea_internal.y, latValHeaWatIso.u)
+    annotation (Line(points={{-128,140},{-120,140},{-120,40},{98,40}},color={255,0,255}));
+  connect(latValChiWatIso.y, y1ValChiWatInlIso)
+    annotation (Line(points={{122,0},{180,0}},color={255,0,255}));
+  connect(timHp.passed, latValChiWatIso.clr)
+    annotation (Line(points={{12,12},{40,12},{40,-6},{98,-6}}, color={255,0,255}));
+  connect(latValHeaWatIso.y, y1ValHeaWatOutIso)
+    annotation (Line(points={{122,40},{140,40},{140,20},{180,20}},color={255,0,255}));
+  connect(latValChiWatIso.y, y1ValChiWatOutIso)
+    annotation (Line(points={{122,0},{140,0},{140,-20},{180,-20}},color={255,0,255}));
+  connect(rou1.y[1], latPumHeaWatPri.u)
+    annotation (Line(points={{82,-40},{90,-40},{90,-60},{108,-60}},
+                                                color={255,0,255}));
+  connect(rou.y[1], latPumHeaWatPri.u)
+    annotation (Line(points={{82,-66},{90,-66},{90,-60},{108,-60}},
+                                                                  color={255,0,255}));
+  connect(timHp.passed, latPumHeaWatPri.clr)
+    annotation (Line(points={{12,12},{40,12},{40,-20},{100,-20},{100,-66},{108,
+          -66}},
+      color={255,0,255}));
+  connect(latPumHeaWatPri.y, y1PumHeaWatPri)
+    annotation (Line(points={{132,-60},{180,-60}},                    color={255,0,255}));
+  connect(latPumChiWatPri.y, y1PumChiWatPri)
+    annotation (Line(points={{132,-100},{180,-100}},
+                                                  color={255,0,255}));
+  connect(timHp.passed, latPumChiWatPri.clr)
+    annotation (Line(points={{12,12},{40,12},{40,-106},{108,-106}},
+                                                                 color={255,0,255}));
+  connect(u1Coo_internal.y, latPumChiWatPri.u)
+    annotation (Line(points={{-128,80},{-100,80},{-100,-100},{108,-100}},
+                                                                      color={255,0,255}));
+  connect(u1Coo_internal.y, latValChiWatIso.u)
+    annotation (Line(points={{-128,80},{-100,80},{-100,0},{98,0}},color={255,0,255}));
+  annotation (
+    defaultComponentName="seqEve",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-140},{100,140}}),
+      graphics={
+        Rectangle(
+          extent={{-100,140},{100,-142}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,190},{150,150}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-160,-160},{160,160}})),
+    Documentation(
+      info="<html>
+<p>
+If a heat pump is commanded on in a desired heating or cooling mode:
+</p>
+<ul>
+<li>
+The isolation valves for desired heating or cooling mode are commanded
+open.
+</li>
+<li>
+<b>Plants with dedicated primary pumps</b>:
+The dedicated primary pumps are commanded on when the 
+associated isolation valves are commanded open.
+</li>
+<li>
+<b>Plants with headered primary pumps</b>:
+The headered primary pumps are commanded on as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered</a>.
+</li>
+<li>
+Once the isolation valves are fully open (based on nominal valve timing <code>dtVal</code>)
+and the lead pumps are proven on, the heat pump is enabled in heating or cooling
+mode.
+</li>
+</ul>
+<p>
+If a heat pump is commanded off:
+</p>
+<ul>
+<li>
+The heat pump is disabled.
+</li>
+<li>
+After the time required for the internal shutdown cycle to time out 
+(<code>dtOff</code> to be determined empirically, defaulting to <i>3</i>&nbsp;min),
+all isolation valves are commanded closed.
+</li>
+<li>
+<b>Plants with dedicated primary pumps</b>:
+The dedicated primary pumps are commanded off when the associated
+isolation valves are commanded closed.
+</li>
+<li>
+<b>Plants with headered primary pumps</b>:
+The headered primary pumps are commanded off as described in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered\">
+Buildings.Templates.Plants.Controls.Pumps.Generic.StagingHeadered</a>.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EventSequencing;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo b/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo
new file mode 100644
index 00000000000..8fb4d6bc578
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/SortRuntime.mo
@@ -0,0 +1,315 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block SortRuntime
+  "Sort equipment by increasing staging runtime"
+  parameter Integer nin=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Integer idxEquAlt[:]={i for i in 1:nin}
+    "Indices of lead/lag alternate equipment"
+    annotation (Evaluate=true);
+  final parameter Integer nEquAlt=size(idxEquAlt, 1)
+    "Number of lead/lag alternate equipment"
+    annotation (Evaluate=true);
+  parameter Real runTim_start[nEquAlt]={60 + i for i in 1:nEquAlt}
+    "Staging runtime initial values";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Run[nin]
+    "Boolean signal used to assess equipment runtime"
+    annotation (Placement(transformation(extent={{-240,20},{-200,60}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Ava[nin]
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-240,-60},{-200,-20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yRunTimLif[nEquAlt]
+    "Lifetime runtime"
+    annotation (Placement(transformation(extent={{200,60},{240,100}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput yRunTimSta[nEquAlt]
+    "Staging runtime"
+    annotation (Placement(transformation(extent={{200,20},{240,60}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yIdx[nEquAlt](
+    start={i for i in 1:nEquAlt})
+    "Indices of equipment sorted by increasing staging runtime"
+    annotation (Placement(transformation(extent={{200,-20},{240,20}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Logical.TimerAccumulating timRun[nEquAlt]
+    "Compute staging runtime"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Not off[nEquAlt]
+    "Return true if equipment off"
+    annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Res[nEquAlt](
+    each k=false) "Signal for staging runtime reset"
+    annotation (Placement(transformation(extent={{-180,-110},{-160,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sort sor(
+    final ascending=true,
+    nin=nEquAlt)
+    "Sort equipment by increasing weighted runtime"
+    annotation (Placement(transformation(extent={{110,-10},{130,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal weiOffAva[nEquAlt](
+    each final realTrue=1E10,
+    each final realFalse=1)
+    "Weight to be applied to runtime of equipment off and available"
+    annotation (Placement(transformation(extent={{-50,30},{-30,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply appWeiOffAva[nEquAlt]
+    "Apply weights to runtime of equipment off and available"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply voiRunUna[nEquAlt]
+    "Void runtime of unavailable equipment"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Logical.And offAva[nEquAlt]
+    "Return true if equipment off and available"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not una[nEquAlt]
+    "Return true if equipment unavailable"
+    annotation (Placement(transformation(extent={{-90,-50},{-70,-30}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal zerUna[nEquAlt](
+    each final realTrue=0,
+    each final realFalse=1)
+    "Assign zero to unavailable equipment"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer timUna[nEquAlt]
+    "Compute time elapsed since equipment is unavailable"
+    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter addWei[nEquAlt](
+    each final p=1E20)
+    "Add weight"
+    annotation (Placement(transformation(extent={{10,-90},{30,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter opp[nEquAlt](
+    each final k=- 1)
+    "Take opposite value"
+    annotation (Placement(transformation(extent={{-20,-90},{0,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Add addWeiUna[nEquAlt]
+    "Add weight to unavailable equipment"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply voiWeiAva[nEquAlt]
+    "Void weight of available equipment"
+    annotation (Placement(transformation(extent={{48,-90},{68,-70}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal zerAva[nEquAlt](
+    each final realTrue=0,
+    each final realFalse=1)
+    "Assign zero to available equipment"
+    annotation (Placement(transformation(extent={{-50,-130},{-30,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.TimerAccumulating timRunLif[nEquAlt]
+    "Compute lifetime runtime"
+    annotation (Placement(transformation(extent={{-50,70},{-30,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant fal[nEquAlt](
+    each final k=false)
+    "Constant"
+    annotation (Placement(transformation(extent={{-180,90},{-160,110}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal u1RunEquAlt(
+    final nin=nin,
+    final nout=nEquAlt,
+    final extract=idxEquAlt)
+    "Extract signal for lead/lag alternate equipment only"
+    annotation (Placement(transformation(extent={{-180,30},{-160,50}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal u1AvaEquAlt(
+    final nin=nin,
+    final nout=nEquAlt,
+    final extract=idxEquAlt)
+    "Extract signal for lead/lag alternate equipment only"
+    annotation (Placement(transformation(extent={{-180,-50},{-160,-30}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerExtractor resIdxInp[nEquAlt](
+    each final nin=nEquAlt)
+    "Restore indices consistent with input vectors"
+    annotation (Placement(transformation(extent={{170,-10},{190,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant idxEquAltMat[nEquAlt, nEquAlt](
+    final k={idxEquAlt for i in 1:nEquAlt})
+    "Indices of lead/lag alternate equipment repeated nEquAlt times"
+    annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant runTimSta[nEquAlt](
+    final k=runTim_start)
+    "Staging runtime initial values"
+    annotation (Placement(transformation(extent={{-100,110},{-80,130}})));
+  Buildings.Controls.OBC.CDL.Reals.Max iniRunTim[nEquAlt]
+    "Fix runtime until it exceeds the initial value"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+equation
+  connect(u1Res.y, timRun.reset)
+    annotation (Line(points={{-158,-100},{-120,-100},{-120,-8},{-92,-8}},color={255,0,255}));
+  connect(weiOffAva.y, appWeiOffAva.u1)
+    annotation (Line(points={{-28,40},{-20,40},{-20,6},{-12,6}},color={0,0,127}));
+  connect(off.y, offAva.u1)
+    annotation (Line(points={{-108,40},{-92,40}},color={255,0,255}));
+  connect(offAva.y, weiOffAva.u)
+    annotation (Line(points={{-68,40},{-52,40}},color={255,0,255}));
+  connect(appWeiOffAva.y, voiRunUna.u1)
+    annotation (Line(points={{12,0},{20,0},{20,6},{28,6}},color={0,0,127}));
+  connect(zerUna.y, voiRunUna.u2)
+    annotation (Line(points={{-28,-40},{20,-40},{20,-6},{28,-6}},color={0,0,127}));
+  connect(una.y, timUna.u)
+    annotation (Line(points={{-68,-40},{-60,-40},{-60,-80},{-52,-80}},color={255,0,255}));
+  connect(una.y, zerUna.u)
+    annotation (Line(points={{-68,-40},{-52,-40}},color={255,0,255}));
+  connect(timUna.y, opp.u)
+    annotation (Line(points={{-28,-80},{-22,-80}},color={0,0,127}));
+  connect(opp.y, addWei.u)
+    annotation (Line(points={{2,-80},{8,-80}},color={0,0,127}));
+  connect(addWeiUna.y, sor.u)
+    annotation (Line(points={{92,0},{108,0}},color={0,0,127}));
+  connect(voiRunUna.y, addWeiUna.u1)
+    annotation (Line(points={{52,0},{54,0},{54,6},{68,6}},color={0,0,127}));
+  connect(voiWeiAva.y, addWeiUna.u2)
+    annotation (Line(points={{70,-80},{80,-80},{80,-20},{60,-20},{60,-6},{68,-6}},
+      color={0,0,127}));
+  connect(addWei.y, voiWeiAva.u1)
+    annotation (Line(points={{32,-80},{40,-80},{40,-74},{46,-74}},color={0,0,127}));
+  connect(zerAva.y, voiWeiAva.u2)
+    annotation (Line(points={{-28,-120},{40,-120},{40,-86},{46,-86}},color={0,0,127}));
+  connect(timRunLif.y, yRunTimLif)
+    annotation (Line(points={{-28,80},{220,80}},color={0,0,127}));
+  connect(fal.y, timRunLif.reset)
+    annotation (Line(points={{-158,100},{-60,100},{-60,72},{-52,72}},color={255,0,255}));
+  connect(u1Run, u1RunEquAlt.u)
+    annotation (Line(points={{-220,40},{-182,40}},color={255,0,255}));
+  connect(u1RunEquAlt.y, off.u)
+    annotation (Line(points={{-158,40},{-132,40}},color={255,0,255}));
+  connect(u1RunEquAlt.y, timRunLif.u)
+    annotation (Line(points={{-158,40},{-140,40},{-140,80},{-52,80}},color={255,0,255}));
+  connect(u1RunEquAlt.y, timRun.u)
+    annotation (Line(points={{-158,40},{-140,40},{-140,0},{-92,0}},color={255,0,255}));
+  connect(u1Ava, u1AvaEquAlt.u)
+    annotation (Line(points={{-220,-40},{-182,-40}},color={255,0,255}));
+  connect(u1AvaEquAlt.y, una.u)
+    annotation (Line(points={{-158,-40},{-92,-40}},color={255,0,255}));
+  connect(u1AvaEquAlt.y, zerAva.u)
+    annotation (Line(points={{-158,-40},{-100,-40},{-100,-120},{-52,-120}},color={255,0,255}));
+  connect(u1AvaEquAlt.y, offAva.u2)
+    annotation (Line(points={{-158,-40},{-100,-40},{-100,32},{-92,32}},color={255,0,255}));
+  connect(idxEquAltMat.y, resIdxInp.u)
+    annotation (Line(points={{132,-40},{160,-40},{160,0},{168,0}},color={255,127,0}));
+  connect(sor.yIdx, resIdxInp.index)
+    annotation (Line(points={{132,-6},{164,-6},{164,-16},{180,-16},{180,-12}},
+      color={255,127,0}));
+  connect(resIdxInp.y, yIdx)
+    annotation (Line(points={{192,0},{220,0}},color={255,127,0}));
+  connect(runTimSta.y, iniRunTim.u1)
+    annotation (Line(points={{-78,120},{-66,120},{-66,6},{-52,6}},color={0,0,127}));
+  connect(timRun.y, iniRunTim.u2)
+    annotation (Line(points={{-68,0},{-60,0},{-60,-6},{-52,-6}},color={0,0,127}));
+  connect(iniRunTim.y, appWeiOffAva.u2)
+    annotation (Line(points={{-28,0},{-20,0},{-20,-6},{-12,-6}},color={0,0,127}));
+  connect(timRun.y, yRunTimSta)
+    annotation (Line(points={{-68,0},{-60,0},{-60,20},{180,20},{180,40},{220,40}},
+      color={0,0,127}));
+  annotation (
+    defaultComponentName="sorRunTim",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-200,-160},{200,160}})),
+    Documentation(
+      info="<html>
+<p>
+This block implements the rotation logic for identical parallel
+staged equipment that are lead/lag alternated.
+</p>
+<p>
+Two runtime points are defined for each equipment.
+The Lifetime Runtime is the cumulative runtime of the equipment
+since equipment start-up. This point is not readily resettable by operators.
+Lifetime Runtime should be stored to a software point on the control
+system server so the recorded value is not lost due to controller reset,
+loss of power, programming file update, etc.
+The Staging Runtime is an operator resettable runtime point that stores
+cumulative runtime since the last operator reset.
+</p>
+<p>
+In the case of available equipment,
+when more than one equipment is off or more than one is on,
+the equipment with the most operating hours as determined by
+Staging Runtime is made the last stage equipment and the one
+with the least number of hours is made the lead stage equipment.
+</p>
+<p>
+In the case of unavailable equipment,
+the equipment that alarmed most recently is sent to the last position.
+The equipment in alarm automatically moves up in the staging order
+only if another equipment goes into alarm.
+</p>
+<h4>Staging runtime initialization</h4>
+<p>
+When the controller is initialized, the choice of the first equipment to run
+is random since all runtimes are equal to zero.
+So, before this first equipment reports status, all equipment will be
+considered off and only this first equipment will increase runtime and be
+queued in the staging order.
+At next stage change, another equipment will then be staged on instead,
+resulting in the first running equipment being \"hot swapped\".
+To avoid this behavior, the vector parameter <code>runTim_start</code> is used
+to initialize the staging runtime, which will be fixed at this parameter
+value until it becomes higher.
+The parameter <code>runTim_start</code> should be set to a vector of
+strictly increasing values, where the minimum value is greater than
+the time needed for the equipment to report status.
+</p>
+<h4>Details</h4>
+<p>
+The sorting logic is implemented using the following method.
+</p>
+<ul>
+<li>
+If a unit is on and available, its staging runtime is used as is.
+</li>
+<li>
+If a unit is off and available, its staging runtime is increased 
+by a constant of <i>1E10</i>&nbsp;s.
+</li>
+<li>
+If a unit is unavailable, its staging runtime is replaced by
+the time that has elapsed since the unit became unavailable.
+This time is then increased by a constant of <i>1E20</i>&nbsp;s.
+</li>
+<li>
+A unique instance of the sorting block is then used to order
+the different units.
+</li>
+</ul>
+<p>
+This is effectively the same as sorting the units within
+the three following subsets: units that are on and available, 
+units that are off and available, units that are unavailable.
+In particular, the order index of a given unit remains unchanged
+if it is the only element of a given subset.
+Note that the staging runtime and the time elapsed since an equipment became unavailable
+are both computed from Boolean signals (<code>u1Run</code> and <code>u1Ava</code>).
+These are discrete-time, piecewise constant variables,
+which is why the caveat in the documentation of
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.Sort\">
+Buildings.Controls.OBC.CDL.Reals.Sort</a>
+for purely continuous time-varying variables does not apply here.
+Therefore, no sampling is performed before sorting the equipment runtimes.
+</p>
+<p>
+To facilitate integration into the plant controller, the input vectors
+cover the full set of equipment, including equipment that may not be
+lead/lag alternate.
+The output vectors cover only the subset of lead/lag alternate equipment,
+and the vector of sorted equipment provides indices with respect
+to the input vectors (full set of equipment).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SortRuntime;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo b/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo
new file mode 100644
index 00000000000..398f600f4ab
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/StageAvailability.mo
@@ -0,0 +1,158 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block StageAvailability
+  "Compute stage availability"
+  parameter Real staEqu[:,:](
+    each unit="1",
+    each min=0,
+    each max=1)
+    "Staging matrix – Equipment required for each stage";
+  final parameter Integer nSta=size(staEqu, 1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  final parameter Integer nEqu=size(staEqu, 2)
+    "Number of equipment"
+    annotation (Evaluate=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Ava[nEqu]
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-180,-80},{-140,-40}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nSta]
+    "Stage available signal"
+    annotation (Placement(transformation(extent={{140,-20},{180,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant matStaEqu[nSta, nEqu](
+    final k=staEqu)
+    "Staging matrix"
+    annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isReq[nSta, nEqu](
+    each final t=0.99)
+    "Return true if equipment required without lead/lag alternate"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold isReqPosAlt[nSta, nEqu](
+    each final t=0)
+    "Return true if equipment required (with or without lead/lag alternate)"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Reals.LessThreshold isNotReqNoAlt[nSta, nEqu](
+    each final t=1)
+    "Return true if equipment not required or required with lead/lag alternate"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanVectorReplicator booVecRep(
+    final nin=nEqu,
+    final nout=nSta)
+    "Replicate equipment available signal"
+    annotation (Placement(transformation(extent={{-130,-70},{-110,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.And isReqAva[nSta, nEqu]
+    "Return true if equipment required without lead/lag alternate and available"
+    annotation (Placement(transformation(extent={{-40,-50},{-20,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.And isReqAltAva[nSta, nEqu]
+    "Return true if equipment required (with or without lead/lag alternate) and available"
+    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Or isReqAvaOrNotReq[nSta, nEqu]
+    "Return true if equipment required without lead/lag alternate and available, or if not required"
+    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd all[nSta](
+    each final nin=nEqu)
+    "Return true if previous block condition valid for all elements"
+    annotation (Placement(transformation(extent={{30,-30},{50,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.And isAva[nSta]
+    "Return true if stage available"
+    annotation (Placement(transformation(extent={{110,-10},{130,10}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum nEquSta[nSta](
+    each final nin=nEqu)
+    "Return the number of equipment required at each stage"
+    annotation (Placement(transformation(extent={{-80,70},{-60,90}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nSta, nEqu]
+    "Convert to integer"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Buildings.Controls.OBC.CDL.Integers.GreaterEqual isReqAltAvaGreReq[nSta]
+    "Return true if number of required available equipment higher than number of required equipment"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum nReqAltAva[nSta](
+    each final nin=nEqu)
+    "Number of equipment required (with or without lead/lag alternate) and available"
+    annotation (Placement(transformation(extent={{30,30},{50,50}})));
+  Buildings.Controls.OBC.CDL.Conversions.RealToInteger nEquStaInt[nSta]
+    "Integer cast of number of equipment required at each stage"
+    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+equation
+  connect(matStaEqu.y, isReq.u)
+    annotation (Line(points={{-108,0},{-90,0},{-90,-40},{-82,-40}},color={0,0,127}));
+  connect(matStaEqu.y, isReqPosAlt.u)
+    annotation (Line(points={{-108,0},{-90,0},{-90,40},{-82,40}},color={0,0,127}));
+  connect(matStaEqu.y, isNotReqNoAlt.u)
+    annotation (Line(points={{-108,0},{-82,0}},color={0,0,127}));
+  connect(isReq.y, isReqAva.u1)
+    annotation (Line(points={{-58,-40},{-42,-40}},color={255,0,255}));
+  connect(booVecRep.y, isReqAva.u2)
+    annotation (Line(points={{-108,-60},{-50,-60},{-50,-48},{-42,-48}},color={255,0,255}));
+  connect(booVecRep.y, isReqAltAva.u2)
+    annotation (Line(points={{-108,-60},{-50,-60},{-50,32},{-42,32}},color={255,0,255}));
+  connect(isReqAva.y, isReqAvaOrNotReq.u2)
+    annotation (Line(points={{-18,-40},{-10,-40},{-10,-28},{-2,-28}},color={255,0,255}));
+  connect(isNotReqNoAlt.y, isReqAvaOrNotReq.u1)
+    annotation (Line(points={{-58,0},{-10,0},{-10,-20},{-2,-20}},color={255,0,255}));
+  connect(isAva.y, y1)
+    annotation (Line(points={{132,0},{160,0}},color={255,0,255}));
+  connect(isReqAvaOrNotReq.y, all.u)
+    annotation (Line(points={{22,-20},{28,-20}},color={255,0,255}));
+  connect(matStaEqu.y, nEquSta.u)
+    annotation (Line(points={{-108,0},{-90,0},{-90,80},{-82,80}},color={0,0,127}));
+  connect(nReqAltAva.y, isReqAltAvaGreReq.u1)
+    annotation (Line(points={{52,40},{68,40}},color={255,127,0}));
+  connect(nReqAltAva.u, booToInt.y)
+    annotation (Line(points={{28,40},{22,40}},color={255,127,0}));
+  connect(nEquSta.y, nEquStaInt.u)
+    annotation (Line(points={{-58,80},{-42,80}},color={0,0,127}));
+  connect(nEquStaInt.y, isReqAltAvaGreReq.u2)
+    annotation (Line(points={{-18,80},{60,80},{60,32},{68,32}},color={255,127,0}));
+  connect(u1Ava, booVecRep.u)
+    annotation (Line(points={{-160,-60},{-132,-60}},color={255,0,255}));
+  connect(isReqPosAlt.y, isReqAltAva.u1)
+    annotation (Line(points={{-58,40},{-42,40}},color={255,0,255}));
+  connect(isReqAltAva.y, booToInt.u)
+    annotation (Line(points={{-18,40},{-2,40}},color={255,0,255}));
+  connect(isReqAltAvaGreReq.y, isAva.u1)
+    annotation (Line(points={{92,40},{100,40},{100,0},{108,0}},color={255,0,255}));
+  connect(all.y, isAva.u2)
+    annotation (Line(points={{52,-20},{100,-20},{100,-8},{108,-8}},color={255,0,255}));
+  annotation (
+    defaultComponentName="avaSta",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-140,-100},{140,100}})),
+    Documentation(
+      info="<html>
+<p>
+A stage is deemed available if both the following are true:
+</p>
+<ul>
+<li>
+Each equipment required to run at that stage without
+lead/lag alternate is available.
+</li>
+<li>
+The number of equipment required to run at that stage &ndash;
+with or without lead/lag alternate &ndash; and available
+is greater or equal to the number of equipment required to run
+at that stage.
+</li>
+</ul>
+<p>
+Otherwise, the stage is deemed unavailable.
+</p>
+</html>"));
+end StageAvailability;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo b/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo
new file mode 100644
index 00000000000..3eef5577daf
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/StageChangeCommand.mo
@@ -0,0 +1,458 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block StageChangeCommand
+  "Generate stage change command"
+  parameter Boolean have_inpPlrSta=false
+    "Set to true to use an input signal for SPLR, false to use a parameter"
+    annotation (Evaluate=true);
+  parameter Real plrSta(
+    final max=1,
+    final min=0,
+    start=0.9,
+    final unit="1")=0.9
+    "Staging part load ratio"
+    annotation (Dialog(enable=not have_inpPlrSta));
+  final parameter Real traStaEqu[nEqu, nSta]={{staEqu[i, j] for i in 1:nSta} for j in 1:nEqu}
+    "Transpose of staging matrix";
+  parameter Real staEqu[:,:](
+    each final max=1,
+    each final min=0,
+    each final unit="1")
+    "Staging matrix – Equipment required for each stage";
+  final parameter Integer nSta=size(staEqu, 1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  final parameter Integer nEqu=size(staEqu, 2)
+    "Number of equipment"
+    annotation (Evaluate=true);
+  parameter Real capEqu[nEqu](
+    each final min=0,
+    each final unit="W")
+    "Design capacity of each equipment";
+  parameter Real dtRun(
+    final min=0,
+    final unit="s")=900
+    "Runtime with exceeded staging part load ratio before staging event is triggered";
+  parameter Real dtMea(
+    final min=0,
+    final unit="s")=300
+    "Duration used to compute the moving average of required capacity";
+  parameter Real cp_default(
+    final min=0,
+    final unit="J/(kg.K)")
+    "Default specific heat capacity used to compute required capacity";
+  parameter Real rho_default(
+    final min=0,
+    final unit="kg/m3")
+    "Default density used to compute required capacity";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1AvaSta[nSta]
+    "Stage available signal"
+    annotation (Placement(transformation(extent={{-240,60},{-200,100}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1StaPro
+    "Staging process in progress"
+    annotation (Placement(transformation(extent={{-240,-40},{-200,0}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uPlrSta(
+    final unit="1",
+    final min=0,
+    final max=1)
+    if have_inpPlrSta
+    "Input signal for staging part load ratio"
+    annotation (Placement(transformation(extent={{-240,-200},{-200,-160}}),
+      iconTransformation(extent={{-140,-120},{-100,-80}})));
+  // We allow the stage index to be zero, e.g., when the plant is disabled.
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uSta(
+    final min=0,
+    final max=nSta)
+    "Stage index"
+    annotation (Placement(transformation(extent={{-240,160},{-200,200}}),
+      iconTransformation(extent={{-140,80},{-100,120}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TRet(
+    final unit="K",
+    displayUnit="degC")
+    "Return temperature used to compute required capacity"
+    annotation (Placement(transformation(extent={{-240,-120},{-200,-80}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput TSupSet(
+    final unit="K",
+    displayUnit="degC")
+    "Active supply temperature setpoint used to compute required capacity"
+    annotation (Placement(transformation(extent={{-240,-80},{-200,-40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput V_flow(
+    final unit="m3/s")
+    "Volume flow rate used to compute required capacity"
+    annotation (Placement(transformation(extent={{-240,-160},{-200,-120}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Up
+    "Stage up command"
+    annotation (Placement(transformation(extent={{200,60},{240,100}}),
+      iconTransformation(extent={{100,20},{140,60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1Dow
+    "Stage down command"
+    annotation (Placement(transformation(extent={{200,-100},{240,-60}}),
+      iconTransformation(extent={{100,-60},{140,-20}})));
+  Buildings.Controls.OBC.CDL.Reals.Subtract delT(
+    y(final unit="K"))
+    "Compute ∆T"
+    annotation (Placement(transformation(extent={{-170,-90},{-150,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Abs absDelT(
+    y(final unit="K"))
+    "Compute absolute value of ∆T"
+    annotation (Placement(transformation(extent={{-130,-90},{-110,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter capFlo(
+    y(final unit="W/K"),
+    final k=rho_default * cp_default)
+    "Compute capacity flow rate"
+    annotation (Placement(transformation(extent={{-130,-150},{-110,-130}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply capReq
+    "Compute required capacity"
+    annotation (Placement(transformation(extent={{-90,-90},{-70,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant traMatStaEqu[nEqu, nSta](
+    final k=traStaEqu)
+    "Transpose of staging matrix"
+    annotation (Placement(transformation(extent={{-70,210},{-50,230}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractor reqEquSta[nEqu](
+    each final nin=nSta)
+    "Extract equipment required at given stage"
+    annotation (Placement(transformation(extent={{-10,210},{10,230}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep(
+    final nout=nEqu)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-104,190},{-84,210}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply capEquSta[nEqu]
+    "Capacity of each equipment required at given stage"
+    annotation (Placement(transformation(extent={{30,210},{50,230}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant capEquPar[nEqu](
+    final k=capEqu)
+    "Capacity of each equipment"
+    annotation (Placement(transformation(extent={{-70,150},{-50,170}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum capSta(
+    nin=nEqu)
+    "Compute nominal capacity of active stage"
+    annotation (Placement(transformation(extent={{70,210},{90,230}})));
+  Buildings.Controls.OBC.CDL.Reals.Greater gre(h=1E-4*min(capEqu))
+    "Compare OPLR to SPLR (hysteresis is to avoid chattering with some simulators)"
+    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.MovingAverage movAve(
+    delta=dtMea)
+    "Compute moving average"
+    annotation (Placement(transformation(extent={{-50,-90},{-30,-70}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset timUp(
+    final t=dtRun)
+    "Timer"
+    annotation (Placement(transformation(extent={{110,-70},{130,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Less les(h=1E-4*min(capEqu))
+    "Compare OPLR to SPLR (hysteresis is to avoid chattering with some simulators)"
+    annotation (Placement(transformation(extent={{60,-130},{80,-110}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset timDow(
+    final t=dtRun)
+    "Timer"
+    annotation (Placement(transformation(extent={{110,-130},{130,-110}})));
+  Utilities.HoldReal hol(final dtHol=dtRun)
+    "Hold value of required capacity at stage change"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Integers.Max maxInt
+    "Maximum between stage index and 1"
+    annotation (Placement(transformation(extent={{-140,190},{-120,210}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant one(
+    final k=1)
+    "Constant"
+    annotation (Placement(transformation(extent={{-180,170},{-160,190}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant idxSta[nSta](
+    final k={i for i in 1:nSta})
+    "Stage index"
+    annotation (Placement(transformation(extent={{-180,130},{-160,150}})));
+  Buildings.Controls.OBC.CDL.Integers.Less idxStaLesAct[nSta]
+    "Return true if stage index lower than active stage index"
+    annotation (Placement(transformation(extent={{-150,90},{-130,110}})));
+  Buildings.Controls.OBC.CDL.Logical.And idxStaLesActAva[nSta]
+    annotation (Placement(transformation(extent={{-110,70},{-90,90}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep1(
+    final nout=nSta)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-180,90},{-160,110}})));
+  Utilities.LastTrueIndex idxLasTru(
+    nin=nSta)
+    "Index of next available lower stage"
+    annotation (Placement(transformation(extent={{-70,70},{-50,90}})));
+  Buildings.Controls.OBC.CDL.Integers.Max maxInt1
+    "Maximum between stage index and 1"
+    annotation (Placement(transformation(extent={{-30,110},{-10,130}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep2(
+    final nout=nEqu)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{10,110},{30,130}})));
+  Buildings.Controls.OBC.CDL.Routing.RealExtractor reqEquStaLow[nEqu](
+    each final nin=nSta)
+    "Extract equipment required at next available lower stage"
+    annotation (Placement(transformation(extent={{-10,170},{10,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply capEquStaLow[nEqu]
+    "Capacity of each equipment required at next available lower stage"
+    annotation (Placement(transformation(extent={{30,170},{50,190}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiSum capStaLow(
+    nin=nEqu)
+    "Compute nominal capacity of next available lower stage"
+    annotation (Placement(transformation(extent={{70,170},{90,190}})));
+  Buildings.Controls.OBC.CDL.Integers.Min minInt
+    "Minimum between stage index and 1"
+    annotation (Placement(transformation(extent={{-30,70},{-10,90}})));
+  Buildings.Controls.OBC.CDL.Conversions.IntegerToReal intToRea
+    "Convert to real value"
+    annotation (Placement(transformation(extent={{10,70},{30,90}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply setZer
+    "Set nominal capacity to zero if no lower available stage"
+    annotation (Placement(transformation(extent={{110,170},{130,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply splTimCapSta
+    "SPLR times capacity of active stage"
+    annotation (Placement(transformation(extent={{20,-130},{40,-110}})));
+  Buildings.Controls.OBC.CDL.Reals.Multiply splTimCapStaLow
+    "SPLR times capacity of next available lower stage"
+    annotation (Placement(transformation(extent={{20,-170},{40,-150}})));
+  Utilities.PlaceholderReal parPlrSta(
+    final have_inp=have_inpPlrSta,
+    final have_inpPh=false,
+    final u_internal=plrSta) "Parameter value for SPLR"
+    annotation (Placement(transformation(extent={{-180,-190},{-160,-170}})));
+  Buildings.Controls.OBC.CDL.Logical.FallingEdge endStaPro
+    "True when staging process terminates"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+equation
+  connect(delT.y, absDelT.u)
+    annotation (Line(points={{-148,-80},{-132,-80}},color={0,0,127}));
+  connect(absDelT.y, capReq.u1)
+    annotation (Line(points={{-108,-80},{-100,-80},{-100,-74},{-92,-74}}, color={0,0,127}));
+  connect(capFlo.y, capReq.u2)
+    annotation (Line(points={{-108,-140},{-100,-140},{-100,-86},{-92,-86}},
+      color={0,0,127}));
+  connect(intScaRep.y, reqEquSta.index)
+    annotation (Line(points={{-82,200},{0,200},{0,208}},color={255,127,0}));
+  connect(traMatStaEqu.y, reqEquSta.u)
+    annotation (Line(points={{-48,220},{-12,220}},color={0,0,127}));
+  connect(reqEquSta.y, capEquSta.u1)
+    annotation (Line(points={{12,220},{20,220},{20,226},{28,226}},color={0,0,127}));
+  connect(capEquPar.y, capEquSta.u2)
+    annotation (Line(points={{-48,160},{20,160},{20,214},{28,214}},color={0,0,127}));
+  connect(capEquSta.y, capSta.u)
+    annotation (Line(points={{52,220},{68,220}},color={0,0,127}));
+  connect(movAve.y, hol.u)
+    annotation (Line(points={{-28,-80},{-10,-80},{-10,-66},{18,-66}}, color={0,0,127}));
+  connect(intScaRep.u, maxInt.y)
+    annotation (Line(points={{-106,200},{-118,200}},color={255,127,0}));
+  connect(idxSta.y, idxStaLesAct.u1)
+    annotation (Line(points={{-158,140},{-154,140},{-154,100},{-152,100}},color={255,127,0}));
+  connect(uSta, intScaRep1.u)
+    annotation (Line(points={{-220,180},{-190,180},{-190,100},{-182,100}},color={255,127,0}));
+  connect(intScaRep1.y, idxStaLesAct.u2)
+    annotation (Line(points={{-158,100},{-156,100},{-156,92},{-152,92}},color={255,127,0}));
+  connect(idxStaLesAct.y, idxStaLesActAva.u1)
+    annotation (Line(points={{-128,100},{-120,100},{-120,80},{-112,80}},color={255,0,255}));
+  connect(u1AvaSta, idxStaLesActAva.u2)
+    annotation (Line(points={{-220,80},{-126,80},{-126,72},{-112,72}},color={255,0,255}));
+  connect(idxStaLesActAva.y, idxLasTru.u1)
+    annotation (Line(points={{-88,80},{-72,80}},color={255,0,255}));
+  connect(idxLasTru.y, maxInt1.u2)
+    annotation (Line(points={{-48,80},{-44,80},{-44,114},{-32,114}},color={255,127,0}));
+  connect(one.y, maxInt1.u1)
+    annotation (Line(points={{-158,180},{-40,180},{-40,126},{-32,126}},color={255,127,0}));
+  connect(maxInt1.y, intScaRep2.u)
+    annotation (Line(points={{-8,120},{8,120}},color={255,127,0}));
+  connect(uSta, maxInt.u1)
+    annotation (Line(points={{-220,180},{-190,180},{-190,206},{-142,206}},color={255,127,0}));
+  connect(one.y, maxInt.u2)
+    annotation (Line(points={{-158,180},{-150,180},{-150,194},{-142,194}},color={255,127,0}));
+  connect(intScaRep2.y, reqEquStaLow.index)
+    annotation (Line(points={{32,120},{40,120},{40,140},{0,140},{0,168}},color={255,127,0}));
+  connect(traMatStaEqu.y, reqEquStaLow.u)
+    annotation (Line(points={{-48,220},{-20,220},{-20,180},{-12,180}},color={0,0,127}));
+  connect(reqEquStaLow.y, capEquStaLow.u2)
+    annotation (Line(points={{12,180},{16,180},{16,174},{28,174}},color={0,0,127}));
+  connect(capEquPar.y, capEquStaLow.u1)
+    annotation (Line(points={{-48,160},{20,160},{20,186},{28,186}},color={0,0,127}));
+  connect(capEquStaLow.y, capStaLow.u)
+    annotation (Line(points={{52,180},{68,180}},color={0,0,127}));
+  connect(idxLasTru.y, minInt.u2)
+    annotation (Line(points={{-48,80},{-44,80},{-44,74},{-32,74}},color={255,127,0}));
+  connect(one.y, minInt.u1)
+    annotation (Line(points={{-158,180},{-40,180},{-40,86},{-32,86}},color={255,127,0}));
+  connect(minInt.y, intToRea.u)
+    annotation (Line(points={{-8,80},{8,80}},color={255,127,0}));
+  connect(capStaLow.y, setZer.u1)
+    annotation (Line(points={{92,180},{100,180},{100,186},{108,186}},color={0,0,127}));
+  connect(intToRea.y, setZer.u2)
+    annotation (Line(points={{32,80},{100,80},{100,174},{108,174}},color={0,0,127}));
+  connect(hol.y, gre.u1)
+    annotation (Line(points={{42,-60},{58,-60}},color={0,0,127}));
+  connect(splTimCapSta.y, gre.u2)
+    annotation (Line(points={{42,-120},{44,-120},{44,-68},{58,-68}},color={0,0,127}));
+  connect(capSta.y, splTimCapSta.u2)
+    annotation (Line(points={{92,220},{184,220},{184,-140},{10,-140},{10,-126},
+          {18,-126}},
+      color={0,0,127}));
+  connect(setZer.y, splTimCapStaLow.u2)
+    annotation (Line(points={{132,180},{180,180},{180,-180},{10,-180},{10,-166},
+          {18,-166}},
+      color={0,0,127}));
+  connect(splTimCapStaLow.y, les.u2)
+    annotation (Line(points={{42,-160},{50,-160},{50,-128},{58,-128}},color={0,0,127}));
+  connect(hol.y, les.u1)
+    annotation (Line(points={{42,-60},{50,-60},{50,-120},{58,-120}},color={0,0,127}));
+  connect(gre.y, timUp.u)
+    annotation (Line(points={{82,-60},{108,-60}},
+                                                color={255,0,255}));
+  connect(les.y, timDow.u)
+    annotation (Line(points={{82,-120},{108,-120}},
+                                                  color={255,0,255}));
+  connect(uPlrSta, parPlrSta.u)
+    annotation (Line(points={{-220,-180},{-182,-180}}, color={0,0,127}));
+  connect(parPlrSta.y, splTimCapSta.u1) annotation (Line(points={{-158,-180},{
+          -40,-180},{-40,-114},{18,-114}},
+                                        color={0,0,127}));
+  connect(parPlrSta.y, splTimCapStaLow.u1) annotation (Line(points={{-158,-180},
+          {-40,-180},{-40,-154},{18,-154}},  color={0,0,127}));
+  connect(u1StaPro, hol.u1)
+    annotation (Line(points={{-220,-20},{-10,-20},{-10,-60},{18,-60}}, color={255,0,255}));
+  connect(u1StaPro, endStaPro.u)
+    annotation (Line(points={{-220,-20},{18,-20}}, color={255,0,255}));
+  connect(endStaPro.y, timUp.reset)
+    annotation (Line(points={{42,-20},{90,-20},{90,-68},{108,-68}},
+                                                                  color={255,0,255}));
+  connect(endStaPro.y, timDow.reset)
+    annotation (Line(points={{42,-20},{90,-20},{90,-128},{108,-128}},
+                                                                    color={255,0,255}));
+  connect(timUp.passed, y1Up) annotation (Line(points={{132,-68},{140,-68},{140,
+          80},{220,80}}, color={255,0,255}));
+  connect(timDow.passed, y1Dow) annotation (Line(points={{132,-128},{140,-128},
+          {140,-80},{220,-80}},color={255,0,255}));
+  connect(TSupSet, delT.u1) annotation (Line(points={{-220,-60},{-180,-60},{
+          -180,-74},{-172,-74}}, color={0,0,127}));
+  connect(TRet, delT.u2) annotation (Line(points={{-220,-100},{-180,-100},{-180,
+          -86},{-172,-86}}, color={0,0,127}));
+  connect(V_flow, capFlo.u) annotation (Line(points={{-220,-140},{-132,-140}},
+                                   color={0,0,127}));
+  connect(capReq.y, movAve.u)
+    annotation (Line(points={{-68,-80},{-52,-80}}, color={0,0,127}));
+  annotation (
+    defaultComponentName="chaSta",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-120},{100,120}}),
+      graphics={
+        Rectangle(
+          extent={{-100,120},{100,-120}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,170},{150,130}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-200,-240},{200,240}})),
+    Documentation(
+      info="<html>
+<p>
+The plant equipment is staged in part based on required capacity, <i>Qrequired</i>, 
+relative to nominal capacity of a given stage, <i>Qstage</i>. 
+This ratio is the operative part load ratio, <i>OPLR</i>.
+</p>
+<p>
+<i>OPLR = Qrequired / Qstage</i>
+</p>
+<p>
+If both primary and secondary hot water temperatures and flow rates are available, 
+the sensors in the primary loop are used for calculating <i>Qrequired</i>. 
+If a heat recovery chiller is piped into the secondary return, the sensors in the 
+primary loop are used.
+(These conditions are implemented in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatPumps.AirToWater\">
+Buildings.Templates.Plants.Controls.HeatPumps.AirToWater</a>.)
+</p>
+<p>
+The required capacity is calculated based on return temperature, 
+active supply temperature setpoint and measured flow through the 
+associated circuit flow meter.
+</p>
+<p>
+The required capacity used in logic is a rolling average over a period
+of <code>dtMea</code>
+of instantaneous values sampled at minimum once every <i>30</i>&nbsp;s.
+</p>
+<p>
+When a stage up or stage down transition is initiated, 
+<i>Qrequired</i> is held fixed at its last value until the longer of 
+the successful completion of the stage change 
+and the duration <code>dtRun</code>.
+</p>
+<p>
+The nominal capacity of a given stage, <i>Qstage</i>, is calculated 
+as the sum of the design capacities of all units enabled in a given stage.
+</p>
+<p>
+Staging is executed per the conditions below subject to the following requirements.
+</p>
+<ul>
+<li>
+Each stage has a minimum runtime of <code>dtRun</code>.
+(This condition is implemented in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
+Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>.)
+</li>
+<li>
+Timers are reset to zero at the completion of every stage change.
+</li>
+<li>
+Any unavailable stage is skipped during staging events, 
+but staging conditionals in the current stage are evaluated as per usual.
+</li>
+</ul>
+<p>
+A stage up command is triggered if any of the following is true:
+</p>
+<ul>
+<li>
+Availability Condition: The equipment necessary to operate the 
+current stage is unavailable. 
+The availability condition is not subject to the minimum stage runtime requirement.
+(This condition is implemented in
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
+Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>.)
+</li>
+<li>
+Efficiency Condition: Current stage <i>OPLR &gt; plrSta</i> for a duration of <code>dtRun</code>.
+</li>
+</ul>
+<p>
+A stage down command is triggered if the following is true:
+</p>
+<ul>
+<li>
+Next available lower stage <i>OPLR &lt; plrSta</i> for a duration of <code>dtRun</code>.
+</li>
+</ul>
+<h4>
+Details
+</h4>
+<p>
+A staging matrix <code>staEqu</code> is required as a parameter. 
+See the documentation of 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable\">
+Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable</a>
+for the associated definition and requirements.
+</p>
+<p>
+An \"if\" condition is used to generate the stage up and down command as opposed
+to a \"when\" condition. This means that the command remains true as long as the
+condition is verified. This is necessary, for example, if no higher stage is
+available when a stage up command is triggered. Using a \"when\" condition &ndash;
+which is only valid at the point in time at which the condition becomes true &ndash;
+would prevent the plant from staging when a higher stage becomes available again.
+To avoid multiple consecutive stage changes, the block that receives the stage up
+and down command and computes the stage index must enforce a minimum stage runtime
+of <code>dtRun</code>.
+</p>
+</html>"));
+end StageChangeCommand;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo b/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo
new file mode 100644
index 00000000000..502f90bad01
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/StageCompletion.mo
@@ -0,0 +1,158 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+block StageCompletion
+  "Checks successful completion of stage change"
+  parameter Integer nin=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1[nin]
+    "Equipment enable command"
+    annotation (Placement(transformation(extent={{-200,-20},{-160,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1_actual[nin]
+    "Equipment status"
+    annotation (Placement(transformation(extent={{-200,-80},{-160,-40}}),
+      iconTransformation(extent={{-140,-60},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1End
+    "Successful completion of stage change"
+    annotation (Placement(transformation(extent={{160,80},{200,120}}),
+      iconTransformation(extent={{100,40},{140,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1
+    "Stage change in progress"
+    annotation (Placement(transformation(extent={{160,-80},{200,-40}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+  Buildings.Controls.OBC.CDL.Logical.And enaAndOn[nin]
+    "True if equipment enabled and on status returned"
+    annotation (Placement(transformation(extent={{-50,-10},{-30,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Nor disAndOff[nin]
+    "True if equipment disabled and off status returned"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd allTru(
+    nin=nin)
+    "True if all inputs true"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Or onOrOff[nin]
+    "True if on or off condition met"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Logical.FallingEdge endStaPro
+    "True when staging process terminates"
+    annotation (Placement(transformation(extent={{120,90},{140,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lckChaSta
+    "Lock stage change signal until conditions on equipment command and status met"
+    annotation (Placement(transformation(extent={{30,90},{50,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Change cha[nin]
+    "True if enable signal changes"
+    annotation (Placement(transformation(extent={{-130,50},{-110,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Latch lckAnyCha
+    "Lock equipment command change signal until next stage change"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiOr anyCha(
+    nin=nin)
+    "True if any enable signal changes"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Controls.OBC.CDL.Logical.And chaAndMat
+    "True if enable command changed and equipment status matches command"
+    annotation (Placement(transformation(extent={{30,50},{50,70}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold holAnyCha(
+    trueHoldDuration=1,
+    falseHoldDuration=0)
+    "Hold signal to guard against concomitant stage change and command change"
+    annotation (Placement(transformation(extent={{-50,50},{-30,70}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uSta
+    "Stage index"
+    annotation (Placement(transformation(extent={{-200,80},{-160,120}}),
+      iconTransformation(extent={{-140,20},{-100,60}})));
+  Buildings.Controls.OBC.CDL.Integers.Change chaSta
+    "Return true when stage change is initiated"
+    annotation (Placement(transformation(extent={{-130,90},{-110,110}})));
+equation
+  connect(u1_actual, disAndOff.u2)
+    annotation (Line(points={{-180,-60},{-60,-60},{-60,-48},{-52,-48}},color={255,0,255}));
+  connect(u1_actual, enaAndOn.u2)
+    annotation (Line(points={{-180,-60},{-60,-60},{-60,-8},{-52,-8}},color={255,0,255}));
+  connect(endStaPro.y, y1End)
+    annotation (Line(points={{142,100},{180,100}},color={255,0,255}));
+  connect(lckChaSta.y, y1)
+    annotation (Line(points={{52,100},{100,100},{100,-60},{180,-60}},color={255,0,255}));
+  connect(cha.y, anyCha.u)
+    annotation (Line(points={{-108,60},{-92,60}},color={255,0,255}));
+  connect(u1, cha.u)
+    annotation (Line(points={{-180,0},{-140,0},{-140,60},{-132,60}},color={255,0,255}));
+  connect(u1, enaAndOn.u1)
+    annotation (Line(points={{-180,0},{-52,0}},color={255,0,255}));
+  connect(lckAnyCha.y, chaAndMat.u1)
+    annotation (Line(points={{12,60},{28,60}},color={255,0,255}));
+  connect(chaAndMat.y, lckChaSta.clr)
+    annotation (Line(points={{52,60},{60,60},{60,80},{20,80},{20,94},{28,94}},
+      color={255,0,255}));
+  connect(lckChaSta.y, endStaPro.u)
+    annotation (Line(points={{52,100},{118,100}},color={255,0,255}));
+  connect(u1, disAndOff.u1)
+    annotation (Line(points={{-180,0},{-140,0},{-140,-40},{-52,-40}},color={255,0,255}));
+  connect(enaAndOn.y, onOrOff.u1)
+    annotation (Line(points={{-28,0},{-12,0}},color={255,0,255}));
+  connect(disAndOff.y, onOrOff.u2)
+    annotation (Line(points={{-28,-40},{-20,-40},{-20,-8},{-12,-8}},color={255,0,255}));
+  connect(onOrOff.y, allTru.u)
+    annotation (Line(points={{12,0},{28,0}},color={255,0,255}));
+  connect(allTru.y, chaAndMat.u2)
+    annotation (Line(points={{52,0},{60,0},{60,40},{20,40},{20,52},{28,52}},
+      color={255,0,255}));
+  connect(anyCha.y, holAnyCha.u)
+    annotation (Line(points={{-68,60},{-52,60}},color={255,0,255}));
+  connect(holAnyCha.y, lckAnyCha.u)
+    annotation (Line(points={{-28,60},{-12,60}},color={255,0,255}));
+  connect(chaSta.y, lckChaSta.u)
+    annotation (Line(points={{-108,100},{28,100}},color={255,0,255}));
+  connect(chaSta.y, lckAnyCha.clr)
+    annotation (Line(points={{-108,100},{-20,100},{-20,54},{-12,54}},color={255,0,255}));
+  connect(uSta, chaSta.u)
+    annotation (Line(points={{-180,100},{-132,100}},color={255,127,0}));
+  annotation (
+    defaultComponentName="comSta",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,170},{150,130}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-160,-140},{160,140}})),
+    Documentation(
+      info="<html>
+<p>
+Block that detects a stage change and evaluates whether the stage
+transition is completed.
+</p>
+<p>
+The completion of a stage change is considered successful when
+both of the following conditions have been verified.
+</p>
+<ul>
+<li>
+Following a stage transition event, or exactly at the same time,
+there is a change in the enable command of at least one equipment.
+</li>
+<li>
+The equipment status matches the enable command for all units,
+after any change in the enable command has been detected.
+</li>
+</ul>
+<p>
+The output signal <code>y1End</code> is true exactly at the time when
+the successful completion of the stage change is confirmed.
+The output signal <code>y1</code> is true during the entire time in which
+the stage change is in progress.
+</p>
+</html>"));
+end StageCompletion;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mo
new file mode 100644
index 00000000000..0efd4813da9
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mo
@@ -0,0 +1,94 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model EquipmentAvailability "Validation model for the evaluation of equipment availability"
+  Buildings.Templates.Plants.Controls.StagingRotation.EquipmentAvailability
+    avaHeaCoo(have_heaWat=true, have_chiWat=true)
+    "Evaluate equipment availability – Heating and cooling"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1Ava(
+    table=[
+      0, 1;
+      8, 0;
+      9, 1],
+    timeScale=1000,
+    period=10000)
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1_actual(
+    table=[
+      0, 1;
+      1, 0;
+      2.5, 1;
+      4.2, 0;
+      5, 1;
+      7, 1;
+      8, 0;
+      9, 1],
+    timeScale=1000,
+    period=10000)
+    "Equipment status"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1Hea_actual(
+    table=[
+      0, 1;
+      1, 1;
+      2, 1;
+      5, 0;
+      8.5, 1;
+      9.7, 0],
+    timeScale=1000,
+    period=10000)
+    "Equipment operating mode"
+    annotation (Placement(transformation(extent={{-80,-48},{-60,-28}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.EquipmentAvailability
+    avaHea(have_heaWat=true, have_chiWat=false)
+    "Evaluate equipment availability – Heating only"
+    annotation (Placement(transformation(extent={{0,-70},{20,-50}})));
+equation
+  connect(u1Hea_actual.y[1], avaHeaCoo.u1Hea)
+    annotation (Line(points={{-58,-38},{-30,-38},{-30,-6},{-2,-6}},color={255,0,255}));
+  connect(u1_actual.y[1], avaHeaCoo.u1)
+    annotation (Line(points={{-58,40},{-20,40},{-20,6},{-2,6}},color={255,0,255}));
+  connect(u1_actual.y[1], avaHea.u1)
+    annotation (Line(points={{-58,40},{-20,40},{-20,-54},{-2,-54}},color={255,0,255}));
+  connect(u1Ava.y[1], avaHeaCoo.u1Ava)
+    annotation (Line(points={{-58,0},{-2,0}},color={255,0,255}));
+  connect(u1Ava.y[1], avaHea.u1Ava)
+    annotation (Line(points={{-58,0},{-40,0},{-40,-60},{-2,-60}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentAvailability.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=10000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EquipmentAvailability\">
+Buildings.Templates.Plants.Controls.StagingRotation.EquipmentAvailability</a>
+for heating-only applications (component <code>avaHeaCoo</code>) and heating and cooling 
+applications (component <code>avaHea</code>).
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EquipmentAvailability;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo
new file mode 100644
index 00000000000..dccbd808ee7
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mo
@@ -0,0 +1,134 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model EquipmentEnable "Validation model for equipment enable logic"
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1AvaEqu(
+    table=[
+      0, 1, 1, 1;
+      6, 0, 0, 1;
+      8, 0, 1, 1;
+      10, 1, 0, 1;
+      15, 1, 1, 0;
+      18, 0, 1, 1;
+      22, 1, 1, 1],
+    timeScale=1,
+    period=25)
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable equEnaOneTwo(
+    staEqu=[
+      1, 0, 0;
+      0, 1 / 2, 1 / 2;
+      1, 1 / 2, 1 / 2;
+      0, 1, 1;
+      1, 1, 1])
+    "Compute array of enabled equipment – One small equipment, two large equally sized equipment"
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable uSta(
+    table=[
+      0, 1;
+      5, 2;
+      10, 3;
+      15, 4;
+      20, 5],
+    timeScale=1,
+    period=25)
+    "Stage index"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable equEnaEqu(
+    staEqu=[
+      1 / 3, 1 / 3, 1 / 3;
+      2 / 3, 2 / 3, 2 / 3;
+      1, 1, 1])
+    "Compute array of enabled equipment – Equally sized units"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable uSta1(
+    table=[
+      0, 1;
+      10, 2;
+      20, 3],
+    timeScale=1,
+    period=25)
+    "Stage index"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[3]
+    "Cast to real"
+    annotation (Placement(transformation(extent={{-28,50},{-8,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sort sort(
+    ascending=false,
+    nin=3)
+    "Sort lead/lag alternate equipment with available equipment first"
+    annotation (Placement(transformation(extent={{0,50},{20,70}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1[2]
+    "Cast to real"
+    annotation (Placement(transformation(extent={{-28,-90},{-8,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sort sort1(
+    ascending=false,
+    nin=2)
+    "Sort lead/lag alternate equipment with available equipment first"
+    annotation (Placement(transformation(extent={{0,-90},{20,-70}})));
+  Buildings.Controls.OBC.CDL.Integers.AddParameter addPar[2](
+    each final p=1)
+    "Restore indices with respect to original vector u1AvaEqu"
+    annotation (Placement(transformation(extent={{30,-90},{50,-70}})));
+equation
+  connect(u1AvaEqu.y, equEnaOneTwo.u1Ava)
+    annotation (Line(points={{-58,-40},{-40,-40},{-40,-46},{68,-46}},color={255,0,255}));
+  connect(uSta.y[1], equEnaOneTwo.uSta)
+    annotation (Line(points={{-58,0},{40,0},{40,-40},{68,-40}},color={255,127,0}));
+  connect(uSta1.y[1], equEnaEqu.uSta)
+    annotation (Line(points={{-58,40},{30,40},{30,40},{68,40}},color={255,127,0}));
+  connect(u1AvaEqu.y, equEnaEqu.u1Ava)
+    annotation (Line(points={{-58,-40},{-40,-40},{-40,34},{68,34}},color={255,0,255}));
+  connect(u1AvaEqu.y, booToRea.u)
+    annotation (Line(points={{-58,-40},{-40,-40},{-40,60},{-30,60}},color={255,0,255}));
+  connect(booToRea.y, sort.u)
+    annotation (Line(points={{-6,60},{-2,60}},color={0,0,127}));
+  connect(sort.yIdx, equEnaEqu.uIdxAltSor)
+    annotation (Line(points={{22,54},{60,54},{60,46},{68,46}},color={255,127,0}));
+  connect(u1AvaEqu.y[2:3], booToRea1.u)
+    annotation (Line(points={{-58,-40},{-40,-40},{-40,-80},{-30,-80}},color={255,0,255}));
+  connect(booToRea1.y, sort1.u)
+    annotation (Line(points={{-6,-80},{-2,-80}},color={0,0,127}));
+  connect(sort1.yIdx, addPar.u)
+    annotation (Line(points={{22,-86},{26,-86},{26,-80},{28,-80}},color={255,127,0}));
+  connect(addPar.y, equEnaOneTwo.uIdxAltSor)
+    annotation (Line(points={{52,-80},{60,-80},{60,-34},{68,-34}},color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EquipmentEnable.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=25.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable\">
+Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable</a>
+in a configuration with three equally sized units (component <code>equEnaEqu</code>) 
+and in a configuration with one small unit and two large equally sized 
+units (component <code>equEnaOneTwo</code>).
+Only the units of the same size are lead/lag alternated.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EquipmentEnable;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mo
new file mode 100644
index 00000000000..b65464224cf
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mo
@@ -0,0 +1,117 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model EventSequencing "Validation model for event sequencing logic"
+  Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing seqEveHea(
+    have_heaWat=true,
+    have_chiWat=false,
+    have_valInlIso=true,
+    have_valOutIso=false,
+    have_pumHeaWatPri=true,
+    have_pumHeaWatSec=true)
+    "Event sequencing – Heating-only system with primary-secondary distribution"
+    annotation (Placement(transformation(extent={{20,6},{40,34}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1(
+    table=[0,0,0; 1,1,0; 2,0,0; 3,0,1; 4,0,0; 5,0,0],
+    timeScale=900,
+    period=4500)
+    "Command signal – Index 1 for heating command, 2 for cooling command"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea
+    "Convert command signal to real value"
+    annotation (Placement(transformation(extent={{50,50},{30,70}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol(samplePeriod=1)
+    "Hold signal value"
+    annotation (Placement(transformation(extent={{20,50},{0,70}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr
+    "Compare to zero to compute equipment status"
+    annotation (Placement(transformation(extent={{-10,50},{-30,70}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing seqEveHeaCoo(
+    have_heaWat=true,
+    have_chiWat=true,
+    have_valInlIso=true,
+    have_valOutIso=true,
+    have_pumHeaWatPri=true,
+    have_pumChiWatPri=false,
+    have_pumHeaWatSec=false,
+    have_pumChiWatSec=false)
+    "Event sequencing – Heating and cooling system with primary-only distribution"
+    annotation (Placement(transformation(extent={{20,-34},{40,-6}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea1
+    "Convert command signal to real value"
+    annotation (Placement(transformation(extent={{50,-70},{30,-50}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol1(samplePeriod=1)
+    "Hold signal value"
+    annotation (Placement(transformation(extent={{20,-70},{0,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr1
+    "Compare to zero to compute equipment status"
+    annotation (Placement(transformation(extent={{-10,-70},{-30,-50}})));
+equation
+  connect(u1.y[1], seqEveHea.u1Hea) annotation (Line(points={{-58,0},{0,0},{0,
+          32},{18,32}},    color={255,0,255}));
+  connect(u1.y[1], seqEveHea.u1PumHeaWatSec_actual) annotation (Line(points={{-58,0},
+          {0,0},{0,14},{18,14}},        color={255,0,255}));
+  connect(booToRea.y,zerOrdHol. u)
+    annotation (Line(points={{28,60},{22,60}},
+                                             color={0,0,127}));
+  connect(zerOrdHol.y,greThr. u)
+    annotation (Line(points={{-2,60},{-8,60}},  color={0,0,127}));
+  connect(seqEveHea.y1PumHeaWatPri, booToRea.u) annotation (Line(points={{42,12},
+          {60,12},{60,60},{52,60}},   color={255,0,255}));
+  connect(greThr.y, seqEveHea.u1PumHeaWatPri_actual) annotation (Line(points={{-32,60},
+          {-40,60},{-40,20},{18,20}}, color={255,0,255}));
+  connect(u1.y[1], seqEveHeaCoo.u1Hea) annotation (Line(points={{-58,0},{0,0},{
+          0,-8},{18,-8}}, color={255,0,255}));
+  connect(booToRea1.y, zerOrdHol1.u)
+    annotation (Line(points={{28,-60},{22,-60}}, color={0,0,127}));
+  connect(zerOrdHol1.y, greThr1.u)
+    annotation (Line(points={{-2,-60},{-8,-60}}, color={0,0,127}));
+  connect(seqEveHeaCoo.y1PumHeaWatPri, booToRea1.u) annotation (Line(points={{
+          42,-28},{60,-28},{60,-60},{52,-60}}, color={255,0,255}));
+  connect(greThr1.y, seqEveHeaCoo.u1PumHeaWatPri_actual) annotation (Line(
+        points={{-32,-60},{-40,-60},{-40,-20},{18,-20}}, color={255,0,255}));
+  connect(u1.y[2], seqEveHeaCoo.u1Coo) annotation (Line(points={{-58,0},{0,0},{
+          0,-12},{18,-12}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/EventSequencing.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=4500.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing\">
+Buildings.Templates.Plants.Controls.StagingRotation.EventSequencing</a>
+for the following configurations.
+</p>
+<ul>
+<li>
+Heating-only plant with primary-secondary distribution (component <code>seqEveHea</code>)
+</li>
+<li>
+Heating and cooling plant with primary-only distribution (component <code>seqEveHeaCoo</code>)
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end EventSequencing;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo
new file mode 100644
index 00000000000..88174ac9745
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mo
@@ -0,0 +1,148 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model SortRuntime "Validation model for equipment runtime sorting logic"
+  Buildings.Templates.Plants.Controls.StagingRotation.SortRuntime sorRunTim(
+    nin=3)
+    "Sort runtime"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Utilities.TrueArrayConditional u1Ena(
+    nin=3)
+    "Equipment enable signal"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal booToRea[3]
+    "Convert command signal to real value"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold zerOrdHol[3](
+    each samplePeriod=1)
+    "Hold signal value"
+    annotation (Placement(transformation(extent={{90,-10},{110,10}})));
+  Buildings.Controls.OBC.CDL.Reals.GreaterThreshold greThr[3]
+    "Compare to zero to compute equipment status"
+    annotation (Placement(transformation(extent={{120,-10},{140,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1AvaEqu(
+    table=[
+      0, 1, 1, 1;
+      2000, 0, 1, 1;
+      2500, 0, 1, 0;
+      3000, 1, 1, 1],
+    timeScale=1,
+    period=3000)
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-130,-110},{-110,-90}})));
+  Utilities.StageIndex idxSta(
+    nSta=3,
+    dtRun=60)
+    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Lea(
+    k=true)
+    "Lead equipment enable signal"
+    annotation (Placement(transformation(extent={{-130,90},{-110,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger upPul(
+    period=60)
+    "Stage up command pulse"
+    annotation (Placement(transformation(extent={{-130,-30},{-110,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger dowPul(
+    period=60)
+    "Stage down command pulse"
+    annotation (Placement(transformation(extent={{-130,-70},{-110,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
+    table=[
+      0, 0, 0;
+      60, 1, 0;
+      300, 0, 1],
+    period=500)
+    "Signal to inhibit up and down commands"
+    annotation (Placement(transformation(extent={{-130,10},{-110,30}})));
+  Buildings.Controls.OBC.CDL.Logical.And up
+    "Stage up command"
+    annotation (Placement(transformation(extent={{-80,-30},{-60,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.And dow
+    "Stage up command"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaSta[3](
+    each k=true)
+    "Stage available signal"
+    annotation (Placement(transformation(extent={{-130,50},{-110,70}})));
+  Buildings.Controls.OBC.CDL.Logical.And run[3]
+    "Returns true if equipment is enabled and available"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+equation
+  connect(sorRunTim.yIdx, u1Ena.uIdx)
+    annotation (Line(points={{-18,-6},{-12,-6},{-12,-6},{-2,-6}},color={255,127,0}));
+  connect(booToRea.y, zerOrdHol.u)
+    annotation (Line(points={{82,0},{88,0}},color={0,0,127}));
+  connect(zerOrdHol.y, greThr.u)
+    annotation (Line(points={{112,0},{118,0}},color={0,0,127}));
+  connect(greThr.y, sorRunTim.u1Run)
+    annotation (Line(points={{142,0},{150,0},{150,20},{-46,20},{-46,6},{-42,6}},
+      color={255,0,255}));
+  connect(u1AvaEqu.y[1:3], sorRunTim.u1Ava[1:3])
+    annotation (Line(points={{-108,-100},{-46,-100},{-46,-6},{-42,-6},{-42,-5.33333}},
+      color={255,0,255}));
+  connect(u1Lea.y, idxSta.u1Lea)
+    annotation (Line(points={{-108,100},{-50,100},{-50,46},{-42,46}},color={255,0,255}));
+  connect(upPul.y, up.u2)
+    annotation (Line(points={{-108,-20},{-100,-20},{-100,-28},{-82,-28}},color={255,0,255}));
+  connect(booTimTab.y[2], dow.u1)
+    annotation (Line(points={{-108,20},{-90,20},{-90,-60},{-82,-60}},color={255,0,255}));
+  connect(booTimTab.y[1], up.u1)
+    annotation (Line(points={{-108,20},{-90,20},{-90,-20},{-82,-20}},color={255,0,255}));
+  connect(dowPul.y, dow.u2)
+    annotation (Line(points={{-108,-60},{-100,-60},{-100,-68},{-82,-68}},color={255,0,255}));
+  connect(up.y, idxSta.u1Up)
+    annotation (Line(points={{-58,-20},{-50,-20},{-50,42},{-42,42}},color={255,0,255}));
+  connect(dow.y, idxSta.u1Dow)
+    annotation (Line(points={{-58,-60},{-48,-60},{-48,38},{-42,38}},color={255,0,255}));
+  connect(u1AvaSta.y, idxSta.u1AvaSta)
+    annotation (Line(points={{-108,60},{-52,60},{-52,34},{-42,34}},color={255,0,255}));
+  connect(idxSta.y, u1Ena.u)
+    annotation (Line(points={{-18,40},{-10,40},{-10,0},{-2,0}},color={255,127,0}));
+  connect(u1Ena.y1, run.u1)
+    annotation (Line(points={{22,0},{28,0}},color={255,0,255}));
+  connect(u1AvaEqu.y[1:3], run.u2)
+    annotation (Line(points={{-108,-100},{24,-100},{24,-8},{28,-8}},color={255,0,255}));
+  connect(run.y, booToRea.u)
+    annotation (Line(points={{52,0},{58,0}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/SortRuntime.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=5000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-160,-120},{160,120}})),
+    Documentation(
+      info="<html>
+<p>
+The simulation shows that even wear is achieved among available equipment.
+When it becomes unavailable, equipment #1 is sent to last position,
+and automatically moves up in the staging order only if another 
+equipment (#3) becomes unavailable.
+</p>
+<p>
+We can verify that no equipment gets \"hot swapped\".
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SortRuntime;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mo
new file mode 100644
index 00000000000..a0b2c512e60
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mo
@@ -0,0 +1,77 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model StageAvailability "Validation model for the evaluation of stage availability"
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable u1AvaEqu(
+    table=[
+      0, 0, 0, 0;
+      1, 1, 0, 0;
+      2, 0, 1, 0;
+      3, 0, 0, 1;
+      4, 1, 1, 0;
+      5, 0, 1, 1;
+      6, 1, 1, 1;
+      7, 0, 0, 0],
+    timeScale=1,
+    period=7)
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.StageAvailability avaStaEqu(
+    staEqu=[
+      1 / 3, 1 / 3, 1 / 3;
+      2 / 3, 2 / 3, 2 / 3;
+      1, 1, 1])
+    "Compute stage availability – Equally sized units"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.StageAvailability avaStaOneTwo(
+    staEqu=[
+      1, 0, 0;
+      0, 1 / 2, 1 / 2;
+      1, 1 / 2, 1 / 2;
+      0, 1, 1;
+      1, 1, 1])
+    "Compute stage availability – One small equipment, two large equally sized equipment"
+    annotation (Placement(transformation(extent={{-10,-30},{10,-10}})));
+equation
+  connect(u1AvaEqu.y, avaStaEqu.u1Ava)
+    annotation (Line(points={{-58,0},{-20,0},{-20,20},{-12,20}},color={255,0,255}));
+  connect(u1AvaEqu.y, avaStaOneTwo.u1Ava)
+    annotation (Line(points={{-58,0},{-20,0},{-20,-20},{-12,-20}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageAvailability.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=7.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.StageAvailability\">
+Buildings.Templates.Plants.Controls.StagingRotation.StageAvailability</a>
+in a configuration with three equally sized units (component <code>avaStaEqu</code>) 
+and in a configuration with one small unit and two large equally sized 
+units (component <code>avaStaOneTwo</code>).
+Only the units of the same size are lead/lag alternated.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StageAvailability;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo
new file mode 100644
index 00000000000..00122f80dd9
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mo
@@ -0,0 +1,200 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model StageChangeCommand "Validation model for stage change logic"
+  parameter Real cp_default(
+    final unit="J/(kg.K)")=4184
+    "Default specific heat capacity"
+    annotation (Dialog(group="Configuration",
+      enable=false));
+  parameter Real rho_default(
+    final unit="kg/m3")=996
+    "Default specific heat capacity"
+    annotation (Dialog(group="Configuration",
+      enable=false));
+  final parameter Real capHea_nominal(
+    final unit="W")=sum(chaSta.capEqu)
+    "Installed heating capacity"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real THeaWatSup_nominal(
+    final unit="K",
+    displayUnit="degC")=50 + 273.15
+    "Design HW supply temperature"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Real THeaWatRet_nominal(
+    final unit="K",
+    displayUnit="degC")=42 + 273.15
+    "Design HW return temperature"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Real VHeaWat_flow_nominal(
+    final unit="m3/s")=capHea_nominal /(THeaWatSup_nominal - THeaWatRet_nominal) /
+    cp_default / rho_default
+    "Design primary HW volume flow rate"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Integer nSta=size(chaSta.staEqu, 1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratV_flow(
+    table=[
+      0, 0;
+      1, 0;
+      5, 0.2;
+      6, 0.01;
+      11, 1;
+      12, 1;
+      18, 0],
+    timeScale=1000)
+    "Source signal for volume flow rate ratio"
+    annotation (Placement(transformation(extent={{-130,-50},{-110,-30}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.StageChangeCommand chaSta(
+    plrSta=0.9,
+    staEqu=[
+      1, 0, 0;
+      0, 1 / 2, 1 / 2;
+      1, 1 / 2, 1 / 2;
+      0, 1, 1;
+      1, 1, 1],
+    capEqu=1E3 * {100, 450, 450},
+    cp_default=cp_default,
+    rho_default=rho_default)
+    "Generate stage change command"
+    annotation (Placement(transformation(extent={{-50,-12},{-30,12}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TSupSet(
+    final k=THeaWatSup_nominal)
+    "HWST setpoint"
+    annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TRet(
+    final k=THeaWatRet_nominal)
+    "HWRT"
+    annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
+  Utilities.StageIndex idxSta(
+    final nSta=nSta, dtRun=900)
+    "Compute stage index"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1Lea(
+    k=true)
+    "Lead equipment enable signal"
+    annotation (Placement(transformation(extent={{-130,70},{-110,90}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaSta[nSta](
+    each k=true)
+    "Stage available signal"
+    annotation (Placement(transformation(extent={{-130,-90},{-110,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold      y1UpHol(duration=1)
+    "Hold stage up command for plotting"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold      y1DowHol(duration=1)
+    "Hold stage down command for plotting"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter V_flow(
+    final k=VHeaWat_flow_nominal)
+    "Scale by design flow"
+    annotation (Placement(transformation(extent={{-100,-50},{-80,-30}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.EquipmentEnable enaEqu(
+    final staEqu=chaSta.staEqu)
+    "Enable equipment"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant idxEquLeaLag[2](
+    final k={2, 3})
+    "Indices of lead/lag equipment"
+    annotation (Placement(transformation(extent={{-100,90},{-80,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaEqu[3](
+    each final k=true)
+    "Equipment available signal"
+    annotation (Placement(transformation(extent={{-100,-110},{-80,-90}})));
+  Components.Controls.StatusEmulator staEqu[3](
+    each riseTime=60)
+    "Evaluate equipment status"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+  Buildings.Templates.Plants.Controls.StagingRotation.StageCompletion comSta(
+    nin=3)
+    "Check completion of stage change"
+    annotation (Placement(transformation(extent={{-30,50},{-50,70}})));
+equation
+  connect(TRet.y, chaSta.TRet)
+    annotation (Line(points={{-108,0},{-100,0},{-100,-6},{-52,-6}},color={0,0,127}));
+  connect(TSupSet.y, chaSta.TSupSet)
+    annotation (Line(points={{-108,40},{-100,40},{-100,-4},{-52,-4}},color={0,0,127}));
+  connect(chaSta.y1Up, idxSta.u1Up)
+    annotation (Line(points={{-28,4},{-20,4},{-20,2},{-2,2}},color={255,0,255}));
+  connect(chaSta.y1Dow, idxSta.u1Dow)
+    annotation (Line(points={{-28,-4},{-20,-4},{-20,-2},{-2,-2}},color={255,0,255}));
+  connect(u1Lea.y, idxSta.u1Lea)
+    annotation (Line(points={{-108,80},{-10,80},{-10,6},{-2,6}},color={255,0,255}));
+  connect(u1AvaSta.y, idxSta.u1AvaSta)
+    annotation (Line(points={{-108,-80},{-10,-80},{-10,-6},{-2,-6}},color={255,0,255}));
+  connect(idxSta.y, chaSta.uSta)
+    annotation (Line(points={{22,0},{40,0},{40,20},{-56,20},{-56,10},{-52,10}},
+      color={255,127,0}));
+  connect(chaSta.y1Up, y1UpHol.u)
+    annotation (Line(points={{-28,4},{-20,4},{-20,40},{-2,40}},color={255,0,255}));
+  connect(chaSta.y1Dow, y1DowHol.u)
+    annotation (Line(points={{-28,-4},{-20,-4},{-20,-40},{-2,-40}},color={255,0,255}));
+  connect(u1AvaSta.y, chaSta.u1AvaSta)
+    annotation (Line(points={{-108,-80},{-60,-80},{-60,6},{-52,6}},color={255,0,255}));
+  connect(ratV_flow.y[1], V_flow.u)
+    annotation (Line(points={{-108,-40},{-102,-40}},color={0,0,127}));
+  connect(V_flow.y, chaSta.V_flow)
+    annotation (Line(points={{-78,-40},{-56,-40},{-56,-8},{-52,-8}},color={0,0,127}));
+  connect(idxSta.y, enaEqu.uSta)
+    annotation (Line(points={{22,0},{58,0}},color={255,127,0}));
+  connect(idxEquLeaLag.y, enaEqu.uIdxAltSor)
+    annotation (Line(points={{-78,100},{54,100},{54,6},{58,6}},color={255,127,0}));
+  connect(u1AvaEqu.y, enaEqu.u1Ava)
+    annotation (Line(points={{-78,-100},{54,-100},{54,-6},{58,-6}},color={255,0,255}));
+  connect(enaEqu.y1, staEqu.y1)
+    annotation (Line(points={{82,0},{98,0}},color={255,0,255}));
+  connect(comSta.y1, chaSta.u1StaPro)
+    annotation (Line(points={{-52,54},{-58,54},{-58,2},{-52,2}},color={255,0,255}));
+  connect(enaEqu.y1, comSta.u1)
+    annotation (Line(points={{82,0},{90,0},{90,60},{-28,60},{-28,60}},color={255,0,255}));
+  connect(staEqu.y1_actual, comSta.u1_actual)
+    annotation (Line(points={{122,0},{130,0},{130,56},{-28,56}},color={255,0,255}));
+  connect(idxSta.y, comSta.uSta)
+    annotation (Line(points={{22,0},{40,0},{40,64},{-28,64}},color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageChangeCommand.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=20000.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-140,-120},{140,120}})),
+    Documentation(info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.StageChangeCommand\">
+Buildings.Templates.Plants.Controls.StagingRotation.StageChangeCommand</a>
+in a configuration with one small unit and two large equally sized 
+units (component <code>avaStaOneTwo</code>).
+In response to a varying flow rate, the variation of the
+required capacity <code>chaSta.capReq.y</code> triggers stage change
+events.
+The block 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
+Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>
+is used to illustrate how these events translate into
+a varying plant stage index <code>idxSta.y</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StageChangeCommand;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo
new file mode 100644
index 00000000000..9ac6eee1833
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mo
@@ -0,0 +1,86 @@
+within Buildings.Templates.Plants.Controls.StagingRotation.Validation;
+model StageCompletion "Validation model for the evaluation of stage completion"
+  Buildings.Templates.Plants.Controls.StagingRotation.StageCompletion comSta(
+    nin=2)
+    "Check successful completion of stage change"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
+    table=[
+      0, 0, 0, 0, 0;
+      1, 0, 0, 0, 0;
+      3, 1, 0, 0, 0;
+      6, 1, 0, 1, 0;
+      21, 1, 0, 1, 0;
+      22, 0, 0, 1, 0;
+      24, 0, 0, 0, 0],
+    timeScale=60,
+    period=1800)
+    "Source for Boolean signals"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold      y1ComSta(duration=1)
+    "Hold stage completion signal for plotting"
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable idxSta(
+    table=[
+      0, 0;
+      1, 1;
+      21, 0],
+    timeScale=60,
+    period=1800)
+    "Stage index"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+equation
+  connect(comSta.y1End, y1ComSta.u)
+    annotation (Line(points={{42,6},{50,6},{50,0},{58,0}},color={255,0,255}));
+  connect(booTimTab.y[1:2], comSta.u1[1:2])
+    annotation (Line(points={{-58,0},{18,0},{18,0.5}},color={255,0,255}));
+  connect(booTimTab.y[3:4], comSta.u1_actual[1:2])
+    annotation (Line(points={{-58,0},{0,0},{0,-4},{18,-4},{18,-3.5}},color={255,0,255}));
+  connect(idxSta.y[1], comSta.uSta)
+    annotation (Line(points={{-58,40},{0,40},{0,4},{18,4}},color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/StagingRotation/Validation/StageCompletion.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1800.0,
+      Tolerance=1e-06),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Documentation(info="<html>
+<p>
+This model validates 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.StagingRotation.StageCompletion\">
+Buildings.Templates.Plants.Controls.StagingRotation.StageCompletion</a>
+in a configuration with one small unit and two large equally sized 
+units (component <code>avaStaOneTwo</code>).
+In response to a varying flow rate, the variation of the
+required capacity <code>chaSta.capReq.y</code> triggers stage change
+events.
+The block 
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
+Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>
+is used to illustrate how these events translate into
+a varying plant stage index <code>idxSta.y</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StageCompletion;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.mo b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.mo
new file mode 100644
index 00000000000..704ea747169
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.mo
@@ -0,0 +1,29 @@
+within Buildings.Templates.Plants.Controls.StagingRotation;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order
new file mode 100644
index 00000000000..fb6e2c8e0f6
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/Validation/package.order
@@ -0,0 +1,7 @@
+EquipmentAvailability
+EquipmentEnable
+EventSequencing
+SortRuntime
+StageAvailability
+StageChangeCommand
+StageCompletion
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/package.mo b/Buildings/Templates/Plants/Controls/StagingRotation/package.mo
new file mode 100644
index 00000000000..34a7cfdbcf1
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/package.mo
@@ -0,0 +1,43 @@
+within Buildings.Templates.Plants.Controls;
+package StagingRotation "Package of sequences for equipment staging and rotation"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}), Documentation(info="<html>
+<p>
+This package contains equipment staging and rotation sequences.
+</p>
+</html>"));
+end StagingRotation;
diff --git a/Buildings/Templates/Plants/Controls/StagingRotation/package.order b/Buildings/Templates/Plants/Controls/StagingRotation/package.order
new file mode 100644
index 00000000000..b55032749c8
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/StagingRotation/package.order
@@ -0,0 +1,8 @@
+EquipmentAvailability
+EquipmentEnable
+EventSequencing
+SortRuntime
+StageAvailability
+StageChangeCommand
+StageCompletion
+Validation
diff --git a/Buildings/Templates/Plants/Controls/Types.mo b/Buildings/Templates/Plants/Controls/Types.mo
new file mode 100644
index 00000000000..fd911f43f50
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Types.mo
@@ -0,0 +1,28 @@
+within Buildings.Templates.Plants.Controls;
+package Types
+  "Package with type definitions"
+  extends Modelica.Icons.TypesPackage;
+  type Application = enumeration(
+    Cooling
+      "Cooling system",
+    Heating
+      "Heating system")
+    "Enumeration to specify the type of application";
+  type Actuator = enumeration(
+    Modulating
+      "Modulating",
+    TwoPosition
+      "Two-position")
+    "Enumeration to specify the type of actuator";
+  type EquipmentConnection = enumeration(
+    Parallel
+      "Parallel piped",
+    Series
+      "Series piped")
+    "Enumeration to specify the type of connection between equipment and primary loop";
+  annotation (Documentation(info="<html>
+<p>
+This package provides type definitions.
+</p>
+</html>"));
+end Types;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/CountTrue.mo b/Buildings/Templates/Plants/Controls/Utilities/CountTrue.mo
new file mode 100644
index 00000000000..8290098d308
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/CountTrue.mo
@@ -0,0 +1,62 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block CountTrue
+  "Output the number of true elements in a Boolean array"
+  parameter Integer nin(
+    min=0)=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1[nin]
+    "Array of Boolean signals"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Index of first element being true"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nin](
+    each final integerTrue=1,
+    each final integerFalse=0)
+    "Cast to integer"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum sumMul(
+    final nin=nin)
+    "Sum over array elements"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+equation
+  connect(u1, booToInt.u)
+    annotation (Line(points={{-120,0},{-42,0}},color={255,0,255}));
+  connect(sumMul.y, y)
+    annotation (Line(points={{42,0},{120,0}},color={255,127,0}));
+  connect(booToInt.y, sumMul.u)
+    annotation (Line(points={{-18,0},{18,0}},color={255,127,0}));
+  annotation (
+    defaultComponentName="couTru",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(info="<html>
+<p>
+Counts the number of <code>true</code> elements in the Boolean
+input vector.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end CountTrue;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/FirstTrueIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/FirstTrueIndex.mo
new file mode 100644
index 00000000000..fd16855a651
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/FirstTrueIndex.mo
@@ -0,0 +1,81 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block FirstTrueIndex
+  parameter Integer nin(
+    min=0)=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1[nin]
+    "Array of Boolean signals"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Index of first element being true"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nin](
+    final integerTrue={i for i in 1:nin},
+    each final integerFalse=nin + 1)
+    "Return index if element is true, 0 otherwise"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  MultiMinInteger mulMin(nin=nin) "Return minimum index"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Equal intEqu
+    annotation (Placement(transformation(extent={{34,-50},{54,-30}})));
+  Buildings.Controls.OBC.CDL.Integers.Switch intSwi
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant conInt(
+    k=nin + 1)
+    annotation (Placement(transformation(extent={{-10,-70},{10,-50}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant zer(
+    k=0)
+    annotation (Placement(transformation(extent={{-12,50},{8,70}})));
+equation
+  connect(booToInt.y, mulMin.u)
+    annotation (Line(points={{-38,0},{-12,0}},color={255,127,0}));
+  connect(u1, booToInt.u)
+    annotation (Line(points={{-120,0},{-62,0}},color={255,0,255}));
+  connect(conInt.y, intEqu.u2)
+    annotation (Line(points={{12,-60},{20,-60},{20,-48},{32,-48}},color={255,127,0}));
+  connect(mulMin.y, intSwi.u3)
+    annotation (Line(points={{12,0},{40,0},{40,-8},{68,-8}},color={255,127,0}));
+  connect(intEqu.y, intSwi.u2)
+    annotation (Line(points={{56,-40},{60,-40},{60,0},{68,0}},color={255,0,255}));
+  connect(zer.y, intSwi.u1)
+    annotation (Line(points={{10,60},{60,60},{60,8},{68,8}},color={255,127,0}));
+  connect(mulMin.y, intEqu.u1)
+    annotation (Line(points={{12,0},{20,0},{20,-40},{32,-40}},color={255,127,0}));
+  connect(intSwi.y, y)
+    annotation (Line(points={{92,0},{120,0}},color={255,127,0}));
+  annotation (
+    defaultComponentName="idxFirTru",
+    Documentation(
+      info="<html>
+<p>
+Returns the index of the first <code>true</code> element of the Boolean
+input vector.
+If no element is <code>true</code>, the block returns <i>0</i>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}));
+end FirstTrueIndex;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo b/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo
new file mode 100644
index 00000000000..db9edb53a0f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/HoldReal.mo
@@ -0,0 +1,81 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block HoldReal "Hold value of real signal based on timer and Boolean signal"
+  parameter Real dtHol(
+    final unit="s")=0
+    "Hold time";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1
+    "Boolean signal that triggers fixed output value"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    "Input signal"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
+    "Output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler triSam
+    "Sample signal when the Boolean input switches to true"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi
+    "Switch between actual and fixed value"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold truHol(
+    final duration=dtHol) if dtHol > 0
+    "Hold true value of input signal for given time"
+    annotation (Placement(transformation(extent={{-10,10},{10,30}})));
+  PlaceholderLogical ph(have_inp=dtHol > 0, final have_inpPh=true)
+    "Placeholder signal in case of zero minimum hold time"
+    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+equation
+  connect(u, triSam.u)
+    annotation (Line(points={{-120,-40},{-60,-40},{-60,60},{-12,60}},color={0,0,127}));
+  connect(swi.y, y)
+    annotation (Line(points={{92,0},{120,0}},color={0,0,127}));
+  connect(u1, triSam.trigger)
+    annotation (Line(points={{-120,0},{-40,0},{-40,40},{0,40},{0,48}},color={255,0,255}));
+  connect(u1, truHol.u)
+    annotation (Line(points={{-120,0},{-40,0},{-40,20},{-12,20}},
+                                               color={255,0,255}));
+  connect(triSam.y, swi.u1)
+    annotation (Line(points={{12,60},{60,60},{60,8},{68,8}},color={0,0,127}));
+  connect(u, swi.u3)
+    annotation (Line(points={{-120,-40},{60,-40},{60,-8},{68,-8}},color={0,0,127}));
+  connect(truHol.y, ph.u) annotation (Line(points={{12,20},{20,20},{20,0},{28,0}},
+        color={255,0,255}));
+  connect(u1, ph.uPh) annotation (Line(points={{-120,0},{-40,0},{-40,-6},{28,-6}},
+        color={255,0,255}));
+  connect(ph.y, swi.u2)
+    annotation (Line(points={{52,0},{68,0}}, color={255,0,255}));
+  annotation (
+    defaultComponentName="hol",
+    Icon(
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+Holds input value fixed at its last value while the Boolean signal 
+<code>u1</code> is true, and for at least the hold time <code>dtHol</code>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HoldReal;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/LastTrueIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/LastTrueIndex.mo
new file mode 100644
index 00000000000..b0893c1cb14
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/LastTrueIndex.mo
@@ -0,0 +1,62 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block LastTrueIndex
+  parameter Integer nin(
+    min=0)=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1[nin]
+    "Array of Boolean signals"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Index of first element being true"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt[nin](
+    final integerTrue={i for i in 1:nin},
+    each final integerFalse=0)
+    "Return index if element is true, 0 otherwise"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Templates.Plants.Controls.Utilities.MultiMaxInteger mulMax(nin=nin)
+    "Return minimum index"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+equation
+  connect(booToInt.y, mulMax.u)
+    annotation (Line(points={{-38,0},{-12,0}},color={255,127,0}));
+  connect(u1, booToInt.u)
+    annotation (Line(points={{-120,0},{-62,0}},color={255,0,255}));
+  connect(mulMax.y, y)
+    annotation (Line(points={{12,0},{120,0}},color={255,127,0}));
+  annotation (
+    defaultComponentName="idxLasTru",
+    Documentation(
+      info="<html>
+<p>
+Returns the index of the last <code>true</code> element of the Boolean
+input vector.
+If no element is <code>true</code>, the block returns <i>0</i>.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}));
+end LastTrueIndex;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/MultiMaxInteger.mo b/Buildings/Templates/Plants/Controls/Utilities/MultiMaxInteger.mo
new file mode 100644
index 00000000000..d0e4d1d0a85
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/MultiMaxInteger.mo
@@ -0,0 +1,57 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block MultiMaxInteger "Output the maximum element of the input vector"
+  parameter Integer nin(
+    min=0)=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
+    "Integer input signal"
+    annotation (Placement(transformation(extent={{-140,20},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Integer output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+equation
+  y=max(u);
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="mulMax",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={255,127,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255}),
+        Text(
+          extent={{-90,36},{90,-36}},
+          textColor={160,160,164},
+          textString="max()"),
+        Text(
+          extent={{226,60},{106,10}},
+          textColor={0,0,0},
+          textString=DynamicSelect("",String(y,
+            leftJustified=false,
+            significantDigits=3)))}),
+    Documentation(
+      info="<html>
+<p>
+Outputs the maximum element of the input vector.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiMaxInteger;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/MultiMinInteger.mo b/Buildings/Templates/Plants/Controls/Utilities/MultiMinInteger.mo
new file mode 100644
index 00000000000..484e0434487
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/MultiMinInteger.mo
@@ -0,0 +1,57 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block MultiMinInteger "Output the minimum element of the input vector"
+  parameter Integer nin(
+    min=0)=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u[nin]
+    "Integer input signal"
+    annotation (Placement(transformation(extent={{-140,20},{-100,-20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Integer output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+equation
+  y=min(u);
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="mulMin",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={255,127,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255}),
+        Text(
+          extent={{-90,36},{90,-36}},
+          textColor={160,160,164},
+          textString="min()"),
+        Text(
+          extent={{226,60},{106,10}},
+          textColor={0,0,0},
+          textString=DynamicSelect("",String(y,
+            leftJustified=false,
+            significantDigits=3)))}),
+    Documentation(
+      info="<html>
+<p>
+Outputs the minimum element of the input vector.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end MultiMinInteger;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/PIDWithEnable.mo b/Buildings/Templates/Plants/Controls/Utilities/PIDWithEnable.mo
new file mode 100644
index 00000000000..4e0fa4dba99
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/PIDWithEnable.mo
@@ -0,0 +1,205 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block PIDWithEnable
+  "PID controller with enable signal"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Buildings.Controls.OBC.CDL.Types.SimpleController controllerType=
+    Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+    "Type of controller";
+  parameter Real k(
+    min=0)=1
+    "Gain of controller";
+  parameter Modelica.Units.SI.Time Ti(
+    min=Buildings.Controls.OBC.CDL.Constants.small)=0.5
+    "Time constant of integrator block"
+    annotation (Dialog(enable=controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI
+      or controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Modelica.Units.SI.Time Td(
+    min=0)=0.1
+    "Time constant of derivative block"
+    annotation (Dialog(enable=controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PD
+      or controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID));
+  parameter Real r(
+    min=100 * Modelica.Constants.eps)=1
+    "Typical range of control error, used for scaling the control error";
+  parameter Real yMin=0
+    "Lower limit of output";
+  parameter Real yMax=1
+    "Upper limit of output";
+  parameter Boolean reverseActing=true
+    "Set to true for reverse acting, or false for direct acting control action";
+  parameter Real y_reset=yMin
+    "Value to which the controller output is reset if the boolean trigger has a rising edge";
+  parameter Real y_neutral=y_reset
+    "Value to which the controller output is reset when the controller is disabled";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u_s
+    "Connector of setpoint input signal"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u_m
+    "Connector of measurement input signal"
+    annotation (Placement(transformation(origin={0,-120},extent={{20,-20},{-20,20}},
+      rotation=270),
+      iconTransformation(extent={{20,-20},{-20,20}},rotation=270,origin={0,-120})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
+    "Connector of actuator output signal"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uEna
+    "Enable signal"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,
+      origin={-60,-120}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={-40,-120})));
+  Buildings.Controls.OBC.CDL.Reals.PIDWithReset conPID(
+    final k=k,
+    final Ti=Ti,
+    final Td=Td,
+    final r=r,
+    final controllerType=controllerType,
+    final yMin=yMin,
+    final yMax=yMax,
+    final reverseActing=reverseActing,
+    final y_reset=y_reset)
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch swi1
+    annotation (Placement(transformation(extent={{72,-10},{92,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant valDis(
+    final k=y_neutral)
+    "Value when disabled"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+equation
+  connect(conPID.u_s, swi.y)
+    annotation (Line(points={{-12,0},{-18,0}},color={0,0,127}));
+  connect(uEna, swi.u2)
+    annotation (Line(points={{-60,-120},{-60,-21.5625},{-60,0},{-42,0}},color={255,0,255}));
+  connect(u_s, swi.u1)
+    annotation (Line(points={{-120,0},{-80,0},{-80,8},{-42,8}},color={0,0,127}));
+  connect(u_m, swi.u3)
+    annotation (Line(points={{0,-120},{0,-80},{-50,-80},{-50,-8},{-42,-8}},color={0,0,127}));
+  connect(uEna, conPID.trigger)
+    annotation (Line(points={{-60,-120},{-60,-20},{-6,-20},{-6,-12}},color={255,0,255}));
+  connect(u_m, conPID.u_m)
+    annotation (Line(points={{0,-120},{0,-12}},color={0,0,127}));
+  connect(conPID.y, swi1.u1)
+    annotation (Line(points={{12,0},{40,0},{40,8},{70,8}},color={0,0,127}));
+  connect(swi1.y, y)
+    annotation (Line(points={{94,0},{120,0}},color={0,0,127}));
+  connect(uEna, swi1.u2)
+    annotation (Line(points={{-60,-120},{-60,-20},{60,-20},{60,0},{70,0}},color={255,0,255}));
+  connect(valDis.y, swi1.u3)
+    annotation (Line(points={{52,-40},{64,-40},{64,-8},{70,-8}},color={0,0,127}));
+  annotation (
+    defaultComponentName="conPID",
+    defaultComponentName="conPID",
+    Icon(
+      coordinateSystem(
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-6,-20},{66,-66}},
+          lineColor={255,255,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          visible=(controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.P),
+          extent={{-32,-22},{68,-62}},
+          textColor={0,0,0},
+          textString="P",
+          fillPattern=FillPattern.Solid,
+          fillColor={175,175,175}),
+        Text(
+          visible=(controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PI),
+          extent={{-26,-22},{74,-62}},
+          textColor={0,0,0},
+          textString="PI",
+          fillPattern=FillPattern.Solid,
+          fillColor={175,175,175}),
+        Text(
+          visible=(controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PD),
+          extent={{-16,-22},{88,-62}},
+          textColor={0,0,0},
+          fillPattern=FillPattern.Solid,
+          fillColor={175,175,175},
+          textString="P D"),
+        Text(
+          visible=(controllerType==Buildings.Controls.OBC.CDL.Types.SimpleController.PID),
+          extent={{-14,-22},{86,-62}},
+          textColor={0,0,0},
+          textString="PID",
+          fillPattern=FillPattern.Solid,
+          fillColor={175,175,175}),
+        Polygon(
+          points={{-80,82},{-88,60},{-72,60},{-80,82}},
+          lineColor={192,192,192},
+          fillColor={192,192,192},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-80,68},{-80,-100}},
+          color={192,192,192}),
+        Line(
+          points={{-90,-80},{70,-80}},
+          color={192,192,192}),
+        Polygon(
+          points={{74,-80},{52,-72},{52,-88},{74,-80}},
+          lineColor={192,192,192},
+          fillColor={192,192,192},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255}),
+        Line(
+          points={{-80,-80},{-80,-22}},
+          color={0,0,0}),
+        Line(
+          points={{-80,-22},{6,56}},
+          color={0,0,0}),
+        Line(
+          points={{6,56},{68,56}},
+          color={0,0,0}),
+        Rectangle(
+          extent=DynamicSelect({{100,-100},{84,-100}},{{100,-100},{84,-100+(y-yMin)/(yMax-yMin)*200}}),
+          fillColor={175,175,175},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          lineColor={0,0,0})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+This is an update of
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.PIDWithReset\">
+Buildings.Controls.OBC.CDL.Reals.PIDWithReset</a>
+with an additional enable signal provided as a Boolean input.
+</p>
+<ul>
+<li>
+When enabled, the output of the controller is identical to
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Reals.PIDWithReset\">
+Buildings.Controls.OBC.CDL.Reals.PIDWithReset</a>,
+and the integral term is reset to <code>y_reset</code> at
+enable time.
+</li>
+<li>
+When disabled, the output of the controller is set to <code>y_neutral</code>
+and the setpoint is overridden by the measurement signal in order to avoid
+time integration of the control error.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PIDWithEnable;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/PlaceholderInteger.mo b/Buildings/Templates/Plants/Controls/Utilities/PlaceholderInteger.mo
new file mode 100644
index 00000000000..01b5c66b80a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/PlaceholderInteger.mo
@@ -0,0 +1,82 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block PlaceholderInteger "Output a placeholder signal"
+  parameter Boolean have_inp=true
+    "Set to true if input signal is available"
+    annotation (Evaluate=true);
+  parameter Boolean have_inpPh=false
+    "Set to true if placeholder value is provided with input signal"
+    annotation (Evaluate=true);
+  parameter Integer u_internal(
+    start=0)
+    "Placeholder value if input signal is not available"
+    annotation (Dialog(enable=not have_inpPh));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
+    if have_inp
+    "Input"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uPh
+    if not have_inp and have_inpPh "Input"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+        iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Output"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant ph(final k=u_internal)
+    if not have_inp and not have_inpPh
+    "Placeholder signal if input signal is not available"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+equation
+  connect(u, y) annotation (Line(points={{-120,0},{-6,0},{-6,0},{120,0}}, color
+        ={255,127,0}));
+  connect(uPh, y) annotation (Line(points={{-120,-40},{60,-40},{60,0},{120,0}},
+        color={255,127,0}));
+  connect(ph.y, y) annotation (Line(points={{12,-80},{80,-80},{80,0},{120,0}},
+        color={255,127,0}));
+  annotation (
+    defaultComponentName="ph",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(info="<html>
+<p>
+This block enables replacing a variable that is conditionally
+removed with either a parameter or another input variable.
+</p>
+<ul>
+<li>
+If the parameter <code>have_inp</code> is true, the output variable
+<code>y</code> is equal to the input variable <code>u</code>.
+</li>
+<li>
+If the parameter <code>have_inp</code> is false and the 
+parameter <code>have_inpPh</code> is true, the output variable
+<code>y</code> is equal to the input variable <code>uPh</code>.
+</li>
+<li>
+If the parameter <code>have_inp</code> is false and the 
+parameter <code>have_inpPh</code> is false, the output variable
+<code>y</code> is equal to the parameter <code>u_internal</code>.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PlaceholderInteger;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/PlaceholderLogical.mo b/Buildings/Templates/Plants/Controls/Utilities/PlaceholderLogical.mo
new file mode 100644
index 00000000000..723a5f8b908
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/PlaceholderLogical.mo
@@ -0,0 +1,95 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block PlaceholderLogical "Output a placeholder signal"
+  parameter Boolean have_inp=true
+    "Set to true if input signal is available"
+    annotation (Evaluate=true);
+  parameter Boolean have_inpPh=false
+    "Set to true if placeholder value is provided with input signal"
+    annotation (Evaluate=true);
+  parameter Boolean u_internal(start=true)
+    "Placeholder value if input signal is not available"
+    annotation (Dialog(enable=not have_inpPh));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
+    if have_inp
+    "Input"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput uPh
+    if not have_inp and have_inpPh "Input"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+        iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y
+    "Output"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant ph(final k=u_internal)
+    if not have_inp and not have_inpPh
+    "Placeholder signal if input signal is not available"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+equation
+  connect(u, y)
+    annotation (Line(points={{-120,0},{-6,0},{-6,0},{120,0}},color={255,0,255}));
+  connect(ph.y, y) annotation (Line(points={{12,-80},{80,-80},{80,0},{120,0}},
+        color={255,0,255}));
+  connect(uPh, y) annotation (Line(points={{-120,-40},{60,-40},{60,0},{120,0}},
+        color={255,0,255}));
+  annotation (
+    defaultComponentName="ph",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          lineThickness=5.0,
+          fillColor={215,215,215},
+          fillPattern=FillPattern.Solid,
+          borderPattern=BorderPattern.Raised),
+        Ellipse(
+          extent={{71,7},{85,-7}},
+          lineColor=DynamicSelect({235,235,235},if y then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},if y then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
+          fillPattern=FillPattern.Solid),
+        Polygon(
+          points={{-120,140},{-120,140}},
+          lineColor={28,108,200}),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(info="<html>
+<p>
+This block enables replacing a variable that is conditionally
+removed with either a parameter or another input variable.
+</p>
+<ul>
+<li>
+If the parameter <code>have_inp</code> is true, the output variable
+<code>y</code> is equal to the input variable <code>u</code>.
+</li>
+<li>
+If the parameter <code>have_inp</code> is false and the 
+parameter <code>have_inpPh</code> is true, the output variable
+<code>y</code> is equal to the input variable <code>uPh</code>.
+</li>
+<li>
+If the parameter <code>have_inp</code> is false and the 
+parameter <code>have_inpPh</code> is false, the output variable
+<code>y</code> is equal to the parameter <code>u_internal</code>.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PlaceholderLogical;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/PlaceholderReal.mo b/Buildings/Templates/Plants/Controls/Utilities/PlaceholderReal.mo
new file mode 100644
index 00000000000..a8b853ed0cb
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/PlaceholderReal.mo
@@ -0,0 +1,82 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block PlaceholderReal "Output a placeholder signal"
+  parameter Boolean have_inp=true
+    "Set to true if input signal is available"
+    annotation (Evaluate=true);
+  parameter Boolean have_inpPh=false
+    "Set to true if placeholder value is provided with input signal"
+    annotation (Evaluate=true);
+  parameter Real u_internal(
+    start=0)
+    "Placeholder value if input signal is not available"
+    annotation (Dialog(enable=not have_inpPh));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u
+    if have_inp
+    "Input"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput uPh
+    if not have_inp and have_inpPh "Input"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}}),
+        iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y
+    "Output"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant ph(final k=u_internal)
+    if not have_inp and not have_inpPh
+    "Placeholder signal if input signal is not available"
+    annotation (Placement(transformation(extent={{-10,-90},{10,-70}})));
+equation
+  connect(u, y)
+    annotation (Line(points={{-120,0},{120,0}},color={0,0,127}));
+  connect(ph.y, y) annotation (Line(points={{12,-80},{80,-80},{80,0},{120,0}},
+        color={0,0,127}));
+  connect(uPh, y) annotation (Line(points={{-120,-40},{60,-40},{60,0},{120,0}},
+        color={0,0,127}));
+  annotation (
+    defaultComponentName="ph",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Documentation(info="<html>
+<p>
+This block enables replacing a variable that is conditionally
+removed with either a parameter or another input variable.
+</p>
+<ul>
+<li>
+If the parameter <code>have_inp</code> is true, the output variable
+<code>y</code> is equal to the input variable <code>u</code>.
+</li>
+<li>
+If the parameter <code>have_inp</code> is false and the 
+parameter <code>have_inpPh</code> is true, the output variable
+<code>y</code> is equal to the input variable <code>uPh</code>.
+</li>
+<li>
+If the parameter <code>have_inp</code> is false and the 
+parameter <code>have_inpPh</code> is false, the output variable
+<code>y</code> is equal to the parameter <code>u_internal</code>.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PlaceholderReal;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/SortWithIndices.mo b/Buildings/Templates/Plants/Controls/Utilities/SortWithIndices.mo
new file mode 100644
index 00000000000..56b868566c7
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/SortWithIndices.mo
@@ -0,0 +1,104 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block SortWithIndices
+  "Sort elements of input vector in ascending or descending order"
+  parameter Integer nin(
+    final min=0)=0
+    "Number of input connections"
+    annotation (Dialog(connectorSizing=true),HideResult=true);
+  parameter Boolean ascending=true
+    "Set to true if ascending order, otherwise order is descending";
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput u[nin]
+    "Connector of Real input signals"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y[nin]
+    "Sorted vector"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput yIdx[nin]
+    "Indices of the sorted vector with respect to the original vector"
+    annotation (Placement(transformation(extent={{100,-80},{140,-40}}),
+      iconTransformation(extent={{100,-80},{140,-40}})));
+equation
+  (y, yIdx)=Modelica.Math.Vectors.sort(u,
+    ascending=ascending);
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="sort",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,-100},{100,100}},
+          lineColor={0,0,127},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255}),
+        Text(
+          extent={{-58,70},{54,-60}},
+          textColor={0,0,89},
+          textString="sort")}),
+    Documentation(
+      info="<html>
+<p>
+Block that sorts the elements of the input signal <i>u</i>.
+If the parameter <code>ascending = true</code>, then the output signal <i>y</i> satisfies
+<i>y<sub>i</sub> &lt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
+Otherwise, it satisfies
+<i>y<sub>i</sub> &gt;= y<sub>i+1</sub></i> for all <i>i &isin; {1, ..., n-1}</i>.
+The output signal <i>yIdx</i> contains the indices of the sorted elements,
+with respect to the input vector <i>u</i>.
+</p>
+<h4>Usage</h4>
+<p>
+Note that this block shall only be used for input signals <code>u</code> that are
+time sampled.<br/>
+Otherwise, in simulation, numerical noise from a nonlinear solver or from an
+implicit time integration algorithm may cause the simulation to stall.
+Numerical noise can be present if an input depends
+on a state variable or a quantity that requires an iterative solution,
+such as a temperature or a mass flow rate of an HVAC system.<br/>
+In real controllers, measurement noise may cause the output to change frequently.
+</p>
+<p>
+This block may for example be used in a variable air volume flow
+controller to access the position of the dampers that are most open.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+Added an output variable with the indices of the sorted elements.
+</li>
+<li>
+March 2, 2020, by Michael Wetter:<br/>
+Changed icon to display dynamically the output value.
+</li>
+<li>
+September 22, 2017, by Michael Wetter:<br/>
+Reimplemented function to make it work with OpenModelica.
+</li>
+<li>
+September 14, 2017, by Jianjun Hu:<br/>
+Changed model name.
+</li>
+<li>
+January 10, 2017, by Milica Grahovac:<br/>
+Initial CDL implementation.
+</li>
+<li>
+November 21, 2011, by Michael Wetter:<br/>
+Removed <code>assert</code> statement.
+</li>
+<li>
+November 25, 2008, by Michael Wetter:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end SortWithIndices;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/StageIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/StageIndex.mo
new file mode 100644
index 00000000000..0cfa41c297a
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/StageIndex.mo
@@ -0,0 +1,480 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block StageIndex
+  "Evaluation of stage index from staging signals"
+  parameter Boolean have_inpAva=true
+    "Set to true if stage availability is provided with input signal, false for stages always available"
+    annotation (Evaluate=true);
+  parameter Integer nSta(
+    start=1,
+    final min=1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  parameter Real dtRun(
+    final unit="s",
+    final min=0,
+    displayUnit="min")=0
+    "Minimum runtime of each stage"
+    annotation (Evaluate=true);
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Lea
+    "Lead unit enable signal"
+    annotation (Placement(transformation(extent={{-280,100},{-240,140}}),
+      iconTransformation(extent={{-140,40},{-100,80}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Up
+    "Stage up command"
+    annotation (Placement(transformation(extent={{-280,-20},{-240,20}}),
+      iconTransformation(extent={{-140,0},{-100,40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1Dow
+    "Stage down command"
+    annotation (Placement(transformation(extent={{-280,-60},{-240,-20}}),
+      iconTransformation(extent={{-140,-40},{-100,0}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u1AvaSta[nSta]
+    if have_inpAva
+    "Stage available signal"
+    annotation (Placement(transformation(extent={{-280,-180},{-240,-140}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerOutput y
+    "Stage index"
+    annotation (Placement(transformation(extent={{240,80},{280,120}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Modelica.StateGraph.InitialStepWithSignal sta0(
+    final nOut=nSta,
+    final nIn=nSta)
+    "Stage 0 – All units disabled"
+    annotation (Placement(transformation(extent={{-110,130},{-90,150}})));
+  Modelica.StateGraph.StepWithSignal sta[nSta](
+    each final nIn=nSta + 1,
+    each final nOut=nSta + 1)
+    "Stage i>0"
+    annotation (Placement(transformation(extent={{-10,130},{10,150}})));
+  Modelica.StateGraph.TransitionWithSignal sta0ToSta[nSta](
+    each final enableTimer=false)
+    "Transition from stage 0 to stage i>0"
+    annotation (Placement(transformation(extent={{-70,130},{-50,150}})));
+  inner Modelica.StateGraph.StateGraphRoot stateGraphRoot
+    "State graph root"
+    annotation (Placement(transformation(extent={{-10,210},{10,230}})));
+  Modelica.StateGraph.TransitionWithSignal staToSta[nSta, nSta](
+    each final enableTimer=false)
+    "Transition to higher or lower stage"
+    annotation (Placement(transformation(extent={{130,130},{150,150}})));
+  Buildings.Controls.OBC.CDL.Logical.And runAndTrn[nSta]
+    "Runtime condition met AND stage transition command"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep(
+    final nout=nSta)
+    "Replicate"
+    annotation (Placement(transformation(extent={{-40,-10},{-20,10}})));
+  Modelica.StateGraph.TransitionWithSignal staToSta0[nSta](
+    each final enableTimer=false)
+    "Transition from stage i>0 to stage 0"
+    annotation (Placement(transformation(extent={{50,150},{70,170}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep2(
+    final nout=nSta)
+    "Replicate"
+    annotation (Placement(transformation(extent={{-40,30},{-20,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Not notLea
+    "True if lead unit is disabled"
+    annotation (Placement(transformation(extent={{-190,30},{-170,50}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd upAndEna(
+    nin=3)
+    "Stage up and lead unit enabled and higher stage available"
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
+  Utilities.FirstTrueIndex idxFirAct(
+    nin=nSta)
+    "Return index of first active stage"
+    annotation (Placement(transformation(extent={{180,90},{200,110}})));
+  Buildings.Controls.OBC.CDL.Logical.Not una[nSta]
+    "True if stage is not available"
+    annotation (Placement(transformation(extent={{-190,-170},{-170,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.And runAndEna[nSta]
+    "Runtime condition met AND lead enable signal false"
+    annotation (Placement(transformation(extent={{0,30},{20,50}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanExtractor staUna(
+    final nin=nSta)
+    "Return true if current stage is unavailable"
+    annotation (Placement(transformation(extent={{-150,-170},{-130,-150}})));
+  Buildings.Controls.OBC.CDL.Integers.Max maxInt
+    "Maximum between current stage index and 1"
+    annotation (Placement(transformation(extent={{-190,-210},{-170,-190}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant one(
+    final k=1)
+    "Constant"
+    annotation (Placement(transformation(extent={{-230,-210},{-210,-190}})));
+  PlaceholderLogical pas[nSta](each final have_inp=dtRun > 0, each final
+      have_inpPh=true) "Direct pass-through when no minimum runtime"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={-30,80})));
+  FirstTrueIndex idxFirAva(
+    nin=nSta)
+    "Return index of first available stage"
+    annotation (Placement(transformation(extent={{-190,-130},{-170,-110}})));
+  LastTrueIndex idxLasAva(
+    nin=nSta)
+    "Return index of last available stage"
+    annotation (Placement(transformation(extent={{-190,-90},{-170,-70}})));
+  Buildings.Controls.OBC.CDL.Integers.Greater higAva
+    "Return true if there is any higher stage available"
+    annotation (Placement(transformation(extent={{-150,-90},{-130,-70}})));
+  Buildings.Controls.OBC.CDL.Integers.Less lowAva
+    "Return true if there is any lower stage available"
+    annotation (Placement(transformation(extent={{-150,-130},{-130,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Timer tim[nSta](
+    passed(
+      each start=false),
+    each final t=dtRun)
+    if dtRun > 0
+    "Timer for minimum runtime"
+    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
+  PlaceholderLogical phAvaSta[nSta](
+    each final have_inp=have_inpAva,
+    each final have_inpPh=false,
+    each final u_internal=true) "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{-230,-170},{-210,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.MultiAnd dowAndEna(
+    nin=3)
+    "Stage down and lead unit enabled and lower stage available"
+    annotation (Placement(transformation(extent={{-110,-50},{-90,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Or upOrDow
+    "Stage up or down"
+    annotation (Placement(transformation(extent={{-70,-10},{-50,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Switch idxNex
+    "Return index of next stage to be enabled"
+    annotation (Placement(transformation(extent={{110,-190},{130,-170}})));
+  Buildings.Controls.OBC.CDL.Integers.Less intLesEqu[nSta]
+    "Return true if index less or equal to active stage index minus one"
+    annotation (Placement(transformation(extent={{-10,-210},{10,-190}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant idxStaAll[nSta](
+    final k={i for i in 1:nSta})
+    "Stage indices"
+    annotation (Placement(transformation(extent={{-50,-170},{-30,-150}})));
+  Buildings.Controls.OBC.CDL.Routing.IntegerScalarReplicator intScaRep(
+    nout=nSta)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{-50,-210},{-30,-190}})));
+  Buildings.Controls.OBC.CDL.Logical.And andAva[nSta]
+    "True if previous condition met and stage available"
+    annotation (Placement(transformation(extent={{30,-210},{50,-190}})));
+  LastTrueIndex idxNexLowAva(
+    final nin=nSta)
+    "Return index of next lower available stage"
+    annotation (Placement(transformation(extent={{60,-210},{80,-190}})));
+  FirstTrueIndex idxNexHigAva(
+    final nin=nSta)
+    "Return index of next higher available stage"
+    annotation (Placement(transformation(extent={{60,-170},{80,-150}})));
+  Buildings.Controls.OBC.CDL.Integers.Greater intGreEqu[nSta]
+    "Return true if index greater or equal to active stage index plus one"
+    annotation (Placement(transformation(extent={{-10,-170},{10,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.And andAva1[nSta]
+    "True if previous condition met and stage available"
+    annotation (Placement(transformation(extent={{30,-170},{50,-150}})));
+  Buildings.Controls.OBC.CDL.Logical.Or upOrActUna
+    "Stage up command or active stage unavailable"
+    annotation (Placement(transformation(extent={{-10,-130},{10,-110}})));
+  TrueArrayConditional truIdxNex(
+    final nout=nSta,
+    nin=1)
+    "Generate array with true value at index of next stage to be enabled"
+    annotation (Placement(transformation(extent={{150,-190},{170,-170}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanVectorReplicator repVec(
+    final nin=nSta,
+    final nout=nSta)
+    "Replicate vector"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={160,-140})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep3[nSta](
+    each final nout=nSta)
+    "Replicate signal"
+    annotation (Placement(transformation(extent={{70,-10},{90,10}})));
+  Buildings.Controls.OBC.CDL.Logical.And matTrn[nSta, nSta]
+    "Generate matrix with a maximum of one true element where transition must fire"
+    annotation (Placement(transformation(extent={{112,-10},{132,10}})));
+  Buildings.Controls.OBC.CDL.Logical.And actUnaHigAva
+    "Active stage unavailable and higher stage available"
+    annotation (Placement(transformation(extent={{-50,-50},{-30,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Or upOrDowOrActUna[nSta]
+    "Stage up or down command or active stage unavailable (not subject to runtime requirement)"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator rep1(
+    final nout=nSta)
+    "Replicate"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+  TrueArrayConditional truNexHigAva(
+    final nout=nSta,
+    nin=1)
+    "Generate array with true element at index of next higher available stage (if any, otherwise all false)"
+    annotation (Placement(transformation(extent={{-150,110},{-130,130}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger booToInt(
+    final integerTrue=1,
+    final integerFalse=0)
+    "Cast to integer"
+    annotation (Placement(transformation(extent={{-190,110},{-170,130}})));
+equation
+  for i in 1:nSta loop
+    for j in 1:nSta loop
+      connect(staToSta[i, j].outPort, sta[j].inPort[i])
+        annotation (Line(points={{141.5,140},{160,140},{160,180},{-40,180},{-40,140},{-11,140}},
+          color={0,0,0}));
+      connect(sta[i].outPort[j], staToSta[i, j].inPort)
+        annotation (Line(points={{10.5,140},{136,140}},color={0,0,0}));
+    end for;
+  end for;
+  // Transitio to/from stage 0 – All units disabled.
+  connect(sta.outPort[nSta + 1], staToSta0.inPort)
+    annotation (Line(points={{10.5,140},{20,140},{20,160},{56,160}},color={0,0,0}));
+  connect(sta0ToSta.outPort, sta.inPort[nSta + 1])
+    annotation (Line(points={{-58.5,140},{-11,140}},color={0,0,0}));
+  connect(staToSta0.outPort, sta0.inPort)
+    annotation (Line(points={{61.5,160},{80,160},{80,200},{-140,200},{-140,140},{-111,140}},
+      color={0,0,0}));
+  connect(sta0.outPort, sta0ToSta.inPort)
+    annotation (Line(points={{-89.5,140},{-64,140}},color={0,0,0}));
+  connect(u1Lea, notLea.u)
+    annotation (Line(points={{-260,120},{-200,120},{-200,40},{-192,40}},color={255,0,255}));
+  connect(runAndEna.y, staToSta0.condition)
+    annotation (Line(points={{22,40},{60,40},{60,148}},color={255,0,255}));
+  connect(sta.active, idxFirAct.u1)
+    annotation (Line(points={{0,129},{0,100},{178,100}},color={255,0,255}));
+  connect(maxInt.y, staUna.index)
+    annotation (Line(points={{-168,-200},{-140,-200},{-140,-172}},color={255,127,0}));
+  connect(una.y, staUna.u)
+    annotation (Line(points={{-168,-160},{-152,-160}},color={255,0,255}));
+  connect(idxFirAct.y, y)
+    annotation (Line(points={{202,100},{260,100}},color={255,127,0}));
+  connect(idxLasAva.y, higAva.u1)
+    annotation (Line(points={{-168,-80},{-152,-80}},color={255,127,0}));
+  connect(idxFirAva.y, lowAva.u1)
+    annotation (Line(points={{-168,-120},{-152,-120}},color={255,127,0}));
+  connect(idxFirAct.y, higAva.u2)
+    annotation (Line(points={{202,100},{220,100},{220,-220},{-156,-220},{-156,-88},{-152,-88}},
+      color={255,127,0}));
+  connect(idxFirAct.y, lowAva.u2)
+    annotation (Line(points={{202,100},{220,100},{220,-220},{-156,-220},{-156,-128},{-152,-128}},
+      color={255,127,0}));
+  connect(one.y, maxInt.u1)
+    annotation (Line(points={{-208,-200},{-200,-200},{-200,-194},{-192,-194}},
+      color={255,127,0}));
+  connect(idxFirAct.y, maxInt.u2)
+    annotation (Line(points={{202,100},{220,100},{220,-220},{-196,-220},{-196,-206},{-192,-206}},
+      color={255,127,0}));
+  connect(sta.active, tim.u)
+    annotation (Line(points={{0,129},{0,100},{-100,100},{-100,80},{-92,80}},
+      color={255,0,255}));
+  connect(tim.passed, pas.u)
+    annotation (Line(points={{-68,72},{-60,72},{-60,80},{-42,80}},color={255,0,255}));
+  connect(sta.active, pas.uPh) annotation (Line(points={{0,129},{0,100},{-50,
+          100},{-50,74},{-42,74}}, color={255,0,255}));
+  connect(u1AvaSta, phAvaSta.u)
+    annotation (Line(points={{-260,-160},{-232,-160}}, color={255,0,255}));
+  connect(phAvaSta.y, una.u)
+    annotation (Line(points={{-208,-160},{-192,-160}}, color={255,0,255}));
+  connect(phAvaSta.y, idxLasAva.u1) annotation (Line(points={{-208,-160},{-200,
+          -160},{-200,-80},{-192,-80}}, color={255,0,255}));
+  connect(phAvaSta.y, idxFirAva.u1) annotation (Line(points={{-208,-160},{-200,
+          -160},{-200,-120},{-192,-120}}, color={255,0,255}));
+  connect(u1Lea, upAndEna.u[1])
+    annotation (Line(points={{-260,120},{-200,120},{-200,-2.33333},{-112,-2.33333}},
+      color={255,0,255}));
+  connect(u1Lea, dowAndEna.u[1])
+    annotation (Line(points={{-260,120},{-200,120},{-200,-42.3333},{-112,
+          -42.3333}},
+      color={255,0,255}));
+  connect(u1Up, upAndEna.u[2])
+    annotation (Line(points={{-260,0},{-186,0},{-186,0},{-112,0}},color={255,0,255}));
+  connect(u1Dow, dowAndEna.u[2])
+    annotation (Line(points={{-260,-40},{-112,-40}},color={255,0,255}));
+  connect(higAva.y, upAndEna.u[3])
+    annotation (Line(points={{-128,-80},{-120,-80},{-120,2},{-112,2},{-112,2.33333}},
+      color={255,0,255}));
+  connect(lowAva.y, dowAndEna.u[3])
+    annotation (Line(points={{-128,-120},{-116,-120},{-116,-37.6667},{-112,
+          -37.6667}},
+      color={255,0,255}));
+  connect(upOrDow.y, rep.u)
+    annotation (Line(points={{-48,0},{-42,0}},color={255,0,255}));
+  connect(pas.y, runAndTrn.u1)
+    annotation (Line(points={{-18,80},{-12,80},{-12,0},{-2,0}},color={255,0,255}));
+  connect(rep.y, runAndTrn.u2)
+    annotation (Line(points={{-18,0},{-14,0},{-14,-8},{-2,-8}},color={255,0,255}));
+  connect(intScaRep.y, intLesEqu.u2)
+    annotation (Line(points={{-28,-200},{-24,-200},{-24,-208},{-12,-208}},color={255,127,0}));
+  connect(idxStaAll.y, intLesEqu.u1)
+    annotation (Line(points={{-28,-160},{-20,-160},{-20,-200},{-12,-200}},color={255,127,0}));
+  connect(intLesEqu.y, andAva.u1)
+    annotation (Line(points={{12,-200},{28,-200}},color={255,0,255}));
+  connect(phAvaSta.y, andAva.u2) annotation (Line(points={{-208,-160},{-200,-160},
+          {-200,-180},{20,-180},{20,-208},{28,-208}}, color={255,0,255}));
+  connect(andAva.y, idxNexLowAva.u1)
+    annotation (Line(points={{52,-200},{58,-200}},color={255,0,255}));
+  connect(idxStaAll.y, intGreEqu.u1)
+    annotation (Line(points={{-28,-160},{-12,-160}},color={255,127,0}));
+  connect(intGreEqu.y, andAva1.u1)
+    annotation (Line(points={{12,-160},{28,-160}},color={255,0,255}));
+  connect(phAvaSta.y, andAva1.u2) annotation (Line(points={{-208,-160},{-200,-160},
+          {-200,-180},{20,-180},{20,-168},{28,-168}}, color={255,0,255}));
+  connect(andAva1.y, idxNexHigAva.u1)
+    annotation (Line(points={{52,-160},{58,-160}},color={255,0,255}));
+  connect(u1Up, upOrActUna.u1)
+    annotation (Line(points={{-260,0},{-220,0},{-220,-60},{-20,-60},{-20,-120},{-12,-120}},
+      color={255,0,255}));
+  connect(staUna.y, upOrActUna.u2)
+    annotation (Line(points={{-128,-160},{-60,-160},{-60,-128},{-12,-128}},color={255,0,255}));
+  connect(upOrActUna.y, idxNex.u2)
+    annotation (Line(points={{12,-120},{100,-120},{100,-180},{108,-180}},color={255,0,255}));
+  connect(andAva1.y, idxNexHigAva.u1)
+    annotation (Line(points={{52,-160},{58,-160}},color={255,0,255}));
+  connect(idxNexHigAva.y, idxNex.u1)
+    annotation (Line(points={{82,-160},{90,-160},{90,-172},{108,-172}},color={255,127,0}));
+  connect(idxNexLowAva.y, idxNex.u3)
+    annotation (Line(points={{82,-200},{90,-200},{90,-188},{108,-188}},color={255,127,0}));
+  connect(one.y, truIdxNex.u)
+    annotation (Line(points={{-208,-200},{-200,-200},{-200,-224},{140,-224},{140,-180},{148,-180}},
+      color={255,127,0}));
+  connect(truIdxNex.y1, repVec.u)
+    annotation (Line(points={{172,-180},{180,-180},{180,-160},{160,-160},{160,-152}},
+      color={255,0,255}));
+  connect(rep3.y, matTrn.u1)
+    annotation (Line(points={{92,0},{110,0}},color={255,0,255}));
+  connect(repVec.y, matTrn.u2)
+    annotation (Line(points={{160,-128},{160,-20},{106,-20},{106,-8},{110,-8}},
+      color={255,0,255}));
+  connect(matTrn.y, staToSta.condition)
+    annotation (Line(points={{134,0},{140,0},{140,128}},color={255,0,255}));
+  connect(dowAndEna.y, upOrDow.u2)
+    annotation (Line(points={{-88,-40},{-80,-40},{-80,-8},{-72,-8}},color={255,0,255}));
+  connect(staUna.y, actUnaHigAva.u2)
+    annotation (Line(points={{-128,-160},{-60,-160},{-60,-48},{-52,-48}},color={255,0,255}));
+  connect(higAva.y, actUnaHigAva.u1)
+    annotation (Line(points={{-128,-80},{-74,-80},{-74,-40},{-52,-40}},color={255,0,255}));
+  connect(actUnaHigAva.y, rep1.u)
+    annotation (Line(points={{-28,-40},{-12,-40}},color={255,0,255}));
+  connect(rep1.y, upOrDowOrActUna.u2)
+    annotation (Line(points={{12,-40},{30,-40},{30,-8},{38,-8}},color={255,0,255}));
+  connect(idxNex.y, truIdxNex.uIdx[1])
+    annotation (Line(points={{132,-180},{134,-180},{134,-186},{148,-186}},color={255,127,0}));
+  connect(truNexHigAva.y1, sta0ToSta.condition)
+    annotation (Line(points={{-128,120},{-60,120},{-60,128}},color={255,0,255}));
+  connect(u1Lea, booToInt.u)
+    annotation (Line(points={{-260,120},{-192,120}},color={255,0,255}));
+  connect(booToInt.y, truNexHigAva.u)
+    annotation (Line(points={{-168,120},{-152,120}},color={255,127,0}));
+  connect(idxFirAva.y, truNexHigAva.uIdx[1])
+    annotation (Line(points={{-168,-120},{-160,-120},{-160,114},{-152,114}},
+      color={255,127,0}));
+  connect(upAndEna.y, upOrDow.u1)
+    annotation (Line(points={{-88,0},{-72,0}},color={255,0,255}));
+  connect(notLea.y, rep2.u)
+    annotation (Line(points={{-168,40},{-42,40}},color={255,0,255}));
+  connect(runAndTrn.y, upOrDowOrActUna.u1)
+    annotation (Line(points={{22,0},{38,0}},color={255,0,255}));
+  connect(upOrDowOrActUna.y, rep3.u)
+    annotation (Line(points={{62,0},{68,0}},color={255,0,255}));
+  connect(rep2.y, runAndEna.u1)
+    annotation (Line(points={{-18,40},{-2,40}},color={255,0,255}));
+  connect(pas.y, runAndEna.u2)
+    annotation (Line(points={{-18,80},{-12,80},{-12,32},{-2,32}},color={255,0,255}));
+  connect(idxFirAct.y, intScaRep.u)
+    annotation (Line(points={{202,100},{220,100},{220,-220},{-60,-220},{-60,-200},{-52,-200}},
+      color={255,127,0}));
+  connect(intScaRep.y, intGreEqu.u2)
+    annotation (Line(points={{-28,-200},{-24,-200},{-24,-168},{-12,-168}},color={255,127,0}));
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="idxSta",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-240,-240},{240,240}})),
+    Documentation(
+      info="<html>
+<p>
+This block is used to compute the stage index for a group of
+multiple equipment such as CHW pumps or chillers.
+</p>
+<ul>
+<li>
+At initial time, stage <code>0</code> is active &ndash;
+all units are disabled.
+</li>
+<li>
+From stage <code>0</code>, the transition to the next higher available
+stage is triggered when the lead unit is enabled (<code>u1Lea = true</code>)
+and if at least one stage is available.
+</li>
+<li>
+From any stage <code>i</code> (<code>1 &le; i &le; nSta</code>), the transition
+to the next higher or lower available stage <code>j</code>
+(<code>1 &le; j &le; nSta</code>, <code>j &ne; i</code>)
+is triggered when stage <code>i</code> has been active for the minimum runtime
+and there is a stage up command <code>u1Up</code> or stage down command <code>u1Dow</code>, respectively.
+</li>
+<li>
+From any stage <code>i</code> (<code>1 &le; i &le; nSta</code>), the transition
+to stage <code>0</code> is triggered when stage <code>i</code> has been active
+for the minimum runtime and the lead unit is disabled (<code>u1Lea = false</code>).
+</li>
+</ul>
+<p>
+Unavailable stages are handled by the following requirements.
+</p>
+<ul>
+<li>
+Any unavailable stage (<code>u1Ava[i] = false</code>) is skipped during
+staging events.
+</li>
+<li>
+If all higher (resp. lower) stages are unavailable, then the transition
+to a higher (resp. lower) stage is blocked.
+</li>
+<li>
+If the current stage is unavailable, the transition to the next
+higher available stage is triggered.
+</li>
+<li>
+Stage transitions due to availability conditions are
+not subject to the minimum stage runtime requirement.
+</li>
+</ul>
+<h4>Caveats</h4>
+<p>
+The only way to transition to stage <code>0</code> is by disabling the lead unit
+(<code>u1Lea = false</code>).
+The stage down command <code>u1Dow</code> cannot be used to transition
+below stage <code>1</code>.
+</p>
+<p>
+When the current stage becomes unavailable, the transition to the next
+higher available stage is triggered.
+However, it can happen that equipment that is enabled at the current
+stage is no longer available while the current stage is not deemed
+unavailable – for example if a lead/lag alternate equipment remains available.
+In this case, the equipment rotation logic must stage on the
+lead/lag alternate equipment to replace the faulty equipment.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end StageIndex;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/TimerWithReset.mo b/Buildings/Templates/Plants/Controls/Utilities/TimerWithReset.mo
new file mode 100644
index 00000000000..cf530459b2f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/TimerWithReset.mo
@@ -0,0 +1,143 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block TimerWithReset
+  "Timer measuring the time from the time instant where the Boolean input became true"
+  parameter Real t(
+    final quantity="Time",
+    final unit="s")=0
+    "Threshold time for comparison";
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput u
+    "Input that switches timer on if true, and off if false"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanInput reset
+    "Reset signal"
+    annotation (Placement(transformation(extent={{-140,-100},{-100,-60}}),
+      iconTransformation(extent={{-140,-100},{-100,-60}})));
+  Buildings.Controls.OBC.CDL.Interfaces.RealOutput y(
+    final quantity="Time",
+    final unit="s")
+    "Elapsed time"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput passed
+    "True if the elapsed time is greater than threshold"
+    annotation (Placement(transformation(extent={{100,-100},{140,-60}}),
+      iconTransformation(extent={{100,-100},{140,-60}})));
+protected
+  discrete Real entryTime(
+    final quantity="Time",
+    final unit="s")
+    "Time instant when u became true";
+initial equation
+  pre(entryTime)=time;
+  pre(passed)=t <= 0;
+equation
+  when u and not reset then
+    entryTime=time;
+    // When u becomes true, and t=0, we want passed to be true
+    // at the first step (in superdense time).
+    passed=t <= 0;
+  elsewhen reset then
+    entryTime=time;
+    passed=false;
+  elsewhen
+          (u and time >= t + pre(entryTime)) then
+    passed=true;
+    entryTime=pre(entryTime);
+  elsewhen not u then
+    // Set passed to false.
+    // This is the behavior a timer would have if the threshold test is done with a greater block connected to the output of the timer
+    passed=false;
+    entryTime=pre(entryTime);
+  end when;
+  y=if u then time - entryTime else 0.0;
+  annotation (
+    __cdl(
+      extensionBlock=true),
+    defaultComponentName="tim",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100.0,-100.0},{100.0,100.0}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          fillColor={210,210,210},
+          lineThickness=5.0,
+          fillPattern=FillPattern.Solid,
+          borderPattern=BorderPattern.Raised),
+        Line(
+          points={{-66,-60},{82,-60}},
+          color={192,192,192}),
+        Line(
+          points={{-58,68},{-58,-80}},
+          color={192,192,192}),
+        Polygon(
+          lineColor={192,192,192},
+          fillColor={192,192,192},
+          fillPattern=FillPattern.Solid,
+          points={{90,-60},{68,-52},{68,-68},{90,-60}}),
+        Polygon(
+          lineColor={192,192,192},
+          fillColor={192,192,192},
+          fillPattern=FillPattern.Solid,
+          points={{-58,90},{-66,68},{-50,68},{-58,90}}),
+        Line(
+          points={{-56,-60},{-38,-60},{-38,-16},{40,-16},{40,-60},{68,-60}},
+          color={255,0,255}),
+        Line(
+          points={{-58,0},{-40,0},{40,58},{40,0},{68,0}},
+          color={0,0,127}),
+        Text(
+          extent={{-150,150},{150,110}},
+          textColor={0,0,255},
+          textString="%name"),
+        Text(
+          extent={{-64,62},{62,92}},
+          textColor={0,0,0},
+          textString="t=%t"),
+        Ellipse(
+          extent={{-83,7},{-69,-7}},
+          lineColor=DynamicSelect({235,235,235},if u then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},if u then
+                                                         {0,255,0} else
+                                                                      {235,235,235}),
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{71,-73},{85,-87}},
+          lineColor=DynamicSelect({235,235,235},if passed then
+                                                              {0,255,0} else
+                                                                           {235,235,235}),
+          fillColor=DynamicSelect({235,235,235},if passed then
+                                                              {0,255,0} else
+                                                                           {235,235,235}),
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{226,60},{106,10}},
+          textColor={0,0,0},
+          textString=DynamicSelect("",String(y,
+            leftJustified=false,
+            significantDigits=3)))}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This block is similar to
+<a href=\"modelica://Buildings.Controls.OBC.CDL.Logical.Timer\">
+Buildings.Controls.OBC.CDL.Logical.Timer</a>,
+but introduces an additional Boolean input signal <code>reset</code>,
+which resets the timer.
+When <code>reset</code> becomes true:
+<code>y=0</code> and <code>passed=false</code>.
+</p>
+</html>"));
+end TimerWithReset;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/TrueArrayConditional.mo b/Buildings/Templates/Plants/Controls/Utilities/TrueArrayConditional.mo
new file mode 100644
index 00000000000..800d94a604c
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/TrueArrayConditional.mo
@@ -0,0 +1,80 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+block TrueArrayConditional
+  "Output a Boolean array with a given number of true elements and a priority order"
+  parameter Integer nin(
+    min=0)=0
+    "Size of input array"
+    annotation (Evaluate=true,
+    Dialog(connectorSizing=true),HideResult=true);
+  parameter Integer nout(
+    min=0)=nin
+    "Size of output array"
+    annotation (Evaluate=true);
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput u
+    "Number of true elements"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}}),
+      iconTransformation(extent={{-140,-20},{-100,20}})));
+  Buildings.Controls.OBC.CDL.Interfaces.IntegerInput uIdx[nin]
+    "Array of indices by order of priority to be true"
+    annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}),
+      iconTransformation(extent={{-140,-80},{-100,-40}})));
+  Buildings.Controls.OBC.CDL.Interfaces.BooleanOutput y1[nout]
+    "Output"
+    annotation (Placement(transformation(extent={{100,-20},{140,20}}),
+      iconTransformation(extent={{100,-20},{140,20}})));
+protected
+  Integer iTru
+    "Iteration variable - Count number of true elements";
+  Integer iIdx
+    "Iteration variable - Count number of indices in input vector";
+initial equation
+  pre(u)=0;
+algorithm
+  iTru := 0;
+  iIdx := 1;
+  y1 := fill(false, nout);
+  while
+       (iTru < u) and (iIdx <= nin) loop
+    if (uIdx[iIdx] >= 1) and (uIdx[iIdx] <= nout) then
+      y1[uIdx[iIdx]] := true;
+      iTru := iTru + 1;
+    end if;
+    iIdx := iIdx + 1;
+  end while;
+  annotation (
+    defaultComponentName="truArrCon",
+    __cdl(
+      extensionBlock=true),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=true,
+        extent={{-100,-100},{100,100}}),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false)),
+    Documentation(
+      info="<html>
+<p>
+Accepts indices of true elements that may not be within the
+range of indices of the output vector.
+In this, the number of true elements will not be met.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end TrueArrayConditional;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/CountTrue.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/CountTrue.mo
new file mode 100644
index 00000000000..1541a792899
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/CountTrue.mo
@@ -0,0 +1,56 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model CountTrue "Validation model"
+  Utilities.FirstTrueIndex couTru(nin=6) "Return number of true elements"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Utilities.FirstTrueIndex couTruAllFal(nin=6)
+    "Return number of true elements – All elements of input vector are false"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant conAllFal[6](k=fill(false,
+        6)) "Constant array"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant con[6](k={false,true,false,
+        false,true,false}) "Constant array"
+    annotation (Placement(transformation(extent={{-60,50},{-40,70}})));
+equation
+  connect(con.y, couTru.u1)
+    annotation (Line(points={{-38,60},{-12,60}}, color={255,0,255}));
+  connect(conAllFal.y, couTruAllFal.u1)
+    annotation (Line(points={{-38,0},{-12,0}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/CountTrue.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.CountTrue\">
+Buildings.Templates.Plants.Controls.Utilities.CountTrue</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end CountTrue;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mo
new file mode 100644
index 00000000000..4c510e136f6
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mo
@@ -0,0 +1,59 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model FirstTrueIndex
+  "Validation model"
+  Utilities.FirstTrueIndex idxFirTru(
+    nin=6)
+    "Return first true index"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Utilities.FirstTrueIndex idxFirTruAllFal(nin=6)
+    "Return first true index – All elements of input vector are false"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant conAllFal[6](k=fill(false,
+        6)) "Constant array"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant con[6](k={false,true,
+        false,false,true,false}) "Constant array"
+    annotation (Placement(transformation(extent={{-60,50},{-40,70}})));
+equation
+  connect(con.y, idxFirTru.u1)
+    annotation (Line(points={{-38,60},{-12,60}}, color={255,0,255}));
+  connect(conAllFal.y, idxFirTruAllFal.u1)
+    annotation (Line(points={{-38,0},{-12,0}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/FirstTrueIndex.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.FirstTrueIndex\">
+Buildings.Templates.Plants.Controls.Utilities.FirstTrueIndex</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end FirstTrueIndex;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/HoldReal.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/HoldReal.mo
new file mode 100644
index 00000000000..597ae698440
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/HoldReal.mo
@@ -0,0 +1,62 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model HoldReal "Validation model"
+  Buildings.Templates.Plants.Controls.Utilities.HoldReal hol(dtHol=0)
+    "Hold signal – No minimum hold time"
+    annotation (Placement(transformation(extent={{20,30},{40,50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(width=0.2, period=30)
+    "Source signal for hold trigger"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin sin(freqHz=1/60)
+    "Source signal for value to hold"
+    annotation (Placement(transformation(extent={{-80,50},{-60,70}})));
+  Buildings.Templates.Plants.Controls.Utilities.HoldReal holTim(dtHol=20)
+    "Hold signal – With minimum hold time"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+equation
+  connect(booPul.y, hol.u1)
+    annotation (Line(points={{-58,0},{-20,0},{-20,40},{18,40}},
+                                                color={255,0,255}));
+  connect(sin.y, hol.u) annotation (Line(points={{-58,60},{0,60},{0,34},{18,34}},
+        color={0,0,127}));
+  connect(booPul.y, holTim.u1)
+    annotation (Line(points={{-58,0},{18,0}}, color={255,0,255}));
+  connect(sin.y, holTim.u) annotation (Line(points={{-58,60},{0,60},{0,-6},{18,
+          -6}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/HoldReal.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=60.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.HoldReal\">
+Buildings.Templates.Plants.Controls.Utilities.HoldValue</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end HoldReal;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mo
new file mode 100644
index 00000000000..ddab53a4ea7
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mo
@@ -0,0 +1,59 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model LastTrueIndex
+  "Validation model"
+  Buildings.Templates.Plants.Controls.Utilities.LastTrueIndex idxLasTru(
+    nin=6)
+    "Return last true index"
+    annotation (Placement(transformation(extent={{-10,50},{10,70}})));
+  Buildings.Templates.Plants.Controls.Utilities.LastTrueIndex idxLasTruAllFal(nin=6)
+    "Return last true index – All elements of input vector are false"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant conAllFal[6](k=fill(false,
+        6)) "Constant array"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant con[6](k={false,true,
+        false,false,true,false}) "Constant array"
+    annotation (Placement(transformation(extent={{-60,50},{-40,70}})));
+equation
+  connect(con.y, idxLasTru.u1)
+    annotation (Line(points={{-38,60},{-12,60}}, color={255,0,255}));
+  connect(conAllFal.y, idxLasTruAllFal.u1)
+    annotation (Line(points={{-38,0},{-12,0}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/LastTrueIndex.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.FirstTrueIndex\">
+Buildings.Templates.Plants.Controls.Utilities.FirstTrueIndex</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end LastTrueIndex;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mo
new file mode 100644
index 00000000000..25b2ef56d04
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mo
@@ -0,0 +1,50 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model MultiMaxInteger
+  Buildings.Templates.Plants.Controls.Utilities.MultiMaxInteger mulMax(nin=5)
+    "Block that outputs the maximum element of the input vector"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant con[5](
+    k={1, 2, 3, 4, 5})
+    "Constant vector"
+    annotation (Placement(transformation(extent={{-48,-10},{-28,10}})));
+equation
+  connect(con.y,mulMax. u)
+    annotation (Line(points={{-26,0},{-2,0}},color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMaxInteger.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.MultiMaxInteger\">
+Buildings.Templates.Plants.Controls.Utilities.MultiMaxInteger</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end MultiMaxInteger;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mo
new file mode 100644
index 00000000000..3f6748433c9
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mo
@@ -0,0 +1,50 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model MultiMinInteger
+  Buildings.Templates.Plants.Controls.Utilities.MultiMinInteger mulMin(nin=5)
+    "Block that outputs the minimum element of the input vector"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant con[5](
+    k={1, 2, 3, 4, 5})
+    "Constant vector"
+    annotation (Placement(transformation(extent={{-48,-10},{-28,10}})));
+equation
+  connect(con.y, mulMin.u)
+    annotation (Line(points={{-26,0},{-2,0}},color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/MultiMinInteger.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.MultiMinInteger\">
+Buildings.Templates.Plants.Controls.Utilities.MultiMinInteger</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end MultiMinInteger;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mo
new file mode 100644
index 00000000000..c8a72e83070
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mo
@@ -0,0 +1,70 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model PlaceholderInteger "Validation model"
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger
+                                                                phPar(
+    have_inp=false,
+      have_inpPh=false, u_internal=1) "Placeholder parameter"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Pulse pul(period=1)
+    "Source signal for value to replace"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger
+                                                                phInp(have_inp=
+        false,
+      have_inpPh=true) "Placeholder signal"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant con(k=2) "Constant"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger
+                                                                phNo(
+    have_inp=true,
+    have_inpPh=false,
+    u_internal=3) "No placeholder: use input signal"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+equation
+  connect(pul.y, phNo.u) annotation (Line(points={{-58,0},{0,0},{0,60},{18,60}},
+        color={255,127,0}));
+  connect(con.y, phInp.uPh) annotation (Line(points={{-58,-60},{-20,-60},{-20,
+          -66},{18,-66}}, color={255,127,0}));
+  connect(pul.y, phPar.u)
+    annotation (Line(points={{-58,0},{18,0}}, color={255,127,0}));
+  connect(pul.y, phInp.u) annotation (Line(points={{-58,0},{0,0},{0,-60},{18,
+          -60}}, color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderInteger.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger\">
+Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end PlaceholderInteger;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mo
new file mode 100644
index 00000000000..02fbeef9d45
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mo
@@ -0,0 +1,71 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model PlaceholderLogical "Validation model"
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderLogical
+                                                                phPar(
+    have_inp=false,
+      have_inpPh=false,
+    u_internal=false)                 "Placeholder parameter"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse pul(period=1)
+    "Source signal for value to replace"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderLogical
+                                                                phInp(have_inp=false,
+      have_inpPh=true) "Placeholder signal"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant con(k=true) "Constant"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderLogical
+                                                                phNo(
+    have_inp=true,
+    have_inpPh=false,
+    u_internal=false)
+                  "No placeholder: use input signal"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+equation
+  connect(pul.y, phPar.u)
+    annotation (Line(points={{-58,0},{18,0}}, color={255,0,255}));
+  connect(pul.y, phInp.u) annotation (Line(points={{-58,0},{0,0},{0,-60},{18,
+          -60}}, color={255,0,255}));
+  connect(pul.y, phNo.u) annotation (Line(points={{-58,0},{0,0},{0,60},{18,60}},
+        color={255,0,255}));
+  connect(con.y, phInp.uPh) annotation (Line(points={{-58,-60},{-20,-60},{-20,-66},
+          {18,-66}}, color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderLogical.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.PlaceholderLogical\">
+Buildings.Templates.Plants.Controls.Utilities.PlaceholderLogical</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end PlaceholderLogical;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mo
new file mode 100644
index 00000000000..8d0c99d9ae5
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mo
@@ -0,0 +1,67 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model PlaceholderReal "Validation model"
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderReal phPar(
+    have_inp=false,
+      have_inpPh=false, u_internal=1) "Placeholder parameter"
+    annotation (Placement(transformation(extent={{20,-10},{40,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Pulse
+                                               pul(period=1)
+    "Source signal for value to replace"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderReal phInp(have_inp=false,
+      have_inpPh=true) "Placeholder signal"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(k=2) "Constant"
+    annotation (Placement(transformation(extent={{-80,-70},{-60,-50}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderReal phNo(
+    have_inp=true,
+    have_inpPh=false,
+    u_internal=1) "No placeholder: use input signal"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+equation
+  connect(pul.y, phNo.u)
+    annotation (Line(points={{-58,0},{0,0},{0,60},{18,60}}, color={0,0,127}));
+  connect(pul.y, phPar.u)
+    annotation (Line(points={{-58,0},{18,0}}, color={0,0,127}));
+  connect(pul.y, phInp.u) annotation (Line(points={{-58,0},{0,0},{0,-60},{18,-60}},
+        color={0,0,127}));
+  connect(con.y, phInp.uPh) annotation (Line(points={{-58,-60},{-20,-60},{-20,-66},
+          {18,-66}}, color={0,0,127}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/PlaceholderReal.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.PlaceholderReal\">
+Buildings.Templates.Plants.Controls.Utilities.PlaceholderReal</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end PlaceholderReal;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mo
new file mode 100644
index 00000000000..cb645e2dcfa
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mo
@@ -0,0 +1,113 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model SortWithIndices
+  "Validation model for the Sort block"
+  Buildings.Templates.Plants.Controls.Utilities.SortWithIndices sorAsc(
+    nin=5)
+    "Block that sorts signals in ascending order"
+    annotation (Placement(transformation(extent={{0,20},{20,40}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp1(
+    duration=1,
+    offset=-2,
+    height=4)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-60,56},{-40,76}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp2(
+    duration=1,
+    offset=-1,
+    height=3)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-60,22},{-40,42}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp3(
+    duration=1,
+    offset=2,
+    height=-4)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp4(
+    duration=1,
+    offset=3,
+    height=-1)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-60,-42},{-40,-22}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Ramp ramp5(
+    duration=1,
+    offset=0,
+    height=4)
+    "Block that generates ramp signal"
+    annotation (Placement(transformation(extent={{-60,-74},{-40,-54}})));
+  Buildings.Templates.Plants.Controls.Utilities.SortWithIndices sorDes(
+    nin=5,
+    ascending=false)
+    "Block that sorts signals in descending order"
+    annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
+
+equation
+  connect(ramp1.y,sorAsc.u[1])
+    annotation (Line(points={{-38,66},{-22,66},{-22,29.2},{-2,29.2}},color={0,0,127}));
+  connect(ramp2.y,sorAsc.u[2])
+    annotation (Line(points={{-38,32},{-20,32},{-20,29.6},{-2,29.6}},color={0,0,127}));
+  connect(ramp3.y,sorAsc.u[3])
+    annotation (Line(points={{-38,0},{-22,0},{-22,30},{-2,30}},color={0,0,127}));
+  connect(ramp4.y,sorAsc.u[4])
+    annotation (Line(points={{-38,-32},{-22,-32},{-22,30.4},{-2,30.4}},color={0,0,127}));
+  connect(ramp5.y,sorAsc.u[5])
+    annotation (Line(points={{-38,-64},{-20,-64},{-20,30.8},{-2,30.8}},color={0,0,127}));
+  connect(ramp1.y,sorDes.u[1])
+    annotation (Line(points={{-38,66},{-22,66},{-22,-30.8},{-2,-30.8}},color={0,0,127}));
+  connect(ramp2.y,sorDes.u[2])
+    annotation (Line(points={{-38,32},{-20,32},{-20,-30.4},{-2,-30.4}},color={0,0,127}));
+  connect(ramp3.y,sorDes.u[3])
+    annotation (Line(points={{-38,0},{-22,0},{-22,-30},{-2,-30}},color={0,0,127}));
+  connect(ramp4.y,sorDes.u[4])
+    annotation (Line(points={{-38,-32},{-22,-32},{-22,-29.6},{-2,-29.6}},color={0,0,127}));
+  connect(ramp5.y,sorDes.u[5])
+    annotation (Line(points={{-38,-64},{-20,-64},{-20,-29.2},{-2,-29.2}},color={0,0,127}));
+  annotation (
+    experiment(
+      StopTime=1.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/SortWithIndices.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.SortWithIndices\">
+Buildings.Templates.Plants.Controls.Utilities.SortWithIndices</a>.
+</p>
+<p>
+The input <code>u1</code> varies from <i>-2</i> to <i>+2</i>, input <code>u2</code> varies from <i>-1</i> to <i>+2</i>,
+input <code>u3</code> varies from <i>+2</i> to <i>-2</i>, input <code>u4</code> varies from <i>+3</i> to <i>+2</i>,
+input <code>u5</code> varies from <i>0</i> to <i>+4</i>,
+</p>
+</html>",
+      revisions="<html>
+      <ul>
+      <li>
+      March 29, 2024, by Antoine Gautier:<br/>
+      Updated model with indices of sorted elements.
+</li>
+<li>
+September 14, 2017, by Jianjun Hu:<br/>
+Changed model name.
+</li>
+<li>
+March 22, 2017, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end SortWithIndices;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo
new file mode 100644
index 00000000000..6330fec213f
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/StageIndex.mo
@@ -0,0 +1,145 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model StageIndex
+  parameter Integer nSta=4
+    "Number of stages"
+    annotation (Evaluate=true);
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse ena(
+    width=0.9,
+    period=160,
+    shift=10)
+    "Enable signal"
+    annotation (Placement(transformation(extent={{-90,50},{-70,70}})));
+  Buildings.Templates.Plants.Controls.Utilities.StageIndex idxSta(
+    have_inpAva=false,
+    final nSta=nSta)
+    "Compute stage index - No minimum runtime, all stages available"
+    annotation (Placement(transformation(extent={{20,50},{40,70}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger upPul(
+    period=20)
+    "Stage up command pulse"
+    annotation (Placement(transformation(extent={{-90,10},{-70,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger dowPul(
+    period=20)
+    "Stage down command pulse"
+    annotation (Placement(transformation(extent={{-90,-30},{-70,-10}})));
+  Buildings.Templates.Plants.Controls.Utilities.StageIndex idxStaUna(
+    final nSta=nSta)
+    "Compute stage index - No minimum runtime, some unavailable stages"
+    annotation (Placement(transformation(extent={{62,20},{82,40}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant u1AvaSta[nSta](
+    k={false, false, true, true})
+    "Stage available signal"
+    annotation (Placement(transformation(extent={{-90,-90},{-70,-70}})));
+  Buildings.Templates.Plants.Controls.Utilities.StageIndex idxStaRun(
+    have_inpAva=false,
+    final nSta=nSta,
+    dtRun=25)
+    "Compute stage index - Minimum runtime, all stages available"
+    annotation (Placement(transformation(extent={{20,-40},{40,-20}})));
+  Buildings.Templates.Plants.Controls.Utilities.StageIndex idxStaRunUna(
+    final nSta=nSta,
+    dtRun=25)
+    "Compute stage index - Minimum runtime, some unavailable stages"
+    annotation (Placement(transformation(extent={{60,-70},{80,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable booTimTab(
+    table=[
+      0, 0, 0;
+      10, 1, 0;
+      70, 0, 1],
+    period=160)
+    "Signal to inhibit up and down commands"
+    annotation (Placement(transformation(extent={{-90,80},{-70,100}})));
+  Buildings.Controls.OBC.CDL.Logical.And u1Up
+    "Stage up command"
+    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+  Buildings.Controls.OBC.CDL.Logical.And u1Dow
+    "Stage down command"
+    annotation (Placement(transformation(extent={{-40,-30},{-20,-10}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold      u1UpHol(duration=0.1)
+    "Hold stage up command for plotting"
+    annotation (Placement(transformation(extent={{0,90},{20,110}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueHold      u1DowHol(duration=0.1)
+    "Hold stage down command for plotting"
+    annotation (Placement(transformation(extent={{0,-110},{20,-90}})));
+equation
+  connect(ena.y, idxSta.u1Lea)
+    annotation (Line(points={{-68,60},{0,60},{0,66},{18,66}},color={255,0,255}));
+  connect(ena.y, idxStaUna.u1Lea)
+    annotation (Line(points={{-68,60},{0,60},{0,36},{60,36}},color={255,0,255}));
+  connect(ena.y, idxStaRun.u1Lea)
+    annotation (Line(points={{-68,60},{0,60},{0,-24},{18,-24}},color={255,0,255}));
+  connect(u1AvaSta.y, idxStaUna.u1AvaSta)
+    annotation (Line(points={{-68,-80},{50,-80},{50,24},{60,24}},color={255,0,255}));
+  connect(ena.y, idxStaRunUna.u1Lea)
+    annotation (Line(points={{-68,60},{0,60},{0,-54},{58,-54}},color={255,0,255}));
+  connect(u1AvaSta.y, idxStaRunUna.u1AvaSta)
+    annotation (Line(points={{-68,-80},{50,-80},{50,-66},{58,-66}},color={255,0,255}));
+  connect(upPul.y, u1Up.u2)
+    annotation (Line(points={{-68,20},{-60,20},{-60,12},{-42,12}},color={255,0,255}));
+  connect(dowPul.y, u1Dow.u2)
+    annotation (Line(points={{-68,-20},{-60,-20},{-60,-28},{-42,-28}},color={255,0,255}));
+  connect(booTimTab.y[2], u1Dow.u1)
+    annotation (Line(points={{-68,90},{-50,90},{-50,-20},{-42,-20}},color={255,0,255}));
+  connect(u1Up.y, idxSta.u1Up)
+    annotation (Line(points={{-18,20},{-10,20},{-10,62},{18,62}},color={255,0,255}));
+  connect(u1Dow.y, idxSta.u1Dow)
+    annotation (Line(points={{-18,-20},{-4,-20},{-4,58},{18,58}},color={255,0,255}));
+  connect(u1Up.y, idxStaUna.u1Up)
+    annotation (Line(points={{-18,20},{30,20},{30,32},{60,32}},color={255,0,255}));
+  connect(u1Dow.y, idxStaUna.u1Dow)
+    annotation (Line(points={{-18,-20},{-4,-20},{-4,28},{60,28}},color={255,0,255}));
+  connect(u1Dow.y, idxStaRun.u1Dow)
+    annotation (Line(points={{-18,-20},{-4,-20},{-4,-32},{18,-32}},color={255,0,255}));
+  connect(u1Dow.y, idxStaRunUna.u1Dow)
+    annotation (Line(points={{-18,-20},{-4,-20},{-4,-62},{58,-62}},color={255,0,255}));
+  connect(u1Up.y, idxStaRun.u1Up)
+    annotation (Line(points={{-18,20},{-10,20},{-10,-28},{18,-28}},color={255,0,255}));
+  connect(u1Up.y, idxStaRunUna.u1Up)
+    annotation (Line(points={{-18,20},{-10,20},{-10,-58},{58,-58}},color={255,0,255}));
+  connect(booTimTab.y[1], u1Up.u1)
+    annotation (Line(points={{-68,90},{-50,90},{-50,20},{-42,20}},color={255,0,255}));
+  connect(u1Up.y, u1UpHol.u)
+    annotation (Line(points={{-18,20},{-10,20},{-10,100},{-2,100}},color={255,0,255}));
+  connect(u1Dow.y, u1DowHol.u)
+    annotation (Line(points={{-18,-20},{-4,-20},{-4,-100},{-2,-100}},color={255,0,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/StageIndex.mos"
+        "Simulate and plot"),
+    experiment(
+      StopTime=160.0,
+      Tolerance=1e-06),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.StageIndex\">
+Buildings.Templates.Plants.Controls.Utilities.StageIndex</a>.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}),
+    Diagram(
+      coordinateSystem(
+        extent={{-120,-120},{120,120}})));
+end StageIndex;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mo
new file mode 100644
index 00000000000..46bb48ced19
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mo
@@ -0,0 +1,120 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model TimerWithReset
+  "Validation model for the Timer block"
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset noThr
+    "Timer that do not compare threshold – No Reset"
+    annotation (Placement(transformation(extent={{20,10},{40,30}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset thrTim(
+    final t=0.3) "Timer that compares threshold – No Reset"
+    annotation (Placement(transformation(extent={{20,-30},{40,-10}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset thrTim1(
+    final t=0.3) "Timer that compares threshold – No Reset"
+    annotation (Placement(transformation(extent={{20,-70},{40,-50}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul(
+    final width=0.7,
+    final period=2)
+    "Block that outputs cyclic on and off"
+    annotation (Placement(transformation(extent={{-40,10},{-20,30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Pulse booPul1(
+    final width=0.7,
+    final period=2,
+    final shift=-1)
+    "Block that outputs cyclic on and off"
+    annotation (Placement(transformation(extent={{-40,-70},{-20,-50}})));
+
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant
+                                                   con(k=false) "Constant"
+    annotation (Placement(transformation(extent={{-40,-38},{-20,-18}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset noThrRes
+    "Timer that do not compare threshold – With Reset"
+    annotation (Placement(transformation(extent={{70,30},{90,50}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset thrTimRes(final t=
+        0.3) "Timer that compares threshold – With Reset"
+    annotation (Placement(transformation(extent={{72,-10},{92,10}})));
+  Buildings.Templates.Plants.Controls.Utilities.TimerWithReset thrTim1Res(final t=
+        0.3) "Timer that compares threshold – With Reset"
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger
+                                                   samTri(final period=1.5,
+      shift=1.2) "Block that generates periodic reset signal"
+    annotation (Placement(transformation(extent={{-40,50},{-20,70}})));
+  Buildings.Controls.OBC.CDL.Logical.TrueFalseHold res(trueHoldDuration=0.01,
+      falseHoldDuration=0) "Hold signal for plotting"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+equation
+  connect(booPul.y,noThr.u)
+    annotation (Line(points={{-18,20},{18,20}},color={255,0,255}));
+  connect(booPul.y,thrTim.u)
+    annotation (Line(points={{-18,20},{0,20},{0,-20},{18,-20}},color={255,0,255}));
+  connect(booPul1.y,thrTim1.u)
+    annotation (Line(points={{-18,-60},{18,-60}},color={255,0,255}));
+  connect(con.y, noThr.reset) annotation (Line(points={{-18,-28},{10,-28},{10,
+          12},{18,12}},
+                    color={255,0,255}));
+  connect(con.y, thrTim.reset) annotation (Line(points={{-18,-28},{18,-28}},
+                     color={255,0,255}));
+  connect(con.y, thrTim1.reset) annotation (Line(points={{-18,-28},{10,-28},{10,
+          -68},{18,-68}},
+                     color={255,0,255}));
+  connect(samTri.y, noThrRes.reset) annotation (Line(points={{-18,60},{60,60},{
+          60,32},{68,32}}, color={255,0,255}));
+  connect(booPul.y, noThrRes.u) annotation (Line(points={{-18,20},{0,20},{0,40},
+          {68,40}}, color={255,0,255}));
+  connect(booPul.y, thrTimRes.u) annotation (Line(points={{-18,20},{0,20},{0,0},
+          {70,0}}, color={255,0,255}));
+  connect(samTri.y, thrTimRes.reset) annotation (Line(points={{-18,60},{60,60},
+          {60,-8},{70,-8}}, color={255,0,255}));
+  connect(samTri.y, thrTim1Res.reset) annotation (Line(points={{-18,60},{60,60},
+          {60,-48},{68,-48}}, color={255,0,255}));
+  connect(booPul1.y, thrTim1Res.u) annotation (Line(points={{-18,-60},{0,-60},{
+          0,-40},{68,-40}}, color={255,0,255}));
+  connect(samTri.y, res.u) annotation (Line(points={{-18,60},{60,60},{60,80},{
+          68,80}}, color={255,0,255}));
+  annotation (
+    experiment(
+      StopTime=5.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TimerWithReset.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.TimerWithReset\">
+Buildings.Templates.Plants.Controls.Utilities.TimerWithReset</a>.
+</p>
+</html>",
+      revisions="<html>
+      <ul>
+      <li>
+March 29, 2024, by Antoine Gautier:<br/>
+Updated implementation to reset timer with boolean input.
+</li>
+<li>
+July 23, 2018, by Jianjun Hu:<br/>
+Updated implementation to reset accumulate timer with boolean input.
+</li>
+<li>
+July 18, 2018, by Jianjun Hu:<br/>
+Updated implementation to include accumulate timer.
+</li>
+<li>
+April 2, 2017, by Jianjun Hu:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end TimerWithReset;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mo
new file mode 100644
index 00000000000..6524701b2be
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mo
@@ -0,0 +1,70 @@
+within Buildings.Templates.Plants.Controls.Utilities.Validation;
+model TrueArrayConditional
+  Buildings.Templates.Plants.Controls.Utilities.TrueArrayConditional truArrConSam(nin=2)
+    "Array with true elements and same size as input vector"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Pulse uIdx1(
+    amplitude=1,
+    period=4,
+    shift=1.5) "Source signal for index of first true element"
+    annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Pulse uIdx2(
+    amplitude=1,
+    period=2.5,
+    offset=2) "Source signal for index of second true element"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable uTru(table=[0,0; 1,1; 2,
+        2], period=4) "Source signal for number of true elements"
+    annotation (Placement(transformation(extent={{-80,30},{-60,50}})));
+  Buildings.Templates.Plants.Controls.Utilities.TrueArrayConditional truArrConGre(nout=4,
+      nin=2) "Array with true elements and size greater than input vector"
+    annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
+equation
+  connect(uTru.y[1], truArrConSam.u) annotation (Line(points={{-58,40},{-20,40},
+          {-20,0},{-2,0}}, color={255,127,0}));
+  connect(uIdx1.y, truArrConSam.uIdx[1]) annotation (Line(points={{-58,0},{-40,0},
+          {-40,-6.5},{-2,-6.5}}, color={255,127,0}));
+  connect(uTru.y[1], truArrConGre.u) annotation (Line(points={{-58,40},{-20,40},
+          {-20,-40},{-2,-40}}, color={255,127,0}));
+  connect(uIdx1.y, truArrConGre.uIdx[1]) annotation (Line(points={{-58,0},{-40,0},
+          {-40,-46.5},{-2,-46.5}}, color={255,127,0}));
+  connect(uIdx2.y, truArrConSam.uIdx[2]) annotation (Line(points={{-58,-40},{-50,
+          -40},{-50,-7.5},{-2,-7.5},{-2,-5.5}}, color={255,127,0}));
+  connect(uIdx2.y, truArrConGre.uIdx[2]) annotation (Line(points={{-58,-40},{-50,
+          -40},{-50,-48},{-2,-48},{-2,-45.5}}, color={255,127,0}));
+  annotation (
+    experiment(
+      StopTime=5.0,
+      Tolerance=1e-06),
+    __Dymola_Commands(
+      file="modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/Controls/Utilities/Validation/TrueArrayConditional.mos" "Simulate and plot"),
+    Documentation(
+      info="<html>
+<p>
+Validation model for the block
+<a href=\"modelica://Buildings.Templates.Plants.Controls.Utilities.TrueArrayConditional\">
+Buildings.Templates.Plants.Controls.Utilities.TrueArrayConditional</a>.
+</p>
+</html>",
+      revisions="<html>
+      <ul>
+      <li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Icon(
+      graphics={
+        Ellipse(
+          lineColor={75,138,73},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-100,-100},{100,100}}),
+        Polygon(
+          lineColor={0,0,255},
+          fillColor={75,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-36,60},{64,0},{-36,-60},{-36,60}})}));
+end TrueArrayConditional;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/package.mo b/Buildings/Templates/Plants/Controls/Utilities/Validation/package.mo
new file mode 100644
index 00000000000..e5def715485
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/package.mo
@@ -0,0 +1,29 @@
+within Buildings.Templates.Plants.Controls.Utilities;
+package Validation "Collection of validation models"
+  annotation (
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Polygon(
+          origin={8.0,14.0},
+          lineColor={78,138,73},
+          fillColor={78,138,73},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          points={{-58.0,46.0},{42.0,-14.0},{-58.0,-74.0},{-58.0,46.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}),
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/Validation/package.order b/Buildings/Templates/Plants/Controls/Utilities/Validation/package.order
new file mode 100644
index 00000000000..caa1e43ad37
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/Validation/package.order
@@ -0,0 +1,13 @@
+CountTrue
+FirstTrueIndex
+HoldReal
+LastTrueIndex
+MultiMaxInteger
+MultiMinInteger
+PlaceholderInteger
+PlaceholderLogical
+PlaceholderReal
+SortWithIndices
+StageIndex
+TimerWithReset
+TrueArrayConditional
diff --git a/Buildings/Templates/Plants/Controls/Utilities/package.mo b/Buildings/Templates/Plants/Controls/Utilities/package.mo
new file mode 100644
index 00000000000..bf3ce309a24
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/package.mo
@@ -0,0 +1,48 @@
+within Buildings.Templates.Plants.Controls;
+package Utilities "Package with utility blocks"
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains utility blocks that are used to implement
+the control sequences within
+<a href=\"modelica://Buildings.Templates.Plants.Controls\">
+Buildings.Templates.Plants.Controls</a>.
+</p>
+</html>"),
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}));
+end Utilities;
diff --git a/Buildings/Templates/Plants/Controls/Utilities/package.order b/Buildings/Templates/Plants/Controls/Utilities/package.order
new file mode 100644
index 00000000000..7e02dab8af1
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/Utilities/package.order
@@ -0,0 +1,15 @@
+CountTrue
+FirstTrueIndex
+HoldReal
+LastTrueIndex
+MultiMaxInteger
+MultiMinInteger
+PIDWithEnable
+PlaceholderInteger
+PlaceholderLogical
+PlaceholderReal
+SortWithIndices
+StageIndex
+TimerWithReset
+TrueArrayConditional
+Validation
diff --git a/Buildings/Templates/Plants/Controls/package.mo b/Buildings/Templates/Plants/Controls/package.mo
new file mode 100644
index 00000000000..35798c237e9
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/package.mo
@@ -0,0 +1,47 @@
+within Buildings.Templates.Plants;
+package Controls "Control blocks"
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains control blocks that comply with the CDL specification:
+<a href=\"https://obc.lbl.gov/specification/cdl.html\">
+https://obc.lbl.gov/specification/cdl.html</a>.
+</p>
+</html>"),
+    Icon(
+      graphics={
+        Rectangle(
+          lineColor={200,200,200},
+          fillColor={248,248,248},
+          fillPattern=FillPattern.HorizontalCylinder,
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0),
+        Ellipse(
+          origin={10.0,10.0},
+          lineColor={128,128,128},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,0.0},{-20.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={128,128,128},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,0.0},{60.0,60.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{0.0,-80.0},{60.0,-20.0}}),
+        Ellipse(
+          origin={10.0,10.0},
+          fillColor={76,76,76},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.Solid,
+          extent={{-80.0,-80.0},{-20.0,-20.0}}),
+        Rectangle(
+          lineColor={128,128,128},
+          extent={{-100.0,-100.0},{100.0,100.0}},
+          radius=25.0)}));
+end Controls;
diff --git a/Buildings/Templates/Plants/Controls/package.order b/Buildings/Templates/Plants/Controls/package.order
new file mode 100644
index 00000000000..07c7d33a37e
--- /dev/null
+++ b/Buildings/Templates/Plants/Controls/package.order
@@ -0,0 +1,7 @@
+Enabling
+HeatPumps
+Pumps
+Setpoints
+StagingRotation
+Utilities
+Types
diff --git a/Buildings/Templates/Plants/HeatPumps/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
new file mode 100644
index 00000000000..5bda80564b4
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/AirToWater.mo
@@ -0,0 +1,771 @@
+within Buildings.Templates.Plants.HeatPumps;
+model AirToWater
+  "Air-to-water heat pump plant"
+  extends Buildings.Templates.Plants.HeatPumps.Interfaces.PartialHeatPumpPlant(
+    redeclare final package MediumChiWat=MediumHeaWat,
+    redeclare final package MediumSou=MediumAir,
+    redeclare Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater ctl,
+    final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+    final is_rev=have_chiWat,
+    final cfg(
+      final typMod=hp.typMod));
+  // Heat pumps, dedicated primary pumps and isolation valves
+  Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups.AirToWater hp(
+    redeclare final package MediumHeaWat=MediumHeaWat,
+    redeclare final package MediumAir=MediumAir,
+    final nHp=nHp,
+    final is_rev=is_rev,
+    final energyDynamics=energyDynamics,
+    final have_preDroChiHeaWat=false,
+    final have_preDroSou=false,
+    final dat=dat.hp,
+    final allowFlowReversal=allowFlowReversal,
+    final allowFlowReversalSou=false)
+    "Heat pump group"
+    annotation (Placement(transformation(extent={{-540,-210},{-60,-130}})));
+  Components.PumpsPrimaryDedicated pumPri(
+    redeclare final package Medium=MediumHeaWat,
+    final nHp=nHp,
+    final typArrPumPri=typArrPumPri,
+    final have_pumChiWatPriDed=have_pumChiWatPriDed,
+    final have_pumHeaWatPriVar=have_pumHeaWatPriVar,
+    final have_pumChiWatPriVar=have_pumChiWatPriVar,
+    final datPumHeaWat=dat.pumHeaWatPri,
+    final datPumChiWat=dat.pumChiWatPri,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal)
+    "Dedicated primary pumps"
+    annotation (Placement(transformation(extent={{-540,-130},{-60,-50}})));
+  Components.ValvesIsolation valIso(
+    redeclare final package Medium=MediumHeaWat,
+    final nHp=nHp,
+    final have_chiWat=have_chiWat,
+    final have_valHpInlIso=have_valHpInlIso,
+    final have_valHpOutIso=have_valHpOutIso,
+    final have_pumChiWatPriDed=have_pumChiWatPriDed,
+    final mHeaWatHp_flow_nominal=fill(dat.hp.mHeaWatHp_flow_nominal, nHp),
+    final dpHeaWatHp_nominal=fill(dat.hp.dpHeaWatHp_nominal, nHp),
+    final mChiWatHp_flow_nominal=fill(dat.hp.mChiWatHp_flow_nominal, nHp),
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal)
+    "Heat pump isolation valves"
+    annotation (Placement(transformation(extent={{-540,-50},{-60,90}})));
+  // Primary CHW loop
+  Buildings.Templates.Components.Pumps.Multiple pumChiWatPri(
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium=MediumChiWat,
+    final dat=dat.pumChiWatPri,
+    final nPum=nPumChiWatPri,
+    final have_var=have_pumChiWatPriVar,
+    final have_varCom=true,
+    final allowFlowReversal=allowFlowReversal)
+    if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Headered primary CHW pumps"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+  Buildings.Templates.Components.Routing.SingleToMultiple inlPumChiWatPri(
+    redeclare final package Medium=MediumChiWat,
+    final nPorts=nPumChiWatPri,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300)
+    if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Primary CHW pumps inlet manifold"
+    annotation (Placement(transformation(extent={{-40,70},{-20,90}})));
+  Buildings.Templates.Components.Routing.MultipleToSingle outPumChiWatPri(
+    redeclare final package Medium=MediumChiWat,
+    final nPorts=nPumChiWatPri,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300)
+    if have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Primary CHW pumps outlet manifold"
+    annotation (Placement(transformation(extent={{0,70},{20,90}})));
+  Buildings.Templates.Components.Routing.PassThroughFluid supChiWatPri(
+    redeclare final package Medium=MediumChiWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat and typArrPumPri
+     == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    "Primary CHW supply pipe - Plant with dedicated primary CHW pumps"
+    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+  Buildings.Templates.Components.Sensors.VolumeFlowRate VChiWatPri_flow(
+    redeclare final package Medium=MediumChiWat,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final have_sen=ctl.have_senVChiWatPri,
+    final text_flip=false,
+    final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
+    icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
+    if have_chiWat
+    "Primary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+  Buildings.Templates.Components.Routing.Junction junChiWatBypSup(
+    redeclare final package Medium=MediumChiWat,
+    final tau=tau,
+    final m_flow_nominal=mChiWatPri_flow_nominal * {1, - 1, - 1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving) if have_chiWat
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={100,80})));
+  Buildings.Templates.Components.Sensors.Temperature TChiWatPriSup(
+    redeclare final package Medium=MediumChiWat,
+    final have_sen=true,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+    "Primary CHW supply temperature"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={60,80})));
+  Buildings.Templates.Components.Routing.Junction junChiWatBypRet(
+    redeclare final package Medium=MediumChiWat,
+    final tau=tau,
+    final m_flow_nominal=mChiWatPri_flow_nominal * {1, - 1, 1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    icon_pipe1=Buildings.Templates.Components.Types.IconPipe.Return,
+    icon_pipe3=Buildings.Templates.Components.Types.IconPipe.Supply)
+    if have_chiWat
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=0,
+      origin={100,0})));
+  Buildings.Templates.Components.Sensors.Temperature TChiWatPriRet(
+    redeclare final package Medium=MediumChiWat,
+    final have_sen=ctl.have_senTChiWatPriRet,
+    final m_flow_nominal=mChiWatPri_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+    "Primary CHW return temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={60,0})));
+  // Secondary CHW loop
+  Buildings.Templates.Components.Pumps.Multiple pumChiWatSec(
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    redeclare final package Medium=MediumChiWat,
+    final nPum=nPumChiWatSec,
+    final have_var=true,
+    final have_varCom=true,
+    final dat=dat.pumChiWatSec) if have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary CHW pumps"
+    annotation (Placement(transformation(extent={{170,70},{190,90}})));
+  Buildings.Templates.Components.Routing.SingleToMultiple inlPumChiWatSec(
+    redeclare final package Medium=MediumChiWat,
+    final nPorts=nPumChiWatSec,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300) if
+    have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary CHW pumps inlet manifold"
+    annotation (Placement(transformation(extent={{150,70},{170,90}})));
+  Buildings.Templates.Components.Routing.MultipleToSingle outPumChiWatSec(
+    redeclare final package Medium=MediumChiWat,
+    final nPorts=nPumChiWatSec,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300) if
+    have_chiWat and typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary CHW pumps outlet manifold"
+    annotation (Placement(transformation(extent={{190,70},{210,90}})));
+  Buildings.Templates.Components.Routing.PassThroughFluid supChiWatSec(
+    redeclare final package Medium=MediumChiWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat and
+    typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary CHW supply pipe - Plant without secondary CHW pumps"
+    annotation (Placement(transformation(extent={{170,70},{190,90}})));
+  Buildings.Templates.Components.Sensors.VolumeFlowRate VChiWatSec_flow(
+    redeclare final package Medium=MediumChiWat,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final have_sen=ctl.have_senVChiWatSec,
+    final text_flip=false,
+    final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
+    if have_chiWat
+    "Secondary CHW volume flow rate"
+    annotation (Placement(transformation(extent={{208,70},{228,90}})));
+  Buildings.Templates.Components.Sensors.Temperature TChiWatSecSup(
+    redeclare final package Medium=MediumChiWat,
+    final have_sen=ctl.have_senTChiWatSecSup,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+    "Secondary CHW supply temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={140,80})));
+  Buildings.Templates.Components.Sensors.Temperature TChiWatSecRet(
+    redeclare final package Medium=MediumChiWat,
+    final have_sen=ctl.have_senTChiWatSecRet,
+    final m_flow_nominal=mChiWat_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final allowFlowReversal=allowFlowReversal) if have_chiWat
+    "Secondary CHW return temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={140,0})));
+  // Primary HW loop
+  Buildings.Templates.Components.Routing.SingleToMultiple inlPumHeaWatPri(
+    redeclare final package Medium=MediumHeaWat,
+    final nPorts=nPumHeaWatPri,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300)
+    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Primary HW pumps inlet manifold"
+    annotation (Placement(transformation(extent={{-40,-290},{-20,-270}})));
+  Buildings.Templates.Components.Pumps.Multiple pumHeaWatPri(
+    final energyDynamics=energyDynamics,
+    redeclare final package Medium=MediumHeaWat,
+    final dat=dat.pumHeaWatPri,
+    final nPum=nPumHeaWatPri,
+    final have_var=have_pumHeaWatPriVar,
+    final have_varCom=true,
+    final allowFlowReversal=allowFlowReversal)
+    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Headered primary HW pumps"
+    annotation (Placement(transformation(extent={{-20,-290},{0,-270}})));
+  Buildings.Templates.Components.Routing.MultipleToSingle outPumHeaWatPri(
+    redeclare final package Medium=MediumHeaWat,
+    final nPorts=nPumHeaWatPri,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300)
+    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Primary HW pumps outlet manifold"
+    annotation (Placement(transformation(extent={{0,-290},{20,-270}})));
+  Buildings.Templates.Components.Routing.PassThroughFluid supHeaWatPri(
+    redeclare final package Medium=MediumHeaWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal) if have_heaWat and typArrPumPri
+     == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    "Primary HW supply pipe - Plant with dedicated primary HW pumps"
+    annotation (Placement(transformation(extent={{-20,-290},{0,-270}})));
+  Buildings.Templates.Components.Sensors.VolumeFlowRate VHeaWatPri_flow(
+    redeclare final package Medium=MediumHeaWat,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final have_sen=ctl.have_senVHeaWatPri,
+    final text_flip=false,
+    final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
+    icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
+    "Primary HW volume flow rate"
+    annotation (Placement(transformation(extent={{20,-290},{40,-270}})));
+  Buildings.Templates.Components.Routing.Junction junHeaWatBypSup(
+    redeclare final package Medium=MediumHeaWat,
+    final tau=tau,
+    final m_flow_nominal=mHeaWatPri_flow_nominal * {1, - 1, - 1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving) if have_heaWat
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={100,-280})));
+  Buildings.Templates.Components.Sensors.Temperature THeaWatPriSup(
+    redeclare final package Medium=MediumHeaWat,
+    final have_sen=true,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal)
+    "Primary HW supply temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={60,-280})));
+  Buildings.Templates.Components.Sensors.Temperature THeaWatPriRet(
+    redeclare final package Medium = MediumHeaWat,
+    final have_sen=ctl.have_senTHeaWatPriRet,
+    final m_flow_nominal=mHeaWatPri_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final allowFlowReversal=allowFlowReversal)
+    "Primary HW return temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={60,-360})));
+  Buildings.Templates.Components.Routing.Junction junHeaWatBypRet(
+    redeclare final package Medium=MediumHeaWat,
+    final tau=tau,
+    final m_flow_nominal=mHeaWatPri_flow_nominal * {1, - 1, 1},
+    final energyDynamics=energyDynamics,
+    dp_nominal=fill(0, 3),
+    final portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    final portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    final portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+      else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    icon_pipe1=Buildings.Templates.Components.Types.IconPipe.Return,
+    icon_pipe3=Buildings.Templates.Components.Types.IconPipe.Supply)
+    if have_heaWat
+    "Fluid junction"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=0,
+      origin={100,-360})));
+  Buildings.Fluid.Sources.Boundary_pT bouHeaWat(
+    redeclare final package Medium=MediumHeaWat,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=1) if have_heaWat
+    "Pressure boundary condition to mimic expansion tank"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=90,
+      origin={20,-340})));
+  // Secondary HW loop
+  Buildings.Templates.Components.Pumps.Multiple pumHeaWatSec(
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    redeclare final package Medium=MediumHeaWat,
+    final nPum=nPumHeaWatSec,
+    final have_var=true,
+    final have_varCom=true,
+    final dat=dat.pumHeaWatSec)
+    if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary HW pumps"
+    annotation (Placement(transformation(extent={{170,-290},{190,-270}})));
+  Buildings.Templates.Components.Routing.SingleToMultiple inlPumHeaWatSec(
+    redeclare final package Medium=MediumHeaWat,
+    final nPorts=nPumHeaWatSec,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300)
+    if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary HW pumps inlet manifold"
+    annotation (Placement(transformation(extent={{150,-290},{170,-270}})));
+  Buildings.Templates.Components.Routing.MultipleToSingle outPumHeaWatSec(
+    redeclare final package Medium=MediumHeaWat,
+    final nPorts=nPumHeaWatSec,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final icon_dy=300)
+    if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary HW pumps outlet manifold"
+    annotation (Placement(transformation(extent={{190,-290},{210,-270}})));
+  Buildings.Templates.Components.Routing.PassThroughFluid supHeaWatSec(
+    redeclare final package Medium=MediumHeaWat,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal) if have_heaWat and
+    typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary HW supply pipe - Plant without secondary HW pumps"
+    annotation (Placement(transformation(extent={{170,-290},{190,-270}})));
+  Buildings.Templates.Components.Sensors.VolumeFlowRate VHeaWatSec_flow(
+    redeclare final package Medium=MediumHeaWat,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final have_sen=ctl.have_senVHeaWatSec,
+    final text_flip=false,
+    final typ=Buildings.Templates.Components.Types.SensorVolumeFlowRate.FlowMeter,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply)
+    "Secondary HW volume flow rate"
+    annotation (Placement(transformation(extent={{210,-290},{230,-270}})));
+  Buildings.Templates.Components.Sensors.Temperature THeaWatSecSup(
+    redeclare final package Medium=MediumHeaWat,
+    final have_sen=ctl.have_senTHeaWatSecSup,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Supply,
+    final allowFlowReversal=allowFlowReversal)
+    "Secondary HW supply temperature"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={140,-280})));
+  Buildings.Templates.Components.Sensors.Temperature THeaWatSecRet(
+    redeclare final package Medium=MediumHeaWat,
+    final have_sen=ctl.have_senTHeaWatSecRet,
+    final m_flow_nominal=mHeaWat_flow_nominal,
+    final typ=Buildings.Templates.Components.Types.SensorTemperature.InWell,
+    final icon_pipe=Buildings.Templates.Components.Types.IconPipe.Return,
+    final allowFlowReversal=allowFlowReversal)
+    "Secondary HW return temperature"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={140,-360})));
+equation
+  /* Control point connection - start */
+  connect(bus, hp.bus);
+  connect(busWea, hp.busWea);
+  connect(bus, pumPri.bus);
+  connect(bus, valIso.bus);
+  connect(bus.pumChiWatPri, pumChiWatPri.bus);
+  connect(bus.pumHeaWatPri, pumHeaWatPri.bus);
+  connect(bus.pumChiWatSec, pumChiWatSec.bus);
+  connect(bus.pumHeaWatSec, pumHeaWatSec.bus);
+  connect(VChiWatPri_flow.y, bus.VChiWatPri_flow);
+  connect(VHeaWatPri_flow.y, bus.VHeaWatPri_flow);
+  connect(VChiWatSec_flow.y, bus.VChiWatSec_flow);
+  connect(VHeaWatSec_flow.y, bus.VHeaWatSec_flow);
+  connect(TChiWatPriSup.y, bus.TChiWatPriSup);
+  connect(THeaWatPriSup.y, bus.THeaWatPriSup);
+  connect(TChiWatPriRet.y, bus.TChiWatPriRet);
+  connect(THeaWatPriRet.y, bus.THeaWatPriRet);
+  connect(TChiWatSecSup.y, bus.TChiWatSecSup);
+  connect(THeaWatSecSup.y, bus.THeaWatSecSup);
+  connect(TChiWatSecRet.y, bus.TChiWatSecRet);
+  connect(THeaWatSecRet.y, bus.THeaWatSecRet);
+  /* Control point connection - stop */
+  connect(pumChiWatPri.ports_b, outPumChiWatPri.ports_a)
+    annotation (Line(points={{0,80},{0,80}},  color={0,127,255}));
+  connect(inlPumChiWatPri.ports_b, pumChiWatPri.ports_a)
+    annotation (Line(points={{-20,80},{-20,80}},
+                                              color={0,127,255}));
+  connect(valIso.port_bChiWat, inlPumChiWatPri.port_a)
+    annotation (Line(
+      points={{-60,80},{-60,80},{-40,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered));
+  connect(hp.ports_bChiHeaWat, pumPri.ports_aChiHeaWatHp)
+    annotation (Line(points={{-350,-130},{-350,-130}},color={0,127,255}));
+  connect(pumPri.ports_bChiHeaWat, valIso.ports_aChiHeaWatHp)
+    annotation (Line(points={{-350,-50},{-350,-50}},color={0,127,255}));
+  connect(pumPri.ports_bHeaWat, valIso.ports_aHeaWatHp)
+    annotation (Line(points={{-366,-50},{-366,-50}},color={0,127,255}));
+  connect(pumPri.ports_bChiWat, valIso.ports_aChiWatHp)
+    annotation (Line(points={{-334,-50},{-334,-50}},  color={0,127,255}));
+  connect(outPumChiWatPri.port_b, VChiWatPri_flow.port_a)
+    annotation (Line(points={{20,80},{20,80}},color={0,127,255}));
+  connect(VChiWatPri_flow.port_b, TChiWatPriSup.port_a)
+    annotation (Line(
+      points={{40,80},{50,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(TChiWatPriSup.port_b, junChiWatBypSup.port_1)
+    annotation (Line(
+      points={{70,80},{90,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(pumChiWatSec.ports_b, outPumChiWatSec.ports_a)
+    annotation (Line(points={{190,80},{190,80}},color={0,127,255}));
+  connect(inlPumChiWatSec.ports_b, pumChiWatSec.ports_a)
+    annotation (Line(points={{170,80},{170,80}},color={0,127,255}));
+  connect(valIso.port_bChiWat, supChiWatPri.port_a)
+    annotation (Line(
+      points={{-60,80},{-60,80},{-20,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  connect(supChiWatPri.port_b, VChiWatPri_flow.port_a)
+    annotation (Line(
+      points={{0,80},{20,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  connect(valIso.ports_bChiHeaWatHp, pumPri.ports_aChiHeaWat)
+    annotation (Line(points={{-250,-50},{-250,-50}},
+                                                  color={0,127,255}));
+  connect(pumPri.ports_bChiHeaWatHp, hp.ports_aChiHeaWat)
+    annotation (Line(points={{-250,-130},{-250,-130}},
+                                                    color={0,127,255}));
+  connect(VChiWatSec_flow.port_b, port_bChiWat)
+    annotation (Line(
+      points={{228,80},{600,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(supChiWatSec.port_b, VChiWatSec_flow.port_a)
+    annotation (Line(
+      points={{190,80},{208,80}},
+      color={0,0,0},
+      visible=have_chiWat and typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized,
+      thickness=0.5));
+
+  connect(pumHeaWatPri.ports_b, outPumHeaWatPri.ports_a)
+    annotation (Line(points={{0,-280},{0,-280}},  color={0,127,255}));
+  connect(inlPumHeaWatPri.ports_b, pumHeaWatPri.ports_a)
+    annotation (Line(points={{-20,-280},{-20,-280}},
+                                                  color={0,127,255}));
+  connect(outPumHeaWatPri.port_b, VHeaWatPri_flow.port_a)
+    annotation (Line(points={{20,-280},{20,-280}},color={0,127,255}));
+  connect(VHeaWatPri_flow.port_b, THeaWatPriSup.port_a)
+    annotation (Line(points={{40,-280},{50,-280}},  color={0,0,0},
+      thickness=0.5));
+  connect(THeaWatPriSup.port_b, junHeaWatBypSup.port_1)
+    annotation (Line(points={{70,-280},{90,-280}},  color={0,0,0},
+      thickness=0.5));
+  connect(pumHeaWatSec.ports_b, outPumHeaWatSec.ports_a)
+    annotation (Line(points={{190,-280},{190,-280}},color={0,127,255}));
+  connect(inlPumHeaWatSec.ports_b, pumHeaWatSec.ports_a)
+    annotation (Line(points={{170,-280},{170,-280}},color={0,127,255}));
+  connect(supHeaWatPri.port_b, VHeaWatPri_flow.port_a)
+    annotation (Line(
+      points={{0,-280},{20,-280}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  connect(supHeaWatSec.port_b, VHeaWatSec_flow.port_a)
+    annotation (Line(
+      points={{190,-280},{210,-280}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_heaWat and typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
+  connect(outPumHeaWatSec.port_b, VHeaWatSec_flow.port_a)
+    annotation (Line(points={{210,-280},{210,-280}},color={0,0,0},
+      thickness=0.5));
+  connect(valIso.port_bHeaWat, inlPumHeaWatPri.port_a)
+    annotation (Line(
+      points={{-540,20},{-540,-280},{-40,-280}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered));
+  connect(VHeaWatSec_flow.port_b, port_bHeaWat)
+    annotation (Line(points={{230,-280},{600,-280}},color={0,0,0},
+      thickness=0.5));
+  connect(valIso.port_bHeaWat, supHeaWatPri.port_a)
+    annotation (Line(
+      points={{-540,20},{-540,-280},{-20,-280}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  connect(junHeaWatBypSup.port_3, junHeaWatBypRet.port_3)
+    annotation (Line(points={{100,-290},{100,-350}}, color={0,0,0},
+      thickness=0.5));
+  connect(junChiWatBypSup.port_3, junChiWatBypRet.port_3)
+    annotation (Line(
+      points={{100,70},{100,10}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(junChiWatBypSup.port_2, TChiWatSecSup.port_a)
+    annotation (Line(
+      points={{110,80},{130,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(TChiWatSecSup.port_b, inlPumChiWatSec.port_a)
+    annotation (Line(points={{150,80},{150,80}},
+                                               color={0,0,0},
+      thickness=0.5));
+  connect(junChiWatBypRet.port_1, TChiWatSecRet.port_b)
+    annotation (Line(
+      points={{110,0},{130,0}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(port_aChiWat, TChiWatSecRet.port_a)
+    annotation (Line(
+      points={{600,0},{150,0}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(junChiWatBypRet.port_2, TChiWatPriRet.port_a)
+    annotation (Line(
+      points={{90,0},{70,0}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5,
+      visible=have_chiWat));
+  connect(port_aHeaWat, THeaWatSecRet.port_a)
+    annotation (Line(points={{600,-360},{150,-360}},color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
+  connect(junHeaWatBypSup.port_2, THeaWatSecSup.port_a)
+    annotation (Line(points={{110,-280},{130,-280}},
+                                                   color={0,0,0},
+      thickness=0.5));
+  connect(THeaWatSecSup.port_b, inlPumHeaWatSec.port_a)
+    annotation (Line(points={{150,-280},{150,-280}},
+                                                   color={0,0,0},
+      thickness=0.5));
+  connect(THeaWatSecSup.port_b, supHeaWatSec.port_a) annotation (Line(
+      points={{150,-280},{158,-280},{158,-232},{166,-232},{166,-280},{170,-280}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_heaWat and typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
+  connect(TChiWatSecSup.port_b, supChiWatSec.port_a) annotation (Line(
+      points={{150,80},{158,80},{158,60},{166,60},{166,80},{170,80}},
+      color={0,0,0},
+      thickness=0.5,
+      visible=have_chiWat and typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
+  connect(bouHeaWat.ports[1], THeaWatPriRet.port_b)
+    annotation (Line(points={{20,-350},{20,-360},{50,-360}},
+                                                           color={0,127,255}));
+  connect(junHeaWatBypRet.port_1, THeaWatSecRet.port_b)
+    annotation (Line(points={{110,-360},{130,-360}}, color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
+  connect(junHeaWatBypRet.port_2, THeaWatPriRet.port_a) annotation (Line(
+      points={{90,-360},{70,-360}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
+  connect(THeaWatPriRet.port_b, valIso.port_aHeaWat) annotation (Line(
+      points={{50,-360},{-584,-360},{-584,60},{-540,60}},
+      color={0,0,0},
+      thickness=0.5,
+      pattern=LinePattern.Dash));
+  connect(outPumChiWatSec.port_b, VChiWatSec_flow.port_a) annotation (Line(
+      points={{210,80},{208,80}},
+      color={0,0,0},
+      thickness=1));
+  connect(TChiWatPriRet.port_b, valIso.port_aChiWat) annotation (Line(
+      points={{50,0},{0,0},{0,40},{-60,40}},
+      color={0,0,0},
+      pattern=LinePattern.Dash,
+      thickness=0.5,
+      visible=have_chiWat));
+  annotation (
+    defaultComponentName="pla",
+    Documentation(
+      info="<html>
+<h4>Description</h4>
+<p>
+This template represents an air-to-water heat pump plant
+with closed-loop controls. While the heat pump plant configuration can be changed
+through parameters, a typical configuration is shown in the image below.
+</p>
+<p align=\"center\">
+<img alt=\"Image of heat pump plant\"
+src=\"modelica://Buildings/Resources/Images/Templates/Plants/HeatPumps/AirToWater.png\"/>
+</p>
+<p>
+Only identical heat pumps are currently supported.
+</p>
+<p>
+The supported plant configurations are enumerated in the table below.
+The first option displayed in bold characters corresponds to the default
+configuration.<br/>
+</p>
+<table summary=\"summary\" border=\"1\">
+<tr><th>Configuration parameter</th><th>Options</th><th>Notes</th></tr>
+<tr><td>Function</td>
+<td>
+<b>Heating and cooling</b><br/>
+Heating-only
+</td>
+<td>
+The plant always provides heating hot water.<br/>
+Setting the parameter <code>have_chiWat</code> to true (default setting) allows
+modeling a plant that provides both heating hot water and chilled water.
+</td>
+</tr>
+<tr><td>Type of distribution</td>
+<td>
+<b>Constant primary-variable secondary centralized</b>
+</td>
+<td>
+It is assumed that the HW and the CHW loops have the
+same type of distribution, as specified by this parameter.<br/>
+\"Centralized secondary pumps\" refers to configurations with a single
+group of secondary pumps that is typically integrated into the plant.<br/>
+Distributed secondary pumps with multiple secondary loops served
+by dedicated secondary pumps are currently not supported.<br/>
+Options are limited to constant primary distributions because most
+AWHPs on the market use a reverse cycle for defrosting.
+This requires maximum primary flow during defrost cycles and hinders
+variable primary distributions.<br/>
+An option for constant primary-only distributions with ∆p-controlled
+variable speed pumps will be added in a next release.
+</td>
+</tr>
+<tr><td>Type of primary pump arrangement</td>
+<td>
+<b>Dedicated</b><br/>
+Headered
+</td>
+<td>It is assumed that the HW and the CHW loops have the
+same type of primary pump arrangement, as specified by this parameter.
+</td>
+</tr>
+<tr><td>Separate dedicated primary CHW pumps</td>
+<td>
+<b>False</b><br/>
+True
+</td>
+<td>This option is only available for heating and cooling plants
+with dedicated primary pumps.
+If this option is not selected (default setting), each AWHP uses
+a common dedicated primary pump for HW and CHW.
+Otherwise, each AWHP relies on a separate dedicated HW pump
+and a separate dedicated CHW pump.
+</td>
+</tr>
+<tr><td>Type of primary HW pumps</td>
+<td>
+<b>Variable speed</b><br/>
+Constant speed
+</td>
+<td>
+For constant primary-variable secondary distributions, the variable
+speed primary pumps are commanded at fixed speeds, determined during the
+Testing, Adjusting and Balancing phase to provide design AWHP flow in
+heating and cooling modes.
+The same intent is achieved with constant speed primary pumps through the
+use of balancing valves.
+</td>
+</tr>
+<tr><td>Type of primary CHW pumps</td>
+<td>
+<b>Variable speed</b><br/>
+Constant speed
+</td>
+<td>See the note above on primary HW pumps.</td>
+</tr>
+<tr><td>Controller</td>
+<td>
+<b>Closed-loop controls with supply temperature and differential pressure reset</b><br/>
+</td>
+<td>
+Most parts of the sequence of operation are similar to that
+described in ASHRAE, 2021 for chiller plants.<br/>
+See the documentation of <a href=\"modelica://Buildings.Templates.Plants.Controls.HeatPumps.AirToWater\">
+Buildings.Templates.Plants.Controls.HeatPumps.AirToWater</a>
+for more details.<br/>
+An open loop controller is also available for validation purposes.
+</td>
+</tr>
+</table>
+<h4>Control points</h4>
+<p>
+The control sequence implemented in this template requires the 
+external input points specified in the documentation of the controller
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater\">
+Buildings.Templates.Plants.HeatPumps.Components.Controls.AirToWater</a>.
+<h4>Implementation details</h4>
+<p>
+The pressure drops of the heat pump CHW and HW heat exchangers are calculated
+within the isolation valve component <code>valIso</code> based on lumped flow
+coefficients for the sake of computational efficiency.
+</p>
+<h4>References</h4>
+<ul>
+<li id=\"ASHRAE2021\">
+ASHRAE, 2021. Guideline 36-2021, High-Performance Sequences of Operation
+for HVAC Systems. Atlanta, GA.
+</li>
+</ul>
+</html>"));
+end AirToWater;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo
new file mode 100644
index 00000000000..ddb864f12e7
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Controls/AirToWater.mo
@@ -0,0 +1,332 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Controls;
+model AirToWater
+  "Controller for AWHP plant"
+  extends
+    Buildings.Templates.Plants.HeatPumps.Components.Interfaces.PartialController(
+    final typ=Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater);
+  final parameter Real staEqu[:, nHp](
+    each final max=1,
+    each final min=0,
+    each final unit="1")=dat.staEqu
+    "Staging matrix – Equipment required for each stage"
+    annotation (Dialog(group="Equipment staging and rotation"));
+  final parameter Integer nSta(
+    final min=1)=size(staEqu, 1)
+    "Number of stages"
+    annotation (Evaluate=true);
+  final parameter Integer nEquAlt(
+    final min=0)=max({sum({(if staEqu[i, j] > 0 and staEqu[i, j] < 1 then 1 else 0) for j in 1:nHp}) for i in 1:nSta})
+    "Number of lead/lag alternate equipment"
+    annotation (Evaluate=true);
+  final parameter Integer idxEquAlt[nEquAlt]=Modelica.Math.BooleanVectors.index(
+    {Modelica.Math.BooleanVectors.anyTrue({staEqu[i,j] > 0 and staEqu[i,j] < 1 for i in 1:nSta})
+    for j in 1:nHp})
+    "Indices of lead/lag alternate equipment"
+    annotation (Evaluate=true,
+    Dialog(group="Equipment staging and rotation"));
+  Buildings.Templates.Plants.Controls.HeatPumps.AirToWater ctl(
+    final TChiWatSupSet_max=dat.TChiWatSupSet_max,
+    final TChiWatSup_nominal=dat.TChiWatSup_nominal,
+    final THeaWatSupSet_min=dat.THeaWatSupSet_min,
+    final THeaWatSup_nominal=dat.THeaWatSup_nominal,
+    final TOutChiWatLck=dat.TOutChiWatLck,
+    final TOutHeaWatLck=dat.TOutHeaWatLck,
+    final VChiWatSec_flow_nominal=dat.VChiWatSec_flow_nominal,
+    final VHeaWatSec_flow_nominal=dat.VHeaWatSec_flow_nominal,
+    final capCooHp_nominal=fill(dat.capCooHp_nominal, cfg.nHp),
+    final capHeaHp_nominal=fill(dat.capHeaHp_nominal, cfg.nHp),
+    final cp_default=if cfg.have_heaWat then cfg.cpHeaWat_default else cfg.cpChiWat_default,
+    final dpChiWatRemSet_max=dat.dpChiWatRemSet_max,
+    final dpChiWatRemSet_min=dat.dpChiWatRemSet_min,
+    final dpHeaWatRemSet_max=dat.dpHeaWatRemSet_max,
+    final dpHeaWatRemSet_min=dat.dpHeaWatRemSet_min,
+    final have_chiWat=cfg.have_chiWat,
+    final have_heaWat=cfg.have_heaWat,
+    final have_inpSch=have_inpSch,
+    final have_pumChiWatPriDed_select=cfg.have_pumChiWatPriDed,
+    final have_pumChiWatSec_select=cfg.typPumChiWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized,
+    final have_pumHeaWatSec_select=cfg.typPumHeaWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized,
+    final have_pumPriHdr=cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered,
+    final have_pumHeaWatPriVar=cfg.have_pumHeaWatPriVar,
+    final have_pumChiWatPriVar=cfg.have_pumChiWatPriVar,
+    final have_senDpChiWatRemWir=cfg.have_senDpChiWatRemWir,
+    final have_senDpHeaWatRemWir=cfg.have_senDpHeaWatRemWir,
+    final have_senTChiWatPriRet_select=have_senTChiWatPriRet_select,
+    final have_senTChiWatSecRet=have_senTChiWatSecRet,
+    final have_senTHeaWatPriRet_select=have_senTHeaWatPriRet_select,
+    final have_senTHeaWatSecRet=have_senTHeaWatSecRet,
+    final have_senVChiWatPri_select=have_senVChiWatPri_select,
+    final have_senVHeaWatPri_select=have_senVHeaWatPri_select,
+    final have_valHpInlIso=cfg.have_valHpInlIso,
+    final have_valHpOutIso=cfg.have_valHpOutIso,
+    final idxEquAlt=idxEquAlt,
+    final nHp=cfg.nHp,
+    final nPumChiWatPri=cfg.nPumChiWatPri,
+    final nPumChiWatSec=cfg.nPumChiWatSec,
+    final nPumHeaWatPri=cfg.nPumHeaWatPri,
+    final nPumHeaWatSec=cfg.nPumHeaWatSec,
+    final nSenDpChiWatRem=nSenDpChiWatRem,
+    final nSenDpHeaWatRem=nSenDpHeaWatRem,
+    final plrSta=dat.plrSta,
+    final rho_default=if cfg.have_heaWat then cfg.rhoHeaWat_default else cfg.rhoChiWat_default,
+    final schCoo=dat.schCoo,
+    final schHea=dat.schHea,
+    final staEqu=dat.staEqu,
+    final yPumChiWatPriSet=dat.yPumChiWatPriSet,
+    final yPumHeaWatPriSet=dat.yPumHeaWatPriSet)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-20,-20},{20,40}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqPlaHeaWatAirHan(
+    final nin=nAirHan) if cfg.have_heaWat "Sum of HW plant requests from AHU"
+    annotation (Placement(transformation(extent={{210,190},{190,210}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqPlaHeaWatEquZon(
+    final nin=nEquZon) if cfg.have_heaWat
+    "Sum of HW plant requests from zone equipment"
+    annotation (Placement(transformation(extent={{210,-90},{190,-70}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqResHeaWatAirHan(nin=1)
+    if cfg.have_heaWat "Sum of HW reset requests from AHU"
+    annotation (Placement(transformation(extent={{210,110},{190,130}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqResHeaWatEquZon(
+    final nin=nEquZon) if cfg.have_heaWat
+    "Sum of HW reset requests from zone equipment"
+    annotation (Placement(transformation(extent={{210,-170},{190,-150}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqResChiWatAirHan(final nin=
+        nAirHan) if cfg.have_chiWat "Sum of CHW reset requests from AHU"
+    annotation (Placement(transformation(extent={{210,70},{190,90}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqPlaChiWatEquZon(final nin=
+        nEquZon) if cfg.have_chiWat
+    "Sum of CHW plant requests from zone equipment"
+    annotation (Placement(transformation(extent={{210,-130},{190,-110}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqResChiWatEquZon(final nin=
+        nEquZon) if cfg.have_chiWat
+    "Sum of CHW reset requests from zone equipment"
+    annotation (Placement(transformation(extent={{210,-210},{190,-190}})));
+  Buildings.Controls.OBC.CDL.Integers.MultiSum reqPlaChiWatAirHan(final nin=
+        nAirHan) if cfg.have_chiWat "Sum of CHW plant requests from AHU"
+    annotation (Placement(transformation(extent={{210,150},{190,170}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqPlaHeaWatAirHan(
+    final have_inp=cfg.have_heaWat,
+    final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,190},{150,210}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqPlaChiWatAirHan(final
+      have_inp=cfg.have_chiWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,150},{150,170}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqResHeaWatAirHan(final
+      have_inp=cfg.have_heaWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,110},{150,130}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqResChiWatAirHan(final
+      have_inp=cfg.have_chiWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,70},{150,90}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqPlaHeaWatEquZon(final
+      have_inp=cfg.have_heaWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,-90},{150,-70}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqPlaChiWatEquZon(final
+      have_inp=cfg.have_chiWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,-130},{150,-110}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqResHeaWatEquZon(final
+      have_inp=cfg.have_heaWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,-170},{150,-150}})));
+  Buildings.Templates.Plants.Controls.Utilities.PlaceholderInteger phReqResChiWatEquZon(final
+      have_inp=cfg.have_chiWat, final u_internal=0)
+    "Placeholder value if signal is not available"
+    annotation (Placement(transformation(extent={{170,-210},{150,-190}})));
+  Buildings.Controls.OBC.CDL.Integers.Add reqPlaHeaWat
+    "Sum of HW plant requests of all loads served"
+    annotation (Placement(transformation(extent={{110,184},{90,204}})));
+  Buildings.Controls.OBC.CDL.Integers.Add reqPlaChiWat
+    "Sum of CHW plant requests of all loads served"
+    annotation (Placement(transformation(extent={{110,144},{90,164}})));
+  Buildings.Controls.OBC.CDL.Integers.Add reqResHeaWat
+    "Sum of HW reset requests of all loads served"
+    annotation (Placement(transformation(extent={{110,104},{90,124}})));
+  Buildings.Controls.OBC.CDL.Integers.Add reqResChiWat
+    "Sum of CHW reset requests of all loads served"
+    annotation (Placement(transformation(extent={{110,64},{90,84}})));
+equation
+  /* Control point connection - start */
+  // Inputs from plant control bus
+  connect(bus.TChiWatPriRet, ctl.TChiWatPriRet);
+  connect(bus.TChiWatPriSup, ctl.TChiWatPriSup);
+  connect(bus.TChiWatSecRet, ctl.TChiWatSecRet);
+  connect(bus.TChiWatSecSup, ctl.TChiWatSecSup);
+  connect(bus.THeaWatPriRet, ctl.THeaWatPriRet);
+  connect(bus.THeaWatPriSup, ctl.THeaWatPriSup);
+  connect(bus.THeaWatSecRet, ctl.THeaWatSecRet);
+  connect(bus.THeaWatSecSup, ctl.THeaWatSecSup);
+  connect(bus.TOut, ctl.TOut);
+  connect(bus.VChiWatPri_flow, ctl.VChiWatPri_flow);
+  connect(bus.VChiWatSec_flow, ctl.VChiWatSec_flow);
+  connect(bus.VHeaWatPri_flow, ctl.VHeaWatPri_flow);
+  connect(bus.VHeaWatSec_flow, ctl.VHeaWatSec_flow);
+  connect(bus.dpChiWatLoc, ctl.dpChiWatLoc);
+  connect(bus.dpChiWatLocSet, ctl.dpChiWatLocSet);
+  connect(bus.dpChiWatRem, ctl.dpChiWatRem);
+  connect(bus.dpHeaWatLoc, ctl.dpHeaWatLoc);
+  connect(bus.dpHeaWatLocSet, ctl.dpHeaWatLocSet);
+  connect(bus.dpHeaWatRem, ctl.dpHeaWatRem);
+  connect(busHp.y1_actual, ctl.u1Hp_actual);
+  connect(busPumChiWatPri.y1_actual, ctl.u1PumChiWatPri_actual);
+  connect(busPumChiWatSec.y1_actual, ctl.u1PumChiWatSec_actual);
+  connect(busPumHeaWatPri.y1_actual, ctl.u1PumHeaWatPri_actual);
+  connect(busPumHeaWatSec.y1_actual, ctl.u1PumHeaWatSec_actual);
+  connect(bus.u1SchCoo, ctl.u1SchCoo);
+  connect(bus.u1SchHea, ctl.u1SchHea);
+  // Outputs to plant control bus
+  connect(ctl.TSupSet, busHp.TSet);
+  connect(ctl.TChiWatSupSet, bus.TChiWatSupSet);
+  connect(ctl.THeaWatSupSet, bus.THeaWatSupSet);
+  connect(ctl.dpChiWatRemSet, bus.dpChiWatRemSet);
+  connect(ctl.dpHeaWatRemSet, bus.dpHeaWatRemSet);
+  connect(ctl.y1HeaHp, busHp.y1Hea);
+  connect(ctl.y1Hp, busHp.y1);
+  connect(ctl.y1PumChiWatPri, busPumChiWatPri.y1);
+  connect(ctl.y1PumChiWatSec, busPumChiWatSec.y1);
+  connect(ctl.y1PumHeaWatPri, busPumHeaWatPri.y1);
+  connect(ctl.y1PumHeaWatSec, busPumHeaWatSec.y1);
+  connect(ctl.y1ValChiWatHpInlIso, busValChiWatHpInlIso.y1);
+  connect(ctl.y1ValChiWatHpOutIso, busValChiWatHpOutIso.y1);
+  connect(ctl.y1ValHeaWatHpInlIso, busValHeaWatHpInlIso.y1);
+  connect(ctl.y1ValHeaWatHpOutIso, busValHeaWatHpOutIso.y1);
+  connect(ctl.yPumChiWatPriDed, busPumChiWatPri.y);
+  connect(ctl.yPumChiWatPriHdr, busPumChiWatPri.y);
+  connect(ctl.yPumChiWatSec, busPumChiWatSec.y);
+  connect(ctl.yPumHeaWatPriDed, busPumHeaWatPri.y);
+  connect(ctl.yPumHeaWatPriHdr, busPumHeaWatPri.y);
+  connect(ctl.yPumHeaWatSec, busPumHeaWatSec.y);
+  /* Control point connection - stop */
+  connect(busAirHan.reqResChiWat, reqResChiWatAirHan.u) annotation (Line(
+      points={{260,140},{240,140},{240,80},{212,80}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busEquZon.reqPlaHeaWat, reqPlaHeaWatEquZon.u) annotation (Line(
+      points={{260,-140},{240,-140},{240,-80},{212,-80}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busEquZon.reqResHeaWat, reqResHeaWatEquZon.u) annotation (Line(
+      points={{260,-140},{240,-140},{240,-160},{212,-160}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busEquZon.reqPlaChiWat, reqPlaChiWatEquZon.u) annotation (Line(
+      points={{260,-140},{240,-140},{240,-120},{212,-120}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busEquZon.reqResChiWat, reqResChiWatEquZon.u) annotation (Line(
+      points={{260,-140},{240,-140},{240,-200},{212,-200}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busAirHan.reqPlaChiWat, reqPlaChiWatAirHan.u) annotation (Line(
+      points={{260,140},{240,140},{240,160},{212,160}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busAirHan.reqPlaHeaWat, reqPlaHeaWatAirHan.u) annotation (Line(
+      points={{260,140},{240,140},{240,200},{212,200}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busAirHan.reqResHeaWat, reqResHeaWatAirHan.u[1:1]) annotation (Line(
+      points={{260,140},{240,140},{240,120},{212,120}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(reqPlaHeaWatAirHan.y, phReqPlaHeaWatAirHan.u)
+    annotation (Line(points={{188,200},{172,200}}, color={255,127,0}));
+  connect(reqPlaChiWatAirHan.y, phReqPlaChiWatAirHan.u)
+    annotation (Line(points={{188,160},{172,160}}, color={255,127,0}));
+  connect(reqResHeaWatAirHan.y, phReqResHeaWatAirHan.u)
+    annotation (Line(points={{188,120},{172,120}}, color={255,127,0}));
+  connect(reqResChiWatAirHan.y, phReqResChiWatAirHan.u)
+    annotation (Line(points={{188,80},{172,80}}, color={255,127,0}));
+  connect(reqPlaHeaWatEquZon.y, phReqPlaHeaWatEquZon.u) annotation (Line(points
+        ={{188,-80},{180,-80},{180,-80},{172,-80}}, color={255,127,0}));
+  connect(reqPlaChiWatEquZon.y, phReqPlaChiWatEquZon.u)
+    annotation (Line(points={{188,-120},{172,-120}}, color={255,127,0}));
+  connect(reqResChiWatEquZon.y, phReqResChiWatEquZon.u)
+    annotation (Line(points={{188,-200},{172,-200}}, color={255,127,0}));
+  connect(reqResHeaWatEquZon.y, phReqResHeaWatEquZon.u) annotation (Line(points
+        ={{188,-160},{178,-160},{178,-160},{172,-160}}, color={255,127,0}));
+  connect(phReqPlaHeaWatAirHan.y, reqPlaHeaWat.u1)
+    annotation (Line(points={{148,200},{112,200}}, color={255,127,0}));
+  connect(phReqPlaHeaWatEquZon.y, reqPlaHeaWat.u2) annotation (Line(points={{148,
+          -80},{140,-80},{140,188},{112,188}}, color={255,127,0}));
+  connect(phReqPlaChiWatAirHan.y, reqPlaChiWat.u1)
+    annotation (Line(points={{148,160},{112,160}}, color={255,127,0}));
+  connect(phReqPlaChiWatEquZon.y, reqPlaChiWat.u2) annotation (Line(points={{148,
+          -120},{138,-120},{138,148},{112,148}}, color={255,127,0}));
+  connect(phReqResHeaWatAirHan.y, reqResHeaWat.u1)
+    annotation (Line(points={{148,120},{112,120}}, color={255,127,0}));
+  connect(phReqResChiWatAirHan.y, reqResChiWat.u1)
+    annotation (Line(points={{148,80},{112,80}}, color={255,127,0}));
+  connect(phReqResHeaWatEquZon.y, reqResHeaWat.u2) annotation (Line(points={{148,
+          -160},{136,-160},{136,108},{112,108}}, color={255,127,0}));
+  connect(phReqResChiWatEquZon.y, reqResChiWat.u2) annotation (Line(points={{148,
+          -200},{134,-200},{134,68},{112,68}}, color={255,127,0}));
+  connect(reqPlaHeaWat.y, ctl.nReqPlaHeaWat) annotation (Line(points={{88,194},
+          {-40,194},{-40,22.3529},{-22,22.3529}},
+                                       color={255,127,0}));
+  connect(reqPlaChiWat.y, ctl.nReqPlaChiWat) annotation (Line(points={{88,154},
+          {-38,154},{-38,20.5882},{-22,20.5882}},
+                                       color={255,127,0}));
+  connect(reqResHeaWat.y,ctl.nReqResHeaWat)  annotation (Line(points={{88,114},
+          {-36,114},{-36,18.8235},{-22,18.8235}},
+                                       color={255,127,0}));
+  connect(reqResChiWat.y,ctl.nReqResChiWat)  annotation (Line(points={{88,74},{
+          -34,74},{-34,17.0588},{-22,17.0588}},
+                                  color={255,127,0}));
+  annotation (
+    defaultComponentName="ctl", Documentation(info="<html>
+<p>
+This class implements the sequence of operation for plants with 
+air-to-water heat pumps.
+It is based on the controller
+<a href=\"modelica://Buildings.Templates.Plants.Controls.HeatPumps.AirToWater\">
+Buildings.Templates.Plants.Controls.HeatPumps.AirToWater</a>.
+</p>
+<h4>Control points</h4>
+<p>
+The control sequence requires the following external input points in
+addition to those already included in the HP plant template.
+</p>
+<ul>
+<li>Outdoor air temperature <code>TOut</code>:
+AI signal with a dimensionality of zero</li>
+<li>HW differential pressure from remote sensor(s) <code>dpHeaWatRem</code>:
+AI signal with a dimensionality of one, the number of remote
+sensors is specified by the parameter <code>nSenDpHeaWatRem</code>.</li>
+<li>CHW differential pressure from remote sensor(s) <code>dpChiWatRem</code> – 
+only for heating and cooling plants:
+AI signal with a dimensionality of one, the number of remote
+sensors is specified by the parameter <code>nSenDpChiWatRem</code>.</li>
+<li>
+Inside the sub-bus <code>busAirHan[:]</code> or <code>busEquZon[:]</code>,
+with a dimensionality of one
+<ul>
+<li>HW plant requests yielded by the air handler or zone
+equipment controller <code>bus(AirHan|EquZon)[:].reqPlaHeaWat</code>:
+AI signal (Integer), with a dimensionality of one
+</li>
+<li>HW reset requests yielded by the air handler or zone
+equipment controller <code>bus(AirHan|EquZon)[:].reqResHeaWat</code>:
+AI signal (Integer), with a dimensionality of one
+</li>
+</ul>
+</li>
+<li>
+CHW plant requests yielded by the air handler or zone – 
+only for heating and cooling plants:
+equipment controller <code>bus(AirHan|EquZon)[:].reqPlaChiWat</code>:
+AI signal (Integer), with a dimensionality of one
+</li>
+<li>
+CHW reset requests yielded by the air handler or zone – 
+only for heating and cooling plants:
+equipment controller <code>bus(AirHan|EquZon)[:].reqResChiWat</code>:
+AI signal (Integer), with a dimensionality of one
+</li>
+</ul>
+</html>"));
+end AirToWater;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Controls/OpenLoop.mo b/Buildings/Templates/Plants/HeatPumps/Components/Controls/OpenLoop.mo
new file mode 100644
index 00000000000..b14e8139bdc
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Controls/OpenLoop.mo
@@ -0,0 +1,209 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Controls;
+block OpenLoop
+  "Open-loop controller"
+  extends
+    Buildings.Templates.Plants.HeatPumps.Components.Interfaces.PartialController(
+    final typ=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop);
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant THeaWatSupSet[nHp](
+    y(each final unit="K",
+      each displayUnit="degC"),
+    each k=Buildings.Templates.Data.Defaults.THeaWatSupMed)
+    "Heat pump HW supply temperature set point"
+    annotation (Placement(transformation(extent={{-80,330},{-100,350}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TChiWatSupSet[nHp](
+    y(each final unit="K",
+      each displayUnit="degC"),
+    each k=Buildings.Templates.Data.Defaults.TChiWatSup)
+    "Heat pump CHW supply temperature set point"
+    annotation (Placement(transformation(extent={{-80,290},{-100,310}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1ValHeaWatHpInlIso[nHp](
+    each table=[
+      0, 0;
+      1, 1;
+      3, 0;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.have_heaWat and cfg.have_valHpInlIso
+    "Heat pump inlet HW isolation valve opening signal"
+    annotation (Placement(transformation(extent={{-180,250},{-200,270}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1ValHeaWatHpOutIso[nHp](
+    each table=[
+      0, 0;
+      1, 1;
+      3, 0;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.have_heaWat and cfg.have_valHpOutIso
+    "Heat pump outlet HW isolation valve opening signal"
+    annotation (Placement(transformation(extent={{-180,210},{-200,230}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1ValChiWatHpInlIso[nHp](
+    each table=[
+      0, 0;
+      3.1, 1;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.have_chiWat and cfg.have_valHpInlIso
+    "Heat pump inlet CHW isolation valve opening signal"
+    annotation (Placement(transformation(extent={{-180,-90},{-200,-70}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1ValChiWatHpOutIso[nHp](
+    each table=[
+      0, 0;
+      3.1, 1;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.have_chiWat and cfg.have_valHpOutIso
+    "Heat pump outlet CHW isolation valve opening signal"
+    annotation (Placement(transformation(extent={{-180,-130},{-200,-110}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1Hp[nHp](
+    each table=[
+      0, 0;
+      1, 0;
+      1, 1;
+      5, 1],
+    each timeScale=1000,
+    each period=5000)
+    "Heat pump start/stop command"
+    annotation (Placement(transformation(extent={{-180,330},{-200,350}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1HeaHp[nHp](
+    each table=[
+      0, 1;
+      3, 0;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.is_rev
+    "Heat pump heating mode command"
+    annotation (Placement(transformation(extent={{-180,290},{-200,310}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1PumHeaWatPri[cfg.nPumHeaWatPri](
+    each table=if cfg.have_pumChiWatPriDed or not cfg.have_chiWat then
+                                                                      [
+      0, 0;
+      1, 1;
+      3, 0;
+      5, 0] else
+                [
+      0, 0;
+      1, 1;
+      3, 0;
+      3.1, 1;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.have_heaWat
+    "Primary CHW pump start/stop command"
+    annotation (Placement(transformation(extent={{-180,170},{-200,190}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1PumChiWatPri[cfg.nPumChiWatPri](
+    each table=[
+      0, 0;
+      3.1, 1;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.have_pumChiWatPriDed
+    "Primary CHW pump start/stop command"
+    annotation (Placement(transformation(extent={{-180,-210},{-200,-190}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1PumHeaWatSec[cfg.nPumHeaWatSec](
+    each table=[
+      0, 0;
+      1, 1;
+      3, 0;
+      5, 0],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Secondary HW pump start/stop command"
+    annotation (Placement(transformation(extent={{-180,130},{-200,150}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable y1PumChiWatSec[cfg.nPumChiWatSec](
+    each table=[
+      0, 0;
+      3, 1;
+      5, 1],
+    each timeScale=1000,
+    each period=5000)
+    if cfg.typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Secondary CHW pump start/stop command"
+    annotation (Placement(transformation(extent={{-180,-250},{-200,-230}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPumHeaWatSec(
+    k=1)
+    if cfg.typPumHeaWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Secondary HW pump speed signal"
+    annotation (Placement(transformation(extent={{-140,130},{-160,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPumChiWatSec(
+    k=1)
+    if cfg.typPumChiWatSec <> Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Secondary CHW pump speed signal"
+    annotation (Placement(transformation(extent={{-140,-250},{-160,-230}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TSet[nHp](
+    y(each final unit="K",
+      each displayUnit="degC"))
+    "Active supply temperature setpoint"
+    annotation (Placement(transformation(extent={{-140,310},{-160,330}})));
+  Buildings.Controls.OBC.CDL.Logical.Sources.Constant tru[nHp](
+    each final k=true)
+    if not cfg.is_rev
+    "Constant"
+    annotation (Placement(transformation(extent={{-80,250},{-100,270}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPumHeaWatPriHdr(k=1)
+    if cfg.have_heaWat and cfg.have_pumHeaWatPriVar and
+      cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Headered primary HW pump speed signal"
+    annotation (Placement(transformation(extent={{-140,170},{-160,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPumChiWatPriHdr(k=1)
+    if cfg.have_chiWat and cfg.have_pumHeaWatPriVar and
+      cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Headered primary CHW pump speed signal"
+    annotation (Placement(transformation(extent={{-140,-210},{-160,-190}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPumHeaWatPriDed[cfg.nPumHeaWatPri](
+     each k=1) if cfg.have_heaWat and cfg.have_pumHeaWatPriVar and
+      cfg.typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    "Dedicated primary HW pump speed signal"
+    annotation (Placement(transformation(extent={{-100,170},{-120,190}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant yPumChiWatPriDed[cfg.nPumChiWatPri](
+     each k=1) if cfg.have_pumChiWatPriDed and cfg.have_pumHeaWatPriVar
+    "Dedicated primary CHW pump speed signal"
+    annotation (Placement(transformation(extent={{-100,-210},{-120,-190}})));
+equation
+  /* Control point connection - start */
+  connect(y1PumHeaWatPri.y[1], busPumHeaWatPri.y1);
+  connect(yPumHeaWatPriHdr.y, busPumHeaWatPri.y);
+  connect(yPumHeaWatPriDed.y, busPumHeaWatPri.y);
+  connect(y1PumHeaWatSec.y[1], busPumHeaWatSec.y1);
+  connect(yPumHeaWatSec.y, busPumHeaWatSec.y);
+  connect(y1ValHeaWatHpInlIso.y[1], busValHeaWatHpInlIso.y1);
+  connect(y1ValHeaWatHpOutIso.y[1], busValHeaWatHpOutIso.y1);
+  connect(yPumChiWatSec.y, busPumChiWatSec.y);
+  connect(y1ValChiWatHpOutIso.y[1], busValChiWatHpOutIso.y1);
+  connect(y1PumChiWatPri.y[1], busPumChiWatPri.y1);
+  connect(yPumChiWatPriHdr.y, busPumChiWatPri.y);
+  connect(yPumChiWatPriDed.y, busPumChiWatPri.y);
+  connect(y1ValChiWatHpInlIso.y[1], busValChiWatHpInlIso.y1);
+  connect(y1PumChiWatSec.y[1], busPumChiWatSec.y1);
+  connect(y1Hp.y[1], busHp.y1);
+  connect(y1HeaHp.y[1], busHp.y1Hea);
+  connect(TSet.y, busHp.TSet);
+  /* Control point connection - stop */
+                                       connect(TChiWatSupSet.y, TSet.u3)
+    annotation (Line(points={{-102,300},{-120,300},{-120,312},{-138,312}},color={0,0,127}));
+  connect(THeaWatSupSet.y, TSet.u1)
+    annotation (Line(points={{-102,340},{-120,340},{-120,328},{-138,328}},color={0,0,127}));
+  connect(y1HeaHp.y[1], TSet.u2)
+    annotation (Line(points={{-202,300},{-210,300},{-210,280},{-130,280},{-130,
+          320},{-138,320}},
+      color={255,0,255}));
+  connect(tru.y, TSet.u2)
+    annotation (Line(points={{-102,260},{-130,260},{-130,320},{-138,320}},color={255,0,255}));
+  annotation (
+    defaultComponentName="ctl", Documentation(info="<html>
+<p>
+This is an open loop controller providing control inputs
+for the plant model
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.AirToWater\">
+Buildings.Templates.Plants.HeatPumps.AirToWater</a>.
+It is only used for testing purposes.
+</p>
+</html>"));
+end OpenLoop;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Controls/package.mo b/Buildings/Templates/Plants/HeatPumps/Components/Controls/package.mo
new file mode 100644
index 00000000000..9e7d14a9162
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Controls/package.mo
@@ -0,0 +1,13 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+package Controls "Controllers"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+All control blocks that form the control sequence of a system are instantiated
+into one single class, a so-called control section.
+This package contains such control sections for heat pump plant models.
+</p>
+</html>"));
+end Controls;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Controls/package.order b/Buildings/Templates/Plants/HeatPumps/Components/Controls/package.order
new file mode 100644
index 00000000000..c1d5525102f
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Controls/package.order
@@ -0,0 +1,2 @@
+AirToWater
+OpenLoop
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo b/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo
new file mode 100644
index 00000000000..a577b627f97
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Data/Controller.mo
@@ -0,0 +1,229 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Data;
+record Controller
+  "Record for plant controller"
+  extends Modelica.Icons.Record;
+  parameter Buildings.Templates.Plants.HeatPumps.Configuration.HeatPumpPlant cfg
+    "Plant configuration parameters";
+  // HW loop
+  // RFE: Declare array parameters for unequally sized units.
+  // The current implementation only supports equally sized units.
+  parameter Modelica.Units.SI.Temperature THeaWatSup_nominal(
+    displayUnit="degC",
+    start=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    final min=273.15)
+    "Maximum HW supply temperature setpoint (design HW supply temperature)"
+    annotation (Dialog(group="Temperature setpoints",
+      enable=cfg.have_heaWat));
+  parameter Real THeaWatSupSet_min(
+    final min=273.15,
+    start=25 + 273.15,
+    final unit="K",
+    displayUnit="degC")
+    "Minimum value to which the HW supply temperature can be reset"
+    annotation (Dialog(group="Temperature setpoints",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.Temperature TOutHeaWatLck(
+    displayUnit="degC",
+    final min=273.15)=Buildings.Templates.Data.Defaults.TOutHeaWatLck
+    "Outdoor air lockout temperature above which the HW loop is prevented from operating"
+    annotation (Dialog(group="Temperature setpoints",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VHeaWatHp_flow_nominal(
+    start=0.1,
+    displayUnit="L/s",
+    final min=0)
+    "Design HW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pump flow setpoints",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.HeatFlowRate capHeaHp_nominal(
+    start=1,
+    final min=0)
+    "Design heating capacity - Each heat pump"
+    annotation (Dialog(group="Capacity",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VHeaWatSec_flow_nominal(
+    start=0.01,
+    displayUnit="L/s",
+    final min=0)
+    "Design secondary HW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Capacity",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+  parameter Modelica.Units.SI.PressureDifference dpHeaWatRemSet_min(
+    final min=0,
+    start=5 * 6894)=5 * 6894
+    "Minimum value to which the HW differential pressure can be reset - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by designer",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+        or cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+  // HACK(AntoineGautier):
+  // Using cfg.nSenDpHeaWatRem for size(dpHeaWatRemSet_max, 1) is not supported by Dymola which fails to "evaluate and check the size declaration".
+  // So the size is kept unassigned.
+  // This requires explicitely providing a value with OCT, even if enable=false.
+  parameter Modelica.Units.SI.PressureDifference dpHeaWatRemSet_max[:](
+    start=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, cfg.nSenDpHeaWatRem),
+    final min=fill(0, cfg.nSenDpHeaWatRem))
+    "Maximum HW differential pressure setpoint - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+        or cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+  parameter Real yPumHeaWatPriSet(
+    final max=1,
+    final min=0,
+    start=1,
+    final unit="1")
+    "Primary pump speed providing design heat pump flow in heating mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater and
+      cfg.have_heaWat and cfg.have_pumHeaWatPriVar));
+  parameter Real yPumHeaWatSec_min(
+    final unit="1",
+    final min=0,
+    final max=1)=0.1
+    "Secondary HW pump minimum speed"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_heaWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+  // CHW loop
+  parameter Modelica.Units.SI.Temperature TChiWatSup_nominal(
+    displayUnit="degC",
+    start=Buildings.Templates.Data.Defaults.TChiWatSup,
+    final min=273.15)
+    "Minimum CHW supply temperature setpoint (design CHW supply temperature)"
+    annotation (Dialog(group="Temperature setpoints",
+      enable=cfg.have_chiWat));
+  parameter Modelica.Units.SI.Temperature TChiWatSupSet_max(
+    final min=273.15,
+    start=15 + 273.15,
+    displayUnit="degC")
+    "Maximum value to which the CHW supply temperature can be reset"
+    annotation (Dialog(group="Temperature setpoints",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.Temperature TOutChiWatLck(
+    displayUnit="degC",
+    final min=273.15)=Buildings.Templates.Data.Defaults.TOutChiWatLck
+    "Outdoor air lockout temperature below which the CHW loop is prevented from operating"
+    annotation (Dialog(group="Temperature setpoints",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VChiWatHp_flow_nominal(
+    start=0.1,
+    displayUnit="L/s",
+    final min=0)
+    "Design CHW volume flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pump flow setpoints",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.HeatFlowRate capCooHp_nominal(
+    start=1,
+    final min=0)
+    "Design cooling capacity - Each heat pump"
+    annotation (Dialog(group="Capacity",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  parameter Modelica.Units.SI.VolumeFlowRate VChiWatSec_flow_nominal(
+    start=0.01,
+    displayUnit="L/s",
+    final min=0)
+    "Design secondary CHW volume flow rate"
+    annotation (Evaluate=true,
+    Dialog(group="Capacity",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+  parameter Modelica.Units.SI.PressureDifference dpChiWatRemSet_min(
+    final min=0,
+    start=5 * 6894)=5 * 6894
+    "Minimum value to which the CHW differential pressure can be reset - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by designer",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+        or cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+  // HACK(AntoineGautier):
+  // Using cfg.nSenDpChiWatRem for size(dpChiWatRemSet_max, 1) is not supported by Dymola which fails to "evaluate and check the size declaration".
+  // So the size is kept unassigned.
+  // This requires explicitely providing a value with OCT, even if enable=false.
+  parameter Modelica.Units.SI.PressureDifference dpChiWatRemSet_max[:](
+    start=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, cfg.nSenDpChiWatRem),
+    final min=fill(0, cfg.nSenDpChiWatRem))
+    "Maximum CHW differential pressure setpoint - Remote sensor"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and (cfg.typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+        or cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None)));
+  parameter Real yPumChiWatPriSet(
+    final max=1,
+    final min=0,
+    start=1,
+    final unit="1")
+    "Primary pump speed providing design heat pump flow in cooling mode"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+      and cfg.have_pumChiWatPriVar));
+  parameter Real yPumChiWatSec_min(
+    final unit="1",
+    final min=0,
+    final max=1)=0.1
+    "Secondary CHW pump minimum speed"
+    annotation (Dialog(group=
+      "Information provided by testing, adjusting, and balancing contractor",
+      enable=cfg.have_chiWat and cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater
+        and cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+  parameter Real schHea[:, 2](start=[
+    0, 1;
+    24 * 3600, 1])=[
+    0, 1;
+    24 * 3600, 1]
+    "Heating mode enable schedule"
+    annotation (Dialog(enable=not cfg.have_inpSch and
+    cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater,
+    group="Plant enable"));
+  parameter Real schCoo[:, 2](start=[
+    0, 1;
+    24 * 3600, 1])=[
+    0, 1;
+    24 * 3600, 1]
+    "Cooling mode enable schedule"
+    annotation (Dialog(enable=not cfg.have_inpSch and
+    cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater,
+    group="Plant enable"));
+  // HACK(AntoineGautier):
+  // Using cfg.nHp for size(staEqu, 2) is not supported by Dymola which fails to "evaluate and check the size declaration".
+  // So the size is kept unassigned and a check is performed at initialization.
+  // Furthermore, a start value cannot be provided as the number of plant stages is not known beforehand.
+  // If provided, there will likely be a mismatch between assigned value and start value.
+  // Therefore, no enable annotation can be used.
+  parameter Real staEqu[:, :](
+    each final max=1,
+    each final min=0,
+    each final unit="1")
+    "Staging matrix – Equipment required for each stage"
+    annotation (Dialog(group="Equipment staging and rotation"));
+  parameter Real plrSta(
+    final max=1,
+    final min=0,
+    start=0.9,
+    final unit="1")=0.9
+    "Staging part load ratio"
+    annotation (Dialog(group="Equipment staging and rotation",
+    enable=cfg.typCtl==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater));
+  annotation (
+    defaultComponentName="datCtl",
+    Documentation(
+      info="<html>
+<p>
+This record provides the set of parameters for
+heat pump plant controllers that can be found within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.Controls\">
+Buildings.Templates.Plants.HeatPumps.Components.Controls</a>.
+</p>
+</html>"));
+end Controller;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Data/HeatPumpGroup.mo b/Buildings/Templates/Plants/HeatPumps/Components/Data/HeatPumpGroup.mo
new file mode 100644
index 00000000000..61b988302c3
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Data/HeatPumpGroup.mo
@@ -0,0 +1,185 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Data;
+record HeatPumpGroup
+  extends Modelica.Icons.Record;
+  parameter Integer nHp(
+    final min=1)
+    "Number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Buildings.Templates.Components.Types.HeatPump typ
+    "Equipment type"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Boolean is_rev
+    "Set to true for reversible heat pumps, false for heating only"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Buildings.Templates.Components.Types.HeatPumpModel typMod
+    "Type of heat pump model"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  // Default fluid properties
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "HW default specific heat capacity"
+    annotation (Dialog(group="Configuration",
+      enable=false));
+  /*
+  cpChiWat_default is for internal use only.
+  It is the same as cpChiWat_default for reversible HP.
+  Non-reversible HP that can be controlled to produce either HW or CHW
+  shall be modeled with chiller components (as a chiller/heater).
+  */
+    final parameter Modelica.Units.SI.SpecificHeatCapacity cpChiWat_default=
+    cpHeaWat_default
+    "CHW default specific heat capacity";
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpSou_default=if typ ==
+    Buildings.Templates.Components.Types.HeatPump.AirToWater then Buildings.Utilities.Psychrometrics.Constants.cpAir
+    else Buildings.Utilities.Psychrometrics.Constants.cpWatLiq
+    "Source fluid default specific heat capacity"
+    annotation (Dialog(group="Configuration",
+      enable=false));
+  // RFE: Declare array parameters for unequally sized units.
+  // The current implementation only supports equally sized units.
+  parameter Modelica.Units.SI.MassFlowRate mHeaWatHp_flow_nominal(
+    final min=0)
+    "HW mass flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpHeaWatHp_nominal(
+    min=0,
+    start=Buildings.Templates.Data.Defaults.dpChiWatChi)
+    "Pressure drop at design HW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate capHeaHp_nominal
+    "Heating capacity - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.Temperature THeaWatSupHp_nominal(
+    final min=273.15)
+    "(Highest) HW supply temperature - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.Temperature THeaWatRetHp_nominal=
+    THeaWatSupHp_nominal - abs(capHeaHp_nominal) / cpHeaWat_default /
+    mHeaWatHp_flow_nominal
+    "HW return temperature - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatHp_flow_nominal(
+    start=0,
+    final min=0)
+    "CHW mass flow rate - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Nominal condition",
+      enable=is_rev));
+  final parameter Modelica.Units.SI.PressureDifference dpChiWatHp_nominal=
+    dpHeaWatHp_nominal *(mChiWatHp_flow_nominal / mHeaWatHp_flow_nominal) ^ 2
+    "Pressure drop at design CHW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.HeatFlowRate capCooHp_nominal(
+    start=0)
+    "Cooling capacity - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=is_rev));
+  parameter Modelica.Units.SI.Temperature TChiWatSupHp_nominal(
+    start=Buildings.Templates.Data.Defaults.TChiWatSup,
+    final min=253.15)
+    "(Lowest) CHW supply temperature - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=is_rev));
+  final parameter Modelica.Units.SI.Temperature TChiWatRetHp_nominal=if is_rev
+    then TChiWatSupHp_nominal + abs(capCooHp_nominal) / cpChiWat_default /
+    mChiWatHp_flow_nominal else Buildings.Templates.Data.Defaults.TChiWatRet
+    "CHW return temperature - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=is_rev));
+  parameter Modelica.Units.SI.Temperature TSouHeaHp_nominal(
+    start=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    final min=220)
+    "OAT or source fluid supply temperature (evaporator entering) in heating mode - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mSouWwHeaHp_flow_nominal(
+    start=mHeaWatHp_flow_nominal,
+    final min=0)
+    "Source fluid mass flow rate in heating mode - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Nominal condition",
+      enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+  parameter Modelica.Units.SI.PressureDifference dpSouWwHeaHp_nominal(
+    min=0,
+    start=Buildings.Templates.Data.Defaults.dpChiWatChi)
+    "Source fluid pressure drop in heating mode - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+  final parameter Modelica.Units.SI.MassFlowRate mSouHeaHp_flow_nominal=if typ ==
+    Buildings.Templates.Components.Types.HeatPump.WaterToWater then mSouWwHeaHp_flow_nominal
+    else Buildings.Templates.Data.Defaults.mAirFloByCapChi * abs(capHeaHp_nominal)
+    "Source fluid mass flow rate in heating mode - Each heat pump"
+    annotation (Evaluate=true);
+  final parameter Modelica.Units.SI.PressureDifference dpSouHeaHp_nominal=if typ ==
+    Buildings.Templates.Components.Types.HeatPump.WaterToWater then dpSouWwHeaHp_nominal
+    else Buildings.Templates.Data.Defaults.dpAirChi
+    "Source fluid pressure drop in heating mode - Each heat pump";
+  parameter Modelica.Units.SI.Temperature TSouCooHp_nominal(
+    start=Buildings.Templates.Data.Defaults.TOutHpCoo,
+    final min=273.15)
+    "OAT or source fluid supply temperature (condenser entering) in cooling mode - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=is_rev));
+  parameter Modelica.Units.SI.MassFlowRate mSouWwCooHp_flow_nominal(
+    start=mChiWatHp_flow_nominal,
+    final min=0)
+    "Source fluid mass flow rate in cooling mode - Each heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Nominal condition",
+      enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater and is_rev));
+  final parameter Modelica.Units.SI.MassFlowRate mSouCooHp_flow_nominal=if typ ==
+    Buildings.Templates.Components.Types.HeatPump.WaterToWater then mSouWwCooHp_flow_nominal
+    else Buildings.Templates.Data.Defaults.mAirFloByCapChi * abs(capCooHp_nominal)
+    "Source fluid mass flow rate in cooling mode - Each heat pump"
+    annotation (Evaluate=true);
+  final parameter Modelica.Units.SI.PressureDifference dpSouCooHp_nominal=
+    dpSouHeaHp_nominal *(mSouCooHp_flow_nominal / mSouHeaHp_flow_nominal) ^ 2
+    "Source fluid pressure drop in cooling mode - Each heat pump";
+  replaceable parameter Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic perFitHp(
+    dpHeaLoa_nominal=dpHeaWatHp_nominal,
+    dpHeaSou_nominal=dpSouHeaHp_nominal,
+    hea(
+      Q_flow=abs(capHeaHp_nominal),
+      P=0,
+      mLoa_flow=mHeaWatHp_flow_nominal,
+      mSou_flow=mSouHeaHp_flow_nominal,
+      coeQ={1, 0, 0, 0, 0},
+      coeP={1, 0, 0, 0, 0},
+      TRefLoa=THeaWatRetHp_nominal,
+      TRefSou=TSouHeaHp_nominal),
+    coo(
+      Q_flow=if is_rev then - abs(capCooHp_nominal) else - 1,
+      P=0,
+      mLoa_flow=mChiWatHp_flow_nominal,
+      mSou_flow=mSouCooHp_flow_nominal,
+      coeQ={1, 0, 0, 0, 0},
+      coeP={1, 0, 0, 0, 0},
+      TRefLoa=TChiWatRetHp_nominal,
+      TRefSou=TSouCooHp_nominal))
+    constrainedby Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic
+    "Performance data - Equation fit model - Each heat pump"
+    annotation (Dialog(enable=typMod==Buildings.Templates.Components.Types.HeatPumpModel.EquationFit),
+  choicesAllMatching=true,
+  Placement(transformation(extent={{-8,-40},{8,-24}})));
+  annotation (
+    defaultComponentPrefixes="parameter",
+    defaultComponentName="datHp",
+    Documentation(info="<html>
+<p>
+This record provides the set of parameters for heat pump group models 
+that can be found within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups\">
+Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups</a>.
+</p>
+<p>
+Only identical heat pumps are currently supported.
+</p>
+</html>"));
+end HeatPumpGroup;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Data/package.mo b/Buildings/Templates/Plants/HeatPumps/Components/Data/package.mo
new file mode 100644
index 00000000000..0c219b8eb9e
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Data/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+package Data "Records for design and operating parameters"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package provides records for design and operating parameters.
+</p>
+</html>"));
+end Data;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Data/package.order b/Buildings/Templates/Plants/HeatPumps/Components/Data/package.order
new file mode 100644
index 00000000000..62f5cba34cf
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Data/package.order
@@ -0,0 +1,2 @@
+Controller
+HeatPumpGroup
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo
new file mode 100644
index 00000000000..533afb57ce9
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/AirToWater.mo
@@ -0,0 +1,40 @@
+within Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups;
+model AirToWater
+  "Air-to-water heat pump group"
+  extends Buildings.Templates.Plants.HeatPumps.Components.Interfaces.PartialHeatPumpGroup(
+    redeclare final package MediumSou=MediumAir,
+    final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+    final typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit);
+  Buildings.Templates.Components.HeatPumps.AirToWater hp[nHp](
+    redeclare each final package MediumHeaWat=MediumHeaWat,
+    redeclare each final package MediumAir=MediumAir,
+    each final is_rev=is_rev,
+    final dat=datHp,
+    each final allowFlowReversal=allowFlowReversal,
+    each final energyDynamics=energyDynamics,
+    each final have_preDroChiHeaWat=have_preDroChiHeaWat,
+    each final have_preDroSou=have_preDroSou)
+    "Heat pump unit"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}})));
+equation
+  for i in 1:nHp loop
+    connect(busWea, hp[i].busWea)
+      annotation (Line(points={{40,200},{40,10},{6,10}},color={255,204,51},thickness=0.5));
+  end for;
+  connect(ports_aChiHeaWat, hp.port_a)
+    annotation (Line(points={{120,200},{120,0},{10,0}},color={0,127,255}));
+  connect(hp.port_b, ports_bChiHeaWat)
+    annotation (Line(points={{-10,0},{-120,0},{-120,200}},color={0,127,255}));
+  connect(busHp, hp.bus)
+    annotation (Line(points={{0,160},{0,10}},color={255,204,51},thickness=0.5));
+  connect(ports_aSou, hp.port_aSou)
+    annotation (Line(points={{-120,-200},{-120,-10},{-10,-10}},color={0,127,255}));
+  connect(ports_bSou, hp.port_bSou)
+    annotation (Line(points={{120,-200},{120,-10},{10,-10}},color={0,127,255}));
+  annotation (
+    defaultComponentName="hp", Documentation(info="<html>
+<p>
+This model represents a group of heat pumps.
+</p>
+</html>"));
+end AirToWater;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/package.mo b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/package.mo
new file mode 100644
index 00000000000..49ae155ba9d
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+package HeatPumpGroups "Models for heat pump groups"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains models of heat pump groups.
+</p>
+</html>"));
+end HeatPumpGroups;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/package.order b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/package.order
new file mode 100644
index 00000000000..971b641363f
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/HeatPumpGroups/package.order
@@ -0,0 +1 @@
+AirToWater
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo
new file mode 100644
index 00000000000..aacd12b97cb
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialController.mo
@@ -0,0 +1,264 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Interfaces;
+block PartialController "Interface for heat pump plant controller"
+  /*
+  The following bindings are for parameters that are propagated *up*
+  from the controller to the plant configuration record.
+  All other configuration parameters (e.g. nHp) are propagated *down*
+  from the plant configuration record to the controller.
+  */
+  parameter Buildings.Templates.Plants.HeatPumps.Configuration.HeatPumpPlant cfg(
+    typCtl=typ,
+    nAirHan=nAirHan,
+    nEquZon=nEquZon,
+    have_senDpHeaWatRemWir=have_senDpHeaWatRemWir,
+    nSenDpHeaWatRem=nSenDpHeaWatRem,
+    have_senDpChiWatRemWir=have_senDpChiWatRemWir,
+    nSenDpChiWatRem=nSenDpChiWatRem)
+    "Plant configuration parameters"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=false));
+  parameter Buildings.Templates.Plants.HeatPumps.Components.Data.Controller dat(
+    cfg=cfg)
+    "Parameter record for controller";
+  final parameter Integer nHp=cfg.nHp
+    "Number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Buildings.Templates.Plants.HeatPumps.Types.Controller typ
+    "Type of controller"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Integer nAirHan(
+    final min=if typ <> Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop
+      and nEquZon == 0 then 1 else 0,
+    start=0)
+    "Number of air handling units served by the plant"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
+  parameter Integer nEquZon(
+    final min=if typ <> Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop
+      and nAirHan == 0 then 1 else 0,
+    start=0)
+    "Number of terminal units (zone equipment) served by the plant"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
+  parameter Boolean have_senVHeaWatPri_select(start=false)
+    "Set to true for plants with primary HW flow sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+      cfg.have_heaWat and not cfg.have_hrc and have_senVHeaWatSec));
+  final parameter Boolean have_senVHeaWatPri=cfg.have_heaWat and
+    (if cfg.have_hrc or not have_senVHeaWatSec then true else have_senVHeaWatPri_select)
+    "Set to true for plants with primary HW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  // Secondary flow sensor required for secondary HW pump staging.
+  final parameter Boolean have_senVHeaWatSec=
+    cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Set to true for plants with secondary HW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  parameter Boolean have_senVChiWatPri_select(start=false)
+    "Set to true for plants with primary CHW flow sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+      cfg.have_chiWat and not cfg.have_hrc and have_senVChiWatSec));
+  final parameter Boolean have_senVChiWatPri=cfg.have_chiWat and
+    (if cfg.have_hrc or not have_senVChiWatSec then true
+    else have_senVChiWatPri_select)
+    "Set to true for plants with primary CHW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  // Secondary flow sensor required for secondary CHW pump staging.
+  final parameter Boolean have_senVChiWatSec=
+    cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Set to true for plants with secondary CHW flow sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  parameter Boolean have_senTHeaWatPriRet_select(start=false)
+    "Set to true for plants with primary HW return temperature sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+      cfg.have_heaWat and not cfg.have_hrc and have_senTHeaWatSecRet));
+  final parameter Boolean have_senTHeaWatPriRet=cfg.have_heaWat and
+    (if cfg.have_hrc or not have_senTHeaWatSecRet then true else have_senTHeaWatPriRet_select)
+    "Set to true for plants with primary HW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  parameter Boolean have_senTChiWatPriRet_select(start=false)
+    "Set to true for plants with primary CHW return temperature sensor"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+      cfg.have_chiWat and not cfg.have_hrc and have_senTChiWatSecRet));
+  final parameter Boolean have_senTChiWatPriRet=cfg.have_chiWat and
+    (if cfg.have_hrc or not have_senTChiWatSecRet then true else have_senTChiWatPriRet_select)
+    "Set to true for plants with primary CHW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  // For primary-secondary plants, SHWST sensor is required for plant staging.
+  final parameter Boolean have_senTHeaWatSecSup=
+    cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Set to true for plants with secondary HW supply temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  // For primary-secondary plants, SCHWST sensor is required for plant staging.
+  final parameter Boolean have_senTChiWatSecSup=
+    cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Set to true for plants with secondary CHW supply temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration"));
+  parameter Boolean have_senTHeaWatSecRet(start=false)
+    "Set to true for plants with secondary HW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration",
+    enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+    cfg.typPumHeaWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+  parameter Boolean have_senTChiWatSecRet(start=false)
+    "Set to true for plants with secondary CHW return temperature sensor"
+    annotation (Evaluate=true, Dialog(group="Configuration",
+    enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop and
+    cfg.typPumChiWatSec<>Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None));
+  parameter Boolean have_senDpHeaWatRemWir=false
+    "Set to true for remote HW differential pressure sensor(s) hardwired to plant or pump controller"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
+  parameter Integer nSenDpHeaWatRem(
+    final min=if typ <> Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop
+      then 1 else 0)=1
+    "Number of remote HW differential pressure sensors used for HW pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
+  parameter Boolean have_senDpChiWatRemWir=have_senDpHeaWatRemWir
+    "Set to true for remote CHW differential pressure sensor(s) hardwired to plant or pump controller"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=cfg.have_chiWat and typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
+  parameter Integer nSenDpChiWatRem(
+    final min=if typ <> Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop
+      then 1 else 0)=1
+    "Number of remote CHW differential pressure sensors used for CHW pump speed control"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=cfg.have_chiWat and typ<>Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop));
+  parameter Boolean have_inpSch(start=false)=false
+    "Set to true to provide schedule via software input point"
+    annotation (Dialog(group="Plant enable",
+    enable=typ==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater),
+    Evaluate=true);
+  final parameter Real schHea[:, 2]=dat.schHea
+    "Heating mode enable schedule"
+    annotation (Dialog(enable=not have_inpSch and
+    typ==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater,
+    group="Plant enable"));
+  final parameter Real schCoo[:, 2]=dat.schCoo
+    "Cooling mode enable schedule"
+    annotation (Dialog(enable=not have_inpSch and
+    typ==Buildings.Templates.Plants.HeatPumps.Types.Controller.AirToWater,
+    group="Plant enable"));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,
+      origin={-260,0}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={-100,0})));
+  Buildings.Templates.AirHandlersFans.Interfaces.Bus busAirHan[nAirHan]
+    if nAirHan > 0
+    "Air handling unit control bus"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=-90,
+      origin={260,140}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=-90,origin={100,60})));
+  Buildings.Templates.ZoneEquipment.Interfaces.Bus busEquZon[nEquZon]
+    if nEquZon > 0
+    "Terminal unit control bus"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=-90,
+      origin={260,-140}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=-90,origin={100,-60})));
+protected
+  Buildings.Templates.Components.Interfaces.Bus busHp[nHp]
+    "Heat pump control bus"
+    annotation (Placement(transformation(extent={{-260,320},{-220,360}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatPri
+    if cfg.typPumHeaWatPri<>Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    "Primary HW pump control bus"
+    annotation (Placement(transformation(extent={{-260,160},{-220,200}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatSec
+    if cfg.typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary HW pump control bus"
+    annotation (Placement(transformation(extent={{-260,120},{-220,160}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatPri
+    if cfg.typPumChiWatPri<>Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    "Primary CHW pump control bus"
+    annotation (Placement(transformation(extent={{-260,-220},{-220,-180}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatSec
+    if cfg.typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    "Secondary CHW pump control bus"
+    annotation (Placement(transformation(extent={{-260,-260},{-220,-220}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpInlIso[nHp]
+    if cfg.have_heaWat and cfg.have_valHpInlIso
+    "Heat pump inlet HW isolation valve control bus"
+    annotation (Placement(transformation(extent={{-260,280},{-220,320}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpOutIso[nHp]
+    if cfg.have_heaWat and cfg.have_valHpOutIso
+    "Heat pump outlet HW isolation valve control bus"
+    annotation (Placement(transformation(extent={{-260,240},{-220,280}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValChiWatHpInlIso[nHp]
+    if cfg.have_chiWat and cfg.have_valHpInlIso
+    "Heat pump inlet CHW isolation valve control bus"
+    annotation (Placement(transformation(extent={{-260,-100},{-220,-60}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValChiWatHpOutIso[nHp]
+    if cfg.have_chiWat and cfg.have_valHpOutIso
+    "Heat pump outlet CHW isolation valve control bus"
+    annotation (Placement(transformation(extent={{-260,-140},{-220,-100}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+equation
+  /* Control point connection - start */
+  connect(busPumHeaWatPri, bus.pumHeaWatPri);
+  connect(busPumChiWatPri, bus.pumChiWatPri);
+  connect(busPumChiWatSec, bus.pumChiWatSec);
+  connect(busPumHeaWatSec, bus.pumHeaWatSec);
+  connect(busHp, bus.hp);
+  connect(busValHeaWatHpInlIso, bus.valHeaWatHpInlIso);
+  connect(busValHeaWatHpOutIso, bus.valHeaWatHpOutIso);
+  connect(busValChiWatHpInlIso, bus.valChiWatHpInlIso);
+  connect(busValChiWatHpOutIso, bus.valChiWatHpOutIso);
+  /* Control point connection - stop */
+                                       annotation (
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false),
+      graphics={
+        Rectangle(
+          extent={{-100,100},{100,-100}},
+          lineColor={0,0,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-150,150},{150,110}},
+          textString="%name",
+          textColor={0,0,255})}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-260,-380},{260,380}})),
+    Documentation(
+      info="<html>
+<p>
+This partial class provides a standard interface for heat pump plant controllers.
+</p>
+</html>",
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialController;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo
new file mode 100644
index 00000000000..a1bd7818c69
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/PartialHeatPumpGroup.mo
@@ -0,0 +1,331 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Interfaces;
+model PartialHeatPumpGroup "Interface for heat pump group"
+  replaceable package MediumHeaWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "HW medium"
+    annotation (__ctrlFlow(enable=false));
+  /*
+  MediumChiWat is for internal use only.
+  It is the same as MediumHeaWat for reversible HP.
+  Non-reversible HP that can be controlled to produce either HW or CHW
+  shall be modeled with chiller components (as a chiller/heater).
+  */
+    final package MediumChiWat=MediumHeaWat
+    "CHW medium";
+  /*
+  Derived classes representing AWHP shall use:
+  redeclare final package MediumSou = MediumAir
+  */
+    replaceable package MediumSou=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Source-side medium"
+    annotation (Dialog(enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater),
+      __ctrlFlow(enable=false));
+  replaceable package MediumAir=Buildings.Media.Air
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Air medium"
+    annotation (Dialog(enable=typ==Buildings.Templates.Components.Types.HeatPump.AirToWater),
+  __ctrlFlow(enable=false));
+  parameter Integer nHp(
+    final min=1)
+    "Number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Buildings.Templates.Components.Types.HeatPump typ
+    "Equipment type"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean is_rev
+    "Set to true for reversible heat pumps, false for heating only"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Buildings.Templates.Components.Types.HeatPumpModel typMod=
+    Buildings.Templates.Components.Types.HeatPumpModel.EquationFit
+    "Type of heat pump model"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"),
+    __ctrlFlow(enable=false));
+  parameter Buildings.Templates.Plants.HeatPumps.Components.Data.HeatPumpGroup dat(
+    nHp=nHp,
+    typ=typ,
+    is_rev=is_rev,
+    typMod=typMod,
+    cpHeaWat_default=cpHeaWat_default,
+    cpSou_default=cpSou_default)
+    "Design and operating parameters"
+    annotation (Placement(transformation(extent={{170,170},{190,190}})),
+    __ctrlFlow(enable=false));
+  final parameter Buildings.Templates.Components.Data.HeatPump datHp[nHp](
+    each final is_rev=is_rev,
+    each final typ=typ,
+    each final typMod=typMod,
+    each final cpHeaWat_default=cpHeaWat_default,
+    each final cpSou_default=cpSou_default,
+    each final mHeaWat_flow_nominal=dat.mHeaWatHp_flow_nominal,
+    each final mSouWwCoo_flow_nominal=dat.mSouWwCooHp_flow_nominal,
+    each final TSouHea_nominal=dat.TSouHeaHp_nominal,
+    each final mChiWat_flow_nominal=dat.mChiWatHp_flow_nominal,
+    each final dpSouWwHea_nominal=dat.dpSouWwHeaHp_nominal,
+    each final THeaWatSup_nominal=dat.THeaWatSupHp_nominal,
+    each final dpHeaWat_nominal=dat.dpHeaWatHp_nominal,
+    each final mSouWwHea_flow_nominal=dat.mSouWwHeaHp_flow_nominal,
+    each final TSouCoo_nominal=dat.TSouCooHp_nominal,
+    each final perFit=dat.perFitHp,
+    each final capCoo_nominal=dat.capCooHp_nominal,
+    each final TChiWatSup_nominal=dat.TChiWatSupHp_nominal,
+    each final capHea_nominal=dat.capHeaHp_nominal)
+    "Design and operating parameters - Each heat pump";
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWatHp_flow_nominal=dat.mHeaWatHp_flow_nominal
+    "Design HW mass flow rate - Each heat pump";
+  final parameter Modelica.Units.SI.HeatFlowRate capHeaHp_nominal=dat.capHeaHp_nominal
+    "Design heating capacity - Each heat pump";
+  final parameter Modelica.Units.SI.HeatFlowRate QHeaHp_flow_nominal=abs(capHeaHp_nominal)
+    "Design heating heat flow rate - Each heat pump";
+  final parameter Modelica.Units.SI.PressureDifference dpHeaWatHp_nominal=dat.dpHeaWatHp_nominal
+    "Design HW pressure drop - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature THeaWatSupHp_nominal=dat.THeaWatSupHp_nominal
+    "Design HW supply temperature - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature THeaWatRetHp_nominal=dat.THeaWatRetHp_nominal
+    "Design HW return temperature - Each heat pump";
+  final parameter Modelica.Units.SI.MassFlowRate mChiWatHp_flow_nominal=dat.mChiWatHp_flow_nominal
+    "Design CHW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.PressureDifference dpChiWatHp_nominal=dat.dpChiWatHp_nominal
+    "Design CHW pressure drop - Each heat pump";
+  final parameter Modelica.Units.SI.HeatFlowRate capCooHp_nominal=dat.capCooHp_nominal
+    "Design cooling capacity - Each heat pump";
+  final parameter Modelica.Units.SI.HeatFlowRate QCooHp_flow_nominal=- abs(capCooHp_nominal)
+    "Design cooling heat flow rate - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature TChiWatSupHp_nominal=dat.TChiWatSupHp_nominal
+    "Design CHW supply temperature - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature TChiWatRetHp_nominal=dat.TChiWatRetHp_nominal
+    "Design CHW return temperature - Each heat pump";
+  final parameter Modelica.Units.SI.MassFlowRate mSouHeaHp_flow_nominal=dat.mSouHeaHp_flow_nominal
+    "Design source fluid mass flow rate in heating mode - Each heat pump";
+  final parameter Modelica.Units.SI.PressureDifference dpSouHeaHp_nominal=dat.dpSouHeaHp_nominal
+    "Design source fluid pressure drop in heating mode - Each heat pump";
+  final parameter Modelica.Units.SI.MassFlowRate mSouCooHp_flow_nominal=dat.mSouCooHp_flow_nominal
+    "Design source fluid mass flow rate in cooling mode - Each heat pump";
+  final parameter Modelica.Units.SI.PressureDifference dpSouCooHp_nominal=dat.dpSouCooHp_nominal
+    "Designs source fluid pressure drop in cooling mode - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature TSouCooHp_nominal=dat.TSouCooHp_nominal
+    "Design OAT or source fluid supply temperature (condenser entering) in cooling mode - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature TSouHeaHp_nominal=dat.TSouHeaHp_nominal
+    "Design OAT or source fluid supply temperature (evaporator entering) in heating mode - Each heat pump";
+  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 allowFlowReversal=true
+    "Load side flow reversal: false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation (Dialog(tab="Assumptions"),
+    Evaluate=true);
+  parameter Boolean allowFlowReversalSou=true
+    "Source side flow reversal: false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation (Dialog(tab="Assumptions",
+      enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater),
+    Evaluate=true);
+  parameter Boolean have_preDroChiHeaWat=true
+    "Set to true for CHW/HW pressure drop computed by this model, false for external computation"
+    annotation (Evaluate=true,
+    Dialog(tab="Assumptions"));
+  parameter Boolean have_preDroSou=true
+    "Set to true for source fluid pressure drop computed by this model, false for external computation"
+    annotation (Evaluate=true,
+    Dialog(tab="Assumptions",
+      enable=Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+  final parameter MediumHeaWat.SpecificHeatCapacity cpHeaWat_default=
+    MediumHeaWat.specificHeatCapacityCp(staHeaWat_default)
+    "HW default specific heat capacity";
+  final parameter MediumHeaWat.ThermodynamicState staHeaWat_default=MediumHeaWat.setState_pTX(
+    T=THeaWatSupHp_nominal,
+    p=MediumHeaWat.p_default,
+    X=MediumHeaWat.X_default)
+    "HW default state";
+  final parameter MediumChiWat.SpecificHeatCapacity cpChiWat_default=
+    MediumChiWat.specificHeatCapacityCp(staChiWat_default)
+    "CHW default specific heat capacity";
+  final parameter MediumChiWat.ThermodynamicState staChiWat_default=MediumChiWat.setState_pTX(
+    T=TChiWatSupHp_nominal,
+    p=MediumChiWat.p_default,
+    X=MediumChiWat.X_default)
+    "CHW default state";
+  final parameter MediumSou.SpecificHeatCapacity cpSou_default=MediumSou.specificHeatCapacityCp(staSou_default)
+    "Source fluid default specific heat capacity";
+  final parameter MediumSou.ThermodynamicState staSou_default=MediumSou.setState_pTX(
+    T=TSouHeaHp_nominal,
+    p=MediumSou.p_default,
+    X=MediumSou.X_default)
+    "Source fluid default state";
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bChiHeaWat[nHp](
+    redeclare each final package Medium=MediumHeaWat,
+    each m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=MediumHeaWat.h_default,
+      nominal=MediumHeaWat.h_default))
+    "CHW/HW supply"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={-120,200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={-500,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aChiHeaWat[nHp](
+    redeclare each final package Medium=MediumHeaWat,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=MediumHeaWat.h_default,
+      nominal=MediumHeaWat.h_default))
+    "CHW/HW return"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={120,200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={500,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bSou[nHp](
+    redeclare each final package Medium=MediumSou,
+    each m_flow(
+      max=if allowFlowReversalSou then + Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=MediumSou.h_default,
+      nominal=MediumSou.h_default))
+    "Source fluid return (from heat pumps)"
+    annotation (Placement(iconVisible=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater,
+      transformation(extent={{-10,-40},{10,40}},rotation=90,origin={120,-200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={500,-398})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aSou[nHp](
+    redeclare each final package Medium=MediumSou,
+    each m_flow(
+      min=if allowFlowReversalSou then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=MediumSou.h_default,
+      nominal=MediumSou.h_default))
+    "Source fluid supply (to heat pumps)"
+    annotation (Placement(iconVisible=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater,
+      transformation(extent={{-10,-40},{10,40}},rotation=90,origin={-120,-200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={-500,-400})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-20,180},{20,220}}),
+      iconTransformation(extent={{-20,380},{20,420}})));
+  Buildings.BoundaryConditions.WeatherData.Bus busWea
+    if typ == Buildings.Templates.Components.Types.HeatPump.AirToWater
+    "Weather bus"
+    annotation (Placement(transformation(extent={{20,180},{60,220}}),
+      iconTransformation(extent={{-220,380},{-180,420}})));
+  // Diagnostics
+  parameter Boolean show_T=false
+    "= true, if actual temperature at port is computed"
+    annotation (Dialog(tab="Advanced",group="Diagnostics"),HideResult=true);
+  MediumHeaWat.ThermodynamicState sta_aChiHeaWat[nHp]=MediumHeaWat.setState_phX(ports_aChiHeaWat.p, noEvent(actualStream(ports_aChiHeaWat.h_outflow)), noEvent(actualStream(ports_aChiHeaWat.Xi_outflow)))
+    if show_T
+    "CHW/HW medium properties in port_aChiHeaWat";
+  MediumHeaWat.ThermodynamicState sta_bChiHeaWat[nHp]=MediumHeaWat.setState_phX(ports_bChiHeaWat.p, noEvent(actualStream(ports_bChiHeaWat.h_outflow)), noEvent(actualStream(ports_bChiHeaWat.Xi_outflow)))
+    if show_T
+    "CHW/HW medium properties in port_bChiHeaWat";
+  MediumSou.ThermodynamicState sta_aSou[nHp]=MediumSou.setState_phX(ports_aSou.p, noEvent(actualStream(ports_aSou.h_outflow)), noEvent(actualStream(ports_aSou.Xi_outflow)))
+    if show_T
+    "Source medium properties in port_aSou";
+  MediumSou.ThermodynamicState sta_bSou[nHp]=MediumSou.setState_phX(ports_bSou.p, noEvent(actualStream(ports_bSou.h_outflow)), noEvent(actualStream(ports_bSou.Xi_outflow)))
+    if show_T
+    "Source medium properties in port_bSou";
+protected
+  Buildings.Templates.Components.Interfaces.Bus busHp[nHp]
+    "Heat pump control bus"
+    annotation (Placement(transformation(extent={{-20,140},{20,180}}),
+      iconTransformation(extent={{-522,206},{-482,246}})));
+equation
+  connect(bus.hp, busHp)
+    annotation (Line(points={{0,200},{0,200},{0,160}},color={255,204,51},thickness=0.5));
+  annotation (Diagram(coordinateSystem(extent={{-200,-200},{200,200}})), Icon(
+        coordinateSystem(preserveAspectRatio=false, extent={{-2400,-400},{2400,
+            400}}), graphics={
+        Bitmap(
+          extent={{1880,160},{1960,240}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg",
+          visible=nHp >= 1),
+        Rectangle(
+          extent={{2240,400},{1960,0}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          visible=nHp >= 1),
+        Text(
+          extent={{1960,250},{2240,150}},
+          textColor={0,0,0},
+          visible=nHp >= 1,
+          textString="HP-1"),
+        Bitmap(
+          extent={{1080,160},{1160,240}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg",
+          visible=nHp >= 2),
+        Rectangle(
+          extent={{1440,400},{1160,0}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          visible=nHp >= 2),
+        Text(
+          extent={{1160,250},{1440,150}},
+          textColor={0,0,0},
+          visible=nHp >= 2,
+          textString="HP-2"),
+        Bitmap(
+          extent={{280,160},{360,240}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg",
+          visible=nHp >= 3),
+        Rectangle(
+          extent={{640,400},{360,0}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          visible=nHp >= 3),
+        Text(
+          extent={{360,250},{640,150}},
+          textColor={0,0,0},
+          visible=nHp >= 3,
+          textString="HP-3"),
+        Bitmap(
+          extent={{-520,160},{-440,240}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg",
+          visible=nHp >= 4),
+        Rectangle(
+          extent={{-160,400},{-440,0}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          visible=nHp >= 4),
+        Text(
+          extent={{-440,250},{-160,150}},
+          textColor={0,0,0},
+          visible=nHp >= 4,
+          textString="HP-4"),
+        Bitmap(
+          extent={{-1320,160},{-1240,240}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg",
+          visible=nHp >= 5),
+        Rectangle(
+          extent={{-960,400},{-1240,0}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          visible=nHp >= 5),
+        Text(
+          extent={{-1240,250},{-960,150}},
+          textColor={0,0,0},
+          visible=nHp >= 5,
+          textString="HP-5"),
+        Bitmap(
+          extent={{-2120,160},{-2040,240}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Boilers/ControllerOnboard.svg",
+          visible=nHp >= 6),
+        Rectangle(
+          extent={{-1760,400},{-2040,0}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          visible=nHp >= 6),
+        Text(
+          extent={{-2040,250},{-1760,150}},
+          textColor={0,0,0},
+          visible=nHp >= 6,
+          textString="HP-6")}),
+    Documentation(info="<html>
+<p>
+This partial class provides a standard interface for heat pump
+group models.
+</p>
+</html>"));
+end PartialHeatPumpGroup;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/package.mo b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/package.mo
new file mode 100644
index 00000000000..15254aed0fd
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+package Interfaces "Interface classes"
+  extends Modelica.Icons.InterfacesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains interface classes.
+</p>
+</html>"));
+end Interfaces;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/package.order b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/package.order
new file mode 100644
index 00000000000..6112600b18a
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Interfaces/package.order
@@ -0,0 +1,2 @@
+PartialController
+PartialHeatPumpGroup
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo b/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo
new file mode 100644
index 00000000000..5721bb03f62
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/PumpsPrimaryDedicated.mo
@@ -0,0 +1,868 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+model PumpsPrimaryDedicated
+  "Dedicated primary pumps"
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium model"
+    annotation (__ctrlFlow(enable=false));
+  parameter Integer nHp(min=1)
+    "Number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  /* RFE(AntoineGautier): Add support for multiple pumps for each heat pump.
+  Currently, only one dedicated CHW or HW pump for each HP is supported.
+  */
+  final parameter Integer nPum=if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    then nHp else 0
+    "Number of primary pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Buildings.Templates.Components.Types.PumpArrangement typArrPumPri
+    "Type of primary pump arrangement"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean have_pumChiWatPriDed(start=false)
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  parameter Boolean have_pumHeaWatPriVar(start=false)
+    "Set to true for variable speed primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  parameter Boolean have_pumChiWatPriVar(start=false)
+    "Set to true for variable speed primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+        and have_pumChiWatPriDed));
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPumHeaWat(
+    typ=if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+      then Buildings.Templates.Components.Types.Pump.Multiple else Buildings.Templates.Components.Types.Pump.None,
+    nPum=nPum)
+    "HW pump parameters"
+    annotation (Dialog(enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated),
+      Placement(transformation(extent={{170,170},{190,190}})));
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPumChiWat(
+    typ=if have_pumChiWatPriDed then Buildings.Templates.Components.Types.Pump.Multiple
+      else Buildings.Templates.Components.Types.Pump.None,
+    nPum=if have_pumChiWatPriDed then nPum else 0)
+    "CHW pump parameters"
+    annotation (Dialog(enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+      and have_pumChiWatPriDed),
+      Placement(transformation(extent={{170,130},{190,150}})));
+  parameter Modelica.Units.SI.PressureDifference dpValCheHeaWat_nominal[nPum](
+    each final min=0,
+    start=fill(if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+         then Buildings.Templates.Data.Defaults.dpValChe else 0, nPum))=fill(
+    if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+     then Buildings.Templates.Data.Defaults.dpValChe else 0, nPum)
+    "HW pump check valve pressure drop at design HW pump flow rate"
+    annotation (Dialog(group="Nominal condition",
+      enable=typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  parameter Modelica.Units.SI.PressureDifference dpValCheChiWat_nominal[if have_pumChiWatPriDed then nPum else 0](
+    each final min=0,
+    start=fill(if have_pumChiWatPriDed then Buildings.Templates.Data.Defaults.dpValChe
+         else 0, if have_pumChiWatPriDed then nPum else 0))=fill(if
+    have_pumChiWatPriDed then Buildings.Templates.Data.Defaults.dpValChe else 0,
+    if have_pumChiWatPriDed then nPum else 0)
+    "CHW pump check valve pressure drop at design CHW pump flow rate"
+    annotation (Dialog(group="Nominal condition", enable=have_pumChiWatPriDed));
+  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 Modelica.Units.SI.Time tau=1
+    "Time constant at nominal flow"
+    annotation (Dialog(tab="Dynamics",group="Nominal condition",
+      enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
+    __ctrlFlow(enable=false));
+  parameter Boolean allowFlowReversal=true
+    "Set to false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation (Dialog(tab="Assumptions"),
+    Evaluate=true);
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bChiHeaWat[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+      or typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+      and not have_pumChiWatPriDed
+    "CHW/HW supply (to primary loop)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={-100,200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=270,origin={-500,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aChiHeaWat[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "CHW/HW return (from primary loop)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={100,200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=270,origin={500,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bChiHeaWatHp[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "CHW/HW return (HP entering)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={100,-200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={500,-400})));
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bHeaWat[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+      and have_pumChiWatPriDed
+    "HW supply (to primary loop)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={-180,200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={-660,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bChiWat[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+      and have_pumChiWatPriDed
+    "CHW supply (to primary loop)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={-20,200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={-340,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aChiHeaWatHp[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "CHW/HW supply (HP leaving)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={-100,-200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={-500,-400})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{20,180},{60,220}}),
+      iconTransformation(extent={{-20,380},{20,420}})));
+  Buildings.Templates.Components.Pumps.Multiple pumHeaWat(
+    redeclare final package Medium=Medium,
+    final have_var=have_pumHeaWatPriVar,
+    final have_varCom=false,
+    final nPum=nPum,
+    final dat=datPumHeaWat,
+    final dpValChe_nominal=dpValCheHeaWat_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final tau=tau,
+    final energyDynamics=energyDynamics)
+    if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    "Dedicated primary (HW) Pumps"
+    annotation (Placement(transformation(extent={{-130,-70},{-150,-50}})));
+  Buildings.Templates.Components.Pumps.Multiple pumChiWat(
+    redeclare final package Medium=Medium,
+    final have_var=have_pumChiWatPriVar,
+    final have_varCom=false,
+    final nPum=if have_pumChiWatPriDed then nPum else 0,
+    final dat=datPumChiWat,
+    final dpValChe_nominal=dpValCheChiWat_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final tau=tau,
+    final energyDynamics=energyDynamics)
+    if have_pumChiWatPriDed
+    "Dedicated primary CHW pumps - Optional"
+    annotation (Placement(transformation(extent={{-48,-70},{-28,-50}})));
+  Buildings.Templates.Components.Routing.PassThroughFluid pasHdr[nHp](
+      redeclare each final package Medium = Medium) if typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Headered
+    "Direct fluid pass-through for headered primary pumps" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-100,-140})));
+  Fluid.FixedResistances.Junction junDedSep[nPum](
+    redeclare each final package Medium =Medium,
+    final m_flow_nominal={{
+      max(datPumHeaWat.m_flow_nominal[i], datPumChiWat.m_flow_nominal[i]),
+      -datPumHeaWat.m_flow_nominal[i],
+      -datPumChiWat.m_flow_nominal[i]} for i in 1:nPum},
+    dp_nominal=fill(fill(0, 3), nPum),
+    each final energyDynamics=energyDynamics,
+    each final portFlowDirection_1=if allowFlowReversal then
+      Modelica.Fluid.Types.PortFlowDirection.Bidirectional else
+      Modelica.Fluid.Types.PortFlowDirection.Entering,
+    each final portFlowDirection_2=if allowFlowReversal then
+      Modelica.Fluid.Types.PortFlowDirection.Bidirectional else
+      Modelica.Fluid.Types.PortFlowDirection.Leaving,
+   each final portFlowDirection_3=if allowFlowReversal then
+      Modelica.Fluid.Types.PortFlowDirection.Bidirectional else
+      Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+     and have_pumChiWatPriDed
+    "Fluid junction for separate dedicated primary pumps" annotation (Placement(
+        transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-80,-140})));
+  Buildings.Templates.Components.Routing.PassThroughFluid pasDedCom[nHp](
+      redeclare each final package Medium = Medium) if typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Dedicated and not
+    have_pumChiWatPriDed
+    "Direct fluid pass-through for common dedicated primary pumps" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-120,-140})));
+protected
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatPri
+    "Primary HW pump control bus"
+    annotation (Placement(transformation(extent={{-20,-120},{20,-80}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatPri
+    if have_pumChiWatPriDed
+    "Primary CHW pump control bus"
+    annotation (Placement(transformation(extent={{-20,-70},{20,-30}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+equation
+  connect(bus.pumHeaWatPri, busPumHeaWatPri)
+    annotation (Line(points={{40,200},{40,-100},{0,-100}},
+                                                        color={255,204,51},thickness=0.5));
+  connect(bus.pumChiWatPri, busPumChiWatPri)
+    annotation (Line(points={{40,200},{40,-50},{0,-50}},color={255,204,51},thickness=0.5));
+  connect(pumHeaWat.ports_b, ports_bHeaWat)
+    annotation (Line(points={{-150,-60},{-180,-60},{-180,200}},
+      color={0,127,255}));
+  connect(pumHeaWat.ports_b, ports_bChiHeaWat)
+    annotation (Line(points={{-150,-60},{-160,-60},{-160,180},{-100,180},{-100,
+          200}},
+      color={0,127,255}));
+  connect(pumChiWat.ports_b, ports_bChiWat)
+    annotation (Line(points={{-28,-60},{-20,-60},{-20,200}},
+      color={0,127,255}));
+  connect(busPumHeaWatPri, pumHeaWat.bus)
+    annotation (Line(points={{0,-100},{-140,-100},{-140,-50}},       color={255,204,51},thickness=0.5));
+  connect(busPumChiWatPri, pumChiWat.bus)
+    annotation (Line(points={{0,-50},{-38,-50}},color={255,204,51},thickness=0.5));
+  connect(ports_aChiHeaWat, ports_bChiHeaWatHp)
+    annotation (Line(points={{100,200},{100,-200}},color={0,127,255}));
+  connect(ports_aChiHeaWatHp, pasHdr.port_a)
+    annotation (Line(points={{-100,-200},{-100,-150}}, color={0,127,255}));
+  connect(pasHdr.port_b, ports_bChiHeaWat)
+    annotation (Line(points={{-100,-130},{-100,200}}, color={0,127,255}));
+  connect(junDedSep.port_3, pumChiWat.ports_a) annotation (Line(points={{-70,
+          -140},{-60,-140},{-60,-60},{-48,-60}},
+                                            color={0,127,255}));
+  connect(ports_aChiHeaWatHp, pasDedCom.port_a) annotation (Line(points={{-100,
+          -200},{-120,-200},{-120,-150}},                   color={0,127,255}));
+  connect(pasDedCom.port_b, pumHeaWat.ports_a) annotation (Line(points={{-120,
+          -130},{-120,-60},{-130,-60}},
+                                  color={0,127,255}));
+  connect(ports_aChiHeaWatHp, junDedSep.port_1) annotation (Line(points={{-100,
+          -200},{-80,-200},{-80,-150}},       color={0,127,255}));
+  connect(junDedSep.port_2, pumHeaWat.ports_a) annotation (Line(points={{-80,
+          -130},{-80,-60},{-130,-60}},
+                                 color={0,127,255}));
+  annotation (
+    defaultComponentName="pumPri",
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-200},{200,200}})),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-2400,-400},{2400,400}}), graphics={
+        Line(
+          points={{2000,60},{2000,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+               and nHp >= 1),
+        Line(
+          points={{2000,400},{2000,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 1),
+        Line(
+          points={{2200,400},{2200,-400}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=nHp >= 1),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 1,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={2022,10},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 1,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={2000,260},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and have_pumHeaWatPriVar and nHp >= 1,
+          extent={{2080,-50},{2180,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{2020,-40},{2020,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 1),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 1,
+          extent={{-50,-50},{50,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={1822,10},
+          rotation=90),
+        Line(
+          points={{1800,400},{1800,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 1),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 1,
+          extent={{-40,-40},{40,40}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={1800,260},
+          rotation=90),
+        Line(
+          points={{1820,-40},{1820,-200},{2020,-200}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 1),
+    Bitmap(
+          visible=have_pumChiWatPriDed and have_pumChiWatPriVar and nHp >= 1,
+          extent={{1660,-50},{1760,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{2066,0},{2080,0}},
+          color={0,0,0},
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 1),
+        Line(
+          points={{1760,0},{1778,0}},
+          color={0,0,0},
+          visible=have_pumChiWatPriDed and nHp >= 1),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and not have_pumHeaWatPriVar and nHp >= 1,
+          extent={{2080,-50},{2180,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Bitmap(
+          visible=have_pumChiWatPriDed and not have_pumChiWatPriVar and nHp >=
+              1,
+          extent={{1660,-104},{1760,-4}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{-2000,60},{-2000,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+               and nHp >= 6),
+        Line(
+          points={{-2000,400},{-2000,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 6),
+        Line(
+          points={{-1800,400},{-1800,-400}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=nHp >= 6),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 6,
+          extent={{-50,-50},{50,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={-1978,10},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 6,
+          extent={{-40,-40},{40,40}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={-2000,260},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and have_pumHeaWatPriVar and nHp >= 6,
+          extent={{-1920,-50},{-1820,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{-1980,-40},{-1980,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 6),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 6,
+          extent={{-50,-50},{50,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={-2178,10},
+          rotation=90),
+        Line(
+          points={{-2200,400},{-2200,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 6),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 6,
+          extent={{-40,-40},{40,40}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={-2200,260},
+          rotation=90),
+        Line(
+          points={{-2180,-40},{-2180,-200},{-1980,-200}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 6),
+    Bitmap(
+          visible=have_pumChiWatPriDed and have_pumChiWatPriVar and nHp >= 6,
+          extent={{-2340,-50},{-2240,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{-1934,0},{-1920,0}},
+          color={0,0,0},
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 6),
+        Line(
+          points={{-2240,0},{-2222,0}},
+          color={0,0,0},
+          visible=have_pumChiWatPriDed and nHp >= 6),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and not have_pumHeaWatPriVar and nHp >= 6,
+          extent={{-1920,-50},{-1820,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Bitmap(
+          visible=have_pumChiWatPriDed and not have_pumChiWatPriVar and nHp >= 6,
+          extent={{-2340,-50},{-2240,50}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{-1200,60},{-1200,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+               and nHp >= 5),
+        Line(
+          points={{-1200,400},{-1200,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 5),
+        Line(
+          points={{-1000,400},{-1000,-400}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=nHp >= 5),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 5,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={-1178,10},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 5,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={-1200,260},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and have_pumHeaWatPriVar and nHp >= 5,
+          extent={{-1120,-50},{-1020,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{-1180,-40},{-1180,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 5),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 5,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={-1378,10},
+          rotation=90),
+        Line(
+          points={{-1400,400},{-1400,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 5),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 5,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={-1400,260},
+          rotation=90),
+        Line(
+          points={{-1380,-40},{-1380,-200},{-1180,-200}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 5),
+    Bitmap(
+          visible=have_pumChiWatPriDed and have_pumChiWatPriVar and nHp >= 5,
+          extent={{-1540,-50},{-1440,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{-1134,0},{-1120,0}},
+          color={0,0,0},
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 5),
+        Line(
+          points={{-1440,0},{-1422,0}},
+          color={0,0,0},
+          visible=have_pumChiWatPriDed and nHp >= 5),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and not have_pumHeaWatPriVar and nHp >= 5,
+          extent={{-1120,-50},{-1020,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Bitmap(
+          visible=have_pumChiWatPriDed and not have_pumChiWatPriVar and nHp >=
+              5,
+          extent={{-1540,-50},{-1440,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{-400,60},{-400,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+               and nHp >= 4),
+        Line(
+          points={{-400,400},{-400,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 4),
+        Line(
+          points={{-200,400},{-200,-400}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=nHp >= 4),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 4,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={-378,10},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 4,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={-400,260},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and have_pumHeaWatPriVar and nHp >= 4,
+          extent={{-320,-50},{-220,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{-380,-40},{-380,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 4),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 4,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={-578,10},
+          rotation=90),
+        Line(
+          points={{-600,400},{-600,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 4),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 4,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={-600,260},
+          rotation=90),
+        Line(
+          points={{-580,-40},{-580,-200},{-380,-200}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 4),
+    Bitmap(
+          visible=have_pumChiWatPriDed and have_pumChiWatPriVar and nHp >= 4,
+          extent={{-740,-50},{-640,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{-334,0},{-320,0}},
+          color={0,0,0},
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 4),
+        Line(
+          points={{-640,0},{-622,0}},
+          color={0,0,0},
+          visible=have_pumChiWatPriDed and nHp >= 4),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and not have_pumHeaWatPriVar and nHp >= 4,
+          extent={{-320,-50},{-220,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Bitmap(
+          visible=have_pumChiWatPriDed and not have_pumChiWatPriVar and nHp >=
+              4,
+          extent={{-740,-50},{-640,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{400,60},{400,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+               and nHp >= 3),
+        Line(
+          points={{400,400},{400,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 3),
+        Line(
+          points={{600,400},{600,-400}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=nHp >= 3),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 3,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={422,10},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 3,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={400,260},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and have_pumHeaWatPriVar and nHp >= 3,
+          extent={{480,-50},{580,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{420,-40},{420,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 3),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 3,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={222,10},
+          rotation=90),
+        Line(
+          points={{200,400},{200,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 3),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 3,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={200,260},
+          rotation=90),
+        Line(
+          points={{220,-40},{220,-200},{420,-200}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 3),
+    Bitmap(
+          visible=have_pumChiWatPriDed and have_pumChiWatPriVar and nHp >= 3,
+          extent={{60,-50},{160,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{466,0},{480,0}},
+          color={0,0,0},
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 3),
+        Line(
+          points={{160,0},{178,0}},
+          color={0,0,0},
+          visible=have_pumChiWatPriDed and nHp >= 3),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and not have_pumHeaWatPriVar and nHp >= 3,
+          extent={{480,-50},{580,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Bitmap(
+          visible=have_pumChiWatPriDed and not have_pumChiWatPriVar and nHp >=
+              3,
+          extent={{60,-50},{160,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+        Line(
+          points={{1200,60},{1200,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+               and nHp >= 2),
+        Line(
+          points={{1200,400},{1200,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 2),
+        Line(
+          points={{1400,400},{1400,-400}},
+          color={0,0,0},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=nHp >= 2),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 2,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={1222,10},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 2,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={1200,260},
+          rotation=90),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and have_pumHeaWatPriVar and nHp >= 2,
+          extent={{1280,-50},{1380,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{1220,-40},{1220,-400}},
+          color={0,0,0},
+          thickness=5,
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 2),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 2,
+          extent={{-50,-50},{50,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Pumps/Single.svg",
+          origin={1022,10},
+          rotation=90),
+        Line(
+          points={{1000,400},{1000,60}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 2),
+    Bitmap(
+          visible=have_pumChiWatPriDed and nHp >= 2,
+          extent={{-40,-40},{40,40}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/Check.svg",
+          origin={1000,260},
+          rotation=90),
+        Line(
+          points={{1020,-40},{1020,-200},{1220,-200}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 2),
+    Bitmap(
+          visible=have_pumChiWatPriDed and have_pumChiWatPriVar and nHp >= 2,
+          extent={{860,-50},{960,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/VFD.svg"),
+        Line(
+          points={{1266,0},{1280,0}},
+          color={0,0,0},
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and nHp >= 2),
+        Line(
+          points={{960,0},{978,0}},
+          color={0,0,0},
+          visible=have_pumChiWatPriDed and nHp >= 2),
+    Bitmap(
+          visible=typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+               and not have_pumHeaWatPriVar and nHp >= 2,
+          extent={{1280,-50},{1380,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg"),
+    Bitmap(
+          visible=have_pumChiWatPriDed and not have_pumChiWatPriVar and nHp >=
+              2,
+          extent={{860,-50},{960,50}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/MotorStarter.svg")}),
+    Documentation(revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model represents dedicated primary HW pumps and, optionally,
+separate dedicated primary CHW pumps if the parameter 
+<code>have_pumChiWatPriDed</code> is set to true.
+The pump components are connected to the heat pump outlet,
+in a \"pump away\" configuration. 
+Variable speed or constant speed pumps can be modeled by
+setting the parameters <code>have_pumHeaWatPriVar</code>
+and <code>have_pumChiWatPriVar</code>.
+If headered pumps are modeled 
+(<code>typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Headered</code>),
+this component resolves to a direct fluid pass-through.
+</p>
+</html>"));
+end PumpsPrimaryDedicated;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo
new file mode 100644
index 00000000000..b22dd0e9779
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mo
@@ -0,0 +1,386 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Validation;
+model HeatPumpGroupAirToWater
+  "Validation model for heat pump group"
+  extends Modelica.Icons.Example;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW/HW medium";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Data.Controller datCtlPlaAwNrv(
+    cfg(
+      have_hrc = false,
+      have_inpSch = false,
+      have_chiWat=false,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      have_pumHeaWatPriVar=true,
+      have_pumChiWatPriVar=false,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      have_pumChiWatPriDed=false,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=hpAwNrv.is_rev,
+      typ=hpAwNrv.typ,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=hpAwNrv.cpChiWat_default,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      have_valHpInlIso=false,
+      have_valHpOutIso=false,
+      typMod=hpAwNrv.typMod,
+      cpHeaWat_default=hpAwNrv.cpHeaWat_default,
+      cpSou_default=hpAwNrv.cpSou_default,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=hpAwNrv.nHp,
+      nPumHeaWatPri=hpAwNrv.nHp,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=hpAwNrv.nHp,
+      nSenDpHeaWatRem=1,
+      nSenDpChiWatRem=1,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=datHpAwNrv.THeaWatSupHp_nominal,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlPlaAwNrv.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlPlaAwNrv.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, hpAwNrv.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-260,40},{-240,60}})));
+  parameter Data.Controller datCtlPlaAw(
+    cfg(
+      have_hrc = false,
+      have_inpSch = false,
+      have_chiWat=true,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      have_pumHeaWatPriVar=true,
+      have_pumChiWatPriVar=true,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      have_pumChiWatPriDed=false,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=hpAw.is_rev,
+      typ=hpAw.typ,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=hpAw.cpChiWat_default,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      have_valHpInlIso=true,
+      have_valHpOutIso=true,
+      typMod=hpAw.typMod,
+      cpHeaWat_default=hpAw.cpHeaWat_default,
+      cpSou_default=hpAw.cpSou_default,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=hpAw.nHp,
+      nPumHeaWatPri=hpAw.nHp,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=hpAw.nHp,
+      nSenDpHeaWatRem=1,
+      nSenDpChiWatRem=1,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=datHpAw.THeaWatSupHp_nominal,
+    TChiWatSup_nominal=datHpAw.TChiWatSupHp_nominal,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlPlaAw.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlPlaAw.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, hpAw.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-260,-200},{-240,-180}})));
+
+  parameter Buildings.Templates.Plants.HeatPumps.Components.Data.HeatPumpGroup datHpAwNrv(
+    final cpHeaWat_default=hpAwNrv.cpHeaWat_default,
+    final cpSou_default=hpAwNrv.cpSou_default,
+    final nHp=hpAwNrv.nHp,
+    final typ=hpAwNrv.typ,
+    final is_rev=hpAwNrv.is_rev,
+    final typMod=hpAwNrv.typMod,
+    mHeaWatHp_flow_nominal=datHpAwNrv.capHeaHp_nominal / abs(datHpAwNrv.THeaWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.THeaWatRetMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWatHp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHeaHp_nominal=500E3,
+    THeaWatSupHp_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TSouHeaHp_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    perFitHp(
+      hea(
+        P=datHpAwNrv.capHeaHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwHea,
+        coeQ={- 4.2670305442, - 0.7381077035, 6.0049480456, 0, 0},
+        coeP={- 4.9107455513, 5.3665308366, 0.5447612754, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpHeaLow)))
+    "Non-reversible AWHP parameters"
+    annotation (Placement(transformation(extent={{-220,40},{-200,60}})));
+  parameter Buildings.Templates.Plants.HeatPumps.Components.Data.HeatPumpGroup datHpAw(
+    final cpHeaWat_default=hpAw.cpHeaWat_default,
+    final cpSou_default=hpAw.cpSou_default,
+    final nHp=hpAw.nHp,
+    final typ=hpAw.typ,
+    final is_rev=hpAw.is_rev,
+    final typMod=hpAw.typMod,
+    mHeaWatHp_flow_nominal=datHpAw.capHeaHp_nominal / abs(datHpAw.THeaWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.THeaWatRetMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWatHp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHeaHp_nominal=500E3,
+    THeaWatSupHp_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TSouHeaHp_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    mChiWatHp_flow_nominal=datHpAw.capCooHp_nominal / abs(datHpAw.TChiWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.TChiWatRet) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    capCooHp_nominal=500E3,
+    TChiWatSupHp_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TSouCooHp_nominal=Buildings.Templates.Data.Defaults.TOutHpCoo,
+    perFitHp(
+      hea(
+        P=datHpAw.capHeaHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwHea,
+        coeQ={- 4.2670305442, - 0.7381077035, 6.0049480456, 0, 0},
+        coeP={- 4.9107455513, 5.3665308366, 0.5447612754, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpHeaLow),
+      coo(
+        P=datHpAw.capCooHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwCoo,
+        coeQ={- 2.2545246871, 6.9089257665, - 3.6548225094, 0, 0},
+        coeP={- 5.8086010402, 1.6894933858, 5.1167787436, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpCoo)))
+    "Reversible AWHP parameters"
+    annotation (Placement(transformation(extent={{-220,-200},{-200,-180}})));
+  Fluid.Sources.Boundary_pT sup(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=hpAwNrv.nHp)
+    "Boundary condition at distribution system supply"
+    annotation (Placement(transformation(extent={{120,130},{100,150}})));
+  Fluid.Sources.Boundary_pT inlHp1(
+    redeclare final package Medium=Medium,
+    use_p_in=true,
+    use_T_in=true,
+    nPorts=hpAwNrv.nHp)
+    "Boundary conditions at HP inlet"
+    annotation (Placement(transformation(extent={{-120,150},{-100,170}})));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=0,
+      origin={180,160})));
+  Fluid.Sensors.TemperatureTwoPort TRet1[hpAwNrv.nHp](
+    redeclare each final package Medium=Medium,
+    each final m_flow_nominal=datHpAwNrv.mHeaWatHp_flow_nominal)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{-80,150},{-60,170}})));
+  Fluid.Sensors.TemperatureTwoPort TSup1[hpAwNrv.nHp](
+    redeclare each final package Medium=Medium,
+    each final m_flow_nominal=datHpAwNrv.mHeaWatHp_flow_nominal)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{60,130},{80,150}})));
+  Controls.OpenLoop ctlPlaAwNrv(
+    final cfg=datCtlPlaAwNrv.cfg,
+    final dat=datCtlPlaAwNrv)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{10,170},{-10,190}})));
+  HeatPumpGroups.AirToWater hpAwNrv(
+    redeclare final package MediumHeaWat=Medium,
+    nHp=3,
+    is_rev=false,
+    final dat=datHpAwNrv,
+    final energyDynamics=energyDynamics)
+    "Non reversible AWHP"
+    annotation (Placement(transformation(extent={{280,40},{-200,120}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin THeaWatRet(
+    amplitude=datHpAwNrv.THeaWatSupHp_nominal - datHpAwNrv.THeaWatRetHp_nominal,
+    freqHz=3 / 3000,
+    y(final unit="K",
+      displayUnit="degC"),
+    offset=datHpAwNrv.THeaWatRetHp_nominal,
+    startTime=0)
+    "HW return temperature value"
+    annotation (Placement(transformation(extent={{-290,130},{-270,150}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pHeaWatInl(
+    k=sup.p + datHpAwNrv.dpHeaWatHp_nominal)
+    "HW inlet pressure"
+    annotation (Placement(transformation(extent={{-290,170},{-270,190}})));
+  HeatPumpGroups.AirToWater hpAw(
+    redeclare final package MediumHeaWat=Medium,
+    nHp=3,
+    is_rev=true,
+    final dat=datHpAw,
+    final energyDynamics=energyDynamics)
+    "Reversible AWHP"
+    annotation (Placement(transformation(extent={{280,-200},{-200,-120}})));
+  Controls.OpenLoop ctlPlaAw(
+    final cfg=datCtlPlaAw.cfg,
+    final dat=datCtlPlaAw)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-20,-30},{-40,-10}})));
+  Fluid.Sources.Boundary_pT inlHp(
+    redeclare final package Medium=Medium,
+    use_p_in=true,
+    use_T_in=true,
+    nPorts=hpAwNrv.nHp)
+    "Boundary conditions at HP inlet"
+    annotation (Placement(transformation(extent={{-120,-50},{-100,-30}})));
+  Fluid.Sensors.TemperatureTwoPort TRet[hpAw.nHp](
+    redeclare each final package Medium=Medium,
+    each final m_flow_nominal=datHpAw.mHeaWatHp_flow_nominal)
+    "Return temperature"
+    annotation (Placement(transformation(extent={{-80,-50},{-60,-30}})));
+  Fluid.Sources.Boundary_pT sup1(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=hpAwNrv.nHp)
+    "Boundary condition at distribution system supply"
+    annotation (Placement(transformation(extent={{120,-50},{100,-30}})));
+  Fluid.Sensors.TemperatureTwoPort TSup[hpAw.nHp](
+    redeclare each final package Medium=Medium,
+    each final m_flow_nominal=datHpAw.mHeaWatHp_flow_nominal)
+    "Supply temperature"
+    annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin THeaWatRet1(
+    amplitude=datHpAw.THeaWatSupHp_nominal - datHpAw.THeaWatRetHp_nominal,
+    freqHz=3 / 3000,
+    y(final unit="K",
+      displayUnit="degC"),
+    offset=datHpAw.THeaWatRetHp_nominal,
+    startTime=0)
+    "HW return temperature value"
+    annotation (Placement(transformation(extent={{-290,-70},{-270,-50}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Sin TChiWatRet(
+    amplitude=datHpAw.TChiWatRetHp_nominal - datHpAw.TChiWatSupHp_nominal,
+    freqHz=3 / 3000,
+    y(final unit="K",
+      displayUnit="degC"),
+    offset=datHpAw.TChiWatRetHp_nominal,
+    startTime=0)
+    "CHW return temperature value"
+    annotation (Placement(transformation(extent={{-290,-110},{-270,-90}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pHeaWatInl1(
+    k=sup.p + hpAw.dpHeaWatHp_nominal)
+    "HW inlet pressure"
+    annotation (Placement(transformation(extent={{-290,10},{-270,30}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant pChiWatInl(
+    k=sup.p + hpAw.dpChiWatHp_nominal)
+    "CHW inlet pressure"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-280,-20})));
+  Buildings.Controls.OBC.CDL.Reals.Switch TRetAct
+    "Active return temperature"
+    annotation (Placement(transformation(extent={{-240,-90},{-220,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Switch pInl_rel
+    "Active inlet gaupe pressure"
+    annotation (Placement(transformation(extent={{-240,-10},{-220,10}})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus busPla
+    "Plant controller"
+    annotation (Placement(iconVisible=false,transformation(extent={{-20,-20},{20,20}}),
+      iconTransformation(extent={{-548,-190},{-508,-150}})));
+  Buildings.Templates.Components.Interfaces.Bus busHp[hpAw.nHp]
+    "HP control bus"
+    annotation (Placement(iconVisible=false,transformation(extent={{-120,-20},{-80,20}}),
+      iconTransformation(extent={{-536,100},{-496,140}})));
+equation
+  connect(ctlPlaAwNrv.bus, hpAwNrv.bus)
+    annotation (Line(points={{10,180},{40,180},{40,120}},
+                                                        color={255,204,51},thickness=0.5));
+  connect(inlHp1.ports, TRet1.port_a)
+    annotation (Line(points={{-100,160},{-80,160}},color={0,127,255}));
+  connect(TRet1.port_b, hpAwNrv.ports_aChiHeaWat)
+    annotation (Line(points={{-60,160},{-10,160},{-10,120}},color={0,127,255}));
+  connect(hpAwNrv.ports_bChiHeaWat, TSup1.port_a)
+    annotation (Line(points={{90,120},{90,140},{60,140}},color={0,127,255}));
+  connect(TSup1.port_b, sup.ports)
+    annotation (Line(points={{80,140},{100,140}},color={0,127,255}));
+  connect(weaDat.weaBus, hpAwNrv.busWea)
+    annotation (Line(points={{170,160},{60,160},{60,120}},color={255,204,51},thickness=0.5));
+  connect(THeaWatRet.y, inlHp1.T_in)
+    annotation (Line(points={{-268,140},{-140,140},{-140,164},{-122,164}},color={0,0,127}));
+  connect(pHeaWatInl.y, inlHp1.p_in)
+    annotation (Line(points={{-268,180},{-140,180},{-140,168},{-122,168}},color={0,0,127}));
+  connect(weaDat.weaBus, hpAw.busWea)
+    annotation (Line(points={{170,160},{160,160},{160,0},{60,0},{60,-120}},
+                                                                          color={255,204,51},thickness=0.5));
+  connect(ctlPlaAw.bus, hpAw.bus)
+    annotation (Line(points={{-20,-20},{40,-20},{40,-120}},
+                                                        color={255,204,51},thickness=0.5));
+  connect(inlHp.ports, TRet.port_a)
+    annotation (Line(points={{-100,-40},{-80,-40}},color={0,127,255}));
+  connect(TRet.port_b, hpAw.ports_aChiHeaWat)
+    annotation (Line(points={{-60,-40},{-10,-40},{-10,-120}},
+                                                            color={0,127,255}));
+  connect(TSup.port_b, sup1.ports)
+    annotation (Line(points={{80,-40},{100,-40}},color={0,127,255}));
+  connect(hpAw.ports_bChiHeaWat, TSup.port_a)
+    annotation (Line(points={{90,-120},{90,-40},{60,-40}},
+                                                         color={0,127,255}));
+  connect(THeaWatRet1.y, TRetAct.u1)
+    annotation (Line(points={{-268,-60},{-260,-60},{-260,-72},{-242,-72}},color={0,0,127}));
+  connect(TChiWatRet.y, TRetAct.u3)
+    annotation (Line(points={{-268,-100},{-250,-100},{-250,-88},{-242,-88}},
+      color={0,0,127}));
+  connect(pHeaWatInl1.y, pInl_rel.u1)
+    annotation (Line(points={{-268,20},{-260,20},{-260,8},{-242,8}},color={0,0,127}));
+  connect(pChiWatInl.y, pInl_rel.u3)
+    annotation (Line(points={{-268,-20},{-260,-20},{-260,-8},{-242,-8}},color={0,0,127}));
+  connect(pInl_rel.y, inlHp.p_in)
+    annotation (Line(points={{-218,0},{-132,0},{-132,-32},{-122,-32}},color={0,0,127}));
+  connect(TRetAct.y, inlHp.T_in)
+    annotation (Line(points={{-218,-80},{-132,-80},{-132,-36},{-122,-36}},color={0,0,127}));
+  connect(busPla, ctlPlaAw.bus)
+    annotation (Line(points={{0,0},{0,-20},{-20,-20}},color={255,204,51},thickness=0.5));
+  connect(busPla.hp, busHp)
+    annotation (Line(points={{0,0},{-100,0}},color={255,204,51},thickness=0.5));
+  connect(busHp[1].y1Hea, pInl_rel.u2)
+    annotation (Line(points={{-100,0},{-100,20},{-250,20},{-250,0},{-242,0}},
+      color={255,204,51},thickness=0.5));
+  connect(pInl_rel.u2, TRetAct.u2)
+    annotation (Line(points={{-242,0},{-250,0},{-250,-80},{-242,-80}},color={255,0,255}));
+  annotation (
+    Diagram(
+      coordinateSystem(
+        extent={{-300,-220},{300,220}})),
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/HeatPumpGroupAirToWater.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StartTime=10497600.0,
+      StopTime=10505600.0),
+    Documentation(
+      info="<html>
+<p>
+This model validates the model
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups.AirToWater\">
+Buildings.Templates.Plants.HeatPumps.Components.HeatPumpGroups.AirToWater</a>
+in a configuration in which the heat pump components are exposed
+to a constant differential pressure and a varying
+return temperature.
+</p>
+<p>
+The model is configured to represent either a non-reversible heat pump
+(component <code>hpAwNrv</code>) or a reversible heat pump
+(component <code>hpAw</code>) that switches between cooling and heating
+mode.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end HeatPumpGroupAirToWater;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo
new file mode 100644
index 00000000000..f75e6661008
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mo
@@ -0,0 +1,694 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Validation;
+model PumpsPrimaryDedicated
+  "Validation model for dedicated primary pump component"
+  extends Modelica.Icons.Example;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW/HW medium";
+  parameter Boolean use_spePumIni = false
+    "Set to true to compute pump speed at initialization, false to use default value"
+    annotation(Evaluate=true);
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  // Calculation of pump speed to meet design flow.
+  parameter Real r_N[pumPriHea.nPum](
+    each final fixed=false,
+    each start=1,
+    each final unit="1")
+    "Relative revolution, r_N=N/N_nominal";
+  parameter Real r_NDef[pumPriHea.nPum](
+    each start=1,
+    each final unit="1")=fill(0.85, pumPriHea.nPum)
+    "Default value for relative revolution, r_N=N/N_nominal";
+  parameter Data.Controller datCtl(
+    cfg(
+      have_pumHeaWatPriVar=false,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=false,
+      have_valHpInlIso=true,
+      have_chiWat=true,
+      have_pumChiWatPriDed=false,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=true,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=2,
+      nPumHeaWatPri=2,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=0,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtl.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtl.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtl.cfg.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-160,290},{-140,310}})));
+  parameter Data.Controller datCtlNoDed(
+    cfg(
+      have_pumHeaWatPriVar=false,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=false,
+      have_valHpInlIso=true,
+      have_chiWat=true,
+      have_pumChiWatPriDed=false,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=true,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Headered,
+      nHp=2,
+      nPumHeaWatPri=2,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=0,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlNoDed.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlNoDed.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtlNoDed.cfg.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-160,110},{-140,130}})));
+  parameter Data.Controller datCtlSep(
+    cfg(
+      have_pumHeaWatPriVar=false,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=false,
+      have_valHpInlIso=true,
+      have_chiWat=true,
+      have_pumChiWatPriDed=true,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=true,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=2,
+      nPumHeaWatPri=2,
+      nPumChiWatPri=2,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlSep.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlSep.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtlSep.cfg.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-160,-130},{-140,-110}})));
+  parameter Data.Controller datCtlHea(
+    cfg(
+      have_pumHeaWatPriVar=true,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=false,
+      have_valHpInlIso=false,
+      have_chiWat=false,
+      have_pumChiWatPriDed=false,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=false,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=2,
+      nPumHeaWatPri=2,
+      nPumChiWatPri=0,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlHea.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlHea.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtlHea.cfg.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-160,-370},{-140,-350}})));
+  parameter Data.HeatPumpGroup datHp(
+    final nHp=2,
+    final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+    final is_rev=true,
+    final typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+    mHeaWatHp_flow_nominal=datHp.capHeaHp_nominal / abs(datHp.THeaWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.THeaWatRetMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWatHp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHeaHp_nominal=500E3,
+    THeaWatSupHp_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TSouHeaHp_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    mChiWatHp_flow_nominal=datHp.capCooHp_nominal / abs(datHp.TChiWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.TChiWatRet) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    capCooHp_nominal=500E3,
+    TChiWatSupHp_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TSouCooHp_nominal=Buildings.Templates.Data.Defaults.TOutHpCoo,
+    perFitHp(
+      hea(
+        P=datHp.capHeaHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwHea,
+        coeQ={- 4.2670305442, - 0.7381077035, 6.0049480456, 0, 0},
+        coeP={- 4.9107455513, 5.3665308366, 0.5447612754, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpHeaLow),
+      coo(
+        P=datHp.capCooHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwCoo,
+        coeQ={- 2.2545246871, 6.9089257665, - 3.6548225094, 0, 0},
+        coeP={- 5.8086010402, 1.6894933858, 5.1167787436, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpCoo)))
+    "HP parameters"
+    annotation (Placement(transformation(extent={{-160,220},{-140,240}})));
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPumPriCom(
+    typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    nPum=datHp.nHp,
+    m_flow_nominal=fill(max(datHp.mHeaWatHp_flow_nominal, datHp.mChiWatHp_flow_nominal),
+        datHp.nHp),
+    dp_nominal=fill(max(datHp.dpHeaWatHp_nominal, datHp.dpChiWatHp_nominal) +
+        Buildings.Templates.Data.Defaults.dpValChe + max(max(valChiWatIsoCom.dpValve_nominal),
+        max(valHeaWatIsoCom.dpValve_nominal)), datHp.nHp))
+    "Primary pump parameters"
+    annotation (Placement(transformation(extent={{-120,220},{-100,240}})));
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPumHeaWat(
+    typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    nPum=datHp.nHp,
+    m_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, datHp.nHp),
+    dp_nominal=fill(datHp.dpHeaWatHp_nominal + Buildings.Templates.Data.Defaults.dpValChe
+         + max(valHeaWatIsoCom.dpValve_nominal), datHp.nHp))
+    "Dedicated primary HW pump parameters"
+    annotation (Placement(transformation(extent={{-160,-200},{-140,-180}})));
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPumChiWat(
+    typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    nPum=datHp.nHp,
+    m_flow_nominal=fill(datHp.mChiWatHp_flow_nominal, datHp.nHp),
+    dp_nominal=fill(datHp.dpChiWatHp_nominal + Buildings.Templates.Data.Defaults.dpValChe
+         + max(valHeaWatIsoCom.dpValve_nominal), datHp.nHp))
+    "Dedicated primary CHW pump parameters"
+    annotation (Placement(transformation(extent={{-120,-200},{-100,-180}})));
+  parameter Buildings.Templates.Components.Data.PumpMultiple datPumHeaWatHea(
+    typ=Buildings.Templates.Components.Types.Pump.Multiple,
+    nPum=datHp.nHp,
+    m_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, datHp.nHp),
+    dp_nominal=1.5 * fill(datHp.dpHeaWatHp_nominal + Buildings.Templates.Data.Defaults.dpValChe
+         + max(valHeaWatIsoCom.dpValve_nominal), datHp.nHp))
+    "Dedicated primary HW pump parameters – Heating-only system"
+    annotation (Placement(transformation(extent={{-160,-200},{-140,-180}})));
+  final parameter Buildings.Templates.Components.Data.PumpSingle datPumSin[
+    pumPriCom.nHp](
+    each typ=datPumPriCom.typ,
+    m_flow_nominal=datPumPriCom.m_flow_nominal,
+    dp_nominal=datPumPriCom.dp_nominal,
+    per=datPumPriCom.per,
+    each rho_default=datPumPriCom.rho_default)
+    "Cast multiple pump record into single pump record array";
+  final parameter Buildings.Templates.Components.Data.PumpSingle datPumHeaWatHeaSin[pumPriHea.nHp](
+    each typ=datPumHeaWatHea.typ,
+    m_flow_nominal=datPumHeaWatHea.m_flow_nominal,
+    dp_nominal=datPumHeaWatHea.dp_nominal,
+    per=datPumHeaWatHea.per,
+    each rho_default=datPumHeaWatHea.rho_default)
+    "Cast multiple pump record into single pump record array";
+  Buildings.Templates.Plants.HeatPumps.Components.PumpsPrimaryDedicated
+    pumPriCom(
+    redeclare final package Medium = Medium,
+    nHp=2,
+    typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+    have_pumChiWatPriDed=false,
+    have_pumHeaWatPriVar=false,
+    have_pumChiWatPriVar=false,
+    datPumHeaWat=datPumPriCom,
+    final energyDynamics=energyDynamics)
+    "Primary pumps - Heating and cooling system with common constant speed dedicated primary pumps"
+    annotation (Placement(transformation(extent={{-240,160},{240,240}})));
+  Fluid.FixedResistances.PressureDrop hpCom[pumPriCom.nHp](
+    redeclare each final package Medium = Medium,
+    each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+    each dp_nominal=datHp.dpHeaWatHp_nominal) "Heat pump HX"
+    annotation (Placement(transformation(extent={{10,150},{-10,170}})));
+  Fluid.Sources.Boundary_pT ret(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=datHp.nHp)
+    "Boundary condition at return"
+    annotation (Placement(transformation(extent={{80,270},{60,290}})));
+  Controls.OpenLoop ctl(
+    final cfg=datCtl.cfg,
+    final dat=datCtl)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-100,290},{-120,310}})));
+  Buildings.Templates.Plants.HeatPumps.Components.PumpsPrimaryDedicated
+    pumPriNoDed(
+    redeclare final package Medium = Medium,
+    nHp=2,
+    typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Headered,
+    have_pumChiWatPriDed=false,
+    have_pumHeaWatPriVar=false,
+    have_pumChiWatPriVar=false,
+    datPumHeaWat=datPumPriCom,
+    final energyDynamics=energyDynamics)
+    "No dedicated primary pumps (headered pumps)"
+    annotation (Placement(transformation(extent={{-240,-60},{240,20}})));
+  Fluid.FixedResistances.PressureDrop hpHdr[pumPriCom.nHp](
+    redeclare each final package Medium = Medium,
+    each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+    each dp_nominal=datHp.dpHeaWatHp_nominal)
+    "Heat pump HX"
+    annotation (Placement(transformation(extent={{10,-70},{-10,-50}})));
+  Fluid.Sources.Boundary_pT ret1(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=datHp.nHp)
+    "Boundary condition at return"
+    annotation (Placement(transformation(extent={{70,70},{50,90}})));
+  Controls.OpenLoop ctlNoDed(
+    final cfg=datCtlNoDed.cfg,
+    final dat=datCtlNoDed)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-100,110},{-120,130}})));
+  Buildings.Templates.Components.Pumps.Multiple pumPriHdr(
+    have_var=false,
+    final energyDynamics=energyDynamics,
+    nPum=2,
+    dat=datPumPriCom) "Headered primary pumps"
+    annotation (Placement(transformation(extent={{-70,50},{-50,70}})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus busPla
+    "Plant control bus"
+    annotation (Placement(iconVisible=false,transformation(extent={{-100,100},{-60,
+            140}}),
+      iconTransformation(extent={{-332,42},{-292,82}})));
+  Buildings.Templates.Plants.HeatPumps.Components.PumpsPrimaryDedicated pumPriSep(
+    redeclare final package Medium=Medium,
+    nHp=2,
+    typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+    have_pumChiWatPriDed=true,
+    have_pumHeaWatPriVar=false,
+    have_pumChiWatPriVar=false,
+    datPumHeaWat=datPumHeaWat,
+    final datPumChiWat=datPumChiWat,
+    final energyDynamics=energyDynamics)
+    "Primary pumps - Heating and cooling system with separate constant speed dedicated CHW pumps"
+    annotation (Placement(transformation(extent={{-240,-260},{240,-180}})));
+  Fluid.Sources.Boundary_pT ret2(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=datHp.nHp)
+    "Boundary condition at return"
+    annotation (Placement(transformation(extent={{90,-150},{70,-130}})));
+  Controls.OpenLoop ctlSep(
+    final cfg=datCtlSep.cfg,
+    final dat=datCtlSep)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-100,-130},{-120,-110}})));
+  Fluid.FixedResistances.PressureDrop hpSep[pumPriCom.nHp](
+    redeclare each final package Medium = Medium,
+    each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+    each dp_nominal=datHp.dpHeaWatHp_nominal) "Heat pump HX"
+    annotation (Placement(transformation(extent={{10,-270},{-10,-250}})));
+  Buildings.Templates.Components.Actuators.Valve valHeaWatIsoCom[datHp.nHp](
+    redeclare each final package Medium = Medium,
+    each typ=Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition,
+    dat(
+      each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+      each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValIso,
+      dpFixed_nominal=
+          Buildings.Templates.Utilities.computeBalancingPressureDrop(
+          m_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, datHp.nHp),
+          dp_nominal=pumPriCom.dpValCheHeaWat_nominal*(datHp.mHeaWatHp_flow_nominal
+            /max(datHp.mHeaWatHp_flow_nominal, datHp.mChiWatHp_flow_nominal))^2 .+
+            fill(datHp.dpHeaWatHp_nominal, datHp.nHp) .+ valHeaWatIsoCom.dpValve_nominal,
+          datPum=datPumSin)),
+    each from_dp=true) "Primary HW loop isolation valve"
+    annotation (Placement(transformation(extent={{-30,270},{-10,290}})));
+  Buildings.Templates.Components.Actuators.Valve valChiWatIsoCom[datHp.nHp](
+    redeclare each final package Medium = Medium,
+    each typ=Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition,
+    dat(
+      each m_flow_nominal=datHp.mChiWatHp_flow_nominal,
+      each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValIso,
+      dpFixed_nominal=
+          Buildings.Templates.Utilities.computeBalancingPressureDrop(
+          m_flow_nominal=fill(datHp.mChiWatHp_flow_nominal, datHp.nHp),
+          dp_nominal=pumPriCom.dpValCheHeaWat_nominal*(datHp.mChiWatHp_flow_nominal
+            /max(datHp.mHeaWatHp_flow_nominal, datHp.mChiWatHp_flow_nominal))^2 .+
+            fill(datHp.dpChiWatHp_nominal, datHp.nHp) .+ valChiWatIsoCom.dpValve_nominal,
+          datPum=datPumSin)),
+    each from_dp=true) "Primary CHW loop isolation valve"
+    annotation (Placement(transformation(extent={{10,250},{30,270}})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus busPla1
+    "Plant control bus"
+    annotation (Placement(iconVisible=false,transformation(extent={{-90,280},{-50,320}}),
+      iconTransformation(extent={{-332,42},{-292,82}})));
+  Buildings.Templates.Components.Actuators.Valve valChiWatIsoHdr[datHp.nHp](
+    redeclare each final package Medium = Medium,
+    each typ=Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition,
+    dat(
+      each m_flow_nominal=datHp.mChiWatHp_flow_nominal,
+      each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValIso,
+      dpFixed_nominal=
+          Buildings.Templates.Utilities.computeBalancingPressureDrop(
+          m_flow_nominal=fill(datHp.mChiWatHp_flow_nominal, datHp.nHp),
+          dp_nominal=pumPriHdr.dpValChe_nominal*(datHp.mChiWatHp_flow_nominal/
+            max(datHp.mHeaWatHp_flow_nominal, datHp.mChiWatHp_flow_nominal))^2 .+
+            fill(datHp.dpChiWatHp_nominal, datHp.nHp) .+ valChiWatIsoCom.dpValve_nominal,
+          datPum=datPumSin)),
+    each from_dp=true) "Primary CHW loop isolation valve"
+    annotation (Placement(transformation(extent={{10,50},{30,70}})));
+  Buildings.Templates.Components.Actuators.Valve valHeaWatIsoHdr[datHp.nHp](
+    redeclare each final package Medium = Medium,
+    each typ=Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition,
+    dat(
+      each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+      each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValIso,
+      dpFixed_nominal=
+          Buildings.Templates.Utilities.computeBalancingPressureDrop(
+          m_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, datHp.nHp),
+          dp_nominal=pumPriHdr.dpValChe_nominal*(datHp.mHeaWatHp_flow_nominal/
+            max(datHp.mHeaWatHp_flow_nominal, datHp.mChiWatHp_flow_nominal))^2 .+
+            fill(datHp.dpHeaWatHp_nominal, datHp.nHp) .+ valHeaWatIsoCom.dpValve_nominal,
+          datPum=datPumSin)),
+    each from_dp=true) "Primary HW loop isolation valve"
+    annotation (Placement(transformation(extent={{-30,70},{-10,90}})));
+  Buildings.Templates.Components.Actuators.Valve valHeaWatIsoSep[datHp.nHp](
+    redeclare each final package Medium=Medium,
+    each typ=Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition,
+    dat(
+      each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+      each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValIso),
+    each from_dp=true,
+    each linearized=true)
+    "Primary HW loop isolation valve"
+    annotation (Placement(transformation(extent={{-30,-150},{-10,-130}})));
+  Buildings.Templates.Components.Actuators.Valve valChiWatIsoSep[datHp.nHp](
+    redeclare each final package Medium=Medium,
+    each typ=Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition,
+    dat(
+      each m_flow_nominal=datHp.mChiWatHp_flow_nominal,
+      each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValIso),
+    each from_dp=true,
+    each linearized=true)
+    "Primary CHW loop isolation valve"
+    annotation (Placement(transformation(extent={{10,-170},{30,-150}})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus busPla2
+    "Plant control bus"
+    annotation (Placement(iconVisible=false,transformation(extent={{-100,-140},{-60,-100}}),
+      iconTransformation(extent={{-332,42},{-292,82}})));
+  Buildings.Templates.Plants.HeatPumps.Components.PumpsPrimaryDedicated pumPriHea(
+    redeclare final package Medium=Medium,
+    nHp=2,
+    typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+    have_pumChiWatPriDed=false,
+    have_pumHeaWatPriVar=true,
+    have_pumChiWatPriVar=false,
+    datPumHeaWat=datPumHeaWatHea,
+    final energyDynamics=energyDynamics)
+    "Primary pumps - Heating-only system with variable speed dedicated primary pumps"
+    annotation (Placement(transformation(extent={{-240,-460},{240,-380}})));
+  Fluid.Sources.Boundary_pT ret3(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=1)
+    "Boundary condition at return"
+    annotation (Placement(transformation(extent={{90,-350},{70,-330}})));
+  Controls.OpenLoop ctlHea(
+    final cfg=datCtlHea.cfg,
+    final dat=datCtlHea,
+    yPumHeaWatPriDed(k=r_N))
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-100,-370},{-120,-350}})));
+  Fluid.FixedResistances.PressureDrop hpHea[pumPriCom.nHp](
+    redeclare each final package Medium = Medium,
+    each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+    each dp_nominal=datHp.dpHeaWatHp_nominal) "Heat pump HX"
+    annotation (Placement(transformation(extent={{10,-470},{-10,-450}})));
+  Fluid.FixedResistances.PressureDrop priHeaWat(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=sum(datPumHeaWat.m_flow_nominal),
+    final dp_nominal=0)
+    "Primary HW loop"
+    annotation (Placement(transformation(extent={{-10,-350},{10,-330}})));
+initial equation
+  // Calculation of pump speed to provide design flow.
+  if use_spePumIni then
+    fill(0, pumPriHea.nHp)=Buildings.Templates.Utilities.computeBalancingPressureDrop(
+      m_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, pumPriHea.nHp),
+      dp_nominal=pumPriHea.dpValCheHeaWat_nominal .+ fill(datHp.dpHeaWatHp_nominal, pumPriHea.nHp) .+
+        fill(Buildings.Templates.Data.Defaults.dpValIso, pumPriHea.nHp),
+      datPum=datPumHeaWatHeaSin,
+      r_N=r_N);
+  else
+    r_N=r_NDef;
+  end if;
+equation
+  for i in 1:(pumPriHea.nHp) loop
+    connect(pumPriHea.ports_bChiHeaWat[i], priHeaWat.port_a)
+      annotation (Line(points={{-50,-380},{-50,-340},{-10,-340}},
+        color={0,127,255}));
+    connect(priHeaWat.port_b, pumPriHea.ports_aChiHeaWat[i])
+      annotation (Line(points={{10,-340},{50,-340},{50,-380}},color={0,127,255}));
+  end for;
+  connect(pumPriCom.ports_bChiHeaWatHp, hpCom.port_a)
+    annotation (Line(points={{50,160},{10,160}}, color={0,127,255}));
+  connect(hpCom.port_b, pumPriCom.ports_aChiHeaWatHp)
+    annotation (Line(points={{-10,160},{-50,160}}, color={0,127,255}));
+  connect(pumPriNoDed.ports_bChiHeaWatHp, hpHdr.port_a)
+    annotation (Line(points={{50,-60},{10,-60}}, color={0,127,255}));
+  connect(hpHdr.port_b, pumPriNoDed.ports_aChiHeaWatHp)
+    annotation (Line(points={{-10,-60},{-50,-60}}, color={0,127,255}));
+  connect(pumPriNoDed.ports_bChiHeaWat, pumPriHdr.ports_a)
+    annotation (Line(points={{-50,20},{-80,20},{-80,60},{-70,60}}, color={0,127,255}));
+  connect(ctlNoDed.bus, busPla)
+    annotation (Line(points={{-100,120},{-80,120}},color={255,204,51},thickness=0.5));
+  connect(busPla.pumHeaWatPri, pumPriHdr.bus)
+    annotation (Line(points={{-80,120},{-60,120},{-60,70}},color={255,204,51},thickness=0.5));
+  connect(pumPriSep.ports_bChiHeaWatHp, hpSep.port_a)
+    annotation (Line(points={{50,-260},{10,-260}},           color={0,127,255}));
+  connect(hpSep.port_b, pumPriSep.ports_aChiHeaWatHp)
+    annotation (Line(points={{-10,-260},{-50,-260}},           color={0,127,255}));
+  connect(pumPriCom.ports_bChiHeaWat, valHeaWatIsoCom.port_a) annotation (Line(
+        points={{-50,240},{-50,280},{-30,280}}, color={0,127,255}));
+  connect(valHeaWatIsoCom.port_b, pumPriCom.ports_aChiHeaWat)
+    annotation (Line(points={{-10,280},{50,280},{50,240}}, color={0,127,255}));
+  connect(pumPriCom.ports_bChiHeaWat, valChiWatIsoCom.port_a) annotation (Line(
+        points={{-50,240},{-50,260},{10,260}}, color={0,127,255}));
+  connect(valChiWatIsoCom.port_b, pumPriCom.ports_aChiHeaWat)
+    annotation (Line(points={{30,260},{50,260},{50,240}}, color={0,127,255}));
+  connect(ctl.bus, busPla1)
+    annotation (Line(points={{-100,300},{-70,300}},color={255,204,51},thickness=0.5));
+  connect(busPla1.valHeaWatHpInlIso, valHeaWatIsoCom.bus) annotation (Line(
+      points={{-70,300},{-20,300},{-20,290}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busPla1.valChiWatHpInlIso, valChiWatIsoCom.bus) annotation (Line(
+      points={{-70,300},{20,300},{20,270}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(ret.ports, valHeaWatIsoCom.port_b)
+    annotation (Line(points={{60,280},{-10,280}}, color={0,127,255}));
+  connect(pumPriHdr.ports_b, valChiWatIsoHdr.port_a)
+    annotation (Line(points={{-50,60},{10,60}}, color={0,127,255}));
+  connect(pumPriHdr.ports_b, valHeaWatIsoHdr.port_a) annotation (Line(points={{-50,
+          60},{-40,60},{-40,80},{-30,80}}, color={0,127,255}));
+  connect(valHeaWatIsoHdr.port_b, pumPriNoDed.ports_aChiHeaWat)
+    annotation (Line(points={{-10,80},{50,80},{50,20}}, color={0,127,255}));
+  connect(valChiWatIsoHdr.port_b, pumPriNoDed.ports_aChiHeaWat)
+    annotation (Line(points={{30,60},{50,60},{50,20}}, color={0,127,255}));
+  connect(ret1.ports, valHeaWatIsoHdr.port_b)
+    annotation (Line(points={{50,80},{-10,80}}, color={0,127,255}));
+  connect(busPla.valHeaWatHpInlIso, valHeaWatIsoHdr.bus) annotation (Line(
+      points={{-80,120},{-20,120},{-20,90}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busPla.valChiWatHpInlIso, valChiWatIsoHdr.bus) annotation (Line(
+      points={{-80,120},{20,120},{20,70}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busPla1, pumPriCom.bus) annotation (Line(
+      points={{-70,300},{0,300},{0,240}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busPla2.valHeaWatHpInlIso, valHeaWatIsoSep.bus)
+    annotation (Line(points={{-80,-120},{-20,-120},{-20,-130}},color={255,204,51},thickness=0.5));
+  connect(busPla2.valChiWatHpInlIso, valChiWatIsoSep.bus)
+    annotation (Line(points={{-80,-120},{20,-120},{20,-150}},  color={255,204,51},thickness=0.5));
+  connect(ctlSep.bus, busPla2)
+    annotation (Line(points={{-100,-120},{-80,-120}},color={255,204,51},thickness=0.5));
+  connect(pumPriSep.ports_bHeaWat, valHeaWatIsoSep.port_a)
+    annotation (Line(points={{-66,-180},{-66,-140},{-30,-140}},color={0,127,255}));
+  connect(pumPriSep.ports_bChiWat, valChiWatIsoSep.port_a)
+    annotation (Line(points={{-34,-180},{-34,-160},{10,-160}}, color={0,127,255}));
+  connect(valHeaWatIsoSep.port_b, pumPriSep.ports_aChiHeaWat)
+    annotation (Line(points={{-10,-140},{50,-140},{50,-180}},
+                                                           color={0,127,255}));
+  connect(valChiWatIsoSep.port_b, pumPriSep.ports_aChiHeaWat)
+    annotation (Line(points={{30,-160},{50,-160},{50,-180}}, color={0,127,255}));
+  connect(busPla2, pumPriSep.bus)
+    annotation (Line(points={{-80,-120},{0,-120},{0,-180}},    color={255,204,51},thickness=0.5));
+  connect(pumPriHea.ports_bChiHeaWatHp, hpHea.port_a)
+    annotation (Line(points={{50,-460},{10,-460}},           color={0,127,255}));
+  connect(hpHea.port_b, pumPriHea.ports_aChiHeaWatHp)
+    annotation (Line(points={{-10,-460},{-50,-460}},           color={0,127,255}));
+  connect(ctlHea.bus, pumPriHea.bus)
+    annotation (Line(points={{-100,-360},{0,-360},{0,-380}},    color={255,204,51},thickness=0.5));
+  connect(ret2.ports, valHeaWatIsoSep.port_b)
+    annotation (Line(points={{70,-140},{-10,-140}}, color={0,127,255}));
+  connect(ret3.ports[1], priHeaWat.port_b)
+    annotation (Line(points={{70,-340},{10,-340}}, color={0,127,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/PumpsPrimaryDedicated.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=5000.0),
+    Diagram(
+      coordinateSystem(
+        extent={{-300,-520},{300,360}})),
+    Documentation(info="<html>
+<p>
+This model validates the model
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.PumpsPrimaryDedicated\">
+Buildings.Templates.Plants.HeatPumps.Components.PumpsPrimaryDedicated</a>
+for the following configurations.
+</p>
+<ul>
+<li>
+Heating and cooling system with common constant speed dedicated primary pumps: 
+component <code>pumPriCom</code>.
+</li>
+<li>
+Heating and cooling system with headered constant speed primary pumps: 
+component <code>pumPriHdr</code>.
+</li>
+<li>
+Heating and cooling system with separate constant speed dedicated HW and CHW pumps:
+component <code>pumPriSep</code>.
+</li>
+<li>
+Heating-only system with variable speed dedicated primary pumps:
+component <code>pumPriHea</code>.
+</li>
+</ul>
+<p>
+In each configuration, two identical heat pumps are represented by fixed flow resistances
+(components <code>hp*</code>). 
+</p>
+<p>
+The model uses open loop controls and the simulation allows verifying that design flow 
+is obtained in each loop and each heat pump when the pumps are enabled.
+</p>
+<p>
+In the configurations with common constant speed dedicated primary pumps or
+headered constant speed primary pumps, this requires adjusting the 
+design pressure drop of the balancing valves which are modeled by fixed flow 
+resistances in the isolation valve components 
+<code>valHeaWatIso*</code> and <code>valChiWatIso*</code>.
+This adjustment is done programmatically using the function
+<a href=\"modelica://Buildings.Templates.Utilities.computeBalancingPressureDrop\">
+Buildings.Templates.Utilities.computeBalancingPressureDrop</a>.
+</p>
+<p>
+Similarly, in the configuration with variable speed pumps <code>pumPriHea</code>, 
+the design head of the pumps is voluntarily chosen higher than necessary
+and the required pump speed needed to provide the design HP flow is computed 
+at initialization by solving for a balancing valve pressure drop of zero.
+Note that this requires solving a numerical Jacobian at initialization.
+Although this is handled well by various Modelica tools, the parameter
+<code>use_spePumIni</code> allows switching to a default value in 
+this validation model for better integration into the continuous integration 
+test workflow.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PumpsPrimaryDedicated;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo
new file mode 100644
index 00000000000..aa872c51043
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mo
@@ -0,0 +1,482 @@
+within Buildings.Templates.Plants.HeatPumps.Components.Validation;
+model ValvesIsolation
+  "Validation model for isolation valve component"
+  extends Modelica.Icons.Example;
+  parameter Buildings.Templates.Plants.HeatPumps.Types.Controller typCtl=
+    Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW/HW medium";
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  parameter Data.Controller datCtl(
+    cfg(
+      have_pumHeaWatPriVar=true,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=valIsoCom.have_valHpOutIso,
+      have_valHpInlIso=valIsoCom.have_valHpInlIso,
+      have_chiWat=valIsoCom.have_chiWat,
+      have_pumChiWatPriDed=valIsoCom.have_pumChiWatPriDed,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=true,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=2,
+      nPumHeaWatPri=2,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=0,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max,
+        datCtl.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max,
+        datCtl.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtl.cfg.nHp)}) "Controller parameters"
+    annotation (Placement(transformation(extent={{-80,370},{-60,390}})));
+  parameter Data.Controller datCtlHeaInl(
+    cfg(
+      have_pumHeaWatPriVar=true,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=valIsoHeaInl.have_valHpOutIso,
+      have_valHpInlIso=valIsoHeaInl.have_valHpInlIso,
+      have_chiWat=valIsoHeaInl.have_chiWat,
+      have_pumChiWatPriDed=valIsoHeaInl.have_pumChiWatPriDed,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None,
+      is_rev=false,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=2,
+      nPumHeaWatPri=2,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=0,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+        dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlHeaInl.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlHeaInl.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtlHeaInl.cfg.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-80,110},{-60,130}})));
+  parameter Data.Controller datCtlSep(
+    cfg(
+      have_pumHeaWatPriVar=true,
+      have_pumChiWatPriVar=false,
+      have_inpSch=false,
+      have_hrc=false,
+      have_valHpOutIso=valIsoSep.have_valHpOutIso,
+      have_valHpInlIso=valIsoSep.have_valHpInlIso,
+      have_chiWat=valIsoSep.have_chiWat,
+      have_pumChiWatPriDed=valIsoSep.have_pumChiWatPriDed,
+      typPumHeaWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumChiWatPri=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+      typPumHeaWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      typDis=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only,
+      nPumChiWatSec=0,
+      rhoHeaWat_default=Buildings.Media.Water.d_const,
+      typCtl=Buildings.Templates.Plants.HeatPumps.Types.Controller.OpenLoop,
+      is_rev=true,
+      typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+      rhoChiWat_default=Buildings.Media.Water.d_const,
+      cpChiWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_hotWat=false,
+      have_valChiWatMinByp=false,
+      have_valHeaWatMinByp=false,
+      typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+      cpHeaWat_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      cpSou_default=Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      have_senDpChiWatRemWir=true,
+      typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+      nHp=2,
+      nPumHeaWatPri=2,
+      have_heaWat=true,
+      nPumHeaWatSec=0,
+      rhoSou_default=Buildings.Media.Air.dStp,
+      have_senDpHeaWatRemWir=true,
+      typPumChiWatSec=Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None,
+      nPumChiWatPri=2,
+      nSenDpHeaWatRem=0,
+      nSenDpChiWatRem=0,
+      nAirHan=0,
+      nEquZon=0),
+    THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    dpChiWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpChiWatRemSet_max, datCtlSep.cfg.nSenDpChiWatRem),
+    dpHeaWatRemSet_max=fill(Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max, datCtlSep.cfg.nSenDpHeaWatRem),
+    staEqu={fill(1, datCtlSep.cfg.nHp)})
+    "Controller parameters"
+    annotation (Placement(transformation(extent={{-80,-130},{-60,-110}})));
+  parameter Data.HeatPumpGroup datHp(
+    final nHp=2,
+    final typ=Buildings.Templates.Components.Types.HeatPump.AirToWater,
+    final is_rev=true,
+    final typMod=Buildings.Templates.Components.Types.HeatPumpModel.EquationFit,
+    mHeaWatHp_flow_nominal=datHp.capHeaHp_nominal / abs(datHp.THeaWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.THeaWatRetMed) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    dpHeaWatHp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+    capHeaHp_nominal=500E3,
+    THeaWatSupHp_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+    TSouHeaHp_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+    mChiWatHp_flow_nominal=datHp.capCooHp_nominal / abs(datHp.TChiWatSupHp_nominal -
+      Buildings.Templates.Data.Defaults.TChiWatRet) / Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+    capCooHp_nominal=500E3,
+    TChiWatSupHp_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+    TSouCooHp_nominal=Buildings.Templates.Data.Defaults.TOutHpCoo,
+    perFitHp(
+      hea(
+        P=datHp.capHeaHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwHea,
+        coeQ={- 4.2670305442, - 0.7381077035, 6.0049480456, 0, 0},
+        coeP={- 4.9107455513, 5.3665308366, 0.5447612754, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpHeaLow),
+      coo(
+        P=datHp.capCooHp_nominal / Buildings.Templates.Data.Defaults.COPHpAwCoo,
+        coeQ={- 2.2545246871, 6.9089257665, - 3.6548225094, 0, 0},
+        coeP={- 5.8086010402, 1.6894933858, 5.1167787436, 0, 0},
+        TRefLoa=Buildings.Templates.Data.Defaults.TChiWatRet,
+        TRefSou=Buildings.Templates.Data.Defaults.TOutHpCoo)))
+    "HP parameters"
+    annotation (Placement(transformation(extent={{-40,190},{-20,210}})));
+  Buildings.Templates.Plants.HeatPumps.Components.ValvesIsolation valIsoCom(
+    redeclare final package Medium = Medium,
+    nHp=2,
+    have_chiWat=true,
+    have_valHpInlIso=true,
+    have_valHpOutIso=true,
+    have_pumChiWatPriDed=false,
+    final mHeaWatHp_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, valIsoCom.nHp),
+    dpHeaWatHp_nominal=fill(datHp.dpHeaWatHp_nominal, valIsoCom.nHp),
+    mChiWatHp_flow_nominal=fill(datHp.mChiWatHp_flow_nominal, valIsoCom.nHp),
+    final energyDynamics=energyDynamics,
+    y_start=0)
+    "Isolation valves - Heating and cooling system with common dedicated primary HW and CHW pumps"
+    annotation (Placement(transformation(extent={{-240,220},{240,360}})));
+  Fluid.FixedResistances.PressureDrop hpCom[valIsoCom.nHp](
+    redeclare each final package Medium = Medium,
+    m_flow_nominal=valIsoCom.mHeaWatHp_flow_nominal,
+    dp_nominal=fill(0, valIsoCom.nHp))
+    "Heat pump HX with zero fluid resistance: pressure drop computed in valve component"
+    annotation (Placement(transformation(extent={{10,210},{-10,230}})));
+  Fluid.Sources.Boundary_pT retChiWat(
+    redeclare final package Medium = Medium,
+    p=supChiWat.p + max(valIsoCom.dpChiWat_nominal),
+    T=Buildings.Templates.Data.Defaults.TChiWatRet,
+    nPorts=1) "Boundary condition at CHW return"
+    annotation (Placement(transformation(extent={{280,300},{260,320}})));
+  Fluid.Sources.Boundary_pT retHeaWat(
+    redeclare final package Medium = Medium,
+    p=supHeaWat.p + max(valIsoCom.dpHeaWat_nominal),
+    T=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+    nPorts=1) "Boundary condition at HW return"
+    annotation (Placement(transformation(extent={{-280,320},{-260,340}})));
+  Fluid.Sources.Boundary_pT supChiWat(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pChiWat_rel_nominal + 101325,
+    nPorts=1)
+    "Boundary condition at CHW supply"
+    annotation (Placement(transformation(extent={{280,340},{260,360}})));
+  Fluid.Sources.Boundary_pT supHeaWat(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=1)
+    "Boundary condition at HW supply"
+    annotation (Placement(transformation(extent={{-280,280},{-260,300}})));
+  Controls.OpenLoop ctl(
+    final cfg=datCtl.cfg,
+    final dat=datCtl)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-30,370},{-50,390}})));
+  Buildings.Templates.Plants.HeatPumps.Components.ValvesIsolation valIsoHeaInl(
+    redeclare final package Medium = Medium,
+    nHp=2,
+    have_chiWat=false,
+    have_pumChiWatPriDed=false,
+    have_valHpInlIso=true,
+    have_valHpOutIso=false,
+    final mHeaWatHp_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, valIsoCom.nHp),
+    dpHeaWatHp_nominal=fill(datHp.dpHeaWatHp_nominal, valIsoCom.nHp),
+    mChiWatHp_flow_nominal=fill(datHp.mChiWatHp_flow_nominal, valIsoCom.nHp),
+    final energyDynamics=energyDynamics,
+    y_start=0)
+    "Isolation valves - Heating-only system with isolation valves at HP inlet"
+    annotation (Placement(transformation(extent={{-240,-40},{240,100}})));
+  Fluid.FixedResistances.PressureDrop hpHea[valIsoHeaInl.nHp](
+    redeclare each final package Medium=Medium,
+    m_flow_nominal=valIsoHeaInl.mHeaWatHp_flow_nominal,
+    dp_nominal=fill(0, valIsoHeaInl.nHp))
+    "Heat pump HX with zero fluid resistance: pressure drop computed in valve component"
+    annotation (Placement(transformation(extent={{10,-50},{-10,-30}})));
+  Fluid.Sources.Boundary_pT retHeaWat1(
+    redeclare final package Medium=Medium,
+    p=supHeaWat1.p + max(valIsoHeaInl.dpHeaWat_nominal),
+    T=Buildings.Templates.Data.Defaults.THeaWatRetMed,
+    nPorts=1)
+    "Boundary condition at HW return"
+    annotation (Placement(transformation(extent={{-280,60},{-260,80}})));
+  Fluid.Sources.Boundary_pT supHeaWat1(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=1)
+    "Boundary condition at HW supply"
+    annotation (Placement(transformation(extent={{-280,20},{-260,40}})));
+  Controls.OpenLoop ctlHeaInl(
+    final cfg=datCtlHeaInl.cfg,
+    final dat=datCtlHeaInl)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-30,110},{-50,130}})));
+  Buildings.Templates.Plants.HeatPumps.Components.ValvesIsolation valIsoSep(
+    redeclare final package Medium = Medium,
+    nHp=2,
+    have_chiWat=true,
+    have_valHpInlIso=true,
+    have_valHpOutIso=false,
+    have_pumChiWatPriDed=true,
+    final mHeaWatHp_flow_nominal=fill(datHp.mHeaWatHp_flow_nominal, valIsoCom.nHp),
+    dpHeaWatHp_nominal=fill(datHp.dpHeaWatHp_nominal, valIsoCom.nHp),
+    mChiWatHp_flow_nominal=fill(datHp.mChiWatHp_flow_nominal, valIsoCom.nHp),
+    final energyDynamics=energyDynamics,
+    y_start=0,
+    from_dp=false)
+    "Isolation valves - Heating and cooling system with separate dedicated primary HW and CHW pumps"
+    annotation (Placement(transformation(extent={{-240,-280},{240,-140}})));
+  Fluid.FixedResistances.PressureDrop hpSep[valIsoSep.nHp](
+    redeclare each final package Medium=Medium,
+    m_flow_nominal=valIsoSep.mHeaWatHp_flow_nominal,
+    dp_nominal=fill(0, valIsoSep.nHp))
+    "Heat pump HX with zero fluid resistance: pressure drop computed in valve component"
+    annotation (Placement(transformation(extent={{10,-370},{-10,-350}})));
+  Fluid.Sources.Boundary_pT supHeaWat2(
+    redeclare final package Medium=Medium,
+    p=Buildings.Templates.Data.Defaults.pHeaWat_rel_nominal + 101325,
+    nPorts=2)
+    "Boundary condition at HW supply"
+    annotation (Placement(transformation(extent={{-280,-200},{-260,-180}})));
+  Controls.OpenLoop ctlSep(
+    final cfg=datCtlSep.cfg,
+    final dat=datCtlSep)
+    "Plant controller"
+    annotation (Placement(transformation(extent={{-30,-130},{-50,-110}})));
+  Fluid.Movers.Preconfigured.SpeedControlled_y pumChiWatPri[2](
+    redeclare each final package Medium=Medium,
+    each addPowerToMedium=false,
+    each m_flow_nominal=datHp.mChiWatHp_flow_nominal,
+    each final energyDynamics=energyDynamics,
+    dp_nominal=valIsoSep.dpChiWat_nominal + cheValChiWat.dpValve_nominal)
+    "Primary CHW pump"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=-90,
+      origin={-34,-334})));
+  Fluid.Movers.Preconfigured.SpeedControlled_y pumHeaWatPri[2](
+    redeclare each final package Medium=Medium,
+    each addPowerToMedium=false,
+    each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+    each final energyDynamics=energyDynamics,
+    dp_nominal=valIsoSep.dpHeaWat_nominal + cheValHeaWat.dpValve_nominal)
+    "Primary HW pump"
+    annotation (Placement(transformation(extent={{10,-10},{-10,10}},rotation=-90,
+      origin={-66,-320})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus busPla
+    "Plant controller"
+    annotation (Placement(iconVisible=false,transformation(extent={{80,-140},{120,
+            -100}}),
+      iconTransformation(extent={{-548,-190},{-508,-150}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal yPumHeaWatPri[2]
+    "Primary HW pump speed command"
+    annotation (Placement(transformation(extent={{80,-336},{60,-316}})));
+  Buildings.Controls.OBC.CDL.Conversions.BooleanToReal yPumChiWatPri[2]
+    "Primary CHW pump speed command"
+    annotation (Placement(transformation(extent={{110,-356},{90,-336}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumHeaWatPri
+    "Primary HW pump control bus"
+    annotation (Placement(iconVisible=false,transformation(extent={{100,-346},{140,
+            -306}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busPumChiWatPri
+    "Primary CHW pump control bus"
+    annotation (Placement(iconVisible=false,transformation(extent={{120,-366},{160,
+            -326}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Fluid.FixedResistances.CheckValve cheValHeaWat[2](
+    redeclare each final package Medium=Medium,
+    each m_flow_nominal=datHp.mHeaWatHp_flow_nominal,
+    each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValChe)
+    "Check valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-66,-296})));
+  Fluid.FixedResistances.CheckValve cheValChiWat[2](
+    redeclare each final package Medium=Medium,
+    each m_flow_nominal=datHp.mChiWatHp_flow_nominal,
+    each dpValve_nominal=Buildings.Templates.Data.Defaults.dpValChe)
+    "Check valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-34,-306})));
+equation
+  connect(retHeaWat.ports[1], valIsoCom.port_aHeaWat) annotation (Line(points={{-260,
+          330},{-240,330}},                           color={0,127,255}));
+  connect(retChiWat.ports[1], valIsoCom.port_aChiWat)
+    annotation (Line(points={{260,310},{240,310}}, color={0,127,255}));
+  connect(valIsoCom.port_bChiWat, supChiWat.ports[1])
+    annotation (Line(points={{240,350},{260,350}}, color={0,127,255}));
+  connect(valIsoCom.port_bHeaWat, supHeaWat.ports[1]) annotation (Line(points={{-240,
+          290},{-260,290}},                color={0,127,255}));
+  connect(ctl.bus, valIsoCom.bus) annotation (Line(
+      points={{-30,380},{0,380},{0,330}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(retHeaWat1.ports[1], valIsoHeaInl.port_aHeaWat)
+    annotation (Line(points={{-260,70},{-240,70}},                     color={0,127,255}));
+  connect(valIsoHeaInl.port_bHeaWat, supHeaWat1.ports[1])
+    annotation (Line(points={{-240,30},{-260,30}},                     color={0,127,255}));
+  connect(ctlHeaInl.bus, valIsoHeaInl.bus)
+    annotation (Line(points={{-30,120},{0,120},{0,70}},    color={255,204,51},thickness=0.5));
+  connect(valIsoCom.ports_bChiHeaWatHp, hpCom.port_a)
+    annotation (Line(points={{50,220},{10,220}}, color={0,127,255}));
+  connect(hpCom.port_b, valIsoCom.ports_aChiHeaWatHp)
+    annotation (Line(points={{-10,220},{-50,220}}, color={0,127,255}));
+  connect(valIsoHeaInl.ports_bChiHeaWatHp, hpHea.port_a)
+    annotation (Line(points={{50,-40},{10,-40}},        color={0,127,255}));
+  connect(hpHea.port_b, valIsoHeaInl.ports_aChiHeaWatHp)
+    annotation (Line(points={{-10,-40},{-50,-40}},        color={0,127,255}));
+  connect(valIsoSep.port_bHeaWat, supHeaWat2.ports[1])
+    annotation (Line(points={{-240,-210},{-260,-210},{-260,-191}},
+      color={0,127,255}));
+  connect(ctlSep.bus, valIsoSep.bus)
+    annotation (Line(points={{-30,-120},{0,-120},{0,-170}},  color={255,204,51},thickness=0.5));
+  connect(valIsoSep.ports_bChiHeaWatHp, hpSep.port_a)
+    annotation (Line(points={{50,-280},{50,-360},{10,-360}},color={0,127,255}));
+  connect(supHeaWat2.ports[2], valIsoSep.port_aHeaWat)
+    annotation (Line(points={{-260,-189},{-260,-170},{-240,-170}},
+      color={0,127,255}));
+  connect(ctlSep.bus, busPla)
+    annotation (Line(points={{-30,-120},{100,-120}},
+                                                  color={255,204,51},thickness=0.5));
+  connect(busPla.pumHeaWatPri, busPumHeaWatPri)
+    annotation (Line(points={{100,-120},{280,-120},{280,-326},{120,-326}},
+                                                   color={255,204,51},thickness=0.5));
+  connect(busPumHeaWatPri.y1, yPumHeaWatPri.u)
+    annotation (Line(points={{120,-326},{82,-326}},color={255,204,51},thickness=0.5));
+  connect(yPumHeaWatPri.y, pumHeaWatPri.y)
+    annotation (Line(points={{58,-326},{0,-326},{0,-320},{-54,-320}},    color={0,0,127}));
+  connect(busPla.pumChiWatPri, busPumChiWatPri)
+    annotation (Line(points={{100,-120},{280,-120},{280,-346},{140,-346}},
+                                                             color={255,204,51},thickness=0.5));
+  connect(busPumChiWatPri.y1, yPumChiWatPri.u)
+    annotation (Line(points={{140,-346},{112,-346}},
+                                                   color={255,204,51},thickness=0.5));
+  connect(yPumChiWatPri.y, pumChiWatPri.y)
+    annotation (Line(points={{88,-346},{0,-346},{0,-334},{-22,-334}},    color={0,0,127}));
+  connect(pumHeaWatPri.port_b, cheValHeaWat.port_a)
+    annotation (Line(points={{-66,-310},{-66,-306}},color={0,127,255}));
+  connect(cheValHeaWat.port_b, valIsoSep.ports_aHeaWatHp)
+    annotation (Line(points={{-66,-286},{-66,-280}},color={0,127,255}));
+  connect(cheValChiWat.port_b, valIsoSep.ports_aChiWatHp)
+    annotation (Line(points={{-34,-296},{-34,-280}},  color={0,127,255}));
+  connect(pumChiWatPri.port_b, cheValChiWat.port_a)
+    annotation (Line(points={{-34,-324},{-34,-316}},color={0,127,255}));
+  connect(hpSep.port_b, pumChiWatPri.port_a) annotation (Line(points={{-10,-360},
+          {-34,-360},{-34,-344}}, color={0,127,255}));
+  connect(hpSep.port_b, pumHeaWatPri.port_a) annotation (Line(points={{-10,-360},
+          {-66,-360},{-66,-330}}, color={0,127,255}));
+  connect(valIsoSep.port_bChiWat, valIsoSep.port_aChiWat) annotation (Line(
+        points={{240,-150},{260,-150},{260,-190},{240,-190},{240,-190}}, color=
+          {0,127,255}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Components/Validation/ValvesIsolation.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=5000.0),
+    Diagram(
+      coordinateSystem(
+        extent={{-300,-400},{300,400}})),
+    Documentation(revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+This model validates the model
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.ValvesIsolation\">
+Buildings.Templates.Plants.HeatPumps.Components.ValvesIsolation</a>
+for the following configurations.
+</p>
+<ul>
+<li>
+Heating and cooling system with common dedicated primary HW and CHW pumps
+and isolation valves at both heat pump inlet and outlet: 
+component <code>valIsoCom</code>.
+</li>
+<li>
+Heating-only system with isolation valves at heat pump inlet: 
+component <code>valIsoHeaInl</code>.
+</li>
+<li>
+Heating and cooling system with separate dedicated primary HW and CHW pumps
+and isolation valves at heat pump inlet: 
+component <code>valIsoSep</code>.
+</li>
+</ul>
+<p>
+In each configuration, two identical heat pumps are represented by fixed 
+flow resistances (components <code>hp*</code>). 
+</p>
+<p>
+The model uses open loop controls and the simulation allows verifying that design 
+flow is obtained in each loop and each heat pump when the valves are open.
+</p>
+</html>"));
+end ValvesIsolation;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.mo b/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.mo
new file mode 100644
index 00000000000..d0e544e07bc
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.mo
@@ -0,0 +1,13 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains validation models for the classes within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components\">
+Buildings.Templates.Plants.HeatPumps.Components</a>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order b/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order
new file mode 100644
index 00000000000..2fae7671638
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/Validation/package.order
@@ -0,0 +1,3 @@
+HeatPumpGroupAirToWater
+PumpsPrimaryDedicated
+ValvesIsolation
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo b/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo
new file mode 100644
index 00000000000..997b4cd520c
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/ValvesIsolation.mo
@@ -0,0 +1,1229 @@
+within Buildings.Templates.Plants.HeatPumps.Components;
+model ValvesIsolation
+  "Heat pump isolation valves"
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Medium model"
+    annotation (__ctrlFlow(enable=false));
+  final parameter Buildings.Templates.Components.Types.Valve typ=
+    Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+    "Valve type"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Integer nHp(
+    final min=1)
+    "Number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean have_chiWat
+    "Set to true if the plant provides CHW"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean have_valHpInlIso
+    "Set to true for isolation valves at HP inlet"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean have_valHpOutIso
+    "Set to true for isolation valves at HP outlet"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean have_pumChiWatPriDed(
+    start=false)
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+      enable=have_chiWat));
+  parameter Modelica.Units.SI.MassFlowRate mHeaWatHp_flow_nominal[nHp](
+    each final min=0,
+    each start=0)
+    "HW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpHeaWatHp_nominal[nHp](
+    each final min=0,
+    each start=Buildings.Templates.Data.Defaults.dpChiWatChi)
+    "Pressure drop at design HW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpBalHeaWatHp_nominal[nHp](
+    each final min=0)=fill(0, nHp)
+    "Balancing valve pressure drop at design HW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate mChiWatHp_flow_nominal[nHp](
+    each start=0,
+    each final min=0)
+    "CHW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=have_chiWat));
+  final parameter Modelica.Units.SI.PressureDifference dpChiWatHp_nominal[nHp]=
+    dpHeaWatHp_nominal .*(mChiWatHp_flow_nominal ./ mHeaWatHp_flow_nominal) .^ 2
+    "Pressure drop at design CHW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=have_chiWat));
+  parameter Modelica.Units.SI.PressureDifference dpBalChiWatHp_nominal[nHp](
+    each final min=0,
+    each start=0)=fill(0, nHp)
+    "Balancing valve pressure drop at design CHW mass flow rate - Each heat pump"
+    annotation (Dialog(group="Nominal condition",
+      enable=have_chiWat));
+  parameter Modelica.Units.SI.PressureDifference dpValveHeaWat_nominal[nHp]=fill(Buildings.Templates.Data.Defaults.dpValIso, nHp)
+    "HW isolation valve pressure drop: identical for inlet and outlet valves"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.PressureDifference dpFixedHeaWat_nominal[nHp]=
+    dpHeaWatHp_nominal + dpBalHeaWatHp_nominal
+    "Fixed HW pressure drop: HP + balancing valve"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.PressureDifference dpHeaWat_nominal[nHp]=
+    dpFixedHeaWat_nominal +(if have_valHpOutIso then dpValveHeaWat_nominal else fill(0, nHp)) +
+    (if have_valHpInlIso then dpValveHeaWat_nominal else fill(0, nHp))
+    "Total HW pressure drop: fixed + valves"
+    annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.PressureDifference dpValveChiWat_nominal[nHp](
+    each start=0)=fill(Buildings.Templates.Data.Defaults.dpValIso, nHp)
+    "Isolation valve CHW pressure drop: identical for inlet and outlet valves"
+    annotation (Dialog(group="Nominal condition",
+      enable=have_chiWat));
+  final parameter Modelica.Units.SI.PressureDifference dpFixedChiWat_nominal[nHp]=
+    if have_chiWat then dpChiWatHp_nominal + dpBalChiWatHp_nominal else fill(0, nHp)
+    "Total fixed CHW pressure drop"
+    annotation (Dialog(group="Nominal condition",
+      enable=have_chiWat));
+  final parameter Modelica.Units.SI.PressureDifference dpChiWat_nominal[nHp]=
+    dpFixedChiWat_nominal +(if have_chiWat and have_valHpOutIso then dpValveChiWat_nominal
+    else fill(0, nHp)) +(if have_chiWat and have_valHpInlIso then dpValveChiWat_nominal
+    else fill(0, nHp))
+    "Total CHW pressure drop: fixed + valves"
+    annotation (Dialog(group="Nominal condition",
+      enable=have_chiWat));
+  final parameter Buildings.Templates.Components.Data.Valve datValHeaWatHpOutIso[nHp](
+    each typ=typ,
+    m_flow_nominal=mHeaWatHp_flow_nominal,
+    dpValve_nominal=dpValveHeaWat_nominal,
+    dpFixed_nominal=dpFixedHeaWat_nominal)
+    "Heat pump outlet HW isolation valve parameters"
+    annotation (Placement(transformation(extent={{-30,80},{-10,100}})));
+  // dpFixed_nominal only applied to inlet valves if there is no outlet valve.
+  final parameter Buildings.Templates.Components.Data.Valve datValHeaWatHpInlIso[nHp](
+    each typ=typ,
+    m_flow_nominal=mHeaWatHp_flow_nominal,
+    dpValve_nominal=dpValveHeaWat_nominal,
+    dpFixed_nominal=if not have_valHpOutIso then dpFixedHeaWat_nominal else fill(0, nHp))
+    "Heat pump inlet HW isolation valve parameters"
+    annotation (Placement(transformation(extent={{-30,80},{-10,100}})));
+  final parameter Buildings.Templates.Components.Data.Valve datValChiWatHpOutIso[nHp](
+    each typ=typ,
+    m_flow_nominal=mChiWatHp_flow_nominal,
+    dpValve_nominal=dpValveChiWat_nominal,
+    dpFixed_nominal=dpFixedChiWat_nominal)
+    "Heat pump outlet CHW isolation valve parameters"
+    annotation (Placement(transformation(extent={{10,80},{30,100}})));
+  // dpFixed_nominal only applied to inlet valves if there is no outlet valve.
+  final parameter Buildings.Templates.Components.Data.Valve datValChiWatHpInlIso[nHp](
+    each typ=typ,
+    m_flow_nominal=mChiWatHp_flow_nominal,
+    dpValve_nominal=dpValveChiWat_nominal,
+    dpFixed_nominal=if not have_valHpOutIso then dpFixedChiWat_nominal else fill(0, nHp))
+    "Heat pump inlet CHW isolation valve parameters"
+    annotation (Placement(transformation(extent={{10,80},{30,100}})));
+  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 Modelica.Units.SI.Time tau=10
+    "Time constant at nominal flow"
+    annotation (Dialog(tab="Dynamics",group="Nominal condition",
+      enable=energyDynamics<>Modelica.Fluid.Types.Dynamics.SteadyState),
+    __ctrlFlow(enable=false));
+  parameter Boolean allowFlowReversal=true
+    "Set to false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation (Dialog(tab="Assumptions"),
+    Evaluate=true);
+  parameter Boolean use_inputFilter=energyDynamics <> Modelica.Fluid.Types.Dynamics.SteadyState
+    "= true, if opening is filtered with a 2nd order CriticalDamping filter"
+    annotation (__ctrlFlow(enable=false),
+  Dialog(tab="Dynamics",group="Filtered opening",
+    enable=have_valHpInlIso or have_valHpOutIso));
+  parameter Modelica.Units.SI.Time riseTime=120
+    "Rise time of the filter (time to reach 99.6 % of an opening step)"
+    annotation (__ctrlFlow(enable=false),
+  Dialog(tab="Dynamics",group="Filtered opening",
+    enable=use_inputFilter and have_valHpInlIso or have_valHpOutIso));
+  parameter Modelica.Blocks.Types.Init init=Modelica.Blocks.Types.Init.InitialOutput
+    "Type of initialization (no init/steady state/initial state/initial output)"
+    annotation (__ctrlFlow(enable=false),
+  Dialog(tab="Dynamics",group="Filtered opening",
+    enable=use_inputFilter and have_valHpInlIso or have_valHpOutIso));
+  parameter Real y_start=1
+    "Initial position of actuator"
+    annotation (__ctrlFlow(enable=false),
+  Dialog(tab="Dynamics",group="Filtered opening",
+    enable=use_inputFilter and have_valHpInlIso or have_valHpOutIso));
+  parameter Boolean from_dp=true
+    "= true, use m_flow = f(dp) else dp = f(m_flow)"
+    annotation (Evaluate=true,
+    Dialog(tab="Advanced",
+      enable=have_valHpInlIso or have_valHpOutIso));
+  parameter Boolean linearized=true
+    "= true, use linear relation between m_flow and dp for any flow rate"
+    annotation (Evaluate=true,
+    Dialog(tab="Advanced",
+      enable=have_valHpInlIso or have_valHpOutIso));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bChiWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if have_chiWat
+    "CHW supply (to primary loop)"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-100,200}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={2400,600})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aChiWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if have_chiWat
+    "CHW return (from primary loop)"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={180,200}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=0,
+        origin={2400,200})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bHeaWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "HW supply (to primary loop)"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={-180,200}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=180,
+        origin={-2400,0})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aHeaWat(
+    redeclare final package Medium=Medium,
+    m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "HW return (from primary loop)"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={100,200}), iconTransformation(
+        extent={{-10,-10},{10,10}},
+        rotation=180,
+        origin={-2400,400})));
+  Modelica.Fluid.Interfaces.FluidPorts_b ports_bChiHeaWatHp[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    "CHW/HW return (HP entering)"
+    annotation (Placement(transformation(extent={{-10,-40},{10,40}},rotation=90,
+      origin={100,-200}),
+      iconTransformation(extent={{-10,-40},{10,40}},rotation=90,origin={500,-700})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aChiHeaWatHp[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if not have_pumChiWatPriDed
+    "CHW/HW supply (HP leaving)"
+    annotation (Placement(transformation(
+        extent={{-10,-40},{10,40}},
+        rotation=90,
+        origin={-100,-200}), iconTransformation(
+        extent={{-10,-40},{10,40}},
+        rotation=90,
+        origin={-500,-700})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aHeaWatHp[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if have_pumChiWatPriDed
+    "HW supply (HP leaving)"
+    annotation (Placement(transformation(
+        extent={{-10,-40},{10,40}},
+        rotation=90,
+        origin={-180,-200}), iconTransformation(
+        extent={{-10,-40},{10,40}},
+        rotation=90,
+        origin={-660,-700})));
+  Modelica.Fluid.Interfaces.FluidPorts_a ports_aChiWatHp[nHp](
+    redeclare each final package Medium=Medium,
+    each m_flow(
+      min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    each h_outflow(
+      start=Medium.h_default,
+      nominal=Medium.h_default))
+    if have_pumChiWatPriDed
+    "CHW supply (HP leaving)"
+    annotation (Placement(transformation(
+        extent={{-10,-40},{10,40}},
+        rotation=90,
+        origin={-20,-200}), iconTransformation(
+        extent={{-10,-40},{10,40}},
+        rotation=90,
+        origin={-340,-700})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-20,180},{20,220}}),
+      iconTransformation(extent={{-20,380},{20,420}})));
+  Buildings.Templates.Components.Actuators.Valve valHeaWatHpOutIso[nHp](
+    redeclare each final package Medium=Medium,
+    final dat=datValHeaWatHpOutIso,
+    each final typ=typ,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start,
+    each final from_dp=from_dp,
+    each final linearized=linearized)
+    if have_valHpOutIso
+    "HP outlet HW isolation valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-180,0})));
+  Buildings.Templates.Components.Actuators.Valve valChiWatHpOutIso[nHp](
+    redeclare each final package Medium=Medium,
+    final dat=datValChiWatHpOutIso,
+    each final typ=typ,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start,
+    each final from_dp=from_dp,
+    each final linearized=linearized)
+    if have_valHpOutIso and have_chiWat
+    "HP outlet CHW isolation valve"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-100,0})));
+  Buildings.Templates.Components.Actuators.Valve valHeaWatHpInlIso[nHp](
+    redeclare each final package Medium=Medium,
+    final dat=datValHeaWatHpInlIso,
+    each final typ=typ,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start,
+    each final from_dp=from_dp,
+    each final linearized=linearized)
+    if have_valHpInlIso
+    "HP inlet HW isolation valve"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=90,
+      origin={100,0})));
+  Buildings.Templates.Components.Actuators.Valve valChiWatHpInlIso[nHp](
+    redeclare each final package Medium=Medium,
+    final dat=datValChiWatHpInlIso,
+    each final typ=typ,
+    each final use_inputFilter=use_inputFilter,
+    each final riseTime=riseTime,
+    each final init=init,
+    each final y_start=y_start,
+    each final from_dp=from_dp,
+    each final linearized=linearized)
+    if have_valHpInlIso and have_chiWat
+    "HP inlet CHW isolation valve"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=90,
+      origin={180,0})));
+  Buildings.Templates.Components.Routing.PassThroughFluid pasHeaWatHpOut[nHp](
+    redeclare each final package Medium=Medium)
+    if not have_valHpOutIso
+    "Direct fluid pass-through"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-160,0})));
+  Buildings.Templates.Components.Routing.PassThroughFluid pasChiWatHpOut[nHp](
+    redeclare each final package Medium=Medium)
+    if not have_valHpOutIso and have_chiWat
+    "Direct fluid pass-through"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=90,
+      origin={-80,0})));
+  Fluid.Delays.DelayFirstOrder junHeaWatSup(
+    redeclare final package Medium=Medium,
+    final tau=tau,
+    final m_flow_nominal=sum(mHeaWatHp_flow_nominal),
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final prescribedHeatFlowRate=false,
+    final nPorts=nHp + 1)
+    "Fluid volume at junction"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-160,50})));
+  Fluid.Delays.DelayFirstOrder junChiWatSup(
+    redeclare final package Medium=Medium,
+    final tau=tau,
+    final m_flow_nominal=sum(mChiWatHp_flow_nominal),
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final prescribedHeatFlowRate=false,
+    final nPorts=nHp + 1)
+    if have_chiWat
+    "Fluid volume at junction"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-82,50})));
+  Fluid.Delays.DelayFirstOrder junHeaWatRet(
+    redeclare final package Medium=Medium,
+    final tau=tau,
+    final m_flow_nominal=sum(mHeaWatHp_flow_nominal),
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final prescribedHeatFlowRate=false,
+    final nPorts=nHp + 1)
+    "Fluid volume at junction"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={80,50})));
+  /*
+  HW pressure drop computed in this component in the absence of isolation valves
+  at both inlet and outlet.
+  */
+    Fluid.FixedResistances.PressureDrop pasHeaWatHpInl[nHp](
+    redeclare each final package Medium=Medium,
+    final m_flow_nominal=mHeaWatHp_flow_nominal,
+    final dp_nominal=if not have_valHpInlIso and not have_valHpOutIso then dpFixedHeaWat_nominal
+      else fill(0, nHp))
+    if not have_valHpInlIso
+    "Direct fluid pass-through with optional fluid resistance"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=90,
+      origin={80,0})));
+  /*
+  CHW pressure drop computed in this component in the absence of isolation valves
+  at both inlet and outlet.
+  */
+    Fluid.FixedResistances.PressureDrop pasChiWatHpInl[nHp](
+    redeclare each final package Medium=Medium,
+    final m_flow_nominal=mChiWatHp_flow_nominal,
+    final dp_nominal=if not have_valHpInlIso and not have_valHpOutIso then dpFixedChiWat_nominal
+      else fill(0, nHp))
+    if not have_valHpInlIso and have_chiWat
+    "Direct fluid pass-through with optional fluid resistance"
+    annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=90,
+      origin={160,0})));
+  Fluid.Delays.DelayFirstOrder junChiWatRet(
+    redeclare final package Medium=Medium,
+    final tau=tau,
+    final m_flow_nominal=sum(mChiWatHp_flow_nominal),
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    final prescribedHeatFlowRate=false,
+    final nPorts=nHp + 1)
+    if have_chiWat
+    "Fluid volume at junction"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={160,50})));
+protected
+  Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpInlIso[nHp]
+    if have_valHpInlIso
+    "Heat pump inlet HW isolation valve control bus"
+    annotation (Placement(transformation(extent={{40,140},{80,180}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValHeaWatHpOutIso[nHp]
+    if have_valHpOutIso
+    "Heat pump outlet HW isolation valve control bus"
+    annotation (Placement(transformation(extent={{-80,140},{-40,180}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValChiWatHpInlIso[nHp]
+    if have_chiWat and have_valHpInlIso
+    "Heat pump inlet CHW isolation valve control bus"
+    annotation (Placement(transformation(extent={{10,160},{50,200}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+  Buildings.Templates.Components.Interfaces.Bus busValChiWatHpOutIso[nHp]
+    if have_chiWat and have_valHpOutIso
+    "Heat pump outlet CHW isolation valve control bus"
+    annotation (Placement(transformation(extent={{-50,160},{-10,200}}),
+      iconTransformation(extent={{-466,50},{-426,90}})));
+equation
+  connect(bus.valHeaWatHpInlIso, busValHeaWatHpInlIso)
+    annotation (Line(points={{0,200},{0,160},{60,160}},color={255,204,51},thickness=0.5));
+  connect(bus.valHeaWatHpOutIso, busValHeaWatHpOutIso)
+    annotation (Line(points={{0,200},{0,160},{-60,160}},color={255,204,51},thickness=0.5));
+  connect(bus.valChiWatHpInlIso, busValChiWatHpInlIso)
+    annotation (Line(points={{0,200},{0,180},{30,180}},color={255,204,51},thickness=0.5));
+  connect(bus.valChiWatHpOutIso, busValChiWatHpOutIso)
+    annotation (Line(points={{0,200},{0,180},{-30,180}},color={255,204,51},thickness=0.5));
+  connect(ports_aHeaWatHp, valHeaWatHpOutIso.port_a)
+    annotation (Line(points={{-180,-200},{-180,-10}},color={0,127,255}));
+  connect(ports_aChiHeaWatHp, valHeaWatHpOutIso.port_a)
+    annotation (Line(points={{-100,-200},{-120,-200},{-120,-20},{-180,-20},{
+          -180,-10}},
+      color={0,127,255}));
+  connect(ports_aChiHeaWatHp, valChiWatHpOutIso.port_a)
+    annotation (Line(points={{-100,-200},{-100,-200},{-100,-10}},color={0,127,255}));
+  connect(ports_aChiWatHp, valChiWatHpOutIso.port_a)
+    annotation (Line(points={{-20,-200},{-20,-20},{-100,-20},{-100,-10}},  color={0,127,255}));
+  connect(ports_aHeaWatHp, pasHeaWatHpOut.port_a)
+    annotation (Line(points={{-180,-200},{-160,-200},{-160,-10}},          color={0,127,255}));
+  connect(ports_aChiHeaWatHp, pasHeaWatHpOut.port_a)
+    annotation (Line(points={{-100,-200},{-120,-200},{-120,-20},{-160,-20},{
+          -160,-10}},
+      color={0,127,255}));
+  connect(ports_aChiHeaWatHp, pasChiWatHpOut.port_a)
+    annotation (Line(points={{-100,-200},{-80,-200},{-80,-10}},          color={0,127,255}));
+  connect(ports_aChiWatHp, pasChiWatHpOut.port_a)
+    annotation (Line(points={{-20,-200},{-20,-20},{-80,-20},{-80,-10}},
+      color={0,127,255}));
+  connect(valHeaWatHpOutIso.port_b, junHeaWatSup.ports[1:nHp])
+    annotation (Line(points={{-180,10},{-180,20},{-160,20},{-160,40}},color={0,127,255}));
+  connect(pasHeaWatHpOut.port_b, junHeaWatSup.ports[1:nHp])
+    annotation (Line(points={{-160,10},{-160,40}},color={0,127,255}));
+  connect(junHeaWatSup.ports[nHp + 1], port_bHeaWat)
+    annotation (Line(points={{-160,40},{-180,40},{-180,200}},color={0,127,255}));
+  connect(valChiWatHpOutIso.port_b, junChiWatSup.ports[1:nHp])
+    annotation (Line(points={{-100,10},{-100,20},{-82,20},{-82,40}},color={0,127,255}));
+  connect(pasChiWatHpOut.port_b, junChiWatSup.ports[1:nHp])
+    annotation (Line(points={{-80,10},{-80,40},{-82,40}},color={0,127,255}));
+  connect(port_bChiWat, junChiWatSup.ports[nHp + 1])
+    annotation (Line(points={{-100,200},{-100,40},{-82,40}},color={0,127,255}));
+  connect(port_aHeaWat, junHeaWatRet.ports[nHp + 1])
+    annotation (Line(points={{100,200},{100,40},{80,40}},color={0,127,255}));
+  connect(junHeaWatRet.ports[1:nHp], valHeaWatHpInlIso.port_a)
+    annotation (Line(points={{80,40},{80,20},{100,20},{100,10}},color={0,127,255}));
+  connect(pasHeaWatHpInl.port_a, junHeaWatRet.ports[1:nHp])
+    annotation (Line(points={{80,10},{80,26},{80,40},{80,40}},color={0,127,255}));
+  connect(port_aChiWat, junChiWatRet.ports[nHp + 1])
+    annotation (Line(points={{180,200},{180,40},{160,40}},color={0,127,255}));
+  connect(valChiWatHpInlIso.port_a, junChiWatRet.ports[1:nHp])
+    annotation (Line(points={{180,10},{180,20},{160,20},{160,40}},color={0,127,255}));
+  connect(pasChiWatHpInl.port_a, junChiWatRet.ports[1:nHp])
+    annotation (Line(points={{160,10},{160,26},{160,40},{160,40}},color={0,127,255}));
+  connect(pasHeaWatHpInl.port_b, ports_bChiHeaWatHp)
+    annotation (Line(points={{80,-10},{80,-200},{100,-200}},         color={0,127,255}));
+  connect(valHeaWatHpInlIso.port_b, ports_bChiHeaWatHp)
+    annotation (Line(points={{100,-10},{100,-200}},color={0,127,255}));
+  connect(pasChiWatHpInl.port_b, ports_bChiHeaWatHp)
+    annotation (Line(points={{160,-10},{160,-180},{100,-180},{100,-200}},color={0,127,255}));
+  connect(valChiWatHpInlIso.port_b, ports_bChiHeaWatHp)
+    annotation (Line(points={{180,-10},{180,-180},{100,-180},{100,-200}},
+      color={0,127,255}));
+  connect(busValHeaWatHpInlIso, valHeaWatHpInlIso.bus)
+    annotation (Line(points={{60,160},{110,160},{110,0}},color={255,204,51},thickness=0.5));
+  connect(busValChiWatHpInlIso, valChiWatHpInlIso.bus)
+    annotation (Line(points={{30,180},{190,180},{190,0}},color={255,204,51},thickness=0.5));
+  connect(busValChiWatHpOutIso, valChiWatHpOutIso.bus)
+    annotation (Line(points={{-30,180},{-110,180},{-110,0}},color={255,204,51},thickness=0.5));
+  connect(busValHeaWatHpOutIso, valHeaWatHpOutIso.bus)
+    annotation (Line(points={{-60,160},{-190,160},{-190,0}},color={255,204,51},thickness=0.5));
+
+  annotation (
+    defaultComponentName="valIso",
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-200},{200,200}})),
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-2400,-700},{2400,700}}), graphics={
+        Line(
+          points={{1000,-160},{1000,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 2),
+        Line(
+          points={{200,-160},{200,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 3),
+        Line(
+          points={{-600,-160},{-600,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 4),
+        Line(
+          points={{-1400,-160},{-1400,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 5),
+        Line(
+          points={{-2200,-160},{-2200,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 6),
+        Line(
+          points={{1800,-160},{1800,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_pumChiWatPriDed and nHp >= 1),
+        Line(
+          points={{2400,200},{2400,-400},{2200,-400}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=have_chiWat and nHp >= 1),
+        Line(
+          points={{1800,-160},{1800,600},{2400,600}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and nHp >= 1),
+    Bitmap(
+          visible=have_chiWat and have_valHpOutIso and nHp >= 1,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={1800,-200}),
+    Line( points={{-2400,400},{2200,400},{2200,-700}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=nHp >= 1),
+    Bitmap(
+          visible=have_valHpInlIso and nHp >= 1,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={2200,-200}),
+    Bitmap(
+          visible=have_chiWat and nHp >= 1 and have_valHpInlIso,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={2400,-200}),
+    Line( visible=have_chiWat and nHp >= 1 and have_valHpInlIso,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={2370,-200},
+          rotation=-90),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and nHp >= 1 and have_valHpInlIso,
+          extent={{2260,-240},{2340,-160}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpInlIso and nHp >= 1,
+          extent={{2060,-240},{2140,-160}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_valHpInlIso and nHp >= 1,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={2170,-200},
+          rotation=-90),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpOutIso and nHp >= 1,
+          extent={{1860,-240},{1940,-160}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and have_valHpOutIso and nHp >= 1,
+          extent={{1660,-240},{1740,-160}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_chiWat and have_valHpOutIso and nHp >= 1,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={1770,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{1780,20},{1820,-20}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 1),
+        Line(
+          points={{1000,-160},{1000,600},{1800,600}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and nHp >= 2),
+    Bitmap(
+          visible=have_chiWat and have_valHpOutIso and nHp >= 2,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={1000,-200}),
+    Line( points={{1400,400},{1400,-700}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=nHp >= 2),
+    Bitmap(
+          visible=have_valHpInlIso and nHp >= 2,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={1400,-200}),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and nHp >= 2 and have_valHpInlIso,
+          extent={{1460,-240},{1540,-160}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpInlIso and nHp >= 2,
+          extent={{1260,-240},{1340,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_valHpInlIso and nHp >= 2,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={1370,-200},
+          rotation=-90),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpOutIso and nHp >= 2,
+          extent={{1060,-240},{1140,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and have_valHpOutIso and nHp >= 2,
+          extent={{860,-240},{940,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_chiWat and have_valHpOutIso and nHp >= 2,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={970,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{980,20},{1020,-20}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 2),
+   Line(  points={{1200,4},{1200,-696}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 2),
+    Bitmap(
+          visible=have_valHpOutIso and nHp >= 2,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={1200,-200}),
+    Line( visible=have_valHpOutIso and nHp >= 2,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={1170,-200},
+          rotation=-90),
+        Line(
+          points={{200,-160},{200,600},{1000,600}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and nHp >= 3),
+    Bitmap(
+          visible=have_chiWat and have_valHpOutIso and nHp >= 3,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={200,-200}),
+    Line( points={{600,400},{600,-700}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=nHp >= 3),
+    Bitmap(
+          visible=have_valHpInlIso and nHp >= 3,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={600,-200}),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpInlIso and nHp >= 3,
+          extent={{460,-240},{540,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_valHpInlIso and nHp >= 3,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={570,-200},
+          rotation=-90),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpOutIso and nHp >= 3,
+          extent={{260,-240},{340,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and have_valHpOutIso and nHp >= 3,
+          extent={{60,-240},{140,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_chiWat and have_valHpOutIso and nHp >= 3,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={170,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{180,20},{220,-20}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 3),
+   Line(  points={{400,0},{400,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 3),
+    Bitmap(
+          visible=have_valHpOutIso and nHp >= 3,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={400,-200}),
+    Line( visible=have_valHpOutIso and nHp >= 3,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={370,-200},
+          rotation=-90),
+        Line(
+          points={{-600,-160},{-600,600},{200,600}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and nHp >= 4),
+    Bitmap(
+          visible=have_chiWat and have_valHpOutIso and nHp >= 4,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-600,-200}),
+    Line( points={{-200,400},{-200,-700}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=nHp >= 4),
+    Bitmap(
+          visible=have_valHpInlIso and nHp >= 4,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-200,-200}),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpInlIso and nHp >= 4,
+          extent={{-340,-240},{-260,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_valHpInlIso and nHp >= 4,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-230,-200},
+          rotation=-90),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpOutIso and nHp >= 4,
+          extent={{-540,-240},{-460,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and have_valHpOutIso and nHp >= 4,
+          extent={{-740,-240},{-660,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_chiWat and have_valHpOutIso and nHp >= 4,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-630,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{-620,20},{-580,-20}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 4),
+   Line(  points={{-400,0},{-400,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 4),
+    Bitmap(
+          visible=have_valHpOutIso and nHp >= 4,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-400,-200}),
+    Line( visible=have_valHpOutIso and nHp >= 4,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-430,-200},
+          rotation=-90),
+        Line(
+          points={{-1400,-160},{-1400,600},{-600,600}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and nHp >= 5),
+    Bitmap(
+          visible=have_chiWat and have_valHpOutIso and nHp >= 5,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-1400,-200}),
+    Line( points={{-1000,400},{-1000,-700}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=nHp >= 5),
+    Bitmap(
+          visible=have_valHpInlIso and nHp >= 5,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-1000,-200}),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpInlIso and nHp >= 5,
+          extent={{-1140,-240},{-1060,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_valHpInlIso and nHp >= 5,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-1030,-200},
+          rotation=-90),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpOutIso and nHp >= 5,
+          extent={{-1340,-240},{-1260,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and have_valHpOutIso and nHp >= 5,
+          extent={{-1540,-240},{-1460,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_chiWat and have_valHpOutIso and nHp >= 5,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-1430,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{-1420,20},{-1380,-20}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 5),
+   Line(  points={{-1200,0},{-1200,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 5),
+    Bitmap(
+          visible=have_valHpOutIso and nHp >= 5,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-1200,-200}),
+    Line( visible=have_valHpOutIso and nHp >= 5,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-1230,-200},
+          rotation=-90),
+        Line(
+          points={{-2200,-160},{-2200,600},{-1400,600}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and nHp >= 6),
+    Bitmap(
+          visible=have_chiWat and have_valHpOutIso and nHp >= 6,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-2200,-200}),
+    Line( points={{-1800,400},{-1800,-700}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=nHp >= 6),
+    Bitmap(
+          visible=have_valHpInlIso and nHp >= 6,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-1800,-200}),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpInlIso and nHp >= 6,
+          extent={{-1940,-240},{-1860,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_valHpInlIso and nHp >= 6,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-1830,-200},
+          rotation=-90),
+                                 Bitmap(
+          visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_valHpOutIso and nHp >= 6,
+          extent={{-2140,-240},{-2060,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and have_valHpOutIso and nHp >= 6,
+          extent={{-2340,-240},{-2260,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+    Line( visible=have_chiWat and have_valHpOutIso and nHp >= 6,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-2230,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{-2220,20},{-2180,-22}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 6),
+   Line(  points={{-2000,0},{-2000,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 6),
+    Bitmap(
+          visible=have_valHpOutIso and nHp >= 6,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-2000,-200}),
+    Line( visible=have_valHpOutIso and nHp >= 6,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-2030,-200},
+          rotation=-90),
+   Line(  points={{-2400,0},{2000,0},{2000,-700}},
+          color={0,0,0},
+          thickness=5,
+          visible=nHp >= 1),
+    Bitmap(
+          visible=have_valHpOutIso and nHp >= 1,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={2000,-200}),
+    Line( visible=have_valHpOutIso and nHp >= 1,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={1970,-200},
+          rotation=-90),
+        Line(points={{1820,-508}}, color={0,0,0}),
+        Line(
+          points={{160,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 1,
+          origin={1950,-400},
+          rotation=90),
+        Line(
+          points={{160,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 2,
+          origin={1150,-400},
+          rotation=90),
+        Line(
+          points={{160,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 3,
+          origin={350,-400},
+          rotation=90),
+        Line(
+          points={{160,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 4,
+          origin={-450,-400},
+          rotation=90),
+        Line(
+          points={{160,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 5,
+          origin={-1250,-400},
+          rotation=90),
+        Line(
+          points={{160,150},{0,150},{0,-50}},
+          color={0,0,0},
+          thickness=5,
+          visible=have_chiWat and not have_pumChiWatPriDed and nHp >= 6,
+          origin={-2050,-400},
+          rotation=90),
+   Rectangle(
+          extent={{2180,220},{2220,178}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 2),
+        Line(
+          points={{2400,200},{1600,200},{1600,-400},{1400,-400}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=have_chiWat and nHp >= 2),
+    Bitmap(
+          visible=have_chiWat and nHp >= 2 and have_valHpInlIso,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={1600,-200}),
+    Line( visible=have_chiWat and nHp >= 2 and have_valHpInlIso,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={1570,-200},
+          rotation=-90),
+   Rectangle(
+          extent={{1380,220},{1420,178}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 3),
+        Line(
+          points={{1600,200},{800,200},{800,-400},{600,-400}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=have_chiWat and nHp >= 3),
+    Bitmap(
+          visible=have_chiWat and nHp >= 3 and have_valHpInlIso,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={800,-200}),
+    Line( visible=have_chiWat and nHp >= 3 and have_valHpInlIso,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={770,-200},
+          rotation=-90),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and nHp >= 3 and have_valHpInlIso,
+          extent={{660,-240},{740,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+   Rectangle(
+          extent={{580,220},{620,180}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 4),
+   Rectangle(
+          extent={{-220,220},{-180,180}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 5),
+   Rectangle(
+          extent={{-1020,220},{-980,180}},
+          lineColor={0,0,0},
+          lineThickness=1,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          pattern=LinePattern.None,
+          visible=have_chiWat and nHp >= 6),
+        Line(
+          points={{800,200},{0,200},{0,-400},{-200,-400}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=have_chiWat and nHp >= 4),
+    Bitmap(
+          visible=have_chiWat and nHp >= 4 and have_valHpInlIso,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={0,-200}),
+    Line( visible=have_chiWat and nHp >= 4 and have_valHpInlIso,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-30,-200},
+          rotation=-90),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and nHp >= 4 and have_valHpInlIso,
+          extent={{-140,-240},{-60,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+        Line(
+          points={{0,200},{-800,200},{-800,-400},{-1000,-400}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=have_chiWat and nHp >= 5),
+    Bitmap(
+          visible=have_chiWat and nHp >= 5 and have_valHpInlIso,
+          extent={{-100,-100},{100,100}},
+          fileName=
+              "modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-800,-200}),
+    Line( visible=have_chiWat and nHp >= 5 and have_valHpInlIso,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-830,-200},
+          rotation=-90),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and nHp >= 5 and have_valHpInlIso,
+          extent={{-940,-240},{-860,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg"),
+        Line(
+          points={{-800,200},{-1600,200},{-1600,-400},{-1800,-400}},
+          color={0,0,0},
+          pattern=LinePattern.Dash,
+          thickness=5,
+          visible=have_chiWat and nHp >= 6),
+    Bitmap(
+          visible=have_chiWat and nHp >= 6 and have_valHpInlIso,
+          extent={{-100,-100},{100,100}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Valves/TwoWay.svg",
+          rotation=360,
+          origin={-1600,-200}),
+    Line( visible=have_chiWat and nHp >= 6 and have_valHpInlIso,
+          points={{0,30},{0,-30}},
+          color={0,0,0},
+          origin={-1630,-200},
+          rotation=-90),
+   Bitmap(visible=typ == Buildings.Templates.Components.Types.Valve.TwoWayTwoPosition
+               and have_chiWat and nHp >= 6 and have_valHpInlIso,
+          extent={{-1740,-240},{-1660,-160}},
+          fileName="modelica://Buildings/Resources/Images/Templates/Components/Actuators/TwoPosition.svg")}),
+    Documentation(
+      info="<html>
+<p>
+This model represents the heat pump isolation valves.
+The isolation valves are modeled as two-way two-position 
+valves, which can be located at the heat pump inlet and/or
+outlet depending on the settings of the parameters <code>have_valHpInlIso</code>
+and <code>have_valHpOutIso</code>.
+It is assumed that the heat pumps always provide heating hot water.
+Optionally, chilled water return and supply and the associated isolation valves
+can be modeled by setting the parameter <code>have_chiWat</code> to true.
+</p>
+<h4>Implementation details</h4>
+<p>
+By default, the isolation valves are modeled considering a linear
+variation of the pressure drop with the flow rate (<code>linearized=true</code>), 
+as opposed to the quadratic relationship usually considered for 
+a turbulent flow regime.
+By limiting the size of the system of nonlinear equations, this setting 
+reduces the risk of solver failure and the time to solution.
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end ValvesIsolation;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/package.mo b/Buildings/Templates/Plants/HeatPumps/Components/package.mo
new file mode 100644
index 00000000000..aec862402dd
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/package.mo
@@ -0,0 +1,14 @@
+within Buildings.Templates.Plants.HeatPumps;
+package Components "Package with component models"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains component models that are used in the templates
+within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps\">
+Buildings.Templates.Plants.HeatPumps</a>.
+</p>
+</html>"));
+end Components;
diff --git a/Buildings/Templates/Plants/HeatPumps/Components/package.order b/Buildings/Templates/Plants/HeatPumps/Components/package.order
new file mode 100644
index 00000000000..426b14e3579
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Components/package.order
@@ -0,0 +1,7 @@
+PumpsPrimaryDedicated
+ValvesIsolation
+Controls
+HeatPumpGroups
+Data
+Validation
+Interfaces
diff --git a/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo
new file mode 100644
index 00000000000..be40d255458
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Configuration/HeatPumpPlant.mo
@@ -0,0 +1,138 @@
+within Buildings.Templates.Plants.HeatPumps.Configuration;
+record HeatPumpPlant
+  "Configuration parameters for heat pump plant"
+  extends Modelica.Icons.Record;
+  // Generic
+  parameter Buildings.Templates.Components.Types.HeatPump typ
+    "Type of heat pump"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Components.Types.HeatPumpModel typMod
+    "Type of heat pump model"
+    annotation (Evaluate=true);
+  parameter Boolean have_heaWat
+    "Set to true if the plant provides HW"
+    annotation (Evaluate=true);
+  parameter Boolean have_hotWat
+    "Set to true if the plant provides DHW"
+    annotation (Evaluate=true);
+  parameter Boolean have_chiWat
+    "Set to true if the plant provides CHW"
+    annotation (Evaluate=true);
+  parameter Boolean have_hrc
+    "Set to true for plants with a sidestream heat recovery chiller"
+    annotation (Evaluate=true);
+  parameter Integer nHp
+    "Number of heat pumps"
+    annotation (Evaluate=true);
+  parameter Boolean is_rev
+    "Set to true for reversible heat pumps, false for heating only"
+    annotation (Evaluate=true);
+  parameter Boolean have_valHpInlIso
+    "Set to true for isolation valves at HP inlet"
+    annotation (Evaluate=true);
+  parameter Boolean have_valHpOutIso
+    "Set to true for isolation valves at HP outlet"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Plants.HeatPumps.Types.Controller typCtl
+    "Type of controller"
+    annotation (Evaluate=true);
+  parameter Integer nAirHan
+    "Number of air handling units served by the plant"
+    annotation (Evaluate=true);
+  parameter Integer nEquZon
+    "Number of terminal units (zone equipment) served by the plant"
+    annotation (Evaluate=true);
+  // Default fluid properties
+  parameter Modelica.Units.SI.Density rhoHeaWat_default
+    "HW default density"
+    annotation (Evaluate=true);
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpHeaWat_default
+    "HW default specific heat capacity"
+    annotation (Evaluate=true);
+  parameter Modelica.Units.SI.Density rhoChiWat_default
+    "CHW default density"
+    annotation (Evaluate=true);
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpChiWat_default
+    "CHW default specific heat capacity"
+    annotation (Evaluate=true);
+  parameter Modelica.Units.SI.Density rhoSou_default
+    "Source fluid default density"
+    annotation (Evaluate=true);
+  parameter Modelica.Units.SI.SpecificHeatCapacity cpSou_default
+    "Source fluid default specific heat capacity"
+    annotation (Evaluate=true);
+  // HW loop
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri
+    "Type of primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Integer nPumHeaWatPri
+    "Number of primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Integer nPumHeaWatSec
+    "Number of secondary HW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_valHeaWatMinByp
+    "Set to true if the HW loop has a minimum flow bypass valve"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Components.Types.PumpArrangement typArrPumPri
+    "Type of primary pump arrangement"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumHeaWatPriVar
+    "Set to true for variable speed primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumHeaWatSec
+    "Type of secondary HW pumps"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Plants.HeatPumps.Types.Distribution typDis
+    "Type of CHW/HW distribution system"
+    annotation (Evaluate=true);
+  parameter Boolean have_senDpHeaWatRemWir
+    "Set to true for remote HW differential pressure sensor(s) hardwired to plant or pump controller"
+    annotation (Evaluate=true);
+  parameter Integer nSenDpHeaWatRem
+    "Number of remote HW differential pressure sensors used for HW pump speed control"
+    annotation (Evaluate=true);
+  // CHW loop
+  parameter Boolean have_pumChiWatPriDed
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri
+    "Type of primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Integer nPumChiWatPri
+    "Number of primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Integer nPumChiWatSec
+    "Number of secondary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_valChiWatMinByp
+    "Set to true if the CHW loop has a minimum flow bypass valve"
+    annotation (Evaluate=true);
+  parameter Boolean have_pumChiWatPriVar
+    "Set to true for variable speed primary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumChiWatSec
+    "Type of secondary CHW pumps"
+    annotation (Evaluate=true);
+  parameter Boolean have_senDpChiWatRemWir
+    "Set to true for remote CHW differential pressure sensor(s) hardwired to plant or pump controller"
+    annotation (Evaluate=true);
+  parameter Integer nSenDpChiWatRem
+    "Number of remote CHW differential pressure sensors used for CHW pump speed control"
+    annotation (Evaluate=true);
+  parameter Boolean have_inpSch
+    "Set to true to provide schedule via software input point"
+    annotation (Evaluate=true);
+  annotation (
+    defaultComponentPrefixes="parameter",
+    defaultComponentName="cfg",
+    Documentation(
+      info="<html>
+<p>
+This record provides the set of configuration parameters for
+the heat pump plant models within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps\">
+Buildings.Templates.Plants.HeatPumps</a>.
+</p>
+</html>"));
+end HeatPumpPlant;
diff --git a/Buildings/Templates/Plants/HeatPumps/Configuration/package.mo b/Buildings/Templates/Plants/HeatPumps/Configuration/package.mo
new file mode 100644
index 00000000000..8febf249dd3
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Configuration/package.mo
@@ -0,0 +1,9 @@
+within Buildings.Templates.Plants.HeatPumps;
+package Configuration "Records for configuration parameters"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package provides records for configuration parameters.
+</p>
+</html>"));
+end Configuration;
diff --git a/Buildings/Templates/Plants/HeatPumps/Configuration/package.order b/Buildings/Templates/Plants/HeatPumps/Configuration/package.order
new file mode 100644
index 00000000000..e15cae8bbc9
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Configuration/package.order
@@ -0,0 +1 @@
+HeatPumpPlant
diff --git a/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo
new file mode 100644
index 00000000000..309f5f718d6
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Data/HeatPumpPlant.mo
@@ -0,0 +1,127 @@
+within Buildings.Templates.Plants.HeatPumps.Data;
+record HeatPumpPlant
+  "Record for heat pump plant"
+  extends Modelica.Icons.Record;
+  // Generic
+  parameter Buildings.Templates.Plants.HeatPumps.Configuration.HeatPumpPlant cfg
+    "Configuration parameters"
+    annotation (Dialog(enable=false));
+  parameter String id=""
+    "System tag"
+    annotation (Dialog(tab="Advanced"));
+  parameter Buildings.Templates.Plants.HeatPumps.Components.Data.Controller ctl(
+    final cfg=cfg)
+    "Controller"
+    annotation (Dialog(group="Controls"));
+  parameter Buildings.Templates.Plants.HeatPumps.Components.Data.HeatPumpGroup
+    hp(
+    final typ=cfg.typ,
+    final nHp=cfg.nHp,
+    final is_rev=cfg.is_rev,
+    final typMod=cfg.typMod,
+    final cpHeaWat_default=cfg.cpHeaWat_default,
+    final cpSou_default=cfg.cpSou_default,
+    TChiWatSupHp_nominal=ctl.TChiWatSup_nominal,
+    capCooHp_nominal=ctl.capCooHp_nominal,
+    mHeaWatHp_flow_nominal=ctl.VHeaWatHp_flow_nominal*cfg.rhoHeaWat_default,
+    capHeaHp_nominal=ctl.capHeaHp_nominal,
+    mChiWatHp_flow_nominal=ctl.VChiWatHp_flow_nominal*cfg.rhoChiWat_default,
+    THeaWatSupHp_nominal=ctl.THeaWatSup_nominal)
+    "Heat pumps"
+    annotation (Dialog(group="Heat pumps"));
+  // HW loop
+  parameter Buildings.Templates.Components.Data.PumpMultiple pumHeaWatPri(
+    final nPum=cfg.nPumHeaWatPri,
+    final rho_default=cfg.rhoHeaWat_default,
+    final typ=if cfg.typPumHeaWatPri <> Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+      then Buildings.Templates.Components.Types.Pump.Multiple else Buildings.Templates.Components.Types.Pump.None,
+    m_flow_nominal=fill(hp.nHp * (
+      if cfg.have_chiWat and cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None then
+        max(hp.mHeaWatHp_flow_nominal, hp.mChiWatHp_flow_nominal) else hp.mHeaWatHp_flow_nominal) /
+        max(cfg.nPumHeaWatPri, 1),
+      cfg.nPumHeaWatPri))
+    "Primary HW pumps"
+    annotation (Dialog(group="Primary HW loop"));
+  final parameter Buildings.Templates.Components.Data.PumpSingle pumHeaWatPriSin[max(cfg.nPumHeaWatPri, 1)](
+    each typ=pumHeaWatPri.typ,
+    m_flow_nominal=if pumHeaWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+      then {0} else pumHeaWatPri.m_flow_nominal,
+    dp_nominal=if pumHeaWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+      then {0} else pumHeaWatPri.dp_nominal,
+    per(
+      pressure(
+        V_flow=if pumHeaWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+          then
+              [0] else pumHeaWatPri.per.pressure.V_flow,
+        dp=if pumHeaWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+          then
+              [0] else pumHeaWatPri.per.pressure.dp)),
+    each rho_default=pumHeaWatPri.rho_default)
+    "Cast multiple pump record into single pump record array";
+  parameter Buildings.Templates.Components.Data.PumpMultiple pumHeaWatSec(
+    final nPum=cfg.nPumHeaWatSec,
+    final rho_default=cfg.rhoHeaWat_default,
+    final typ=if cfg.typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+      then Buildings.Templates.Components.Types.Pump.Multiple else Buildings.Templates.Components.Types.Pump.None)
+    "Secondary HW pumps"
+    annotation (Dialog(group="Secondary HW loop",
+      enable=cfg.have_heaWat and cfg.typPumHeaWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
+  // CHW loop
+  parameter Buildings.Templates.Components.Data.PumpMultiple pumChiWatPri(
+    final nPum=cfg.nPumChiWatPri,
+    final rho_default=cfg.rhoChiWat_default,
+    final typ=if cfg.typPumChiWatPri <> Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+      then Buildings.Templates.Components.Types.Pump.Multiple else Buildings.Templates.Components.Types.Pump.None,
+    m_flow_nominal=fill(hp.mChiWatHp_flow_nominal * hp.nHp / max(cfg.nPumChiWatPri, 1), cfg.nPumChiWatPri))
+    "Primary CHW pumps"
+    annotation (Dialog(group="Primary CHW loop",
+      enable=cfg.typPumChiWatPri<>Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None));
+  final parameter Buildings.Templates.Components.Data.PumpSingle pumChiWatPriSin[max(cfg.nPumChiWatPri, 1)](
+    each typ=pumChiWatPri.typ,
+    m_flow_nominal=if pumChiWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+      then {0} else pumChiWatPri.m_flow_nominal,
+    dp_nominal=if pumChiWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+      then {0} else pumChiWatPri.dp_nominal,
+    per(
+      pressure(
+        V_flow=if pumChiWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+          then
+              [
+          0] else pumChiWatPri.per.pressure.V_flow,
+        dp=if pumChiWatPri.typ == Buildings.Templates.Components.Types.Pump.None
+          then
+              [
+          0] else pumChiWatPri.per.pressure.dp)),
+    each rho_default=pumChiWatPri.rho_default)
+    "Cast multiple pump record into single pump record array";
+  parameter Buildings.Templates.Components.Data.PumpMultiple pumChiWatSec(
+    final nPum=cfg.nPumChiWatSec,
+    final rho_default=cfg.rhoChiWat_default,
+    final typ=if cfg.typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+      then Buildings.Templates.Components.Types.Pump.Multiple else Buildings.Templates.Components.Types.Pump.None)
+    "Secondary CHW pumps"
+    annotation (Dialog(group="Secondary CHW loop",
+      enable=cfg.typPumChiWatSec==Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized));
+  annotation (
+    defaultComponentName="dat",
+    Documentation(
+      info="<html>
+<p>
+This record provides the set of sizing and operating parameters for
+the heat pump plant models within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps\">
+Buildings.Templates.Plants.HeatPumps</a>.
+</p>
+<p>
+Most of the parameters should be assigned through the sub-record
+dedicated to the controller.
+All parameters that are also needed to parameterize other plant
+components are propagated from the controller sub-record
+to the corresponding equipment sub-records.
+Note that those parameter bindings are not final so they may be
+overwritten in case a component is parameterized at nominal
+conditions that differ from the design conditions specified
+in the controller sub-record.
+</p>
+</html>"));
+end HeatPumpPlant;
diff --git a/Buildings/Templates/Plants/HeatPumps/Data/package.mo b/Buildings/Templates/Plants/HeatPumps/Data/package.mo
new file mode 100644
index 00000000000..14334eb8a65
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Data/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Templates.Plants.HeatPumps;
+package Data "Records for design and operating parameters"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package provides records for design and operating parameters.
+</p>
+</html>"));
+end Data;
diff --git a/Buildings/Templates/Plants/HeatPumps/Data/package.order b/Buildings/Templates/Plants/HeatPumps/Data/package.order
new file mode 100644
index 00000000000..e15cae8bbc9
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Data/package.order
@@ -0,0 +1 @@
+HeatPumpPlant
diff --git a/Buildings/Templates/Plants/HeatPumps/Interfaces/Bus.mo b/Buildings/Templates/Plants/HeatPumps/Interfaces/Bus.mo
new file mode 100644
index 00000000000..98cba382fc0
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Interfaces/Bus.mo
@@ -0,0 +1,16 @@
+within Buildings.Templates.Plants.HeatPumps.Interfaces;
+expandable connector Bus
+  "Control bus for heat pump plant"
+  extends Modelica.Icons.SignalBus;
+  annotation (
+    defaultComponentName="bus",
+    Documentation(
+      info="<html>
+  <p>
+  This expandable connector provides a standard interface for
+  all control signals of the heat pump plant models within
+  <a href=\"modelica://Buildings.Templates.Plants.HeatPumps\">
+  Buildings.Templates.Plants.HeatPumps</a>.
+  </p>
+  </html>"));
+end Bus;
diff --git a/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo b/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo
new file mode 100644
index 00000000000..8f57e405b53
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Interfaces/PartialHeatPumpPlant.mo
@@ -0,0 +1,772 @@
+within Buildings.Templates.Plants.HeatPumps.Interfaces;
+partial model PartialHeatPumpPlant
+  "Interface class for heat pump plant"
+  replaceable package MediumHeaWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "HW medium"
+    annotation (Dialog(enable=have_heaWat),
+  __ctrlFlow(enable=false));
+  replaceable package MediumHotWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "DHW medium"
+    annotation (Dialog(enable=have_hotWat),
+  __ctrlFlow(enable=false));
+  replaceable package MediumChiWat=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "CHW medium"
+    annotation (Dialog(enable=have_chiWat),
+  __ctrlFlow(enable=false));
+  /*
+  Derived classes representing AWHP shall use:
+  redeclare final package MediumSou = MediumAir
+  */
+    replaceable package MediumSou=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Source-side medium"
+    annotation (Dialog(enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater),
+      __ctrlFlow(enable=false));
+  replaceable package MediumAir=Buildings.Media.Air
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Air medium"
+    annotation (Dialog(enable=typ==Buildings.Templates.Components.Types.HeatPump.AirToWater),
+  __ctrlFlow(enable=false));
+  // The current implementation only supports plants that provide HHW.
+  final parameter Boolean have_heaWat=true
+    "Set to true if the plant provides HW"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  parameter Boolean have_chiWat=true
+    "Set to true if the plant provides CHW"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  // RFE: To be exposed for templates that include optional DHW service.
+  final parameter Boolean have_hotWat=false
+    "Set to true if the plant provides DHW"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  // RFE(AntoineGautier): Add option for sidestream HRC. Always excluded for now.
+  final parameter Boolean have_hrc(
+    start=false)=false
+    "Set to true for plants with a sidestream heat recovery chiller"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+    enable=have_heaWat and have_chiWat));
+  parameter Buildings.Templates.Components.Types.HeatPump typ
+    "Type of heat pump"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pumps"));
+  parameter Buildings.Templates.Plants.HeatPumps.Configuration.HeatPumpPlant cfg(
+    final cpChiWat_default=cpChiWat_default,
+    final cpHeaWat_default=cpHeaWat_default,
+    final cpSou_default=cpSou_default,
+    final have_chiWat=have_chiWat,
+    final have_heaWat=have_heaWat,
+    final have_hrc=have_hrc,
+    final have_hotWat=have_hotWat,
+    final have_pumHeaWatPriVar=have_pumHeaWatPriVar,
+    final have_pumChiWatPriVar=have_pumChiWatPriVar,
+    final have_pumChiWatPriDed=have_pumChiWatPriDed,
+    final have_valChiWatMinByp=have_valChiWatMinByp,
+    final have_valHeaWatMinByp=have_valHeaWatMinByp,
+    final have_valHpInlIso=have_valHpInlIso,
+    final have_valHpOutIso=have_valHpOutIso,
+    final is_rev=is_rev,
+    final nHp=nHp,
+    final nPumChiWatPri=nPumChiWatPri,
+    final nPumChiWatSec=nPumChiWatSec,
+    final nPumHeaWatPri=nPumHeaWatPri,
+    final nPumHeaWatSec=nPumHeaWatSec,
+    final rhoChiWat_default=rhoChiWat_default,
+    final rhoHeaWat_default=rhoHeaWat_default,
+    final rhoSou_default=rhoSou_default,
+    final typ=typ,
+    final typArrPumPri=typArrPumPri,
+    final typDis=typDis,
+    final typPumChiWatPri=typPumChiWatPri,
+    final typPumHeaWatPri=typPumHeaWatPri,
+    final typPumChiWatSec=typPumChiWatSec,
+    final typPumHeaWatSec=typPumHeaWatSec,
+    final typCtl=ctl.typ,
+    final nAirHan=ctl.nAirHan,
+    final nEquZon=ctl.nEquZon,
+    final have_senDpHeaWatRemWir=ctl.have_senDpHeaWatRemWir,
+    final nSenDpHeaWatRem=ctl.nSenDpHeaWatRem,
+    final have_senDpChiWatRemWir=ctl.have_senDpChiWatRemWir,
+    final nSenDpChiWatRem=ctl.nSenDpChiWatRem,
+    final have_inpSch=ctl.have_inpSch)
+    "Configuration parameters"
+    annotation (__ctrlFlow(enable=false));
+  parameter Buildings.Templates.Plants.HeatPumps.Data.HeatPumpPlant dat(
+    cfg=cfg)
+    "Design and operating parameters"
+    annotation (Placement(transformation(extent={{-120,360},{-100,380}})));
+  // RFE(AntoineGautier): Allow specifying subset of units dedicated to HW, CHW or DHW production.
+  parameter Integer nHp(
+    final min=1,
+    start=1)
+    "Total number of heat pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pumps"));
+  parameter Boolean is_rev
+    "Set to true for reversible heat pumps, false for heating only"
+    annotation (Evaluate=true,
+    Dialog(group="Heat pumps"));
+  // Plants with AWHP.
+  // RFE(AntoineGautier): Add constant primary-only option.
+  final parameter Buildings.Templates.Plants.HeatPumps.Types.Distribution typDis_select1(
+    start=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)=
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    "Type of distribution system"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.AirToWater),
+    choices(
+      choice=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+      "Constant primary - Variable secondary centralized"));
+  // Plants with WWHP.
+  parameter Buildings.Templates.Plants.HeatPumps.Types.Distribution typDis_select2(
+    start=Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
+    "Type of distribution system"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration",
+    enable=typ==Buildings.Templates.Components.Types.HeatPump.WaterToWater));
+  final parameter Buildings.Templates.Plants.HeatPumps.Types.Distribution typDis=
+    if typ == Buildings.Templates.Components.Types.HeatPump.AirToWater then typDis_select1
+    else typDis_select2
+    "Type of distribution system"
+    annotation (Evaluate=true);
+  final parameter Boolean have_valHpInlIso=if not have_chiWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Dedicated then false
+    else true
+    "Set to true for isolation valves at HP inlet"
+    annotation (Evaluate=true);
+  final parameter Boolean have_valHpOutIso=if not have_chiWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Dedicated then false
+    elseif nHp == 1 then false elseif have_pumChiWatPriDed then false else true
+    "Set to true for isolation valves at HP outlet"
+    annotation (Evaluate=true);
+  parameter Buildings.Templates.Components.Types.PumpArrangement typArrPumPri=
+    Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    "Type of primary pump arrangement"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  final parameter Boolean have_bypHeaWatFix=
+    have_heaWat and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+    and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    "Set to true if the HW loop has a fixed bypass"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  final parameter Boolean have_valHeaWatMinByp=have_heaWat and typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    "Set to true if the HW loop has a minimum flow bypass valve"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  // Constant primary plants with dedicated primary pumps.
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri_select1(
+    start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
+    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+    "Type of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_heaWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+        and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)),
+    choices(
+    choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
+      "Constant speed pump specified separately",
+    choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+      "Variable speed pump specified separately"));
+  // Constant primary plants with headered primary pumps.
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri_select2(
+    start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
+    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+    "Type of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_heaWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
+        and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)),
+    choices(choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
+      "Constant speed pump specified separately",
+    choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+      "Variable speed pump specified separately"));
+  // Variable primary plants with headered primary pumps require variable speed pumps.
+  final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumHeaWatPri=
+    if have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated
+    and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
+    then typPumHeaWatPri_select1 elseif have_heaWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Headered and (typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only or typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
+    then typPumHeaWatPri_select2 elseif have_heaWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Dedicated and (typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only or typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2) then
+    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+    elseif have_heaWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
+    then Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable else
+    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    "Type of primary HW pumps"
+    annotation (Evaluate=true);
+  final parameter Boolean have_pumHeaWatPriVar=
+    typPumHeaWatPri == Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+    "Set to true for variable speed primary HW pumps"
+    annotation (Evaluate=true);
+  parameter Integer nPumHeaWatPri_select(
+    final min=0,
+    start=0)=nHp
+    "Number of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_heaWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered));
+  final parameter Integer nPumHeaWatPri=if have_heaWat then (if typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Headered then nPumHeaWatPri_select
+    else nHp) else 0
+    "Number of primary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  // RFE: Only centralized secondary HW pumps are currently supported for primary-secondary plants.
+  final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumHeaWatSec=
+    if have_heaWat and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
+    then Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    else Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Type of secondary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Secondary HW loop"));
+  // Primary-secondary plants.
+  parameter Integer nPumHeaWatSec_select(
+    final min=0)=nHp
+    "Number of secondary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Secondary HW loop",
+      enable=have_heaWat and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)));
+  final parameter Integer nPumHeaWatSec(
+    final min=0)=if not have_heaWat or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    then 0 else nPumHeaWatSec_select
+    "Number of secondary HW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Secondary HW loop"));
+  // Plants with dedicated primary pumps.
+  parameter Boolean have_pumChiWatPriDed_select(
+    start=false)=false
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_chiWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Dedicated));
+  final parameter Boolean have_pumChiWatPriDed=if have_chiWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Dedicated then have_pumChiWatPriDed_select
+    else false
+    "Set to true for plants with separate dedicated primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  final parameter Boolean have_bypChiWatFix=
+    have_chiWat and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+    and typDis <> Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    "Set to true if the CHW loop has a fixed bypass"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  final parameter Boolean have_valChiWatMinByp=have_chiWat and typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    "Set to true if the CHW loop has a minimum flow bypass valve"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  // Constant primary plants with separate dedicated primary CHW pumps.
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri_select1(
+    start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
+    typPumHeaWatPri
+    "Type of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_pumChiWatPriDed and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)));
+  // Constant primary plants with headered primary pumps.
+  parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri_select2(
+    start=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable)=
+    typPumHeaWatPri
+    "Type of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_chiWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered
+        and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)),
+    choices(choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant
+      "Constant speed pump specified separately",
+    choice=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+      "Variable speed pump specified separately"));
+  // Variable primary plants with headered primary CHW pumps require variable speed pumps.
+  final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary typPumChiWatPri=
+    if have_pumChiWatPriDed and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
+    then typPumChiWatPri_select1 elseif have_chiWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Headered and (typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only or typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2)
+    then typPumChiWatPri_select2 elseif have_pumChiWatPriDed and (typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only or typDis ==
+    Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2) then
+    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+    elseif have_chiWat and typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Headered
+    and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
+    then Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable else
+    Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+    "Type of primary CHW pumps"
+    annotation (Evaluate=true);
+  final parameter Boolean have_pumChiWatPriVar=
+    typPumChiWatPri == Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable
+    "Set to true for variable speed primary CHW pumps"
+    annotation (Evaluate=true);
+  // Plants with headered primary CHW pumps.
+  parameter Integer nPumChiWatPri_select(
+    final min=0,
+    start=0)=nHp
+    "Number of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop",
+      enable=have_chiWat and typArrPumPri==Buildings.Templates.Components.Types.PumpArrangement.Headered));
+  final parameter Integer nPumChiWatPri=if have_chiWat and typArrPumPri ==
+    Buildings.Templates.Components.Types.PumpArrangement.Headered then nPumChiWatPri_select
+    elseif have_pumChiWatPriDed then nHp else 0
+    "Number of primary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Primary loop"));
+  // RFE: Currently, only centralized secondary CHW pumps are supported for primary-secondary plants.
+  final parameter Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary typPumChiWatSec=
+    if have_chiWat and (typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+    or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)
+    then Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.Centralized
+    else Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    "Type of secondary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Secondary CHW loop"));
+  parameter Integer nPumChiWatSec_select(
+    final min=0)=nHp
+    "Number of secondary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Secondary CHW loop",
+      enable=have_chiWat and (typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Variable2
+        or typDis==Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1And2)));
+  final parameter Integer nPumChiWatSec(
+    final min=0)=if not have_chiWat or typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+    then 0 else nPumChiWatSec_select
+    "Number of secondary CHW pumps"
+    annotation (Evaluate=true,
+    Dialog(group="Secondary CHW loop"));
+  // Design and operating parameters.
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWatPri_flow_nominal=if have_heaWat
+    then dat.hp.mHeaWatHp_flow_nominal * nHp else 0
+    "Primary HW mass flow rate"
+    annotation (Evaluate=true);
+  final parameter Modelica.Units.SI.MassFlowRate mHeaWat_flow_nominal=if have_heaWat
+    then (if typPumHeaWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    then mHeaWatPri_flow_nominal else sum(dat.pumHeaWatSec.m_flow_nominal)) else 0
+    "HW mass flow rate (total, distributed to consumers)"
+    annotation (Evaluate=true);
+  final parameter Modelica.Units.SI.HeatFlowRate capHea_nominal=if have_heaWat
+    then abs(dat.hp.capHeaHp_nominal) * nHp else 0
+    "Heating capacity - All units";
+  final parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal=
+    capHea_nominal
+    "Heating heat flow rate - All units";
+  final parameter Modelica.Units.SI.Temperature THeaWatSup_nominal=dat.ctl.THeaWatSup_nominal
+    "Maximum HW supply temperature";
+  final parameter Modelica.Units.SI.Temperature THeaWatRet_nominal=
+    THeaWatSup_nominal - QHea_flow_nominal / cpHeaWat_default /
+    mHeaWat_flow_nominal
+    "HW return temperature";
+  final parameter Modelica.Units.SI.MassFlowRate mChiWatPri_flow_nominal=if have_chiWat
+    then dat.hp.mChiWatHp_flow_nominal * nHp else 0
+    "Primary CHW mass flow rate"
+    annotation (Evaluate=true);
+  final parameter Modelica.Units.SI.MassFlowRate mChiWat_flow_nominal=if have_chiWat
+    then (if typPumChiWatSec == Buildings.Templates.Plants.HeatPumps.Types.PumpsSecondary.None
+    then mChiWatPri_flow_nominal else sum(dat.pumChiWatSec.m_flow_nominal)) else 0
+    "CHW mass flow rate - Total, distributed to consumers"
+    annotation (Evaluate=true);
+  final parameter Modelica.Units.SI.HeatFlowRate capCoo_nominal=if have_chiWat
+    then abs(dat.hp.capCooHp_nominal) * nHp else 0
+    "Cooling capacity - All units";
+  final parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=-
+    capCoo_nominal
+    "Cooling heat flow rate - All units";
+  final parameter Modelica.Units.SI.Temperature TChiWatSup_nominal=dat.ctl.TChiWatSup_nominal
+    "Minimum CHW supply temperature";
+  final parameter Modelica.Units.SI.Temperature TChiWatRet_nominal=if is_rev
+    then TChiWatSup_nominal - QCoo_flow_nominal / cpChiWat_default /
+    mChiWat_flow_nominal else Buildings.Templates.Data.Defaults.TChiWatRet
+    "CHW return temperature - Each heat pump"
+    annotation (Dialog(group="Nominal condition"));
+  final parameter Modelica.Units.SI.Temperature TSouHea_nominal=dat.hp.TSouHeaHp_nominal
+    "OAT or source fluid supply temperature (evaporator entering) in heating mode - Each heat pump";
+  final parameter Modelica.Units.SI.Temperature TSouCoo_nominal=dat.hp.TSouCooHp_nominal
+    "OAT or source fluid supply temperature (evaporator entering) in cooling mode - Each heat pump";
+  // Dynamics and miscellaneous parameterss.
+  parameter Modelica.Units.SI.Time tau=30
+    "Time constant at nominal flow"
+    annotation (Dialog(tab="Dynamics",group="Nominal condition"));
+  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 allowFlowReversal=true
+    "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
+    annotation (Dialog(tab="Assumptions"),
+    Evaluate=true);
+  parameter Boolean show_T=false
+    "= true, if actual temperature at port is computed"
+    annotation (Dialog(tab="Advanced",group="Diagnostics"));
+  final parameter MediumHeaWat.Density rhoHeaWat_default=MediumHeaWat.density(staHeaWat_default)
+    "HW default density"
+    annotation (Evaluate=true);
+  final parameter MediumHeaWat.SpecificHeatCapacity cpHeaWat_default=
+    MediumHeaWat.specificHeatCapacityCp(staHeaWat_default)
+    "HW default specific heat capacity"
+    annotation (Evaluate=true);
+  final parameter MediumHeaWat.ThermodynamicState staHeaWat_default=MediumHeaWat.setState_pTX(
+    T=THeaWatSup_nominal,
+    p=MediumHeaWat.p_default,
+    X=MediumHeaWat.X_default)
+    "HW default state"
+    annotation (Evaluate=true);
+  final parameter MediumChiWat.Density rhoChiWat_default=MediumChiWat.density(staChiWat_default)
+    "CHW default density"
+    annotation (Evaluate=true);
+  final parameter MediumChiWat.SpecificHeatCapacity cpChiWat_default=
+    MediumChiWat.specificHeatCapacityCp(staChiWat_default)
+    "CHW default specific heat capacity"
+    annotation (Evaluate=true);
+  final parameter MediumChiWat.ThermodynamicState staChiWat_default=MediumChiWat.setState_pTX(
+    T=TChiWatSup_nominal,
+    p=MediumChiWat.p_default,
+    X=MediumChiWat.X_default)
+    "CHW default state"
+    annotation (Evaluate=true);
+  /*
+  Source fluid default state = heating mode:
+  - Impact of difference between TSouHea_nominal and TSouCoo_nominal on cp is about 0.5 %.
+  - Impact of difference between TSouHea_nominal and TSouCoo_nominal on rho is about 2 %,
+    with rhoSouHea_nominal > rhoSouCoo_nominal, so conservative for pump sizing.
+  */
+  final parameter MediumSou.Density rhoSou_default=MediumSou.density(staSou_default)
+    "Source fluid default density"
+    annotation (Evaluate=true);
+  final parameter MediumSou.SpecificHeatCapacity cpSou_default=MediumSou.specificHeatCapacityCp(staSou_default)
+    "Source fluid default specific heat capacity"
+    annotation (Evaluate=true);
+  final parameter MediumSou.ThermodynamicState staSou_default=MediumSou.setState_pTX(
+    T=TSouHea_nominal,
+    p=MediumSou.p_default,
+    X=MediumSou.X_default)
+    "Source fluid default state"
+    annotation (Evaluate=true);
+  Modelica.Fluid.Interfaces.FluidPort_a port_aHeaWat(
+    redeclare final package Medium=MediumHeaWat,
+    m_flow(
+      final min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    h_outflow(
+      start=MediumHeaWat.h_default,
+      nominal=MediumHeaWat.h_default))
+    if have_heaWat
+    "HW return"
+    annotation (Placement(transformation(extent={{590,-370},{610,-350}}),
+      iconTransformation(extent={{190,-190},{210,-170}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bHeaWat(
+    redeclare final package Medium=MediumHeaWat,
+    m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    h_outflow(
+      start=MediumHeaWat.h_default,
+      nominal=MediumHeaWat.h_default))
+    if have_heaWat
+    "HW supply"
+    annotation (Placement(transformation(extent={{590,-290},{610,-270}}),
+      iconTransformation(extent={{190,-110},{210,-90}})));
+  Modelica.Fluid.Interfaces.FluidPort_a port_aChiWat(
+    redeclare final package Medium=MediumChiWat,
+    m_flow(
+      final min=if allowFlowReversal then - Modelica.Constants.inf else 0),
+    h_outflow(
+      start=MediumChiWat.h_default,
+      nominal=MediumChiWat.h_default))
+    if have_chiWat
+    "CHW return"
+    annotation (Placement(transformation(extent={{590,-10},{610,10}}),
+      iconTransformation(extent={{190,-50},{210,-30}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_bChiWat(
+    redeclare final package Medium=MediumChiWat,
+    m_flow(
+      max=if allowFlowReversal then + Modelica.Constants.inf else 0),
+    h_outflow(
+      start=MediumChiWat.h_default,
+      nominal=MediumChiWat.h_default))
+    if have_chiWat
+    "CHW supply"
+    annotation (Placement(transformation(extent={{590,70},{610,90}}),
+      iconTransformation(extent={{190,30},{210,50}})));
+  Buildings.Templates.Plants.HeatPumps.Interfaces.Bus bus
+    "Plant control bus"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=90,
+      origin={-600,320}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=90,origin={-200,180})));
+  Buildings.Templates.AirHandlersFans.Interfaces.Bus busAirHan[cfg.nAirHan]
+    if cfg.nAirHan > 0
+    "Air handling unit control bus"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=-90,
+      origin={600,340}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=-90,origin={200,180})));
+  Buildings.Templates.ZoneEquipment.Interfaces.Bus busEquZon[cfg.nEquZon]
+    if cfg.nEquZon > 0
+    "Terminal unit control bus"
+    annotation (Placement(transformation(extent={{-20,-20},{20,20}},rotation=-90,
+      origin={600,300}),
+      iconTransformation(extent={{-20,-20},{20,20}},rotation=-90,origin={200,120})));
+  BoundaryConditions.WeatherData.Bus busWea
+    "Weather bus"
+    annotation (Placement(transformation(extent={{-20,380},{20,420}}),
+      iconTransformation(extent={{-20,180},{20,220}})));
+  replaceable Buildings.Templates.Plants.HeatPumps.Components.Interfaces.PartialController ctl
+    constrainedby
+    Buildings.Templates.Plants.HeatPumps.Components.Interfaces.PartialController(
+      final cfg=cfg,
+      final dat=dat.ctl)
+    "Plant controller"
+    annotation (
+    Dialog(group="Controls"),
+    Placement(transformation(extent={{460,310},{480,330}})));
+  // Miscellaneous
+  Buildings.Fluid.Sources.Outside out(
+    redeclare replaceable package Medium=Buildings.Media.Air,
+    nPorts=1)
+    "Outdoor air conditions"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=-90,
+      origin={0,380})));
+  Buildings.Fluid.Sensors.Temperature TOut(
+    redeclare replaceable package Medium=Buildings.Media.Air,
+    warnAboutOnePortConnection=false)
+    "OA temperature"
+    annotation (Placement(transformation(extent={{-30,370},{-10,390}})));
+initial equation
+  if typArrPumPri == Buildings.Templates.Components.Types.PumpArrangement.Dedicated then
+    assert(nPumHeaWatPri == nHp, "In " + getInstanceName() + ": " +
+      "In case of dedicated primary HW pumps, the number pumps (=" + String(nPumHeaWatPri) +
+      ") must be equal to the number of heat pumps (=" + String(nHp) + ").");
+  end if;
+  if have_pumChiWatPriDed then
+    assert(nPumChiWatPri == nHp, "In " + getInstanceName() + ": " +
+      "In case of separate dedicated primary CHW pumps, the number pumps (=" +
+      String(nPumChiWatPri) + ") must be equal to the number of heat pumps (=" +
+      String(nHp) + ").");
+  end if;
+equation
+  /* Control point connection - start */
+                                         connect(TOut.T, bus.TOut);
+  /* Control point connection - stop */
+                                       connect(bus, ctl.bus)
+    annotation (Line(points={{-600,320},{460,320}}, color={255,204,51},thickness=0.5));
+  connect(ctl.busAirHan, busAirHan)
+    annotation (Line(points={{480,326},{580,326},{580,340},{600,340}},   color={255,204,51},thickness=0.5));
+  connect(ctl.busEquZon, busEquZon)
+    annotation (Line(points={{480,314},{580,314},{580,300},{600,300}},   color={255,204,51},thickness=0.5));
+  connect(busWea, out.weaBus)
+    annotation (Line(points={{0,400},{0,390},{0.2,390}},color={255,204,51},thickness=0.5));
+  connect(out.ports[1], TOut.port)
+    annotation (Line(points={{0,370},{-20,370}},
+                                               color={0,127,255}));
+  annotation (
+    defaultComponentName="plaHp",
+    Icon(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-200,-200},{200,200}}),
+      graphics={
+        Line(
+          points={{20,-100},{20,-180},{200,-180}},
+          color={28,108,200},
+          thickness=5,
+          pattern=LinePattern.Dash,
+          visible=have_chiWat),
+        Line(
+          points={{0,40},{0,-100},{-40,-100}},
+          color={28,108,200},
+          thickness=5,
+          origin={160,-100},
+          rotation=-90,
+          visible=have_chiWat),
+        Rectangle(
+          extent={{-200,200},{200,-200}},
+          lineColor={0,0,255},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Text(
+          extent={{-151,-212},{149,-252}},
+          textColor={0,0,255},
+          textString="%name"),
+        Line(
+          points={{20,-40},{20,-100},{-60,-100}},
+          color={238,46,47},
+          pattern=LinePattern.Dash,
+          thickness=5),
+        Line(
+          points={{-60,60},{20,60},{20,-40}},
+          color={238,46,47},
+          thickness=5,
+          pattern=LinePattern.Dash),
+        Line(
+          points={{100,-100},{100,-180}},
+          color={238,46,47},
+          thickness=5,
+          visible=have_heaWat),
+        Rectangle(
+          extent={{-160,130},{-60,30}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-130,100},{-90,60}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-122,96},{-126,68}},
+          color={0,0,0}),
+        Line(
+          points={{-98,96},{-94,68}},
+          color={0,0,0}),
+        Rectangle(
+          extent={{-160,-32},{-60,-132}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={95,95,95},
+          fillPattern=FillPattern.Solid),
+        Ellipse(
+          extent={{-130,-62},{-90,-102}},
+          lineColor={0,0,0},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid),
+        Line(
+          points={{-122,-66},{-126,-94}},
+          color={0,0,0}),
+        Line(
+          points={{-98,-66},{-94,-94}},
+          color={0,0,0}),
+        Line(
+          points={{100,38},{100,-42}},
+          color={28,108,200},
+          thickness=5,
+          visible=have_chiWat),
+        Line(
+          points={{0,40},{0,-100}},
+          color={28,108,200},
+          thickness=5,
+          visible=have_chiWat,
+          origin={160,40},
+          rotation=-90),
+        Line(
+          points={{0,40},{0,-140}},
+          color={28,108,200},
+          thickness=5,
+          visible=have_chiWat,
+          origin={160,-40},
+          rotation=-90,
+          pattern=LinePattern.Dash),
+        Line(
+          points={{-60,-60},{60,-60},{60,40}},
+          color={238,46,47},
+          thickness=5),
+        Line(
+          points={{-60,100},{60,100},{60,40}},
+          color={238,46,47},
+          thickness=5),
+        Ellipse(
+          extent={{-40,-40},{0,-80}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={0,100,199}),
+        Polygon(
+          points={{-20,-41},{-20,-79},{-1,-60},{-20,-41}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={255,255,255}),
+        Ellipse(
+          extent={{-40,120},{0,80}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={0,100,199}),
+        Polygon(
+          points={{-20,119},{-20,81},{-1,100},{-20,119}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={255,255,255}),
+        Line(
+          points={{0,40},{0,-100},{-40,-100}},
+          color={238,46,47},
+          thickness=5,
+          visible=have_heaWat,
+          origin={160,-100},
+          rotation=-90),
+        Line(
+          points={{0,40},{0,-140},{-80,-140}},
+          color={238,46,47},
+          thickness=5,
+          visible=have_heaWat,
+          pattern=LinePattern.Dash,
+          origin={160,-180},
+          rotation=-90),
+        Ellipse(
+          extent={{130,-80},{170,-120}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={0,100,199},
+          startAngle=0,
+          endAngle=360,
+          visible=have_heaWat and typPumHeaWatSec<>Buildings.Templates.HeatingPlants.HotWater.Types.PumpsSecondary.None),
+        Polygon(
+          points={{150,-81},{150,-119},{169,-100},{150,-81}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={255,255,255},
+          visible=have_heaWat and typPumHeaWatSec<>Buildings.Templates.HeatingPlants.HotWater.Types.PumpsSecondary.None),
+        Ellipse(
+          extent={{130,60},{170,20}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.Sphere,
+          fillColor={0,100,199},
+          startAngle=0,
+          endAngle=360,
+          visible=have_chiWat and typPumChiWatSec<>Buildings.Templates.HeatingPlants.HotWater.Types.PumpsSecondary.None),
+        Polygon(
+          points={{150,59},{150,21},{169,40},{150,59}},
+          lineColor={0,0,0},
+          pattern=LinePattern.None,
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={255,255,255},
+          visible=have_chiWat and typPumChiWatSec<>Buildings.Templates.HeatingPlants.HotWater.Types.PumpsSecondary.None)}),
+    Diagram(
+      coordinateSystem(
+        preserveAspectRatio=false,
+        extent={{-600,-400},{600,400}})),
+    Documentation(
+      revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>",
+      info="<html>
+<p>
+This partial class provides a standard interface for heat pump
+plant models.
+</p>
+</html>"));
+end PartialHeatPumpPlant;
diff --git a/Buildings/Templates/Plants/HeatPumps/Interfaces/package.mo b/Buildings/Templates/Plants/HeatPumps/Interfaces/package.mo
new file mode 100644
index 00000000000..08e63c1de08
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Interfaces/package.mo
@@ -0,0 +1,9 @@
+within Buildings.Templates.Plants.HeatPumps;
+package Interfaces "Interface classes"
+  extends Modelica.Icons.InterfacesPackage;
+  annotation (Documentation(info="<html>
+<p>
+This package contains interface classes.
+</p>
+</html>"));
+end Interfaces;
diff --git a/Buildings/Templates/Plants/HeatPumps/Interfaces/package.order b/Buildings/Templates/Plants/HeatPumps/Interfaces/package.order
new file mode 100644
index 00000000000..395e1f57ca1
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Interfaces/package.order
@@ -0,0 +1,2 @@
+Bus
+PartialHeatPumpPlant
diff --git a/Buildings/Templates/Plants/HeatPumps/Types.mo b/Buildings/Templates/Plants/HeatPumps/Types.mo
new file mode 100644
index 00000000000..eced4ebe8bf
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Types.mo
@@ -0,0 +1,48 @@
+within Buildings.Templates.Plants.HeatPumps;
+package Types
+  "Package with type definitions"
+  extends Modelica.Icons.TypesPackage;
+  type Controller = enumeration(
+    AirToWater
+      "Controller for AWHP plant",
+    OpenLoop
+      "Open loop controller")
+    "Enumeration to specify the plant controller";
+  type Distribution = enumeration(
+    Constant1Only
+      "Constant primary-only",
+    Variable1Only
+      "Variable primary-only",
+    Constant1Variable2
+      "Constant primary - Variable secondary centralized",
+    Variable1And2
+      "Variable primary - Variable secondary centralized")
+    "Enumeration to specify the type of CHW/HW distribution system";
+  type PumpsPrimary = enumeration(
+    Constant
+      "Constant speed pump specified separately",
+    Variable
+      "Variable speed pump specified separately",
+    None
+      "No pump")
+    "Enumeration to specify the type of primary pumps";
+  type PumpsSecondary = enumeration(
+    None
+      "No secondary pumps (primary-only)",
+    Centralized
+      "Variable secondary centralized")
+    "Enumeration to specify the type of secondary HW pumps";
+  type SensorLocation = enumeration(
+    Return
+      "Sensor in the return line",
+    Supply
+      "Sensor in the supply line")
+    "Enumeration to specify the sensor location";
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains type definitions.
+</p>
+</html>"));
+end Types;
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo b/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo
new file mode 100644
index 00000000000..dc1438e2bd2
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/AirToWater.mo
@@ -0,0 +1,386 @@
+within Buildings.Templates.Plants.HeatPumps.Validation;
+model AirToWater
+  "Validation of AWHP plant template"
+  extends Modelica.Icons.Example;
+  replaceable package Medium=Buildings.Media.Water
+    constrainedby Modelica.Media.Interfaces.PartialMedium
+    "Main medium (common for CHW and HW)";
+  parameter Boolean have_chiWat=true
+    "Set to true if the plant provides CHW"
+    annotation (Evaluate=true,
+    Dialog(group="Configuration"));
+  inner parameter UserProject.Data.AllSystems datAll(
+    pla(final cfg=pla.cfg))
+    "Plant parameters"
+    annotation (Placement(transformation(extent={{-120,160},{-100,180}})));
+  parameter Boolean allowFlowReversal=true
+    "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
+    annotation (Dialog(tab="Assumptions"),
+    Evaluate=true);
+  parameter Modelica.Fluid.Types.Dynamics energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial
+    "Type of energy balance: dynamic (3 initialization options) or steady state"
+    annotation (Evaluate=true,
+    Dialog(tab="Dynamics",group="Conservation equations"));
+  BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
+    filNam=Modelica.Utilities.Files.loadResource(
+      "modelica://Buildings/Resources/weatherdata/USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos"))
+    "Outdoor conditions"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=0,
+      origin={-170,-40})));
+  Fluid.HeatExchangers.SensibleCooler_T loaHeaWat(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=pla.mHeaWat_flow_nominal,
+    show_T=true,
+    final dp_nominal=0,
+    final energyDynamics=energyDynamics,
+    tau=300,
+    QMin_flow=-pla.capHea_nominal)
+    "HW system approximated by prescribed return temperature"
+    annotation (Placement(transformation(extent={{70,-110},{90,-90}})));
+  Fluid.HeatExchangers.Heater_T loaChiWat(
+    redeclare final package Medium=Medium,
+    final m_flow_nominal=pla.mChiWat_flow_nominal,
+    show_T=true,
+    final dp_nominal=0,
+    final energyDynamics=energyDynamics,
+    tau=300,
+    QMax_flow=pla.capCoo_nominal)
+    if have_chiWat
+    "CHW system system approximated by prescribed return temperature"
+    annotation (Placement(transformation(extent={{70,-50},{90,-30}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage     valDisHeaWat(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=pla.mHeaWat_flow_nominal,
+    dpValve_nominal=3E4,
+    dpFixed_nominal=datAll.pla.ctl.dpHeaWatRemSet_max[1] - 3E4)
+    "Distribution system approximated by variable flow resistance"
+    annotation (Placement(transformation(extent={{110,-110},{130,-90}})));
+  Fluid.Actuators.Valves.TwoWayEqualPercentage     valDisChiWat(
+    redeclare final package Medium=Medium,
+    m_flow_nominal=pla.mChiWat_flow_nominal,
+    dpValve_nominal=3E4,
+    dpFixed_nominal=datAll.pla.ctl.dpChiWatRemSet_max[1] - 3E4)
+    if have_chiWat
+    "Distribution system approximated by variable flow resistance"
+    annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
+  Buildings.Templates.Plants.HeatPumps.AirToWater pla(
+    redeclare final package MediumHeaWat=Medium,
+    final dat=datAll.pla,
+    final have_chiWat=have_chiWat,
+    nHp=3,
+    typArrPumPri=Buildings.Templates.Components.Types.PumpArrangement.Dedicated,
+    typPumHeaWatPri_select2=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Variable,
+    typPumChiWatPri_select1=Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.Constant,
+    final energyDynamics=energyDynamics,
+    final allowFlowReversal=allowFlowReversal,
+    show_T=true,
+    ctl(
+      nAirHan=1,
+      nEquZon=0,
+      have_senVHeaWatPri_select=true,
+      have_senVChiWatPri_select=true,
+      have_senTHeaWatPriRet_select=true,
+      have_senTChiWatPriRet_select=true,
+      have_senTHeaWatSecRet=true,
+      have_senTChiWatSecRet=true,
+      have_senDpHeaWatRemWir=true))
+    "Heat pump plant"
+    annotation (Placement(transformation(extent={{-80,-100},{-40,-60}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant TDum(
+    k=293.15,
+    y(final unit="K",
+      displayUnit="degC"))
+    "Placeholder signal for request generator"
+    annotation (Placement(transformation(extent={{-180,130},{-160,150}})));
+  Fluid.Sensors.RelativePressure dpHeaWatRem_1(
+    redeclare final package Medium = Medium)
+    "HW differential pressure at one remote location"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={40,-120})));
+  Fluid.Sensors.RelativePressure dpChiWatRem_1(
+    redeclare final package Medium = Medium) if have_chiWat
+    "CHW differential pressure at one remote location"
+    annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={40,-60})));
+  Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.PlantRequests reqPlaRes(
+    final heaCoi=Buildings.Controls.OBC.ASHRAE.G36.Types.HeatingCoil.WaterBased, final
+      cooCoi=if have_chiWat then Buildings.Controls.OBC.ASHRAE.G36.Types.CoolingCoil.WaterBased
+         else Buildings.Controls.OBC.ASHRAE.G36.Types.CoolingCoil.None)
+    "Plant and reset request"
+    annotation (Placement(transformation(extent={{90,102},{70,122}})));
+  AirHandlersFans.Interfaces.Bus busAirHan "AHU control bus" annotation (
+      Placement(transformation(extent={{-60,100},{-20,140}}),iconTransformation(
+          extent={{-340,-140},{-300,-100}})));
+  Interfaces.Bus busPla "Plant control bus" annotation (Placement(
+        transformation(extent={{-100,-40},{-60,0}}), iconTransformation(extent
+          ={{-370,-70},{-330,-30}})));
+  Buildings.Controls.OBC.CDL.Routing.RealVectorFilter dpChiWatRem(
+    final nin=pla.cfg.nSenDpChiWatRem,
+    final nout=pla.cfg.nSenDpChiWatRem) if have_chiWat
+    "Gather all remote CHW differential pressure signals"
+    annotation (Placement(transformation(extent={{10,10},{-10,30}})));
+  Buildings.Controls.OBC.CDL.Routing.RealVectorFilter dpHeaWatRem(
+    final nin=pla.cfg.nSenDpHeaWatRem,
+    final nout=pla.cfg.nSenDpHeaWatRem)
+    "Gather all remote HW differential pressure signals"
+    annotation (Placement(transformation(extent={{10,-30},{-10,-10}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.TimeTable ratFlo(
+    table=[0,0,0; 5,0,0; 7,1,0; 12,0.2,0.2; 16,0,1; 22,0.1,0.1; 24,0,0],
+    timeScale=3600)
+    "Source signal for flow rate ratio – Index 1 for HW, 2 for CHW"
+    annotation (Placement(transformation(extent={{-180,70},{-160,90}})));
+  Buildings.Controls.OBC.CDL.Reals.PID ctlEquZon[if have_chiWat then 2 else 1](
+    each k=0.1,
+    each Ti=60,
+    each final reverseActing=true) "Zone equipment controller"
+    annotation (Placement(transformation(extent={{70,70},{90,90}})));
+  Buildings.Controls.OBC.CDL.Reals.MultiplyByParameter norFlo[if have_chiWat
+     then 2 else 1](
+     k=if have_chiWat then {1/pla.mHeaWat_flow_nominal,1/pla.mChiWat_flow_nominal}
+         else {1/pla.mHeaWat_flow_nominal})
+     "Normalize flow rate" annotation (
+     Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=90,
+        origin={180,0})));
+  Fluid.Sensors.MassFlowRate mChiWat_flow(
+   redeclare final package Medium = Medium) if have_chiWat
+   "CHW mass flow rate" annotation (
+      Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={160,-60})));
+  Fluid.Sensors.MassFlowRate mHeaWat_flow(redeclare final package Medium =
+        Medium) "HW mass flow rate" annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=-90,
+        origin={160,-120})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter TChiWatRet(p=pla.TChiWatRet_nominal
+         - pla.TChiWatSup_nominal) if have_chiWat
+    "Prescribed CHW return temperature"
+    annotation (Placement(transformation(extent={{-130,30},{-110,50}})));
+  Buildings.Controls.OBC.CDL.Reals.AddParameter THeaWatRet(p=pla.THeaWatRet_nominal
+         - pla.THeaWatSup_nominal) "Prescribed HW return temperature"
+    annotation (Placement(transformation(extent={{-130,-10},{-110,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Max max2 "Limit prescribed HWRT"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Buildings.Controls.OBC.CDL.Reals.Min min1 if have_chiWat
+    "Limit prescribed CHWRT"
+    annotation (Placement(transformation(extent={{-90,30},{-70,50}})));
+  Buildings.Controls.OBC.CDL.Integers.Multiply mulInt[4]
+    "Importance multiplier"
+    annotation (Placement(transformation(extent={{0,110},{-20,130}})));
+  Buildings.Controls.OBC.CDL.Integers.Sources.Constant cst[4](each k=10)
+    "Constant"
+    annotation (Placement(transformation(extent={{40,150},{20,170}})));
+  Buildings.Fluid.FixedResistances.PressureDrop pipHeaWat(
+    redeclare final package Medium =Medium,
+    final m_flow_nominal=pla.mHeaWat_flow_nominal,
+    final dp_nominal=max(
+      max(datAll.pla.pumHeaWatPri.dp_nominal),
+      max(datAll.pla.pumHeaWatSec.dp_nominal)) - datAll.pla.ctl.dpHeaWatRemSet_max[1])
+    "Piping"
+    annotation (Placement(transformation(extent={{10,-150},{-10,-130}})));
+  Buildings.Fluid.FixedResistances.PressureDrop pipChiWat(
+    redeclare final package Medium =Medium,
+    final m_flow_nominal=pla.mChiWat_flow_nominal,
+    final dp_nominal=max(
+      max(datAll.pla.pumChiWatPri.dp_nominal),
+      max(datAll.pla.pumChiWatSec.dp_nominal)) - datAll.pla.ctl.dpChiWatRemSet_max[1])
+    if have_chiWat
+    "Piping"
+    annotation (Placement(transformation(extent={{10,-90},{-10,-70}})));
+  Buildings.Controls.OBC.CDL.Reals.Sources.Constant con(k=293.15)
+    "Constant limiting prescribed return temperature"
+    annotation (Placement(transformation(extent={{-180,10},{-160,30}})));
+  Controls.Utilities.PlaceholderInteger ph[2](each final have_inp=have_chiWat,
+      each final u_internal=0) "Placeholder value"
+    annotation (Placement(transformation(extent={{40,114},{20,134}})));
+equation
+  if have_chiWat then
+    connect(mulInt[3].y, busAirHan.reqResChiWat)
+      annotation (Line(points={{-22,120},{-40,120}}, color={255,127,0}));
+    connect(mulInt[4].y, busAirHan.reqPlaChiWat)
+      annotation (Line(points={{-22,120},{-40,120}}, color={255,127,0}));
+  end if;
+  connect(weaDat.weaBus, pla.busWea)
+    annotation (Line(points={{-160,-40},{-60,-40},{-60,-60}},
+                                                           color={255,204,51},thickness=0.5));
+  connect(pla.port_bChiWat, loaChiWat.port_a)
+    annotation (Line(points={{-40,-76},{-20,-76},{-20,-40},{70,-40}},
+                                                             color={0,127,255}));
+  connect(loaChiWat.port_b, valDisChiWat.port_a)
+    annotation (Line(points={{90,-40},{110,-40}},
+                                            color={0,127,255}));
+  connect(loaHeaWat.port_b, valDisHeaWat.port_a)
+    annotation (Line(points={{90,-100},{110,-100}},
+                                                color={0,127,255}));
+  connect(pla.port_bHeaWat, loaHeaWat.port_a)
+    annotation (Line(points={{-40,-90},{-20,-90},{-20,-100},{70,-100}},
+                                                                 color={0,127,255}));
+  connect(loaChiWat.port_a, dpChiWatRem_1.port_a)
+    annotation (Line(points={{70,-40},{40,-40},{40,-50}}, color={0,127,255}));
+  connect(dpHeaWatRem_1.port_a, loaHeaWat.port_a) annotation (Line(points={{40,-110},
+          {40,-100},{70,-100}}, color={0,127,255}));
+  connect(TDum.y, reqPlaRes.TAirSup) annotation (Line(points={{-158,140},{100,
+          140},{100,120},{92,120}},color={0,0,127}));
+  connect(TDum.y, reqPlaRes.TAirSupSet) annotation (Line(points={{-158,140},{
+          100,140},{100,115},{92,115}},
+                                   color={0,0,127}));
+  connect(busAirHan, pla.busAirHan[1]) annotation (Line(
+      points={{-40,120},{-40,-62}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(pla.bus, busPla) annotation (Line(
+      points={{-80,-62},{-80,-20}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(dpHeaWatRem.y, busPla.dpHeaWatRem)
+    annotation (Line(points={{-12,-20},{-80,-20}}, color={0,0,127}));
+  connect(dpChiWatRem.y, busPla.dpChiWatRem)
+    annotation (Line(points={{-12,20},{-20,20},{-20,-18},{-80,-18},{-80,-20}},
+                                                           color={0,0,127}));
+  connect(valDisChiWat.y_actual, reqPlaRes.uCooCoiSet) annotation (Line(points={{125,-33},
+          {140,-33},{140,109},{92,109}},          color={0,0,127}));
+  connect(valDisHeaWat.y_actual, reqPlaRes.uHeaCoiSet) annotation (Line(points={{125,-93},
+          {136,-93},{136,104},{92,104}},          color={0,0,127}));
+  connect(dpHeaWatRem_1.p_rel, dpHeaWatRem.u[1]) annotation (Line(points={{31,-120},
+          {20,-120},{20,-20},{12,-20}},
+                                      color={0,0,127}));
+  connect(dpChiWatRem_1.p_rel, dpChiWatRem.u[1]) annotation (Line(points={{31,-60},
+          {22,-60},{22,20},{12,20}},
+                                   color={0,0,127}));
+  connect(valDisChiWat.port_b, mChiWat_flow.port_a) annotation (Line(points={{130,-40},
+          {160,-40},{160,-50}},      color={0,127,255}));
+  connect(mChiWat_flow.port_b, dpChiWatRem_1.port_b) annotation (Line(points={{160,
+          -70},{160,-80},{40,-80},{40,-70}}, color={0,127,255}));
+  connect(valDisHeaWat.port_b, mHeaWat_flow.port_a) annotation (Line(points={{130,
+          -100},{160,-100},{160,-110}}, color={0,127,255}));
+  connect(mHeaWat_flow.port_b, dpHeaWatRem_1.port_b) annotation (Line(points={{160,
+          -130},{160,-140},{40,-140},{40,-130}}, color={0,127,255}));
+  connect(mHeaWat_flow.m_flow, norFlo[1].u) annotation (Line(points={{171,-120},
+          {180,-120},{180,-12}}, color={0,0,127}));
+  connect(mChiWat_flow.m_flow, norFlo[2].u)
+    annotation (Line(points={{171,-60},{180,-60},{180,-12}}, color={0,0,127}));
+  connect(norFlo.y, ctlEquZon.u_m) annotation (Line(points={{180,12},{180,60},{80,
+          60},{80,68}}, color={0,0,127}));
+  connect(ratFlo.y[1:(if have_chiWat then 2 else 1)], ctlEquZon.u_s)
+    annotation (Line(points={{-158,80},{68,80}}, color={0,0,127}));
+  connect(ctlEquZon[2].y, valDisChiWat.y) annotation (Line(points={{92,80},{100,
+          80},{100,-20},{120,-20},{120,-28}}, color={0,0,127}));
+  connect(ctlEquZon[1].y, valDisHeaWat.y) annotation (Line(points={{92,80},{100,
+          80},{100,-84},{120,-84},{120,-88}}, color={0,0,127}));
+  connect(busPla.THeaWatPriSup, THeaWatRet.u) annotation (Line(
+      points={{-80,-20},{-140,-20},{-140,0},{-132,0}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(busPla.TChiWatPriSup, TChiWatRet.u) annotation (Line(
+      points={{-80,-20},{-140,-20},{-140,40},{-132,40}},
+      color={255,204,51},
+      thickness=0.5));
+  connect(TChiWatRet.y,min1. u1) annotation (Line(points={{-108,40},{-100,40},{-100,
+          46},{-92,46}}, color={0,0,127}));
+  connect(min1.y, loaChiWat.TSet) annotation (Line(points={{-68,40},{62,40},{62,
+          -32},{68,-32}}, color={0,0,127}));
+  connect(max2.y, loaHeaWat.TSet) annotation (Line(points={{-68,0},{60,0},{60,-92},
+          {68,-92}}, color={0,0,127}));
+  connect(cst.y, mulInt.u1) annotation (Line(points={{18,160},{6,160},{6,126},{2,
+          126}}, color={255,127,0}));
+  connect(mulInt[1].y, busAirHan.reqResHeaWat) annotation (Line(points={{-22,120},
+          {-30,120},{-30,120},{-40,120}}, color={255,127,0}));
+  connect(mulInt[2].y, busAirHan.reqPlaHeaWat)
+    annotation (Line(points={{-22,120},{-40,120}}, color={255,127,0}));
+  connect(pipHeaWat.port_b, pla.port_aHeaWat) annotation (Line(points={{-10,-140},
+          {-30,-140},{-30,-98},{-40,-98}}, color={0,127,255}));
+  connect(pipChiWat.port_b, pla.port_aChiWat) annotation (Line(points={{-10,-80},
+          {-20,-80},{-20,-84},{-40,-84}}, color={0,127,255}));
+  connect(mChiWat_flow.port_b, pipChiWat.port_a) annotation (Line(points={{160,-70},
+          {160,-80},{10,-80}}, color={0,127,255}));
+  connect(mHeaWat_flow.port_b, pipHeaWat.port_a) annotation (Line(points={{160,-130},
+          {160,-140},{10,-140}}, color={0,127,255}));
+  connect(con.y, min1.u2) annotation (Line(points={{-158,20},{-100,20},{-100,34},
+          {-92,34}}, color={0,0,127}));
+  connect(con.y, max2.u1) annotation (Line(points={{-158,20},{-100,20},{-100,6},
+          {-92,6}}, color={0,0,127}));
+  connect(THeaWatRet.y, max2.u2) annotation (Line(points={{-108,0},{-100,0},{
+          -100,-6},{-92,-6}}, color={0,0,127}));
+  connect(reqPlaRes.yChiWatResReq, ph[1].u) annotation (Line(points={{68,120},{
+          50,120},{50,124},{42,124}}, color={255,127,0}));
+  connect(reqPlaRes.yChiPlaReq, ph[2].u) annotation (Line(points={{68,115},{50,
+          115},{50,124},{42,124}}, color={255,127,0}));
+  connect(reqPlaRes.yHotWatResReq, mulInt[1].u2) annotation (Line(points={{68,
+          109},{12,109},{12,114},{2,114}}, color={255,127,0}));
+  connect(reqPlaRes.yHotWatPlaReq, mulInt[2].u2) annotation (Line(points={{68,
+          104},{12,104},{12,114},{2,114}}, color={255,127,0}));
+  connect(ph[1].y, mulInt[3].u2) annotation (Line(points={{18,124},{12,124},{12,
+          114},{2,114}}, color={255,127,0}));
+  connect(ph[2].y, mulInt[4].u2) annotation (Line(points={{18,124},{12,124},{12,
+          114},{2,114}}, color={255,127,0}));
+  annotation (
+    __Dymola_Commands(
+      file=
+        "modelica://Buildings/Resources/Scripts/Dymola/Templates/Plants/HeatPumps/Validation/AirToWater.mos"
+        "Simulate and plot"),
+    experiment(
+      Tolerance=1e-6,
+      StopTime=86400.0),
+    Documentation(
+      info="<html>
+<p>
+This model validates
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.AirToWater\">
+Buildings.Templates.Plants.HeatPumps.AirToWater</a>
+by simulating a <i>24</i>-hour period with overlapping heating and
+cooling loads.
+The heating loads reach their peak value first, the cooling loads reach it last.
+</p>
+<p>
+Three equally sized heat pumps are modeled. All can be lead/lag alternated.
+A unique aggregated load is modeled on each loop by means of a cooling or heating
+component controlled to maintain a constant <i>&Delta;T</i>
+and a modulating valve controlled to track a prescribed flow rate.
+An importance multiplier of <i>10</i> is applied to the plant requests 
+and reset requests generated from the valve position.
+</p>
+<p>
+The user can toggle the top-level parameter <code>have_chiWat</code>
+to switch between a cooling and heating system (the default setting) 
+to a heating-only system.
+Advanced equipment and control options can be modified via the parameter
+dialog of the plant component.
+</p>
+<p>
+Simulating this model shows how the plant responds to a varying load by 
+</p>
+<ul>
+<li>
+staging or unstaging the AWHPs and associated primary pumps,
+</li>
+<li>
+rotating lead/lag alternate equipment to ensure even wear,
+</li>
+<li>
+resetting the supply temperature and remote differential pressure 
+in both the CHW and HW loops based on the valve position,
+</li>
+<li>
+staging and controlling the secondary pumps to meet the 
+remote differential pressure setpoint.
+</li>
+</ul>
+</html>", revisions="<html>
+<ul>
+<li>
+March 29, 2024, by Antoine Gautier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"),
+    Diagram(
+      coordinateSystem(
+        extent={{-200,-200},{200,200}})));
+end AirToWater;
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo
new file mode 100644
index 00000000000..29b78074952
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/AllSystems.mo
@@ -0,0 +1,84 @@
+within Buildings.Templates.Plants.HeatPumps.Validation.UserProject.Data;
+class AllSystems
+  "Top-level (whole building) system parameters"
+  extends Buildings.Templates.Data.AllSystems(
+    sysUni=Buildings.Templates.Types.Units.SI,
+    stdEne=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
+    stdVen=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,
+    ashCliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.ASHRAEClimateZone.Zone_3B);
+  parameter Buildings.Templates.Plants.HeatPumps.Data.HeatPumpPlant pla(
+    hp(
+      capHeaHp_nominal=500E3,
+      capCooHp_nominal=500E3,
+      mHeaWatHp_flow_nominal=pla.hp.capHeaHp_nominal/abs(pla.ctl.THeaWatSup_nominal
+           - Buildings.Templates.Data.Defaults.THeaWatRetMed)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      mChiWatHp_flow_nominal=pla.hp.capCooHp_nominal/abs(pla.ctl.TChiWatSup_nominal
+           - Buildings.Templates.Data.Defaults.TChiWatRet)/Buildings.Utilities.Psychrometrics.Constants.cpWatLiq,
+      dpHeaWatHp_nominal=Buildings.Templates.Data.Defaults.dpHeaWatHp,
+      TSouHeaHp_nominal=Buildings.Templates.Data.Defaults.TOutHpHeaLow,
+      TSouCooHp_nominal=Buildings.Templates.Data.Defaults.TOutHpCoo,
+      perFitHp(hea(
+          P=pla.hp.capHeaHp_nominal/Buildings.Templates.Data.Defaults.COPHpAwHea,
+          coeQ={-4.2670305442,-0.7381077035,6.0049480456,0,0},
+          coeP={-4.9107455513,5.3665308366,0.5447612754,0,0},
+          TRefLoa=pla.hp.THeaWatRetHp_nominal,
+          TRefSou=pla.hp.TSouHeaHp_nominal), coo(
+          P=pla.hp.capCooHp_nominal/Buildings.Templates.Data.Defaults.COPHpAwCoo,
+          coeQ={-2.2545246871,6.9089257665,-3.6548225094,0,0},
+          coeP={-5.8086010402,1.6894933858,5.1167787436,0,0},
+          TRefLoa=pla.hp.TChiWatRetHp_nominal,
+          TRefSou=pla.hp.TSouCooHp_nominal))),
+    pumHeaWatPri(dp_nominal=fill(
+      (if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+        then max(pla.hp.dpHeaWatHp_nominal, pla.hp.dpChiWatHp_nominal) else  pla.hp.dpHeaWatHp_nominal) *1.2, pla.cfg.nPumHeaWatPri)
+           .+ (if pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+           or pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+           then Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max else 0)),
+    pumHeaWatSec(
+      m_flow_nominal=fill(
+        pla.ctl.VHeaWatSec_flow_nominal*Buildings.Media.Water.d_const/max(1,pla.cfg.nPumHeaWatSec), pla.cfg.nPumHeaWatSec),
+      dp_nominal=fill(Buildings.Templates.Data.Defaults.dpHeaWatLocSet_max, pla.cfg.nPumHeaWatSec)),
+    pumChiWatPri(dp_nominal=fill(pla.hp.dpChiWatHp_nominal*1.2, pla.cfg.nPumChiWatPri)
+           .+ (if pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Constant1Only
+           or pla.cfg.typDis == Buildings.Templates.Plants.HeatPumps.Types.Distribution.Variable1Only
+           then Buildings.Templates.Data.Defaults.dpChiWatLocSet_max else 0)),
+    pumChiWatSec(
+      m_flow_nominal=fill(
+        pla.ctl.VChiWatSec_flow_nominal*Buildings.Media.Water.d_const/max(1,pla.cfg.nPumChiWatSec), pla.cfg.nPumChiWatSec),
+      dp_nominal=fill(Buildings.Templates.Data.Defaults.dpChiWatLocSet_max, pla.cfg.nPumChiWatSec)),
+    ctl(
+      THeaWatSupSet_min=298.15,
+      VHeaWatSec_flow_nominal=pla.cfg.nHp * pla.ctl.VHeaWatHp_flow_nominal / 1.1,
+      TChiWatSupSet_max=288.15,
+      VChiWatSec_flow_nominal=pla.cfg.nHp * pla.ctl.VChiWatHp_flow_nominal / 1.1,
+      dpChiWatRemSet_max={Buildings.Templates.Data.Defaults.dpChiWatRemSet_max},
+      dpHeaWatRemSet_max={Buildings.Templates.Data.Defaults.dpHeaWatRemSet_max},
+      THeaWatSup_nominal=Buildings.Templates.Data.Defaults.THeaWatSupMed,
+      TOutChiWatLck=273.15,
+      TOutHeaWatLck=Buildings.Templates.Data.Defaults.TOutHeaWatLck,
+      VHeaWatHp_flow_nominal=pla.hp.mHeaWatHp_flow_nominal/Buildings.Media.Water.d_const,
+      VChiWatHp_flow_nominal=pla.hp.mChiWatHp_flow_nominal/Buildings.Media.Water.d_const,
+      capHeaHp_nominal=pla.hp.capHeaHp_nominal,
+      capCooHp_nominal=pla.hp.capCooHp_nominal,
+      TChiWatSup_nominal=Buildings.Templates.Data.Defaults.TChiWatSup,
+      yPumChiWatPriSet=if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+        then pla.hp.mChiWatHp_flow_nominal/max(pla.hp.mHeaWatHp_flow_nominal, pla.hp.mChiWatHp_flow_nominal) else 1,
+      yPumHeaWatPriSet=if pla.cfg.have_chiWat and pla.cfg.typPumChiWatPri==Buildings.Templates.Plants.HeatPumps.Types.PumpsPrimary.None
+        then pla.hp.mHeaWatHp_flow_nominal/max(pla.hp.mHeaWatHp_flow_nominal, pla.hp.mChiWatHp_flow_nominal) else 1,
+      staEqu={fill(i/pla.cfg.nHp, pla.cfg.nHp) for i in 1:pla.cfg.nHp}))
+    "Parameters for heat pump plant"
+    annotation (Dialog(group="Plants"),
+    Placement(transformation(extent={{-10,0},{10,20}})));
+
+  annotation (
+    defaultComponentPrefixes="inner parameter",
+    defaultComponentName="datAll",
+    Documentation(
+      info="<html>
+<p>
+This class provides the set of sizing and operating parameters for
+the whole HVAC system.
+It is aimed for validation purposes only.
+</p>
+</html>"));
+end AllSystems;
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo
new file mode 100644
index 00000000000..e083ed1c4bd
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Templates.Plants.HeatPumps.Validation.UserProject;
+package Data "Package with classes for storing system parameters"
+  extends Modelica.Icons.MaterialPropertiesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package provides records for design and operating parameters
+that are used for validation purposes.
+</p>
+</html>"));
+end Data;
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.order b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.order
new file mode 100644
index 00000000000..3831742ec60
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/Data/package.order
@@ -0,0 +1 @@
+AllSystems
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo
new file mode 100644
index 00000000000..0080c5049a9
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.mo
@@ -0,0 +1,11 @@
+within Buildings.Templates.Plants.HeatPumps.Validation;
+package UserProject "Package with configured models"
+  extends Modelica.Icons.VariantsPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains models used for validation purposes.
+</p>
+</html>"));
+end UserProject;
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.order b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.order
new file mode 100644
index 00000000000..0b7088ec633
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/UserProject/package.order
@@ -0,0 +1 @@
+Data
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/package.mo b/Buildings/Templates/Plants/HeatPumps/Validation/package.mo
new file mode 100644
index 00000000000..8d54b9e0ff9
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/package.mo
@@ -0,0 +1,18 @@
+within Buildings.Templates.Plants.HeatPumps;
+package Validation "Package with validation models"
+  extends Modelica.Icons.ExamplesPackage;
+  annotation (
+    Documentation(
+      info="<html>
+<p>
+This package contains models validating the templates within
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps\">
+Buildings.Templates.Plants.HeatPumps</a>
+for various system configurations.
+</p>
+<p>
+The models also illustrate parameter propagation from the top-level
+HVAC system record <code>datAll</code>.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Templates/Plants/HeatPumps/Validation/package.order b/Buildings/Templates/Plants/HeatPumps/Validation/package.order
new file mode 100644
index 00000000000..71336f7e6e9
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/Validation/package.order
@@ -0,0 +1,2 @@
+AirToWater
+UserProject
diff --git a/Buildings/Templates/Plants/HeatPumps/package.mo b/Buildings/Templates/Plants/HeatPumps/package.mo
new file mode 100644
index 00000000000..6d48e499260
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/package.mo
@@ -0,0 +1,9 @@
+within Buildings.Templates.Plants;
+package HeatPumps "Heat pump plant"
+  extends Modelica.Icons.Package;
+  annotation (
+    Documentation(
+      info="<html>
+<p>This package contains templates for heat pump plants.</p>
+</html>"));
+end HeatPumps;
diff --git a/Buildings/Templates/Plants/HeatPumps/package.order b/Buildings/Templates/Plants/HeatPumps/package.order
new file mode 100644
index 00000000000..215baa2eb40
--- /dev/null
+++ b/Buildings/Templates/Plants/HeatPumps/package.order
@@ -0,0 +1,7 @@
+AirToWater
+Components
+Configuration
+Data
+Types
+Validation
+Interfaces
diff --git a/Buildings/Templates/Plants/package.mo b/Buildings/Templates/Plants/package.mo
new file mode 100644
index 00000000000..ce672ee403f
--- /dev/null
+++ b/Buildings/Templates/Plants/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Templates;
+package Plants
+  "Central plants"
+  extends Modelica.Icons.Package;
+  annotation (
+    Documentation(
+      info="<html>
+<p>This package contains templates for central plants.</p>
+</html>"));
+end Plants;
diff --git a/Buildings/Templates/Plants/package.order b/Buildings/Templates/Plants/package.order
new file mode 100644
index 00000000000..fd79608553d
--- /dev/null
+++ b/Buildings/Templates/Plants/package.order
@@ -0,0 +1,2 @@
+Controls
+HeatPumps
diff --git a/Buildings/Templates/Utilities/computeBalancingPressureDrop.mo b/Buildings/Templates/Utilities/computeBalancingPressureDrop.mo
new file mode 100644
index 00000000000..4f03c83310f
--- /dev/null
+++ b/Buildings/Templates/Utilities/computeBalancingPressureDrop.mo
@@ -0,0 +1,49 @@
+within Buildings.Templates.Utilities;
+function computeBalancingPressureDrop
+  "Compute the design pressure drop of a balancing valve"
+  extends Modelica.Icons.Function;
+  input Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Design mass flow rate (target)";
+  input Modelica.Units.SI.PressureDifference dp_nominal
+    "Pressure drop of equipment in series at design flow rate";
+  input Buildings.Templates.Components.Data.PumpSingle datPum
+    "Pump parameters";
+  input Real r_N(unit="1")=1
+    "Relative revolution, r_N=N/N_nominal";
+  output Modelica.Units.SI.PressureDifference dpBal_nominal
+    "Pressure drop of balancing valve at design flow rate";
+protected
+  Modelica.Units.SI.PressureDifference dpPum_nominal =
+    Buildings.Fluid.Movers.BaseClasses.Characteristics.pressure(
+    V_flow=m_flow_nominal / datPum.rho_default,
+    r_N=r_N,
+    d=Buildings.Utilities.Math.Functions.splineDerivatives(
+      x=datPum.per.pressure.V_flow,
+      y=datPum.per.pressure.dp),
+    dpMax=max(datPum.per.pressure.dp),
+    V_flow_max=max(datPum.per.pressure.V_flow),
+    per=Buildings.Fluid.Movers.BaseClasses.Characteristics.flowParametersInternal(
+      n=size(datPum.per.pressure.V_flow, 1),
+      V_flow=datPum.per.pressure.V_flow,
+      dp=datPum.per.pressure.dp))
+    "Pump head at target design flow";
+algorithm
+  dpBal_nominal := dpPum_nominal - dp_nominal;
+  annotation (Documentation(info="<html>
+<p>
+Given the design mass flow rate, the design pressure drop
+of all equipment in series, the pump parameters and the 
+pump speed, the function returns the pressure drop
+of a balancing valve at design flow, so that the total 
+pressure drop is equal to the pump head.
+</p>
+<p>
+The model 
+<a href=\"modelica://Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated\">
+Buildings.Templates.Plants.HeatPumps.Components.Validation.PumpsPrimaryDedicated</a>
+serves as a validation model for this function and illustrates how the function
+can be used to calculate either the design pressure drop of balancing 
+valves or the primary pump speed required to provide the design flow.
+</p>
+</html>"));
+end computeBalancingPressureDrop;
diff --git a/Buildings/Templates/Utilities/package.mo b/Buildings/Templates/Utilities/package.mo
new file mode 100644
index 00000000000..098f8d76ed8
--- /dev/null
+++ b/Buildings/Templates/Utilities/package.mo
@@ -0,0 +1,27 @@
+within Buildings.Templates;
+package Utilities "Package with utility functions"
+  extends Modelica.Icons.Package;
+
+  annotation (
+  Icon(coordinateSystem(extent={{-100.0,-100.0},{100.0,100.0}}), graphics={
+    Polygon(
+      origin={1.3835,-4.1418},
+      rotation=45.0,
+      fillColor={64,64,64},
+      pattern=LinePattern.None,
+      fillPattern=FillPattern.Solid,
+      points={{-15.0,93.333},{-15.0,68.333},{0.0,58.333},{15.0,68.333},{15.0,93.333},{20.0,93.333},{25.0,83.333},{25.0,58.333},{10.0,43.333},{10.0,-41.667},{25.0,-56.667},{25.0,-76.667},{10.0,-91.667},{0.0,-91.667},{0.0,-81.667},{5.0,-81.667},{15.0,-71.667},{15.0,-61.667},{5.0,-51.667},{-5.0,-51.667},{-15.0,-61.667},{-15.0,-71.667},{-5.0,-81.667},{0.0,-81.667},{0.0,-91.667},{-10.0,-91.667},{-25.0,-76.667},{-25.0,-56.667},{-10.0,-41.667},{-10.0,43.333},{-25.0,58.333},{-25.0,83.333},{-20.0,93.333}}),
+    Polygon(
+      origin={10.1018,5.218},
+      rotation=-45.0,
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      points={{-15.0,87.273},{15.0,87.273},{20.0,82.273},{20.0,27.273},{10.0,17.273},{10.0,7.273},{20.0,2.273},{20.0,-2.727},{5.0,-2.727},{5.0,-77.727},{10.0,-87.727},{5.0,-112.727},{-5.0,-112.727},{-10.0,-87.727},{-5.0,-77.727},{-5.0,-2.727},{-20.0,-2.727},{-20.0,2.273},{-10.0,7.273},{-10.0,17.273},{-20.0,27.273},{-20.0,82.273}})}),
+      Documentation(revisions="<html>
+</html>", info="<html>
+<p>
+This package contains utility functions that are used
+in HVAC system templates.
+</p>
+</html>"));
+end Utilities;
diff --git a/Buildings/Templates/Utilities/package.order b/Buildings/Templates/Utilities/package.order
new file mode 100644
index 00000000000..b5898f9cd5b
--- /dev/null
+++ b/Buildings/Templates/Utilities/package.order
@@ -0,0 +1 @@
+computeBalancingPressureDrop
diff --git a/Buildings/Templates/package.order b/Buildings/Templates/package.order
index 9c28253a22a..1cd7704ac04 100644
--- a/Buildings/Templates/package.order
+++ b/Buildings/Templates/package.order
@@ -1,6 +1,8 @@
 UsersGuide
 AirHandlersFans
 Components
+Plants
+Utilities
 ZoneEquipment
 Data
 Types
diff --git a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
index efb9ad69df5..d2cee2f3994 100644
--- a/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
+++ b/Buildings/ThermalZones/Detailed/Examples/MixedAirCO2.mo
@@ -19,6 +19,7 @@ model MixedAirCO2
     annotation (Placement(transformation(extent={{0,-40},{20,-20}})));
   Buildings.Fluid.Sensors.PPM senCO2(
     redeclare package Medium = MediumA,
+    warnAboutOnePortConnection=false,
     MM=Modelica.Media.IdealGases.Common.SingleGasesData.CO2.MM)
     "CO2 sensor that measures concentration in the room"
     annotation (Placement(transformation(extent={{70,-60},{90,-40}})));
@@ -100,6 +101,12 @@ a brief overshoot during the initial transient.
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3731\">#3731</a>
+</li>
+<li>
 September 8, 2017, by Michael Wetter:<br/>
 First implementation.
 </li>
diff --git a/Buildings/ThermalZones/Detailed/UsersGuide.mo b/Buildings/ThermalZones/Detailed/UsersGuide.mo
index e94e17970d7..9cb57aab77e 100644
--- a/Buildings/ThermalZones/Detailed/UsersGuide.mo
+++ b/Buildings/ThermalZones/Detailed/UsersGuide.mo
@@ -989,7 +989,7 @@ port <i>2</i> etc.
 <p>
 <a name=\"ZuoEtAl2016\"/>
 Wangda Zuo, Michael Wetter, Wei Tian, Dan Li, Mingang Jin, Qingyan Chen.<br/>
-<a href=\"modelica://Buildings/Resources/Images/ThermalZones/Detailed/Examples/FFD/Zuo2016.pdf\">
+<a href=\"modelica://Buildings/Resources/Images/ThermalZones/Detailed/Examples/FFD/ZuoEtAl2016.pdf\">
 Coupling Indoor Airflow, HVAC, Control and Building Envelope Heat Transfer in the Modelica Buildings Library.
 </a>
 <br/>
diff --git a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo
index 3fa10537e29..bbef37a0a25 100644
--- a/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo
+++ b/Buildings/ThermalZones/Detailed/Validation/BESTEST/Cases9xx/Case960.mo
@@ -110,7 +110,8 @@ model Case960 "Case 900, but with an unconditioned sun-space"
     annotation (Placement(transformation(extent={{54,-134},{62,-126}})));
   Modelica.Blocks.Math.Product product1
     annotation (Placement(transformation(extent={{74,-138},{84,-128}})));
-  Buildings.Fluid.Sensors.Density density1(redeclare package Medium = MediumA)
+  Buildings.Fluid.Sensors.Density density1(redeclare package Medium = MediumA,
+      warnAboutOnePortConnection=false)
     "Air density inside the building"
     annotation (Placement(transformation(extent={{84,-162},{74,-152}})));
   Buildings.Fluid.FixedResistances.PressureDrop heaCoo1(
@@ -237,6 +238,12 @@ equation
             Documentation(revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3731\">#3731</a>
+</li>
+<li>
 May 12, 2023, by Jianjun Hu:<br/>
 Added test acceptance criteria limits.
 This is for
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo
index 2739ee15fe5..5aba7107819 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Actuator.mo
@@ -85,7 +85,6 @@ initial equation
 equation
   yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
     adapter=adapter,
-    initialCall=false,
     nY=nY,
     u={u,round(time,1E-3)},
     dummy=nObj);
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo
index ac79939929b..961697e83a6 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/ThermalZoneAdapter.mo
@@ -34,6 +34,10 @@ model ThermalZoneAdapter
   parameter Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels logLevel=Buildings.ThermalZones.EnergyPlus_9_6_0.Types.LogLevels.Warning
     "LogLevels of EnergyPlus output"
     annotation (Dialog(tab="Debug"));
+  parameter Boolean setInitialRadiativeHeatGainToZero
+    "If true, then the radiative heat gain sent from Modelica to EnergyPlus is zero during the model initialization"
+    annotation (Dialog(tab="Advanced"), Evaluate=true);
+
   parameter Integer nFluPor
     "Number of fluid ports (Set to 2 for one inlet and one outlet)";
   final parameter Modelica.Units.SI.Area AFlo(fixed=false) "Floor area";
@@ -41,6 +45,7 @@ model ThermalZoneAdapter
   final parameter Real mSenFac(
     fixed=false)
     "Factor for scaling the sensible thermal mass of the zone air volume";
+
   Modelica.Blocks.Interfaces.RealInput T(
     final unit="K",
     displayUnit="degC")
@@ -96,8 +101,7 @@ protected
     fixed=false,
     start=0)
     "Total number of Spawn objects in building";
-  parameter Modelica.Units.SI.MassFlowRate m_flow_small(fixed=false)
-    "Small mass flow rate used to avoid TAveInlet = 0";
+
   Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject(
     objectType=1,
     startTime=startTime,
@@ -137,30 +141,42 @@ protected
   // This has been removed due to numerical noise,
   // see https://github.com/lbl-srg/modelica-buildings/issues/2358#issuecomment-819578850
   //////////
-  parameter Modelica.Units.SI.Time startTime(fixed=false)
-    "Simulation start time";
+
   Real yEP[nY]
     "Output of exchange function";
-  Modelica.Units.SI.Time tNext(start=startTime, fixed=true)
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(fixed=false)
+    "Small mass flow rate used to avoid TAveInlet = 0";
+  parameter Modelica.Units.SI.Time startTime(fixed=false)
+    "Simulation start time";
+
+  discrete Modelica.Units.SI.Time tNext
     "Next sampling time";
   //Modelica.Units.SI.Time tNextEP(start=startTime-1, fixed=true) "Next sampling time requested from EnergyPlus";
   // constant Real dT_dtMax(unit="K/s") = 0.000001 "Bound on temperature derivative to reduce or increase time step";
   //  Modelica.Units.SI.Time dtMax(displayUnit="min", start=600, fixed=true) "Maximum time step before next sampling";
-  discrete Modelica.Units.SI.Time tLast(fixed=true, start=startTime)
+  discrete Modelica.Units.SI.Time tLast
     "Last time of data exchange";
   discrete Modelica.Units.SI.Time dtLast
     "Time step since the last synchronization";
-  discrete Modelica.Units.SI.MassFlowRate mInlet_flow(
-    start=0,
-    fixed=true)
+  discrete Modelica.Units.SI.MassFlowRate mInlet_flow
     "Time averaged inlet mass flow rate";
   discrete Modelica.Units.SI.Temperature TAveInlet
     "Time averaged inlet temperature";
   discrete Modelica.Units.SI.Temperature TRooLast
     "Room air temperature at last sampling";
+  discrete Modelica.Units.SI.HeatFlowRate QGaiRadAve_flow
+   "Radiative heat flow rate averaged over the past synchronization time step";
+
+  Modelica.Units.SI.Energy EGaiRad(unbounded=true)
+   "Radiative energy exchanged since the start of the simulation";
+  discrete Modelica.Units.SI.Energy EGaiRadLast(unbounded=true)
+   "Radiative energy exchanged at the last synchronization time step";
+
 //  discrete Real dQCon_flow_dT(
 //    final unit="W/K")
 //    "Derivative dQCon_flow / dT";
+
   discrete Modelica.Units.SI.HeatFlowRate QConLast_flow(fixed=false, start=0)
     "Convective sensible heat to be added to zone air if T = TRooLast";
   function round
@@ -185,34 +201,61 @@ initial equation
       Modelica.Utilities.Strings.length(fmuName) > 1,
       "If usePrecompiledFMU = true, must set parameter fmuName");
   end if;
-  startTime=time;
+
   nObj=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.initialize(
     adapter=adapter,
     isSynchronized=building.isSynchronized);
-  {AFlo,V,mSenFac}=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getParameters(
+
+  {AFlo, V, mSenFac}=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.getParameters(
     adapter=adapter,
     nParOut=nParOut,
     isSynchronized=nObj);
-  TAveInlet=293.15;
+
   m_flow_small=V*3*1.2/3600*1E-10;
-  assert(
-    AFlo > 0,
-    "Floor area must not be zero.");
-  assert(
-    V > 0,
-    "Volume must not be zero.");
-  assert(
-    mSenFac > 0.9999,
-    "mSenFac must be bigger or equal than one.");
+  startTime=time;
+
+  // Initialization of output variables.
+  TRooLast=T;
+  dtLast=0;
+  mInlet_flow=0;
+  TAveInlet=T;
+
+  QGaiRadAve_flow = if setInitialRadiativeHeatGainToZero then 0 else QGaiRad_flow;
+  tLast=time;
+  EGaiRad = 0;
+  EGaiRadLast = 0;
+
+  // Synchronization with EnergyPlus
+  // Below, the term X_w/(1.-X_w) is for conversion from kg/kg_total_air (Modelica) to kg/kg_dry_air (EnergyPlus)
+  yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
+    adapter=adapter,
+    nY=nY,
+    u={ T, X_w/(1.-X_w), mInlet_flow, TAveInlet, QGaiRadAve_flow, round(time,1E-3)},
+    dummy=AFlo);
+
+  TRad=yEP[1];
+  QConLast_flow=yEP[2];
+  QLat_flow=yEP[3];
+  QPeo_flow=yEP[4];
+  tNext=yEP[5];
+
+  assert(AFlo > 0, "Floor area must not be zero.");
+  assert(V > 0, "Volume must not be zero.");
+  assert(mSenFac > 0.9999, "mSenFac must be at least 1.");
 
 equation
   if usePrecompiledFMU then
     // For JModelica, this must be in the equation section rather than the initial equation section
-    assert(
-      Modelica.Utilities.Strings.length(fmuName) > 1,
+    assert(Modelica.Utilities.Strings.length(fmuName) > 1,
       "If usePrecompiledFMU = true, must set parameter fmuName");
   end if;
-  when {initial(),time >= pre(tNext)} then
+
+  // Integrate GQaiRad_flow, which breaks any algebraic loop if QGaiRad_flow is
+  // a function of TRad
+  der(EGaiRad) = QGaiRad_flow;
+
+  // Synchronization with EnergyPlus
+  when {time >= pre(tNext)} then
     // Initialization of output variables.
     TRooLast=T;
     dtLast=time-pre(tLast);
@@ -223,30 +266,35 @@ equation
         else
           0 for i in 1:nFluPor));
     TAveInlet=noEvent(
-      (sum(
+      sum(
         if m_flow[i] > 0 then
           TInlet[i]*m_flow[i]
         else
-          0 for i in 1:nFluPor)+m_flow_small*pre(TAveInlet))/(mInlet_flow+m_flow_small));
+          0 for i in 1:nFluPor)+m_flow_small*pre(TAveInlet)/(mInlet_flow+m_flow_small));
     // Below, the term X_w/(1.-X_w) is for conversion from kg/kg_total_air (Modelica) to kg/kg_dry_air (EnergyPlus)
+    QGaiRadAve_flow = (EGaiRadLast-pre(EGaiRadLast))/dtLast;
+
+    // Call EnergyPlus
     yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
       adapter=adapter,
-      initialCall=false,
       nY=nY,
-      u={T,X_w/(1.-X_w),pre(mInlet_flow),TAveInlet,pre(QGaiRad_flow),round(time,1E-3)},
+      u={T,X_w/(1.-X_w),pre(mInlet_flow),TAveInlet,QGaiRadAve_flow,round(time,1E-3)},
       dummy=AFlo);
+    // Assign return values of EnergyPlus
     TRad=yEP[1];
     QConLast_flow=yEP[2];
     QLat_flow=yEP[3];
     QPeo_flow=yEP[4];
-    //dQCon_flow_dT=yEP[5];
-    //tNext=yEP[6];
     tNext=yEP[5];
     tLast=time;
+    // Store current value of exchanged radiative heat
+    EGaiRadLast = EGaiRad;
   end when;
   //QCon_flow=QConLast_flow+(T-TRooLast)*dQCon_flow_dT;
   QCon_flow=QConLast_flow;
+
   synBui.synchronize.done=nObj;
+
   annotation (
     defaultComponentName="fmuZon",
     Icon(
@@ -266,6 +314,16 @@ of its class <code>adapter</code>, of EnergyPlus.
       revisions="<html>
 <ul>
 <li>
+March 22, 2024, by Michael Wetter:<br/>
+Changed radiative heat flow rate sent to EnergyPlus to be the average over the last
+synchronization time step rather than the instantaneuous value, and set the initial value to zero.
+This avoids a nonlinear system of equation during the time integration for models in which
+the radiative heat gain is a function of the room radiative temperature, such as
+when a radiator is connected to the room model.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">Buildings, #3707</a>.
+</li>
+<li>
 February 14, 2024, by Michael Wetter:<br/>
 Added <code>pre()</code> operator for inlet mass flow rate and for convective heat gain
 to avoid an algebraic loop on discrete variables.<br/>
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo
index c7ca47ae479..7383a8bba20 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones1.mo
@@ -27,6 +27,7 @@ model FMUZoneAdapterZones1
     final fmuName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones1.fmu"),
     logLevel=building.logLevel,
+    setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
     "Adapter to EnergyPlus"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo
index b90ccb2905f..a5539e15146 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones2.mo
@@ -28,6 +28,7 @@ model FMUZoneAdapterZones2
     final fmuName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
+    setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
     "Adapter to EnergyPlus"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
@@ -71,6 +72,7 @@ model FMUZoneAdapterZones2
     final fmuName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
+    setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
     "Adapter to EnergyPlus"
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo
index 66153f4f836..3c749c4294e 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/Validation/FMUZoneAdapterZones3.mo
@@ -28,6 +28,7 @@ model FMUZoneAdapterZones3
     final fmuName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
+    setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
     "Adapter to EnergyPlus"
     annotation (Placement(transformation(extent={{20,20},{40,40}})));
@@ -71,6 +72,7 @@ model FMUZoneAdapterZones3
     final fmuName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
+    setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
     "Adapter to EnergyPlus"
     annotation (Placement(transformation(extent={{20,-20},{40,0}})));
@@ -94,6 +96,7 @@ model FMUZoneAdapterZones3
     final fmuName=Modelica.Utilities.Files.loadResource(
       "modelica://Buildings/Resources/src/ThermalZones/EnergyPlus_9_6_0/FMUs/Zones3.fmu"),
     logLevel=building.logLevel,
+    setInitialRadiativeHeatGainToZero=true,
     final nFluPor=2)
     "Adapter to EnergyPlus"
     annotation (Placement(transformation(extent={{20,-60},{40,-40}})));
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo
index 2aee550a1a3..725ccc69418 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/BaseClasses/exchange.mo
@@ -4,8 +4,6 @@ pure function exchange
   extends Modelica.Icons.Function;
   input Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.SpawnExternalObject adapter
     "External object";
-  input Boolean initialCall
-    "Set to true if initial() is true, false otherwise";
   input Integer nY
     "Size of output y";
   input Real u[:]
@@ -14,8 +12,7 @@ pure function exchange
     "Dummy value (used to force Modelica tools to call initialize())";
   output Real y[nY]
     "Output values. First all outputs, then all derivatives, then next event time";
-external "C" exchange_Modelica_EnergyPlus_9_6_0(
-  adapter,initialCall,u,dummy,y)
+external "C" exchange_Modelica_EnergyPlus_9_6_0(adapter, u, dummy, y)
   annotation (
       Include="#include <EnergyPlus_9_6_0_Wrapper.c>",
       IncludeDirectory="modelica://Buildings/Resources/C-Sources",
@@ -30,6 +27,10 @@ External function that exchanges data with EnergyPlus.
       revisions="<html>
 <ul>
 <li>
+March 27, 2024, by Michael Wetter:<br/>
+Removed non-needed argument <code>initialCall</code>.
+</li>
+<li>
 December 11, 2021, by Michael Wetter:<br/>
 Declared function as <code>pure</code> for MSL 4.0.0.
 </li>
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo
index 48843639797..fe8777bd4f1 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Building.mo
@@ -39,7 +39,11 @@ model Building
     "If true, then this model computes the wet bulb temperature"
     annotation (Dialog(tab="Advanced"));
 
-  parameter Real relativeSurfaceTolerance(min=1E-12) = 1E-7
+  parameter Boolean setInitialRadiativeHeatGainToZero = true
+    "If true, then the radiative heat gain sent from Modelica to EnergyPlus is zero during the model initialization"
+    annotation (Dialog(tab="Advanced"), Evaluate=true);
+
+  parameter Real relativeSurfaceTolerance(min=1E-12) = 1E-6
     "Relative tolerance of surface temperature calculations"
     annotation (Dialog(tab="Advanced"));
 
@@ -149,33 +153,49 @@ must be provided. When starting the simulation, EnergyPlus will
 be run with the weather file whose name is identical to <code>epwName</code>,
 while Modelica will use the file specified by <code>weaName</code>.
 </p>
+<h4>Note regarding <code>setInitialRadiativeHeatGainToZero</code> and <code>relativeSurfaceTolerance</code></h4>
 <p>
 To configure models that connect components for radiative heat exchange to the thermal zone model,
-the parameter <code>relativeSurfaceTolerance</code> in the <i>Advanced</i> tab may have to be tightended.
-See the section <i>Notes about modeling components that are connected to the radiative heat port</i>
-in the model
-<a href=\"modelica://Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone\">
-Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone</a>
-for details.
+it is recommended to leave the parameter <code>setInitialRadiativeHeatGainToZero</code>
+at its default value <code>true</code>.
+This sets the radiative heat flow rate sent from Modelica to EnergyPlus
+to zero during the initialization of the model, thereby avoiding a potential nonlinear system
+of equations that may give convergence problems. This only affects the initialization of the model
+but not the time integration, hence the error should be small for typical models.
+</p>
+<p>
+If you decide to set <code>setInitialRadiativeHeatGainToZero = false</code>, you need to be aware of the following:
+If <code>setInitialRadiativeHeatGainToZero = false</code>,
+then the radiative heat gain from the model input is being used.
+If this radiative heat gain depends on the radiative temperature that is an output of the EnergyPlus model,
+a nonlinear equation is formed.
+Because in EnergyPlus, computing the radiative temperature involves an iterative solution,
+this can cause convergence problems due to having two nested solvers,
+the outer being the Modelica solver that solves for the radiative heat flow rate <code>QGaiRad_flow</code>,
+and the innner being the EnergyPlus solver that solves for the radiative temperature <code>TRad</code>.
+Hence, we recommend to leave <code>setInitialRadiativeHeatGainToZero = true</code>.
+</p>
+<p>
+If you decide to set <code>setInitialRadiativeHeatGainToZero = false</code>, you may need to also
+tighten the tolerance of the EnergyPlus solver by tightening <code>relativeSurfaceTolerance</code>,
+but one cannot assure that the nested nonlinear equations converge.
+</p>
+<p>
+Because a Modelica model does not have knowledge of the solver tolerance, automatically tightening
+<code>relativeSurfaceTolerance</code> as a function of the Modelica solver tolerance
+is not possible.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
 March 16, 2024, by Michael Wetter:<br/>
-Increased the default value for <code>relativeSurfaceTolerance</code>.
+Introduced parameter <code>setInitialRadiativeHeatGainToZero</code>.
 This is required for
 <a href=\"modelica://Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator\">
 Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator</a>
-with OpenModelica. This model forms a nonlinear equation between the radiator temperature,
-which is used to compute the radiative heat flow rate between radiator and room radiative temperature, and the
-room surface temperature. The radiator temperature is computed in Modelica and the room surface
-temperature is computed in EnergyPlus. The latter requires the iterative solution of the
-radiative heat balance equation. Hence, evaluating the residuals for this nonlinear equation
-requires an iteration in EnergyPlus.
-As a rule of thumb, such nested solvers require one order of magnitude higher precision for the inner
-solver. As Modelica models are often solved for a tolerance of <code>1E-6</code>, the default value
-for <code>relativeSurfaceTolerance</code> has been set to 1E-8.<br/>
+with OpenModelica.
+See info section for rationale.<br/>
 This was required for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">#3707</a>.
 </li>
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo
index 682247f628c..023b80e6604 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/OpaqueConstruction.mo
@@ -126,7 +126,6 @@ equation
     dtLast=time-pre(tLast);
     yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
       adapter=adapter,
-      initialCall=false,
       nY=nY,
       u={heaPorFro.T,heaPorBac.T,round(time,1E-3)},
       dummy=A);
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo
index 90fb3cb405c..bd924a45ab8 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/OutputVariable.mo
@@ -91,7 +91,6 @@ equation
   when {initial(),time >= pre(tNext)} then
     yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
       adapter=adapter,
-      initialCall=false,
       nY=nY,
       u={round(time,1E-3),directDependency_in_internal},
       dummy=nObj);
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo
index 509bb0a655c..a9540c7d683 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/Schedule.mo
@@ -80,7 +80,6 @@ initial equation
 equation
   yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
     adapter=adapter,
-    initialCall=false,
     nY=nY,
     u={u,round(time,1E-3)},
     dummy=nObj);
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
index 4e2b2292491..5117a17ddaa 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/ThermalZone.mo
@@ -89,6 +89,11 @@ protected
       273.15 + 37) "Latent heat of water vapor";
   final parameter Modelica.Units.SI.MassFlowRate m_flow_nominal=V*3/3600
     "Nominal mass flow rate (used for regularization)";
+
+  final parameter Boolean setInitialRadiativeHeatGainToZero = building.setInitialRadiativeHeatGainToZero
+    "If true, then the radiative heat gain sent from Modelica to EnergyPlus is zero during the model initialization"
+    annotation (Dialog(tab="Advanced"), Evaluate=true);
+
   Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter fmuZon(
     final modelicaNameBuilding=modelicaNameBuilding,
     final modelicaInstanceName=modelicaInstanceName,
@@ -97,6 +102,7 @@ protected
     final idfName=idfName,
     final epwName=epwName,
     final relativeSurfaceTolerance=relativeSurfaceTolerance,
+    final setInitialRadiativeHeatGainToZero=setInitialRadiativeHeatGainToZero,
     final zoneName=zoneName,
     final nFluPor=nPorts,
     final usePrecompiledFMU=usePrecompiledFMU,
@@ -507,34 +513,55 @@ by people.)
 <h5>Notes about modeling components that are connected to the radiative heat port</h5>
 <p>
 Models in which a component is connected to the radiative heat port <code>heaPorRad</code> may cause
-convergence problems if that component computes the radiative heat exchange <code>heaPorRad.Q_flow</code>
-based on the temperature <code>heaPorRad.T</code>.
-An example of such a model is
-<a href=\"modelica://Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator\">
-Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator</a>.
-This model forms a nonlinear equation between the radiator temperature,
-which is used to compute the radiative heat flow rate between radiator and room radiative temperature, and the
-room surface temperature. The radiator temperature is computed in Modelica and the room surface
-temperature is computed in EnergyPlus. The latter requires the iterative solution of the
-radiative heat balance equation. Hence, when a Modelica tool evaluates the residuals
-for this nonlinear equation, EnergyPlus does an iterative solution for the room surface temperature.
-As a rule of thumb, such nested solvers require one order of magnitude higher precision for the inner
-solver.
-By default, the tolerance of the radiative heat balance solver in EnergyPlus is set to <code>1E-7</code>,
-which should suffice. However, if a model does not converge -- in which case the error message may involve
-variables <code>TRad</code>, <code>QGaiRad_flow</code> or <code>yEP[1}</code> --
-the tolerance can be increased by setting the parameter <code>relativeSurfaceTolerance</code>
-in the instance <code>building</code>.
+convergence problems during the initialization of the simulation
+if that component computes the radiative heat exchange <code>heaPorRad.Q_flow</code>
+based on the temperature <code>heaPorRad.T</code>, and if the parameter
+<code>building.setInitialRadiativeHeatGainToZero</code> is changed from its default value
+<code>true</code>.
+It is therefore recommended to leave the parameter <code>setInitialRadiativeHeatGainToZero</code>
+at its default value <code>true</code>.
+This sets the radiative heat flow rate sent from Modelica to EnergyPlus
+to zero during the initialization of the model, thereby avoiding a potential nonlinear system
+of equations that may give convergence problems. This only affects the initialization of the model
+but not the time integration, hence the error should be small for typical models.
+</p>
+<p>
+If you decide to set <code>setInitialRadiativeHeatGainToZero = false</code>, you need to be aware of the following:
+If <code>setInitialRadiativeHeatGainToZero = false</code>,
+then the radiative heat gain from the model input is being used.
+If this radiative heat gain depends on the radiative temperature that is an output of the EnergyPlus model,
+a nonlinear equation is formed.
+Because in EnergyPlus, computing the radiative temperature involves an iterative solution,
+this can cause convergence problems due to having two nested solvers,
+the outer being the Modelica solver that solves for the radiative heat flow rate <code>QGaiRad_flow</code>,
+and the innner being the EnergyPlus solver that solves for the radiative temperature <code>TRad</code>.
+Hence, we recommend to leave <code>building.setInitialRadiativeHeatGainToZero = true</code>.
+</p>
+<p>
+If you decide to set <code>building.setInitialRadiativeHeatGainToZero = false</code>, you may need to also
+tighten the tolerance of the EnergyPlus solver by tightening <code>building.relativeSurfaceTolerance</code>,
+but one cannot assure that the nested nonlinear equations converge.
 </p>
 <p>
 Because a Modelica model does not have knowledge of the solver tolerance, automatically tightening
-<code>relativeSurfaceTolerance</code> as a function of the Modelica solver tolerance
+<code>building.relativeSurfaceTolerance</code> as a function of the Modelica solver tolerance
 is not possible.
 </p>
 </html>",
       revisions="<html>
 <ul>
 <li>
+March 22, 2024, by Michael Wetter:<br/>
+Changed radiative heat flow rate sent to EnergyPlus to be the average over the last
+synchronization time step rather than the instantaneuous value, and set the initial value by default to zero.
+Introduced parameter <code>setInitialRadiativeHeatGainToZero</code>.
+This avoids a nonlinear system of equation during the time integration for models in which
+the radiative heat gain is a function of the room radiative temperature, such as
+when a radiator is connected to the room model.<br/>
+This is for
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">Buildings, #3707</a>.
+</li>
+<li>
 February 14, 2024, by Michael Wetter:<br/>
 Added heat port to radiative balance <code>heaPorRad</code>.<br/>
 This is for
diff --git a/Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo b/Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo
index 9e02020d5e9..1aeb8c5ec00 100644
--- a/Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo
+++ b/Buildings/ThermalZones/EnergyPlus_9_6_0/ZoneSurface.mo
@@ -116,7 +116,6 @@ equation
     dtLast=time-pre(tLast);
     yEP=Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.exchange(
       adapter=adapter,
-      initialCall=false,
       nY=nY,
       u={T,round(time,1E-3)},
       dummy=A);
diff --git a/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo b/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo
index 6cdee6f34fe..089fcc928ea 100644
--- a/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo
+++ b/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithLatentGain.mo
@@ -14,11 +14,13 @@ model RoomWithLatentGain
       startTime3=0,
       endTime3=0));
   Fluid.Sensors.RelativeHumidity senRelHum(
-    redeclare package Medium = Medium)
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Relative humidity of room air"
     annotation (Placement(transformation(extent={{110,-20},{130,0}})));
   Fluid.Sensors.MassFraction senMasFra(
-    redeclare package Medium = Medium)
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Absolute humidity of room air in kg/kg total air"
     annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
 equation
@@ -39,6 +41,12 @@ This test case changes the medium to moist air, and adds latent heat gain.
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1857\">IBPSA, #1857</a>.
+</li>
+<li>
 October 9, 2019, by Michael Wetter:<br/>
 First implementation.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">IBPSA, issue 1209</a>.
@@ -53,4 +61,4 @@ experiment(
   "Simulate and plot"),
     Diagram(coordinateSystem(extent={{-140,-100},{140,100}})),
     Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
-end RoomWithLatentGain;
+end RoomWithLatentGain;
\ No newline at end of file
diff --git a/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo b/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo
index d3cba2f7e37..04f913cbc2a 100644
--- a/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo
+++ b/Buildings/ThermalZones/ReducedOrder/Validation/RoomWithoutLatentGain.mo
@@ -21,11 +21,13 @@ model RoomWithoutLatentGain
     rotation=0,
     origin={23,3})));
   Fluid.Sensors.RelativeHumidity senRelHum(
-    redeclare package Medium = Medium)
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Relative humidity of room air"
     annotation (Placement(transformation(extent={{110,-20},{130,0}})));
   Fluid.Sensors.MassFraction senMasFra(
-    redeclare package Medium = Medium)
+    redeclare package Medium = Medium,
+    warnAboutOnePortConnection = false)
     "Absolute humidity of room air in kg/kg total air"
     annotation (Placement(transformation(extent={{110,-50},{130,-30}})));
 equation
@@ -46,6 +48,12 @@ This test case changes the medium to moist air, and adds zero latent heat gain.
 </html>", revisions="<html>
 <ul>
 <li>
+March 26, 2024, by Michael Wetter:<br/>
+Configured the sensor parameter to suppress the warning about being a one-port connection.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1857\">IBPSA, #1857</a>.
+</li>
+<li>
 October 9, 2019, by Michael Wetter:<br/>
 First implementation.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">IBPSA, issue 1209</a>.
@@ -60,4 +68,4 @@ experiment(
   "Simulate and plot"),
     Diagram(coordinateSystem(extent={{-140,-100},{140,100}})),
     Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
-end RoomWithoutLatentGain;
+end RoomWithoutLatentGain;
\ No newline at end of file
diff --git a/Buildings/UsersGuide/Acknowledgements.mo b/Buildings/UsersGuide/Acknowledgements.mo
new file mode 100644
index 00000000000..7c94575653c
--- /dev/null
+++ b/Buildings/UsersGuide/Acknowledgements.mo
@@ -0,0 +1,148 @@
+within Buildings.UsersGuide;
+class Acknowledgements "Acknowledgements"
+  extends Modelica.Icons.Information;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<h4><font color=\"#008000\" size=\"5\">Acknowledgements</font></h4>
+<p>
+ The development of this library was supported by:
+</p>
+ <ul>
+ <li>The U.S. Department of Energy, Assistant Secretary for
+  Energy Efficiency and Renewable Energy,
+  <ul>
+  <li>
+  Office of Building
+  Technologies, under Contracts Number DE-AC02-05CH11231 and DE-EE0007688,
+  </li>
+  <li>
+  Advanced Manufacturing Office, under Award Number DE-EE0009139, and
+ </li>
+  <li>
+  Geothermal Technologies Office, under Award Number DE-AC02-05CH11231.
+  </li>
+  </ul>
+  </li>
+ <li>
+  The California Energy Commission, Public Interest Energy Research Program, Buildings End Use Energy Efficiency Program, Award Number 500-10-052.
+ </li>
+ </ul>
+<p>
+The core of this library is the Modelica IBPSA library,
+a free open-source library with basic models that codify best practices for
+the implementation of models for building and community energy and control systems.
+The development of the IBPSA library is organized through the
+<a href=\"https://ibpsa.github.io/project1\">IBPSA Project 1</a>
+of the International Building Performance Simulation Association (IBPSA).
+From 2012 to 2017, the development was organized through the
+<a href=\"http://www.iea-annex60.org\">Annex 60 project</a>
+of the Energy in Buildings and Communities Programme of the International Energy Agency (IEA EBC).
+</p>
+ <p>
+  The <a href=\"modelica://Buildings.Airflow.Multizone\">package for multizone airflow modeling</a>
+  and the <a href=\"modelica://Buildings.Utilities.Comfort.Fanger\">model for thermal comfort</a>
+  was contributed by the United Technologies Research Center, which also contributed to the
+  validation of the <a href=\"modelica://Buildings.ThermalZones.Detailed.MixedAir\">room heat transfer model</a>.
+</p>
+<p>
+We thank Dietmar Winkler from Telemark University College for the various feedback that
+helped improve the organization and structure of the library.
+</p>
+<p>
+The following people have directly contributed to the implementation of the Buildings library
+(many others have contributed by other means than model implementation):
+</p>
+<ul>
+<li>Saranya Anbarasu, Pennsylvania State University, USA
+</li>
+<li>David Blum, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Marco Bonvini, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Felix B&uuml;nning, RWTH Aachen, Germany
+</li>
+<li>Guokai Chen, University College London, UK
+</li>
+<li>Massimo Cimmino, Polytechnique Montr&eacute;al, Canada
+</li>
+<li>Rainer Czetina, University of Applied Sciences Technikum Wien, Austria
+</li>
+<li>Karthikeya Devaprasad, Pacific Northwest National Laboratory, USA
+</li>
+<li>Hagar Elarga, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Hongxiang \"Casper\" Fu, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Yangyang Fu, University of Colorado Boulder, Colorado, USA
+</li>
+<li>Antoine Gautier, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Sebastian Giglmayr, University of Applied Sciences Technikum Wien, Austria
+</li>
+<li>Milica Grahovac, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Peter Grant, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Brandon M. Hencey, Cornell University, USA
+</li>
+<li>Sen Huang, Pacific Northwest National Laboratory, USA
+</li>
+<li>Kathryn Hinkelman, University of Colorado Boulder, Colorado, USA
+</li>
+<li>Jianjun Hu, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Roman Ilk, University of Applied Sciences Technikum Wien, Austria
+</li>
+<li>Dan Li, University of Miami, Florida, USA
+</li>
+<li>Filip Jorissen, KU Leuven, Belgium
+</li>
+<li>Thierry S. Nouidui, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Markus Nurschinger, University of Applied Sciences Technikum Wien, Austria
+</li>
+<li>Xiufeng Pang, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Remi Patureau, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Damien Picard, KU Leuven, Belgium
+</li>
+<li>Kaustubh Phalak, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Thomas Sevilla, University of Miami, Florida, USA
+</li>
+<li>Chengnan Shi, University of Colorado Boulder, Colorado, USA
+</li>
+<li>Martin Sj&ouml;lund, Link&ouml;ping University, Sweden
+</li>
+<li>Matthis Thorade, Berlin University of the Arts, Germany
+</li>
+<li>Wei Tian, University of Miami, Florida, USA
+</li>
+<li>Armin Teskeredzic, Mechanical Engineering Faculty Sarajevo and GIZ, Bosnia and Herzegovina
+</li>
+<li>Rafael Velazquez, University of Seville, Spain
+</li>
+<li>Pierre Vigouroux, Institut National des Sciences Appliquees, France
+</li>
+<li>Sebastian Vock, University of Applied Sciences Technikum Wien, Austria
+</li>
+<li>Vladimir Vukovic, Austrian Institute of Technology, Austria
+</li>
+<li>Jing Wang, University of Colorado Boulder, Colorado, USA
+</li>
+<li>Michael Wetter, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Tea Zakula, University of Zagreb, Croatia
+</li>
+<li>Ettore Zanetti, Politecnico di Milano, Italy
+</li>
+<li>Rebecca Zarin Pass, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Kun Zhang, Lawrence Berkeley National Laboratory, USA
+</li>
+<li>Wangda Zuo, University of Colorado Boulder, Colorado, USA
+</li>
+</ul>
+</html>"));
+end Acknowledgements;
diff --git a/Buildings/UsersGuide/Contact.mo b/Buildings/UsersGuide/Contact.mo
new file mode 100644
index 00000000000..9bdb6d3035c
--- /dev/null
+++ b/Buildings/UsersGuide/Contact.mo
@@ -0,0 +1,18 @@
+within Buildings.UsersGuide;
+class Contact "Contact"
+  extends Modelica.Icons.Contact;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<h4><font color=\"#008000\" size=\"5\">Contact</font></h4>
+<p>
+The development of the Buildings library is organized by<br/>
+<a href=\"http://simulationresearch.lbl.gov/wetter\">Michael Wetter</a><br/>
+    Lawrence Berkeley National Laboratory (LBNL)<br/>
+    One Cyclotron Road<br/>
+    Bldg. 90-3147<br/>
+    Berkeley, CA 94720<br/>
+    USA<br/>
+    email: <a href=\"mailto:MWetter@lbl.gov\">MWetter@lbl.gov</a><br/>
+</p>
+</html>"));
+end Contact;
diff --git a/Buildings/UsersGuide/Conventions.mo b/Buildings/UsersGuide/Conventions.mo
new file mode 100644
index 00000000000..60504a38975
--- /dev/null
+++ b/Buildings/UsersGuide/Conventions.mo
@@ -0,0 +1,197 @@
+within Buildings.UsersGuide;
+class Conventions "Conventions"
+  extends Modelica.Icons.Information;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<p>
+The <code>Buildings</code> library uses the following conventions,
+which largely are based on the conventions of the Modelica Standard Library.
+</p>
+
+<h4>Package structure</h4>
+<p>
+Packages have usually the following subpackages:
+</p>
+<ul>
+<li>
+<code>UsersGuide</code> containing an overall description of the library
+and how to use it.
+</li>
+<li>
+<code>Examples</code> containing models demonstrating the
+usage of the library.
+</li>
+<li>
+<code>Validation</code> containing typically small models that validate a certain
+behavior of a model.
+</li>
+<li>
+<code>Interfaces</code> containing connectors and partial models.
+</li>
+<li>
+<code>Types</code> containing type, enumeration and choice definitions.
+</li>
+</ul>
+
+<h4>Naming</h4>
+<ol>
+<li>
+Class names of models, blocks and packages should start with an upper-case letter and be a
+noun or a noun with a combination of adjectives and nouns.
+Use camel-case notation to combine multiple words, such as <code>HeatTransfer</code>.
+Don't repeat higher level package names, for example, rather than <code>Chillers.CarnotChiller</code>,
+use <code>Chillers.Carnot</code>.
+</li>
+<li>
+Instance names should be a combination of the first three
+characters of a word, such as <code>preDro</code> for pressure drop model.
+Where applicable, a single character can be used if this is generally understood, such
+as <code>T</code> for temperature, <code>p</code> for pressure, <code>u</code> for control input
+and <code>y</code> for control output signal. As needed, these can be augmented, for example
+a controller that outputs a control signal for a valve and a damper may output <code>yVal</code>
+and <code>yDam</code>.
+</li>
+<li>
+The following variables are frequently used for physical quantities:
+<ul>
+<li><code>T</code> for temperature,</li>
+<li><code>p</code> for pressure,</li>
+<li><code>dp</code> for pressure difference,</li>
+<li><code>P</code> for power,</li>
+<li><code>E</code> for energy (or <code>Q</code> for thermal energy),</li>
+<li><code>X</code> for mass fraction,</li>
+<li><code>Q_flow</code> for heat flow rate</li>
+<li><code>m_flow</code> for mass flow rate and</li>
+<li><code>H_flow</code> for enthalpy flow rate.</li>
+</ul>
+</li>
+<li>
+The nomenclature used in the package
+<a href=\"modelica://Buildings.Utilities.Psychrometrics\">
+Buildings.Utilities.Psychrometrics</a>
+is as follows,
+<ul>
+<li>
+Uppercase <code>X</code> denotes mass fraction per total mass.
+</li>
+<li>
+Lowercase <code>x</code> denotes mass fraction per mass of dry air.
+</li>
+<li>
+The notation <code>z_xy</code> denotes that the function or block has output
+<code>z</code> and inputs <code>x</code> and <code>y</code>.
+</li>
+<li>
+The symbol <code>pW</code> denotes water vapor pressure, <code>TDewPoi</code>
+denotes dew point temperature, <code>TWetBul</code> denotes wet bulb temperature,
+and <code>TDryBul</code> (or simply <code>T</code>) denotes dry bulb temperature.
+</li>
+</ul>
+</li>
+<li>
+Control input signals usually start with <code>u</code> and control output signals usually start with <code>y</code>,
+unless use of the physical quantity is clearer.
+</li>
+<li>
+The following strings are frequently used:
+<ul>
+<li>
+Prefix <code>use_</code> for conditionally enabled input signals, such as <code>use_T_in</code>
+for enabling an input connector for temperature in
+<a href=\"modelica://Buildings.Fluid.Sources.Boundary_pT\">Buildings.Fluid.Sources.Boundary_pT</a>,
+or as <code>use_enthalpy</code> in
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Enable\">
+Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Enable</a>
+to flag if it should evaluate outdoor air enthalpy in addition to temperature.
+</li>
+<li>
+Prefix <code>have_</code> if a controller has a certain input, such as <code>have_CO2Sen</code>
+in <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Controller\">
+Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Controller</a> if the zone has a CO<sub>2</sub> sensor.
+</li>
+<li>
+Suffix <code>_flow</code> for a flow variable, such as <code>Q_flow</code>, <code>m_flow</code>
+and <code>V_flow</code>.
+See <a href=\"modelica://Buildings.Fluid.Sensors.VolumeFlowRate\">
+Buildings.Fluid.Sensors.VolumeFlowRate</a>.
+</li>
+<li>
+Suffix <code>_nominal</code> for the design or nominal capacity, i.e., <code>Q_flow_nominal</code> is the
+capacity of a device that it has at full load, and <code>m_flow_nominal</code> is the design mass flow rate.
+See <a href=\"modelica://Buildings.Fluid.HeatExchangers.HeaterCooler_u\">
+Buildings.Fluid.HeatExchangers.HeaterCooler_u</a>.
+</li>
+<li>
+Suffix <code>_small</code> for a small value which is typically used for regularization (to ensure
+a numerically robust implementation).
+</li>
+<li>
+Suffix <code>Set</code> for set point.
+</li>
+<li>
+Suffix <code>_min</code> (<code>_max</code>) for minimum (maximum),
+such as <code>TSupCoo_min</code> for the lowest cooling supply air temperature
+setpoint in
+<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.SupplyTemperature\">
+Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.SupplyTemperature</a>.
+</li>
+</ul>
+</li>
+<li>
+The two connectors of a domain that have identical declarations
+and different icons are usually distinguished by <code>_a</code>, <code>_b</code>
+or <code>_p</code>, <code>_n</code>.
+Examples are fluid ports <code>port_a</code> and <code>port_b</code>
+or electrical connectors
+<code>terminal_p</code> and <code>terminal_n</code>.
+</li>
+</ol>
+
+<h4>Documentation</h4>
+<ol>
+<li>
+In the html documentation, start additional headings with
+<code>h4</code>.
+(The headings <code>h1, h2, h3</code> must not be used,
+because they are utilized from the automatically generated
+documentation.)
+</li>
+<li>
+Comments must be added to each class (package, model, function etc.).
+</li>
+<li>
+The first character should be upper case.
+</li>
+<li>
+For one-line comments of parameters, variables and classes, no period should be used at the end of the comment.
+</li>
+</ol>
+
+<h4>Graphical display</h4>
+<ol>
+<li>
+The instance name of a component is always displayed in its icon
+(using the text string \"%name\") in blue color.
+</li>
+<li>
+A connector class has the instance
+name definition in the diagram layer and usually not in the icon layer, unless this helps with usability.
+</li>
+<li>
+The value of main parameters, such as nominal capacity, are displayed
+in the icon in black color in a smaller font size as the instance name
+if this helps with usability.
+</li>
+</ol>
+
+<h4>Miscellaneous</h4>
+<ol>
+<li>
+Where applicable, all variable must have units, also if the variable is protected.
+</li>
+<li>
+Each class (i.e., model, block and function) must be used in an example or validation case.
+</li>
+</ol>
+</html>"));
+end Conventions;
diff --git a/Buildings/UsersGuide/License.mo b/Buildings/UsersGuide/License.mo
new file mode 100644
index 00000000000..43b1817ad9e
--- /dev/null
+++ b/Buildings/UsersGuide/License.mo
@@ -0,0 +1,119 @@
+within Buildings.UsersGuide;
+class License "License"
+  extends Modelica.Icons.Information;
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<h4>License</h4>
+<p>
+Modelica Buildings Library. Copyright (c) 1998-2024
+Modelica Association,
+International Building Performance Simulation Association (IBPSA),
+The Regents of the University of California, through Lawrence Berkeley National Laboratory
+(subject to receipt of any required approvals from the U.S. Dept. of Energy) and
+contributors.
+All rights reserved.
+</p>
+<p>
+NOTICE.  This Software was developed under funding from the U.S. Department of Energy and
+the U.S. Government consequently retains certain rights.
+As such, the U.S. Government has been granted for itself and others acting on its behalf
+a paid-up, nonexclusive, irrevocable, worldwide license in the Software
+to reproduce, distribute copies to the public, prepare derivative works, and
+perform publicly and display publicly, and to permit other to do so.
+</p>
+<p>
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+</p>
+<ol>
+<li>
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+</li>
+<li>
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the distribution.
+</li>
+<li>
+Neither the names of the Modelica Association,
+International Building Performance Simulation Association (IBPSA),
+the University of California,
+Lawrence Berkeley National Laboratory,
+U.S. Dept. of Energy,
+nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+</li>
+</ol>
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</p>
+<p>
+You are under no obligation whatsoever to provide any bug fixes, patches,
+or upgrades to the features, functionality or performance of the source code
+(\"Enhancements\") to anyone; however, if you choose to make your Enhancements
+available either publicly, or directly to Lawrence Berkeley National
+Laboratory, without imposing a separate written license agreement for such
+Enhancements, then you hereby grant the following license: a non-exclusive,
+royalty-free perpetual license to install, use, modify, prepare derivative
+works, incorporate into other computer software, distribute, and sublicense
+such enhancements or derivative works thereof, in binary and source code form.
+</p>
+<p>
+Note: The license is a revised 3 clause BSD license with an ADDED paragraph
+at the end that makes it easy to accept improvements.
+</p>
+<h4>Third Party License</h4>
+<p>
+To parse weather file, the function <code>getTimeSpan.c</code> uses
+third party code that uses the following license:
+</p>
+<p>
+Copyright (c) 2011 The NetBSD Foundation, Inc.<br/>
+All rights reserved.
+</p>
+<p>
+This code is derived from software contributed to The NetBSD Foundation
+by Christos Zoulas.
+</p>
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+</p>
+<ol>
+<li>
+  Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+</li>
+<li>
+  Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+</li>
+</ol>
+<p>
+THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</p>
+</html>"));
+end License;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_10_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_10_0.mo
new file mode 100644
index 00000000000..b18c1098d51
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_10_0.mo
@@ -0,0 +1,56 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_10_0 "Version 0.10.0"
+  extends Modelica.Icons.ReleaseNotes;
+annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Added package
+<code>Buildings.Airflow.Multizone</code>
+with models for multizone airflow and contaminant transport.
+</li>
+<li>
+Added the model
+<code>Buildings.Utilities.Comfort.Fanger</code>
+for thermal comfort calculations.
+</li>
+<li>
+Rewrote
+<code>Buildings.Fluid.Storage.BaseClasses.ThirdOrderStratifier</code>, which is used in
+<code>Buildings.Fluid.Storage.StratifiedEnhanced</code>,
+to avoid state events when the flow reverses.
+This leads to faster and more robust simulation.
+</li>
+<li>
+In models of package
+<code>Buildings.Fluid.MixingVolumes</code>,
+added nominal value for <code>mC</code> to avoid wrong trajectory
+when concentration is around 1E-7.
+See also <a href=\"https://trac.modelica.org/Modelica/ticket/393\">
+https://trac.modelica.org/Modelica/ticket/393</a>.
+</li>
+<li>
+Fixed bug in fan and pump models that led to too small an enthalpy
+increase across the flow device.
+</li>
+<li>
+In model <code>Buildings.Fluid.Movers.FlowControlled_dp</code>,
+changed <code>assert(dp_in &ge; 0, ...)</code> to <code>assert(dp_in &ge; -0.1, ...)</code>.
+The former implementation triggered the assert if <code>dp_in</code> was solved for
+in a nonlinear equation since the solution can be slightly negative while still being
+within the solver tolerance.
+</li>
+<li>
+Added model
+<code>Buildings.Controls.SetPoints.Table</code>
+that allows the specification of a floating setpoint using a table of values.
+</li>
+<li>
+Revised model
+<code>Buildings.Fluid.HeatExchangers.Radiators.RadiatorEN442_2</code>.
+The new version has exactly the same nominal power during the simulation as specified
+by the parameters. This also required a change in the parameters.
+</li>
+</ul>
+</html>"));
+end Version_0_10_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_11_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_11_0.mo
new file mode 100644
index 00000000000..4d9b6426617
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_11_0.mo
@@ -0,0 +1,88 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_11_0 "Version 0.11.0"
+  extends Modelica.Icons.ReleaseNotes;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+<b>Note:</b> The packages whose name ends with <code>Beta</code>
+are still being validated.
+</p>
+
+<ul>
+<li>
+Added the package
+<code>Buildings.ThermalZones.Detailed</code> to compute heat transfer in rooms
+and through the building envelope.
+Multiple instances of these models can be connected to create
+a multi-zone building model.
+</li>
+<li>
+Added the package
+<code>Buildings.HeatTransfer.Windows</code>
+to compute heat transfer (solar radiation, infrared radiation,
+convection and conduction) through glazing systems.
+</li>
+<li>
+In package
+<code>Buildings.Fluid.Chillers</code>, added the chiller models
+<code>Buildings.Fluid.Chillers.ElectricReformulatedEIR</code>
+and
+<code>Buildings.Fluid.Cphillers.ElectricEIR</code>, and added
+the package
+<code>Buildings.Fluid.Chillers.Data</code>
+that contains data sets of chiller performance data.
+</li>
+<li>
+Added package
+<code>Buildings.BoundaryConditions</code>
+with models to compute boundary conditions, such as
+solar irradiation and sky temperature.
+</li>
+<li>
+Added package
+<code>Buildings.Utilities.IO.WeatherData</code>
+with models to read weather data in the TMY3 format.
+</li>
+<li>
+Revised the package
+<code>Buildings.Fluid.Sensors</code>.
+</li>
+<li>
+Revised the package
+<code>Buildings.Fluid.HeatExchangers.CoolingTowers</code>.
+</li>
+<li>
+In
+<code>Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger</code>
+and
+<code>Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger</code>,
+fixed bug in energy and moisture balance that affected results if a component
+adds or removes moisture to the air stream.
+In the old implementation, the enthalpy and species
+outflow at <code>port_b</code> was multiplied with the mass flow rate at
+<code>port_a</code>. The old implementation led to small errors that were proportional
+to the amount of moisture change. For example, if the moisture added by the component
+was <code>0.005 kg/kg</code>, then the error was <code>0.5%</code>.
+Also, the results for forward flow and reverse flow differed by this amount.
+With the new implementation, the energy and moisture balance is exact.
+</li>
+<li>
+In
+<code>Buildings.Fluid.Interfaces.ConservationEquation</code> and in
+<code>Buildings.Media.Interfaces.PartialSimpleMedium</code>, set
+nominal attribute for medium to provide consistent normalization.
+Without this change, Dymola 7.4 uses different values for the nominal attribute
+based on the value of <code>Advanced.OutputModelicaCodeWithJacobians=true/false;</code>
+in the model
+<code>Buildings.Examples.HydronicHeating</code>.
+</li>
+<li>
+Fixed bug in energy balance of
+<code>Buildings.Fluid.Chillers.Carnot</code>.
+</li>
+<li>
+Fixed bug in efficiency curves in package
+<code>Buildings.Fluid.Movers.BaseClasses.Characteristics</code>.
+</li>
+</ul>
+</html>"));
+end Version_0_11_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_12_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_12_0.mo
new file mode 100644
index 00000000000..bb47d6d0997
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_12_0.mo
@@ -0,0 +1,61 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_12_0 "Version 0.12.0"
+  extends Modelica.Icons.ReleaseNotes;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+<b>Note:</b> The packages whose name ends with <code>Beta</code>
+are still being validated.
+</p>
+<p>
+The following <b style=\"color:red\">critical error</b> has been fixed (i.e. error
+that can lead to wrong simulation results):
+</p>
+
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+  <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
+  <tr><td valign=\"top\"><code>Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange</code></td>
+      <td valign=\"top\">The model <code>Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange</code>
+      had an error in the view factor approximation.
+      The error caused too much radiosity to flow from large to small surfaces because the law of reciprocity
+      for view factors was not satisfied. This led to low surface temperatures if a surface had a large area
+      compared to other surfaces.
+      The bug has been fixed by rewriting the view factor calculation.
+      </td>
+  </tr>
+</table>
+
+<p>
+The following improvements and additions have been made:
+</p>
+<ul>
+<li>
+Updated library to Modelica 3.2.
+</li>
+<li>
+Added <code>homotopy</code> operator.
+</li>
+<li>
+Restructured package <code>Buildings.HeatTransfer</code>.
+</li>
+<li>
+Rewrote the models in <code>Buildings.Fluid.Actuators</code> to avoid having the flow coefficient
+<code>k</code> as an algebraic variable.
+This increases robustness.
+</li>
+<li>
+Rewrote energy, species and trace substance balance in
+<code>Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</code>
+to better handle zero mass flow rate.
+</li>
+<li>
+Implemented functions <code>enthalpyOfCondensingGas</code> and <code>saturationPressure</code>
+in single substance media
+to allow use of the room model with media that do not contain water vapor.
+</li>
+<li>
+Revised <code>Buildings.Fluid.Sources.Outside</code>
+to allow use of the room model with media that do not contain water vapor.
+</li>
+</ul>
+</html>"));
+end Version_0_12_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_1_0.mo
new file mode 100644
index 00000000000..f1b06b9a45c
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_1_0.mo
@@ -0,0 +1,21 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_1_0 "Version 0.1.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info", Documentation(info="<html>
+<p>
+First release of the library.
+</p>
+<p>
+This version contains basic models for modeling building HVAC systems.
+It also contains new medium models in the package
+<code>Buildings.Media</code>. These medium models
+have simpler property functions than the ones from
+<code>Modelica.Media</code>. For example,
+there is medium model with constant heat capacity which is often sufficiently
+accurate for building HVAC simulation, in contrast to the more detailed models
+from <code>Modelica.Media</code> that are valid in
+a larger temperature range, at the expense of introducing non-linearities due
+to the medium properties.
+</p>
+</html>"));
+end Version_0_1_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_2_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_2_0.mo
new file mode 100644
index 00000000000..647deae44fa
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_2_0.mo
@@ -0,0 +1,14 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_2_0 "Version 0.2.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info", Documentation(info=
+                 "<html>
+<p>
+New in this version are models for two and three way valves.
+In addition, the <code>Fluids</code> package has been slightly revised.
+The package <code>Fluid.BaseClasses</code> has been added because in
+the previous version, partial models for fixed resistances
+where part of the <code>Actuator</code> package.
+</p>
+</html>"));
+end Version_0_2_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_3_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_3_0.mo
new file mode 100644
index 00000000000..a55afeaefdc
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_3_0.mo
@@ -0,0 +1,58 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_3_0 "Version 0.3.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Added package <code>Buildings.Fluid.Sources</code>.
+The package contains models for modeling species that
+do not affect the medium balance of volumes. This can be used to track
+for example carbon dioxide or other species that have a small concentration.
+</li>
+<li>
+The package <code>Buildings.Fluid.Actuators.Motors</code> has been added.
+The package contains a motor model for valves and dampers.
+</li>
+<li>
+The package <code>Buildings.Media</code> has been reorganized and
+the new medium model
+<code>Buildings.Media.GasesPTDecoupled.MoistAir</code>
+has been added.
+<br/>
+In addition, this package now contains a bug fix that is needed for Modelica 2.2.1 and 2.2.2.
+The bugs are fixed by using a new
+base class
+<code>Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</code>
+ (that fixes the bugs) instead of
+<code>Modelica.Media.Interfaces.PartialSimpleIdealGasMedium</code>.
+In the original implementation, initial states of fluid volumes can be far away from
+the steady-state value because of an inconsistent implementation of the enthalpy
+and internal energy.
+When the <code>Buildings</code> library is upgraded to
+to Modelica 3.0.0, it should be safe to remove this bug fix.
+</li>
+<li>
+The package <code>Buildings.Fluid.HeatExchangers</code>
+has been revised and several models have been renamed.
+The heat exchanger models have been revised to allow computing the fluid volumes either
+dynamically, or in steady-state.
+</li>
+<li>
+The damper with exponential opening characteristic has been revised to allow control signals
+over the whole range between <code>0</code> and <code>1</code>. This was in earlier versions restricted.
+In the same model, a bug was fixed that caused the flow to be largest for <code>y=0</code>, i.e., when the damper is closed.
+</li>
+<li>
+Additional models for psychrometric equations have been added. The new models contain equations
+that convert dew point temperature and water vapor pressure, as well
+as water vapor concentration and water vapor pressure.
+</li>
+<li>
+A new mixing volume has been added that allows latent heat exchange with the volume.
+This model can be used to model a volume of moist air with water vapor condensation
+inside the volume. The condensate is removed from the volume in its liquid phase.
+</li>
+</ul>
+</html>"));
+end Version_0_3_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_4_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_4_0.mo
new file mode 100644
index 00000000000..c2ffef19c33
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_4_0.mo
@@ -0,0 +1,22 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_4_0 "Version 0.4.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Added package <code>Buildings.Fluid.Storage</code>
+with models for thermal energy storage.
+</li>
+<li>
+Added a steady-state model for a heat and moisture exchanger with
+constant effectiveness.
+See <code>Buildings.Fluid.MassExchangers.ConstantEffectiveness</code>
+</li>
+<li>
+Added package <code>Buildings.Utilities.Reports</code>.
+The package contains models that facilitate reporting.
+</li>
+</ul>
+</html>"));
+end Version_0_4_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_5_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_5_0.mo
new file mode 100644
index 00000000000..902263b01cb
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_5_0.mo
@@ -0,0 +1,34 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_5_0 "Version 0.5.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Updated library to Modelica.Fluid 1.0.
+</li>
+<li>
+Moved most examples from package <code>Buildings.Fluid.Examples</code> to the
+example directory in the package of the individual model.
+</li>
+<li>
+Renamed package <code>Buildings.Utilites.Controls</code> to
+<code>Buildings.Utilites.Diagnostics</code>.
+</li>
+<li>
+Introduced packages
+<code>Buildings.Controls</code>,
+<code>Buildings.HeatTransfer</code>
+(which contains models for heat transfer that generally does not involve
+modeling of the fluid flow),
+<code>Buildings.Fluid.Boilers</code> and
+<code>Buildings.Fluid.HeatExchangers.Radiators</code>.
+</li>
+<li>
+Changed valve models in <code>Buildings.Fluid.Actuators.Valves</code> so that
+<code>Kv</code> or <code>Cv</code> can
+be used as the flow coefficient (in [m3/h] or [USG/min]).
+</li>
+</ul>
+</html>"));
+end Version_0_5_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_6_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_6_0.mo
new file mode 100644
index 00000000000..9776e921136
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_6_0.mo
@@ -0,0 +1,90 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_6_0 "Version 0.6.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Added the package
+<code>Buildings.Utilities.IO.BCVTB</code>
+which contains an interface to the
+<a href=\"http://simulationresearch.lbl.gov/bcvtb\">Building Controls Virtual Test Bed.</a>
+</li>
+<li>
+Updated license to Modelica License 2.
+</li>
+<li>
+Replaced
+<code>Buildings.Utilities.Psychrometrics.HumidityRatioPressure</code>
+by
+<code>Buildings.Utilities.Psychrometrics.HumidityRatio_pWat</code>
+and
+<code>Buildings.Utilities.Psychrometrics.VaporPressure_X</code>
+because the old model used <code>RealInput</code> ports, which are obsolete
+in Modelica 3.0.
+</li>
+<li>
+Changed the base class
+<code>Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</code>
+to enable computation of pressure drop of mechanical equipment.
+</li>
+<li>
+Introduced package
+<code>Buildings.Fluid.BaseClasses.FlowModels</code> to model pressure drop,
+and rewrote
+<code>Buildings.Fluid.BaseClasses.PartialResistance</code>.
+</li>
+<li>
+Redesigned package
+<code>Buildings.Utilities.Math</code> to allow having blocks and functions
+with the same name. Functions are now in
+<code>Buildings.Utilities.Math.Functions</code>.
+</li>
+<li>
+Fixed sign error in
+<code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code>
+which caused a wrong energy balance in
+<code>Buildings.Fluid.Storage.StratifiedEnhanced</code>.
+</li>
+<li>
+Renamed
+<code>Buildings.Fluid.HeatExchangers.HeaterCoolerIdeal</code> to
+<code>Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed</code>
+to have the same nomenclatures as is used for
+<code>Buildings.Fluid.MassExchangers.HumidifierPrescribed</code>
+</li>
+<li>
+In
+<code>Buildings.Fluid/Actuators/BaseClasses/PartialDamperExponential</code>,
+added option to compute linearization near zero based on
+the fraction of nominal flow instead of the Reynolds number.
+This was set as the default, as it leads most reliably to a model
+parametrization that leads to a derivative <code>d m_flow/d p</code>
+near the origin that is not too steep for a Newton-based solver.
+</li>
+<li>
+In damper and VAV box models, added optional parameters
+to allow specifying the nominal face velocity instead of the area.
+</li>
+<li>
+Set nominal attribute for pressure drop <code>dp</code> in
+<code>Buildings.Fluid.BaseClasses.PartialResistance</code> and in its
+child classes.
+</li>
+<li>
+Added models for chiller
+(<code>Buildings.Fluid.Chillers.Carnot</code>),
+for occupancy
+(<code>Buildings.Controls.SetPoints.OccupancySchedule</code>) and for
+blocks that take a vector as an argument
+(<code>Buildings.Utilities.Math.Min</code>,
+<code>Buildings.Utilities.Math.Max</code>, and
+<code>Buildings.Utilities.Math.Average</code>).
+</li>
+<li>
+Changed various variable names to be consistent with naming
+convention used in Modelica.Fluid 1.0.
+</li>
+</ul>
+</html>"));
+end Version_0_6_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_7_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_7_0.mo
new file mode 100644
index 00000000000..96544426451
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_7_0.mo
@@ -0,0 +1,22 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_7_0 "Version 0.7.0"
+  extends Modelica.Icons.ReleaseNotes;
+            annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Updated library from Modelica_Fluid to Modelica.Fluid 1.0
+</li>
+<li>
+Merged sensor and source models from Modelica.Fluid to Buildings.Fluid.
+</li>
+<li> Added sensor for sensible and latent enthalpy flow rate,
+<code>Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate</code> and
+<code>Buildings.Fluid.Sensors.LatentEnthalpyFlowRate</code>.
+These sensors are needed, for example, to interface air-conditioning
+systems that are modeled with Modelica with the Building Controls
+Virtual Test Bed.
+</li>
+</ul>
+</html>"));
+end Version_0_7_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_8_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_8_0.mo
new file mode 100644
index 00000000000..ef602479332
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_8_0.mo
@@ -0,0 +1,110 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_8_0 "Version 0.8.0"
+  extends Modelica.Icons.ReleaseNotes;
+            annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+In
+<code>Buildings.Fluid.Interfaces.ConservationEquation</code>,
+added to <code>Medium.BaseProperties</code> the initialization
+<code>X(start=X_start[1:Medium.nX])</code>. Previously, the initialization
+was only done for <code>Xi</code> but not for <code>X</code>, which caused the
+medium to be initialized to <code>reference_X</code>, ignoring the value of <code>X_start</code>.
+</li>
+<li>
+Renamed <code>Buildings.Media.PerfectGases.MoistAirNonSaturated</code>
+to <code>Buildings.Media.PerfectGases.MoistAirUnsaturated</code>
+and <code>Buildings.Media.GasesPTDecoupled.MoistAirNoLiquid</code>
+to
+<code>Buildings.Media.Air</code>,
+and added <code>assert</code> statements if saturation occurs.
+</li>
+<li>
+Added regularizaation near zero flow to
+<code>Buildings.Fluid.HeatExchangers.ConstantEffectiveness</code>
+and
+<code>Buildings.Fluid.MassExchangers.ConstantEffectiveness</code>.
+</li>
+<li>
+Fixed bug regarding temperature offset in
+<code>Buildings.Media.PerfectGases.MoistAirUnsaturated.T_phX</code>.
+</li>
+<li>
+Added implementation of function
+<code>Buildings.Media.Air.enthalpyOfNonCondensingGas</code> and its derivative.
+</li>
+<li>
+In <code>Buildings.Media.PerfectGases.MoistAir</code>, fixed
+bug in implementation of <code>Buildings.Media.PerfectGases.MoistAir.T_phX</code>.
+In the previous version, it computed the inverse of its parent class,
+which gave slightly different results.
+</li>
+<li>
+In <code>Buildings.Utilities.IO.BCVTB.BCVTB</code>, added parameter to specify
+the value to be sent to the BCVTB at the first data exchange,
+and added parameter that deactivates the interface. Deactivating
+the interface is sometimes useful during debugging.
+</li>
+<li>
+In <code>Buildings.Media.GasesPTDecoupled.MoistAir</code> and in
+<code>Buildings.Media.PerfectGases.MoistAir</code>, added function
+<code>enthalpyOfNonCondensingGas</code> and its derivative.
+</li>
+<li>
+In <code>Buildings.Media</code>,
+fixed bug in implementations of derivatives.
+</li>
+<li>
+Added model
+<code>Buildings.Fluid.Storage.ExpansionVessel</code>.
+</li>
+<li>
+Added Wrapper function <code>Buildings.Fluid.Movers.BaseClasses.Characteristics.solve</code>
+for <code>Modelica.Math.Matrices.solve</code>. This is currently needed since
+<code>Modelica.Math.Matrices.solve</code> does not specify a
+derivative.
+</li>
+<li>
+Fixed bug in
+<code>Buildings.Fluid.Storage.Stratified</code>.
+In the previous version,
+for computing the heat conduction between the top (or bottom) segment and
+the outside,
+the whole thickness of the water volume was used
+instead of only half the thickness.
+</li>
+<li>
+In <code>Buildings.Media.ConstantPropertyLiquidWater</code>, added the option to specify
+a compressibility. This can help reducing the size of the coupled nonlinear system of
+equations, at the expense of introducing stiffness. This change required to change
+the inheritance tree of the medium. Its base class is now
+<code>Buildings.Media.Interfaces.PartialSimpleMedium</code>,
+which contains the equation for the compressibility. The default setting will model
+the flow as incompressible.
+</li>
+<li>
+In <code>Buildings.Controls.Continuous.Examples.PIDHysteresis</code>
+and <code>Buildings.Controls.Continuous.Examples.PIDHysteresisTimer</code>,
+fixed error in default parameter <code>eOn</code>.
+Fixed error by introducing parameter <code>Td</code>,
+which used to be hard-wired in the PID controller.
+</li>
+<li>
+Added more models for fans and pumps to the package
+<code>Buildings.Fluid.Movers</code>.
+The models are similar to the ones in
+<code>Modelica.Fluid.Machines</code> but have been adapted for
+air-based systems, and to include more characteristic curves
+in
+<code>Buildings.Fluid.Movers.BaseClasses.Characteristics</code>.
+The new models are better suited than the existing fan model
+<code>Buildings.Fluid.Movers.FlowMachinePolynomial</code> for zero flow rate.
+</li>
+<li>
+Added an optional mixing volume to <code>Buildings.Fluid.BaseClasses.PartialThreeWayResistance</code>
+and hence to the flow splitter and to the three-way valves. This often breaks algebraic loops and provides a state for the temperature if the mass flow rate goes to zero.
+</li>
+</ul>
+</html>"));
+end Version_0_8_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_9_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_9_0.mo
new file mode 100644
index 00000000000..95ad46544d5
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_9_0.mo
@@ -0,0 +1,103 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_9_0 "Version 0.9.0"
+  extends Modelica.Icons.ReleaseNotes;
+annotation (preferredView="info", Documentation(info=
+                 "<html>
+<ul>
+<li>
+Added the following heat exchanger models
+<ul>
+<li>
+<code>Buildings.Fluid.HeatExchangers.DryEffectivenessNTU</code>
+for a sensible heat exchanger that uses the <code>epsilon-NTU</code>
+relations to compute the heat transfer.
+</li>
+<li>
+<code>Buildings.Fluid.HeatExchangers.DryCoilCounterFlow</code> and
+<code>Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</code>
+to model a coil without and with water vapor condensation. These models
+approximate the coil as a counterflow heat exchanger.
+</li>
+</ul>
+</li>
+<li>
+Revised air damper
+<code>Buildings.Fluid.Actuators.BaseClasses.exponentialDamper</code>.
+The new implementation avoids warnings and leads to faster convergence
+since the solver does not attempt anymore to solve for a variable that
+needs to be strictly positive.
+</li>
+<li>
+Revised package
+<code>Buildings.Fluid.Movers</code>
+to allow zero flow for some pump or fan models.
+If the input to the model is the control signal <code>y</code>, then
+the flow is equal to zero if <code>y=0</code>. This change required rewriting
+the package to avoid division by the rotational speed.
+</li>
+<li>
+Revised package
+<code>Buildings.HeatTransfer</code>
+to include a model for a multi-layer construction, and to
+allow individual material layers to be computed steady-state or
+transient.
+</li>
+<li>
+In package  <code>Buildings.Fluid</code>, changed models so that
+if the parameter <code>dp_nominal</code> is set to zero,
+then the pressure drop equation is removed. This allows, for example,
+to model a heating and a cooling coil in series, and lump there pressure drops
+into a single element, thereby reducing the dimension of the nonlinear system
+of equations.
+</li>
+<li>
+Added model <code>Buildings.Controls.Continuous.LimPID</code>, which is identical to
+<code>Modelica.Blocks.Continuous.LimPID</code>, except that it
+allows reverse control action. This simplifies use of the controller
+for cooling applications.
+</li>
+<li>
+Added model <code>Buildings.Fluid.Actuators.Dampers.MixingBox</code> for an outside air
+mixing box with air dampers.
+</li>
+<li>
+Changed implementation of flow resistance in
+<code>Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow</code>. Instead of using a
+fixed resistance and a damper model in series, only one model is used
+that internally adds these two resistances. This leads to smaller systems
+of nonlinear equations.
+</li>
+<li>
+Changed
+<code>Buildings.Media.PerfectGases.MoistAir.T_phX</code> (and by inheritance all
+other moist air medium models) to first compute <code>T</code>
+in closed form assuming no saturation. Then, a check is done to determine
+whether the state is in the fog region. If the state is in the fog region,
+then <code>Internal.solve</code> is called. This new implementation
+can lead to significantly shorter computing
+time in models that frequently call <code>T_phX</code>.
+</li>
+<li>
+Added package
+<code>Buildings.Media.GasesConstantDensity</code> which contains medium models
+for dry air and moist air.
+The use of a constant density avoids having pressure as a state variable in mixing volumes. Hence, fast transients
+introduced by a change in pressure are avoided.
+The drawback is that the dimensionality of the coupled
+nonlinear equation system is typically larger for flow
+networks.
+</li>
+<li>
+In
+<code>Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential</code>,
+added default value for parameter <code>A</code> to avoid compilation error
+if the parameter is disabled but not specified.
+</li>
+<li>
+Simplified the mixing volumes in
+<code>Buildings.Fluid.MixingVolumes</code> by removing the port velocity,
+pressure drop and height.
+</li>
+</ul>
+</html>"));
+end Version_0_9_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_0_9_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_0_9_1.mo
new file mode 100644
index 00000000000..9505e807d04
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_0_9_1.mo
@@ -0,0 +1,29 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_0_9_1 "Version 0.9.1"
+  extends Modelica.Icons.ReleaseNotes;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+The following <b style=\"color:red\">critical error</b> has been fixed (i.e. error
+that can lead to wrong simulation results):
+</p>
+
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+  <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage.</b></td></tr>
+  <tr><td valign=\"top\"><code>Buildings.Fluid.Storage.StratifiedEnhanced</code></td>
+      <td valign=\"top\">The model <code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code>
+      had a sign error that lead to a wrong energy balance.
+      The model that was affected by this error is
+      <code>Buildings.Fluid.Storage.StratifiedEnhanced</code>.
+      The model
+      <code>Buildings.Fluid.Storage.Stratified</code> was not affected.<br/>
+      The bug has been fixed by using the newly introduced model
+      <code>Buildings.Fluid.Storage.BaseClasses.ThirdOrderStratifier</code>. This model
+      uses a third-order upwind scheme to reduce the numerical dissipation instead of the
+      correction term that was used in <code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code>.
+      The model <code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code> has been removed since it
+      also led to significant overshoot in temperatures when the stratification was pronounced.
+      </td>
+  </tr>
+</table>
+</html>"));
+end Version_0_9_1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_10_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_10_0_0.mo
new file mode 100644
index 00000000000..200cc1976ba
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_10_0_0.mo
@@ -0,0 +1,1220 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_10_0_0 "Version 10.0.0"
+extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 10.0.0 is a major release that adds various new packages and models.
+</p>
+<p>
+The library has been tested with
+Dymola 2023x,
+OpenModelica 1.22.0-dev (41-g8a5b18f-1),
+OPTIMICA 1.43.4 and recent versions of Impact.
+</p>
+<p>
+The following major changes have been done compared to release 9.1.1:
+</p>
+<ul>
+<li>
+A package with configurable template models for variable air volume flow systems
+with control based on ASHRAE Guideline 36 has been added to
+<code>Buildings.Template</code>.
+</li>
+<li>
+Reduced order building envelope models
+based on the ISO 13790:2008 Standard have been added.
+This allows modeling of building envelope heat transfer either with a detailed Modelica
+multizone model (<code>Buildings.ThermalZones.Detailed</code>),
+with EnergyPlus via the Spawn coupling (<code>Buildings.ThermalZones.EnergyPlus_9_6_0</code>),
+or with reduced order models based on ISO 13790 (<code>Buildings.ThermalZones.ISO13790</code>)
+or based on VDI 6007 (<code>Buildings.ThermalZones.ReducedOrder</code>).
+</li>
+<li>
+Various models for district energy systems have been added to the package
+<code>Buildings.Experimental</code>.
+This package includes models for
+<ul>
+<li>
+combined heating and cooling district energy systems
+that operate near ambient temperature (sometimes called 5th generation district energy systems),
+</li>
+<li>
+Energy Transfer Stations (ETS) with all electric plants with heat recovery chillers,
+</li>
+<li>
+ETS with multiple heat pumps (heat recovery as well as air-source heat pumps) and storage, i.e.,
+the so-called Time-Independent Energy Recovery (TIER) plant in
+(<code>Buildings.DHC.Plants.Combined.AllElectricCWStorage</code>),
+</li>
+<li>
+direct and indirect ETS for heating or for cooling, and
+</li>
+<li>
+district steam systems.
+</li>
+</ul>
+</li>
+<li>
+A package with all major hydronic configurations that are encountered in heating and cooling systems
+has been added in <code>Buildings.Fluid.HydronicConfigurations</code>.
+This package also includes automatic sizing of control valves to obtain suitable valve authority.
+</li>
+<li>
+The fan and pump models have been revised, and can now be configured to compute
+the part load efficiency based on the Euler number.
+</li>
+<li>
+Various new elementary control blocks have been added to the <code>Buildings.Controls.OBC.CDL</code> package to
+provide a reference implementation of the ASHRAE Standard 231P
+<i>Control Description Language</i> that is currently being developed.
+See also <a href=\"https://obc.lbl.gov\">obc.lbl.gov</a>.
+</li>
+</ul>
+</div>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Templates
+    </td>
+    <td valign=\"top\">Package that contains templates for HVAC systems with control sequences
+                       based on ASHRAE Guideline 36.
+                       Currently limited to VAV systems, the package is under active development
+                       and will be further expanded with templates for primary systems and various
+                       types of zone equipment.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.ISO13790
+    </td>
+    <td valign=\"top\">Package that contains models for reduced building physics of thermal zones
+                       based on a thermal network consisting of five resistances and one capacity.
+                       The models are inspired by the ISO 13790:2008 Standard.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Heating
+    </td>
+    <td valign=\"top\">Package containing models for energy transfer stations used in district heating systems.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.Examples
+    </td>
+    <td valign=\"top\">Package that contains example models of a building
+                       with loads provided as time series for heat
+                       pump space heating, heat pump domestic hot water heating,
+                       and free cooling in an ambient district network.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.Heating
+    </td>
+    <td valign=\"top\">Package containing models for loads in district heating systems.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Combined
+    </td>
+    <td valign=\"top\">Package of models for central plants that provide heating and cooling.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.BaseClasses.Steam
+    </td>
+    <td valign=\"top\">Package for steam systems using the split-medium approach..
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Steam
+    </td>
+    <td valign=\"top\">Package of example models for steam district heating systems.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.Steam
+    </td>
+    <td valign=\"top\">Package with models for loads involving steam systems.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Steam
+    </td>
+    <td valign=\"top\">Package of models for distribution networks involving steam.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Steam
+    </td>
+    <td valign=\"top\">Package with models for steam plants.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HydronicConfigurations
+    </td>
+    <td valign=\"top\">Package that contains models for standard connection
+                       configurations used in hydronic circuits for heating or cooling applications.
+    </td>
+</tr>
+  </table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Proof
+    </td>
+    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231p committee.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3256\">issue 3256</a>.
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.VariablePulse
+    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231p committee.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3042\">issue 3042</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Ramp
+    </td>
+    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231p committee.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3141\">issue 3141</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Stage
+    </td>
+    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231P committee.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3103\">issue 3103</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants.Cooling</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.StoragePlant<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.FlowControl<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.SelectMin<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.TankStatus<br/>
+                       Buildings.DHC.Plants.Cooling.Controls.Validation.TankStatus<br/>
+                       Buildings.DHC.Plants.Cooling.Examples.StoragePlantDualSource<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.IdealUser<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.ParallelJunctions<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.ParallelPipes<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.ReversibleConnection<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.TankBranch<br/>
+                       Buildings.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser
+    </td>
+    <td valign=\"top\">Added models for a district CHW system with two plants,
+                       where one of them has a storage tank that can be charged remotely by the other plant.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">issue 2859</a>.
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">
+        Buildings.Fluid.Movers.Examples.Data.EnglanderNorford1992<br/>
+        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW12<br/>
+        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW13<br/>
+        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW15<br/>
+        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW16<br/>
+        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW18<br/>
+        Buildings.Fluid.Movers.Examples.StaticReset<br/>
+        Buildings.Fluid.Movers.Validation.PowerEuler<br/>
+        Buildings.Fluid.Movers.BaseClasses.Euler.computeTables<br/>
+        Buildings.Fluid.Movers.BaseClasses.Euler.correlation<br/>
+        Buildings.Fluid.Movers.BaseClasses.Euler.getPeak<br/>
+        Buildings.Fluid.Movers.BaseClasses.Euler.lookupTables<br/>
+        Buildings.Fluid.Movers.BaseClasses.Euler.peak<br/>
+        Buildings.Fluid.Movers.BaseClasses.Validation.EulerComparison<br/>
+        Buildings.Fluid.Movers.BaseClasses.Validation.EulerCurve<br/>
+        Buildings.Fluid.Movers.BaseClasses.Validation.EulerReducedSpeed<br/>
+        Buildings.Fluid.Movers.BaseClasses.Validation.HydraulicEfficiencyMethods<br/>
+        Buildings.Fluid.Movers.BaseClasses.Validation.TotalEfficiencyMethods
+    </td>
+    <td valign=\"top\">
+    Added package that enables the Euler number method for efficiency computation,
+    as well as example models, validation models, and data records to support it.<br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+        Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot<br/>
+        Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot<br/>
+        Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve<br/>
+        Buildings.Fluid.Movers.BaseClasses.Validation.MotorEfficiencyMethods
+    </td>
+    <td valign=\"top\">
+    Added functions and data records that allow the motor efficiency to be provided
+    as a function of part load ratio, and its validation model.<br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+        Buildings.Fluid.Movers.Preconfigured.FlowControlled_dp<br/>
+        Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow<br/>
+        Buildings.Fluid.Movers.Preconfigured.SpeedControlled_y<br/>
+        Buildings.Fluid.Movers.Preconfigured.Validation.ControlledFlowMachinePreconfigured
+    </td>
+    <td valign=\"top\">
+    Added preconfigured versions for the mover models that only require the user
+    to provide nominal conditions.<br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+        Buildings.Fluid.Movers.Validation.PressureCurve
+    </td>
+    <td valign=\"top\">
+    Added a validation model that displays the pressure curve.<br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3371\">#3371</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.BaseClasses.PartialAirSource
+    </td>
+    <td valign=\"top\">Added new base class that only provides moist air as a medium selection.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1681\">IBPSA, #1681</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Files</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Utilities.IO.Files.WeeklySchedule
+    </td>
+    <td valign=\"top\">Added model to read weekly time schedules from a file.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1601\">IBPSA, #1601</a>.
+    </td>
+  </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Controls.OBC.ASHRAE.G36.TerminalUnits</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms
+    </td>
+    <td valign=\"top\">Added delay triggering alarms after enabling AHU supply fan, to allow the system becoming stabilized.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants.Cooling</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed
+    </td>
+    <td valign=\"top\">Set <code>final totPum.nin = numPum</code> so that this block is restricted
+                       to a two-pump configuration as intended.
+                       Also corrected the \"up to two pumps\" language in documentation.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3470\">issue 3470</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.UsersGuide<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx
+    </td>
+    <td valign=\"top\">Added test acceptance criteria limits.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3396\">issue 3396</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.PIDWithInputGains
+    </td>
+    <td valign=\"top\">Correted the instance <code>antWinGai2</code> to be conditional.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3423\">#3423</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">Improved error message in Java application that converts weather file.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3380\">#3380</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.AHUs</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.FreezeProtection<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.FreezeProtection
+    </td>
+    <td valign=\"top\">Added flag to disable freeze protection.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Switch
+    </td>
+    <td valign=\"top\">Added <code>smoothOrder(0, ...)</code> as this is required for some solvers
+                     that assume otherwise the output of the block to be differentiable.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.RealExtractSignal
+    </td>
+    <td valign=\"top\">Added assertion when the extract index is out of range.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Electrical.Interfaces.PartialTwoPort
+    </td>
+    <td valign=\"top\">Added constraining clause for terminal as models that extend from this model
+                     access a component that is not in the base class, and Optimica 1.40
+                     issues a warning for this.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3236\">#3236</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples.ScalableBenchmarks</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone
+    </td>
+    <td valign=\"top\">Changed <code>fan[].m_flow_nominal</code> from 10 to 0.1.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3067\">#3067</a>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Guideline36
+    </td>
+    <td valign=\"top\">Changed the indication of the status when window is closed.<br/>
+                       In default, it should be true (closed dry contact) rather than false.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">#3257</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.PartialHVAC
+    </td>
+    <td valign=\"top\">Added junction to mix the return and outdoor air.<br/>
+                       Set the value of parameter <code>transferHeat</code> to true for the mixed air temperature sensor.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3230\">#3230</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.VAVReheatBox
+    </td>
+    <td valign=\"top\">Changed the pressure independent damper to exponential damper.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Controls.RoomVAV
+    </td>
+    <td valign=\"top\">Added flag to choose different damper type and added control for the boxes with the exponential damper.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+</td>
+<tr><td valign=\"top\">Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
+    </td>
+    <td valign=\"top\">Compute the scaling parameters based on the peak loads
+                        and revise documentation.<br/>
+                        This is for
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2302\">#2302</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2Pipe
+    </td>
+    <td valign=\"top\">Removed renamed model redeclare to solve error and allow separate pipe
+                       declarations on sup/ret of DHC networks.<br/>
+                        This is for
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
+    </td>
+    <td valign=\"top\">Fix redeclare of dis pipe models in connections.<br/>
+                        This is for
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve
+    </td>
+    <td valign=\"top\">Removed start value for <code>dp</code>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">#3231</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.BaseClasses</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.MassFlowRateMultiplier
+    </td>
+    <td valign=\"top\">Added option to use input connector as multiplier factor.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1684\">IBPSA, #1684</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                         Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
+                         Buildings.Fluid.MixingVolumes.MixingVolume<br/>
+                         Buildings.Fluid.MixingVolumes.MixingVolume.MoistAir</br>
+                         Buildings.Fluid.Sensors.TemperatureWetBulbTwoPort
+    </td>
+    <td valign=\"top\">Improved implementation so that models also work with certain media from
+                       the Modelica Standard Library that may be used to model combustion gases.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1650\">IBPSA, #1650</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Chillers.BaseClasses.PartialElectric
+    </td>
+    <td valign=\"top\">Added optional switchover mode for heat recovery chillers.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3211\">#3211</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Chillers.BaseClasses.Carnot
+  </td>
+  <td valign=\"top\">Changed parameter binding
+                     <code>etaCarnot_nominal(unit=\"1\") =
+                     COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
+                     to
+                     <code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
+                     Improved documentation.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">#3226</a>.
+  </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.OneUTube<br/>
+                       Buildings.Fluid.Geothermal.Borefields.TwoUTubes
+    </td>
+    <td valign=\"top\">Enabled calculation of bore fields with hundreds of bore holes. This is
+                       accomplished by updating the calculation of the ground temperature response in the model
+                       <code>Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.GroundTemperatureResponse</code>
+                       using clustering of bore holes as described in
+                       <a href=\"https://doi.org/10.1080/19401493.2021.1968953\">
+                       doi:10.1080/19401493.2021.1968953</a>.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1577\">IBPSA, #1577</a>.
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU<br/>
+                       Buildings.Fluid.HeatExchangers.BaseClasses.PartialEffectivenessNTU
+    </td>
+    <td valign=\"top\">Set <code>flowRegime</code> to be equal to <code>flowRegime_nominal</code>
+                       by default. Added an assertion warning to inform the user about how to change
+                       this behaviour if the flow direction does need to change.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1682\">IBPSA, #1682</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
+  </td>
+</tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                         Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                         Buildings.Fluid.Movers.SpeedControlled_y
+    </td>
+    <td valign=\"top\">Avoided negative flow work if the flow or pressure is forced in a way that the flow work would be negative.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1621\">IBPSA, #1621</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                         Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                         Buildings.Fluid.Movers.SpeedControlled_y<br/>
+                         Buildings.Fluid.Movers.Preconfigured.SpeedControlled_y<br/>
+                         Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine
+    </td>
+    <td valign=\"top\">Changed the way the nominal flow rate is declared
+                       so that it can be modified in <code>PartialFlowMachine</code>
+                       by a higher-level model, but not the other way around.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1705\">IBPSA, #1705</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
+    </td>
+    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
+    </td>
+    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.BaseClasses.Outside<br/>
+                       Buildings.Fluid.Sources.MassFlowSource_WeatherData
+    </td>
+    <td valign=\"top\">Changed base class to constrain medium to moist air.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1681\">IBPSA, #1681</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassTRExteriorIrradiationNoShading<br/>
+                       Buildings.HeatTransfer.Windows.Functions.glassTRInteriorIrradiationNoShading
+    </td>
+    <td valign=\"top\">Added default value for output variables.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3111\">#3111</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Examples.BaseClasses.PartialProperties
+    </td>
+    <td valign=\"top\">Removed a self-dependent default binding of a function input.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3384\">#3384</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Steam
+    </td>
+    <td valign=\"top\">Changed the variable type definition of <code>pHat</code> and <code>THat</code>
+                       from absolute to <code>Modelica.Units.SI.PressureDifference</code> and
+                       <code>Modelica.Units.SI.TemperatureDifference</code> to prevent min/max
+                       assertion erros during initilization.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.<br/>
+                       In function <code>rho_pT</code>, created and used new function extending
+                       <code>Modelica.Media.Water.IF97_Utilities.BaseIF97.Basic.g2</code> with an
+                       annotation <code>smoothOrder=2</code>.  This is to specifcally pass on the
+                       <code>smoothOrder=2</code> annotion placed on <code>rho_pT</code> to
+                       the <code>g2</code> function.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Obsolete.Controls.OBC.ASHRAE.G36_PR1</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Obsolete.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
+    </td>
+    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse</b>
+    </td>
+</tr><tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom<br/>
+                          Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface<br/>
+                          Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer
+    </td>
+    <td valign=\"top\">Changed pipe spacing and insulation of radiant slab.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane
+    </td>
+    <td valign=\"top\">Corrected units of protected variables to avoid warning during model check.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1644\">IBPSA, issue #1644</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+  <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.regNonZeroPower
+    </td>
+    <td valign=\"top\">Improved documentation and assertion.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3135\">Buildings, issue #3135</a>.
+    </td>
+  </tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.spliceFunction<br/>
+                         Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
+    </td>
+    <td valign=\"top\">Improved implementation of transition limits.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Controls.OBC.ASHRAE.G36.TerminalUnits</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms
+    </td>
+    <td valign=\"top\">Added zone operation mode input to limit triggering alarms only in occupied mode.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Dampers<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.DamperValves
+    </td>
+    <td valign=\"top\">Added AHU supply fan status input for damper position reset.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Air</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizer
+    </td>
+    <td valign=\"top\">Refactored the model for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.AHUs</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.SeparateWithDP<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Economizers.Subsequences.Enable<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Economizers.Subsequences.Limits
+    </td>
+    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
+                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms<br/>
+    </td>
+    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
+                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Dampers<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Dampers<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Dampers<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Dampers<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.DampersDualSensors<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.DampersSingleSensors<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.DamperValves<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.DamperValves<br/>
+    </td>
+    <td valign=\"top\">Removed the parameter <code>have_preIndDam</code> to exclude the option of using pressure independant damper.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.Types</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes
+    </td>
+    <td valign=\"top\">Removed the option of using return fan with tracking calculated supply and return airflow.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection
+    </td>
+    <td valign=\"top\">Removed the no-economizer option.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous<br/>
+    </td>
+    <td valign=\"top\">Renamed package <code>Continuous</code> to <code>Reals</code>
+                       due to changes in ASHRAE Standard 231P.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3483\">#3483</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.And3<br/>
+                         Buildings.Controls.OBC.CDL.Logical.Validation.And3
+    </td>
+    <td valign=\"top\">Moved to the <code>Obsolete</code> package based on ASHRAE 231P.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Acos<br/>
+                       Buildings.Controls.OBC.CDL.Reals.Asin<br/>
+                       Buildings.Controls.OBC.CDL.Reals.Atan<br/>
+                       Buildings.Controls.OBC.CDL.Reals.Atan2
+    </td>
+    <td valign=\"top\">Added unit <code>rad</code> to the output.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3277\">#3277</a>.<br/>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Cos<br/>
+                       Buildings.Controls.OBC.CDL.Reals.Sin<br/>
+                       Buildings.Controls.OBC.CDL.Reals.Tan
+    </td>
+    <td valign=\"top\">Added unit <code>rad</code> to the input.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3277\">#3277</a>.<br/>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.RealExtractor
+    </td>
+    <td valign=\"top\">Removed parameter <code>allowOutOfRange</code> and <code>outOfRangeValue</code> and output the element with the nearest valid index
+                       when the index input is out of range.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
+                       Buildings.Examples.HydronicHeating.TwoRoomsWithStorage<br/>
+                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone<br/>
+                       Buildings.Examples.VAVReheat.BaseClasses.PartialHVAC
+    </td>
+    <td valign=\"top\">Replaced fan and pump models that have simple two-point
+                       pressure curve assignments with preconfigured models.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
+    </td>
+    <td valign=\"top\">Changed control that enables the heating system.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop
+    </td>
+    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
+                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Loads</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.BaseClasses.FlowDistribution<br/>
+                       Buildings.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl
+    </td>
+    <td valign=\"top\">Swapped the pump models for preconfigured versions.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3099\">#3099</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.DXCoils</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.DXCoils.AirCooled<br/>
+                       Buildings.Fluid.DXCoils.WaterCooled
+    </td>
+    <td valign=\"top\">Renamed packages to <code>AirSource</code> and <code>WaterSource</code>
+                       as DX coils for heating are added, and hence cooled is not an appropriate package name.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3288\">issue 3288</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Examples.SimpleHouse
+    </td>
+    <td valign=\"top\">Changed <code>conDam.yMin</code> from 0.1 to 0.25.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1624\">
+                       IBPSA, #1624</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine
+    </td>
+    <td valign=\"top\">Removed the block that was used to support fan or pump models with an rpm input.
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, issue 1704</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
+                       Buildings.Fluid.Movers.Data.Generic<br/>
+                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW12<br/>
+                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW13<br/>
+                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW15<br/>
+                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW16<br/>
+                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW18<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.CronolineIL80slash220dash4slash4<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to8<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to4<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to8<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to8<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos50slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos80slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS25slash10<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash10<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash5<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash10<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash7<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine50slash150dash4slash2<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2<br/>
+                       Buildings.Fluid.Movers.Examples.MoverContinuous<br/>
+                       Buildings.Fluid.Movers.Examples.MoverParameter<br/>
+                       Buildings.Fluid.Movers.Examples.MoverStages<br/>
+                       Buildings.Fluid.Movers.Preconfigured.Validation.ControlledFlowMachinePreconfigured<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_y<br/>
+                       Buildings.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine<br/>
+                       Buildings.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow<br/>
+                       Buildings.Fluid.Movers.Validation.ControlledFlowMachine<br/>
+                       Buildings.Fluid.Movers.Validation.ControlledFlowMachineDynamic<br/>
+                       Buildings.Fluid.Movers.Validation.PowerSimplified<br/>
+                       Buildings.Fluid.Movers.Validation.PumpCurveDerivatives<br/>
+                       Buildings.Fluid.Movers.Validation.Pump_stratos<br/>
+                       Buildings.Fluid.Movers.Validation.Pump_y_stratos
+    </td>
+    <td valign=\"top\">Removed or replaced parameters, blocks, and components that were
+                       used to support fan or pump models with an rpm input.
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, issue 1704</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+                       Buildings.Fluid.Movers.Preconfigured.SpeedControlled_Nrpm<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                       Buildings.Fluid.Movers.Validation.SpeedControlled_Nrpm
+    </td>
+    <td valign=\"top\">Moved to the <code>Obsolete</code> package.
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, issue 1704</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface<br/>
+                       Buildings.Fluid.Movers.BaseClasses.PowerInterface<br/>
+                       Buildings.Fluid.Movers.BaseClasses.Types
+    </td>
+    <td valign=\"top\">Added computation paths for power and efficiency variables
+                       for the Euler number or as a function of part load ratio.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.Validation.NegativePressureOrFlow
+    </td>
+    <td valign=\"top\">Remade this model with
+                       <a href=\"Modelica://Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface\">
+                       Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface</a>
+                       instead of using a full mover model so that forcing a flow
+                       rate and a pressure rise is more straightforward.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.Data.Generic<br/>
+                       Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface<br/>
+                       Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
+                       Buildings.Fluid.Movers.BaseClasses.Validation.FlowMachineInterface
+    </td>
+    <td valign=\"top\">Moved the assignment of <code>V_flow_max</code> and <code>haveVMax</code>
+                       from <code>Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</code>
+                       to lower-level models.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                       Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_y<br/>
+                       Buildings.Fluid.Movers.Data.Generic<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.CronolineIL80slash220dash4slash4<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to8<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to4<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to8<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to8<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos50slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos80slash1to12<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS25slash10<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash10<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash5<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash10<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash7<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine50slash150dash4slash2<br/>
+                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2<br/>
+                       Buildings.Fluid.Movers.Validation.PowerSimplified<br/>
+                       Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface
+    </td>
+    <td valign=\"top\">Refactored the models and data recoreds for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_m_flow
+    </td>
+    <td valign=\"top\">Added assertion to avoid using the model with a head that is
+                       significantly higher than the head specified by its performance curve.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1659\">IBPSA, #1659</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+    </td>
+</tr><tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.Controls.CollectorPump
+    </td>
+    <td valign=\"top\">Corrected implementation to make comparison based on total irradiation on tilted surface
+                       rather than the direct normal irradiation.
+                       This required adding parameters for the azimuth, tilt and ground reflectance.<br/>
+                       Added hysteresis to the controller, and changed output signal to be boolean-valued on/off
+                       rather than a continuous signal.<br/>
+                       Moved the old implementation to <code>Buildings.Obsolete.Fluid.SolarCollectors.Controls</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3074\">#3074</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse</b>
+    </td>
+</tr><tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer
+    </td>
+    <td valign=\"top\">Replaced ideal heater with a geothermal heat pump.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
+    </td>
+</tr><tr><td valign=\"top\">Buildings.Obsolete.DistrictHeatingCooling
+    </td>
+    <td valign=\"top\">Removed package which is no longer supported.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Plotters</b>
+    </td>
+</tr><tr><td valign=\"top\">Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve
+    </td>
+    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
+                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    </td>
+    <td valign=\"top\">Corrected input for enabling freeze protection setback mode.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">issue 3084</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sources.CalendarTime
+    </td>
+    <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
+                       that caused simultaneous events to not be triggered at the same time.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Electrical.DC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Electrical.DC.Storage.BaseClasses.Charge
+    </td>
+    <td valign=\"top\">Corrected calculation of power taken from the battery when it is discharged.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3095\">issue 3095</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
+    </td>
+    <td valign=\"top\">Corrected outdoor temperature in instance <code>TOutSwi</code> at which system switches on and off.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3059\">issue 3059</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+    </td>
+  </tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger
+  </td>
+  <td valign=\"top\">Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
+                     Corrected calculation of heat pump evaporator mass flow control.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
+                     issue 3379</a>.
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.HeatPump
+  </td>
+  <td valign=\"top\">Assigned dp_nominal to condenser pump.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
+                     issue 3379</a>.
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Cooling.Indirect
+  </td>
+  <td valign=\"top\">Fixed building supply temperature controller parameter <code>reverseActing</code>
+                     by changing from <code>true</code> to <code>false</code>.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3299\">
+                     issue 3299</a>.
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Cooling.Direct
+  </td>
+  <td valign=\"top\">Removed assignment of check valve <code>allowFlowReversal=false</code>.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3389\">#3389</a>.
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
+  </td>
+  <td valign=\"top\">Applied <code>facMul</code> to domestic hot water load.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
+                     issue 3379</a>.
+  </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.PartialEffectivenessNTU
+    </td>
+    <td valign=\"top\">Corrected wrong temperature in assignment of <code>sta2_default</code>.
+                       For <code>Buildings.Media.Air</code> and <code>Buildings.Media.Water</code>
+                       this error does not affect the results.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3151\">Buildings, issue 3151</a>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
+                       Buildings.Fluid.DXSystems.AirCooled.SingleStage<br/>
+                       Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
+                       Buildings.Fluid.DXSystems.WaterCooled.MultiStage<br/>
+                       Buildings.Fluid.DXSystems.WaterCooled.SingleStage<br/>
+                       Buildings.Fluid.DXSystems.WaterCooled.VariableSpeed<br/>
+                       Buildings.Fluid.DXSystems.Cooling.BaseClasses.CapacityWaterCooled<br/>
+                       Buildings.Fluid.DXSystems.BaseClasses.PartialCoolingCapacity
+
+    </td>
+    <td valign=\"top\">Corrected performance calculation as a function of mass flow rates.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3146\">#3146</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                       Buildings.Fluid.HeatExchangers.WetCoilDiscretized
+    </td>
+    <td valign=\"top\">Reverted the correction on latent heat from component.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.Validation.WetCoilCounterFlowLowWaterFlowRate<br/>
+    </td>
+    <td valign=\"top\">Modify air source boundary condition so air enters coil at 99.5% relative humidity.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Utilities.Time</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime
+    </td>
+    <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
+                       that caused simultaneous events to not be triggered at the same time.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
+    </td>
+  </tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.DXSystems.Cooling.BaseClasses.Evaporation
+    </td>
+    <td valign=\"top\">Corrected assertion for the condition <code>dX_nominal&lt;0</code> and the documentation.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3322\">issue 3322</a>.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_10_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_10_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_10_1_0.mo
new file mode 100644
index 00000000000..7de935417bb
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_10_1_0.mo
@@ -0,0 +1,178 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_10_1_0 "Version 10.1.0"
+  extends
+      Modelica.Icons.ReleaseNotes;
+    annotation (
+      Documentation(info = "<html>
+<div class=\"release-summary\">
+<p>
+Version 10.1.0 is backward compatible with version 10.0.0.
+</p>
+<p>
+The library has been tested with
+Dymola 2024x,
+OpenModelica 1.22.1-1,
+OPTIMICA 1.43.4 and recent versions of Impact.
+</p>
+<p>
+The following major changes have been done compared to release 10.0.0:
+</p>
+<ul>
+<li>
+A package to model aquifer thermal energy storage has been added.
+</li>
+</ul>
+<p>
+Many models have been updated to improve performance, for compliance with the Modelica Language Standard and to correct model errors.
+</p>
+</div>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Aquifer
+    </td>
+    <td valign=\"top\">Library with component models for aquifer thermal energy storage.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator
+    </td>
+    <td valign=\"top\">Added example for how to couple a radiator to the zone model.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3659\">Buildings, #3659</a>.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.BoundaryConditions.WeatherData</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.Bus
+    </td>
+    <td valign=\"top\">Declared variables on weather data bus, which avoids
+                       a warning in OMEdit, and improves usability of weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1798\">IBPSA, issue 1798</a>.
+    </td>
+</tr>
+    <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS<br/>
+                       Buildings.Experimental.DHC.Loads.Combined.BaseClasses.PartialBuildingWithETS
+    </td>
+    <td valign=\"top\">Added parameters <code>TDisWatMin</code> and <code>TDisWatMax</code>
+                       in lieu of using <code>datDes</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3697\">issue 3697</a>.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Occupants</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Occupants.BaseClasses.binaryVariableGeneration<br/>
+                       Buildings.Occupants.BaseClasses.exponentialVariableGeneration<br/>
+                       Buildings.Occupants.BaseClasses.weibullVariableGeneration
+    </td>
+    <td valign=\"top\">Initialized <code>localSeed</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3549\">#3549</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone
+    </td>
+    <td valign=\"top\">Added radiative heat port to allow coupling of a radiator to the thermal zone.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3659\">Buildings, #3659</a>.
+    </td>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter
+    </td>
+    <td valign=\"top\">Added <code>pre()</code> operator on mass flow rate and radiative heat gain
+                     to avoid an algebraic loop on discrete variables.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3659\">Buildings, #3659</a>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                       Buildings.Fluid.SolarCollectors.EN12975
+    </td>
+    <td valign=\"top\">Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel,
+                       e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect<br/>
+                       Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect<br/>
+                       Buildings.Experimental.DHC.Loads.Steam.BuildingTimeSeriesAtETS
+    </td>
+    <td valign=\"top\">Corrected wrong <code>displayUnit</code> string.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.TankBranch
+    </td>
+    <td valign=\"top\">Corrected wrong use of <code>displayUnit</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal.Borefields</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesOneUTube<br/>
+                       Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.internalResistancesTwoUTube
+    </td>
+    <td valign=\"top\">Corrected usage of <code>getInstanceName()</code>, which was called inside
+                       these functions. This does not conform with the Modelica Language Standard, and causes
+                       the compilation to fail in OpenModelica 1.22.0.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer
+    </td>
+    <td valign=\"top\">Corrected wrong <code>displayUnit</code> string.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_10_1_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_11_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_11_0_0.mo
new file mode 100644
index 00000000000..d3db6fddb5b
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_11_0_0.mo
@@ -0,0 +1,798 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_11_0_0 "Version 11.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 11.0.0 is a major release that adds various new packages and models.
+</p>
+<p>
+The library has been tested with
+Dymola 2024x,
+OpenModelica 1.22.1-1,
+OPTIMICA 1.48.2 and recent versions of Impact.
+</p>
+<p>
+The following major changes have been done compared to release 10.1.0:
+</p>
+<ul>
+<li>
+A package for central plants with reversible air-to-water heat pumps has been added to <code>Buildings.Templates.Plants.HeatPumps</code>.
+The package allows configuration of the type of hydronic integration.
+</li>
+<li>
+The models for 1st to 5th generation district heating and cooling systems have been expanded and revised,
+a user guide has been added, and the models have been
+moved from the package <code>Buildings.Experimental.DHC</code> to <code>Buildings.DHC</code>.
+</li>
+<li>
+A package for domestic hot water generation and loads that are served by a district system has been added to
+<code>Buildings.DHC.Loads.HotWater</code>.
+</li>
+<li>
+The initialization of the Spawn model has been refactored to avoid an iteration between Modelica and EnergyPlus as this
+caused numerical problems for some model configurations.
+</li>
+<li>
+The implementation of the blocks for the Control Description Language (CDL), which is being standardized through
+ASHRAE Standard 231P, has been revised to comply with the latest draft of the standard.
+</li>
+<li>
+A tutorial for how to build a simple system model has been added to <code>Buildings.Examples.Tutorial.SimpleHouse</code>.
+</li>
+</ul>
+</div>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Templates.Plants
+    </td>
+    <td valign=\"top\">Package with template models for central plants with air-to-water reversible heat pumps, including the plant closed loop control.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.Tutorial.SimpleHouse
+    </td>
+    <td valign=\"top\">Tutorial for how to build a simple system model.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.HotWater
+    </td>
+    <td valign=\"top\">Package of models for domestic hot water generation and loads served by district networks.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.Combined</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger
+    </td>
+    <td valign=\"top\">Created partial base class to support two versions of the
+                       energy transfer station.  One that heats domestic hot
+                       water with a heat pump, and one that heats domestic
+                       hot water with a heat pump plus storage tank and heat exchanger.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank
+    </td>
+    <td valign=\"top\">Version of
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+                       Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
+                       that heats domestic hot water with a heat pump plus storage tank and heat exchanger.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump
+    </td>
+    <td valign=\"top\">Partial base class to support two versions of heat pump subsystem.
+                       One which directly heats water through condenser, and
+                       one which uses the heat pump to heat water in a storage tank,
+                       which can be circulated to heat water through a heat exchanger.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank
+    </td>
+    <td valign=\"top\">Uses a heat pump to heat water in a storage tank,
+                       which can be circulated to heat domestic hot water through a heat exchanger,
+                       modeled with
+                       <a href=\"Modelica://Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
+                       Buildings.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank
+    </td>
+    <td valign=\"top\">Similar to <a href=\"Modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
+                       Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>,
+                       but uses <a href=\"Modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank\">
+                       Buildings.DHC.ETS.Combined.HeatPumpHeatExchangerDHWTank</a>
+                       as the ETS.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
+    </td>
+    <td valign=\"top\">Example model for use of <a href=\"Modelica://Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
+                       Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.BuriedPipes.PipeGroundCoupling
+    </td>
+    <td valign=\"top\">Ground coupling model <a href=\"Modelica://Buildings.Fluid.FixedResistances.BuriedPipes.PipeGroundCoupling\">
+                       Buildings.Fluid.FixedResistances.BuriedPipes.PipeGroundCoupling</a>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution1Pipe_R
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Distribution1Pipe_R\">
+    Buildings.DHC.Networks.Distribution1Pipe_R</a>. One pipe distribution network that uses autosize
+    pipes for supply and lossless for connection. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution1PipePlugFlow_v
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Distribution1PipePlugFlow_v\">
+    Buildings.DHC.Networks.Distribution1PipePlugFlow_v</a>. One pipe distribution network that uses plugflow
+    pipes for supply and lossless for connection. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution2Pipe_R
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Distribution2Pipe_R\">
+    Buildings.DHC.Networks.Distribution2Pipe_R</a>. Two pipes network that uses autosize pipes for
+    supply and return, and lossless for connection. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Connections</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Connection1Pipe_R
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection1Pipe_R\">
+    Buildings.DHC.Networks.Connections.Connection1Pipe_R</a>. One pipe connection model using autosize pipes for supply
+    and lossless for connection. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
+    Buildings.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. One pipe connection model using plugflow pipes for supply
+    and lossless for connection. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Connection2Pipe_R
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection2Pipe_R\">
+    Buildings.DHC.Networks.Connections.Connection2Pipe_R</a>. Two pipes connection model using autosize pipes for supply
+    and return, lossless for connection. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample\">
+    Buildings.DHC.Networks.Connections.Examples.Connection1PipeExample</a>. Example model for one pipe connections.
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample\">
+    Buildings.DHC.Networks.Connections.Examples.Connection2PipeExample</a>. Example model for two pipes connections.
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Controls.AgentPump1Pipe
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Controls.AgentPump1Pipe\">
+    Buildings.DHC.Networks.Controls.AgentPump1Pipe</a>. Agent controller (i.e. borefield, waste heat plant)
+    for one pipe networks. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample\">
+    Buildings.DHC.Networks.Controls.Examples.AgentPump1PipeExample</a>. Example model for AgentPump1Pipe.
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample\">
+    Buildings.DHC.Networks.Controls.Examples.MainPump1PipeExample</a>. Example model for MainPump1PipeExample.
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Examples.Combined</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl
+    </td>
+    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
+    Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>. This example model showcases a more sophisticated way
+    of controlling district agent pumps. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Interpolate<br/>
+                       Buildings.Utilities.Math.Examples.Interpolate
+    </td>
+    <td valign=\"top\">Created a block with an example model for
+                       <a href=\"modelica://Buildings.Utilities.Math.Functions.interpolate\">
+                       Buildings.Utilities.Math.Functions.interpolate</a>.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1844\">IBPSA, #1844</a>.
+    </td>
+</tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Controls.OBC.ASHRAE.G36</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Controller
+    </td>
+    <td valign=\"top\">Added 2-position relief damper position output <code>y1RelDam</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">All classes
+    </td>
+    <td valign=\"top\">Expanded interface class names to full class names for all classes within <code>Buildings.Controls.OBC.CDL</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3746\">#3746</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.Examples
+    </td>
+    <td valign=\"top\">Changed the package name from <code>Examples</code> to <code>Validation</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3517\">issue 3517</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPort<br/>
+                     Buildings.Fluid.Interfaces.PartialTwoPort<br/>
+                     Buildings.Fluid.Interfaces.PartialTwoPortVector
+    </td>
+    <td valign=\"top\">Changed implementation to allow moving fluid connector.
+                     This accomodates implementation of models that should have connectors on the top and bottom (such as a tank)
+                     and moving of connectors for models that need larger icons.<br/>
+                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">IBPSA, #1781</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.Heating</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Heating.Direct
+    </td>
+    <td valign=\"top\">Documentation corrected for heating.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">issue 3628</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Heating.Indirect
+    </td>
+    <td valign=\"top\">Documentation corrected for heating.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">issue 3628</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Templates</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Templates.Components.Fans.ArrayVariable
+    </td>
+    <td valign=\"top\">Refactored with flow rate multiplier.<br/>
+                  This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3536\">#3536</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Building
+    </td>
+    <td valign=\"top\">Introduced parameter <code>setInitialRadiativeHeatGainToZero</code> and refactored
+                     radiative heat exchange between Modelica and EnergyPlus.
+                     This was done to avoid iterative solutions between Modelica and EnergyPlus
+                     for some coupled simulations that exchange radiative heat transfer, such as from
+                     a hydronic radiator.
+                     For details, see info section in
+                     <code>Buildings.ThermalZones.EnergyPlus_9_6_0.Building</code>.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">Buildings, #3707</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating<br/>
+                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer<br/>
+                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom<br/>
+                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface<br/>
+                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator
+    </td>
+    <td valign=\"top\">Added insulation to EnergyPlus input data file and resized the system.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">#3707</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone
+    </td>
+    <td valign=\"top\">Changed radiative heat flow rate sent to EnergyPlus to be the average over the last
+                     synchronization time step rather than the instantaneuous value, and set it by default
+                     to zero during the initialization. This avoids a
+                     nonlinear system of equation during the time integration for models in which
+                     the radiative heat gain is a function of the room radiative temperature, such as
+                     when a radiator is connected to the room model.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">Buildings, #3707</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007<br/>
+                     Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007
+    </td>
+    <td valign=\"top\">Changed implementation to allow ground temperature to be taken from an input rather than using
+                     a constant value.<br/>
+                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1744\">IBPSA, #1744</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.BaseClasses  </b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.Pump_m_flow
+    </td>
+    <td valign=\"top\"> Updated pump model to use
+    to <a href=\"Modelica://Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow\">
+    Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow </a>. This change allows to have a better
+    estimation of pump default curve using euler number. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger
+    </td>
+    <td valign=\"top\"> Reduced <code>swiFlo.dpValve_nominal</code> to numerically zero to avoid reverse flow. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.ETS.Combined.Subsystems.BaseClasses  </b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump
+    </td>
+    <td valign=\"top\"> Converted heat pump model to dynamic by changing <code>heaPum.energyDynamics</code> to
+    <code>Modelica.Fluid.Types.Dynamics.FixedInitial</code> and added junction on recirculation loop. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Examples.Combined  </b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.SeriesConstantFlow
+    </td>
+    <td valign=\"top\"> Added connections that were removed in
+    <a href=\"Modelica://Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries\">
+    Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.SeriesVariableFlow
+    </td>
+    <td valign=\"top\"> Added connections that were removed in
+    <a href=\"Modelica://Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries\">
+    Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sources.ModelTime
+    </td>
+    <td valign=\"top\">Renamed the block to <code>CivilTime</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3596\">issue 3596</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset
+    </td>
+    <td valign=\"top\">Renamed the block to <code>TrueHold</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3689\">issue 3689</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Or3<br/>
+                       Buildings.Controls.OBC.CDL.Logical.ZeroCrossing<br/>
+                       Buildings.Controls.OBC.CDL.Logical.OnOffController<br/>
+                       Buildings.Controls.OBC.CDL.Logical.TriggeredTrapezoid
+    </td>
+    <td valign=\"top\">Moved the block to the <code>Obsolete</code> package.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3595\">issue 3595</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits
+    </td>
+    <td valign=\"top\">Added coil type enumeration and removed the coil type flags.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Controller
+    </td>
+    <td valign=\"top\">Removed the connectors <code>uCooCoi_actual</code> and <code>uHeaCoi_actual</code>,
+                       added coil type enumeration and removed the coil type flags.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Experimental.DHC
+    </td>
+    <td valign=\"top\">The package was renamed to <code>Buildings.DHC</code>,
+                       and the package <code>DHC.EnergyTransferStations</code> was renamed to
+                       <code>DHC.ETS</code>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.PartialDirect
+    </td>
+    <td valign=\"top\">Change input <code>TSetDisRet</code> to <code>TDisRetSet</code>.
+    </td>
+</tr>
+    <tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.PartialIndirect
+    </td>
+    <td valign=\"top\">Change input <code>TSetBuiSup</code> to <code>TBuiSupSet</code>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger
+    </td>
+    <td valign=\"top\">Extend from new partial base class
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
+                       Buildings.DHC.ETS.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
+                       Evaporator water flow through space heating and domestic how water heat
+                       pumps is constant, with dT across district supply and return controlled by three-way mixing valve.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.HeatPump
+    </td>
+    <td valign=\"top\">Extend from new partial base class
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump\">
+                       Buildings.DHC.ETS.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
+                       Evaporator water flow through heat pump
+                       is constant, with dT across district supply and return controlled by three-way mixing valve.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPump
+    </td>
+    <td valign=\"top\">Validation test for
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPump\">
+                       Buildings.DHC.ETS.Combined.Subsystems.HeatPump</a>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.ETS.Combined.Subsystems.Validation.HeatPumpDHWTank
+    </td>
+    <td valign=\"top\">Validation test for
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank\">
+                       Buildings.DHC.ETS.Combined.Subsystems.HeatPumpDHWTank</a>.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Loads.Combined.BuildingTimeSeriesWithETS
+    </td>
+    <td valign=\"top\">Updated to use new version of
+                       <a href=\"Modelica://Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger\">
+                       Buildings.DHC.ETS.Combined.HeatPumpHeatExchanger</a>
+                       as the ETS.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleCommands
+    </td>
+    <td valign=\"top\">The class has been moved to Buildings.Templates.Components.Controls.MultipleCommands.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3536\">#3536</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Reservoir.Borefield
+    </td>
+    <td valign=\"top\">Moved to Buildings.DHC.Examples.Combined.BaseClasses.Borefield
+                       <a href=\"Modelica://Buildings.DHC.Examples.Combined.BaseClasses.Borefield\"></a>.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">#3628</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                       Buildings.Fluid.SolarCollectors.EN12975
+    </td>
+    <td valign=\"top\">Changed assignment of <code>computeFlowResistance</code> to <code>final</code> based on
+                       <code>dp_nominal</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Obsolete.Utilities.IO.Python36
+    </td>
+    <td valign=\"top\">Removed package.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3506\">#3506</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Templates</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Templates.AirHandlersFans.Data.PartialAirHandler<br/>
+                     Buildings.Templates.AirHandlersFans.Data.VAVMultiZone<br/>
+                     Buildings.Templates.AirHandlersFans.Interfaces.PartialAirHandler<br/>
+                     Buildings.Templates.AirHandlersFans.VAVMultiZone<br/>
+                     Buildings.Templates.ZoneEquipment.Data.PartialAirTerminal<br/>
+                     Buildings.Templates.ZoneEquipment.Data.VAVBox<br/>
+                     Buildings.Templates.ZoneEquipment.Interfaces.PartialAirTerminal<br/>
+                     Buildings.Templates.ZoneEquipment.Interfaces.VAVBox<br/>
+                     Buildings.Templates.ZoneEquipment.VAVBoxCoolingOnly<br/>
+                     Buildings.Templates.ZoneEquipment.VAVBoxReheat
+    </td>
+    <td valign=\"top\">Refactored with a record class for configuration parameters.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3500\">#3500</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Templates.Components.Dampers<br/>
+                     Buildings.Templates.Components.Valves
+    </td>
+    <td valign=\"top\">The models in these packages have been retired and replaced
+                with two container classes within <code>Buildings.Templates.Components.Actuators</code>
+                that cover all equipment types, and allow the flow characteristic to be specified
+                with one parameter.<br/>
+                             This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3539\">#3539</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.BuriedPipes
+    </td>
+    <td valign=\"top\">Moved to Buildings.Fluid.FixedResistances.BuriedPipes
+                       <a href=\"Modelica://Buildings.Fluid.FixedResistances.BuriedPipes\"></a>.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">#3431</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2Pipe
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Connection2Pipe</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
+    </td>
+    <td valign=\"top\"> Moved and renamed <code>Buildings.DHC.Networks.Connection2PipePlugFlow</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
+                     Buildings.DHC.Networks.Connections.Connection2PipePlugFlow_v </a>. Also updated available paremeters
+                     for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Distribution2Pipe
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Distribution2Pipe</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
+    </td>
+    <td valign=\"top\"> Renamed <code>Buildings.DHC.Networks.Distribution2PipePlugFlow</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Distribution2PipePlugFlow_v\">
+                     Buildings.DHC.Networks.Distribution2PipePlugFlow_v </a>. Also updated available paremeters
+                     for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Connection2PipePlugFlow
+    </td>
+    <td valign=\"top\"> Renamed <code>Buildings.DHC.Networks.Controls.MainPump</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Controls.MainPump1Pipe\">
+                     Buildings.DHC.Networks.Controls.MainPump1Pipe </a>. Also updated available paremeters
+                     and documentation. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined </b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.UnidirectionalParallel
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.UnidirectionalParallel</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.UnidirectionalSeries
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.UnidirectionalSeries</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined.BaseClasses </b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard</code>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize
+    </td>
+    <td valign=\"top\"> Moved <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Pipes.PipeAutosize\">
+                     Buildings.DHC.Networks.Pipes.PipeAutosize</a>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.PipeStandard
+    </td>
+    <td valign=\"top\"> Moved <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeStandard</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Pipes.PipeStandard\">
+                     Buildings.DHC.Networks.Pipes.PipeStandard</a>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.<br/>
+                     This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.Validation.Pipe
+    </td>
+    <td valign=\"top\"> Moved <code>Buildings.DHC.Networks.Combined.BaseClasses.Validation.Pipe</code>
+                     to <a href=\"Modelica://Buildings.DHC.Networks.Pipes.Validation.Pipe\">
+                     Buildings.DHC.Networks.Pipes.Validation.Pipe</a>.
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Examples.Combined.BaseClasses </b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries
+    </td>
+    <td valign=\"top\"> Removed several connections to implement
+    to <a href=\"Modelica://Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
+    Buildings.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>.
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.interpolate<br/>
+                       Buildings.Utilities.Math.Functions.Examples.Interpolate
+    </td>
+    <td valign=\"top\">Moved these classes to
+                       <a href=\"modelica://Buildings.Utilities.Math.Functions\">
+                       Buildings.Utilities.Math.Functions</a>
+                       from
+                       <a href=\"modelica://Buildings.Airflow.Multizone.BaseClasses\">
+                       Buildings.Airflow.Multizone.BaseClasses</a>.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1844\">IBPSA, #1844</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Templates</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Templates.AirHandlersFans.Components.Controls.G36VAVMultiZone<br/>
+                       Buildings.Templates.AirHandlersFans.Components.Data.OutdoorReliefReturnSection<br/>
+                       Buildings.Templates.AirHandlersFans.Components.Interfaces.PartialOutdoorReliefReturnSection<br/>
+                       Buildings.Templates.AirHandlersFans.Components.Interfaces.PartialReliefReturnSection<br/>
+                       Buildings.Templates.AirHandlersFans.Components.OutdoorReliefReturnSection.MixedAirWithDamper<br/>
+                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.NoRelief<br/>
+                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.NoReturn<br/>
+                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReliefDamper<br/>
+                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReliefFan<br/>
+                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReturnFan<br/>
+                       Buildings.Templates.AirHandlersFans.Configuration.PartialAirHandler<br/>
+                       Buildings.Templates.AirHandlersFans.Data.VAVMultiZone<br/>
+                       Buildings.Templates.AirHandlersFans.VAVMultiZone
+    </td>
+    <td valign=\"top\">Added support for additional configurations.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">#3526</a>
+                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3520\">#3520</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+</html>"));
+end Version_11_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo
new file mode 100644
index 00000000000..3cc2584890f
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_11_0_1.mo
@@ -0,0 +1,123 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_11_0_1 "Version 11.0.1"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 11.0.1 is ... xxx
+</p>
+</div>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">xxx
+    </td>
+    <td valign=\"top\">xxx.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><p>Buildings.ThermalZones.Detailed.Examples.ISAT</p>
+    </td>
+    <td valign=\"top\"><p>Package with thermal airflow model using in situ adaptive tabulation.</p>
+    </td>
+</tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sort
+    </td>
+    <td valign=\"top\">Added an output variable with the indices of the sorted elements.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3809\">issue 3809</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch
+    </td>
+    <td valign=\"top\">Simplified the implementation.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3796\">#3796</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>xxx</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">xxx
+    </td>
+    <td valign=\"top\">xxx.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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>xxx</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">xxx
+    </td>
+    <td valign=\"top\">xxx.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>xxx</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">xxx
+    </td>
+    <td valign=\"top\">xxx.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>xxx</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">xxx
+    </td>
+    <td valign=\"top\">xxx.
+    </td>
+</tr>
+</table>
+<p>
+Note:
+</p>
+<ul>
+<li>
+xxx
+</li>
+</ul>
+</html>"));
+end Version_11_0_1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_0_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_0_build1.mo
new file mode 100644
index 00000000000..c7abd3e0239
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_0_build1.mo
@@ -0,0 +1,487 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_0_build1 "Version 1.0 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+   annotation (preferredView="info", Documentation(info="<html>
+<p>
+Version 1.0 is the first official release of the <code>Buildings</code>
+library.
+Compared to the last pre-release, which is version 0.12, this version contains
+new models as well as significant improvements to the model formulation
+that leads to faster and more robust simulation. A detailed list of changes is shown below.
+</p>
+<p>
+Version 1.0 is not backward compatible to version 0.12, i.e., models developed with
+versions 0.12 will require some changes in their parameters to
+work with version 1.0.
+The conversion script
+<a href=\"modelica://Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_0.12_to_1.0.mos\">
+Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_0.12_to_1.0.mos</a> can help
+in converting old models to this version of the library.
+</p>
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes</td>
+    <td valign=\"top\">
+    This is a library with a model for a borehole heat exchanger.
+    </td></tr>
+</table>
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b></td></tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.windPressureLowRise
+                      </td>
+    <td valign=\"top\">Added a function that computes wind pressure on the facade of low-rise buildings.
+    </td> </tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b></td></tr>
+<tr><td valign=\"top\">Buildings.Examples.ChillerPlant
+                      </td>
+    <td valign=\"top\">Added an example for a chilled water plant model.
+    </td> </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.UsersGuide
+                      </td>
+    <td valign=\"top\">Added a user's guide that describes
+                       the main functionality of all base classes.
+    </td> </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.Outside_Cp<br/>
+                       Buildings.Fluid.Sources.Outside_CpLowRise
+                      </td>
+    <td valign=\"top\">Added models to compute wind pressure on building
+                       facades.
+    </td> </tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b></td></tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Conductor
+                      </td>
+    <td valign=\"top\">Added a model for heat conduction in circular coordinates.
+    </td> </tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Examples</b></td></tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
+                      </td>
+    <td valign=\"top\">Added BESTEST validation models.
+    </td> </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b></td></tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.cubicHermiteLinearExtrapolation<br/>
+                       Buildings.Utilities.Math.Functions.splineDerivatives.
+                      </td>
+    <td valign=\"top\">Added functions for cubic hermite spline interpolation, with
+                       option for monotone increasing (or decreasing) spline.
+    </td> </tr>
+</table>
+
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Airflow.Multizone</b></td></tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.powerLaw</td>
+    <td valign=\"top\">This function has been reimplemented to handle zero flow rate
+                     in a more robust and more efficient way.
+                     This change improves all components that model flow resistance in
+                     the package Buildings.Airflow.Multizone.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b></td></tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3</td>
+    <td valign=\"top\">This model has now the option of using a constant value,
+                     using the data from the weather file, or from an input connector for 7 variables,
+                     including atmospheric pressure, relative humidity, dry bulb temperature,
+                     global horizontal radiation, diffuse horizontal radiation,
+                     wind direction and wind speed.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
+<tr><td valign=\"top\">
+                      Buildings.Fluid.Actuators.BaseClasses.PartialActuator<br/>
+                      Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential<br/>
+                      Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve<br/>
+                      Buildings.Fluid.BaseClasses.PartialResistance<br/>
+                      Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp<br/>
+                      Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow<br/>
+                      Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</td>
+    <td valign=\"top\">The computation of the linearized flow resistance has been moved from
+                     the functions to the model, i.e., into an equation section.
+                     If the linear implementation is in a function body, then a symbolic processor
+                     may not invert the equation. This can lead to systems of coupled equations in
+                     cases where an explicit solution is possible.
+                     In addition, the handling of zero flow rate has been improved for the nonlinear
+                     pressure drop model.
+                     These improvements affect all models in <code>Buildings.Fluid</code> that compute
+                     flow resistance.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed</td>
+    <td valign=\"top\">This model can now be configured as a steady-state or dynamic model.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow<br/>
+                     Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                     Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
+                     Buildings.Fluid.HeatExchangers.WetCoilDiscretized</td>
+    <td valign=\"top\">The implementation for handling zero flow rate, if the models
+are used as steady-state models, have been improved.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.ntu_epsilonZ</td>
+    <td valign=\"top\">Changed implementation to use
+                     <code>Modelica.Media.Common.OneNonLinearEquation</code> instead of
+                     <code>Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</code>,
+                     which was removed for this version of the library.
+                     </td>
+</tr>
+
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers.CoolingTowers</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc<br/>
+                     Buildings.Fluid.HeatExchangers.CoolingTowers.FixedApproach</td>
+    <td valign=\"top\">
+       These models are now based on a new base class <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.CoolingTower</code>.
+       This allows using the models as replaceable models without warning when checking the model.
+    </td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc</td>
+    <td valign=\"top\">
+       Changed implementation of performance curve to avoid division by zero.
+    </td></tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.MassExchangers</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed</td>
+    <td valign=\"top\">This model can now be configured as a steady-state or dynamic model.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.*TwoPort</td>
+    <td valign=\"top\">All sensors with two ports, except for the mass flow rate sensor,
+                     have been revised to add sensor dynamics.
+                     Adding sensor dynamics avoids numerical problems when mass flow
+                     rates are close to zero and the sensor is configured to allow
+                     flow reversal. See
+                     <code>Buildings.Fluid.Sensors.UsersGuide</code> for details.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
+                     Buildings.Fluid.Storage.StratifiedEnhanced</td>
+    <td valign=\"top\">Changed the implementation of the model <code>Buoyancy</code>
+                     to make it differentiable in the temperatures.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
+<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleMedium<br/>
+                     Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</td>
+    <td valign=\"top\">Moved the assignment of the <code>stateSelect</code> attribute for
+                     the <code>BaseProperties</code> to the model
+                     <code>Buildings.Fluid.MixingVolumes.MixingVolume</code>. This allows
+                     to handle it differently for steady-state and dynamic models.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b></td></tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.TDewPoi_pW</td>
+    <td valign=\"top\">Changed implementation to use
+                     <code>Modelica.Media.Common.OneNonLinearEquation</code> instead of
+                     <code>Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</code>,
+                     which was removed for this version of the library.
+                     </td>
+</tr>
+
+</table>
+
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Airflow.Multizone</b></td></tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic</td>
+    <td valign=\"top\">The implementation has been changed to better handle mass flow rates
+near zero flow.
+This required the introduction of a new parameter <code>m_flow_nominal</code>
+that is used for the regularization near zero mass flow rate.</td></tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.Examples.Stratified<br/>
+                     Buildings.Fluid.MixingVolumes</td>
+    <td valign=\"top\">
+                     Removed the parameters <code>use_T_start</code> and <code>h_start</code>,
+                     as <code>T_start</code> is more convenient to use than <code>h_start</code>
+                     for building simulation.
+                     </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerPolynomial</td>
+    <td valign=\"top\">The parameter <code>dT_nominal</code> has been removed
+as it can be computed from the parameter <code>m_flow_nominal</code>.
+This change was needed to avoid a non-literal value for the nominal
+attribute for the mass flow rate in the pressure drop model.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.MixingVolumes</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolume<br/>
+                     Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
+                     Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir</td>
+    <td valign=\"top\">The implementation has been changed to better handle mass flow rates
+near zero flow if the components have exactly two fluid ports connected.
+This required the introduction of a new parameter <code>m_flow_nominal</code>
+that is used for the regularization near zero mass flow rate.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
+                     Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                     Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                     Buildings.Fluid.Movers.FlowControlled_m_flow</td>
+    <td valign=\"top\">
+                     The performance data are now defined through records and not
+                     through replaceable functions. The performance data now needs to be
+                     declared in the form<pre>
+ pressure(V_flow_nominal={0,V_flow_nominal,2*V_flow_nominal},
+          dp_nominal={2*dp_nominal,dp_nominal,0})</pre>
+                     where <code>pressure</code> is an instance of a record. A similar declaration is
+                     used for power and efficiency.
+                     <br/>
+                     The parameter m_flow_nominal has been removed from
+                     FlowMachine_y and FlowMachine_Nrpm.
+                                <br/>
+                     The parameter m_flow_max has been replaced by m_flow_nominal in
+                     FlowMachine_m_flow.
+                                <br/>
+                     The implementation of the pressure drop computation as a function
+                     of speed and volume flow rate has been revised to avoid a singularity
+                     near zero volume flow rate and zero speed.<br/>
+                     The implementation has also been simplified to avoid using two different flow paths
+                     if the models are configured for steady-state or dynamic simulation.</td></tr>
+
+
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
+                     Buildings.Fluid.Interfaces.PartialDynamicStaticFourPortHeatMassExchanger<br/>
+                     Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
+                     Buildings.Fluid.Interfaces.PartialDynamicStaticTwoPortHeatMassExchanger<br/>
+                     Buildings.Fluid.Interfaces.ConservationEquation</td>
+    <td valign=\"top\">The implementation has been changed to better handle mass flow rates
+near zero flow if the components have exactly two fluid ports connected.</td>
+</tr>
+
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPortDynamic</td>
+    <td valign=\"top\">This model has been deleted since the sensor
+                     <code>Buildings.Fluid.Sensors.TemperatureTwoPort</code> has been revised
+                     and can now also be used as a dynamic model of a sensor.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticTwoPortInterface</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.PartialTwoPortInterface</td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticStaticTwoPortHeatMassExchanger</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortHeatMassExchanger</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger</td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPort</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.FourPort</td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticStaticFourPortHeatMassExchanger</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger</td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticFourPortInterface</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.PartialFourPortInterface</td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPortHeatMassExchanger</td>
+    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.FourPortHeatMassExchanger</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b></td></tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</td>
+    <td valign=\"top\">This package has been removed, and all functions have been
+                       revised to use Modelica.Media.Common.OneNonLinearEquation.</td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Reports</b></td></tr>
+<tr><td valign=\"top\">Buildings.Utilities.IO.Files.Printer<br/>
+                     Buildings.Utilities.IO.Files.BaseClasses.printRealArray</td>
+    <td valign=\"top\">Changed parameter <code>precision</code> to <code>significantDigits</code> and
+                     <code>minimumWidth</code> to <code>minimumLength</code>
+                     to use the same terminology as the Modelica Standard Library.</td>
+</tr>
+
+</table>
+
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
+
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody</td>
+    <td valign=\"top\">Fixed error in <code>if-then</code> statement that led to
+                       a selection of the wrong branch to compute the sky temperature.</td></tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
+<tr><td valign=\"top\">Buildings.Media.PartialSimpleMedium<br/>
+                       Buildings.Media.GasesConstantDensity.SimpleAir</td>
+    <td valign=\"top\">Fixed error in assignment of <code>singleState</code> parameter.
+                       This change can lead to different initial conditions if the density of
+                       water is modeled as a function of pressure, or if the
+                       medium model Buildings.Media.GasesConstantDensity.SimpleAir is used.</td></tr>
+
+<tr><td valign=\"top\">Buildings.Media.GasesConstantDensity<br/>
+                       Buildings.Media.GasesConstantDensity.MoistAir<br/>
+                       Buildings.Media.GasesConstantDensity.MoistAirUnsaturated<br/>
+                       Buildings.Media.GasesConstantDensity.SimpleAir</td>
+    <td valign=\"top\">Fixed error in the function <code>density</code> which returned a non-constant density,
+                     and added a call to <code>ModelicaError(...)</code> in <code>setState_dTX</code> since this
+                     function cannot assign the medium pressure based on the density (as density is a constant
+                     in this model).
+</td></tr>
+
+<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</td>
+    <td valign=\"top\">Updated package with a new copy from the Modelica Standard Library, since
+                     the Modelica Standard Library fixed a bug in computing the internal energy of the medium.
+                     This bug led to very fast temperature transients at the start of the simulation.
+</td></tr>
+
+<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleMedium</td>
+    <td valign=\"top\">Fixed bug in function density, which always returned <code>d_const</code>,
+                       regardless of the value of <code>constantDensity</code>.
+</td></tr>
+
+<tr><td valign=\"top\">Buildings.Media.GasesPTDecoupled</td>
+    <td valign=\"top\">Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
+                       For this medium, the function is <code>u=h-pStd/dStp</code>.
+</td></tr>
+
+<tr><td valign=\"top\">Buildings.Media.GasesConstantDensity</td>
+    <td valign=\"top\">Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
+                       For this medium, the function is <code>u=h-p/dStp</code>.
+</td></tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
+                     Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditions</td>
+    <td valign=\"top\">Fixed bug (<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/35\">issue 35</a>)
+                     that leads to the wrong solar heat gain for
+                     roofs and for floors. Prior to this bug fix, the outside facing surface
+                     of a ceiling received solar irradiation as if it were a floor
+                     and vice versa.</td></tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
+                     Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditionsWithWindow</td>
+    <td valign=\"top\">Fixed bug (<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/36\">issue 36</a>)
+                     that leads to too high a surface temperature of the window frame when
+                     it receives solar radiation. The previous version did not compute
+                     the infrared radiation exchange between the
+                     window frame and the sky.</td></tr>
+
+</table>
+
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, but, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.ConvertRadiation</td>
+    <td>Corrected wrong unit label.
+    </td>
+</tr>
+</table>
+
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/8\">&#35;8</a></td>
+    <td valign=\"top\">
+         Add switches for new data.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/19\">&#35;19</a></td>
+    <td valign=\"top\">
+         Shift the time for the radiation data 30 min forth and output the local civil time in the data reader.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/41\">&#35;41</a></td>
+    <td valign=\"top\">
+       Using when-then sentences to reduce CPU time.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/43\">&#35;43</a></td>
+    <td valign=\"top\">
+         Add a ConvertRadiation to convert the unit of radiation from TMY3.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/28\">&#35;28</a></td>
+    <td valign=\"top\">
+         Move scripts to Buildings\\Resources\\Scripts\\Dymola.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b></td></tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/18\">&#35;18</a></td>
+    <td valign=\"top\">
+         Add a smooth interpolation function to avoid the event.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/30\">&#35;30</a></td>
+    <td valign=\"top\">
+         Removed non-required structurally incomplete annotation.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/35\">&#35;35</a></td>
+    <td valign=\"top\">
+         Wrong surface tilt for radiation at exterior surfaces of floors and ceilings.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/36\">&#35;36</a></td>
+    <td valign=\"top\">
+         High window frame temperatures.
+    </td>
+</tr>
+</table>
+
+<p>
+Note:
+</p>
+<ul>
+<li>
+The version number scheme has been changed. It is now identical to the one used by the Modelica Standard Library.
+Versions are identified with two numbers <code>x.y</code> and a build number. The first official
+release of each version has the build number <code>1</code>. For each released bug fix,
+the build number is incremented.
+See
+<code>Modelica.UsersGuide.ReleaseNotes.VersionManagement</code> for details.
+</li>
+<li>
+To allow adding scripts for multiple simulation environments,
+all scripts have been moved to the directory <code>Buildings/Resources/Scripts/Dymola</code> and the annotation that
+generates the entry in the <code>Command</code> pull down menu has been changed to
+<code>__Dymola_Commands(file=...)</code>
+</li>
+</ul>
+</html>"));
+end Version_1_0_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_0_build2.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_0_build2.mo
new file mode 100644
index 00000000000..8bae6c1fc70
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_0_build2.mo
@@ -0,0 +1,131 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_0_build2 "Version 1.0 build 2"
+  extends Modelica.Icons.ReleaseNotes;
+   annotation (preferredView="info", Documentation(info="<html>
+<p>
+Version 1.0 build 2 has been released to correct model errors that
+were present in version 1.0 build 1. Both versions are compatible.
+In addition, version 1.0 build 2 contains improved documentation
+of various example models.
+<!-- New libraries -->
+<!-- New components for existing libraries -->
+<!-- Backward compatible changes -->
+</p>
+
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.Continuous<br/>
+                       Buildings.Controls.Discrete<br/>
+                       Buildings.Controls.SetPoints
+    </td>
+    <td valign=\"top\">Improved documentation of models and of examples.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorDiscretizedOpen<br/>
+                     Buildings.Airflow.Multizone.DoorDiscretizedOperable
+    </td>
+    <td valign=\"top\">Changed the computation of the discharge coefficient to use the
+       nominal density instead of the actual density.
+       Computing <code>sqrt(2/rho)</code> sometimes causes warnings from the solver,
+       as it seems to try negative values for the density during iterative solutions.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.Examples
+    </td>
+    <td valign=\"top\">Improved documentation of examples.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples.DualFanDualDuct</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.Controls.RoomMixingBox
+    </td>
+    <td valign=\"top\">Improved control of minimum air flow rate to avoid overheating.
+    </td>
+</tr>
+</table>
+
+<!-- Non-backward compatbile changes to existing components -->
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Convection.Exterior
+    </td>
+    <td valign=\"top\">Fixed error in assignment of wind-based convection coefficient.
+                     The old implementation did not take into account the surface roughness.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.SolarRadiationExchange
+    </td>
+    <td valign=\"top\">In the previous version, the radiative properties
+     of the long-wave spectrum instead of the solar spectrum have been used
+     to compute the distribution of the solar radiation among the surfaces
+     inside the room.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.MixedAir
+    </td>
+    <td valign=\"top\">Added missing connect statement between window frame
+     surface and window frame convection model. Prior to this bug fix,
+     no convective heat transfer was computed between window frame and
+     room air.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.HeatGain
+    </td>
+    <td valign=\"top\">Fixed bug that caused convective heat gains
+     to be removed from the room instead of added to the room.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<!-- Github issues -->
+
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal.Boreholes</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/45\">&#35;45</a>
+    </td>
+    <td valign=\"top\">Dymola 2012 FD01 hangs when simulating a borehole heat exchanger.
+    This was caused by a wrong release of memory in <code>freeArray.c</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/46\">&#35;46</a>
+    </td>
+    <td valign=\"top\">The convective internal heat gain has the wrong sign.
+    </td>
+</tr>
+
+</table>
+</html>"));
+end Version_1_0_build2;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_1_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_1_build1.mo
new file mode 100644
index 00000000000..1ea26309d0e
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_1_build1.mo
@@ -0,0 +1,322 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_1_build1 "Version 1.1 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+   annotation (preferredView="info", Documentation(info="<html>
+<p>
+Version 1.1 build 1 contains improvements to models that address numerical problems.
+In particular, flow machines and actuators now have an optional filter
+that converts step changes in the input signal to a smooth change in
+speed or actuator position.
+Also, (<code>Buildings.Examples.Tutorial</code>)
+has been added to provide step-by-step instruction for how to build
+system models.
+<!-- New libraries -->
+</p>
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Examples.Tutorial
+    </td>
+    <td valign=\"top\">Tutorial with step by step instructions for how to
+                       build system models.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.Pipe
+    </td>
+    <td valign=\"top\">Added a model for a pipe with transport delay and optional heat
+                       exchange with the environment.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.UsersGuide
+    </td>
+    <td valign=\"top\">Added a user's guide for actuator models.
+    </td>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                     Buildings.Fluid.Interfaces.StaticConservationEquation
+    </td>
+    <td valign=\"top\">These base classes have been added to simplify the implementation
+                     of dynamic and steady-state thermofluid models.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Fluid.Data.Fuels
+    </td>
+    <td valign=\"top\">Package with physical properties of fuels that are used by the
+                     boiler model.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
+                       Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
+                       Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
+                       Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening
+    </td>
+    <td valign=\"top\">Added an optional 2nd order lowpass filter for the input signal.
+                       The filter approximates the travel time of the actuators.
+                       It also makes the system of equations easier to solve
+                       because a step change in the input signal causes a gradual change in the actuator
+                       position.<br/>
+                       Note that this filter affects the time response of closed loop control.
+                       Therefore, enabling the filter may require retuning of control loops.
+                       See the user's guide of the Buildings.Fluid.Actuators package.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerPolynomial
+    </td>
+    <td valign=\"top\">Added computation of fuel usage and improved the documentation.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                       Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                       Buildings.Fluid.Movers.FlowControlled_m_flow
+    </td>
+    <td valign=\"top\">Added a 2nd order lowpass filter to the input signal.
+                       The filter approximates the startup and shutdown transients of fans or pumps.
+                       It also makes the system of equations easier to solve
+                       because a step change in the input signal causes a gradual change in the
+                       mass flow rate.<br/>
+                       Note that this filter affects the time response of closed loop control.
+                       Therefore, enabling the filter may require retuning of control loops.
+                       See the user's guide of the Buildings.Fluid.Movers package.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger
+    </td>
+    <td valign=\"top\">Changed model to use graphical implementation of models for
+                       pressure drop and conservation equations.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.BaseClasses.PartialResistance<br/>
+                       Buildings.Fluid.FixedResistances.FixedResistanceDpM<br/>
+                       Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve<br/>
+                       Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential
+    </td>
+    <td valign=\"top\">Revised base classes and models to simplify object inheritance tree.
+                       Set <code>m_flow_small</code> to <code>final</code> in Buildings.Fluid.BaseClasses.PartialResistance,
+                       and removed its assignment in the other classes.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.FixedResistanceDpM<br/>
+                       Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM
+    </td>
+    <td valign=\"top\">Improved documentation.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassProperty
+    </td>
+    <td valign=\"top\">Added the function <code>glassPropertyUncoated</code> that calculates the property for uncoated glass.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+    </td>
+    <td valign=\"top\">Changed model to use new implementation of
+                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity
+                       in its base classes.
+                       This change leads to the use of the same equations for the radiative
+                       heat transfer between window and ambient as is used for
+                       the opaque constructions.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening
+    </td>
+    <td valign=\"top\">Changed models to allow modeling of a fixed resistance that is
+                       within the controlled flow leg. This allows in some cases
+                       to avoid a nonlinear equation if a flow resistance is
+                       in series to the valve.
+                       This change required changing the parameter for the valve resistance
+                       <code>dp_nominal</code> to <code>dpValve_nominal</code>,
+                       and introducing the parameter
+                       <code>dpFixed_nominal</code>, with <code>dpFixed_nominal=0</code>
+                       as its default value.
+                       Previous models that instantiate these components need to change the
+                       assignment of <code>dp_nominal</code> to an assignment of
+                       <code>dpValve_nominal</code>.
+                       See also <code>Buildings.Fluid.Actuators.UsersGuide</code>.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Radiosity.OutdoorRadiosity<br/>
+                       Buildings.HeatTransfer.Windows.ExteriorHeatTransfer
+    </td>
+    <td valign=\"top\">Changed model to use new implementation of
+                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity.
+                       This change leads to the use of the same equations for the radiative
+                       heat transfer between window and ambient as is used for
+                       the opaque constructions.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
+    </td>
+    <td valign=\"top\">Changed model to fix a bug that caused the output of the block
+                       to be incorrect when the simulation started
+                       at a time different from zero.
+                       When fixing this bug, the parameter <code>startTime</code> was removed,
+                       and the parameter <code>endTime</code> was renamed to <code>period</code>.
+                       The period always starts at <i>t=0</i> seconds.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
+    </td>
+    <td valign=\"top\">The output of the block was incorrect when the simulation started
+                       at a time different from zero.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow<br/>
+                       Buildings.Fluid.HeatExchangers.WetCoilCounterFlow
+    </td>
+    <td valign=\"top\">Corrected error in assignment of <code>dp2_nominal</code>.
+                       The previous assignment caused a pressure drop in all except one element,
+                       instead of the opposite. This caused too high a flow resistance
+                       of the heat exchanger.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody
+    </td>
+    <td valign=\"top\">Fixed error in BlackBody model that was causing a translation error when <code>calTSky</code> was set to <code>Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.HorizontalRadiation</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
+    </td>
+    <td valign=\"top\">Fixed wrong class reference in information section.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.IO.BCVTB.Examples.MoistAir
+    </td>
+    <td valign=\"top\">Updated fan parameters, which were still for
+                       version 0.12 of the Buildings library and hence caused
+                       a translation error with version 1.0 or higher.
+    </td>
+</tr>
+</table>
+<!-- Github issues -->
+
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Exterior longwave radiation exchange in window model</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/51\">&#35;51</a>
+    </td>
+    <td valign=\"top\">Changed model to use new implementation of
+                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity.
+                       This change leads to the use of the same equations for the radiative
+                       heat transfer between window and ambient as is used for
+                       the opaque constructions.
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/53\">&#35;53</a>
+    </td>
+    <td valign=\"top\">Fixed bug in Buildings.Controls.SetPoints.OccupancySchedule that
+                       led to wrong results when the simulation started at a time different from zero.
+    </td>
+</tr>
+</table>
+
+<p>
+Note:
+</p>
+<ul>
+<li>
+The use of filters for actuator and flow machine input
+signals changes the dynamic response of feedback control loops.
+Therefore, control gains may need to be retuned.
+See <code>Buildings.Fluid.Actuators.UsersGuide</code>
+and
+<code>Buildings.Fluid.Movers.UsersGuide</code> for recommended control
+gains and further details.
+</li>
+</ul>
+</html>"));
+end Version_1_1_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_2_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_2_build1.mo
new file mode 100644
index 00000000000..25e1c180745
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_2_build1.mo
@@ -0,0 +1,283 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_2_build1 "Version 1.2 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+   annotation (preferredView="info", Documentation(info="<html>
+<p>
+In version 1.2 build 1, models for radiant slabs and window overhangs and sidefins have been added.
+This version also contains various improvements to existing models.
+A detailed list of changes is shown below.
+<!-- New libraries -->
+</p>
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs
+    </td>
+    <td valign=\"top\">Package with models for radiant slabs
+                       with pipes or a capillary heat exchanger
+                       embedded in the construction.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Fluid.Data.Pipes
+    </td>
+    <td valign=\"top\">Package with records for pipes.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.FixedShade<br/>
+                       Buildings.HeatTransfer.Windows.Overhang<br/>
+                       Buildings.HeatTransfer.Windows.SideFins
+    </td>
+    <td valign=\"top\">For windows with either an overhang or side fins,
+                       these blocks output the fraction of the area
+                       that is sun exposed.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
+    </td>
+    <td valign=\"top\">Added BESTEST validation models for case 610, 620, 630, 640,
+                       650FF, 650, 920, 940, 950FF, 950, and 960.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">Removed assignment of <code>HGloHor_in</code> in its declaration,
+                       because this gives an overdetermined system if the input connector
+                       is used.<br/>
+                       Added new sub-bus that contains the solar position.
+                       This allows reusing the solar position in various other models.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.DiffuseIsotropic<br/>
+                       Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez<br/>
+                       Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.DiffuseIsotropic<br/>
+                       Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.DiffusePerez<br/>
+    </td>
+    <td valign=\"top\">Added optional output of diffuse radiation from the sky and ground.
+                       This allows reusing the diffuse radiation in solar thermal collector.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth
+    </td>
+    <td valign=\"top\">Changed implementation to avoid an event at solar noon.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Data.BoreholeFillings
+    </td>
+    <td valign=\"top\">
+                       Renamed class to <code>BoreholeFillings</code>
+                       to be consistent with data records being plural.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.GasesPTDecoupled.MoistAir<br/>
+                       Buildings.Media.Air<br/>
+                       Buildings.Media.PerfectGases.MoistAir<br/>
+                       Buildings.Media.PerfectGases.MoistAirUnsaturated<br/>
+                       Buildings.Media.GasesConstantDensity.MoistAir<br/>
+                       Buildings.Media.GasesConstantDensity.MoistAirUnsaturated
+    </td>
+    <td valign=\"top\">Added redeclaration of <code>ThermodynamicState</code>
+                       to avoid a warning
+                       during model check and translation.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+    </td>
+    <td valign=\"top\">Added a check that ensures that the number of surfaces
+                       are equal to the length of the parameter that contains
+                       the surface area, and added a check to ensure that no surface area
+                       is equal to zero. These checks help detecting erroneous declarations
+                       of the room model. The changes were done in
+                       <code>Buildings.ThermalZones.Detailed.MixedAir.PartialSurfaceInterface</code>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatbile changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+    </td>
+    <td valign=\"top\">Added optional modeling of window overhangs and side fins.
+                       The modeling of window overhangs and side fins required the
+                       introduction of the new parameters
+                       <code>hWin</code> for the window height and
+                       <code>wWin</code> for the window width, in addition to the
+                       parameters <code>ove</code> and <code>sidFin</code> which are used
+                       to declare the geometry of overhangs and side fins.
+                       The parameters <code>hWin</code> and <code>wWin</code>
+                       replace the previously used parameter <code>AWin</code> for the
+                       window area.
+                       Users need to manually replace <code>AWin</code> with <code>hWin</code>
+                       and <code>wWin</code> when updating models
+                       from a previous version of the library.<br/>
+                       See the information section in
+                       <code>Buildings.ThermalZones.Detailed.MixedAir</code> for how to use these models.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
+    </td>
+    <td valign=\"top\">
+                      Fixed a bug that caused an error in the schedule if the simulation start time was negative or equal to the first entry in the schedule.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.BaseClass.ThirdOrderStratifier
+    </td>
+    <td valign=\"top\">Revised the implementation to reduce the temperature overshoot.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
+    </td>
+    <td valign=\"top\">Fixed the bug in the temperature linearization and
+                       in the heat flow through the glass layer if the transmissivity of glass
+                       in the infrared regime is non-zero.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass
+    </td>
+    <td valign=\"top\">Fixed a bug in the parameter assignment of the instance <code>glass</code>.
+                       Previously, the infrared emissivity of surface a was assigned to the surface b.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.IO.BCVTB
+    </td>
+    <td valign=\"top\">Added a call to <code>Buildings.Utilities.IO.BCVTB.BaseClasses.exchangeReals</code>
+                       in the <code>initial algorithm</code> section.
+                       This is needed to propagate the initial condition to the server.
+                       It also leads to one more data exchange, which is correct and avoids the
+                       warning message in Ptolemy that says that the simulation reached its stop time
+                       one time step prior to the final time.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">Corrected the documentation of the unit requirement for
+                       input files, parameters and connectors.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPortInterface<br/>
+                       Buildings.Fluid.Interfaces.PartialTwoPortInterface
+    </td>
+    <td valign=\"top\">Replaced the erroneous function call <code>Medium.density</code> with
+                       <code>Medium1.density</code> and <code>Medium2.density</code> in
+                        <code>PartialFourPortInterface</code>.
+                       Changed condition to remove <code>sta_a1</code> and
+                       <code>sta_a2</code> in <code>PartialFourPortInterface</code>, and
+                       <code>sta_a</code> in <code>PartialTwoPortInterface</code>, to also
+                       compute the state at the inlet port if <code>show_V_flow=true</code>.<br/>
+                       The previous implementation resulted in a translation error
+                       if <code>show_V_flow=true</code>, but worked correctly otherwise
+                       because the erroneous function call is removed if  <code>show_V_flow=false</code>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Chillers.Examples.BaseClasses.PartialElectric
+    </td>
+    <td valign=\"top\">Corrected the nominal mass flow rate used in the mass flow source.
+    </td>
+</tr>
+</table>
+<!-- Github issues -->
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Heat transfer in glass layer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/56\">&#35;56</a>
+    </td>
+    <td valign=\"top\">Fixed bug in heat flow through the glass layer if the infrared transmissivity is non-zero.
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/57\">&#35;57</a>
+    </td>
+    <td valign=\"top\">Fixed bug in temperature linearization of window glass.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Overshooting in enhanced stratified tank</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/15\">&#35;15</a>
+    </td>
+    <td valign=\"top\">Revised the implementation to reduce the temperature over-shoot.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_1_2_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_3_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_3_build1.mo
new file mode 100644
index 00000000000..e7f55f578ed
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_3_build1.mo
@@ -0,0 +1,265 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_3_build1 "Version 1.3 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+   annotation (preferredView="info", Documentation(info="<html>
+<p>
+In version 1.3 build 1, models for direct evaporative cooling coils with multiple stages or with
+a variable speed compressor have been added.
+This version also contains improvements to the fan and pump models to better treat zero mass flow rate.
+Various other improvements have been made to improve the numerics and to use consistent variable names.
+A detailed list of changes is shown below.
+<!-- New libraries -->
+</p>
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Fluid.DXSystems
+    </td>
+    <td valign=\"top\">Library with direct evaporative cooling coils.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.DataCenterContinuousTimeControl
+    </td>
+    <td valign=\"top\">Added chilled water plant model with continuous time control that
+                       replaces the discrete time control in
+                       <code>Buildings.Examples.ChillerPlant.DataCenterDiscreteTimeControl</code>.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.X_pSatpphi
+    </td>
+    <td valign=\"top\">Function that computes moisture concentration based
+                       on saturation pressure, total pressure and relative
+                       humidity.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.TWetBul_TDryBulPhi
+    </td>
+    <td valign=\"top\">Block that computes the wet bulb temperature for given
+                     dry bulb temperature, relative humidity and atmospheric pressure.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.WetBul_pTX
+    </td>
+    <td valign=\"top\">Block that computes the temperature and mass fraction
+                       at the wet bulb state for given dry bulb temperature,
+                       species concentration and atmospheric pressure.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatbile changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">Added computation of the wet bulb temperature.
+                       Computing the wet bulb temperature introduces a nonlinear
+                       equation. As we have not observed an increase in computing time
+                       because of computing the wet bulb temperature, it is computed
+                       by default. By setting the parameter
+                       <code>computeWetBulbTemperature=false</code>, the computation of the
+                       wet bulb temperature can be removed.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
+    </td>
+    <td valign=\"top\">Added <code>pre</code> operator and relaxed tolerance in <code>assert</code> statement.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                       Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_y<br/>
+    </td>
+    <td valign=\"top\">Reformulated implementation of efficiency model
+                       to avoid a division by zero at zero mass flow rate
+                       for models in which a user specifies
+                       a power instead of an efficiency performance curve.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi
+    </td>
+    <td valign=\"top\">Added option to approximate the wet bulb temperature using an
+                     explicit equation.
+                     Reformulated the original model to change the dimension of the
+                     nonlinear system of equations from two to one.
+    </td>
+    </tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
+                       Buildings.BoundaryConditions.Types
+    </td>
+    <td valign=\"top\">Improved the optional inputs for the radiation data global horizontal, diffuse horizontal and direct normal radiation.
+    If a user specifies two of them, the third will be automatically calculated.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody
+    </td>
+    <td valign=\"top\">Renamed <code>radHor</code> to <code>radHorIR</code>
+                       to indicate that the radiation is in the infrared
+                       spectrum.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.DoorDiscretized<br/>
+                     Buildings.Airflow.Multizone.DoorDiscretizedOpen<br/>
+                     Buildings.Airflow.Multizone.DoorDiscretizedOperable<br/>
+                     Buildings.Airflow.Multizone.Orifice<br/>
+                     Buildings.Airflow.Multizone.ZonalFlow_ACS<br/>
+                     Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential<br/>
+                     Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
+                     Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
+                     Buildings.Fluid.BaseClasses.PartialResistance<br/>
+                     Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
+                     Buildings.Fluid.Movers.BaseClasses.PowerInterface<br/>
+                     Buildings.Fluid.Storage.BaseClasses.Buoyancy<br/>
+                     Buildings.Fluid.HeatExchangers.BaseClasses.MassExchange
+    </td>
+    <td valign=\"top\">Renamed protected parameters for consistency with the naming conventions.
+                     In previous releases, fluid properties had the suffix <code>0</code>
+                     or <code>_nominal</code> instead of <code>_default</code> when they
+                     where computed based on the medium default properties.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
+                     Buildings.Fluid.Sensors.LatentEnthalpyFlowRate
+    </td>
+    <td valign=\"top\">Moved computation of parameter <code>i_w</code> to new base class
+                     <code>Buildings.Fluid.BaseClasses.IndexWater</code>
+                     The value of this parameter is now assigned dynamically and does not require to be specified
+                     by the user.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.BaseClasses.ThirdOrderStratifier
+    </td>
+    <td valign=\"top\">Removed unused protected parameters <code>sta0</code> and <code>cp0</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.DataCenterDiscreteTimeControl<br/>
+                       Buildings.Examples.ChillerPlant.BaseClasses.Controls.TrimAndRespond<br/>
+                       Buildings.Examples.ChillerPlant.BaseClasses.Controls.ZeroOrderHold
+    </td>
+    <td valign=\"top\">Re-implemented the controls for setpoint reset.
+    Revised the model <code>TrimAndRespond</code> and deleted the model <code>ZeroOrderHold</code>.
+    Improved the documentation.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.DataCenterDiscreteTimeControl
+    </td>
+    <td valign=\"top\">Fixed error in wet bulb temperature. The previous version used
+                     a model to compute the wet bulb temperature that takes as an
+                     input the relative humidity, but required mass fraction as an input.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
+                       Buildings.BoundaryConditions.SkyTemperature.BlackBody
+    </td>
+    <td valign=\"top\">Renamed <code>radHor</code> to <code>radHorIR</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.BaseClasses.FlowModels.Examples.InverseFlowFunction
+    </td>
+    <td valign=\"top\">Fixed error in the documentation.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
+    </td>
+    <td valign=\"top\">Fixed broken link in the documentation.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.Characteristics.powerParameters
+    </td>
+    <td valign=\"top\">Fixed wrong <code>displayUnit</code> and
+                       <code>max</code> attribute for power.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes
+    </td>
+    <td valign=\"top\">In documentation, removed reference to the parameter
+                       <code>use_HeatTransfer</code> which no longer exists.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassPropertyUncoated
+    </td>
+    <td valign=\"top\">Improved the documentation for implementation and added comments for model limitations.
+    </td>
+</tr>
+</table>
+<!-- Github issues -->
+<!-- none -->
+</html>"));
+end Version_1_3_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_4_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_4_build1.mo
new file mode 100644
index 00000000000..c022a403367
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_4_build1.mo
@@ -0,0 +1,309 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_4_build1 "Version 1.4 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+   annotation (preferredView="info",
+   Documentation(info="<html>
+<p>
+Version 1.4 build 1 contains the new package <code>Buildings.Utilities.IO.Python27</code>
+that allows calling Python functions from Modelica.
+It also contains in the package <code>Buildings.HeatTransfer.Conduction.SingleLayer</code>
+a new model for heat conduction in phase change material. This model can be used as a layer
+of the room heat transfer model.
+</p>
+
+<p>
+Non-backward compatible changes had to be introduced
+in the valve models
+<code>Buildings.Fluid.Actuators.Valves</code> to fully comply with the Modelica
+language specification, and in the models in the package
+<code>Buildings.Utilities.Diagnostics</code>
+as they used the <code>cardinality</code> function which is deprecated in the Modelica
+Language Specification.
+</p>
+
+<p>
+See below for details.
+<!-- New libraries -->
+</p>
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Utilities.IO.Python27
+    </td>
+    <td valign=\"top\">
+         Package that contains blocks and functions that embed Python 2.7 in Modelica.
+         Data can be sent to Python functions and received from Python functions.
+         This allows for example data analysis in Python as part of a Modelica model,
+         or data exchange as part of a hardware-in-the-loop simulation in which
+         Python is used to communicate with hardware.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
+    </td>
+    <td valign=\"top\">This function is used by the weather data reader to set
+                       the path to the weather file relative to the root directory
+                       of the Buildings library.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume
+    </td>
+    <td valign=\"top\">Removed the check of multiple connections to the same element
+                       of a fluid port, as this check required the use of the deprecated
+                       <code>cardinality</code> function.
+    </td>
+</tr><tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.SingleLayer
+    </td>
+    <td valign=\"top\">Added option to model layers with phase change material.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange
+    </td>
+    <td valign=\"top\">Removed the use of the <code>cardinality</code> function
+                       as this function is deprecated in the Modelica Language Specification.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves
+    </td>
+    <td valign=\"top\">All valves now require the declaration of <code>dp_nominal</code>
+                       if the parameter assignment is
+                       <code>CvData = Buildings.Fluid.Types.CvTypes.OpPoint</code>.
+                       This change was needed because in the previous version,
+                       <code>dp_nominal</code> had
+                       a default value of <i>6000</i> Pascals. However, if
+                       <code>CvData &gt;&lt; Buildings.Fluid.Types.CvTypes.OpPoint</code>, then
+                       <code>dp_nominal</code> is computed in the initial algorithm section and hence
+                       providing a default value is not allowed according to
+                       the Modelica Language Specification.
+                       Hence, it had to be removed.<br/>
+                       As part of this change, we set <code>dp(nominal=6000)</code> for all valves,
+                       because the earlier formulation uses a value that is not known during compilation,
+                       and hence leads to an error in Dymola 2014.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
+                       Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
+    </td>
+    <td valign=\"top\">Removed the use of the deprecated
+                       <code>cardinality</code> function.
+                       Therefore, now all input signals must be connected.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Diagnostics.AssertEquality<br/>
+                       Buildings.Utilities.Diagnostics.AssertInequality
+    </td>
+    <td valign=\"top\">Removed the option to not connect input signals, as this
+                       required the use of the <code>cardinality</code> function which
+                       is deprecated in the MSL, and not correctly implemented in OpenModelica.
+                       Therefore, if using these models, both input signals must be connected.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.splineDerivatives
+    </td>
+    <td valign=\"top\">Removed the default value
+                       <code>input Boolean ensureMonotonicity=isMonotonic(y, strict=false)</code>
+                       as the Modelica language specification is not clear whether defaults can be computed
+                       or must be constants.
+    </td>
+</tr></table>
+<!-- Errors that have been fixed -->
+
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
+<tr><td colspan=\"2\"><b>Buildings.Controls</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.SetPoints.HotWaterTemperatureReset
+    </td>
+    <td valign=\"top\">Corrected error that led to wrong results if the room air temperature is
+                     different from its nominal value <code>TRoo_nominal</code>.
+                     This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/74\">issue 74</a>.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
+                     Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitSlab
+    </td>
+    <td valign=\"top\">Fixed bug in the assignment of the fictitious thermal resistance by replacing
+                     <code>RFic[nSeg](each G=A/Rx)</code> with
+                     <code>RFic[nSeg](each G=A/nSeg/Rx)</code>.
+                     This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/79\">issue 79</a>.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Diagnostics.AssertEquality<br/>
+                       Buildings.Utilities.Diagnostics.AssertInequality
+    </td>
+    <td valign=\"top\">Replaced <code>when</code> test with <code>if</code> test as
+                       equations within a <code>when</code> section are only evaluated
+                       when the condition becomes true.
+                       This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/72\">issue 72</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear
+    </td>
+    <td valign=\"top\">The documenation was
+                       <i>Fraction Kv(port_1 &rarr; port_2)/Kv(port_3 &rarr; port_2)</i> instead of
+                       <i>Fraction Kv(port_3 &rarr; port_2)/Kv(port_1 &rarr; port_2)</i>.
+                       Because the parameter set correctly its attributes
+                       <code>min=0</code> and <code>max=1</code>,
+                       instances of these models used the correct value.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.ValveParameters
+    </td>
+    <td valign=\"top\">Removed stray backslash in write statement.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                       Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
+                       Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger
+    </td>
+    <td valign=\"top\">Removed wrong unit attribute of <code>COut</code>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.HexElement
+    </td>
+    <td valign=\"top\">Changed the redeclaration of <code>vol2</code> to be replaceable,
+                     as <code>vol2</code> is replaced in some models.
+    </td>
+</tr>
+</table>
+<!-- Github issues -->
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Add explanation of nStaRef.</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/70\">&#35;70</a>
+    </td>
+    <td valign=\"top\">
+    Described in
+    <code>Buildings.HeatTransfer.Data.Solids</code>
+    how the parameter <code>nStaRef</code> is used
+    to compute the spatial grid that is used for simulating transient heat conduction.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Assert statement does not fire.</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/72\">&#35;72</a>
+    </td>
+    <td valign=\"top\">
+    The blocks <code>Buildings.Utilities.Diagnostics.AssertEquality</code> and
+    <code>Buildings.Utilities.Diagnostics.AssertInequality</code> did not fire because
+    the test on the time was in a <code>when</code> instead of an <code>if</code> statement.
+    This was wrong because <code>when</code> sections are only evaluated
+    when the condition becomes true.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b><code>HotWaterTemperatureReset</code> computes wrong results if room temperature differs from nominal value.</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/74\">&#35;74</a>
+    </td>
+    <td valign=\"top\">The equation
+<pre>TSup = TRoo_in_internal
+          + ((TSup_nominal+TRet_nominal)/2-TRoo_in_internal) * qRel^(1/m)
+          + (TSup_nominal-TRet_nominal)/2 * qRel;</pre>
+should be formulated as
+<pre>TSup = TRoo_in_internal
+          + ((TSup_nominal+TRet_nominal)/2-TRoo_nominal) * qRel^(1/m)
+          + (TSup_nominal-TRet_nominal)/2 * qRel;</pre>
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Bug in <code>RadiantSlabs.SingleCircuitSlab</code> fictitious resistance RFic.</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/79\">&#35;79</a>
+    </td>
+    <td valign=\"top\">This bug has been fixed in the assignment of the fictitious thermal resistance by replacing
+                     <code>RFic[nSeg](each G=A/Rx)</code> with
+                     <code>RFic[nSeg](each G=A/nSeg/Rx)</code>.
+                     The bug also affected <code>RadiantSlabs.ParallelCircuitSlab</code>.
+    </td>
+</tr>
+</table>
+
+<p>
+Note:
+</p>
+<ul>
+<li>
+This version contains various updates that allow
+the syntax of the example models to be checked in the pedantic mode
+in Dymola 2014.
+</li>
+</ul>
+</html>"));
+end Version_1_4_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build1.mo
new file mode 100644
index 00000000000..4fc55b1a50f
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build1.mo
@@ -0,0 +1,557 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_5_build1 "Version 1.5 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info",
+    Documentation(info="<html>
+<p>
+Version 1.5 build 1 is a major release that contains new packages with models for
+solar collectors and for the Facility for Low Energy Experiments (FLEXLAB)
+at the Lawrence Berkeley National Laboratory.
+</p>
+<p>
+This release also contains a major revision of all info sections to correct invalid html syntax.
+The package <code>Buildings.HeatTransfer.Radiosity</code> has been revised to comply
+with the Modelica language specification.
+The package <code>Buildings.ThermalZones.Detailed</code> has been revised to aid implementation of
+non-uniformly mixed room air models.
+This release also contains various corrections that avoid warnings during translation
+when used with Modelica 3.2.1.
+Various models have been revised to increase compatibility with OpenModelica.
+However, currently only a subset of the models work with OpenModelica.
+</p>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors
+    </td>
+    <td valign=\"top\">Library with solar collectors.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.FLEXLAB
+    </td>
+    <td valign=\"top\">Package with models for test cells of LBNL's FLEXLAB
+                       (Facility for Low Energy Experiments in Buildings).
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Utilities.IO.FLEXLAB
+    </td>
+    <td valign=\"top\">Package that demonstrates two-way data exchange
+                       between Modelica and LBNL's FLEXLAB (Facility for
+                       Low Energy Experiments in Buildings).
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+    </td>
+    <td valign=\"top\">Added a model of a tank with built-in heat exchanger.
+                       This model may be used together with solar thermal plants.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Resources</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Resources.Include
+    </td>
+    <td valign=\"top\">Added an <code>Include</code> folder and the <code>bcvtb.h</code>
+    header file to it to fix compilation errors in BCVTB example files.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
+                       Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
+    </td>
+    <td valign=\"top\">Improved the algorithm that determines the absolute path of the file.
+                       Now weather files are searched in the path specified, and if not found, the urls
+                       <code>file://</code>, <code>modelica://</code> and <code>modelica://Buildings</code>
+                       are added in this order to search for the weather file.
+                       This allows using the data reader without having to specify an absolute path,
+                       as long as the <code>Buildings</code> library
+                       is on the <code>MODELICAPATH</code>.
+    </td>
+</tr>
+
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
+    </td>
+    <td valign=\"top\">Reformulated computation of outlet properties to avoid an event at zero mass flow rate.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc
+    </td>
+    <td valign=\"top\">Simplified the implementation for the situation if
+                       <code>allowReverseFlow=false</code>.
+                       Avoided the use of the conditionally enabled variables <code>sta_a</code> and
+                       <code>sta_b</code> as this was not proper use of the Modelica syntax.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.Examples.ReverseFlowHumidifier
+    </td>
+    <td valign=\"top\">Changed one instance of <code>Modelica.Fluid.Sources.MassFlowSource_T</code>,
+                       that was connected to the two fluid streams,
+                       to two instances, each having half the mass flow rate.
+                       This is required for the model to work with Modelica 3.2.1 due to the
+                       change introduced in
+                       ticket <a href=\"https://trac.modelica.org/Modelica/ticket/739\">#739</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.EnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.LatentEnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.VolumeFlowRate
+    </td>
+    <td valign=\"top\">Removed default value <code>tau=0</code> as the base class
+                       already sets <code>tau=1</code>.
+                       This change was made so that all sensors use the same default value.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.TraceSubstancesTwoPort
+    </td>
+    <td valign=\"top\">Added default value <code>C_start=0</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Data.OpaqueConstructions.Generic
+    </td>
+    <td valign=\"top\">Changed the annotation of the
+                       instance <code>material</code> from
+                       <code>Evaluate=true</code> to <code>Evaluate=false</code>.
+                       This is required to allow changing the
+                       material properties after compilation.
+                       Note, however, that the number of state variables in
+                       <code>Buildings.HeatTransfer.Data.BaseClasses.Material</code>
+                       are only computed when the model is translated, because
+                       the number of state variables is fixed
+                       at compilation time.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Diagnostics.AssertEquality<br/>
+                       Buildings.Utilities.Diagnostics.AssertInequality
+    </td>
+    <td valign=\"top\">Added <code>time</code> in print statement as OpenModelica,
+                       in its error message, does not output the time
+                       when the assert is triggered.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Airflow</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.Orifice<br/>
+                       Buildings.Airflow.Multizone.EffectiveAirLeakageArea<br/>
+                       Buildings.Airflow.Multizone.ZonalFlow_ACS
+    </td>
+    <td valign=\"top\">Changed the parameter <code>useConstantDensity</code> to
+                       <code>useDefaultProperties</code> to use consistent names
+                       within this package.
+                       A conversion script in <code>Resources/Scripts/Dymola</code>
+                       can be used to update old models that use this parameter.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.BaseClasses.IndexWater
+    </td>
+    <td valign=\"top\">Renamed class to
+                       <code>Buildings.Fluid.BaseClasses.IndexMassFraction</code>
+                       as it is applicable for all mass fraction sensors.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+                       Buildings.Fluid.HeatExchangers.ConstantEffectiveness<br/>
+                       Buildings.Fluid.HeatExchangers.DryEffectivenessNTU<br/>
+                       Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                       Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger<br/>
+                       Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
+                       Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger<br/>
+                       Buildings.Fluid.MassExchangers.ConstantEffectiveness<br/>
+                       Buildings.Fluid.MassExchangers.HumidifierPrescribed<br/>
+                       Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolumeWaterPort<br/>
+                       Buildings.Fluid.MixingVolumes.MixingVolume<br/>
+                       Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
+                       Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir<br/>
+                       Buildings.Fluid.Storage.ExpansionVessel
+    </td>
+    <td valign=\"top\">Changed the input connector <code>mXi_flow</code> (or <code>mXi1_flow</code>
+                       and <code>mXi2_flow</code>) to <code>mWat_flow</code> (or <code>mWat1_flow</code>
+                       and <code>mWat2_flow</code>).
+                       This change has been done as declaring <code>mXi_flow</code> is ambiguous
+                       because it does not specify what other species are added unless a mass flow rate
+                       <code>m_flow</code> is also known. To avoid this confusion, the connector variables
+                       have been renamed.
+                       The equations that were used were, however, correct.
+                       This addresses issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/165\">#165</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+                       Buildings.Fluid.Storage.BaseClasses.IndirectTankHeatExchanger<br/>
+                       Buildings.Fluid.BaseClasses.PartialResistance<br/>
+                       Buildings.Fluid.FixedResistances.BaseClasses.Pipe<br/>
+                       Buildings.Fluid.FixedResistances.FixedResistanceDpM<br/>
+                       Buildings.Fluid.FixedResistances.LosslessPipe<br/>
+                       Buildings.Fluid.Geothermal.Boreholes.BaseClasses.BoreholeSegment<br/>
+                       Buildings.Fluid.Geothermal.Boreholes.UTube<br/>
+                       Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab<br/>
+                       Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
+                       Buildings.Fluid.Interfaces.PartialFourPortInterface<br/>
+                       Buildings.Fluid.Interfaces.PartialTwoPortInterface<br/>
+                       Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger<br/>
+                       Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger<br/>
+                       Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
+                       Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume<br/>
+                       Buildings.Fluid.Movers.BaseClasses.FlowControlled<br/>
+                       Buildings.Fluid.Movers.BaseClasses.IdealSource<br/>
+                       Buildings.Fluid.Movers.BaseClasses.PrescribedFlowMachine<br/>
+    </td>
+    <td valign=\"top\">Removed the computation of <code>V_flow</code> and removed the parameter
+                       <code>show_V_flow</code>.
+                       The reason is that the computation of <code>V_flow</code> required
+                       the use of <code>sta_a</code> (to compute the density),
+                       but <code>sta_a</code> is also a variable that is conditionally
+                       enabled. However, this was not correct Modelica syntax as conditional variables
+                       can only be used in a <code>connect</code>
+                       statement, not in an assignment. Dymola 2014 FD01 beta3 is checking
+                       for this incorrect syntax. Hence, <code>V_flow</code> was removed as its
+                       conditional implementation would require a rather cumbersome implementation
+                       that uses a new connector that carries the state of the medium.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes
+    </td>
+    <td valign=\"top\">Removed <code>Buildings.Fluid.MixingVolumes.MixingVolumeDryAir</code>
+                       as this model is no longer used. The model
+                       <code>Buildings.Fluid.MixingVolumes.MixingVolume</code>
+                       can be used instead of.<br/>
+                       Removed base class <code>Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolumeWaterPort</code>
+                       as this model is no longer used.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.Examples.TraceSubstances
+    </td>
+    <td valign=\"top\">Renamed example from <code>ExtraProperty</code> to
+                     <code>TraceSubstances</code> in order to use the same name
+                     as the sensor.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.PrescribedExtraPropertyFlowRate
+    </td>
+    <td valign=\"top\">Renamed model to<code>TraceSubstancesFlowRate</code> to
+                     use the same terminology than the Modelica Standard Library.<br/>
+                     The conversion script updates existing models that instantiate
+                     this model.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.Examples.PrescribedExtraPropertyFlow
+    </td>
+    <td valign=\"top\">Renamed example to<code>TraceSubstancesFlowRate</code>
+                     in order to use the same name as the source model.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume<br/>
+                       Buildings.Fluid.FixedResistances.Pipe<br/>
+                       Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab<br/>
+                       Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
+                       Buildings.Fluid.Movers.BaseClasses.FlowControlled
+    </td>
+    <td valign=\"top\">Renamed <code>X_nominal</code> to <code>X_default</code>
+                       or <code>X_start</code>, where <code>X</code> may be
+                       <code>state</code>, <code>rho</code>, or <code>mu</code>,
+                       depending on whether the medium default values or the start values
+                       are used in the computation of the state
+                       and derived quantities.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer<br/>
+                         Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Interfaces.RadiosityInflow<br/>
+                       Buildings.HeatTransfer.Interfaces.RadiosityOutflow<br/>
+                       Buildings.HeatTransfer.Radiosity.BaseClasses.ParametersTwoSurfaces<br/>
+                       Buildings.HeatTransfer.Radiosity.Constant<br/>
+                       Buildings.HeatTransfer.Radiosity.Examples.OpaqueSurface<br/>
+                       Buildings.HeatTransfer.Radiosity.Examples.OutdoorRadiosity<br/>
+                       Buildings.HeatTransfer.Radiosity.IndoorRadiosity<br/>
+                       Buildings.HeatTransfer.Radiosity.OpaqueSurface<br/>
+                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity<br/>
+                       Buildings.HeatTransfer.Radiosity.RadiositySplitter<br/>
+                       Buildings.HeatTransfer.Radiosity.package<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.Examples.CenterOfGlass<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.Examples.GlassLayer<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.Examples.Shade<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.Shade<br/>
+                       Buildings.HeatTransfer.Windows.Examples.BoundaryHeatTransfer<br/>
+                       Buildings.HeatTransfer.Windows.ExteriorHeatTransfer<br/>
+                       Buildings.HeatTransfer.Windows.InteriorHeatTransfer<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationGainDistribution<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.MixedAir<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.Overhang<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.SideFins
+    </td>
+    <td valign=\"top\">Changed the connectors for the radiosity model.
+                       The previous implemenation declared the radiosity as a
+                       <code>flow</code> variables, but the implementation did not use
+                       a potential variable.<br/>
+                       Therefore, the radiosity was the only variable in the connector,
+                       which is not allowed for <code>flow</code> variables.
+                       This change required a reformulation of models because with the new formulation,
+                       the incoming and outcoming radiosity are both non-negative values.
+                       This addresses issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/158\">#158</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer<br/>
+                         Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.PartialConvection<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.PartialWindowBoundaryCondition<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.Shade<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.ShadeConvection<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.ShadeRadiation<br/>
+                       Buildings.HeatTransfer.Windows.InteriorHeatTransfer<br/>
+                       Buildings.HeatTransfer.Windows.InteriorHeatTransferConvective<br/>
+                       Buildings.ThermalZones.Detailed.ExteriorBoundaryConditionsWithWindow<br/>
+                       Buildings.ThermalZones.Detailed.PartialSurfaceInterface<br/>
+                       Buildings.ThermalZones.Detailed.InfraredRadiationExchange<br/>
+                       Buildings.ThermalZones.Detailed.AirHeatMassBalanceMixed<br/>
+                       Buildings.ThermalZones.Detailed.SolarRadiationExchange<br/>
+                       Buildings.ThermalZones.Detailed.RadiationTemperature<br/>
+                       Buildings.ThermalZones.Detailed.InfraredRadiationGainDistribution
+    </td>
+    <td valign=\"top\">Redesigned the implementation of the room model and its base classes.
+                       This redesign separates convection from radiation, and it provides
+                       one composite model for the convection and the heat and mass balance in
+                       the room. This change was done to allow an implementation of the room air
+                       heat and mass balance that does not assume uniformly mixed room air.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Convection.Functions.HeatFlux.rayleigh
+    </td>
+    <td valign=\"top\">Renamed function from <code>raleigh</code> to <code>rayleigh</code>.
+    </td>
+</tr>
+
+
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.SpecificEntropyTwoPort
+    </td>
+    <td valign=\"top\">
+           Corrected wrong computation of the dynamics used for the sensor signal.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear
+    </td>
+    <td valign=\"top\">
+           Corrected the glass layer thickness, which was <i>5.7</i> mm instead of
+           <i>3</i> mm, as the documentation states.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody<br/>
+              Buildings.BoundaryConditions.WeatherData.BaseClasses.CheckTemperature<br/>
+              Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
+              Buildings.Controls.SetPoints.HotWaterTemperatureReset<br/>
+              Buildings.Examples.ChillerPlant.BaseClasses.Controls.ChillerSwitch<br/>
+              Buildings.Examples.ChillerPlant.BaseClasses.Controls.WSEControl<br/>
+              Buildings.Fluid.Boilers.BoilerPolynomial<br/>
+              Buildings.Fluid.HeatExchangers.BaseClasses.HexElement<br/>
+              Buildings.Fluid.HeatExchangers.BaseClasses.MassExchange<br/>
+              Buildings.Fluid.HeatExchangers.BaseClasses.MassExchangeDummy<br/>
+              Buildings.Fluid.DXSystems.Cooling.BaseClasses.ApparatusDewPoint<br/>
+              Buildings.Fluid.DXSystems.Cooling.BaseClasses.ApparatusDryPoint<br/>
+              Buildings.Fluid.DXSystems.BaseClasses.CoolingCapacity<br/>
+              Buildings.Fluid.DXSystems.Cooling.BaseClasses.DXCooling<br/>
+              Buildings.Fluid.DXSystems.BaseClasses.DryCoil<br/>
+              Buildings.Fluid.DXSystems.Cooling.BaseClasses.DryWetSelector<br/>
+              Buildings.Fluid.DXSystems.Cooling.BaseClasses.Evaporation<br/>
+              Buildings.Fluid.DXSystems.Cooling.BaseClasses.WetCoil<br/>
+              Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolumeWaterPort<br/>
+              Buildings.Fluid.Sensors.RelativeTemperature<br/>
+              Buildings.Fluid.Sensors.Temperature<br/>
+              Buildings.Fluid.Sensors.TemperatureTwoPort<br/>
+              Buildings.Fluid.Sensors.TemperatureWetBulbTwoPort<br/>
+              Buildings.Fluid.SolarCollectors.BaseClasses.PartialHeatLoss<br/>
+              Buildings.Utilities.Comfort.Fanger<br/>
+              Buildings.Utilities.IO.BCVTB.From_degC<br/>
+              Buildings.Utilities.IO.BCVTB.To_degC<br/>
+              Buildings.Utilities.Psychrometrics.TDewPoi_pW<br/>
+              Buildings.Utilities.Psychrometrics.TWetBul_TDryBulPhi<br/>
+              Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi<br/>
+              Buildings.Utilities.Psychrometrics.WetBul_pTX<br/>
+              Buildings.Utilities.Psychrometrics.pW_TDewPoi
+    </td>
+    <td valign=\"top\">Replaced wrong attribute <code>quantity=\"Temperature\"</code>
+                     with <code>quantity=\"ThermodynamicTemperature\"</code>.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Data.Fuels.Generic
+    </td>
+    <td valign=\"top\">Corrected wrong type for <code>mCO2</code>.
+                       It was declared as <code>Modelica.Units.SI.MassFraction</code>,
+                       which is incorrect.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.Correlations.BaseClasses.Bounds
+    </td>
+    <td valign=\"top\">Corrected wrong type for <code>FRWat_min</code>, <code>FRWat_max</code>
+                       and <code>liqGasRat_max</code>.
+                       They were declared as <code>Modelica.Units.SI.MassFraction</code>,
+                       which is incorrect as, for example, <code>FRWat_max</code> can be larger than one.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.ConstantEffectiveness<br/>
+                     Buildings.Fluid.MassExchangers.ConstantEffectiveness
+    </td>
+    <td valign=\"top\">Corrected error in the documentation that was not updated
+                     when the implementation of zero flow rate was revised.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation
+    </td>
+    <td valign=\"top\">Corrected the syntax error
+                       <code>Medium.ExtraProperty C[Medium.nC](each nominal=C_nominal)</code>
+                       to
+                       <code>Medium.ExtraProperty C[Medium.nC](nominal=C_nominal)</code>
+                       because <code>C_nominal</code> is a vector.
+                       This syntax error caused a compilation error in OpenModelica.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.LatentEnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.MassFraction<br/>
+                       Buildings.Fluid.Sensors.MassFractionTwoPort
+    </td>
+    <td valign=\"top\">Changed medium declaration in the <code>extends</code> statement
+                       to <code>replaceable</code> to avoid a translation error in
+                       OpenModelica.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.TraceSubstances<br/>
+                       Buildings.Fluid.Sensors.TraceSubstancesTwoPort
+    </td>
+    <td valign=\"top\">Corrected syntax errors in setting nominal value for output signal
+                       and for state variable.
+                       This eliminates a compilation error in OpenModelica.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.TraceSubstancesFlowSource
+    </td>
+    <td valign=\"top\">Added missing <code>each</code> in declaration of
+                       <code>C_in_internal</code>.
+                       This eliminates a compilation error in OpenModelica.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Python27</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.IO.Python27.Functions.exchange
+    </td>
+    <td valign=\"top\">Corrected error in C code that lead to message
+                       <code>'module' object has no attribute 'argv'</code>
+                       when a python module accessed <code>sys.argv</code>.
+    </td>
+</tr>
+
+
+
+</table>
+<!-- Github issues -->
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Verify mass and species balance</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/165\">#165</a>
+    </td>
+    <td valign=\"top\">This issue has been addressed by renaming the connectors to avoid an ambiguity
+                       in the model equation. The equations were correct.
+    </td>
+<tr><td colspan=\"2\"><b>Remove flow attribute from radiosity connectors</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/158\">#158</a>
+    </td>
+    <td valign=\"top\">This issue has been addressed by reformulating the radiosity models.
+                       With the new implementation, incoming and outgoing radiosity are non-negative
+                       quantities.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_1_5_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build2.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build2.mo
new file mode 100644
index 00000000000..a02f77b06cc
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build2.mo
@@ -0,0 +1,47 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_5_build2 "Version 1.5 build 2"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info",
+    Documentation(info="<html>
+<p>
+Version 1.5 build 2 is a maintenance release that corrects an error in
+<code>Buildings.Fluid.HeatExchangers.DryCoilDiscretized</code> and in
+<code>Buildings.Fluid.HeatExchangers.WetCoilDiscretized</code>.
+It is fully compatible with version 1.5 build 1.
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
+                       Buildings.Fluid.HeatExchangers.WetCoilDiscretized
+    </td>
+    <td valign=\"top\">
+           Corrected wrong connect statements that caused the last register to have
+           no liquid flow.
+           This closes issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/194\">#194</a>.
+    </td>
+</tr>
+</table>
+<!-- Github issues -->
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>DryCoilDiscretized model not using last register, liquid flow path</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/194\">#194</a>
+    </td>
+    <td valign=\"top\">This issue has been addressed by correcting the connect statements.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_1_5_build2;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build3.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build3.mo
new file mode 100644
index 00000000000..a8728bdc7f3
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_5_build3.mo
@@ -0,0 +1,46 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_5_build3 "Version 1.5 build 3"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (preferredView="info",
+    Documentation(info="<html>
+<p>
+Version 1.5 build 3 is a maintenance release that corrects an error in
+<code>Buildings.Fluid.MassExchangers.HumidifierPrescribed</code>.
+It is fully compatible with version 1.5 build 2.
+</p>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed
+    </td>
+    <td valign=\"top\">
+           Corrected the enthalpy balance, which caused the latent heat flow rate to be added
+           twice to the fluid stream.
+           This closes issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/197\">#197</a>.
+    </td>
+</tr>
+</table>
+<!-- Github issues -->
+<p>
+The following
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>HumidifierPrescribed accounts twice for latent heat gain</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/197\">#197</a>
+    </td>
+    <td valign=\"top\">This issue has been addressed by correcting the latent heat added to the
+                       fluid stream.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_1_5_build3;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_1_6_build1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_1_6_build1.mo
new file mode 100644
index 00000000000..386d19094d8
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_1_6_build1.mo
@@ -0,0 +1,261 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_1_6_build1 "Version 1.6 build 1"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+<p>
+Version 1.6 build 1 updates the <code>Buildings</code> library to the
+Modelica Standard Library 3.2.1 and to <code>Modelica_StateGraph2</code> 2.0.2.
+</p>
+<p>
+This is the first version of the <code>Buildings</code> library
+that contains models from the
+<a href=\"https://github.com/ibpsa/modelica\">
+IEA EBC Annex 60 library</a>,
+a Modelica library for building and community energy systems that is
+collaboratively developed within the project
+<a href=\"http://www.iea-annex60.org\">
+\"New generation computational tools for building and community energy systems
+based on the Modelica and Functional Mockup Interface standards\"</a>,
+a project that is conducted under the
+Energy in Buildings and Communities Programme (EBC) of the
+International Energy Agency (IEA).
+</p>
+<!-- New libraries -->
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayTable
+    </td>
+    <td valign=\"top\">Two way valve for which the opening characteristics
+                       is specified by a table.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Examples.Average
+                       Buildings.Utilities.Math.Examples.InverseXRegularized
+                       Buildings.Utilities.Math.Examples.Polynominal
+                       Buildings.Utilities.Math.Examples.PowerLinearized
+                       Buildings.Utilities.Math.Examples.QuadraticLinear
+                       Buildings.Utilities.Math.Examples.RegNonZeroPower
+                       Buildings.Utilities.Math.Examples.SmoothExponential
+                       Buildings.Utilities.Math.Functions.average
+                       Buildings.Utilities.Math.Functions.booleanReplicator
+                       Buildings.Utilities.Math.Functions.Examples.IsMonotonic
+                       Buildings.Utilities.Math.Functions.Examples.TrapezoidalIntegration
+                       Buildings.Utilities.Math.Functions.integerReplicator
+                       Buildings.Utilities.Math.InverseXRegularized
+                       Buildings.Utilities.Math.Polynominal
+                       Buildings.Utilities.Math.PowerLinearized
+                       Buildings.Utilities.Math.QuadraticLinear
+                       Buildings.Utilities.Math.RegNonZeroPower
+                       Buildings.Utilities.Math.SmoothExponential
+                       Buildings.Utilities.Math.TrapezoidalIntegration
+    </td>
+    <td valign=\"top\">Various functions and blocks for mathematical operations.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Examples.SaturationPressureLiquid
+                       Buildings.Utilities.Psychrometrics.Examples.SaturationPressure
+                       Buildings.Utilities.Psychrometrics.Examples.SublimationPressureIce
+                       Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_saturationPressureLiquid
+                       Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_sublimationPressureIce
+                       Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.SaturationPressureDerivativeCheck
+                       Buildings.Utilities.Psychrometrics.Functions.Examples.SaturationPressure
+                       Buildings.Utilities.Psychrometrics.Functions.saturationPressureLiquid
+                       Buildings.Utilities.Psychrometrics.Functions.saturationPressure
+                       Buildings.Utilities.Psychrometrics.Functions.sublimationPressureIce
+                       Buildings.Utilities.Psychrometrics.SaturationPressureLiquid
+                       Buildings.Utilities.Psychrometrics.SaturationPressure
+                       Buildings.Utilities.Psychrometrics.SublimationPressureIce
+    </td>
+    <td valign=\"top\">Various functions and blocks for psychrometric calculations.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortInterface<br/>
+                       Buildings.Fluid.Interfaces.PartialFourPortInterface
+    </td>
+    <td valign=\"top\">Removed call to homotopy function
+                       in the computation of the connector variables as
+                       these are conditionally enabled variables and
+                       therefore must not be used in any equation. They
+                       are only for output reporting.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential
+    </td>
+    <td valign=\"top\">Improved documentation of the flow resistance.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
+    </td>
+    <td valign=\"top\">Added the option to use a constant, an input signal or the weather file as the source
+                       for the ceiling height, the total sky cover, the opaque sky cover, the dew point temperature,
+                       and the infrared horizontal radiation <code>HInfHor</code>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowMachinePolynomial
+    </td>
+    <td valign=\"top\">Moved the model to the package
+                       <code>Buildings.Obsolete</code>,
+                       as this model is planned to be removed in future versions.
+                       The conversion script should update old instances of
+                       this model automatically in Dymola.
+                       Users should change their models to use a flow machine from
+                       the package <code>Buildings.Fluid.Movers</code>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.ExpansionVessel
+    </td>
+    <td valign=\"top\">Simplified the model to have a constant pressure.
+                       The following non-backward compatible changes
+                       have been made.
+                       <ol>
+                       <li>The parameter <code>VTot</code> was renamed to <code>V_start</code>.</li>
+                       <li>The following parameters were removed: <code>VGas0</code>,
+                           <code>pMax</code>, <code>energyDynamics</code> and <code>massDynamics</code>.</li>
+                       </ol>
+                       The conversion script should update old instances of
+                       this model automatically in Dymola.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+    </td>
+    <td valign=\"top\">Revised the model as the old version required the port<sub>a</sub>
+                       of the heat exchanger to be located higher than port<sub>b</sub>.
+                       This makes sense if the heat exchanger is used to heat up the tank,
+                       but not if it is used to cool down a tank, such as in a cooling plant.
+                       The following parameters were changed:
+                       <ol>
+                         <li>Changed <code>hexTopHeight</code> to <code>hHex_a</code>.</li>
+                         <li>Changed <code>hexBotHeight</code> to <code>hHex_b</code>.</li>
+                         <li>Changed <code>topHexSeg</code> to <code>segHex_a</code>,
+                          and made it protected as this is deduced from <code>hHex_a</code>.</li>
+                         <li>Changed <code>botHexSeg</code> to <code>segHex_b</code>,
+                          and made it protected as this is deduced from <code>hHex_b</code>.</li>
+                       </ol>
+                       The names of the following ports have been changed:
+                       <ol>
+                         <li>Changed <code>port_a1</code> to <code>portHex_a</code>.</li>
+                         <li>Changed <code>port_b1</code> to <code>portHex_b</code>.</li>
+                       </ol>
+                       The conversion script should update old instances of
+                       this model automatically in Dymola for all of the above changes.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.UTube
+    </td>
+    <td valign=\"top\">Reimplemented the resistor network inside the borehole
+                       as the old implementation led to too slow a transient
+                       response. This change also led to the removal of the
+                       parameters <code>B0</code> and <code>B1</code>
+                       as the new implementation does not require them.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.BaseClasses.HexInternalElement
+    </td>
+    <td valign=\"top\">Corrected error in documentation which stated a wrong default value
+                       for the pipe spacing.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.ntu_epsilonZ()
+    </td>
+    <td valign=\"top\">Added dummy argument to function call of <code>Internal.solve</code>
+                       to avoid a warning during model check in Dymola 2015.
+    </td>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
+    </td>
+    <td valign=\"top\">Changed <code>assert</code> statement to avoid comparing
+                       enumeration with an integer, which triggers a warning
+                       in Dymola 2015.
+    </td>
+
+    </tr>    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWall<br/>
+                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
+                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows
+    </td>
+    <td valign=\"top\">Corrected wrong assignment of parameter in instance <code>bouConExt(conMod=...)</code>
+                       which was set to an interior instead of an exterior convection model.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.TDewPoi_pW()
+    </td>
+    <td valign=\"top\">Added dummy argument to function call of <code>Internal.solve</code>
+                       to avoid a warning during model check in Dymola 2015.
+    </td>
+</table>
+<!-- Github issues -->
+<p>
+The followings
+<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
+have been fixed:
+</p>
+<table border=\"1\" summary=\"github issues\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/196\">#196</a>
+    </td>
+    <td valign=\"top\">Change capacity location in borehole grout.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_1_6_build1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_2_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_2_0_0.mo
new file mode 100644
index 00000000000..6e44db15ea9
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_2_0_0.mo
@@ -0,0 +1,717 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_2_0_0 "Version 2.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+<p>
+Version 2.0.0 is a major release that contains various new packages, models
+and improvements.
+</p>
+<p>
+The following major additions have been done in version 2.0:
+</p>
+<ul>
+<li>
+A CFD model
+that is embedded in a thermal zone has been added.
+This model is implemented in <code>Buildings.ThermalZones.Detailed.CFD</code>.
+The CFD model is an implementation of the Fast Fluid Dynamics code
+that allows three-dimensional CFD inside a thermal zone,
+coupled to building heat transfer, HVAC components and feedback control loops.
+</li>
+<li>
+A new package <code>Buildings.Electrical</code> has been added.
+This package allows studying
+buildings to electrical grid integration. It includes models for loads, transformers,
+cables, batteries, PV and wind turbines.
+Models exist for DC and AC systems with two- or three-phase that can be balanced and unbalanced.
+The models compute voltage, current, active and reactive power
+based on the quasi-stationary assumption or using the dynamic phasorial representation.
+</li>
+<li>
+The new package <code>Buildings.Controls.DemandResponse</code>
+contains models for demand response simulation.
+</li>
+<li>
+The new package
+<code>Buildings.Controls.Predictors</code>
+contains a data-driven model that predicts the electrical load
+of a building. The prediction can be done
+either using an average baseline or
+a linear regression with respect to outside temperature.
+For both, optionally a day-of adjustment can be made.
+</li>
+</ul>
+<p>
+The tables below give more detailed information to the revisions
+of this library compared to the previous release 1.6 build 1.
+</p>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\">Buildings.Electrical
+    </td>
+    <td valign=\"top\">Library for electrical grid simulation that
+                       allows to study building to electrical grid integration.
+                       The library contains models of loads, generation and transmission
+                       for DC and AC systems.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Controls.DemandResponse
+    </td>
+    <td valign=\"top\">Library with a model for demand response prediction.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Controls.Predictors
+    </td>
+    <td valign=\"top\">Library with a data-driven model that predicts the electrical load
+                     of a building. The prediction can be done
+                     either using an average baseline or
+                     a linear regression with respect to outside temperature.
+                     For both, optionally a day-of adjustment can be made.
+    </td>
+    </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent
+    </td>
+    <td valign=\"top\">Model of a pressure-independent two way valve.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCooler_T
+    </td>
+    <td valign=\"top\">Model of a heater or cooler that takes as an input
+                       the set point for the temperature of the fluid that leaves
+                       the component. The set point is tracked exactly
+                       if the component has sufficient capacity.
+                       Optionally, the component can be configured to compute
+                       a dynamic rather than a steady-state response.
+    </td>
+    </tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Phi_pTX<br/>
+                       Buildings.Utilities.Psychrometrics.Functions.phi_pTX
+    </td>
+    <td valign=\"top\">Block and function that computes the relative humidity
+                       for given pressure, temperature and water vapor mass fraction.
+    </td>
+    </tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD
+    </td>
+    <td valign=\"top\">Room model that computes the room air flow
+                       using computational fluid dynamics (CFD).
+                       The CFD simulation is coupled to the thermal simulation of the room
+                       and, through the fluid port, to the air conditioning system.
+                       Currently, the supported CFD program is the
+                       Fast Fluid Dynamics (FFD) program.
+                       See <code>Buildings.ThermalZones.Detailed.UsersGuide.CFD</code>
+                       for detailed explanations.
+    </td>
+    </tr>
+
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">Added option to obtain the black body sky temperature
+                       from a parameter or an input signal rather than
+                       computing it in the weather data reader.<br/><br/>
+                       Removed redundant connection
+                       <code>connect(conHorRad.HOut, cheHorRad.HIn);</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Chillers.ElectricEIR<br/>
+                       Buildings.Chillers.ElectricReformulatedEIR
+    </td>
+    <td valign=\"top\">Changed implementation so that the model
+                       is continuously differentiable.
+                       This is for issue
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/373\">373</a>.
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow
+    </td>
+    <td valign=\"top\">Changed assignment of <code>T_m</code> to avoid using the conditionally
+                       enabled model <code>ele[:].mas.T</code>, which is only
+                       valid in a connect statement.
+                       Moved assignments of
+                       <code>Q1_flow</code>, <code>Q2_flow</code>, <code>T1</code>,
+                       <code>T2</code> and <code>T_m</code> outside of equation section
+                       to avoid mixing graphical and textual modeling within the same model.
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized
+    </td>
+    <td valign=\"top\">Removed parameter <code>m1_flow_nominal</code>, as this parameter is already
+                    declared in its base class
+                    <code>Buildings.Fluid.Interfaces.PartialFourPortInterface</code>.
+                    This change avoids an error in OpenModelica as the two declarations
+                    had a different value for the <code>min</code> attribute, which is not valid
+                    in Modelica.
+    </td>
+    </tr>
+    <tr>
+    <td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister<br/>
+                       Buildings.Fluid.HeatExchangers.BaseClasses.DuctManifoldDistributor
+    </td>
+    <td valign=\"top\">Reformulated the multiple iterators in the <code>sum</code> function
+                       as this language construct is not supported in OpenModelica.
+    </td>
+    </tr>
+
+    <tr>
+    <td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
+    </td>
+    <td valign=\"top\">Set start value for <code>hPip(fluid(T))</code> to avoid
+                       a warning about conflicting start values.
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                       Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                       Buildings.Fluid.Movers.FlowControlled_m_flow
+
+    </td>
+    <td valign=\"top\">For the parameter setting <code>use_powerCharacteristic=true</code>,
+                     changed the computation of the power consumption at
+                     reduced speed to properly account for the
+                     affinity laws. This is in response to
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/202\">#202</a>.
+    </td>
+</tr>
+
+    <tr>
+    <td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                       Buildings.Fluid.SolarCollectors.EN12975
+    </td>
+    <td valign=\"top\">Reformulated the model to avoid a translation error
+                       if glycol is used.<br/>
+                       Propagated parameters for initialization in base class
+                       <code>Buildings.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector</code>
+                       and set <code>prescribedHeatFlowRate=true</code>.
+    </td>
+    </tr>
+
+    <tr>
+    <td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+    </td>
+    <td valign=\"top\">Replaced the <code>abs()</code> function in the assignment of the parameter
+                       <code>nSegHexTan</code> as the return value of <code>abs()</code>
+                       is a <code>Real</code> which causes a type error during model check.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.MultiLayer
+    </td>
+    <td valign=\"top\">Changed the assignment of <code>_T_a_start</code>,
+                       <code>_T_b_start</code> and <code>RTot</code> to be
+                       in the initial equation section as opposed to
+                       the parameter declaration.
+                       This is needed to avoid an error during model check
+                       and translation in Dymola 2015 FD01 beta1.
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.InteriorHeatTransferConvective
+    </td>
+    <td valign=\"top\">Changed model to allow a temperature dependent convective heat transfer
+                       on the room side.
+                       This is for issue
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/52\">52</a>.
+    </td>
+    </tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleIdealGasMedium<br/>
+                       Buildings.Media.Interfaces.PartialSimpleMedium
+    </td>
+    <td valign=\"top\">Set <code>T(start=T_default)</code> and
+                       <code>p(start=p_default)</code> in the
+                       <code>ThermodynamicState</code> record. Setting the start value for
+                       <code>T</code> is required to avoid an error due to
+                       conflicting start values when translating
+                       <code>Buildings.Examples.VAVReheat.ClosedLoop</code> in pedantic mode.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+    </td>
+    <td valign=\"top\">Changed model to allow a temperature dependent convective heat transfer
+                       on the room side for windows.
+                       This is for issue
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/52\">52</a>.
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Rooms.BaseClasses.ExteriorBoundaryConditionsWithWindow
+    </td>
+    <td valign=\"top\">Conditionally removed the shade model if no shade is present.
+                       This corrects
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/234\">#234</a>.
+    </td>
+</tr>
+
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Airflow</b>
+   </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.ZonalFlow_ACS<br/>
+                       Buildings.Airflow.Multizone.ZonalFlow_m_flow
+   </td>
+   <td valign=\"top\">Removed parameter <code>forceErrorControlOnFlow</code> as it was not used.
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+   </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+   </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+   </td>
+   <td valign=\"top\">Changed the following signals for compatibility with OpenModelica:<br/>
+                      <code>weaBus.sol.zen</code> to <code>weaBus.solZen</code>.<br/>
+                      <code>weaBus.sol.dec</code> to <code>weaBus.solDec</code>.<br/>
+                      <code>weaBus.sol.alt</code> to <code>weaBus.solAlt</code>.<br/>
+                      <code>weaBus.sol.solHouAng</code> to <code>weaBus.solHouAng</code>.<br/>
+                      For Dymola, the conversion script will automatically
+                      update existing models.
+   </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+   </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.IntegerSum
+   </td>
+   <td valign=\"top\">Removed block as it is not used in any model.
+                      Models that require an integer sum can use
+                      <code>Modelica.Blocks.MathInteger.Sum</code>.
+   </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.UnoccupiedOn
+   </td>
+   <td valign=\"top\">Removed block as it is not used in any model.
+   </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.HeatTransfer.Data.GlazingSystems.Generic
+    </td>
+    <td valign=\"top\">Removed parameter <code>nLay</code> as OpenModelica
+                       could not assign it during translation.
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.BaseClasses.der_temperature_u
+    </td>
+    <td valign=\"top\">Changed the input argument for this function from type
+                       <code>Buildings.HeatTransfer.Data.BaseClasses.Material</code>
+                       to the elements of this type as OpenModelica fails to translate the
+                       model if the input to this function is a record.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Types.Azimuth<br/>
+                       Buildings.HeatTransfer.Types.Tilt
+    </td>
+    <td valign=\"top\">Moved these types from <code>Buildings.HeatTransfer</code>
+                       to the top-level package <code>Buildings</code> because
+                       they are used in <code>Buildings.BoundaryConditions</code>,
+                       <code>Buildings.HeatTransfer</code> and <code>Buildings.ThermalZones.Detailed</code>.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+    </td>
+</tr>
+
+
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+    </tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.Pipe<br/>
+                       Buildings.Fluid.FixedResistances.BaseClasses.Pipe<br/>
+                       Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
+    </td>
+    <td valign=\"top\">Renamed pressure drop from <code>res</code> to
+                       <code>preDro</code> to use the same name as in other models.
+                       This corrects
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/271\">#271</a>.
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
+                       Buildings.Fluid.HeatExchangers.WetCoilDiscretized
+    </td>
+    <td valign=\"top\">Reformulated flow splitter in the model to reduce
+                       the dimension of the coupled linear or nonlinear
+                       system of equations. With this revision, the optional
+                       control volume in the duct inlet has been removed
+                       as it is no longer needed. Therefore, the parameter
+                       <code>dl</code> has also been removed.
+                       Replaced the parameters <code>energyDynamics1</code>
+                       and  <code>energyDynamics2</code> with
+                       <code>energyDynamics</code>.
+                       Removed the parameter <code>ductConnectionDynamics</code>.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed
+    </td>
+    <td valign=\"top\">Renamed the model to <code>HeaterCooler_u</code> due to
+                       the introduction of the new model <code>HeaterCooler_T</code>.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
+                       Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab
+    </td>
+    <td valign=\"top\">Changed the models to use by default an <i>&epsilon;-NTU</i>
+                       approach for the heat transfer between the fluid and the slab
+                       rather than a finite difference scheme along the
+                       flow path.
+                       Optionally, the finite difference scheme can also be used
+                       as this is needed for some control design applications.<br/>
+                       The new <i>&epsilon;-NTU</i> formulation has shown to lead to
+                       about five times faster
+                       computation on several test cases including the models in
+                       <code>Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples</code>.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+ </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.DuctManifoldFixedResistance
+    </td>
+    <td valign=\"top\">Reformulated flow splitter in the model to reduce
+                       the dimension of the coupled linear or nonlinear
+                       system of equations. With this revision, the optional
+                       control volume in the duct inlet has been removed
+                       as it is no longer needed. Therefore, the parameters
+                       <code>dl</code> and <code>energyDynamics</code> have
+                       also been removed.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+    </td>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister
+    </td>
+    <td valign=\"top\">Replaced the parameters <code>energyDynamics1</code>
+                       and <code>energyDynamics2</code> with
+                       the new parameter <code>energyDynamics</code>.
+                       Removed the parameters <code>steadyState_1</code>
+                       and <code>steadyState_2</code> as this information
+                       is already contained in <code>energyDynamics</code>.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed
+    </td>
+    <td valign=\"top\">Renamed the model to <code>Humidifier_u</code> due to
+                       the introduction of the new model <code>HeaterCooler_T</code>
+                       and to use the same naming pattern as <code>HeaterCooler_u</code>.<br/>
+                       For Dymola, the conversion script will automatically
+                       update existing models.
+
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.Fluid.Movers
+    </td>
+    <td valign=\"top\">This package has been redesigned.
+                       The models have been renamed as follows:<br/>
+                       <code>Buildings.Fluid.Movers.FlowMachine_dp</code>
+                       is now called
+                       <code>Buildings.Fluid.Movers.FlowControlled_dp</code>.<br/>
+                       <code>Buildings.Fluid.Movers.FlowMachine_m_flow</code>
+                       is now called
+                       <code>Buildings.Fluid.Movers.FlowControlled_m_flow</code>.<br/>
+                       <code>Buildings.Fluid.Movers.FlowMachine_Nrpm</code>
+                       is now called
+                       <code>Buildings.Fluid.Movers.SpeedControlled_Nrpm</code>.<br/>
+                       <code>Buildings.Fluid.Movers.FlowMachine_y</code>
+                       is now called
+                       <code>Buildings.Fluid.Movers.SpeedControlled_y</code>.<br/><br/>
+                       In addition, the performance
+                       data of all movers are now stored in a record.
+                       These records are in
+                       <code>Buildings.Fluid.Movers.Data</code>.
+                       For most existing instances, it should be sufficient to enclose
+                       the existing performance data in a record called <code>per</code>.
+                       For example,
+                       <code><br/>
+                       Buildings.Fluid.Movers.FlowMachine_y fan(<br/>
+                       &nbsp;redeclare package Medium = Medium,<br/>
+                       &nbsp;pressure(<br/>
+                       &nbsp;&nbsp;V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,<br/>
+                       &nbsp;&nbsp;dp={2*dp_nominal,dp_nominal,0})));<br/>
+                       </code>
+                       becomes
+                       <code><br/>
+                       Buildings.Fluid.Movers.SpeedControlled_y fan(<br/>
+                       &nbsp;redeclare package Medium = Medium,<br/>
+                       &nbsp;per(<br/>
+                       &nbsp;&nbsp;pressure(<br/>
+                       &nbsp;&nbsp;&nbsp;V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,<br/>
+                       &nbsp;&nbsp;&nbsp;dp={2*dp_nominal,dp_nominal,0})));<br/>
+                       </code>
+                       <br/>
+                       See the <code>Buildings.Fluid.Movers.UsersGuide</code> for more
+                       information about these records.
+                       <br/><br/>
+                       For Dymola, the conversion script will
+                       update existing models to use the old implementations
+                       which are now in the package <code>Buildings.Obsolete.Fluid.Movers</code>.
+    </td>
+</tr>
+
+
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media
+    </td>
+<td>
+                       Renamed all media to simplify the media selection.
+                       For typical building energy simulation,
+                       <code>Buildings.Media.Air</code> and <code>Buildings.Media.Water</code>
+                       should be used.<br/><br/>
+                       The following changes were made.<br/><br/>
+                       Renamed <code>Buildings.Media.GasesPTDecoupled.MoistAirUnsaturated</code><br/>
+                       to <code>Buildings.Media.Air</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.ConstantPropertyLiquidWater</code><br/>
+                       to <code>Buildings.Media.Water</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.PerfectGases.MoistAir</code><br/>
+                       to <code>Buildings.Obsolete.Media.PerfectGases.MoistAir</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.GasesConstantDensity.MoistAirUnsaturated</code><br/>
+                       to <code>Buildings.Obsolete.Media.GasesConstantDensity.MoistAirUnsaturated</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.GasesConstantDensity.MoistAir</code><br/>
+                       to <code>Buildings.Obsolete.Media.GasesConstantDensity.MoistAir</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.GasesConstantDensity.SimpleAir</code><br/>
+                       to <code>Buildings.Obsolete.Media.GasesConstantDensity.SimpleAir</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.IdealGases.SimpleAir</code><br/>
+                       to <code>Buildings.Obsolete.Media.IdealGases.SimpleAir</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.GasesPTDecoupled.MoistAir</code><br/>
+                       to <code>Buildings.Obsolete.Media.GasesPTDecoupled.MoistAir</code>.<br/><br/>
+                       Renamed <code>Buildings.Media.GasesPTDecoupled.SimpleAir</code><br/>
+                       to <code>Buildings.Obsolete.Media.GasesPTDecoupled.SimpleAir</code>.<br/><br/>
+                       For Dymola, the conversion script will
+                       update existing models according to the above list.
+
+</td>
+</tr>
+
+
+<tr><td valign=\"top\">Buildings.Media.Water
+    </td>
+    <td valign=\"top\">Removed option to model water as a compressible medium as
+                       this option was not useful.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.ParameterConstructionWithWindow
+    </td>
+    <td valign=\"top\">Removed the keyword <code>replaceable</code> for the parameters
+                       <code>ove</code> and <code>sidFin</code>.<br/>
+                       Models that instantiate <code>Buildings.ThermalZones.Detailed.MixedAir</code> are
+                       not affected by this change.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
+    </td>
+    <td valign=\"top\">Moved the package to <code>Buildings.ThermalZones.Detailed.Validation.BESTEST</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.SimulationTime
+    </td>
+    <td valign=\"top\">Moved the block <code>Buildings.Utilities.SimulationTime</code>
+                       to <code>Buildings.Utilities.Time.ModelTime</code>.<br/>
+                       For Dymola, the conversion script will
+                       update existing models according to the above list.
+    </td>
+</tr>
+
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">Corrected error that led the total and opaque sky cover to be ten times
+                       too low if its value was obtained from the parameter or the input connector.
+                       For the standard configuration in which the sky cover is obtained from
+                       the weather data file, the model was correct. This error only affected
+                       the other two possible configurations.
+    </td>
+</tr><tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Data.Pipes
+    </td>
+    <td valign=\"top\">Corrected wrong entries for inner and outer diameter
+                       of PEX pipes.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.BaseClasses.singleUTubeResistances
+    </td>
+    <td valign=\"top\">Corrected error in function that used <code>beta</code>
+                       before it was assigned a value.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
+                       Buildings.Fluid.Storage.StratifiedEnhanced<br/>
+                       Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+    </td>
+    <td valign=\"top\">Replaced the use of <code>Medium.lambda_const</code> with
+                       <code>Medium.thermalConductivity(sta_default)</code> as
+                       <code>lambda_const</code> is not declared for all media.
+                       This avoids a translation error if certain media are used.
+    </td>
+</tr><tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+    </td>
+    <td valign=\"top\">Corrected issue
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/271\">#271</a>
+                       which led to a compilation error if the heat exchanger
+                       and the tank had different media.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
+    </td>
+    <td valign=\"top\">Corrected issue
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/304\">#304</a>
+                       that led to an error in the glass temperatures if the glass conductance
+                       is very small.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+    </td>
+    <td valign=\"top\">Added propagation of the parameter value <code>linearizeRadiation</code>
+                       to the window model. Prior to this change, the radiation
+                       was never linearized for computing the glass long-wave radiation.
+    </td>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples.X3WithRadiantFloor<br/>
+                            Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples.X3AWithRadiantFloor<br/>
+                            Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples.X3BWithRadiantFloor
+    </td>
+    <td valign=\"top\">Corrected wrong entries for inner and outer diameter
+                       of PEX pipes.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.FixedResistanceDpM
+    </td>
+    <td valign=\"top\">Corrected error in documentation of computation of <code>k</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
+    </td>
+    <td valign=\"top\">Changed type of <code>tauIR</code> from
+                       <code>Modelica.Units.SI.Emissivity</code> to
+                       <code>Modelica.Units.SI.TransmissionCoefficient</code>.
+                       This avoids a type error in OpenModelica.
+    </td>
+</tr>
+
+</table>
+
+<p>
+<b>Note:</b>
+</p>
+<p>
+With version 2.0, we start using semantic versioning as described at <a href=\"http://semver.org/\">http://semver.org/</a>.
+</p>
+</html>"));
+end Version_2_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_2_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_2_1_0.mo
new file mode 100644
index 00000000000..6180c5fe2a5
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_2_1_0.mo
@@ -0,0 +1,135 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_2_1_0 "Version 2.1.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+   <p>
+   Version 2.1.0 is fully compatible with version 2.0.0.
+   It adds the package <code>Buildings.Fluid.FMI</code> that provides containers
+   for exporting thermofluid flow components as FMUs.
+   It also updates the temperature sensor to optionally simulate heat losses,
+   and it contains bug fixes for the trace substance sensor if used without flow reversal.
+   Improvements have been made to various models to reduce the simulation time, and
+   to <code>Buildings.Examples.Tutorial.Boiler</code> to simplify the control implementation.
+   </p>
+   <!-- New libraries -->
+   <p>
+   The following <b style=\"color:blue\">new libraries</b> have been added:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+   <tr><td valign=\"top\">Buildings.Fluid.FMI
+       </td>
+       <td valign=\"top\">This package contains blocks that serve as containers for exporting
+                          models from <code>Buildings.Fluid</code> as a Functional Mockup Unit (FMU).<br/>
+                          This allows using models from <code>Buildings.Fluid</code>, add them
+                          to a block that only has input and output signals, but no acausal connectors,
+                          and then export the model as a Functional Mockup Unit.
+                          Models can be individual models or systems that are composed of various
+                          models.
+                          For more information, see the
+                          <a href=\"modelica://Buildings.Fluid.FMI.UsersGuide\">User's Guide</a>.
+       </td>
+       </tr>
+   </table>
+   <!-- New components for existing libraries -->
+
+   <!-- Backward compatible changes -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   have been <b style=\"color:blue\">improved</b> in a
+   <b style=\"color:blue\">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.Examples</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Examples.Tutorial.Boiler.System5<br/>
+                        Buildings.Examples.Tutorial.Boiler.System6<br/>
+                        Buildings.Examples.Tutorial.Boiler.System7
+       </td>
+       <td valign=\"top\">Changed control input for <code>conPIDBoi</code> and set
+                        <code>reverseAction=true</code>
+                        to address issue
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/436\">#436</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot<br/>
+                          Buildings.Fluid.DXSystems.Cooling.BaseClasses.PartialDXCoil<br/>
+                          Buildings.Fluid.HeatExchangers.HeaterCooler_u<br/>
+                          Buildings.Fluid.MassExchangers.Humidifier_u
+       </td>
+       <td valign=\"top\">Set parameter <code>prescribedHeatFlowRate=true</code>
+                          which causes a simpler energy balance to be used.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPort
+       </td>
+       <td valign=\"top\">Added option to simulate thermal loss, which is
+                        useful if the sensor is used to measure
+                        the fluid temperature in a system with on/off control
+                        for the mass flow rate.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                          Buildings.Fluid.SolarCollectors.EN12975
+       </td>
+       <td valign=\"top\">Corrected sign error in computation of heat loss
+                          that prevents the medium to exceed <code>Medium.T_min</code>
+                          or <code>Medium.T_max</code>. With the previous implementation,
+                          an assertion may be generated unnecessarily rather than
+                          the model guiding against the violation of these bounds.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume
+
+
+       </td>
+       <td valign=\"top\">Added test on <code>allowFlowReversal</code> in criteria
+                          about what energy balance implementation to use.
+                          This causes simpler models, for example when exporting
+                          <code>Buildings.Fluid.HeatExchangers.HeaterCooler_u</code>
+                          as an FMU.
+       </td>
+   </tr>
+   </table>
+   <!-- Non-backward compatible changes to existing components -->
+
+   <!-- Errors that have been fixed -->
+   <p>
+   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+   that can lead to wrong simulation results):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sensors.TraceSubstanceTwoPort
+       </td>
+       <td valign=\"top\">Corrected wrong sensor signal if <code>allowFlowReversal=false</code>.
+                          For this setting, the sensor output was for the wrong flow direction.
+                          This corrects
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/249\">issue 249</a>.
+       </td>
+   </tr>
+   </table>
+   <!-- Uncritical errors -->
+   <p>
+   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+   units are wrong or errors in documentation):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                          Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
+       </td>
+       <td valign=\"top\">Corrected documentation.
+       </td>
+   </tr>
+   </table>
+   </html>"));
+end Version_2_1_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_3_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_3_0_0.mo
new file mode 100644
index 00000000000..3c77f7199fa
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_3_0_0.mo
@@ -0,0 +1,610 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_3_0_0 "Version 3.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+   <div class=\"release-summary\">
+   <p>
+   Version 3.0.0 is a major new release.
+   </p>
+   <p>
+     The following major changes have been done:
+   <ul>
+     <li>
+       Electrochromic windows have been added. See <code>Buildings.ThermalZones.Detailed.Examples.ElectroChromicWindow</code>.
+     </li>
+     <li>
+       The models in <code>Buildings.Fluid.Movers</code> can now be configured to use
+       three different control input signals: a continuous signal (depending on the model
+       either normalized speed, speed in rpm, prescribed mass flow rate or prescribed head),
+       discrete stages of these quantities, or on/off.
+       The models also have been refactored to make their implementation clearer.
+     </li>
+     <li>
+       The new package <code>Buildings.Fluid.HeatPumps</code> has been added.
+       This package contains models for idealized heat pumps
+       whose COP changes proportional to the change in COP of a Carnot cycle,
+       with an optional correction for the part load efficiency.
+     </li>
+     <li>
+       Various models, in particular in the package <code>Buildings.Electrical</code>,
+       have been reformulated to comply with the Modelica Language Definition.
+       All models comply with the pedantic Modelica check of Dymola.
+     </li>
+   </ul>
+   </div>
+   <!-- New libraries -->
+   <p>
+   The following <b style=\"color:blue\">new libraries</b> have been added:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps
+       </td>
+       <td valign=\"top\">Library with heat pump models.
+                          This library contains models for idealized heat pumps
+                          whose COP changes proportional to the change in COP of a Carnot cycle.
+                          Optionally, a part load efficiency curve can be specified.
+                          The model <code>Buildings.Fluid.HeatPumps.Carnot_TCon</code>
+                          takes as a control input the leaving
+                          condenser fluid temperature, and the model
+                          <code>Buildings.Fluid.HeatPumps.Carnot_y</code> takes as
+                          a control signal the compressor speed.
+       </td>
+       </tr>
+   </table>
+   <!-- New components for existing libraries -->
+   <p>
+   The following <b style=\"color:blue\">new components</b> have been added
+   to <b style=\"color:blue\">existing</b> libraries:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.SolarGeometry</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.BoundaryConditions.SolarGeometry.ProjectedShadowLength
+       </td>
+       <td valign=\"top\">Block that computes the length of a shadow projected onto a horizontal plane
+                          into the direction that is perpendicular to the azimuth of a surface.
+       </td>
+       </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Adapter3to3<br/>
+                        Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Connection3to3Ground_n<br/>
+                        Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Connection3to3Ground_p
+       </td>
+       <td valign=\"top\">Adapters for unbalanced three phase systems which are required because
+                        the previous formulation used connect statements that violate the Modelica
+                        Language Definition. This change was required to enable pedantic model check and translation
+                        in Dymola 2016 FD01.
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/426\">#426</a>.
+       </td>
+       </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot_TEva
+       </td>
+       <td valign=\"top\">Chiller model whose efficiency changes with temperatures
+                          similarly to a change in Carnot efficiency. The control input signal
+                          is the evaporator leaving fluid temperature.
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/353\">IBPSA, #353</a>.
+       </td>
+       </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sensors.PPM<br/>
+                          Buildings.Fluid.Sensors.PPMTwoPort
+       </td>
+       <td valign=\"top\">Sensors that measure trace substances in parts per million.
+       </td>
+       </tr>
+   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BeamDepthInRoom
+       </td>
+       <td valign=\"top\">Block that computes the maximum distance at which
+                          a solar beam that enters the window hits the workplane.
+       </td>
+       </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.smoothInterpolation
+       </td>
+       <td valign=\"top\">Function that interpolates for vectors <code>xSup[]</code>, <code>ySup[]</code>
+                          and independent variable <code>x</code>.
+                          The interpolation is done using a cubic Hermite spline with linear extrapolation.
+       </td>
+       </tr>
+   </table>
+   <!-- Backward compatible changes -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   have been <b style=\"color:blue\">improved</b> in a
+   <b style=\"color:blue\">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>
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                          Buildings.Fluid.Actuators.Valves.ThreeWayLinear
+    </td>
+    <td valign=\"top\">Changed the default value for valve leakage
+                       parameter <code>l</code> from <code>0</code> to <code>0.0001</code>.
+                       This is the same value as is used for the two-way valves,
+                       and avoids an assertion that would be triggered if <code>l=0</code>.
+    </td>
+    </tr>
+
+    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.UTube
+       </td>
+       <td valign=\"top\">Updated code for 64 bit on Linux and Windows.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/485\">issue 485</a>.
+       </td>
+    </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
+    </td>
+    <td valign=\"top\">Reformulated model to allow translation in OpenModelica.
+                       This is for issue
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/490\">#490</a>.
+    </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
+    </td>
+    <td valign=\"top\">Changed the sign convention for <code>dTEva_nominal</code>.
+                       Now, this quantity needs to be negative.
+                       This change was done to be consistent with other models.
+                       In this version, a warning will be written if the sign
+                       is not updated, but the results will be the same.
+                       In future versions the warning will be
+                       changed to an error.<br/>
+                       The parameters <code>dTEva_nominal</code> and
+                       <code>dTCon_nominal</code> are now used
+                       to assign default values for the nominal mass flow rates.
+    </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolume<br/>
+                          Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
+    </td>
+    <td valign=\"top\">Added the parameter <code>use_C_flow</code>. If set
+                       to <code>true</code>, an input connector will be enabled that can be used
+                       to add a trace substance flow rate, such as CO2, to the volume.
+    </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
+                          Buildings.Fluid.Movers.FlowControlled_y
+    </td>
+    <td valign=\"top\">Added the parameter <code>inputType</code> which allows
+                       to set the input as an continuous input signal,
+                       to set the input as an Integer input signal that selects the stage of the mover,
+                       or to remove the input connector and use a parameter
+                       to assign the control signal.
+    </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+       </td>
+       <td valign=\"top\">Added option to set dynamics of heat exchanger material
+                        separately from the dynamics of the fluid inside the heat
+                        exchanger.
+                        This is for issue
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/434\">#434</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
+                          Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
+
+       </td>
+       <td valign=\"top\">Propagated parameter <code>allowFlowReversal</code>
+                          which can cause a simpler energy balance to be used.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortTransport
+
+       </td>
+       <td valign=\"top\">Implemented more efficient computation of <code>port_a.Xi_outflow</code>
+                          and <code>port_a.C_outflow</code> when <code>allowFlowReversal=false</code>.
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/305\">IBPSA issue 305</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp<br/>
+                        Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow
+
+       </td>
+       <td valign=\"top\">Refactored for a more efficient implementation.
+                        Removed double declaration of <code>smooth(..)</code> and <code>smoothOrder</code>
+                        and changed <code>Inline=true</code> to <code>LateInline=true</code>.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/301\">IBPSA issue 301</a>
+                        and for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/279\">IBPSA issue 279</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
+       </td>
+       <td valign=\"top\">Set <code>start</code> and <code>fixed</code>
+                          attributes in
+                          <code>u[nWri](start=_uStart, each fixed=true)</code>
+                          to avoid a warning in Dymola 2016 about unspecified initial conditions.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/422\">issue 422</a>.<br/>
+                          Set <code>start</code> and <code>fixed</code>
+                          attributes in
+                          <code>firstTrigger(start=false, fixed=true)</code>,
+                          <code>retVal(start=0, fixed=true)</code> and <code>modTimRea(fixed=false)</code>
+                          to avoid such a warning in the pedantic Modelica check in Dymola 2016.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/459\">issue 459</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD
+       </td>
+       <td valign=\"top\">Updated code for 64 bit on Linux and Windows.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/485\">issue 485</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.Math.Functions
+       </td>
+       <td valign=\"top\">Refactored <code>Buildings.Utilities.Math.Functions.inverseXRegularized</code>
+                        to make it more efficient as it is used in many steady-state energy balances.
+                          This closes
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/302\">IBPSA issue 302</a>.
+       </td>
+   </tr>
+  </table>
+   <!-- Non-backward compatible changes to existing components -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   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.BoundaryConditions</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody<br/>
+                          Buildings.BoundaryConditions.WeatherData.Bus
+     </td>
+       <td valign=\"top\">Renamed the connector from <code>radHorIR</code> to <code>HHorIR</code>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/376\">IBPSA issue 376</a>.
+                          For Dymola, the conversion script updates these connections.
+                          However, this also results in a renaming of the weather bus variable
+                          <code>weaBus.radHorIR</code> to <code>HHorIR</code>, which may
+                          require a manual update.
+       </td>
+     </tr>
+
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
+     </td>
+     <td valign=\"top\">Removed the constant <code>sensibleOnly</code> and
+                        introduced instead the parameter <code>use_mWat_flow</code>.
+                        The new parameter, if set to <code>true</code>, will enable an input connector
+                        that can be used to add water to the conservation equation.
+                        For Dymola, the conversion script updates the model for these changes.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
+     </td>
+     <td valign=\"top\">Renamed the model to  <code>Buildings.Fluid.Chillers.Carnot_y</code>
+                        due to the addition of the new model <code>Buildings.Fluid.Chillers.Carnot_TEva</code>.
+                        In addition, the following parameter names were changed:
+                        <code>use_eta_Carnot</code> was changed to <code>use_eta_Carnot_nominal</code>, and
+                        <code>etaCar</code> was changed to <code>etaCarnot_nominal</code>.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/353\">IBPSA issue 353</a>.
+                        For Dymola, the conversion script removes these parameters.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
+                          Buildings.Fluid.Movers.FlowControlled_y
+     </td>
+     <td valign=\"top\">Removed the parameters <code>use_powerCharacteristics</code>
+                        and <code>motorCooledByFluid</code> as these are already
+                        declared in the performance data record <code>per</code>.
+                        This is for issue
+                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/434\">#457</a>.
+                        For Dymola, the conversion script removes these parameters.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
+                          Buildings.Fluid.Movers.FlowControlled_y
+     </td>
+     <td valign=\"top\">Removed the public variable <code>r_N</code>.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/417\">IBPSA issue 417</a>.
+                        For Dymola, the conversion script removes
+                        assignments of <code>r_N(start)</code>.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                          Buildings.Fluid.Movers.FlowControlled_m_flow
+   </td>
+   <td valign=\"top\">Write a warning if no pressure curve is provided because
+                     the efficiency calculation can only be done correctly if a pressure curve
+                     is provided. The warning can be suppressed by providing a pressure curve, or
+                     by setting <code>nominalValuesDefineDefaultPressureCurve=true</code>.
+     </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.Data
+     </td>
+     <td valign=\"top\">Replaced the parameters
+                        <code>Buildings.Fluid.Movers.Data.FlowControlled</code>,
+                        <code>Buildings.Fluid.Movers.Data.SpeedControlled_y</code>, and
+                        <code>Buildings.Fluid.Movers.Data.SpeedControlled_Nrpm</code> by
+                        the parameter
+                        <code>Buildings.Fluid.Movers.Data.Generic</code>
+                        which is used for all four types of movers.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/417\">IBPSA issue 417</a>.
+                        This change allows to correctly compute the fan or pump power also for the models
+                        <code>Buildings.Fluid.Movers.FlowControlled_dp</code>,
+                        <code>Buildings.Fluid.Movers.FlowControlled_m_flow</code>
+                        for speeds that are different from the nominal speed, provided that the user
+                        specifies the pressure curve.
+                        For Dymola, the conversion script updates this parameter.<br/><br/>
+                        In the previous record
+                        <code>Buildings.Fluid.Movers.Data.SpeedControlled_Nrpm</code>,
+                        changed the parameter <code>N_nominal</code> to <code>speed_rpm_nominal</code>.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/396\">IBPSA issue 396</a>.
+                        For Dymola, the conversion script updates this parameter.
+     </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.PartialThreeWayResistance<br/>
+                          Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
+                          Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
+                          Buildings.Fluid.Movers.FlowControlled_y<br/>
+                          Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                          Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
+                          Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage
+     </td>
+     <td valign=\"top\">Removed parameter <code>dynamicBalance</code> that overwrote the setting
+                        of <code>energyDynamics</code> and <code>massDynamics</code>.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/411\">
+                        IBPSA, issue 411</a>.
+                        For Dymola, the conversion script updates the models.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPort
+     </td>
+     <td valign=\"top\">Renamed the protected parameters
+                        <code>port_a_exposesState</code>, <code>port_b_exposesState</code> and
+                        <code>showDesignFlowDirection</code>.
+                        This is for
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/349\">IBPSA issue 349</a>
+                        and
+                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/351\">IBPSA issue 351</a>.
+                        For Dymola, the conversion script updates models
+                        that extend from <code>Buildings.Fluid.Interfaces.PartialTwoPort</code>.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPort
+     </td>
+     <td valign=\"top\">Renamed model to <code>Buildings.Fluid.Interfaces.PartialFourPort</code> and
+                        removed the parameters
+                        <code>h_outflow_a1_start</code>,
+                        <code>h_outflow_b1_start</code>,
+                        <code>h_outflow_a2_start</code> and
+                        <code>h_outflow_b2_start</code>
+                        to make the model similar to <code>Buildings.Fluid.Interfaces.PartialTwoPort</code>.
+                        See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/299\">IBPSA issue 299</a>
+                        for a discussion.
+                        For Dymola, the conversion script updates models
+                        that extend from <code>Buildings.Fluid.Interfaces.FourPort</code>.
+     </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
+       </td>
+       <td valign=\"top\">
+                        Revised implementation of conservation equations and
+                        added default values for outlet quantities at <code>port_a</code>
+                        if <code>allowFlowReversal=false</code>.
+                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/281\">IBPSA issue 281</a>.
+                        Also, revised implementation so that equations are always consistent
+                        and do not lead to division by zero,
+                        also when connecting a <code>prescribedHeatFlowRate</code>
+                        to <code>MixingVolume</code> instances.
+                        Renamed <code>use_safeDivision</code> to <code>prescribedHeatFlowRate</code>.
+                        See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/282\">IBPSA issue 282</a>
+                        for a discussion.
+                        For users who simply instantiate existing component models, this change is backward
+                        compatible.
+                        However, developers who implement component models that extend from
+                        <code>Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation</code> may need to update
+                        the parameter <code>use_safeDivision</code> and use instead <code>prescribedHeatFlowRate</code>.
+                        See the model documentation.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+       </td>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
+                          Buildings.ThermalZones.Detailed.CFD
+       </td>
+       <td valign=\"top\">These models can now be used with electrochromic windows.
+                          This required to change the glass properties
+                          <code>tauSol</code>, <code>rhoSol_a</code> and <code>rhoSol_b</code>
+                          to be arrays. For example, to convert an existing model, use
+                          <code>tauSol={0.6}</code> instead of <code>tauSol=0.6</code>.
+                          For Dymola, the conversion script will automatically
+                          update existing models.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
+       </td>
+   <tr><td valign=\"top\">Buildings.Obsolete.Fluid.Movers<br/>
+                          Buildings.Obsolete.Media
+       </td>
+       <td valign=\"top\">Removed these packages which have models from
+                          release 2.0.0.
+       </td>
+   </tr>
+   </table>
+   <!-- Errors that have been fixed -->
+   <p>
+   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+   that can lead to wrong simulation results):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
+       </td>
+       <td valign=\"top\">Corrected wrong computation of state of leaving fluid
+                          <code>staB1</code> and <code>staB2</code>
+                          for the configuration without flow reversal.
+                          The previous implementation mistakenly used the <code>inStream</code> operator.
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/476\">
+                          issue 476</a>
+       </td>
+   </tr>
+   </table>
+   <!-- Uncritical errors -->
+   <p>
+   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+   units are wrong or errors in documentation):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Electrical.Interfaces.PartialWindTurbine
+       </td>
+       <td valign=\"top\">Reformulated test for equality of <code>Real</code> variables. This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.SingleLayer<br/>
+                          Buildings.HeatTransfer.Data.BaseClasses
+       </td>
+       <td valign=\"top\">Reformulated test for equality of <code>Real</code> variables. This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.FMI.FlowSplitter_u
+       </td>
+       <td valign=\"top\">Corrected wrong assert statement. This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/442\">issue 442</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
+       </td>
+       <td valign=\"top\">Corrected wrong assert statement for test on the efficiency function. This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/468\">issue 468</a>.
+       </td>
+   </tr>
+
+
+   <tr><td colspan=\"2\"><b>Buildings.Media</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Media.Specialized.Water.TemperatureDependentDensity
+       </td>
+       <td valign=\"top\">Removed dublicate entry of <code>smooth</code> and <code>smoothOrder</code>.
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/303\">IBPSA issue 303</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatGain
+       </td>
+       <td valign=\"top\">Reformulated test for equality of <code>Real</code> variables. This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
+       </td>
+   </tr>
+
+
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_2_regNonZeroPower<br/>
+                          Buildings.Utilities.Math.Functions.BaseClasses.der_polynomial<br/>
+                          Buildings.Utilities.Math.Functions.BaseClasses.der_regNonZeroPower
+
+       </td>
+       <td valign=\"top\">Corrected wrong derivative implementation and improved their regression tests.
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/303\">IBPSA issue 303</a>.
+
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Density_pTX
+       </td>
+       <td valign=\"top\">Corrected wrong default component name.
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.saturationPressure
+       </td>
+       <td valign=\"top\">Changed <code>smoothOrder</code> from <i>5</i> to <i>1</i> as
+                         <code>Buildings.Utilities.Math.Functions.spliceFunction</code> is only once
+                         continuously differentiable.
+                         Inlined the function.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python27</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.IO.Python27.exchange
+       </td>
+       <td valign=\"top\">Updated Python implementation to allow compiling code
+                          on 64 bit Linux. Previously, on Linux a segmentation fault
+                          occurred during run-time if 64 bit code rather than
+                          32 bit code was generated. This is now corrected.<br/>
+                          Also, Windows 64 bit binaries have been added.<br/>
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/287\">issue 287</a>.
+       </td>
+   </tr>
+
+   </table>
+   </html>"));
+end Version_3_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_4_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_4_0_0.mo
new file mode 100644
index 00000000000..8eb6672c5bd
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_4_0_0.mo
@@ -0,0 +1,889 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_4_0_0 "Version 4.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+   <div class=\"release-summary\">
+   <p>
+   Version 4.0.0 is a major new release. It is the first release
+   that is based on the <i>Modelica IBPSA Library</i>
+   (<a href=\"https://github.com/ibpsa/modelica\">https://github.com/ibpsa/modelica</a>).
+   All models simulate with Dymola 2017 FD01 and with JModelica,
+   and the results of these simulators have been cross-compared and are
+   equal within the expected tolerance.
+   </p>
+   <p>
+     The following major changes have been done:
+   <ul>
+   <li>
+   It no longer uses the <code>Modelica_StateGraph2</code>
+   library. Instead, it uses <code>Modelica.StateGraph</code> which is part
+   of the Modelica Standard Library.
+   </li>
+   <li>
+   The models in <code>Buildings.Fluid.Movers</code> have been refactored to increase
+   the numerical robustness at very low speed when the fans or pumps are switched on or off.
+   </li>
+   <li>
+   The following new packages have been added:
+   <ul>
+   <li>
+   <code>Buildings.Obsolete.DistrictHeatingCooling</code>
+   with models for district heating and cooling
+   with bi-directional flow in the distribution pipes.
+   </li>
+   <li>
+   <code>Buildings.Fluid.FMI.Adaptors</code> and
+   <code>Buildings.Fluid.FMI.ExportContainers</code>, which
+   allow export of HVAC systems and of thermal zones as
+   Functional Mockup Units.
+   </li>
+   <li>
+   <code>Buildings.Fluid.HeatExchangers.ActiveBeams</code>,
+   with active beams for cooling and heating.
+   </li>
+   <li>
+   <code>Buildings.Fluid.DXSystems.WaterCooled</code>,
+   with water-cooled direct expansion cooling coils.
+   </li>
+   <li>
+   <code>Buildings.ThermalZones.ReducedOrder</code>, with
+   reduced order models of thermal zones based on VDI 6007
+   that are suitable for district energy simulation.
+   </li>
+   </ul>
+   </li>
+   <li>
+   The package <code>Buildings.Rooms</code> has been renamed to <code>Buildings.ThermalZones.Detailed</code>.
+   This was done because of the introduction of <code>Buildings.ThermalZones.ReducedOrder</code>,
+   which is from the <code>Annex60</code> library,
+   in order for thermal zones to be in the same top-level package.<br/>
+   For Dymola, the conversion script will update models that use any model of the package
+   <code>Buildings.Rooms</code>.
+   </li>
+   <li>
+   The model <code>Buildings.Fluid.FixedResistances.FixedResistanceDpM</code> has been refactored. Now, if
+   the hydraulic diameter is not yet known, one can use the simpler model
+   <code>Buildings.Fluid.FixedResistances.PressureDrop</code>, otherwise the model
+   <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> may be used.
+   With this refactoring, also the model <code>Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM</code> has
+   been renamed to <code>Buildings.Fluid.FixedResistances.Junction</code> and
+   parameters that use the hydraulic diameter have been removed.
+   </li>
+   <li>
+   The models <code>Buildings.HeatTransfer.Conduction.SingleLayer</code>,
+   <code>Buildings.HeatTransfer.Conduction.MultiLayer</code>,
+   and <code>Buildings.HeatTransfer.Windows.Window</code> have been refactored
+   to add the option to place a state at the surface of a construction.
+   This leads in many examples that use the room model to a smaller number
+   of non-linear system of equations and a 20% to 40% faster simulation.
+   </li>
+   <li>
+   The models <code>Buildings.Fluid.HeatPumps.ReciprocatingWaterToWater</code>
+   and <code>Buildings.Fluid.HeatPumps.ScrollWaterToWater</code> have been added.
+   Parameters to these models rely on calibration with tabulated heat pump performance
+   data. Python scripts for the calibration of the heat pump models are in
+   <code>Buildings/Resources/src/fluid/heatpumps/calibration</code>.
+   This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/587\">issue 587</a>.
+   </li>
+   </ul>
+   </div>
+   <!-- New libraries -->
+   <p>
+   The following <b style=\"color:blue\">new libraries</b> have been added:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+
+   <tr><td valign=\"top\">Buildings.Obsolete.DistrictHeatingCooling
+       </td>
+       <td valign=\"top\">Package with models for district heating and cooling
+                          with bi-directional flow in the distribution pipes.
+
+       </td>
+       </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.FMI.Adaptors<br/>
+                          Buildings.Fluid.FMI.ExportContainers
+       </td>
+       <td valign=\"top\">Library with adaptors to export HVAC systems and thermal zones
+                          as a Functional Mockup Unit for Model Exchange.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.
+       </td>
+       </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.ActiveBeams
+       </td>
+       <td valign=\"top\">Package with models of active beams for space cooling and heating.
+       </td>
+       </tr>
+
+    <tr><td valign=\"top\">Buildings.Fluid.DXSystems.WaterCooled
+       </td>
+       <td valign=\"top\">Package with models of water-cooled direct expansion
+                          cooling coils with single speed, variable speed
+                          or multi-stage compressor.
+        </td>
+        </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Compressors
+       </td>
+       <td valign=\"top\">Package with models of compressors for heat pumps.
+       </td>
+       </tr>
+
+     <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder
+       </td>
+       <td valign=\"top\">Package with reduced order models of thermal zones based
+                        on VDI 6007.
+       </td>
+       </tr>
+
+   </table>
+   <!-- New components for existing libraries -->
+   <p>
+   The following <b style=\"color:blue\">new components</b> have been added
+   to <b style=\"color:blue\">existing</b> libraries:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sensors.Velocity
+       </td>
+       <td valign=\"top\">Sensor for the flow velocity.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.EvaporatorCondenser
+       </td>
+       <td valign=\"top\">Model for evaporator/condenser with refrigerant experiencing constant temperature phase change.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.ReciprocatingWaterToWater
+       </td>
+       <td valign=\"top\">Model for water to water heat pump with a reciprocating compressor.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.ScrollWaterToWater
+       </td>
+       <td valign=\"top\">Model for water to water heat pump with a scroll compressor.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows.BaseClasses</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.HeatCapacity
+       </td>
+       <td valign=\"top\">Model for adding a state on the room-facing surface of a window.
+This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
+       </td>
+   </tr>
+
+
+   <tr><td colspan=\"2\"><b>Buildings.Media</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Media.Refrigerants.R410A
+       </td>
+       <td valign=\"top\">Model for thermodynamic properties of refrigerant R410A.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Media.Specialized.Water.ConstantProperties_pT
+       </td>
+       <td valign=\"top\">Model for liquid water with constant properties at user-selected temperature.<br/>
+                          This closes
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/511\">IBPSA, #511</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.Math.IntegratorWithReset
+       </td>
+       <td valign=\"top\">Integrator with optional input that allows
+                          resetting the state if the input changes from <code>false</code>
+                          to <code>true</code>.<br/>
+                          This closes
+                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/494\">IBPSA, #494</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.Time</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime
+       </td>
+       <td valign=\"top\">Block that outputs the calendar time, time of the week, hour of the day etc.<br/>
+                          This closes
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/501\">IBPSA, #501</a>.
+       </td>
+   </tr>
+
+   </table>
+   <!-- Backward compatible changes -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   have been <b style=\"color:blue\">improved</b> in a
+   <b style=\"color:blue\">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.BoundaryConditions</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.GetHeaderElement<br/>
+                          Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath<br/>
+                          Buildings.BoundaryConditions.WeatherData.BaseClasses.getHeaderElementTMY3<br/>
+                          Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
+                          Buildings.BoundaryConditions.SolarGeometry.ProjectedShadowLength
+       </td>
+       <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>
+                          to make the model work in JModelica.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
+                          <br/>
+                          Removed the use of <code>Modelica.Utilities.Files.fullPathName</code>
+                          in <code>Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
+                          </code> which is implicitly done in <code>Modelica.Utilities.Files.loadResource.
+                          </code>
+                          <br/>
+                          Removed in
+                          <code>Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
+                          </code>the addition of <code>file://</code> to file names which do not start
+                          with <code>file://</code>, or <code>modelica://</code>.
+                          This is not required when using
+                          <code>Modelica.Utilities.Files.loadResource</code>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/539\">issue 539</a>.
+                          </td>
+       </tr>
+       <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+       </td>
+       <td valign=\"top\">Shifted the computation of the infrared irradiation such that
+                          the results in <code>Buildings.BoundaryConditions.SkyTemperature.Examples.BlackBody</code>
+                          are consistent for both option of the black-body sky temperature calculation.
+                          This closes
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/648\">IBPSA, #648</a>.
+       </td>
+       </tr>
+       <tr>
+       <td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.SkyClearness
+       </td>
+       <td valign=\"top\">Reduced tolerance for regularization if the sky clearness is near one or eight.
+                          This closes
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/521\">IBPSA, #521</a>.
+
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Controls</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID<br/>
+                          Buildings.Controls.Continuous.PIDHysteresis<br/>
+                          Buildings.Controls.Continuous.PIDHysteresisTimer<br/>
+          </td>
+          <td valign=\"top\">Added option to reset the control output when an optional Boolean input signal
+                           changes from <code>false</code> to <code>true</code>.<br/>
+                           This closes
+                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/494\">IBPSA, #494</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Electrical.DC.Storage.Examples.Battery
+       </td>
+       <td valign=\"top\">Replaced <code>Modelica_StateGraph2</code> with
+                          <code>Modelica.StateGraph</code>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/504\">issue 504</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Examples</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
+                          Buildings.Examples.VAVReheat.ClosedLoop
+
+       </td>
+       <td valign=\"top\">Added hysteresis to the economizer control to avoid many events.
+                          This change was done in
+                          <code>Buildings.Examples.VAVReheat.Controls.EconomizerTemperatureControl</code>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/502\">issue 502</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop
+
+       </td>
+       <td valign=\"top\">Set <code>filteredSpeed=false</code> in fan models to avoid a large
+                          increase in computing time when simulated between <i>t=1.60E7</i>
+                          and <i>t=1.66E7</i>.
+
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ClosedLoop
+
+       </td>
+       <td valign=\"top\">Changed chilled water supply temperature to <i>6&deg;C</i>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/509\">issue 509</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.Controls.BatteryControl<br/>
+                          Buildings.Examples.ChillerPlant.BaseClasses.Controls.WSEControl<br/>
+                          Buildings.Examples.HydronicHeating.TwoRoomsWithStorage<br/>
+                          Buildings.Examples.Tutorial.Boiler.System7
+       </td>
+       <td valign=\"top\">Replaced <code>Modelica_StateGraph2</code> with
+                          <code>Modelica.StateGraph</code>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/504\">issue 504</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.SingleLayer
+       </td>
+       <td valign=\"top\">Added option to place a state at the surface of a construction.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.MultiLayer
+       </td>
+       <td valign=\"top\">Added option to place a state at the surface of a construction.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Window
+       </td>
+       <td valign=\"top\">Added option to place a state at the surface of a construction.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BeamDepthInRoom
+       </td>
+       <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD<br/>
+                          Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
+       </td>
+       <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
+                          Buildings.ThermalZones.Detailed.CFD
+       </td>
+       <td valign=\"top\">Refactored the distribution of the diffuse solar irradiation.
+                          Previously, the model assumed that all diffuse irradiation first hits the floor before it is
+                          diffusely reflected to all other surfaces. Now, the incoming diffuse solar irradiation is distributed
+                          to all surfaces, proportional to their emissivity plus transmissivity times area.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
+       </td>
+   </tr>
+   </table>
+   <!-- Non-backward compatible changes to existing components -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   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.BoundaryConditions</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getHeaderElementTMY3
+       </td>
+       <td valign=\"top\">This function is used to read location coordinates
+                          from the TMY3 weather data file. The call to
+                          <code>Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath</code>
+                          has been removed as it calls the function
+                          <code>Modelica.Utilities.Files.loadResource</code>, whose return value needs
+                          to be known at compilation time to store the weather data in the FMU.
+                          This is not supported by JModelica.
+                          Most models should still work as this call has been added at a higher level
+                          of the model hierarchy. If models don't work, add a call to <code>loadResource</code>
+                          at the top-level.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Controls</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.Continuous.PIDHysteresis
+       </td>
+       <td valign=\"top\">Set <code>zer(final k=0)</code> and made
+                          <code>swi</code>, <code>zer</code> and
+                          <code>zer1</code> protected, as they are for
+                          <code>Buildings.Controls.Continuous.PIDHysteresis</code>.
+                          Only models that access these instances, which typically is not the case,
+                          are affected by this change.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID<br/>
+                          Buildings.Controls.Continuous.PIDHysteresis<br/>
+                          Buildings.Controls.Continuous.PIDHysteresisTimer<br/>
+          </td>
+          <td valign=\"top\">Removed the parameter <code>limitsAtInit</code> as
+                           it is not used.<br/>
+                           For Dymola, the conversion script will update models that set this parameter.<br/>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.SetPoints.Table
+       </td>
+       <td valign=\"top\">Changed protected final parameter <code>nCol</code> to <code>nRow</code>.<br/>
+                          For Dymola, the conversion script will update models that access this parameter.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/555\">issue 555</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
+                          Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
+                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
+                          Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
+                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
+                          Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                          Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
+                          Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
+                          Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
+                          Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent<br/>
+                          Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening<br/>
+                          Buildings.Fluid.Actuators.Valves.TwoWayTable
+       </td>
+       <td valign=\"top\">Renamed the parameter
+                          <code>filteredOpening</code> to
+                          <code>use_inputFilter</code>.<br/>
+                          For Dymola, the conversion script will update models that access this parameter.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/665\">IBPSA, #665</a>
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
+                          Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
+                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
+                          Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
+                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow
+       </td>
+       <td valign=\"top\">Renamed the parameters
+                          <code>use_v_nominal</code> and all area related parameters,
+                          because <code>m_flow_nominal</code> and <code>v_nominal</code>
+                          are used to compute the area.<br/>
+                          For Dymola, the conversion script will update models that access this parameter.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/544\">IBPSA, #544</a>
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot_TEva<br/>
+                          Buildings.Fluid.Chillers.Carnot_y
+       </td>
+       <td valign=\"top\">Removed the parameters
+                          <code>effInpEva</code> and
+                          <code>effInpCon</code>.
+                          Now, always the leaving water temperatures are used to compute the coefficient
+                          of performance (COP). Previously, the
+                          entering water temperature could be used, but this can give COPs that are higher than
+                          the Carnot efficiency if the temperature lift is small.
+                          For Dymola, the conversion script will update models.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/497\">IBPSA, #497</a>
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.FixedResistances</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.FixedResistanceDpM
+       </td>
+       <td valign=\"top\">Renamed
+                          <code>Buildings.Fluid.FixedResistances.FixedResistanceDpM</code> to
+                          <code>Buildings.Fluid.FixedResistances.PressureDrop</code>
+                          and removed the parameters <code>use_dh</code>, <code>dh</code> and <code>ReC</code>.
+                          For Dymola, the conversion script will update models.
+                          If a model needs to be used that allows specifying <code>dh</code> and <code>ReC</code>,
+                          then the new model
+                          <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> can be used.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM
+       </td>
+       <td valign=\"top\">Renamed
+                          <code>Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM</code> to
+                          <code>Buildings.Fluid.FixedResistances.Junction</code>
+                          and removed the parameters <code>use_dh</code>, <code>dh</code> and <code>ReC</code>.
+                          For Dymola, the conversion script will update models.
+                          If a model needs to be used that allows specifying <code>dh</code> and <code>ReC</code>,
+                          then use <code>Buildings.Fluid.FixedResistances.Junction</code> with
+                          <code>dp_nominal = 0</code> (which removes the pressure drop) and use
+                          <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> at each fluid port.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.FMI.InletAdaptor<br/>
+                          Buildings.Fluid.FMI.OutletAdaptor<br/>
+                          Buildings.Fluid.FMI.TwoPort<br/>
+                          Buildings.Fluid.FMI.TwoPortComponent
+       </td>
+       <td valign=\"top\">Renamed
+                          <code>Buildings.Fluid.FMI.InletAdaptor</code> to
+                          <code>Buildings.Fluid.FMI.Adaptors.Inlet</code>,<br/>
+                          renamed
+                          <code>Buildings.Fluid.FMI.OutletAdaptor</code> to
+                          <code>Buildings.Fluid.FMI.Adaptors.Outlet</code>,<br/>
+                          renamed
+                          <code>Buildings.Fluid.FMI.TwoPort</code> to
+                          <code>Buildings.Fluid.FMI.ExportContainers.PartialTwoPort</code>,<br/>
+                          renamed
+                          <code>Buildings.Fluid.FMI.TwoPortComponent</code> to
+                          <code>Buildings.Fluid.FMI.ExportContainers.ReplaceableTwoPort</code>.
+                          This was due to the restructuring of the <code>Buildings.Fluid.FMI</code>
+                          package for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.<br/>
+                          For Dymola, the conversion script updates these models.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">
+                          Buildings.Fluid.DXSystems.AirCooled.SingleSpeed<br/>
+                          Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
+                          Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
+                          Buildings.Fluid.DXSystems.Data
+       </td>
+       <td valign=\"top\">Renamed
+                          <code>Buildings.Fluid.DXSystems.AirCooled.SingleSpeed</code> to<br/>
+                          <code>Buildings.Fluid.DXSystems.AirCooled.SingleSpeed</code>,<br/>
+                          <code>Buildings.Fluid.DXSystems.AirCooled.VariableSpeed</code> to<br/>
+                          <code>Buildings.Fluid.DXSystems.AirCooled.VariableSpeed</code>,<br/>
+                          <code>Buildings.Fluid.DXSystems.AirCooled.MultiStage</code> to<br/>
+                          <code>Buildings.Fluid.DXSystems.AirCooled.MultiStage</code> and<br/>
+                          <code>Buildings.Fluid.DXSystems.Data</code> to<br/>
+                          <code>Buildings.Fluid.DXSystems.AirCooled.Data</code>.<br/>
+                          This was due to the addition of the new package
+                          <code>Buildings.Fluid.DXSystems.WaterCooled</code>.
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/635\">Buildings, #635</a>.<br/>
+                          For Dymola, the conversion script updates these models.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Carnot_TEva<br/>
+                          Buildings.Fluid.HeatPumps.Carnot_y
+       </td>
+       <td valign=\"top\">Removed the parameters
+                          <code>effInpEva</code> and
+                          <code>effInpCon</code>.
+                          Now, always the leaving water temperatures are used to compute the coefficient
+                          of performance (COP). Previously, the
+                          entering water temperature could be used, but this can give COPs that are higher than
+                          the Carnot efficiency if the temperature lift is small.
+                          For Dymola, the conversion script will update models.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/497\">IBPSA, #497</a>
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Boreholes
+       </td>
+       <td valign=\"top\">Moved the package <code>Buildings.Fluid.HeatExchangers.Boreholes</code> to
+                          <code>Buildings.Fluid.Geothermal.Boreholes</code>.
+                          This is for compatibility with an ongoing model development that will include
+                          a borefield model.<br/>
+                          For Dymola, the conversion script will update models that use any model of the package
+                          <code>Buildings.Fluid.HeatExchangers.Boreholes</code>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Movers
+       </td>
+       <td valign=\"top\">Removed the function
+                          <code>Buildings.Fluid.Movers.BaseClasses.Characteristics.flowApproximationAtOrigin</code>
+                          and changed the arguments of the function
+                          <code>Buildings.Fluid.Movers.BaseClasses.Characteristics.pressure</code>.<br/>
+                          This was done due to the refactoring of the fan and pump model for low speed. This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/458\">IBPSA, #458</a>.<br/>
+                          Users who simply use the existing model in <code>Buildings.Fluid.Movers</code> are not affected by
+                          this change as the function are called by a low-level implementation only.
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.
+                          Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                          Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                          Buildings.Fluid.Movers.SpeedControlled_y
+       </td>
+       <td valign=\"top\">Renamed the parameter
+                          <code>filteredSpeed</code> to
+                          <code>use_inputFilter</code>.<br/>
+                          For Dymola, the conversion script will update models that access this parameter.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/665\">IBPSA, #665</a>
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers
+       </td>
+       <td valign=\"top\">Changed the name of the function
+                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.efficiency</code>
+                          to
+                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.normalizedPower</code>.
+                          Changed the name of the record
+                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.efficiencyParameters</code>
+                          to
+                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.fan</code>,
+                          and changed the parameter of this record from
+                          <code>eta</code> to <code>r_P</code>.
+                          This change was done as the performance is for the relative power consumption, and not the fan
+                          efficiency, as the old parameter name suggests.
+                          Users who use the default parameters are not affected by this change.
+                          If the default parameters were changed, then for Dymola,
+                          the conversion script will update the model.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+       </td>
+   </tr>
+       <tr><td valign=\"top\">Buildings.HeatTransfer.BaseClasses.TransmittedRadiation<br/>
+                              Buildings.HeatTransfer.BaseClasses.WindowRadiation
+       </td>
+       <td valign=\"top\">Refactored the model to allow separate treatment for the diffuse and direct irradiation,
+                          which is needed for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
+       </td>
+    </tr>
+
+    <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction
+       </td>
+       <td valign=\"top\">Removed parameter <code>A</code> as it is already declared in
+                          <code>Buildings.HeatTransfer.Conduction.BaseClasses.PartialConductor</code>
+                          which is often used with this class.
+       </td>
+    </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed
+
+       </td>
+       <td valign=\"top\">Moved package from <code>Buildings.Rooms</code> to <code>Buildings.ThermalZones.Detailed</code>.
+                          This was done because <code>Buildings</code> has a new package
+                          <code>Buildings.ThermalZones.ReducedOrder</code> with reduced order building models.
+                          Hence, the more detailed room models should be in the same top-level package as they
+                          are also for modeling of thermal zones.<br/>
+                          For Dymola, the conversion script will update models that use any model of the package
+                          <code>Buildings.ThermalZones</code>.
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD<br/>
+                          Buildings.ThermalZones.Detailed.MixedAir<br/>
+                          Buildings.ThermalZones.Detailed.BaseClasses.CFDAirHeatMassBalance<br/>
+                          Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatMassBalance<br/>
+                          Buildings.ThermalZones.Detailed.BaseClasses.PartialAirHeatMassBalance<br/>
+                          Buildings.ThermalZones.Detailed.BaseClasses.RoomHeatMassBalance
+
+       </td>
+       <td valign=\"top\">Refactored implementation of latent heat gain for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
+                          Users who simply use <code>Buildings.MixedAir.Rooms.CFD</code> or
+                          <code>Buildings.MixedAir.Rooms.MixedAir</code> will not be affected by this change,
+                          except if they access variables related to the heat gain.
+
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.AirHeatMassBalanceMixed<br/>
+                          Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatGain
+       </td>
+       <td valign=\"top\">Removed models as these are no longer needed due after the refactoring
+                          of the room model for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
+       </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RoomHeatMassBalance<br/>
+                           Buildings.ThermalZones.Detailed.BaseClasses.SolarRadiationExchange
+       </td>
+       <td valign=\"top\">Refactored the distribution of the diffuse solar irradiation, which required replacing the
+                          input and output signals.
+                          Previously, the model assumed that all diffuse irradiation first hits the floor before it is
+                          diffusely reflected to all other surfaces. Now, the incoming diffuse solar irradiation is distributed
+                          to all surfaces, proportional to their emissivity plus transmissivity times area.<br/>
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
+" +
+ "       </td>
+    </tr>
+
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDHeatGain
+       </td>
+       <td valign=\"top\">Renamed model from <code>Buildings.ThermalZones.Detailed.BaseClasses.CFDHeatGain</code> to
+                          <code>Buildings.ThermalZones.Detailed.BaseClasses.HeatGain</code>.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
+       </td>
+   </tr>
+
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
+       </td>
+       <td valign=\"top\">Removed the parameter <code>uStart</code> as it is not required. As this is in a base
+                          class, users typically won't need to change their models
+                          unless they use this base class directly.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/579\">Buildings, #579</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+       </td>
+   </tr>
+       <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.WetBul_pTX
+       </td>
+       <td valign=\"top\">Deleted the model
+                          <code>Buildings.Utilities.Psychrometrics.WetBul_pTX</code>
+                          as the same functionality is provided by
+                          <code>Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi</code>.
+                          Users who use <code>Buildings.Utilities.Psychrometrics.WetBul_pTX</code>
+                          need to replace the model manually and reconnect the input and output ports.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/475\">IBPSA, #475</a>.
+       </td>
+    </tr>
+
+   </table>
+   <!-- Errors that have been fixed -->
+   <p>
+   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+   that can lead to wrong simulation results):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
+                          Buildings.Fluid.DXSystems.AirCooled.SingleSpeed<br/>
+                          Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
+                          Buildings.Fluid.DXSystems.AirCooled.BaseClasses.Evaporation
+       </td>
+       <td valign=\"top\">Corrected the computation of the wet bulb state in the model
+                          that computes the reevaporation of water vapor into the air stream when the coil
+                          is switched off. The results change slightly.
+                          This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/520\">issue 520</a>
+                          and integrates the change of
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/474\">IBPSA, #474</a>.
+
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+       </td>
+       <td valign=\"top\">Corrected computation of the heat exchanger location which was wrong
+                          if <code>hHex_a &lt; hHex_b</code>, e.g., the port a of the heat exchanger
+                          is below the port b.
+                          This closes
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/531\">issue 531</a>.
+       </td>
+   </tr>   <tr><td colspan=\"2\"><b>Buildings.Examples</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ClosedLoop<br/>
+                          Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
+                          Buildings.Examples.VAVReheat.Controls.Economizer
+       </td>
+       <td valign=\"top\">Corrected the economizer controller which closed
+                          the outside air when there was no freeze concern during summer.
+                          This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/511\">issue 511</a>.
+       </td>
+   </tr>
+   </table>
+   <!-- Uncritical errors -->
+   <p>
+   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+   units are wrong or errors in documentation):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Sources.Grid<br/>
+                          Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.Grid<br/>
+                          Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.Grid_N
+       </td>
+       <td valign=\"top\">Corrected sign error in documentation string of
+                          variable <code>P</code>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchanger.WetCoilCounterFlow<br/>
+                          Buildings.Fluid.HeatExchanger.WetCoilDiscretized
+       </td>
+       <td valign=\"top\">Redeclared <code>Medium2</code> to force it to be a subclass
+                          of <code>Modelica.Media.Interfaces.PartialCondensingGases</code>.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/544\">
+                          issue 544</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Storage
+       </td>
+       <td valign=\"top\">Removed medium declaration, which is not needed and inconsistent with
+                          the declaration in the base class.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/544\">
+                          issue 544</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case900<br/>
+                          Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case900
+       </td>
+       <td valign=\"top\">Added missing <code>parameter</code> keyword,
+                          which is required as the variable (for the materials) is assigned to a parameter.
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/543\">issue 543</a>.
+       </td>
+   </tr>
+   </table>
+   </html>"));
+end Version_4_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_5_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_5_0_0.mo
new file mode 100644
index 00000000000..32d4b23bc2c
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_5_0_0.mo
@@ -0,0 +1,346 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_5_0_0 "Version 5.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+   <div class=\"release-summary\">
+   <p>
+   Version 5.0.0 is a major new release that
+   contains new packages to model control sequences,
+   a package with control sequences from ASHRAE Guideline 36 and
+   a package with pre-configured models for data center chilled water plants.
+   All models simulate with Dymola 2017FD01, Dymola 2018 and with JModelica (revision 10374).
+   </p>
+   <p>
+     The following major changes have been done:
+   <ul>
+   <li>
+   The package <code>Buildings.Controls.OBC.CDL</code> has been added.
+   This package provides elementary blocks to implemented control sequences.
+   The blocks conform to the Control Description Language specification
+   published at <a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>.
+   </li>
+   <li>
+   The package <code>Buildings.Controls.OBC.ASHRAE.G36_PR1</code> has been added.
+   This package contains control sequences for variable air volume flow systems
+   according to ASHRAE Guideline 36, public review draft 1.
+   The implementation uses blocks from the above described
+   <code>Buildings.Controls.OBC.CDL</code> package, and conforms to the
+   Control Description Language specification.
+   </li>
+   <li>
+   New models for ideal heaters and sensible coolers, and ideal
+   humidifiers have been added.
+   </li>
+   <li>
+   Various models have been improved.
+   </li>
+   </ul>
+   </div>
+   <!-- New libraries -->
+   <p>
+   The following <b style=\"color:blue\">new libraries</b> have been added:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+   <tr><td valign=\"top\">Buildings.Applications.DataCenter
+       </td>
+       <td valign=\"top\">Library with component models and pre-configured
+                          system models for data centers.
+       </td>
+       </tr>
+   <tr><td valign=\"top\">Buildings.Controls.OBC
+       </td>
+       <td valign=\"top\">Library with basic control blocks and ready-to-use control sequences
+                          from the OpenBuildingControl project
+                          (<a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>).<br/>
+                          The subpackage <code>Buildings.Controls.OBC.ASHRAE</code>
+                          contains control sequences
+                          for HVAC systems as described in ASHRAE Guideline 36.<br/>
+                          The subpackage <code>Buildings.Controls.OBC.CDL</code>
+                          contains libraries with basic control blocks.
+                          These are a part of a Control Description Language (CDL)
+                          currently being developed, which is used to compose
+                          the sequences in <code>Buildings.Controls.OBC.ASHRAE</code>.
+                          The intent of this implementation is that
+                          Modelica models that are conformant with the CDL
+                          can be translated to product lines of different control vendors.
+       </td>
+       </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Humidifiers
+       </td>
+       <td valign=\"top\">Package with spray air washer, steam humidifier and a humidifer
+                          that adds a water vapor mass flow rate that is proportional to the control input.
+       </td>
+       </tr>
+   </table>
+   <!-- New components for existing libraries -->
+   <p>
+   The following <b style=\"color:blue\">new components</b> have been added
+   to <b style=\"color:blue\">existing</b> libraries:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Heater_T<br/>
+                        Buildings.Fluid.HeatExchangers.SensibleCooler_T
+       </td>
+       <td valign=\"top\">Added these new components to allow modeling a heater
+                        and a sensible-only cooler that use an input signal to
+                        ideally control their outlet temperature,
+                        with optional capacity limitation
+                        and optional first order dynamics.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.MassExchangers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Humidifiers.SprayAirWasher_X<br/>
+                          Buildings.Fluid.Humidifiers.SteamHumidifier_X
+       </td>
+       <td valign=\"top\">Added component which allows setting the outlet water vapor
+                        mass fraction using an input signal, and controlling it ideally
+                        with optional capacity limitation
+                        and optional first order dynamics.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sources.MassFlowSource_WeatherData
+       </td>
+       <td valign=\"top\">Added component which allows prescribing
+                          a mass flow rate that has thermal properties
+                          obtained from weather data.
+       </td>
+   </tr>
+   </table>
+   <!-- Backward compatible changes -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   have been <b style=\"color:blue\">improved</b> in a
+   <b style=\"color:blue\">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.Chillers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot_TEva<br/>
+                          Buildings.Fluid.Chillers.Carnot_y
+       </td>
+       <td valign=\"top\">Added approach temperature to avoid
+                          too large COPs if the temperature lift is small.<br/>
+                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/698\">IBPSA, #698</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow<br/>
+                          Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
+                          Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                          Buildings.Fluid.HeatExchangers.WetCoilDiscretized
+       </td>
+       <td valign=\"top\">Improved model so that for certain parameters (dynamic balance,
+                          or steady-state balance and no reverse flow,
+                          or <i>hA</i>-calculation that is independent of temperature),
+                          two fast state variables can be removed.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/678\">Buildings, #678</a>.
+                          <br/><br/>
+                          Added approximation of diffusion, which is needed for very small
+                          flow rates which can happen if fans are off but wind pressure
+                          entrains cold air through the HVAC system.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1038\">Buildings, #1038</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Carnot_TCon<br/>
+                          Buildings.Fluid.HeatPumps.Carnot_y
+       </td>
+       <td valign=\"top\">Added approach temperature to avoid
+                          too large COPs if the temperature lift is small.<br/>
+                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/698\">IBPSA, #698</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp
+       </td>
+       <td valign=\"top\">Added optional input signal for
+                          differential pressure measurement,
+                          which will then be tracked by the model.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPort
+       </td>
+       <td valign=\"top\">Improved optional heat loss model.<br/>
+                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/840\">IBPSA, #840</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                          Buildings.Fluid.SolarCollectors.EN12975
+       </td>
+       <td valign=\"top\">Changed models for incidence angles below 60&deg;
+                          in order to increase the accuracy near sunrise and sunset.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/785\">#785</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+       </td>
+       <td valign=\"top\">Added an optional input that allows injecting
+                          trace substances, such as CO2 release from people,
+                          to the room air.
+       </td>
+   </tr>
+   </table>
+   <!-- Non-backward compatible changes to existing components -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   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>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCooler_T
+       </td>
+       <td valign=\"top\">Renamed <code>Buildings.Fluid.HeatExchangers.HeaterCooler_T</code>
+                        to <code>Buildings.Fluid.HeatExchangers.PrescribedOutlet</code>
+                        as it now also allows to set the outlet water vapor mass fraction.<br/>
+                        For Dymola, a conversion script makes this change.<br/>
+                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">IBPSA, #763</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.MassExchangers.Humidifier_u
+       </td>
+       <td valign=\"top\">Moved model to <code>Buildings.Fluid.Humidifiers.Humidifier_u</code>.<br/>
+                          Removed parameters <code>use_T_in</code> and <code>T</code>,
+                          and removed input connector <code>T_in</code>, as these are no
+                          longer needed.<br/>
+                          For Dymola, the conversion script will remove the parameter
+                          settings.<br/>
+                          For Dymola, a conversion script makes this change.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/704\">#704</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces
+       </td>
+       <td valign=\"top\">Renamed <code>PrescribedOutletState</code> to <code>PrescribedOutlet</code>
+                        and removed <code>PrescribedOutletStateParameters</code>.<br/>
+                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">IBPSA, #763</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers
+       </td>
+       <td valign=\"top\">Removed the function
+                        <code>Buildings.Fluid.HeatExchangers.BaseClasses.appartusDewPoint</code>
+                        as it was nowhere used, and it also has no validation test.<br/>
+                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/724\">Buildings, #724</a>.
+       </td>
+   </tr>
+
+
+   </table>
+   <!-- Errors that have been fixed -->
+   <p>
+   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+   that can lead to wrong simulation results):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Airflow.Multizone.EffectiveAirLeakageArea
+       </td>
+       <td valign=\"top\">Corrected error in computation of <code>A</code> which was
+                          <code>A=CD/CDRat * L * dpRat^(0.5-m))</code> rather than
+                          <code>A=CDRat/CD * L * dpRat^(0.5-m))</code>.<br/>
+                          See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/743\">#743</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Controls</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.Continuous.OffTimer
+       </td>
+       <td valign=\"top\">Corrected implementation as the timer had the wrong
+                          if the simulation did not start at <code>time = 0</code>.
+                          After the first reset, the value was correct.<br/>
+                          See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/743\">IBPSA, #743</a>.
+       </td>
+   </tr>
+
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
+                          Buildings.Fluid.Interfaces.FourPortHeatMassExchanger
+       </td>
+       <td valign=\"top\">Corrected assignment of <code>Q_flow</code> (or <code>Q1_flow</code>
+                          and <code>Q2_flow</code>).
+                          Previously, these variables were assigned only the sensible heat flow rate,
+                          but they should include the latent heat exhange to be consistent with
+                          the variable naming, and because the cooling coils interpret these variables
+                          as if they contain the latent heat flow rate.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/704\">#704</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                          Buildings.Fluid.HeatExchangers.WetCoilDiscretized<br/>
+                          Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent
+       </td>
+       <td valign=\"top\">Added heat of condensation to coil surface heat balance
+                          and removed it from the air stream.
+                          This gives higher coil surface temperature and avoids
+                          overestimating the latent heat ratio that was
+                          observed in the previous implementation.
+                          The code change was in
+                          <code>Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent</code><br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/711\">#711</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.HADryCoil
+       </td>
+       <td valign=\"top\">Corrected coefficient for temperature-dependency correction
+                          of air-side convection coefficient.
+                          By default, the convection coefficient
+                          is assumed to be temperature-independent, in which cases this
+                          correction has no effect on the results.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/698\">#698</a>.
+       </td>
+   </tr>
+   </table>
+   <!-- Uncritical errors -->
+   <p>
+   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+   units are wrong or errors in documentation):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.MultiLayer
+       </td>
+       <td valign=\"top\">Corrected wrong result variable <code>R</code> and <code>UA</code>.
+                          These variables are only used for reporting.
+                          All other calculations are not affected by this error.
+       </td>
+   </tr>
+   </table>
+   </html>"));
+end Version_5_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_5_0_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_5_0_1.mo
new file mode 100644
index 00000000000..a5b7bb2d353
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_5_0_1.mo
@@ -0,0 +1,35 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_5_0_1 "Version 5.0.1"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+   <div class=\"release-summary\">
+   <p>
+   Version 5.0.1 corrects an error in <code>Buildings.Fluid.SolarCollectors</code>
+   that led to too small heat losses if a collector has more than one panel.
+   Also, Dymola specific annotations to load data files in a GUI have been replaced
+   for compatibility with other tools.
+   Otherwise, version 5.0.1 is identical to 5.0.0.
+   </p>
+   <p>
+   All models simulate with Dymola 2017FD01, Dymola 2018 and JModelica (revision 10374).
+   </p>
+   </div>
+   <p>
+   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+   that can lead to wrong simulation results):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                          Buildings.Fluid.SolarCollectors.EN12975
+       </td>
+       <td valign=\"top\">Corrected error in parameterization of heat loss calculation
+                          that led to too small heat losses if a collector has more than one panel.<br/>
+                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">issue 1073</a>.
+       </td>
+   </tr>
+   </table>
+   </html>"));
+end Version_5_0_1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_5_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_5_1_0.mo
new file mode 100644
index 00000000000..ef1698c66d3
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_5_1_0.mo
@@ -0,0 +1,208 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_5_1_0 "Version 5.1.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+   <div class=\"release-summary\">
+   <p>
+   Version 5.1.0 adds new libraries, new components and improves various existing components.
+   Version 5.1.0 updates the license to a 3-clause BSD license.
+   It is backward compatible with versions 5.0.0 and 5.0.1.
+   </p>
+   <p>
+   This release adds
+   a model for propylene glycol - water mixtures, a model for long pipes
+   suited for district heating and cooling simulations, a new valve model whose
+   opening characteristics can be fit to measured data, and idealized models
+   that allow to prescribe the temperature and humidity in any part of a fluid flow
+   system.
+   </p>
+   </div>
+   <!-- New libraries -->
+   <p>
+   The following <b style=\"color:blue\">new libraries</b> have been added:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+   <tr><td valign=\"top\">Buildings.Media.Antifreeze.PropyleneGlycolWater
+       </td>
+       <td valign=\"top\">Package with medium model for propylene glycol - water mixture.
+                          The concentration and the medium temperature for which the properties are evaluated
+                          can be set when instantiating the medium.
+       </td>
+       </tr>
+   </table>
+   <!-- New components for existing libraries -->
+   <p>
+   The following <b style=\"color:blue\">new components</b> have been added
+   to <b style=\"color:blue\">existing</b> libraries:
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayPolynomial
+       </td>
+       <td valign=\"top\">Two-way valve with opening characteristics
+                          specified by a polynomial.
+                          This model may be used if a valve characteristics needs to be
+                          matched to measured data.
+       </td>
+       </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipe
+       </td>
+       <td valign=\"top\">Pipe with heat loss and transport of the fluid
+                          using a plug flow model. This model is applicable for
+                          simulation of long pipes such as in district heating and cooling systems.
+       </td>
+       </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sources.PropertySource_T<br/>
+                          Buildings.Fluid.Sources.PropertySource_h
+       </td>
+       <td valign=\"top\">Model that changes the fluid properties of the medium that flows through it
+                          based on input signals. These idealized models can be used to force a certain temperature,
+                          enthalpy or humidity in a fluid flow system.
+       </td>
+       </tr>
+   </table>
+   <!-- Backward compatible changes -->
+   <p>
+   The following <b style=\"color:blue\">existing components</b>
+   have been <b style=\"color:blue\">improved</b> in a
+   <b style=\"color:blue\">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.Airflow.Multizone</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorDiscretizedOpen<br/>
+                          Buildings.Airflow.Multizone.DoorDiscretizedOperable
+       </td>
+       <td valign=\"top\">Removed term that assures non-zero flow rate in each path,
+                          reformulated flow balance to ensure that model is symmetric,
+                          and improved implementation to reduce number of calculations.<br/>
+                          This is
+                          for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/937\">IBPSA, issue 937</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialParallelElectricEIR
+       </td>
+       <td valign=\"top\">Added <code>constrainedby</code> to declaration of chiller.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1118\">issue 1118</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Supply
+   </td>
+       <td valign=\"top\">Revised implementation of fan speed control signal calculation
+                          to remove the hysteresis blocks.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1153\">issue 1153</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Line
+   </td>
+   <td valign=\"top\">Improved documentation and icon, and added a warning if the limits are used and x1 &gt; x2.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                          Buildings.Fluid.SolarCollectors.EN12975
+       </td>
+       <td valign=\"top\">Improved calculation of heat loss.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1100\">issue 1100</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Sources.Boundary_pT<br/>
+                          Buildings.Fluid.Sources.Boundary_ph<br/>
+                          Buildings.Fluid.Sources.FixedBoundary<br/>
+                          Buildings.Fluid.Sources.MassFlowSource_T<br/>
+                          Buildings.Fluid.Sources.MassFlowSource_h
+       </td>
+       <td valign=\"top\">Refactored models to allow using <code>Xi</code> rather
+                          than <code>X</code> as an input.<br/>
+                          By default, the check on the medium base properties is now removed
+                          to reduce translation and simulation time.<br/>
+                          This is for
+                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">IBPSA, issue 882</a>.
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified
+       </td>
+       <td valign=\"top\">Refactored tank to allow modeling of tanks that have multiple inlets or outlets along the height.
+                          The tank now has for each control volume a fluid port that can be connected from outside the model.<br/>
+                          This is for
+                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1182\">issue 1182</a>.
+       </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.IO</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.IO.Python27
+       </td>
+       <td valign=\"top\">Added option for a Python object
+                        to be passed from one Python function invocation to the next.
+                        This allows to build up a Python data structure (or to instantiate a Python object),
+                        and do computations on this object at each function invocation. For example,
+                        a Model Predictive Control algorithm or a machine learning algorithm,
+                        implemented in Python, could be fed with data at each time step.
+                        It could then store this data
+                        and use the current and its historical data to feed its algorithm.
+                        Based on this algorithm, it could output a control signal for use in another Modelica model.
+                        <br/>
+                        The function <code>Buildings.Utilities.IO.Python27.Functions.exchange</code> now takes
+                        two additional arguments: A class that contains a pointer to the Python interpreter
+                        (for efficiency, as this avoids initializing Python at each call), and
+                        a flag that determines whether the Python function returns an object and receives this
+                        object at the next invocation. See
+                        <code>Buildings.Utilities.IO.Python27.UsersGuide</code> and
+                        <code>Buildings.Utilities.IO.Python27.Real_Real</code> for how to use
+                        these two arguments.
+                        <br/>
+                        Models that use <code>Buildings.Utilities.IO.Python27.Real_Real</code>
+                        will still work as before. The change only affects the low-level function
+                        <code>Buildings.Utilities.IO.Python27.Functions.exchange</code>.
+       </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Utilities.IO.Python27</td>
+     <td valign=\"top\">
+                      Corrected <code>LibraryDirectory</code> annotation.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1160\">issue 1160</a>.
+     </td>
+   </tr>
+   </table>
+   <!-- Non-backward compatible changes to existing components -->
+   <!-- Errors that have been fixed -->
+   <p>
+   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+   that can lead to wrong simulation results):
+   </p>
+   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+   <tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b>
+       </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PrescribedOutlet
+       </td>
+       <td valign=\"top\">Corrected error that caused the old model do not track <code>TSet</code> and <code>X_wSet</code>
+                          simultaneously.<br/>
+                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/893\">IBPSA, issue 893</a>.
+       </td>
+   </tr>
+   </table>
+   <!-- Uncritical errors -->
+   </html>"));
+end Version_5_1_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_6_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_6_0_0.mo
new file mode 100644
index 00000000000..6218e4e11e5
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_6_0_0.mo
@@ -0,0 +1,512 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_6_0_0 "Version 6.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+    <div class=\"release-summary\">
+   <p>
+   Version 6.0.0 is a major new release that
+   contains various new packages, new models and improvements to existing models.
+   The library has been tested with Dymola 2019FD01 and with JModelica (revision 12903).
+   </p>
+   <p>
+     The following major changes have been done:
+   <ul>
+   <li>
+     Various new packages have been added, such as:
+     <ul>
+       <li>
+         A package for simulating occupancy and occupancy that resulted from IEA EBC Annex 66.
+       </li>
+       <li>
+         A package with models for geothermal borefields.
+       </li>
+       <li>
+         A package with blocks for control of shades and of outdoor lights.
+       </li>
+       <li>
+         A package with blocks that allow generating time series and scatter plots,
+         and writing these plots to one or several html files.
+       </li>
+       <li>
+         A package with blocks for unit conversion.
+       </li>
+     </ul>
+   </li>
+   <li>
+     Various new control blocks have been added to <code>Buildings.Controls.OBC.CDL</code>.
+   </li>
+   </ul>
+    </div>
+    <!-- New libraries -->
+    <p>
+    The following <b style=\"color:blue\">new libraries</b> have been added:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+    <tr><td valign=\"top\">Buildings.Controls.OBC.OutdoorLights
+        </td>
+        <td valign=\"top\">Package with outdoor lighting controllers.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.Shade
+        </td>
+        <td valign=\"top\">Package with shade controllers.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.UnitConversions
+        </td>
+        <td valign=\"top\">Package with blocks for unit conversion.
+                           Blocks in this package are meant to use when reading
+                           data from a building automation system,
+                           or writing data to a building automation system,
+                           that uses units that are different
+                           from the units used by Modelica.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Geothermal
+        </td>
+        <td valign=\"top\">Package with models for geothermal heat exchangers.
+                           This package has models for borefields with vertical boreholes,
+                           and for a single vertical borehole with a U-tube heat exchanger.
+                           The borefield models can have any geometrical configuration,
+                           and either one or two U-tube heat exchangers.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Occupants
+       </td>
+       <td valign=\"top\">Package with occupant behavior models and functions to
+                          simulate the occupancy and the interaction of occupants
+                          with air-conditioning and heating systems, windows,
+                          blinds, and lighting in residential and office buildings.
+       </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Cryptographics
+        </td>
+        <td valign=\"top\">Package with a function to compute a SHA1 encrypted string.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.IO.Files
+    </td>
+    <td valign=\"top\">Package with blocks to write CSV files, JSON files or combi time table files.
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Plotters
+       </td>
+       <td valign=\"top\">Package with blocks that allow generating
+                          time series and scatter plots, and writing these plots to
+                          one or several html files.
+                          The plots can be deactivated based on an input signal and a time
+                          delay, for example, to plot data only while the HVAC system
+                          operates for at least <i>30</i> minutes.
+       </td>
+    </tr>
+    </table>
+    <!-- New components for existing libraries -->
+    <p>
+    The following <b style=\"color:blue\">new components</b> have been added
+    to <b style=\"color:blue\">existing</b> libraries:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MultiOr
+        </td>
+        <td valign=\"top\">Block that outputs true boolean signal if and only if any element of the boolean input vector is true.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MatrixMin
+        </td>
+        <td valign=\"top\">Block that outputs vector of row- or column-wise minimum values.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MatrixMax
+        </td>
+        <td valign=\"top\">Block that outputs vector of row- or column-wise maximum values.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MatrixGain
+        </td>
+        <td valign=\"top\">Block that outputs the product of a gain matrix with the input signal vector.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.MovingMean
+        </td>
+        <td valign=\"top\">Block that outputs the discrete moving mean of a sampled input signal.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Change
+        </td>
+        <td valign=\"top\">Block that outputs whether its Integer input changed its value, and whether it increased or decreased.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.IntegerSwitch
+        </td>
+        <td valign=\"top\">Block that outputs one of two integer input signals based on a boolean input signal.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.RealExtractor
+        </td>
+        <td valign=\"top\">Block that extracts a scalar signal from a signal vector dependent on an Integer-valued input.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
+        </td>
+        <td valign=\"top\">Block that outputs sunrise and sunset time for each day.
+        </td>
+        </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers
+        </td>
+        <td valign=\"top\">Added <code>Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU</code>
+                           which computes the effectiveness of a plate heat exchanger
+                           based on design conditions and current mass flow rates.
+        </td>
+        </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Math
+        </td>
+        <td valign=\"top\">Added Bessel, exponential integral, factorial, falling factorial and binomial functions.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.X_pTphi
+        </td>
+        <td valign=\"top\">Added function to compute humidity mass fraction for given pressure, temperature
+                         and relative humidity.
+        </td>
+    </tr>
+    </table>
+    <!-- Backward compatible changes -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    have been <b style=\"color:blue\">improved</b> in a
+    <b style=\"color:blue\">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.BoundaryConditions</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+        </td>
+        <td valign=\"top\">Updated implementation to allow for weather data file that span less than a year and cross New Year,
+                         and for weather data files that span more than a year.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-ibpsa/issues/842\">IBPSA, #842</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Timer
+        </td>
+        <td valign=\"top\">Updated implementation to output accumulated time when input is <code>true</code>.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1212\">issue 1212</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TrueDelay
+        </td>
+        <td valign=\"top\">Added parameter <code>delayOnInit</code> to optionally delay the initial <code>true</code> input.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1346\">issue 1346</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1/AHUs.SingleZone.VAV.SetPoints.OutsideAirFlow
+        </td>
+        <td valign=\"top\">Made input connector for occupancy conditionally removable to avoid having to set the
+                           number of occupants as an input if there is no occupancy sensor.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1270\">issue 1270</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                           Buildings.Fluid.MixingVolumes.MixingVolume<br/>
+                           Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
+        </td>
+        <td valign=\"top\">Changed model so that the volume is no longer fixed at compilation time.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1411\">issue 1411</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Media</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Media.Air<br/>
+                           Buildings.Media.Water<br/>
+                           Buildings.Media.Antifreeze.PropyleneGlycolWater<br/>
+                           Buildings.Media.Specialized.Air.PerfectGas<br/>
+        </td>
+        <td valign=\"top\">Improved error message when temperature or mass fraction is outside the allowed range.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1045\">IBPSA, issue 1045</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python27</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.IO.Python27.Functions.exchange<br/>
+        </td>
+        <td valign=\"top\">Refactored setting the <code>PYTHONPATH</code> environment variable.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1421\">issue 1421</a>.
+    </td>
+    </table>
+    <!-- Non-backward compatible changes to existing components -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    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.Airflow.Multizone</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorDiscretizedOperable
+        </td>
+        <td valign=\"top\">Removed parameter <code>CD</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/971\">IBPSA, #971</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.EffectiveAirLeakageArea
+        </td>
+        <td valign=\"top\">Removed parameters <code>A</code>, <code>CD</code> and <code>lWet</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/932\">IBPSA, #932</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic
+        </td>
+        <td valign=\"top\">Removed parameter <code>m_flow_nominal</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/970\">IBPSA, #970</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.Orifice
+        </td>
+        <td valign=\"top\">Removed parameter <code>lWet</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/932\">IBPSA, #932</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic<br/>
+                           Buildings.Airflow.Multizone.MediumColumn<br/>
+                           Buildings.Airflow.Multizone.EffectiveAirLeakageArea<br/>
+                           Buildings.Airflow.Multizone.Orifice
+        </td>
+        <td valign=\"top\">Removed parameter <code>allowFlowReversal</code> as this is not meaningful
+                           for these models.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/877\">IBPSA, #877</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.ConvertTime
+        </td>
+        <td valign=\"top\">Added new parameters needed for weather data files that span multiple years.
+                           Models of users are not likely to be affected by this change as this model
+                           is part of the weather data file reader that implements all required changes.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/842\">IBPSA, #842</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone<br/>
+                         Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone
+        </td>
+        <td valign=\"top\">Renamed packages to
+                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV</code>
+                           and <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV</code>,
+                           and renamed various signals and parameters for consistency.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.RealExtractSignal
+        </td>
+        <td valign=\"top\">Changed block name from <code>ExtractSignal</code>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MultiMax
+        </td>
+        <td valign=\"top\">Changed output variable name from <code>yMax</code> to <code>y</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/\">issue 1252</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MultiMin
+        </td>
+        <td valign=\"top\">Changed output variable name from <code>yMin</code> to <code>y</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/\">issue 1252</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
+        </td>
+        <td valign=\"top\">Renamed model to
+                           <code>Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU</code>
+                           because the convective heat transfer coefficients are for air.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           Removed variable <code>Z</code> as it is not used.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU
+        </td>
+        <td valign=\"top\">Removed variable <code>Z</code> as it is not used.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Ground.Boreholes.BaseClasses.factorial
+        </td>
+        <td valign=\"top\">Renamed function to
+                           <code>Buildings.Utilities.Math.Functions.factorial</code>
+                           because it is also used by the new Geothermal package.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Ground.Boreholes
+        </td>
+        <td valign=\"top\">Renamed package to
+                           <code>Buildings.Fluid.Geothermal.Boreholes</code>
+                           due to the introduction of the new Geothermal package.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.MassFlowRateMultiplier
+        </td>
+        <td valign=\"top\">Renamed model to
+                           <code>Buildings.Fluid.BaseClasses.MassFlowRateMultiplier</code>
+                           because it is also used by the new Geothermal package.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Sources.FixedBoundary
+        </td>
+        <td valign=\"top\">This model is now obsolete and will be removed in future releases.
+                           The model has been renamed model to
+                           <code>Buildings.Obsolete.Fluid.Sources.FixedBoundary</code>.
+                           Use <code>Buildings.Fluid.Sources.Boundary_pT</code> instead.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Media</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Media.Refrigerants.R410A
+        </td>
+        <td valign=\"top\">Removed the function <code>pressureSatLiq_T</code> as it was not used.<br/>
+                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/995\">IBPSA, #995</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities.Reports</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Reports.Printer<br/>
+                           Buildings.Utilities.Reports.printRealArray
+        </td>
+        <td valign=\"top\">Moved <code>Buildings.Utilities.Reports.Printer</code> to
+                           <code>Buildings.Utilities.IO.Files.Printer</code> and moved
+                           <code>Buildings.Utilities.Reports.printRealArray</code> to
+                           <code>Buildings.Utilities.IO.Files.BaseClasses.printRealArray</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is due to the newly introduced package <code>Buildings.Utilities.IO.Files</code>.
+        </td>
+    </tr>
+    </table>
+    <!-- Errors that have been fixed -->
+    <p>
+    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+    that can lead to wrong simulation results):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch
+        </td>
+        <td valign=\"top\">Corrected implementation that causes wrong output at initial stage.<br/>
+                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Toggle
+        </td>
+        <td valign=\"top\">Corrected implementation that causes wrong output at initial stage.<br/>
+                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
+        </td>
+    </tr>
+
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.Data.Soil.SandStone
+        </td>
+        <td valign=\"top\">Corrected wrong thermal properties.<br/>
+                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1062\">IBPSA, #1062</a>.
+        </td>
+    </tr>
+
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Heater_T<br/>
+                           Buildings.Fluid.HeatExchangers.SensibleCooler_T
+        </td>
+        <td valign=\"top\">Corrected missing propagation of initial conditions.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1016\">IBPSA, #1016</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+        </td>
+        <td valign=\"top\">Propagated parameter <code>mSenFac</code> which
+                           increased the thermal capacity of the room air, such as
+                           to account for furniture.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1405\">issue 1405</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.FourElements
+        </td>
+        <td valign=\"top\">The RC element of the roof <code>roofRC</code>
+                           was flipped to have its <code>port_b</code> on the outside.
+                           The resistances <code>RRem</code> and <code>R</code>
+                           of the roof and floor have been switched
+                           in the documentation.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/997\">IBPSA, #997</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Uncritical errors -->
+    <p>
+    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+    units are wrong or errors in documentation):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+        </td>
+        <td valign=\"top\">Corrected wrong time in the documentation of the parameters.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1409\">issue 1409</a>.
+        </td>
+    </tr>
+    </table>
+    </html>"));
+end Version_6_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_7_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_7_0_0.mo
new file mode 100644
index 00000000000..8a85dc4fd2a
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_7_0_0.mo
@@ -0,0 +1,808 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_7_0_0 "Version 7.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+    annotation (Documentation(info="<html>
+    <div class=\"release-summary\">
+    <p>
+    Version 7.0.0 is a major release that
+    contains various new packages, new models and improvements to existing models.
+    The library has been tested with
+    Dymola 2020x and 2021,
+    JModelica (revision 14023), and
+    OPTIMICA (revision OCT-stable-r12473_JM-r14295).
+    </p>
+    <p>
+      The following major changes have been done:
+    <ul>
+    <li>
+      New packages have been added to model building controls (<code>Buildings.Controls.OBC.Utilities</code>)
+      and to support the creation of emulators that compare the performance of building control sequences in
+      the Building Optimization Performance Tests framework
+      <a href=\"https://github.com/ibpsa/project1-boptest\">BOPTEST</a>.
+    </li>
+    <li>
+      Various new control blocks have been added to <code>Buildings.Controls.OBC.CDL</code>.
+    </li>
+    <li>
+      Various new equipment models have been added, such as models of absorption chillers, CHP equipment and heat pumps.
+    </li>
+    <li>
+      The reduced order building models now also allow modeling air moisture and air contaminant balance.
+    </li>
+    <li>
+      A tutorial has been added to explain how to implement control sequences using the Control Description Language
+      that is being developed in the <a href=\"https://obc.lbl.gov\">OpenBuildingControl</a> project.
+    </li>
+    <li>
+      The icons of many components have been updated so that they visualize temperatures, flow rates
+      or control signals while the simulation is running.
+    </li>
+    <li>
+      Results of the ANSI/ASHRAE Standard 14 validation (BESTEST) are now integrated in the user's guide
+      <code>Buildings.ThermalZones.Detailed.Validation.BESTEST.UsersGuide</code>.
+    </li>
+    </ul>
+    </div>
+    <!-- New libraries -->
+    <p>
+    The following <b style=\"color:blue\">new libraries</b> have been added:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+    <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities
+        </td>
+        <td valign=\"top\">Package with utility blocks, base classes and validation
+                           models for the OpenBuildingControl (OBC) library.
+        </td>
+        </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.IO.SignalExchange
+        </td>
+        <td valign=\"top\">Package with blocks that can be used
+                           to identify and activate control signal overwrites, and
+                           to identify and read sensor signals. This package is used
+                           by the Building Optimization Performance Test software
+                           <a href=\"https://github.com/ibpsa/project1-boptest\">BOPTEST</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.IO.Python36
+        </td>
+        <td valign=\"top\">Upgraded from <code>Buildings.Utilities.IO.Python27</code>
+                           since Python2.7 has been deprecated.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue #1760</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- New components for existing libraries -->
+    <p>
+    The following <b style=\"color:blue\">new components</b> have been added
+    to <b style=\"color:blue\">existing</b> libraries:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow
+        </td>
+        <td valign=\"top\">Package of sequences for specifying the minimum outdoor airflow rate.
+                           This replaces <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutsideAirFlow</code>.
+                           The new implemented sequences separate zone level calculation from the system level calculation.
+                           It avoids vector-valued calculations.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1829\">#1829</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus
+        </td>
+        <td valign=\"top\">Block that outputs zone temperature status by comparing it with setpoint temperatures, with the maximum and
+                           minimum temperature of the group which the zone is in. This allows separating the vector-valued calculations
+                           from control sequences.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>.
+        </td>
+      </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean
+        </td>
+        <td valign=\"top\">Block that outputs the triggered discrete moving mean of an input signal.
+                           This replaces <code>Buildings.Controls.OBC.CDL.Discrete.MovingMean</code>, which
+                           has been moved to <code>Buildings.Obsolete</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1588\">#1588</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.OptimalStart
+        </td>
+        <td valign=\"top\">Block that outputs optimal start time for an HVAC system prior to the occupancy.
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1589\">#1589</a>.
+        </td>
+        </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayTable
+        </td>
+        <td valign=\"top\">Three way valves with opening characteristics based on a user-provided table.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.CHPs
+        </td>
+        <td valign=\"top\">Package with model for combined heat and power device.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Chillers.AbsorptionIndirectSteam
+        </td>
+        <td valign=\"top\">Indirect steam heated absorption chiller based on performance curves.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.CheckValve
+        </td>
+        <td valign=\"top\">Check valve that prevents backflow, except for a small leakage flow rate.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1198\">IBPSA, #1198</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.EquationFitReversible
+        </td>
+        <td valign=\"top\">Heat pump model that can be reversed between heating and cooling mode,
+                           that takes as a set point the leaving fluid temperature, and that computes
+                           its performance based on an equation fit.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples.Tutorial</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.Tutorial.CDL
+        </td>
+        <td valign=\"top\">Tutorial that explains how to implement control sequences using
+                           the <a href=\"https://obc.lbl.gov\">Control Description Language</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Backward compatible changes -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    have been <b style=\"color:blue\">improved</b> in a
+    <b style=\"color:blue\">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.BoundaryConditions.WeatherData</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+        </td>
+        <td valign=\"top\">Refactored weather data reader and changed implementation to allow exactly zero radiation rather
+                           than a small positive value.
+                           This was required to allow simulating buildings at steady-state, which is needed
+                           for some controls design.
+                           For examples in which buildings are simulated at steady-state, see
+                           <code>Buildings.ThermalZones.Detailed.Validation.MixedAirFreeResponseSteadyState</code>,
+                           <code>Buildings.Examples.VAVReheat.Validation.Guideline36SteadyState</code> and
+                           <code>Buildings.ThermalZones.ReducedOrder.Validation.RoomSteadyState</code>.<br/>
+                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1340\">IBPSA, #1340</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID
+        </td>
+        <td valign=\"top\">Removed homotopy that may be used during initialization to ensure that outputs are bounded.<br/>
+                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1221\">IBPSA, #1221</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Derivative
+        </td>
+        <td valign=\"top\">Removed parameter <code>initType</code> and <code>x_start</code>.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1887\">IBPSA, #1887</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset
+        </td>
+        <td valign=\"top\">Removed parameter <code>initType</code>.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1887\">IBPSA, #1887</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
+        </td>
+        <td valign=\"top\">Removed homotopy that may be used during initialization to ensure that outputs are bounded.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1221\">IBPSA, #1221</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime<br/>
+                           Buildings.Controls.OBC.CDL.Types.ZeroTime
+        </td>
+        <td valign=\"top\">Revised implementation such that the meaning of <code>time</code> is better explained
+                           and unix time stamps are correctly defined with respect to GMT.
+                           Added option unix time stamp GMT.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1232\">IBPSA, #1232</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime<br/>
+                           Buildings.Controls.OBC.CDL.Types.ZeroTime
+        </td>
+        <td valign=\"top\">Revised implementation such that the meaning of <code>time</code> is better explained
+                           and unix time stamps are correctly defined with respect to GMT.
+                           Added option unix time stamp GMT.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1232\">IBPSA, #1232</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch<br/>
+                         Buildings.Controls.OBC.CDL.Logical.Toggle
+        </td>
+        <td valign=\"top\">Simplified implementation, which makes them work with OpenModelica.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1823\">#1823</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Timer
+        </td>
+        <td valign=\"top\">Added a boolean input to reset the accumulated timer.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1221\">#1221</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Types.Init
+        </td>
+        <td valign=\"top\">Removed this enumeration because it is no longer used.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1887\">#1887</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1 </b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.TrimAndRespond
+        </td>
+        <td valign=\"top\">Corrected to delay the true initial device status.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1876\">#1876</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.DamperValves
+        </td>
+        <td valign=\"top\">Replaced multisum block with add blocks, replaced gain block used for normalization
+                           with division block.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1830\">#1830</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller
+        </td>
+        <td valign=\"top\">Replaced the mode and setpoint calculation block with
+                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.SetPoints.ActiveAirFlow
+        </td>
+        <td valign=\"top\">Used hysteresis to check occupancy.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1788\">#1788</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutsideAirFlow
+        </td>
+        <td valign=\"top\">Applied hysteresis for checking ventilation efficiency.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1787\">#1787</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.TrimAndRespond
+        </td>
+        <td valign=\"top\">Added assertions and corrected implementation when respond amount is negative.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1530\">#1503</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples.Tutorial</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.Tutorial.Boiler<br/>
+                           Buildings.Examples.Tutorial.SpaceCooling
+        </td>
+        <td valign=\"top\">Updated examples to use the control blocks from the Control Description Language package
+                           <code>Buildings.Controls.OBC.CDL</code>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.VAVBranch
+        </td>
+        <td valign=\"top\">Added output connector for returned damper position.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.ActuatorSignal<br/>
+                           Buildings.Fluid.Actuators.Dampers.PressureIndependent
+        </td>
+        <td valign=\"top\">Added the computation of the damper opening.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">
+                           Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve<br/>
+                           Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
+                           Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
+                           Buildings.Fluid.Actuators.Valves.TwoWayPolynomial<br/>
+                           Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent<br/>
+                           Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening<br/>
+                           Buildings.Fluid.Actuators.Valves.TwoWayTable
+        </td>
+        <td valign=\"top\">Improved implementation to guard against control input that is negative.
+                           The new implementation constrains the input to be bigger than <i>0</i>.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1233\">IBPSA, #1233</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.shaGFunction
+        </td>
+        <td valign=\"top\">Declared string as a constant due to JModelica's tigther type checking.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1230\">IBPSA, #1230</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.SingleSpeed<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.MultiStage<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.SingleSpeed<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.VariableSpeed
+        </td>
+        <td valign=\"top\">Corrected wrong <code>min</code> and <code>max</code> attribute for change in humidity.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1933\">#1933</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
+                           Buildings.Fluid.Storage.StratifiedEnhanced<br/>
+                           Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
+        </td>
+        <td valign=\"top\">Provided option to initialize the tank temperature at different values across the height of the tank.<br/>
+        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1246\">IBPSA, #1246</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector
+        </td>
+        <td valign=\"top\">In volume, set <code>prescribedHeatFlowRate=false</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1636\">#1636</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.HeatTransfer.Convection.Exterior
+        </td>
+        <td valign=\"top\">Set wind direction modifier to a constant as wind speed approaches zero.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1923\">#1923</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600<br/>
+                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
+        </td>
+        <td valign=\"top\">Changed computation of time averaged values to avoid a time event every hour.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1714\">#1714</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.TwoElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.FourElements
+        </td>
+        <td valign=\"top\">Added option to also simulate moisture balance in room air volume.
+                           This can be enabled by setting the parameter <code>use_moisture_balance = true</code>.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">IBPSA, #1209</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.IO.Files.CSVWriter<br/>
+                           Buildings.Utilities.IO.Files.CombiTimeTableWriter<br/>
+                           Buildings.Utilities.IO.Files.CombiTimeTableWriter
+        </td>
+        <td valign=\"top\">Revised to avoid overflow of string buffer in Dymola.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1219\">IBPSA, #1219</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Math.SmoothHeaviside<br/>
+                           Buildings.Utilities.Math.Functions.SmoothHeaviside
+        </td>
+        <td valign=\"top\">This function is now twice instead of only once Lipschitz continuously differentiable.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1202\">IBPSA, #1202</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime<br/>
+                           Buildings.Utilities.Time.Types.ZeroTime
+        </td>
+        <td valign=\"top\">Revised implementation such that the meaning of <code>time</code> is better explained
+                           and unix time stamps are correctly defined with respect to GMT.
+                           Added option unix time stamp GMT.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1192\">IBPSA, #1192</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Comfort.Fanger
+        </td>
+        <td valign=\"top\">Updated the model from ASHRAE 1997 to ANSI/ASHRAE 55-2017
+                           and added a validation model which compares the PMV
+                           with an implementation from the University of California at Berkeley.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1936\">#1936</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Floor<br/>
+                           Buildings.Examples.VAVReheat.ASHRAE2006<br/>
+                           Buildings.Examples.VAVReheat.Guideline36<br/>
+                           Buildings.Examples.DualFanDualDuct
+
+        </td>
+        <td valign=\"top\">Updated core zone geometry parameters related to room heat and mass balance.
+                           This change was done in
+                           <code>Buildings.Examples.VAVReheat.BaseClasses.Floor</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1719\">#1719</a>.
+       </td>
+    </tr>
+    </table>
+    <!-- Non-backward compatible changes to existing components -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    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.Airflow</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone
+        </td>
+        <td valign=\"top\">Set parameters <code>m_flow_small</code>, <code>m1_flow_small</code>
+                           and <code>m2_flow_small</code> to <code>final</code> so that they do
+                           no longer appear on the GUI. These parameters are not used by models
+                           in this package.
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1362\">IBPSA, #1362</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
+        </td>
+        <td valign=\"top\">Refactored model so that it is itself a CDL conformant composite block.
+                           This refactoring removes the no longer use parameters <code>xd_start</code> that was
+                           used to initialize the state of the derivative term. This state is now initialized
+                           based on the requested initial output <code>yd_start</code> which is a new parameter
+                           with a default of <code>0</code>.
+                           Also, removed the parameters <code>y_start</code> and <code>initType</code> because
+                           the initial output of the controller can be set by using <code>xi_start</code>
+                           and <code>yd_start</code>.
+                           This refactoring also removes the parameter <code>strict</code> that
+                           was used in the output limiter. The new implementation enforces a strict check by default.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1878\">#1878</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
+        </td>
+        <td valign=\"top\">Changed the default values for the output limiter from <code>yMin=-yMax</code> to <code>yMin=0</code>
+                           and from <code>yMax</code> being unspecified to <code>yMax=1</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1888\">#1888</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.MovingMean
+        </td>
+        <td valign=\"top\">This block became obsolete, use <code>Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean</code> instead.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SetPoints.SupplyReturnTemperatureReset
+        </td>
+        <td valign=\"top\">Changed name from <code>HotWaterTemperatureReset</code> to <code>SupplyReturnTemperatureReset</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/860\">#860</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Controller
+        </td>
+        <td valign=\"top\">Reimplemented to add new block for specifying the minimum outdoor airfow setpoint.
+                           The new block avoids vector-valued calculations.<br/>
+                           The reimplemented controller needs to work with
+                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.Zone</code> and
+                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.SumZone</code>,
+                           to calculate the zone level minimum outdoor airflow setpoints and then find the sum, the minimum and
+                           the maximum of these setpoints. See
+                           <code>Buildings.Examples.VAVReheat.Guideline36</code>.
+                           <br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1829\">#1829</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+        </td>
+        <td valign=\"top\">Reimplemented to remove the vector-valued calculations.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ModeAndSetPoints
+        </td>
+        <td valign=\"top\">Removed from the library as it can be replaced by
+                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller
+        </td>
+        <td valign=\"top\">Added cooling coil control and the controller validation model.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1265\">#1265</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Economizers.Subsequences.Enable
+        </td>
+        <td valign=\"top\">Added the option to allow fixed plus differential dry bulb temperature cutoff.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Economizers.Subsequences.Modulation
+        </td>
+        <td valign=\"top\">Added heating coil control sequences.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Supply
+        </td>
+        <td valign=\"top\">Added a switch for fan control.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ZoneState
+        </td>
+        <td valign=\"top\">Improved the implementation to avoid issues when heating and cooling controls occur at the same time.
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.SystemRequests
+        </td>
+        <td valign=\"top\">Changed the actual damper position name from <code>uDam</code> to <code>yDam_actual</code>.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller
+        </td>
+        <td valign=\"top\">Added actual VAV damper position as the input for generating system request.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.DamperValves
+        </td>
+        <td valign=\"top\">Added option to check if the VAV damper is pressure independent.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.SetPoints</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.SetPoints.SupplyReturnTemperatureReset
+        </td>
+        <td valign=\"top\">Changed name from <code>HotWaterTemperatureReset</code> to <code>SupplyReturnTemperatureReset</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/860\">#860</a>.<br/>
+                           For Dymola, a conversion script makes this change.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">
+                           Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential<br/>
+                           Buildings.Fluid.Actuators.Dampers.Exponential<br/>
+                           Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
+                           Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
+                           Buildings.Fluid.Actuators.Dampers.PressureIndependent<br/>
+                           Buildings.Fluid.Actuators.Dampers.VAVBoxExponential
+        </td>
+        <td valign=\"top\">Merged <code>VAVBoxExponential</code> into <code>Exponential</code>.<br/>
+                           <code>Exponential</code> now provides all modeling capabilities previously
+                           implemented in <code>VAVBoxExponential</code> which is no more needed and
+                           has been removed from the library.<br/>
+                           New parameters <code>dpDamper_nominal</code> and <code>dpFixed_nominal</code>
+                           have been introduced in <code>Exponential</code>, consistent with the
+                           valve models.<br/>
+                           Parameter <code>k0</code> has been replaced by a leakage coefficient.<br/>
+                           For Dymola, a conversion script makes this change. However the script will
+                           not make the <code>each</code> keyword persist in array declarations. The
+                           keyword will have to be manually reintroduced after applying the script.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1188\">IBPSA, #1188</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">
+                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.TwoElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.TwoElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.FourElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.FourElements<br/>
+                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
+                           Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.BaseClasses.PartialVDI6007<br/>
+                           Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.BaseClasses.PartialVDI6007<br/>
+                           Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007WithWindow
+
+        </td>
+        <td valign=\"top\">Renamed convection coefficient from <code>alpha*</code> to <code>hCon*</code>.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1168\">IBPSA, #1168</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Errors that have been fixed -->
+    <p>
+    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+    that can lead to wrong simulation results):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable
+        </td>
+        <td valign=\"top\">Corrected implementation so that it gives the correct periodicity
+                         of the table if the simulation starts at a negative time.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1834\">1834</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Sources.PVSimple<br/>
+                           Buildings.Electrical.AC.OnePhase.Sources.PVSimpleOriented<br/>
+                           Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimple<br/>
+                           Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimpleOriented<br/>
+                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple<br/>
+                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented<br/>
+                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented_N<br/>
+                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple_N<br/>
+                           Buildings.Electrical.Interfaces.PartialPV
+        </td>
+        <td valign=\"top\">Corrected model so that reported power <code>P</code> also includes the DCAC conversion.
+                           Note that the power added to the elecrical system was correct, but the power reported in
+                           the output connector <code>P</code> did not include this conversion factor.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1577\">1577</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
+                         Buildings.Electrical.AC.ThreePhasesBalanced.Storage.Battery
+    </td>
+      <td valign=\"top\">Corrected model and improved the documentation. The previous model extracted from
+                       the AC connector the input power <code>P</code> plus the AC/DC conversion losses, but <code>P</code>
+                       should be the power exchanged at the AC connector. Conversion losses are now only
+                       accounted for in the energy exchange at the battery.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1865\">1865</a>.
+      </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006<br/>
+                           Buildings.Examples.VAVReheat.Guideline36
+        </td>
+        <td valign=\"top\">Connected actual VAV damper position as the measured input data for
+                           defining duct static pressure setpoint.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.DuctStaticPressureSetpoint
+        </td>
+        <td valign=\"top\">Reverse action changed to <code>true</code> for the pressure set-point controller.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.RoomVAV
+        </td>
+        <td valign=\"top\">Refactored the model to implement a single maximum control logic.
+                           The previous implementation led to a maximum air flow rate in heating demand.<br/>
+                           The input connector <code>TDis</code> is removed. This is non backward compatible.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc<br/>
+                           Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.normalizedPower
+        </td>
+        <td valign=\"top\">Corrected error in computing the cooling tower fan power consumption.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1691\">1691</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings/Resources/Python-Sources/KalmanFilter.py<br/>
+                           Buildings.Utilities.IO.Python27.Examples.KalmanFilter
+        </td>
+        <td valign=\"top\">Changed the temporary file format from <code>pickle</code> to <code>json</code> as the former can trigger a
+                           segfault with JModelica simulation run in a subprocess.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1587\">Buildings, #1587</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Uncritical errors -->
+    <p>
+    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+    units are wrong or errors in documentation):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
+        </td>
+        <td valign=\"top\">Removed wrong unit declaration for gain <code>k</code>.<br/>
+                           This is for
+                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1821\">Buildings, #1821</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Sources.Boundary_pT<br/>
+                           Buildings.Fluid.Sources.Boundary_ph<br/>
+                           Buildings.Fluid.Sources.MassFlowSource_T<br/>
+                           Buildings.Fluid.Sources.MassFlowSource_h
+        </td>
+        <td valign=\"top\">Refactored handling of mass fractions which was needed to handle media such as
+                           <code>Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents</code> and
+                           <code>Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas</code>.<br/>
+                           Prior to this change, use of these media led to a translation error.<br/>
+                           This is for
+                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">IBPSA, #1205</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
+                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow
+        </td>
+        <td valign=\"top\">Corrected wrong assignment of a parameter.<br/>
+                           This is for
+                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1766\">IBPSA, #1766</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings/Resources</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings/Resources/C-Sources/cryptographicsHash.c
+        </td>
+        <td valign=\"top\">Add a <code>#ifndef</code> clause.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1278\">IBPSA, #1278</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Obsolete components -->
+    <p>
+    The following components have become <b style=\"color:blue\">obsolete</b>:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Obsolete.Controls.OBC.CDL.Discrete.MovingMean
+        </td>
+        <td valign=\"top\">The block <code>Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean</code>
+                           replaced the original <code>MovingMean</code> block.<br/>
+                           For Dymola, a conversion script makes this change.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-buildings/issues/1588\">#1588</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Obsolete.Utilities.IO.Python27
+        </td>
+        <td valign=\"top\">The package <code>Buildings.Utilities.IO.Python27</code>
+                           has been upgraded to <code>Buildings.Utilities.IO.Python36</code>.<br/>
+                           For Dymola, a conversion script moves the Python27 package to here.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-buildings/issues/1760\">issue #1760</a>.
+        </td>
+    </tr>
+    </table>
+     </html>"));
+end Version_7_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_7_0_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_7_0_1.mo
new file mode 100644
index 00000000000..420a523b2b7
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_7_0_1.mo
@@ -0,0 +1,177 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_7_0_1 "Version 7.0.1"
+    extends Modelica.Icons.ReleaseNotes;
+      annotation (Documentation(info="<html>
+    <div class=\"release-summary\">
+    <p>
+    Version 7.0.1 is a bug fix release.
+    The library has been tested with
+    Dymola 2021 and 2022,
+    JModelica (revision 14023), and
+    OPTIMICA (revision OCT-stable-r12473_JM-r14295).
+    </p>
+    <p>
+    The following changes have been done:
+    <ul>
+    <li>
+    Corrected memory violation on Windows for weather data file with long header lines.
+    </li>
+    <li>
+    Corrected various misplaced or missing <code>each</code> declarations.
+    </li>
+    <li>
+    Corrected access to protected classes.
+    </li>
+    <li>
+    Reformulated replaceable class to avoid access of components that are not in the constraining type.
+    </li>
+    <li>
+    Added missing parameter declarations for records.
+    </li>
+    </ul>
+    </div>
+    <!-- New libraries -->
+    <!-- New components for existing libraries -->
+    <!-- Backward compatible changes -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    have been <b style=\"color:blue\">improved</b> in a
+    <b style=\"color:blue\">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.Applications</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation
+        </td>
+        <td valign=\"top\">Changed boundary condition model to prescribed pressure rather than prescribed mass flow rate.
+                           Prescribing the mass flow rate caused
+                           unreasonably large pressure drop because the mass flow rate was forced through a closed valve.<br/>
+                           This is for
+                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2488\">#2488</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BalancedStepUp.YD
+        </td>
+        <td valign=\"top\">Set better start values for algebraic variables.<br/>
+                           This is for
+                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2432\">#2432</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Non-backward compatible changes to existing components -->
+    <!-- Errors that have been fixed -->
+    <!-- Uncritical errors -->
+    <p>
+    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+    units are wrong or errors in documentation):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal<br/>
+                           Buildings.Fluid.CHPs.ThermalElectricalFollowing
+        </td>
+        <td valign=\"top\">Reformulated replaceable class to avoid access of components that are not in the constraining type.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2471\">issue #2471</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield
+        </td>
+        <td valign=\"top\">Corrected placement of <code>each</code> keyword.
+                           See <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/2440\">Buildings, #2440</a>.
+                           <br/>
+                           Switched port connections for <code>masFloDiv</code>.
+                           See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/41\">IBPSA, #41</a>.
+                           <br/>
+                           Propagated flowReversal into <code>masFloDiv</code> and <code>masFloMul</code>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.Examples.Borefields<br/>
+                           Buildings.Fluid.Geothermal.Borefields.Validation.ConstantHeatInjection_100Boreholes</br>
+                           Buildings.Fluid.Geothermal.Borefields.Validation.Sandbox
+        </td>
+        <td valign=\"top\">Added missing parameter keyword for data records.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister<br/>
+                           Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent
+        </td>
+        <td valign=\"top\">Changed constant <code>simplify_mWat_flow</code> from protected to public because it is assigned by
+                           <a href=\"modelica://Buildings.Fluid.HeatExchangers.WetCoilCounterFlow\">
+                           Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</a>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2387\">#2387</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.PartialPrescribedOutlet
+        </td>
+        <td valign=\"top\">Removed duplicate declaration of <code>m_flow_nominal</code> which is already
+                           declared in the base class.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.Examples.MultiStage<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Examples.PerformanceCurves.Curve_I<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Examples.PerformanceCurves.Curve_II<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Examples.PerformanceCurves.Curve_III<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Examples.SingleSpeed<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Examples.SpaceCooling<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Examples.VariableSpeed<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Validation.SingleSpeedEnergyPlus<br/>
+                           Buildings.Fluid.DXSystems.AirCooled.Validation.SingleSpeedPLREnergyPlus<br/>
+                           Buildings.Fluid.DXSystems.Cooling.BaseClasses.Examples.WetCoil<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.Examples.MultiStage<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.Examples.SingleSpeed<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.Examples.VariableSpeed<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.Validation.VariableSpeedEnergyPlus<br/>
+                           Buildings.Fluid.DXSystems.WaterCooled.Validation.VariableSpeedEnergyPlusPartLoad<br/>
+        </td>
+        <td valign=\"top\">Corrected placement of <code>each</code> keyword.<br/>
+                           See <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/2440\">Buildings, PR #2440</a>.<br/>
+                           Added missing parameter declaration for data record.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow
+        </td>
+        <td valign=\"top\">Removed <code>final</code> declaration in redeclaration.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2392\">#2392</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PrescribedOutlet
+        </td>
+        <td valign=\"top\">Removed duplicate declaration of <code>m_flow_nominal</code> which is already
+                           declared in the base class.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Sources.BaseClasses.PartialSource<br/>
+                           Buildings.Fluid.Storage.BaseClasses.IndirectTankHeatExchanger
+        </td>
+        <td valign=\"top\">Corrected misplaced <code>each</code> and added missing instance comment.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1462\">IBPSA, #1462</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3
+        </td>
+        <td valign=\"top\">Corrected memory access violation on Windows for files with long header.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">IBPSA, #1432</a>.
+        </td>
+     </tr>
+    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3<br/>
+                           Buildings.Utilities.Cryptographics.sha
+        </td>
+        <td valign=\"top\">Corrected memory leak in C function.
+        </td>
+     </tr>
+     <tr><td valign=\"top\">Buildings.Utilities.IO.BCVTB.BaseClasses.FluidInterface
+        </td>
+        <td valign=\"top\">Corrected missing <code>each</code> keyword.
+        </td>
+     </tr>
+    </table>
+    <!-- Obsolete components -->
+     </html>"));
+end Version_7_0_1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_7_0_2.mo b/Buildings/UsersGuide/ReleaseNotes/Version_7_0_2.mo
new file mode 100644
index 00000000000..98c5561e6de
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_7_0_2.mo
@@ -0,0 +1,191 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_7_0_2 "Version 7.0.2"
+    extends Modelica.Icons.ReleaseNotes;
+      annotation (Documentation(info="<html>
+    <div class=\"release-summary\">
+    <p>
+    Version 7.0.2 is a bug fix release.
+    The library has been tested with Dymola 2022, JModelica (revision 14023),
+    OpenModelica 1.19.0-dev (449+g4f16e6af22)
+    and OPTIMICA (revision OCT-stable-r19089_JM-r14295).
+    </p>
+    <p>
+    The following changes have been done:
+    <ul>
+    <li>
+    Improved models to comply with Modelica Language Standard. Now all models translate with OpenModelica.
+    </li>
+    <li>
+    Corrected chiller models for situation where condenser is air cooled.
+    </li>
+    <li>
+    Corrected occupancy models for simulations that do not start at time equal to zero.
+    </li>
+    <li>
+    Implemtend various other improvements.
+    </li>
+    </ul>
+    </div>
+    <!-- New libraries -->
+    <!-- New components for existing libraries -->
+    <p>
+    The following <b style=\"color:blue\">new components</b> have been added
+    to <b style=\"color:blue\">existing</b> libraries:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_York_YCAL0033EE_101kW_3_1COP_AirCooled
+        </td>
+        <td valign=\"top\">Data for air cooled chiller. <br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">Buildings, issue #2770</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Backward compatible changes -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    have been <b style=\"color:blue\">improved</b> in a
+    <b style=\"color:blue\">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.Controls.Continuous</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.Continuous.SignalRanker
+        </td>
+        <td valign=\"top\">Changed implementation to use sort function from Modelica Standard Library,
+                           and updated its example to avoid simultaneous state and time events.<br/>
+                           This is for
+                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples.ChillerPlant</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
+        </td>
+        <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, issue #2761</a>.<br/>
+                           Changed initialization from steady state initial to fixed initial for some components.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
+        </td>
+        <td valign=\"top\">Improved model to guard against approximation errors of event handling.
+                           With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
+                           all simulate with OpenModelica.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buildings, issue #2713</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
+        </td>
+        <td valign=\"top\">Reimplemented function to avoid a potential overflow caused by the <code>cosh</code> function.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Non-backward compatible changes to existing components -->
+    <!-- Errors that have been fixed -->
+    <p>
+    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+    that can lead to wrong simulation results):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\"> Buildings.Fluid.Chillers.BaseClasses.PartialElectric
+        </td>
+        <td valign=\"top\">Corrected calculation of entering condenser temperature
+                           when using a moist air media model.
+                           This is important for modeling air-cooled chillers using the model
+                           <code>Buildings.Fluid.Chillers.ElectricEIR</code>.
+                           <br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">Buildings, issue #2770</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Occupants</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Occupants.Office.Occupancy.Wang2005Occupancy
+        </td>
+        <td valign=\"top\">Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
+                           To improve efficiency, this reformulation also changes the event triggering function so that
+                           it leads to time events rather than state events.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2590\">Buildings, #2590</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Uncritical errors -->
+    <p>
+    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+    units are wrong or errors in documentation):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOperable
+        </td>
+        <td valign=\"top\">Removed duplicate declaration of <code>VABp_flow</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1496\">Buildings, issue #1496</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
+                           Buildings.Electrical.DC.Storage.BaseClasses.Charge<br/>
+                           Buildings.Electrical.DC.Storage.Battery
+        </td>
+        <td valign=\"top\">Corrected unit string.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
+        </td>
+    </tr>
+    <tr>
+      <td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
+      </td>
+    </tr>
+    <tr>
+      <td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
+      </td>
+      <td valign=\"top\">Corrected weather data bus connection which was structurally incorrect
+                         and did not parse in OpenModelica.<br/>
+                         This is for
+                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
+       </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RadiationTemperature
+        </td>
+        <td valign=\"top\">Corrected annotation.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2550\">Buildings, issue #2550</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
+                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
+                           Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3B.Electrical</br/>
+                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
+        </td>
+        <td valign=\"top\">Added missing parameter declaration.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2556\">Buildings, issue #2556</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Obsolete components -->
+     </html>"));
+end Version_7_0_2;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_8_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_8_0_0.mo
new file mode 100644
index 00000000000..d8235d32ebb
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_8_0_0.mo
@@ -0,0 +1,747 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_8_0_0 "Version 8.0.0"
+  extends Modelica.Icons.ReleaseNotes;
+      annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 8.0.0 is a major release that contains the first version of the Spawn of EnergyPlus coupling.
+The library has been tested with Dymola 2021, JModelica (revision 14023),
+and OPTIMICA (revision OCT-stable-r19089_JM-r14295).
+</p>
+<p>
+The following major changes have been done:
+</p>
+<ul>
+<li>
+The package <code>Buildings.ThermalZones.EnergyPlus</code>
+contains the first version of the Spawn of EnergyPlus coupling that is being developed
+at <a href=\"https://lbl-srg.github.io/soep\">https://lbl-srg.github.io/soep</a>.
+The Spawn coupling allows to model HVAC and controls in Modelica, and graphically connect to
+EnergyPlus models for thermal zones, schedules, EMS actuators and output variables.
+This allows for example to model HVAC systems, HVAC controls and controls for active facade systems in Modelica,
+and use the EnergyPlus envelope model to simulate heat transfer through the building envelope, including the
+heat and light transmission through the windows for the current control signal of the active shade.
+</li>
+<li>
+The package
+<code>Buildings.DHC</code> contains models for district heating and cooling systems
+that are being developed for the URBANopt District Energy System software.
+</li>
+<li>
+The new media <code>Buildings.Media.Antifreeze.PropyleneGlycolWater</code> allows modeling
+of propylene-glycol water mixtures.
+</li>
+<li>
+A new cooling coil model <code>Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU</code>
+has been added. This model is applicable for fully-dry, partially-wet, and fully-wet regimes.
+In contrast to <code>Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</code> and
+to <code>Buildings.Fluid.HeatExchangers.WetCoilDiscretized</code>,
+this model uses the epsilon-NTU relationship rather than a spatial discretization of the coil.
+This leads to fewer state variables and generally to a faster simulation.
+</li>
+<li>
+New simplified door models for bi-directional air exchange between thermal zones are
+implemented in <code>Buildings.Airflow.Multizone</code>.
+</li>
+<li>
+Various other models have been improved or added, in particular for modeling of
+control sequences using the Control Description Language that has been developed
+in the OpenBuildingControl project at <a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>.
+</li>
+</ul>
+</div>
+<p>
+For more details, please see the release notes below.
+</p>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.Validation.BESTEST
+    </td>
+    <td valign=\"top\">Packages with validation models for the weather data BESTEST.<br/>
+                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1314\">IBPSA, issue 1314</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC
+    </td>
+    <td valign=\"top\">Packages for modeling district heating
+                       and cooling systems.<br/>
+                       These packages contain components supporting the integration within
+                       the URBANopt SDK. The development is in progress.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Antifreeze.PropyleneGlycolWater
+    </td>
+    <td valign=\"top\">Package with medium model for propylene glycol water mixtures.
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1410\">IBPSA, issue 1410</a>.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus
+    </td>
+    <td valign=\"top\">Package for Spawn of EnergyPlus that couples Modelica directly
+                     to the EnergyPlus envelope model.<br/>
+                     The models in this package allow simulating the envelope heat transfer
+                     of one or several buildings in EnergyPlus, and simulating HVAC and controls
+                     in Modelica. EnergyPlus objects are represented graphically as any other Modelica
+                     models, and the coupling and co-simulation is done automatically based on these models.
+    </td>
+</tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOpen<br/>
+                       Buildings.Airflow.Multizone.DoorOperable
+    </td>
+    <td valign=\"top\">Simplified model for large openings with bi-directional, buoyancy-induced air flow, such as open doors.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1353\">IBPSA, issue 1353</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.GroupStatus
+    </td>
+    <td valign=\"top\">Find minimum and maximum values regarding the status of zones in one group. This is needed
+                       for specifying the group operating mode according to ASHRAE Guideline 36, May 2020 version.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
+    </td>
+    <td valign=\"top\">Moved from Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints,
+                       reimplemented to use the operating mode specified according to ASHRAE G36 official release and changed
+                       the heating and cooling demand limit level to be inputs.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.PID
+    </td>
+    <td valign=\"top\">New implementation of the PID controller.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\"># 2056</a> and
+                       for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\"># 2182</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.PIDWithReset
+    </td>
+    <td valign=\"top\">New implementation of the PID controller with output reset based on a boolean trigger.
+                       This implementation allows to reset the output of the controller
+                       to a parameter value. (Resetting it to an input was never used and is now removed for simplicity.)<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\"># 2056</a> and
+                       for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\"># 2182</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TimerAccumulating
+    </td>
+    <td valign=\"top\">New timer that accumulates time. The output will be reset to zero when the reset input
+                       becomes <code>true</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2101\"># 2101</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Sources.Pulse
+    </td>
+    <td valign=\"top\"><code>Integer</code> pulse source signal.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\"># 2125</a>
+                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\"># 2282</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable
+    </td>
+    <td valign=\"top\">Time table for <code>Integer</code> outputs.<br/>
+                       Each output is held constant between two consecutive entries in each column of the <code>table</code> parameters.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\"># 2125</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable
+    </td>
+    <td valign=\"top\">Time table for <code>Boolean</code> outputs.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\"># 2125</a>.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.SupplyAirTemperature
+    </td>
+    <td valign=\"top\">Control block for tracking the supply air temperature set point.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\"># 2024</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.SupplyAirTemperatureSetpoint
+    </td>
+    <td valign=\"top\">Computation of the supply air temperature set point based on the operation mode.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\"># 2024</a>.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayButterfly
+    </td>
+    <td valign=\"top\">Two way valve with the flow characteristic of a butterfly valve.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/975\">IBPSA, issue 975</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU
+    </td>
+    <td valign=\"top\">Cooling coil model applicable for fully-dry, partially-wet, and fully-wet regimes.
+                       In contrast to <code>Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</code> and
+                       to <code>Buildings.Fluid.HeatExchangers.WetCoilDiscretized</code>,
+                       this model uses the epsilon-NTU relationship rather than a spatial discretization of the coil.
+                       This leads to fewer state variables and generally to a faster simulation.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/622\"># 622</a>.</td>
+</tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Air</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36
+    </td>
+    <td valign=\"top\">Updated AHU controller which applies the sequence of specifying operating mode
+                       according to G36 official release.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller
+    </td>
+    <td valign=\"top\">Changed the default heating maximum airflow setpoint to 30% of the zone nominal airflow.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2172\"># 2172</a>.
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MovingMean<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.PID<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.PIDWithReset<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.SlewRateLimiter<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Sources.Sin<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.DayType<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.FirstOrderHold<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.Sampler<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.UnitDelay<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Sources.Pulse<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Timer<br/>
+                       Buildings.Controls.OBC.CDL.Logical.TimerAccumulating<br/>
+                       Buildings.Controls.OBC.CDL.Logical.TriggeredTrapezoid<br/>
+                       Buildings.Controls.OBC.CDL.Logical.TrueDelay<br/>
+                       Buildings.Controls.OBC.CDL.Logical.TrueFalseHold<br/>
+                       Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset<br/>
+                       Buildings.Controls.OBC.CDL.Psychrometrics.DewPoint_TDryBulPhi<br/>
+                       Buildings.Controls.OBC.CDL.Psychrometrics.SpecificEnthalpy_TDryBulPhi<br/>
+                       Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi<br/>
+                       Buildings.Controls.OBC.Utilities.SetPoints.SupplyReturnTemperatureReset<br/>
+                       Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
+
+    </td>
+    <td valign=\"top\">Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2243\">issue 2243</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Greater<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Less<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold
+    </td>
+    <td valign=\"top\">Added option to specify a hysteresis, which by default is set to <i>0</i>.
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.OptimalStart
+
+    </td>
+    <td valign=\"top\">Refactored sampling of history of temperature slope to only sample when control error requires optimal start up.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2345\">#2345</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
+    </td>
+    <td valign=\"top\">Changed <code>dpVal_nominal</code> to 6 kPa.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2378\">issue 2378</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Floor
+    </td>
+    <td valign=\"top\">Refactored model to extend from the newly added <code>Buildings.Examples.VAVReheat.BaseClasses.PartialFloor</code> model.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1502\">issue 1502</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
+    <td valign=\"top\">Declared the rooms in a new model <code>Buildings.Examples.VAVReheat.BaseClasses.Floor</code>
+                       to allow use of the model with the Modelica or the Spawn envelope model.<br/>
+<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
+                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone<br/>
+                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.TwoFloor_TwoZone<br/>
+                       Buildings.Examples.VAVReheat.ASHRAE2006<br/>
+                       Buildings.Examples.VAVReheat.Guideline36
+    </td>
+    <td valign=\"top\">Adapted the model to the updated control of supply air temperature.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\">issue 2024</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Guideline36
+    </td>
+    <td valign=\"top\">Upgraded sequence of specifying operating mode according to G36 official release.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1893</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Guideline36
+    </td>
+    <td valign=\"top\">Change component name <code>yOutDam</code> to <code>yExhDam</code>
+                       and update documentation graphic to include relief damper.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2399\">#2399</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006
+    </td>
+    <td valign=\"top\">Update documentation graphic to include relief damper.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2399\">#2399</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipe
+    </td>
+    <td valign=\"top\">Improved calculation of time constant to avoid negative values in some special cases.<br/>
+                     This is for
+                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1427\">IBPSA, issue 1427</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU<br/>
+                           Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU<br/>
+                           Buildings.Fluid.HeatExchangers.PartialEffectivenessNTU
+    </td>
+    <td valign=\"top\">Added a warning for when <code>Q_flow_nominal</code> is specified with the wrong sign.
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs<br/>
+                           Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions.AverageResistance
+    </td>
+    <td valign=\"top\">Corrected inequality test on <code>alpha</code>,
+                       and changed print statement to an assertion with assertion level set to warning.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2009\">issue 2009</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU<br/>
+                           Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU<br/>
+                           Buildings.Fluid.HeatExchangers.PartialEffectivenessNTU
+    </td>
+    <td valign=\"top\">Added a warning for when <code>Q_flow_nominal</code> is specified with the wrong sign.
+    </td>
+    </tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs<br/>
+                       Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions.AverageResistance
+    </td>
+    <td valign=\"top\">Corrected inequality test on <code>alpha</code>,
+                       and changed print statement to an assertion with assertion level set to warning.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2009\">issue 2009</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.EnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.EntropyFlowRate<br/>
+                       Buildings.Fluid.Sensors.LatentEnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
+                       Buildings.Fluid.Sensors.VolumeFlowRate
+    </td>
+    <td valign=\"top\">Changed parameter values to use as default a steady-state sensor signal.<br/>
+                     This is for
+                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1406\">IBPSA, issue 1406</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Refrigerants.R410A
+    </td>
+    <td valign=\"top\">Improved implementation, which now works with OpenModelica.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1414\">IBPSA, issue 1414</a>.
+    </td>
+</tr>
+
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Cryptographics.sha
+    </td>
+    <td valign=\"top\">Corrected memory leak.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Air</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV
+    </td>
+    <td valign=\"top\">Updated parameters of the two HVAC controllers such as PI gains, damper positions,
+                       and supply air temperature limits to make example models comparable.
+                       Added CO2 monitoring.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1608</a>.
+</tr>
+<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizerController
+    </td>
+    <td valign=\"top\">Moved and renamed to
+                       <code>Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerChillerDXHeatingEconomizer</code>.
+                       Also a bug fix was implemented that enables the fan when cooling needed during unoccupied hours.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2265\">issue 2265</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID<br/>
+                       Buildings.Controls.Continuous.PIDHysteresis<br/>
+                       Buildings.Controls.Continuous.PIDHysteresisTimer
+    </td>
+    <td valign=\"top\">Corrected wrong convention of reverse and direct action.
+                       The previous parameter <code>reverseAction</code> with a default of <code>false</code>
+                       has been removed, and
+                       a new parameter <code>reverseActing</code> with a default of <code>true</code>
+                       has been added. This was done because the previous implementation wrongly interpreted reverse action
+                       as the control output changing in reverse to the change in control error, but the
+                       industry convention is that reverse action means that the control output
+                       changes in reverse to the measurement signal.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">IBPSA, #1365</a>.<br/>
+                       For Dymola, a conversion script makes this change.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulation
+    </td>
+    <td valign=\"top\">Removed parameter <code>samplePeriod</code> and removed delay on actuator signal
+                       to avoid a large delay in this feedback loop.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2454\">issue 2454</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller
+    </td>
+    <td valign=\"top\">Updated the block of specifying operating mode and setpoints.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1893</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    </td>
+    <td valign=\"top\">Upgraded the sequence according to ASHRAE Guideline 36, May 2020 version.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1893</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Continuous</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.ChangeSign<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold
+    </td>
+    <td valign=\"top\">Moved blocks to <code>Obsolete</code> package because they can be implemented with other blocks
+                       and have only rarely been used.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2134\">issue 2134</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
+    </td>
+    <td valign=\"top\">Corrected wrong convention of reverse and direct action.
+                       The previous parameter <code>reverseAction</code> with a default of <code>false</code>
+                       has been removed, and
+                       a new parameter <code>reverseActing</code> with a default of <code>true</code>
+                       has been added. This was done because the previous implementation wrongly interpreted reverse action
+                       as the control output changing in reverse to the change in control error, but the
+                       industry convention is that reverse action means that the control output
+                       changes in reverse to the measurement signal.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">IBPSA, #1365</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
+    </td>
+    <td valign=\"top\">Moved model to <code>Building.Obsolete.Controls.OBC.CDL.Continuous</code>.<br/>
+                       Instead of this model, use the new model <code>Buildings.Controls.Continuous.PID</code> or
+                       <code>Buildings.Controls.Continuous.PIDWithReset</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.GreaterEqual<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.LessEqual
+    </td>
+    <td valign=\"top\">Moved blocks to obsolete package. Instead of these blocks, use the ones that
+                       do not contain the word <code>Equal</code>
+                       in their name. This was done because for real-valued, measured quantities, there is
+                       no reason to distinguish between weak and strict inequality
+                       (due to sensor noise, or within a simulation, due to solver noise or rounding errors).<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">#2076</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests
+    </td>
+    <td valign=\"top\">Renamed parameter <code>threshold</code> to <code>t</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">#2076</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests
+    </td>
+    <td valign=\"top\">Moved block to obsolete package because this block is not needed,
+                       and it would need to be refactored to add hysteresis.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2124\">#2124</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse
+    </td>
+    <td valign=\"top\">Removed <code>startTime</code> parameter. Introduced <code>shift</code> parameter.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">issue 2170</a>
+                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\">issue 2282</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse
+    </td>
+    <td valign=\"top\">Removed parameter <code>nperiod</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">issue 2170</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Logical</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Toggle
+    </td>
+    <td valign=\"top\">Removed the parameter <code>pre_y_start</code>, and made the initial output to be equal to
+                       latch or toggle input when the clear input is <code>false</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2177\">#2177</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Timer
+    </td>
+    <td valign=\"top\">Removed <code>reset</code> boolean input and added boolean output <code>passed</code>
+                       to show if the time becomes greater than threshold time.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2101\">#2101</a>.
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Sources.Pulse
+    </td>
+    <td valign=\"top\">Removed <code>startTime</code> parameter. Introduced <code>shift</code> parameter.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">issue 2170</a>
+                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\">issue 2282</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Integers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Integers.LessEqualThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Integers.GreaterThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Integers.LessThreshold
+    </td>
+    <td valign=\"top\">Renamed parameter <code>threshold</code> to <code>t</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">#2076</a>.<br/>
+                       For Dymola, a conversion script makes this change.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Psychrometrics</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi<br/>
+                       Buildings.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi<br/>
+                       Buildings.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi
+    </td>
+    <td valign=\"top\">Renamed blocks and removed input connector for pressure.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2139\">#2139</a>.<br/>
+                       For Dymola, a conversion script will rename existing instance to use
+                       the old versions which have been moved to the <code>Buildings.Obsolete</code> package.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SetPoints
+    </td>
+    <td valign=\"top\">Moved package from <code>Buildings.Controls.OBC.CDL.SetPoints</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2355\">#2355</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.UnitConversions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.UnitConversions.From_Btu<br/>
+                       Buildings.Controls.OBC.UnitConversions.From_quad<br/>
+                       Buildings.Controls.OBC.UnitConversions.To_Btu<br/>
+                       Buildings.Controls.OBC.UnitConversions.To_quad
+    </td>
+    <td valign=\"top\">Corrected quantity from <code>Work</code> to <code>Energy</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2245\">#2245</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006<br/>
+                     Buildings.Examples.VAVReheat.Guideline36<br/>
+                     Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
+    </td>
+    <td valign=\"top\">Refactored model to implement the economizer dampers directly in
+    <code>Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop</code> rather than through the
+    model of a mixing box. Since the version of the Guideline 36 model has no exhaust air damper,
+    this leads to simpler equations.
+    <br/> This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2454\">issue #2454</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.VAVBranch
+    </td>
+    <td valign=\"top\">Moved to <code>Buildings.Obsolete.Examples.VAVReheat.BaseClasses.VAVBranch</code>
+    and replaced by <code>Buildings.Examples.VAVReheat.BaseClasses.VAVReheatBox</code>.
+    <br/> This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2059\">issue #2059</a>.
+    <br/> For Dymola, a conversion script makes this change.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.Economizer
+    </td>
+    <td valign=\"top\">Updated the block with an input for enabling outdoor air damper opening and an input for
+                     economizer cooling signal.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\">issue 2024</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.EconomizerTemperatureControl
+    </td>
+    <td valign=\"top\">This block is now retired.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\">issue 2024</a>.
+<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Experimental.DistrictHeatingCooling
+    </td>
+    <td valign=\"top\">Moved package to <code>Buildings.Obsolete.DistrictHeatingCooling</code>.<br/>
+                       Generic components for DHC system modeling are now developed under
+                       <code>Buildings.DHC</code>.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters.ChillerCooled.Equipment</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.FourPortResistanceChillerWSE<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialChillerWSE<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialCoolingCoilHumidifyingHeating<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialHeatExchanger<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialIntegratedPrimary<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialPlantParallel<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialPumpParallel<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.ThreeWayValveParameters<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.IntegratedPrimaryLoadSide<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.IntegratedPrimaryPlantSide<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.IntegratedPrimarySecondary<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.NonIntegrated<br/>
+                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.WatersideEconomizer
+    </td>
+    <td valign=\"top\">Corrected fixed flow resistance settings and added ideal mixing junctions.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2446\">issue 2446</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Integers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Change
+    </td>
+    <td valign=\"top\">Corrected initialization of previous value of input to use the current input rather than <code>0</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2294\">issue 2294</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Continuous</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Greater<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Less<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold
+    </td>
+    <td valign=\"top\">Corrected documentation.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2246\">issue 2246</a>.
+    </td>
+</tr>
+</table>
+<p>
+Note:
+</p>
+<ul>
+<li>
+This version also corrects a possible memory violation when reading weather data files that have very long lines,
+as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">IBPSA, #1432</a>.
+</li>
+</ul>
+</html>"));
+end Version_8_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_8_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_0.mo
new file mode 100644
index 00000000000..c82f91992f5
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_0.mo
@@ -0,0 +1,292 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_8_1_0 "Version 8.1.0"
+  extends Modelica.Icons.ReleaseNotes;
+      annotation (Documentation(info="<html>
+    <div class=\"release-summary\">
+    <p>
+    Version 8.1.0 is a minor release that is backwards compatible with version 8.0.0.
+    The library has been tested with Dymola 2022, JModelica (revision 14023),
+    OpenModelica 1.19.0-dev (449+g4f16e6af22),
+    and OPTIMICA (revision OCT-stable-r19089_JM-r14295).
+    </p>
+    <p>
+    The following changes have been done:
+    <ul>
+    <li>
+    Added a package to compute undisturbed ground temperatures.
+    </li>
+    <li>
+    Added controller for radiant cooling and heating systems.
+    </li>
+    <li>
+    Added a package for district cooling applications.
+    </li>
+    <li>
+    Added a new boiler model that is suitable for condensing boilers.
+    </li>
+    <li>
+    Corrected various errors and improved compliance with Modelica Language Standard.
+    </li>
+    </ul>
+    </div>
+    <!-- New libraries -->
+    <p>
+    The following <b style=\"color:blue\">new libraries</b> have been added:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+    <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.BoundaryConditions.GroundTemperature
+        </td>
+        <td valign=\"top\">Package with models and climatic data for computing ground temperature.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.RadiantSystems
+        </td>
+        <td valign=\"top\">Package with controllers for radiant cooling and heating systems
+                           such for pipes embedded in the concrete slab.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.DHC</b>
+        </td>
+    <tr><td valign=\"top\">Buildings.DHC.Plants.Cooling
+        </td>
+        <td valign=\"top\">Package with models for a chilled water plant adapted to
+        district cooling applications.<br/>
+        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2264\">issue 2264</a>
+        </td>
+    </tr>
+    </table>
+    <!-- New components for existing libraries -->
+    <p>
+    The following <b style=\"color:blue\">new components</b> have been added
+    to <b style=\"color:blue\">existing</b> libraries:
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+      </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatusDuplicator
+      </td>
+      <td valign=\"top\">Block that duplicates the zone status to be connected to all zone groups.<br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
+      </td>
+    </tr>
+    <tr><td valign=\"top\">
+          Buildings.Controls.OBC.CDL.Routing.BooleanVectorFilter<br/>
+          Buildings.Controls.OBC.CDL.Routing.BooleanVectorReplicator<br/>
+          Buildings.Controls.OBC.CDL.Routing.IntegerVectorFilter<br/>
+          Buildings.Controls.OBC.CDL.Routing.IntegerVectorReplicator<br/>
+          Buildings.Controls.OBC.CDL.Routing.RealVectorFilter<br/>
+          Buildings.Controls.OBC.CDL.Routing.RealVectorReplicator
+      </td>
+      <td valign=\"top\">Blocks for filtering and replicating vectors of signals.<br/>
+           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
+      </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b>
+      </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerTable<br/>
+                         Buildings.Fluid.Boilers.Examples.BoilerTable<br/>
+                         Buildings.Fluid.Boilers.Validation.BoilerTableEfficiencyCurves<br/>
+                         Buildings.Fluid.Boilers.BaseClasses.PartialBoiler<br/>
+                         Buildings.Fluid.Boilers.Data.Generic<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash2501<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash3001<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash3501<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash4001<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash5001<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash6001<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX400<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX500<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX600<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX725<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX850<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0400<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0500<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0650<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0800<br/>
+                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash1000
+      </td>
+      <td valign=\"top\">Classes for modeling boilers whose efficiency curves are provided as a table.
+                         Part of the code from the old <code>Buildings.Fluid.Boilers.BoilerPolynomial</code>
+                         has been moved to <code>Buildings.Fluid.Boilers.BaseClasses.PartialBoiler</code>
+                         to support the new model <code>Buildings.Fluid.Boilers.BoilerTable</code>. <br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2651\">issue 2651</a>.<br/>
+                         In the moved code, the boiler's heating power output is now corrected by
+                         its loss to the ambient. <br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2725\">#2725</a>.
+      </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+      </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_York_YCAL0033EE_101kW_3_1COP_AirCooled
+      </td>
+      <td valign=\"top\">Data for air cooled chiller. <br/>
+                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">issue #2770</a>.
+      </td>
+    </tr>
+    </table>
+    <!-- Backward compatible changes -->
+    <p>
+    The following <b style=\"color:blue\">existing components</b>
+    have been <b style=\"color:blue\">improved</b> in a
+    <b style=\"color:blue\">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.Controls.Continuous</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.Continuous.SignalRanker
+        </td>
+        <td valign=\"top\">Changed implementation to use sort function from Modelica Standard Library,
+                           and updated its example to avoid simultaneous state and time events.<br/>
+                           This is for
+                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Examples.ChillerPlant</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
+        </td>
+        <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, issue #2761</a>.<br/>
+                           Changed initialization from steady state initial to fixed initial for some components.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
+        </td>
+        <td valign=\"top\">Improved model to guard against approximation errors of event handling.
+                           With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
+                           all simulate with OpenModelica.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buildings, issue #2713</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
+        </td>
+        <td valign=\"top\">Reimplemented function to avoid a potential overflow caused by the <code>cosh</code> function.<br/>
+                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Non-backward compatible changes to existing components -->
+    <!-- Errors that have been fixed -->
+    <p>
+    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+    that can lead to wrong simulation results):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\"> Buildings.Fluid.Chillers.BaseClasses.PartialElectric
+        </td>
+        <td valign=\"top\">Corrected calculation of entering condenser temperature
+                           when using a moist air media model.
+                           This is important for modeling air-cooled chillers using the model
+                           <code>Buildings.Fluid.Chillers.ElectricEIR</code>.
+                           <br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">issue #2770</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Occupants</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Occupants.Office.Occupancy.Wang2005Occupancy
+        </td>
+        <td valign=\"top\">Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
+                           To improve efficiency, this reformulation also changes the event triggering function so that
+                           it leads to time events rather than state events.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2590\">Buildings, #2590</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Uncritical errors -->
+    <p>
+    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+    units are wrong or errors in documentation):
+    </p>
+    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+    <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOperable
+        </td>
+        <td valign=\"top\">Removed duplicate declaration of <code>VABp_flow</code>.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1496\">Buildings, issue #1496</a>.
+        </td>
+    </tr>
+    <tr>
+      <td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
+      </td>
+    </tr>
+    <tr>
+      <td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
+      </td>
+      <td valign=\"top\">Corrected weather data bus connection which was structurally incorrect
+                         and did not parse in OpenModelica.<br/>
+                         This is for
+                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
+       </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
+                           Buildings.Electrical.DC.Storage.BaseClasses.Charge<br/>
+                           Buildings.Electrical.DC.Storage.Battery
+        </td>
+        <td valign=\"top\">Corrected unit string.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RadiationTemperature
+        </td>
+        <td valign=\"top\">Corrected annotation.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2550\">Buildings, issue #2550</a>.
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
+                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
+                           Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3B.Electrical</br>
+                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
+        </td>
+        <td valign=\"top\">Added missing parameter declaration.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2556\">Buildings, issue #2556</a>.
+        </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+        </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
+        </td>
+        <td valign=\"top\">Improved model to guard against approximation errors of event handling.
+                           With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
+                           all simulate with OpenModelica.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buildings, issue #2713</a>.
+        </td>
+    </tr>
+    </table>
+    <!-- Obsolete components -->
+     </html>"));
+end Version_8_1_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_8_1_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_1.mo
new file mode 100644
index 00000000000..bebd847b06f
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_1.mo
@@ -0,0 +1,153 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_8_1_1 "Version 8.1.1"
+  extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 8.1.1 is a patch that has backward compatible bug fixes.
+It is backwards compatible with version 8.0.0 and 8.1.0.
+</p>
+<p>
+The library has been tested with Dymola 2022,
+JModelica (revision 14023),
+OpenModelica 1.19.0-dev (449+g4f16e6af22),
+OPTIMICA (revision OCT-dev-r26446_JM-r14295) and recent versions of Impact.
+</p>
+</div>
+  <!-- New libraries -->
+<!-- New components for existing libraries -->
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Examples.VAVReheat</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Controls.FreezeStat
+  </td>
+  <td valign=\"top\">Added hysteresis. Without it, models can stall due to state events.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2975\">#2975</a>.
+  </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SunRiseSet
+    </td>
+    <td valign=\"top\">Changed implementation to avoid NaN in OpenModelica.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2835\">issue 2835</a>.
+    </td>
+</tr>
+  <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line_N<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC_N<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRL_N<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC_N
+    </td>
+    <td valign=\"top\">Set nominal attribute for voltage at terminal.
+                       This change enables Dymola 2023 beta3 to solve
+                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepDown.DY</code>
+                       and
+                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepUp.DD</code>
+                       which otherwise fail during the initialization as the homotopy steps
+                       obtain unreasonable values for the voltages.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus
+    </td>
+    <td valign=\"top\">Changed handling of forward and backward slashes on Windows.
+                       Now models in this package also work with OpenModelica on Windows.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.ParallelConstantFlow
+    </td>
+    <td valign=\"top\">Removed the model that represented an incorrect hydronic configuration. <br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2967\">#2967</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Applications</b>
+  </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.IntegratedPrimaryLoadSide
+      </td>
+      <td valign=\"top\">Removed duplicate instances of blocks that generate control signals.<br/>
+                         This is for
+                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2963\">Buildings, issue 2963</a>.
+      </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+  </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.PID<br/>
+                         Buildings.Controls.OBC.CDL.PIDWithReset
+  </td>
+  <td valign=\"top\">Corrected wrong documentation in how the derivative of the control error is approximated.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2994\">Buildings, issue 2994</a>.
+  </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.CentralPlants.Cooling.Controls.ChillerStage
+    </td>
+    <td valign=\"top\">Corrected parameter value for <code>twoOn.nOut</code>.
+                       This correction is required to simulate the model in Dymola 2022
+                       if the model has been updated to MSL 4.0.0. With MSL 3.2.3, the simulation
+                       works without this correction.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    </td>
+    <td valign=\"top\">Corrected assignment of gas constant which lead to a unit error.
+                       This change does not affect the results as the value is not used for this liquid medium.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1603\">IBPSA, #1603</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python36</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.IO.Python36.Functions.Examples.Exchange
+    </td>
+    <td valign=\"top\">Removed call to impure function <code>removeFile</code>.
+                       This removal is required for MSL 4.0.0.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_8_1_1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_8_1_2.mo b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_2.mo
new file mode 100644
index 00000000000..dd63660c759
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_2.mo
@@ -0,0 +1,74 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_8_1_2 "Version 8.1.2"
+extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 8.1.2 is a patch that has backward compatible bug fixes.
+It is backwards compatible with versions 8.0.0, 8.1.0 and 8.1.1.
+</p>
+<p>
+The library has been tested with Dymola 2022,
+JModelica (revision 14023),
+OpenModelica 1.19.0-dev (449+g4f16e6af22),
+OPTIMICA (revision OCT-dev-r26446_JM-r14295) and recent versions of Impact.
+</p>
+</div>
+<!-- New libraries -->
+<!-- New components for existing libraries -->
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.HeatTransfer</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass
+    </td>
+    <td valign=\"top\">Changed the gas layer to be conditional.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3026\">#3026</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Boilers.Data.Lochinvar
+  </td>
+  <td valign=\"top\">Added annotation <code>defaultComponentPrefixes = \"parameter\"</code>.
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic
+  </td>
+  <td valign=\"top\">Removed <code>protected</code> declaration inside the record as the Modelica Language Specification
+                     only allows public sections in a record.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3009\">#3009</a>.
+  </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<!-- Errors that have been fixed -->
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger<br/>
+                       Buildings.Controls.OBC.CDL.Conversions.BooleanToReal<br/>
+    </td>
+    <td valign=\"top\">Corrected documentation texts where the variables were described with wrong types.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3016\">#3016</a>.
+    </td>
+</tr>
+</table>
+</html>"));
+end Version_8_1_2;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_8_1_3.mo b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_3.mo
new file mode 100644
index 00000000000..30e7c95518c
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_8_1_3.mo
@@ -0,0 +1,40 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_8_1_3 "Version 8.1.3"
+  extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 8.1.3 is a patch that has backward compatible bug fixes.
+It is backwards compatible with versions 8.0.0, 8.1.0, 8.1.1 and 8.1.2.
+</p>
+<p>
+The library has been tested with Dymola 2022,
+JModelica (revision 14023),
+OpenModelica 1.19.0-dev (449+g4f16e6af22),
+OPTIMICA (revision OCT-dev-r26446_JM-r14295) and recent versions of Impact.
+</p>
+</div>
+<!-- New libraries -->
+<!-- New components for existing libraries -->
+<!-- Backward compatible changes -->
+<!-- Non-backward compatible changes to existing components -->
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized</br>
+    </td>
+    <td valign=\"top\">Corrected removal of latent heat from component.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3027\">#3027</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+</html>"));
+end Version_8_1_3;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_9_0_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_9_0_0.mo
new file mode 100644
index 00000000000..2cf3ee2fb4c
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_9_0_0.mo
@@ -0,0 +1,1086 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_9_0_0 "Version 9.0.0"
+extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 9.0.0 is a major release that updates the Modelica version from 3.2.3 to 4.0.0.
+</p>
+<p>
+The library has been tested with Dymola 2022x,
+OpenModelica 1.19.0-dev (613-gd6e04c0-1),
+OPTIMICA (revision 2022-05-09-master-4b0cd2bf71) and recent versions of Impact.
+</p>
+<p>
+The following major changes have been done:
+</p>
+<ul>
+<li>
+The Modelica version has been updated from version 3.2.3 to 4.0.0.
+</li>
+<li>
+Most fluid component models have been updated to remove the parameter <code>massDynamics</code>,
+which is now set to the same value as the parameter <code>energyDynamics</code>.
+</li>
+<li>
+The models for coupling with EnergyPlus have been moved to the package
+<code>Buildings.ThermalZones.EnergyPlus_9_6_0</code> to allow
+support for more than one EnergyPlus version
+in future releases.
+</li>
+<li>
+The BESTEST validation in the package
+<code>Buildings.ThermalZones.Detailed.Validation.BESTEST</code>
+has been updated to the latest BESTEST version, and new tests have been added.
+</li>
+<li>
+The package <code>Buildings.Fluid.Geothermal.BuriedPipes</code>
+has been added to model heat transfer between buried pipes and the ground,
+such as for district energy systems.
+</li>
+<li>
+The package <code>Buildings.Media.Steam</code> for modeling steam has been added.
+</li>
+<li>
+Various new models have been added to the package <code>Buildings.Airflow.Multizone</code>
+for modeling multizone air exchange.
+</li>
+<li>
+Models for ice tanks have been added to the package
+<code>Buildings.Fluid.Storage.Ice</code>.
+</li>
+<li>
+Various models, such as for PV, solar collectors and thermal zones have been
+improved to obtain the latitude of the building from the weather data bus,
+rather than requiring the user to specify it.
+</li>
+<li>
+The run-time coupling with Python has been updated to Python version 3.8,
+and it has been renamed to <code>Buildings.Utilities.IO.Python_3_8</code>.
+</li>
+<li>
+Various other models have been improved or added, in particular for modeling of
+control sequences using the Control Description Language that has been developed
+in the OpenBuildingControl project at <a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>.
+</li>
+</ul>
+</div>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
+      </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Geothermal.BuriedPipes
+      </td>
+      <td valign=\"top\">Package with models for modeling thermal coupling between buried pipes and ground.
+      </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+  <tr><td valign=\"top\">Buildings.Media.Steam
+      </td>
+      <td valign=\"top\">Package with medium model for steam heating applications.
+      </td>
+  </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Case660<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case670<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case680<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case680FF<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case685<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case695<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case910<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case930<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case980<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case980FF<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case985<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case995
+    </td>
+    <td valign=\"top\">Added new test cases based on the ASHRAE 140-2020.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3005\">#3005</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Air</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart
+    </td>
+    <td valign=\"top\">Added example models for the use of the block optimal start controller.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2126\">#2126</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.Coefficient_V_flow<br/>
+                     Buildings.Airflow.Multizone.Coefficient_m_flow<br/>
+                     Buildings.Airflow.Multizone.Point_m_flow<br/>
+                     Buildings.Airflow.Multizone.Points_m_flow<br/>
+                     Buildings.Airflow.Multizone.Table_V_flow<br/>
+                     Buildings.Airflow.Multizone.Table_m_flow
+    </td>
+    <td valign=\"top\">Added new component models for multizone air exchange.<br/>
+                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipeDiscretized
+    </td>
+    <td valign=\"top\">Added model for multiple plug flow pipes in series,
+                     which can be used to vary boundary conditions over the length of a pipe.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sources.Outside_CpData
+    </td>
+    <td valign=\"top\">Added new component model that allows specifying a wind pressure profile for an exterior construction.<br/>
+                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatusDuplicator
+    </td>
+    <td valign=\"top\">Block that duplicates the zone status to be connected to all zone groups.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">
+        Buildings.Controls.OBC.CDL.Routing.BooleanVectorFilter<br/>
+        Buildings.Controls.OBC.CDL.Routing.BooleanVectorReplicator<br/>
+        Buildings.Controls.OBC.CDL.Routing.IntegerVectorFilter<br/>
+        Buildings.Controls.OBC.CDL.Routing.IntegerVectorReplicator<br/>
+        Buildings.Controls.OBC.CDL.Routing.RealVectorFilter<br/>
+        Buildings.Controls.OBC.CDL.Routing.RealVectorReplicator
+    </td>
+    <td valign=\"top\">Blocks for filtering and replicating vectors of signals.<br/>
+         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Asin<br/>
+                     Buildings.Controls.OBC.CDL.Continuous.Acos<br/>
+                     Buildings.Controls.OBC.CDL.Continuous.Subtract<br/>
+                     Buildings.Controls.OBC.CDL.Integers.Subtract
+    </td>
+    <td valign=\"top\">Created new blocks based on the discussion from ASHRAE Standard 231P Committee.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Derivative
+    </td>
+    <td valign=\"top\">Created new block which is required for PID controller with gain scheduling.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3022\">#3022</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.AddParameter
+    </td>
+    <td valign=\"top\">Created new block based on the discussion from ASHRAE Standard 231P Committee.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">#2876</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.RadiantSystems</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.RadiantSystems.Cooling.HighMassSupplyTemperature_TSurRelHum
+    </td>
+    <td valign=\"top\">Added controller for radiant cooling that controls the surface temperature
+                       using constant mass flow and variable supply temperature.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2823\">#2823</a>.<br/>
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.PIDWithInputGains
+    </td>
+    <td valign=\"top\">Added PID controller with anti-windup and control gains exposed as inputs.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2993\">#2993</a>.<br/>
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Storage.Ice</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Storage.Ice.ControlledTank<br/>
+                     Buildings.Fluid.Storage.Ice.Tank
+    </td>
+    <td valign=\"top\">Added models for ice storage tank whose performance is characterized by performance curves.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2820\">#2820</a>.
+    </td>
+</tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.HeatTransfer</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass
+    </td>
+    <td valign=\"top\">Changed the gas layer to be conditional.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3026\">#3026</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Case600FF<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case640<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case650<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case650FF<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case950<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case950FF
+    </td>
+    <td valign=\"top\">Updated the test cases based on the ASHRAE 140-2020.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3005\">#3005</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.AHUParameters<br/>
+                       Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialCoolingCoilHumidifyingHeating
+    </td>
+    <td valign=\"top\">Changed cooling coil model and removed unused parameters.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">#2549</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
+    </td>
+    <td valign=\"top\">The weather data reader is now reading the altitude above sea level from the weather data file.
+                       This new version also outputs this altitude and the latitude of the location on the weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+    </td>
+<tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.Continuous.SignalRanker
+    </td>
+    <td valign=\"top\">Changed implementation to use sort function from Modelica Standard Library,
+                       and updated its example to avoid simultaneous state and time events.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.GroupStatus
+    </td>
+    <td valign=\"top\">Added filters to select which zones are used in group.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\"># 2544</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime
+    </td>
+    <td valign=\"top\">Increased number of years that block will output the calendar time.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger<br/>
+                       Buildings.Controls.OBC.CDL.Conversions.BooleanToReal<br/>
+    </td>
+    <td valign=\"top\">Corrected documentation texts where the variables were described with wrong types.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3016\">issue 3016</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean<br/>
+    </td>
+    <td valign=\"top\">Added missing <code>discrete</code> keyword to sampled variable.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
+    </td>
+    <td valign=\"top\">Changed implementation to avoid NaN in OpenModelica.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2835\">issue 2835</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Electrical.AC.ThreePhasesUnbalanced</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line_N<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC_N<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRL_N<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC_N
+    </td>
+    <td valign=\"top\">Set nominal attribute for voltage at terminal.
+                       This change enables Dymola 2023 beta3 to solve
+                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepDown.DY</code>
+                       and
+                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepUp.DD</code>
+                       which otherwise fail during the initialization as the homotopy steps
+                       obtain unreasonable values for the voltages.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Boilers.Data.Lochinvar
+  </td>
+  <td valign=\"top\">Added annotation <code>defaultComponentPrefixes = \"parameter\"</code>.
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Boilers.Polynomial
+    </td>
+    <td valign=\"top\">Moved part of the code to <code>Buildings.Fluid.Boilers.BaseClasses.PartialBoiler</code>
+                       to support the new model <code>Buildings.Fluid.Boilers.BoilerTable</code>. <br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2651\"># 2651</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU
+    </td>
+    <td valign=\"top\">Exposed ratio of convection coefficients, set its default values based on fluid properties and flow rates,
+                       and exposed exponents for convective heat transfer coefficients.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2918\">#2918</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic
+    </td>
+    <td valign=\"top\">Removed <code>protected</code> declaration inside the record as the Modelica Language Specification
+                       only allows public sections in a record.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3009\">#3009</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.DuctStaticPressureSetpoint
+    </td>
+    <td valign=\"top\">Removed hysteresis that disabled duct static pressure reset based on outdoor air temperature.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2545\">#2545</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Validation.BaseClasses.Floor
+    </td>
+    <td valign=\"top\">Update CO2 generation expressions.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2781\">#2781</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Controls.FreezeStat
+    </td>
+    <td valign=\"top\">Added hysteresis. Without it, models can stall due to state events.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2975\">#2975</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
+                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone<br/>
+                       Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
+    </td>
+    <td valign=\"top\">Changed cooling coil model.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">#2549</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.Tutorial.Boiler.System7
+    </td>
+    <td valign=\"top\">Changed block downstream of <code>greThrTRoo</code> from <code>and</code> to <code>or</code> block.
+                       This ensures that the system is off when the outdoor air or room air is sufficiently warm.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.Tutorial.SpaceCooling.System2<br/>
+                       Buildings.Examples.Tutorial.SpaceCooling.System3<br/>
+    </td>
+    <td valign=\"top\">Correct supply and return water parameterization.<br/>
+                       Use design conditions for UA parameterization in cooling coil.<br/>
+                       Use explicit calculation of sensible and latent load to determine design load
+                       on cooling coil.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
+    </td>
+    <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, #2761</a>.
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling
+    </td>
+    <td valign=\"top\">Revised the model for extensibility. <br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2749\">#2749</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                       Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                       Buildings.Fluid.Movers.SpeedControlled_y
+    </td>
+    <td valign=\"top\">Changed implementation of the filter.
+                       The new implementation uses a simpler model.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1498\">IBPSA #1498</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FMI.ExportContainers.HVACZone<br/>
+                       Buildings.Fluid.FMI.ExportContainers.HVACZones<br/>
+    </td>
+    <td valign=\"top\">Correct supply and return water parameterization.<br/>
+                       Use explicit calculation of sensible and latent load to determine design load
+                       on cooling coil.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FMI.ExportContainers.Validation.RoomHVAC
+    </td>
+    <td valign=\"top\">Changed cooling coil model.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">#2549</a>.<br/>
+                       Correct supply and return water parameterization.<br/>
+                       Use explicit calculation of sensible and latent load to determine design load
+                       on cooling coil.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.Examples.BaseClasses.PartialStaticTwoPortCoolingTower
+    </td>
+    <td valign=\"top\">Added a temperature sensor for better measurement of the entering water temperature.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2866\">#2866</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Air
+    </td>
+    <td valign=\"top\">Made the <code>BaseProperties</code> replaceable.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1516\">IBPSA #1516</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+      </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
+  </td>
+  <td valign=\"top\">Improved model to guard against approximation errors of event handling.
+                     With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
+                     all simulate with OpenModelica.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buidings, #2713</a>.
+  </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.IO</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Utilities.IO.Files.Examples.CSVReader
+    </td>
+    <td valign=\"top\">Updated example so it works with future versions of the Modelica Standard Library which
+                       supports reading csv files.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1572\">IBPSA #1572</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
+    </td>
+    <td valign=\"top\">Reimplemented function to avoid a potential overflow caused by the <code>cosh</code> function.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem
+    </td>
+    <td valign=\"top\">Added a temperature sensor for better measurement of the entering water temperature.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2866\">#2866</a>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Applications</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">
+    Buildings.Applications.DataCenters.ChillerCooled.Equipment.FlowMachine_y<br/>
+    Buildings.Applications.DataCenters.ChillerCooled.Equipment.FlowMachine_m<br/>
+    Buildings.Applications.DataCenters.ChillerCooled.Equipment.ElectricChillerParallel<br/>
+    Buildings.Applications.DataCenters.ChillerCooled.Controls.VariableSpeedPumpStage
+    </td>
+    <td valign=\"top\">Moved to <code>Buildings.Applications.BaseClasses</code>.<br/>
+                This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2264\"># 2264</a>.<br/>
+                This change is supported in the conversion script.</td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarGeometry.IncidenceAngle<br/>
+                       Buildings.BoundaryConditions.SolarGeometry.BaseClasses.IncidenceAngle<br/>
+                       Buildings.BoundaryConditions.SolarGeometry.ZenithAngle<br/>
+                       Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez<br/>
+                       Buildings.BoundaryConditions.SolarIrradiation.DirectTiltedSurface<br/>
+                       Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth
+    </td>
+    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.RelativeAirMass
+    </td>
+    <td valign=\"top\">Introduced altitude attenuation for relative air mass calculation.
+                       This required adding a new input.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.SkyClearness
+    </td>
+    <td valign=\"top\">Changed input connector <code>HGloHor</code> to <code>HDirHor</code>.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.Continuous.PIDHysteresisTimer<br/>
+                       Buildings.Controls.Continuous.PIDHysteresis
+    </td>
+    <td valign=\"top\">Moved blocks to <code>Buildings.Obsolete.Controls.Continuous</code>.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1522\">IBPSA, #1522</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Add<br/>
+                       Buildings.Controls.OBC.CDL.Integers.Add<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.AddParameter
+    </td>
+    <td valign=\"top\">Moved classes to <code>Obsolete</code> package and created new blocks to avoid using input gain factor.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a> and
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">#2876</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Feedback
+    </td>
+    <td valign=\"top\">Moved the class to <code>Obsolete</code> package.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Division<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Gain<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.MovingMean<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Product<br/>
+                       Buildings.Controls.OBC.CDL.Integers.Product<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.SlewRateLimiter
+    </td>
+    <td valign=\"top\">Renamed the blocks to <code>Divide</code>, <code>MultiplyByParameter</code>, <code>MovingAverage</code>,
+                       <code>Multiply</code>, <code>LimitSlewRate</code>.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Interfaces.DayTypeInput<br/>
+                       Buildings.Controls.OBC.CDL.Interfaces.DayTypeOutput<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.DayType<br/>
+                       Buildings.Controls.OBC.CDL.Conversions.IsHoliday<br/>
+                       Buildings.Controls.OBC.CDL.Conversions.IsWorkingDay<br/>
+                       Buildings.Controls.OBC.CDL.Conversions.IsNonWorkingDay<br/>
+                       Buildings.Controls.OBC.CDL.Discrete.Examples.DayType<br/>
+                       Buildings.Controls.OBC.CDL.Conversions.Validation.DayTypeCheck<br/>
+                       Buildings.Controls.OBC.CDL.Types.Day
+    </td>
+    <td valign=\"top\">Moved classes to <code>Obsolete</code> package.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2839\">#2839</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.MultiAnd<br/>
+                       Buildings.Controls.OBC.CDL.Logical.MultiOr
+    </td>
+    <td valign=\"top\">Renamed parameter <code>nu</code> to <code>nin</code>.
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2580\">#2580</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.BooleanReplicator<br/>
+                       Buildings.Controls.OBC.CDL.Routing.IntegerReplicator<br/>
+                       Buildings.Controls.OBC.CDL.Routing.RealReplicator
+    </td>
+    <td valign=\"top\">Renamed to include <code>BooleanScalarReplicator</code>, <code>IntegerScalarReplicator</code>,
+                       and <code>RealScalarReplicator</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">#2544</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.IntegerSwitch<br/>
+                       Buildings.Controls.OBC.CDL.Logical.LogicalSwitch<br/>
+                       Buildings.Controls.OBC.CDL.Logical.Switch
+    </td>
+    <td valign=\"top\">Moved the blocks to <code>CDL.Integers.Switch</code>, <code>CDL.Logical.Switch</code>,
+                       and <code>CDL.Continuous.Switch</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2650\">#2650</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Change
+    </td>
+    <td valign=\"top\">Renamed parameter for start value from <code>y_start</code> to <code>pre_u_start</code>
+                       for consistency with <code>Buildings.Controls.OBC.CDL.Logical.Change</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2990\">#2990</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented<br/>
+                       Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented_N<br/>
+                       Buildings.Electrical.DC.Sources.PVSimpleOriented<br/>
+                       Buildings.Electrical.AC.OnePhase.Sources.PVSimpleOriented<br/>
+                       Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimpleOriented<br/>
+                       Buildings.Electrical.DC.Sources.PVSimpleOriented<br/>
+                       Buildings.Electrical.Interfaces.PartialPVOriented
+    </td>
+    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006<br/>
+                       Buildings.Examples.VAVReheat.Guideline36<br/>
+                       Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
+    </td>
+    <td valign=\"top\">Changed models to include the hydraulic configurations of the cooling coil,
+                       heating coil and VAV terminal box.<br/>
+                       Changed heating supply water temperature at design condition to <i>45</i>&deg;C.<br/>
+                       Corrected implementation of freeze protection for ASHRAE 2006 models.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2594\">#2594</a>.<br/>
+                       Changed model structure to separate building and HVAC system.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2652\">#2652</a>.<br/>
+                       Changed parameter declarations and added to Guideline 36 models the optimal start up calculation.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2829\">issue #2829</a>.
+    </td>
+</tr>
+ <tr><td colspan=\"2\"><b>Buildings.Examples.ScalableBenchmarks</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ScalableBenchmarks.BuildingVAV.ThermalZones.ThermalZone
+    </td>
+    <td valign=\"top\">Reimplemented computation of energy provided by HVAC system to also include the latent load.
+                     The new implementation uses the enthalpy sensor, and therefore the mass flow rate and temperature
+                     sensors have been removed. Also, rather than load in Watts, it outputs the energy in Joules.<br/>
+                     This version also improves the infiltration. Now, exactly the same amount of air in infiltrated and
+                     exfiltrated. This was not the case previously because the infiltration was a prescribed air flow rate,
+                     and the exfiltration was based on pressure difference. This caused an inbalance in the HVAC supply and
+                     return air flow rate.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
+                       Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
+                       Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
+                       Buildings.Fluid.Actuators.Dampers.PressureIndependent<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.ThreeWayTable<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayPolynomial<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening<br/>
+                       Buildings.Fluid.Actuators.Valves.TwoWayTable
+    </td>
+    <td valign=\"top\">Changed implementation of the filter and changed the parameter <code>order</code> to be a constant
+                       because typical users have no need to change this value.
+                       The new implementation uses a simpler model.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1498\">IBPSA #1498</a>.<br/>
+                       This change is only backwards incompatible if a user
+                       propagated the value of <code>order</code> to a high-level parameter.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.FixedResistances</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipe<br/>
+                       Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore
+    </td>
+    <td valign=\"top\">In <code>Buildings.Fluid.FixedResistances.PlugFlowPipe</code>, changed <code>ports_b</code>,
+                       which was a vectorized port, to <code>port_b</code> which is a scalar port.
+                       This has been done in order for the model to have the same connectors as
+                       are used for other pipe models.<br/>
+                       Refactored implementation and made various classes in this model protected.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1494\">IBPSA #1494</a>.<br/>
+                       For Dymola, a conversion script renames existing models to
+                       <code>Buildings.Obsolete.Fluid.FixedResistances.PlugFlowPipe</code> and
+                       <code>Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.EN12975<br/>
+                       Buildings.Fluid.SolarCollectors.ASHRAE93
+    </td>
+    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Storage.ExpansionVessel
+    </td>
+    <td valign=\"top\">Removed parameter <code>p</code> which was not used.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1614\">IBPSA, #1614</a>.
+                       This change is supported in the conversion script.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.FixedShade<br/>
+                       Buildings.HeatTransfer.Windows.Overhang<br/>
+                       Buildings.HeatTransfer.Windows.BaseClasses.Overhang
+    </td>
+    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Obsolete.Utilities.IO.Python27
+    </td>
+    <td valign=\"top\">Removed support for Python 27. Use instead <code>Buildings.Utilities.IO.Python36</code>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
+                       Buildings.ThermalZones.Detailed.CFD<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditions<br/>
+                       Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditionsWithWindow<br/>
+                       Buildings.ThermalZones.Detailed.Validation.BaseClasses.SingleZoneFloor
+    </td>
+    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
+    </td>
+    <td valign=\"top\">Set <code>final massDynamics=energyDynamic</code>.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1542\">IBPSA, #1542</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0
+    </td>
+    <td valign=\"top\">Renamed package to add the version number for EnergyPlus. This will allow supporting more than
+                       one version of EnergyPlus.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2851\">#2851</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Building
+    </td>
+    <td valign=\"top\">This model, which needs to be part of every model that uses EnergyPlus, now
+                       requires the specification of the EnergyPlus weather data file (<code>.epw</code> file)
+                       through the parameter <code>epwName</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2443\">#2443</a>.<br/>
+                       <br/>
+                       Removed the parameters <code>showWeatherData</code> and <code>generatePortableFMU</code>.
+                       Now, the weather data bus is always enabled as it is used in almost all simulations.
+                       This change is supported in the conversion script.<br/>
+                       Converted <code>usePrecompiledFMU</code> and the associated <code>fmuName</code> from
+                       parameter to a constant as these are only used for debugging by developers.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2759\">#2759</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring<br/>
+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer<br/>
+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter<br/>
+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring<br/>
+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer<br/>
+                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter
+    </td>
+    <td valign=\"top\">Changed models to include the hydraulic configurations of the cooling coil,
+                       heating coil and VAV terminal box.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2594\">#2594</a>.<br/>
+                       Changed model structure to separate building and HVAC system.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2652\">#2652</a>.<br/>
+                       Changed parameter declarations and added to Guideline 36 models the optimal start up calculation.
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2829\">issue #2829</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Utilities.IO</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Utilities.IO.Python36
+    </td>
+    <td valign=\"top\">Replaced package with <code>Buildings.Utilities.IO.Python_3_8</code>
+                       and moved the old package to <code>Buildings.Obsolete.Utilities.IO.Python36</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2599\">#2599</a>.<br/>
+                       For Dymola, a conversion script will rename models that use <code>Python36</code>
+                       to use <code>Python_3_8</code>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Polynominal<br/>
+                         Buildings.Utilities.Math.Examples.Polynominal
+    </td>
+    <td valign=\"top\">Corrected name to <code>Polynomial</code>.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1524\">IBPSA, #1524</a>.<br/>
+                       This change is supported in the conversion script.
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Greater<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.Less<br/>
+                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold
+    </td>
+    <td valign=\"top\">Corrected the condition of switching true back to false. It is caused by the wrong inequality check.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2981\">#2981</a>.
+    </td>
+</tr>
+
+
+<tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Examples.Combined.ParallelConstantFlow
+    </td>
+    <td valign=\"top\">Removed the model that represented an incorrect hydronic configuration. <br/>
+    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2967\">#2967</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"> Buildings.Fluid.Chillers.BaseClasses.PartialElectric
+    </td>
+    <td valign=\"top\">Corrected calculation of entering condenser temperature
+                       when using a moist air media model.
+                       This is important for modeling air-cooled chillers using the model
+                       <code>Buildings.Fluid.Chillers.ElectricEIR</code>
+                       <br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">#2770</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized</br>
+    </td>
+    <td valign=\"top\">Corrected removal of latent heat from component.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3027\">#3027</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Occupants</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Occupants.Office.Occupancy.Wang2005Occupancy
+    </td>
+    <td valign=\"top\">Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
+                       To improve efficiency, this reformulation also changes the event triggering function so that
+                       it leads to time events rather than state events.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2590\">#2590</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Airflow</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOperable
+    </td>
+    <td valign=\"top\">Removed duplicate declaration of <code>VABp_flow</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1496\">Buildings, #1496</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.IntegratedPrimaryLoadSide
+    </td>
+    <td valign=\"top\">Removed duplicate instances of blocks that generate control signals.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2963\">Buildings, issue 2963</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
+    </td>
+    <td valign=\"top\">Corrected weather data bus connection which was structurally incorrect
+                       and did not parse in OpenModelica.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+  </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.PID<br/>
+                         Buildings.Controls.OBC.CDL.PIDWithReset
+  </td>
+  <td valign=\"top\">Corrected wrong documentation in how the derivative of the control error is approximated.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2994\">Buildings, issue 2994</a>.
+  </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Sources.PVSimple<br/>
+                         Buildings.Electrical.AC.OnePhase.Sources.PVSimpleOriented<br/>
+                         Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimple<br/>
+                         Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimpleOriented<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented<br/>
+                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented_N<br/>
+                         Buildings.Electrical.DC.Sources.PVSimple<br/>
+                         Buildings.Electrical.DC.Sources.PVSimpleOriented<br/>
+                         Buildings.Electrical.Interfaces.PartialPvBase
+    </td>
+    <td valign=\"top\">Corrected wrong documentation string for surface area which
+                       should be gross rather than net area.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.Controls.ChillerStage
+    </td>
+    <td valign=\"top\">Corrected parameter value for <code>twoOn.nOut</code>.
+                       This correction is required to simulate the model in Dymola 2022
+                       if the model has been updated to MSL 4.0.0. With MSL 3.2.3, the simulation
+                       works without this correction.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Media.Specialized.Water.TemperatureDependentDensity
+    </td>
+    <td valign=\"top\">Corrected assignment of gas constant which lead to a unit error.
+                       This change does not affect the results as the value is not used for this liquid medium.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1603\">IBPSA, #1603</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RadiationTemperature
+    </td>
+    <td valign=\"top\">Corrected annotation.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2550\">Buildings, #2550</a>.
+    </td>
+</tr>
+    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
+                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
+                           Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3B.Electrical<br/>
+                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
+        </td>
+        <td valign=\"top\">Added missing parameter declaration.<br/>
+                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2556\">Buildings, #2556</a>.
+        </td>
+   </tr>
+   <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python_3_8</b>
+   </td>
+   </tr>
+   <tr><td valign=\"top\">Buildings.Utilities.IO.Python_3_8.Functions.Examples.Exchange
+   </td>
+   <td valign=\"top\">Removed call to impure function <code>removeFile</code>.
+                      This removal is required for MSL 4.0.0.<br/>
+                      This is for
+                      <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
+   </td>
+</tr>
+</table>
+</html>"));
+end Version_9_0_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_9_1_0.mo b/Buildings/UsersGuide/ReleaseNotes/Version_9_1_0.mo
new file mode 100644
index 00000000000..5440cbe5a9e
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_9_1_0.mo
@@ -0,0 +1,345 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_9_1_0 "Version 9.1.0"
+extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 9.1.0 is backward compatible with 9.0.0.
+</p>
+<p>
+The library has been tested with Dymola 2023x,
+OpenModelica 1.20.0-dev (314-g3033f43-1),
+OPTIMICA (revision 2022-05-09-master-4b0cd2bf71) and recent versions of Impact.
+</p>
+<p>
+The following major changes have been done:
+</p>
+<ul>
+<li>
+The ASHRAE Guideline 36 air-side sequences have been updated to the official release.
+They are in the package <code>Buildings.Controls.OBC.ASHRAE.G36</code>.
+The previous public release draft is still distributed with this version.
+</li>
+<li>
+Various new blocks for the Control Description Language have been added to the package
+<code>Buildings.Controls.OBC.CDL</code>.
+</li>
+<li>
+The flow rate control in various examples has been improved to avoid large pump or fan heads
+if the mass flow rate is prescribed rather than computed based on the pump or fan curve.
+</li>
+<li>
+Various models have been improved for robustness,
+for compatibility with the <code>Modelica.Media</code> library,
+and to correct errors.
+</li>
+</ul>
+</div>
+<!-- New libraries -->
+<p>
+The following <b style=\"color:blue\">new libraries</b> have been added:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+      </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36
+      </td>
+      <td valign=\"top\">Package with sequences implemented according to ASHRAE Guideline 36 official release, May 2020.
+      </td>
+  </tr>
+</table>
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.Examples.GlobalPerezTiltedSurface
+    </td>
+    <td valign=\"top\">Added model that outputs the global solar irradiation on a tilted surface.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1654\">IBPSA, #1654</a>.
+    </td>
+ </tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal<br/>
+                         Buildings.Controls.OBC.CDL.Routing.BooleanExtractor<br/>
+                         Buildings.Controls.OBC.CDL.Routing.IntegerExtractSignal<br/>
+                         Buildings.Controls.OBC.CDL.Routing.IntegerExtractor
+    </td>
+    <td valign=\"top\">Added boolean and integer extract signals.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined.BaseClasses</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.Validation.Pipe
+    </td>
+    <td valign=\"top\">Test for comparing <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize</code> <br/>
+                       initialization of <code>dh</code> to <code>Buildings.DHC.Networks.Combined.BaseClasses.PipeStandard</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\">issue #2510</a>.
+    </td>
+</tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Applications.DataCenter</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Applications.BaseClasses.Equipment.FlowMachine_m<br/>
+                         Buildings.Applications.BaseClasses.Equipment.FlowMachine_y<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialCoolingCoilHumidifyingHeating<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialHeatExchanger<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialPumpParallel<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.SignalFilterParameters<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.IntegratedPrimarySecondary<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PartialDataCenter<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
+                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
+    </td>
+    <td valign=\"top\">Improved implementation to avoid high pressures due to pump with forced mass flow rate.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1659\">IBPSA, #1659</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
+    </td>
+    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.DHC</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.DHC.ETS.BaseClasses.Validation.CollectorDistributor<br/>
+                         Buildings.DHC.ETS.Combined.Subsystems.HeatPump<br/>
+                         Buildings.DHC.Examples.Combined.BaseClasses.PartialSeries<br/>
+                         Buildings.DHC.Plants.Cooling.ElectricChillerParallel<br/>
+                         Buildings.DHC.Plants.Cooling.Examples.ElectricChillerParallel<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem<br/>
+                         Buildings.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel
+    </td>
+    <td valign=\"top\">Improved implementation to avoid high pressures due to pump with forced mass flow rate.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1659\">IBPSA, #1659</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve
+    </td>
+    <td valign=\"top\">Propagated parameter <code>riseTime</code> to valves. The value is not used as the filter is disabled,
+                       but it will show in the result file. Having a consistent value for all these parameters in the result filter
+                       helps during debugging.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1663\">IBPSA, #1663</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction
+    </td>
+    <td valign=\"top\">Initialized variable which otherwise lead to the simulation to fail in OpenModelica.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1664\">IBPSA, #1664</a>.
+    </td>
+  </tr>
+  <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
+                         Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
+                         Buildings.Fluid.MixingVolumes.MixingVolume<br/>
+                         Buildings.Fluid.MixingVolumes.MixingVolume.MoistAir</br>
+                         Buildings.Fluid.Sensors.TemperatureWetBulbTwoPort
+    </td>
+    <td valign=\"top\">Improved implementation so that models also work with certain media from
+                       the Modelica Standard Library that may be used to model combustion gases.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1650\">IBPSA, #1650</a>.
+    </td>
+  <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
+                         Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
+                         Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
+                         Buildings.Fluid.Movers.SpeedControlled_y
+    </td>
+    <td valign=\"top\">Avoided negative flow work if the flow or pressure is forced in a way that the flow work would be negative.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1621\">IBPSA, #1621</a>.
+    </td>
+  </tr>
+  <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassTRExteriorIrradiationNoShading<br/>
+                       Buildings.HeatTransfer.Windows.Functions.glassTRInteriorIrradiationNoShading
+    </td>
+    <td valign=\"top\">Added default value for output variables.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3111\">#3111</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.regNonZeroPower
+    </td>
+    <td valign=\"top\">Improved documentation and assertion.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3135\">Buildings, issue #3135</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
+  <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane
+    </td>
+    <td valign=\"top\">Corrected units of protected variables to avoid warning during model check.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1644\">IBPSA, issue #1644</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.spliceFunction<br/>
+                         Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
+    </td>
+    <td valign=\"top\">Improved implementation of transition limits.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Networks.Combined.BaseClasses</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Networks.Combined.BaseClasses.PipeAutosize
+    </td>
+    <td valign=\"top\"><code>start</code> attribute for parameter <code>dh</code> changed to 0.01.<br/>
+                       <code>min</code> attribute for parameter <code>dh</code> changed to 0.001.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\">issue #2510</a>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+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.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Examples.SimpleHouse
+    </td>
+    <td valign=\"top\">Changed <code>conDam.yMin</code> from 0.1 to 0.25.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1624\">
+                       IBPSA, #1624</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples.ScalableBenchmarks</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone
+    </td>
+    <td valign=\"top\">Changed <code>fan[].m_flow_nominal</code> from 10 to 0.1.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3067\">#3067</a>
+    </td>
+</tr>
+</table>
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Electrical.DC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Electrical.DC.Storage.BaseClasses.Charge
+    </td>
+    <td valign=\"top\">Corrected calculation of power taken from the battery when it is discharged.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3095\">issue 3095</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.DHC.Plants.Cooling</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.DHC.Plants.Cooling.ElectricChillerParallel
+    </td>
+    <td valign=\"top\">Corrected wrong assignments for chiller system <code>mulChiSys</code> which assigned chilled water
+                     to condenser water parameters and vice versa.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
+    </td>
+    <td valign=\"top\">Corrected input for enabling freeze protection setback mode.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">issue 3084</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
+    </td>
+    <td valign=\"top\">Corrected outdoor temperature in instance <code>TOutSwi</code> at which system switches on and off.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3059\">issue 3059</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.PartialEffectivenessNTU
+    </td>
+    <td valign=\"top\">Corrected wrong temperature in assignment of <code>sta2_default</code>.
+                       For <code>Buildings.Media.Air</code> and <code>Buildings.Media.Water</code>
+                       this error does not affect the results.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3151\">Buildings, issue 3151</a>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
+                       Buildings.Fluid.DXSystems.AirCooled.SingleStage<br/>
+                       Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
+                       Buildings.Fluid.DXSystems.WaterCooled.MultiStage<br/>
+                       Buildings.Fluid.DXSystems.WaterCooled.SingleStage<br/>
+                       Buildings.Fluid.DXSystems.WaterCooled.VariableSpeed<br/>
+                       Buildings.Fluid.DXSystems.Cooling.BaseClasses.CapacityWaterCooled<br/>
+                       Buildings.Fluid.DXSystems.BaseClasses.PartialCoolingCapacity
+
+    </td>
+    <td valign=\"top\">Corrected performance calculation as a function of mass flow rates.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3146\">#3146</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
+                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized</br>
+    </td>
+    <td valign=\"top\">Reverted the correction on latent heat from component.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
+    </td>
+</tr>
+<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.Validation.WetCoilCounterFlowLowWaterFlowRate<br/>
+    </td>
+    <td valign=\"top\">Modify air source boundary condition so air enters coil at 99.5% relative humidity.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+</html>"));
+end Version_9_1_0;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_9_1_1.mo b/Buildings/UsersGuide/ReleaseNotes/Version_9_1_1.mo
new file mode 100644
index 00000000000..3ce6c339ae1
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_9_1_1.mo
@@ -0,0 +1,239 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_9_1_1 "Version 9.1.1"
+extends Modelica.Icons.ReleaseNotes;
+  annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 9.1.1 is backward compatible with 9.1.0, except that the Spawn binaries need to be updated as described
+  in <code>Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide.Installation</code>.
+  </p>
+  <p>
+  The library has been tested with
+  Dymola 2023x,
+  OpenModelica 1.22.0-dev (41-g8a5b18f-1),
+  OPTIMICA 1.43.4 and recent versions of Impact.
+  </p>
+  <p>
+  The Spawn binaries have been updated from version 0.3.0 to 0.4.3.
+  Both use the same EnergyPlus input data files from EnergyPlus 9.6.0.
+  The update corrects a bug that caused EnergyPlus to always send
+  a heat capacitance multiplier of <i>1</i> to Modelica
+  (see <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3481\">#3481</a>).
+  </p>
+</div>
+<!-- New libraries -->
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b>
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.PartialConvertTime
+    </td>
+    <td valign=\"top\">Added model to be extended in solar models that need calendar year for calculation.<br/>
+                     See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1716\">IBPSA, #1716</a>.
+
+    </td>
+</tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Controls.OBC.Utilities</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.PIDWithInputGains
+    </td>
+    <td valign=\"top\">Corrected the instance <code>antWinGai2</code> to be conditional.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3423\">#3423</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings/BoundaryConditions/SolarGeometry/BaseClasses/Declination.mo<br/>
+                     Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo<br/>
+                     Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo<br/>
+                     Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo<br/>
+                     Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo
+    </td>
+    <td valign=\"top\">Updated radiation models to use calendar time instead of simulation time.<br/>
+                     See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1716\">IBPSA, #1716</a>.
+
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi
+    </td>
+    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
+                     See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
+
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage<br/>
+                     Buildings.Controls.OBC.CDL.Utilities.Validation.SunRiseSet<br/>
+                     Buildings.Controls.OBC.CDL.Utilities.Validation.SunRiseSetNegativeStartTime<br/>
+                     Buildings.Controls.OBC.CDL.Utilities.Validation.SunRiseSetPositiveStartTime
+    </td>
+    <td valign=\"top\">Changed models to comply with CDL specifications.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3301\">#3301</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Electrical.Interfaces.PartialTwoPort
+    </td>
+    <td valign=\"top\">Added constraining clause for terminal as models that extend from this model
+                     access a component that is not in the base class, and Optimica 1.40
+                     issues a warning for this.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3236\">#3236</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings.Fluid.Examples.Performance.Example5<br/>
+                       Buildings.Fluid.Examples.Performance.Example6<br/>
+                       Buildings.Fluid.Examples.Performance.Example7<br/>
+                       Buildings.Fluid.Examples.Performance.Example8
+    </td>
+    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
+                       See  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
+
+    </td>
+</tr>
+  <tr>
+    <td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.convectionResistanceCircularPipe<br/>
+    Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances
+    </td>
+    <td valign=\"top\">Corrected variability of assignment to comply with the Modelica Language Definition.<br/>
+                       See  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1762\">IBPSA, #1762</a>.
+
+    </td>
+  </tr>
+<tr>
+    <td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.Examples.EpsilonNTUZ
+    </td>
+    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
+                       See  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
+
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Media</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Media.Examples.BaseClasses.PartialProperties
+    </td>
+    <td valign=\"top\">Removed a self-dependent default binding of a function input.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3384\">#3384</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
+    </td>
+</tr>
+<tr>
+    <td valign=\"top\">Buildings.Utilities.Plotters.Examples.Scatter<br/>
+                       Buildings.Utilities.Plotters.Examples.TimeSeries<br/>
+                       Buildings.Utilities.Psychrometrics.TWetBul_TDryBulPhi<br/>
+                       Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi
+    </td>
+    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
+                       See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
+
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime
+  </td>
+  <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
+                     that caused simultaneous events to not be triggered at the same time.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
+  </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+  </td>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized
+    </td>
+    <td valign=\"top\">Corrected the modification of <code>hexReg[nReg].m2_flow_nominal</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3441\">#3441</a>.
+    </td>
+</tr>
+  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+  </td>
+  <tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone
+    </td>
+    <td valign=\"top\">Corrected bug that caused EnergyPlus to always
+                       send <i>1</i> for the heat capacitance multiplier.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3481\">#3481</a>.
+    </td>
+  </tr>
+<tr><td colspan=\"2\"><b>Buildings.Utilities.Time</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime
+  </td>
+  <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
+                     that caused simultaneous events to not be triggered at the same time.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
+  </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.FMI.Adaptors.Outlet
+  </td>
+  <td valign=\"top\">Corrected dimension of <code>X</code> in function call, which caused the model to not translate with some tools
+                     if the media has only one component such as water.<br/>
+                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1768\">IBPSA, #1768</a>.
+  </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
+  </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Evaporation
+  </td>
+  <td valign=\"top\">Corrected assertion for the condition <code>dX_nominal&lt;0</code>
+                     and the documentation.<br/>
+                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3322\">issue 3322</a>.
+  </td>
+</tr>
+</table>
+</html>"));
+end Version_9_1_1;
diff --git a/Buildings/UsersGuide/ReleaseNotes/Version_9_1_2.mo b/Buildings/UsersGuide/ReleaseNotes/Version_9_1_2.mo
new file mode 100644
index 00000000000..46cccf28a4b
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/Version_9_1_2.mo
@@ -0,0 +1,228 @@
+within Buildings.UsersGuide.ReleaseNotes;
+class Version_9_1_2 "Version 9.1.2"
+    extends Modelica.Icons.ReleaseNotes;
+      annotation (Documentation(info="<html>
+<div class=\"release-summary\">
+<p>
+Version 9.1.2 is backward compatible with 9.1.0 and 9.1.1, except that relative to 9.1.0, the Spawn binaries need to be updated as described
+in <code>Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide.Installation</code>.
+</p>
+<p>
+The library has been tested with Dymola 2023x, OpenModelica 1.22.0-dev (41-g8a5b18f-1), OPTIMICA 1.43.4 and recent versions of Impact.
+</p>
+<p>
+This backward compatible version adds a heat meter sensor and it adds a new example that demonstrates
+how to use a hydronic radiator with the updated Spawn interface.
+Also, many models have been updated to improve performance, for compliance with the Modelica Language Standard and
+to correct model errors.
+</p>
+</div>
+<!-- New libraries -->
+<!-- New components for existing libraries -->
+<p>
+The following <b style=\"color:blue\">new components</b> have been added
+to <b style=\"color:blue\">existing</b> libraries:
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.Sensors.HeatMeter
+    </td>
+    <td valign=\"top\">Sensor to measure the heat flow rate between a supply and return pipe in a fluid circuit.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1831\">IBPSA, #1831</a>.
+
+    </td>
+    </tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator
+    </td>
+    <td valign=\"top\">Added example for how to couple a radiator to the zone model.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3659\">Buildings, #3659</a>.
+    </td>
+    </tr>
+</table>
+<!-- Backward compatible changes -->
+<p>
+The following <b style=\"color:blue\">existing components</b>
+have been <b style=\"color:blue\">improved</b> in a
+<b style=\"color:blue\">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.Air.Systems.SingleZone.VAV</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerChillerDXHeatingEconomizer<br/>
+    </td>
+    <td valign=\"top\">Adjust hysteresis based on heating to avoid chatter.<br>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3735\">#3735</a>.
+    </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Controls.DemandResponse</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Controls.DemandResponse.Client
+    </td>
+    <td valign=\"top\">Refactored implementation so it works also with OpenModelica.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/3754\">#3754</a>.
+    </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Electrical.Interfaces.InductiveLoad
+    </td>
+    <td valign=\"top\">Reformulated calculation of reactive power to bound argument of tangent away from &pi;,
+                       which avoids an infinite function value.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3776\">Buildings, #3776</a>.
+    </td>
+    </tr>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.FMI.AirToOutlet<br/>
+                           Buildings.Fluid.FMI.InletToAir<br/>
+                           Buildings.Fluid.FMI.FlowSplitter_u<br/>
+                           Buildings.Fluid.FMI.Sink_T<br/>
+                           Buildings.Fluid.FMI.Source_T<br/>
+                           Buildings.Fluid.FMI.Adaptors.Inlet<br/>
+                           Buildings.Fluid.FMI.Adaptors.Outlet
+    </td>
+    <td valign=\"top\">Added missing causality which is required for language compliance and for
+                       Wolfram System Modeler.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1829\">IBPSA, #1829</a> and
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1853\">IBPSA, #1853</a>.
+    </td>
+    <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors.Examples</b>
+    </td>
+    </tr>
+    <tr><td valign=\"top\">Buildings.Fluid.Sensors.Examples.PPM
+    </td>
+    <td valign=\"top\">Added pressure drop to avoid redundant initial conditions for pressure of control volume.
+                       This corrects an issue in Wolfram System Modeler.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1830\">#1830</a>.
+    </td>
+    <tr><td colspan=\"2\"><b>Buildings.Occupants</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Occupants.BaseClasses.binaryVariableGeneration<br/>
+                       Buildings.Occupants.BaseClasses.exponentialVariableGeneration<br/>
+                       Buildings.Occupants.BaseClasses.weibullVariableGeneration
+    </td>
+    <td valign=\"top\">Initialized <code>localSeed</code>.<br/>
+                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3549\">#3549</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone
+    </td>
+    <td valign=\"top\">Added radiative heat port to allow coupling of a radiator to the thermal zone.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3659\">Buildings, #3659</a>.
+    </td>
+<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.BaseClasses.ThermalZoneAdapter
+    </td>
+    <td valign=\"top\">Added <code>pre()</code> operator on mass flow rate and radiative heat gain
+                     to avoid an algebraic loop on discrete variables.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3659\">Buildings, #3659</a>.
+    </td>
+</tr>
+</table>
+<!-- Non-backward compatible changes to existing components -->
+<!-- Errors that have been fixed -->
+<p>
+The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
+that can lead to wrong simulation results):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
+                       Buildings.Fluid.SolarCollectors.EN12975
+    </td>
+    <td valign=\"top\">Corrected implementation of pressure drop calculation for the situation where the collectors are in parallel,
+                       e.g., if <code>sysConfig == Buildings.Fluid.SolarCollectors.Types.SystemConfiguration.Parallel</code>.<br/>
+                       This is for
+                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.interpolate
+    </td>
+    <td valign=\"top\">Corrected implementation to ensure that the function is once continuously differentiable.<br/>
+                       This is for
+                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1840\">IBPSA, #1840</a>.
+    </td>
+</tr>
+</table>
+<!-- Uncritical errors -->
+<p>
+The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
+that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
+units are wrong or errors in documentation):
+</p>
+<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
+<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumn<br/>
+                       Buildings.Airflow.Multizone.MediumColumnDynamic
+    </td>
+    <td valign=\"top\">Corrected wrong annotation.
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1842\">IBPSA, #1842</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.SkyClearness
+    </td>
+    <td valign=\"top\">Corrected wrong <code>displayUnit</code> attribute.<br/>
+                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1848\">IBPSA, #1848</a>.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.ReliefFan<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.ReliefFan<br/>
+                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.ReliefFanGroup
+    </td>
+    <td valign=\"top\">Corrected wrong use <code>displayUnit</code> attribute.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Examples</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
+                       Buildings.Examples.VAVReheat.BaseClasses.ASHRAE2006<br/>
+                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone
+    </td>
+    <td valign=\"top\">Corrected wrong use <code>displayUnit</code> attribute.
+    </td>
+</tr>
+<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
+    </td>
+</tr>
+<tr><td valign=\"top\">Buildings.Fluid.HeatPumps.EquationFitReversible
+    </td>
+    <td valign=\"top\">Corrected wrong assertion for operation mode.<br/>
+                     This is for
+                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3664\">Buildings, #3664</a>.
+    </td>
+</tr>
+
+</table>
+</html>"));
+end Version_9_1_2;
diff --git a/Buildings/UsersGuide/ReleaseNotes/package.mo b/Buildings/UsersGuide/ReleaseNotes/package.mo
new file mode 100644
index 00000000000..2ef5fa149c3
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/package.mo
@@ -0,0 +1,155 @@
+within Buildings.UsersGuide;
+package ReleaseNotes "Release notes"
+  extends Modelica.Icons.ReleaseNotes;
+
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<p>
+This section summarizes the changes that have been performed
+on the Buildings library.
+</p>
+<ul>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_11_0_1\">Version 11.0.1</a> (xxx, 2024)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_11_0_0\">Version 11.0.0</a> (April 9, 2024)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_10_1_0\">Version 10.1.0</a> (April 9, 2024)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_10_0_0\">Version 10.0.0</a> (September 5, 2023)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_1_2\">Version 9.1.2</a> (April 9, 2024)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_1_1\">Version 9.1.1</a> (September 5, 2023)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_1_0\">Version 9.1.0</a> (December 6, 2022)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_0_0\">Version 9.0.0</a> (May 31, 2022)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_3\">Version 8.1.3</a> (May 31, 2022)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_2\">Version 8.1.2</a> (May 26, 2022)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_1\">Version 8.1.1</a> (May 12, 2022)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_0\">Version 8.1.0</a> (December 9, 2021)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_0_0\">Version 8.0.0</a> (June 8, 2021)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_7_0_2\">Version 7.0.2</a> (December 9, 2021)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_7_0_1\">Version 7.0.1</a> (June 4, 2021)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_7_0_0\">Version 7.0.0</a> (May 28, 2020)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_6_0_0\">Version 6.0.0</a> (July 15, 2019)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_5_1_0\">Version 5.1.0</a> (June 14, 2018)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_5_0_1\">Version 5.0.1</a> (November 22, 2017)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_5_0_0\">Version 5.0.0</a> (November 17, 2017)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_4_0_0\">Version 4.0.0</a> (March 29, 2017)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_3_0_0\">Version 3.0.0</a> (March 29, 2016)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_2_1_0\">Version 2.1.0</a> (July 13, 2015)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_2_0_0\">Version 2.0.0</a> (May 4, 2015)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_6_build1\">Version 1.6 build1</a> (June 19, 2014)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_5_build3\">Version 1.5 build3</a> (February 12, 2014)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_5_build2\">Version 1.5 build2</a> (December 13, 2013)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_5_build1\">Version 1.5 build1</a> (October 24, 2013)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_4_build1\">Version 1.4 build1</a> (May 15, 2013)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_3_build1\">Version 1.3 build1</a> (January 8, 2013)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_2_build1\">Version 1.2 build1</a> (July 26, 2012)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_1_build1\">Version 1.1 build1</a> (February 29, 2012)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_0_build2\">Version 1.0 build2</a> (December 8, 2011)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_0_build1\">Version 1.0 build1</a> (November 4, 2011)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_12_0\">Version 0.12.0 </a> (May 6, 2011)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_11_0\">Version 0.11.0 </a> (March 17, 2011)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_10_0\">Version 0.10.0 </a> (July 30, 2010)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_9_1\">Version 0.9.1 </a> (June 24, 2010)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_9_0\">Version 0.9.0 </a> (June 11, 2010)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_8_0\">Version 0.8.0 </a> (February 6, 2010)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_7_0\">Version 0.7.0 </a> (September 29, 2009)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_6_0\">Version 0.6.0 </a> (May 15, 2009)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_5_0\">Version 0.5.0 </a> (February 19, 2009)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_4_0\">Version 0.4.0 </a> (October 31, 2008)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_3_0\">Version 0.3.0 </a> (September 30, 2008)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_2_0\">Version 0.2.0 </a> (June 17, 2008)
+</li>
+<li>
+<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_1_0\">Version 0.1.0 </a> (May 27, 2008)
+</li>
+</ul>
+</html>"));
+end ReleaseNotes;
diff --git a/Buildings/UsersGuide/ReleaseNotes/package.order b/Buildings/UsersGuide/ReleaseNotes/package.order
new file mode 100644
index 00000000000..675d014b513
--- /dev/null
+++ b/Buildings/UsersGuide/ReleaseNotes/package.order
@@ -0,0 +1,47 @@
+Version_11_0_1
+Version_11_0_0
+Version_10_1_0
+Version_10_0_0
+Version_9_1_2
+Version_9_1_1
+Version_9_1_0
+Version_9_0_0
+Version_8_1_3
+Version_8_1_2
+Version_8_1_1
+Version_8_1_0
+Version_8_0_0
+Version_7_0_2
+Version_7_0_1
+Version_7_0_0
+Version_6_0_0
+Version_5_1_0
+Version_5_0_1
+Version_5_0_0
+Version_4_0_0
+Version_3_0_0
+Version_2_1_0
+Version_2_0_0
+Version_1_6_build1
+Version_1_5_build3
+Version_1_5_build2
+Version_1_5_build1
+Version_1_4_build1
+Version_1_3_build1
+Version_1_2_build1
+Version_1_1_build1
+Version_1_0_build2
+Version_1_0_build1
+Version_0_12_0
+Version_0_11_0
+Version_0_10_0
+Version_0_9_1
+Version_0_9_0
+Version_0_8_0
+Version_0_7_0
+Version_0_6_0
+Version_0_5_0
+Version_0_4_0
+Version_0_3_0
+Version_0_2_0
+Version_0_1_0
diff --git a/Buildings/UsersGuide/package.mo b/Buildings/UsersGuide/package.mo
new file mode 100644
index 00000000000..bea6944a653
--- /dev/null
+++ b/Buildings/UsersGuide/package.mo
@@ -0,0 +1,167 @@
+within Buildings;
+package UsersGuide "User's Guide"
+  extends Modelica.Icons.Information;
+
+  annotation (preferredView="info",
+  Documentation(info="<html>
+<p>
+The <code>Buildings</code> library is a free open-source library for modeling of building energy and control systems.
+Many models are based on models from the package
+<a href=\"modelica://Modelica.Fluid\">Modelica.Fluid</a> and use
+the same ports to ensure compatibility with models from that library.
+</p>
+<p>
+The web page for this library is
+<a href=\"http://simulationresearch.lbl.gov/modelica\">http://simulationresearch.lbl.gov/modelica</a>.
+We welcome contributions from different users to further advance this library,
+whether it is through collaborative model development, through model use and testing
+or through requirements definition or by providing feedback regarding the model applicability
+to solve specific problems.
+</p>
+<p>
+The library has the following <i>User's Guides</i>:
+</p>
+<ol>
+<li>
+General information about the use of the <code>Buildings</code> library
+is available at
+<a href=\"http://simulationresearch.lbl.gov/modelica/userGuide\">
+http://simulationresearch.lbl.gov/modelica/userGuide</a>.
+This web site covers general information that is not specific to the
+use of individual packages or models.
+Discussed topics include
+how to get started, best practices, how to post-process results using Python,
+work-around for problems and how to develop models.<br/>
+</li>
+<li>
+Some packages have their own
+User's Guides that can be accessed by the links below.
+These User's Guides are explaining items that are specific to the
+particular package.<br/>
+<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Airflow.Multizone.UsersGuide\">Airflow.Multizone</a>
+   </td>
+   <td valign=\"top\">Package for multizone airflow and contaminant transport.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.BoundaryConditions.UsersGuide\">BoundaryConditions</a>
+   </td>
+   <td valign=\"top\">Package for computing boundary conditions, such as solar irradiation.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Controls.OBC\">Controls.OBC</a>
+   </td>
+   <td valign=\"top\">Package with the Control Description Language (CDL) and with control sequences that are implemented using CDL.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.DHC\">DHC</a>
+   </td>
+   <td valign=\"top\">Package with models for district heating and cooling systems.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.UsersGuide\">Fluid</a>
+   </td>
+   <td valign=\"top\">Package for one-dimensional fluid in piping networks with heat exchangers, valves, etc.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Actuators.UsersGuide\">Fluid.Actuators</a>
+   </td>
+   <td valign=\"top\">Package with valves and air dampers.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Cooling\">Fluid.DXSystems.Cooling</a>
+   </td>
+   <td valign=\"top\">Package with components for DX systems for cooling.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Heating\">Fluid.DXSystems.Heating</a>
+   </td>
+   <td valign=\"top\">Package with components for DX systems for heating.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.FMI.UsersGuide\">Fluid.FMI</a>
+   </td>
+   <td valign=\"top\">Package with blocks to export thermofluid flow models as Functional Mockup Units.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.HeatExchangers.ActiveBeams.UsersGuide\">Fluid.HeatExchangers.ActiveBeams</a>
+   </td>
+   <td valign=\"top\">Package with active beams.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.HydronicConfigurations.UsersGuide\">Fluid.HydronicConfigurations.UsersGuide</a>
+   </td>
+   <td valign=\"top\">Package with all major hydronic configurations of heating and cooling systems.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Cooling.UsersGuide\">Fluid.HeatExchangers.DXSystems.Cooling</a>
+   </td>
+   <td valign=\"top\">Package with direct evaporative cooling coils.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Heating.UsersGuide\">Fluid.HeatExchangers.DXSystems.Heating</a>
+   </td>
+   <td valign=\"top\">Package with air source DX heating coils.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.HeatExchangers.RadiantSlabs.UsersGuide\">Fluid.HeatExchangers.RadiantSlabs</a>
+   </td>
+   <td valign=\"top\">Package with radiant slabs.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Movers.UsersGuide\">Fluid.Movers</a>
+   </td>
+   <td valign=\"top\">Package with fans and pumps.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">Fluid.Sensors</a>
+   </td>
+   <td valign=\"top\">Package with sensors.</td>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Storage.UsersGuide\">Fluid.Storage</a>
+   </td>
+   <td valign=\"top\">Package with storage tanks and an expansion vessel.</td>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.SolarCollectors.UsersGuide\">Fluid.SolarCollectors</a>
+   </td>
+   <td valign=\"top\">Package with solar collectors.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Interfaces.UsersGuide\">Fluid.Interfaces</a>
+   </td>
+   <td valign=\"top\">Base models that can be used by developers to implement new models.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.HeatTransfer.UsersGuide\">HeatTransfer</a>
+   </td>
+   <td valign=\"top\">Package for heat transfer in building constructions.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Templates\">Templates</a>
+   </td>
+   <td valign=\"top\">Package with pre-configured templates of HVAC systems and their control sequences.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.UsersGuide.MixedAir\">ThermalZones.Detailed.UsersGuide.MixedAir</a>
+   </td>
+   <td valign=\"top\">Package for heat transfer in rooms and through the building envelope with the
+                      room air being modeled using the mixed air assumption.</td>
+</tr>
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.UsersGuide.CFD\">ThermalZones.Detailed.UsersGuide.CFD</a>
+   </td>
+   <td valign=\"top\">Package for heat transfer in rooms and through the building envelope with the
+                      room air being modeled using computational fluid dynamics.</td>
+</tr>
+
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.Examples.FFD.UsersGuide\">ThermalZones.Detailed.Examples.FFD.UsersGuide</a>
+   </td>
+   <td valign=\"top\">Package with examples that use the Fast Fluid Dynamics program for
+                    the computational fluid dynamics.</td>
+</tr>
+
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide\">ThermalZones.EnergyPlus.UsersGuide</a>
+   </td>
+   <td valign=\"top\">Package for Spawn of EnergyPlus with models that use EnergyPlus to simulate
+                    one or several building envelope models.</td>
+</tr>
+
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Utilities.IO.Python_3_8.UsersGuide\">Utilities.IO.Python_3_8</a>
+   </td>
+   <td valign=\"top\">Package to call Python functions from Modelica.</td>
+</tr>
+
+<tr><td valign=\"top\"><a href=\"modelica://Buildings.Utilities.Plotters.UsersGuide\">Utilities.Plotters</a>
+   </td>
+   <td valign=\"top\">Package that allow writing time series and scatter plots to an html output file.</td>
+</tr>
+
+</table><br/>
+</li>
+<li>
+There are also tutorials available at
+<a href=\"modelica://Buildings.Examples.Tutorial\">
+Buildings.Examples.Tutorial</a>.
+These tutorials contain step by step instructions for how to build system models.
+</li>
+</ol>
+</html>"));
+end UsersGuide;
diff --git a/Buildings/UsersGuide/package.order b/Buildings/UsersGuide/package.order
new file mode 100644
index 00000000000..c3ea20f63b8
--- /dev/null
+++ b/Buildings/UsersGuide/package.order
@@ -0,0 +1,5 @@
+Conventions
+ReleaseNotes
+Contact
+Acknowledgements
+License
diff --git a/Buildings/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mo b/Buildings/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mo
new file mode 100644
index 00000000000..8035aaf7b71
--- /dev/null
+++ b/Buildings/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mo
@@ -0,0 +1,55 @@
+within Buildings.Utilities.IO.Files.Validation;
+model WeeklyScheduleWindowsLineEndings "Weekly schedule example"
+  extends Modelica.Icons.Example;
+  parameter String data = "double tab1(3,5) #test:
+mon:0:0:10          -  3   1  -
+tue,thu:20:30:59  123  -  45  -
+wed                12  1   4  -" "Contents of schedule.txt";
+  Buildings.Utilities.IO.Files.WeeklySchedule weeSchLin(
+    columns={2,3,4,5},
+    tableOnFile=true,
+    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/schedule.txt"),
+    t_offset=1e6) "Weekly schedule example using file data source"
+    annotation (Placement(transformation(extent={{-10,20},{10,40}})));
+
+  Buildings.Utilities.IO.Files.WeeklySchedule weeSchWin(
+    columns={2,3,4,5},
+    tableOnFile=true,
+    fileName=Modelica.Utilities.Files.loadResource("modelica://Buildings/Resources/Data/scheduleWindows.txt"),
+    t_offset=1e6) "Weekly schedule example using parameter data source"
+    annotation (Placement(transformation(extent={{-10,-32},{10,-12}})));
+  Diagnostics.AssertEquality assEqu[4](
+    each startTime=-10000,
+    each threShold=Modelica.Constants.small)
+    "Trigger an assertion if the outputs differ"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+equation
+  connect(weeSchLin.y, assEqu.u1)
+    annotation (Line(points={{11,30},{24,30},{24,6},{38,6}}, color={0,0,127}));
+  connect(weeSchWin.y, assEqu.u2) annotation (Line(points={{11,-22},{24,-22},{24,
+          -6},{38,-6}}, color={0,0,127}));
+  annotation (
+    Documentation(info="<html>
+<p>
+Example for a weekly schedule that reads the schedule data from a file.
+There are two file readers, one reading a file with Windows line endings and the other with Linux line endings.
+</p>
+</html>",
+revisions="<html>
+<ul>
+<li>
+April 2, 2024, by Michael Wetter:<br/>
+First implementation.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1860\">IBPSA, #1860</a>.
+</li>
+</ul>
+</html>"),
+    experiment(
+      StartTime=-10000,
+      StopTime=1000000,
+      Tolerance=1e-06),
+    __Dymola_Commands(file=
+          "modelica://Buildings/Resources/Scripts/Dymola/Utilities/IO/Files/Validation/WeeklyScheduleWindowsLineEndings.mos"
+        "Simulate and plot"));
+end WeeklyScheduleWindowsLineEndings;
diff --git a/Buildings/Utilities/IO/Files/Validation/package.mo b/Buildings/Utilities/IO/Files/Validation/package.mo
new file mode 100644
index 00000000000..5dde0e7aecd
--- /dev/null
+++ b/Buildings/Utilities/IO/Files/Validation/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Utilities.IO.Files;
+package Validation "Collection of models that validate the models that access files"
+  extends Modelica.Icons.ExamplesPackage;
+
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains models that validate the models that access files.
+The examples plot various outputs. These model outputs are stored as reference data to
+allow continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Utilities/IO/Files/Validation/package.order b/Buildings/Utilities/IO/Files/Validation/package.order
new file mode 100644
index 00000000000..a47e6a26b06
--- /dev/null
+++ b/Buildings/Utilities/IO/Files/Validation/package.order
@@ -0,0 +1 @@
+WeeklyScheduleWindowsLineEndings
diff --git a/Buildings/Utilities/IO/Files/WeeklySchedule.mo b/Buildings/Utilities/IO/Files/WeeklySchedule.mo
index a4155579eed..9b06d00db0d 100644
--- a/Buildings/Utilities/IO/Files/WeeklySchedule.mo
+++ b/Buildings/Utilities/IO/Files/WeeklySchedule.mo
@@ -54,6 +54,10 @@ protected
         revisions="<html>
 <ul>
 <li>
+March 30 2024, by Filip Jorissen:<br/>
+Avoiding memory leaks for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1861\">IBPSA, #1860</a>.
+</li>
+<li>
 April 10 2022, by Filip Jorissen:<br/>
 Added parameter source implementation.
 </li>
@@ -90,7 +94,7 @@ The parameter <code>columns</code> is used to specify which columns of the table
 The first column is time, hence for the above example, set <code>columns = {2}</code>.
 </p>
 <p>
-See <a href=\"modelica://Buildings/Resources/Data/schedule.txt\">Buildings/Resources/Data/schedule.txt</a> 
+See <a href=\"modelica://Buildings/Resources/Data/schedule.txt\">Buildings/Resources/Data/schedule.txt</a>
 for an example of the supported file format.
 </p>
 </html>"),
diff --git a/Buildings/Utilities/IO/Files/package.order b/Buildings/Utilities/IO/Files/package.order
index 5c6edd3f4f7..78aa16d278d 100644
--- a/Buildings/Utilities/IO/Files/package.order
+++ b/Buildings/Utilities/IO/Files/package.order
@@ -4,4 +4,5 @@ JSONWriter
 Printer
 WeeklySchedule
 Examples
+Validation
 BaseClasses
diff --git a/Buildings/Utilities/Plotters/Examples/SingleZoneVAVSupply_u.mo b/Buildings/Utilities/Plotters/Examples/SingleZoneVAVSupply_u.mo
index faac5764003..1a384ae22a1 100644
--- a/Buildings/Utilities/Plotters/Examples/SingleZoneVAVSupply_u.mo
+++ b/Buildings/Utilities/Plotters/Examples/SingleZoneVAVSupply_u.mo
@@ -137,7 +137,7 @@ The plot will be generated in the file <code>plots.html</code>.
 </p>
 <p align=\"center\">
 <img alt=\"Image of set point reset\"
-src=\"modelica://Buildings/Resources/Images/Obsolete/Controls/OBC/ASHRAE/G36_PR1/AHUs/VAVSingleZoneTSupSet.png\"/>
+src=\"modelica://Buildings/Resources/Images/Controls/OBC/ASHRAE/G36/AHUs/SingleZone/VAV/SetPoints/Supply_Temperature.png\"/>
 </p>
 </html>", revisions="<html>
 <ul>
diff --git a/Buildings/package.mo b/Buildings/package.mo
index 508b8802834..605032f0924 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -2,13810 +2,19 @@ within ;
 package Buildings "Library with models for building energy and control systems"
   extends Modelica.Icons.Package;
 
-package UsersGuide "User's Guide"
-  extends Modelica.Icons.Information;
-  class Conventions "Conventions"
-    extends Modelica.Icons.Information;
-    annotation (preferredView="info",
-    Documentation(info="<html>
-<p>
-The <code>Buildings</code> library uses the following conventions,
-which largely are based on the conventions of the Modelica Standard Library.
-</p>
-
-<h4>Package structure</h4>
-<p>
-Packages have usually the following subpackages:
-</p>
-<ul>
-<li>
-<code>UsersGuide</code> containing an overall description of the library
-and how to use it.
-</li>
-<li>
-<code>Examples</code> containing models demonstrating the
-usage of the library.
-</li>
-<li>
-<code>Validation</code> containing typically small models that validate a certain
-behavior of a model.
-</li>
-<li>
-<code>Interfaces</code> containing connectors and partial models.
-</li>
-<li>
-<code>Types</code> containing type, enumeration and choice definitions.
-</li>
-</ul>
-
-<h4>Naming</h4>
-<ol>
-<li>
-Class names of models, blocks and packages should start with an upper-case letter and be a
-noun or a noun with a combination of adjectives and nouns.
-Use camel-case notation to combine multiple words, such as <code>HeatTransfer</code>.
-Don't repeat higher level package names, for example, rather than <code>Chillers.CarnotChiller</code>,
-use <code>Chillers.Carnot</code>.
-</li>
-<li>
-Instance names should be a combination of the first three
-characters of a word, such as <code>preDro</code> for pressure drop model.
-Where applicable, a single character can be used if this is generally understood, such
-as <code>T</code> for temperature, <code>p</code> for pressure, <code>u</code> for control input
-and <code>y</code> for control output signal. As needed, these can be augmented, for example
-a controller that outputs a control signal for a valve and a damper may output <code>yVal</code>
-and <code>yDam</code>.
-</li>
-<li>
-The following variables are frequently used for physical quantities:
-<ul>
-<li><code>T</code> for temperature,</li>
-<li><code>p</code> for pressure,</li>
-<li><code>dp</code> for pressure difference,</li>
-<li><code>P</code> for power,</li>
-<li><code>E</code> for energy (or <code>Q</code> for thermal energy),</li>
-<li><code>X</code> for mass fraction,</li>
-<li><code>Q_flow</code> for heat flow rate</li>
-<li><code>m_flow</code> for mass flow rate and</li>
-<li><code>H_flow</code> for enthalpy flow rate.</li>
-</ul>
-</li>
-<li>
-The nomenclature used in the package
-<a href=\"modelica://Buildings.Utilities.Psychrometrics\">
-Buildings.Utilities.Psychrometrics</a>
-is as follows,
-<ul>
-<li>
-Uppercase <code>X</code> denotes mass fraction per total mass.
-</li>
-<li>
-Lowercase <code>x</code> denotes mass fraction per mass of dry air.
-</li>
-<li>
-The notation <code>z_xy</code> denotes that the function or block has output
-<code>z</code> and inputs <code>x</code> and <code>y</code>.
-</li>
-<li>
-The symbol <code>pW</code> denotes water vapor pressure, <code>TDewPoi</code>
-denotes dew point temperature, <code>TWetBul</code> denotes wet bulb temperature,
-and <code>TDryBul</code> (or simply <code>T</code>) denotes dry bulb temperature.
-</li>
-</ul>
-</li>
-<li>
-Control input signals usually start with <code>u</code> and control output signals usually start with <code>y</code>,
-unless use of the physical quantity is clearer.
-</li>
-<li>
-The following strings are frequently used:
-<ul>
-<li>
-Prefix <code>use_</code> for conditionally enabled input signals, such as <code>use_T_in</code>
-for enabling an input connector for temperature in
-<a href=\"modelica://Buildings.Fluid.Sources.Boundary_pT\">Buildings.Fluid.Sources.Boundary_pT</a>,
-or as <code>use_enthalpy</code> in
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Enable\">
-Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Enable</a>
-to flag if it should evaluate outdoor air enthalpy in addition to temperature.
-</li>
-<li>
-Prefix <code>have_</code> if a controller has a certain input, such as <code>have_CO2Sen</code>
-in <a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Controller\">
-Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Controller</a> if the zone has a CO<sub>2</sub> sensor.
-</li>
-<li>
-Suffix <code>_flow</code> for a flow variable, such as <code>Q_flow</code>, <code>m_flow</code>
-and <code>V_flow</code>.
-See <a href=\"modelica://Buildings.Fluid.Sensors.VolumeFlowRate\">
-Buildings.Fluid.Sensors.VolumeFlowRate</a>.
-</li>
-<li>
-Suffix <code>_nominal</code> for the design or nominal capacity, i.e., <code>Q_flow_nominal</code> is the
-capacity of a device that it has at full load, and <code>m_flow_nominal</code> is the design mass flow rate.
-See <a href=\"modelica://Buildings.Fluid.HeatExchangers.HeaterCooler_u\">
-Buildings.Fluid.HeatExchangers.HeaterCooler_u</a>.
-</li>
-<li>
-Suffix <code>_small</code> for a small value which is typically used for regularization (to ensure
-a numerically robust implementation).
-</li>
-<li>
-Suffix <code>Set</code> for set point.
-</li>
-<li>
-Suffix <code>_min</code> (<code>_max</code>) for minimum (maximum),
-such as <code>TSupCoo_min</code> for the lowest cooling supply air temperature
-setpoint in
-<a href=\"modelica://Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.SupplyTemperature\">
-Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.SupplyTemperature</a>.
-</li>
-</ul>
-</li>
-<li>
-The two connectors of a domain that have identical declarations
-and different icons are usually distinguished by <code>_a</code>, <code>_b</code>
-or <code>_p</code>, <code>_n</code>.
-Examples are fluid ports <code>port_a</code> and <code>port_b</code>
-or electrical connectors
-<code>terminal_p</code> and <code>terminal_n</code>.
-</li>
-</ol>
-
-<h4>Documentation</h4>
-<ol>
-<li>
-In the html documentation, start additional headings with
-<code>h4</code>.
-(The headings <code>h1, h2, h3</code> must not be used,
-because they are utilized from the automatically generated
-documentation.)
-</li>
-<li>
-Comments must be added to each class (package, model, function etc.).
-</li>
-<li>
-The first character should be upper case.
-</li>
-<li>
-For one-line comments of parameters, variables and classes, no period should be used at the end of the comment.
-</li>
-</ol>
-
-<h4>Graphical display</h4>
-<ol>
-<li>
-The instance name of a component is always displayed in its icon
-(using the text string \"%name\") in blue color.
-</li>
-<li>
-A connector class has the instance
-name definition in the diagram layer and usually not in the icon layer, unless this helps with usability.
-</li>
-<li>
-The value of main parameters, such as nominal capacity, are displayed
-in the icon in black color in a smaller font size as the instance name
-if this helps with usability.
-</li>
-</ol>
-
-<h4>Miscellaneous</h4>
-<ol>
-<li>
-Where applicable, all variable must have units, also if the variable is protected.
-</li>
-<li>
-Each class (i.e., model, block and function) must be used in an example or validation case.
-</li>
-</ol>
-</html>"));
-  end Conventions;
-
-  package ReleaseNotes "Release notes"
-    extends Modelica.Icons.ReleaseNotes;
-
-    class Version_11_0_0 "Version 11.0.0"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 11.0.0 is ...
-</p>
-</div>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\"><p>Buildings.ThermalZones.Detailed.Examples.ISAT</p>
-    </td>
-    <td valign=\"top\"><p>Package with thermal airflow model using in situ adaptive tabulation.</p>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.Tutorial.SimpleHouse
-    </td>
-    <td valign=\"top\">Tutorial for how to build a simple system model.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.HotWater
-    </td>
-    <td valign=\"top\">Package of models for domestic hot water generation and loads served by district networks.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.Combined</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger
-    </td>
-    <td valign=\"top\">Created partial base class to support two versions of the
-                       energy transfer station.  One that heats domestic hot
-                       water with a heat pump, and one that heats domestic
-                       hot water with a heat pump plus storage tank and heat exchanger.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank
-    </td>
-    <td valign=\"top\">Version of
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
-                       that heats domestic hot water with a heat pump plus storage tank and heat exchanger.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump
-    </td>
-    <td valign=\"top\">Partial base class to support two versions of heat pump subsystem.
-                       One which directly heats water through condenser, and
-                       one which uses the heat pump to heat water in a storage tank,
-                       which can be circulated to heat water through a heat exchanger.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank
-    </td>
-    <td valign=\"top\">Uses a heat pump to heat water in a storage tank,
-                       which can be circulated to heat domestic hot water through a heat exchanger,
-                       modeled with
-                       <a href=\"Modelica://Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger\">
-                       Buildings.Experimental.DHC.Loads.HotWater.StorageTankWithExternalHeatExchanger</a>.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank
-    </td>
-    <td valign=\"top\">Similar to <a href=\"Modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS\">
-                       Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS</a>,
-                       but uses <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchangerDHWTank</a>
-                       as the ETS.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank
-    </td>
-    <td valign=\"top\">Example model for use of <a href=\"Modelica://Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank\">
-                       Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETSWithDHWTank</a>.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.BuriedPipes.PipeGroundCoupling
-    </td>
-    <td valign=\"top\">Ground coupling model <a href=\"Modelica://Buildings.Fluid.FixedResistances.BuriedPipes.PipeGroundCoupling\">
-                       Buildings.Fluid.FixedResistances.BuriedPipes.PipeGroundCoupling</a>.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution1Pipe_R
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution1Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Distribution1Pipe_R</a>. One pipe distribution network that uses autosize 
-    pipes for supply and lossless for connection. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Distribution1PipePlugFlow_v</a>. One pipe distribution network that uses plugflow 
-    pipes for supply and lossless for connection. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution2Pipe_R
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution2Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Distribution2Pipe_R</a>. Two pipes network that uses autosize pipes for 
-    supply and return, and lossless for connection. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Connections</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection1Pipe_R</a>. One pipe connection model using autosize pipes for supply 
-    and lossless for connection. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection1PipePlugFlow_v</a>. One pipe connection model using plugflow pipes for supply 
-    and lossless for connection. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection2Pipe_R</a>. Two pipes connection model using autosize pipes for supply 
-    and return, lossless for connection. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample\">
-    Buildings.Experimental.DHC.Networks.Connections.Examples.Connection1PipeExample</a>. Example model for one pipe connections. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample\">
-    Buildings.Experimental.DHC.Networks.Connections.Examples.Connection2PipeExample</a>. Example model for two pipes connections. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe\">
-    Buildings.Experimental.DHC.Networks.Controls.AgentPump1Pipe</a>. Agent controller (i.e. borefield, waste heat plant) 
-    for one pipe networks. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample\">
-    Buildings.Experimental.DHC.Networks.Controls.Examples.AgentPump1PipeExample</a>. Example model for AgentPump1Pipe. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample\">
-    Buildings.Experimental.DHC.Networks.Controls.Examples.MainPump1PipeExample</a>. Example model for MainPump1PipeExample. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Examples.Combined</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl
-    </td>
-    <td valign=\"top\"> Added <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
-    Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>. This example model showcases a more sophisticated way 
-    of controlling district agent pumps. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr>                                                            
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Interpolate<br/>
-                       Buildings.Utilities.Math.Examples.Interpolate
-    </td>
-    <td valign=\"top\">Created a block with an example model for
-                       <a href=\"modelica://Buildings.Utilities.Math.Functions.interpolate\">
-                       Buildings.Utilities.Math.Functions.interpolate</a>.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1844\">IBPSA, #1844</a>.
-    </td>
-</tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Controls.OBC.ASHRAE.G36</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Controller
-    </td>
-    <td valign=\"top\">Added 2-position relief damper position output <code>y1RelDam</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.Examples
-    </td>
-    <td valign=\"top\">Changed the package name from <code>Examples</code> to <code>Validation</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3517\">issue 3517</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPort<br/>
-                     Buildings.Fluid.Interfaces.PartialTwoPort<br/>
-                     Buildings.Fluid.Interfaces.PartialTwoPortVector
-    </td>
-    <td valign=\"top\">Changed implementation to allow moving fluid connector.
-                     This accomodates implementation of models that should have connectors on the top and bottom (such as a tank)
-                     and moving of connectors for models that need larger icons.<br/>
-                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">IBPSA, #1781</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.Heating</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Heating.Direct
-    </td>
-    <td valign=\"top\">Documentation corrected for heating.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">issue 3628</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Heating.Indirect
-    </td>
-    <td valign=\"top\">Documentation corrected for heating.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">issue 3628</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Templates</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Templates.Components.Fans.ArrayVariable
-    </td>
-    <td valign=\"top\">Refactored with flow rate multiplier.<br/>
-                  This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3536\">#3536</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Building
-    </td>
-    <td valign=\"top\">Tightened <code>relativeSurfaceTolerance</code>, which is the tolerance used by
-                       EnergyPlus, for the surface radiative heat balance solver.
-                       This was required for some coupled simulations that exchange radiative heat transfer
-                       between Modelica and EnergyPlus to converge.
-                       For details, see section <i>Known Issues</i> in
-                       <code>Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide</code>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.AirHeating<br/>
-                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer<br/>
-                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom<br/>
-                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface<br/>
-                     Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.Radiator
-    </td>
-    <td valign=\"top\">Added insulation to EnergyPlus input data file and resized the system.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3707\">#3707</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007<br/>
-                     Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007
-    </td>
-    <td valign=\"top\">Changed implementation to allow ground temperature to be taken from an input rather than using
-                     a constant value.<br/>
-                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1744\">IBPSA, #1744</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses  </b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Pump_m_flow
-    </td>         
-    <td valign=\"top\"> Updated pump model to use
-    to <a href=\"Modelica://Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow\">
-    Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow </a>. This change allows to have a better 
-    estimation of pump default curve using euler number. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr> 
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger
-    </td>         
-    <td valign=\"top\"> Reduced <code>swiFlo.dpValve_nominal</code> to numerically zero to avoid reverse flow. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr> 
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses  </b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump
-    </td>         
-    <td valign=\"top\"> Converted heat pump model to dynamic by changing <code>heaPum.energyDynamics</code> to 
-    <code>Modelica.Fluid.Types.Dynamics.FixedInitial</code> and added junction on recirculation loop. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr> 
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Examples.Combined  </b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.SeriesConstantFlow
-    </td>         
-    <td valign=\"top\"> Added connections that were removed in
-    <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries\">
-    Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr> 
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlow
-    </td>         
-    <td valign=\"top\"> Added connections that were removed in
-    <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries\">
-    Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries </a>. This is for 
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr> 
-
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sources.ModelTime
-    </td>
-    <td valign=\"top\">Renamed the block to <code>CivilTime</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3596\">issue 3596</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Or3<br/>
-                       Buildings.Controls.OBC.CDL.Logical.ZeroCrossing<br/>
-                       Buildings.Controls.OBC.CDL.Logical.OnOffController<br/>
-                       Buildings.Controls.OBC.CDL.Logical.TriggeredTrapezoid
-    </td>
-    <td valign=\"top\">Moved the block to the <code>Obsolete</code> package.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3595\">issue 3595</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits
-    </td>
-    <td valign=\"top\">Added coil type enumeration and removed the coil type flags.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Controller
-    </td>
-    <td valign=\"top\">Removed the connectors <code>uCooCoi_actual</code> and <code>uHeaCoi_actual</code>,
-                       added coil type enumeration and removed the coil type flags.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">issue 3526</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialDirect
-    </td>
-    <td valign=\"top\">Change input <code>TSetDisRet</code> to <code>TDisRetSet</code>.
-    </td>
-</tr>
-    <tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.PartialIndirect
-    </td>
-    <td valign=\"top\">Change input <code>TSetBuiSup</code> to <code>TBuiSupSet</code>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger
-    </td>
-    <td valign=\"top\">Extend from new partial base class
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.BaseClasses.PartialHeatPumpHeatExchanger</a>.
-                       Evaporator water flow through space heating and domestic how water heat
-                       pumps is constant, with dT across district supply and return controlled by three-way mixing valve.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump
-    </td>
-    <td valign=\"top\">Extend from new partial base class
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.BaseClasses.PartialHeatPump</a>.
-                       Evaporator water flow through heat pump
-                       is constant, with dT across district supply and return controlled by three-way mixing valve.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPump
-    </td>
-    <td valign=\"top\">Validation test for
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</a>.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank
-    </td>
-    <td valign=\"top\">Validation test for
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDHWTank</a>.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.BuildingTimeSeriesWithETS
-    </td>
-    <td valign=\"top\">Updated to use new version of
-                       <a href=\"Modelica://Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger\">
-                       Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger</a>
-                       as the ETS.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">issue 3063</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Combined.Subsystems.BaseClasses.MultipleCommands
-    </td>
-    <td valign=\"top\">The class has been moved to Buildings.Templates.Components.Controls.MultipleCommands.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3536\">#3536</a>.<br/>
-                     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\"></a>.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3628\">#3628</a>.<br/>
-                     This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
-                       Buildings.Fluid.SolarCollectors.EN12975
-    </td>
-    <td valign=\"top\">Changed assignment of <code>computeFlowResistance</code> to <code>final</code> based on
-                       <code>dp_nominal</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3597\">Buildings, #3597</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Templates</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Templates.AirHandlersFans.Data.PartialAirHandler<br/>
-                     Buildings.Templates.AirHandlersFans.Data.VAVMultiZone<br/>
-                     Buildings.Templates.AirHandlersFans.Interfaces.PartialAirHandler<br/>
-                     Buildings.Templates.AirHandlersFans.VAVMultiZone<br/>
-                     Buildings.Templates.ZoneEquipment.Data.PartialAirTerminal<br/>
-                     Buildings.Templates.ZoneEquipment.Data.VAVBox<br/>
-                     Buildings.Templates.ZoneEquipment.Interfaces.PartialAirTerminal<br/>
-                     Buildings.Templates.ZoneEquipment.Interfaces.VAVBox<br/>
-                     Buildings.Templates.ZoneEquipment.VAVBoxCoolingOnly<br/>
-                     Buildings.Templates.ZoneEquipment.VAVBoxReheat
-    </td>
-    <td valign=\"top\">Refactored with a record class for configuration parameters.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3500\">#3500</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Templates.Components.Dampers<br/>
-                     Buildings.Templates.Components.Valves
-    </td>
-    <td valign=\"top\">The models in these packages have been retired and replaced
-                with two container classes within <code>Buildings.Templates.Components.Actuators</code>
-                that cover all equipment types, and allow the flow characteristic to be specified
-                with one parameter.<br/>
-                             This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3539\">#3539</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Geothermal.BuriedPipes
-    </td>
-    <td valign=\"top\">Moved to Buildings.Fluid.FixedResistances.BuriedPipes
-                       <a href=\"Modelica://Buildings.Fluid.FixedResistances.BuriedPipes\"></a>.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">#3431</a>.<br/>
-                     This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2Pipe 
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Connection2Pipe</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow 
-    </td>         
-    <td valign=\"top\"> Moved and renamed <code>Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Connections.Connection2PipePlugFlow_v </a>. Also updated available paremeters
-    for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>      
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Distribution2Pipe  
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Distribution2Pipe</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>     
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow 
-    </td>         
-    <td valign=\"top\"> Renamed <code>Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v\">
-    Buildings.Experimental.DHC.Networks.Distribution2PipePlugFlow_v </a>. Also updated available paremeters
-    for sizing and heatport configuration. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow 
-    </td>         
-    <td valign=\"top\"> Renamed <code>Buildings.Experimental.DHC.Networks.Controls.MainPump</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe\">
-    Buildings.Experimental.DHC.Networks.Controls.MainPump1Pipe </a>. Also updated available paremeters
-    and documentation. This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr> 
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined </b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.UnidirectionalParallel
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.UnidirectionalParallel</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.UnidirectionalSeries
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.UnidirectionalSeries</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined.BaseClasses </b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelAutosize</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionParallelStandard</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesAutosize</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.ConnectionSeriesStandard</code>.  
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">#3694</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize
-    </td>         
-    <td valign=\"top\"> Moved <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize\">
-    Buildings.Experimental.DHC.Networks.Pipes.PipeAutosize</a>. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr>  
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard
-    </td>         
-    <td valign=\"top\"> Moved <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Pipes.PipeStandard\">
-    Buildings.Experimental.DHC.Networks.Pipes.PipeStandard</a>. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr> 
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.Validation.Pipe
-    </td>         
-    <td valign=\"top\"> Moved <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.Validation.Pipe</code>
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe\">
-    Buildings.Experimental.DHC.Networks.Pipes.Validation.Pipe</a>. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3694\">issue 3694</a>.
-    </td>
-</tr> 
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Examples.Combined.BaseClasses </b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries
-    </td>         
-    <td valign=\"top\"> Removed several connections to implement
-    to <a href=\"Modelica://Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl\">
-    Buildings.Experimental.DHC.Examples.Combined.SeriesVariableFlowAgentControl</a>. 
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3431\">issue 3431</a>.
-    </td>
-</tr> 
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.interpolate<br/>
-                       Buildings.Utilities.Math.Functions.Examples.Interpolate
-    </td>
-    <td valign=\"top\">Moved these classes to
-                       <a href=\"modelica://Buildings.Utilities.Math.Functions\">
-                       Buildings.Utilities.Math.Functions</a>
-                       from
-                       <a href=\"modelica://Buildings.Airflow.Multizone.BaseClasses\">
-                       Buildings.Airflow.Multizone.BaseClasses</a>.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1844\">IBPSA, #1844</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>xxx</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">xxx
-    </td>
-    <td valign=\"top\">xxx.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Templates</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Templates.AirHandlersFans.Components.Controls.G36VAVMultiZone<br/>
-                       Buildings.Templates.AirHandlersFans.Components.Data.OutdoorReliefReturnSection<br/>
-                       Buildings.Templates.AirHandlersFans.Components.Interfaces.PartialOutdoorReliefReturnSection<br/>
-                       Buildings.Templates.AirHandlersFans.Components.Interfaces.PartialReliefReturnSection<br/>
-                       Buildings.Templates.AirHandlersFans.Components.OutdoorReliefReturnSection.MixedAirWithDamper<br/>
-                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.NoRelief<br/>
-                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.NoReturn<br/>
-                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReliefDamper<br/>
-                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReliefFan<br/>
-                       Buildings.Templates.AirHandlersFans.Components.ReliefReturnSection.ReturnFan<br/>
-                       Buildings.Templates.AirHandlersFans.Configuration.PartialAirHandler<br/>
-                       Buildings.Templates.AirHandlersFans.Data.VAVMultiZone<br/>
-                       Buildings.Templates.AirHandlersFans.VAVMultiZone
-    </td>
-    <td valign=\"top\">Added support for additional configurations.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3526\">#3526</a>
-                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3520\">#3520</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>xxx</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">xxx
-    </td>
-    <td valign=\"top\">xxx.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>xxx</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">xxx
-    </td>
-    <td valign=\"top\">xxx.
-    </td>
-</tr>
-</table>
-<p>
-Note:
-</p>
-<ul>
-<li>
-xxx
-</li>
-</ul>
-</html>"));
-    end Version_11_0_0;
-
-
-  class Version_10_0_0 "Version 10.0.0"
-  extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 10.0.0 is a major release that adds various new packages and models.
-</p>
-<p>
-The library has been tested with
-Dymola 2023x,
-OpenModelica 1.22.0-dev (41-g8a5b18f-1),
-OPTIMICA 1.43.4 and recent versions of Impact.
-</p>
-<p>
-The following major changes have been done compared to release 9.1.1:
-</p>
-<ul>
-<li>
-A package with configurable template models for variable air volume flow systems
-with control based on ASHRAE Guideline 36 has been added to
-<code>Buildings.Template</code>.
-</li>
-<li>
-Reduced order building envelope models
-based on the ISO 13790:2008 Standard have been added.
-This allows modeling of building envelope heat transfer either with a detailed Modelica
-multizone model (<code>Buildings.ThermalZones.Detailed</code>),
-with EnergyPlus via the Spawn coupling (<code>Buildings.ThermalZones.EnergyPlus_9_6_0</code>),
-or with reduced order models based on ISO 13790 (<code>Buildings.ThermalZones.ISO13790</code>)
-or based on VDI 6007 (<code>Buildings.ThermalZones.ReducedOrder</code>).
-</li>
-<li>
-Various models for district energy systems have been added to the package
-<code>Buildings.Experimental</code>.
-This package includes models for
-<ul>
-<li>
-combined heating and cooling district energy systems
-that operate near ambient temperature (sometimes called 5th generation district energy systems),
-</li>
-<li>
-Energy Transfer Stations (ETS) with all electric plants with heat recovery chillers,
-</li>
-<li>
-ETS with multiple heat pumps (heat recovery as well as air-source heat pumps) and storage, i.e.,
-the so-called Time-Independent Energy Recovery (TIER) plant in
-(<code>Buildings.Experimental.DHC.Plants.Combined.AllElectricCWStorage</code>),
-</li>
-<li>
-direct and indirect ETS for heating or for cooling, and
-</li>
-<li>
-district steam systems.
-</li>
-</ul>
-</li>
-<li>
-A package with all major hydronic configurations that are encountered in heating and cooling systems
-has been added in <code>Buildings.Fluid.HydronicConfigurations</code>.
-This package also includes automatic sizing of control valves to obtain suitable valve authority.
-</li>
-<li>
-The fan and pump models have been revised, and can now be configured to compute
-the part load efficiency based on the Euler number.
-</li>
-<li>
-Various new elementary control blocks have been added to the <code>Buildings.Controls.OBC.CDL</code> package to
-provide a reference implementation of the ASHRAE Standard 231P
-<i>Control Description Language</i> that is currently being developed.
-See also <a href=\"https://obc.lbl.gov\">obc.lbl.gov</a>.
-</li>
-</ul>
-</div>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Templates
-    </td>
-    <td valign=\"top\">Package that contains templates for HVAC systems with control sequences
-                       based on ASHRAE Guideline 36.
-                       Currently limited to VAV systems, the package is under active development
-                       and will be further expanded with templates for primary systems and various
-                       types of zone equipment.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.ISO13790
-    </td>
-    <td valign=\"top\">Package that contains models for reduced building physics of thermal zones
-                       based on a thermal network consisting of five resistances and one capacity.
-                       The models are inspired by the ISO 13790:2008 Standard.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Heating
-    </td>
-    <td valign=\"top\">Package containing models for energy transfer stations used in district heating systems.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Combined.Examples
-    </td>
-    <td valign=\"top\">Package that contains example models of a building
-                       with loads provided as time series for heat
-                       pump space heating, heat pump domestic hot water heating,
-                       and free cooling in an ambient district network.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Heating
-    </td>
-    <td valign=\"top\">Package containing models for loads in district heating systems.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Combined
-    </td>
-    <td valign=\"top\">Package of models for central plants that provide heating and cooling.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.BaseClasses.Steam
-    </td>
-    <td valign=\"top\">Package for steam systems using the split-medium approach..
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Steam
-    </td>
-    <td valign=\"top\">Package of example models for steam district heating systems.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.Steam
-    </td>
-    <td valign=\"top\">Package with models for loads involving steam systems.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Steam
-    </td>
-    <td valign=\"top\">Package of models for distribution networks involving steam.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Steam
-    </td>
-    <td valign=\"top\">Package with models for steam plants.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HydronicConfigurations
-    </td>
-    <td valign=\"top\">Package that contains models for standard connection
-                       configurations used in hydronic circuits for heating or cooling applications.
-    </td>
-</tr>
-  </table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Proof
-    </td>
-    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231p committee.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3256\">issue 3256</a>.
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.VariablePulse
-    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231p committee.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3042\">issue 3042</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Ramp
-    </td>
-    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231p committee.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3141\">issue 3141</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Stage
-    </td>
-    <td valign=\"top\">Added new CDL blocks as suggested by ASHRAE 231P committee.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3103\">issue 3103</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants.Cooling</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.StoragePlant<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.FlowControl<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.SelectMin<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.TankStatus<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Controls.Validation.TankStatus<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.Examples.StoragePlantDualSource<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.IdealUser<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelJunctions<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ParallelPipes<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.ReversibleConnection<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.TankBranch<br/>
-                       Buildings.Experimental.DHC.Plants.Cooling.BaseClasses.Validation.IdealUser
-    </td>
-    <td valign=\"top\">Added models for a district CHW system with two plants,
-                       where one of them has a storage tank that can be charged remotely by the other plant.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2859\">issue 2859</a>.
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">
-        Buildings.Fluid.Movers.Examples.Data.EnglanderNorford1992<br/>
-        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW12<br/>
-        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW13<br/>
-        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW15<br/>
-        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW16<br/>
-        Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW18<br/>
-        Buildings.Fluid.Movers.Examples.StaticReset<br/>
-        Buildings.Fluid.Movers.Validation.PowerEuler<br/>
-        Buildings.Fluid.Movers.BaseClasses.Euler.computeTables<br/>
-        Buildings.Fluid.Movers.BaseClasses.Euler.correlation<br/>
-        Buildings.Fluid.Movers.BaseClasses.Euler.getPeak<br/>
-        Buildings.Fluid.Movers.BaseClasses.Euler.lookupTables<br/>
-        Buildings.Fluid.Movers.BaseClasses.Euler.peak<br/>
-        Buildings.Fluid.Movers.BaseClasses.Validation.EulerComparison<br/>
-        Buildings.Fluid.Movers.BaseClasses.Validation.EulerCurve<br/>
-        Buildings.Fluid.Movers.BaseClasses.Validation.EulerReducedSpeed<br/>
-        Buildings.Fluid.Movers.BaseClasses.Validation.HydraulicEfficiencyMethods<br/>
-        Buildings.Fluid.Movers.BaseClasses.Validation.TotalEfficiencyMethods
-    </td>
-    <td valign=\"top\">
-    Added package that enables the Euler number method for efficiency computation,
-    as well as example models, validation models, and data records to support it.<br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-        Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiency_yMot<br/>
-        Buildings.Fluid.Movers.BaseClasses.Characteristics.efficiencyParameters_yMot<br/>
-        Buildings.Fluid.Movers.BaseClasses.Characteristics.motorEfficiencyCurve<br/>
-        Buildings.Fluid.Movers.BaseClasses.Validation.MotorEfficiencyMethods
-    </td>
-    <td valign=\"top\">
-    Added functions and data records that allow the motor efficiency to be provided
-    as a function of part load ratio, and its validation model.<br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-        Buildings.Fluid.Movers.Preconfigured.FlowControlled_dp<br/>
-        Buildings.Fluid.Movers.Preconfigured.FlowControlled_m_flow<br/>
-        Buildings.Fluid.Movers.Preconfigured.SpeedControlled_y<br/>
-        Buildings.Fluid.Movers.Preconfigured.Validation.ControlledFlowMachinePreconfigured
-    </td>
-    <td valign=\"top\">
-    Added preconfigured versions for the mover models that only require the user
-    to provide nominal conditions.<br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-        Buildings.Fluid.Movers.Validation.PressureCurve
-    </td>
-    <td valign=\"top\">
-    Added a validation model that displays the pressure curve.<br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3371\">#3371</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.BaseClasses.PartialAirSource
-    </td>
-    <td valign=\"top\">Added new base class that only provides moist air as a medium selection.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1681\">IBPSA, #1681</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Files</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Utilities.IO.Files.WeeklySchedule
-    </td>
-    <td valign=\"top\">Added model to read weekly time schedules from a file.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1601\">IBPSA, #1601</a>.
-    </td>
-  </tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Controls.OBC.ASHRAE.G36.TerminalUnits</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms
-    </td>
-    <td valign=\"top\">Added delay triggering alarms after enabling AHU supply fan, to allow the system becoming stabilized.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants.Cooling</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.Controls.ChilledWaterPumpSpeed
-    </td>
-    <td valign=\"top\">Set <code>final totPum.nin = numPum</code> so that this block is restricted
-                       to a two-pump configuration as intended.
-                       Also corrected the \"up to two pumps\" language in documentation.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3470\">issue 3470</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.UsersGuide<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx
-    </td>
-    <td valign=\"top\">Added test acceptance criteria limits.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3396\">issue 3396</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.PIDWithInputGains
-    </td>
-    <td valign=\"top\">Correted the instance <code>antWinGai2</code> to be conditional.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3423\">#3423</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">Improved error message in Java application that converts weather file.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3380\">#3380</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.AHUs</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.SetPoints.FreezeProtection<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.SetPoints.FreezeProtection
-    </td>
-    <td valign=\"top\">Added flag to disable freeze protection.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Switch
-    </td>
-    <td valign=\"top\">Added <code>smoothOrder(0, ...)</code> as this is required for some solvers
-                     that assume otherwise the output of the block to be differentiable.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.RealExtractSignal
-    </td>
-    <td valign=\"top\">Added assertion when the extract index is out of range.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Electrical.Interfaces.PartialTwoPort
-    </td>
-    <td valign=\"top\">Added constraining clause for terminal as models that extend from this model
-                     access a component that is not in the base class, and Optimica 1.40
-                     issues a warning for this.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3236\">#3236</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples.ScalableBenchmarks</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone
-    </td>
-    <td valign=\"top\">Changed <code>fan[].m_flow_nominal</code> from 10 to 0.1.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3067\">#3067</a>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Guideline36
-    </td>
-    <td valign=\"top\">Changed the indication of the status when window is closed.<br/>
-                       In default, it should be true (closed dry contact) rather than false.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">#3257</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.PartialHVAC
-    </td>
-    <td valign=\"top\">Added junction to mix the return and outdoor air.<br/>
-                       Set the value of parameter <code>transferHeat</code> to true for the mixed air temperature sensor.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3230\">#3230</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.VAVReheatBox
-    </td>
-    <td valign=\"top\">Changed the pressure independent damper to exponential damper.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Controls.RoomVAV
-    </td>
-    <td valign=\"top\">Added flag to choose different damper type and added control for the boxes with the exponential damper.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
-</td>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
-    </td>
-    <td valign=\"top\">Compute the scaling parameters based on the peak loads
-                        and revise documentation.<br/>
-                        This is for
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2302\">#2302</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2Pipe
-    </td>
-    <td valign=\"top\">Removed renamed model redeclare to solve error and allow separate pipe
-                       declarations on sup/ret of DHC networks.<br/>
-                        This is for
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Connection2PipePlugFlow
-    </td>
-    <td valign=\"top\">Fix redeclare of dis pipe models in connections.<br/>
-                        This is for
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve
-    </td>
-    <td valign=\"top\">Removed start value for <code>dp</code>.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3231\">#3231</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.BaseClasses</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.MassFlowRateMultiplier
-    </td>
-    <td valign=\"top\">Added option to use input connector as multiplier factor.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1684\">IBPSA, #1684</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                         Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
-                         Buildings.Fluid.MixingVolumes.MixingVolume<br/>
-                         Buildings.Fluid.MixingVolumes.MixingVolume.MoistAir</br>
-                         Buildings.Fluid.Sensors.TemperatureWetBulbTwoPort
-    </td>
-    <td valign=\"top\">Improved implementation so that models also work with certain media from
-                       the Modelica Standard Library that may be used to model combustion gases.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1650\">IBPSA, #1650</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Chillers.BaseClasses.PartialElectric
-    </td>
-    <td valign=\"top\">Added optional switchover mode for heat recovery chillers.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3211\">#3211</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Chillers.BaseClasses.Carnot
-  </td>
-  <td valign=\"top\">Changed parameter binding
-                     <code>etaCarnot_nominal(unit=\"1\") =
-                     COP_nominal/(TUseAct_nominal/(TCon_nominal+TAppCon_nominal - (TEva_nominal-TAppEva_nominal)))</code>
-                     to
-                     <code>etaCarnot_nominal(unit=\"1\") = 0.3</code> to avoid a circular assignment.<br/>
-                     Improved documentation.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3226\">#3226</a>.
-  </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.OneUTube<br/>
-                       Buildings.Fluid.Geothermal.Borefields.TwoUTubes
-    </td>
-    <td valign=\"top\">Enabled calculation of bore fields with hundreds of bore holes. This is
-                       accomplished by updating the calculation of the ground temperature response in the model
-                       <code>Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.GroundTemperatureResponse</code>
-                       using clustering of bore holes as described in
-                       <a href=\"https://doi.org/10.1080/19401493.2021.1968953\">
-                       doi:10.1080/19401493.2021.1968953</a>.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1577\">IBPSA, #1577</a>.
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU<br/>
-                       Buildings.Fluid.HeatExchangers.BaseClasses.PartialEffectivenessNTU
-    </td>
-    <td valign=\"top\">Set <code>flowRegime</code> to be equal to <code>flowRegime_nominal</code>
-                       by default. Added an assertion warning to inform the user about how to change
-                       this behaviour if the flow direction does need to change.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1682\">IBPSA, #1682</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
-  </td>
-</tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                         Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                         Buildings.Fluid.Movers.SpeedControlled_y
-    </td>
-    <td valign=\"top\">Avoided negative flow work if the flow or pressure is forced in a way that the flow work would be negative.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1621\">IBPSA, #1621</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                         Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                         Buildings.Fluid.Movers.SpeedControlled_y<br/>
-                         Buildings.Fluid.Movers.Preconfigured.SpeedControlled_y<br/>
-                         Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine
-    </td>
-    <td valign=\"top\">Changed the way the nominal flow rate is declared
-                       so that it can be modified in <code>PartialFlowMachine</code>
-                       by a higher-level model, but not the other way around.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1705\">IBPSA, #1705</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
-    </td>
-    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
-    </td>
-    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.BaseClasses.Outside<br/>
-                       Buildings.Fluid.Sources.MassFlowSource_WeatherData
-    </td>
-    <td valign=\"top\">Changed base class to constrain medium to moist air.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1681\">IBPSA, #1681</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassTRExteriorIrradiationNoShading<br/>
-                       Buildings.HeatTransfer.Windows.Functions.glassTRInteriorIrradiationNoShading
-    </td>
-    <td valign=\"top\">Added default value for output variables.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3111\">#3111</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Examples.BaseClasses.PartialProperties
-    </td>
-    <td valign=\"top\">Removed a self-dependent default binding of a function input.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3384\">#3384</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Steam
-    </td>
-    <td valign=\"top\">Changed the variable type definition of <code>pHat</code> and <code>THat</code>
-                       from absolute to <code>Modelica.Units.SI.PressureDifference</code> and
-                       <code>Modelica.Units.SI.TemperatureDifference</code> to prevent min/max
-                       assertion erros during initilization.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.<br/>
-                       In function <code>rho_pT</code>, created and used new function extending
-                       <code>Modelica.Media.Water.IF97_Utilities.BaseIF97.Basic.g2</code> with an
-                       annotation <code>smoothOrder=2</code>.  This is to specifcally pass on the
-                       <code>smoothOrder=2</code> annotion placed on <code>rho_pT</code> to
-                       the <code>g2</code> function.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2905\">#2905</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Obsolete.Controls.OBC.ASHRAE.G36_PR1</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Obsolete.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
-    </td>
-    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse</b>
-    </td>
-</tr><tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TRoom<br/>
-                          Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.RadiantHeatingCooling_TSurface<br/>
-                          Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer
-    </td>
-    <td valign=\"top\">Changed pipe spacing and insulation of radiant slab.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane
-    </td>
-    <td valign=\"top\">Corrected units of protected variables to avoid warning during model check.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1644\">IBPSA, issue #1644</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-  <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.regNonZeroPower
-    </td>
-    <td valign=\"top\">Improved documentation and assertion.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3135\">Buildings, issue #3135</a>.
-    </td>
-  </tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.spliceFunction<br/>
-                         Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
-    </td>
-    <td valign=\"top\">Improved implementation of transition limits.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Controls.OBC.ASHRAE.G36.TerminalUnits</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms
-    </td>
-    <td valign=\"top\">Added zone operation mode input to limit triggering alarms only in occupied mode.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Dampers<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.DamperValves
-    </td>
-    <td valign=\"top\">Added AHU supply fan status input for damper position reset.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3257\">issue 3257</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Air</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizer
-    </td>
-    <td valign=\"top\">Refactored the model for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.AHUs</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.AHUs.MultiZone.VAV.Economizers.Subsequences.Limits.SeparateWithDP<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Economizers.Subsequences.Enable<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Economizers.Subsequences.Limits
-    </td>
-    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
-                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.Alarms<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.Alarms<br/>
-    </td>
-    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
-                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.CoolingOnly.Subsequences.Dampers<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctColdDuctMin.Subsequences.Dampers<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConDischargeSensor.Subsequences.Dampers<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctMixConInletSensor.Subsequences.Dampers<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.DampersDualSensors<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.DualDuctSnapActing.Subsequences.DampersSingleSensors<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanCVF.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.ParallelFanVVF.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.Reheat.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanCVF.Subsequences.DamperValves<br/>
-                       Buildings.Controls.OBC.ASHRAE.G36.TerminalUnits.SeriesFanVVF.Subsequences.DamperValves<br/>
-    </td>
-    <td valign=\"top\">Removed the parameter <code>have_preIndDam</code> to exclude the option of using pressure independant damper.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36.Types</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes
-    </td>
-    <td valign=\"top\">Removed the option of using return fan with tracking calculated supply and return airflow.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36.Types.OutdoorAirSection
-    </td>
-    <td valign=\"top\">Removed the no-economizer option.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3139\">#3139</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous<br/>
-    </td>
-    <td valign=\"top\">Renamed package <code>Continuous</code> to <code>Reals</code>
-                       due to changes in ASHRAE Standard 231P.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3483\">#3483</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.And3<br/>
-                         Buildings.Controls.OBC.CDL.Logical.Validation.And3
-    </td>
-    <td valign=\"top\">Moved to the <code>Obsolete</code> package based on ASHRAE 231P.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Acos<br/>
-                       Buildings.Controls.OBC.CDL.Reals.Asin<br/>
-                       Buildings.Controls.OBC.CDL.Reals.Atan<br/>
-                       Buildings.Controls.OBC.CDL.Reals.Atan2
-    </td>
-    <td valign=\"top\">Added unit <code>rad</code> to the output.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3277\">#3277</a>.<br/>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Cos<br/>
-                       Buildings.Controls.OBC.CDL.Reals.Sin<br/>
-                       Buildings.Controls.OBC.CDL.Reals.Tan
-    </td>
-    <td valign=\"top\">Added unit <code>rad</code> to the input.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3277\">#3277</a>.<br/>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.RealExtractor
-    </td>
-    <td valign=\"top\">Removed parameter <code>allowOutOfRange</code> and <code>outOfRangeValue</code> and output the element with the nearest valid index
-                       when the index input is out of range.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
-                       Buildings.Examples.HydronicHeating.TwoRoomsWithStorage<br/>
-                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone<br/>
-                       Buildings.Examples.VAVReheat.BaseClasses.PartialHVAC
-    </td>
-    <td valign=\"top\">Replaced fan and pump models that have simple two-point
-                       pressure curve assignments with preconfigured models.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">#2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
-    </td>
-    <td valign=\"top\">Changed control that enables the heating system.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Combined.Controls.BaseClasses.ModeCondenserLoop
-    </td>
-    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
-                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Loads</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.BaseClasses.FlowDistribution<br/>
-                       Buildings.Experimental.DHC.Loads.BaseClasses.Validation.FlowDistributionPumpControl
-    </td>
-    <td valign=\"top\">Swapped the pump models for preconfigured versions.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3099\">#3099</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.DXCoils</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.DXCoils.AirCooled<br/>
-                       Buildings.Fluid.DXCoils.WaterCooled
-    </td>
-    <td valign=\"top\">Renamed packages to <code>AirSource</code> and <code>WaterSource</code>
-                       as DX coils for heating are added, and hence cooled is not an appropriate package name.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3288\">issue 3288</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Examples.SimpleHouse
-    </td>
-    <td valign=\"top\">Changed <code>conDam.yMin</code> from 0.1 to 0.25.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1624\">
-                       IBPSA, #1624</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine
-    </td>
-    <td valign=\"top\">Removed the block that was used to support fan or pump models with an rpm input.
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, issue 1704</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
-                       Buildings.Fluid.Movers.Data.Generic<br/>
-                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW12<br/>
-                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW13<br/>
-                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW15<br/>
-                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW16<br/>
-                       Buildings.Fluid.Movers.Data.Fans.Greenheck.BIDW18<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.CronolineIL80slash220dash4slash4<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to8<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to4<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to8<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to8<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos50slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos80slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS25slash10<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash10<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash5<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash10<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash7<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine50slash150dash4slash2<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2<br/>
-                       Buildings.Fluid.Movers.Examples.MoverContinuous<br/>
-                       Buildings.Fluid.Movers.Examples.MoverParameter<br/>
-                       Buildings.Fluid.Movers.Examples.MoverStages<br/>
-                       Buildings.Fluid.Movers.Preconfigured.Validation.ControlledFlowMachinePreconfigured<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_y<br/>
-                       Buildings.Fluid.Movers.Validation.BaseClasses.ControlledFlowMachine<br/>
-                       Buildings.Fluid.Movers.Validation.BaseClasses.FlowMachine_ZeroFlow<br/>
-                       Buildings.Fluid.Movers.Validation.ControlledFlowMachine<br/>
-                       Buildings.Fluid.Movers.Validation.ControlledFlowMachineDynamic<br/>
-                       Buildings.Fluid.Movers.Validation.PowerSimplified<br/>
-                       Buildings.Fluid.Movers.Validation.PumpCurveDerivatives<br/>
-                       Buildings.Fluid.Movers.Validation.Pump_stratos<br/>
-                       Buildings.Fluid.Movers.Validation.Pump_y_stratos
-    </td>
-    <td valign=\"top\">Removed or replaced parameters, blocks, and components that were
-                       used to support fan or pump models with an rpm input.
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, issue 1704</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-                       Buildings.Fluid.Movers.Preconfigured.SpeedControlled_Nrpm<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                       Buildings.Fluid.Movers.Validation.SpeedControlled_Nrpm
-    </td>
-    <td valign=\"top\">Moved to the <code>Obsolete</code> package.
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1704\">IBPSA, issue 1704</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface<br/>
-                       Buildings.Fluid.Movers.BaseClasses.PowerInterface<br/>
-                       Buildings.Fluid.Movers.BaseClasses.Types
-    </td>
-    <td valign=\"top\">Added computation paths for power and efficiency variables
-                       for the Euler number or as a function of part load ratio.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.Validation.NegativePressureOrFlow
-    </td>
-    <td valign=\"top\">Remade this model with
-                       <a href=\"Modelica://Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface\">
-                       Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface</a>
-                       instead of using a full mover model so that forcing a flow
-                       rate and a pressure rise is more straightforward.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.Data.Generic<br/>
-                       Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface<br/>
-                       Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
-                       Buildings.Fluid.Movers.BaseClasses.Validation.FlowMachineInterface
-    </td>
-    <td valign=\"top\">Moved the assignment of <code>V_flow_max</code> and <code>haveVMax</code>
-                       from <code>Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine</code>
-                       to lower-level models.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                       Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_y<br/>
-                       Buildings.Fluid.Movers.Data.Generic<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.CronolineIL80slash220dash4slash4<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to4<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to8<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to4<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos30slash1to8<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos32slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos40slash1to8<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos50slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.Stratos80slash1to12<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS25slash10<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash10<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS30slash5<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash10<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.TopS40slash7<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine50slash150dash4slash2<br/>
-                       Buildings.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2<br/>
-                       Buildings.Fluid.Movers.Validation.PowerSimplified<br/>
-                       Buildings.Fluid.Movers.BaseClasses.FlowMachineInterface
-    </td>
-    <td valign=\"top\">Refactored the models and data recoreds for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2668\">issue 2668</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_m_flow
-    </td>
-    <td valign=\"top\">Added assertion to avoid using the model with a head that is
-                       significantly higher than the head specified by its performance curve.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1659\">IBPSA, #1659</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
-    </td>
-</tr><tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.Controls.CollectorPump
-    </td>
-    <td valign=\"top\">Corrected implementation to make comparison based on total irradiation on tilted surface
-                       rather than the direct normal irradiation.
-                       This required adding parameters for the azimuth, tilt and ground reflectance.<br/>
-                       Added hysteresis to the controller, and changed output signal to be boolean-valued on/off
-                       rather than a continuous signal.<br/>
-                       Moved the old implementation to <code>Buildings.Obsolete.Fluid.SolarCollectors.Controls</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3074\">#3074</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse</b>
-    </td>
-</tr><tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SingleFamilyHouse.HeatPumpRadiantHeatingGroundHeatTransfer
-    </td>
-    <td valign=\"top\">Replaced ideal heater with a geothermal heat pump.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
-    </td>
-</tr><tr><td valign=\"top\">Buildings.Obsolete.DistrictHeatingCooling
-    </td>
-    <td valign=\"top\">Removed package which is no longer supported.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Plotters</b>
-    </td>
-</tr><tr><td valign=\"top\">Buildings.Utilities.Plotters.Examples.BaseClasses.CoolingCoilValve
-    </td>
-    <td valign=\"top\">Because of the removal of <code>Logical.And3</code> based on ASHRAE 231P,
-                       replaced it with a stack of two <code>Logical.And</code> blocks.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2465\">#2465</a>.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
-    </td>
-    <td valign=\"top\">Corrected input for enabling freeze protection setback mode.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">issue 3084</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Reals.Sources.CalendarTime
-    </td>
-    <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
-                       that caused simultaneous events to not be triggered at the same time.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Electrical.DC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Electrical.DC.Storage.BaseClasses.Charge
-    </td>
-    <td valign=\"top\">Corrected calculation of power taken from the battery when it is discharged.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3095\">issue 3095</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
-    </td>
-    <td valign=\"top\">Corrected outdoor temperature in instance <code>TOutSwi</code> at which system switches on and off.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3059\">issue 3059</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
-    </td>
-  </tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger
-  </td>
-  <td valign=\"top\">Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
-                     Corrected calculation of heat pump evaporator mass flow control.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
-                     issue 3379</a>.
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump
-  </td>
-  <td valign=\"top\">Assigned dp_nominal to condenser pump.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
-                     issue 3379</a>.
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Indirect
-  </td>
-  <td valign=\"top\">Fixed building supply temperature controller parameter <code>reverseActing</code>
-                     by changing from <code>true</code> to <code>false</code>.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3299\">
-                     issue 3299</a>.
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.Cooling.Direct
-  </td>
-  <td valign=\"top\">Removed assignment of check valve <code>allowFlowReversal=false</code>.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3389\">#3389</a>.
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Loads.BaseClasses.Examples.BaseClasses.BuildingTimeSeries
-  </td>
-  <td valign=\"top\">Applied <code>facMul</code> to domestic hot water load.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3379\">
-                     issue 3379</a>.
-  </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.PartialEffectivenessNTU
-    </td>
-    <td valign=\"top\">Corrected wrong temperature in assignment of <code>sta2_default</code>.
-                       For <code>Buildings.Media.Air</code> and <code>Buildings.Media.Water</code>
-                       this error does not affect the results.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3151\">Buildings, issue 3151</a>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
-                       Buildings.Fluid.DXSystems.AirCooled.SingleStage<br/>
-                       Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
-                       Buildings.Fluid.DXSystems.WaterCooled.MultiStage<br/>
-                       Buildings.Fluid.DXSystems.WaterCooled.SingleStage<br/>
-                       Buildings.Fluid.DXSystems.WaterCooled.VariableSpeed<br/>
-                       Buildings.Fluid.DXSystems.Cooling.BaseClasses.CapacityWaterCooled<br/>
-                       Buildings.Fluid.DXSystems.BaseClasses.PartialCoolingCapacity
-
-    </td>
-    <td valign=\"top\">Corrected performance calculation as a function of mass flow rates.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3146\">#3146</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                       Buildings.Fluid.HeatExchangers.WetCoilDiscretized
-    </td>
-    <td valign=\"top\">Reverted the correction on latent heat from component.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.Validation.WetCoilCounterFlowLowWaterFlowRate<br/>
-    </td>
-    <td valign=\"top\">Modify air source boundary condition so air enters coil at 99.5% relative humidity.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Utilities.Time</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime
-    </td>
-    <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
-                       that caused simultaneous events to not be triggered at the same time.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
-    </td>
-  </tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.DXSystems.Cooling.BaseClasses.Evaporation
-    </td>
-    <td valign=\"top\">Corrected assertion for the condition <code>dX_nominal&lt;0</code> and the documentation.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3322\">issue 3322</a>.
-    </td>
-</tr>
-</table>
-</html>"));
-  end Version_10_0_0;
-
-  class Version_9_1_1 "Version 9.1.1"
-  extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 9.1.1 is backward compatible with 9.1.0, except that the Spawn binaries need to be updated as described
-  in <code>Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide.Installation</code>.
-  </p>
-  <p>
-  The library has been tested with
-  Dymola 2023x,
-  OpenModelica 1.22.0-dev (41-g8a5b18f-1),
-  OPTIMICA 1.43.4 and recent versions of Impact.
-  </p>
-  <p>
-  The Spawn binaries have been updated from version 0.3.0 to 0.4.3.
-  Both use the same EnergyPlus input data files from EnergyPlus 9.6.0.
-  The update corrects a bug that caused EnergyPlus to always send
-  a heat capacitance multiplier of <i>1</i> to Modelica
-  (see <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3481\">#3481</a>).
-  </p>
-</div>
-<!-- New libraries -->
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b>
-    </td>
-</tr>
-<tr>
-    <td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.PartialConvertTime
-    </td>
-    <td valign=\"top\">Added model to be extended in solar models that need calendar year for calculation.<br/>
-                     See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1716\">IBPSA, #1716</a>.
-
-    </td>
-</tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Controls.OBC.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.PIDWithInputGains
-    </td>
-    <td valign=\"top\">Corrected the instance <code>antWinGai2</code> to be conditional.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3423\">#3423</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr>
-    <td valign=\"top\">Buildings/BoundaryConditions/SolarGeometry/BaseClasses/Declination.mo<br/>
-                     Buildings/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo<br/>
-                     Buildings/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo<br/>
-                     Buildings/BoundaryConditions/WeatherData/BaseClasses/EquationOfTime.mo<br/>
-                     Buildings/BoundaryConditions/WeatherData/BaseClasses/LocalCivilTime.mo
-    </td>
-    <td valign=\"top\">Updated radiation models to use calendar time instead of simulation time.<br/>
-                     See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1716\">IBPSA, #1716</a>.
-
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr>
-    <td valign=\"top\">Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi
-    </td>
-    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
-                     See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
-
-    </td>
-</tr>
-<tr>
-    <td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Validation.MovingAverage<br/>
-                     Buildings.Controls.OBC.CDL.Utilities.Validation.SunRiseSet<br/>
-                     Buildings.Controls.OBC.CDL.Utilities.Validation.SunRiseSetNegativeStartTime<br/>
-                     Buildings.Controls.OBC.CDL.Utilities.Validation.SunRiseSetPositiveStartTime
-    </td>
-    <td valign=\"top\">Changed models to comply with CDL specifications.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3301\">#3301</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Electrical.Interfaces.PartialTwoPort
-    </td>
-    <td valign=\"top\">Added constraining clause for terminal as models that extend from this model
-                     access a component that is not in the base class, and Optimica 1.40
-                     issues a warning for this.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3236\">#3236</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr>
-    <td valign=\"top\">Buildings.Fluid.Examples.Performance.Example5<br/>
-                       Buildings.Fluid.Examples.Performance.Example6<br/>
-                       Buildings.Fluid.Examples.Performance.Example7<br/>
-                       Buildings.Fluid.Examples.Performance.Example8
-    </td>
-    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
-                       See  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
-
-    </td>
-</tr>
-  <tr>
-    <td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.convectionResistanceCircularPipe<br/>
-    Buildings.Fluid.Geothermal.Borefields.BaseClasses.Boreholes.BaseClasses.Functions.partialInternalResistances
-    </td>
-    <td valign=\"top\">Corrected variability of assignment to comply with the Modelica Language Definition.<br/>
-                       See  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1762\">IBPSA, #1762</a>.
-
-    </td>
-  </tr>
-<tr>
-    <td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.Examples.EpsilonNTUZ
-    </td>
-    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
-                       See  <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
-
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Examples.BaseClasses.PartialProperties
-    </td>
-    <td valign=\"top\">Removed a self-dependent default binding of a function input.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3384\">#3384</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr>
-    <td valign=\"top\">Buildings.Utilities.Plotters.Examples.Scatter<br/>
-                       Buildings.Utilities.Plotters.Examples.TimeSeries<br/>
-                       Buildings.Utilities.Psychrometrics.TWetBul_TDryBulPhi<br/>
-                       Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi
-    </td>
-    <td valign=\"top\">Added a constant in order for unit check to pass.<br/>
-                       See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1711\">IBPSA, #1711</a>.
-
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime
-  </td>
-  <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
-                     that caused simultaneous events to not be triggered at the same time.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
-  </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-  </td>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized
-    </td>
-    <td valign=\"top\">Corrected the modification of <code>hexReg[nReg].m2_flow_nominal</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3441\">#3441</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
-  </td>
-  <tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.ThermalZone
-    </td>
-    <td valign=\"top\">Corrected bug that caused EnergyPlus to always
-                       send <i>1</i> for the heat capacitance multiplier.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3481\">#3481</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Time</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime
-  </td>
-  <td valign=\"top\">Refactored implementation to avoid wrong day number due to rounding errors
-                     that caused simultaneous events to not be triggered at the same time.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3199\">issue 3199</a>.
-  </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FMI.Adaptors.Outlet
-  </td>
-  <td valign=\"top\">Corrected dimension of <code>X</code> in function call, which caused the model to not translate with some tools
-                     if the media has only one component such as water.<br/>
-                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1768\">IBPSA, #1768</a>.
-  </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DXCoils.BaseClasses.Evaporation
-  </td>
-  <td valign=\"top\">Corrected assertion for the condition <code>dX_nominal&lt;0</code>
-                     and the documentation.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3322\">issue 3322</a>.
-  </td>
-</tr>
-</table>
-</html>"));
-  end Version_9_1_1;
-
-  class Version_9_1_0 "Version 9.1.0"
-  extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 9.1.0 is backward compatible with 9.0.0.
-</p>
-<p>
-The library has been tested with Dymola 2023x,
-OpenModelica 1.20.0-dev (314-g3033f43-1),
-OPTIMICA (revision 2022-05-09-master-4b0cd2bf71) and recent versions of Impact.
-</p>
-<p>
-The following major changes have been done:
-</p>
-<ul>
-<li>
-The ASHRAE Guideline 36 air-side sequences have been updated to the official release.
-They are in the package <code>Buildings.Controls.OBC.ASHRAE.G36</code>.
-The previous public release draft is still distributed with this version.
-</li>
-<li>
-Various new blocks for the Control Description Language have been added to the package
-<code>Buildings.Controls.OBC.CDL</code>.
-</li>
-<li>
-The flow rate control in various examples has been improved to avoid large pump or fan heads
-if the mass flow rate is prescribed rather than computed based on the pump or fan curve.
-</li>
-<li>
-Various models have been improved for robustness,
-for compatibility with the <code>Modelica.Media</code> library,
-and to correct errors.
-</li>
-</ul>
-</div>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-      </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36
-      </td>
-      <td valign=\"top\">Package with sequences implemented according to ASHRAE Guideline 36 official release, May 2020.
-      </td>
-  </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.Examples.GlobalPerezTiltedSurface
-    </td>
-    <td valign=\"top\">Added model that outputs the global solar irradiation on a tilted surface.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1654\">IBPSA, #1654</a>.
-    </td>
- </tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.BooleanExtractSignal<br/>
-                         Buildings.Controls.OBC.CDL.Routing.BooleanExtractor<br/>
-                         Buildings.Controls.OBC.CDL.Routing.IntegerExtractSignal<br/>
-                         Buildings.Controls.OBC.CDL.Routing.IntegerExtractor
-    </td>
-    <td valign=\"top\">Added boolean and integer extract signals.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3125\">#3125</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined.BaseClasses</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.Validation.Pipe
-    </td>
-    <td valign=\"top\">Test for comparing <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize</code> <br/>
-                       initialization of <code>dh</code> to <code>Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeStandard</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\">issue #2510</a>.
-    </td>
-</tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Applications.DataCenter</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Applications.BaseClasses.Equipment.FlowMachine_m<br/>
-                         Buildings.Applications.BaseClasses.Equipment.FlowMachine_y<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialCoolingCoilHumidifyingHeating<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialHeatExchanger<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialPumpParallel<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.SignalFilterParameters<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.IntegratedPrimarySecondary<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.BaseClasses.PartialDataCenter<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
-    </td>
-    <td valign=\"top\">Improved implementation to avoid high pressures due to pump with forced mass flow rate.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1659\">IBPSA, #1659</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.AHU
-    </td>
-    <td valign=\"top\">Replaced hysteresis with <code>max</code> function to avoid chattering when the fan switches on.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3106\">#3106</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Experimental.DHC.EnergyTransferStations.BaseClasses.Validation.CollectorDistributor<br/>
-                         Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump<br/>
-                         Buildings.Experimental.DHC.Examples.Combined.BaseClasses.PartialSeries<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Examples.ElectricChillerParallel<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersParallel<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.CoolingTowersWithBypass<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem<br/>
-                         Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.CoolingTowersParallel
-    </td>
-    <td valign=\"top\">Improved implementation to avoid high pressures due to pump with forced mass flow rate.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1659\">IBPSA, #1659</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.PartialThreeWayValve
-    </td>
-    <td valign=\"top\">Propagated parameter <code>riseTime</code> to valves. The value is not used as the filter is disabled,
-                       but it will show in the result file. Having a consistent value for all these parameters in the result filter
-                       helps during debugging.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1663\">IBPSA, #1663</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.gFunction
-    </td>
-    <td valign=\"top\">Initialized variable which otherwise lead to the simulation to fail in OpenModelica.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1664\">IBPSA, #1664</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                         Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
-                         Buildings.Fluid.MixingVolumes.MixingVolume<br/>
-                         Buildings.Fluid.MixingVolumes.MixingVolume.MoistAir</br>
-                         Buildings.Fluid.Sensors.TemperatureWetBulbTwoPort
-    </td>
-    <td valign=\"top\">Improved implementation so that models also work with certain media from
-                       the Modelica Standard Library that may be used to model combustion gases.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1650\">IBPSA, #1650</a>.
-    </td>
-  <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                         Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                         Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                         Buildings.Fluid.Movers.SpeedControlled_y
-    </td>
-    <td valign=\"top\">Avoided negative flow work if the flow or pressure is forced in a way that the flow work would be negative.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1621\">IBPSA, #1621</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassTRExteriorIrradiationNoShading<br/>
-                       Buildings.HeatTransfer.Windows.Functions.glassTRInteriorIrradiationNoShading
-    </td>
-    <td valign=\"top\">Added default value for output variables.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3111\">#3111</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.regNonZeroPower
-    </td>
-    <td valign=\"top\">Improved documentation and assertion.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3135\">Buildings, issue #3135</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-  <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.SolarGain.CorrectionGDoublePane
-    </td>
-    <td valign=\"top\">Corrected units of protected variables to avoid warning during model check.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1644\">IBPSA, issue #1644</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.spliceFunction<br/>
-                         Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
-    </td>
-    <td valign=\"top\">Improved implementation of transition limits.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1640\">IBPSA, issue #1640</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Networks.Combined.BaseClasses</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Networks.Combined.BaseClasses.PipeAutosize
-    </td>
-    <td valign=\"top\"><code>start</code> attribute for parameter <code>dh</code> changed to 0.01.<br/>
-                       <code>min</code> attribute for parameter <code>dh</code> changed to 0.001.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2510\">issue #2510</a>.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Examples.SimpleHouse
-    </td>
-    <td valign=\"top\">Changed <code>conDam.yMin</code> from 0.1 to 0.25.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1624\">
-                       IBPSA, #1624</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples.ScalableBenchmarks</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone
-    </td>
-    <td valign=\"top\">Changed <code>fan[].m_flow_nominal</code> from 10 to 0.1.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3067\">#3067</a>
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Electrical.DC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Electrical.DC.Storage.BaseClasses.Charge
-    </td>
-    <td valign=\"top\">Corrected calculation of power taken from the battery when it is discharged.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3095\">issue 3095</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC.Plants.Cooling</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.ElectricChillerParallel
-    </td>
-    <td valign=\"top\">Corrected wrong assignments for chiller system <code>mulChiSys</code> which assigned chilled water
-                     to condenser water parameters and vice versa.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
-    </td>
-    <td valign=\"top\">Corrected input for enabling freeze protection setback mode.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3084\">issue 3084</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
-    </td>
-    <td valign=\"top\">Corrected outdoor temperature in instance <code>TOutSwi</code> at which system switches on and off.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3059\">issue 3059</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.PartialEffectivenessNTU
-    </td>
-    <td valign=\"top\">Corrected wrong temperature in assignment of <code>sta2_default</code>.
-                       For <code>Buildings.Media.Air</code> and <code>Buildings.Media.Water</code>
-                       this error does not affect the results.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3151\">Buildings, issue 3151</a>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
-                       Buildings.Fluid.DXSystems.AirCooled.SingleStage<br/>
-                       Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
-                       Buildings.Fluid.DXSystems.WaterCooled.MultiStage<br/>
-                       Buildings.Fluid.DXSystems.WaterCooled.SingleStage<br/>
-                       Buildings.Fluid.DXSystems.WaterCooled.VariableSpeed<br/>
-                       Buildings.Fluid.DXSystems.Cooling.BaseClasses.CapacityWaterCooled<br/>
-                       Buildings.Fluid.DXSystems.BaseClasses.PartialCoolingCapacity
-
-    </td>
-    <td valign=\"top\">Corrected performance calculation as a function of mass flow rates.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3146\">#3146</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized</br>
-    </td>
-    <td valign=\"top\">Reverted the correction on latent heat from component.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.Validation.WetCoilCounterFlowLowWaterFlowRate<br/>
-    </td>
-    <td valign=\"top\">Modify air source boundary condition so air enters coil at 99.5% relative humidity.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3065\">#3065</a>.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-</html>"));
-  end Version_9_1_0;
-
-
-  class Version_9_0_0 "Version 9.0.0"
-  extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 9.0.0 is a major release that updates the Modelica version from 3.2.3 to 4.0.0.
-</p>
-<p>
-The library has been tested with Dymola 2022x,
-OpenModelica 1.19.0-dev (613-gd6e04c0-1),
-OPTIMICA (revision 2022-05-09-master-4b0cd2bf71) and recent versions of Impact.
-</p>
-<p>
-The following major changes have been done:
-</p>
-<ul>
-<li>
-The Modelica version has been updated from version 3.2.3 to 4.0.0.
-</li>
-<li>
-Most fluid component models have been updated to remove the parameter <code>massDynamics</code>,
-which is now set to the same value as the parameter <code>energyDynamics</code>.
-</li>
-<li>
-The models for coupling with EnergyPlus have been moved to the package
-<code>Buildings.ThermalZones.EnergyPlus_9_6_0</code> to allow
-support for more than one EnergyPlus version
-in future releases.
-</li>
-<li>
-The BESTEST validation in the package
-<code>Buildings.ThermalZones.Detailed.Validation.BESTEST</code>
-has been updated to the latest BESTEST version, and new tests have been added.
-</li>
-<li>
-The package <code>Buildings.Fluid.Geothermal.BuriedPipes</code>
-has been added to model heat transfer between buried pipes and the ground,
-such as for district energy systems.
-</li>
-<li>
-The package <code>Buildings.Media.Steam</code> for modeling steam has been added.
-</li>
-<li>
-Various new models have been added to the package <code>Buildings.Airflow.Multizone</code>
-for modeling multizone air exchange.
-</li>
-<li>
-Models for ice tanks have been added to the package
-<code>Buildings.Fluid.Storage.Ice</code>.
-</li>
-<li>
-Various models, such as for PV, solar collectors and thermal zones have been
-improved to obtain the latitude of the building from the weather data bus,
-rather than requiring the user to specify it.
-</li>
-<li>
-The run-time coupling with Python has been updated to Python version 3.8,
-and it has been renamed to <code>Buildings.Utilities.IO.Python_3_8</code>.
-</li>
-<li>
-Various other models have been improved or added, in particular for modeling of
-control sequences using the Control Description Language that has been developed
-in the OpenBuildingControl project at <a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>.
-</li>
-</ul>
-</div>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
-      </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Geothermal.BuriedPipes
-      </td>
-      <td valign=\"top\">Package with models for modeling thermal coupling between buried pipes and ground.
-      </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-  <tr><td valign=\"top\">Buildings.Media.Steam
-      </td>
-      <td valign=\"top\">Package with medium model for steam heating applications.
-      </td>
-  </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Case660<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case670<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case680<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case680FF<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case685<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case695<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case910<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case930<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case980<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case980FF<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case985<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case995
-    </td>
-    <td valign=\"top\">Added new test cases based on the ASHRAE 140-2020.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3005\">#3005</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Air</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.Examples.OptimalStart
-    </td>
-    <td valign=\"top\">Added example models for the use of the block optimal start controller.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2126\">#2126</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.Coefficient_V_flow<br/>
-                     Buildings.Airflow.Multizone.Coefficient_m_flow<br/>
-                     Buildings.Airflow.Multizone.Point_m_flow<br/>
-                     Buildings.Airflow.Multizone.Points_m_flow<br/>
-                     Buildings.Airflow.Multizone.Table_V_flow<br/>
-                     Buildings.Airflow.Multizone.Table_m_flow
-    </td>
-    <td valign=\"top\">Added new component models for multizone air exchange.<br/>
-                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipeDiscretized
-    </td>
-    <td valign=\"top\">Added model for multiple plug flow pipes in series,
-                     which can be used to vary boundary conditions over the length of a pipe.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.Outside_CpData
-    </td>
-    <td valign=\"top\">Added new component model that allows specifying a wind pressure profile for an exterior construction.<br/>
-                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1436\">IBPSA, #1436</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatusDuplicator
-    </td>
-    <td valign=\"top\">Block that duplicates the zone status to be connected to all zone groups.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-        Buildings.Controls.OBC.CDL.Routing.BooleanVectorFilter<br/>
-        Buildings.Controls.OBC.CDL.Routing.BooleanVectorReplicator<br/>
-        Buildings.Controls.OBC.CDL.Routing.IntegerVectorFilter<br/>
-        Buildings.Controls.OBC.CDL.Routing.IntegerVectorReplicator<br/>
-        Buildings.Controls.OBC.CDL.Routing.RealVectorFilter<br/>
-        Buildings.Controls.OBC.CDL.Routing.RealVectorReplicator
-    </td>
-    <td valign=\"top\">Blocks for filtering and replicating vectors of signals.<br/>
-         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Asin<br/>
-                     Buildings.Controls.OBC.CDL.Continuous.Acos<br/>
-                     Buildings.Controls.OBC.CDL.Continuous.Subtract<br/>
-                     Buildings.Controls.OBC.CDL.Integers.Subtract
-    </td>
-    <td valign=\"top\">Created new blocks based on the discussion from ASHRAE Standard 231P Committee.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Derivative
-    </td>
-    <td valign=\"top\">Created new block which is required for PID controller with gain scheduling.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3022\">#3022</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.AddParameter
-    </td>
-    <td valign=\"top\">Created new block based on the discussion from ASHRAE Standard 231P Committee.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">#2876</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.RadiantSystems</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.RadiantSystems.Cooling.HighMassSupplyTemperature_TSurRelHum
-    </td>
-    <td valign=\"top\">Added controller for radiant cooling that controls the surface temperature
-                       using constant mass flow and variable supply temperature.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2823\">#2823</a>.<br/>
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.PIDWithInputGains
-    </td>
-    <td valign=\"top\">Added PID controller with anti-windup and control gains exposed as inputs.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2993\">#2993</a>.<br/>
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Storage.Ice</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.Ice.ControlledTank<br/>
-                     Buildings.Fluid.Storage.Ice.Tank
-    </td>
-    <td valign=\"top\">Added models for ice storage tank whose performance is characterized by performance curves.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2820\">#2820</a>.
-    </td>
-</tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.HeatTransfer</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass
-    </td>
-    <td valign=\"top\">Changed the gas layer to be conditional.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3026\">#3026</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Case600FF<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case640<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case650<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case650FF<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case950<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BESTEST.Case950FF
-    </td>
-    <td valign=\"top\">Updated the test cases based on the ASHRAE 140-2020.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3005\">#3005</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.AHUParameters<br/>
-                       Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialCoolingCoilHumidifyingHeating
-    </td>
-    <td valign=\"top\">Changed cooling coil model and removed unused parameters.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">#2549</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">The weather data reader is now reading the altitude above sea level from the weather data file.
-                       This new version also outputs this altitude and the latitude of the location on the weather data bus.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-    </td>
-<tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.Continuous.SignalRanker
-    </td>
-    <td valign=\"top\">Changed implementation to use sort function from Modelica Standard Library,
-                       and updated its example to avoid simultaneous state and time events.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.GroupStatus
-    </td>
-    <td valign=\"top\">Added filters to select which zones are used in group.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\"># 2544</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime
-    </td>
-    <td valign=\"top\">Increased number of years that block will output the calendar time.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger<br/>
-                       Buildings.Controls.OBC.CDL.Conversions.BooleanToReal<br/>
-    </td>
-    <td valign=\"top\">Corrected documentation texts where the variables were described with wrong types.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3016\">issue 3016</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean<br/>
-    </td>
-    <td valign=\"top\">Added missing <code>discrete</code> keyword to sampled variable.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2942\">issue 2942</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
-    </td>
-    <td valign=\"top\">Changed implementation to avoid NaN in OpenModelica.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2835\">issue 2835</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Electrical.AC.ThreePhasesUnbalanced</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line_N<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC_N<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRL_N<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC_N
-    </td>
-    <td valign=\"top\">Set nominal attribute for voltage at terminal.
-                       This change enables Dymola 2023 beta3 to solve
-                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepDown.DY</code>
-                       and
-                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepUp.DD</code>
-                       which otherwise fail during the initialization as the homotopy steps
-                       obtain unreasonable values for the voltages.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Boilers.Data.Lochinvar
-  </td>
-  <td valign=\"top\">Added annotation <code>defaultComponentPrefixes = \"parameter\"</code>.
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Boilers.Polynomial
-    </td>
-    <td valign=\"top\">Moved part of the code to <code>Buildings.Fluid.Boilers.BaseClasses.PartialBoiler</code>
-                       to support the new model <code>Buildings.Fluid.Boilers.BoilerTable</code>. <br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2651\"># 2651</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU
-    </td>
-    <td valign=\"top\">Exposed ratio of convection coefficients, set its default values based on fluid properties and flow rates,
-                       and exposed exponents for convective heat transfer coefficients.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2918\">#2918</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic
-    </td>
-    <td valign=\"top\">Removed <code>protected</code> declaration inside the record as the Modelica Language Specification
-                       only allows public sections in a record.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3009\">#3009</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.DuctStaticPressureSetpoint
-    </td>
-    <td valign=\"top\">Removed hysteresis that disabled duct static pressure reset based on outdoor air temperature.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2545\">#2545</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Validation.BaseClasses.Floor
-    </td>
-    <td valign=\"top\">Update CO2 generation expressions.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2781\">#2781</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Controls.FreezeStat
-    </td>
-    <td valign=\"top\">Added hysteresis. Without it, models can stall due to state events.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2975\">#2975</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
-                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone<br/>
-                       Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
-    </td>
-    <td valign=\"top\">Changed cooling coil model.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">#2549</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.Tutorial.Boiler.System7
-    </td>
-    <td valign=\"top\">Changed block downstream of <code>greThrTRoo</code> from <code>and</code> to <code>or</code> block.
-                       This ensures that the system is off when the outdoor air or room air is sufficiently warm.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.Tutorial.SpaceCooling.System2<br/>
-                       Buildings.Examples.Tutorial.SpaceCooling.System3<br/>
-    </td>
-    <td valign=\"top\">Correct supply and return water parameterization.<br/>
-                       Use design conditions for UA parameterization in cooling coil.<br/>
-                       Use explicit calculation of sensible and latent load to determine design load
-                       on cooling coil.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
-    </td>
-    <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, #2761</a>.
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling
-    </td>
-    <td valign=\"top\">Revised the model for extensibility. <br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2749\">#2749</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                       Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_y
-    </td>
-    <td valign=\"top\">Changed implementation of the filter.
-                       The new implementation uses a simpler model.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1498\">IBPSA #1498</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FMI.ExportContainers.HVACZone<br/>
-                       Buildings.Fluid.FMI.ExportContainers.HVACZones<br/>
-    </td>
-    <td valign=\"top\">Correct supply and return water parameterization.<br/>
-                       Use explicit calculation of sensible and latent load to determine design load
-                       on cooling coil.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FMI.ExportContainers.Validation.RoomHVAC
-    </td>
-    <td valign=\"top\">Changed cooling coil model.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2549\">#2549</a>.<br/>
-                       Correct supply and return water parameterization.<br/>
-                       Use explicit calculation of sensible and latent load to determine design load
-                       on cooling coil.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2624\">#2624</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.Examples.BaseClasses.PartialStaticTwoPortCoolingTower
-    </td>
-    <td valign=\"top\">Added a temperature sensor for better measurement of the entering water temperature.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2866\">#2866</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Air
-    </td>
-    <td valign=\"top\">Made the <code>BaseProperties</code> replaceable.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1516\">IBPSA #1516</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-      </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
-  </td>
-  <td valign=\"top\">Improved model to guard against approximation errors of event handling.
-                     With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
-                     all simulate with OpenModelica.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buidings, #2713</a>.
-  </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.IO</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Utilities.IO.Files.Examples.CSVReader
-    </td>
-    <td valign=\"top\">Updated example so it works with future versions of the Modelica Standard Library which
-                       supports reading csv files.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1572\">IBPSA #1572</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
-    </td>
-    <td valign=\"top\">Reimplemented function to avoid a potential overflow caused by the <code>cosh</code> function.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.Subsystems.Examples.BaseClasses.PartialCoolingTowersSubsystem
-    </td>
-    <td valign=\"top\">Added a temperature sensor for better measurement of the entering water temperature.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2866\">#2866</a>.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Applications</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    Buildings.Applications.DataCenters.ChillerCooled.Equipment.FlowMachine_y<br/>
-    Buildings.Applications.DataCenters.ChillerCooled.Equipment.FlowMachine_m<br/>
-    Buildings.Applications.DataCenters.ChillerCooled.Equipment.ElectricChillerParallel<br/>
-    Buildings.Applications.DataCenters.ChillerCooled.Controls.VariableSpeedPumpStage
-    </td>
-    <td valign=\"top\">Moved to <code>Buildings.Applications.BaseClasses</code>.<br/>
-                This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2264\"># 2264</a>.<br/>
-                This change is supported in the conversion script.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarGeometry.IncidenceAngle<br/>
-                       Buildings.BoundaryConditions.SolarGeometry.BaseClasses.IncidenceAngle<br/>
-                       Buildings.BoundaryConditions.SolarGeometry.ZenithAngle<br/>
-                       Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez<br/>
-                       Buildings.BoundaryConditions.SolarIrradiation.DirectTiltedSurface<br/>
-                       Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth
-    </td>
-    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.RelativeAirMass
-    </td>
-    <td valign=\"top\">Introduced altitude attenuation for relative air mass calculation.
-                       This required adding a new input.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.SkyClearness
-    </td>
-    <td valign=\"top\">Changed input connector <code>HGloHor</code> to <code>HDirHor</code>.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.Continuous.PIDHysteresisTimer<br/>
-                       Buildings.Controls.Continuous.PIDHysteresis
-    </td>
-    <td valign=\"top\">Moved blocks to <code>Buildings.Obsolete.Controls.Continuous</code>.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1522\">IBPSA, #1522</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Add<br/>
-                       Buildings.Controls.OBC.CDL.Integers.Add<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.AddParameter
-    </td>
-    <td valign=\"top\">Moved classes to <code>Obsolete</code> package and created new blocks to avoid using input gain factor.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a> and
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2876\">#2876</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Feedback
-    </td>
-    <td valign=\"top\">Moved the class to <code>Obsolete</code> package.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Division<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Gain<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.MovingMean<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Product<br/>
-                       Buildings.Controls.OBC.CDL.Integers.Product<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.SlewRateLimiter
-    </td>
-    <td valign=\"top\">Renamed the blocks to <code>Divide</code>, <code>MultiplyByParameter</code>, <code>MovingAverage</code>,
-                       <code>Multiply</code>, <code>LimitSlewRate</code>.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2865\">#2865</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Interfaces.DayTypeInput<br/>
-                       Buildings.Controls.OBC.CDL.Interfaces.DayTypeOutput<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.DayType<br/>
-                       Buildings.Controls.OBC.CDL.Conversions.IsHoliday<br/>
-                       Buildings.Controls.OBC.CDL.Conversions.IsWorkingDay<br/>
-                       Buildings.Controls.OBC.CDL.Conversions.IsNonWorkingDay<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.Examples.DayType<br/>
-                       Buildings.Controls.OBC.CDL.Conversions.Validation.DayTypeCheck<br/>
-                       Buildings.Controls.OBC.CDL.Types.Day
-    </td>
-    <td valign=\"top\">Moved classes to <code>Obsolete</code> package.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2839\">#2839</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.MultiAnd<br/>
-                       Buildings.Controls.OBC.CDL.Logical.MultiOr
-    </td>
-    <td valign=\"top\">Renamed parameter <code>nu</code> to <code>nin</code>.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2580\">#2580</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.BooleanReplicator<br/>
-                       Buildings.Controls.OBC.CDL.Routing.IntegerReplicator<br/>
-                       Buildings.Controls.OBC.CDL.Routing.RealReplicator
-    </td>
-    <td valign=\"top\">Renamed to include <code>BooleanScalarReplicator</code>, <code>IntegerScalarReplicator</code>,
-                       and <code>RealScalarReplicator</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">#2544</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.IntegerSwitch<br/>
-                       Buildings.Controls.OBC.CDL.Logical.LogicalSwitch<br/>
-                       Buildings.Controls.OBC.CDL.Logical.Switch
-    </td>
-    <td valign=\"top\">Moved the blocks to <code>CDL.Integers.Switch</code>, <code>CDL.Logical.Switch</code>,
-                       and <code>CDL.Continuous.Switch</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2650\">#2650</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Change
-    </td>
-    <td valign=\"top\">Renamed parameter for start value from <code>y_start</code> to <code>pre_u_start</code>
-                       for consistency with <code>Buildings.Controls.OBC.CDL.Logical.Change</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2990\">#2990</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented<br/>
-                       Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented_N<br/>
-                       Buildings.Electrical.DC.Sources.PVSimpleOriented<br/>
-                       Buildings.Electrical.AC.OnePhase.Sources.PVSimpleOriented<br/>
-                       Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimpleOriented<br/>
-                       Buildings.Electrical.DC.Sources.PVSimpleOriented<br/>
-                       Buildings.Electrical.Interfaces.PartialPVOriented
-    </td>
-    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006<br/>
-                       Buildings.Examples.VAVReheat.Guideline36<br/>
-                       Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
-    </td>
-    <td valign=\"top\">Changed models to include the hydraulic configurations of the cooling coil,
-                       heating coil and VAV terminal box.<br/>
-                       Changed heating supply water temperature at design condition to <i>45</i>&deg;C.<br/>
-                       Corrected implementation of freeze protection for ASHRAE 2006 models.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2594\">#2594</a>.<br/>
-                       Changed model structure to separate building and HVAC system.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2652\">#2652</a>.<br/>
-                       Changed parameter declarations and added to Guideline 36 models the optimal start up calculation.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2829\">issue #2829</a>.
-    </td>
-</tr>
- <tr><td colspan=\"2\"><b>Buildings.Examples.ScalableBenchmarks</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ScalableBenchmarks.BuildingVAV.ThermalZones.ThermalZone
-    </td>
-    <td valign=\"top\">Reimplemented computation of energy provided by HVAC system to also include the latent load.
-                     The new implementation uses the enthalpy sensor, and therefore the mass flow rate and temperature
-                     sensors have been removed. Also, rather than load in Watts, it outputs the energy in Joules.<br/>
-                     This version also improves the infiltration. Now, exactly the same amount of air in infiltrated and
-                     exfiltrated. This was not the case previously because the infiltration was a prescribed air flow rate,
-                     and the exfiltration was based on pressure difference. This caused an inbalance in the HVAC supply and
-                     return air flow rate.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
-                       Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
-                       Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
-                       Buildings.Fluid.Actuators.Dampers.PressureIndependent<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayTable<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayPolynomial<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayTable
-    </td>
-    <td valign=\"top\">Changed implementation of the filter and changed the parameter <code>order</code> to be a constant
-                       because typical users have no need to change this value.
-                       The new implementation uses a simpler model.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1498\">IBPSA #1498</a>.<br/>
-                       This change is only backwards incompatible if a user
-                       propagated the value of <code>order</code> to a high-level parameter.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.FixedResistances</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipe<br/>
-                       Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore
-    </td>
-    <td valign=\"top\">In <code>Buildings.Fluid.FixedResistances.PlugFlowPipe</code>, changed <code>ports_b</code>,
-                       which was a vectorized port, to <code>port_b</code> which is a scalar port.
-                       This has been done in order for the model to have the same connectors as
-                       are used for other pipe models.<br/>
-                       Refactored implementation and made various classes in this model protected.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1494\">IBPSA #1494</a>.<br/>
-                       For Dymola, a conversion script renames existing models to
-                       <code>Buildings.Obsolete.Fluid.FixedResistances.PlugFlowPipe</code> and
-                       <code>Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.EN12975<br/>
-                       Buildings.Fluid.SolarCollectors.ASHRAE93
-    </td>
-    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Fluid.Storage.ExpansionVessel
-    </td>
-    <td valign=\"top\">Removed parameter <code>p</code> which was not used.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1614\">IBPSA, #1614</a>.
-                       This change is supported in the conversion script.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.FixedShade<br/>
-                       Buildings.HeatTransfer.Windows.Overhang<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.Overhang
-    </td>
-    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Obsolete.Utilities.IO.Python27
-    </td>
-    <td valign=\"top\">Removed support for Python 27. Use instead <code>Buildings.Utilities.IO.Python36</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
-                       Buildings.ThermalZones.Detailed.CFD<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditions<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditionsWithWindow<br/>
-                       Buildings.ThermalZones.Detailed.Validation.BaseClasses.SingleZoneFloor
-    </td>
-    <td valign=\"top\">Removed parameter <code>lat</code> for the latitude as this is now obtained from the weather data bus.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-    </td>
-    <td valign=\"top\">Set <code>final massDynamics=energyDynamic</code>.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1542\">IBPSA, #1542</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus_9_6_0</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0
-    </td>
-    <td valign=\"top\">Renamed package to add the version number for EnergyPlus. This will allow supporting more than
-                       one version of EnergyPlus.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2851\">#2851</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Building
-    </td>
-    <td valign=\"top\">This model, which needs to be part of every model that uses EnergyPlus, now
-                       requires the specification of the EnergyPlus weather data file (<code>.epw</code> file)
-                       through the parameter <code>epwName</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2443\">#2443</a>.<br/>
-                       <br/>
-                       Removed the parameters <code>showWeatherData</code> and <code>generatePortableFMU</code>.
-                       Now, the weather data bus is always enabled as it is used in almost all simulations.
-                       This change is supported in the conversion script.<br/>
-                       Converted <code>usePrecompiledFMU</code> and the associated <code>fmuName</code> from
-                       parameter to a constant as these are only used for debugging by developers.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2759\">#2759</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Spring<br/>
-                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Summer<br/>
-                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.ASHRAE2006Winter<br/>
-                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Spring<br/>
-                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Summer<br/>
-                       Buildings.ThermalZones.EnergyPlus_9_6_0.Examples.SmallOffice.Guideline36Winter
-    </td>
-    <td valign=\"top\">Changed models to include the hydraulic configurations of the cooling coil,
-                       heating coil and VAV terminal box.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2594\">#2594</a>.<br/>
-                       Changed model structure to separate building and HVAC system.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2652\">#2652</a>.<br/>
-                       Changed parameter declarations and added to Guideline 36 models the optimal start up calculation.
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2829\">issue #2829</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Utilities.IO</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Utilities.IO.Python36
-    </td>
-    <td valign=\"top\">Replaced package with <code>Buildings.Utilities.IO.Python_3_8</code>
-                       and moved the old package to <code>Buildings.Obsolete.Utilities.IO.Python36</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2599\">#2599</a>.<br/>
-                       For Dymola, a conversion script will rename models that use <code>Python36</code>
-                       to use <code>Python_3_8</code>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Polynominal<br/>
-                         Buildings.Utilities.Math.Examples.Polynominal
-    </td>
-    <td valign=\"top\">Corrected name to <code>Polynomial</code>.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1524\">IBPSA, #1524</a>.<br/>
-                       This change is supported in the conversion script.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Greater<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Less<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold
-    </td>
-    <td valign=\"top\">Corrected the condition of switching true back to false. It is caused by the wrong inequality check.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2981\">#2981</a>.
-    </td>
-</tr>
-
-
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.ParallelConstantFlow
-    </td>
-    <td valign=\"top\">Removed the model that represented an incorrect hydronic configuration. <br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2967\">#2967</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"> Buildings.Fluid.Chillers.BaseClasses.PartialElectric
-    </td>
-    <td valign=\"top\">Corrected calculation of entering condenser temperature
-                       when using a moist air media model.
-                       This is important for modeling air-cooled chillers using the model
-                       <code>Buildings.Fluid.Chillers.ElectricEIR</code>
-                       <br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">#2770</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized</br>
-    </td>
-    <td valign=\"top\">Corrected removal of latent heat from component.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3027\">#3027</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Occupants</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Occupants.Office.Occupancy.Wang2005Occupancy
-    </td>
-    <td valign=\"top\">Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
-                       To improve efficiency, this reformulation also changes the event triggering function so that
-                       it leads to time events rather than state events.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2590\">#2590</a>.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Airflow</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOperable
-    </td>
-    <td valign=\"top\">Removed duplicate declaration of <code>VABp_flow</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1496\">Buildings, #1496</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.IntegratedPrimaryLoadSide
-    </td>
-    <td valign=\"top\">Removed duplicate instances of blocks that generate control signals.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2963\">Buildings, issue 2963</a>.
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
-    </td>
-    <td valign=\"top\">Corrected weather data bus connection which was structurally incorrect
-                       and did not parse in OpenModelica.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-  </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.PID<br/>
-                         Buildings.Controls.OBC.CDL.PIDWithReset
-  </td>
-  <td valign=\"top\">Corrected wrong documentation in how the derivative of the control error is approximated.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2994\">Buildings, issue 2994</a>.
-  </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-    </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Sources.PVSimple<br/>
-                         Buildings.Electrical.AC.OnePhase.Sources.PVSimpleOriented<br/>
-                         Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimple<br/>
-                         Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimpleOriented<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented_N<br/>
-                         Buildings.Electrical.DC.Sources.PVSimple<br/>
-                         Buildings.Electrical.DC.Sources.PVSimpleOriented<br/>
-                         Buildings.Electrical.Interfaces.PartialPvBase
-    </td>
-    <td valign=\"top\">Corrected wrong documentation string for surface area which
-                       should be gross rather than net area.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.Experimental</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling.Controls.ChillerStage
-    </td>
-    <td valign=\"top\">Corrected parameter value for <code>twoOn.nOut</code>.
-                       This correction is required to simulate the model in Dymola 2022
-                       if the model has been updated to MSL 4.0.0. With MSL 3.2.3, the simulation
-                       works without this correction.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    </td>
-    <td valign=\"top\">Corrected assignment of gas constant which lead to a unit error.
-                       This change does not affect the results as the value is not used for this liquid medium.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1603\">IBPSA, #1603</a>.
-    </td>
-  </tr>
-  <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RadiationTemperature
-    </td>
-    <td valign=\"top\">Corrected annotation.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2550\">Buildings, #2550</a>.
-    </td>
-</tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
-                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
-                           Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3B.Electrical<br/>
-                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
-        </td>
-        <td valign=\"top\">Added missing parameter declaration.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2556\">Buildings, #2556</a>.
-        </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python_3_8</b>
-   </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.IO.Python_3_8.Functions.Examples.Exchange
-   </td>
-   <td valign=\"top\">Removed call to impure function <code>removeFile</code>.
-                      This removal is required for MSL 4.0.0.<br/>
-                      This is for
-                      <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
-   </td>
-</tr>
-</table>
-</html>"));
-  end Version_9_0_0;
-
-
-  class Version_8_1_3 "Version 8.1.3"
-    extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 8.1.3 is a patch that has backward compatible bug fixes.
-It is backwards compatible with versions 8.0.0, 8.1.0, 8.1.1 and 8.1.2.
-</p>
-<p>
-The library has been tested with Dymola 2022,
-JModelica (revision 14023),
-OpenModelica 1.19.0-dev (449+g4f16e6af22),
-OPTIMICA (revision OCT-dev-r26446_JM-r14295) and recent versions of Impact.
-</p>
-</div>
-<!-- New libraries -->
-<!-- New components for existing libraries -->
-<!-- Backward compatible changes -->
-<!-- Non-backward compatible changes to existing components -->
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"> Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                        Buildings.Fluid.HeatExchangers.WetCoilDiscretized</br>
-    </td>
-    <td valign=\"top\">Corrected removal of latent heat from component.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3027\">#3027</a>.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-</html>"));
-  end Version_8_1_3;
-
-
-  class Version_8_1_2 "Version 8.1.2"
-  extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 8.1.2 is a patch that has backward compatible bug fixes.
-It is backwards compatible with versions 8.0.0, 8.1.0 and 8.1.1.
-</p>
-<p>
-The library has been tested with Dymola 2022,
-JModelica (revision 14023),
-OpenModelica 1.19.0-dev (449+g4f16e6af22),
-OPTIMICA (revision OCT-dev-r26446_JM-r14295) and recent versions of Impact.
-</p>
-</div>
-<!-- New libraries -->
-<!-- New components for existing libraries -->
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.HeatTransfer</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass
-    </td>
-    <td valign=\"top\">Changed the gas layer to be conditional.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3026\">#3026</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Boilers.Data.Lochinvar
-  </td>
-  <td valign=\"top\">Added annotation <code>defaultComponentPrefixes = \"parameter\"</code>.
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Data.EquationFitReversible.Generic
-  </td>
-  <td valign=\"top\">Removed <code>protected</code> declaration inside the record as the Modelica Language Specification
-                     only allows public sections in a record.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3009\">#3009</a>.
-  </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<!-- Errors that have been fixed -->
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls</b>
-  </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Conversions.BooleanToInteger<br/>
-                       Buildings.Controls.OBC.CDL.Conversions.BooleanToReal<br/>
-    </td>
-    <td valign=\"top\">Corrected documentation texts where the variables were described with wrong types.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3016\">#3016</a>.
-    </td>
-</tr>
-</table>
-</html>"));
-  end Version_8_1_2;
-
-  class Version_8_1_1 "Version 8.1.1"
-    extends Modelica.Icons.ReleaseNotes;
-    annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 8.1.1 is a patch that has backward compatible bug fixes.
-It is backwards compatible with version 8.0.0 and 8.1.0.
-</p>
-<p>
-The library has been tested with Dymola 2022,
-JModelica (revision 14023),
-OpenModelica 1.19.0-dev (449+g4f16e6af22),
-OPTIMICA (revision OCT-dev-r26446_JM-r14295) and recent versions of Impact.
-</p>
-</div>
-  <!-- New libraries -->
-<!-- New components for existing libraries -->
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Examples.VAVReheat</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Controls.FreezeStat
-  </td>
-  <td valign=\"top\">Added hysteresis. Without it, models can stall due to state events.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2975\">#2975</a>.
-  </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SunRiseSet
-    </td>
-    <td valign=\"top\">Changed implementation to avoid NaN in OpenModelica.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2835\">issue 2835</a>.
-    </td>
-</tr>
-  <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.Line_N<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRLC_N<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortMatrixRL_N<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC<br/>
-                         Buildings.Electrical.AC.ThreePhasesUnbalanced.Lines.TwoPortRLC_N
-    </td>
-    <td valign=\"top\">Set nominal attribute for voltage at terminal.
-                       This change enables Dymola 2023 beta3 to solve
-                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepDown.DY</code>
-                       and
-                       <code>Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.UnbalancedStepUp.DD</code>
-                       which otherwise fail during the initialization as the homotopy steps
-                       obtain unreasonable values for the voltages.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.EnergyPlus</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus
-    </td>
-    <td valign=\"top\">Changed handling of forward and backward slashes on Windows.
-                       Now models in this package also work with OpenModelica on Windows.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.Examples.Combined.ParallelConstantFlow
-    </td>
-    <td valign=\"top\">Removed the model that represented an incorrect hydronic configuration. <br/>
-    This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2967\">#2967</a>.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Applications</b>
-  </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation.IntegratedPrimaryLoadSide
-      </td>
-      <td valign=\"top\">Removed duplicate instances of blocks that generate control signals.<br/>
-                         This is for
-                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2963\">Buildings, issue 2963</a>.
-      </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-  </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.PID<br/>
-                         Buildings.Controls.OBC.CDL.PIDWithReset
-  </td>
-  <td valign=\"top\">Corrected wrong documentation in how the derivative of the control error is approximated.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2994\">Buildings, issue 2994</a>.
-  </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC.CentralPlants.Cooling.Controls.ChillerStage
-    </td>
-    <td valign=\"top\">Corrected parameter value for <code>twoOn.nOut</code>.
-                       This correction is required to simulate the model in Dymola 2022
-                       if the model has been updated to MSL 4.0.0. With MSL 3.2.3, the simulation
-                       works without this correction.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
-    </td>
-</tr>
-  <tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Media.Specialized.Water.TemperatureDependentDensity
-    </td>
-    <td valign=\"top\">Corrected assignment of gas constant which lead to a unit error.
-                       This change does not affect the results as the value is not used for this liquid medium.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1603\">IBPSA, #1603</a>.
-    </td>
-  </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python36</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.IO.Python36.Functions.Examples.Exchange
-    </td>
-    <td valign=\"top\">Removed call to impure function <code>removeFile</code>.
-                       This removal is required for MSL 4.0.0.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1563\">Buildings, #1563</a>.
-    </td>
-</tr>
-</table>
-</html>"));
-  end Version_8_1_1;
-
-
-  class Version_8_1_0 "Version 8.1.0"
-    extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-    <div class=\"release-summary\">
-    <p>
-    Version 8.1.0 is a minor release that is backwards compatible with version 8.0.0.
-    The library has been tested with Dymola 2022, JModelica (revision 14023),
-    OpenModelica 1.19.0-dev (449+g4f16e6af22),
-    and OPTIMICA (revision OCT-stable-r19089_JM-r14295).
-    </p>
-    <p>
-    The following changes have been done:
-    <ul>
-    <li>
-    Added a package to compute undisturbed ground temperatures.
-    </li>
-    <li>
-    Added controller for radiant cooling and heating systems.
-    </li>
-    <li>
-    Added a package for district cooling applications.
-    </li>
-    <li>
-    Added a new boiler model that is suitable for condensing boilers.
-    </li>
-    <li>
-    Corrected various errors and improved compliance with Modelica Language Standard.
-    </li>
-    </ul>
-    </div>
-    <!-- New libraries -->
-    <p>
-    The following <b style=\"color:blue\">new libraries</b> have been added:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-    <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.BoundaryConditions.GroundTemperature
-        </td>
-        <td valign=\"top\">Package with models and climatic data for computing ground temperature.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.RadiantSystems
-        </td>
-        <td valign=\"top\">Package with controllers for radiant cooling and heating systems
-                           such for pipes embedded in the concrete slab.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Experimental.DHC</b>
-        </td>
-    <tr><td valign=\"top\">Buildings.Experimental.DHC.Plants.Cooling
-        </td>
-        <td valign=\"top\">Package with models for a chilled water plant adapted to
-        district cooling applications.<br/>
-        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2264\">issue 2264</a>
-        </td>
-    </tr>
-    </table>
-    <!-- New components for existing libraries -->
-    <p>
-    The following <b style=\"color:blue\">new components</b> have been added
-    to <b style=\"color:blue\">existing</b> libraries:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-      </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatusDuplicator
-      </td>
-      <td valign=\"top\">Block that duplicates the zone status to be connected to all zone groups.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
-      </td>
-    </tr>
-    <tr><td valign=\"top\">
-          Buildings.Controls.OBC.CDL.Routing.BooleanVectorFilter<br/>
-          Buildings.Controls.OBC.CDL.Routing.BooleanVectorReplicator<br/>
-          Buildings.Controls.OBC.CDL.Routing.IntegerVectorFilter<br/>
-          Buildings.Controls.OBC.CDL.Routing.IntegerVectorReplicator<br/>
-          Buildings.Controls.OBC.CDL.Routing.RealVectorFilter<br/>
-          Buildings.Controls.OBC.CDL.Routing.RealVectorReplicator
-      </td>
-      <td valign=\"top\">Blocks for filtering and replicating vectors of signals.<br/>
-           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2544\">issue 2544</a>.
-      </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b>
-      </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerTable<br/>
-                         Buildings.Fluid.Boilers.Examples.BoilerTable<br/>
-                         Buildings.Fluid.Boilers.Validation.BoilerTableEfficiencyCurves<br/>
-                         Buildings.Fluid.Boilers.BaseClasses.PartialBoiler<br/>
-                         Buildings.Fluid.Boilers.Data.Generic<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash2501<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash3001<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash3501<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash4001<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash5001<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.Crest.FBdash6001<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX400<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX500<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX600<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX725<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.FTXL.FTX850<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0400<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0500<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0650<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash0800<br/>
-                         Buildings.Fluid.Boilers.Data.Lochinvar.KnightXL.KBXdash1000
-      </td>
-      <td valign=\"top\">Classes for modeling boilers whose efficiency curves are provided as a table.
-                         Part of the code from the old <code>Buildings.Fluid.Boilers.BoilerPolynomial</code>
-                         has been moved to <code>Buildings.Fluid.Boilers.BaseClasses.PartialBoiler</code>
-                         to support the new model <code>Buildings.Fluid.Boilers.BoilerTable</code>. <br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2651\">issue 2651</a>.<br/>
-                         In the moved code, the boiler's heating power output is now corrected by
-                         its loss to the ambient. <br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2725\">#2725</a>.
-      </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-      </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_York_YCAL0033EE_101kW_3_1COP_AirCooled
-      </td>
-      <td valign=\"top\">Data for air cooled chiller. <br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">issue #2770</a>.
-      </td>
-    </tr>
-    </table>
-    <!-- Backward compatible changes -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    have been <b style=\"color:blue\">improved</b> in a
-    <b style=\"color:blue\">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.Controls.Continuous</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.Continuous.SignalRanker
-        </td>
-        <td valign=\"top\">Changed implementation to use sort function from Modelica Standard Library,
-                           and updated its example to avoid simultaneous state and time events.<br/>
-                           This is for
-                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples.ChillerPlant</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
-        </td>
-        <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, issue #2761</a>.<br/>
-                           Changed initialization from steady state initial to fixed initial for some components.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
-        </td>
-        <td valign=\"top\">Improved model to guard against approximation errors of event handling.
-                           With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
-                           all simulate with OpenModelica.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buildings, issue #2713</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
-        </td>
-        <td valign=\"top\">Reimplemented function to avoid a potential overflow caused by the <code>cosh</code> function.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Non-backward compatible changes to existing components -->
-    <!-- Errors that have been fixed -->
-    <p>
-    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-    that can lead to wrong simulation results):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\"> Buildings.Fluid.Chillers.BaseClasses.PartialElectric
-        </td>
-        <td valign=\"top\">Corrected calculation of entering condenser temperature
-                           when using a moist air media model.
-                           This is important for modeling air-cooled chillers using the model
-                           <code>Buildings.Fluid.Chillers.ElectricEIR</code>.
-                           <br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">issue #2770</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Occupants</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Occupants.Office.Occupancy.Wang2005Occupancy
-        </td>
-        <td valign=\"top\">Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
-                           To improve efficiency, this reformulation also changes the event triggering function so that
-                           it leads to time events rather than state events.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2590\">Buildings, #2590</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Uncritical errors -->
-    <p>
-    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-    units are wrong or errors in documentation):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOperable
-        </td>
-        <td valign=\"top\">Removed duplicate declaration of <code>VABp_flow</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1496\">Buildings, issue #1496</a>.
-        </td>
-    </tr>
-    <tr>
-      <td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
-      </td>
-    </tr>
-    <tr>
-      <td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
-      </td>
-      <td valign=\"top\">Corrected weather data bus connection which was structurally incorrect
-                         and did not parse in OpenModelica.<br/>
-                         This is for
-                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
-       </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
-                           Buildings.Electrical.DC.Storage.BaseClasses.Charge<br/>
-                           Buildings.Electrical.DC.Storage.Battery
-        </td>
-        <td valign=\"top\">Corrected unit string.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RadiationTemperature
-        </td>
-        <td valign=\"top\">Corrected annotation.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2550\">Buildings, issue #2550</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
-                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
-                           Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3B.Electrical</br>
-                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
-        </td>
-        <td valign=\"top\">Added missing parameter declaration.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2556\">Buildings, issue #2556</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
-        </td>
-        <td valign=\"top\">Improved model to guard against approximation errors of event handling.
-                           With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
-                           all simulate with OpenModelica.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buildings, issue #2713</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Obsolete components -->
-     </html>"));
-  end Version_8_1_0;
-
-  class Version_8_0_0 "Version 8.0.0"
-    extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-<div class=\"release-summary\">
-<p>
-Version 8.0.0 is a major release that contains the first version of the Spawn of EnergyPlus coupling.
-The library has been tested with Dymola 2021, JModelica (revision 14023),
-and OPTIMICA (revision OCT-stable-r19089_JM-r14295).
-</p>
-<p>
-The following major changes have been done:
-</p>
-<ul>
-<li>
-The package <code>Buildings.ThermalZones.EnergyPlus</code>
-contains the first version of the Spawn of EnergyPlus coupling that is being developed
-at <a href=\"https://lbl-srg.github.io/soep\">https://lbl-srg.github.io/soep</a>.
-The Spawn coupling allows to model HVAC and controls in Modelica, and graphically connect to
-EnergyPlus models for thermal zones, schedules, EMS actuators and output variables.
-This allows for example to model HVAC systems, HVAC controls and controls for active facade systems in Modelica,
-and use the EnergyPlus envelope model to simulate heat transfer through the building envelope, including the
-heat and light transmission through the windows for the current control signal of the active shade.
-</li>
-<li>
-The package
-<code>Buildings.Experimental.DHC</code> contains models for district heating and cooling systems
-that are being developed for the URBANopt District Energy System software.
-</li>
-<li>
-The new media <code>Buildings.Media.Antifreeze.PropyleneGlycolWater</code> allows modeling
-of propylene-glycol water mixtures.
-</li>
-<li>
-A new cooling coil model <code>Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU</code>
-has been added. This model is applicable for fully-dry, partially-wet, and fully-wet regimes.
-In contrast to <code>Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</code> and
-to <code>Buildings.Fluid.HeatExchangers.WetCoilDiscretized</code>,
-this model uses the epsilon-NTU relationship rather than a spatial discretization of the coil.
-This leads to fewer state variables and generally to a faster simulation.
-</li>
-<li>
-New simplified door models for bi-directional air exchange between thermal zones are
-implemented in <code>Buildings.Airflow.Multizone</code>.
-</li>
-<li>
-Various other models have been improved or added, in particular for modeling of
-control sequences using the Control Description Language that has been developed
-in the OpenBuildingControl project at <a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>.
-</li>
-</ul>
-</div>
-<p>
-For more details, please see the release notes below.
-</p>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.Validation.BESTEST
-    </td>
-    <td valign=\"top\">Packages with validation models for the weather data BESTEST.<br/>
-                     This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1314\">IBPSA, issue 1314</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DHC
-    </td>
-    <td valign=\"top\">Packages for modeling district heating
-                       and cooling systems.<br/>
-                       These packages contain components supporting the integration within
-                       the URBANopt SDK. The development is in progress.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Antifreeze.PropyleneGlycolWater
-    </td>
-    <td valign=\"top\">Package with medium model for propylene glycol water mixtures.
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1410\">IBPSA, issue 1410</a>.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.EnergyPlus
-    </td>
-    <td valign=\"top\">Package for Spawn of EnergyPlus that couples Modelica directly
-                     to the EnergyPlus envelope model.<br/>
-                     The models in this package allow simulating the envelope heat transfer
-                     of one or several buildings in EnergyPlus, and simulating HVAC and controls
-                     in Modelica. EnergyPlus objects are represented graphically as any other Modelica
-                     models, and the coupling and co-simulation is done automatically based on these models.
-    </td>
-</tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOpen<br/>
-                       Buildings.Airflow.Multizone.DoorOperable
-    </td>
-    <td valign=\"top\">Simplified model for large openings with bi-directional, buoyancy-induced air flow, such as open doors.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1353\">IBPSA, issue 1353</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.GroupStatus
-    </td>
-    <td valign=\"top\">Find minimum and maximum values regarding the status of zones in one group. This is needed
-                       for specifying the group operating mode according to ASHRAE Guideline 36, May 2020 version.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.ModeAndSetPoints
-    </td>
-    <td valign=\"top\">Moved from Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints,
-                       reimplemented to use the operating mode specified according to ASHRAE G36 official release and changed
-                       the heating and cooling demand limit level to be inputs.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.PID
-    </td>
-    <td valign=\"top\">New implementation of the PID controller.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\"># 2056</a> and
-                       for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\"># 2182</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.PIDWithReset
-    </td>
-    <td valign=\"top\">New implementation of the PID controller with output reset based on a boolean trigger.
-                       This implementation allows to reset the output of the controller
-                       to a parameter value. (Resetting it to an input was never used and is now removed for simplicity.)<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\"># 2056</a> and
-                       for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2182\"># 2182</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TimerAccumulating
-    </td>
-    <td valign=\"top\">New timer that accumulates time. The output will be reset to zero when the reset input
-                       becomes <code>true</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2101\"># 2101</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Sources.Pulse
-    </td>
-    <td valign=\"top\"><code>Integer</code> pulse source signal.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\"># 2125</a>
-                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\"># 2282</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Sources.TimeTable
-    </td>
-    <td valign=\"top\">Time table for <code>Integer</code> outputs.<br/>
-                       Each output is held constant between two consecutive entries in each column of the <code>table</code> parameters.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\"># 2125</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Sources.TimeTable
-    </td>
-    <td valign=\"top\">Time table for <code>Boolean</code> outputs.<br/>
-                     This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2125\"># 2125</a>.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.SupplyAirTemperature
-    </td>
-    <td valign=\"top\">Control block for tracking the supply air temperature set point.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\"># 2024</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.SupplyAirTemperatureSetpoint
-    </td>
-    <td valign=\"top\">Computation of the supply air temperature set point based on the operation mode.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\"># 2024</a>.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayButterfly
-    </td>
-    <td valign=\"top\">Two way valve with the flow characteristic of a butterfly valve.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/975\">IBPSA, issue 975</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilEffectivenessNTU
-    </td>
-    <td valign=\"top\">Cooling coil model applicable for fully-dry, partially-wet, and fully-wet regimes.
-                       In contrast to <code>Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</code> and
-                       to <code>Buildings.Fluid.HeatExchangers.WetCoilDiscretized</code>,
-                       this model uses the epsilon-NTU relationship rather than a spatial discretization of the coil.
-                       This leads to fewer state variables and generally to a faster simulation.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/622\"># 622</a>.</td>
-</tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Air</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.Examples.Guideline36
-    </td>
-    <td valign=\"top\">Updated AHU controller which applies the sequence of specifying operating mode
-                       according to G36 official release.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\"># 1893</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller
-    </td>
-    <td valign=\"top\">Changed the default heating maximum airflow setpoint to 30% of the zone nominal airflow.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2172\"># 2172</a>.
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MovingMean<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.PID<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.PIDWithReset<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.SlewRateLimiter<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Sources.Ramp<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Sources.Sin<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.DayType<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.FirstOrderHold<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.Sampler<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.UnitDelay<br/>
-                       Buildings.Controls.OBC.CDL.Discrete.ZeroOrderHold<br/>
-                       Buildings.Controls.OBC.CDL.Logical.Sources.Pulse<br/>
-                       Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger<br/>
-                       Buildings.Controls.OBC.CDL.Logical.Timer<br/>
-                       Buildings.Controls.OBC.CDL.Logical.TimerAccumulating<br/>
-                       Buildings.Controls.OBC.CDL.Logical.TriggeredTrapezoid<br/>
-                       Buildings.Controls.OBC.CDL.Logical.TrueDelay<br/>
-                       Buildings.Controls.OBC.CDL.Logical.TrueFalseHold<br/>
-                       Buildings.Controls.OBC.CDL.Logical.TrueHoldWithReset<br/>
-                       Buildings.Controls.OBC.CDL.Psychrometrics.DewPoint_TDryBulPhi<br/>
-                       Buildings.Controls.OBC.CDL.Psychrometrics.SpecificEnthalpy_TDryBulPhi<br/>
-                       Buildings.Controls.OBC.CDL.Psychrometrics.WetBulb_TDryBulPhi<br/>
-                       Buildings.Controls.OBC.Utilities.SetPoints.SupplyReturnTemperatureReset<br/>
-                       Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
-
-    </td>
-    <td valign=\"top\">Reformulated to remove dependency to <code>Modelica.Units.SI</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2243\">issue 2243</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Greater<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Less<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold
-    </td>
-    <td valign=\"top\">Added option to specify a hysteresis, which by default is set to <i>0</i>.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.OptimalStart
-
-    </td>
-    <td valign=\"top\">Refactored sampling of history of temperature slope to only sample when control error requires optimal start up.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2345\">#2345</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.HydronicHeating.TwoRoomsWithStorage
-    </td>
-    <td valign=\"top\">Changed <code>dpVal_nominal</code> to 6 kPa.
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2378\">issue 2378</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Floor
-    </td>
-    <td valign=\"top\">Refactored model to extend from the newly added <code>Buildings.Examples.VAVReheat.BaseClasses.PartialFloor</code> model.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1502\">issue 1502</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
-    <td valign=\"top\">Declared the rooms in a new model <code>Buildings.Examples.VAVReheat.BaseClasses.Floor</code>
-                       to allow use of the model with the Modelica or the Spawn envelope model.<br/>
-<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
-                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.OneFloor_OneZone<br/>
-                       Buildings.Examples.ScalableBenchmarks.BuildingVAV.Examples.TwoFloor_TwoZone<br/>
-                       Buildings.Examples.VAVReheat.ASHRAE2006<br/>
-                       Buildings.Examples.VAVReheat.Guideline36
-    </td>
-    <td valign=\"top\">Adapted the model to the updated control of supply air temperature.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\">issue 2024</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Guideline36
-    </td>
-    <td valign=\"top\">Upgraded sequence of specifying operating mode according to G36 official release.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1893</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Guideline36
-    </td>
-    <td valign=\"top\">Change component name <code>yOutDam</code> to <code>yExhDam</code>
-                       and update documentation graphic to include relief damper.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2399\">#2399</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006
-    </td>
-    <td valign=\"top\">Update documentation graphic to include relief damper.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2399\">#2399</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipe
-    </td>
-    <td valign=\"top\">Improved calculation of time constant to avoid negative values in some special cases.<br/>
-                     This is for
-                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1427\">IBPSA, issue 1427</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU<br/>
-                           Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU<br/>
-                           Buildings.Fluid.HeatExchangers.PartialEffectivenessNTU
-    </td>
-    <td valign=\"top\">Added a warning for when <code>Q_flow_nominal</code> is specified with the wrong sign.
-    </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs<br/>
-                           Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions.AverageResistance
-    </td>
-    <td valign=\"top\">Corrected inequality test on <code>alpha</code>,
-                       and changed print statement to an assertion with assertion level set to warning.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2009\">issue 2009</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU<br/>
-                           Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU<br/>
-                           Buildings.Fluid.HeatExchangers.PartialEffectivenessNTU
-    </td>
-    <td valign=\"top\">Added a warning for when <code>Q_flow_nominal</code> is specified with the wrong sign.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs<br/>
-                       Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.Functions.AverageResistance
-    </td>
-    <td valign=\"top\">Corrected inequality test on <code>alpha</code>,
-                       and changed print statement to an assertion with assertion level set to warning.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2009\">issue 2009</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.EnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.EntropyFlowRate<br/>
-                       Buildings.Fluid.Sensors.LatentEnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.VolumeFlowRate
-    </td>
-    <td valign=\"top\">Changed parameter values to use as default a steady-state sensor signal.<br/>
-                     This is for
-                     <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1406\">IBPSA, issue 1406</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Refrigerants.R410A
-    </td>
-    <td valign=\"top\">Improved implementation, which now works with OpenModelica.<br/>
-                       This is for
-                       <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1414\">IBPSA, issue 1414</a>.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Cryptographics.sha
-    </td>
-    <td valign=\"top\">Corrected memory leak.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Air</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV
-    </td>
-    <td valign=\"top\">Updated parameters of the two HVAC controllers such as PI gains, damper positions,
-                       and supply air temperature limits to make example models comparable.
-                       Added CO2 monitoring.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1608</a>.
-</tr>
-<tr><td valign=\"top\">Buildings.Air.Systems.SingleZone.VAV.ChillerDXHeatingEconomizerController
-    </td>
-    <td valign=\"top\">Moved and renamed to
-                       <code>Buildings.Air.Systems.SingleZone.VAV.BaseClasses.ControllerChillerDXHeatingEconomizer</code>.
-                       Also a bug fix was implemented that enables the fan when cooling needed during unoccupied hours.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2265\">issue 2265</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID<br/>
-                       Buildings.Controls.Continuous.PIDHysteresis<br/>
-                       Buildings.Controls.Continuous.PIDHysteresisTimer
-    </td>
-    <td valign=\"top\">Corrected wrong convention of reverse and direct action.
-                       The previous parameter <code>reverseAction</code> with a default of <code>false</code>
-                       has been removed, and
-                       a new parameter <code>reverseActing</code> with a default of <code>true</code>
-                       has been added. This was done because the previous implementation wrongly interpreted reverse action
-                       as the control output changing in reverse to the change in control error, but the
-                       industry convention is that reverse action means that the control output
-                       changes in reverse to the measurement signal.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">IBPSA, #1365</a>.<br/>
-                       For Dymola, a conversion script makes this change.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Economizers.Subsequences.Modulation
-    </td>
-    <td valign=\"top\">Removed parameter <code>samplePeriod</code> and removed delay on actuator signal
-                       to avoid a large delay in this feedback loop.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2454\">issue 2454</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller
-    </td>
-    <td valign=\"top\">Updated the block of specifying operating mode and setpoints.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1893</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
-    </td>
-    <td valign=\"top\">Upgraded the sequence according to ASHRAE Guideline 36, May 2020 version.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1893\">issue 1893</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Continuous</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.ChangeSign<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.HysteresisWithHold
-    </td>
-    <td valign=\"top\">Moved blocks to <code>Obsolete</code> package because they can be implemented with other blocks
-                       and have only rarely been used.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2134\">issue 2134</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
-    </td>
-    <td valign=\"top\">Corrected wrong convention of reverse and direct action.
-                       The previous parameter <code>reverseAction</code> with a default of <code>false</code>
-                       has been removed, and
-                       a new parameter <code>reverseActing</code> with a default of <code>true</code>
-                       has been added. This was done because the previous implementation wrongly interpreted reverse action
-                       as the control output changing in reverse to the change in control error, but the
-                       industry convention is that reverse action means that the control output
-                       changes in reverse to the measurement signal.<br/>
-                       This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1365\">IBPSA, #1365</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
-    </td>
-    <td valign=\"top\">Moved model to <code>Building.Obsolete.Controls.OBC.CDL.Continuous</code>.<br/>
-                       Instead of this model, use the new model <code>Buildings.Controls.Continuous.PID</code> or
-                       <code>Buildings.Controls.Continuous.PIDWithReset</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2056\">issue 2056</a>.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.GreaterEqualThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.GreaterEqual<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.LessEqualThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.LessEqual
-    </td>
-    <td valign=\"top\">Moved blocks to obsolete package. Instead of these blocks, use the ones that
-                       do not contain the word <code>Equal</code>
-                       in their name. This was done because for real-valued, measured quantities, there is
-                       no reason to distinguish between weak and strict inequality
-                       (due to sensor noise, or within a simulation, due to solver noise or rounding errors).<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">#2076</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests
-    </td>
-    <td valign=\"top\">Renamed parameter <code>threshold</code> to <code>t</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">#2076</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.NumberOfRequests
-    </td>
-    <td valign=\"top\">Moved block to obsolete package because this block is not needed,
-                       and it would need to be refactored to add hysteresis.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2124\">#2124</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse
-    </td>
-    <td valign=\"top\">Removed <code>startTime</code> parameter. Introduced <code>shift</code> parameter.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">issue 2170</a>
-                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\">issue 2282</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.Pulse
-    </td>
-    <td valign=\"top\">Removed parameter <code>nperiod</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">issue 2170</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Logical</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch<br/>
-                       Buildings.Controls.OBC.CDL.Logical.Toggle
-    </td>
-    <td valign=\"top\">Removed the parameter <code>pre_y_start</code>, and made the initial output to be equal to
-                       latch or toggle input when the clear input is <code>false</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2177\">#2177</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Timer
-    </td>
-    <td valign=\"top\">Removed <code>reset</code> boolean input and added boolean output <code>passed</code>
-                       to show if the time becomes greater than threshold time.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2101\">#2101</a>.
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Sources.SampleTrigger<br/>
-                       Buildings.Controls.OBC.CDL.Logical.Sources.Pulse
-    </td>
-    <td valign=\"top\">Removed <code>startTime</code> parameter. Introduced <code>shift</code> parameter.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2170\">issue 2170</a>
-                       and <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2282\">issue 2282</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Integers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.GreaterEqualThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Integers.LessEqualThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Integers.GreaterThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Integers.LessThreshold
-    </td>
-    <td valign=\"top\">Renamed parameter <code>threshold</code> to <code>t</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2076\">#2076</a>.<br/>
-                       For Dymola, a conversion script makes this change.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Psychrometrics</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Psychrometrics.TDewPoi_TDryBulPhi<br/>
-                       Buildings.Controls.OBC.CDL.Psychrometrics.TWetBul_TDryBulPhi<br/>
-                       Buildings.Controls.OBC.CDL.Psychrometrics.h_TDryBulPhi
-    </td>
-    <td valign=\"top\">Renamed blocks and removed input connector for pressure.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2139\">#2139</a>.<br/>
-                       For Dymola, a conversion script will rename existing instance to use
-                       the old versions which have been moved to the <code>Buildings.Obsolete</code> package.</td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SetPoints
-    </td>
-    <td valign=\"top\">Moved package from <code>Buildings.Controls.OBC.CDL.SetPoints</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2355\">#2355</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.UnitConversions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.UnitConversions.From_Btu<br/>
-                       Buildings.Controls.OBC.UnitConversions.From_quad<br/>
-                       Buildings.Controls.OBC.UnitConversions.To_Btu<br/>
-                       Buildings.Controls.OBC.UnitConversions.To_quad
-    </td>
-    <td valign=\"top\">Corrected quantity from <code>Work</code> to <code>Energy</code>.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2245\">#2245</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006<br/>
-                     Buildings.Examples.VAVReheat.Guideline36<br/>
-                     Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop
-    </td>
-    <td valign=\"top\">Refactored model to implement the economizer dampers directly in
-    <code>Buildings.Examples.VAVReheat.BaseClasses.PartialOpenLoop</code> rather than through the
-    model of a mixing box. Since the version of the Guideline 36 model has no exhaust air damper,
-    this leads to simpler equations.
-    <br/> This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2454\">issue #2454</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.VAVBranch
-    </td>
-    <td valign=\"top\">Moved to <code>Buildings.Obsolete.Examples.VAVReheat.BaseClasses.VAVBranch</code>
-    and replaced by <code>Buildings.Examples.VAVReheat.BaseClasses.VAVReheatBox</code>.
-    <br/> This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2059\">issue #2059</a>.
-    <br/> For Dymola, a conversion script makes this change.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.Economizer
-    </td>
-    <td valign=\"top\">Updated the block with an input for enabling outdoor air damper opening and an input for
-                     economizer cooling signal.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\">issue 2024</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.EconomizerTemperatureControl
-    </td>
-    <td valign=\"top\">This block is now retired.<br/>
-                       This is for
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2024\">issue 2024</a>.
-<tr><td colspan=\"2\"><b>Buildings.Experimental</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Experimental.DistrictHeatingCooling
-    </td>
-    <td valign=\"top\">Moved package to <code>Buildings.Obsolete.DistrictHeatingCooling</code>.<br/>
-                       Generic components for DHC system modeling are now developed under
-                       <code>Buildings.Experimental.DHC</code>.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters.ChillerCooled.Equipment</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.FourPortResistanceChillerWSE<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialChillerWSE<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialCoolingCoilHumidifyingHeating<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialHeatExchanger<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialIntegratedPrimary<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialPlantParallel<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialPumpParallel<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.ThreeWayValveParameters<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.IntegratedPrimaryLoadSide<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.IntegratedPrimaryPlantSide<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.IntegratedPrimarySecondary<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.NonIntegrated<br/>
-                        Buildings.Applications.DataCenters.ChillerCooled.Equipment.WatersideEconomizer
-    </td>
-    <td valign=\"top\">Corrected fixed flow resistance settings and added ideal mixing junctions.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2446\">issue 2446</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Integers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Change
-    </td>
-    <td valign=\"top\">Corrected initialization of previous value of input to use the current input rather than <code>0</code>.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2294\">issue 2294</a>.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL.Continuous</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Greater<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.GreaterThreshold<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.Less<br/>
-                       Buildings.Controls.OBC.CDL.Continuous.LessThreshold
-    </td>
-    <td valign=\"top\">Corrected documentation.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2246\">issue 2246</a>.
-    </td>
-</tr>
-</table>
-<p>
-Note:
-</p>
-<ul>
-<li>
-This version also corrects a possible memory violation when reading weather data files that have very long lines,
-as reported in <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">IBPSA, #1432</a>.
-</li>
-</ul>
-</html>"));
-  end Version_8_0_0;
-
-  class Version_7_0_2 "Version 7.0.2"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-    <div class=\"release-summary\">
-    <p>
-    Version 7.0.2 is a bug fix release.
-    The library has been tested with Dymola 2022, JModelica (revision 14023),
-    OpenModelica 1.19.0-dev (449+g4f16e6af22)
-    and OPTIMICA (revision OCT-stable-r19089_JM-r14295).
-    </p>
-    <p>
-    The following changes have been done:
-    <ul>
-    <li>
-    Improved models to comply with Modelica Language Standard. Now all models translate with OpenModelica.
-    </li>
-    <li>
-    Corrected chiller models for situation where condenser is air cooled.
-    </li>
-    <li>
-    Corrected occupancy models for simulations that do not start at time equal to zero.
-    </li>
-    <li>
-    Implemtend various other improvements.
-    </li>
-    </ul>
-    </div>
-    <!-- New libraries -->
-    <!-- New components for existing libraries -->
-    <p>
-    The following <b style=\"color:blue\">new components</b> have been added
-    to <b style=\"color:blue\">existing</b> libraries:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Chillers.Data.ElectricEIR.ElectricEIRChiller_York_YCAL0033EE_101kW_3_1COP_AirCooled
-        </td>
-        <td valign=\"top\">Data for air cooled chiller. <br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">Buildings, issue #2770</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Backward compatible changes -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    have been <b style=\"color:blue\">improved</b> in a
-    <b style=\"color:blue\">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.Controls.Continuous</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.Continuous.SignalRanker
-        </td>
-        <td valign=\"top\">Changed implementation to use sort function from Modelica Standard Library,
-                           and updated its example to avoid simultaneous state and time events.<br/>
-                           This is for
-                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1534\">IBPSA, #1534</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples.ChillerPlant</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.DataCenter
-        </td>
-        <td valign=\"top\">Set <code>nominalValuesDefaultPressureCurve=true</code> to avoid warnings.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2761\">Buildings, issue #2761</a>.<br/>
-                           Changed initialization from steady state initial to fixed initial for some components.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.Validation.VDI6007.BaseClasses.VerifyDifferenceThreePeriods
-        </td>
-        <td valign=\"top\">Improved model to guard against approximation errors of event handling.
-                           With this change, the models in <code>Buildings.ThermalZones.ReducedOrder.Validation.VDI6007</code>
-                           all simulate with OpenModelica.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2713\">Buildings, issue #2713</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_spliceFunction
-        </td>
-        <td valign=\"top\">Reimplemented function to avoid a potential overflow caused by the <code>cosh</code> function.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/pull/1531\">IBPSA #1531</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Non-backward compatible changes to existing components -->
-    <!-- Errors that have been fixed -->
-    <p>
-    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-    that can lead to wrong simulation results):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\"> Buildings.Fluid.Chillers.BaseClasses.PartialElectric
-        </td>
-        <td valign=\"top\">Corrected calculation of entering condenser temperature
-                           when using a moist air media model.
-                           This is important for modeling air-cooled chillers using the model
-                           <code>Buildings.Fluid.Chillers.ElectricEIR</code>.
-                           <br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2770\">Buildings, issue #2770</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Occupants</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Occupants.Office.Occupancy.Wang2005Occupancy
-        </td>
-        <td valign=\"top\">Reformulated model so it works also if the simulation does not start at <i>0</i>.<br/>
-                           To improve efficiency, this reformulation also changes the event triggering function so that
-                           it leads to time events rather than state events.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2590\">Buildings, #2590</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Uncritical errors -->
-    <p>
-    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-    units are wrong or errors in documentation):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorOperable
-        </td>
-        <td valign=\"top\">Removed duplicate declaration of <code>VABp_flow</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1496\">Buildings, issue #1496</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
-                           Buildings.Electrical.DC.Storage.BaseClasses.Charge<br/>
-                           Buildings.Electrical.DC.Storage.Battery
-        </td>
-        <td valign=\"top\">Corrected unit string.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2798\">Buildings, issue #2798</a>.
-        </td>
-    </tr>
-    <tr>
-      <td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
-      </td>
-    </tr>
-    <tr>
-      <td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimaryLoadSideEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.IntegratedPrimarySecondaryEconomizer<br/>
-                         Buildings.Applications.DataCenters.ChillerCooled.Examples.NonIntegratedPrimarySecondaryEconomizer
-      </td>
-      <td valign=\"top\">Corrected weather data bus connection which was structurally incorrect
-                         and did not parse in OpenModelica.<br/>
-                         This is for
-                         <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2706\">Buildings, issue 2706</a>.
-       </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RadiationTemperature
-        </td>
-        <td valign=\"top\">Corrected annotation.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2550\">Buildings, issue #2550</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
-                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
-                           Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.X3B.Electrical</br/>
-                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
-        </td>
-        <td valign=\"top\">Added missing parameter declaration.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2556\">Buildings, issue #2556</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Obsolete components -->
-     </html>"));
-  end Version_7_0_2;
-
-
-  class Version_7_0_1 "Version 7.0.1"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-    <div class=\"release-summary\">
-    <p>
-    Version 7.0.1 is a bug fix release.
-    The library has been tested with
-    Dymola 2021 and 2022,
-    JModelica (revision 14023), and
-    OPTIMICA (revision OCT-stable-r12473_JM-r14295).
-    </p>
-    <p>
-    The following changes have been done:
-    <ul>
-    <li>
-    Corrected memory violation on Windows for weather data file with long header lines.
-    </li>
-    <li>
-    Corrected various misplaced or missing <code>each</code> declarations.
-    </li>
-    <li>
-    Corrected access to protected classes.
-    </li>
-    <li>
-    Reformulated replaceable class to avoid access of components that are not in the constraining type.
-    </li>
-    <li>
-    Added missing parameter declarations for records.
-    </li>
-    </ul>
-    </div>
-    <!-- New libraries -->
-    <!-- New components for existing libraries -->
-    <!-- Backward compatible changes -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    have been <b style=\"color:blue\">improved</b> in a
-    <b style=\"color:blue\">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.Applications</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.Validation
-        </td>
-        <td valign=\"top\">Changed boundary condition model to prescribed pressure rather than prescribed mass flow rate.
-                           Prescribing the mass flow rate caused
-                           unreasonably large pressure drop because the mass flow rate was forced through a closed valve.<br/>
-                           This is for
-                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2488\">#2488</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Validation.IEEETests.Test4NodesFeeder.BalancedStepUp.YD
-        </td>
-        <td valign=\"top\">Set better start values for algebraic variables.<br/>
-                           This is for
-                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2432\">#2432</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Non-backward compatible changes to existing components -->
-    <!-- Errors that have been fixed -->
-    <!-- Uncritical errors -->
-    <p>
-    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-    units are wrong or errors in documentation):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.CHPs.BaseClasses.EnergyConversionNormal<br/>
-                           Buildings.Fluid.CHPs.ThermalElectricalFollowing
-        </td>
-        <td valign=\"top\">Reformulated replaceable class to avoid access of components that are not in the constraining type.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2471\">issue #2471</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.PartialBorefield
-        </td>
-        <td valign=\"top\">Corrected placement of <code>each</code> keyword.
-                           See <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/2440\">Buildings, #2440</a>.
-                           <br/>
-                           Switched port connections for <code>masFloDiv</code>.
-                           See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/41\">IBPSA, #41</a>.
-                           <br/>
-                           Propagated flowReversal into <code>masFloDiv</code> and <code>masFloMul</code>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.Examples.Borefields<br/>
-                           Buildings.Fluid.Geothermal.Borefields.Validation.ConstantHeatInjection_100Boreholes</br>
-                           Buildings.Fluid.Geothermal.Borefields.Validation.Sandbox
-        </td>
-        <td valign=\"top\">Added missing parameter keyword for data records.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister<br/>
-                           Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent
-        </td>
-        <td valign=\"top\">Changed constant <code>simplify_mWat_flow</code> from protected to public because it is assigned by
-                           <a href=\"modelica://Buildings.Fluid.HeatExchangers.WetCoilCounterFlow\">
-                           Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</a>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2387\">#2387</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.PartialPrescribedOutlet
-        </td>
-        <td valign=\"top\">Removed duplicate declaration of <code>m_flow_nominal</code> which is already
-                           declared in the base class.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.Examples.MultiStage<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Examples.PerformanceCurves.Curve_I<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Examples.PerformanceCurves.Curve_II<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Examples.PerformanceCurves.Curve_III<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Examples.SingleSpeed<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Examples.SpaceCooling<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Examples.VariableSpeed<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Validation.SingleSpeedEnergyPlus<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.Validation.SingleSpeedPLREnergyPlus<br/>
-                           Buildings.Fluid.DXSystems.Cooling.BaseClasses.Examples.WetCoil<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.Examples.MultiStage<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.Examples.SingleSpeed<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.Examples.VariableSpeed<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.Validation.VariableSpeedEnergyPlus<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.Validation.VariableSpeedEnergyPlusPartLoad<br/>
-        </td>
-        <td valign=\"top\">Corrected placement of <code>each</code> keyword.<br/>
-                           See <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/2440\">Buildings, PR #2440</a>.<br/>
-                           Added missing parameter declaration for data record.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow
-        </td>
-        <td valign=\"top\">Removed <code>final</code> declaration in redeclaration.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/2392\">#2392</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PrescribedOutlet
-        </td>
-        <td valign=\"top\">Removed duplicate declaration of <code>m_flow_nominal</code> which is already
-                           declared in the base class.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Sources.BaseClasses.PartialSource<br/>
-                           Buildings.Fluid.Storage.BaseClasses.IndirectTankHeatExchanger
-        </td>
-        <td valign=\"top\">Corrected misplaced <code>each</code> and added missing instance comment.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1462\">IBPSA, #1462</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3
-        </td>
-        <td valign=\"top\">Corrected memory access violation on Windows for files with long header.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1432\">IBPSA, #1432</a>.
-        </td>
-     </tr>
-    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getTimeSpanTMY3<br/>
-                           Buildings.Utilities.Cryptographics.sha
-        </td>
-        <td valign=\"top\">Corrected memory leak in C function.
-        </td>
-     </tr>
-     <tr><td valign=\"top\">Buildings.Utilities.IO.BCVTB.BaseClasses.FluidInterface
-        </td>
-        <td valign=\"top\">Corrected missing <code>each</code> keyword.
-        </td>
-     </tr>
-    </table>
-    <!-- Obsolete components -->
-     </html>"));
-  end Version_7_0_1;
-
-    class Version_7_0_0 "Version 7.0.0"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-    <div class=\"release-summary\">
-    <p>
-    Version 7.0.0 is a major release that
-    contains various new packages, new models and improvements to existing models.
-    The library has been tested with
-    Dymola 2020x and 2021,
-    JModelica (revision 14023), and
-    OPTIMICA (revision OCT-stable-r12473_JM-r14295).
-    </p>
-    <p>
-      The following major changes have been done:
-    <ul>
-    <li>
-      New packages have been added to model building controls (<code>Buildings.Controls.OBC.Utilities</code>)
-      and to support the creation of emulators that compare the performance of building control sequences in
-      the Building Optimization Performance Tests framework
-      <a href=\"https://github.com/ibpsa/project1-boptest\">BOPTEST</a>.
-    </li>
-    <li>
-      Various new control blocks have been added to <code>Buildings.Controls.OBC.CDL</code>.
-    </li>
-    <li>
-      Various new equipment models have been added, such as models of absorption chillers, CHP equipment and heat pumps.
-    </li>
-    <li>
-      The reduced order building models now also allow modeling air moisture and air contaminant balance.
-    </li>
-    <li>
-      A tutorial has been added to explain how to implement control sequences using the Control Description Language
-      that is being developed in the <a href=\"https://obc.lbl.gov\">OpenBuildingControl</a> project.
-    </li>
-    <li>
-      The icons of many components have been updated so that they visualize temperatures, flow rates
-      or control signals while the simulation is running.
-    </li>
-    <li>
-      Results of the ANSI/ASHRAE Standard 14 validation (BESTEST) are now integrated in the user's guide
-      <code>Buildings.ThermalZones.Detailed.Validation.BESTEST.UsersGuide</code>.
-    </li>
-    </ul>
-    </div>
-    <!-- New libraries -->
-    <p>
-    The following <b style=\"color:blue\">new libraries</b> have been added:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-    <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities
-        </td>
-        <td valign=\"top\">Package with utility blocks, base classes and validation
-                           models for the OpenBuildingControl (OBC) library.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.IO.SignalExchange
-        </td>
-        <td valign=\"top\">Package with blocks that can be used
-                           to identify and activate control signal overwrites, and
-                           to identify and read sensor signals. This package is used
-                           by the Building Optimization Performance Test software
-                           <a href=\"https://github.com/ibpsa/project1-boptest\">BOPTEST</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.IO.Python36
-        </td>
-        <td valign=\"top\">Upgraded from <code>Buildings.Utilities.IO.Python27</code>
-                           since Python2.7 has been deprecated.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1760\">issue #1760</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- New components for existing libraries -->
-    <p>
-    The following <b style=\"color:blue\">new components</b> have been added
-    to <b style=\"color:blue\">existing</b> libraries:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow
-        </td>
-        <td valign=\"top\">Package of sequences for specifying the minimum outdoor airflow rate.
-                           This replaces <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutsideAirFlow</code>.
-                           The new implemented sequences separate zone level calculation from the system level calculation.
-                           It avoids vector-valued calculations.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1829\">#1829</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.ZoneStatus
-        </td>
-        <td valign=\"top\">Block that outputs zone temperature status by comparing it with setpoint temperatures, with the maximum and
-                           minimum temperature of the group which the zone is in. This allows separating the vector-valued calculations
-                           from control sequences.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>.
-        </td>
-      </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean
-        </td>
-        <td valign=\"top\">Block that outputs the triggered discrete moving mean of an input signal.
-                           This replaces <code>Buildings.Controls.OBC.CDL.Discrete.MovingMean</code>, which
-                           has been moved to <code>Buildings.Obsolete</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1588\">#1588</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.OptimalStart
-        </td>
-        <td valign=\"top\">Block that outputs optimal start time for an HVAC system prior to the occupancy.
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1589\">#1589</a>.
-        </td>
-        </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayTable
-        </td>
-        <td valign=\"top\">Three way valves with opening characteristics based on a user-provided table.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.CHPs
-        </td>
-        <td valign=\"top\">Package with model for combined heat and power device.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Chillers.AbsorptionIndirectSteam
-        </td>
-        <td valign=\"top\">Indirect steam heated absorption chiller based on performance curves.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.CheckValve
-        </td>
-        <td valign=\"top\">Check valve that prevents backflow, except for a small leakage flow rate.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1198\">IBPSA, #1198</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.EquationFitReversible
-        </td>
-        <td valign=\"top\">Heat pump model that can be reversed between heating and cooling mode,
-                           that takes as a set point the leaving fluid temperature, and that computes
-                           its performance based on an equation fit.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples.Tutorial</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.Tutorial.CDL
-        </td>
-        <td valign=\"top\">Tutorial that explains how to implement control sequences using
-                           the <a href=\"https://obc.lbl.gov\">Control Description Language</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Backward compatible changes -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    have been <b style=\"color:blue\">improved</b> in a
-    <b style=\"color:blue\">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.BoundaryConditions.WeatherData</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-        </td>
-        <td valign=\"top\">Refactored weather data reader and changed implementation to allow exactly zero radiation rather
-                           than a small positive value.
-                           This was required to allow simulating buildings at steady-state, which is needed
-                           for some controls design.
-                           For examples in which buildings are simulated at steady-state, see
-                           <code>Buildings.ThermalZones.Detailed.Validation.MixedAirFreeResponseSteadyState</code>,
-                           <code>Buildings.Examples.VAVReheat.Validation.Guideline36SteadyState</code> and
-                           <code>Buildings.ThermalZones.ReducedOrder.Validation.RoomSteadyState</code>.<br/>
-                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1340\">IBPSA, #1340</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.Continuous</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID
-        </td>
-        <td valign=\"top\">Removed homotopy that may be used during initialization to ensure that outputs are bounded.<br/>
-                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1221\">IBPSA, #1221</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Derivative
-        </td>
-        <td valign=\"top\">Removed parameter <code>initType</code> and <code>x_start</code>.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1887\">IBPSA, #1887</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.IntegratorWithReset
-        </td>
-        <td valign=\"top\">Removed parameter <code>initType</code>.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1887\">IBPSA, #1887</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
-        </td>
-        <td valign=\"top\">Removed homotopy that may be used during initialization to ensure that outputs are bounded.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1221\">IBPSA, #1221</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime<br/>
-                           Buildings.Controls.OBC.CDL.Types.ZeroTime
-        </td>
-        <td valign=\"top\">Revised implementation such that the meaning of <code>time</code> is better explained
-                           and unix time stamps are correctly defined with respect to GMT.
-                           Added option unix time stamp GMT.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1232\">IBPSA, #1232</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.CalendarTime<br/>
-                           Buildings.Controls.OBC.CDL.Types.ZeroTime
-        </td>
-        <td valign=\"top\">Revised implementation such that the meaning of <code>time</code> is better explained
-                           and unix time stamps are correctly defined with respect to GMT.
-                           Added option unix time stamp GMT.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1232\">IBPSA, #1232</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch<br/>
-                         Buildings.Controls.OBC.CDL.Logical.Toggle
-        </td>
-        <td valign=\"top\">Simplified implementation, which makes them work with OpenModelica.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1823\">#1823</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Timer
-        </td>
-        <td valign=\"top\">Added a boolean input to reset the accumulated timer.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1221\">#1221</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Types.Init
-        </td>
-        <td valign=\"top\">Removed this enumeration because it is no longer used.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1887\">#1887</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1 </b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.TrimAndRespond
-        </td>
-        <td valign=\"top\">Corrected to delay the true initial device status.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1876\">#1876</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.DamperValves
-        </td>
-        <td valign=\"top\">Replaced multisum block with add blocks, replaced gain block used for normalization
-                           with division block.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1830\">#1830</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller
-        </td>
-        <td valign=\"top\">Replaced the mode and setpoint calculation block with
-                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.SetPoints.ActiveAirFlow
-        </td>
-        <td valign=\"top\">Used hysteresis to check occupancy.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1788\">#1788</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutsideAirFlow
-        </td>
-        <td valign=\"top\">Applied hysteresis for checking ventilation efficiency.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1787\">#1787</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.TrimAndRespond
-        </td>
-        <td valign=\"top\">Added assertions and corrected implementation when respond amount is negative.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1530\">#1503</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples.Tutorial</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.Tutorial.Boiler<br/>
-                           Buildings.Examples.Tutorial.SpaceCooling
-        </td>
-        <td valign=\"top\">Updated examples to use the control blocks from the Control Description Language package
-                           <code>Buildings.Controls.OBC.CDL</code>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.VAVBranch
-        </td>
-        <td valign=\"top\">Added output connector for returned damper position.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.ActuatorSignal<br/>
-                           Buildings.Fluid.Actuators.Dampers.PressureIndependent
-        </td>
-        <td valign=\"top\">Added the computation of the damper opening.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">
-                           Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve<br/>
-                           Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
-                           Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
-                           Buildings.Fluid.Actuators.Valves.TwoWayPolynomial<br/>
-                           Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent<br/>
-                           Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening<br/>
-                           Buildings.Fluid.Actuators.Valves.TwoWayTable
-        </td>
-        <td valign=\"top\">Improved implementation to guard against control input that is negative.
-                           The new implementation constrains the input to be bigger than <i>0</i>.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1233\">IBPSA, #1233</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.BaseClasses.HeatTransfer.ThermalResponseFactors.shaGFunction
-        </td>
-        <td valign=\"top\">Declared string as a constant due to JModelica's tigther type checking.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1230\">IBPSA, #1230</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.SingleSpeed<br/>
-                           Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.MultiStage<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.SingleSpeed<br/>
-                           Buildings.Fluid.DXSystems.WaterCooled.VariableSpeed
-        </td>
-        <td valign=\"top\">Corrected wrong <code>min</code> and <code>max</code> attribute for change in humidity.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1933\">#1933</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
-                           Buildings.Fluid.Storage.StratifiedEnhanced<br/>
-                           Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-        </td>
-        <td valign=\"top\">Provided option to initialize the tank temperature at different values across the height of the tank.<br/>
-        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1246\">IBPSA, #1246</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector
-        </td>
-        <td valign=\"top\">In volume, set <code>prescribedHeatFlowRate=false</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1636\">#1636</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.HeatTransfer.Convection.Exterior
-        </td>
-        <td valign=\"top\">Set wind direction modifier to a constant as wind speed approaches zero.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1923\">#1923</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600<br/>
-                           Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases6xx.Case600FF
-        </td>
-        <td valign=\"top\">Changed computation of time averaged values to avoid a time event every hour.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1714\">#1714</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.TwoElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.FourElements
-        </td>
-        <td valign=\"top\">Added option to also simulate moisture balance in room air volume.
-                           This can be enabled by setting the parameter <code>use_moisture_balance = true</code>.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1209\">IBPSA, #1209</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.IO.Files.CSVWriter<br/>
-                           Buildings.Utilities.IO.Files.CombiTimeTableWriter<br/>
-                           Buildings.Utilities.IO.Files.CombiTimeTableWriter
-        </td>
-        <td valign=\"top\">Revised to avoid overflow of string buffer in Dymola.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1219\">IBPSA, #1219</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Math.SmoothHeaviside<br/>
-                           Buildings.Utilities.Math.Functions.SmoothHeaviside
-        </td>
-        <td valign=\"top\">This function is now twice instead of only once Lipschitz continuously differentiable.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1202\">IBPSA, #1202</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime<br/>
-                           Buildings.Utilities.Time.Types.ZeroTime
-        </td>
-        <td valign=\"top\">Revised implementation such that the meaning of <code>time</code> is better explained
-                           and unix time stamps are correctly defined with respect to GMT.
-                           Added option unix time stamp GMT.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1192\">IBPSA, #1192</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Comfort.Fanger
-        </td>
-        <td valign=\"top\">Updated the model from ASHRAE 1997 to ANSI/ASHRAE 55-2017
-                           and added a validation model which compares the PMV
-                           with an implementation from the University of California at Berkeley.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1936\">#1936</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.BaseClasses.Floor<br/>
-                           Buildings.Examples.VAVReheat.ASHRAE2006<br/>
-                           Buildings.Examples.VAVReheat.Guideline36<br/>
-                           Buildings.Examples.DualFanDualDuct
-
-        </td>
-        <td valign=\"top\">Updated core zone geometry parameters related to room heat and mass balance.
-                           This change was done in
-                           <code>Buildings.Examples.VAVReheat.BaseClasses.Floor</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1719\">#1719</a>.
-       </td>
-    </tr>
-    </table>
-    <!-- Non-backward compatible changes to existing components -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    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.Airflow</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone
-        </td>
-        <td valign=\"top\">Set parameters <code>m_flow_small</code>, <code>m1_flow_small</code>
-                           and <code>m2_flow_small</code> to <code>final</code> so that they do
-                           no longer appear on the GUI. These parameters are not used by models
-                           in this package.
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1362\">IBPSA, #1362</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
-        </td>
-        <td valign=\"top\">Refactored model so that it is itself a CDL conformant composite block.
-                           This refactoring removes the no longer use parameters <code>xd_start</code> that was
-                           used to initialize the state of the derivative term. This state is now initialized
-                           based on the requested initial output <code>yd_start</code> which is a new parameter
-                           with a default of <code>0</code>.
-                           Also, removed the parameters <code>y_start</code> and <code>initType</code> because
-                           the initial output of the controller can be set by using <code>xi_start</code>
-                           and <code>yd_start</code>.
-                           This refactoring also removes the parameter <code>strict</code> that
-                           was used in the output limiter. The new implementation enforces a strict check by default.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1878\">#1878</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
-        </td>
-        <td valign=\"top\">Changed the default values for the output limiter from <code>yMin=-yMax</code> to <code>yMin=0</code>
-                           and from <code>yMax</code> being unspecified to <code>yMax=1</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1888\">#1888</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.MovingMean
-        </td>
-        <td valign=\"top\">This block became obsolete, use <code>Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean</code> instead.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.Utilities.SetPoints.SupplyReturnTemperatureReset
-        </td>
-        <td valign=\"top\">Changed name from <code>HotWaterTemperatureReset</code> to <code>SupplyReturnTemperatureReset</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/860\">#860</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.Controller
-        </td>
-        <td valign=\"top\">Reimplemented to add new block for specifying the minimum outdoor airfow setpoint.
-                           The new block avoids vector-valued calculations.<br/>
-                           The reimplemented controller needs to work with
-                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.Zone</code> and
-                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV.SetPoints.OutdoorAirFlow.SumZone</code>,
-                           to calculate the zone level minimum outdoor airflow setpoints and then find the sum, the minimum and
-                           the maximum of these setpoints. See
-                           <code>Buildings.Examples.VAVReheat.Guideline36</code>.
-                           <br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1829\">#1829</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
-        </td>
-        <td valign=\"top\">Reimplemented to remove the vector-valued calculations.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ModeAndSetPoints
-        </td>
-        <td valign=\"top\">Removed from the library as it can be replaced by
-                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.ModeAndSetPoints</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1709\">#1709</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Controller
-        </td>
-        <td valign=\"top\">Added cooling coil control and the controller validation model.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1265\">#1265</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Economizers.Subsequences.Enable
-        </td>
-        <td valign=\"top\">Added the option to allow fixed plus differential dry bulb temperature cutoff.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.Economizers.Subsequences.Modulation
-        </td>
-        <td valign=\"top\">Added heating coil control sequences.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Supply
-        </td>
-        <td valign=\"top\">Added a switch for fan control.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.ZoneState
-        </td>
-        <td valign=\"top\">Improved the implementation to avoid issues when heating and cooling controls occur at the same time.
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.SystemRequests
-        </td>
-        <td valign=\"top\">Changed the actual damper position name from <code>uDam</code> to <code>yDam_actual</code>.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Controller
-        </td>
-        <td valign=\"top\">Added actual VAV damper position as the input for generating system request.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.TerminalUnits.Reheat.DamperValves
-        </td>
-        <td valign=\"top\">Added option to check if the VAV damper is pressure independent.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.SetPoints</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.SetPoints.SupplyReturnTemperatureReset
-        </td>
-        <td valign=\"top\">Changed name from <code>HotWaterTemperatureReset</code> to <code>SupplyReturnTemperatureReset</code>.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/860\">#860</a>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">
-                           Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential<br/>
-                           Buildings.Fluid.Actuators.Dampers.Exponential<br/>
-                           Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
-                           Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
-                           Buildings.Fluid.Actuators.Dampers.PressureIndependent<br/>
-                           Buildings.Fluid.Actuators.Dampers.VAVBoxExponential
-        </td>
-        <td valign=\"top\">Merged <code>VAVBoxExponential</code> into <code>Exponential</code>.<br/>
-                           <code>Exponential</code> now provides all modeling capabilities previously
-                           implemented in <code>VAVBoxExponential</code> which is no more needed and
-                           has been removed from the library.<br/>
-                           New parameters <code>dpDamper_nominal</code> and <code>dpFixed_nominal</code>
-                           have been introduced in <code>Exponential</code>, consistent with the
-                           valve models.<br/>
-                           Parameter <code>k0</code> has been replaced by a leakage coefficient.<br/>
-                           For Dymola, a conversion script makes this change. However the script will
-                           not make the <code>each</code> keyword persist in array declarations. The
-                           keyword will have to be manually reintroduced after applying the script.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1188\">IBPSA, #1188</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">
-                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.TwoElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.TwoElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.FourElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.FourElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.OneElement<br/>
-                           Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.BaseClasses.PartialVDI6007<br/>
-                           Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.BaseClasses.PartialVDI6007<br/>
-                           Buildings.ThermalZones.ReducedOrder.EquivalentAirTemperature.VDI6007WithWindow
-
-        </td>
-        <td valign=\"top\">Renamed convection coefficient from <code>alpha*</code> to <code>hCon*</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1168\">IBPSA, #1168</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Errors that have been fixed -->
-    <p>
-    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-    that can lead to wrong simulation results):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Sources.TimeTable
-        </td>
-        <td valign=\"top\">Corrected implementation so that it gives the correct periodicity
-                         of the table if the simulation starts at a negative time.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1834\">1834</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Sources.PVSimple<br/>
-                           Buildings.Electrical.AC.OnePhase.Sources.PVSimpleOriented<br/>
-                           Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimple<br/>
-                           Buildings.Electrical.AC.ThreePhasesBalanced.Sources.PVSimpleOriented<br/>
-                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple<br/>
-                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented<br/>
-                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimpleOriented_N<br/>
-                           Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.PVsimple_N<br/>
-                           Buildings.Electrical.Interfaces.PartialPV
-        </td>
-        <td valign=\"top\">Corrected model so that reported power <code>P</code> also includes the DCAC conversion.
-                           Note that the power added to the elecrical system was correct, but the power reported in
-                           the output connector <code>P</code> did not include this conversion factor.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1577\">1577</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Storage.Battery<br/>
-                         Buildings.Electrical.AC.ThreePhasesBalanced.Storage.Battery
-    </td>
-      <td valign=\"top\">Corrected model and improved the documentation. The previous model extracted from
-                       the AC connector the input power <code>P</code> plus the AC/DC conversion losses, but <code>P</code>
-                       should be the power exchanged at the AC connector. Conversion losses are now only
-                       accounted for in the energy exchange at the battery.<br/>
-                       This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1865\">1865</a>.
-      </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Examples.VAVReheat</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ASHRAE2006<br/>
-                           Buildings.Examples.VAVReheat.Guideline36
-        </td>
-        <td valign=\"top\">Connected actual VAV damper position as the measured input data for
-                           defining duct static pressure setpoint.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.DuctStaticPressureSetpoint
-        </td>
-        <td valign=\"top\">Reverse action changed to <code>true</code> for the pressure set-point controller.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.RoomVAV
-        </td>
-        <td valign=\"top\">Refactored the model to implement a single maximum control logic.
-                           The previous implementation led to a maximum air flow rate in heating demand.<br/>
-                           The input connector <code>TDis</code> is removed. This is non backward compatible.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1873\">#1873</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc<br/>
-                           Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.normalizedPower
-        </td>
-        <td valign=\"top\">Corrected error in computing the cooling tower fan power consumption.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1691\">1691</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings/Resources/Python-Sources/KalmanFilter.py<br/>
-                           Buildings.Utilities.IO.Python27.Examples.KalmanFilter
-        </td>
-        <td valign=\"top\">Changed the temporary file format from <code>pickle</code> to <code>json</code> as the former can trigger a
-                           segfault with JModelica simulation run in a subprocess.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1587\">Buildings, #1587</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Uncritical errors -->
-    <p>
-    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-    units are wrong or errors in documentation):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.LimPID
-        </td>
-        <td valign=\"top\">Removed wrong unit declaration for gain <code>k</code>.<br/>
-                           This is for
-                           <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1821\">Buildings, #1821</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Sources.Boundary_pT<br/>
-                           Buildings.Fluid.Sources.Boundary_ph<br/>
-                           Buildings.Fluid.Sources.MassFlowSource_T<br/>
-                           Buildings.Fluid.Sources.MassFlowSource_h
-        </td>
-        <td valign=\"top\">Refactored handling of mass fractions which was needed to handle media such as
-                           <code>Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents</code> and
-                           <code>Modelica.Media.IdealGases.MixtureGases.SimpleNaturalGas</code>.<br/>
-                           Prior to this change, use of these media led to a translation error.<br/>
-                           This is for
-                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1205\">IBPSA, #1205</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows<br/>
-                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow
-        </td>
-        <td valign=\"top\">Corrected wrong assignment of a parameter.<br/>
-                           This is for
-                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1766\">IBPSA, #1766</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings/Resources</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings/Resources/C-Sources/cryptographicsHash.c
-        </td>
-        <td valign=\"top\">Add a <code>#ifndef</code> clause.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1278\">IBPSA, #1278</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Obsolete components -->
-    <p>
-    The following components have become <b style=\"color:blue\">obsolete</b>:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Obsolete.Controls.OBC.CDL.Discrete.MovingMean
-        </td>
-        <td valign=\"top\">The block <code>Buildings.Controls.OBC.CDL.Discrete.TriggeredMovingMean</code>
-                           replaced the original <code>MovingMean</code> block.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-buildings/issues/1588\">#1588</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Obsolete.Utilities.IO.Python27
-        </td>
-        <td valign=\"top\">The package <code>Buildings.Utilities.IO.Python27</code>
-                           has been upgraded to <code>Buildings.Utilities.IO.Python36</code>.<br/>
-                           For Dymola, a conversion script moves the Python27 package to here.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-buildings/issues/1760\">issue #1760</a>.
-        </td>
-    </tr>
-    </table>
-     </html>"));
-    end Version_7_0_0;
-
-    class Version_6_0_0 "Version 6.0.0"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-    <div class=\"release-summary\">
-   <p>
-   Version 6.0.0 is a major new release that
-   contains various new packages, new models and improvements to existing models.
-   The library has been tested with Dymola 2019FD01 and with JModelica (revision 12903).
-   </p>
-   <p>
-     The following major changes have been done:
-   <ul>
-   <li>
-     Various new packages have been added, such as:
-     <ul>
-       <li>
-         A package for simulating occupancy and occupancy that resulted from IEA EBC Annex 66.
-       </li>
-       <li>
-         A package with models for geothermal borefields.
-       </li>
-       <li>
-         A package with blocks for control of shades and of outdoor lights.
-       </li>
-       <li>
-         A package with blocks that allow generating time series and scatter plots,
-         and writing these plots to one or several html files.
-       </li>
-       <li>
-         A package with blocks for unit conversion.
-       </li>
-     </ul>
-   </li>
-   <li>
-     Various new control blocks have been added to <code>Buildings.Controls.OBC.CDL</code>.
-   </li>
-   </ul>
-    </div>
-    <!-- New libraries -->
-    <p>
-    The following <b style=\"color:blue\">new libraries</b> have been added:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-    <tr><td valign=\"top\">Buildings.Controls.OBC.OutdoorLights
-        </td>
-        <td valign=\"top\">Package with outdoor lighting controllers.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.Shade
-        </td>
-        <td valign=\"top\">Package with shade controllers.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.UnitConversions
-        </td>
-        <td valign=\"top\">Package with blocks for unit conversion.
-                           Blocks in this package are meant to use when reading
-                           data from a building automation system,
-                           or writing data to a building automation system,
-                           that uses units that are different
-                           from the units used by Modelica.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Geothermal
-        </td>
-        <td valign=\"top\">Package with models for geothermal heat exchangers.
-                           This package has models for borefields with vertical boreholes,
-                           and for a single vertical borehole with a U-tube heat exchanger.
-                           The borefield models can have any geometrical configuration,
-                           and either one or two U-tube heat exchangers.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Occupants
-       </td>
-       <td valign=\"top\">Package with occupant behavior models and functions to
-                          simulate the occupancy and the interaction of occupants
-                          with air-conditioning and heating systems, windows,
-                          blinds, and lighting in residential and office buildings.
-       </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Cryptographics
-        </td>
-        <td valign=\"top\">Package with a function to compute a SHA1 encrypted string.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.IO.Files
-    </td>
-    <td valign=\"top\">Package with blocks to write CSV files, JSON files or combi time table files.
-    </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Plotters
-       </td>
-       <td valign=\"top\">Package with blocks that allow generating
-                          time series and scatter plots, and writing these plots to
-                          one or several html files.
-                          The plots can be deactivated based on an input signal and a time
-                          delay, for example, to plot data only while the HVAC system
-                          operates for at least <i>30</i> minutes.
-       </td>
-    </tr>
-    </table>
-    <!-- New components for existing libraries -->
-    <p>
-    The following <b style=\"color:blue\">new components</b> have been added
-    to <b style=\"color:blue\">existing</b> libraries:
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MultiOr
-        </td>
-        <td valign=\"top\">Block that outputs true boolean signal if and only if any element of the boolean input vector is true.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MatrixMin
-        </td>
-        <td valign=\"top\">Block that outputs vector of row- or column-wise minimum values.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MatrixMax
-        </td>
-        <td valign=\"top\">Block that outputs vector of row- or column-wise maximum values.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MatrixGain
-        </td>
-        <td valign=\"top\">Block that outputs the product of a gain matrix with the input signal vector.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Discrete.MovingMean
-        </td>
-        <td valign=\"top\">Block that outputs the discrete moving mean of a sampled input signal.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Integers.Change
-        </td>
-        <td valign=\"top\">Block that outputs whether its Integer input changed its value, and whether it increased or decreased.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.IntegerSwitch
-        </td>
-        <td valign=\"top\">Block that outputs one of two integer input signals based on a boolean input signal.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Routing.RealExtractor
-        </td>
-        <td valign=\"top\">Block that extracts a scalar signal from a signal vector dependent on an Integer-valued input.
-        </td>
-        </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Utilities.SunRiseSet
-        </td>
-        <td valign=\"top\">Block that outputs sunrise and sunset time for each day.
-        </td>
-        </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers
-        </td>
-        <td valign=\"top\">Added <code>Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU</code>
-                           which computes the effectiveness of a plate heat exchanger
-                           based on design conditions and current mass flow rates.
-        </td>
-        </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Math
-        </td>
-        <td valign=\"top\">Added Bessel, exponential integral, factorial, falling factorial and binomial functions.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.X_pTphi
-        </td>
-        <td valign=\"top\">Added function to compute humidity mass fraction for given pressure, temperature
-                         and relative humidity.
-        </td>
-    </tr>
-    </table>
-    <!-- Backward compatible changes -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    have been <b style=\"color:blue\">improved</b> in a
-    <b style=\"color:blue\">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.BoundaryConditions</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-        </td>
-        <td valign=\"top\">Updated implementation to allow for weather data file that span less than a year and cross New Year,
-                         and for weather data files that span more than a year.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-ibpsa/issues/842\">IBPSA, #842</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Timer
-        </td>
-        <td valign=\"top\">Updated implementation to output accumulated time when input is <code>true</code>.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1212\">issue 1212</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.TrueDelay
-        </td>
-        <td valign=\"top\">Added parameter <code>delayOnInit</code> to optionally delay the initial <code>true</code> input.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1346\">issue 1346</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1/AHUs.SingleZone.VAV.SetPoints.OutsideAirFlow
-        </td>
-        <td valign=\"top\">Made input connector for occupancy conditionally removable to avoid having to set the
-                           number of occupants as an input if there is no occupancy sensor.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1270\">issue 1270</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                           Buildings.Fluid.MixingVolumes.MixingVolume<br/>
-                           Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
-        </td>
-        <td valign=\"top\">Changed model so that the volume is no longer fixed at compilation time.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1411\">issue 1411</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Media</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Media.Air<br/>
-                           Buildings.Media.Water<br/>
-                           Buildings.Media.Antifreeze.PropyleneGlycolWater<br/>
-                           Buildings.Media.Specialized.Air.PerfectGas<br/>
-        </td>
-        <td valign=\"top\">Improved error message when temperature or mass fraction is outside the allowed range.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1045\">IBPSA, issue 1045</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python27</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.IO.Python27.Functions.exchange<br/>
-        </td>
-        <td valign=\"top\">Refactored setting the <code>PYTHONPATH</code> environment variable.<br/>
-                         This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1421\">issue 1421</a>.
-    </td>
-    </table>
-    <!-- Non-backward compatible changes to existing components -->
-    <p>
-    The following <b style=\"color:blue\">existing components</b>
-    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.Airflow.Multizone</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorDiscretizedOperable
-        </td>
-        <td valign=\"top\">Removed parameter <code>CD</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/971\">IBPSA, #971</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.EffectiveAirLeakageArea
-        </td>
-        <td valign=\"top\">Removed parameters <code>A</code>, <code>CD</code> and <code>lWet</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/932\">IBPSA, #932</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic
-        </td>
-        <td valign=\"top\">Removed parameter <code>m_flow_nominal</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/970\">IBPSA, #970</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.Orifice
-        </td>
-        <td valign=\"top\">Removed parameter <code>lWet</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/932\">IBPSA, #932</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic<br/>
-                           Buildings.Airflow.Multizone.MediumColumn<br/>
-                           Buildings.Airflow.Multizone.EffectiveAirLeakageArea<br/>
-                           Buildings.Airflow.Multizone.Orifice
-        </td>
-        <td valign=\"top\">Removed parameter <code>allowFlowReversal</code> as this is not meaningful
-                           for these models.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/877\">IBPSA, #877</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.ConvertTime
-        </td>
-        <td valign=\"top\">Added new parameters needed for weather data files that span multiple years.
-                           Models of users are not likely to be affected by this change as this model
-                           is part of the weather data file reader that implements all required changes.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/842\">IBPSA, #842</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone<br/>
-                         Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone
-        </td>
-        <td valign=\"top\">Renamed packages to
-                           <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV</code>
-                           and <code>Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.MultiZone.VAV</code>,
-                           and renamed various signals and parameters for consistency.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.RealExtractSignal
-        </td>
-        <td valign=\"top\">Changed block name from <code>ExtractSignal</code>.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MultiMax
-        </td>
-        <td valign=\"top\">Changed output variable name from <code>yMax</code> to <code>y</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/\">issue 1252</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.MultiMin
-        </td>
-        <td valign=\"top\">Changed output variable name from <code>yMin</code> to <code>y</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/\">issue 1252</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
-        </td>
-        <td valign=\"top\">Renamed model to
-                           <code>Buildings.Fluid.HeatExchangers.DryCoilEffectivenessNTU</code>
-                           because the convective heat transfer coefficients are for air.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           Removed variable <code>Z</code> as it is not used.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.PlateHeatExchangerEffectivenessNTU
-        </td>
-        <td valign=\"top\">Removed variable <code>Z</code> as it is not used.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Ground.Boreholes.BaseClasses.factorial
-        </td>
-        <td valign=\"top\">Renamed function to
-                           <code>Buildings.Utilities.Math.Functions.factorial</code>
-                           because it is also used by the new Geothermal package.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Ground.Boreholes
-        </td>
-        <td valign=\"top\">Renamed package to
-                           <code>Buildings.Fluid.Geothermal.Boreholes</code>
-                           due to the introduction of the new Geothermal package.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.BaseClasses.MassFlowRateMultiplier
-        </td>
-        <td valign=\"top\">Renamed model to
-                           <code>Buildings.Fluid.BaseClasses.MassFlowRateMultiplier</code>
-                           because it is also used by the new Geothermal package.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Sources.FixedBoundary
-        </td>
-        <td valign=\"top\">This model is now obsolete and will be removed in future releases.
-                           The model has been renamed model to
-                           <code>Buildings.Obsolete.Fluid.Sources.FixedBoundary</code>.
-                           Use <code>Buildings.Fluid.Sources.Boundary_pT</code> instead.<br/>
-                           For Dymola, a conversion script makes this change.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Media</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Media.Refrigerants.R410A
-        </td>
-        <td valign=\"top\">Removed the function <code>pressureSatLiq_T</code> as it was not used.<br/>
-                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/995\">IBPSA, #995</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.Utilities.Reports</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Utilities.Reports.Printer<br/>
-                           Buildings.Utilities.Reports.printRealArray
-        </td>
-        <td valign=\"top\">Moved <code>Buildings.Utilities.Reports.Printer</code> to
-                           <code>Buildings.Utilities.IO.Files.Printer</code> and moved
-                           <code>Buildings.Utilities.Reports.printRealArray</code> to
-                           <code>Buildings.Utilities.IO.Files.BaseClasses.printRealArray</code>.<br/>
-                           For Dymola, a conversion script makes this change.<br/>
-                           This is due to the newly introduced package <code>Buildings.Utilities.IO.Files</code>.
-        </td>
-    </tr>
-    </table>
-    <!-- Errors that have been fixed -->
-    <p>
-    The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-    that can lead to wrong simulation results):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Latch
-        </td>
-        <td valign=\"top\">Corrected implementation that causes wrong output at initial stage.<br/>
-                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Logical.Toggle
-        </td>
-        <td valign=\"top\">Corrected implementation that causes wrong output at initial stage.<br/>
-                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1402\">issue 1402</a>.
-        </td>
-    </tr>
-
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Borefields.Data.Soil.SandStone
-        </td>
-        <td valign=\"top\">Corrected wrong thermal properties.<br/>
-                         This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1062\">IBPSA, #1062</a>.
-        </td>
-    </tr>
-
-    <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Heater_T<br/>
-                           Buildings.Fluid.HeatExchangers.SensibleCooler_T
-        </td>
-        <td valign=\"top\">Corrected missing propagation of initial conditions.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1016\">IBPSA, #1016</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-        </td>
-        <td valign=\"top\">Propagated parameter <code>mSenFac</code> which
-                           increased the thermal capacity of the room air, such as
-                           to account for furniture.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1405\">issue 1405</a>.
-        </td>
-    </tr>
-    <tr><td colspan=\"2\"><b>Buildings.ThermalZones.ReducedOrder</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder.RC.ThreeElements<br/>
-                           Buildings.ThermalZones.ReducedOrder.RC.FourElements
-        </td>
-        <td valign=\"top\">The RC element of the roof <code>roofRC</code>
-                           was flipped to have its <code>port_b</code> on the outside.
-                           The resistances <code>RRem</code> and <code>R</code>
-                           of the roof and floor have been switched
-                           in the documentation.<br/>
-                           This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/997\">IBPSA, #997</a>.
-        </td>
-    </tr>
-    </table>
-    <!-- Uncritical errors -->
-    <p>
-    The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-    that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-    units are wrong or errors in documentation):
-    </p>
-    <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-    <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE</b>
-        </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.Generic.SetPoints.OperationMode
-        </td>
-        <td valign=\"top\">Corrected wrong time in the documentation of the parameters.<br/>
-                           This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1409\">issue 1409</a>.
-        </td>
-    </tr>
-    </table>
-    </html>"));
-    end Version_6_0_0;
-
-   class Version_5_1_0 "Version 5.1.0"
-     extends Modelica.Icons.ReleaseNotes;
-       annotation (Documentation(info="<html>
-   <div class=\"release-summary\">
-   <p>
-   Version 5.1.0 adds new libraries, new components and improves various existing components.
-   Version 5.1.0 updates the license to a 3-clause BSD license.
-   It is backward compatible with versions 5.0.0 and 5.0.1.
-   </p>
-   <p>
-   This release adds
-   a model for propylene glycol - water mixtures, a model for long pipes
-   suited for district heating and cooling simulations, a new valve model whose
-   opening characteristics can be fit to measured data, and idealized models
-   that allow to prescribe the temperature and humidity in any part of a fluid flow
-   system.
-   </p>
-   </div>
-   <!-- New libraries -->
-   <p>
-   The following <b style=\"color:blue\">new libraries</b> have been added:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-   <tr><td valign=\"top\">Buildings.Media.Antifreeze.PropyleneGlycolWater
-       </td>
-       <td valign=\"top\">Package with medium model for propylene glycol - water mixture.
-                          The concentration and the medium temperature for which the properties are evaluated
-                          can be set when instantiating the medium.
-       </td>
-       </tr>
-   </table>
-   <!-- New components for existing libraries -->
-   <p>
-   The following <b style=\"color:blue\">new components</b> have been added
-   to <b style=\"color:blue\">existing</b> libraries:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayPolynomial
-       </td>
-       <td valign=\"top\">Two-way valve with opening characteristics
-                          specified by a polynomial.
-                          This model may be used if a valve characteristics needs to be
-                          matched to measured data.
-       </td>
-       </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.PlugFlowPipe
-       </td>
-       <td valign=\"top\">Pipe with heat loss and transport of the fluid
-                          using a plug flow model. This model is applicable for
-                          simulation of long pipes such as in district heating and cooling systems.
-       </td>
-       </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sources.PropertySource_T<br/>
-                          Buildings.Fluid.Sources.PropertySource_h
-       </td>
-       <td valign=\"top\">Model that changes the fluid properties of the medium that flows through it
-                          based on input signals. These idealized models can be used to force a certain temperature,
-                          enthalpy or humidity in a fluid flow system.
-       </td>
-       </tr>
-   </table>
-   <!-- Backward compatible changes -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   have been <b style=\"color:blue\">improved</b> in a
-   <b style=\"color:blue\">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.Airflow.Multizone</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorDiscretizedOpen<br/>
-                          Buildings.Airflow.Multizone.DoorDiscretizedOperable
-       </td>
-       <td valign=\"top\">Removed term that assures non-zero flow rate in each path,
-                          reformulated flow balance to ensure that model is symmetric,
-                          and improved implementation to reduce number of calculations.<br/>
-                          This is
-                          for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/937\">IBPSA, issue 937</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Applications.DataCenters</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Applications.DataCenters.ChillerCooled.Equipment.BaseClasses.PartialParallelElectricEIR
-       </td>
-       <td valign=\"top\">Added <code>constrainedby</code> to declaration of chiller.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1118\">issue 1118</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.ASHRAE.G36_PR1</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.OBC.ASHRAE.G36_PR1.AHUs.SingleZone.VAV.SetPoints.Supply
-   </td>
-       <td valign=\"top\">Revised implementation of fan speed control signal calculation
-                          to remove the hysteresis blocks.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1153\">issue 1153</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Controls.OBC.CDL</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.OBC.CDL.Continuous.Line
-   </td>
-   <td valign=\"top\">Improved documentation and icon, and added a warning if the limits are used and x1 &gt; x2.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
-                          Buildings.Fluid.SolarCollectors.EN12975
-       </td>
-       <td valign=\"top\">Improved calculation of heat loss.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1100\">issue 1100</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sources.Boundary_pT<br/>
-                          Buildings.Fluid.Sources.Boundary_ph<br/>
-                          Buildings.Fluid.Sources.FixedBoundary<br/>
-                          Buildings.Fluid.Sources.MassFlowSource_T<br/>
-                          Buildings.Fluid.Sources.MassFlowSource_h
-       </td>
-       <td valign=\"top\">Refactored models to allow using <code>Xi</code> rather
-                          than <code>X</code> as an input.<br/>
-                          By default, the check on the medium base properties is now removed
-                          to reduce translation and simulation time.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/882\">IBPSA, issue 882</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified
-       </td>
-       <td valign=\"top\">Refactored tank to allow modeling of tanks that have multiple inlets or outlets along the height.
-                          The tank now has for each control volume a fluid port that can be connected from outside the model.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1182\">issue 1182</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.IO</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.IO.Python27
-       </td>
-       <td valign=\"top\">Added option for a Python object
-                        to be passed from one Python function invocation to the next.
-                        This allows to build up a Python data structure (or to instantiate a Python object),
-                        and do computations on this object at each function invocation. For example,
-                        a Model Predictive Control algorithm or a machine learning algorithm,
-                        implemented in Python, could be fed with data at each time step.
-                        It could then store this data
-                        and use the current and its historical data to feed its algorithm.
-                        Based on this algorithm, it could output a control signal for use in another Modelica model.
-                        <br/>
-                        The function <code>Buildings.Utilities.IO.Python27.Functions.exchange</code> now takes
-                        two additional arguments: A class that contains a pointer to the Python interpreter
-                        (for efficiency, as this avoids initializing Python at each call), and
-                        a flag that determines whether the Python function returns an object and receives this
-                        object at the next invocation. See
-                        <code>Buildings.Utilities.IO.Python27.UsersGuide</code> and
-                        <code>Buildings.Utilities.IO.Python27.Real_Real</code> for how to use
-                        these two arguments.
-                        <br/>
-                        Models that use <code>Buildings.Utilities.IO.Python27.Real_Real</code>
-                        will still work as before. The change only affects the low-level function
-                        <code>Buildings.Utilities.IO.Python27.Functions.exchange</code>.
-       </td>
-  </tr>
-  <tr><td valign=\"top\">Buildings.Utilities.IO.Python27</td>
-     <td valign=\"top\">
-                      Corrected <code>LibraryDirectory</code> annotation.<br/>
-                     This is for
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1160\">issue 1160</a>.
-     </td>
-   </tr>
-   </table>
-   <!-- Non-backward compatible changes to existing components -->
-   <!-- Errors that have been fixed -->
-   <p>
-   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-   that can lead to wrong simulation results):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PrescribedOutlet
-       </td>
-       <td valign=\"top\">Corrected error that caused the old model do not track <code>TSet</code> and <code>X_wSet</code>
-                          simultaneously.<br/>
-                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/893\">IBPSA, issue 893</a>.
-       </td>
-   </tr>
-   </table>
-   <!-- Uncritical errors -->
-   </html>"));
-   end Version_5_1_0;
-
-   class Version_5_0_1 "Version 5.0.1"
-     extends Modelica.Icons.ReleaseNotes;
-       annotation (Documentation(info="<html>
-   <div class=\"release-summary\">
-   <p>
-   Version 5.0.1 corrects an error in <code>Buildings.Fluid.SolarCollectors</code>
-   that led to too small heat losses if a collector has more than one panel.
-   Also, Dymola specific annotations to load data files in a GUI have been replaced
-   for compatibility with other tools.
-   Otherwise, version 5.0.1 is identical to 5.0.0.
-   </p>
-   <p>
-   All models simulate with Dymola 2017FD01, Dymola 2018 and JModelica (revision 10374).
-   </p>
-   </div>
-   <p>
-   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-   that can lead to wrong simulation results):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
-                          Buildings.Fluid.SolarCollectors.EN12975
-       </td>
-       <td valign=\"top\">Corrected error in parameterization of heat loss calculation
-                          that led to too small heat losses if a collector has more than one panel.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1073\">issue 1073</a>.
-       </td>
-   </tr>
-   </table>
-   </html>"));
-   end Version_5_0_1;
-
-
-   class Version_5_0_0 "Version 5.0.0"
-     extends Modelica.Icons.ReleaseNotes;
-       annotation (Documentation(info="<html>
-   <div class=\"release-summary\">
-   <p>
-   Version 5.0.0 is a major new release that
-   contains new packages to model control sequences,
-   a package with control sequences from ASHRAE Guideline 36 and
-   a package with pre-configured models for data center chilled water plants.
-   All models simulate with Dymola 2017FD01, Dymola 2018 and with JModelica (revision 10374).
-   </p>
-   <p>
-     The following major changes have been done:
-   <ul>
-   <li>
-   The package <code>Buildings.Controls.OBC.CDL</code> has been added.
-   This package provides elementary blocks to implemented control sequences.
-   The blocks conform to the Control Description Language specification
-   published at <a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>.
-   </li>
-   <li>
-   The package <code>Buildings.Controls.OBC.ASHRAE.G36_PR1</code> has been added.
-   This package contains control sequences for variable air volume flow systems
-   according to ASHRAE Guideline 36, public review draft 1.
-   The implementation uses blocks from the above described
-   <code>Buildings.Controls.OBC.CDL</code> package, and conforms to the
-   Control Description Language specification.
-   </li>
-   <li>
-   New models for ideal heaters and sensible coolers, and ideal
-   humidifiers have been added.
-   </li>
-   <li>
-   Various models have been improved.
-   </li>
-   </ul>
-   </div>
-   <!-- New libraries -->
-   <p>
-   The following <b style=\"color:blue\">new libraries</b> have been added:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-   <tr><td valign=\"top\">Buildings.Applications.DataCenter
-       </td>
-       <td valign=\"top\">Library with component models and pre-configured
-                          system models for data centers.
-       </td>
-       </tr>
-   <tr><td valign=\"top\">Buildings.Controls.OBC
-       </td>
-       <td valign=\"top\">Library with basic control blocks and ready-to-use control sequences
-                          from the OpenBuildingControl project
-                          (<a href=\"https://obc.lbl.gov\">https://obc.lbl.gov</a>).<br/>
-                          The subpackage <code>Buildings.Controls.OBC.ASHRAE</code>
-                          contains control sequences
-                          for HVAC systems as described in ASHRAE Guideline 36.<br/>
-                          The subpackage <code>Buildings.Controls.OBC.CDL</code>
-                          contains libraries with basic control blocks.
-                          These are a part of a Control Description Language (CDL)
-                          currently being developed, which is used to compose
-                          the sequences in <code>Buildings.Controls.OBC.ASHRAE</code>.
-                          The intent of this implementation is that
-                          Modelica models that are conformant with the CDL
-                          can be translated to product lines of different control vendors.
-       </td>
-       </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Humidifiers
-       </td>
-       <td valign=\"top\">Package with spray air washer, steam humidifier and a humidifer
-                          that adds a water vapor mass flow rate that is proportional to the control input.
-       </td>
-       </tr>
-   </table>
-   <!-- New components for existing libraries -->
-   <p>
-   The following <b style=\"color:blue\">new components</b> have been added
-   to <b style=\"color:blue\">existing</b> libraries:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Heater_T<br/>
-                        Buildings.Fluid.HeatExchangers.SensibleCooler_T
-       </td>
-       <td valign=\"top\">Added these new components to allow modeling a heater
-                        and a sensible-only cooler that use an input signal to
-                        ideally control their outlet temperature,
-                        with optional capacity limitation
-                        and optional first order dynamics.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.MassExchangers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Humidifiers.SprayAirWasher_X<br/>
-                          Buildings.Fluid.Humidifiers.SteamHumidifier_X
-       </td>
-       <td valign=\"top\">Added component which allows setting the outlet water vapor
-                        mass fraction using an input signal, and controlling it ideally
-                        with optional capacity limitation
-                        and optional first order dynamics.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sources.MassFlowSource_WeatherData
-       </td>
-       <td valign=\"top\">Added component which allows prescribing
-                          a mass flow rate that has thermal properties
-                          obtained from weather data.
-       </td>
-   </tr>
-   </table>
-   <!-- Backward compatible changes -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   have been <b style=\"color:blue\">improved</b> in a
-   <b style=\"color:blue\">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.Chillers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot_TEva<br/>
-                          Buildings.Fluid.Chillers.Carnot_y
-       </td>
-       <td valign=\"top\">Added approach temperature to avoid
-                          too large COPs if the temperature lift is small.<br/>
-                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/698\">IBPSA, #698</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow<br/>
-                          Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
-                          Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                          Buildings.Fluid.HeatExchangers.WetCoilDiscretized
-       </td>
-       <td valign=\"top\">Improved model so that for certain parameters (dynamic balance,
-                          or steady-state balance and no reverse flow,
-                          or <i>hA</i>-calculation that is independent of temperature),
-                          two fast state variables can be removed.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/678\">Buildings, #678</a>.
-                          <br/><br/>
-                          Added approximation of diffusion, which is needed for very small
-                          flow rates which can happen if fans are off but wind pressure
-                          entrains cold air through the HVAC system.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/1038\">Buildings, #1038</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Carnot_TCon<br/>
-                          Buildings.Fluid.HeatPumps.Carnot_y
-       </td>
-       <td valign=\"top\">Added approach temperature to avoid
-                          too large COPs if the temperature lift is small.<br/>
-                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/698\">IBPSA, #698</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp
-       </td>
-       <td valign=\"top\">Added optional input signal for
-                          differential pressure measurement,
-                          which will then be tracked by the model.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPort
-       </td>
-       <td valign=\"top\">Improved optional heat loss model.<br/>
-                          This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/840\">IBPSA, #840</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.SolarCollectors</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
-                          Buildings.Fluid.SolarCollectors.EN12975
-       </td>
-       <td valign=\"top\">Changed models for incidence angles below 60&deg;
-                          in order to increase the accuracy near sunrise and sunset.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/785\">#785</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-       </td>
-       <td valign=\"top\">Added an optional input that allows injecting
-                          trace substances, such as CO2 release from people,
-                          to the room air.
-       </td>
-   </tr>
-   </table>
-   <!-- Non-backward compatible changes to existing components -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   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>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCooler_T
-       </td>
-       <td valign=\"top\">Renamed <code>Buildings.Fluid.HeatExchangers.HeaterCooler_T</code>
-                        to <code>Buildings.Fluid.HeatExchangers.PrescribedOutlet</code>
-                        as it now also allows to set the outlet water vapor mass fraction.<br/>
-                        For Dymola, a conversion script makes this change.<br/>
-                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">IBPSA, #763</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.MassExchangers.Humidifier_u
-       </td>
-       <td valign=\"top\">Moved model to <code>Buildings.Fluid.Humidifiers.Humidifier_u</code>.<br/>
-                          Removed parameters <code>use_T_in</code> and <code>T</code>,
-                          and removed input connector <code>T_in</code>, as these are no
-                          longer needed.<br/>
-                          For Dymola, the conversion script will remove the parameter
-                          settings.<br/>
-                          For Dymola, a conversion script makes this change.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/704\">#704</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces
-       </td>
-       <td valign=\"top\">Renamed <code>PrescribedOutletState</code> to <code>PrescribedOutlet</code>
-                        and removed <code>PrescribedOutletStateParameters</code>.<br/>
-                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/763\">IBPSA, #763</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers
-       </td>
-       <td valign=\"top\">Removed the function
-                        <code>Buildings.Fluid.HeatExchangers.BaseClasses.appartusDewPoint</code>
-                        as it was nowhere used, and it also has no validation test.<br/>
-                        This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/724\">Buildings, #724</a>.
-       </td>
-   </tr>
-
-
-   </table>
-   <!-- Errors that have been fixed -->
-   <p>
-   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-   that can lead to wrong simulation results):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Airflow</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Airflow.Multizone.EffectiveAirLeakageArea
-       </td>
-       <td valign=\"top\">Corrected error in computation of <code>A</code> which was
-                          <code>A=CD/CDRat * L * dpRat^(0.5-m))</code> rather than
-                          <code>A=CDRat/CD * L * dpRat^(0.5-m))</code>.<br/>
-                          See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/743\">#743</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Controls</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.Continuous.OffTimer
-       </td>
-       <td valign=\"top\">Corrected implementation as the timer had the wrong
-                          if the simulation did not start at <code>time = 0</code>.
-                          After the first reset, the value was correct.<br/>
-                          See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/743\">IBPSA, #743</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
-                          Buildings.Fluid.Interfaces.FourPortHeatMassExchanger
-       </td>
-       <td valign=\"top\">Corrected assignment of <code>Q_flow</code> (or <code>Q1_flow</code>
-                          and <code>Q2_flow</code>).
-                          Previously, these variables were assigned only the sensible heat flow rate,
-                          but they should include the latent heat exhange to be consistent with
-                          the variable naming, and because the cooling coils interpret these variables
-                          as if they contain the latent heat flow rate.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/704\">#704</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                          Buildings.Fluid.HeatExchangers.WetCoilDiscretized<br/>
-                          Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent
-       </td>
-       <td valign=\"top\">Added heat of condensation to coil surface heat balance
-                          and removed it from the air stream.
-                          This gives higher coil surface temperature and avoids
-                          overestimating the latent heat ratio that was
-                          observed in the previous implementation.
-                          The code change was in
-                          <code>Buildings.Fluid.HeatExchangers.BaseClasses.HexElementLatent</code><br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/711\">#711</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.HADryCoil
-       </td>
-       <td valign=\"top\">Corrected coefficient for temperature-dependency correction
-                          of air-side convection coefficient.
-                          By default, the convection coefficient
-                          is assumed to be temperature-independent, in which cases this
-                          correction has no effect on the results.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/698\">#698</a>.
-       </td>
-   </tr>
-   </table>
-   <!-- Uncritical errors -->
-   <p>
-   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-   units are wrong or errors in documentation):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.MultiLayer
-       </td>
-       <td valign=\"top\">Corrected wrong result variable <code>R</code> and <code>UA</code>.
-                          These variables are only used for reporting.
-                          All other calculations are not affected by this error.
-       </td>
-   </tr>
-   </table>
-   </html>"));
-   end Version_5_0_0;
-
-   class Version_4_0_0 "Version 4.0.0"
-     extends Modelica.Icons.ReleaseNotes;
-     annotation (Documentation(info="<html>
-   <div class=\"release-summary\">
-   <p>
-   Version 4.0.0 is a major new release. It is the first release
-   that is based on the <i>Modelica IBPSA Library</i>
-   (<a href=\"https://github.com/ibpsa/modelica\">https://github.com/ibpsa/modelica</a>).
-   All models simulate with Dymola 2017 FD01 and with JModelica,
-   and the results of these simulators have been cross-compared and are
-   equal within the expected tolerance.
-   </p>
-   <p>
-     The following major changes have been done:
-   <ul>
-   <li>
-   It no longer uses the <code>Modelica_StateGraph2</code>
-   library. Instead, it uses <code>Modelica.StateGraph</code> which is part
-   of the Modelica Standard Library.
-   </li>
-   <li>
-   The models in <code>Buildings.Fluid.Movers</code> have been refactored to increase
-   the numerical robustness at very low speed when the fans or pumps are switched on or off.
-   </li>
-   <li>
-   The following new packages have been added:
-   <ul>
-   <li>
-   <code>Buildings.Obsolete.DistrictHeatingCooling</code>
-   with models for district heating and cooling
-   with bi-directional flow in the distribution pipes.
-   </li>
-   <li>
-   <code>Buildings.Fluid.FMI.Adaptors</code> and
-   <code>Buildings.Fluid.FMI.ExportContainers</code>, which
-   allow export of HVAC systems and of thermal zones as
-   Functional Mockup Units.
-   </li>
-   <li>
-   <code>Buildings.Fluid.HeatExchangers.ActiveBeams</code>,
-   with active beams for cooling and heating.
-   </li>
-   <li>
-   <code>Buildings.Fluid.DXSystems.WaterCooled</code>,
-   with water-cooled direct expansion cooling coils.
-   </li>
-   <li>
-   <code>Buildings.ThermalZones.ReducedOrder</code>, with
-   reduced order models of thermal zones based on VDI 6007
-   that are suitable for district energy simulation.
-   </li>
-   </ul>
-   </li>
-   <li>
-   The package <code>Buildings.Rooms</code> has been renamed to <code>Buildings.ThermalZones.Detailed</code>.
-   This was done because of the introduction of <code>Buildings.ThermalZones.ReducedOrder</code>,
-   which is from the <code>Annex60</code> library,
-   in order for thermal zones to be in the same top-level package.<br/>
-   For Dymola, the conversion script will update models that use any model of the package
-   <code>Buildings.Rooms</code>.
-   </li>
-   <li>
-   The model <code>Buildings.Fluid.FixedResistances.FixedResistanceDpM</code> has been refactored. Now, if
-   the hydraulic diameter is not yet known, one can use the simpler model
-   <code>Buildings.Fluid.FixedResistances.PressureDrop</code>, otherwise the model
-   <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> may be used.
-   With this refactoring, also the model <code>Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM</code> has
-   been renamed to <code>Buildings.Fluid.FixedResistances.Junction</code> and
-   parameters that use the hydraulic diameter have been removed.
-   </li>
-   <li>
-   The models <code>Buildings.HeatTransfer.Conduction.SingleLayer</code>,
-   <code>Buildings.HeatTransfer.Conduction.MultiLayer</code>,
-   and <code>Buildings.HeatTransfer.Windows.Window</code> have been refactored
-   to add the option to place a state at the surface of a construction.
-   This leads in many examples that use the room model to a smaller number
-   of non-linear system of equations and a 20% to 40% faster simulation.
-   </li>
-   <li>
-   The models <code>Buildings.Fluid.HeatPumps.ReciprocatingWaterToWater</code>
-   and <code>Buildings.Fluid.HeatPumps.ScrollWaterToWater</code> have been added.
-   Parameters to these models rely on calibration with tabulated heat pump performance
-   data. Python scripts for the calibration of the heat pump models are in
-   <code>Buildings/Resources/src/fluid/heatpumps/calibration</code>.
-   This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/587\">issue 587</a>.
-   </li>
-   </ul>
-   </div>
-   <!-- New libraries -->
-   <p>
-   The following <b style=\"color:blue\">new libraries</b> have been added:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-
-   <tr><td valign=\"top\">Buildings.Obsolete.DistrictHeatingCooling
-       </td>
-       <td valign=\"top\">Package with models for district heating and cooling
-                          with bi-directional flow in the distribution pipes.
-
-       </td>
-       </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.FMI.Adaptors<br/>
-                          Buildings.Fluid.FMI.ExportContainers
-       </td>
-       <td valign=\"top\">Library with adaptors to export HVAC systems and thermal zones
-                          as a Functional Mockup Unit for Model Exchange.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.
-       </td>
-       </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.ActiveBeams
-       </td>
-       <td valign=\"top\">Package with models of active beams for space cooling and heating.
-       </td>
-       </tr>
-
-    <tr><td valign=\"top\">Buildings.Fluid.DXSystems.WaterCooled
-       </td>
-       <td valign=\"top\">Package with models of water-cooled direct expansion
-                          cooling coils with single speed, variable speed
-                          or multi-stage compressor.
-        </td>
-        </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Compressors
-       </td>
-       <td valign=\"top\">Package with models of compressors for heat pumps.
-       </td>
-       </tr>
-
-     <tr><td valign=\"top\">Buildings.ThermalZones.ReducedOrder
-       </td>
-       <td valign=\"top\">Package with reduced order models of thermal zones based
-                        on VDI 6007.
-       </td>
-       </tr>
-
-   </table>
-   <!-- New components for existing libraries -->
-   <p>
-   The following <b style=\"color:blue\">new components</b> have been added
-   to <b style=\"color:blue\">existing</b> libraries:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sensors.Velocity
-       </td>
-       <td valign=\"top\">Sensor for the flow velocity.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.EvaporatorCondenser
-       </td>
-       <td valign=\"top\">Model for evaporator/condenser with refrigerant experiencing constant temperature phase change.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.ReciprocatingWaterToWater
-       </td>
-       <td valign=\"top\">Model for water to water heat pump with a reciprocating compressor.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.ScrollWaterToWater
-       </td>
-       <td valign=\"top\">Model for water to water heat pump with a scroll compressor.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows.BaseClasses</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.HeatCapacity
-       </td>
-       <td valign=\"top\">Model for adding a state on the room-facing surface of a window.
-This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
-       </td>
-   </tr>
-
-
-   <tr><td colspan=\"2\"><b>Buildings.Media</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Media.Refrigerants.R410A
-       </td>
-       <td valign=\"top\">Model for thermodynamic properties of refrigerant R410A.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Media.Specialized.Water.ConstantProperties_pT
-       </td>
-       <td valign=\"top\">Model for liquid water with constant properties at user-selected temperature.<br/>
-                          This closes
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/511\">IBPSA, #511</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.Math.IntegratorWithReset
-       </td>
-       <td valign=\"top\">Integrator with optional input that allows
-                          resetting the state if the input changes from <code>false</code>
-                          to <code>true</code>.<br/>
-                          This closes
-                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/494\">IBPSA, #494</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.Time</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.Time.CalendarTime
-       </td>
-       <td valign=\"top\">Block that outputs the calendar time, time of the week, hour of the day etc.<br/>
-                          This closes
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/501\">IBPSA, #501</a>.
-       </td>
-   </tr>
-
-   </table>
-   <!-- Backward compatible changes -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   have been <b style=\"color:blue\">improved</b> in a
-   <b style=\"color:blue\">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.BoundaryConditions</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.Examples.GetHeaderElement<br/>
-                          Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath<br/>
-                          Buildings.BoundaryConditions.WeatherData.BaseClasses.getHeaderElementTMY3<br/>
-                          Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
-                          Buildings.BoundaryConditions.SolarGeometry.ProjectedShadowLength
-       </td>
-       <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>
-                          to make the model work in JModelica.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
-                          <br/>
-                          Removed the use of <code>Modelica.Utilities.Files.fullPathName</code>
-                          in <code>Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
-                          </code> which is implicitly done in <code>Modelica.Utilities.Files.loadResource.
-                          </code>
-                          <br/>
-                          Removed in
-                          <code>Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
-                          </code>the addition of <code>file://</code> to file names which do not start
-                          with <code>file://</code>, or <code>modelica://</code>.
-                          This is not required when using
-                          <code>Modelica.Utilities.Files.loadResource</code>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/539\">issue 539</a>.
-                          </td>
-       </tr>
-       <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-       </td>
-       <td valign=\"top\">Shifted the computation of the infrared irradiation such that
-                          the results in <code>Buildings.BoundaryConditions.SkyTemperature.Examples.BlackBody</code>
-                          are consistent for both option of the black-body sky temperature calculation.
-                          This closes
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/648\">IBPSA, #648</a>.
-       </td>
-       </tr>
-       <tr>
-       <td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.SkyClearness
-       </td>
-       <td valign=\"top\">Reduced tolerance for regularization if the sky clearness is near one or eight.
-                          This closes
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/521\">IBPSA, #521</a>.
-
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Controls</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID<br/>
-                          Buildings.Controls.Continuous.PIDHysteresis<br/>
-                          Buildings.Controls.Continuous.PIDHysteresisTimer<br/>
-          </td>
-          <td valign=\"top\">Added option to reset the control output when an optional Boolean input signal
-                           changes from <code>false</code> to <code>true</code>.<br/>
-                           This closes
-                           <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/494\">IBPSA, #494</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Electrical.DC.Storage.Examples.Battery
-       </td>
-       <td valign=\"top\">Replaced <code>Modelica_StateGraph2</code> with
-                          <code>Modelica.StateGraph</code>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/504\">issue 504</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Examples</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
-                          Buildings.Examples.VAVReheat.ClosedLoop
-
-       </td>
-       <td valign=\"top\">Added hysteresis to the economizer control to avoid many events.
-                          This change was done in
-                          <code>Buildings.Examples.VAVReheat.Controls.EconomizerTemperatureControl</code>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/502\">issue 502</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.ClosedLoop
-
-       </td>
-       <td valign=\"top\">Set <code>filteredSpeed=false</code> in fan models to avoid a large
-                          increase in computing time when simulated between <i>t=1.60E7</i>
-                          and <i>t=1.66E7</i>.
-
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ClosedLoop
-
-       </td>
-       <td valign=\"top\">Changed chilled water supply temperature to <i>6&deg;C</i>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/509\">issue 509</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Examples.ChillerPlant.BaseClasses.Controls.BatteryControl<br/>
-                          Buildings.Examples.ChillerPlant.BaseClasses.Controls.WSEControl<br/>
-                          Buildings.Examples.HydronicHeating.TwoRoomsWithStorage<br/>
-                          Buildings.Examples.Tutorial.Boiler.System7
-       </td>
-       <td valign=\"top\">Replaced <code>Modelica_StateGraph2</code> with
-                          <code>Modelica.StateGraph</code>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/504\">issue 504</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.SingleLayer
-       </td>
-       <td valign=\"top\">Added option to place a state at the surface of a construction.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.MultiLayer
-       </td>
-       <td valign=\"top\">Added option to place a state at the surface of a construction.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Window
-       </td>
-       <td valign=\"top\">Added option to place a state at the surface of a construction.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/565\">issue 565</a>.
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BeamDepthInRoom
-       </td>
-       <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD<br/>
-                          Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
-       </td>
-       <td valign=\"top\">Refactored the use of <code>Modelica.Utilities.Files.loadResource</code>.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">issue 506</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
-                          Buildings.ThermalZones.Detailed.CFD
-       </td>
-       <td valign=\"top\">Refactored the distribution of the diffuse solar irradiation.
-                          Previously, the model assumed that all diffuse irradiation first hits the floor before it is
-                          diffusely reflected to all other surfaces. Now, the incoming diffuse solar irradiation is distributed
-                          to all surfaces, proportional to their emissivity plus transmissivity times area.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
-       </td>
-   </tr>
-   </table>
-   <!-- Non-backward compatible changes to existing components -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   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.BoundaryConditions</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getHeaderElementTMY3
-       </td>
-       <td valign=\"top\">This function is used to read location coordinates
-                          from the TMY3 weather data file. The call to
-                          <code>Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath</code>
-                          has been removed as it calls the function
-                          <code>Modelica.Utilities.Files.loadResource</code>, whose return value needs
-                          to be known at compilation time to store the weather data in the FMU.
-                          This is not supported by JModelica.
-                          Most models should still work as this call has been added at a higher level
-                          of the model hierarchy. If models don't work, add a call to <code>loadResource</code>
-                          at the top-level.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Controls</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.Continuous.PIDHysteresis
-       </td>
-       <td valign=\"top\">Set <code>zer(final k=0)</code> and made
-                          <code>swi</code>, <code>zer</code> and
-                          <code>zer1</code> protected, as they are for
-                          <code>Buildings.Controls.Continuous.PIDHysteresis</code>.
-                          Only models that access these instances, which typically is not the case,
-                          are affected by this change.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.Continuous.LimPID<br/>
-                          Buildings.Controls.Continuous.PIDHysteresis<br/>
-                          Buildings.Controls.Continuous.PIDHysteresisTimer<br/>
-          </td>
-          <td valign=\"top\">Removed the parameter <code>limitsAtInit</code> as
-                           it is not used.<br/>
-                           For Dymola, the conversion script will update models that set this parameter.<br/>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Controls.SetPoints.Table
-       </td>
-       <td valign=\"top\">Changed protected final parameter <code>nCol</code> to <code>nRow</code>.<br/>
-                          For Dymola, the conversion script will update models that access this parameter.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/555\">issue 555</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Actuators</b>
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
-                          Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
-                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
-                          Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
-                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
-                          Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                          Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
-                          Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
-                          Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
-                          Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent<br/>
-                          Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening<br/>
-                          Buildings.Fluid.Actuators.Valves.TwoWayTable
-       </td>
-       <td valign=\"top\">Renamed the parameter
-                          <code>filteredOpening</code> to
-                          <code>use_inputFilter</code>.<br/>
-                          For Dymola, the conversion script will update models that access this parameter.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/665\">IBPSA, #665</a>
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
-                          Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
-                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
-                          Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
-                          Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow
-       </td>
-       <td valign=\"top\">Renamed the parameters
-                          <code>use_v_nominal</code> and all area related parameters,
-                          because <code>m_flow_nominal</code> and <code>v_nominal</code>
-                          are used to compute the area.<br/>
-                          For Dymola, the conversion script will update models that access this parameter.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/544\">IBPSA, #544</a>
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot_TEva<br/>
-                          Buildings.Fluid.Chillers.Carnot_y
-       </td>
-       <td valign=\"top\">Removed the parameters
-                          <code>effInpEva</code> and
-                          <code>effInpCon</code>.
-                          Now, always the leaving water temperatures are used to compute the coefficient
-                          of performance (COP). Previously, the
-                          entering water temperature could be used, but this can give COPs that are higher than
-                          the Carnot efficiency if the temperature lift is small.
-                          For Dymola, the conversion script will update models.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/497\">IBPSA, #497</a>
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.FixedResistances</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.FixedResistanceDpM
-       </td>
-       <td valign=\"top\">Renamed
-                          <code>Buildings.Fluid.FixedResistances.FixedResistanceDpM</code> to
-                          <code>Buildings.Fluid.FixedResistances.PressureDrop</code>
-                          and removed the parameters <code>use_dh</code>, <code>dh</code> and <code>ReC</code>.
-                          For Dymola, the conversion script will update models.
-                          If a model needs to be used that allows specifying <code>dh</code> and <code>ReC</code>,
-                          then the new model
-                          <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> can be used.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM
-       </td>
-       <td valign=\"top\">Renamed
-                          <code>Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM</code> to
-                          <code>Buildings.Fluid.FixedResistances.Junction</code>
-                          and removed the parameters <code>use_dh</code>, <code>dh</code> and <code>ReC</code>.
-                          For Dymola, the conversion script will update models.
-                          If a model needs to be used that allows specifying <code>dh</code> and <code>ReC</code>,
-                          then use <code>Buildings.Fluid.FixedResistances.Junction</code> with
-                          <code>dp_nominal = 0</code> (which removes the pressure drop) and use
-                          <code>Buildings.Fluid.FixedResistances.HydraulicDiameter</code> at each fluid port.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.FMI</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.FMI.InletAdaptor<br/>
-                          Buildings.Fluid.FMI.OutletAdaptor<br/>
-                          Buildings.Fluid.FMI.TwoPort<br/>
-                          Buildings.Fluid.FMI.TwoPortComponent
-       </td>
-       <td valign=\"top\">Renamed
-                          <code>Buildings.Fluid.FMI.InletAdaptor</code> to
-                          <code>Buildings.Fluid.FMI.Adaptors.Inlet</code>,<br/>
-                          renamed
-                          <code>Buildings.Fluid.FMI.OutletAdaptor</code> to
-                          <code>Buildings.Fluid.FMI.Adaptors.Outlet</code>,<br/>
-                          renamed
-                          <code>Buildings.Fluid.FMI.TwoPort</code> to
-                          <code>Buildings.Fluid.FMI.ExportContainers.PartialTwoPort</code>,<br/>
-                          renamed
-                          <code>Buildings.Fluid.FMI.TwoPortComponent</code> to
-                          <code>Buildings.Fluid.FMI.ExportContainers.ReplaceableTwoPort</code>.
-                          This was due to the restructuring of the <code>Buildings.Fluid.FMI</code>
-                          package for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/506\">Buildings, #506</a>.<br/>
-                          For Dymola, the conversion script updates these models.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">
-                          Buildings.Fluid.DXSystems.AirCooled.SingleSpeed<br/>
-                          Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
-                          Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
-                          Buildings.Fluid.DXSystems.Data
-       </td>
-       <td valign=\"top\">Renamed
-                          <code>Buildings.Fluid.DXSystems.AirCooled.SingleSpeed</code> to<br/>
-                          <code>Buildings.Fluid.DXSystems.AirCooled.SingleSpeed</code>,<br/>
-                          <code>Buildings.Fluid.DXSystems.AirCooled.VariableSpeed</code> to<br/>
-                          <code>Buildings.Fluid.DXSystems.AirCooled.VariableSpeed</code>,<br/>
-                          <code>Buildings.Fluid.DXSystems.AirCooled.MultiStage</code> to<br/>
-                          <code>Buildings.Fluid.DXSystems.AirCooled.MultiStage</code> and<br/>
-                          <code>Buildings.Fluid.DXSystems.Data</code> to<br/>
-                          <code>Buildings.Fluid.DXSystems.AirCooled.Data</code>.<br/>
-                          This was due to the addition of the new package
-                          <code>Buildings.Fluid.DXSystems.WaterCooled</code>.
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/635\">Buildings, #635</a>.<br/>
-                          For Dymola, the conversion script updates these models.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.HeatPumps</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps.Carnot_TEva<br/>
-                          Buildings.Fluid.HeatPumps.Carnot_y
-       </td>
-       <td valign=\"top\">Removed the parameters
-                          <code>effInpEva</code> and
-                          <code>effInpCon</code>.
-                          Now, always the leaving water temperatures are used to compute the coefficient
-                          of performance (COP). Previously, the
-                          entering water temperature could be used, but this can give COPs that are higher than
-                          the Carnot efficiency if the temperature lift is small.
-                          For Dymola, the conversion script will update models.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/497\">IBPSA, #497</a>
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.Boreholes
-       </td>
-       <td valign=\"top\">Moved the package <code>Buildings.Fluid.HeatExchangers.Boreholes</code> to
-                          <code>Buildings.Fluid.Geothermal.Boreholes</code>.
-                          This is for compatibility with an ongoing model development that will include
-                          a borefield model.<br/>
-                          For Dymola, the conversion script will update models that use any model of the package
-                          <code>Buildings.Fluid.HeatExchangers.Boreholes</code>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Movers
-       </td>
-       <td valign=\"top\">Removed the function
-                          <code>Buildings.Fluid.Movers.BaseClasses.Characteristics.flowApproximationAtOrigin</code>
-                          and changed the arguments of the function
-                          <code>Buildings.Fluid.Movers.BaseClasses.Characteristics.pressure</code>.<br/>
-                          This was done due to the refactoring of the fan and pump model for low speed. This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/458\">IBPSA, #458</a>.<br/>
-                          Users who simply use the existing model in <code>Buildings.Fluid.Movers</code> are not affected by
-                          this change as the function are called by a low-level implementation only.
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.
-                          Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                          Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                          Buildings.Fluid.Movers.SpeedControlled_y
-       </td>
-       <td valign=\"top\">Renamed the parameter
-                          <code>filteredSpeed</code> to
-                          <code>use_inputFilter</code>.<br/>
-                          For Dymola, the conversion script will update models that access this parameter.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/665\">IBPSA, #665</a>
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers
-       </td>
-       <td valign=\"top\">Changed the name of the function
-                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.efficiency</code>
-                          to
-                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.normalizedPower</code>.
-                          Changed the name of the record
-                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.efficiencyParameters</code>
-                          to
-                          <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.Characteristics.fan</code>,
-                          and changed the parameter of this record from
-                          <code>eta</code> to <code>r_P</code>.
-                          This change was done as the performance is for the relative power consumption, and not the fan
-                          efficiency, as the old parameter name suggests.
-                          Users who use the default parameters are not affected by this change.
-                          If the default parameters were changed, then for Dymola,
-                          the conversion script will update the model.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-       </td>
-   </tr>
-       <tr><td valign=\"top\">Buildings.HeatTransfer.BaseClasses.TransmittedRadiation<br/>
-                              Buildings.HeatTransfer.BaseClasses.WindowRadiation
-       </td>
-       <td valign=\"top\">Refactored the model to allow separate treatment for the diffuse and direct irradiation,
-                          which is needed for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
-       </td>
-    </tr>
-
-    <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.BaseClasses.PartialConstruction
-       </td>
-       <td valign=\"top\">Removed parameter <code>A</code> as it is already declared in
-                          <code>Buildings.HeatTransfer.Conduction.BaseClasses.PartialConductor</code>
-                          which is often used with this class.
-       </td>
-    </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed
-
-       </td>
-       <td valign=\"top\">Moved package from <code>Buildings.Rooms</code> to <code>Buildings.ThermalZones.Detailed</code>.
-                          This was done because <code>Buildings</code> has a new package
-                          <code>Buildings.ThermalZones.ReducedOrder</code> with reduced order building models.
-                          Hence, the more detailed room models should be in the same top-level package as they
-                          are also for modeling of thermal zones.<br/>
-                          For Dymola, the conversion script will update models that use any model of the package
-                          <code>Buildings.ThermalZones</code>.
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD<br/>
-                          Buildings.ThermalZones.Detailed.MixedAir<br/>
-                          Buildings.ThermalZones.Detailed.BaseClasses.CFDAirHeatMassBalance<br/>
-                          Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatMassBalance<br/>
-                          Buildings.ThermalZones.Detailed.BaseClasses.PartialAirHeatMassBalance<br/>
-                          Buildings.ThermalZones.Detailed.BaseClasses.RoomHeatMassBalance
-
-       </td>
-       <td valign=\"top\">Refactored implementation of latent heat gain for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
-                          Users who simply use <code>Buildings.MixedAir.Rooms.CFD</code> or
-                          <code>Buildings.MixedAir.Rooms.MixedAir</code> will not be affected by this change,
-                          except if they access variables related to the heat gain.
-
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.AirHeatMassBalanceMixed<br/>
-                          Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatGain
-       </td>
-       <td valign=\"top\">Removed models as these are no longer needed due after the refactoring
-                          of the room model for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
-       </td>
-    </tr>
-    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.RoomHeatMassBalance<br/>
-                           Buildings.ThermalZones.Detailed.BaseClasses.SolarRadiationExchange
-       </td>
-       <td valign=\"top\">Refactored the distribution of the diffuse solar irradiation, which required replacing the
-                          input and output signals.
-                          Previously, the model assumed that all diffuse irradiation first hits the floor before it is
-                          diffusely reflected to all other surfaces. Now, the incoming diffuse solar irradiation is distributed
-                          to all surfaces, proportional to their emissivity plus transmissivity times area.<br/>
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/451\">issue 451</a>.
-"    +
-    "       </td>
-    </tr>
-
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDHeatGain
-       </td>
-       <td valign=\"top\">Renamed model from <code>Buildings.ThermalZones.Detailed.BaseClasses.CFDHeatGain</code> to
-                          <code>Buildings.ThermalZones.Detailed.BaseClasses.HeatGain</code>.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/515\">Buildings, #515</a>.
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
-       </td>
-       <td valign=\"top\">Removed the parameter <code>uStart</code> as it is not required. As this is in a base
-                          class, users typically won't need to change their models
-                          unless they use this base class directly.<br/>
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/579\">Buildings, #579</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-       </td>
-   </tr>
-       <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.WetBul_pTX
-       </td>
-       <td valign=\"top\">Deleted the model
-                          <code>Buildings.Utilities.Psychrometrics.WetBul_pTX</code>
-                          as the same functionality is provided by
-                          <code>Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi</code>.
-                          Users who use <code>Buildings.Utilities.Psychrometrics.WetBul_pTX</code>
-                          need to replace the model manually and reconnect the input and output ports.<br/>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/475\">IBPSA, #475</a>.
-       </td>
-    </tr>
-
-   </table>
-   <!-- Errors that have been fixed -->
-   <p>
-   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-   that can lead to wrong simulation results):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.DXSystems.AirCooled.MultiStage<br/>
-                          Buildings.Fluid.DXSystems.AirCooled.SingleSpeed<br/>
-                          Buildings.Fluid.DXSystems.AirCooled.VariableSpeed<br/>
-                          Buildings.Fluid.DXSystems.AirCooled.BaseClasses.Evaporation
-       </td>
-       <td valign=\"top\">Corrected the computation of the wet bulb state in the model
-                          that computes the reevaporation of water vapor into the air stream when the coil
-                          is switched off. The results change slightly.
-                          This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/520\">issue 520</a>
-                          and integrates the change of
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/474\">IBPSA, #474</a>.
-
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-       </td>
-       <td valign=\"top\">Corrected computation of the heat exchanger location which was wrong
-                          if <code>hHex_a &lt; hHex_b</code>, e.g., the port a of the heat exchanger
-                          is below the port b.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/531\">issue 531</a>.
-       </td>
-   </tr>   <tr><td colspan=\"2\"><b>Buildings.Examples</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Examples.VAVReheat.ClosedLoop<br/>
-                          Buildings.Examples.DualFanDualDuct.ClosedLoop<br/>
-                          Buildings.Examples.VAVReheat.Controls.Economizer
-       </td>
-       <td valign=\"top\">Corrected the economizer controller which closed
-                          the outside air when there was no freeze concern during summer.
-                          This closes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/511\">issue 511</a>.
-       </td>
-   </tr>
-   </table>
-   <!-- Uncritical errors -->
-   <p>
-   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-   units are wrong or errors in documentation):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Electrical.AC.OnePhase.Sources.Grid<br/>
-                          Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.Grid<br/>
-                          Buildings.Electrical.AC.ThreePhasesUnbalanced.Sources.Grid_N
-       </td>
-       <td valign=\"top\">Corrected sign error in documentation string of
-                          variable <code>P</code>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchanger.WetCoilCounterFlow<br/>
-                          Buildings.Fluid.HeatExchanger.WetCoilDiscretized
-       </td>
-       <td valign=\"top\">Redeclared <code>Medium2</code> to force it to be a subclass
-                          of <code>Modelica.Media.Interfaces.PartialCondensingGases</code>.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/544\">
-                          issue 544</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Storage
-       </td>
-       <td valign=\"top\">Removed medium declaration, which is not needed and inconsistent with
-                          the declaration in the base class.<br/>
-                          This is for <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/544\">
-                          issue 544</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Validation.BESTEST</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case900<br/>
-                          Buildings.ThermalZones.Detailed.Validation.BESTEST.Cases9xx.Case900
-       </td>
-       <td valign=\"top\">Added missing <code>parameter</code> keyword,
-                          which is required as the variable (for the materials) is assigned to a parameter.
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/543\">issue 543</a>.
-       </td>
-   </tr>
-   </table>
-   </html>"));
-   end Version_4_0_0;
-
-   class Version_3_0_0 "Version 3.0.0"
-     extends Modelica.Icons.ReleaseNotes;
-       annotation (Documentation(info="<html>
-   <div class=\"release-summary\">
-   <p>
-   Version 3.0.0 is a major new release.
-   </p>
-   <p>
-     The following major changes have been done:
-   <ul>
-     <li>
-       Electrochromic windows have been added. See <code>Buildings.ThermalZones.Detailed.Examples.ElectroChromicWindow</code>.
-     </li>
-     <li>
-       The models in <code>Buildings.Fluid.Movers</code> can now be configured to use
-       three different control input signals: a continuous signal (depending on the model
-       either normalized speed, speed in rpm, prescribed mass flow rate or prescribed head),
-       discrete stages of these quantities, or on/off.
-       The models also have been refactored to make their implementation clearer.
-     </li>
-     <li>
-       The new package <code>Buildings.Fluid.HeatPumps</code> has been added.
-       This package contains models for idealized heat pumps
-       whose COP changes proportional to the change in COP of a Carnot cycle,
-       with an optional correction for the part load efficiency.
-     </li>
-     <li>
-       Various models, in particular in the package <code>Buildings.Electrical</code>,
-       have been reformulated to comply with the Modelica Language Definition.
-       All models comply with the pedantic Modelica check of Dymola.
-     </li>
-   </ul>
-   </div>
-   <!-- New libraries -->
-   <p>
-   The following <b style=\"color:blue\">new libraries</b> have been added:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-   <tr><td valign=\"top\">Buildings.Fluid.HeatPumps
-       </td>
-       <td valign=\"top\">Library with heat pump models.
-                          This library contains models for idealized heat pumps
-                          whose COP changes proportional to the change in COP of a Carnot cycle.
-                          Optionally, a part load efficiency curve can be specified.
-                          The model <code>Buildings.Fluid.HeatPumps.Carnot_TCon</code>
-                          takes as a control input the leaving
-                          condenser fluid temperature, and the model
-                          <code>Buildings.Fluid.HeatPumps.Carnot_y</code> takes as
-                          a control signal the compressor speed.
-       </td>
-       </tr>
-   </table>
-   <!-- New components for existing libraries -->
-   <p>
-   The following <b style=\"color:blue\">new components</b> have been added
-   to <b style=\"color:blue\">existing</b> libraries:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.SolarGeometry</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.BoundaryConditions.SolarGeometry.ProjectedShadowLength
-       </td>
-       <td valign=\"top\">Block that computes the length of a shadow projected onto a horizontal plane
-                          into the direction that is perpendicular to the azimuth of a surface.
-       </td>
-       </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Adapter3to3<br/>
-                        Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Connection3to3Ground_n<br/>
-                        Buildings.Electrical.AC.ThreePhasesUnbalanced.Interfaces.Connection3to3Ground_p
-       </td>
-       <td valign=\"top\">Adapters for unbalanced three phase systems which are required because
-                        the previous formulation used connect statements that violate the Modelica
-                        Language Definition. This change was required to enable pedantic model check and translation
-                        in Dymola 2016 FD01.
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/426\">#426</a>.
-       </td>
-       </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot_TEva
-       </td>
-       <td valign=\"top\">Chiller model whose efficiency changes with temperatures
-                          similarly to a change in Carnot efficiency. The control input signal
-                          is the evaporator leaving fluid temperature.
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/353\">IBPSA, #353</a>.
-       </td>
-       </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sensors.PPM<br/>
-                          Buildings.Fluid.Sensors.PPMTwoPort
-       </td>
-       <td valign=\"top\">Sensors that measure trace substances in parts per million.
-       </td>
-       </tr>
-   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer.Windows</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BeamDepthInRoom
-       </td>
-       <td valign=\"top\">Block that computes the maximum distance at which
-                          a solar beam that enters the window hits the workplane.
-       </td>
-       </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.smoothInterpolation
-       </td>
-       <td valign=\"top\">Function that interpolates for vectors <code>xSup[]</code>, <code>ySup[]</code>
-                          and independent variable <code>x</code>.
-                          The interpolation is done using a cubic Hermite spline with linear extrapolation.
-       </td>
-       </tr>
-   </table>
-   <!-- Backward compatible changes -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   have been <b style=\"color:blue\">improved</b> in a
-   <b style=\"color:blue\">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>
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                          Buildings.Fluid.Actuators.Valves.ThreeWayLinear
-    </td>
-    <td valign=\"top\">Changed the default value for valve leakage
-                       parameter <code>l</code> from <code>0</code> to <code>0.0001</code>.
-                       This is the same value as is used for the two-way valves,
-                       and avoids an assertion that would be triggered if <code>l=0</code>.
-    </td>
-    </tr>
-
-    <tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.UTube
-       </td>
-       <td valign=\"top\">Updated code for 64 bit on Linux and Windows.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/485\">issue 485</a>.
-       </td>
-    </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
-    </td>
-    <td valign=\"top\">Reformulated model to allow translation in OpenModelica.
-                       This is for issue
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/490\">#490</a>.
-    </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
-    </td>
-    <td valign=\"top\">Changed the sign convention for <code>dTEva_nominal</code>.
-                       Now, this quantity needs to be negative.
-                       This change was done to be consistent with other models.
-                       In this version, a warning will be written if the sign
-                       is not updated, but the results will be the same.
-                       In future versions the warning will be
-                       changed to an error.<br/>
-                       The parameters <code>dTEva_nominal</code> and
-                       <code>dTCon_nominal</code> are now used
-                       to assign default values for the nominal mass flow rates.
-    </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolume<br/>
-                          Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
-    </td>
-    <td valign=\"top\">Added the parameter <code>use_C_flow</code>. If set
-                       to <code>true</code>, an input connector will be enabled that can be used
-                       to add a trace substance flow rate, such as CO2, to the volume.
-    </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
-                          Buildings.Fluid.Movers.FlowControlled_y
-    </td>
-    <td valign=\"top\">Added the parameter <code>inputType</code> which allows
-                       to set the input as an continuous input signal,
-                       to set the input as an Integer input signal that selects the stage of the mover,
-                       or to remove the input connector and use a parameter
-                       to assign the control signal.
-    </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-       </td>
-       <td valign=\"top\">Added option to set dynamics of heat exchanger material
-                        separately from the dynamics of the fluid inside the heat
-                        exchanger.
-                        This is for issue
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/434\">#434</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
-                          Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
-
-       </td>
-       <td valign=\"top\">Propagated parameter <code>allowFlowReversal</code>
-                          which can cause a simpler energy balance to be used.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortTransport
-
-       </td>
-       <td valign=\"top\">Implemented more efficient computation of <code>port_a.Xi_outflow</code>
-                          and <code>port_a.C_outflow</code> when <code>allowFlowReversal=false</code>.
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/305\">IBPSA issue 305</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp<br/>
-                        Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow
-
-       </td>
-       <td valign=\"top\">Refactored for a more efficient implementation.
-                        Removed double declaration of <code>smooth(..)</code> and <code>smoothOrder</code>
-                        and changed <code>Inline=true</code> to <code>LateInline=true</code>.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/301\">IBPSA issue 301</a>
-                        and for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/279\">IBPSA issue 279</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.CFDExchange
-       </td>
-       <td valign=\"top\">Set <code>start</code> and <code>fixed</code>
-                          attributes in
-                          <code>u[nWri](start=_uStart, each fixed=true)</code>
-                          to avoid a warning in Dymola 2016 about unspecified initial conditions.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/422\">issue 422</a>.<br/>
-                          Set <code>start</code> and <code>fixed</code>
-                          attributes in
-                          <code>firstTrigger(start=false, fixed=true)</code>,
-                          <code>retVal(start=0, fixed=true)</code> and <code>modTimRea(fixed=false)</code>
-                          to avoid such a warning in the pedantic Modelica check in Dymola 2016.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/459\">issue 459</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD
-       </td>
-       <td valign=\"top\">Updated code for 64 bit on Linux and Windows.
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/485\">issue 485</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.Math.Functions
-       </td>
-       <td valign=\"top\">Refactored <code>Buildings.Utilities.Math.Functions.inverseXRegularized</code>
-                        to make it more efficient as it is used in many steady-state energy balances.
-                          This closes
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/302\">IBPSA issue 302</a>.
-       </td>
-   </tr>
-  </table>
-   <!-- Non-backward compatible changes to existing components -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   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.BoundaryConditions</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody<br/>
-                          Buildings.BoundaryConditions.WeatherData.Bus
-     </td>
-       <td valign=\"top\">Renamed the connector from <code>radHorIR</code> to <code>HHorIR</code>
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/376\">IBPSA issue 376</a>.
-                          For Dymola, the conversion script updates these connections.
-                          However, this also results in a renaming of the weather bus variable
-                          <code>weaBus.radHorIR</code> to <code>HHorIR</code>, which may
-                          require a manual update.
-       </td>
-     </tr>
-
-    <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
-     </td>
-     <td valign=\"top\">Removed the constant <code>sensibleOnly</code> and
-                        introduced instead the parameter <code>use_mWat_flow</code>.
-                        The new parameter, if set to <code>true</code>, will enable an input connector
-                        that can be used to add water to the conservation equation.
-                        For Dymola, the conversion script updates the model for these changes.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
-     </td>
-     <td valign=\"top\">Renamed the model to  <code>Buildings.Fluid.Chillers.Carnot_y</code>
-                        due to the addition of the new model <code>Buildings.Fluid.Chillers.Carnot_TEva</code>.
-                        In addition, the following parameter names were changed:
-                        <code>use_eta_Carnot</code> was changed to <code>use_eta_Carnot_nominal</code>, and
-                        <code>etaCar</code> was changed to <code>etaCarnot_nominal</code>.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/353\">IBPSA issue 353</a>.
-                        For Dymola, the conversion script removes these parameters.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
-                          Buildings.Fluid.Movers.FlowControlled_y
-     </td>
-     <td valign=\"top\">Removed the parameters <code>use_powerCharacteristics</code>
-                        and <code>motorCooledByFluid</code> as these are already
-                        declared in the performance data record <code>per</code>.
-                        This is for issue
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/434\">#457</a>.
-                        For Dymola, the conversion script removes these parameters.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
-                          Buildings.Fluid.Movers.FlowControlled_y
-     </td>
-     <td valign=\"top\">Removed the public variable <code>r_N</code>.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/417\">IBPSA issue 417</a>.
-                        For Dymola, the conversion script removes
-                        assignments of <code>r_N(start)</code>.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                          Buildings.Fluid.Movers.FlowControlled_m_flow
-   </td>
-   <td valign=\"top\">Write a warning if no pressure curve is provided because
-                     the efficiency calculation can only be done correctly if a pressure curve
-                     is provided. The warning can be suppressed by providing a pressure curve, or
-                     by setting <code>nominalValuesDefineDefaultPressureCurve=true</code>.
-     </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.Movers.Data
-     </td>
-     <td valign=\"top\">Replaced the parameters
-                        <code>Buildings.Fluid.Movers.Data.FlowControlled</code>,
-                        <code>Buildings.Fluid.Movers.Data.SpeedControlled_y</code>, and
-                        <code>Buildings.Fluid.Movers.Data.SpeedControlled_Nrpm</code> by
-                        the parameter
-                        <code>Buildings.Fluid.Movers.Data.Generic</code>
-                        which is used for all four types of movers.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/417\">IBPSA issue 417</a>.
-                        This change allows to correctly compute the fan or pump power also for the models
-                        <code>Buildings.Fluid.Movers.FlowControlled_dp</code>,
-                        <code>Buildings.Fluid.Movers.FlowControlled_m_flow</code>
-                        for speeds that are different from the nominal speed, provided that the user
-                        specifies the pressure curve.
-                        For Dymola, the conversion script updates this parameter.<br/><br/>
-                        In the previous record
-                        <code>Buildings.Fluid.Movers.Data.SpeedControlled_Nrpm</code>,
-                        changed the parameter <code>N_nominal</code> to <code>speed_rpm_nominal</code>.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/396\">IBPSA issue 396</a>.
-                        For Dymola, the conversion script updates this parameter.
-     </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Fluid.BaseClasses.PartialThreeWayResistance<br/>
-                          Buildings.Fluid.Movers.BaseClasses.PartialFlowMachine<br/>
-                          Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                          Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                          Buildings.Fluid.Movers.FlowControlled_Nrpm<br/>
-                          Buildings.Fluid.Movers.FlowControlled_y<br/>
-                          Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                          Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
-                          Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage
-     </td>
-     <td valign=\"top\">Removed parameter <code>dynamicBalance</code> that overwrote the setting
-                        of <code>energyDynamics</code> and <code>massDynamics</code>.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/411\">
-                        IBPSA, issue 411</a>.
-                        For Dymola, the conversion script updates the models.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPort
-     </td>
-     <td valign=\"top\">Renamed the protected parameters
-                        <code>port_a_exposesState</code>, <code>port_b_exposesState</code> and
-                        <code>showDesignFlowDirection</code>.
-                        This is for
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/349\">IBPSA issue 349</a>
-                        and
-                        <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/351\">IBPSA issue 351</a>.
-                        For Dymola, the conversion script updates models
-                        that extend from <code>Buildings.Fluid.Interfaces.PartialTwoPort</code>.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPort
-     </td>
-     <td valign=\"top\">Renamed model to <code>Buildings.Fluid.Interfaces.PartialFourPort</code> and
-                        removed the parameters
-                        <code>h_outflow_a1_start</code>,
-                        <code>h_outflow_b1_start</code>,
-                        <code>h_outflow_a2_start</code> and
-                        <code>h_outflow_b2_start</code>
-                        to make the model similar to <code>Buildings.Fluid.Interfaces.PartialTwoPort</code>.
-                        See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/299\">IBPSA issue 299</a>
-                        for a discussion.
-                        For Dymola, the conversion script updates models
-                        that extend from <code>Buildings.Fluid.Interfaces.FourPort</code>.
-     </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
-       </td>
-       <td valign=\"top\">
-                        Revised implementation of conservation equations and
-                        added default values for outlet quantities at <code>port_a</code>
-                        if <code>allowFlowReversal=false</code>.
-                        This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/281\">IBPSA issue 281</a>.
-                        Also, revised implementation so that equations are always consistent
-                        and do not lead to division by zero,
-                        also when connecting a <code>prescribedHeatFlowRate</code>
-                        to <code>MixingVolume</code> instances.
-                        Renamed <code>use_safeDivision</code> to <code>prescribedHeatFlowRate</code>.
-                        See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/282\">IBPSA issue 282</a>
-                        for a discussion.
-                        For users who simply instantiate existing component models, this change is backward
-                        compatible.
-                        However, developers who implement component models that extend from
-                        <code>Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation</code> may need to update
-                        the parameter <code>use_safeDivision</code> and use instead <code>prescribedHeatFlowRate</code>.
-                        See the model documentation.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-       </td>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
-                          Buildings.ThermalZones.Detailed.CFD
-       </td>
-       <td valign=\"top\">These models can now be used with electrochromic windows.
-                          This required to change the glass properties
-                          <code>tauSol</code>, <code>rhoSol_a</code> and <code>rhoSol_b</code>
-                          to be arrays. For example, to convert an existing model, use
-                          <code>tauSol={0.6}</code> instead of <code>tauSol=0.6</code>.
-                          For Dymola, the conversion script will automatically
-                          update existing models.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Obsolete</b>
-       </td>
-   <tr><td valign=\"top\">Buildings.Obsolete.Fluid.Movers<br/>
-                          Buildings.Obsolete.Media
-       </td>
-       <td valign=\"top\">Removed these packages which have models from
-                          release 2.0.0.
-       </td>
-   </tr>
-   </table>
-   <!-- Errors that have been fixed -->
-   <p>
-   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-   that can lead to wrong simulation results):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid.Chillers</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
-       </td>
-       <td valign=\"top\">Corrected wrong computation of state of leaving fluid
-                          <code>staB1</code> and <code>staB2</code>
-                          for the configuration without flow reversal.
-                          The previous implementation mistakenly used the <code>inStream</code> operator.
-                          This is for
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/476\">
-                          issue 476</a>
-       </td>
-   </tr>
-   </table>
-   <!-- Uncritical errors -->
-   <p>
-   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-   units are wrong or errors in documentation):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Electrical</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Electrical.Interfaces.PartialWindTurbine
-       </td>
-       <td valign=\"top\">Reformulated test for equality of <code>Real</code> variables. This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.SingleLayer<br/>
-                          Buildings.HeatTransfer.Data.BaseClasses
-       </td>
-       <td valign=\"top\">Reformulated test for equality of <code>Real</code> variables. This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.FMI.FlowSplitter_u
-       </td>
-       <td valign=\"top\">Corrected wrong assert statement. This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/442\">issue 442</a>.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot
-       </td>
-       <td valign=\"top\">Corrected wrong assert statement for test on the efficiency function. This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/468\">issue 468</a>.
-       </td>
-   </tr>
-
-
-   <tr><td colspan=\"2\"><b>Buildings.Media</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Media.Specialized.Water.TemperatureDependentDensity
-       </td>
-       <td valign=\"top\">Removed dublicate entry of <code>smooth</code> and <code>smoothOrder</code>.
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/303\">IBPSA issue 303</a>.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.MixedAirHeatGain
-       </td>
-       <td valign=\"top\">Reformulated test for equality of <code>Real</code> variables. This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/493\">issue 493</a>.
-       </td>
-   </tr>
-
-
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.Math.Functions.BaseClasses.der_2_regNonZeroPower<br/>
-                          Buildings.Utilities.Math.Functions.BaseClasses.der_polynomial<br/>
-                          Buildings.Utilities.Math.Functions.BaseClasses.der_regNonZeroPower
-
-       </td>
-       <td valign=\"top\">Corrected wrong derivative implementation and improved their regression tests.
-                          This is for
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/303\">IBPSA issue 303</a>.
-
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Density_pTX
-       </td>
-       <td valign=\"top\">Corrected wrong default component name.
-       </td>
-   </tr>
-
-   <tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.saturationPressure
-       </td>
-       <td valign=\"top\">Changed <code>smoothOrder</code> from <i>5</i> to <i>1</i> as
-                         <code>Buildings.Utilities.Math.Functions.spliceFunction</code> is only once
-                         continuously differentiable.
-                         Inlined the function.
-       </td>
-   </tr>
-
-   <tr><td colspan=\"2\"><b>Buildings.Utilities.IO.Python27</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Utilities.IO.Python27.exchange
-       </td>
-       <td valign=\"top\">Updated Python implementation to allow compiling code
-                          on 64 bit Linux. Previously, on Linux a segmentation fault
-                          occurred during run-time if 64 bit code rather than
-                          32 bit code was generated. This is now corrected.<br/>
-                          Also, Windows 64 bit binaries have been added.<br/>
-                          This closes
-                          <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/287\">issue 287</a>.
-       </td>
-   </tr>
-
-   </table>
-   </html>"));
-   end Version_3_0_0;
-
-   class Version_2_1_0 "Version 2.1.0"
-     extends Modelica.Icons.ReleaseNotes;
-       annotation (Documentation(info="<html>
-   <p>
-   Version 2.1.0 is fully compatible with version 2.0.0.
-   It adds the package <code>Buildings.Fluid.FMI</code> that provides containers
-   for exporting thermofluid flow components as FMUs.
-   It also updates the temperature sensor to optionally simulate heat losses,
-   and it contains bug fixes for the trace substance sensor if used without flow reversal.
-   Improvements have been made to various models to reduce the simulation time, and
-   to <code>Buildings.Examples.Tutorial.Boiler</code> to simplify the control implementation.
-   </p>
-   <!-- New libraries -->
-   <p>
-   The following <b style=\"color:blue\">new libraries</b> have been added:
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-   <tr><td valign=\"top\">Buildings.Fluid.FMI
-       </td>
-       <td valign=\"top\">This package contains blocks that serve as containers for exporting
-                          models from <code>Buildings.Fluid</code> as a Functional Mockup Unit (FMU).<br/>
-                          This allows using models from <code>Buildings.Fluid</code>, add them
-                          to a block that only has input and output signals, but no acausal connectors,
-                          and then export the model as a Functional Mockup Unit.
-                          Models can be individual models or systems that are composed of various
-                          models.
-                          For more information, see the
-                          <a href=\"modelica://Buildings.Fluid.FMI.UsersGuide\">User's Guide</a>.
-       </td>
-       </tr>
-   </table>
-   <!-- New components for existing libraries -->
-
-   <!-- Backward compatible changes -->
-   <p>
-   The following <b style=\"color:blue\">existing components</b>
-   have been <b style=\"color:blue\">improved</b> in a
-   <b style=\"color:blue\">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.Examples</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Examples.Tutorial.Boiler.System5<br/>
-                        Buildings.Examples.Tutorial.Boiler.System6<br/>
-                        Buildings.Examples.Tutorial.Boiler.System7
-       </td>
-       <td valign=\"top\">Changed control input for <code>conPIDBoi</code> and set
-                        <code>reverseAction=true</code>
-                        to address issue
-                        <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/436\">#436</a>.
-       </td>
-   </tr>
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Chillers.Carnot<br/>
-                          Buildings.Fluid.DXSystems.Cooling.BaseClasses.PartialDXCoil<br/>
-                          Buildings.Fluid.HeatExchangers.HeaterCooler_u<br/>
-                          Buildings.Fluid.MassExchangers.Humidifier_u
-       </td>
-       <td valign=\"top\">Set parameter <code>prescribedHeatFlowRate=true</code>
-                          which causes a simpler energy balance to be used.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPort
-       </td>
-       <td valign=\"top\">Added option to simulate thermal loss, which is
-                        useful if the sensor is used to measure
-                        the fluid temperature in a system with on/off control
-                        for the mass flow rate.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
-                          Buildings.Fluid.SolarCollectors.EN12975
-       </td>
-       <td valign=\"top\">Corrected sign error in computation of heat loss
-                          that prevents the medium to exceed <code>Medium.T_min</code>
-                          or <code>Medium.T_max</code>. With the previous implementation,
-                          an assertion may be generated unnecessarily rather than
-                          the model guiding against the violation of these bounds.
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume
-
-
-       </td>
-       <td valign=\"top\">Added test on <code>allowFlowReversal</code> in criteria
-                          about what energy balance implementation to use.
-                          This causes simpler models, for example when exporting
-                          <code>Buildings.Fluid.HeatExchangers.HeaterCooler_u</code>
-                          as an FMU.
-       </td>
-   </tr>
-   </table>
-   <!-- Non-backward compatible changes to existing components -->
-
-   <!-- Errors that have been fixed -->
-   <p>
-   The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-   that can lead to wrong simulation results):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Sensors.TraceSubstanceTwoPort
-       </td>
-       <td valign=\"top\">Corrected wrong sensor signal if <code>allowFlowReversal=false</code>.
-                          For this setting, the sensor output was for the wrong flow direction.
-                          This corrects
-                          <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/249\">issue 249</a>.
-       </td>
-   </tr>
-   </table>
-   <!-- Uncritical errors -->
-   <p>
-   The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-   that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-   units are wrong or errors in documentation):
-   </p>
-   <table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-   <tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-       </td>
-   </tr>
-   <tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                          Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
-       </td>
-       <td valign=\"top\">Corrected documentation.
-       </td>
-   </tr>
-   </table>
-   </html>"));
-   end Version_2_1_0;
-
-    class Version_2_0_0 "Version 2.0.0"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-<p>
-Version 2.0.0 is a major release that contains various new packages, models
-and improvements.
-</p>
-<p>
-The following major additions have been done in version 2.0:
-</p>
-<ul>
-<li>
-A CFD model
-that is embedded in a thermal zone has been added.
-This model is implemented in <code>Buildings.ThermalZones.Detailed.CFD</code>.
-The CFD model is an implementation of the Fast Fluid Dynamics code
-that allows three-dimensional CFD inside a thermal zone,
-coupled to building heat transfer, HVAC components and feedback control loops.
-</li>
-<li>
-A new package <code>Buildings.Electrical</code> has been added.
-This package allows studying
-buildings to electrical grid integration. It includes models for loads, transformers,
-cables, batteries, PV and wind turbines.
-Models exist for DC and AC systems with two- or three-phase that can be balanced and unbalanced.
-The models compute voltage, current, active and reactive power
-based on the quasi-stationary assumption or using the dynamic phasorial representation.
-</li>
-<li>
-The new package <code>Buildings.Controls.DemandResponse</code>
-contains models for demand response simulation.
-</li>
-<li>
-The new package
-<code>Buildings.Controls.Predictors</code>
-contains a data-driven model that predicts the electrical load
-of a building. The prediction can be done
-either using an average baseline or
-a linear regression with respect to outside temperature.
-For both, optionally a day-of adjustment can be made.
-</li>
-</ul>
-<p>
-The tables below give more detailed information to the revisions
-of this library compared to the previous release 1.6 build 1.
-</p>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Electrical
-    </td>
-    <td valign=\"top\">Library for electrical grid simulation that
-                       allows to study building to electrical grid integration.
-                       The library contains models of loads, generation and transmission
-                       for DC and AC systems.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Controls.DemandResponse
-    </td>
-    <td valign=\"top\">Library with a model for demand response prediction.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Controls.Predictors
-    </td>
-    <td valign=\"top\">Library with a data-driven model that predicts the electrical load
-                     of a building. The prediction can be done
-                     either using an average baseline or
-                     a linear regression with respect to outside temperature.
-                     For both, optionally a day-of adjustment can be made.
-    </td>
-    </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayPressureIndependent
-    </td>
-    <td valign=\"top\">Model of a pressure-independent two way valve.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCooler_T
-    </td>
-    <td valign=\"top\">Model of a heater or cooler that takes as an input
-                       the set point for the temperature of the fluid that leaves
-                       the component. The set point is tracked exactly
-                       if the component has sufficient capacity.
-                       Optionally, the component can be configured to compute
-                       a dynamic rather than a steady-state response.
-    </td>
-    </tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Phi_pTX<br/>
-                       Buildings.Utilities.Psychrometrics.Functions.phi_pTX
-    </td>
-    <td valign=\"top\">Block and function that computes the relative humidity
-                       for given pressure, temperature and water vapor mass fraction.
-    </td>
-    </tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.CFD
-    </td>
-    <td valign=\"top\">Room model that computes the room air flow
-                       using computational fluid dynamics (CFD).
-                       The CFD simulation is coupled to the thermal simulation of the room
-                       and, through the fluid port, to the air conditioning system.
-                       Currently, the supported CFD program is the
-                       Fast Fluid Dynamics (FFD) program.
-                       See <code>Buildings.ThermalZones.Detailed.UsersGuide.CFD</code>
-                       for detailed explanations.
-    </td>
-    </tr>
-
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">Added option to obtain the black body sky temperature
-                       from a parameter or an input signal rather than
-                       computing it in the weather data reader.<br/><br/>
-                       Removed redundant connection
-                       <code>connect(conHorRad.HOut, cheHorRad.HIn);</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Chillers.ElectricEIR<br/>
-                       Buildings.Chillers.ElectricReformulatedEIR
-    </td>
-    <td valign=\"top\">Changed implementation so that the model
-                       is continuously differentiable.
-                       This is for issue
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/373\">373</a>.
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow
-    </td>
-    <td valign=\"top\">Changed assignment of <code>T_m</code> to avoid using the conditionally
-                       enabled model <code>ele[:].mas.T</code>, which is only
-                       valid in a connect statement.
-                       Moved assignments of
-                       <code>Q1_flow</code>, <code>Q2_flow</code>, <code>T1</code>,
-                       <code>T2</code> and <code>T_m</code> outside of equation section
-                       to avoid mixing graphical and textual modeling within the same model.
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized
-    </td>
-    <td valign=\"top\">Removed parameter <code>m1_flow_nominal</code>, as this parameter is already
-                    declared in its base class
-                    <code>Buildings.Fluid.Interfaces.PartialFourPortInterface</code>.
-                    This change avoids an error in OpenModelica as the two declarations
-                    had a different value for the <code>min</code> attribute, which is not valid
-                    in Modelica.
-    </td>
-    </tr>
-    <tr>
-    <td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister<br/>
-                       Buildings.Fluid.HeatExchangers.BaseClasses.DuctManifoldDistributor
-    </td>
-    <td valign=\"top\">Reformulated the multiple iterators in the <code>sum</code> function
-                       as this language construct is not supported in OpenModelica.
-    </td>
-    </tr>
-
-    <tr>
-    <td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
-    </td>
-    <td valign=\"top\">Set start value for <code>hPip(fluid(T))</code> to avoid
-                       a warning about conflicting start values.
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                       Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                       Buildings.Fluid.Movers.FlowControlled_m_flow
-
-    </td>
-    <td valign=\"top\">For the parameter setting <code>use_powerCharacteristic=true</code>,
-                     changed the computation of the power consumption at
-                     reduced speed to properly account for the
-                     affinity laws. This is in response to
-                     <a href=\"https://github.com/lbl-srg/modelica-buildings/pull/202\">#202</a>.
-    </td>
-</tr>
-
-    <tr>
-    <td valign=\"top\">Buildings.Fluid.SolarCollectors.ASHRAE93<br/>
-                       Buildings.Fluid.SolarCollectors.EN12975
-    </td>
-    <td valign=\"top\">Reformulated the model to avoid a translation error
-                       if glycol is used.<br/>
-                       Propagated parameters for initialization in base class
-                       <code>Buildings.Fluid.SolarCollectors.BaseClasses.PartialSolarCollector</code>
-                       and set <code>prescribedHeatFlowRate=true</code>.
-    </td>
-    </tr>
-
-    <tr>
-    <td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-    </td>
-    <td valign=\"top\">Replaced the <code>abs()</code> function in the assignment of the parameter
-                       <code>nSegHexTan</code> as the return value of <code>abs()</code>
-                       is a <code>Real</code> which causes a type error during model check.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.MultiLayer
-    </td>
-    <td valign=\"top\">Changed the assignment of <code>_T_a_start</code>,
-                       <code>_T_b_start</code> and <code>RTot</code> to be
-                       in the initial equation section as opposed to
-                       the parameter declaration.
-                       This is needed to avoid an error during model check
-                       and translation in Dymola 2015 FD01 beta1.
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.InteriorHeatTransferConvective
-    </td>
-    <td valign=\"top\">Changed model to allow a temperature dependent convective heat transfer
-                       on the room side.
-                       This is for issue
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/52\">52</a>.
-    </td>
-    </tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleIdealGasMedium<br/>
-                       Buildings.Media.Interfaces.PartialSimpleMedium
-    </td>
-    <td valign=\"top\">Set <code>T(start=T_default)</code> and
-                       <code>p(start=p_default)</code> in the
-                       <code>ThermodynamicState</code> record. Setting the start value for
-                       <code>T</code> is required to avoid an error due to
-                       conflicting start values when translating
-                       <code>Buildings.Examples.VAVReheat.ClosedLoop</code> in pedantic mode.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-    </td>
-    <td valign=\"top\">Changed model to allow a temperature dependent convective heat transfer
-                       on the room side for windows.
-                       This is for issue
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/52\">52</a>.
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Rooms.BaseClasses.ExteriorBoundaryConditionsWithWindow
-    </td>
-    <td valign=\"top\">Conditionally removed the shade model if no shade is present.
-                       This corrects
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/234\">#234</a>.
-    </td>
-</tr>
-
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Airflow</b>
-   </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.ZonalFlow_ACS<br/>
-                       Buildings.Airflow.Multizone.ZonalFlow_m_flow
-   </td>
-   <td valign=\"top\">Removed parameter <code>forceErrorControlOnFlow</code> as it was not used.
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-   </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-   </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-   </td>
-   <td valign=\"top\">Changed the following signals for compatibility with OpenModelica:<br/>
-                      <code>weaBus.sol.zen</code> to <code>weaBus.solZen</code>.<br/>
-                      <code>weaBus.sol.dec</code> to <code>weaBus.solDec</code>.<br/>
-                      <code>weaBus.sol.alt</code> to <code>weaBus.solAlt</code>.<br/>
-                      <code>weaBus.sol.solHouAng</code> to <code>weaBus.solHouAng</code>.<br/>
-                      For Dymola, the conversion script will automatically
-                      update existing models.
-   </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-   </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.IntegerSum
-   </td>
-   <td valign=\"top\">Removed block as it is not used in any model.
-                      Models that require an integer sum can use
-                      <code>Modelica.Blocks.MathInteger.Sum</code>.
-   </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.VAVReheat.Controls.UnoccupiedOn
-   </td>
-   <td valign=\"top\">Removed block as it is not used in any model.
-   </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.HeatTransfer.Data.GlazingSystems.Generic
-    </td>
-    <td valign=\"top\">Removed parameter <code>nLay</code> as OpenModelica
-                       could not assign it during translation.
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.BaseClasses.der_temperature_u
-    </td>
-    <td valign=\"top\">Changed the input argument for this function from type
-                       <code>Buildings.HeatTransfer.Data.BaseClasses.Material</code>
-                       to the elements of this type as OpenModelica fails to translate the
-                       model if the input to this function is a record.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Types.Azimuth<br/>
-                       Buildings.HeatTransfer.Types.Tilt
-    </td>
-    <td valign=\"top\">Moved these types from <code>Buildings.HeatTransfer</code>
-                       to the top-level package <code>Buildings</code> because
-                       they are used in <code>Buildings.BoundaryConditions</code>,
-                       <code>Buildings.HeatTransfer</code> and <code>Buildings.ThermalZones.Detailed</code>.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-    </td>
-</tr>
-
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-    </tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.Pipe<br/>
-                       Buildings.Fluid.FixedResistances.BaseClasses.Pipe<br/>
-                       Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab
-    </td>
-    <td valign=\"top\">Renamed pressure drop from <code>res</code> to
-                       <code>preDro</code> to use the same name as in other models.
-                       This corrects
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/271\">#271</a>.
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
-                       Buildings.Fluid.HeatExchangers.WetCoilDiscretized
-    </td>
-    <td valign=\"top\">Reformulated flow splitter in the model to reduce
-                       the dimension of the coupled linear or nonlinear
-                       system of equations. With this revision, the optional
-                       control volume in the duct inlet has been removed
-                       as it is no longer needed. Therefore, the parameter
-                       <code>dl</code> has also been removed.
-                       Replaced the parameters <code>energyDynamics1</code>
-                       and  <code>energyDynamics2</code> with
-                       <code>energyDynamics</code>.
-                       Removed the parameter <code>ductConnectionDynamics</code>.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed
-    </td>
-    <td valign=\"top\">Renamed the model to <code>HeaterCooler_u</code> due to
-                       the introduction of the new model <code>HeaterCooler_T</code>.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
-                       Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab
-    </td>
-    <td valign=\"top\">Changed the models to use by default an <i>&epsilon;-NTU</i>
-                       approach for the heat transfer between the fluid and the slab
-                       rather than a finite difference scheme along the
-                       flow path.
-                       Optionally, the finite difference scheme can also be used
-                       as this is needed for some control design applications.<br/>
-                       The new <i>&epsilon;-NTU</i> formulation has shown to lead to
-                       about five times faster
-                       computation on several test cases including the models in
-                       <code>Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples</code>.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
- </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.DuctManifoldFixedResistance
-    </td>
-    <td valign=\"top\">Reformulated flow splitter in the model to reduce
-                       the dimension of the coupled linear or nonlinear
-                       system of equations. With this revision, the optional
-                       control volume in the duct inlet has been removed
-                       as it is no longer needed. Therefore, the parameters
-                       <code>dl</code> and <code>energyDynamics</code> have
-                       also been removed.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-    </td>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.CoilRegister
-    </td>
-    <td valign=\"top\">Replaced the parameters <code>energyDynamics1</code>
-                       and <code>energyDynamics2</code> with
-                       the new parameter <code>energyDynamics</code>.
-                       Removed the parameters <code>steadyState_1</code>
-                       and <code>steadyState_2</code> as this information
-                       is already contained in <code>energyDynamics</code>.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed
-    </td>
-    <td valign=\"top\">Renamed the model to <code>Humidifier_u</code> due to
-                       the introduction of the new model <code>HeaterCooler_T</code>
-                       and to use the same naming pattern as <code>HeaterCooler_u</code>.<br/>
-                       For Dymola, the conversion script will automatically
-                       update existing models.
-
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.Fluid.Movers
-    </td>
-    <td valign=\"top\">This package has been redesigned.
-                       The models have been renamed as follows:<br/>
-                       <code>Buildings.Fluid.Movers.FlowMachine_dp</code>
-                       is now called
-                       <code>Buildings.Fluid.Movers.FlowControlled_dp</code>.<br/>
-                       <code>Buildings.Fluid.Movers.FlowMachine_m_flow</code>
-                       is now called
-                       <code>Buildings.Fluid.Movers.FlowControlled_m_flow</code>.<br/>
-                       <code>Buildings.Fluid.Movers.FlowMachine_Nrpm</code>
-                       is now called
-                       <code>Buildings.Fluid.Movers.SpeedControlled_Nrpm</code>.<br/>
-                       <code>Buildings.Fluid.Movers.FlowMachine_y</code>
-                       is now called
-                       <code>Buildings.Fluid.Movers.SpeedControlled_y</code>.<br/><br/>
-                       In addition, the performance
-                       data of all movers are now stored in a record.
-                       These records are in
-                       <code>Buildings.Fluid.Movers.Data</code>.
-                       For most existing instances, it should be sufficient to enclose
-                       the existing performance data in a record called <code>per</code>.
-                       For example,
-                       <code><br/>
-                       Buildings.Fluid.Movers.FlowMachine_y fan(<br/>
-                       &nbsp;redeclare package Medium = Medium,<br/>
-                       &nbsp;pressure(<br/>
-                       &nbsp;&nbsp;V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,<br/>
-                       &nbsp;&nbsp;dp={2*dp_nominal,dp_nominal,0})));<br/>
-                       </code>
-                       becomes
-                       <code><br/>
-                       Buildings.Fluid.Movers.SpeedControlled_y fan(<br/>
-                       &nbsp;redeclare package Medium = Medium,<br/>
-                       &nbsp;per(<br/>
-                       &nbsp;&nbsp;pressure(<br/>
-                       &nbsp;&nbsp;&nbsp;V_flow={0,m_flow_nominal,2*m_flow_nominal}/1.2,<br/>
-                       &nbsp;&nbsp;&nbsp;dp={2*dp_nominal,dp_nominal,0})));<br/>
-                       </code>
-                       <br/>
-                       See the <code>Buildings.Fluid.Movers.UsersGuide</code> for more
-                       information about these records.
-                       <br/><br/>
-                       For Dymola, the conversion script will
-                       update existing models to use the old implementations
-                       which are now in the package <code>Buildings.Obsolete.Fluid.Movers</code>.
-    </td>
-</tr>
-
-
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media
-    </td>
-<td>
-                       Renamed all media to simplify the media selection.
-                       For typical building energy simulation,
-                       <code>Buildings.Media.Air</code> and <code>Buildings.Media.Water</code>
-                       should be used.<br/><br/>
-                       The following changes were made.<br/><br/>
-                       Renamed <code>Buildings.Media.GasesPTDecoupled.MoistAirUnsaturated</code><br/>
-                       to <code>Buildings.Media.Air</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.ConstantPropertyLiquidWater</code><br/>
-                       to <code>Buildings.Media.Water</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.PerfectGases.MoistAir</code><br/>
-                       to <code>Buildings.Obsolete.Media.PerfectGases.MoistAir</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.GasesConstantDensity.MoistAirUnsaturated</code><br/>
-                       to <code>Buildings.Obsolete.Media.GasesConstantDensity.MoistAirUnsaturated</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.GasesConstantDensity.MoistAir</code><br/>
-                       to <code>Buildings.Obsolete.Media.GasesConstantDensity.MoistAir</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.GasesConstantDensity.SimpleAir</code><br/>
-                       to <code>Buildings.Obsolete.Media.GasesConstantDensity.SimpleAir</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.IdealGases.SimpleAir</code><br/>
-                       to <code>Buildings.Obsolete.Media.IdealGases.SimpleAir</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.GasesPTDecoupled.MoistAir</code><br/>
-                       to <code>Buildings.Obsolete.Media.GasesPTDecoupled.MoistAir</code>.<br/><br/>
-                       Renamed <code>Buildings.Media.GasesPTDecoupled.SimpleAir</code><br/>
-                       to <code>Buildings.Obsolete.Media.GasesPTDecoupled.SimpleAir</code>.<br/><br/>
-                       For Dymola, the conversion script will
-                       update existing models according to the above list.
-
-</td>
-</tr>
-
-
-<tr><td valign=\"top\">Buildings.Media.Water
-    </td>
-    <td valign=\"top\">Removed option to model water as a compressible medium as
-                       this option was not useful.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.ParameterConstructionWithWindow
-    </td>
-    <td valign=\"top\">Removed the keyword <code>replaceable</code> for the parameters
-                       <code>ove</code> and <code>sidFin</code>.<br/>
-                       Models that instantiate <code>Buildings.ThermalZones.Detailed.MixedAir</code> are
-                       not affected by this change.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
-    </td>
-    <td valign=\"top\">Moved the package to <code>Buildings.ThermalZones.Detailed.Validation.BESTEST</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.SimulationTime
-    </td>
-    <td valign=\"top\">Moved the block <code>Buildings.Utilities.SimulationTime</code>
-                       to <code>Buildings.Utilities.Time.ModelTime</code>.<br/>
-                       For Dymola, the conversion script will
-                       update existing models according to the above list.
-    </td>
-</tr>
-
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">Corrected error that led the total and opaque sky cover to be ten times
-                       too low if its value was obtained from the parameter or the input connector.
-                       For the standard configuration in which the sky cover is obtained from
-                       the weather data file, the model was correct. This error only affected
-                       the other two possible configurations.
-    </td>
-</tr><tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Data.Pipes
-    </td>
-    <td valign=\"top\">Corrected wrong entries for inner and outer diameter
-                       of PEX pipes.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.BaseClasses.singleUTubeResistances
-    </td>
-    <td valign=\"top\">Corrected error in function that used <code>beta</code>
-                       before it was assigned a value.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
-                       Buildings.Fluid.Storage.StratifiedEnhanced<br/>
-                       Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-    </td>
-    <td valign=\"top\">Replaced the use of <code>Medium.lambda_const</code> with
-                       <code>Medium.thermalConductivity(sta_default)</code> as
-                       <code>lambda_const</code> is not declared for all media.
-                       This avoids a translation error if certain media are used.
-    </td>
-</tr><tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-    </td>
-    <td valign=\"top\">Corrected issue
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/271\">#271</a>
-                       which led to a compilation error if the heat exchanger
-                       and the tank had different media.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
-    </td>
-    <td valign=\"top\">Corrected issue
-                       <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/304\">#304</a>
-                       that led to an error in the glass temperatures if the glass conductance
-                       is very small.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-    </td>
-    <td valign=\"top\">Added propagation of the parameter value <code>linearizeRadiation</code>
-                       to the window model. Prior to this change, the radiation
-                       was never linearized for computing the glass long-wave radiation.
-    </td>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples.X3WithRadiantFloor<br/>
-                            Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples.X3AWithRadiantFloor<br/>
-                            Buildings.ThermalZones.Detailed.FLEXLAB.Rooms.Examples.X3BWithRadiantFloor
-    </td>
-    <td valign=\"top\">Corrected wrong entries for inner and outer diameter
-                       of PEX pipes.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.FixedResistanceDpM
-    </td>
-    <td valign=\"top\">Corrected error in documentation of computation of <code>k</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
-    </td>
-    <td valign=\"top\">Changed type of <code>tauIR</code> from
-                       <code>Modelica.Units.SI.Emissivity</code> to
-                       <code>Modelica.Units.SI.TransmissionCoefficient</code>.
-                       This avoids a type error in OpenModelica.
-    </td>
-</tr>
-
-</table>
-
-<p>
-<b>Note:</b>
-</p>
-<p>
-With version 2.0, we start using semantic versioning as described at <a href=\"http://semver.org/\">http://semver.org/</a>.
-</p>
-</html>"));
-    end Version_2_0_0;
-
-    class Version_1_6_build1 "Version 1.6 build 1"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (Documentation(info="<html>
-<p>
-Version 1.6 build 1 updates the <code>Buildings</code> library to the
-Modelica Standard Library 3.2.1 and to <code>Modelica_StateGraph2</code> 2.0.2.
-</p>
-<p>
-This is the first version of the <code>Buildings</code> library
-that contains models from the
-<a href=\"https://github.com/ibpsa/modelica\">
-IEA EBC Annex 60 library</a>,
-a Modelica library for building and community energy systems that is
-collaboratively developed within the project
-<a href=\"http://www.iea-annex60.org\">
-\"New generation computational tools for building and community energy systems
-based on the Modelica and Functional Mockup Interface standards\"</a>,
-a project that is conducted under the
-Energy in Buildings and Communities Programme (EBC) of the
-International Energy Agency (IEA).
-</p>
-<!-- New libraries -->
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.TwoWayTable
-    </td>
-    <td valign=\"top\">Two way valve for which the opening characteristics
-                       is specified by a table.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Examples.Average
-                       Buildings.Utilities.Math.Examples.InverseXRegularized
-                       Buildings.Utilities.Math.Examples.Polynominal
-                       Buildings.Utilities.Math.Examples.PowerLinearized
-                       Buildings.Utilities.Math.Examples.QuadraticLinear
-                       Buildings.Utilities.Math.Examples.RegNonZeroPower
-                       Buildings.Utilities.Math.Examples.SmoothExponential
-                       Buildings.Utilities.Math.Functions.average
-                       Buildings.Utilities.Math.Functions.booleanReplicator
-                       Buildings.Utilities.Math.Functions.Examples.IsMonotonic
-                       Buildings.Utilities.Math.Functions.Examples.TrapezoidalIntegration
-                       Buildings.Utilities.Math.Functions.integerReplicator
-                       Buildings.Utilities.Math.InverseXRegularized
-                       Buildings.Utilities.Math.Polynominal
-                       Buildings.Utilities.Math.PowerLinearized
-                       Buildings.Utilities.Math.QuadraticLinear
-                       Buildings.Utilities.Math.RegNonZeroPower
-                       Buildings.Utilities.Math.SmoothExponential
-                       Buildings.Utilities.Math.TrapezoidalIntegration
-    </td>
-    <td valign=\"top\">Various functions and blocks for mathematical operations.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Examples.SaturationPressureLiquid
-                       Buildings.Utilities.Psychrometrics.Examples.SaturationPressure
-                       Buildings.Utilities.Psychrometrics.Examples.SublimationPressureIce
-                       Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_saturationPressureLiquid
-                       Buildings.Utilities.Psychrometrics.Functions.BaseClasses.der_sublimationPressureIce
-                       Buildings.Utilities.Psychrometrics.Functions.BaseClasses.Examples.SaturationPressureDerivativeCheck
-                       Buildings.Utilities.Psychrometrics.Functions.Examples.SaturationPressure
-                       Buildings.Utilities.Psychrometrics.Functions.saturationPressureLiquid
-                       Buildings.Utilities.Psychrometrics.Functions.saturationPressure
-                       Buildings.Utilities.Psychrometrics.Functions.sublimationPressureIce
-                       Buildings.Utilities.Psychrometrics.SaturationPressureLiquid
-                       Buildings.Utilities.Psychrometrics.SaturationPressure
-                       Buildings.Utilities.Psychrometrics.SublimationPressureIce
-    </td>
-    <td valign=\"top\">Various functions and blocks for psychrometric calculations.
-    </td>
-    </tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortInterface<br/>
-                       Buildings.Fluid.Interfaces.PartialFourPortInterface
-    </td>
-    <td valign=\"top\">Removed call to homotopy function
-                       in the computation of the connector variables as
-                       these are conditionally enabled variables and
-                       therefore must not be used in any equation. They
-                       are only for output reporting.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential
-    </td>
-    <td valign=\"top\">Improved documentation of the flow resistance.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
-    </td>
-    <td valign=\"top\">Added the option to use a constant, an input signal or the weather file as the source
-                       for the ceiling height, the total sky cover, the opaque sky cover, the dew point temperature,
-                       and the infrared horizontal radiation <code>HInfHor</code>.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowMachinePolynomial
-    </td>
-    <td valign=\"top\">Moved the model to the package
-                       <code>Buildings.Obsolete</code>,
-                       as this model is planned to be removed in future versions.
-                       The conversion script should update old instances of
-                       this model automatically in Dymola.
-                       Users should change their models to use a flow machine from
-                       the package <code>Buildings.Fluid.Movers</code>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.ExpansionVessel
-    </td>
-    <td valign=\"top\">Simplified the model to have a constant pressure.
-                       The following non-backward compatible changes
-                       have been made.
-                       <ol>
-                       <li>The parameter <code>VTot</code> was renamed to <code>V_start</code>.</li>
-                       <li>The following parameters were removed: <code>VGas0</code>,
-                           <code>pMax</code>, <code>energyDynamics</code> and <code>massDynamics</code>.</li>
-                       </ol>
-                       The conversion script should update old instances of
-                       this model automatically in Dymola.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-    </td>
-    <td valign=\"top\">Revised the model as the old version required the port<sub>a</sub>
-                       of the heat exchanger to be located higher than port<sub>b</sub>.
-                       This makes sense if the heat exchanger is used to heat up the tank,
-                       but not if it is used to cool down a tank, such as in a cooling plant.
-                       The following parameters were changed:
-                       <ol>
-                         <li>Changed <code>hexTopHeight</code> to <code>hHex_a</code>.</li>
-                         <li>Changed <code>hexBotHeight</code> to <code>hHex_b</code>.</li>
-                         <li>Changed <code>topHexSeg</code> to <code>segHex_a</code>,
-                          and made it protected as this is deduced from <code>hHex_a</code>.</li>
-                         <li>Changed <code>botHexSeg</code> to <code>segHex_b</code>,
-                          and made it protected as this is deduced from <code>hHex_b</code>.</li>
-                       </ol>
-                       The names of the following ports have been changed:
-                       <ol>
-                         <li>Changed <code>port_a1</code> to <code>portHex_a</code>.</li>
-                         <li>Changed <code>port_b1</code> to <code>portHex_b</code>.</li>
-                       </ol>
-                       The conversion script should update old instances of
-                       this model automatically in Dymola for all of the above changes.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.UTube
-    </td>
-    <td valign=\"top\">Reimplemented the resistor network inside the borehole
-                       as the old implementation led to too slow a transient
-                       response. This change also led to the removal of the
-                       parameters <code>B0</code> and <code>B1</code>
-                       as the new implementation does not require them.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes.BaseClasses.HexInternalElement
-    </td>
-    <td valign=\"top\">Corrected error in documentation which stated a wrong default value
-                       for the pipe spacing.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.ntu_epsilonZ()
-    </td>
-    <td valign=\"top\">Added dummy argument to function call of <code>Internal.solve</code>
-                       to avoid a warning during model check in Dymola 2015.
-    </td>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryEffectivenessNTU
-    </td>
-    <td valign=\"top\">Changed <code>assert</code> statement to avoid comparing
-                       enumeration with an integer, which triggers a warning
-                       in Dymola 2015.
-    </td>
-
-    </tr>    <tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWall<br/>
-                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallWithWindow<br/>
-                           Buildings.ThermalZones.Detailed.Constructions.Examples.ExteriorWallTwoWindows
-    </td>
-    <td valign=\"top\">Corrected wrong assignment of parameter in instance <code>bouConExt(conMod=...)</code>
-                       which was set to an interior instead of an exterior convection model.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.TDewPoi_pW()
-    </td>
-    <td valign=\"top\">Added dummy argument to function call of <code>Internal.solve</code>
-                       to avoid a warning during model check in Dymola 2015.
-    </td>
-</table>
-<!-- Github issues -->
-<p>
-The followings
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table border=\"1\" summary=\"github issues\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/196\">#196</a>
-    </td>
-    <td valign=\"top\">Change capacity location in borehole grout.
-    </td>
-</tr>
-</table>
-</html>"));
-    end Version_1_6_build1;
-
-    class Version_1_5_build3 "Version 1.5 build 3"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (preferredView="info",
-        Documentation(info="<html>
-<p>
-Version 1.5 build 3 is a maintenance release that corrects an error in
-<code>Buildings.Fluid.MassExchangers.HumidifierPrescribed</code>.
-It is fully compatible with version 1.5 build 2.
-</p>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed
-    </td>
-    <td valign=\"top\">
-           Corrected the enthalpy balance, which caused the latent heat flow rate to be added
-           twice to the fluid stream.
-           This closes issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/197\">#197</a>.
-    </td>
-</tr>
-</table>
-<!-- Github issues -->
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>HumidifierPrescribed accounts twice for latent heat gain</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/197\">#197</a>
-    </td>
-    <td valign=\"top\">This issue has been addressed by correcting the latent heat added to the
-                       fluid stream.
-    </td>
-</tr>
-</table>
-</html>"));
-    end Version_1_5_build3;
-
-    class Version_1_5_build2 "Version 1.5 build 2"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (preferredView="info",
-        Documentation(info="<html>
-<p>
-Version 1.5 build 2 is a maintenance release that corrects an error in
-<code>Buildings.Fluid.HeatExchangers.DryCoilDiscretized</code> and in
-<code>Buildings.Fluid.HeatExchangers.WetCoilDiscretized</code>.
-It is fully compatible with version 1.5 build 1.
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
-                       Buildings.Fluid.HeatExchangers.WetCoilDiscretized
-    </td>
-    <td valign=\"top\">
-           Corrected wrong connect statements that caused the last register to have
-           no liquid flow.
-           This closes issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/194\">#194</a>.
-    </td>
-</tr>
-</table>
-<!-- Github issues -->
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>DryCoilDiscretized model not using last register, liquid flow path</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/194\">#194</a>
-    </td>
-    <td valign=\"top\">This issue has been addressed by correcting the connect statements.
-    </td>
-</tr>
-</table>
-</html>"));
-    end Version_1_5_build2;
-
-    class Version_1_5_build1 "Version 1.5 build 1"
-      extends Modelica.Icons.ReleaseNotes;
-        annotation (preferredView="info",
-        Documentation(info="<html>
-<p>
-Version 1.5 build 1 is a major release that contains new packages with models for
-solar collectors and for the Facility for Low Energy Experiments (FLEXLAB)
-at the Lawrence Berkeley National Laboratory.
-</p>
-<p>
-This release also contains a major revision of all info sections to correct invalid html syntax.
-The package <code>Buildings.HeatTransfer.Radiosity</code> has been revised to comply
-with the Modelica language specification.
-The package <code>Buildings.ThermalZones.Detailed</code> has been revised to aid implementation of
-non-uniformly mixed room air models.
-This release also contains various corrections that avoid warnings during translation
-when used with Modelica 3.2.1.
-Various models have been revised to increase compatibility with OpenModelica.
-However, currently only a subset of the models work with OpenModelica.
-</p>
-<!-- New libraries -->
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Fluid.SolarCollectors
-    </td>
-    <td valign=\"top\">Library with solar collectors.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.FLEXLAB
-    </td>
-    <td valign=\"top\">Package with models for test cells of LBNL's FLEXLAB
-                       (Facility for Low Energy Experiments in Buildings).
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Utilities.IO.FLEXLAB
-    </td>
-    <td valign=\"top\">Package that demonstrates two-way data exchange
-                       between Modelica and LBNL's FLEXLAB (Facility for
-                       Low Energy Experiments in Buildings).
-    </td>
-    </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.StratifiedEnhancedInternalHex
-    </td>
-    <td valign=\"top\">Added a model of a tank with built-in heat exchanger.
-                       This model may be used together with solar thermal plants.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.Resources</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Resources.Include
-    </td>
-    <td valign=\"top\">Added an <code>Include</code> folder and the <code>bcvtb.h</code>
-    header file to it to fix compilation errors in BCVTB example files.
-    </td>
-    </tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
-                       Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
-    </td>
-    <td valign=\"top\">Improved the algorithm that determines the absolute path of the file.
-                       Now weather files are searched in the path specified, and if not found, the urls
-                       <code>file://</code>, <code>modelica://</code> and <code>modelica://Buildings</code>
-                       are added in this order to search for the weather file.
-                       This allows using the data reader without having to specify an absolute path,
-                       as long as the <code>Buildings</code> library
-                       is on the <code>MODELICAPATH</code>.
-    </td>
-</tr>
-
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation
-    </td>
-    <td valign=\"top\">Reformulated computation of outlet properties to avoid an event at zero mass flow rate.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc
-    </td>
-    <td valign=\"top\">Simplified the implementation for the situation if
-                       <code>allowReverseFlow=false</code>.
-                       Avoided the use of the conditionally enabled variables <code>sta_a</code> and
-                       <code>sta_b</code> as this was not proper use of the Modelica syntax.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.Examples.ReverseFlowHumidifier
-    </td>
-    <td valign=\"top\">Changed one instance of <code>Modelica.Fluid.Sources.MassFlowSource_T</code>,
-                       that was connected to the two fluid streams,
-                       to two instances, each having half the mass flow rate.
-                       This is required for the model to work with Modelica 3.2.1 due to the
-                       change introduced in
-                       ticket <a href=\"https://trac.modelica.org/Modelica/ticket/739\">#739</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.EnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.LatentEnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.VolumeFlowRate
-    </td>
-    <td valign=\"top\">Removed default value <code>tau=0</code> as the base class
-                       already sets <code>tau=1</code>.
-                       This change was made so that all sensors use the same default value.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.TraceSubstancesTwoPort
-    </td>
-    <td valign=\"top\">Added default value <code>C_start=0</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Data.OpaqueConstructions.Generic
-    </td>
-    <td valign=\"top\">Changed the annotation of the
-                       instance <code>material</code> from
-                       <code>Evaluate=true</code> to <code>Evaluate=false</code>.
-                       This is required to allow changing the
-                       material properties after compilation.
-                       Note, however, that the number of state variables in
-                       <code>Buildings.HeatTransfer.Data.BaseClasses.Material</code>
-                       are only computed when the model is translated, because
-                       the number of state variables is fixed
-                       at compilation time.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Diagnostics.AssertEquality<br/>
-                       Buildings.Utilities.Diagnostics.AssertInequality
-    </td>
-    <td valign=\"top\">Added <code>time</code> in print statement as OpenModelica,
-                       in its error message, does not output the time
-                       when the assert is triggered.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Airflow</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.Orifice<br/>
-                       Buildings.Airflow.Multizone.EffectiveAirLeakageArea<br/>
-                       Buildings.Airflow.Multizone.ZonalFlow_ACS
-    </td>
-    <td valign=\"top\">Changed the parameter <code>useConstantDensity</code> to
-                       <code>useDefaultProperties</code> to use consistent names
-                       within this package.
-                       A conversion script in <code>Resources/Scripts/Dymola</code>
-                       can be used to update old models that use this parameter.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.BaseClasses.IndexWater
-    </td>
-    <td valign=\"top\">Renamed class to
-                       <code>Buildings.Fluid.BaseClasses.IndexMassFraction</code>
-                       as it is applicable for all mass fraction sensors.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-                       Buildings.Fluid.HeatExchangers.ConstantEffectiveness<br/>
-                       Buildings.Fluid.HeatExchangers.DryEffectivenessNTU<br/>
-                       Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                       Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger<br/>
-                       Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
-                       Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger<br/>
-                       Buildings.Fluid.MassExchangers.ConstantEffectiveness<br/>
-                       Buildings.Fluid.MassExchangers.HumidifierPrescribed<br/>
-                       Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolumeWaterPort<br/>
-                       Buildings.Fluid.MixingVolumes.MixingVolume<br/>
-                       Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
-                       Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir<br/>
-                       Buildings.Fluid.Storage.ExpansionVessel
-    </td>
-    <td valign=\"top\">Changed the input connector <code>mXi_flow</code> (or <code>mXi1_flow</code>
-                       and <code>mXi2_flow</code>) to <code>mWat_flow</code> (or <code>mWat1_flow</code>
-                       and <code>mWat2_flow</code>).
-                       This change has been done as declaring <code>mXi_flow</code> is ambiguous
-                       because it does not specify what other species are added unless a mass flow rate
-                       <code>m_flow</code> is also known. To avoid this confusion, the connector variables
-                       have been renamed.
-                       The equations that were used were, however, correct.
-                       This addresses issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/165\">#165</a>.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-                       Buildings.Fluid.Storage.BaseClasses.IndirectTankHeatExchanger<br/>
-                       Buildings.Fluid.BaseClasses.PartialResistance<br/>
-                       Buildings.Fluid.FixedResistances.BaseClasses.Pipe<br/>
-                       Buildings.Fluid.FixedResistances.FixedResistanceDpM<br/>
-                       Buildings.Fluid.FixedResistances.LosslessPipe<br/>
-                       Buildings.Fluid.Geothermal.Boreholes.BaseClasses.BoreholeSegment<br/>
-                       Buildings.Fluid.Geothermal.Boreholes.UTube<br/>
-                       Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab<br/>
-                       Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
-                       Buildings.Fluid.Interfaces.PartialFourPortInterface<br/>
-                       Buildings.Fluid.Interfaces.PartialTwoPortInterface<br/>
-                       Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger<br/>
-                       Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger<br/>
-                       Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
-                       Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume<br/>
-                       Buildings.Fluid.Movers.BaseClasses.FlowControlled<br/>
-                       Buildings.Fluid.Movers.BaseClasses.IdealSource<br/>
-                       Buildings.Fluid.Movers.BaseClasses.PrescribedFlowMachine<br/>
-    </td>
-    <td valign=\"top\">Removed the computation of <code>V_flow</code> and removed the parameter
-                       <code>show_V_flow</code>.
-                       The reason is that the computation of <code>V_flow</code> required
-                       the use of <code>sta_a</code> (to compute the density),
-                       but <code>sta_a</code> is also a variable that is conditionally
-                       enabled. However, this was not correct Modelica syntax as conditional variables
-                       can only be used in a <code>connect</code>
-                       statement, not in an assignment. Dymola 2014 FD01 beta3 is checking
-                       for this incorrect syntax. Hence, <code>V_flow</code> was removed as its
-                       conditional implementation would require a rather cumbersome implementation
-                       that uses a new connector that carries the state of the medium.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes
-    </td>
-    <td valign=\"top\">Removed <code>Buildings.Fluid.MixingVolumes.MixingVolumeDryAir</code>
-                       as this model is no longer used. The model
-                       <code>Buildings.Fluid.MixingVolumes.MixingVolume</code>
-                       can be used instead of.<br/>
-                       Removed base class <code>Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolumeWaterPort</code>
-                       as this model is no longer used.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.Examples.TraceSubstances
-    </td>
-    <td valign=\"top\">Renamed example from <code>ExtraProperty</code> to
-                     <code>TraceSubstances</code> in order to use the same name
-                     as the sensor.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.PrescribedExtraPropertyFlowRate
-    </td>
-    <td valign=\"top\">Renamed model to<code>TraceSubstancesFlowRate</code> to
-                     use the same terminology than the Modelica Standard Library.<br/>
-                     The conversion script updates existing models that instantiate
-                     this model.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.Examples.PrescribedExtraPropertyFlow
-    </td>
-    <td valign=\"top\">Renamed example to<code>TraceSubstancesFlowRate</code>
-                     in order to use the same name as the source model.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume<br/>
-                       Buildings.Fluid.FixedResistances.Pipe<br/>
-                       Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitsSlab<br/>
-                       Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
-                       Buildings.Fluid.Movers.BaseClasses.FlowControlled
-    </td>
-    <td valign=\"top\">Renamed <code>X_nominal</code> to <code>X_default</code>
-                       or <code>X_start</code>, where <code>X</code> may be
-                       <code>state</code>, <code>rho</code>, or <code>mu</code>,
-                       depending on whether the medium default values or the start values
-                       are used in the computation of the state
-                       and derived quantities.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer<br/>
-                         Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Interfaces.RadiosityInflow<br/>
-                       Buildings.HeatTransfer.Interfaces.RadiosityOutflow<br/>
-                       Buildings.HeatTransfer.Radiosity.BaseClasses.ParametersTwoSurfaces<br/>
-                       Buildings.HeatTransfer.Radiosity.Constant<br/>
-                       Buildings.HeatTransfer.Radiosity.Examples.OpaqueSurface<br/>
-                       Buildings.HeatTransfer.Radiosity.Examples.OutdoorRadiosity<br/>
-                       Buildings.HeatTransfer.Radiosity.IndoorRadiosity<br/>
-                       Buildings.HeatTransfer.Radiosity.OpaqueSurface<br/>
-                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity<br/>
-                       Buildings.HeatTransfer.Radiosity.RadiositySplitter<br/>
-                       Buildings.HeatTransfer.Radiosity.package<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.Examples.CenterOfGlass<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.Examples.GlassLayer<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.Examples.Shade<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.Shade<br/>
-                       Buildings.HeatTransfer.Windows.Examples.BoundaryHeatTransfer<br/>
-                       Buildings.HeatTransfer.Windows.ExteriorHeatTransfer<br/>
-                       Buildings.HeatTransfer.Windows.InteriorHeatTransfer<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationGainDistribution<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.MixedAir<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.Overhang<br/>
-                       Buildings.ThermalZones.Detailed.BaseClasses.SideFins
-    </td>
-    <td valign=\"top\">Changed the connectors for the radiosity model.
-                       The previous implemenation declared the radiosity as a
-                       <code>flow</code> variables, but the implementation did not use
-                       a potential variable.<br/>
-                       Therefore, the radiosity was the only variable in the connector,
-                       which is not allowed for <code>flow</code> variables.
-                       This change required a reformulation of models because with the new formulation,
-                       the incoming and outcoming radiosity are both non-negative values.
-                       This addresses issue <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/158\">#158</a>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer<br/>
-                         Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.PartialConvection<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.PartialWindowBoundaryCondition<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.Shade<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.ShadeConvection<br/>
-                       Buildings.HeatTransfer.Windows.BaseClasses.ShadeRadiation<br/>
-                       Buildings.HeatTransfer.Windows.InteriorHeatTransfer<br/>
-                       Buildings.HeatTransfer.Windows.InteriorHeatTransferConvective<br/>
-                       Buildings.ThermalZones.Detailed.ExteriorBoundaryConditionsWithWindow<br/>
-                       Buildings.ThermalZones.Detailed.PartialSurfaceInterface<br/>
-                       Buildings.ThermalZones.Detailed.InfraredRadiationExchange<br/>
-                       Buildings.ThermalZones.Detailed.AirHeatMassBalanceMixed<br/>
-                       Buildings.ThermalZones.Detailed.SolarRadiationExchange<br/>
-                       Buildings.ThermalZones.Detailed.RadiationTemperature<br/>
-                       Buildings.ThermalZones.Detailed.InfraredRadiationGainDistribution
-    </td>
-    <td valign=\"top\">Redesigned the implementation of the room model and its base classes.
-                       This redesign separates convection from radiation, and it provides
-                       one composite model for the convection and the heat and mass balance in
-                       the room. This change was done to allow an implementation of the room air
-                       heat and mass balance that does not assume uniformly mixed room air.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Convection.Functions.HeatFlux.rayleigh
-    </td>
-    <td valign=\"top\">Renamed function from <code>raleigh</code> to <code>rayleigh</code>.
-    </td>
-</tr>
-
-
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.SpecificEntropyTwoPort
-    </td>
-    <td valign=\"top\">
-           Corrected wrong computation of the dynamics used for the sensor signal.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Data.GlazingSystems.DoubleClearAir13Clear
-    </td>
-    <td valign=\"top\">
-           Corrected the glass layer thickness, which was <i>5.7</i> mm instead of
-           <i>3</i> mm, as the documentation states.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody<br/>
-              Buildings.BoundaryConditions.WeatherData.BaseClasses.CheckTemperature<br/>
-              Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
-              Buildings.Controls.SetPoints.HotWaterTemperatureReset<br/>
-              Buildings.Examples.ChillerPlant.BaseClasses.Controls.ChillerSwitch<br/>
-              Buildings.Examples.ChillerPlant.BaseClasses.Controls.WSEControl<br/>
-              Buildings.Fluid.Boilers.BoilerPolynomial<br/>
-              Buildings.Fluid.HeatExchangers.BaseClasses.HexElement<br/>
-              Buildings.Fluid.HeatExchangers.BaseClasses.MassExchange<br/>
-              Buildings.Fluid.HeatExchangers.BaseClasses.MassExchangeDummy<br/>
-              Buildings.Fluid.DXSystems.Cooling.BaseClasses.ApparatusDewPoint<br/>
-              Buildings.Fluid.DXSystems.Cooling.BaseClasses.ApparatusDryPoint<br/>
-              Buildings.Fluid.DXSystems.BaseClasses.CoolingCapacity<br/>
-              Buildings.Fluid.DXSystems.Cooling.BaseClasses.DXCooling<br/>
-              Buildings.Fluid.DXSystems.BaseClasses.DryCoil<br/>
-              Buildings.Fluid.DXSystems.Cooling.BaseClasses.DryWetSelector<br/>
-              Buildings.Fluid.DXSystems.Cooling.BaseClasses.Evaporation<br/>
-              Buildings.Fluid.DXSystems.Cooling.BaseClasses.WetCoil<br/>
-              Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolumeWaterPort<br/>
-              Buildings.Fluid.Sensors.RelativeTemperature<br/>
-              Buildings.Fluid.Sensors.Temperature<br/>
-              Buildings.Fluid.Sensors.TemperatureTwoPort<br/>
-              Buildings.Fluid.Sensors.TemperatureWetBulbTwoPort<br/>
-              Buildings.Fluid.SolarCollectors.BaseClasses.PartialHeatLoss<br/>
-              Buildings.Utilities.Comfort.Fanger<br/>
-              Buildings.Utilities.IO.BCVTB.From_degC<br/>
-              Buildings.Utilities.IO.BCVTB.To_degC<br/>
-              Buildings.Utilities.Psychrometrics.TDewPoi_pW<br/>
-              Buildings.Utilities.Psychrometrics.TWetBul_TDryBulPhi<br/>
-              Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi<br/>
-              Buildings.Utilities.Psychrometrics.WetBul_pTX<br/>
-              Buildings.Utilities.Psychrometrics.pW_TDewPoi
-    </td>
-    <td valign=\"top\">Replaced wrong attribute <code>quantity=\"Temperature\"</code>
-                     with <code>quantity=\"ThermodynamicTemperature\"</code>.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Data.Fuels.Generic
-    </td>
-    <td valign=\"top\">Corrected wrong type for <code>mCO2</code>.
-                       It was declared as <code>Modelica.Units.SI.MassFraction</code>,
-                       which is incorrect.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.Correlations.BaseClasses.Bounds
-    </td>
-    <td valign=\"top\">Corrected wrong type for <code>FRWat_min</code>, <code>FRWat_max</code>
-                       and <code>liqGasRat_max</code>.
-                       They were declared as <code>Modelica.Units.SI.MassFraction</code>,
-                       which is incorrect as, for example, <code>FRWat_max</code> can be larger than one.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.ConstantEffectiveness<br/>
-                     Buildings.Fluid.MassExchangers.ConstantEffectiveness
-    </td>
-    <td valign=\"top\">Corrected error in the documentation that was not updated
-                     when the implementation of zero flow rate was revised.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation
-    </td>
-    <td valign=\"top\">Corrected the syntax error
-                       <code>Medium.ExtraProperty C[Medium.nC](each nominal=C_nominal)</code>
-                       to
-                       <code>Medium.ExtraProperty C[Medium.nC](nominal=C_nominal)</code>
-                       because <code>C_nominal</code> is a vector.
-                       This syntax error caused a compilation error in OpenModelica.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.LatentEnthalpyFlowRate<br/>
-                       Buildings.Fluid.Sensors.MassFraction<br/>
-                       Buildings.Fluid.Sensors.MassFractionTwoPort
-    </td>
-    <td valign=\"top\">Changed medium declaration in the <code>extends</code> statement
-                       to <code>replaceable</code> to avoid a translation error in
-                       OpenModelica.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.TraceSubstances<br/>
-                       Buildings.Fluid.Sensors.TraceSubstancesTwoPort
-    </td>
-    <td valign=\"top\">Corrected syntax errors in setting nominal value for output signal
-                       and for state variable.
-                       This eliminates a compilation error in OpenModelica.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.TraceSubstancesFlowSource
-    </td>
-    <td valign=\"top\">Added missing <code>each</code> in declaration of
-                       <code>C_in_internal</code>.
-                       This eliminates a compilation error in OpenModelica.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Python27</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.IO.Python27.Functions.exchange
-    </td>
-    <td valign=\"top\">Corrected error in C code that lead to message
-                       <code>'module' object has no attribute 'argv'</code>
-                       when a python module accessed <code>sys.argv</code>.
-    </td>
-</tr>
-
-
-
-</table>
-<!-- Github issues -->
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Verify mass and species balance</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/165\">#165</a>
-    </td>
-    <td valign=\"top\">This issue has been addressed by renaming the connectors to avoid an ambiguity
-                       in the model equation. The equations were correct.
-    </td>
-<tr><td colspan=\"2\"><b>Remove flow attribute from radiosity connectors</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/158\">#158</a>
-    </td>
-    <td valign=\"top\">This issue has been addressed by reformulating the radiosity models.
-                       With the new implementation, incoming and outgoing radiosity are non-negative
-                       quantities.
-    </td>
-</tr>
-</table>
-</html>"));
-    end Version_1_5_build1;
-
-  class Version_1_4_build1 "Version 1.4 build 1"
-    extends Modelica.Icons.ReleaseNotes;
-     annotation (preferredView="info",
-     Documentation(info="<html>
-<p>
-Version 1.4 build 1 contains the new package <code>Buildings.Utilities.IO.Python27</code>
-that allows calling Python functions from Modelica.
-It also contains in the package <code>Buildings.HeatTransfer.Conduction.SingleLayer</code>
-a new model for heat conduction in phase change material. This model can be used as a layer
-of the room heat transfer model.
-</p>
-
-<p>
-Non-backward compatible changes had to be introduced
-in the valve models
-<code>Buildings.Fluid.Actuators.Valves</code> to fully comply with the Modelica
-language specification, and in the models in the package
-<code>Buildings.Utilities.Diagnostics</code>
-as they used the <code>cardinality</code> function which is deprecated in the Modelica
-Language Specification.
-</p>
-
-<p>
-See below for details.
-<!-- New libraries -->
-</p>
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Utilities.IO.Python27
-    </td>
-    <td valign=\"top\">
-         Package that contains blocks and functions that embed Python 2.7 in Modelica.
-         Data can be sent to Python functions and received from Python functions.
-         This allows for example data analysis in Python as part of a Modelica model,
-         or data exchange as part of a hardware-in-the-loop simulation in which
-         Python is used to communicate with hardware.
-    </td>
-    </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.getAbsolutePath
-    </td>
-    <td valign=\"top\">This function is used by the weather data reader to set
-                       the path to the weather file relative to the root directory
-                       of the Buildings library.
-    </td>
-    </tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.BaseClasses.PartialMixingVolume
-    </td>
-    <td valign=\"top\">Removed the check of multiple connections to the same element
-                       of a fluid port, as this check required the use of the deprecated
-                       <code>cardinality</code> function.
-    </td>
-</tr><tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Conduction.SingleLayer
-    </td>
-    <td valign=\"top\">Added option to model layers with phase change material.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange
-    </td>
-    <td valign=\"top\">Removed the use of the <code>cardinality</code> function
-                       as this function is deprecated in the Modelica Language Specification.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves
-    </td>
-    <td valign=\"top\">All valves now require the declaration of <code>dp_nominal</code>
-                       if the parameter assignment is
-                       <code>CvData = Buildings.Fluid.Types.CvTypes.OpPoint</code>.
-                       This change was needed because in the previous version,
-                       <code>dp_nominal</code> had
-                       a default value of <i>6000</i> Pascals. However, if
-                       <code>CvData &gt;&lt; Buildings.Fluid.Types.CvTypes.OpPoint</code>, then
-                       <code>dp_nominal</code> is computed in the initial algorithm section and hence
-                       providing a default value is not allowed according to
-                       the Modelica Language Specification.
-                       Hence, it had to be removed.<br/>
-                       As part of this change, we set <code>dp(nominal=6000)</code> for all valves,
-                       because the earlier formulation uses a value that is not known during compilation,
-                       and hence leads to an error in Dymola 2014.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
-                       Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir
-    </td>
-    <td valign=\"top\">Removed the use of the deprecated
-                       <code>cardinality</code> function.
-                       Therefore, now all input signals must be connected.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Diagnostics.AssertEquality<br/>
-                       Buildings.Utilities.Diagnostics.AssertInequality
-    </td>
-    <td valign=\"top\">Removed the option to not connect input signals, as this
-                       required the use of the <code>cardinality</code> function which
-                       is deprecated in the MSL, and not correctly implemented in OpenModelica.
-                       Therefore, if using these models, both input signals must be connected.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.splineDerivatives
-    </td>
-    <td valign=\"top\">Removed the default value
-                       <code>input Boolean ensureMonotonicity=isMonotonic(y, strict=false)</code>
-                       as the Modelica language specification is not clear whether defaults can be computed
-                       or must be constants.
-    </td>
-</tr></table>
-<!-- Errors that have been fixed -->
-
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-
-<tr><td colspan=\"2\"><b>Buildings.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.SetPoints.HotWaterTemperatureReset
-    </td>
-    <td valign=\"top\">Corrected error that led to wrong results if the room air temperature is
-                     different from its nominal value <code>TRoo_nominal</code>.
-                     This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/74\">issue 74</a>.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs.SingleCircuitSlab<br/>
-                     Buildings.Fluid.HeatExchangers.RadiantSlabs.ParallelCircuitSlab
-    </td>
-    <td valign=\"top\">Fixed bug in the assignment of the fictitious thermal resistance by replacing
-                     <code>RFic[nSeg](each G=A/Rx)</code> with
-                     <code>RFic[nSeg](each G=A/nSeg/Rx)</code>.
-                     This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/79\">issue 79</a>.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Diagnostics.AssertEquality<br/>
-                       Buildings.Utilities.Diagnostics.AssertInequality
-    </td>
-    <td valign=\"top\">Replaced <code>when</code> test with <code>if</code> test as
-                       equations within a <code>when</code> section are only evaluated
-                       when the condition becomes true.
-                       This fixes <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/72\">issue 72</a>.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear
-    </td>
-    <td valign=\"top\">The documenation was
-                       <i>Fraction Kv(port_1 &rarr; port_2)/Kv(port_3 &rarr; port_2)</i> instead of
-                       <i>Fraction Kv(port_3 &rarr; port_2)/Kv(port_1 &rarr; port_2)</i>.
-                       Because the parameter set correctly its attributes
-                       <code>min=0</code> and <code>max=1</code>,
-                       instances of these models used the correct value.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.BaseClasses.ValveParameters
-    </td>
-    <td valign=\"top\">Removed stray backslash in write statement.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                       Buildings.Fluid.Interfaces.StaticTwoPortConservationEquation<br/>
-                       Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger
-    </td>
-    <td valign=\"top\">Removed wrong unit attribute of <code>COut</code>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.HexElement
-    </td>
-    <td valign=\"top\">Changed the redeclaration of <code>vol2</code> to be replaceable,
-                     as <code>vol2</code> is replaced in some models.
-    </td>
-</tr>
-</table>
-<!-- Github issues -->
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Add explanation of nStaRef.</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/70\">&#35;70</a>
-    </td>
-    <td valign=\"top\">
-    Described in
-    <code>Buildings.HeatTransfer.Data.Solids</code>
-    how the parameter <code>nStaRef</code> is used
-    to compute the spatial grid that is used for simulating transient heat conduction.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Assert statement does not fire.</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/72\">&#35;72</a>
-    </td>
-    <td valign=\"top\">
-    The blocks <code>Buildings.Utilities.Diagnostics.AssertEquality</code> and
-    <code>Buildings.Utilities.Diagnostics.AssertInequality</code> did not fire because
-    the test on the time was in a <code>when</code> instead of an <code>if</code> statement.
-    This was wrong because <code>when</code> sections are only evaluated
-    when the condition becomes true.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b><code>HotWaterTemperatureReset</code> computes wrong results if room temperature differs from nominal value.</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/74\">&#35;74</a>
-    </td>
-    <td valign=\"top\">The equation
-<pre>TSup = TRoo_in_internal
-          + ((TSup_nominal+TRet_nominal)/2-TRoo_in_internal) * qRel^(1/m)
-          + (TSup_nominal-TRet_nominal)/2 * qRel;</pre>
-should be formulated as
-<pre>TSup = TRoo_in_internal
-          + ((TSup_nominal+TRet_nominal)/2-TRoo_nominal) * qRel^(1/m)
-          + (TSup_nominal-TRet_nominal)/2 * qRel;</pre>
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Bug in <code>RadiantSlabs.SingleCircuitSlab</code> fictitious resistance RFic.</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/79\">&#35;79</a>
-    </td>
-    <td valign=\"top\">This bug has been fixed in the assignment of the fictitious thermal resistance by replacing
-                     <code>RFic[nSeg](each G=A/Rx)</code> with
-                     <code>RFic[nSeg](each G=A/nSeg/Rx)</code>.
-                     The bug also affected <code>RadiantSlabs.ParallelCircuitSlab</code>.
-    </td>
-</tr>
-</table>
-
-<p>
-Note:
-</p>
-<ul>
-<li>
-This version contains various updates that allow
-the syntax of the example models to be checked in the pedantic mode
-in Dymola 2014.
-</li>
-</ul>
-</html>"));
-  end Version_1_4_build1;
-
-  class Version_1_3_build1 "Version 1.3 build 1"
-    extends Modelica.Icons.ReleaseNotes;
-     annotation (preferredView="info", Documentation(info="<html>
-<p>
-In version 1.3 build 1, models for direct evaporative cooling coils with multiple stages or with
-a variable speed compressor have been added.
-This version also contains improvements to the fan and pump models to better treat zero mass flow rate.
-Various other improvements have been made to improve the numerics and to use consistent variable names.
-A detailed list of changes is shown below.
-<!-- New libraries -->
-</p>
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Fluid.DXSystems
-    </td>
-    <td valign=\"top\">Library with direct evaporative cooling coils.
-    </td>
-    </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.DataCenterContinuousTimeControl
-    </td>
-    <td valign=\"top\">Added chilled water plant model with continuous time control that
-                       replaces the discrete time control in
-                       <code>Buildings.Examples.ChillerPlant.DataCenterDiscreteTimeControl</code>.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.X_pSatpphi
-    </td>
-    <td valign=\"top\">Function that computes moisture concentration based
-                       on saturation pressure, total pressure and relative
-                       humidity.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.TWetBul_TDryBulPhi
-    </td>
-    <td valign=\"top\">Block that computes the wet bulb temperature for given
-                     dry bulb temperature, relative humidity and atmospheric pressure.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.WetBul_pTX
-    </td>
-    <td valign=\"top\">Block that computes the temperature and mass fraction
-                       at the wet bulb state for given dry bulb temperature,
-                       species concentration and atmospheric pressure.
-    </td>
-    </tr>
-</table>
-<!-- Backward compatbile changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">Added computation of the wet bulb temperature.
-                       Computing the wet bulb temperature introduces a nonlinear
-                       equation. As we have not observed an increase in computing time
-                       because of computing the wet bulb temperature, it is computed
-                       by default. By setting the parameter
-                       <code>computeWetBulbTemperature=false</code>, the computation of the
-                       wet bulb temperature can be removed.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
-    </td>
-    <td valign=\"top\">Added <code>pre</code> operator and relaxed tolerance in <code>assert</code> statement.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                       Buildings.Fluid.Movers.FlowControlled_m_flow<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_y<br/>
-    </td>
-    <td valign=\"top\">Reformulated implementation of efficiency model
-                       to avoid a division by zero at zero mass flow rate
-                       for models in which a user specifies
-                       a power instead of an efficiency performance curve.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.TWetBul_TDryBulXi
-    </td>
-    <td valign=\"top\">Added option to approximate the wet bulb temperature using an
-                     explicit equation.
-                     Reformulated the original model to change the dimension of the
-                     nonlinear system of equations from two to one.
-    </td>
-    </tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
-                       Buildings.BoundaryConditions.Types
-    </td>
-    <td valign=\"top\">Improved the optional inputs for the radiation data global horizontal, diffuse horizontal and direct normal radiation.
-    If a user specifies two of them, the third will be automatically calculated.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody
-    </td>
-    <td valign=\"top\">Renamed <code>radHor</code> to <code>radHorIR</code>
-                       to indicate that the radiation is in the infrared
-                       spectrum.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.DoorDiscretized<br/>
-                     Buildings.Airflow.Multizone.DoorDiscretizedOpen<br/>
-                     Buildings.Airflow.Multizone.DoorDiscretizedOperable<br/>
-                     Buildings.Airflow.Multizone.Orifice<br/>
-                     Buildings.Airflow.Multizone.ZonalFlow_ACS<br/>
-                     Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential<br/>
-                     Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
-                     Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
-                     Buildings.Fluid.BaseClasses.PartialResistance<br/>
-                     Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
-                     Buildings.Fluid.Movers.BaseClasses.PowerInterface<br/>
-                     Buildings.Fluid.Storage.BaseClasses.Buoyancy<br/>
-                     Buildings.Fluid.HeatExchangers.BaseClasses.MassExchange
-    </td>
-    <td valign=\"top\">Renamed protected parameters for consistency with the naming conventions.
-                     In previous releases, fluid properties had the suffix <code>0</code>
-                     or <code>_nominal</code> instead of <code>_default</code> when they
-                     where computed based on the medium default properties.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate<br/>
-                     Buildings.Fluid.Sensors.LatentEnthalpyFlowRate
-    </td>
-    <td valign=\"top\">Moved computation of parameter <code>i_w</code> to new base class
-                     <code>Buildings.Fluid.BaseClasses.IndexWater</code>
-                     The value of this parameter is now assigned dynamically and does not require to be specified
-                     by the user.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.BaseClasses.ThirdOrderStratifier
-    </td>
-    <td valign=\"top\">Removed unused protected parameters <code>sta0</code> and <code>cp0</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.DataCenterDiscreteTimeControl<br/>
-                       Buildings.Examples.ChillerPlant.BaseClasses.Controls.TrimAndRespond<br/>
-                       Buildings.Examples.ChillerPlant.BaseClasses.Controls.ZeroOrderHold
-    </td>
-    <td valign=\"top\">Re-implemented the controls for setpoint reset.
-    Revised the model <code>TrimAndRespond</code> and deleted the model <code>ZeroOrderHold</code>.
-    Improved the documentation.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Examples</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.ChillerPlant.DataCenterDiscreteTimeControl
-    </td>
-    <td valign=\"top\">Fixed error in wet bulb temperature. The previous version used
-                     a model to compute the wet bulb temperature that takes as an
-                     input the relative humidity, but required mass fraction as an input.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3<br/>
-                       Buildings.BoundaryConditions.SkyTemperature.BlackBody
-    </td>
-    <td valign=\"top\">Renamed <code>radHor</code> to <code>radHorIR</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.BaseClasses.FlowModels.Examples.InverseFlowFunction
-    </td>
-    <td valign=\"top\">Fixed error in the documentation.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
-    </td>
-    <td valign=\"top\">Fixed broken link in the documentation.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.BaseClasses.Characteristics.powerParameters
-    </td>
-    <td valign=\"top\">Fixed wrong <code>displayUnit</code> and
-                       <code>max</code> attribute for power.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes
-    </td>
-    <td valign=\"top\">In documentation, removed reference to the parameter
-                       <code>use_HeatTransfer</code> which no longer exists.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassPropertyUncoated
-    </td>
-    <td valign=\"top\">Improved the documentation for implementation and added comments for model limitations.
-    </td>
-</tr>
-</table>
-<!-- Github issues -->
-<!-- none -->
-</html>"));
-  end Version_1_3_build1;
-
-  class Version_1_2_build1 "Version 1.2 build 1"
-    extends Modelica.Icons.ReleaseNotes;
-     annotation (preferredView="info", Documentation(info="<html>
-<p>
-In version 1.2 build 1, models for radiant slabs and window overhangs and sidefins have been added.
-This version also contains various improvements to existing models.
-A detailed list of changes is shown below.
-<!-- New libraries -->
-</p>
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.RadiantSlabs
-    </td>
-    <td valign=\"top\">Package with models for radiant slabs
-                       with pipes or a capillary heat exchanger
-                       embedded in the construction.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Fluid.Data.Pipes
-    </td>
-    <td valign=\"top\">Package with records for pipes.
-    </td>
-    </tr>
-</table>
-<!-- New components for existing libraries -->
-
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.FixedShade<br/>
-                       Buildings.HeatTransfer.Windows.Overhang<br/>
-                       Buildings.HeatTransfer.Windows.SideFins
-    </td>
-    <td valign=\"top\">For windows with either an overhang or side fins,
-                       these blocks output the fraction of the area
-                       that is sun exposed.
-    </td>
-    </tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
-    </td>
-    <td valign=\"top\">Added BESTEST validation models for case 610, 620, 630, 640,
-                       650FF, 650, 920, 940, 950FF, 950, and 960.
-    </td>
-    </tr>
-</table>
-<!-- Backward compatible changes -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">Removed assignment of <code>HGloHor_in</code> in its declaration,
-                       because this gives an overdetermined system if the input connector
-                       is used.<br/>
-                       Added new sub-bus that contains the solar position.
-                       This allows reusing the solar position in various other models.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarIrradiation.DiffuseIsotropic<br/>
-                       Buildings.BoundaryConditions.SolarIrradiation.DiffusePerez<br/>
-                       Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.DiffuseIsotropic<br/>
-                       Buildings.BoundaryConditions.SolarIrradiation.BaseClasses.DiffusePerez<br/>
-    </td>
-    <td valign=\"top\">Added optional output of diffuse radiation from the sky and ground.
-                       This allows reusing the diffuse radiation in solar thermal collector.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SolarGeometry.BaseClasses.SolarAzimuth
-    </td>
-    <td valign=\"top\">Changed implementation to avoid an event at solar noon.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Data.BoreholeFillings
-    </td>
-    <td valign=\"top\">
-                       Renamed class to <code>BoreholeFillings</code>
-                       to be consistent with data records being plural.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Media.GasesPTDecoupled.MoistAir<br/>
-                       Buildings.Media.Air<br/>
-                       Buildings.Media.PerfectGases.MoistAir<br/>
-                       Buildings.Media.PerfectGases.MoistAirUnsaturated<br/>
-                       Buildings.Media.GasesConstantDensity.MoistAir<br/>
-                       Buildings.Media.GasesConstantDensity.MoistAirUnsaturated
-    </td>
-    <td valign=\"top\">Added redeclaration of <code>ThermodynamicState</code>
-                       to avoid a warning
-                       during model check and translation.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-    </td>
-    <td valign=\"top\">Added a check that ensures that the number of surfaces
-                       are equal to the length of the parameter that contains
-                       the surface area, and added a check to ensure that no surface area
-                       is equal to zero. These checks help detecting erroneous declarations
-                       of the room model. The changes were done in
-                       <code>Buildings.ThermalZones.Detailed.MixedAir.PartialSurfaceInterface</code>.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatbile changes to existing components -->
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-    </td>
-    <td valign=\"top\">Added optional modeling of window overhangs and side fins.
-                       The modeling of window overhangs and side fins required the
-                       introduction of the new parameters
-                       <code>hWin</code> for the window height and
-                       <code>wWin</code> for the window width, in addition to the
-                       parameters <code>ove</code> and <code>sidFin</code> which are used
-                       to declare the geometry of overhangs and side fins.
-                       The parameters <code>hWin</code> and <code>wWin</code>
-                       replace the previously used parameter <code>AWin</code> for the
-                       window area.
-                       Users need to manually replace <code>AWin</code> with <code>hWin</code>
-                       and <code>wWin</code> when updating models
-                       from a previous version of the library.<br/>
-                       See the information section in
-                       <code>Buildings.ThermalZones.Detailed.MixedAir</code> for how to use these models.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
-    </td>
-    <td valign=\"top\">
-                      Fixed a bug that caused an error in the schedule if the simulation start time was negative or equal to the first entry in the schedule.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.BaseClass.ThirdOrderStratifier
-    </td>
-    <td valign=\"top\">Revised the implementation to reduce the temperature overshoot.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.GlassLayer
-    </td>
-    <td valign=\"top\">Fixed the bug in the temperature linearization and
-                       in the heat flow through the glass layer if the transmissivity of glass
-                       in the infrared regime is non-zero.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.BaseClasses.CenterOfGlass
-    </td>
-    <td valign=\"top\">Fixed a bug in the parameter assignment of the instance <code>glass</code>.
-                       Previously, the infrared emissivity of surface a was assigned to the surface b.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.IO.BCVTB
-    </td>
-    <td valign=\"top\">Added a call to <code>Buildings.Utilities.IO.BCVTB.BaseClasses.exchangeReals</code>
-                       in the <code>initial algorithm</code> section.
-                       This is needed to propagate the initial condition to the server.
-                       It also leads to one more data exchange, which is correct and avoids the
-                       warning message in Ptolemy that says that the simulation reached its stop time
-                       one time step prior to the final time.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3
-    </td>
-    <td valign=\"top\">Corrected the documentation of the unit requirement for
-                       input files, parameters and connectors.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPortInterface<br/>
-                       Buildings.Fluid.Interfaces.PartialTwoPortInterface
-    </td>
-    <td valign=\"top\">Replaced the erroneous function call <code>Medium.density</code> with
-                       <code>Medium1.density</code> and <code>Medium2.density</code> in
-                        <code>PartialFourPortInterface</code>.
-                       Changed condition to remove <code>sta_a1</code> and
-                       <code>sta_a2</code> in <code>PartialFourPortInterface</code>, and
-                       <code>sta_a</code> in <code>PartialTwoPortInterface</code>, to also
-                       compute the state at the inlet port if <code>show_V_flow=true</code>.<br/>
-                       The previous implementation resulted in a translation error
-                       if <code>show_V_flow=true</code>, but worked correctly otherwise
-                       because the erroneous function call is removed if  <code>show_V_flow=false</code>.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Chillers.Examples.BaseClasses.PartialElectric
-    </td>
-    <td valign=\"top\">Corrected the nominal mass flow rate used in the mass flow source.
-    </td>
-</tr>
-</table>
-<!-- Github issues -->
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Heat transfer in glass layer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/56\">&#35;56</a>
-    </td>
-    <td valign=\"top\">Fixed bug in heat flow through the glass layer if the infrared transmissivity is non-zero.
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/57\">&#35;57</a>
-    </td>
-    <td valign=\"top\">Fixed bug in temperature linearization of window glass.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Overshooting in enhanced stratified tank</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/15\">&#35;15</a>
-    </td>
-    <td valign=\"top\">Revised the implementation to reduce the temperature over-shoot.
-    </td>
-</tr>
-</table>
-</html>"));
-  end Version_1_2_build1;
-
-  class Version_1_1_build1 "Version 1.1 build 1"
-    extends Modelica.Icons.ReleaseNotes;
-     annotation (preferredView="info", Documentation(info="<html>
-<p>
-Version 1.1 build 1 contains improvements to models that address numerical problems.
-In particular, flow machines and actuators now have an optional filter
-that converts step changes in the input signal to a smooth change in
-speed or actuator position.
-Also, (<code>Buildings.Examples.Tutorial</code>)
-has been added to provide step-by-step instruction for how to build
-system models.
-<!-- New libraries -->
-</p>
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Examples.Tutorial
-    </td>
-    <td valign=\"top\">Tutorial with step by step instructions for how to
-                       build system models.
-    </td>
-    </tr>
-</table>
-<!-- New components for existing libraries -->
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.Pipe
-    </td>
-    <td valign=\"top\">Added a model for a pipe with transport delay and optional heat
-                       exchange with the environment.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.UsersGuide
-    </td>
-    <td valign=\"top\">Added a user's guide for actuator models.
-    </td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.ConservationEquation<br/>
-                     Buildings.Fluid.Interfaces.StaticConservationEquation
-    </td>
-    <td valign=\"top\">These base classes have been added to simplify the implementation
-                     of dynamic and steady-state thermofluid models.
-    </td>
-    </tr>
-<tr><td valign=\"top\">Buildings.Fluid.Data.Fuels
-    </td>
-    <td valign=\"top\">Package with physical properties of fuels that are used by the
-                     boiler model.
-    </td>
-    </tr>
-</table>
-<!-- Backward compatible changes -->
-
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Dampers.Exponential<br/>
-                       Buildings.Fluid.Actuators.Dampers.VAVBoxExponential<br/>
-                       Buildings.Fluid.Actuators.Dampers.MixingBox<br/>
-                       Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening
-    </td>
-    <td valign=\"top\">Added an optional 2nd order lowpass filter for the input signal.
-                       The filter approximates the travel time of the actuators.
-                       It also makes the system of equations easier to solve
-                       because a step change in the input signal causes a gradual change in the actuator
-                       position.<br/>
-                       Note that this filter affects the time response of closed loop control.
-                       Therefore, enabling the filter may require retuning of control loops.
-                       See the user's guide of the Buildings.Fluid.Actuators package.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerPolynomial
-    </td>
-    <td valign=\"top\">Added computation of fuel usage and improved the documentation.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
-                       Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                       Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                       Buildings.Fluid.Movers.FlowControlled_m_flow
-    </td>
-    <td valign=\"top\">Added a 2nd order lowpass filter to the input signal.
-                       The filter approximates the startup and shutdown transients of fans or pumps.
-                       It also makes the system of equations easier to solve
-                       because a step change in the input signal causes a gradual change in the
-                       mass flow rate.<br/>
-                       Note that this filter affects the time response of closed loop control.
-                       Therefore, enabling the filter may require retuning of control loops.
-                       See the user's guide of the Buildings.Fluid.Movers package.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger
-    </td>
-    <td valign=\"top\">Changed model to use graphical implementation of models for
-                       pressure drop and conservation equations.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.BaseClasses.PartialResistance<br/>
-                       Buildings.Fluid.FixedResistances.FixedResistanceDpM<br/>
-                       Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve<br/>
-                       Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential
-    </td>
-    <td valign=\"top\">Revised base classes and models to simplify object inheritance tree.
-                       Set <code>m_flow_small</code> to <code>final</code> in Buildings.Fluid.BaseClasses.PartialResistance,
-                       and removed its assignment in the other classes.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.FixedResistances.FixedResistanceDpM<br/>
-                       Buildings.Fluid.FixedResistances.SplitterFixedResistanceDpM
-    </td>
-    <td valign=\"top\">Improved documentation.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Windows.Functions.glassProperty
-    </td>
-    <td valign=\"top\">Added the function <code>glassPropertyUncoated</code> that calculates the property for uncoated glass.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir
-    </td>
-    <td valign=\"top\">Changed model to use new implementation of
-                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity
-                       in its base classes.
-                       This change leads to the use of the same equations for the radiative
-                       heat transfer between window and ambient as is used for
-                       the opaque constructions.
-    </td>
-</tr>
-</table>
-<!-- Non-backward compatible changes to existing components -->
-
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Actuators.Valves.ThreeWayEqualPercentageLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.ThreeWayLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayEqualPercentage<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayLinear<br/>
-                       Buildings.Fluid.Actuators.Valves.TwoWayQuickOpening
-    </td>
-    <td valign=\"top\">Changed models to allow modeling of a fixed resistance that is
-                       within the controlled flow leg. This allows in some cases
-                       to avoid a nonlinear equation if a flow resistance is
-                       in series to the valve.
-                       This change required changing the parameter for the valve resistance
-                       <code>dp_nominal</code> to <code>dpValve_nominal</code>,
-                       and introducing the parameter
-                       <code>dpFixed_nominal</code>, with <code>dpFixed_nominal=0</code>
-                       as its default value.
-                       Previous models that instantiate these components need to change the
-                       assignment of <code>dp_nominal</code> to an assignment of
-                       <code>dpValve_nominal</code>.
-                       See also <code>Buildings.Fluid.Actuators.UsersGuide</code>.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Radiosity.OutdoorRadiosity<br/>
-                       Buildings.HeatTransfer.Windows.ExteriorHeatTransfer
-    </td>
-    <td valign=\"top\">Changed model to use new implementation of
-                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity.
-                       This change leads to the use of the same equations for the radiative
-                       heat transfer between window and ambient as is used for
-                       the opaque constructions.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
-    </td>
-    <td valign=\"top\">Changed model to fix a bug that caused the output of the block
-                       to be incorrect when the simulation started
-                       at a time different from zero.
-                       When fixing this bug, the parameter <code>startTime</code> was removed,
-                       and the parameter <code>endTime</code> was renamed to <code>period</code>.
-                       The period always starts at <i>t=0</i> seconds.
-    </td>
-</tr>
-</table>
-<!-- Errors that have been fixed -->
-
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.SetPoints.OccupancySchedule
-    </td>
-    <td valign=\"top\">The output of the block was incorrect when the simulation started
-                       at a time different from zero.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow<br/>
-                       Buildings.Fluid.HeatExchangers.WetCoilCounterFlow
-    </td>
-    <td valign=\"top\">Corrected error in assignment of <code>dp2_nominal</code>.
-                       The previous assignment caused a pressure drop in all except one element,
-                       instead of the opposite. This caused too high a flow resistance
-                       of the heat exchanger.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody
-    </td>
-    <td valign=\"top\">Fixed error in BlackBody model that was causing a translation error when <code>calTSky</code> was set to <code>Buildings.BoundaryConditions.Types.SkyTemperatureCalculation.HorizontalRadiation</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger
-    </td>
-    <td valign=\"top\">Fixed wrong class reference in information section.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Utilities.IO.BCVTB.Examples.MoistAir
-    </td>
-    <td valign=\"top\">Updated fan parameters, which were still for
-                       version 0.12 of the Buildings library and hence caused
-                       a translation error with version 1.0 or higher.
-    </td>
-</tr>
-</table>
-<!-- Github issues -->
-
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Exterior longwave radiation exchange in window model</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/51\">&#35;51</a>
-    </td>
-    <td valign=\"top\">Changed model to use new implementation of
-                       Buildings.HeatTransfer.Radiosity.OutdoorRadiosity.
-                       This change leads to the use of the same equations for the radiative
-                       heat transfer between window and ambient as is used for
-                       the opaque constructions.
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/53\">&#35;53</a>
-    </td>
-    <td valign=\"top\">Fixed bug in Buildings.Controls.SetPoints.OccupancySchedule that
-                       led to wrong results when the simulation started at a time different from zero.
-    </td>
-</tr>
-</table>
-
-<p>
-Note:
-</p>
-<ul>
-<li>
-The use of filters for actuator and flow machine input
-signals changes the dynamic response of feedback control loops.
-Therefore, control gains may need to be retuned.
-See <code>Buildings.Fluid.Actuators.UsersGuide</code>
-and
-<code>Buildings.Fluid.Movers.UsersGuide</code> for recommended control
-gains and further details.
-</li>
-</ul>
-</html>"));
-  end Version_1_1_build1;
-
-  class Version_1_0_build2 "Version 1.0 build 2"
-    extends Modelica.Icons.ReleaseNotes;
-     annotation (preferredView="info", Documentation(info="<html>
-<p>
-Version 1.0 build 2 has been released to correct model errors that
-were present in version 1.0 build 1. Both versions are compatible.
-In addition, version 1.0 build 2 contains improved documentation
-of various example models.
-<!-- New libraries -->
-<!-- New components for existing libraries -->
-<!-- Backward compatible changes -->
-</p>
-
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Controls</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Controls.Continuous<br/>
-                       Buildings.Controls.Discrete<br/>
-                       Buildings.Controls.SetPoints
-    </td>
-    <td valign=\"top\">Improved documentation of models and of examples.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.DoorDiscretizedOpen<br/>
-                     Buildings.Airflow.Multizone.DoorDiscretizedOperable
-    </td>
-    <td valign=\"top\">Changed the computation of the discharge coefficient to use the
-       nominal density instead of the actual density.
-       Computing <code>sqrt(2/rho)</code> sometimes causes warnings from the solver,
-       as it seems to try negative values for the density during iterative solutions.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.Examples
-    </td>
-    <td valign=\"top\">Improved documentation of examples.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples.DualFanDualDuct</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.Examples.DualFanDualDuct.Controls.RoomMixingBox
-    </td>
-    <td valign=\"top\">Improved control of minimum air flow rate to avoid overheating.
-    </td>
-</tr>
-</table>
-
-<!-- Non-backward compatbile changes to existing components -->
-<!-- Errors that have been fixed -->
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Convection.Exterior
-    </td>
-    <td valign=\"top\">Fixed error in assignment of wind-based convection coefficient.
-                     The old implementation did not take into account the surface roughness.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.SolarRadiationExchange
-    </td>
-    <td valign=\"top\">In the previous version, the radiative properties
-     of the long-wave spectrum instead of the solar spectrum have been used
-     to compute the distribution of the solar radiation among the surfaces
-     inside the room.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.MixedAir
-    </td>
-    <td valign=\"top\">Added missing connect statement between window frame
-     surface and window frame convection model. Prior to this bug fix,
-     no convective heat transfer was computed between window frame and
-     room air.
-    </td>
-</tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.BaseClasses.HeatGain
-    </td>
-    <td valign=\"top\">Fixed bug that caused convective heat gains
-     to be removed from the room instead of added to the room.
-    </td>
-</tr>
-</table>
-<!-- Uncritical errors -->
-<!-- Github issues -->
-
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Geothermal.Boreholes</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/45\">&#35;45</a>
-    </td>
-    <td valign=\"top\">Dymola 2012 FD01 hangs when simulating a borehole heat exchanger.
-    This was caused by a wrong release of memory in <code>freeArray.c</code>.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b>
-    </td>
-</tr>
-<tr><td valign=\"top\"><a href=\"https://github.com/lbl-srg/modelica-buildings/issues/46\">&#35;46</a>
-    </td>
-    <td valign=\"top\">The convective internal heat gain has the wrong sign.
-    </td>
-</tr>
-
-</table>
-</html>"));
-  end Version_1_0_build2;
-
-  class Version_1_0_build1 "Version 1.0 build 1"
-    extends Modelica.Icons.ReleaseNotes;
-     annotation (preferredView="info", Documentation(info="<html>
-<p>
-Version 1.0 is the first official release of the <code>Buildings</code>
-library.
-Compared to the last pre-release, which is version 0.12, this version contains
-new models as well as significant improvements to the model formulation
-that leads to faster and more robust simulation. A detailed list of changes is shown below.
-</p>
-<p>
-Version 1.0 is not backward compatible to version 0.12, i.e., models developed with
-versions 0.12 will require some changes in their parameters to
-work with version 1.0.
-The conversion script
-<a href=\"modelica://Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_0.12_to_1.0.mos\">
-Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_0.12_to_1.0.mos</a> can help
-in converting old models to this version of the library.
-</p>
-<p>
-The following <b style=\"color:blue\">new libraries</b> have been added:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\">Buildings.Fluid.Geothermal.Boreholes</td>
-    <td valign=\"top\">
-    This is a library with a model for a borehole heat exchanger.
-    </td></tr>
-</table>
-<p>
-The following <b style=\"color:blue\">new components</b> have been added
-to <b style=\"color:blue\">existing</b> libraries:
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.Airflow.Multizone</b></td></tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.windPressureLowRise
-                      </td>
-    <td valign=\"top\">Added a function that computes wind pressure on the facade of low-rise buildings.
-    </td> </tr>
-<tr><td colspan=\"2\"><b>Buildings.Examples</b></td></tr>
-<tr><td valign=\"top\">Buildings.Examples.ChillerPlant
-                      </td>
-    <td valign=\"top\">Added an example for a chilled water plant model.
-    </td> </tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.UsersGuide
-                      </td>
-    <td valign=\"top\">Added a user's guide that describes
-                       the main functionality of all base classes.
-    </td> </tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Sources</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sources.Outside_Cp<br/>
-                       Buildings.Fluid.Sources.Outside_CpLowRise
-                      </td>
-    <td valign=\"top\">Added models to compute wind pressure on building
-                       facades.
-    </td> </tr>
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b></td></tr>
-<tr><td valign=\"top\">Buildings.HeatTransfer.Conductor
-                      </td>
-    <td valign=\"top\">Added a model for heat conduction in circular coordinates.
-    </td> </tr>
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones.Detailed.Examples</b></td></tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.Examples.BESTEST
-                      </td>
-    <td valign=\"top\">Added BESTEST validation models.
-    </td> </tr>
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b></td></tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.Functions.cubicHermiteLinearExtrapolation<br/>
-                       Buildings.Utilities.Math.Functions.splineDerivatives.
-                      </td>
-    <td valign=\"top\">Added functions for cubic hermite spline interpolation, with
-                       option for monotone increasing (or decreasing) spline.
-    </td> </tr>
-</table>
-
-<p>
-The following <b style=\"color:blue\">existing components</b>
-have been <b style=\"color:blue\">improved</b> in a
-<b style=\"color:blue\">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.Airflow.Multizone</b></td></tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.BaseClasses.powerLaw</td>
-    <td valign=\"top\">This function has been reimplemented to handle zero flow rate
-                     in a more robust and more efficient way.
-                     This change improves all components that model flow resistance in
-                     the package Buildings.Airflow.Multizone.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions.WeatherData</b></td></tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.ReaderTMY3</td>
-    <td valign=\"top\">This model has now the option of using a constant value,
-                     using the data from the weather file, or from an input connector for 7 variables,
-                     including atmospheric pressure, relative humidity, dry bulb temperature,
-                     global horizontal radiation, diffuse horizontal radiation,
-                     wind direction and wind speed.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
-<tr><td valign=\"top\">
-                      Buildings.Fluid.Actuators.BaseClasses.PartialActuator<br/>
-                      Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential<br/>
-                      Buildings.Fluid.Actuators.BaseClasses.PartialTwoWayValve<br/>
-                      Buildings.Fluid.BaseClasses.PartialResistance<br/>
-                      Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_dp<br/>
-                      Buildings.Fluid.BaseClasses.FlowModels.basicFlowFunction_m_flow<br/>
-                      Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</td>
-    <td valign=\"top\">The computation of the linearized flow resistance has been moved from
-                     the functions to the model, i.e., into an equation section.
-                     If the linear implementation is in a function body, then a symbolic processor
-                     may not invert the equation. This can lead to systems of coupled equations in
-                     cases where an explicit solution is possible.
-                     In addition, the handling of zero flow rate has been improved for the nonlinear
-                     pressure drop model.
-                     These improvements affect all models in <code>Buildings.Fluid</code> that compute
-                     flow resistance.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed</td>
-    <td valign=\"top\">This model can now be configured as a steady-state or dynamic model.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.DryCoilCounterFlow<br/>
-                     Buildings.Fluid.HeatExchangers.WetCoilCounterFlow<br/>
-                     Buildings.Fluid.HeatExchangers.DryCoilDiscretized<br/>
-                     Buildings.Fluid.HeatExchangers.WetCoilDiscretized</td>
-    <td valign=\"top\">The implementation for handling zero flow rate, if the models
-are used as steady-state models, have been improved.</td>
-</tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.BaseClasses.ntu_epsilonZ</td>
-    <td valign=\"top\">Changed implementation to use
-                     <code>Modelica.Media.Common.OneNonLinearEquation</code> instead of
-                     <code>Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</code>,
-                     which was removed for this version of the library.
-                     </td>
-</tr>
-
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.HeatExchangers.CoolingTowers</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc<br/>
-                     Buildings.Fluid.HeatExchangers.CoolingTowers.FixedApproach</td>
-    <td valign=\"top\">
-       These models are now based on a new base class <code>Buildings.Fluid.HeatExchangers.CoolingTowers.BaseClasses.CoolingTower</code>.
-       This allows using the models as replaceable models without warning when checking the model.
-    </td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.HeatExchangers.CoolingTowers.YorkCalc</td>
-    <td valign=\"top\">
-       Changed implementation of performance curve to avoid division by zero.
-    </td></tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.MassExchangers</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.MassExchangers.HumidifierPrescribed</td>
-    <td valign=\"top\">This model can now be configured as a steady-state or dynamic model.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.*TwoPort</td>
-    <td valign=\"top\">All sensors with two ports, except for the mass flow rate sensor,
-                     have been revised to add sensor dynamics.
-                     Adding sensor dynamics avoids numerical problems when mass flow
-                     rates are close to zero and the sensor is configured to allow
-                     flow reversal. See
-                     <code>Buildings.Fluid.Sensors.UsersGuide</code> for details.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Storage</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.Stratified<br/>
-                     Buildings.Fluid.Storage.StratifiedEnhanced</td>
-    <td valign=\"top\">Changed the implementation of the model <code>Buoyancy</code>
-                     to make it differentiable in the temperatures.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
-<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleMedium<br/>
-                     Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</td>
-    <td valign=\"top\">Moved the assignment of the <code>stateSelect</code> attribute for
-                     the <code>BaseProperties</code> to the model
-                     <code>Buildings.Fluid.MixingVolumes.MixingVolume</code>. This allows
-                     to handle it differently for steady-state and dynamic models.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Psychrometrics</b></td></tr>
-<tr><td valign=\"top\">Buildings.Utilities.Psychrometrics.Functions.TDewPoi_pW</td>
-    <td valign=\"top\">Changed implementation to use
-                     <code>Modelica.Media.Common.OneNonLinearEquation</code> instead of
-                     <code>Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</code>,
-                     which was removed for this version of the library.
-                     </td>
-</tr>
-
-</table>
-
-<p>
-The following <b style=\"color:blue\">existing components</b>
-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.Airflow.Multizone</b></td></tr>
-<tr><td valign=\"top\">Buildings.Airflow.Multizone.MediumColumnDynamic</td>
-    <td valign=\"top\">The implementation has been changed to better handle mass flow rates
-near zero flow.
-This required the introduction of a new parameter <code>m_flow_nominal</code>
-that is used for the regularization near zero mass flow rate.</td></tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Storage.Examples.Stratified<br/>
-                     Buildings.Fluid.MixingVolumes</td>
-    <td valign=\"top\">
-                     Removed the parameters <code>use_T_start</code> and <code>h_start</code>,
-                     as <code>T_start</code> is more convenient to use than <code>h_start</code>
-                     for building simulation.
-                     </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Boilers</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Boilers.BoilerPolynomial</td>
-    <td valign=\"top\">The parameter <code>dT_nominal</code> has been removed
-as it can be computed from the parameter <code>m_flow_nominal</code>.
-This change was needed to avoid a non-literal value for the nominal
-attribute for the mass flow rate in the pressure drop model.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.MixingVolumes</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.MixingVolumes.MixingVolume<br/>
-                     Buildings.Fluid.MixingVolumes.MixingVolumeDryAir<br/>
-                     Buildings.Fluid.MixingVolumes.MixingVolumeMoistAir</td>
-    <td valign=\"top\">The implementation has been changed to better handle mass flow rates
-near zero flow if the components have exactly two fluid ports connected.
-This required the introduction of a new parameter <code>m_flow_nominal</code>
-that is used for the regularization near zero mass flow rate.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Movers</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Movers.SpeedControlled_y<br/>
-                     Buildings.Fluid.Movers.SpeedControlled_Nrpm<br/>
-                     Buildings.Fluid.Movers.FlowControlled_dp<br/>
-                     Buildings.Fluid.Movers.FlowControlled_m_flow</td>
-    <td valign=\"top\">
-                     The performance data are now defined through records and not
-                     through replaceable functions. The performance data now needs to be
-                     declared in the form<pre>
- pressure(V_flow_nominal={0,V_flow_nominal,2*V_flow_nominal},
-          dp_nominal={2*dp_nominal,dp_nominal,0})</pre>
-                     where <code>pressure</code> is an instance of a record. A similar declaration is
-                     used for power and efficiency.
-                     <br/>
-                     The parameter m_flow_nominal has been removed from
-                     FlowMachine_y and FlowMachine_Nrpm.
-                                <br/>
-                     The parameter m_flow_max has been replaced by m_flow_nominal in
-                     FlowMachine_m_flow.
-                                <br/>
-                     The implementation of the pressure drop computation as a function
-                     of speed and volume flow rate has been revised to avoid a singularity
-                     near zero volume flow rate and zero speed.<br/>
-                     The implementation has also been simplified to avoid using two different flow paths
-                     if the models are configured for steady-state or dynamic simulation.</td></tr>
-
-
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.FourPortHeatMassExchanger<br/>
-                     Buildings.Fluid.Interfaces.PartialDynamicStaticFourPortHeatMassExchanger<br/>
-                     Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger<br/>
-                     Buildings.Fluid.Interfaces.PartialDynamicStaticTwoPortHeatMassExchanger<br/>
-                     Buildings.Fluid.Interfaces.ConservationEquation</td>
-    <td valign=\"top\">The implementation has been changed to better handle mass flow rates
-near zero flow if the components have exactly two fluid ports connected.</td>
-</tr>
-
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Sensors</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Sensors.TemperatureTwoPortDynamic</td>
-    <td valign=\"top\">This model has been deleted since the sensor
-                     <code>Buildings.Fluid.Sensors.TemperatureTwoPort</code> has been revised
-                     and can now also be used as a dynamic model of a sensor.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Fluid.Interfaces</b></td></tr>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticTwoPortInterface</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.PartialTwoPortInterface</td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticStaticTwoPortHeatMassExchanger</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialTwoPortHeatMassExchanger</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.TwoPortHeatMassExchanger</td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPort</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.FourPort</td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticStaticFourPortHeatMassExchanger</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger</td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialStaticFourPortInterface</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.PartialFourPortInterface</td>
-<tr><td valign=\"top\">Buildings.Fluid.Interfaces.PartialFourPortHeatMassExchanger</td>
-    <td valign=\"top\">Renamed to Buildings.Fluid.Interfaces.FourPortHeatMassExchanger</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Math</b></td></tr>
-<tr><td valign=\"top\">Buildings.Utilities.Math.BaseClasses.OneNonLinearEquation</td>
-    <td valign=\"top\">This package has been removed, and all functions have been
-                       revised to use Modelica.Media.Common.OneNonLinearEquation.</td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Utilities.Reports</b></td></tr>
-<tr><td valign=\"top\">Buildings.Utilities.IO.Files.Printer<br/>
-                     Buildings.Utilities.IO.Files.BaseClasses.printRealArray</td>
-    <td valign=\"top\">Changed parameter <code>precision</code> to <code>significantDigits</code> and
-                     <code>minimumWidth</code> to <code>minimumLength</code>
-                     to use the same terminology as the Modelica Standard Library.</td>
-</tr>
-
-</table>
-
-<p>
-The following <b style=\"color:red\">critical errors</b> have been fixed (i.e., errors
-that can lead to wrong simulation results):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-
-
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.SkyTemperature.BlackBody</td>
-    <td valign=\"top\">Fixed error in <code>if-then</code> statement that led to
-                       a selection of the wrong branch to compute the sky temperature.</td></tr>
-<tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
-<tr><td valign=\"top\">Buildings.Media.PartialSimpleMedium<br/>
-                       Buildings.Media.GasesConstantDensity.SimpleAir</td>
-    <td valign=\"top\">Fixed error in assignment of <code>singleState</code> parameter.
-                       This change can lead to different initial conditions if the density of
-                       water is modeled as a function of pressure, or if the
-                       medium model Buildings.Media.GasesConstantDensity.SimpleAir is used.</td></tr>
-
-<tr><td valign=\"top\">Buildings.Media.GasesConstantDensity<br/>
-                       Buildings.Media.GasesConstantDensity.MoistAir<br/>
-                       Buildings.Media.GasesConstantDensity.MoistAirUnsaturated<br/>
-                       Buildings.Media.GasesConstantDensity.SimpleAir</td>
-    <td valign=\"top\">Fixed error in the function <code>density</code> which returned a non-constant density,
-                     and added a call to <code>ModelicaError(...)</code> in <code>setState_dTX</code> since this
-                     function cannot assign the medium pressure based on the density (as density is a constant
-                     in this model).
-</td></tr>
-
-<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</td>
-    <td valign=\"top\">Updated package with a new copy from the Modelica Standard Library, since
-                     the Modelica Standard Library fixed a bug in computing the internal energy of the medium.
-                     This bug led to very fast temperature transients at the start of the simulation.
-</td></tr>
-
-<tr><td valign=\"top\">Buildings.Media.Interfaces.PartialSimpleMedium</td>
-    <td valign=\"top\">Fixed bug in function density, which always returned <code>d_const</code>,
-                       regardless of the value of <code>constantDensity</code>.
-</td></tr>
-
-<tr><td valign=\"top\">Buildings.Media.GasesPTDecoupled</td>
-    <td valign=\"top\">Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
-                       For this medium, the function is <code>u=h-pStd/dStp</code>.
-</td></tr>
-
-<tr><td valign=\"top\">Buildings.Media.GasesConstantDensity</td>
-    <td valign=\"top\">Fixed bug in <code>u=h-R*T</code>, which is only valid for ideal gases.
-                       For this medium, the function is <code>u=h-p/dStp</code>.
-</td></tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
-                     Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditions</td>
-    <td valign=\"top\">Fixed bug (<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/35\">issue 35</a>)
-                     that leads to the wrong solar heat gain for
-                     roofs and for floors. Prior to this bug fix, the outside facing surface
-                     of a ceiling received solar irradiation as if it were a floor
-                     and vice versa.</td></tr>
-<tr><td valign=\"top\">Buildings.ThermalZones.Detailed.MixedAir<br/>
-                     Buildings.ThermalZones.Detailed.BaseClasses.ExteriorBoundaryConditionsWithWindow</td>
-    <td valign=\"top\">Fixed bug (<a href=\"https://github.com/lbl-srg/modelica-buildings/issues/36\">issue 36</a>)
-                     that leads to too high a surface temperature of the window frame when
-                     it receives solar radiation. The previous version did not compute
-                     the infrared radiation exchange between the
-                     window frame and the sky.</td></tr>
-
-</table>
-
-<p>
-The following <b style=\"color:red\">uncritical errors</b> have been fixed (i.e., errors
-that do <b style=\"color:red\">not</b> lead to wrong simulation results, but, e.g.,
-units are wrong or errors in documentation):
-</p>
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
-<tr><td valign=\"top\">Buildings.BoundaryConditions.WeatherData.BaseClasses.ConvertRadiation</td>
-    <td>Corrected wrong unit label.
-    </td>
-</tr>
-</table>
-
-<p>
-The following
-<a href=\"https://github.com/lbl-srg/modelica-buildings/issues\">issues</a>
-have been fixed:
-</p>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-<tr><td colspan=\"2\"><b>Buildings.BoundaryConditions</b></td></tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/8\">&#35;8</a></td>
-    <td valign=\"top\">
-         Add switches for new data.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/19\">&#35;19</a></td>
-    <td valign=\"top\">
-         Shift the time for the radiation data 30 min forth and output the local civil time in the data reader.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/41\">&#35;41</a></td>
-    <td valign=\"top\">
-       Using when-then sentences to reduce CPU time.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/43\">&#35;43</a></td>
-    <td valign=\"top\">
-         Add a ConvertRadiation to convert the unit of radiation from TMY3.
-    </td>
-</tr>
-<tr><td colspan=\"2\"><b>Buildings.Fluid</b></td></tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/28\">&#35;28</a></td>
-    <td valign=\"top\">
-         Move scripts to Buildings\\Resources\\Scripts\\Dymola.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.HeatTransfer</b></td></tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/18\">&#35;18</a></td>
-    <td valign=\"top\">
-         Add a smooth interpolation function to avoid the event.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.Media</b></td></tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/30\">&#35;30</a></td>
-    <td valign=\"top\">
-         Removed non-required structurally incomplete annotation.
-    </td>
-</tr>
-
-<tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/35\">&#35;35</a></td>
-    <td valign=\"top\">
-         Wrong surface tilt for radiation at exterior surfaces of floors and ceilings.
-    </td>
-</tr>
-<tr><td valign=\"top\">
-    <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/36\">&#35;36</a></td>
-    <td valign=\"top\">
-         High window frame temperatures.
-    </td>
-</tr>
-</table>
-
-<p>
-Note:
-</p>
-<ul>
-<li>
-The version number scheme has been changed. It is now identical to the one used by the Modelica Standard Library.
-Versions are identified with two numbers <code>x.y</code> and a build number. The first official
-release of each version has the build number <code>1</code>. For each released bug fix,
-the build number is incremented.
-See
-<code>Modelica.UsersGuide.ReleaseNotes.VersionManagement</code> for details.
-</li>
-<li>
-To allow adding scripts for multiple simulation environments,
-all scripts have been moved to the directory <code>Buildings/Resources/Scripts/Dymola</code> and the annotation that
-generates the entry in the <code>Command</code> pull down menu has been changed to
-<code>__Dymola_Commands(file=...)</code>
-</li>
-</ul>
-</html>"));
-  end Version_1_0_build1;
-
-  class Version_0_12_0 "Version 0.12.0"
-    extends Modelica.Icons.ReleaseNotes;
-  annotation (preferredView="info", Documentation(info="<html>
-<p>
-<b>Note:</b> The packages whose name ends with <code>Beta</code>
-are still being validated.
-</p>
-<p>
-The following <b style=\"color:red\">critical error</b> has been fixed (i.e. error
-that can lead to wrong simulation results):
-</p>
-
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr><td colspan=\"2\"><b>Buildings.ThermalZones</b></td></tr>
-  <tr><td valign=\"top\"><code>Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange</code></td>
-      <td valign=\"top\">The model <code>Buildings.ThermalZones.Detailed.BaseClasses.InfraredRadiationExchange</code>
-      had an error in the view factor approximation.
-      The error caused too much radiosity to flow from large to small surfaces because the law of reciprocity
-      for view factors was not satisfied. This led to low surface temperatures if a surface had a large area
-      compared to other surfaces.
-      The bug has been fixed by rewriting the view factor calculation.
-      </td>
-  </tr>
-</table>
-
-<p>
-The following improvements and additions have been made:
-</p>
-<ul>
-<li>
-Updated library to Modelica 3.2.
-</li>
-<li>
-Added <code>homotopy</code> operator.
-</li>
-<li>
-Restructured package <code>Buildings.HeatTransfer</code>.
-</li>
-<li>
-Rewrote the models in <code>Buildings.Fluid.Actuators</code> to avoid having the flow coefficient
-<code>k</code> as an algebraic variable.
-This increases robustness.
-</li>
-<li>
-Rewrote energy, species and trace substance balance in
-<code>Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</code>
-to better handle zero mass flow rate.
-</li>
-<li>
-Implemented functions <code>enthalpyOfCondensingGas</code> and <code>saturationPressure</code>
-in single substance media
-to allow use of the room model with media that do not contain water vapor.
-</li>
-<li>
-Revised <code>Buildings.Fluid.Sources.Outside</code>
-to allow use of the room model with media that do not contain water vapor.
-</li>
-</ul>
-</html>"));
-  end Version_0_12_0;
-
-  class Version_0_11_0 "Version 0.11.0"
-    extends Modelica.Icons.ReleaseNotes;
-  annotation (preferredView="info", Documentation(info="<html>
-<p>
-<b>Note:</b> The packages whose name ends with <code>Beta</code>
-are still being validated.
-</p>
-
-<ul>
-<li>
-Added the package
-<code>Buildings.ThermalZones.Detailed</code> to compute heat transfer in rooms
-and through the building envelope.
-Multiple instances of these models can be connected to create
-a multi-zone building model.
-</li>
-<li>
-Added the package
-<code>Buildings.HeatTransfer.Windows</code>
-to compute heat transfer (solar radiation, infrared radiation,
-convection and conduction) through glazing systems.
-</li>
-<li>
-In package
-<code>Buildings.Fluid.Chillers</code>, added the chiller models
-<code>Buildings.Fluid.Chillers.ElectricReformulatedEIR</code>
-and
-<code>Buildings.Fluid.Cphillers.ElectricEIR</code>, and added
-the package
-<code>Buildings.Fluid.Chillers.Data</code>
-that contains data sets of chiller performance data.
-</li>
-<li>
-Added package
-<code>Buildings.BoundaryConditions</code>
-with models to compute boundary conditions, such as
-solar irradiation and sky temperature.
-</li>
-<li>
-Added package
-<code>Buildings.Utilities.IO.WeatherData</code>
-with models to read weather data in the TMY3 format.
-</li>
-<li>
-Revised the package
-<code>Buildings.Fluid.Sensors</code>.
-</li>
-<li>
-Revised the package
-<code>Buildings.Fluid.HeatExchangers.CoolingTowers</code>.
-</li>
-<li>
-In
-<code>Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger</code>
-and
-<code>Buildings.Fluid.Interfaces.StaticFourPortHeatMassExchanger</code>,
-fixed bug in energy and moisture balance that affected results if a component
-adds or removes moisture to the air stream.
-In the old implementation, the enthalpy and species
-outflow at <code>port_b</code> was multiplied with the mass flow rate at
-<code>port_a</code>. The old implementation led to small errors that were proportional
-to the amount of moisture change. For example, if the moisture added by the component
-was <code>0.005 kg/kg</code>, then the error was <code>0.5%</code>.
-Also, the results for forward flow and reverse flow differed by this amount.
-With the new implementation, the energy and moisture balance is exact.
-</li>
-<li>
-In
-<code>Buildings.Fluid.Interfaces.ConservationEquation</code> and in
-<code>Buildings.Media.Interfaces.PartialSimpleMedium</code>, set
-nominal attribute for medium to provide consistent normalization.
-Without this change, Dymola 7.4 uses different values for the nominal attribute
-based on the value of <code>Advanced.OutputModelicaCodeWithJacobians=true/false;</code>
-in the model
-<code>Buildings.Examples.HydronicHeating</code>.
-</li>
-<li>
-Fixed bug in energy balance of
-<code>Buildings.Fluid.Chillers.Carnot</code>.
-</li>
-<li>
-Fixed bug in efficiency curves in package
-<code>Buildings.Fluid.Movers.BaseClasses.Characteristics</code>.
-</li>
-</ul>
-</html>"));
-  end Version_0_11_0;
-
-  class Version_0_10_0 "Version 0.10.0"
-    extends Modelica.Icons.ReleaseNotes;
-  annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Added package
-<code>Buildings.Airflow.Multizone</code>
-with models for multizone airflow and contaminant transport.
-</li>
-<li>
-Added the model
-<code>Buildings.Utilities.Comfort.Fanger</code>
-for thermal comfort calculations.
-</li>
-<li>
-Rewrote
-<code>Buildings.Fluid.Storage.BaseClasses.ThirdOrderStratifier</code>, which is used in
-<code>Buildings.Fluid.Storage.StratifiedEnhanced</code>,
-to avoid state events when the flow reverses.
-This leads to faster and more robust simulation.
-</li>
-<li>
-In models of package
-<code>Buildings.Fluid.MixingVolumes</code>,
-added nominal value for <code>mC</code> to avoid wrong trajectory
-when concentration is around 1E-7.
-See also <a href=\"https://trac.modelica.org/Modelica/ticket/393\">
-https://trac.modelica.org/Modelica/ticket/393</a>.
-</li>
-<li>
-Fixed bug in fan and pump models that led to too small an enthalpy
-increase across the flow device.
-</li>
-<li>
-In model <code>Buildings.Fluid.Movers.FlowControlled_dp</code>,
-changed <code>assert(dp_in &ge; 0, ...)</code> to <code>assert(dp_in &ge; -0.1, ...)</code>.
-The former implementation triggered the assert if <code>dp_in</code> was solved for
-in a nonlinear equation since the solution can be slightly negative while still being
-within the solver tolerance.
-</li>
-<li>
-Added model
-<code>Buildings.Controls.SetPoints.Table</code>
-that allows the specification of a floating setpoint using a table of values.
-</li>
-<li>
-Revised model
-<code>Buildings.Fluid.HeatExchangers.Radiators.RadiatorEN442_2</code>.
-The new version has exactly the same nominal power during the simulation as specified
-by the parameters. This also required a change in the parameters.
-</li>
-</ul>
-</html>"));
-  end Version_0_10_0;
-
-  class Version_0_9_1 "Version 0.9.1"
-    extends Modelica.Icons.ReleaseNotes;
-  annotation (preferredView="info", Documentation(info="<html>
-<p>
-The following <b style=\"color:red\">critical error</b> has been fixed (i.e. error
-that can lead to wrong simulation results):
-</p>
-
-<table class=\"releaseTable\" summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\" style=\"border-collapse:collapse;\">
-  <tr><td colspan=\"2\"><b>Buildings.Fluid.Storage.</b></td></tr>
-  <tr><td valign=\"top\"><code>Buildings.Fluid.Storage.StratifiedEnhanced</code></td>
-      <td valign=\"top\">The model <code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code>
-      had a sign error that lead to a wrong energy balance.
-      The model that was affected by this error is
-      <code>Buildings.Fluid.Storage.StratifiedEnhanced</code>.
-      The model
-      <code>Buildings.Fluid.Storage.Stratified</code> was not affected.<br/>
-      The bug has been fixed by using the newly introduced model
-      <code>Buildings.Fluid.Storage.BaseClasses.ThirdOrderStratifier</code>. This model
-      uses a third-order upwind scheme to reduce the numerical dissipation instead of the
-      correction term that was used in <code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code>.
-      The model <code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code> has been removed since it
-      also led to significant overshoot in temperatures when the stratification was pronounced.
-      </td>
-  </tr>
-</table>
-</html>"));
-  end Version_0_9_1;
-
-  class Version_0_9_0 "Version 0.9.0"
-    extends Modelica.Icons.ReleaseNotes;
-  annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Added the following heat exchanger models
-<ul>
-<li>
-<code>Buildings.Fluid.HeatExchangers.DryEffectivenessNTU</code>
-for a sensible heat exchanger that uses the <code>epsilon-NTU</code>
-relations to compute the heat transfer.
-</li>
-<li>
-<code>Buildings.Fluid.HeatExchangers.DryCoilCounterFlow</code> and
-<code>Buildings.Fluid.HeatExchangers.WetCoilCounterFlow</code>
-to model a coil without and with water vapor condensation. These models
-approximate the coil as a counterflow heat exchanger.
-</li>
-</ul>
-</li>
-<li>
-Revised air damper
-<code>Buildings.Fluid.Actuators.BaseClasses.exponentialDamper</code>.
-The new implementation avoids warnings and leads to faster convergence
-since the solver does not attempt anymore to solve for a variable that
-needs to be strictly positive.
-</li>
-<li>
-Revised package
-<code>Buildings.Fluid.Movers</code>
-to allow zero flow for some pump or fan models.
-If the input to the model is the control signal <code>y</code>, then
-the flow is equal to zero if <code>y=0</code>. This change required rewriting
-the package to avoid division by the rotational speed.
-</li>
-<li>
-Revised package
-<code>Buildings.HeatTransfer</code>
-to include a model for a multi-layer construction, and to
-allow individual material layers to be computed steady-state or
-transient.
-</li>
-<li>
-In package  <code>Buildings.Fluid</code>, changed models so that
-if the parameter <code>dp_nominal</code> is set to zero,
-then the pressure drop equation is removed. This allows, for example,
-to model a heating and a cooling coil in series, and lump there pressure drops
-into a single element, thereby reducing the dimension of the nonlinear system
-of equations.
-</li>
-<li>
-Added model <code>Buildings.Controls.Continuous.LimPID</code>, which is identical to
-<code>Modelica.Blocks.Continuous.LimPID</code>, except that it
-allows reverse control action. This simplifies use of the controller
-for cooling applications.
-</li>
-<li>
-Added model <code>Buildings.Fluid.Actuators.Dampers.MixingBox</code> for an outside air
-mixing box with air dampers.
-</li>
-<li>
-Changed implementation of flow resistance in
-<code>Buildings.Fluid.Actuators.Dampers.MixingBoxMinimumFlow</code>. Instead of using a
-fixed resistance and a damper model in series, only one model is used
-that internally adds these two resistances. This leads to smaller systems
-of nonlinear equations.
-</li>
-<li>
-Changed
-<code>Buildings.Media.PerfectGases.MoistAir.T_phX</code> (and by inheritance all
-other moist air medium models) to first compute <code>T</code>
-in closed form assuming no saturation. Then, a check is done to determine
-whether the state is in the fog region. If the state is in the fog region,
-then <code>Internal.solve</code> is called. This new implementation
-can lead to significantly shorter computing
-time in models that frequently call <code>T_phX</code>.
-</li>
-<li>
-Added package
-<code>Buildings.Media.GasesConstantDensity</code> which contains medium models
-for dry air and moist air.
-The use of a constant density avoids having pressure as a state variable in mixing volumes. Hence, fast transients
-introduced by a change in pressure are avoided.
-The drawback is that the dimensionality of the coupled
-nonlinear equation system is typically larger for flow
-networks.
-</li>
-<li>
-In
-<code>Buildings.Fluid.Actuators.BaseClasses.PartialDamperExponential</code>,
-added default value for parameter <code>A</code> to avoid compilation error
-if the parameter is disabled but not specified.
-</li>
-<li>
-Simplified the mixing volumes in
-<code>Buildings.Fluid.MixingVolumes</code> by removing the port velocity,
-pressure drop and height.
-</li>
-</ul>
-</html>"));
-  end Version_0_9_0;
-
-  class Version_0_8_0 "Version 0.8.0"
-    extends Modelica.Icons.ReleaseNotes;
-              annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-In
-<code>Buildings.Fluid.Interfaces.ConservationEquation</code>,
-added to <code>Medium.BaseProperties</code> the initialization
-<code>X(start=X_start[1:Medium.nX])</code>. Previously, the initialization
-was only done for <code>Xi</code> but not for <code>X</code>, which caused the
-medium to be initialized to <code>reference_X</code>, ignoring the value of <code>X_start</code>.
-</li>
-<li>
-Renamed <code>Buildings.Media.PerfectGases.MoistAirNonSaturated</code>
-to <code>Buildings.Media.PerfectGases.MoistAirUnsaturated</code>
-and <code>Buildings.Media.GasesPTDecoupled.MoistAirNoLiquid</code>
-to
-<code>Buildings.Media.Air</code>,
-and added <code>assert</code> statements if saturation occurs.
-</li>
-<li>
-Added regularizaation near zero flow to
-<code>Buildings.Fluid.HeatExchangers.ConstantEffectiveness</code>
-and
-<code>Buildings.Fluid.MassExchangers.ConstantEffectiveness</code>.
-</li>
-<li>
-Fixed bug regarding temperature offset in
-<code>Buildings.Media.PerfectGases.MoistAirUnsaturated.T_phX</code>.
-</li>
-<li>
-Added implementation of function
-<code>Buildings.Media.Air.enthalpyOfNonCondensingGas</code> and its derivative.
-</li>
-<li>
-In <code>Buildings.Media.PerfectGases.MoistAir</code>, fixed
-bug in implementation of <code>Buildings.Media.PerfectGases.MoistAir.T_phX</code>.
-In the previous version, it computed the inverse of its parent class,
-which gave slightly different results.
-</li>
-<li>
-In <code>Buildings.Utilities.IO.BCVTB.BCVTB</code>, added parameter to specify
-the value to be sent to the BCVTB at the first data exchange,
-and added parameter that deactivates the interface. Deactivating
-the interface is sometimes useful during debugging.
-</li>
-<li>
-In <code>Buildings.Media.GasesPTDecoupled.MoistAir</code> and in
-<code>Buildings.Media.PerfectGases.MoistAir</code>, added function
-<code>enthalpyOfNonCondensingGas</code> and its derivative.
-</li>
-<li>
-In <code>Buildings.Media</code>,
-fixed bug in implementations of derivatives.
-</li>
-<li>
-Added model
-<code>Buildings.Fluid.Storage.ExpansionVessel</code>.
-</li>
-<li>
-Added Wrapper function <code>Buildings.Fluid.Movers.BaseClasses.Characteristics.solve</code>
-for <code>Modelica.Math.Matrices.solve</code>. This is currently needed since
-<code>Modelica.Math.Matrices.solve</code> does not specify a
-derivative.
-</li>
-<li>
-Fixed bug in
-<code>Buildings.Fluid.Storage.Stratified</code>.
-In the previous version,
-for computing the heat conduction between the top (or bottom) segment and
-the outside,
-the whole thickness of the water volume was used
-instead of only half the thickness.
-</li>
-<li>
-In <code>Buildings.Media.ConstantPropertyLiquidWater</code>, added the option to specify
-a compressibility. This can help reducing the size of the coupled nonlinear system of
-equations, at the expense of introducing stiffness. This change required to change
-the inheritance tree of the medium. Its base class is now
-<code>Buildings.Media.Interfaces.PartialSimpleMedium</code>,
-which contains the equation for the compressibility. The default setting will model
-the flow as incompressible.
-</li>
-<li>
-In <code>Buildings.Controls.Continuous.Examples.PIDHysteresis</code>
-and <code>Buildings.Controls.Continuous.Examples.PIDHysteresisTimer</code>,
-fixed error in default parameter <code>eOn</code>.
-Fixed error by introducing parameter <code>Td</code>,
-which used to be hard-wired in the PID controller.
-</li>
-<li>
-Added more models for fans and pumps to the package
-<code>Buildings.Fluid.Movers</code>.
-The models are similar to the ones in
-<code>Modelica.Fluid.Machines</code> but have been adapted for
-air-based systems, and to include more characteristic curves
-in
-<code>Buildings.Fluid.Movers.BaseClasses.Characteristics</code>.
-The new models are better suited than the existing fan model
-<code>Buildings.Fluid.Movers.FlowMachinePolynomial</code> for zero flow rate.
-</li>
-<li>
-Added an optional mixing volume to <code>Buildings.Fluid.BaseClasses.PartialThreeWayResistance</code>
-and hence to the flow splitter and to the three-way valves. This often breaks algebraic loops and provides a state for the temperature if the mass flow rate goes to zero.
-</li>
-</ul>
-</html>"));
-  end Version_0_8_0;
-
-  class Version_0_7_0 "Version 0.7.0"
-    extends Modelica.Icons.ReleaseNotes;
-              annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Updated library from Modelica_Fluid to Modelica.Fluid 1.0
-</li>
-<li>
-Merged sensor and source models from Modelica.Fluid to Buildings.Fluid.
-</li>
-<li> Added sensor for sensible and latent enthalpy flow rate,
-<code>Buildings.Fluid.Sensors.SensibleEnthalpyFlowRate</code> and
-<code>Buildings.Fluid.Sensors.LatentEnthalpyFlowRate</code>.
-These sensors are needed, for example, to interface air-conditioning
-systems that are modeled with Modelica with the Building Controls
-Virtual Test Bed.
-</li>
-</ul>
-</html>"));
-  end Version_0_7_0;
-
-  class Version_0_6_0 "Version 0.6.0"
-    extends Modelica.Icons.ReleaseNotes;
-      annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Added the package
-<code>Buildings.Utilities.IO.BCVTB</code>
-which contains an interface to the
-<a href=\"http://simulationresearch.lbl.gov/bcvtb\">Building Controls Virtual Test Bed.</a>
-</li>
-<li>
-Updated license to Modelica License 2.
-</li>
-<li>
-Replaced
-<code>Buildings.Utilities.Psychrometrics.HumidityRatioPressure</code>
-by
-<code>Buildings.Utilities.Psychrometrics.HumidityRatio_pWat</code>
-and
-<code>Buildings.Utilities.Psychrometrics.VaporPressure_X</code>
-because the old model used <code>RealInput</code> ports, which are obsolete
-in Modelica 3.0.
-</li>
-<li>
-Changed the base class
-<code>Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</code>
-to enable computation of pressure drop of mechanical equipment.
-</li>
-<li>
-Introduced package
-<code>Buildings.Fluid.BaseClasses.FlowModels</code> to model pressure drop,
-and rewrote
-<code>Buildings.Fluid.BaseClasses.PartialResistance</code>.
-</li>
-<li>
-Redesigned package
-<code>Buildings.Utilities.Math</code> to allow having blocks and functions
-with the same name. Functions are now in
-<code>Buildings.Utilities.Math.Functions</code>.
-</li>
-<li>
-Fixed sign error in
-<code>Buildings.Fluid.Storage.BaseClasses.Stratifier</code>
-which caused a wrong energy balance in
-<code>Buildings.Fluid.Storage.StratifiedEnhanced</code>.
-</li>
-<li>
-Renamed
-<code>Buildings.Fluid.HeatExchangers.HeaterCoolerIdeal</code> to
-<code>Buildings.Fluid.HeatExchangers.HeaterCoolerPrescribed</code>
-to have the same nomenclatures as is used for
-<code>Buildings.Fluid.MassExchangers.HumidifierPrescribed</code>
-</li>
-<li>
-In
-<code>Buildings.Fluid/Actuators/BaseClasses/PartialDamperExponential</code>,
-added option to compute linearization near zero based on
-the fraction of nominal flow instead of the Reynolds number.
-This was set as the default, as it leads most reliably to a model
-parametrization that leads to a derivative <code>d m_flow/d p</code>
-near the origin that is not too steep for a Newton-based solver.
-</li>
-<li>
-In damper and VAV box models, added optional parameters
-to allow specifying the nominal face velocity instead of the area.
-</li>
-<li>
-Set nominal attribute for pressure drop <code>dp</code> in
-<code>Buildings.Fluid.BaseClasses.PartialResistance</code> and in its
-child classes.
-</li>
-<li>
-Added models for chiller
-(<code>Buildings.Fluid.Chillers.Carnot</code>),
-for occupancy
-(<code>Buildings.Controls.SetPoints.OccupancySchedule</code>) and for
-blocks that take a vector as an argument
-(<code>Buildings.Utilities.Math.Min</code>,
-<code>Buildings.Utilities.Math.Max</code>, and
-<code>Buildings.Utilities.Math.Average</code>).
-</li>
-<li>
-Changed various variable names to be consistent with naming
-convention used in Modelica.Fluid 1.0.
-</li>
-</ul>
-</html>"));
-  end Version_0_6_0;
-
-  class Version_0_5_0 "Version 0.5.0"
-    extends Modelica.Icons.ReleaseNotes;
-      annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Updated library to Modelica.Fluid 1.0.
-</li>
-<li>
-Moved most examples from package <code>Buildings.Fluid.Examples</code> to the
-example directory in the package of the individual model.
-</li>
-<li>
-Renamed package <code>Buildings.Utilites.Controls</code> to
-<code>Buildings.Utilites.Diagnostics</code>.
-</li>
-<li>
-Introduced packages
-<code>Buildings.Controls</code>,
-<code>Buildings.HeatTransfer</code>
-(which contains models for heat transfer that generally does not involve
-modeling of the fluid flow),
-<code>Buildings.Fluid.Boilers</code> and
-<code>Buildings.Fluid.HeatExchangers.Radiators</code>.
-</li>
-<li>
-Changed valve models in <code>Buildings.Fluid.Actuators.Valves</code> so that
-<code>Kv</code> or <code>Cv</code> can
-be used as the flow coefficient (in [m3/h] or [USG/min]).
-</li>
-</ul>
-</html>"));
-  end Version_0_5_0;
-
-  class Version_0_4_0 "Version 0.4.0"
-    extends Modelica.Icons.ReleaseNotes;
-      annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Added package <code>Buildings.Fluid.Storage</code>
-with models for thermal energy storage.
-</li>
-<li>
-Added a steady-state model for a heat and moisture exchanger with
-constant effectiveness.
-See <code>Buildings.Fluid.MassExchangers.ConstantEffectiveness</code>
-</li>
-<li>
-Added package <code>Buildings.Utilities.Reports</code>.
-The package contains models that facilitate reporting.
-</li>
-</ul>
-</html>"));
-  end Version_0_4_0;
-
-  class Version_0_3_0 "Version 0.3.0"
-    extends Modelica.Icons.ReleaseNotes;
-      annotation (preferredView="info", Documentation(info=
-                   "<html>
-<ul>
-<li>
-Added package <code>Buildings.Fluid.Sources</code>.
-The package contains models for modeling species that
-do not affect the medium balance of volumes. This can be used to track
-for example carbon dioxide or other species that have a small concentration.
-</li>
-<li>
-The package <code>Buildings.Fluid.Actuators.Motors</code> has been added.
-The package contains a motor model for valves and dampers.
-</li>
-<li>
-The package <code>Buildings.Media</code> has been reorganized and
-the new medium model
-<code>Buildings.Media.GasesPTDecoupled.MoistAir</code>
-has been added.
-<br/>
-In addition, this package now contains a bug fix that is needed for Modelica 2.2.1 and 2.2.2.
-The bugs are fixed by using a new
-base class
-<code>Buildings.Media.Interfaces.PartialSimpleIdealGasMedium</code>
- (that fixes the bugs) instead of
-<code>Modelica.Media.Interfaces.PartialSimpleIdealGasMedium</code>.
-In the original implementation, initial states of fluid volumes can be far away from
-the steady-state value because of an inconsistent implementation of the enthalpy
-and internal energy.
-When the <code>Buildings</code> library is upgraded to
-to Modelica 3.0.0, it should be safe to remove this bug fix.
-</li>
-<li>
-The package <code>Buildings.Fluid.HeatExchangers</code>
-has been revised and several models have been renamed.
-The heat exchanger models have been revised to allow computing the fluid volumes either
-dynamically, or in steady-state.
-</li>
-<li>
-The damper with exponential opening characteristic has been revised to allow control signals
-over the whole range between <code>0</code> and <code>1</code>. This was in earlier versions restricted.
-In the same model, a bug was fixed that caused the flow to be largest for <code>y=0</code>, i.e., when the damper is closed.
-</li>
-<li>
-Additional models for psychrometric equations have been added. The new models contain equations
-that convert dew point temperature and water vapor pressure, as well
-as water vapor concentration and water vapor pressure.
-</li>
-<li>
-A new mixing volume has been added that allows latent heat exchange with the volume.
-This model can be used to model a volume of moist air with water vapor condensation
-inside the volume. The condensate is removed from the volume in its liquid phase.
-</li>
-</ul>
-</html>"));
-  end Version_0_3_0;
-
-  class Version_0_2_0 "Version 0.2.0"
-    extends Modelica.Icons.ReleaseNotes;
-      annotation (preferredView="info", Documentation(info=
-                   "<html>
-<p>
-New in this version are models for two and three way valves.
-In addition, the <code>Fluids</code> package has been slightly revised.
-The package <code>Fluid.BaseClasses</code> has been added because in
-the previous version, partial models for fixed resistances
-where part of the <code>Actuator</code> package.
-</p>
-</html>"));
-  end Version_0_2_0;
-
-  class Version_0_1_0 "Version 0.1.0"
-    extends Modelica.Icons.ReleaseNotes;
-      annotation (preferredView="info", Documentation(info="<html>
-<p>
-First release of the library.
-</p>
-<p>
-This version contains basic models for modeling building HVAC systems.
-It also contains new medium models in the package
-<code>Buildings.Media</code>. These medium models
-have simpler property functions than the ones from
-<code>Modelica.Media</code>. For example,
-there is medium model with constant heat capacity which is often sufficiently
-accurate for building HVAC simulation, in contrast to the more detailed models
-from <code>Modelica.Media</code> that are valid in
-a larger temperature range, at the expense of introducing non-linearities due
-to the medium properties.
-</p>
-</html>"));
-  end Version_0_1_0;
-
-    annotation (preferredView="info",
-    Documentation(info="<html>
-<p>
-This section summarizes the changes that have been performed
-on the Buildings library.
-</p>
-<ul>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_11_0_0\">Version 11.0.0</a> (xxx, 2023)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_10_0_0\">Version 10.0.0</a> (September 5, 2023)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_1_1\">Version 9.1.1</a> (September 5, 2023)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_1_0\">Version 9.1.0</a> (December 6, 2022)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_9_0_0\">Version 9.0.0</a> (May 31, 2022)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_3\">Version 8.1.3</a> (May 31, 2022)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_2\">Version 8.1.2</a> (May 26, 2022)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_1\">Version 8.1.1</a> (May 12, 2022)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_1_0\">Version 8.1.0</a> (December 9, 2021)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_8_0_0\">Version 8.0.0</a> (June 8, 2021)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_7_0_2\">Version 7.0.2</a> (December 9, 2021)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_7_0_1\">Version 7.0.1</a> (June 4, 2021)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_7_0_0\">Version 7.0.0</a> (May 28, 2020)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_6_0_0\">Version 6.0.0</a> (July 15, 2019)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_5_1_0\">Version 5.1.0</a> (June 14, 2018)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_5_0_1\">Version 5.0.1</a> (November 22, 2017)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_5_0_0\">Version 5.0.0</a> (November 17, 2017)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_4_0_0\">Version 4.0.0</a> (March 29, 2017)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_3_0_0\">Version 3.0.0</a> (March 29, 2016)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_2_1_0\">Version 2.1.0</a> (July 13, 2015)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_2_0_0\">Version 2.0.0</a> (May 4, 2015)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_6_build1\">Version 1.6 build1</a> (June 19, 2014)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_5_build3\">Version 1.5 build3</a> (February 12, 2014)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_5_build2\">Version 1.5 build2</a> (December 13, 2013)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_5_build1\">Version 1.5 build1</a> (October 24, 2013)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_4_build1\">Version 1.4 build1</a> (May 15, 2013)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_3_build1\">Version 1.3 build1</a> (January 8, 2013)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_2_build1\">Version 1.2 build1</a> (July 26, 2012)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_1_build1\">Version 1.1 build1</a> (February 29, 2012)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_0_build2\">Version 1.0 build2</a> (December 8, 2011)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_1_0_build1\">Version 1.0 build1</a> (November 4, 2011)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_12_0\">Version 0.12.0 </a> (May 6, 2011)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_11_0\">Version 0.11.0 </a> (March 17, 2011)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_10_0\">Version 0.10.0 </a> (July 30, 2010)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_9_1\">Version 0.9.1 </a> (June 24, 2010)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_9_0\">Version 0.9.0 </a> (June 11, 2010)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_8_0\">Version 0.8.0 </a> (February 6, 2010)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_7_0\">Version 0.7.0 </a> (September 29, 2009)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_6_0\">Version 0.6.0 </a> (May 15, 2009)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_5_0\">Version 0.5.0 </a> (February 19, 2009)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_4_0\">Version 0.4.0 </a> (October 31, 2008)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_3_0\">Version 0.3.0 </a> (September 30, 2008)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_2_0\">Version 0.2.0 </a> (June 17, 2008)
-</li>
-<li>
-<a href=\"modelica://Buildings.UsersGuide.ReleaseNotes.Version_0_1_0\">Version 0.1.0 </a> (May 27, 2008)
-</li>
-</ul>
-
-</html>"));
-  end ReleaseNotes;
-
-  class Contact "Contact"
-    extends Modelica.Icons.Contact;
-    annotation (preferredView="info",
-    Documentation(info="<html>
-<h4><font color=\"#008000\" size=\"5\">Contact</font></h4>
-<p>
-The development of the Buildings library is organized by<br/>
-<a href=\"http://simulationresearch.lbl.gov/wetter\">Michael Wetter</a><br/>
-    Lawrence Berkeley National Laboratory (LBNL)<br/>
-    One Cyclotron Road<br/>
-    Bldg. 90-3147<br/>
-    Berkeley, CA 94720<br/>
-    USA<br/>
-    email: <a href=\"mailto:MWetter@lbl.gov\">MWetter@lbl.gov</a><br/>
-</p>
-</html>"));
-  end Contact;
-
-  class Acknowledgements "Acknowledgements"
-    extends Modelica.Icons.Information;
-    annotation (preferredView="info",
-    Documentation(info="<html>
-<h4><font color=\"#008000\" size=\"5\">Acknowledgements</font></h4>
-<p>
- The development of this library was supported by:
-</p>
- <ul>
- <li>The U.S. Department of Energy, Assistant Secretary for
-  Energy Efficiency and Renewable Energy,
-  <ul>
-  <li>
-  Office of Building
-  Technologies, under Contracts Number DE-AC02-05CH11231 and DE-EE0007688,
-  </li>
-  <li>
-  Advanced Manufacturing Office, under Award Number DE-EE0009139, and
- </li>
-  <li>
-  Geothermal Technologies Office, under Award Number DE-AC02-05CH11231.
-  </li>
-  </ul>
-  </li>
- <li>
-  The California Energy Commission, Public Interest Energy Research Program, Buildings End Use Energy Efficiency Program, Award Number 500-10-052.
- </li>
- </ul>
-<p>
-The core of this library is the Modelica IBPSA library,
-a free open-source library with basic models that codify best practices for
-the implementation of models for building and community energy and control systems.
-The development of the IBPSA library is organized through the
-<a href=\"https://ibpsa.github.io/project1\">IBPSA Project 1</a>
-of the International Building Performance Simulation Association (IBPSA).
-From 2012 to 2017, the development was organized through the
-<a href=\"http://www.iea-annex60.org\">Annex 60 project</a>
-of the Energy in Buildings and Communities Programme of the International Energy Agency (IEA EBC).
-</p>
- <p>
-  The <a href=\"modelica://Buildings.Airflow.Multizone\">package for multizone airflow modeling</a>
-  and the <a href=\"modelica://Buildings.Utilities.Comfort.Fanger\">model for thermal comfort</a>
-  was contributed by the United Technologies Research Center, which also contributed to the
-  validation of the <a href=\"modelica://Buildings.ThermalZones.Detailed.MixedAir\">room heat transfer model</a>.
-</p>
-<p>
-We thank Dietmar Winkler from Telemark University College for the various feedback that
-helped improve the organization and structure of the library.
-</p>
-<p>
-The following people have directly contributed to the implementation of the Buildings library
-(many others have contributed by other means than model implementation):
-</p>
-<ul>
-<li>Saranya Anbarasu, Pennsylvania State University, USA
-</li>
-<li>David Blum, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Marco Bonvini, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Felix B&uuml;nning, RWTH Aachen, Germany
-</li>
-<li>Guokai Chen, University College London, UK
-</li>
-<li>Massimo Cimmino, Polytechnique Montr&eacute;al, Canada
-</li>
-<li>Rainer Czetina, University of Applied Sciences Technikum Wien, Austria
-</li>
-<li>Hagar Elarga, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Hongxiang \"Casper\" Fu, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Yangyang Fu, University of Colorado Boulder, Colorado, USA
-</li>
-<li>Antoine Gautier, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Sebastian Giglmayr, University of Applied Sciences Technikum Wien, Austria
-</li>
-<li>Milica Grahovac, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Peter Grant, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Brandon M. Hencey, Cornell University, USA
-</li>
-<li>Sen Huang, Pacific Northwest National Laboratory, USA
-</li>
-<li>Kathryn Hinkelman, University of Colorado Boulder, Colorado, USA
-</li>
-<li>Jianjun Hu, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Roman Ilk, University of Applied Sciences Technikum Wien, Austria
-</li>
-<li>Dan Li, University of Miami, Florida, USA
-</li>
-<li>Filip Jorissen, KU Leuven, Belgium
-</li>
-<li>Thierry S. Nouidui, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Markus Nurschinger, University of Applied Sciences Technikum Wien, Austria
-</li>
-<li>Xiufeng Pang, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Damien Picard, KU Leuven, Belgium
-</li>
-<li>Kaustubh Phalak, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Thomas Sevilla, University of Miami, Florida, USA
-</li>
-<li>Chengnan Shi, University of Colorado Boulder, Colorado, USA
-</li>
-<li>Martin Sj&ouml;lund, Link&ouml;ping University, Sweden
-</li>
-<li>Matthis Thorade, Berlin University of the Arts, Germany
-</li>
-<li>Wei Tian, University of Miami, Florida, USA
-</li>
-<li>Armin Teskeredzic, Mechanical Engineering Faculty Sarajevo and GIZ, Bosnia and Herzegovina
-</li>
-<li>Rafael Velazquez, University of Seville, Spain
-</li>
-<li>Pierre Vigouroux, Institut National des Sciences Appliquees, France
-</li>
-<li>Sebastian Vock, University of Applied Sciences Technikum Wien, Austria
-</li>
-<li>Vladimir Vukovic, Austrian Institute of Technology, Austria
-</li>
-<li>Jing Wang, University of Colorado Boulder, Colorado, USA
-</li>
-<li>Michael Wetter, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Tea Zakula, University of Zagreb, Croatia
-</li>
-<li>Ettore Zanetti, Politecnico di Milano, Italy
-</li>
-<li>Rebecca Zarin Pass, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Kun Zhang, Lawrence Berkeley National Laboratory, USA
-</li>
-<li>Wangda Zuo, University of Colorado Boulder, Colorado, USA
-</li>
-</ul>
-</html>"));
-  end Acknowledgements;
-
-  class License "License"
-    extends Modelica.Icons.Information;
-    annotation (preferredView="info",
-    Documentation(info="<html>
-<h4>License</h4>
-<p>
-Modelica Buildings Library. Copyright (c) 1998-2024
-Modelica Association,
-International Building Performance Simulation Association (IBPSA),
-The Regents of the University of California, through Lawrence Berkeley National Laboratory
-(subject to receipt of any required approvals from the U.S. Dept. of Energy) and
-contributors.
-All rights reserved.
-</p>
-<p>
-NOTICE.  This Software was developed under funding from the U.S. Department of Energy and
-the U.S. Government consequently retains certain rights.
-As such, the U.S. Government has been granted for itself and others acting on its behalf
-a paid-up, nonexclusive, irrevocable, worldwide license in the Software
-to reproduce, distribute copies to the public, prepare derivative works, and
-perform publicly and display publicly, and to permit other to do so.
-</p>
-<p>
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-</p>
-<ol>
-<li>
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-</li>
-<li>
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the distribution.
-</li>
-<li>
-Neither the names of the Modelica Association,
-International Building Performance Simulation Association (IBPSA),
-the University of California,
-Lawrence Berkeley National Laboratory,
-U.S. Dept. of Energy,
-nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-</li>
-</ol>
-<p>
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</p>
-<p>
-You are under no obligation whatsoever to provide any bug fixes, patches,
-or upgrades to the features, functionality or performance of the source code
-(\"Enhancements\") to anyone; however, if you choose to make your Enhancements
-available either publicly, or directly to Lawrence Berkeley National
-Laboratory, without imposing a separate written license agreement for such
-Enhancements, then you hereby grant the following license: a non-exclusive,
-royalty-free perpetual license to install, use, modify, prepare derivative
-works, incorporate into other computer software, distribute, and sublicense
-such enhancements or derivative works thereof, in binary and source code form.
-</p>
-<p>
-Note: The license is a revised 3 clause BSD license with an ADDED paragraph
-at the end that makes it easy to accept improvements.
-</p>
-<h4>Third Party License</h4>
-<p>
-To parse weather file, the function <code>getTimeSpan.c</code> uses
-third party code that uses the following license:
-</p>
-<p>
-Copyright (c) 2011 The NetBSD Foundation, Inc.<br/>
-All rights reserved.
-</p>
-<p>
-This code is derived from software contributed to The NetBSD Foundation
-by Christos Zoulas.
-</p>
-<p>
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-</p>
-<ol>
-<li>
-  Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-</li>
-<li>
-  Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-</li>
-</ol>
-<p>
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</p>
-</html>"));
-  end License;
-
-  annotation (preferredView="info",
-  Documentation(info="<html>
-<p>
-The <code>Buildings</code> library is a free open-source library for modeling of building energy and control systems.
-Many models are based on models from the package
-<a href=\"modelica://Modelica.Fluid\">Modelica.Fluid</a> and use
-the same ports to ensure compatibility with models from that library.
-</p>
-<p>
-The web page for this library is
-<a href=\"http://simulationresearch.lbl.gov/modelica\">http://simulationresearch.lbl.gov/modelica</a>.
-We welcome contributions from different users to further advance this library,
-whether it is through collaborative model development, through model use and testing
-or through requirements definition or by providing feedback regarding the model applicability
-to solve specific problems.
-</p>
-<p>
-The library has the following <i>User's Guides</i>:
-</p>
-<ol>
-<li>
-General information about the use of the <code>Buildings</code> library
-is available at
-<a href=\"http://simulationresearch.lbl.gov/modelica/userGuide\">
-http://simulationresearch.lbl.gov/modelica/userGuide</a>.
-This web site covers general information that is not specific to the
-use of individual packages or models.
-Discussed topics include
-how to get started, best practices, how to post-process results using Python,
-work-around for problems and how to develop models.<br/>
-</li>
-<li>
-Some packages have their own
-User's Guides that can be accessed by the links below.
-These User's Guides are explaining items that are specific to the
-particular package.<br/>
-<table summary=\"summary\" border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Airflow.Multizone.UsersGuide\">Airflow.Multizone</a>
-   </td>
-   <td valign=\"top\">Package for multizone airflow and contaminant transport.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.BoundaryConditions.UsersGuide\">BoundaryConditions</a>
-   </td>
-   <td valign=\"top\">Package for computing boundary conditions, such as solar irradiation.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Controls.OBC\">Controls.OBC</a>
-   </td>
-   <td valign=\"top\">Package with the Control Description Language (CDL) and with control sequences that are implemented using CDL.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Experimental.DHC\">Experimental.DHC</a>
-   </td>
-   <td valign=\"top\">Package with models for district heating and cooling systems.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.UsersGuide\">Fluid</a>
-   </td>
-   <td valign=\"top\">Package for one-dimensional fluid in piping networks with heat exchangers, valves, etc.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Actuators.UsersGuide\">Fluid.Actuators</a>
-   </td>
-   <td valign=\"top\">Package with valves and air dampers.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Cooling\">Fluid.DXSystems.Cooling</a>
-   </td>
-   <td valign=\"top\">Package with components for DX systems for cooling.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Heating\">Fluid.DXSystems.Heating</a>
-   </td>
-   <td valign=\"top\">Package with components for DX systems for heating.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.FMI.UsersGuide\">Fluid.FMI</a>
-   </td>
-   <td valign=\"top\">Package with blocks to export thermofluid flow models as Functional Mockup Units.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.HeatExchangers.ActiveBeams.UsersGuide\">Fluid.HeatExchangers.ActiveBeams</a>
-   </td>
-   <td valign=\"top\">Package with active beams.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.HydronicConfigurations.UsersGuide\">Fluid.HydronicConfigurations.UsersGuide</a>
-   </td>
-   <td valign=\"top\">Package with all major hydronic configurations of heating and cooling systems.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Cooling.UsersGuide\">Fluid.HeatExchangers.DXSystems.Cooling</a>
-   </td>
-   <td valign=\"top\">Package with direct evaporative cooling coils.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.DXSystems.Heating.UsersGuide\">Fluid.HeatExchangers.DXSystems.Heating</a>
-   </td>
-   <td valign=\"top\">Package with air source DX heating coils.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.HeatExchangers.RadiantSlabs.UsersGuide\">Fluid.HeatExchangers.RadiantSlabs</a>
-   </td>
-   <td valign=\"top\">Package with radiant slabs.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Movers.UsersGuide\">Fluid.Movers</a>
-   </td>
-   <td valign=\"top\">Package with fans and pumps.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Sensors.UsersGuide\">Fluid.Sensors</a>
-   </td>
-   <td valign=\"top\">Package with sensors.</td>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Storage.UsersGuide\">Fluid.Storage</a>
-   </td>
-   <td valign=\"top\">Package with storage tanks and an expansion vessel.</td>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.SolarCollectors.UsersGuide\">Fluid.SolarCollectors</a>
-   </td>
-   <td valign=\"top\">Package with solar collectors.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Fluid.Interfaces.UsersGuide\">Fluid.Interfaces</a>
-   </td>
-   <td valign=\"top\">Base models that can be used by developers to implement new models.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.HeatTransfer.UsersGuide\">HeatTransfer</a>
-   </td>
-   <td valign=\"top\">Package for heat transfer in building constructions.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Templates\">Templates</a>
-   </td>
-   <td valign=\"top\">Package with pre-configured templates of HVAC systems and their control sequences.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.UsersGuide.MixedAir\">ThermalZones.Detailed.UsersGuide.MixedAir</a>
-   </td>
-   <td valign=\"top\">Package for heat transfer in rooms and through the building envelope with the
-                      room air being modeled using the mixed air assumption.</td>
-</tr>
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.UsersGuide.CFD\">ThermalZones.Detailed.UsersGuide.CFD</a>
-   </td>
-   <td valign=\"top\">Package for heat transfer in rooms and through the building envelope with the
-                      room air being modeled using computational fluid dynamics.</td>
-</tr>
-
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.Detailed.Examples.FFD.UsersGuide\">ThermalZones.Detailed.Examples.FFD.UsersGuide</a>
-   </td>
-   <td valign=\"top\">Package with examples that use the Fast Fluid Dynamics program for
-                    the computational fluid dynamics.</td>
-</tr>
-
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.ThermalZones.EnergyPlus_9_6_0.UsersGuide\">ThermalZones.EnergyPlus.UsersGuide</a>
-   </td>
-   <td valign=\"top\">Package for Spawn of EnergyPlus with models that use EnergyPlus to simulate
-                    one or several building envelope models.</td>
-</tr>
-
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Utilities.IO.Python_3_8.UsersGuide\">Utilities.IO.Python_3_8</a>
-   </td>
-   <td valign=\"top\">Package to call Python functions from Modelica.</td>
-</tr>
-
-<tr><td valign=\"top\"><a href=\"modelica://Buildings.Utilities.Plotters.UsersGuide\">Utilities.Plotters</a>
-   </td>
-   <td valign=\"top\">Package that allow writing time series and scatter plots to an html output file.</td>
-</tr>
-
-</table><br/>
-</li>
-<li>
-There are also tutorials available at
-<a href=\"modelica://Buildings.Examples.Tutorial\">
-Buildings.Examples.Tutorial</a>.
-These tutorials contain step by step instructions for how to build system models.
-</li>
-</ol>
-</html>"));
-end UsersGuide;
-
 
 annotation (
 preferredView="info",
-version="11.0.0",
-versionDate="2023-09-05",
-dateModified="2023-09-05",
+version="11.0.1",
+versionDate="2024-04-09",
+dateModified="2024-04-09",
 uses(Modelica(version="4.0.0")),
 conversion(
   from(
-    version={"10.0.0"},
+    version={"10.0.0", "10.1.0"},
     script="modelica://Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_10_to_11.0.0.mos"),
   from(
-    version={"9.0.0", "9.1.0", "9.1.1"},
+    version={"9.0.0", "9.1.0", "9.1.1", "9.1.2"},
     script="modelica://Buildings/Resources/Scripts/Conversion/ConvertBuildings_from_9_to_10.0.0.mos"),
   from(
     version={"8.0.0", "8.1.0", "8.1.1", "8.1.2", "8.1.3"},
diff --git a/Buildings/package.order b/Buildings/package.order
index dbc4ec10240..1d19cee1b0f 100644
--- a/Buildings/package.order
+++ b/Buildings/package.order
@@ -4,6 +4,7 @@ Airflow
 Applications
 BoundaryConditions
 Controls
+DHC
 Electrical
 Fluid
 HeatTransfer
@@ -14,6 +15,5 @@ ThermalZones
 Utilities
 Types
 Examples
-Experimental
 BaseClasses
 Obsolete
diff --git a/README.md b/README.md
index 4a39e755f01..11d92eeccf5 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The main project site is http://simulationresearch.lbl.gov/modelica.
 
 ## Current release
 
-Download [Buildings Library 10.0.0 (2023-09-05)](https://github.com/lbl-srg/modelica-buildings/releases/download/v10.0.0/Buildings-v10.0.0.zip)
+Download [Buildings Library 11.0.0 (2024-04-09)](https://github.com/lbl-srg/modelica-buildings/releases/download/v11.0.0/Buildings-v11.0.0.zip)
 
 ## License