From ce2bb617e16a2cb17c1ae62cbc5f1841a9ba9de4 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 2 Oct 2023 13:16:25 -0700
Subject: [PATCH] Renamed connector

---
 .../BaseClasses/PartialHeatPumpHeatExchanger.mo |  6 +++++-
 .../Combined/HeatPumpHeatExchanger.mo           | 17 +++++++++--------
 .../Combined/HeatPumpHeatExchangerDHWTank.mo    | 16 ++++++++--------
 .../Loads/Combined/BuildingTimeSeriesWithETS.mo |  2 +-
 ...xamples_BuildingTimeSeriesWithETSDHWTank.txt |  2 +-
 .../ConvertBuildings_from_10_to_11.0.0.mos      |  4 ++++
 .../BuildingTimeSeriesWithETSDHWTank.mos        |  2 +-
 ...xamples.BuildingTimeSeriesWithETSDHWTank.mos |  2 +-
 8 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
index eb34b5789c3..af275eba533 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
+++ b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/BaseClasses/PartialHeatPumpHeatExchanger.mo
@@ -147,7 +147,7 @@ model PartialHeatPumpHeatExchanger
         extent={{-40,-40},{40,40}},
         rotation=0,
         origin={-340,-140})));
-  Buildings.Controls.OBC.CDL.Interfaces.RealInput loaSHW(
+  Buildings.Controls.OBC.CDL.Interfaces.RealInput QReqHotWat_flow(
     final unit="W") if have_hotWat "Service hot water load"
     annotation (
       Placement(transformation(
@@ -657,6 +657,10 @@ Energy, Volume 199, 15 May 2020, 117418.
   revisions="<html>
 <ul>
 <li>
+October 2, 2023, by Michael Wetter:<br/>
+Renamed input <code>loaSHW</code> to <code>QReqHotWat_flow</code>.
+</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/>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
index e407f2d7927..6052151e263 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
+++ b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchanger.mo
@@ -3,7 +3,8 @@ 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));
+      volMix_a(nPorts=4),
+      volMix_b(nPorts=4));
   Subsystems.HeatPump                                                            proHotWat(
     redeclare final package Medium1 = MediumBui,
     redeclare final package Medium2 = MediumSer,
@@ -83,7 +84,7 @@ equation
           37},{14,80},{-108,80},{-108,94},{-102,94}}, color={0,0,127}));
   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(loaSHW,div1. u1) annotation (Line(points={{-320,-120},{-290,-120},{
+  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)
@@ -97,17 +98,17 @@ equation
   annotation (
   Documentation(info="<html>
 <p>
-This model uses the base energy transfer station defined in 
+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 
+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> 
+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.
@@ -127,12 +128,12 @@ Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPump</
 </li>
 <li>
 The condensor water mass flow rate is computed based on the domestic hot water
-heating load (input <code>loaSHW</code>) where the temperature of water is boosted from the
+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>loaSHW</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
+<code>QReqHotWat_flow</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
 </p>
 </li>
 <li>
@@ -151,7 +152,7 @@ Extended from partial base class.
 This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
 issue 3063</a>.
-</li>  
+</li>
 <li>
 May 17, 2023, by David Blum:<br/>
 Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
diff --git a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
index dc30a6ebeaa..2a0b57309b6 100644
--- a/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
+++ b/Buildings/Experimental/DHC/EnergyTransferStations/Combined/HeatPumpHeatExchangerDHWTank.mo
@@ -85,24 +85,24 @@ equation
           -156,-80},{-320,-80}}, color={0,0,127}));
   connect(THotWatSupSet, theMixVal.TMixSet) annotation (Line(points={{-320,-40},
           {-32,-40},{-32,32},{-8,32},{-8,63.2},{-19,63.2}}, color={0,0,127}));
-  connect(loaSHW, gai.u) annotation (Line(points={{-320,-120},{-288,-120},{-288,
+  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},{-8,78},{-8,69.8},{-19,69.8}}, color={0,0,127}));
   annotation (
   Documentation(info="<html>
 <p>
-This model uses the base energy transfer station defined in 
+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 
+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> 
+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.
@@ -122,20 +122,20 @@ Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.HeatPumpDH
 </li>
 <li>
 The heat pump condensor water mass flow rate is controlled for the charging of the storage tank
-as described in 
+as described in
 <a href=\"modelica://Buildings.Experimental.DHC.Loads.HotWater.HeatPumpWithTank\">
 Buildings.Experimental.DHC.Loads.HotWater.HeatPumpWithTank</a>.
 </li>
 <li>
 The mass flow rate of water leaving the storage tank is computed based on the domestic hot water
-heating load (input <code>loaSHW</code>) combined with the operation of a thermostatic
+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 tank
 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>loaSHW</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
+<code>QReqHotWat_flow</code> = m&#775; cp (<code>THotWatSup_nominal</code> - <code>TColWat</code>)
 </p>
 </li>
 <li>
@@ -154,7 +154,7 @@ Extended from partial base class.
 This is for
 <a href=\"https://github.com/lbl-srg/modelica-buildings/issues/3063\">
 issue 3063</a>.
-</li>  
+</li>
 <li>
 May 17, 2023, by David Blum:<br/>
 Assigned dp_nominal to <code>pum1HexChi</code>.<br/>
diff --git a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
index 60e44e1372d..fff47dab83c 100644
--- a/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
+++ b/Buildings/Experimental/DHC/Loads/Combined/BuildingTimeSeriesWithETS.mo
@@ -70,7 +70,7 @@ model BuildingTimeSeriesWithETS
         QCoo_flow_nominal) "Normalized cooling load"
     annotation (Placement(transformation(extent={{-200,-150},{-180,-130}})));
 equation
-  connect(bui.QReqHotWat_flow, ets.loaSHW) annotation (Line(points={{28,4},{28,
+  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}));
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
index 0b3d258ccdb..8763618e6ff 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Experimental_DHC_Loads_Combined_Examples_BuildingTimeSeriesWithETSDHWTank.txt
@@ -20,7 +20,7 @@ bui.PHea=[0e+00, 4.129269714355469e+02, 8.192984771728516e+01, 9.10314453125e+03
 bui.PPum=[5.250715836882591e-02, 2.398956451416016e+02, 5.265986328125e+02, 2.5298583984375e+03, 2.947833740234375e+03, 2.206622314453125e+03, 2.480401123046875e+03, 2.107822753906249e+03, 9.477518463134766e+01, 9.27625732421875e+01, 2.979886474609375e+02, 1.51693017578125e+03, 1.683224487304688e+03, 2.98496875e+03, 3.499408935546874e+03, 2.205470947265625e+03, 2.463007080078125e+03, 2.16153271484375e+03, 9.476506042480469e+01, 9.275562286376953e+01, 1.096261962890625e+03, 1.482679809570312e+03, 1.61401318359375e+03, 2.906157958984375e+03, 3.082759033203125e+03, 1.623158325195312e+03, 1.48962109375e+03, 1.602397705078123e+03, 9.477777862548827e+01, 9.287525939941406e+01, 9.206014251708984e+01, 3.061961975097656e+02, 1.47125390625e+03, 2.934305908203125e+03, 3.534788330078125e+03, 2.153093017578125e+03, 2.62479833984375e+03, 2.184079833984375e+03, 9.477332305908203e+01, 1.6419287109375e+02, 1.428935546875e+03, 1.573349487304688e+03, 1.726895263671875e+03, 3.0732099609375e+03, 4.05636669921875e+03, 2.971639892578125e+03, 3.603106201171875e+03, 2.732995849609375e+03, 1.47383154296875e+03, 1.694314208984375e+03, 1.869390380859375e+03, 1.984915283203125e+03, 2.068254638671875e+03, 2.3361416015625e+03, 2.319030029296875e+03, 2.321929931640625e+03, 2.369701904296875e+03, 2.40714501953125e+03, 2.146822998046877e+03, 2.233544189453125e+03, 2.296720458984375e+03, 2.341439697265625e+03, 2.374544189453125e+03, 2.71166552734375e+03, 2.660502197265625e+03, 2.58228857421875e+03, 2.573349609375e+03, 2.610462158203125e+03, 2.300459228515625e+03, 2.4041142578125e+03, 2.4627802734375e+03, 2.546924072265625e+03, 2.58826806640625e+03, 4.320375e+03, 5.92902978515625e+03, 3.948944091796875e+03, 4.4410439453125e+03, 3.24253076171875e+03, 1.93337548828125e+03, 2.158819091796875e+03, 2.310767822265625e+03, 2.445441162109375e+03, 2.528824951171875e+03, 4.2818046875e+03, 5.803943359375e+03, 3.536703125e+03, 4.274451171875e+03, 3.19223974609375e+03, 1.903408081054688e+03, 2.117461669921875e+03, 2.25700048828125e+03, 2.395788330078125e+03, 2.492287109375e+03, 4.18769580078125e+03, 5.43679345703125e+03, 3.14006591796875e+03, 3.774295654296875e+03, 2.99011328125e+03, 1.684476684570312e+03, 1.904487670898438e+03, 2.0660546875e+03]
 bui.QHea_flow=[0e+00, 1.493409118652344e+02, 1.96499462890625e+03, 6.7062e+04, 8.794946875e+04, 4.81281640625e+04, 6.336166796875e+04, 4.203754296874994e+04, 7.818440347909927e-02, 2.162826806306839e-02, 4.948764038085938e+02, 8.9321689453125e+03, 1.8312390625e+04, 9.14274921875e+04, 1.199913671874999e+05, 4.775331640625e+04, 6.2614796875e+04, 4.526994140625e+04, 7.798042893409729e-02, 2.16028057038784e-02, 2.267438720703125e+03, 7.1049501953125e+03, 1.4277197265625e+04, 8.6850328125e+04, 9.54722890625e+04, 1.43484423828125e+04, 7.3159599609375e+03, 1.339677148437491e+04, 7.135672867298089e-02, 2.106104418635374e-02, 1.201198808848858e-02, 5.277313232421875e+02, 6.4657158203125e+03, 8.86046328125e+04, 1.219892265625e+05, 4.45152578125e+04, 7.11158515625e+04, 4.651371484375e+04, 7.835377007722855e-02, 0e+00, 3.32916064453125e+03, 1.1968400390625e+04, 2.08016328125e+04, 9.665625e+04, 1.487390625e+05, 8.83808828125e+04, 1.25934e+05, 7.496425e+04, 6.57106640625e+03, 1.8963818359375e+04, 2.8790822265625e+04, 3.5349765625e+04, 4.025085546875e+04, 5.587071875e+04, 5.486714062499999e+04, 5.507441015625001e+04, 5.759196484375002e+04, 5.949939453125e+04, 4.493506640625009e+04, 5.044890625e+04, 5.3770390625e+04, 5.613808203125e+04, 5.779956640625e+04, 7.51835234375e+04, 7.24934453125e+04, 6.86282578125e+04, 6.823384375e+04, 7.0093515625e+04, 5.37290078125e+04, 5.940627734375e+04, 6.24497734375e+04, 6.69123046875e+04, 6.899815625e+04, 1.62266546875e+05, 2.249033125e+05, 1.419346875e+05, 1.66257734375e+05, 1.041997265625e+05, 3.2251439453125e+04, 4.59709921875e+04, 5.458297265625e+04, 6.159392578125e+04, 6.59460234375e+04, 1.6056546875e+05, 2.203854375e+05, 1.2065740625e+05, 1.5891796875e+05, 1.012013984375e+05, 3.05666796875e+04, 4.335852734375e+04, 5.17644765625e+04, 5.897602734375e+04, 6.40561875e+04, 1.56225765625e+05, 2.06757390625e+05, 9.79604921875e+04, 1.3483134375e+05, 8.92684609375e+04, 1.8283357421875e+04, 3.078685546875e+04, 4.016099609375e+04]
 bui.QCoo_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.ets.loaSHW=[0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070291e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070227e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+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, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00]
+bui.ets.QReqHotWat_flow=[0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070291e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070227e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+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, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 9.202666625976562e+02, 3.5e+03, 1.4e+03, 3.320800048828125e+03, 9.352000122070312e+02, 0e+00, 0e+00, 0e+00]
 bui.ets.THotWatSupSet=[3.221499938964844e+02, 3.221499938964844e+02]
 bui.ets.theMixVal.TMixSet=[3.221499938964844e+02, 3.221499938964844e+02]
 bui.ets.proHotWat.senTHotSup.T=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 3.335948791503906e+02, 3.338192749023438e+02, 3.319585571289062e+02, 3.325673217773438e+02, 3.32170654296875e+02, 3.332152404785156e+02, 3.332152404785156e+02, 3.332152404785156e+02, 3.332152404785156e+02, 3.332152404785156e+02, 3.338019409179688e+02, 3.339641723632812e+02, 3.320222473144531e+02, 3.325843811035156e+02, 3.321752014160156e+02, 3.332200317382812e+02, 3.332200317382812e+02, 3.332200317382812e+02, 3.332200317382812e+02, 3.332200317382812e+02, 3.33798095703125e+02, 3.339659423828125e+02, 3.320230102539062e+02, 3.325867309570312e+02, 3.321752624511719e+02, 3.332187194824219e+02, 3.332187194824219e+02, 3.332187194824219e+02, 3.332187194824219e+02, 3.332187194824219e+02, 3.3379833984375e+02, 3.339649353027344e+02, 3.320228881835938e+02, 3.325872802734375e+02, 3.321751403808594e+02, 3.332189331054688e+02, 3.332189331054688e+02, 3.332189331054688e+02, 3.332189331054688e+02, 3.332189331054688e+02, 3.337955627441406e+02, 3.339668273925781e+02, 3.320229187011719e+02, 3.325876770019531e+02, 3.321755676269531e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.333215942382812e+02, 3.337685241699219e+02, 3.339941101074219e+02, 3.320491943359375e+02, 3.325955810546875e+02, 3.321776428222656e+02, 3.332142028808594e+02, 3.332142028808594e+02, 3.332142028808594e+02, 3.332142028808594e+02, 3.332142028808594e+02, 3.337964782714844e+02, 3.339668579101562e+02, 3.320232849121094e+02, 3.32585693359375e+02, 3.321753845214844e+02, 3.332146911621094e+02, 3.332146911621094e+02, 3.332146911621094e+02, 3.332146911621094e+02, 3.332146911621094e+02, 3.337954406738281e+02, 3.339659118652344e+02, 3.320231018066406e+02, 3.32586669921875e+02, 3.321752014160156e+02, 3.332171325683594e+02, 3.332171325683594e+02, 3.332171325683594e+02]
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 ea938858c1a..005999c477a 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 of hot water load
+convertElement("Buildings.Experimental.DHC.EnergyTransferStations.Combined.HeatPumpHeatExchanger",
+               "loaSHW", "QReqHotWat_flow");
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/3517
 convertClass("Buildings.Controls.OBC.CDL.Discrete.Examples",
              "Buildings.Controls.OBC.CDL.Discrete.Validation");
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
index 3ad8d6a19b8..37c4dfbceaf 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
@@ -6,7 +6,7 @@ createPlot(id=1, position={540, 9, 784, 614}, y={"bui.ets.proHotWat.heaPumTan.he
 createPlot(id=1, position={540, 9, 784, 614}, 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, 614}, y={"bui.QHea_flow", "bui.QCoo_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=104, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
 
-createPlot(id=2, position={590, -8, 592, 663}, y={"bui.ets.loaSHW"}, range={0.0, 900000.0, -2000.0, 4000.0}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
+createPlot(id=2, position={590, -8, 592, 663}, y={"bui.ets.QReqHotWat_flow"}, range={0.0, 900000.0, -2000.0, 4000.0}, grid=true, subPlot=101, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
 createPlot(id=2, position={590, -8, 592, 663}, y={"bui.ets.THotWatSupSet", "bui.ets.theMixVal.TMixSet"}, range={0.0, 900000.0, 280.0, 340.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"K", ""});
 createPlot(id=2, position={590, -8, 592, 663}, y={"bui.ets.proHotWat.senTHotSup.T", "bui.ets.proHotWat.THotSouSet.y"}, range={0.0, 900000.0, 250.0, 350.0}, grid=true, subPlot=103, colors={{238,46,47}, {28,108,200}}, timeUnit="s", displayUnits={"K", ""});
 createPlot(id=2, position={590, -8, 592, 663}, y={"bui.ets.theMixVal.mMix_flow"}, range={0.0, 900000.0, -0.02, 0.039999999999999994}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"kg/s"});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
index c7784bdf347..bb3e98796c4 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank.mos
@@ -8,7 +8,7 @@ compareVars :=
     "bui.PPum",
     "bui.QHea_flow",
     "bui.QCoo_flow",
-    "bui.ets.loaSHW",
+    "bui.ets.QReqHotWat_flow",
     "bui.ets.THotWatSupSet",
     "bui.ets.theMixVal.TMixSet",
     "bui.ets.proHotWat.senTHotSup.T",
