From a8a09804e09007cc4b42ac86ba52414d7e2114f8 Mon Sep 17 00:00:00 2001
From: AntoineGautier <agautier@solamen.fr>
Date: Wed, 20 Sep 2023 14:42:39 +0200
Subject: [PATCH 1/5] Revert most of the changes from #1782

This is done manually as git apply with diff from d2edb0cae fails.
error: IBPSA/Fluid/Interfaces/PartialTwoPort.mo: patch does not apply
---
 IBPSA/Fluid/Interfaces/PartialFourPort.mo     | 31 ++----------
 IBPSA/Fluid/Interfaces/PartialTwoPort.mo      | 19 +------
 .../Fluid/Interfaces/PartialTwoPortVector.mo  | 21 +-------
 .../Storage/BaseClasses/PartialStratified.mo  | 43 ++++++++++++++--
 IBPSA/Fluid/Storage/Examples/Stratified.mo    | 49 +++++++++----------
 .../Examples/StratifiedEnhancedInternalHex.mo |  7 ++-
 .../StratifiedUnloadAtMinimumTemperature.mo   | 21 ++++----
 .../Validation/HeatExchangerDynamics.mo       | 13 ++---
 8 files changed, 91 insertions(+), 113 deletions(-)

diff --git a/IBPSA/Fluid/Interfaces/PartialFourPort.mo b/IBPSA/Fluid/Interfaces/PartialFourPort.mo
index 524ee257a9..1d5cb458ca 100644
--- a/IBPSA/Fluid/Interfaces/PartialFourPort.mo
+++ b/IBPSA/Fluid/Interfaces/PartialFourPort.mo
@@ -34,44 +34,26 @@ partial model PartialFourPort "Partial model with four ports"
                      m_flow(min=if allowFlowReversal1 then -Modelica.Constants.inf else 0),
                      h_outflow(start = Medium1.h_default, nominal = Medium1.h_default))
     "Fluid connector a1 (positive design flow direction is from port_a1 to port_b1)"
-    annotation (Placement(transformation(extent={{port_a1_x-10,port_a1_y-10},{port_a1_x+10,port_a1_y+10}})));
+    annotation (Placement(transformation(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 connector b1 (positive design flow direction is from port_a1 to port_b1)"
-    annotation (Placement(transformation(extent={{port_b1_x-10,port_b1_y-10},{port_b1_x+10,port_b1_y+10}})));
+    annotation (Placement(transformation(extent={{110,50},{90,70}})));
 
   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 connector a2 (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{port_a2_x-10,port_a2_y-10},{port_a2_x+10,port_a2_y+10}})));
+    annotation (Placement(transformation(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 connector b2 (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{port_b2_x-10,port_b2_y-10},{port_b2_x+10,port_b2_y+10}})));
-
-protected
-  constant Integer port_a1_x = -100
-    "x-coordinate of port_a1 center";
-  constant Integer port_a1_y = 60
-    "y-coordinate of port_a1 center";
-  constant Integer port_b1_x = 100
-    "x-coordinate of port_b1 center";
-  constant Integer port_b1_y = 60
-    "y-coordinate of port_b1 center";
-  constant Integer port_a2_x = 100
-    "x-coordinate of port_a2 center";
-  constant Integer port_a2_y = -60
-    "y-coordinate of port_a2 center";
-  constant Integer port_b2_x = -100
-    "x-coordinate of port_b2 center";
-  constant Integer port_b2_y = -60
-    "y-coordinate of port_b2 center";
+    annotation (Placement(transformation(extent={{-90,-70},{-110,-50}})));
 
   annotation (
     preferredView="info",
@@ -101,11 +83,6 @@ are not implemented.
 </html>", revisions="<html>
 <ul>
 <li>
-September 1, 2023, by Antoine Gautier:<br/>
-Added constants for parameterization of port placement.
-See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">#1781</a>.
-</li>
-<li>
 April 6, 2020, by Filip Jorissen:<br/>
 Added arrows to the icon indicating the intended flow direction
 when <code>allowFlowReversal=false</code>.
diff --git a/IBPSA/Fluid/Interfaces/PartialTwoPort.mo b/IBPSA/Fluid/Interfaces/PartialTwoPort.mo
index d2a4f3d8b9..dfa69ce6fc 100644
--- a/IBPSA/Fluid/Interfaces/PartialTwoPort.mo
+++ b/IBPSA/Fluid/Interfaces/PartialTwoPort.mo
@@ -20,23 +20,13 @@ partial model PartialTwoPort "Partial component with two ports"
      m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
      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={{port_a_x-10,port_a_y-10},{port_a_x+10,port_a_y+10}})));
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b(
     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 connector b (positive design flow direction is from port_a to port_b)"
-    annotation (Placement(transformation(extent={{port_b_x-10,port_b_y-10},{port_b_x+10,port_b_y+10}})));
-
-protected
-  constant Integer port_a_x = -100
-    "x-coordinate of port_a center";
-  constant Integer port_a_y = 0
-    "y-coordinate of port_a center";
-  constant Integer port_b_x = 100
-    "x-coordinate of port_b center";
-  constant Integer port_b_y = 0
-    "y-coordinate of port_b center";
+    annotation (Placement(transformation(extent={{110,-10},{90,10}})));
 
   annotation (
     Documentation(info="<html>
@@ -58,11 +48,6 @@ users have not used this global definition to assign parameters.
 </html>", revisions="<html>
 <ul>
 <li>
-September 1, 2023, by Antoine Gautier:<br/>
-Added constants for parameterization of port placement.
-See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">#1781</a>.
-</li>
-<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/IBPSA/Fluid/Interfaces/PartialTwoPortVector.mo b/IBPSA/Fluid/Interfaces/PartialTwoPortVector.mo
index ab193a43eb..f22cb87398 100644
--- a/IBPSA/Fluid/Interfaces/PartialTwoPortVector.mo
+++ b/IBPSA/Fluid/Interfaces/PartialTwoPortVector.mo
@@ -11,7 +11,6 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
           property_T=293.15,
           X_a=0.40)
           "Propylene glycol water, 40% mass fraction")));
-
   parameter Integer nPorts "Number of ports"
     annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports"));
   parameter Boolean allowFlowReversal=true
@@ -23,14 +22,14 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
     m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
     h_outflow(start=Medium.h_default, nominal=Medium.h_default))
     "Fluid connector a (positive design flow direction is from port_a to ports_b)"
-    annotation (Placement(transformation(extent={{port_a_x-10,port_a_y-10},{port_a_x+10,port_a_y+10}})));
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 
   Modelica.Fluid.Interfaces.FluidPorts_b ports_b[nPorts](
     redeclare each 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))
     "Fluid connectors b (positive design flow direction is from port_a to ports_b)"
-    annotation (Placement(transformation(extent={{port_b_x-10,port_b_y-40},{port_b_x+10,port_b_y+40}})));
+    annotation (Placement(transformation(extent={{90,-40},{110,40}})));
 
   // Diagnostics
    parameter Boolean show_T = false
@@ -50,17 +49,6 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
                           noEvent(actualStream(ports_b.h_outflow)),
                           noEvent(actualStream(ports_b.Xi_outflow)))
       if show_T "Medium properties in ports_b";
-
-protected
-  constant Integer port_a_x = -100
-    "x-coordinate of port_a center";
-  constant Integer port_a_y = 0
-    "y-coordinate of port_a center";
-  constant Integer port_b_x = 100
-    "x-coordinate of port_b center";
-  constant Integer port_b_y = 0
-    "y-coordinate of port_b center";
-
   annotation (
     Documentation(info="<html>
 <p>
@@ -85,11 +73,6 @@ users have not used this global definition to assign parameters.
 </html>", revisions="<html>
 <ul>
 <li>
-September 1, 2023, by Antoine Gautier:<br/>
-Added constants for parameterization of port placement.
-See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">#1781</a>.
-</li>
-<li>
 March 30, 2021, by Michael Wetter:<br/>
 Added annotation <code>HideResult=true</code>.<br/>
 This is for
diff --git a/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo b/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
index 5d8138516d..554b36357a 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
+++ b/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
@@ -1,8 +1,7 @@
 within IBPSA.Fluid.Storage.BaseClasses;
 model PartialStratified
   "Partial model of a stratified tank for thermal energy storage"
-  extends IBPSA.Fluid.Interfaces.PartialTwoPortInterface(
-    port_a_x=0, port_a_y=100, port_b_x=0, port_b_y=-100);
+  extends IBPSA.Fluid.Interfaces.PartialTwoPortInterface;
 
   import Modelica.Fluid.Types;
   import Modelica.Fluid.Types.Dynamics;
@@ -332,13 +331,49 @@ Icon(graphics={
           fillColor={0,0,127},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{2,100},{-2,60}},
+          extent={{-76,2},{-90,-2}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,127},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{2,-60},{-2,-100}},
+          extent={{0,84},{-80,80}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-76,84},{-80,-2}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{82,0},{78,-86}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{0,84},{-4,60}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{82,-84},{2,-88}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{6,-60},{2,-84}},
+          lineColor={0,0,255},
+          pattern=LinePattern.None,
+          fillColor={0,0,127},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{92,2},{78,-2}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,127},
diff --git a/IBPSA/Fluid/Storage/Examples/Stratified.mo b/IBPSA/Fluid/Storage/Examples/Stratified.mo
index 93e8b36590..ffe1f040ce 100644
--- a/IBPSA/Fluid/Storage/Examples/Stratified.mo
+++ b/IBPSA/Fluid/Storage/Examples/Stratified.mo
@@ -11,30 +11,30 @@ model Stratified "Test model for stratified tank"
     nSeg=10,
     m_flow_nominal=0.1,
     VTan=3) "Tank"
-    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
     Modelica.Blocks.Sources.TimeTable TWat(table=[0,273.15 + 40; 3600,273.15 +
         40; 3600,273.15 + 20; 7200,273.15 + 20]) "Water temperature"
-                 annotation (Placement(transformation(extent={{-100,2},{-80,22}})));
+                 annotation (Placement(transformation(extent={{-100,-6},{-80,14}})));
   IBPSA.Fluid.Sources.Boundary_pT sou_1(
     p=300000 + 5000,
     T=273.15 + 50,
     redeclare package Medium = Medium,
     use_T_in=true,
-    nPorts=2)             annotation (Placement(transformation(extent={{-60,-2},
-            {-40,18}})));
+    nPorts=2)             annotation (Placement(transformation(extent={{-60,-10},
+            {-40,10}})));
   IBPSA.Fluid.Sources.Boundary_pT sin_1(
     redeclare package Medium = Medium,
     T=273.15 + 20,
     use_p_in=true,
     p=300000,
-    nPorts=2)             annotation (Placement(transformation(extent={{90,-18},
-            {70,2}})));
+    nPorts=2)             annotation (Placement(transformation(extent={{90,-10},
+            {70,10}})));
   IBPSA.Fluid.FixedResistances.PressureDrop res_1(
     from_dp=true,
     redeclare package Medium = Medium,
     dp_nominal=5000,
     m_flow_nominal=0.1)
-    annotation (Placement(transformation(extent={{34,-18},{54,2}})));
+    annotation (Placement(transformation(extent={{34,-10},{54,10}})));
   IBPSA.Fluid.Storage.StratifiedEnhanced tanEnh(
     redeclare package Medium = Medium,
     hTan=3,
@@ -42,7 +42,7 @@ model Stratified "Test model for stratified tank"
     nSeg=10,
     m_flow_nominal=0.1,
     VTan=3) "Tank"
-    annotation (Placement(transformation(extent={{-18,-70},{2,-50}})));
+    annotation (Placement(transformation(extent={{-18,-90},{2,-70}})));
   IBPSA.Fluid.FixedResistances.PressureDrop res_2(
     from_dp=true,
     redeclare package Medium = Medium,
@@ -52,7 +52,7 @@ model Stratified "Test model for stratified tank"
   IBPSA.Fluid.Sensors.EnthalpyFlowRate HOut_flow(redeclare package Medium =
         Medium, m_flow_nominal=0.1) "Enthalpy flow rate"
                                      annotation (Placement(transformation(
-          extent={{4,-16},{20,0}})));
+          extent={{4,-8},{20,8}})));
   IBPSA.Fluid.Sensors.EnthalpyFlowRate HOut_flow1(redeclare package Medium =
         Medium, m_flow_nominal=0.1) "Enthalpy flow rate"
                                      annotation (Placement(transformation(
@@ -85,25 +85,24 @@ model Stratified "Test model for stratified tank"
             {-40,32},{-28,44}})));
 equation
   connect(TWat.y, sou_1.T_in) annotation (Line(
-      points={{-79,12},{-62,12}},
+      points={{-79,4},{-62,4}},
       color={0,0,127}));
-  connect(tanSim.port_b, HOut_flow.port_a) annotation (Line(points={{-10,0},{
-          -10,-8},{4,-8}},           color={0,127,255}));
+  connect(tanSim.port_b, HOut_flow.port_a) annotation (Line(points={{0,0},{4,0}},
+                                     color={0,127,255}));
   connect(HOut_flow.port_b, res_1.port_a)
-    annotation (Line(points={{20,-8},{34,-8}}, color={0,127,255}));
+    annotation (Line(points={{20,0},{34,0}},   color={0,127,255}));
   connect(tanEnh.port_b, HOut_flow1.port_a)
-    annotation (Line(points={{-8,-70},{-8,-80},{20,-80}},
-                                               color={0,127,255}));
+    annotation (Line(points={{2,-80},{20,-80}},color={0,127,255}));
   connect(HOut_flow1.port_b, res_2.port_a) annotation (Line(points={{36,-80},{
           40,-80}}, color={0,127,255}));
   connect(add.y, dH.u)
     annotation (Line(points={{53,40},{66,40}},   color={0,0,127}));
-  connect(HOut_flow.H_flow, add.u1) annotation (Line(points={{12,0.8},{12,46},{
+  connect(HOut_flow.H_flow, add.u1) annotation (Line(points={{12,8.8},{12,46},{
           30,46}},   color={0,0,127}));
   connect(HOut_flow1.H_flow, add.u2) annotation (Line(points={{28,-71.2},{28,34},
           {30,34}},       color={0,0,127}));
   connect(P.y, sin_1.p_in) annotation (Line(
-      points={{41,70},{100,70},{100,0},{92,0}},
+      points={{41,70},{100,70},{100,8},{92,8}},
       color={0,0,127}));
   connect(sine.y, TBCSid1.T) annotation (Line(points={{-69,72},{-55.5,72},{
           -55.5,90},{-41.2,90}}, color={0,0,127}));
@@ -114,31 +113,31 @@ equation
   connect(sine.y, TBCTop2.T) annotation (Line(points={{-69,72},{-56,72},{-56,38},
           {-41.2,38}}, color={0,0,127}));
   connect(TBCSid2.port, tanEnh.heaPorSid) annotation (Line(points={{-28,56},{
-          -24,56},{-24,-12},{-2,-12},{-2,-60},{-2.4,-60}}, color={191,0,0}));
+          -24,56},{-24,-38},{-2,-38},{-2,-80},{-2.4,-80}}, color={191,0,0}));
   connect(TBCTop2.port, tanEnh.heaPorTop) annotation (Line(points={{-28,38},{
-          -26,38},{-26,-14},{-6,-14},{-6,-52.6}}, color={191,0,0}));
+          -26,38},{-26,-40},{-6,-40},{-6,-72.6}}, color={191,0,0}));
   connect(sin_1.ports[1], res_1.port_b) annotation (Line(
-      points={{70,-9},{64,-9},{64,-8},{54,-8}},
+      points={{70,-1},{64,-1},{64,0},{54,0}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(sin_1.ports[2], res_2.port_b) annotation (Line(
-      points={{70,-7},{64,-7},{64,-80},{60,-80}},
+      points={{70,1},{64,1},{64,-80},{60,-80}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(sou_1.ports[1], tanSim.port_a) annotation (Line(
-      points={{-40,7},{-30,7},{-30,20},{-10,20}},
+      points={{-40,-1},{-30,-1},{-30,0},{-20,0}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(sou_1.ports[2], tanEnh.port_a) annotation (Line(
-      points={{-40,9},{-30,9},{-30,-40},{-8,-40},{-8,-50}},
+      points={{-40,1},{-30,1},{-30,-80},{-18,-80}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(TBCSid1.port, tanSim.heaPorSid) annotation (Line(
-      points={{-28,90},{-4.4,90},{-4.4,10}},
+      points={{-28,90},{-4.4,90},{-4.4,0}},
       color={191,0,0},
       smooth=Smooth.None));
   connect(TBCTop1.port, tanSim.heaPorTop) annotation (Line(
-      points={{-28,72},{-8,72},{-8,17.4}},
+      points={{-28,72},{-8,72},{-8,7.4}},
       color={191,0,0},
       smooth=Smooth.None));
   annotation(experiment(Tolerance=1e-08, StopTime=10800),
diff --git a/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo b/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo
index 11bf4b6e2c..da67106c7e 100644
--- a/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo
+++ b/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo
@@ -142,13 +142,12 @@ equation
           41.3333},{-6,41.3333},{-6,-66.08},{6,-66.08}},               color={0,
           127,255}));
   connect(bouWat.ports[1], tanSte.port_b) annotation (Line(points={{62,-79.3333},
-          {52,-79.3333},{52,40},{22,40},{22,56},{23,56}},
-                                          color={0,127,255}));
+          {52,-79.3333},{52,72},{40,72}}, color={0,127,255}));
   connect(bouWat.ports[2], tanDyn.port_b)
-    annotation (Line(points={{62,-78},{52,-78},{52,-36},{21,-36},{21,-28}},
+    annotation (Line(points={{62,-78},{52,-78},{52,-12},{38,-12}},
                                                           color={0,127,255}));
   connect(bouWat.ports[3], tanDynSol.port_b) annotation (Line(points={{62,
-          -76.6667},{24,-76.6667},{24,-76},{23,-76}},
+          -76.6667},{58,-76.6667},{58,-76},{52,-76},{52,-60},{40,-60}},
                                             color={0,127,255}));
   connect(step.y, solColSup.p_in)
     annotation (Line(points={{-59,48},{-52,48},{-42,48}}, color={0,0,127}));
diff --git a/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo b/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
index ca8107a058..f28c6e07df 100644
--- a/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
+++ b/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
@@ -20,7 +20,7 @@ model StratifiedUnloadAtMinimumTemperature
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nSeg=nSeg,
     T_start=353.15) "Hot water storage tank"
-    annotation (Placement(transformation(extent={{-120,-128},{-100,-108}})));
+    annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
   IBPSA.Fluid.Sources.Boundary_pT loa(redeclare package Medium = Medium,
       nPorts=1)
     "Load (imposed by a constant pressure boundary condition and the flow of masSou)"
@@ -103,14 +103,13 @@ model StratifiedUnloadAtMinimumTemperature
     "Boolean to real conversion for valve at bottom"
     annotation (Placement(transformation(extent={{80,30},{100,50}})));
 equation
-  connect(masSou.ports[1], tan.port_b) annotation (Line(points={{222,-120},{56,
-          -120},{56,-128},{-110,-128}},
-                              color={0,127,255}));
+  connect(masSou.ports[1], tan.port_b) annotation (Line(points={{222,-120},{
+          -100,-120}},        color={0,127,255}));
   connect(TMid.port, tan.heaPorVol[3])
-    annotation (Line(points={{-100,80},{-100,-118},{-110,-118}},
+    annotation (Line(points={{-100,80},{-100,-12},{-110,-12},{-110,-120}},
                                                              color={191,0,0}));
   connect(TBot.port, tan.heaPorVol[5])
-    annotation (Line(points={{-100,40},{-100,-117.76},{-110,-117.76}},
+    annotation (Line(points={{-100,40},{-110,40},{-110,-119.76}},
                                                            color={191,0,0}));
   connect(valTop.port_b, senTem.port_a) annotation (Line(points={{132,-20},{182,
           -20},{182,-60},{190,-60}},
@@ -125,13 +124,13 @@ equation
     annotation (Line(points={{210,-60},{222,-60}},
                                                  color={0,127,255}));
   connect(valTop.port_a, tan.fluPorVol[1]) annotation (Line(points={{112,-20},{
-          -116,-20},{-116,-118},{-112.6,-118},{-112.6,-118.4}},
+          -116,-20},{-116,-118},{-115,-118},{-115,-121.6}},
                                color={0,127,255}));
   connect(valMid.port_a, tan.fluPorVol[3]) annotation (Line(points={{132,-60},{
-          -116,-60},{-116,-118},{-112.6,-118}},
+          -116,-60},{-116,-120},{-115,-120}},
                               color={0,127,255}));
   connect(valBot.port_a, tan.fluPorVol[5]) annotation (Line(points={{150,-100},
-          {-116,-100},{-116,-118},{-112.6,-118},{-112.6,-117.6}},
+          {-116,-100},{-116,-118},{-115,-118},{-115,-118.4}},
                               color={0,127,255}));
   connect(onOffMid.y, and2.u1)
     annotation (Line(points={{-29,80},{8,80}},     color={255,0,255}));
@@ -154,10 +153,10 @@ equation
   connect(not1.y, and2.u2) annotation (Line(points={{1,60},{4,60},{4,72},{8,72}},
         color={255,0,255}));
   connect(hea.port, tan.heaPorVol[5]) annotation (Line(points={{-130,-124},{
-          -110,-124},{-110,-117.76}},
+          -110,-124},{-110,-119.76}},
                               color={191,0,0}));
   connect(TTop.port, tan.heaPorVol[1]) annotation (Line(points={{-160,-90},{
-          -120,-90},{-120,-120},{-110,-120},{-110,-118.24}},
+          -110,-90},{-110,-120.24}},
                              color={191,0,0}));
   connect(onOffHea.u, TTop.T) annotation (Line(points={{-212,-124},{-230,-124},
           {-230,-90},{-181,-90}},color={0,0,127}));
diff --git a/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo b/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo
index 0a49f201ae..5339f1820c 100644
--- a/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo
+++ b/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo
@@ -87,11 +87,11 @@ model HeatExchangerDynamics
   IBPSA.Fluid.Sources.MassFlowSource_T mWatTanDyn_flow(
     redeclare package Medium = Medium,
     nPorts=1) "Mass flow rate through the tank"
-    annotation (Placement(transformation(extent={{82,10},{62,30}})));
+    annotation (Placement(transformation(extent={{80,20},{60,40}})));
   IBPSA.Fluid.Sources.MassFlowSource_T mWatTanSte_flow(
     redeclare package Medium = Medium,
     nPorts=1) "Mass flow rate through the tank"
-    annotation (Placement(transformation(extent={{82,-30},{62,-10}})));
+    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
 equation
   connect(mHex_flow_in.y, mHex_flow1.m_flow_in) annotation (Line(
       points={{-79,20},{-70,20},{-70,28},{-62,28}},
@@ -102,11 +102,12 @@ equation
   connect(mHex_flow2.ports[1], tanSte.portHex_a) annotation (Line(points={{-40,-10},
           {-32,-10},{-30,-10},{-30,-13.8},{32,-13.8}},  color={0,127,255}));
   connect(watInTan.ports[1], tanSte.port_a) annotation (Line(points={{-40,59},{
-          -40,59},{-22,59},{-22,0},{42,0}},  color={0,127,255}));
+          -40,59},{-22,59},{-22,-10},{32,-10}},
+                                             color={0,127,255}));
   connect(mHex_flow1.ports[1], tanDyn.portHex_a) annotation (Line(points={{-40,
           20},{-30,20},{-30,26.2},{32,26.2}}, color={0,127,255}));
   connect(watInTan.ports[2], tanDyn.port_a) annotation (Line(points={{-40,61},{
-          -30,61},{-20,61},{-20,40},{42,40}},
+          -30,61},{-20,61},{-20,30},{32,30}},
                                            color={0,127,255}));
   connect(senTanDyn.port_a, tanDyn.portHex_b) annotation (Line(points={{10,10},{
           20,10},{20,22},{32,22}}, color={0,127,255}));
@@ -119,9 +120,9 @@ equation
           -42,-40},{-42,-37}},
                            color={0,127,255}));
   connect(mWatTanDyn_flow.ports[1], tanDyn.port_b)
-    annotation (Line(points={{62,20},{42,20}}, color={0,127,255}));
+    annotation (Line(points={{60,30},{52,30}}, color={0,127,255}));
   connect(mWatTanSte_flow.ports[1], tanSte.port_b)
-    annotation (Line(points={{62,-20},{42,-20}}, color={0,127,255}));
+    annotation (Line(points={{60,-10},{52,-10}}, color={0,127,255}));
   annotation (
   __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerDynamics.mos"
         "Simulate and plot"),

From c1b2bdec6d7063832fcb771e647fd02cac8c8a9b Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 20 Sep 2023 10:10:49 -0700
Subject: [PATCH 2/5] Added base class to place ports on top and bottom

---
 .../Storage/BaseClasses/PartialStratified.mo  |  49 ++------
 .../BaseClasses/PartialTwoPortInterface.mo    | 113 ++++++++++++++++++
 IBPSA/Fluid/Storage/BaseClasses/package.order |   1 +
 3 files changed, 123 insertions(+), 40 deletions(-)
 create mode 100644 IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo

diff --git a/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo b/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
index 554b36357a..64ca1eb38c 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
+++ b/IBPSA/Fluid/Storage/BaseClasses/PartialStratified.mo
@@ -1,10 +1,11 @@
 within IBPSA.Fluid.Storage.BaseClasses;
 model PartialStratified
   "Partial model of a stratified tank for thermal energy storage"
-  extends IBPSA.Fluid.Interfaces.PartialTwoPortInterface;
+  extends IBPSA.Fluid.Storage.BaseClasses.PartialTwoPortInterface;
 
   import Modelica.Fluid.Types;
   import Modelica.Fluid.Types.Dynamics;
+
   parameter Modelica.Units.SI.Volume VTan "Tank volume";
   parameter Modelica.Units.SI.Length hTan "Height of tank (without insulation)";
   parameter Modelica.Units.SI.Length dIns "Thickness of insulation";
@@ -76,6 +77,7 @@ model PartialStratified
     each final m_flow_small=m_flow_small,
     each final allowFlowReversal=allowFlowReversal) "Tank segment"
     annotation (Placement(transformation(extent={{6,-16},{26,4}})));
+
 protected
   parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(
     T=Medium.T_default,
@@ -331,49 +333,13 @@ Icon(graphics={
           fillColor={0,0,127},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-76,2},{-90,-2}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{0,84},{-80,80}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{-76,84},{-80,-2}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{82,0},{78,-86}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{0,84},{-4,60}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{82,-84},{2,-88}},
-          lineColor={0,0,255},
-          pattern=LinePattern.None,
-          fillColor={0,0,127},
-          fillPattern=FillPattern.Solid),
-        Rectangle(
-          extent={{6,-60},{2,-84}},
+          extent={{2,100},{-2,60}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,127},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{92,2},{78,-2}},
+          extent={{2,-60},{-2,-100}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,127},
@@ -428,5 +394,8 @@ Icon(graphics={
         Line(
           points={{22,-74},{70,-74},{70,72}},
           color={127,0,0},
-          pattern=LinePattern.Dot)}));
+          pattern=LinePattern.Dot),     Text(
+        extent={{-100,100},{-8,70}},
+        textString="%name",
+        textColor={0,0,255})}));
 end PartialStratified;
diff --git a/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo b/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
new file mode 100644
index 0000000000..231c78b8fb
--- /dev/null
+++ b/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
@@ -0,0 +1,113 @@
+within IBPSA.Fluid.Storage.BaseClasses;
+partial model PartialTwoPortInterface
+  "Partial model transporting fluid between two ports without storing mass or energy"
+
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+      annotation (choices(
+        choice(redeclare package Medium = IBPSA.Media.Air "Moist air"),
+        choice(redeclare package Medium = IBPSA.Media.Water "Water"),
+        choice(redeclare package Medium =
+            IBPSA.Media.Antifreeze.PropyleneGlycolWater (
+              property_T=293.15,
+              X_a=0.40)
+              "Propylene glycol water, 40% mass fraction")));
+
+  parameter Boolean allowFlowReversal = true
+    "= false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation(Dialog(tab="Assumptions"), Evaluate=true);
+
+  Modelica.Fluid.Interfaces.FluidPort_a port_a(
+    redeclare final package Medium = Medium,
+    m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
+    p(start=Medium.p_default),
+    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={{-10,90},{10,110}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b(
+    redeclare final package Medium = Medium,
+    m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
+    p(start=Medium.p_default),
+    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={{10,-110},{-10,-90}})));
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(
+    m_flow_nominal) "Small mass flow rate for regularization of zero flow"
+    annotation (Dialog(tab="Advanced"));
+  // Diagnostics
+   parameter Boolean show_T = false
+    "= true, if actual temperature at port is computed"
+    annotation (
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
+
+  Modelica.Units.SI.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow
+    "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
+
+  Modelica.Units.SI.PressureDifference dp(
+    start=_dp_start,
+    displayUnit="Pa") = port_a.p - port_b.p
+    "Pressure difference between port_a and port_b";
+
+  Medium.ThermodynamicState sta_a=
+    if allowFlowReversal then
+      Medium.setState_phX(port_a.p,
+                          noEvent(actualStream(port_a.h_outflow)),
+                          noEvent(actualStream(port_a.Xi_outflow)))
+    else
+      Medium.setState_phX(port_a.p,
+                          noEvent(inStream(port_a.h_outflow)),
+                          noEvent(inStream(port_a.Xi_outflow)))
+      if show_T "Medium properties in port_a";
+
+  Medium.ThermodynamicState sta_b=
+    if allowFlowReversal then
+      Medium.setState_phX(port_b.p,
+                          noEvent(actualStream(port_b.h_outflow)),
+                          noEvent(actualStream(port_b.Xi_outflow)))
+    else
+      Medium.setState_phX(port_b.p,
+                          noEvent(port_b.h_outflow),
+                          noEvent(port_b.Xi_outflow))
+       if show_T "Medium properties in port_b";
+
+protected
+  final parameter Modelica.Units.SI.MassFlowRate _m_flow_start=0
+    "Start value for m_flow, used to avoid a warning if not set in m_flow, and to avoid m_flow.start in parameter window";
+  final parameter Modelica.Units.SI.PressureDifference _dp_start(displayUnit=
+        "Pa") = 0
+    "Start value for dp, used to avoid a warning if not set in dp, and to avoid dp.start in parameter window";
+
+  annotation (
+    preferredView="info",
+    Documentation(info="<html>
+<p>
+This partial class implements the same functionality as 
+<a href=\"modelica://IBPSA.Fluid.Interfaces.StaticTwoPortHeatMassExchanger\">
+IBPSA.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</a>,
+except that <code>port_a</code> and <code>port_b</code> are placed at the top and bottom
+of the component.
+</p>
+<h4>Implementation</h4>
+<p>
+The implementation is done in this package as opposed to
+<a href=\"modelica://IBPSA.Fluid.Interfaces\">
+IBPSA.Fluid.Interfaces</a>
+as it is only used by the storage model, and may be removed when the tool limitations
+that are discussed in
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1794\">IBPSA, #1794</a>.
+are removed.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 20, 2023, by Michael Wetter:<br/>
+First implementation to address
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1794\">IBPSA, #1794</a>.
+</li>
+</ul>
+</html>"));
+end PartialTwoPortInterface;
diff --git a/IBPSA/Fluid/Storage/BaseClasses/package.order b/IBPSA/Fluid/Storage/BaseClasses/package.order
index 23ec1825ad..62b42b3b73 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/package.order
+++ b/IBPSA/Fluid/Storage/BaseClasses/package.order
@@ -1,5 +1,6 @@
 Buoyancy
 IndirectTankHeatExchanger
 PartialStratified
+PartialTwoPortInterface
 ThirdOrderStratifier
 Examples

From 8ebf982db8cd854072d6cfd7f61fdcacb245b16a Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 20 Sep 2023 10:27:24 -0700
Subject: [PATCH 3/5] Checked out files from master

---
 IBPSA/Fluid/Storage/Examples/Stratified.mo    | 49 ++++++++++---------
 .../Examples/StratifiedEnhancedInternalHex.mo |  7 +--
 .../StratifiedUnloadAtMinimumTemperature.mo   | 21 ++++----
 .../Validation/HeatExchangerDynamics.mo       | 13 +++--
 4 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/IBPSA/Fluid/Storage/Examples/Stratified.mo b/IBPSA/Fluid/Storage/Examples/Stratified.mo
index ffe1f040ce..93e8b36590 100644
--- a/IBPSA/Fluid/Storage/Examples/Stratified.mo
+++ b/IBPSA/Fluid/Storage/Examples/Stratified.mo
@@ -11,30 +11,30 @@ model Stratified "Test model for stratified tank"
     nSeg=10,
     m_flow_nominal=0.1,
     VTan=3) "Tank"
-    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+    annotation (Placement(transformation(extent={{-20,0},{0,20}})));
     Modelica.Blocks.Sources.TimeTable TWat(table=[0,273.15 + 40; 3600,273.15 +
         40; 3600,273.15 + 20; 7200,273.15 + 20]) "Water temperature"
-                 annotation (Placement(transformation(extent={{-100,-6},{-80,14}})));
+                 annotation (Placement(transformation(extent={{-100,2},{-80,22}})));
   IBPSA.Fluid.Sources.Boundary_pT sou_1(
     p=300000 + 5000,
     T=273.15 + 50,
     redeclare package Medium = Medium,
     use_T_in=true,
-    nPorts=2)             annotation (Placement(transformation(extent={{-60,-10},
-            {-40,10}})));
+    nPorts=2)             annotation (Placement(transformation(extent={{-60,-2},
+            {-40,18}})));
   IBPSA.Fluid.Sources.Boundary_pT sin_1(
     redeclare package Medium = Medium,
     T=273.15 + 20,
     use_p_in=true,
     p=300000,
-    nPorts=2)             annotation (Placement(transformation(extent={{90,-10},
-            {70,10}})));
+    nPorts=2)             annotation (Placement(transformation(extent={{90,-18},
+            {70,2}})));
   IBPSA.Fluid.FixedResistances.PressureDrop res_1(
     from_dp=true,
     redeclare package Medium = Medium,
     dp_nominal=5000,
     m_flow_nominal=0.1)
-    annotation (Placement(transformation(extent={{34,-10},{54,10}})));
+    annotation (Placement(transformation(extent={{34,-18},{54,2}})));
   IBPSA.Fluid.Storage.StratifiedEnhanced tanEnh(
     redeclare package Medium = Medium,
     hTan=3,
@@ -42,7 +42,7 @@ model Stratified "Test model for stratified tank"
     nSeg=10,
     m_flow_nominal=0.1,
     VTan=3) "Tank"
-    annotation (Placement(transformation(extent={{-18,-90},{2,-70}})));
+    annotation (Placement(transformation(extent={{-18,-70},{2,-50}})));
   IBPSA.Fluid.FixedResistances.PressureDrop res_2(
     from_dp=true,
     redeclare package Medium = Medium,
@@ -52,7 +52,7 @@ model Stratified "Test model for stratified tank"
   IBPSA.Fluid.Sensors.EnthalpyFlowRate HOut_flow(redeclare package Medium =
         Medium, m_flow_nominal=0.1) "Enthalpy flow rate"
                                      annotation (Placement(transformation(
-          extent={{4,-8},{20,8}})));
+          extent={{4,-16},{20,0}})));
   IBPSA.Fluid.Sensors.EnthalpyFlowRate HOut_flow1(redeclare package Medium =
         Medium, m_flow_nominal=0.1) "Enthalpy flow rate"
                                      annotation (Placement(transformation(
@@ -85,24 +85,25 @@ model Stratified "Test model for stratified tank"
             {-40,32},{-28,44}})));
 equation
   connect(TWat.y, sou_1.T_in) annotation (Line(
-      points={{-79,4},{-62,4}},
+      points={{-79,12},{-62,12}},
       color={0,0,127}));
-  connect(tanSim.port_b, HOut_flow.port_a) annotation (Line(points={{0,0},{4,0}},
-                                     color={0,127,255}));
+  connect(tanSim.port_b, HOut_flow.port_a) annotation (Line(points={{-10,0},{
+          -10,-8},{4,-8}},           color={0,127,255}));
   connect(HOut_flow.port_b, res_1.port_a)
-    annotation (Line(points={{20,0},{34,0}},   color={0,127,255}));
+    annotation (Line(points={{20,-8},{34,-8}}, color={0,127,255}));
   connect(tanEnh.port_b, HOut_flow1.port_a)
-    annotation (Line(points={{2,-80},{20,-80}},color={0,127,255}));
+    annotation (Line(points={{-8,-70},{-8,-80},{20,-80}},
+                                               color={0,127,255}));
   connect(HOut_flow1.port_b, res_2.port_a) annotation (Line(points={{36,-80},{
           40,-80}}, color={0,127,255}));
   connect(add.y, dH.u)
     annotation (Line(points={{53,40},{66,40}},   color={0,0,127}));
-  connect(HOut_flow.H_flow, add.u1) annotation (Line(points={{12,8.8},{12,46},{
+  connect(HOut_flow.H_flow, add.u1) annotation (Line(points={{12,0.8},{12,46},{
           30,46}},   color={0,0,127}));
   connect(HOut_flow1.H_flow, add.u2) annotation (Line(points={{28,-71.2},{28,34},
           {30,34}},       color={0,0,127}));
   connect(P.y, sin_1.p_in) annotation (Line(
-      points={{41,70},{100,70},{100,8},{92,8}},
+      points={{41,70},{100,70},{100,0},{92,0}},
       color={0,0,127}));
   connect(sine.y, TBCSid1.T) annotation (Line(points={{-69,72},{-55.5,72},{
           -55.5,90},{-41.2,90}}, color={0,0,127}));
@@ -113,31 +114,31 @@ equation
   connect(sine.y, TBCTop2.T) annotation (Line(points={{-69,72},{-56,72},{-56,38},
           {-41.2,38}}, color={0,0,127}));
   connect(TBCSid2.port, tanEnh.heaPorSid) annotation (Line(points={{-28,56},{
-          -24,56},{-24,-38},{-2,-38},{-2,-80},{-2.4,-80}}, color={191,0,0}));
+          -24,56},{-24,-12},{-2,-12},{-2,-60},{-2.4,-60}}, color={191,0,0}));
   connect(TBCTop2.port, tanEnh.heaPorTop) annotation (Line(points={{-28,38},{
-          -26,38},{-26,-40},{-6,-40},{-6,-72.6}}, color={191,0,0}));
+          -26,38},{-26,-14},{-6,-14},{-6,-52.6}}, color={191,0,0}));
   connect(sin_1.ports[1], res_1.port_b) annotation (Line(
-      points={{70,-1},{64,-1},{64,0},{54,0}},
+      points={{70,-9},{64,-9},{64,-8},{54,-8}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(sin_1.ports[2], res_2.port_b) annotation (Line(
-      points={{70,1},{64,1},{64,-80},{60,-80}},
+      points={{70,-7},{64,-7},{64,-80},{60,-80}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(sou_1.ports[1], tanSim.port_a) annotation (Line(
-      points={{-40,-1},{-30,-1},{-30,0},{-20,0}},
+      points={{-40,7},{-30,7},{-30,20},{-10,20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(sou_1.ports[2], tanEnh.port_a) annotation (Line(
-      points={{-40,1},{-30,1},{-30,-80},{-18,-80}},
+      points={{-40,9},{-30,9},{-30,-40},{-8,-40},{-8,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(TBCSid1.port, tanSim.heaPorSid) annotation (Line(
-      points={{-28,90},{-4.4,90},{-4.4,0}},
+      points={{-28,90},{-4.4,90},{-4.4,10}},
       color={191,0,0},
       smooth=Smooth.None));
   connect(TBCTop1.port, tanSim.heaPorTop) annotation (Line(
-      points={{-28,72},{-8,72},{-8,7.4}},
+      points={{-28,72},{-8,72},{-8,17.4}},
       color={191,0,0},
       smooth=Smooth.None));
   annotation(experiment(Tolerance=1e-08, StopTime=10800),
diff --git a/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo b/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo
index da67106c7e..11bf4b6e2c 100644
--- a/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo
+++ b/IBPSA/Fluid/Storage/Examples/StratifiedEnhancedInternalHex.mo
@@ -142,12 +142,13 @@ equation
           41.3333},{-6,41.3333},{-6,-66.08},{6,-66.08}},               color={0,
           127,255}));
   connect(bouWat.ports[1], tanSte.port_b) annotation (Line(points={{62,-79.3333},
-          {52,-79.3333},{52,72},{40,72}}, color={0,127,255}));
+          {52,-79.3333},{52,40},{22,40},{22,56},{23,56}},
+                                          color={0,127,255}));
   connect(bouWat.ports[2], tanDyn.port_b)
-    annotation (Line(points={{62,-78},{52,-78},{52,-12},{38,-12}},
+    annotation (Line(points={{62,-78},{52,-78},{52,-36},{21,-36},{21,-28}},
                                                           color={0,127,255}));
   connect(bouWat.ports[3], tanDynSol.port_b) annotation (Line(points={{62,
-          -76.6667},{58,-76.6667},{58,-76},{52,-76},{52,-60},{40,-60}},
+          -76.6667},{24,-76.6667},{24,-76},{23,-76}},
                                             color={0,127,255}));
   connect(step.y, solColSup.p_in)
     annotation (Line(points={{-59,48},{-52,48},{-42,48}}, color={0,0,127}));
diff --git a/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo b/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
index f28c6e07df..ca8107a058 100644
--- a/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
+++ b/IBPSA/Fluid/Storage/Examples/StratifiedUnloadAtMinimumTemperature.mo
@@ -20,7 +20,7 @@ model StratifiedUnloadAtMinimumTemperature
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     nSeg=nSeg,
     T_start=353.15) "Hot water storage tank"
-    annotation (Placement(transformation(extent={{-120,-130},{-100,-110}})));
+    annotation (Placement(transformation(extent={{-120,-128},{-100,-108}})));
   IBPSA.Fluid.Sources.Boundary_pT loa(redeclare package Medium = Medium,
       nPorts=1)
     "Load (imposed by a constant pressure boundary condition and the flow of masSou)"
@@ -103,13 +103,14 @@ model StratifiedUnloadAtMinimumTemperature
     "Boolean to real conversion for valve at bottom"
     annotation (Placement(transformation(extent={{80,30},{100,50}})));
 equation
-  connect(masSou.ports[1], tan.port_b) annotation (Line(points={{222,-120},{
-          -100,-120}},        color={0,127,255}));
+  connect(masSou.ports[1], tan.port_b) annotation (Line(points={{222,-120},{56,
+          -120},{56,-128},{-110,-128}},
+                              color={0,127,255}));
   connect(TMid.port, tan.heaPorVol[3])
-    annotation (Line(points={{-100,80},{-100,-12},{-110,-12},{-110,-120}},
+    annotation (Line(points={{-100,80},{-100,-118},{-110,-118}},
                                                              color={191,0,0}));
   connect(TBot.port, tan.heaPorVol[5])
-    annotation (Line(points={{-100,40},{-110,40},{-110,-119.76}},
+    annotation (Line(points={{-100,40},{-100,-117.76},{-110,-117.76}},
                                                            color={191,0,0}));
   connect(valTop.port_b, senTem.port_a) annotation (Line(points={{132,-20},{182,
           -20},{182,-60},{190,-60}},
@@ -124,13 +125,13 @@ equation
     annotation (Line(points={{210,-60},{222,-60}},
                                                  color={0,127,255}));
   connect(valTop.port_a, tan.fluPorVol[1]) annotation (Line(points={{112,-20},{
-          -116,-20},{-116,-118},{-115,-118},{-115,-121.6}},
+          -116,-20},{-116,-118},{-112.6,-118},{-112.6,-118.4}},
                                color={0,127,255}));
   connect(valMid.port_a, tan.fluPorVol[3]) annotation (Line(points={{132,-60},{
-          -116,-60},{-116,-120},{-115,-120}},
+          -116,-60},{-116,-118},{-112.6,-118}},
                               color={0,127,255}));
   connect(valBot.port_a, tan.fluPorVol[5]) annotation (Line(points={{150,-100},
-          {-116,-100},{-116,-118},{-115,-118},{-115,-118.4}},
+          {-116,-100},{-116,-118},{-112.6,-118},{-112.6,-117.6}},
                               color={0,127,255}));
   connect(onOffMid.y, and2.u1)
     annotation (Line(points={{-29,80},{8,80}},     color={255,0,255}));
@@ -153,10 +154,10 @@ equation
   connect(not1.y, and2.u2) annotation (Line(points={{1,60},{4,60},{4,72},{8,72}},
         color={255,0,255}));
   connect(hea.port, tan.heaPorVol[5]) annotation (Line(points={{-130,-124},{
-          -110,-124},{-110,-119.76}},
+          -110,-124},{-110,-117.76}},
                               color={191,0,0}));
   connect(TTop.port, tan.heaPorVol[1]) annotation (Line(points={{-160,-90},{
-          -110,-90},{-110,-120.24}},
+          -120,-90},{-120,-120},{-110,-120},{-110,-118.24}},
                              color={191,0,0}));
   connect(onOffHea.u, TTop.T) annotation (Line(points={{-212,-124},{-230,-124},
           {-230,-90},{-181,-90}},color={0,0,127}));
diff --git a/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo b/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo
index 5339f1820c..0a49f201ae 100644
--- a/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo
+++ b/IBPSA/Fluid/Storage/Validation/HeatExchangerDynamics.mo
@@ -87,11 +87,11 @@ model HeatExchangerDynamics
   IBPSA.Fluid.Sources.MassFlowSource_T mWatTanDyn_flow(
     redeclare package Medium = Medium,
     nPorts=1) "Mass flow rate through the tank"
-    annotation (Placement(transformation(extent={{80,20},{60,40}})));
+    annotation (Placement(transformation(extent={{82,10},{62,30}})));
   IBPSA.Fluid.Sources.MassFlowSource_T mWatTanSte_flow(
     redeclare package Medium = Medium,
     nPorts=1) "Mass flow rate through the tank"
-    annotation (Placement(transformation(extent={{80,-20},{60,0}})));
+    annotation (Placement(transformation(extent={{82,-30},{62,-10}})));
 equation
   connect(mHex_flow_in.y, mHex_flow1.m_flow_in) annotation (Line(
       points={{-79,20},{-70,20},{-70,28},{-62,28}},
@@ -102,12 +102,11 @@ equation
   connect(mHex_flow2.ports[1], tanSte.portHex_a) annotation (Line(points={{-40,-10},
           {-32,-10},{-30,-10},{-30,-13.8},{32,-13.8}},  color={0,127,255}));
   connect(watInTan.ports[1], tanSte.port_a) annotation (Line(points={{-40,59},{
-          -40,59},{-22,59},{-22,-10},{32,-10}},
-                                             color={0,127,255}));
+          -40,59},{-22,59},{-22,0},{42,0}},  color={0,127,255}));
   connect(mHex_flow1.ports[1], tanDyn.portHex_a) annotation (Line(points={{-40,
           20},{-30,20},{-30,26.2},{32,26.2}}, color={0,127,255}));
   connect(watInTan.ports[2], tanDyn.port_a) annotation (Line(points={{-40,61},{
-          -30,61},{-20,61},{-20,30},{32,30}},
+          -30,61},{-20,61},{-20,40},{42,40}},
                                            color={0,127,255}));
   connect(senTanDyn.port_a, tanDyn.portHex_b) annotation (Line(points={{10,10},{
           20,10},{20,22},{32,22}}, color={0,127,255}));
@@ -120,9 +119,9 @@ equation
           -42,-40},{-42,-37}},
                            color={0,127,255}));
   connect(mWatTanDyn_flow.ports[1], tanDyn.port_b)
-    annotation (Line(points={{60,30},{52,30}}, color={0,127,255}));
+    annotation (Line(points={{62,20},{42,20}}, color={0,127,255}));
   connect(mWatTanSte_flow.ports[1], tanSte.port_b)
-    annotation (Line(points={{60,-10},{52,-10}}, color={0,127,255}));
+    annotation (Line(points={{62,-20},{42,-20}}, color={0,127,255}));
   annotation (
   __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/Fluid/Storage/Validation/HeatExchangerDynamics.mos"
         "Simulate and plot"),

From 89217fb1498c1e92058732ed6e8e5821ee02d25d Mon Sep 17 00:00:00 2001
From: AntoineGautier <agautier@solamen.fr>
Date: Thu, 21 Sep 2023 09:52:05 +0200
Subject: [PATCH 4/5] Reroute connections, increase size of diagram

---
 .../BaseClasses/IndirectTankHeatExchanger.mo  | 20 +++++++++----------
 IBPSA/Fluid/Storage/Examples/Stratified.mo    | 10 +++++-----
 IBPSA/Fluid/Storage/StratifiedEnhanced.mo     | 16 +++++++--------
 .../Storage/StratifiedEnhancedInternalHex.mo  | 20 +++++++++----------
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo b/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
index 535f60d9f7..c351fd33e0 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
+++ b/IBPSA/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
@@ -169,7 +169,7 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(vol[1].ports[1],senMasFlo.port_b) annotation (Line(
-      points={{-24,-40},{-24,-50},{-60,-50}},
+      points={{-23,-40},{-23,-50},{-60,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(cap.port,HexToTan.solid) annotation (Line(
@@ -185,7 +185,7 @@ equation
       color={191,0,0},
       smooth=Smooth.None));
   connect(temSenHex.T, hAPipIns.T)     annotation (Line(
-      points={{-10,-70},{0,-70},{0,-76},{9,-76}},
+      points={{-9,-70},{0,-70},{0,-76},{9,-76}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(hAPipIns.hA, htfToHex.Gc)     annotation (Line(
@@ -202,12 +202,12 @@ equation
       smooth=Smooth.None));
   connect(temSenSur.T, hANatCyl.TSur)
                                      annotation (Line(
-      points={{20,52},{20,70},{-40,70},{-40,114},{-2,114}},
+      points={{20,53},{20,70},{-40,70},{-40,114},{-2,114}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(hANatCyl.TFlu, temSenWat.T)
                                      annotation (Line(
-      points={{-2,106},{-36,106},{-36,76},{68,76},{68,50}},
+      points={{-2,106},{-36,106},{-36,76},{68,76},{68,51}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(port_a, senMasFlo.port_a) annotation (Line(
@@ -215,7 +215,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(vol[nSeg].ports[2], res.port_a) annotation (Line(
-      points={{-20,-40},{-20,-50},{46,-50}},
+      points={{-21,-40},{-21,-50},{46,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(res.port_b, port_b) annotation (Line(
@@ -238,7 +238,7 @@ equation
             -150},{100,150}}), graphics), Icon(coordinateSystem(
           preserveAspectRatio=false, extent={{-100,-150},{100,150}}), graphics={
         Rectangle(
-          extent={{-66,64},{74,-96}},
+          extent={{-70,64},{70,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={95,95,95},
@@ -250,25 +250,25 @@ equation
           fillColor={0,0,255},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-66,-12},{74,-18}},
+          extent={{-70,-12},{70,-18}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{-36,64},{-32,-96}},
+          extent={{-40,64},{-36,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{2,64},{6,-96}},
+          extent={{-2,64},{2,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
           fillPattern=FillPattern.Solid),
         Rectangle(
-          extent={{40,64},{44,-96}},
+          extent={{36,64},{40,-96}},
           lineColor={0,0,255},
           pattern=LinePattern.None,
           fillColor={0,0,0},
diff --git a/IBPSA/Fluid/Storage/Examples/Stratified.mo b/IBPSA/Fluid/Storage/Examples/Stratified.mo
index 93e8b36590..bf0cae839c 100644
--- a/IBPSA/Fluid/Storage/Examples/Stratified.mo
+++ b/IBPSA/Fluid/Storage/Examples/Stratified.mo
@@ -42,7 +42,7 @@ model Stratified "Test model for stratified tank"
     nSeg=10,
     m_flow_nominal=0.1,
     VTan=3) "Tank"
-    annotation (Placement(transformation(extent={{-18,-70},{2,-50}})));
+    annotation (Placement(transformation(extent={{-20,-70},{0,-50}})));
   IBPSA.Fluid.FixedResistances.PressureDrop res_2(
     from_dp=true,
     redeclare package Medium = Medium,
@@ -92,7 +92,7 @@ equation
   connect(HOut_flow.port_b, res_1.port_a)
     annotation (Line(points={{20,-8},{34,-8}}, color={0,127,255}));
   connect(tanEnh.port_b, HOut_flow1.port_a)
-    annotation (Line(points={{-8,-70},{-8,-80},{20,-80}},
+    annotation (Line(points={{-10,-70},{-10,-80},{20,-80}},
                                                color={0,127,255}));
   connect(HOut_flow1.port_b, res_2.port_a) annotation (Line(points={{36,-80},{
           40,-80}}, color={0,127,255}));
@@ -114,9 +114,9 @@ equation
   connect(sine.y, TBCTop2.T) annotation (Line(points={{-69,72},{-56,72},{-56,38},
           {-41.2,38}}, color={0,0,127}));
   connect(TBCSid2.port, tanEnh.heaPorSid) annotation (Line(points={{-28,56},{
-          -24,56},{-24,-12},{-2,-12},{-2,-60},{-2.4,-60}}, color={191,0,0}));
+          -24,56},{-24,-12},{-4.4,-12},{-4.4,-60}},        color={191,0,0}));
   connect(TBCTop2.port, tanEnh.heaPorTop) annotation (Line(points={{-28,38},{
-          -26,38},{-26,-14},{-6,-14},{-6,-52.6}}, color={191,0,0}));
+          -26,38},{-26,-14},{-8,-14},{-8,-52.6}}, color={191,0,0}));
   connect(sin_1.ports[1], res_1.port_b) annotation (Line(
       points={{70,-9},{64,-9},{64,-8},{54,-8}},
       color={0,127,255},
@@ -130,7 +130,7 @@ equation
       color={0,127,255},
       smooth=Smooth.None));
   connect(sou_1.ports[2], tanEnh.port_a) annotation (Line(
-      points={{-40,9},{-30,9},{-30,-40},{-8,-40},{-8,-50}},
+      points={{-40,9},{-30,9},{-30,-40},{-10,-40},{-10,-50}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(TBCSid1.port, tanSim.heaPorSid) annotation (Line(
diff --git a/IBPSA/Fluid/Storage/StratifiedEnhanced.mo b/IBPSA/Fluid/Storage/StratifiedEnhanced.mo
index ea105bc83c..69d9596b67 100644
--- a/IBPSA/Fluid/Storage/StratifiedEnhanced.mo
+++ b/IBPSA/Fluid/Storage/StratifiedEnhanced.mo
@@ -43,16 +43,16 @@ equation
           {-40,-80},{14,-80},{14,-16},{16,-16}},color={0,127,255}));
   connect(vol[nSeg].ports[2], H_b_flow.port_a) annotation (Line(points={{16,-16},
           {14,-16},{14,-80},{50,-80}}, color={0,127,255}));
-  connect(H_b_flow.port_b, port_b) annotation (Line(points={{70,-80},{80,-80},{80,
-          0},{100,0}}, color={0,127,255}));
+  connect(H_b_flow.port_b, port_b) annotation (Line(points={{70,-80},{80,-80},{
+          80,-100},{0,-100}}, color={0,127,255}));
   for i in 1:(nSeg-1) loop
     connect(vol[i].ports[2], H_vol_flow[i].port_a) annotation (Line(points={{16,
             -16},{16,-20},{-28,-20},{-28,-40},{-20,-40}}, color={0,127,255}));
     connect(H_vol_flow[i].port_b, vol[i + 1].ports[1]) annotation (Line(points={{0,-40},
             {4,-40},{4,-16},{16,-16}},         color={0,127,255}));
   end for;
-  connect(port_a, H_a_flow.port_a) annotation (Line(points={{-100,0},{
-          -80,0},{-80,-80},{-60,-80}}, color={0,127,255}));
+  connect(port_a, H_a_flow.port_a) annotation (Line(points={{0,100},{-96,100},{
+          -96,-80},{-60,-80}}, color={0,127,255}));
 
   connect(vol[1:nSeg].ports[3], str.fluidPort[2:nSeg+1])
    annotation (Line(points={{16,-16},{16,-18},{-66,-18},{-66,-40},{-60,-40}},
@@ -69,10 +69,10 @@ equation
                                                   color={0,0,127}));
   connect(str.heatPort, vol.heatPort)    annotation (Line(points={{-40,-40},{
           -32,-40},{-32,10},{6,10},{6,-6}},      color={191,0,0}));
-  connect(port_a, str.fluidPort[1]) annotation (Line(points={{-100,5.55112e-16},
-          {-100,0},{-72,0},{-72,-40},{-60,-40}}, color={0,127,255}));
-  connect(port_b, str.fluidPort[nSeg + 2]) annotation (Line(points={{100,
-          5.55112e-16},{100,0},{80,0},{80,-88},{-72,-88},{-72,-40},{-60,-40}},
+  connect(port_a, str.fluidPort[1]) annotation (Line(points={{0,100},{0,92},{
+          -72,92},{-72,-40},{-60,-40}},          color={0,127,255}));
+  connect(port_b, str.fluidPort[nSeg + 2]) annotation (Line(points={{0,-100},{
+          -72,-100},{-72,-40},{-60,-40}},
                            color={0,127,255}));
   connect(mTan_flow.y, str.m_flow) annotation (Line(points={{-73,-32},{-68.5,
           -32},{-68.5,-31.8},{-62,-31.8}}, color={0,0,127}));
diff --git a/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo b/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo
index 6d8e5c7e71..be6ea0535a 100644
--- a/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo
+++ b/IBPSA/Fluid/Storage/StratifiedEnhancedInternalHex.mo
@@ -95,13 +95,13 @@ model StratifiedEnhancedInternalHex
     redeclare final package Medium =MediumHex,
      m_flow(min=if allowFlowReversalHex then -Modelica.Constants.inf else 0))
     "Heat exchanger inlet"
-   annotation (Placement(transformation(extent={{-110,-48},{-90,-28}}),
+   annotation (Placement(transformation(extent={{-150,-30},{-130,-10}}),
                    iconTransformation(extent={{-110,-48},{-90,-28}})));
   Modelica.Fluid.Interfaces.FluidPort_b portHex_b(
      redeclare final package Medium = MediumHex,
      m_flow(max=if allowFlowReversalHex then Modelica.Constants.inf else 0))
     "Heat exchanger outlet"
-   annotation (Placement(transformation(extent={{-110,-90},{-90,-70}}),
+   annotation (Placement(transformation(extent={{-150,-90},{-130,-70}}),
         iconTransformation(extent={{-110,-90},{-90,-70}})));
 
   BaseClasses.IndirectTankHeatExchanger indTanHex(
@@ -126,11 +126,10 @@ model StratifiedEnhancedInternalHex
     final allowFlowReversal=allowFlowReversalHex,
     final m_flow_small=1e-4*abs(mHex_flow_nominal))
     "Heat exchanger inside the tank"
-     annotation (Placement(
-        transformation(
-        extent={{-10,-15},{10,15}},
+     annotation (Placement(transformation(
+        extent={{10,-15},{-10,15}},
         rotation=180,
-        origin={-87,32})));
+        origin={-120,-20})));
 
   Modelica.Units.SI.HeatFlowRate QHex_flow=-sum(indTanHex.port.Q_flow)
     "Heat transferred from the heat exchanger to the tank";
@@ -173,17 +172,17 @@ equation
     for i in 1:hexSegMult loop
       connect(indTanHex.port[j*hexSegMult+i], heaPorVol[segHex_a + (if hHex_a > hHex_b then j else -j)])
         annotation (Line(
-       points={{-87,41.8},{-20,41.8},{-20,-2.22045e-16},{0,-2.22045e-16}},
+       points={{-120,-10.2},{-120,0},{0,0}},
        color={191,0,0},
        smooth=Smooth.None));
     end for;
   end for;
   connect(portHex_a, indTanHex.port_a) annotation (Line(
-      points={{-100,-38},{-68,-38},{-68,32},{-77,32}},
+      points={{-140,-20},{-130,-20}},
       color={0,127,255},
       smooth=Smooth.None));
   connect(indTanHex.port_b, portHex_b) annotation (Line(
-      points={{-97,32},{-98,32},{-98,18},{-70,18},{-70,-80},{-100,-80}},
+      points={{-110,-20},{-100,-20},{-100,-80},{-140,-80}},
       color={0,127,255},
       smooth=Smooth.None));
 
@@ -337,5 +336,6 @@ January 29, 2013 by Peter Grant:<br/>
 First implementation.
 </li>
 </ul>
-</html>"));
+</html>"),
+    Diagram(coordinateSystem(extent={{-140,-100},{100,100}})));
 end StratifiedEnhancedInternalHex;

From 78acfb24faa5709ea89e066881edda7f96f0f3a7 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Thu, 21 Sep 2023 15:09:35 -0700
Subject: [PATCH 5/5] Corrected link

---
 IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo b/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
index 231c78b8fb..97f21e2db6 100644
--- a/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
+++ b/IBPSA/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
@@ -86,8 +86,8 @@ protected
     Documentation(info="<html>
 <p>
 This partial class implements the same functionality as 
-<a href=\"modelica://IBPSA.Fluid.Interfaces.StaticTwoPortHeatMassExchanger\">
-IBPSA.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</a>,
+<a href=\"modelica://IBPSA.Fluid.Interfaces.PartialTwoPortInterface\">
+IBPSA.Fluid.Interfaces.PartialTwoPortInterface</a>,
 except that <code>port_a</code> and <code>port_b</code> are placed at the top and bottom
 of the component.
 </p>