From 89bf74035bdea926701edef2c3dbf35f48b32680 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 15 Sep 2021 11:51:19 -0700
Subject: [PATCH] Merged IBPSA, branch issue1494_plugflowpipe_singleoutlet
 (#2611)

* Merged IBPSA, branch issue1494_plugflowpipe_singleoutlet

* Updated conversion script and release notes

* Integrated new model into PlugFlowDiscretized

* Changed flow rate, updated reference results
---
 .github/workflows/formatting.yml              |   6 +-
 Buildings/.copiedFiles.txt                    |   5 -
 .../BaseClasses/PlugFlowTransportDelay.mo     |  23 +-
 .../BaseClasses/Validation/PlugFlowCore.mo    | 128 -------
 .../BaseClasses/Validation/package.mo         |  21 --
 .../BaseClasses/package.order                 |   2 -
 .../Examples/PlugFlowDiscretized.mo           |  10 +-
 .../FixedResistances/Examples/PlugFlowPipe.mo |  98 ++++--
 .../FixedResistances/PlugFlowDiscretized.mo   | 239 ++++++++++---
 .../Fluid/FixedResistances/PlugFlowPipe.mo    | 261 ++++++++++----
 .../Validation/PlugFlowPipes/FlowReversal.mo  |  16 +-
 .../Validation/PlugFlowPipes/PlugFlowAIT.mo   |  88 +++--
 .../Validation/PlugFlowPipes/PlugFlowULg.mo   |   3 +-
 .../PlugFlowPipes/TransportWaterAir.mo        |   6 +-
 .../Examples/DiscretizedBuriedPipe.mo         |   8 +-
 .../BuriedPipes/Examples/SingleBuriedPipe.mo  |  23 +-
 .../BuriedPipes/Examples/TwoBuriedPipes.mo    |  25 +-
 .../BuriedPipes/Examples/TwoPipesConduit.mo   |  18 +-
 .../Validation/GroundCouplingAIT.mo           | 134 +++++---
 .../BaseClasses/PlugFlowCore.mo               |  52 +--
 .../BaseClasses/Validation.mo                 | 153 +++++++++
 .../FixedResistances/BaseClasses/package.mo   |  12 +
 .../BaseClasses}/package.order                |   1 +
 .../Fluid/FixedResistances/PlugFlowPipe.mo    | 324 ++++++++++++++++++
 .../Fluid/FixedResistances/package.mo         |  10 +
 .../Fluid/FixedResistances/package.order      |   2 +
 Buildings/Obsolete/Fluid/package.order        |   1 +
 ...sistances_Examples_PlugFlowDiscretized.txt |  12 +-
 ...FixedResistances_Examples_PlugFlowPipe.txt |  10 +-
 ..._Validation_PlugFlowPipes_FlowReversal.txt |  17 +-
 ...s_Validation_PlugFlowPipes_PlugFlowAIT.txt |  14 +-
 ...dation_PlugFlowPipes_TransportWaterAir.txt |  26 +-
 ...riedPipes_Validation_GroundCouplingAIT.txt |  14 +-
 .../ConvertBuildings_from_8_to_9.0.0.mos      |   8 +-
 .../BaseClasses/Validation/PlugFlowCore.mos   |  13 -
 .../Examples/PlugFlowDiscretized.mos          |   7 +-
 .../Examples/PlugFlowPipe.mos                 |   4 +-
 .../Validation/PlugFlowPipes/FlowReversal.mos |   2 +-
 .../PlugFlowPipes/TransportWaterAir.mos       |   6 +-
 ...es.BaseClasses.Validation.PlugFlowCore.mos |   5 -
 ...sistances.Examples.PlugFlowDiscretized.mos |   8 +-
 ...FixedResistances.Examples.PlugFlowPipe.mos |   2 +
 ....Validation.PlugFlowPipes.FlowReversal.mos |   5 +-
 ...dation.PlugFlowPipes.TransportWaterAir.mos |  10 +-
 Buildings/package.mo                          |  17 +
 45 files changed, 1293 insertions(+), 556 deletions(-)
 delete mode 100644 Buildings/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo
 delete mode 100644 Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.mo
 rename Buildings/{ => Obsolete}/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo (93%)
 create mode 100644 Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/Validation.mo
 create mode 100644 Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.mo
 rename Buildings/{Fluid/FixedResistances/BaseClasses/Validation => Obsolete/Fluid/FixedResistances/BaseClasses}/package.order (54%)
 create mode 100644 Buildings/Obsolete/Fluid/FixedResistances/PlugFlowPipe.mo
 create mode 100644 Buildings/Obsolete/Fluid/FixedResistances/package.mo
 create mode 100644 Buildings/Obsolete/Fluid/FixedResistances/package.order
 delete mode 100644 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
 delete mode 100644 Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore.mos

diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
index 4c968bf60ec..592372baf5f 100644
--- a/.github/workflows/formatting.yml
+++ b/.github/workflows/formatting.yml
@@ -80,7 +80,7 @@ jobs:
               rm Resources/Scripts/OpenModelica/compareVars/*.mos
               python -c 'import buildingspy.development.regressiontest as u; u.Tester().writeOpenModelicaResultDictionary()'
               git status --porcelain Resources/Scripts/OpenModelica
-              test -z $(git status --porcelain Resources/Scripts/OpenModelica)
+              test -z "$(git status --porcelain Resources/Scripts/OpenModelica)"
 
       - name: "Test user guide"
         run : (cd Resources/Documentation/userGuide; make regressiontest)
@@ -93,6 +93,6 @@ jobs:
               cd ..
               python Buildings/Resources/src/Controls/OBC/UnitConversions/unit_converters.py
               git diff --exit-code Buildings
-              
+
       - name: Check for UTF-8 BOM
-        run: "! find . -name '*.mo' -print0 | xargs -0 grep -l $'^\\xEF\\xBB\\xBF' | grep ."              
+        run: "! find . -name '*.mo' -print0 | xargs -0 grep -l $'^\\xEF\\xBB\\xBF' | grep ."
diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
index a774040bb39..ef4215c7766 100644
--- a/Buildings/.copiedFiles.txt
+++ b/Buildings/.copiedFiles.txt
@@ -487,12 +487,8 @@ Buildings/Fluid/FMI/Validation/package.order
 Buildings/Fluid/FMI/package.mo
 Buildings/Fluid/FMI/package.order
 Buildings/Fluid/FixedResistances/BaseClasses/PlugFlow.mo
-Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
 Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowHeatLoss.mo
 Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo
-Buildings/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo
-Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.mo
-Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.order
 Buildings/Fluid/FixedResistances/BaseClasses/package.mo
 Buildings/Fluid/FixedResistances/BaseClasses/package.order
 Buildings/Fluid/FixedResistances/CheckValve.mo
@@ -1646,7 +1642,6 @@ Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/FlowSplitter_u.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFanPressureDriven.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mos
-Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/CheckValve.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/FlowJunction.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/HydraulicDiameter.mos
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo
index 52b21535607..6f76df5a680 100644
--- a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo
+++ b/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowTransportDelay.mo
@@ -23,12 +23,13 @@ model PlugFlowTransportDelay "Delay time for given normalized velocity"
     if initDelay and (abs(m_flow_start) > 1E-10*m_flow_nominal)
      then min(-length/m_flow_start*(rho*dh^2/4*Modelica.Constants.pi), 0) else 0
     "Initial value of input time at outlet";
-
+  final parameter Real conUM(unit="1/kg") = 4/rho/dh/dh/Modelica.Constants.pi/length
+    "Constant to convert mass flow rate into velocity normalized by the pipe length";
   Modelica.SIunits.Time time_out_rev "Reverse flow direction output time";
   Modelica.SIunits.Time time_out_des "Design flow direction output time";
 
   Real x(start=0) "Spatial coordinate for spatialDistribution operator";
-  Modelica.SIunits.Frequency u "Normalized fluid velocity (1/s)";
+  Real u(unit="1/s") "Normalized fluid velocity (1/s)";
 
   Modelica.Blocks.Interfaces.RealInput m_flow "Mass flow of fluid" annotation (
       Placement(transformation(extent={{-140,-20},{-100,20}}),
@@ -48,8 +49,7 @@ initial equation
   t0 = time;
 
 equation
-  u = m_flow/(rho*(dh^2)/4*Modelica.Constants.pi)/length;
-
+  u = m_flow * conUM;
   der(x) = u;
   (time_out_rev, time_out_des) = spatialDistribution(
     time,
@@ -119,17 +119,14 @@ function. This components requires the mass flow through the pipe and the pipe
 dimensions in order to derive information about the fluid propagation.
 </p>
 <p>
-The component calculates the delay time at both in/outlet ports of the pipe
-and therefore has two outlets. During forward flow, only the forward
-<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowTransportDelay\">
-Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowTransportDelay</a> component in
-<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
-Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>
-will be active and uses the forward output of PlugFlowTransportDelay.
-During reverse, the opposite is true and only the reverse output is used.
+The component calculates the delay time at the inlet and the outlet port of the pipe.
+For the forward flow, the time delay is exposed at the output <code>tau</code>,
+and for the backward flow, the time delay is exposed at the output <code>tauRev</code>.
 </p>
 <h4>Assumption</h4>
-<p>It is assumed that no axial mixing takes place in the pipe. </p>
+<p>
+No axial mixing takes place in the pipe.
+</p>
 </html>", revisions="<html>
 <ul>
 <li>
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo b/Buildings/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo
deleted file mode 100644
index e9458966801..00000000000
--- a/Buildings/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mo
+++ /dev/null
@@ -1,128 +0,0 @@
-within Buildings.Fluid.FixedResistances.BaseClasses.Validation;
-model PlugFlowCore "Simple example of plug flow pipe core"
-  extends Modelica.Icons.Example;
-  replaceable package Medium = Buildings.Media.Water "Medium in pipes"
-                                            annotation (
-      choicesAllMatching=true);
-  parameter Modelica.SIunits.Length dh=0.1
-    "Hydraulic diameter (assuming a round cross section area)";
-  parameter Modelica.SIunits.Length dIns = 0.05
-    "Thickness of pipe insulation";
-  parameter Modelica.SIunits.ThermalConductivity kIns= 0.028
-   "Heat conductivity of pipe insulation";
-
-  parameter Modelica.SIunits.SpecificHeatCapacity cPip=500
-    "Specific heat of pipe wall material. 2300 for PE, 500 for steel";
-  parameter Modelica.SIunits.Density rhoPip=8000
-    "Density of pipe wall material. 930 for PE, 8000 for steel";
-
-  parameter Real R=1/(kIns*2*Modelica.Constants.pi/
-    Modelica.Math.log((dh/2 + dIns)/(dh/2)))
-    "Thermal resistance per unit length from fluid to boundary temperature";
-
-  parameter Real C=rho_default*Modelica.Constants.pi*(
-      dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe";
-
-  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
-      p=Medium.p_default,
-      T=Medium.T_default,
-      X=Medium.X_default)
-    "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
-    annotation (Dialog(group="Advanced"));
-
-  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
-      T=Medium.T_default,
-      p=Medium.p_default,
-      X=Medium.X_default) "Default medium state";
-
-  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
-      Medium.specificHeatCapacityCp(state=sta_default)
-    "Heat capacity of medium";
-
-  Modelica.Blocks.Sources.Ramp Tin(
-    height=20,
-    duration=0,
-    offset=273.15 + 50,
-    startTime=100) "Ramp temperature signal"
-    annotation (Placement(transformation(extent={{-92,-6},{-72,14}})));
-  Sources.Boundary_pT sin(
-    redeclare package Medium = Medium,
-    T=273.15 + 10,
-    nPorts=1,
-    p(displayUnit="Pa") = 101325) "Pressure boundary condition"
-    annotation (Placement(transformation(extent={{82,-10},{62,10}})));
-  Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore pip(
-    redeclare package Medium = Medium,
-    from_dp=true,
-    dh=0.1,
-    length=100,
-    m_flow_nominal=1,
-    roughness=2.5e-5,
-    thickness=0.0032,
-    initDelay=true,
-    m_flow_start=1,
-    R=R,
-    C=C,
-    v_nominal=1.5,
-    T_start_in=323.15,
-    T_start_out=323.15) "Pipe"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Buildings.HeatTransfer.Sources.FixedTemperature bou(T=283.15)
-    "Fixed temperature boundary condition"
-    annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
-  Buildings.Fluid.Sources.MassFlowSource_T sou(
-    nPorts=1,
-    redeclare package Medium = Medium,
-    use_T_in=true,
-    m_flow=3) "Flow source"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
-
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTemOut(
-    redeclare package Medium = Medium,
-    m_flow_nominal=1,
-    T_start=323.15) "Temperature sensor"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
-  Buildings.Fluid.Sensors.TemperatureTwoPort senTemIn(
-    redeclare package Medium = Medium,
-    m_flow_nominal=1,
-    T_start=323.15) "Temperature sensor"
-    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
-equation
-  connect(bou.port, pip.heatPort)
-    annotation (Line(points={{-20,70},{10,70},{10,10}}, color={191,0,0}));
-  connect(Tin.y, sou.T_in)
-    annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
-  connect(senTemOut.port_b, sin.ports[1])
-    annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));
-  connect(sou.ports[1], senTemIn.port_a)
-    annotation (Line(points={{-40,0},{-30,0}}, color={0,127,255}));
-  connect(senTemIn.port_b, pip.port_a)
-    annotation (Line(points={{-10,0},{0,0}}, color={0,127,255}));
-  connect(pip.port_b, senTemOut.port_a)
-    annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
-  annotation (
-    __Dymola_Commands(file=
-          "Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos"
-        "Simulate and Plot"),
-    experiment(StopTime=1000, Tolerance=1e-006),
-    Documentation(info="<html>
-<p>
-Basic test of model
-<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
-Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>.
-This test includes an inlet temperature step under a constant mass flow rate.
-</p>
-</html>", revisions="<html>
-<ul>
-<li>
-October 23, 2017, by Michael Wetter:<br/>
-Corrected wrong hyperlink, updated example for new set of parameters that
-are exposed by the pipe model.
-</li>
-<li>
-September 8, 2017 by Bram van der Heijde:<br/>
-First implementation.
-</li>
-</ul>
-</html>"));
-end PlugFlowCore;
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.mo b/Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.mo
deleted file mode 100644
index df95155040d..00000000000
--- a/Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.mo
+++ /dev/null
@@ -1,21 +0,0 @@
-
-within Buildings.Fluid.FixedResistances.BaseClasses;
-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.Fluid.FixedResistances.BaseClasses\">
-Buildings.Fluid.FixedResistances.BaseClasses</a>.
-</p>
-<p>
-Note that most validation models contain simple input data
-which may not be realistic, but for which the correct
-output can be obtained through an analytic solution.
-The examples plot various outputs, which have been verified against these
-solutions. These model outputs are stored as reference data and
-used for continuous validation whenever models in the library change.
-</p>
-</html>"));
-end Validation;
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/package.order b/Buildings/Fluid/FixedResistances/BaseClasses/package.order
index 271ffdae184..cd04a6ff1c5 100644
--- a/Buildings/Fluid/FixedResistances/BaseClasses/package.order
+++ b/Buildings/Fluid/FixedResistances/BaseClasses/package.order
@@ -1,6 +1,4 @@
 Pipe
 PlugFlow
-PlugFlowCore
 PlugFlowHeatLoss
 PlugFlowTransportDelay
-Validation
diff --git a/Buildings/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mo b/Buildings/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mo
index 6dfd19dbcaa..22504b19dad 100644
--- a/Buildings/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mo
+++ b/Buildings/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mo
@@ -22,14 +22,13 @@ model PlugFlowDiscretized "Simple example of discretized plug flow pipe"
     redeclare package Medium = Medium,
     nSeg=nSeg,
     dh=0.1,
-    length=fill(10, nSeg),
+    totLen=100,
     dIns=0.05,
     kIns=0.028,
-    m_flow_nominal=1,
+    m_flow_nominal=10,
     thickness=0.0032,
     initDelay=true,
-    T_start_in=323.15,
-    T_start_out=323.15) "Pipe segments"
+    T_start_in=fill(323.15, nSeg)) "Pipe segments"
     annotation (Placement(transformation(extent={{0,-10},{20,10}})));
   Buildings.HeatTransfer.Sources.FixedTemperature
     bou[nSeg](T={283.15 + 2 * i for i in 1:nSeg})
@@ -39,7 +38,8 @@ model PlugFlowDiscretized "Simple example of discretized plug flow pipe"
     nPorts=1,
     redeclare package Medium = Medium,
     use_T_in=true,
-    m_flow=3) "Flow source"
+    m_flow=10)
+              "Flow source"
     annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
 
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemOut(
diff --git a/Buildings/Fluid/FixedResistances/Examples/PlugFlowPipe.mo b/Buildings/Fluid/FixedResistances/Examples/PlugFlowPipe.mo
index 3f879114185..19a0aaf727e 100644
--- a/Buildings/Fluid/FixedResistances/Examples/PlugFlowPipe.mo
+++ b/Buildings/Fluid/FixedResistances/Examples/PlugFlowPipe.mo
@@ -8,16 +8,15 @@ model PlugFlowPipe "Simple example of plug flow pipe"
     duration=0,
     offset=273.15 + 50,
     startTime=100) "Ramp pressure signal"
-    annotation (Placement(transformation(extent={{-92,-6},{-72,14}})));
+    annotation (Placement(transformation(extent={{-100,-10},{-80,10}})));
   Sources.Boundary_pT sin(
     redeclare package Medium = Medium,
     T=273.15 + 10,
-    nPorts=1,
+    nPorts=2,
     p(displayUnit="Pa") = 101325) "Pressure boundary condition"
-    annotation (Placement(transformation(extent={{82,-10},{62,10}})));
+    annotation (Placement(transformation(extent={{100,-10},{80,10}})));
   Buildings.Fluid.FixedResistances.PlugFlowPipe pip(
     redeclare package Medium = Medium,
-    nPorts=1,
     dh=0.1,
     length=100,
     dIns=0.05,
@@ -30,40 +29,90 @@ model PlugFlowPipe "Simple example of plug flow pipe"
     rhoPip=8000,
     T_start_in=323.15,
     T_start_out=323.15) "Pipe"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
-  Buildings.HeatTransfer.Sources.FixedTemperature bou(T=283.15)
+    annotation (Placement(transformation(extent={{0,10},{20,30}})));
+  Buildings.HeatTransfer.Sources.FixedTemperature bou[2](each T=283.15)
     "Boundary temperature"
     annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
   Buildings.Fluid.Sources.MassFlowSource_T sou(
-    nPorts=1,
     redeclare package Medium = Medium,
     use_T_in=true,
-    m_flow=3) "Flow source"
-    annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+    m_flow=3,
+    nPorts=1) "Flow source"
+    annotation (Placement(transformation(extent={{-60,10},{-40,30}})));
 
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemOut(
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     T_start=323.15) "Temperature sensor"
-    annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+    annotation (Placement(transformation(extent={{40,10},{60,30}})));
   Buildings.Fluid.Sensors.TemperatureTwoPort senTemIn(
     redeclare package Medium = Medium,
     m_flow_nominal=1,
     T_start=323.15) "Temperature sensor"
-    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+    annotation (Placement(transformation(extent={{-30,10},{-10,30}})));
+  Sensors.TemperatureTwoPort senTemInNoMix(
+    redeclare package Medium = Medium,
+    m_flow_nominal=1,
+    T_start=323.15) "Temperature sensor"
+    annotation (Placement(transformation(extent={{-30,-30},{-10,-10}})));
+  Buildings.Fluid.FixedResistances.PlugFlowPipe pipNoMix(
+    have_pipCap=false,
+    redeclare package Medium = Medium,
+    dh=0.1,
+    length=100,
+    dIns=0.05,
+    kIns=0.028,
+    m_flow_nominal=1,
+    cPip=500,
+    thickness=0.0032,
+    initDelay=true,
+    m_flow_start=1,
+    rhoPip=8000,
+    T_start_in=323.15,
+    T_start_out=323.15) "Pipe"
+    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
+  Sensors.TemperatureTwoPort senTemOutNoMix(
+    redeclare package Medium = Medium,
+    m_flow_nominal=1,
+    T_start=323.15) "Temperature sensor"
+    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+  Sources.MassFlowSource_T souNoMix(
+    redeclare package Medium = Medium,
+    use_T_in=true,
+    m_flow=3,
+    nPorts=1) "Flow source"
+    annotation (Placement(transformation(extent={{-60,-30},{-40,-10}})));
 equation
-  connect(bou.port, pip.heatPort)
-    annotation (Line(points={{-20,70},{10,70},{10,10}}, color={191,0,0}));
   connect(Tin.y, sou.T_in)
-    annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
-  connect(pip.ports_b[1], senTemOut.port_a)
-    annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
+    annotation (Line(points={{-79,0},{-68,0},{-68,24},{-62,24}},
+                                               color={0,0,127}));
+  connect(pip.port_b, senTemOut.port_a)
+    annotation (Line(points={{20,20},{40,20}},
+                                             color={0,127,255}));
   connect(senTemOut.port_b, sin.ports[1])
-    annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));
-  connect(sou.ports[1], senTemIn.port_a)
-    annotation (Line(points={{-40,0},{-30,0}}, color={0,127,255}));
+    annotation (Line(points={{60,20},{76,20},{76,-1},{80,-1}},
+                                             color={0,127,255}));
   connect(senTemIn.port_b, pip.port_a)
-    annotation (Line(points={{-10,0},{0,0}}, color={0,127,255}));
+    annotation (Line(points={{-10,20},{0,20}},
+                                             color={0,127,255}));
+  connect(senTemInNoMix.port_b, pipNoMix.port_a)
+    annotation (Line(points={{-10,-20},{0,-20}}, color={0,127,255}));
+  connect(pipNoMix.port_b, senTemOutNoMix.port_a)
+    annotation (Line(points={{20,-20},{40,-20}}, color={0,127,255}));
+  connect(senTemOutNoMix.port_b, sin.ports[2]) annotation (Line(points={{60,-20},
+          {76,-20},{76,1},{80,1}},   color={0,127,255}));
+  connect(bou[1].port, pip.heatPort)
+    annotation (Line(points={{-20,70},{-4,70},{-4,40},{10,40},{10,30}},
+                                                        color={191,0,0}));
+  connect(bou[2].port, pipNoMix.heatPort) annotation (Line(points={{-20,70},{-4,
+          70},{-4,0},{10,0},{10,-10}},     color={191,0,0}));
+  connect(sou.ports[1], senTemIn.port_a) annotation (Line(points={{-40,20},{-30,
+          20}},               color={0,127,255}));
+  connect(souNoMix.ports[1], senTemInNoMix.port_a)
+    annotation (Line(points={{-40,-20},{-30,-20}}, color={0,127,255}));
+  connect(Tin.y, souNoMix.T_in) annotation (Line(points={{-79,0},{-68,0},{-68,
+          -16},{-62,-16}},
+                      color={0,0,127}));
   annotation (
     __Dymola_Commands(file=
           "Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos"
@@ -72,12 +121,17 @@ equation
     Documentation(info="<html>
 <p>Basic test of model
 <a href=\"modelica://Buildings.Fluid.FixedResistances.PlugFlowPipe\">
-Buildings.Fluid.FixedResistances.PlugFlowPipe</a>.
+Buildings.Fluid.FixedResistances.PlugFlowPipe</a> with and without outlet mixing volume.
 This test includes an inlet temperature step under a constant mass flow rate.
 </p>
 </html>", revisions="<html>
 <ul>
+<li>July 27, 2021 by Baptiste Ravache<br/>Add case without mixing volume</li>
+</ul>
+<ul>
 <li>September 8, 2017 by Bram van der Heijde<br/>First implementation</li>
 </ul>
-</html>"));
+</html>"),
+    Diagram(coordinateSystem(extent={{-120,-100},{120,100}})),
+    Icon(coordinateSystem(extent={{-100,-100},{100,100}})));
 end PlugFlowPipe;
diff --git a/Buildings/Fluid/FixedResistances/PlugFlowDiscretized.mo b/Buildings/Fluid/FixedResistances/PlugFlowDiscretized.mo
index f6d9ec063e0..8c6c3c64faa 100644
--- a/Buildings/Fluid/FixedResistances/PlugFlowDiscretized.mo
+++ b/Buildings/Fluid/FixedResistances/PlugFlowDiscretized.mo
@@ -12,6 +12,11 @@ model PlugFlowDiscretized
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Dialog(tab="Advanced"));
 
+  parameter Boolean have_pipCap=true
+    "= true, a mixing volume is added to port_b that corresponds
+    to the heat capacity of the pipe wall"
+    annotation (Dialog(tab="Advanced"));
+
   parameter Modelica.SIunits.Length dh
     "Hydraulic diameter" annotation (Dialog(group="Material"));
 
@@ -21,10 +26,11 @@ model PlugFlowDiscretized
   parameter Modelica.SIunits.Height roughness=2.5e-5
     "Average height of surface asperities (default: smooth steel pipe)"
     annotation (Dialog(group="Material"));
-  parameter Modelica.SIunits.Length totLen = sum(length)
+  parameter Modelica.SIunits.Length totLen = sum(segLen)
     "Total pipe length (used to compute segment length)"
     annotation (Dialog(group="Material"));
-  parameter Modelica.SIunits.Length length[nSeg] = fill(totLen/nSeg,nSeg) "Pipe segment length"
+  parameter Modelica.SIunits.Length segLen[nSeg]=fill(totLen/nSeg, nSeg)
+    "Pipe segment length"
     annotation (Dialog(group="Material"));
 
   parameter Modelica.SIunits.MassFlowRate m_flow_nominal
@@ -47,15 +53,17 @@ model PlugFlowDiscretized
     "Density of pipe wall material. 930 for PE, 8000 for steel"
     annotation (Dialog(group="Material"));
 
-  parameter Modelica.SIunits.Temperature T_start_in(start=Medium.T_default)=
-    Medium.T_default "Initialization temperature at pipe inlet"
+  parameter Modelica.SIunits.Temperature T_start_in[nSeg]=
+    fill(Medium.T_default, nSeg) "Initialization temperature at pipe inlet"
     annotation (Dialog(tab="Initialization"));
-  parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)=
+  parameter Modelica.SIunits.Temperature T_start_out[nSeg]=
     T_start_in "Initialization temperature at pipe outlet"
     annotation (Dialog(tab="Initialization"));
   parameter Boolean initDelay = false
     "Initialize delay for a constant mass flow rate if true, otherwise start from 0"
     annotation (Dialog(tab="Initialization"));
+  parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe"
+    annotation (Dialog(tab="Initialization", enable=initDelay));
 
   parameter Real fac=1
     "Factor to take into account flow resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal";
@@ -68,35 +76,66 @@ model PlugFlowDiscretized
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPorts[nSeg]
-    "Heat transfer to or from surroundings (heat loss from pipe results in a positive heat flow)"
+    "Heat transfer to or from surrounding for each pipe segment (positive if pipe is colder than surrounding)"
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
 
-  PlugFlowPipe pipSeg[nSeg](
-    cor(redeclare final FixedResistances.LosslessPipe res),
-    final length=length,
-    each final nPorts=1,
-    each final dIns=dIns,
-    each final kIns=kIns,
-    each final cPip=cPip,
-    each final rhoPip=rhoPip,
-    each final dh=dh,
-    each final v_nominal=v_nominal,
-    redeclare final package Medium = Medium,
-    each final allowFlowReversal=allowFlowReversal,
-    each final m_flow_nominal=m_flow_nominal,
-    each final thickness=thickness,
-    each final m_flow_small=m_flow_small,
-    each final T_start_in=T_start_in,
-    each final T_start_out=T_start_out,
-    each final initDelay=initDelay) "Pipe segments"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  Modelica.SIunits.HeatFlowRate QEnv_flow = sum(heatPorts.Q_flow)
+    "Heat transfer to or from surroundings of total pipe length (positive if pipe is colder than surrounding)";
+
+  Modelica.SIunits.PressureDifference dp(displayUnit="Pa") = res.dp
+    "Pressure difference between port_a and port_b";
+
+  Modelica.SIunits.MassFlowRate m_flow = port_a.m_flow
+    "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
+
+  final parameter Modelica.SIunits.Velocity
+    v_nominal = m_flow_nominal / (APip * rho_default)
+    "Velocity at m_flow_nominal";
+
+  Modelica.SIunits.Velocity v = del[1].v "Flow velocity of medium in pipe";
+
+protected
+  parameter Modelica.SIunits.Length rInt = dh / 2 "Pipe interior radius";
+
+  parameter Modelica.SIunits.Area APip = Modelica.Constants.pi * rInt^2
+    "Pipe hydraulic cross-sectional area";
+
+  parameter Modelica.SIunits.HeatCapacity CPip[nSeg]=
+    segLen*((dh + 2*thickness)^2 - dh^2)*Modelica.Constants.pi/4*cPip*rhoPip "Heat capacity of pipe wall";
+
+  final parameter Modelica.SIunits.Volume VEqu[nSeg]=CPip ./ (rho_default*cp_default)
+    "Equivalent water volume to represent pipe wall thermal inertia";
+
+  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
+      p=Medium.p_default,
+      T=Medium.T_default,
+      X=Medium.X_default)
+    "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)";
+
+  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default) "Default medium state";
+
+  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+      Medium.specificHeatCapacityCp(state=sta_default)
+    "Heat capacity of medium";
+
+  parameter Real C(unit="J/(K.m)")=
+    rho_default*Modelica.Constants.pi*(dh/2)^2*cp_default
+    "Thermal capacity per unit length of water in pipe";
+
+  parameter Real R(unit="(m.K)/W")=1/(kIns*2*Modelica.Constants.pi/
+    Modelica.Math.log((dh/2 + thickness + dIns)/(dh/2 + thickness)))
+    "Thermal resistance per unit length from fluid to boundary temperature"
+    annotation (Dialog(group="Thermal resistance"));
 
   FixedResistances.HydraulicDiameter res(
     redeclare final package Medium = Medium,
     final m_flow_nominal=m_flow_nominal,
     final dh=dh,
     final from_dp=from_dp,
-    final length=sum(length),
+    final length=totLen,
     final roughness=roughness,
     final fac=fac,
     final ReC=ReC,
@@ -105,35 +144,133 @@ model PlugFlowDiscretized
     final show_T=false,
     final homotopyInitialization=homotopyInitialization,
     final linearized=linearized,
-    dp(nominal=fac*200*sum(length)))
+    dp(nominal= if rho_default > 500 then totLen * fac * 200 else totLen * fac * 2))
     "Pressure drop calculation for this pipe"
-    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
 
-protected
-  parameter Modelica.SIunits.Length rInt = dh / 2 "Pipe interior radius";
-  parameter Modelica.SIunits.Area APip = Modelica.Constants.pi * rInt^2
-    "Pipe hydraulic cross-sectional area";
-  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
-      p=Medium.p_default,
-      T=Medium.T_default,
-      X=Medium.X_default)
-    "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)";
-  parameter Modelica.SIunits.Velocity
-    v_nominal = m_flow_nominal / (APip * rho_default)
-    "Velocity at m_flow_nominal";
 
+  // In the volume, below, we scale down V and use
+  // mSenFac. Otherwise, for air, we would get very large volumes
+  // which affect the delay of water vapor and contaminants.
+  // See also Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
+  // for why mSenFac is 10 and not 1000, as this gives more reasonable
+  // temperature step response
+  Fluid.MixingVolumes.MixingVolume vol[nSeg](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=m_flow_nominal,
+    final V=if rho_default > 500 then VEqu else VEqu/1000,
+    each final nPorts=2,
+    final T_start=T_start_out,
+    each final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    each final mSenFac=if rho_default > 500 then 1 else 10) if have_pipCap
+    "Control volume connected to port_b. Represents equivalent pipe wall thermal capacity."
+    annotation (Placement(transformation(extent={{30,20},{50,40}})));
+
+  LosslessPipe noMixPip[nSeg](
+    redeclare each final package Medium = Medium,
+    each final m_flow_nominal=m_flow_nominal,
+    each final m_flow_small=m_flow_small,
+    each final allowFlowReversal=allowFlowReversal) if not have_pipCap
+    "Lossless pipe for connecting the outlet port when have_pipCap=false"
+    annotation (Placement(transformation(extent={{30,-50},{50,-30}})));
+
+  BaseClasses.PlugFlow del[nSeg](
+    redeclare each final package Medium = Medium,
+    each final m_flow_small=m_flow_small,
+    each final dh=dh,
+    final length=segLen,
+    each final allowFlowReversal=allowFlowReversal,
+    final T_start_in=T_start_in,
+    final T_start_out=T_start_out) "Model for temperature wave propagation"
+    annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  BaseClasses.PlugFlowHeatLoss heaLos_a[nSeg](
+    redeclare each final package Medium = Medium,
+    each final C=C,
+    each final R=R,
+    each final m_flow_small=m_flow_small,
+    final T_start=T_start_in,
+    each final m_flow_nominal=m_flow_nominal,
+    each final m_flow_start=m_flow_start,
+    each final show_T=false,
+    each final show_V_flow=false) "Heat loss for flow from port_b to port_a"
+    annotation (Placement(transformation(extent={{-40,-10},{-60,10}})));
+  BaseClasses.PlugFlowHeatLoss heaLos_b[nSeg](
+    redeclare each final package Medium = Medium,
+    each final C=C,
+    each final R=R,
+    each final m_flow_small=m_flow_small,
+    final T_start=T_start_out,
+    each final m_flow_nominal=m_flow_nominal,
+    each final m_flow_start=m_flow_start,
+    each final show_T=false,
+    each final show_V_flow=false) "Heat loss for flow from port_a to port_b"
+    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+
+  BaseClasses.PlugFlowTransportDelay timDel[nSeg](
+    final length=segLen,
+    each final dh=dh,
+    each final rho=rho_default,
+    each final initDelay=initDelay,
+    each final m_flow_nominal=m_flow_nominal,
+    each final m_flow_start=m_flow_start) "Time delay"
+    annotation (Placement(transformation(extent={{-40,40},{-20,60}})));
+
+  Sensors.MassFlowRate senMasFlo(
+     redeclare final package Medium = Medium)
+    "Mass flow sensor"
+    annotation (Placement(transformation(extent={{-90,-10},{-70,10}})));
+  Modelica.Blocks.Routing.Replicator rep(nout=nSeg)
+    "Replicates the input signal"
+    annotation (Placement(transformation(extent={{-80,40},{-60,60}})));
 equation
-  connect(port_a, pipSeg[1].port_a)
-    annotation (Line(points={{-100,0},{-10,0}}, color={0,127,255}));
-  for i in 2:nSeg loop
-    connect(pipSeg[i-1].ports_b[1], pipSeg[i].port_a);
-  end for;
-  connect(pipSeg.heatPort, heatPorts)
-    annotation (Line(points={{0,10},{0,100}}, color={191,0,0}));
   connect(res.port_b, port_b)
-    annotation (Line(points={{60,0},{100,0}}, color={0,127,255}));
-  connect(pipSeg[nSeg].ports_b[1], res.port_a)
-    annotation (Line(points={{10,0},{40,0}}, color={0,127,255}));
+    annotation (Line(points={{80,0},{100,0}}, color={0,127,255}));
+  connect(port_a, senMasFlo.port_a)
+    annotation (Line(points={{-100,0},{-90,0}}, color={0,127,255}));
+  connect(senMasFlo.port_b, heaLos_a[1].port_b)
+    annotation (Line(points={{-70,0},{-60,0}}, color={0,127,255}));
+  for i in 1:nSeg loop
+  connect(heaLos_a[i].port_a, del[i].port_a)
+    annotation (Line(points={{-40,0},{-30,0}}, color={0,127,255}));
+  connect(del[i].port_b, heaLos_b[i].port_a)
+    annotation (Line(points={{-10,0},{0,0}}, color={0,127,255}));
+  connect(heaLos_b[i].port_b, vol[i].ports[1])
+    annotation (Line(points={{20,0},{38,0},{38,20}}, color={0,127,255}));
+  connect(heaLos_b[i].port_b, noMixPip[i].port_a) annotation (Line(points={{20,0},
+          {26,0},{26,-40},{30,-40}}, color={0,127,255}));
+  end for;
+  // Connections of last to first element
+  for i in 1:nSeg-1 loop
+    connect(vol[i].ports[2], heaLos_a[i+1].port_b) annotation (Line(points={{42,20},
+            {42,20},{42,-20},{-60,-20},{-60,0}},
+                                             color={0,127,255}));
+    connect(noMixPip[i].port_b, heaLos_a[i+1].port_b) annotation (Line(points={{50,-40},
+          {56,-40},{56,-60},{-60,-60},{-60,0}}, color={0,127,255}));
+  end for;
+  // Connection of last elements to resistance
+  connect(noMixPip[nSeg].port_b, res.port_a) annotation (Line(points={{50,-40},{56,
+          -40},{56,0},{60,0}}, color={0,127,255}));
+  connect(vol[nSeg].ports[2], res.port_a) annotation (Line(points={{42,20},{56,20},
+          {56,0},{60,0}},
+                      color={0,127,255}));
+
+  // Other connections
+
+
+  connect(senMasFlo.m_flow, rep.u) annotation (Line(points={{-80,11},{-80,30},{-90,
+          30},{-90,50},{-82,50}}, color={0,0,127}));
+  connect(rep.y, timDel.m_flow)
+    annotation (Line(points={{-59,50},{-42,50}}, color={0,0,127}));
+  connect(timDel.tauRev, heaLos_a.tau) annotation (Line(points={{-19,54},{-10,54},
+          {-10,30},{-44,30},{-44,10}}, color={0,0,127}));
+  connect(timDel.tau, heaLos_b.tau)
+    annotation (Line(points={{-19,46},{4,46},{4,10}}, color={0,0,127}));
+  connect(heaLos_a.heatPort, heatPorts) annotation (Line(points={{-50,10},{-50,24},
+          {-4,24},{-4,100},{0,100}},
+                                   color={191,0,0}));
+  connect(heaLos_b.heatPort, heatPorts) annotation (Line(points={{10,10},{10,24},
+          {2,24},{2,100},{0,100}},
+                                 color={191,0,0}));
   annotation (
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
             100,100}})),
@@ -142,7 +279,7 @@ equation
         Text(
           extent={{-100,-72},{100,-88}},
           lineColor={0,0,0},
-          textString="L[ ] = %length d = %dh"),
+          textString="L[ ] = %segLen d = %dh"),
         Rectangle(
           extent={{-100,40},{0,-40}},
           lineColor={0,0,0},
diff --git a/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo b/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo
index 4f6370f521e..b64874bc82e 100644
--- a/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo
+++ b/Buildings/Fluid/FixedResistances/PlugFlowPipe.mo
@@ -1,7 +1,7 @@
 within Buildings.Fluid.FixedResistances;
 model PlugFlowPipe
   "Pipe model using spatialDistribution for temperature delay"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortVector;
+  extends Buildings.Fluid.Interfaces.PartialTwoPort;
 
   constant Boolean homotopyInitialization = true "= true, use homotopy method"
     annotation(HideResult=true);
@@ -10,6 +10,11 @@ model PlugFlowPipe
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Dialog(tab="Advanced"));
 
+  parameter Boolean have_pipCap=true
+    "= true, a mixing volume is added to port_b that corresponds
+    to the heat capacity of the pipe wall"
+    annotation (Dialog(tab="Advanced"));
+
   parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi)
     "Hydraulic diameter (assuming a round cross section area)"
     annotation (Dialog(group="Material"));
@@ -45,11 +50,11 @@ model PlugFlowPipe
 
   parameter Modelica.SIunits.SpecificHeatCapacity cPip=2300
     "Specific heat of pipe wall material. 2300 for PE, 500 for steel"
-    annotation (Dialog(group="Material"));
+    annotation (Dialog(group="Material", enable=have_pipCap));
 
   parameter Modelica.SIunits.Density rhoPip(displayUnit="kg/m3")=930
     "Density of pipe wall material. 930 for PE, 8000 for steel"
-    annotation (Dialog(group="Material"));
+    annotation (Dialog(group="Material", enable=have_pipCap));
 
   parameter Modelica.SIunits.Length thickness = 0.0035
     "Pipe wall thickness"
@@ -61,7 +66,7 @@ model PlugFlowPipe
   parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)=
     T_start_in "Initialization temperature at pipe outlet"
     annotation (Dialog(tab="Initialization"));
-  parameter Boolean initDelay(start=false) = false
+  parameter Boolean initDelay = false
     "Initialize delay for a constant mass flow rate if true, otherwise start from 0"
     annotation (Dialog(tab="Initialization"));
   parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe"
@@ -80,49 +85,21 @@ model PlugFlowPipe
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
   Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort
-    "Heat transfer to or from surroundings (heat loss from pipe results in a positive heat flow)"
+    "Heat transfer to or from surroundings (positive if pipe is colder than surrounding)"
     annotation (Placement(transformation(extent={{-10,90},{10,110}})));
 
-  Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore cor(
-    redeclare final package Medium = Medium,
-    final dh=dh,
-    final v_nominal=v_nominal,
-    final length=length,
-    final C=C,
-    final R=R,
-    final m_flow_small=m_flow_small,
-    final m_flow_nominal=m_flow_nominal,
-    final T_start_in=T_start_in,
-    final T_start_out=T_start_out,
-    final m_flow_start=m_flow_start,
-    final initDelay=initDelay,
-    final from_dp=from_dp,
-    final fac=fac,
-    final ReC=ReC,
-    final thickness=thickness,
-    final roughness=roughness,
-    final allowFlowReversal=allowFlowReversal,
-    final homotopyInitialization=homotopyInitialization,
-    final linearized=linearized)
-    "Describing the pipe behavior"
-    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+  // QEnv_flow is introduced because in discretized pipes, heatPort.Q_flow must be summed over all ports.
+  // By introducing this variable, both models have the same variable.
+  Modelica.SIunits.HeatFlowRate QEnv_flow = heatPort.Q_flow
+    "Heat transfer to or from surroundings (positive if pipe is colder than surrounding)";
 
-  // In the volume, below, we scale down V and use
-  // mSenFac. Otherwise, for air, we would get very large volumes
-  // which affect the delay of water vapor and contaminants.
-  // See also Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
-  // for why mSenFac is 10 and not 1000, as this gives more reasonable
-  // temperature step response
-  Fluid.MixingVolumes.MixingVolume vol(
-    redeclare final package Medium = Medium,
-    final m_flow_nominal=m_flow_nominal,
-    final V=if rho_default > 500 then VEqu else VEqu/1000,
-    final nPorts=nPorts + 1,
-    final T_start=T_start_out,
-    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
-    final mSenFac = if rho_default > 500 then 1 else 10)
-    "Control volume connected to ports_b. Represents equivalent pipe wall thermal capacity."
-    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+  Modelica.SIunits.PressureDifference dp(displayUnit="Pa") = res.dp
+    "Pressure difference between port_a and port_b";
+
+  Modelica.SIunits.MassFlowRate m_flow = port_a.m_flow
+    "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
+
+  Modelica.SIunits.Velocity v = del.v "Flow velocity of medium in pipe";
 
 protected
   parameter Modelica.SIunits.HeatCapacity CPip=
@@ -151,25 +128,132 @@ protected
     "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
     annotation (Dialog(group="Advanced"));
 
+  // In the volume, below, we scale down V and use
+  // mSenFac. Otherwise, for air, we would get very large volumes
+  // which affect the delay of water vapor and contaminants.
+  // See also Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
+  // for why mSenFac is 10 and not 1000, as this gives more reasonable
+  // temperature step response
+  Fluid.MixingVolumes.MixingVolume vol(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final V=if rho_default > 500 then VEqu else VEqu/1000,
+    final nPorts=2,
+    final T_start=T_start_out,
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    final mSenFac=if rho_default > 500 then 1 else 10) if have_pipCap
+    "Control volume connected to port_b. Represents equivalent pipe wall thermal capacity."
+    annotation (Placement(transformation(extent={{70,20},{90,40}})));
+
+  LosslessPipe noMixPip(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_small=m_flow_small,
+    final allowFlowReversal=allowFlowReversal) if not have_pipCap
+    "Lossless pipe for connecting the outlet port when have_pipCap=false"
+    annotation (Placement(transformation(extent={{70,-30},{90,-10}})));
+
+  Buildings.Fluid.FixedResistances.HydraulicDiameter res(
+    redeclare final package Medium = Medium,
+    final dh=dh,
+    final m_flow_nominal=m_flow_nominal,
+    final from_dp=from_dp,
+    final length=length,
+    final roughness=roughness,
+    final fac=fac,
+    final ReC=ReC,
+    final v_nominal=v_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final show_T=false,
+    final homotopyInitialization=homotopyInitialization,
+    final linearized=linearized,
+    dp(nominal=fac*200*length))
+    "Pressure drop calculation for this pipe"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+  BaseClasses.PlugFlow del(
+    redeclare final package Medium = Medium,
+    final m_flow_small=m_flow_small,
+    final dh=dh,
+    final length=length,
+    final allowFlowReversal=allowFlowReversal,
+    final T_start_in=T_start_in,
+    final T_start_out=T_start_out)
+    "Model for temperature wave propagation"
+    annotation (Placement(transformation(extent={{10,-10},{30,10}})));
+  BaseClasses.PlugFlowHeatLoss heaLos_a(
+    redeclare final package Medium = Medium,
+    final C=C,
+    final R=R,
+    final m_flow_small=m_flow_small,
+    final T_start=T_start_in,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_start=m_flow_start,
+    final show_T=false,
+    final show_V_flow=false) "Heat loss for flow from port_b to port_a"
+    annotation (Placement(transformation(extent={{-60,-10},{-80,10}})));
+  BaseClasses.PlugFlowHeatLoss heaLos_b(
+    redeclare final package Medium = Medium,
+    final C=C,
+    final R=R,
+    final m_flow_small=m_flow_small,
+    final T_start=T_start_out,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_start=m_flow_start,
+    final show_T=false,
+    final show_V_flow=false) "Heat loss for flow from port_a to port_b"
+    annotation (Placement(transformation(extent={{40,-10},{60,10}})));
+  Sensors.MassFlowRate senMasFlo(redeclare final package Medium =
+        Medium)                              "Mass flow sensor"
+    annotation (Placement(transformation(extent={{-50,10},{-30,-10}})));
+  BaseClasses.PlugFlowTransportDelay timDel(
+    final length=length,
+    final dh=dh,
+    final rho=rho_default,
+    final initDelay=initDelay,
+    final m_flow_nominal=m_flow_nominal,
+    final m_flow_start=m_flow_start) "Time delay"
+    annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
+
 initial equation
   assert(homotopyInitialization, "In " + getInstanceName() +
     ": The constant homotopyInitialization has been modified from its default value. This constant will be removed in future releases.",
     level = AssertionLevel.warning);
 
 equation
-  for i in 1:nPorts loop
-    connect(vol.ports[i + 1], ports_b[i])
-    annotation (Line(points={{70,20},{72,20},{72,6},{72,0},{100,0}},
-        color={0,127,255}));
-  end for;
-  connect(cor.heatPort, heatPort)
-    annotation (Line(points={{0,10},{0,10},{0,100}}, color={191,0,0}));
-
-  connect(cor.port_b, vol.ports[1])
-    annotation (Line(points={{10,0},{70,0},{70,20}}, color={0,127,255}));
-
-  connect(cor.port_a, port_a)
-    annotation (Line(points={{-10,0},{-56,0},{-100,0}}, color={0,127,255}));
+
+  connect(senMasFlo.m_flow,timDel. m_flow) annotation (Line(
+      points={{-40,-11},{-40,-40},{-12,-40}},
+      color={0,0,127},
+      smooth=Smooth.None));
+  connect(timDel.tauRev,heaLos_a. tau) annotation (Line(points={{11,-36},{64,
+          -36},{64,28},{-64,28},{-64,10}},
+                                      color={0,0,127}));
+  connect(timDel.tau,heaLos_b. tau) annotation (Line(points={{11,-44},{34,-44},
+          {34,18},{44,18},{44,10}}, color={0,0,127}));
+  connect(heaLos_a.port_a,senMasFlo. port_a)
+    annotation (Line(points={{-60,0},{-50,0}}, color={0,127,255}));
+  connect(del.port_a,res. port_b)
+    annotation (Line(points={{10,0},{0,0}}, color={0,127,255}));
+  connect(senMasFlo.port_b,res. port_a)
+    annotation (Line(points={{-30,0},{-20,0}}, color={0,127,255}));
+  connect(heaLos_b.port_a,del. port_b)
+    annotation (Line(points={{40,0},{30,0}}, color={0,127,255}));
+  connect(heaLos_b.heatPort, heatPort) annotation (Line(points={{50,10},{50,86},
+          {0,86},{0,100}}, color={191,0,0}));
+  connect(heaLos_a.heatPort, heatPort) annotation (Line(points={{-70,10},{-70,
+          86},{0,86},{0,100}}, color={191,0,0}));
+  connect(heaLos_a.port_b, port_a)
+    annotation (Line(points={{-80,0},{-100,0}}, color={0,127,255}));
+
+  connect(heaLos_b.port_b, vol.ports[1])
+    annotation (Line(points={{60,0},{78,0},{78,20}}, color={0,127,255}));
+  connect(vol.ports[2], port_b)
+    annotation (Line(points={{82,20},{82,0},{100,0}}, color={0,127,255}));
+  connect(heaLos_b.port_b, noMixPip.port_a) annotation (Line(points={{60,0},{66,
+          0},{66,-20},{70,-20}}, color={0,127,255}));
+  connect(noMixPip.port_b, port_b) annotation (Line(points={{90,-20},{94,-20},{94,
+          0},{100,0}}, color={0,127,255}));
+
   annotation (
     Line(points={{70,20},{72,20},{72,0},{100,0}}, color={0,127,255}),
     Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
@@ -215,6 +299,24 @@ d = %dh")}),
     Documentation(revisions="<html>
 <ul>
 <li>
+September 14, 2021, by Michael Wetter:<br/>
+Made most instances protected and exposed main variables of interest.
+</li>
+<li>
+July 9, 2021, by Baptiste Ravache:<br/>
+Replaced the vectorized outlet port <code>ports_b</code> with
+a single outlet port <code>port_b</code>.<br/>
+Expanded the core pipe model that was previously a component.
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1494\">IBPSA, #1494</a>.<br/>
+This change is not backward compatible.<br/>
+The previous classes definitions were moved to
+<a href=\"modelica://Buildings.Obsolete.Fluid.FixedResistances.PlugFlowPipe\">
+Buildings.Obsolete.Fluid.FixedResistances.PlugFlowPipe</a>.
+<a href=\"modelica://Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
+Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>.
+</li>
+<li>
 April 14, 2020, by Michael Wetter:<br/>
 Changed <code>homotopyInitialization</code> to a constant.<br/>
 This is for
@@ -255,14 +357,19 @@ as a plug flow.
 The model also includes thermal inertia of the pipe wall.
 </p>
 <h4>Implementation</h4>
-<p>Heat losses are implemented by
+<p>
+The
+<code>spatialDistribution</code> operator is used for the temperature wave propagation
+through the length of the pipe. This operator is contained in
+<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlow\">
+Buildings.Fluid.FixedResistances.BaseClasses.PlugFlow</a>.
+</p>
+<p>
+The model
 <a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowHeatLoss\">
 Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowHeatLoss</a>
-at each end of the pipe (see
-<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
-Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>).
-Depending on the flow direction, the temperature difference due to heat losses
-is subtracted at the right fluid port.
+implements a heat loss in design direction, but leaves the enthalpy unchanged
+in opposite flow direction. Therefore it is used in front of and behind the time delay.
 </p>
 <p>
 The pressure drop is implemented using
@@ -270,17 +377,27 @@ The pressure drop is implemented using
 Buildings.Fluid.FixedResistances.HydraulicDiameter</a>.
 </p>
 <p>
-The thermal capacity of the pipe wall is implemented as a mixing volume
-of the fluid in the pipe, of which the thermal capacity
+The thermal capacity of the pipe wall is implemented as a mixing volume (at
+<code>port_b</code>) of the fluid in the pipe, of which the thermal capacity
 is equal to that of the pipe wall material.
 In addition, this mixing volume allows the hydraulic separation of subsequent pipes.
-Thanks to the vectorized implementation of the (design) outlet port,
-splits and junctions of pipes can be handled in a numerically efficient way.
 <br/>
-This mixing volume is not present in the
-<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">PlugFlowCore</a> model,
-which can be used in cases where mixing volumes at pipe junctions need to
-be added manually.
+This mixing volume can be removed from this model with the Boolean parameter
+<code>have_pipCap</code>, in cases where the pipe wall heat capacity
+is negligible and a state is not needed at the pipe outlet
+(see the note below about numerical Jacobians).
+</p>
+<p>
+Note that in order to model a branched network it is recommended to use
+<a href=\"modelica://Buildings.Fluid.FixedResistances.Junction\">
+Buildings.Fluid.FixedResistances.Junction</a> at each junction and to configure
+that junction model with a state
+(<code>energyDynamics &lt;&gt; Modelica.Fluid.Types.Dynamics.SteadyState</code>),
+see for instance
+<a href=\"modelica://Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT\">
+Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.PlugFlowAIT</a>.
+This will avoid the numerical Jacobian that is otherwise created when
+the inlet ports of two instances of the plug flow model are connected together.
 </p>
 <h4>Assumptions</h4>
 <ul>
@@ -295,7 +412,7 @@ The boundary temperature is uniform.
 </li>
 <li>
 The thermal inertia of the pipe wall material is lumped on the side of the pipe
-that is connected to <code>ports_b</code>.
+that is connected to <code>port_b</code>.
 </li>
 </ul>
 <h4>References</h4>
diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mo
index 65874aee600..886f758766e 100644
--- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mo
+++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mo
@@ -11,12 +11,11 @@ model FlowReversal
   Sources.Boundary_pT sin(
     redeclare package Medium = Medium,
     nPorts=1,
-    p(displayUnit="Pa") = 101325,
+    p(displayUnit="bar") = 500000,
     T=313.15) "Pressure boundary condition"
     annotation (Placement(transformation(extent={{82,-10},{62,10}})));
   Buildings.Fluid.FixedResistances.PlugFlowPipe pip(
     redeclare package Medium = Medium,
-    nPorts=1,
     dIns=0.05,
     kIns=0.028,
     cPip=500,
@@ -28,7 +27,7 @@ model FlowReversal
     v_nominal=2,
     T_start_in=293.15,
     T_start_out=293.15) "Pipe"
-    annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+    annotation (Placement(transformation(extent={{2,-10},{22,10}})));
   Buildings.Fluid.Sources.MassFlowSource_T sou(
     nPorts=1,
     redeclare package Medium = Medium,
@@ -52,14 +51,14 @@ model FlowReversal
     "Temperature sensor"
     annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
 equation
-  connect(pip.ports_b[1], senTemOut.port_a)
-    annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
+  connect(pip.port_b, senTemOut.port_a)
+    annotation (Line(points={{22,0},{30,0}}, color={0,127,255}));
   connect(senTemOut.port_b, sin.ports[1])
     annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));
   connect(sou.ports[1], senTemIn.port_a)
     annotation (Line(points={{-40,0},{-30,0}}, color={0,127,255}));
   connect(senTemIn.port_b, pip.port_a)
-    annotation (Line(points={{-10,0},{0,0}}, color={0,127,255}));
+    annotation (Line(points={{-10,0},{2,0}}, color={0,127,255}));
   connect(m_flow.y, sou.m_flow_in)
     annotation (Line(points={{-71,8},{-62,8}}, color={0,0,127}));
   annotation (
@@ -74,6 +73,11 @@ Validation model in which water flows into the pipe and then the flow is reverse
 </html>", revisions="<html>
 <ul>
 <li>
+July 12, 2021, by Baptiste Ravache:<br/>
+Changed outlet boundary pressure to avoid negative
+pressure at the inlet when flow is reversed.
+</li>
+<li>
 October 25, 2017, by Michael Wetter:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo
index 3b745503e9b..7420b772fd3 100644
--- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo
+++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowAIT.mo
@@ -60,7 +60,6 @@ model PlugFlowAIT
     kIns=0.024,
     length=115,
     allowFlowReversal=allowFlowReversal,
-    nPorts=2,
     m_flow_nominal=0.3,
     R=1/(2*0.024*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)
         *log(2/0.18),
@@ -69,7 +68,7 @@ model PlugFlowAIT
     rhoPip=8000,
     initDelay=false,
     m_flow_start=0) "Pipe 1"
-    annotation (Placement(transformation(extent={{50,0},{30,20}})));
+    annotation (Placement(transformation(extent={{60,0},{40,20}})));
   PlugFlowPipe pip4(
     dh = 0.0337 - 2*0.0032,
     redeclare package Medium = Medium,
@@ -79,7 +78,6 @@ model PlugFlowAIT
     allowFlowReversal=allowFlowReversal,
     m_flow_nominal=0.3,
     thickness=thickness,
-    nPorts=2,
     R=R80,
     cPip=500,
     rhoPip=8000,
@@ -97,7 +95,6 @@ model PlugFlowAIT
     kIns=0.024,
     dIns=0.045,
     allowFlowReversal=allowFlowReversal,
-    nPorts=2,
     m_flow_nominal=0.3,
     R=1/(2*0.024*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)
         *log(2/0.18),
@@ -114,7 +111,6 @@ model PlugFlowAIT
     dIns=0.045,
     kIns=0.024,
     allowFlowReversal=allowFlowReversal,
-    nPorts=1,
     m_flow_nominal=0.3,
     thickness=thickness,
     dh=0.0337 - 2*0.0032,
@@ -134,7 +130,6 @@ model PlugFlowAIT
     dIns=0.045,
     kIns=0.024,
     allowFlowReversal=allowFlowReversal,
-    nPorts=1,
     m_flow_nominal=0.3,
     thickness=thickness,
     dh=0.0337 - 2*0.0032,
@@ -210,7 +205,6 @@ model PlugFlowAIT
     kIns=0.024,
     length=20,
     allowFlowReversal=allowFlowReversal,
-    nPorts=2,
     m_flow_nominal=0.3,
     R=1/(2*0.024*Modelica.Constants.pi)*log(0.18/0.0899) + 1/(2*2.4*Modelica.Constants.pi)
         *log(2/0.18),
@@ -261,6 +255,36 @@ model PlugFlowAIT
         rotation=180,
         origin={46,56})));
 
+  Buildings.Fluid.FixedResistances.Junction splPip1(
+    redeclare package Medium = Medium,
+    m_flow_nominal={pip1.m_flow_nominal,pip5.m_flow_nominal,pip4.m_flow_nominal},
+    from_dp=true,
+    linearized=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    dp_nominal(each displayUnit="Pa") = {0,0,0},
+    portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Splitter coming out of pip1"
+    annotation (Placement(transformation(extent={{30,20},{10,0}})));
+  Buildings.Fluid.FixedResistances.Junction splPip2(
+    redeclare package Medium = Medium,
+    m_flow_nominal={pip5.m_flow_nominal,pip2.m_flow_nominal,pip3.m_flow_nominal},
+    from_dp=true,
+    linearized=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    dp_nominal(each displayUnit="Pa") = {0,0,0},
+    portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Splitter coming out of pip5"
+    annotation (Placement(transformation(extent={{-30,0},{-50,20}})));
 equation
   connect(m_flow_p3.y, Point3.m_flow_in) annotation (Line(
       points={{-62,-110},{-58,-110},{-58,-94}},
@@ -280,12 +304,12 @@ equation
       smooth=Smooth.None));
   connect(DataReader.y[9], prescribedTemperature.T)
     annotation (Line(points={{21,-130},{38,-130}},        color={0,0,127}));
-  connect(pip4.heatPort, pip1.heatPort) annotation (Line(points={{20,40},{20,40},
-          {40,40},{40,20}}, color={191,0,0}));
-  connect(pip1.heatPort, pip0.heatPort) annotation (Line(points={{40,20},{40,26},
+  connect(pip4.heatPort, pip1.heatPort) annotation (Line(points={{20,40},{50,40},
+          {50,20}},         color={191,0,0}));
+  connect(pip1.heatPort, pip0.heatPort) annotation (Line(points={{50,20},{50,26},
           {100,26},{100,-10},{90,-10}},
                                       color={191,0,0}));
-  connect(pip1.heatPort, pip2.heatPort) annotation (Line(points={{40,20},{40,26},
+  connect(pip1.heatPort, pip2.heatPort) annotation (Line(points={{50,20},{50,26},
           {-78,26}},                   color={191,0,0}));
   connect(pip5.heatPort, pip2.heatPort) annotation (Line(points={{-10,20},{-10,26},
           {-78,26}},                       color={191,0,0}));
@@ -316,29 +340,21 @@ equation
   connect(lessThreshold.u, m_flow_p4.y) annotation (Line(points={{93.6,128},{
           100,128},{100,140},{114,140}},
                                color={0,0,127}));
-  connect(pip1.port_a, pip0.ports_b[1])
-    annotation (Line(points={{50,10},{78,10},{78,0}}, color={0,127,255}));
-  connect(pip1.ports_b[1], pip4.port_a)
-    annotation (Line(points={{30,8},{10,8},{10,30}}, color={0,127,255}));
-  connect(pip5.port_a, pip1.ports_b[2])
-    annotation (Line(points={{0,10},{30,10},{30,12}}, color={0,127,255}));
-  connect(pip4.ports_b[1], senTem_p4.port_a)
-    annotation (Line(points={{8,50},{8,70}},        color={0,127,255}));
-  connect(Point5.ports[1], pip4.ports_b[2]) annotation (Line(points={{36,56},{
-          36,56},{12,56},{12,50}}, color={0,127,255}));
-  connect(pip5.ports_b[1], senTemIn_p2.port_b)
-    annotation (Line(points={{-20,8},{-60,8}},          color={0,127,255}));
-  connect(pip3.port_a, pip5.ports_b[2])
-    annotation (Line(points={{-50,-10},{-50,12},{-20,12}},
-                                                         color={0,127,255}));
+  connect(pip1.port_a, pip0.port_b)
+    annotation (Line(points={{60,10},{80,10},{80,0}}, color={0,127,255}));
+  connect(pip4.port_b, senTem_p4.port_a)
+    annotation (Line(points={{10,50},{10,60},{8,60},{8,70}},
+                                                    color={0,127,255}));
+  connect(Point5.ports[1], pip4.port_b) annotation (Line(points={{36,56},{36,56},
+          {10,56},{10,50}},        color={0,127,255}));
   connect(senTemIn_p2.port_a, pip2.port_a)
     annotation (Line(points={{-80,8},{-88,8},{-88,16}},   color={0,127,255}));
-  connect(pip2.ports_b[1], senTem_p2.port_a)
+  connect(pip2.port_b, senTem_p2.port_a)
     annotation (Line(points={{-88,36},{-88,46}},          color={0,127,255}));
-  connect(pip3.ports_b[1], senTem_p3.port_a) annotation (Line(points={{-50,-30},
+  connect(pip3.port_b, senTem_p3.port_a) annotation (Line(points={{-50,-30},
           {-50,-40}},           color={0,127,255}));
-  connect(ExcludedBranch.ports[1], pip0.ports_b[2]) annotation (Line(points={{82,30},
-          {82,0}},                       color={0,127,255}));
+  connect(ExcludedBranch.ports[1], pip0.port_b) annotation (Line(points={{82,30},
+          {82,16},{82,0},{80,0}},        color={0,127,255}));
   connect(switch1.y, Point5.m_flow_in) annotation (Line(points={{109,64},{58,64}},
                             color={0,0,127}));
   connect(m_flow_p4.y, switch1.u3) annotation (Line(points={{114,140},{100,140},
@@ -348,6 +364,18 @@ equation
   connect(lessThreshold.y, switch1.u2) annotation (Line(points={{75.2,128},{66,
           128},{66,104},{140,104},{140,64},{132,64}},
                                                     color={255,0,255}));
+  connect(pip5.port_a, splPip1.port_2)
+    annotation (Line(points={{0,10},{10,10}},color={0,127,255}));
+  connect(pip1.port_b, splPip1.port_1)
+    annotation (Line(points={{40,10},{30,10}}, color={0,127,255}));
+  connect(splPip1.port_3, pip4.port_a) annotation (Line(points={{20,20},{20,24},
+          {10,24},{10,30}}, color={0,127,255}));
+  connect(senTemIn_p2.port_b, splPip2.port_2)
+    annotation (Line(points={{-60,8},{-60,10},{-50,10}}, color={0,127,255}));
+  connect(pip5.port_b, splPip2.port_1)
+    annotation (Line(points={{-20,10},{-30,10}}, color={0,127,255}));
+  connect(pip3.port_a, splPip2.port_3) annotation (Line(points={{-50,-10},{-50,-4},
+          {-40,-4},{-40,0}}, color={0,127,255}));
   annotation (
     experiment(
       StopTime=603900,
diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo
index 996aa8caa3a..d6a020d4068 100644
--- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo
+++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/PlugFlowULg.mo
@@ -94,7 +94,6 @@ model PlugFlowULg "Validation against data from Université de Liège"
     T_start_in=T_start_in,
     R=((1/(2*pipe.kIns)*log((0.0603/2 + pipe.dIns)/(0.0603/2))) + 1/(5*(0.0603
          + 2*pipe.dIns)))/Modelica.Constants.pi,
-    nPorts=1,
     initDelay=true,
     m_flow_start=pipeDataULg.m_flowIni,
     cPip=500,
@@ -149,7 +148,7 @@ equation
           0}},                                  color={0,127,255}));
   connect(senTem_out.port_a, senEntOut.port_b)
     annotation (Line(points={{-160,0},{-140,0}},       color={0,127,255}));
-  connect(senEntOut.port_a, pipe.ports_b[1])
+  connect(senEntOut.port_a, pipe.port_b)
     annotation (Line(points={{-120,0},{-100,0}},       color={0,127,255}));
   connect(pipe.port_a, senEntIn.port_b)
     annotation (Line(points={{-80,0},{-62,0}}, color={0,127,255}));
diff --git a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo
index cd1f4cf5d28..21400bbdf44 100644
--- a/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo
+++ b/Buildings/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mo
@@ -22,7 +22,6 @@ model TransportWaterAir
     annotation (Placement(transformation(extent={{82,16},{62,36}})));
   Buildings.Fluid.FixedResistances.PlugFlowPipe pip(
     redeclare package Medium = MediumW,
-    nPorts=1,
     dIns=0.05,
     kIns=0.028,
     m_flow_nominal=1,
@@ -62,7 +61,6 @@ model TransportWaterAir
     "Pressure boundary condition"
     annotation (Placement(transformation(extent={{80,-80},{60,-60}})));
   PlugFlowPipe duc(
-    nPorts=1,
     dIns=0.05,
     kIns=0.028,
     m_flow_nominal=1,
@@ -112,7 +110,7 @@ equation
   connect(Tin.y, sou.T_in)
     annotation (Line(points={{-71,30},{-62,30}},
                                                color={0,0,127}));
-  connect(pip.ports_b[1], senTemOutW.port_a)
+  connect(pip.port_b, senTemOutW.port_a)
     annotation (Line(points={{20,26},{30,26}}, color={0,127,255}));
   connect(senTemOutW.port_b, sin.ports[1])
     annotation (Line(points={{50,26},{62,26}}, color={0,127,255}));
@@ -122,7 +120,7 @@ equation
   connect(senTemIn.port_b, pip.port_a)
     annotation (Line(points={{-10,26},{0,26}},
                                              color={0,127,255}));
-  connect(duc.ports_b[1],senTemOutA. port_a)
+  connect(duc.port_b,senTemOutA. port_a)
     annotation (Line(points={{18,-70},{28,-70}}, color={0,127,255}));
   connect(senTemOutA.port_b, sin1.ports[1])
     annotation (Line(points={{48,-70},{60,-70}}, color={0,127,255}));
diff --git a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/DiscretizedBuriedPipe.mo b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/DiscretizedBuriedPipe.mo
index 409dc69471c..3258e123805 100644
--- a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/DiscretizedBuriedPipe.mo
+++ b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/DiscretizedBuriedPipe.mo
@@ -31,7 +31,7 @@ model DiscretizedBuriedPipe
     redeclare package Medium = Medium,
     nSeg=nSeg,
     dh=0.1,
-    length=segLen,
+    segLen=segLen,
     m_flow_nominal=1,
     dIns=dIns,
     kIns=soiDat.k,
@@ -43,7 +43,7 @@ model DiscretizedBuriedPipe
     cliCon=cliCon,
     soiDat=soiDat,
     nSeg=pip.nSeg,
-    len=pip.length,
+    len=pip.segLen,
     dep={1.5},
     pos={0},
     rad={pip.dh/2 + pip.thickness + pip.dIns}) "Ground coupling"
@@ -84,7 +84,7 @@ model DiscretizedBuriedPipe
     redeclare package Medium = Medium,
     nSeg=nSegRev,
     dh=0.1,
-    length=segLenRev,
+    segLen=segLenRev,
     m_flow_nominal=1,
     dIns=dIns,
     kIns=soiDat.k,
@@ -95,7 +95,7 @@ model DiscretizedBuriedPipe
     cliCon=cliCon,
     soiDat=soiDat,
     nSeg=pipRev.nSeg,
-    len=pipRev.length,
+    len=pipRev.segLen,
     dep={1.5},
     pos={0},
     rad={pip.dh / 2 + pip.thickness + pip.dIns})
diff --git a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/SingleBuriedPipe.mo b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/SingleBuriedPipe.mo
index 015cd2b3661..143de77160c 100644
--- a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/SingleBuriedPipe.mo
+++ b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/SingleBuriedPipe.mo
@@ -23,8 +23,7 @@ model SingleBuriedPipe "Example model of a single buried pipe"
     kIns=100,
     cPip=500,
     rhoPip=8000,
-    thickness=0.0032,
-    nPorts=1) "Buried pipe"
+    thickness=0.0032) "Buried pipe"
     annotation (Placement(transformation(extent={{-10,30},{10,50}})));
 
   Buildings.Fluid.Geothermal.BuriedPipes.GroundCoupling gro(
@@ -78,8 +77,7 @@ model SingleBuriedPipe "Example model of a single buried pipe"
     kIns=100,
     cPip=500,
     rhoPip=8000,
-    thickness=0.0032,
-    nPorts=1) "Buried pipe"
+    thickness=0.0032) "Buried pipe"
     annotation (Placement(transformation(extent={{-10,-30},{10,-50}})));
   GroundCoupling groRev(
     nPip=1,
@@ -134,16 +132,11 @@ equation
   connect(senTemInl.port_b, pip.port_a)
     annotation (Line(points={{-30,40},{-10,40}},
                                                color={0,127,255}));
-  connect(pip.ports_b[1], senTemOut.port_a)
-    annotation (Line(points={{10,40},{30,40}},
-                                             color={0,127,255}));
   connect(pip.heatPort, gro.ports[1,1]) annotation (Line(points={{0,50},{0,80},
           {0,80}},         color={191,0,0}));
   connect(senTemOutRev.port_b, pipRev.port_a)
     annotation (Line(points={{-30,-40},{-10,-40}},
                                                  color={0,127,255}));
-  connect(pipRev.ports_b[1], senTemInlRev.port_a)
-    annotation (Line(points={{10,-40},{30,-40}}, color={0,127,255}));
   connect(pipRev.heatPort, groRev.ports[1,1])
     annotation (Line(points={{0,-50},{0,-80},{0,-80}},
                                                  color={191,0,0}));
@@ -153,19 +146,27 @@ equation
     annotation (Line(points={{-60,-40},{-50,-40}}, color={0,127,255}));
   connect(TInlSig.y, souRev.T_in) annotation (Line(points={{-99,0},{100,0},{100,-44},
           {82,-44}}, color={0,0,127}));
+  connect(pip.port_b, senTemOut.port_a)
+    annotation (Line(points={{10,40},{30,40}}, color={0,127,255}));
+  connect(pipRev.port_b, senTemInlRev.port_a)
+    annotation (Line(points={{10,-40},{30,-40}}, color={0,127,255}));
   annotation (Diagram(
         coordinateSystem(preserveAspectRatio=false, extent={{-140,-120},{140,120}})),
     experiment(StopTime=63072000, Tolerance=1e-06),
     Documentation(info="<html>
 <p>
-This example showcases the ground thermal coupling for a single uninsulated 
+This example showcases the ground thermal coupling for a single uninsulated
 buried pipe operating around ambient temperature (<i>20</i>°C).
-Both design flow direction and reverse flow direction 
+Both design flow direction and reverse flow direction
 (components with suffix <code>Rev</code>) are simulated.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 14, 2021, by Michael Wetter:<br/>
+Updated example for new pipe model.
+</li>
+<li>
 March 17, 2021, by Baptiste Ravache:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoBuriedPipes.mo b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoBuriedPipes.mo
index 6af1588db04..c37053b7998 100644
--- a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoBuriedPipes.mo
+++ b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoBuriedPipes.mo
@@ -36,8 +36,7 @@ model TwoBuriedPipes "Example model of two buried pipes in close proximity"
     rhoPip=8000,
     thickness=0.0032,
     T_start_in=TChW,
-    T_start_out=TChW,
-    nPorts=1) "Buried chilled water pipe"
+    T_start_out=TChW) "Buried chilled water pipe"
     annotation (Placement(transformation(extent={{0,10},{20,30}})));
   Modelica.Blocks.Sources.Sine TinChW(
     amplitude=2,
@@ -78,8 +77,7 @@ model TwoBuriedPipes "Example model of two buried pipes in close proximity"
     rhoPip=8000,
     thickness=0.0032,
     T_start_in=THotW,
-    T_start_out=THotW,
-    nPorts=1) "Buried hot water pipe"
+    T_start_out=THotW) "Buried hot water pipe"
     annotation (Placement(transformation(extent={{0,-50},{20,-30}})));
   Modelica.Blocks.Sources.Sine TinHotW(
     amplitude=5,
@@ -129,9 +127,6 @@ equation
   connect(senTemChWIn.port_b, pipChW.port_a)
     annotation (Line(points={{-10,20},{0,20}},
                                              color={0,127,255}));
-  connect(pipChW.ports_b[1], senTemChWOut.port_a)
-    annotation (Line(points={{20,20},{50,20}},
-                                             color={0,127,255}));
   connect(pipChW.heatPort, gro.ports[1,1])
     annotation (Line(points={{10,30},{10,40},{30,40},{30,60},{30,60},{30,59.5}},
                                                        color={191,0,0}));
@@ -144,24 +139,30 @@ equation
     annotation (Line(points={{-46,-40},{-30,-40}}, color={0,127,255}));
   connect(senTemHotWIn.port_b, pipHotW.port_a)
     annotation (Line(points={{-10,-40},{0,-40}}, color={0,127,255}));
-  connect(pipHotW.ports_b[1], senTemHotWOut.port_a)
-    annotation (Line(points={{20,-40},{50,-40}}, color={0,127,255}));
   connect(senTemHotWOut.port_b, sinHotW.ports[1])
     annotation (Line(points={{70,-40},{80,-40}}, color={0,127,255}));
+  connect(pipChW.port_b, senTemChWOut.port_a)
+    annotation (Line(points={{20,20},{50,20}}, color={0,127,255}));
+  connect(pipHotW.port_b, senTemHotWOut.port_a) annotation (Line(points={{20,
+          -40},{36,-40},{36,-40},{50,-40}}, color={0,127,255}));
   annotation (Diagram(
         coordinateSystem(preserveAspectRatio=false, extent={{-120,-120},{120,
             120}})),
     experiment(StopTime=63072000, Tolerance=1e-06),
     Documentation(info="<html>
 <p>
-This example showcases the ground thermal coupling for a network of two 
-uninsulated buried pipes that are in close proximity. One pipe carries 
-chilled water oscillating around <i>10</i>°C whereas the other carries hot water 
+This example showcases the ground thermal coupling for a network of two
+uninsulated buried pipes that are in close proximity. One pipe carries
+chilled water oscillating around <i>10</i>°C whereas the other carries hot water
 oscillating around <i>80</i>°C.
 </p>
 </html>", revisions="<html>
 <ul>
 <li>
+September 14, 2021, by Michael Wetter:<br/>
+Updated example for new pipe model.
+</li>
+<li>
 March 17, 2021, by Baptiste Ravache:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoPipesConduit.mo b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoPipesConduit.mo
index d0f30a8333d..b36db676562 100644
--- a/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoPipesConduit.mo
+++ b/Buildings/Fluid/Geothermal/BuriedPipes/Examples/TwoPipesConduit.mo
@@ -32,8 +32,7 @@ model TwoPipesConduit
     kIns=0.05,
     cPip=500,
     rhoPip=8000,
-    thickness=0.0032,
-    nPorts=1) "Buried pipe"
+    thickness=0.0032) "Buried pipe"
     annotation (Placement(transformation(extent={{-10,50},{10,30}})));
 
   Buildings.Fluid.Geothermal.BuriedPipes.GroundCoupling gro(
@@ -86,8 +85,7 @@ model TwoPipesConduit
     kIns=0.19,
     cPip=500,
     rhoPip=8000,
-    thickness=0.0032,
-    nPorts=1) "Buried pipe"
+    thickness=0.0032) "Buried pipe"
     annotation (Placement(transformation(extent={{-10,-50},{10,-30}})));
   Sensors.TemperatureTwoPort senTemOutRet(
     redeclare package Medium = Medium,
@@ -157,13 +155,9 @@ equation
     annotation (Line(points={{50,40},{60,40}}, color={0,127,255}));
   connect(senTemInlSup.port_b, pipSup.port_a)
     annotation (Line(points={{-30,40},{-10,40}}, color={0,127,255}));
-  connect(pipSup.ports_b[1], senTemOutSup.port_a)
-    annotation (Line(points={{10,40},{30,40}}, color={0,127,255}));
   connect(senTemOutRet.port_b,pipRet. port_a)
     annotation (Line(points={{-30,-40},{-10,-40}},
                                                  color={0,127,255}));
-  connect(pipRet.ports_b[1],senTemInlRet. port_a)
-    annotation (Line(points={{10,-40},{30,-40}}, color={0,127,255}));
   connect(souRet.ports[1],senTemInlRet. port_b)
     annotation (Line(points={{60,-40},{50,-40}}, color={0,127,255}));
   connect(sinRet.ports[1],senTemOutRet. port_a)
@@ -178,6 +172,10 @@ equation
     annotation (Line(points={{40,0},{0,0},{0,30}}, color={191,0,0}));
   connect(con.port_b, gro.ports[1, 1])
     annotation (Line(points={{60,0},{90,0},{90,80}}, color={191,0,0}));
+  connect(pipSup.port_b, senTemOutSup.port_a)
+    annotation (Line(points={{10,40},{30,40}}, color={0,127,255}));
+  connect(pipRet.port_b, senTemInlRet.port_a)
+    annotation (Line(points={{10,-40},{30,-40}}, color={0,127,255}));
   annotation (Diagram(
         coordinateSystem(preserveAspectRatio=false, extent={{-140,-120},{140,120}})),
     experiment(StopTime=63072000, Tolerance=1e-06),
@@ -191,6 +189,10 @@ that contains one insulated hot water supply pipe oscillating around
 </html>", revisions="<html>
 <ul>
 <li>
+September 14, 2021, by Michael Wetter:<br/>
+Updated example for new pipe model.
+</li>
+<li>
 June 02, 2021, by Baptiste Ravache:<br/>
 First implementation.
 </li>
diff --git a/Buildings/Fluid/Geothermal/BuriedPipes/Validation/GroundCouplingAIT.mo b/Buildings/Fluid/Geothermal/BuriedPipes/Validation/GroundCouplingAIT.mo
index f4269f49419..852dfecd69f 100644
--- a/Buildings/Fluid/Geothermal/BuriedPipes/Validation/GroundCouplingAIT.mo
+++ b/Buildings/Fluid/Geothermal/BuriedPipes/Validation/GroundCouplingAIT.mo
@@ -36,7 +36,7 @@ model GroundCouplingAIT
               annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=-90,
-        origin={8,108})));
+        origin={12,108})));
   Fluid.Sources.MassFlowSource_T Point3(
     nPorts=1,
     redeclare package Medium = Medium,
@@ -44,7 +44,7 @@ model GroundCouplingAIT
                         annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-50,-80})));
+        origin={-44,-82})));
   Fluid.Sources.MassFlowSource_T Point2(
     redeclare package Medium = Medium,
     use_m_flow_in=true,
@@ -60,7 +60,6 @@ model GroundCouplingAIT
     kIns=0.024,
     length=115,
     allowFlowReversal=allowFlowReversal,
-    nPorts=2,
     m_flow_nominal=0.3,
     thickness=thickness,
     cPip=500,
@@ -77,14 +76,13 @@ model GroundCouplingAIT
     allowFlowReversal=allowFlowReversal,
     m_flow_nominal=0.3,
     thickness=thickness,
-    nPorts=2,
     cPip=500,
     rhoPip=8000,
     initDelay=false,
     m_flow_start=0) "Pipe 4" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={10,40})));
+        origin={12,40})));
 
   FixedResistances.PlugFlowPipe pip5(
     redeclare package Medium = Medium,
@@ -93,14 +91,13 @@ model GroundCouplingAIT
     kIns=0.024,
     dIns=0.045,
     allowFlowReversal=allowFlowReversal,
-    nPorts=2,
     m_flow_nominal=0.3,
     thickness=thickness,
     cPip=500,
     rhoPip=8000,
     initDelay=false,
     m_flow_start=0) "Pipe 5"
-    annotation (Placement(transformation(extent={{0,0},{-20,20}})));
+    annotation (Placement(transformation(extent={{-6,0},{-26,20}})));
 
   FixedResistances.PlugFlowPipe pip2(
     redeclare package Medium = Medium,
@@ -108,7 +105,6 @@ model GroundCouplingAIT
     dIns=0.0182,
     kIns=0.024,
     allowFlowReversal=allowFlowReversal,
-    nPorts=1,
     m_flow_nominal=0.3,
     thickness=thickness,
     dh=0.0273,
@@ -126,7 +122,6 @@ model GroundCouplingAIT
     dIns=0.0182,
     kIns=0.024,
     allowFlowReversal=allowFlowReversal,
-    nPorts=1,
     m_flow_nominal=0.3,
     thickness=thickness,
     dh=0.0273,
@@ -136,7 +131,7 @@ model GroundCouplingAIT
     m_flow_start=0) "Pipe 3" annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},
         rotation=90,
-        origin={-50,-20})));
+        origin={-44,-20})));
   Modelica.Blocks.Sources.CombiTimeTable DataReader(
     tableOnFile=true,
     tableName="dat",
@@ -149,7 +144,7 @@ model GroundCouplingAIT
     annotation (Placement(transformation(extent={{120,-40},{140,-20}})));
   Modelica.Blocks.Sources.RealExpression m_flow_p3(y=-DataReader.y[7])
     "Mass flow rate for substation 3"
-    annotation (Placement(transformation(extent={{-100,-114},{-60,-94}})));
+    annotation (Placement(transformation(extent={{-94,-116},{-54,-96}})));
   Modelica.Blocks.Sources.RealExpression m_flow_p4(y=-DataReader.y[8])
     "Mass flow rate of substation 4"
     annotation (Placement(transformation(extent={{156,130},{116,150}})));
@@ -166,7 +161,7 @@ model GroundCouplingAIT
                          annotation (Placement(transformation(
         extent={{10,-10},{-10,10}},
         rotation=90,
-        origin={-50,-50})));
+        origin={-44,-52})));
   Fluid.Sensors.TemperatureTwoPort senTem_p2(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
@@ -184,7 +179,7 @@ model GroundCouplingAIT
                          annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={8,80})));
+        origin={12,80})));
   Fluid.Sensors.TemperatureTwoPort senTem_p1(
     redeclare package Medium = Medium,
     m_flow_nominal=m_flow_nominal,
@@ -201,7 +196,6 @@ model GroundCouplingAIT
     kIns=0.024,
     length=20,
     allowFlowReversal=allowFlowReversal,
-    nPorts=2,
     m_flow_nominal=0.3,
     thickness=thickness,
     cPip=500,
@@ -210,10 +204,10 @@ model GroundCouplingAIT
     m_flow_start=0) "Pipe 0" annotation (Placement(transformation(
         extent={{-10,10},{10,-10}},
         rotation=90,
-        origin={80,-10})));
-  Buildings.Fluid.Sources.Boundary_pT ExcludedBranch(redeclare package
-      Medium =                                                                  Medium,
-      nPorts=1) "Mass flow sink for excluded branch"
+        origin={80,-20})));
+  Buildings.Fluid.Sources.Boundary_pT ExcludedBranch(
+    redeclare package Medium = Medium, nPorts=1)
+              "Mass flow sink for excluded branch"
                 annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=-90,
@@ -223,7 +217,7 @@ model GroundCouplingAIT
     m_flow_nominal=m_flow_nominal,
     transferHeat=true,
     tauHeaTra=tauHeaTra) "Temperature sensor"
-    annotation (Placement(transformation(extent={{-80,-2},{-60,18}})));
+    annotation (Placement(transformation(extent={{-80,0},{-60,20}})));
 
   Modelica.Blocks.Logical.Switch switch
     "Decide if mass flow rate is below measurement noise threshold or not"
@@ -284,9 +278,40 @@ model GroundCouplingAIT
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-30,70})));
+  FixedResistances.Junction splPip2(
+    redeclare package Medium = Medium,
+    m_flow_nominal={pip5.m_flow_nominal,pip2.m_flow_nominal,pip3.m_flow_nominal},
+    from_dp=true,
+    linearized=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    dp_nominal(each displayUnit="Pa") = {0,0,0},
+    portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Splitter coming out of pip5"
+    annotation (Placement(transformation(extent={{-34,0},{-54,20}})));
+
+  FixedResistances.Junction splPip1(
+    redeclare package Medium = Medium,
+    m_flow_nominal={pip1.m_flow_nominal,pip5.m_flow_nominal,pip4.m_flow_nominal},
+    from_dp=true,
+    linearized=true,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    dp_nominal(each displayUnit="Pa") = {0,0,0},
+    portFlowDirection_1=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Entering,
+    portFlowDirection_2=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving,
+    portFlowDirection_3=if allowFlowReversal then Modelica.Fluid.Types.PortFlowDirection.Bidirectional
+         else Modelica.Fluid.Types.PortFlowDirection.Leaving)
+    "Splitter coming out of pip1"
+    annotation (Placement(transformation(extent={{22,20},{2,0}})));
 equation
   connect(m_flow_p3.y, Point3.m_flow_in) annotation (Line(
-      points={{-58,-104},{-58,-92}},
+      points={{-52,-106},{-52,-94}},
       color={0,0,127},
       smooth=Smooth.None));
   connect(Point2.m_flow_in, m_flow_p2.y) annotation (Line(
@@ -304,50 +329,28 @@ equation
   connect(senTem_p2.port_b, Point2.ports[1]) annotation (Line(points={{-88,66},
           {-88,66},{-88,70},{-88,72}}, color={0,127,255}));
   connect(Point3.ports[1], senTem_p3.port_b)
-    annotation (Line(points={{-50,-70},{-50,-60}}, color={0,127,255}));
+    annotation (Line(points={{-44,-72},{-44,-62}}, color={0,127,255}));
   connect(senTem_p4.port_b, Point4.ports[1])
-    annotation (Line(points={{8,90},{8,98}},        color={0,127,255}));
+    annotation (Line(points={{12,90},{12,98}},      color={0,127,255}));
   connect(Point1.ports[1], senTem_p1.port_b)
     annotation (Line(points={{80,-68},{80,-60}},          color={0,127,255}));
   connect(senTem_p1.port_a, pip0.port_a)
-    annotation (Line(points={{80,-40},{80,-20}},          color={0,127,255}));
+    annotation (Line(points={{80,-40},{80,-30}},          color={0,127,255}));
   connect(switch.u1, m_flow_p4.y) annotation (Line(points={{56,134},{72,134},{
           72,140},{114,140}},color={0,0,127}));
   connect(m_flow_zero.y, switch.u3)
     annotation (Line(points={{114,118},{100,118},{100,102},{86,102},{86,118},{
           56,118}},                                    color={0,0,127}));
   connect(switch.y, Point4.m_flow_in)
-    annotation (Line(points={{33,126},{16,126},{16,120}},color={0,0,127}));
+    annotation (Line(points={{33,126},{20,126},{20,120}},color={0,0,127}));
   connect(switch.u2, lessThreshold.y) annotation (Line(points={{56,126},{64,126},
           {64,128},{75.2,128}},
                             color={255,0,255}));
   connect(lessThreshold.u, m_flow_p4.y) annotation (Line(points={{93.6,128},{
           100,128},{100,140},{114,140}},
                                color={0,0,127}));
-  connect(pip1.port_a, pip0.ports_b[1])
-    annotation (Line(points={{50,10},{78,10},{78,0}}, color={0,127,255}));
-  connect(pip1.ports_b[1], pip4.port_a)
-    annotation (Line(points={{30,8},{10,8},{10,30}}, color={0,127,255}));
-  connect(pip5.port_a, pip1.ports_b[2])
-    annotation (Line(points={{0,10},{30,10},{30,12}}, color={0,127,255}));
-  connect(pip4.ports_b[1], senTem_p4.port_a)
-    annotation (Line(points={{12,50},{12,60},{8,60},{8,70}},
-                                                    color={0,127,255}));
-  connect(Point5.ports[1], pip4.ports_b[2]) annotation (Line(points={{36,56},
-          {36,56},{8,56},{8,50}},  color={0,127,255}));
-  connect(pip5.ports_b[1], senTemIn_p2.port_b)
-    annotation (Line(points={{-20,8},{-60,8}},          color={0,127,255}));
-  connect(pip3.port_a, pip5.ports_b[2])
-    annotation (Line(points={{-50,-10},{-50,12},{-20,12}},
-                                                         color={0,127,255}));
   connect(senTemIn_p2.port_a, pip2.port_a)
-    annotation (Line(points={{-80,8},{-88,8},{-88,16}},   color={0,127,255}));
-  connect(pip2.ports_b[1], senTem_p2.port_a)
-    annotation (Line(points={{-88,36},{-88,46}},          color={0,127,255}));
-  connect(pip3.ports_b[1], senTem_p3.port_a) annotation (Line(points={{-50,-30},
-          {-50,-40}},           color={0,127,255}));
-  connect(ExcludedBranch.ports[1], pip0.ports_b[2]) annotation (Line(points={{82,30},
-          {82,0}},                       color={0,127,255}));
+    annotation (Line(points={{-80,10},{-88,10},{-88,16}}, color={0,127,255}));
   connect(switch1.y, Point5.m_flow_in) annotation (Line(points={{109,64},{58,64}},
                             color={0,0,127}));
   connect(m_flow_p4.y, switch1.u3) annotation (Line(points={{114,140},{100,140},
@@ -358,17 +361,42 @@ equation
           128},{66,104},{140,104},{140,64},{132,64}},
                                                     color={255,0,255}));
   connect(groMai.ports[1, 1], pip0.heatPort) annotation (Line(points={{130,20},
-          {110,20},{110,-10},{90,-10}}, color={191,0,0}));
+          {110,20},{110,-20},{90,-20}}, color={191,0,0}));
   connect(groMai.ports[1, 2], pip1.heatPort)
     annotation (Line(points={{130,20},{40,20}}, color={191,0,0}));
   connect(groMai.ports[1, 2], pip5.heatPort)
-    annotation (Line(points={{130,20},{-10,20}}, color={191,0,0}));
-  connect(groSup.ports[1, 1], pip2.heatPort) annotation (Line(points={{-30,60},
-          {-30,40},{-60,40},{-60,26},{-78,26}}, color={191,0,0}));
+    annotation (Line(points={{130,20},{-16,20}}, color={191,0,0}));
+  connect(groSup.ports[1, 1], pip2.heatPort) annotation (Line(points={{-30,60},{
+          -30,40},{-60,40},{-60,26},{-78,26}},  color={191,0,0}));
   connect(groSup.ports[1, 2], pip3.heatPort) annotation (Line(points={{-30,60},
-          {-30,-20},{-40,-20}}, color={191,0,0}));
+          {-30,-20},{-34,-20}}, color={191,0,0}));
   connect(groSup.ports[1, 3], pip4.heatPort)
-    annotation (Line(points={{-30,60},{-30,40},{0,40}}, color={191,0,0}));
+    annotation (Line(points={{-30,60},{-30,40},{2,40}}, color={191,0,0}));
+  connect(senTem_p2.port_a, pip2.port_b)
+    annotation (Line(points={{-88,46},{-88,36}}, color={0,127,255}));
+  connect(pip5.port_a, splPip1.port_2)
+    annotation (Line(points={{-6,10},{2,10}}, color={0,127,255}));
+  connect(pip1.port_b, splPip1.port_1)
+    annotation (Line(points={{30,10},{22,10}}, color={0,127,255}));
+  connect(pip4.port_a, splPip1.port_3)
+    annotation (Line(points={{12,30},{12,20}}, color={0,127,255}));
+  connect(pip5.port_b, splPip2.port_1)
+    annotation (Line(points={{-26,10},{-34,10}}, color={0,127,255}));
+  connect(senTemIn_p2.port_b, splPip2.port_2)
+    annotation (Line(points={{-60,10},{-54,10}}, color={0,127,255}));
+  connect(pip3.port_a, splPip2.port_3)
+    annotation (Line(points={{-44,-10},{-44,0}}, color={0,127,255}));
+  connect(pip1.port_a, pip0.port_b)
+    annotation (Line(points={{50,10},{80,10},{80,-10}},
+                                                      color={0,127,255}));
+  connect(pip4.port_b, senTem_p4.port_a)
+    annotation (Line(points={{12,50},{12,70}}, color={0,127,255}));
+  connect(pip4.port_b, Point5.ports[1])
+    annotation (Line(points={{12,50},{12,56},{36,56}}, color={0,127,255}));
+  connect(pip0.port_b, ExcludedBranch.ports[1])
+    annotation (Line(points={{80,-10},{82,-10},{82,30}}, color={0,127,255}));
+  connect(pip3.port_b, senTem_p3.port_a)
+    annotation (Line(points={{-44,-30},{-44,-42}}, color={0,127,255}));
   annotation (
     experiment(
       StopTime=603900,
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
similarity index 93%
rename from Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
rename to Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
index 79f9a01332a..32b7b0dcb7c 100644
--- a/Buildings/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
+++ b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/PlugFlowCore.mo
@@ -1,6 +1,7 @@
-within Buildings.Fluid.FixedResistances.BaseClasses;
+within Buildings.Obsolete.Fluid.FixedResistances.BaseClasses;
 model PlugFlowCore
   "Pipe model using spatialDistribution for temperature delay with modified delay tracker"
+  extends Modelica.Icons.ObsoleteModel;
   extends Buildings.Fluid.Interfaces.PartialTwoPort;
 
   constant Boolean homotopyInitialization = true "= true, use homotopy method"
@@ -9,24 +10,6 @@ model PlugFlowCore
   parameter Modelica.SIunits.Length dh
     "Hydraulic diameter (assuming a round cross section area)";
 
-  replaceable Buildings.Fluid.FixedResistances.HydraulicDiameter res(
-    final dh=dh,
-    final from_dp=from_dp,
-    final length=length,
-    final roughness=roughness,
-    final fac=fac,
-    final ReC=ReC,
-    final v_nominal=v_nominal,
-    final homotopyInitialization=homotopyInitialization,
-    final linearized=linearized,
-    dp(nominal=fac*200*length)) constrainedby
-    Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-      redeclare final package Medium = Medium,
-      final m_flow_nominal=m_flow_nominal,
-      final allowFlowReversal=allowFlowReversal,
-      final show_T=false)
-      "Pressure drop calculation for this pipe"
-    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
   parameter Modelica.SIunits.Velocity v_nominal
     "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)"
     annotation(Dialog(group="Nominal condition"));
@@ -53,7 +36,6 @@ model PlugFlowCore
   parameter Real fac=1
     "Factor to take into account flow resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal";
 
-
   parameter Boolean from_dp=false
     "= true, use m_flow = f(dp) else dp = f(m_flow)"
     annotation (Evaluate=true, Dialog(tab="Advanced"));
@@ -78,6 +60,24 @@ model PlugFlowCore
     "= true, use linear relation between m_flow and dp for any flow rate"
     annotation(Evaluate=true, Dialog(tab="Advanced"));
 
+  Buildings.Fluid.FixedResistances.HydraulicDiameter res(
+    redeclare final package Medium = Medium,
+    final dh=dh,
+    final m_flow_nominal=m_flow_nominal,
+    final from_dp=from_dp,
+    final length=length,
+    final roughness=roughness,
+    final fac=fac,
+    final ReC=ReC,
+    final v_nominal=v_nominal,
+    final allowFlowReversal=allowFlowReversal,
+    final show_T=false,
+    final homotopyInitialization=homotopyInitialization,
+    final linearized=linearized,
+    dp(nominal=fac*200*length))
+                 "Pressure drop calculation for this pipe"
+    annotation (Placement(transformation(extent={{-20,-10},{0,10}})));
+
   Buildings.Fluid.FixedResistances.BaseClasses.PlugFlow del(
     redeclare final package Medium = Medium,
     final m_flow_small=m_flow_small,
@@ -204,14 +204,16 @@ equation
           lineColor={0,0,0},
           fillPattern=FillPattern.HorizontalCylinder,
           fillColor={215,202,187})}),
+    obsolete = "Obsolete model - use Buildings.Fluid.FixedResistances.PlugFlowPipe instead",
     Documentation(revisions="<html>
 <ul>
 <li>
-May 17, 2021, by Baptiste Ravache:<br/>
-Make <code>res</code> instance replaceable, to allow pipe resistance
-aggregation in
-<a href=\"modelica://Buildings.Fluid.FixedResistances.PlugFlowDiscretized\">
-Buildings.Fluid.FixedResistances.PlugFlowDiscretized</a>
+July 12, 2021, by Baptiste Ravache:<br/>
+This class is obsolete and replaced by
+<a href=\"modelica://Buildings.Fluid.FixedResistances.PlugFlowPipe\">
+Buildings.Fluid.FixedResistances.PlugFlowPipe</a>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1494\">IBPSA, #1494</a>.
 </li>
 <li>
 April 14, 2020, by Michael Wetter:<br/>
diff --git a/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/Validation.mo b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/Validation.mo
new file mode 100644
index 00000000000..2ef0937d7c4
--- /dev/null
+++ b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/Validation.mo
@@ -0,0 +1,153 @@
+within Buildings.Obsolete.Fluid.FixedResistances.BaseClasses;
+package Validation "Collection of validation models"
+  extends Modelica.Icons.ExamplesPackage;
+
+  model PlugFlowCore "Simple example of plug flow pipe core"
+    extends Modelica.Icons.Example;
+    replaceable package Medium = Buildings.Media.Water "Medium in pipes"
+                                              annotation (
+        choicesAllMatching=true);
+    parameter Modelica.SIunits.Length dh=0.1
+      "Hydraulic diameter (assuming a round cross section area)";
+    parameter Modelica.SIunits.Length dIns = 0.05
+      "Thickness of pipe insulation";
+    parameter Modelica.SIunits.ThermalConductivity kIns= 0.028
+     "Heat conductivity of pipe insulation";
+
+    parameter Modelica.SIunits.SpecificHeatCapacity cPip=500
+      "Specific heat of pipe wall material. 2300 for PE, 500 for steel";
+    parameter Modelica.SIunits.Density rhoPip=8000
+      "Density of pipe wall material. 930 for PE, 8000 for steel";
+
+    parameter Real R=1/(kIns*2*Modelica.Constants.pi/
+      Modelica.Math.log((dh/2 + dIns)/(dh/2)))
+      "Thermal resistance per unit length from fluid to boundary temperature";
+
+    parameter Real C=rho_default*Modelica.Constants.pi*(
+        dh/2)^2*cp_default "Thermal capacity per unit length of water in pipe";
+
+    parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
+        p=Medium.p_default,
+        T=Medium.T_default,
+        X=Medium.X_default)
+      "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
+      annotation (Dialog(group="Advanced"));
+
+    parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+        T=Medium.T_default,
+        p=Medium.p_default,
+        X=Medium.X_default) "Default medium state";
+
+    parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+        Medium.specificHeatCapacityCp(state=sta_default)
+      "Heat capacity of medium";
+
+    Modelica.Blocks.Sources.Ramp Tin(
+      height=20,
+      duration=0,
+      offset=273.15 + 50,
+      startTime=100) "Ramp temperature signal"
+      annotation (Placement(transformation(extent={{-92,-6},{-72,14}})));
+    Buildings.Fluid.Sources.Boundary_pT sin(
+      redeclare package Medium = Medium,
+      T=273.15 + 10,
+      nPorts=1,
+      p(displayUnit="Pa") = 101325) "Pressure boundary condition"
+      annotation (Placement(transformation(extent={{82,-10},{62,10}})));
+    Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore pip(
+      redeclare package Medium = Medium,
+      from_dp=true,
+      dh=0.1,
+      length=100,
+      m_flow_nominal=1,
+      roughness=2.5e-5,
+      thickness=0.0032,
+      initDelay=true,
+      m_flow_start=1,
+      R=R,
+      C=C,
+      v_nominal=1.5,
+      T_start_in=323.15,
+      T_start_out=323.15) "Pipe"
+      annotation (Placement(transformation(extent={{0,-10},{20,10}})));
+    Buildings.HeatTransfer.Sources.FixedTemperature bou(T=283.15)
+      "Fixed temperature boundary condition"
+      annotation (Placement(transformation(extent={{-40,60},{-20,80}})));
+    Buildings.Fluid.Sources.MassFlowSource_T sou(
+      nPorts=1,
+      redeclare package Medium = Medium,
+      use_T_in=true,
+      m_flow=3) "Flow source"
+      annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
+
+    Buildings.Fluid.Sensors.TemperatureTwoPort senTemOut(
+      redeclare package Medium = Medium,
+      m_flow_nominal=1,
+      T_start=323.15) "Temperature sensor"
+      annotation (Placement(transformation(extent={{30,-10},{50,10}})));
+    Buildings.Fluid.Sensors.TemperatureTwoPort senTemIn(
+      redeclare package Medium = Medium,
+      m_flow_nominal=1,
+      T_start=323.15) "Temperature sensor"
+      annotation (Placement(transformation(extent={{-30,-10},{-10,10}})));
+  equation
+    connect(bou.port, pip.heatPort)
+      annotation (Line(points={{-20,70},{10,70},{10,10}}, color={191,0,0}));
+    connect(Tin.y, sou.T_in)
+      annotation (Line(points={{-71,4},{-62,4}}, color={0,0,127}));
+    connect(senTemOut.port_b, sin.ports[1])
+      annotation (Line(points={{50,0},{62,0}}, color={0,127,255}));
+    connect(sou.ports[1], senTemIn.port_a)
+      annotation (Line(points={{-40,0},{-30,0}}, color={0,127,255}));
+    connect(senTemIn.port_b, pip.port_a)
+      annotation (Line(points={{-10,0},{0,0}}, color={0,127,255}));
+    connect(pip.port_b, senTemOut.port_a)
+      annotation (Line(points={{20,0},{30,0}}, color={0,127,255}));
+    annotation (
+      __Dymola_Commands(file=
+            "Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos"
+          "Simulate and Plot"),
+      experiment(StopTime=1000, Tolerance=1e-006),
+      Documentation(info="<html>
+<p>
+Basic test of model
+<a href=\"modelica://Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
+Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>.
+This test includes an inlet temperature step under a constant mass flow rate.
+</p>
+</html>",   revisions="<html>
+<ul>
+<li>
+July 12, 2021, by Baptiste Ravache:<br/>
+This validation is for a class that is now obsolete.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1494\">IBPSA, #1494</a>.
+</li>
+<li>
+October 23, 2017, by Michael Wetter:<br/>
+Corrected wrong hyperlink, updated example for new set of parameters that
+are exposed by the pipe model.
+</li>
+<li>
+September 8, 2017 by Bram van der Heijde:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+  end PlugFlowCore;
+annotation (preferredView="info", Documentation(info="<html>
+<p>
+This package contains validation models for the classes in
+<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses\">
+Buildings.Fluid.FixedResistances.BaseClasses</a>.
+</p>
+<p>
+Note that most validation models contain simple input data
+which may not be realistic, but for which the correct
+output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these
+solutions. These model outputs are stored as reference data and
+used for continuous validation whenever models in the library change.
+</p>
+</html>"));
+end Validation;
diff --git a/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.mo b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.mo
new file mode 100644
index 00000000000..80f9737afa0
--- /dev/null
+++ b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.mo
@@ -0,0 +1,12 @@
+within Buildings.Obsolete.Fluid.FixedResistances;
+package BaseClasses
+  extends Modelica.Icons.BasesPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models in
+<a href=\"modelica://Buildings.Obsolete.Fluid.FixedResistances\">
+Buildings.Obsolete.Fluid.FixedResistances</a>.
+</p>
+</html>"));
+end BaseClasses;
diff --git a/Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.order b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.order
similarity index 54%
rename from Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.order
rename to Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.order
index de00bc67cf1..01f9086560f 100644
--- a/Buildings/Fluid/FixedResistances/BaseClasses/Validation/package.order
+++ b/Buildings/Obsolete/Fluid/FixedResistances/BaseClasses/package.order
@@ -1 +1,2 @@
 PlugFlowCore
+Validation
diff --git a/Buildings/Obsolete/Fluid/FixedResistances/PlugFlowPipe.mo b/Buildings/Obsolete/Fluid/FixedResistances/PlugFlowPipe.mo
new file mode 100644
index 00000000000..7a0ea7cb02e
--- /dev/null
+++ b/Buildings/Obsolete/Fluid/FixedResistances/PlugFlowPipe.mo
@@ -0,0 +1,324 @@
+within Buildings.Obsolete.Fluid.FixedResistances;
+model PlugFlowPipe "Pipe model using spatialDistribution for temperature delay"
+  extends Modelica.Icons.ObsoleteModel;
+  extends Buildings.Fluid.Interfaces.PartialTwoPortVector;
+
+  constant Boolean homotopyInitialization = true "= true, use homotopy method"
+    annotation(HideResult=true);
+
+  parameter Boolean from_dp=false
+    "= true, use m_flow = f(dp) else dp = f(m_flow)"
+    annotation (Dialog(tab="Advanced"));
+
+  parameter Modelica.SIunits.Length dh=sqrt(4*m_flow_nominal/rho_default/v_nominal/Modelica.Constants.pi)
+    "Hydraulic diameter (assuming a round cross section area)"
+    annotation (Dialog(group="Material"));
+
+  parameter Modelica.SIunits.Velocity v_nominal = 1.5
+    "Velocity at m_flow_nominal (used to compute default value for hydraulic diameter dh)"
+    annotation(Dialog(group="Nominal condition"));
+
+  parameter Real ReC=4000
+    "Reynolds number where transition to turbulent starts";
+
+  parameter Modelica.SIunits.Height roughness=2.5e-5
+    "Average height of surface asperities (default: smooth steel pipe)"
+    annotation (Dialog(group="Material"));
+
+  parameter Modelica.SIunits.Length length "Pipe length"
+    annotation (Dialog(group="Material"));
+
+  parameter Modelica.SIunits.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
+
+  parameter Modelica.SIunits.MassFlowRate m_flow_small = 1E-4*abs(
+    m_flow_nominal) "Small mass flow rate for regularization of zero flow"
+    annotation (Dialog(tab="Advanced"));
+
+  parameter Modelica.SIunits.Length dIns
+    "Thickness of pipe insulation, used to compute R"
+    annotation (Dialog(group="Thermal resistance"));
+
+  parameter Modelica.SIunits.ThermalConductivity kIns
+    "Heat conductivity of pipe insulation, used to compute R"
+    annotation (Dialog(group="Thermal resistance"));
+
+  parameter Modelica.SIunits.SpecificHeatCapacity cPip=2300
+    "Specific heat of pipe wall material. 2300 for PE, 500 for steel"
+    annotation (Dialog(group="Material"));
+
+  parameter Modelica.SIunits.Density rhoPip(displayUnit="kg/m3")=930
+    "Density of pipe wall material. 930 for PE, 8000 for steel"
+    annotation (Dialog(group="Material"));
+
+  parameter Modelica.SIunits.Length thickness = 0.0035
+    "Pipe wall thickness"
+    annotation (Dialog(group="Material"));
+
+  parameter Modelica.SIunits.Temperature T_start_in(start=Medium.T_default)=
+    Medium.T_default "Initialization temperature at pipe inlet"
+    annotation (Dialog(tab="Initialization"));
+  parameter Modelica.SIunits.Temperature T_start_out(start=Medium.T_default)=
+    T_start_in "Initialization temperature at pipe outlet"
+    annotation (Dialog(tab="Initialization"));
+  parameter Boolean initDelay(start=false) = false
+    "Initialize delay for a constant mass flow rate if true, otherwise start from 0"
+    annotation (Dialog(tab="Initialization"));
+  parameter Modelica.SIunits.MassFlowRate m_flow_start=0 "Initial value of mass flow rate through pipe"
+    annotation (Dialog(tab="Initialization", enable=initDelay));
+
+  parameter Real R(unit="(m.K)/W")=1/(kIns*2*Modelica.Constants.pi/
+    Modelica.Math.log((dh/2 + thickness + dIns)/(dh/2 + thickness)))
+    "Thermal resistance per unit length from fluid to boundary temperature"
+    annotation (Dialog(group="Thermal resistance"));
+
+  parameter Real fac=1
+    "Factor to take into account flow resistance of bends etc., fac=dp_nominal/dpStraightPipe_nominal";
+
+  parameter Boolean linearized = false
+    "= true, use linear relation between m_flow and dp for any flow rate"
+    annotation(Evaluate=true, Dialog(tab="Advanced"));
+
+  Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort
+    "Heat transfer to or from surroundings (heat loss from pipe results in a positive heat flow)"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+
+  Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore cor(
+    redeclare final package Medium = Medium,
+    final dh=dh,
+    final v_nominal=v_nominal,
+    final length=length,
+    final C=C,
+    final R=R,
+    final m_flow_small=m_flow_small,
+    final m_flow_nominal=m_flow_nominal,
+    final T_start_in=T_start_in,
+    final T_start_out=T_start_out,
+    final m_flow_start=m_flow_start,
+    final initDelay=initDelay,
+    final from_dp=from_dp,
+    final fac=fac,
+    final ReC=ReC,
+    final thickness=thickness,
+    final roughness=roughness,
+    final allowFlowReversal=allowFlowReversal,
+    final homotopyInitialization=homotopyInitialization,
+    final linearized=linearized) "Describing the pipe behavior"
+    annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
+
+  // In the volume, below, we scale down V and use
+  // mSenFac. Otherwise, for air, we would get very large volumes
+  // which affect the delay of water vapor and contaminants.
+  // See also Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir
+  // for why mSenFac is 10 and not 1000, as this gives more reasonable
+  // temperature step response
+  Buildings.Fluid.MixingVolumes.MixingVolume vol(
+    redeclare final package Medium = Medium,
+    final m_flow_nominal=m_flow_nominal,
+    final V=if rho_default > 500 then VEqu else VEqu/1000,
+    final nPorts=nPorts + 1,
+    final T_start=T_start_out,
+    final energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
+    final mSenFac=if rho_default > 500 then 1 else 10)
+    "Control volume connected to ports_b. Represents equivalent pipe wall thermal capacity."
+    annotation (Placement(transformation(extent={{60,20},{80,40}})));
+
+protected
+  parameter Modelica.SIunits.HeatCapacity CPip=
+    length*((dh + 2*thickness)^2 - dh^2)*Modelica.Constants.pi/4*cPip*rhoPip "Heat capacity of pipe wall";
+
+  final parameter Modelica.SIunits.Volume VEqu=CPip/(rho_default*cp_default)
+    "Equivalent water volume to represent pipe wall thermal inertia";
+
+  parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
+      T=Medium.T_default,
+      p=Medium.p_default,
+      X=Medium.X_default) "Default medium state";
+
+  parameter Modelica.SIunits.SpecificHeatCapacity cp_default=
+      Medium.specificHeatCapacityCp(state=sta_default)
+    "Heat capacity of medium";
+
+  parameter Real C(unit="J/(K.m)")=
+    rho_default*Modelica.Constants.pi*(dh/2)^2*cp_default
+    "Thermal capacity per unit length of water in pipe";
+
+  parameter Modelica.SIunits.Density rho_default=Medium.density_pTX(
+      p=Medium.p_default,
+      T=Medium.T_default,
+      X=Medium.X_default)
+    "Default density (e.g., rho_liquidWater = 995, rho_air = 1.2)"
+    annotation (Dialog(group="Advanced"));
+
+initial equation
+  assert(homotopyInitialization, "In " + getInstanceName() +
+    ": The constant homotopyInitialization has been modified from its default value. This constant will be removed in future releases.",
+    level = AssertionLevel.warning);
+
+equation
+  for i in 1:nPorts loop
+    connect(vol.ports[i + 1], ports_b[i])
+    annotation (Line(points={{70,20},{72,20},{72,6},{72,0},{100,0}},
+        color={0,127,255}));
+  end for;
+  connect(cor.heatPort, heatPort)
+    annotation (Line(points={{0,10},{0,10},{0,100}}, color={191,0,0}));
+
+  connect(cor.port_b, vol.ports[1])
+    annotation (Line(points={{10,0},{70,0},{70,20}}, color={0,127,255}));
+
+  connect(cor.port_a, port_a)
+    annotation (Line(points={{-10,0},{-56,0},{-100,0}}, color={0,127,255}));
+  annotation (
+    Line(points={{70,20},{72,20},{72,0},{100,0}}, color={0,127,255}),
+    Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
+            100,100}})),
+    Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
+            100}}), graphics={
+        Rectangle(
+          extent={{-100,40},{100,-40}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={192,192,192}),
+        Rectangle(
+          extent={{-100,30},{100,-30}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={0,127,255}),
+        Rectangle(
+          extent={{-100,50},{100,40}},
+          lineColor={175,175,175},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Backward),
+        Rectangle(
+          extent={{-100,-40},{100,-50}},
+          lineColor={175,175,175},
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Backward),
+        Polygon(
+          points={{0,90},{40,62},{20,62},{20,38},{-20,38},{-20,62},{-40,62},{0,
+              90}},
+          lineColor={0,0,0},
+          fillColor={238,46,47},
+          fillPattern=FillPattern.Solid),
+        Rectangle(
+          extent={{-30,30},{28,-30}},
+          lineColor={0,0,0},
+          fillPattern=FillPattern.HorizontalCylinder,
+          fillColor={215,202,187}),
+        Text(
+          extent={{-100,-72},{100,-88}},
+          lineColor={0,0,0},
+          textString="L = %length
+          d = %dh")}),
+    obsolete = "Obsolete model - use Buildings.Fluid.FixedResistances.PlugFlowPipe instead",
+    Documentation(revisions="<html>
+<ul>
+<li>
+July 12, 2021, by Baptiste Ravache:<br/>
+This class is obsolete and replaced by
+<a href=\"modelica://Buildings.Fluid.FixedResistances.PlugFlowPipe\">
+Buildings.Fluid.FixedResistances.PlugFlowPipe</a>.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1494\">IBPSA, #1494</a>.
+</li>
+<li>
+April 14, 2020, by Michael Wetter:<br/>
+Changed <code>homotopyInitialization</code> to a constant.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1341\">IBPSA, #1341</a>.
+</li>
+<li>
+March 6, 2020, by Jelger Jansen:<br/>
+Revised calculation of thermal resistance <code>R</code>
+by using correct radiuses.
+See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1310\">#1310</a>.
+</li>
+<li>
+October 23, 2017, by Michael Wetter:<br/>
+Revised variable names and documentation to follow guidelines.
+Corrected malformed hyperlinks.
+</li>
+<li>
+July 4, 2016 by Bram van der Heijde:<br/>
+Introduce <code>pipVol</code>.
+</li>
+<li>
+October 10, 2015 by Marcus Fuchs:<br/>
+Copy Icon from KUL implementation and rename model.
+Replace resistance and temperature delay by an adiabatic pipe.
+</li>
+<li>September, 2015 by Marcus Fuchs:<br/>
+First implementation.
+</li>
+</ul>
+</html>", info="<html>
+<p>
+Pipe with heat loss using the time delay based heat losses and transport
+of the fluid using a plug flow model, applicable for simulation of long
+pipes such as in district heating and cooling systems.</p>
+<p>
+This model takes into account transport delay along the pipe length idealized
+as a plug flow.
+The model also includes thermal inertia of the pipe wall.
+</p>
+<h4>Implementation</h4>
+<p>Heat losses are implemented by
+<a href=\"modelica://Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowHeatLoss\">
+Buildings.Fluid.FixedResistances.BaseClasses.PlugFlowHeatLoss</a>
+at each end of the pipe (see
+<a href=\"modelica://Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">
+Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore</a>).
+Depending on the flow direction, the temperature difference due to heat losses
+is subtracted at the right fluid port.
+</p>
+<p>
+The pressure drop is implemented using
+<a href=\"modelica://Buildings.Fluid.FixedResistances.HydraulicDiameter\">
+Buildings.Fluid.FixedResistances.HydraulicDiameter</a>.
+</p>
+<p>
+The thermal capacity of the pipe wall is implemented as a mixing volume
+of the fluid in the pipe, of which the thermal capacity
+is equal to that of the pipe wall material.
+In addition, this mixing volume allows the hydraulic separation of subsequent pipes.
+Thanks to the vectorized implementation of the (design) outlet port,
+splits and junctions of pipes can be handled in a numerically efficient way.
+<br/>
+This mixing volume is not present in the
+<a href=\"modelica://Buildings.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore\">PlugFlowCore</a> model,
+which can be used in cases where mixing volumes at pipe junctions need to
+be added manually.
+</p>
+<h4>Assumptions</h4>
+<ul>
+<li>
+Heat losses are for steady-state operation.
+</li>
+<li>
+The axial heat diffusion in the fluid, the pipe wall and the ground are neglected.
+</li>
+<li>
+The boundary temperature is uniform.
+</li>
+<li>
+The thermal inertia of the pipe wall material is lumped on the side of the pipe
+that is connected to <code>ports_b</code>.
+</li>
+</ul>
+<h4>References</h4>
+<p>
+Full details on the model implementation and experimental validation can be found
+in:
+</p>
+<p>
+van der Heijde, B., Fuchs, M., Ribas Tugores, C., Schweiger, G., Sartor, K.,
+Basciotti, D., M&uuml;ller, D., Nytsch-Geusen, C., Wetter, M. and Helsen, L.
+(2017).<br/>
+Dynamic equation-based thermo-hydraulic pipe model for district heating and
+cooling systems.<br/>
+<i>Energy Conversion and Management</i>, vol. 151, p. 158-169.
+<a href=\"https://doi.org/10.1016/j.enconman.2017.08.072\">doi:
+10.1016/j.enconman.2017.08.072</a>.</p>
+</html>"));
+end PlugFlowPipe;
diff --git a/Buildings/Obsolete/Fluid/FixedResistances/package.mo b/Buildings/Obsolete/Fluid/FixedResistances/package.mo
new file mode 100644
index 00000000000..07a1c66bb10
--- /dev/null
+++ b/Buildings/Obsolete/Fluid/FixedResistances/package.mo
@@ -0,0 +1,10 @@
+within Buildings.Obsolete.Fluid;
+package FixedResistances "Package with models for fixed flow resistances"
+extends Modelica.Icons.VariantsPackage;
+
+annotation (Documentation(info="<html>
+<p>
+This package contains component models for fixed flow resistances. 
+</p>
+</html>"));
+end FixedResistances;
diff --git a/Buildings/Obsolete/Fluid/FixedResistances/package.order b/Buildings/Obsolete/Fluid/FixedResistances/package.order
new file mode 100644
index 00000000000..cb214d86d53
--- /dev/null
+++ b/Buildings/Obsolete/Fluid/FixedResistances/package.order
@@ -0,0 +1,2 @@
+PlugFlowPipe
+BaseClasses
diff --git a/Buildings/Obsolete/Fluid/package.order b/Buildings/Obsolete/Fluid/package.order
index ce1a5aba2e9..0591da2ccb2 100644
--- a/Buildings/Obsolete/Fluid/package.order
+++ b/Buildings/Obsolete/Fluid/package.order
@@ -1 +1,2 @@
+FixedResistances
 Sources
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowDiscretized.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowDiscretized.txt
index 05c501867e7..7e4f1b3b0f2 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowDiscretized.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowDiscretized.txt
@@ -1,4 +1,4 @@
-last-generated=2021-07-12
+last-generated=2021-09-15
 statistics-simulation=
 {
   "linear": " ",
@@ -7,5 +7,11 @@ statistics-simulation=
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-senTemIn.T=[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.431502075195312e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02]
-senTemOut.T=[3.231499938964844e+02, 3.23148681640625e+02, 3.231470642089844e+02, 3.231455688476562e+02, 3.231439514160156e+02, 3.231421508789062e+02, 3.231405334472656e+02, 3.231387329101562e+02, 3.231367797851562e+02, 3.23135009765625e+02, 3.231329956054688e+02, 3.231309509277344e+02, 3.231289978027344e+02, 3.231267700195312e+02, 3.231246032714844e+02, 3.231224670410156e+02, 3.231200561523438e+02, 3.231177978515625e+02, 3.231154479980469e+02, 3.231128845214844e+02, 3.231105041503906e+02, 3.2310791015625e+02, 3.23105224609375e+02, 3.231026916503906e+02, 3.230998840332031e+02, 3.230971069335938e+02, 3.230943908691406e+02, 3.230914306640625e+02, 3.230892028808594e+02, 3.230886535644531e+02, 3.230887756347656e+02, 3.230887451171875e+02, 3.230887145996094e+02, 3.230887145996094e+02, 3.230887145996094e+02, 3.230887145996094e+02, 3.230887451171875e+02, 3.244130249023438e+02, 3.368785705566406e+02, 3.424958801269531e+02, 3.430244750976562e+02, 3.430459594726562e+02, 3.430464782714844e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464782714844e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464477539062e+02, 3.430464172363281e+02, 3.430464172363281e+02, 3.430464172363281e+02, 3.4304638671875e+02, 3.430463562011719e+02, 3.430463562011719e+02, 3.430463256835938e+02, 3.430462951660156e+02, 3.430462646484375e+02, 3.430462341308594e+02, 3.430462036132812e+02, 3.430462036132812e+02, 3.430462036132812e+02, 3.430462341308594e+02, 3.430462341308594e+02, 3.430462646484375e+02, 3.430462951660156e+02, 3.430463256835938e+02]
+senTemIn.T=[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.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02]
+senTemOut.T=[3.231499938964844e+02, 3.231485290527344e+02, 3.231468200683594e+02, 3.231449279785156e+02, 3.231428527832031e+02, 3.231405944824219e+02, 3.231381530761719e+02, 3.231355285644531e+02, 3.231328430175781e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.23131591796875e+02, 3.242192687988281e+02, 3.431076354980469e+02, 3.431188049316406e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.43118896484375e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189575195312e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02, 3.431189270019531e+02]
+bou[1].T=[2.851499938964844e+02, 2.851499938964844e+02]
+pip.QEnv_flow=[0e+00, -7.699429931640625e+02, -7.698892211914062e+02, -7.69841796875e+02, -7.698005981445312e+02, -7.697659301757812e+02, -7.69738525390625e+02, -7.697188720703125e+02, -7.697077026367188e+02, -7.697046508789062e+02, -7.697047119140625e+02, -8.228048706054688e+02, -8.758958740234375e+02, -9.299409790039062e+02, -1.006861206054688e+03, -1.080934692382812e+03, -1.139826904296875e+03, -1.1942294921875e+03, -1.253367797851562e+03, -1.300544921875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03, -1.3005546875e+03]
+pip.dp=[1.510887109375e+04, 1.510887109375e+04]
+pip.v=[1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00, 1.278884530067444e+00]
+pip.m_flow_nominal=[1e+01, 1e+01]
+pip.m_flow=[1e+01, 1e+01]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowPipe.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowPipe.txt
index 3f4a99e3c40..37e42bfeb04 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowPipe.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Examples_PlugFlowPipe.txt
@@ -1,11 +1,13 @@
-last-generated=2020-03-07
+last-generated=2021-09-13
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "5",
+  "number of continuous time states": "9",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 1e+03]
-senTemIn.T=[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.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02]
-senTemOut.T=[3.231499938964844e+02, 3.230866394042969e+02, 3.230395202636719e+02, 3.230065002441406e+02, 3.229838256835938e+02, 3.2296875e+02, 3.229592590332031e+02, 3.229539184570312e+02, 3.2295166015625e+02, 3.229516906738281e+02, 3.229533996582031e+02, 3.229563903808594e+02, 3.229602966308594e+02, 3.229647827148438e+02, 3.229698181152344e+02, 3.229751892089844e+02, 3.229808654785156e+02, 3.229867858886719e+02, 3.229928283691406e+02, 3.229990234375e+02, 3.230052795410156e+02, 3.230115661621094e+02, 3.230179138183594e+02, 3.230242919921875e+02, 3.230307006835938e+02, 3.230370788574219e+02, 3.230433044433594e+02, 3.230489807128906e+02, 3.230534362792969e+02, 3.23056640625e+02, 3.230589904785156e+02, 3.230607299804688e+02, 3.230619812011719e+02, 3.230628967285156e+02, 3.230635375976562e+02, 3.230640258789062e+02, 3.232365112304688e+02, 3.282808837890625e+02, 3.32128662109375e+02, 3.349722595214844e+02, 3.370736083984375e+02, 3.3862646484375e+02, 3.397740478515625e+02, 3.406220397949219e+02, 3.412487182617188e+02, 3.417118530273438e+02, 3.420541076660156e+02, 3.423070373535156e+02, 3.424939575195312e+02, 3.42632080078125e+02, 3.427341613769531e+02, 3.428096008300781e+02, 3.428653564453125e+02, 3.429065551757812e+02, 3.4293701171875e+02, 3.429595031738281e+02, 3.429761047363281e+02, 3.429884033203125e+02, 3.429974975585938e+02, 3.430042419433594e+02, 3.430092163085938e+02, 3.430129089355469e+02, 3.430155944824219e+02, 3.430176086425781e+02, 3.430190734863281e+02, 3.430201416015625e+02, 3.430209655761719e+02, 3.430215454101562e+02, 3.430219421386719e+02, 3.430222778320312e+02, 3.430225219726562e+02, 3.43022705078125e+02, 3.430228576660156e+02, 3.4302294921875e+02, 3.430230407714844e+02, 3.430230712890625e+02, 3.430231323242188e+02, 3.430231323242188e+02, 3.430231628417969e+02, 3.430231628417969e+02, 3.430231628417969e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.43023193359375e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02, 3.430232238769531e+02]
+senTemIn.T=[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.431497192382812e+02, 3.431499633789062e+02, 3.431499328613281e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431500244140625e+02, 3.431500244140625e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02]
+senTemInNoMix.T=[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.431497192382812e+02, 3.431499633789062e+02, 3.431499328613281e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431500244140625e+02, 3.431500244140625e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02]
+senTemOutNoMix.T=[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.33435791015625e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02, 3.431499938964844e+02]
+senTemOut.T=[3.231499938964844e+02, 3.2314990234375e+02, 3.231499328613281e+02, 3.231499328613281e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499633789062e+02, 3.231499633789062e+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.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.233224182128906e+02, 3.283772277832031e+02, 3.322326965332031e+02, 3.350821533203125e+02, 3.371879272460938e+02, 3.387442016601562e+02, 3.398945617675781e+02, 3.407441711425781e+02, 3.413721313476562e+02, 3.418365173339844e+02, 3.421793823242188e+02, 3.424328002929688e+02, 3.426202087402344e+02, 3.427586669921875e+02, 3.4286083984375e+02, 3.429362182617188e+02, 3.429919738769531e+02, 3.43033203125e+02, 3.430636901855469e+02, 3.43086181640625e+02, 3.431026611328125e+02, 3.431148376464844e+02, 3.431239318847656e+02, 3.431307373046875e+02, 3.431358032226562e+02, 3.431395263671875e+02, 3.431422424316406e+02, 3.431442260742188e+02, 3.431457214355469e+02, 3.431468200683594e+02, 3.43147705078125e+02, 3.431483459472656e+02, 3.431488342285156e+02, 3.431492004394531e+02, 3.431494750976562e+02, 3.431496276855469e+02, 3.431497497558594e+02, 3.431498107910156e+02, 3.431498413085938e+02, 3.431498718261719e+02, 3.4314990234375e+02, 3.4314990234375e+02, 3.431499328613281e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499328613281e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499633789062e+02, 3.431499938964844e+02, 3.431499938964844e+02]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_FlowReversal.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_FlowReversal.txt
index 98d6c19a1d1..d2db734399d 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_FlowReversal.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_FlowReversal.txt
@@ -1,15 +1,14 @@
-last-generated=2017-10-25
+last-generated=2021-09-14
 statistics-simulation=
 {
-  "numerical Jacobians": "0", 
-  "nonlinear": "1", 
-  "number of continuous time states": "3", 
-  "linear": " "
+  "linear": " ",
+  "nonlinear": "1",
+  "number of continuous time states": "3",
+  "numerical Jacobians": "0"
 }
-m_flow.y=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
 time=[0e+00, 1.5e+02]
+m_flow.y=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
 senTemIn.T=[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, 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, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02]
 senTemOut.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.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 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.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02, 3.131499938964844e+02]
-pip.cor.del.v=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
-pip.cor.res.v_nominal=[2e+00, 2e+00]
-pip.cor.v_nominal=[2e+00, 2e+00]
+pip.v_nominal=[2e+00, 2e+00]
+pip.v=[2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, 2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00, -2e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_PlugFlowAIT.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_PlugFlowAIT.txt
index 1a64684f0b4..bf8bf15ed62 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_PlugFlowAIT.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_PlugFlowAIT.txt
@@ -1,17 +1,17 @@
-last-generated=2020-08-17
+last-generated=2021-09-14
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": " ",
-  "number of continuous time states": "23",
+  "number of continuous time states": "25",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6.039e+05]
-senTem_p1.T=[2.931499938964844e+02, 3.724580758666992e+02, 3.715300494384766e+02, 3.70135244140625e+02, 3.70413359375e+02, 3.71649883509888e+02, 3.713182318115234e+02, 3.721544326782226e+02, 3.724403112792968e+02, 3.735652206420899e+02, 3.710009063720703e+02, 3.733088674343402e+02, 3.734443334960937e+02, 3.741315823364258e+02, 3.767000982666016e+02, 3.745358459472656e+02, 3.752014770507812e+02, 3.74476018371582e+02, 3.7111109375e+02, 3.710266159057617e+02, 3.709189453125e+02, 3.723268130493164e+02, 3.748762841796875e+02, 3.74729211730957e+02, 3.744718273925781e+02, 3.72149658203125e+02, 3.728539208984375e+02, 3.739781048583984e+02, 3.751536450195312e+02, 3.760336535644531e+02, 3.754602111816406e+02, 3.758724261474609e+02, 3.724319006347656e+02, 3.71000260925293e+02, 3.715858935546875e+02, 3.737305572509766e+02, 3.735080139160156e+02, 3.74727802734375e+02, 3.754239300537109e+02, 3.718504852294922e+02, 3.716593994140625e+02, 3.720793008422851e+02, 3.750191088867188e+02, 3.74022819519043e+02, 3.734892822265625e+02, 3.733191757202148e+02, 3.708893743896484e+02, 3.70932353268394e+02, 3.712478739416986e+02, 3.69468860168457e+02, 3.728995361328125e+02, 3.740004821777344e+02, 3.715455822753906e+02, 3.72754621887207e+02, 3.727539532470703e+02, 3.731647018432617e+02, 3.727597119140626e+02, 3.741346530151367e+02, 3.740795428466797e+02, 3.739003707885742e+02, 3.735800109863281e+02, 3.710448751831055e+02, 3.709962524414062e+02, 3.717544769287109e+02, 3.719486682128907e+02, 3.72782633972168e+02, 3.718999468994141e+02, 3.709004925537109e+02, 3.723440979003906e+02, 3.71899997253418e+02, 3.730506317138672e+02, 3.739466275024414e+02, 3.761437731933594e+02, 3.740272640991211e+02, 3.737723510742188e+02, 3.713254852294922e+02, 3.722543762207031e+02, 3.723025030517578e+02, 3.715299261474609e+02, 3.726901400756836e+02, 3.709788269042969e+02, 3.724462457275391e+02, 3.703360705566407e+02, 3.701351873779297e+02, 3.700814086914062e+02, 3.733535659790039e+02, 3.755237335205078e+02, 3.748535293579101e+02, 3.756518200683594e+02, 3.719861749267578e+02, 3.689706726074219e+02, 3.690691442871094e+02, 3.716090551757812e+02, 3.717421096801758e+02, 3.731385626220703e+02, 3.718670776367188e+02, 3.703443579101562e+02, 3.704827197265625e+02, 3.679155700683594e+02, 3.701660848999023e+02, 3.73e+02]
+senTem_p1.T=[2.931499938964844e+02, 3.724585855102539e+02, 3.715303186035156e+02, 3.701367916870117e+02, 3.704127795410157e+02, 3.716497352033737e+02, 3.713192175292968e+02, 3.721564813232422e+02, 3.724396008300781e+02, 3.735656539916992e+02, 3.7100263671875e+02, 3.733088275181977e+02, 3.734445556640625e+02, 3.741313247680664e+02, 3.767001000976563e+02, 3.745361770629883e+02, 3.752005786132813e+02, 3.7447365234375e+02, 3.711109069824219e+02, 3.710267959594727e+02, 3.709193237304688e+02, 3.723272708129883e+02, 3.748762030029297e+02, 3.747291723632812e+02, 3.744703588867188e+02, 3.721490020751953e+02, 3.728535546875e+02, 3.739777191162109e+02, 3.751532690429687e+02, 3.760340368652344e+02, 3.754609497070313e+02, 3.758726147460937e+02, 3.724321142578125e+02, 3.71000295715332e+02, 3.715854650878906e+02, 3.73730583190918e+02, 3.735073913574219e+02, 3.74727580871582e+02, 3.754226477050781e+02, 3.718493310546875e+02, 3.716594909667969e+02, 3.720786209106445e+02, 3.750184246826172e+02, 3.74023857421875e+02, 3.734883166503906e+02, 3.733191940307617e+02, 3.708900915527344e+02, 3.70932530038568e+02, 3.712478559165578e+02, 3.694684045410156e+02, 3.728993682861328e+02, 3.740003857421875e+02, 3.715452807617187e+02, 3.727548519897461e+02, 3.72754111328125e+02, 3.731649124145508e+02, 3.727582946777345e+02, 3.741335394287109e+02, 3.740791760253906e+02, 3.739025201416015e+02, 3.735801452636719e+02, 3.710441714477539e+02, 3.709967993164062e+02, 3.7175443359375e+02, 3.719481481933594e+02, 3.727842803955078e+02, 3.718998870849609e+02, 3.709007287597656e+02, 3.72342607421875e+02, 3.718999984741211e+02, 3.730505249023437e+02, 3.739449426269532e+02, 3.761432409667969e+02, 3.7402689453125e+02, 3.737721667480469e+02, 3.713254928588867e+02, 3.7225525390625e+02, 3.723026300048828e+02, 3.715292047119141e+02, 3.726903787231445e+02, 3.709797546386719e+02, 3.724469525146484e+02, 3.703364465332032e+02, 3.701360723876953e+02, 3.700820495605469e+02, 3.733530242919922e+02, 3.755234197998047e+02, 3.748534991455078e+02, 3.756505615234375e+02, 3.719874948120117e+02, 3.689702697753906e+02, 3.690699032592773e+02, 3.716087280273438e+02, 3.717422067260742e+02, 3.731395123291015e+02, 3.718652084350586e+02, 3.70344560546875e+02, 3.704818167114258e+02, 3.679145849609375e+02, 3.701657388305664e+02, 3.73e+02]
 pip0.port_a.m_flow=[2.666699981689453e+01, 2.702643013000488e+01, 2.619314010620117e+01, 2.5065e+01, 2.58597201538086e+01, 2.732485150310383e+01, 2.815e+01, 2.6485e+01, 2.620644012451172e+01, 3.106512992858887e+01, 3.323359985351563e+01, 3.634826709526906e+01, 3.926e+01, 4.074358985900879e+01, 4.019998001098627e+01, 4.193354988098145e+01, 3.70731201171875e+01, 3.384199981689457e+01, 3.163025985717773e+01, 3.606800018310547e+01, 3.016660003662109e+01, 2.789497001647949e+01, 2.957300018310547e+01, 2.966699981689453e+01, 2.933968017578125e+01, 3.216674995422363e+01, 2.714300018310547e+01, 2.994338996887207e+01, 2.869308013916019e+01, 2.857699981689453e+01, 3.066699981689453e+01, 3.065865982055664e+01, 3.307347991943359e+01, 2.833162002563477e+01, 2.885638015747071e+01, 2.651694984436035e+01, 2.808652008056641e+01, 2.695491004943848e+01, 2.702333999633789e+01, 2.412e+01, 2.00333999633789e+01, 1.803663002014159e+01, 1.745693984985352e+01, 1.893199981689453e+01, 1.849308013916016e+01, 1.979970016479492e+01, 1.945322006225586e+01, 2.044979029788247e+01, 2.123971710678603e+01, 2.135199981689453e+01, 2e+01, 2.2685e+01, 2.323363983154297e+01, 2.805699981689453e+01, 3.482e+01, 3.226635017395019e+01, 3.481300018310534e+01, 4.221000000000046e+01, 4.464306015014648e+01, 3.7e+01, 3.796679992675782e+01, 3.048800018310547e+01, 2.945e+01, 2.789699981689453e+01, 2.472e+01, 2.519189987182617e+01, 2.66463801574707e+01, 2.319162002563477e+01, 2.258699981689463e+01, 2.31619998168945e+01, 2.306679992675781e+01, 2.166699981689453e+01, 2.420695983886719e+01, 2.732699981689453e+01, 2.752982009887695e+01, 2.89997501373291e+01, 2.982667999267578e+01, 2.983300018310547e+01, 2.861699981689453e+01, 3.2365e+01, 2.730019989013672e+01, 2.701000000000007e+01, 2.842673995971682e+01, 2.341030982971191e+01, 2.078e+01, 1.987509994506836e+01, 1.900304016113281e+01, 1.917982009887695e+01, 2.005300018310547e+01, 2.083300018310547e+01, 2.013330001831055e+01, 2.01582600402832e+01, 1.992656005859375e+01, 2.003e+01, 2.133300018310547e+01, 2.531684989929199e+01, 3.111355987548828e+01, 3.028170997619629e+01, 2.68498600769043e+01, 2.940856986999512e+01, 3.083300018310547e+01]
-senTem_p2.T=[2.931499938964844e+02, 3.300686254882813e+02, 3.645770697021484e+02, 3.65132134399414e+02, 3.64204443359375e+02, 3.638061944686871e+02, 3.650029095458984e+02, 3.63602776184082e+02, 3.650302758789063e+02, 3.651992611694336e+02, 3.647080963134766e+02, 3.642241570611142e+02, 3.649344897460937e+02, 3.6530974609375e+02, 3.653171862792969e+02, 3.68478872680664e+02, 3.674288134765625e+02, 3.666733407592774e+02, 3.674502453613281e+02, 3.644958746337891e+02, 3.655361450195313e+02, 3.649849743652344e+02, 3.647247583007813e+02, 3.655222512817383e+02, 3.557371704101562e+02, 3.64820198059082e+02, 3.642296954345703e+02, 3.637986813354492e+02, 3.635321276855469e+02, 3.678241903686524e+02, 3.677300537109375e+02, 3.669140524291992e+02, 3.673783068847656e+02, 3.649789016723633e+02, 3.646503240966797e+02, 3.64197282409668e+02, 3.640197766113281e+02, 3.633595495605469e+02, 3.657992718505859e+02, 3.649697756958008e+02, 3.646111083984375e+02, 3.647079312133789e+02, 3.641634020996094e+02, 3.680254913330078e+02, 3.658777685546875e+02, 3.668394485473633e+02, 3.65435126953125e+02, 3.65131518940986e+02, 3.639318197431772e+02, 3.638682373046875e+02, 3.620460205078125e+02, 3.634013711547852e+02, 3.636762841796875e+02, 3.645438235473633e+02, 3.638585852050781e+02, 3.643973403930664e+02, 3.651932360839845e+02, 3.654147836303711e+02, 3.655280114746094e+02, 3.670266311645508e+02, 3.662424133300781e+02, 3.655527182006836e+02, 3.650822601318359e+02, 3.64755669555664e+02, 3.643014562988281e+02, 3.645422042846679e+02, 3.657424548339844e+02, 3.641315551757813e+02, 3.6296666015625e+02, 3.636872308349609e+02, 3.641749389648438e+02, 3.646604180908203e+02, 3.657667993164063e+02, 3.673047119140625e+02, 3.650834899902344e+02, 3.667094345092773e+02, 3.643305676269531e+02, 3.646490036010742e+02, 3.644782061767578e+02, 3.635934182739258e+02, 3.654866149902344e+02, 3.643275415039063e+02, 3.646297497558595e+02, 3.623213803100586e+02, 3.634019567871094e+02, 3.627076736450196e+02, 3.634695751953125e+02, 3.673049798583984e+02, 3.659167834472656e+02, 3.64750666809082e+02, 3.657654632568359e+02, 3.613162713623047e+02, 3.617735339355469e+02, 3.649918130493164e+02, 3.649790802001953e+02, 3.657150985717773e+02, 3.642755212402344e+02, 3.624280844116211e+02, 3.621554528808594e+02, 3.610887387084961e+02, 3.604220886230469e+02]
+senTem_p2.T=[2.931499938964844e+02, 3.284175494384766e+02, 3.645658184814453e+02, 3.650888470458984e+02, 3.642016162109375e+02, 3.638101949030537e+02, 3.64993876953125e+02, 3.636208221435547e+02, 3.650482629394531e+02, 3.651977920532227e+02, 3.646908996582031e+02, 3.642692564440565e+02, 3.649185949707031e+02, 3.652851440429687e+02, 3.652912243652344e+02, 3.68477180480957e+02, 3.674300891113281e+02, 3.666750903320313e+02, 3.674182275390625e+02, 3.644982022094727e+02, 3.655475952148437e+02, 3.64983874206543e+02, 3.6476017578125e+02, 3.65494557800293e+02, 3.557579821777344e+02, 3.647961883544922e+02, 3.64246519165039e+02, 3.637889071655273e+02, 3.635394323730468e+02, 3.678006771850586e+02, 3.677354705810547e+02, 3.668833236694336e+02, 3.673866540527344e+02, 3.649769680786133e+02, 3.646545648193359e+02, 3.641888900756836e+02, 3.640250805664062e+02, 3.634222714233399e+02, 3.658173046875e+02, 3.649299716186524e+02, 3.646482238769531e+02, 3.646845837402344e+02, 3.641926525878906e+02, 3.679968478393555e+02, 3.658913635253906e+02, 3.668252212524414e+02, 3.654642657470703e+02, 3.651156895118424e+02, 3.639551361242185e+02, 3.638537042236328e+02, 3.6208154296875e+02, 3.633966540527344e+02, 3.636585070800782e+02, 3.645860443115234e+02, 3.638471606445312e+02, 3.643877487182617e+02, 3.651912304687501e+02, 3.65378359375e+02, 3.655023333740235e+02, 3.669687905883789e+02, 3.662572021484375e+02, 3.655828170776367e+02, 3.650748858642578e+02, 3.64735817565918e+02, 3.643103137207031e+02, 3.645163818359375e+02, 3.657310870361328e+02, 3.64100940246582e+02, 3.629691027832031e+02, 3.636883966064453e+02, 3.641810119628906e+02, 3.646588201904297e+02, 3.6578408203125e+02, 3.672650552368164e+02, 3.651151495361328e+02, 3.666904144287109e+02, 3.643227099609375e+02, 3.646543032836914e+02, 3.644799676513672e+02, 3.635896655273438e+02, 3.654656005859375e+02, 3.643114334106446e+02, 3.646413342285157e+02, 3.623417474365235e+02, 3.633923376464843e+02, 3.627242172241211e+02, 3.634146020507812e+02, 3.672916647338867e+02, 3.65905244140625e+02, 3.647133905029297e+02, 3.657771942138672e+02, 3.613541345214844e+02, 3.617705920410156e+02, 3.649863549804688e+02, 3.649789001464844e+02, 3.656969284057617e+02, 3.642952270507812e+02, 3.62461353149414e+02, 3.621729187011719e+02, 3.611147946166992e+02, 3.603028259277344e+02]
 pip2.port_a.m_flow=[1.679999977350235e-01, 9.177000068128109e-02, 9.448000088334084e-02, 1.549900056421757e-01, 1.092399999499321e-01, 9.229999552042481e-02, 1.07980001270771e-01, 8.33299968391656e-02, 1.281199997663498e-01, 1.245299975574017e-01, 7.699999958276749e-02, 7.900000363588333e-02, 1.204800027608871e-01, 8.776999905705452e-02, 8.24800023436545e-02, 1.251500051468611e-01, 8.595999866724015e-02, 8.990000091493243e-02, 9.781999826431274e-02, 8.549000188708306e-02, 1.64000004529953e-01, 1.550000011920929e-01, 9.457999899983406e-02, 8.449000079184771e-02, 8.936000138521194e-02, 6.724999938160181e-02, 1.238000030815601e-01, 8.299999684095383e-02, 8.351999878883375e-02, 1.135200006514788e-01, 8.209999725222587e-02, 1.509999930858612e-01, 8.799999952316284e-02, 8.071000285446644e-02, 1.440599988400913e-01, 8.284999765455722e-02, 7.555999889969825e-02, 3.122999988496303e-02, 1.556800051033497e-01, 8.267000038176775e-02, 8.500000238418579e-02, 7.900000363588333e-02, 8.500000089406967e-02, 1.225500025600195e-01, 8.128000259399414e-02, 1.410999942570925e-01, 9.081999748945237e-02, 1.139000046479551e-01, 8.843998563679761e-02, 8.799999952316284e-02, 7.950000092387199e-02, 3.038000037893653e-02, 8.604000061750412e-02, 8.370000019669532e-02, 8.798000201582909e-02, 9.345000311732292e-02, 1.266400063037897e-01, 9.000000357627869e-02, 8.900000154972076e-02, 1.509999930858612e-01, 1.163999974727631e-01, 8.838000029325485e-02, 1.517799971997738e-01, 1.118199966847897e-01, 9.032000094652176e-02, 9.200000017881393e-02, 1.030999964475632e-01, 8.699999749660492e-02, 8.828000009059912e-02, 9.001000352203853e-02, 1.120999984443188e-01, 9.212999910116196e-02, 1.408000016212463e-01, 1.023899997025728e-01, 8.75399985909462e-02, 1.560000032186508e-01, 8.699999749660492e-02, 8.934000223875045e-02, 8.976000025868416e-02, 8.918000124394894e-02, 9.29999977350235e-02, 1.232599979639006e-01, 9.033999845385571e-02, 8.713999778032303e-02, 1.415600004792213e-01, 9.029999934136868e-02, 9.481999889016152e-02, 1.456699999421835e-01, 7.992000192403793e-02, 8.924000345170498e-02, 1.525999970734119e-01, 8.943999789655209e-02, 9.600000083446503e-02, 9.399999678134918e-02, 8.829999819397927e-02, 1.249500006437302e-01, 8.832000017166138e-02, 8.887000128626824e-02, 1.348600018024445e-01, 1.110000014305115e-01, 9.49999988079071e-02]
-senTem_p3.T=[2.931499938964844e+02, 3.157634786987305e+02, 3.628965252685547e+02, 3.625633883666992e+02, 3.628286486816406e+02, 3.642745272130094e+02, 3.643301196289062e+02, 3.629447076416016e+02, 3.638229174804687e+02, 3.626618771362305e+02, 3.629814086914063e+02, 3.632757765911934e+02, 3.626578637695313e+02, 3.591114929199219e+02, 3.604709771728516e+02, 3.639850936889649e+02, 3.630109191894531e+02, 3.638230322265625e+02, 3.682821417236328e+02, 3.652825830078125e+02, 3.643952392578125e+02, 3.629880712890625e+02, 3.638501080322266e+02, 3.63363203125e+02, 3.62128837890625e+02, 3.645135726928711e+02, 3.626160736083984e+02, 3.580858926391601e+02, 3.600769836425781e+02, 3.623469027709961e+02, 3.635609527587891e+02, 3.619250982666015e+02, 3.661058410644531e+02, 3.647667196655273e+02, 3.631589080810547e+02, 3.629512802124024e+02, 3.633136071777344e+02, 3.625672442626953e+02, 3.635595227050781e+02, 3.659864605712891e+02, 3.637702941894531e+02, 3.594209902954101e+02, 3.618733941650391e+02, 3.643937594604492e+02, 3.652084387207031e+02, 3.653201461791992e+02, 3.649077410888672e+02, 3.665559064261521e+02, 3.646896966575765e+02, 3.627786032104492e+02, 3.618874664306641e+02, 3.636957278442383e+02, 3.628378723144531e+02, 3.642719757080078e+02, 3.642260900878906e+02, 3.640413223266602e+02, 3.612954846191406e+02, 3.617427404785155e+02, 3.625001739501953e+02, 3.621934338378906e+02, 3.628943054199219e+02, 3.661615289306641e+02, 3.641638256835938e+02, 3.635084103393555e+02, 3.634464379882813e+02, 3.634437591552734e+02, 3.638648327636719e+02, 3.630819104003906e+02, 3.627387036132812e+02, 3.633320169067383e+02, 3.575544921875e+02, 3.603622741699219e+02, 3.620709716796875e+02, 3.61795387878418e+02, 3.622081353759766e+02, 3.656011962890625e+02, 3.644664733886719e+02, 3.642823721313476e+02, 3.643674615478516e+02, 3.628761846923828e+02, 3.639668273925781e+02, 3.616871130371094e+02, 3.63630552368164e+02, 3.617994549560547e+02, 3.620085437011719e+02, 3.579165130615235e+02, 3.588904931640625e+02, 3.626588604736328e+02, 3.61692587890625e+02, 3.614776254272461e+02, 3.649449462890625e+02, 3.610839962768555e+02, 3.615491589355469e+02, 3.642711047363281e+02, 3.642966839599609e+02, 3.631521316528321e+02, 3.630220336914062e+02, 3.616242599487305e+02, 3.610826605224609e+02, 3.550760623168945e+02, 3.563612060546875e+02]
+senTem_p3.T=[2.931499938964844e+02, 3.14354252319336e+02, 3.628760656738281e+02, 3.625548663330078e+02, 3.628268676757813e+02, 3.642782180095423e+02, 3.643232745361328e+02, 3.629584414672851e+02, 3.638317565917969e+02, 3.626643588256836e+02, 3.629598602294922e+02, 3.633007036731607e+02, 3.626219018554688e+02, 3.591101232910156e+02, 3.604487762451172e+02, 3.639698760986328e+02, 3.630151025390625e+02, 3.638094876098633e+02, 3.682693426513672e+02, 3.652862545776367e+02, 3.644107055664062e+02, 3.629861703491211e+02, 3.638818212890625e+02, 3.633344088745117e+02, 3.621199987792968e+02, 3.644897308349609e+02, 3.626411950683594e+02, 3.580790060424804e+02, 3.600781689453125e+02, 3.62300852355957e+02, 3.635387298583984e+02, 3.619111340332031e+02, 3.661050500488281e+02, 3.647651516723633e+02, 3.631763507080078e+02, 3.629466583251953e+02, 3.633173950195313e+02, 3.626252075195313e+02, 3.635414447021485e+02, 3.659367269897461e+02, 3.637996520996094e+02, 3.593942160034179e+02, 3.618902465820312e+02, 3.643552056884766e+02, 3.652261669921875e+02, 3.653308197021485e+02, 3.649272698974609e+02, 3.665557360685324e+02, 3.647171038964506e+02, 3.62757251586914e+02, 3.61924072265625e+02, 3.636938879394531e+02, 3.628392785644531e+02, 3.643104067993164e+02, 3.642137933349609e+02, 3.640116134643555e+02, 3.612895141601563e+02, 3.617198181152343e+02, 3.624885290527343e+02, 3.621563912963867e+02, 3.628963500976562e+02, 3.661913079833984e+02, 3.641581317138672e+02, 3.635033309936524e+02, 3.63451103515625e+02, 3.634144638061524e+02, 3.638543780517578e+02, 3.630568991088867e+02, 3.627423425292969e+02, 3.633320245361328e+02, 3.57551400756836e+02, 3.603535494995117e+02, 3.621167956542969e+02, 3.617610232543946e+02, 3.622313018798828e+02, 3.656013336181641e+02, 3.644581115722656e+02, 3.642849319458008e+02, 3.643689642333985e+02, 3.628791650390625e+02, 3.639496765136719e+02, 3.616777740478516e+02, 3.636381823730468e+02, 3.618221911621094e+02, 3.620068518066406e+02, 3.579231719970703e+02, 3.588576916503906e+02, 3.626535516357422e+02, 3.616674597167969e+02, 3.614713958740234e+02, 3.649379608154297e+02, 3.611219604492188e+02, 3.615503503417969e+02, 3.64258625793457e+02, 3.642923352050781e+02, 3.631330169677734e+02, 3.630427368164063e+02, 3.616517587280273e+02, 3.610843249511719e+02, 3.550715692138672e+02, 3.562859802246094e+02]
 pip3.port_a.m_flow=[2.899999916553497e-02, 3.183999963104725e-02, 3.158000066876412e-02, 3.949999943375587e-02, 5.447999909520149e-02, 5.449999352181279e-02, 4.043999917805195e-02, 3.602999851107597e-02, 3.323999926447868e-02, 2.899999916553497e-02, 2.909999918192625e-02, 3.018999815645823e-02, 1.635999993886799e-02, 1.715000052005053e-02, 2.005999956279991e-02, 2.00499995611608e-02, 2.227999992668629e-02, 2.593000052496789e-02, 9.022000297904015e-02, 5.499999970197678e-02, 4.460000023245812e-02, 3.653999853879213e-02, 3.413999930024147e-02, 2.799000024795532e-02, 4.855999872088432e-02, 3.950000088661909e-02, 3.52200011909008e-02, 1.816999925300479e-02, 2.187999986112121e-02, 2.099999971687794e-02, 2.099999971687794e-02, 2.298000004142523e-02, 3.6440000385046e-02, 3.814000066369772e-02, 3.86400002241143e-02, 3.014999935403466e-02, 2.932000026106834e-02, 2.93500005826354e-02, 3.109999947249889e-02, 4.261999953538179e-02, 3.90000008046627e-02, 1.9769999515265e-02, 2.664000064134598e-02, 3.253000061959029e-02, 3.5759998857975e-02, 3.890000078827142e-02, 5.352000072598458e-02, 5.89599985113556e-02, 5.683999345929337e-02, 3.299999982118607e-02, 3.949999995529652e-02, 3.400000184774399e-02, 3.339999973773956e-02, 4.078000109642744e-02, 4.895999997854233e-02, 3.000000026077032e-03, 2.400000020861626e-02, 2.687999980524156e-02, 2.482000034302473e-02, 2.877999933436513e-02, 2.760000079870224e-02, 5.437999960035086e-02, 4.492000177502632e-02, 4.537999913096428e-02, 3.500000014901161e-02, 3.599999845027924e-02, 3.799999877810478e-02, 3.700000047683716e-02, 4.055999919772161e-02, 4.198999945074313e-02, 1.859999932348728e-02, 2.04099996201694e-02, 2.1239999756217e-02, 2.133999977260828e-02, 2.400000020861626e-02, 4.849999863654375e-02, 4.415999978780746e-02, 4.30000014603138e-02, 4.224000133574009e-02, 3.700000047683716e-02, 3.299999982118607e-02, 3.299999982118607e-02, 4.052000023424522e-02, 3.799999877810478e-02, 3.97200009226799e-02, 2.0299999602139e-02, 2.294000003486872e-02, 2.277000000700355e-02, 2.243999995291233e-02, 2.400000020861626e-02, 4.869999885559082e-02, 4.30000014603138e-02, 4.460000112652779e-02, 3.799999877810478e-02, 3.75200005620718e-02, 3.290000166743993e-02, 3.464000135660172e-02, 3.612999871373176e-02, 3.90000008046627e-02, 1.999999955296516e-02, 2.400000020861626e-02]
-senTem_p4.T=[2.931499938964844e+02, 3.115555770874024e+02, 3.582850744628906e+02, 3.571484973144532e+02, 3.621510656738281e+02, 3.651830333795551e+02, 3.629164886474609e+02, 3.62394797668457e+02, 3.609189099121094e+02, 3.599904611206055e+02, 3.610176208496094e+02, 3.617749925336008e+02, 3.206450537109375e+02, 3.040003399658203e+02, 2.974303479003906e+02, 2.948431762695312e+02, 2.938186474609375e+02, 2.934136386108398e+02, 3.656162127685547e+02, 3.654140087890625e+02, 3.650336608886719e+02, 3.600245324707032e+02, 3.347104772949219e+02, 3.095600714111328e+02, 2.99619501953125e+02, 2.957087478637695e+02, 2.941610321044922e+02, 2.935488659667969e+02, 2.933074755859375e+02, 2.932122756958008e+02, 2.931745788574219e+02, 2.931596859741211e+02, 2.931538403320312e+02, 3.640935836791992e+02, 3.621106860351562e+02, 3.598755966186524e+02, 3.448850061035157e+02, 3.135705331420899e+02, 3.012011492919922e+02, 2.963355773925781e+02, 2.9440830078125e+02, 3.607703762817383e+02, 3.597486883544922e+02, 3.609109765625e+02, 3.62408955078125e+02, 3.619296005249024e+02, 3.647882720947266e+02, 3.664113361600079e+02, 3.489816542928543e+02, 3.638494946289063e+02, 3.623943481445312e+02, 3.650105075073242e+02, 3.584000378417969e+02, 3.596609124755859e+02, 3.483852862548828e+02, 3.161169662475586e+02, 3.57637919921875e+02, 3.584805068969726e+02, 3.587292150878906e+02, 3.584127392578125e+02, 3.611206298828125e+02, 3.665762921142578e+02, 3.658846936035156e+02, 3.662964984130859e+02, 3.630189135742187e+02, 3.622085983276367e+02, 3.599591223144531e+02, 3.619785140991211e+02, 3.631164404296875e+02, 3.274042776489261e+02, 3.067042388916016e+02, 2.985042126464843e+02, 2.952617016601562e+02, 2.939842895507812e+02, 2.93479808959961e+02, 3.365494079589844e+02, 3.656647082519531e+02, 3.653867681884765e+02, 3.648684759521485e+02, 3.641836056518555e+02, 3.644639831542969e+02, 3.630453540039063e+02, 3.610239471435546e+02, 3.590809677124024e+02, 3.230056726074219e+02, 3.049396560668945e+02, 2.97798402709961e+02, 2.949879843139648e+02, 2.938763159179687e+02, 2.934365676879883e+02, 3.637468200683594e+02, 3.610180511474609e+02, 3.645882055664063e+02, 3.651298205566407e+02, 3.627669354248047e+02, 3.638402694702148e+02, 3.633942578125e+02, 3.604191751098633e+02, 3.341732257080078e+02, 3.093441790771485e+02, 2.995330505371094e+02]
-pip4.port_a.m_flow=[1.30000002682209e-02, 1.27100002206862e-02, 1.200000010430813e-02, 1.112999996170402e-02, 3.260000005364418e-02, 3.06000404236197e-02, 1.099999994039536e-02, 2.500000037252903e-02, 1.499999966472387e-02, 1.400000043213367e-02, 1.340000033378601e-02, 2.089976832638146e-03, 4.800000227987766e-04, 0e+00, 0e+00, 6.500000308733433e-04, 3.600000170990825e-04, 1.000000047497451e-03, 2.400000020861626e-02, 3.700000047683716e-02, 3.159999996423721e-02, 1.30000002682209e-02, 6.200000294484198e-04, 0e+00, 0e+00, 7.500000356230885e-04, 0e+00, 0e+00, 0e+00, 0e+00, 3.000000142492354e-04, 9.900000470224768e-04, 7.20000034198165e-04, 2.343000011518597e-02, 2.057999964803447e-02, 1.155000003054738e-02, 4.400000208988786e-04, 7.300000346731394e-04, 1.000000047497451e-03, 0e+00, 0e+00, 1.21100001223385e-02, 1.400000043213367e-02, 1.353000035509467e-02, 1.499999966472387e-02, 1.400000043213367e-02, 3.299999982118607e-02, 2.959999938295046e-02, 5.200162105353977e-03, 2.54200004413724e-02, 3.749999962747097e-02, 3.179000109434128e-02, 1.099999994039536e-02, 1.425999988801777e-02, 0e+00, 1.650000066729263e-03, 1.22800001502039e-02, 1.30000002682209e-02, 1.035999983549118e-02, 1.200000010430813e-02, 1.999999955296516e-02, 6.100000068545341e-02, 4.707999840378761e-02, 5.099999904632568e-02, 2.703999906778336e-02, 1.760000018402934e-02, 1.314000029116869e-02, 1.600999996066093e-02, 2.651999954134122e-02, 1.000000047497451e-03, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 2.149999979883432e-02, 3.440000176429749e-02, 4.171000000089407e-02, 3.276000164449215e-02, 2.999999932944775e-02, 1.520000025629997e-02, 2.134999981149934e-02, 2.835999947041351e-02, 1.764999929815531e-02, 0e+00, 6.500000308733433e-04, 6.000000284984708e-05, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 2.400000020861626e-02, 3.609999919310212e-02, 5.299999937415123e-02, 3.599999845027924e-02, 2.31000005453825e-02, 1.674999985843897e-02, 1.200000010430813e-02, 1.30000002682209e-02, 1.000000047497451e-03, 0e+00, -0e+00]
+senTem_p4.T=[2.931499938964844e+02, 3.110918795776367e+02, 3.582751763916016e+02, 3.571462466430664e+02, 3.621592321777344e+02, 3.651803523006476e+02, 3.629117517089844e+02, 3.623957421875e+02, 3.609305529785156e+02, 3.599920440673828e+02, 3.610110260009766e+02, 3.617933356978912e+02, 3.206524792480469e+02, 3.040032769775391e+02, 2.974315203857422e+02, 2.948436553955078e+02, 2.938188500976563e+02, 2.934137280273437e+02, 3.656037915039062e+02, 3.654157705688477e+02, 3.650347290039062e+02, 3.600256872558594e+02, 3.347049047851563e+02, 3.095577410888672e+02, 2.996185607910156e+02, 2.957083740234375e+02, 2.941608935546875e+02, 2.935488049316406e+02, 2.933074450683594e+02, 2.932122576904297e+02, 2.931745788574219e+02, 2.931596859741211e+02, 2.931538403320312e+02, 3.640921685791016e+02, 3.621126831054688e+02, 3.598727905273437e+02, 3.448875036621094e+02, 3.135715295410157e+02, 3.012015167236328e+02, 2.963357299804687e+02, 2.944083618164062e+02, 3.60756810913086e+02, 3.597592590332031e+02, 3.608930215454101e+02, 3.624132055664062e+02, 3.619293960571289e+02, 3.647833123779297e+02, 3.664104717785799e+02, 3.489670631098479e+02, 3.638522061157227e+02, 3.623981170654297e+02, 3.65002077331543e+02, 3.584013171386719e+02, 3.596792910766601e+02, 3.484015777587891e+02, 3.161236938476562e+02, 3.57635185546875e+02, 3.584702081298827e+02, 3.587241717529297e+02, 3.583988479614258e+02, 3.611201416015625e+02, 3.665826412963867e+02, 3.658789587402344e+02, 3.662843450927734e+02, 3.630235314941406e+02, 3.622028671264649e+02, 3.599559753417969e+02, 3.619637503051758e+02, 3.631130346679687e+02, 3.274013415527347e+02, 3.06702993774414e+02, 2.985037008666992e+02, 2.952614916992188e+02, 2.939842233276367e+02, 2.934797784423828e+02, 3.365493087768555e+02, 3.65659013671875e+02, 3.65380771484375e+02, 3.648756536865234e+02, 3.641748962402344e+02, 3.644540954589844e+02, 3.630367297363281e+02, 3.610333105468749e+02, 3.590864859008789e+02, 3.230025e+02, 3.049383575439453e+02, 2.977978875732422e+02, 2.949877871704102e+02, 2.938762548828125e+02, 2.934365371704101e+02, 3.637538421630859e+02, 3.610206872558594e+02, 3.645739880371094e+02, 3.651501849365234e+02, 3.627728680419922e+02, 3.638367279052734e+02, 3.633978125e+02, 3.604366250610352e+02, 3.34169135131836e+02, 3.093425231933594e+02, 2.995324096679688e+02]
+pip4.port_a.m_flow=[1.30000002682209e-02, 1.27100002206862e-02, 1.200000010430813e-02, 1.112999996170402e-02, 3.260000005364418e-02, 3.06000404236197e-02, 1.099999994039536e-02, 2.500000037252903e-02, 1.499999966472387e-02, 1.400000043213367e-02, 1.340000033378601e-02, 2.089976832638146e-03, 4.800000227987766e-04, 0e+00, 0e+00, 6.500000308733433e-04, 3.600000170990825e-04, 1.000000047497451e-03, 2.400000020861626e-02, 3.700000047683716e-02, 3.159999996423721e-02, 1.30000002682209e-02, 6.200000294484198e-04, 0e+00, 0e+00, 7.500000356230885e-04, 0e+00, 0e+00, 0e+00, 0e+00, 3.000000142492354e-04, 9.900000470224768e-04, 7.20000034198165e-04, 2.343000011518597e-02, 2.057999964803447e-02, 1.155000003054738e-02, 4.400000208988786e-04, 7.300000346731394e-04, 1.000000047497451e-03, 0e+00, 0e+00, 1.21100001223385e-02, 1.400000043213367e-02, 1.353000035509467e-02, 1.499999966472387e-02, 1.400000043213367e-02, 3.299999982118607e-02, 2.959999938295046e-02, 5.200162105353977e-03, 2.54200004413724e-02, 3.749999962747097e-02, 3.179000109434128e-02, 1.099999994039536e-02, 1.425999988801777e-02, 0e+00, 1.650000066729263e-03, 1.22800001502039e-02, 1.30000002682209e-02, 1.035999983549118e-02, 1.200000010430813e-02, 1.999999955296516e-02, 6.100000068545341e-02, 4.707999840378761e-02, 5.099999904632568e-02, 2.703999906778336e-02, 1.760000018402934e-02, 1.314000029116869e-02, 1.600999996066093e-02, 2.651999954134122e-02, 1.000000047497451e-03, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 2.149999979883432e-02, 3.440000176429749e-02, 4.171000000089407e-02, 3.276000164449215e-02, 2.999999932944775e-02, 1.520000025629997e-02, 2.134999981149934e-02, 2.835999947041351e-02, 1.764999929815531e-02, 0e+00, 6.500000308733433e-04, 6.000000284984708e-05, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 2.400000020861626e-02, 3.609999919310212e-02, 5.299999937415123e-02, 3.599999845027924e-02, 2.31000005453825e-02, 1.674999985843897e-02, 1.200000010430813e-02, 1.30000002682209e-02, 1.000000047497451e-03, 0e+00, 0e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_TransportWaterAir.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_TransportWaterAir.txt
index c258b0085d2..33d1c700810 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_TransportWaterAir.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_FixedResistances_Validation_PlugFlowPipes_TransportWaterAir.txt
@@ -1,20 +1,20 @@
-last-generated=2017-10-25
+last-generated=2021-09-14
 statistics-simulation=
 {
-  "numerical Jacobians": "0", 
-  "nonlinear": "1, 1", 
-  "number of continuous time states": "8", 
-  "linear": "0"
+  "linear": "0",
+  "nonlinear": "1, 1",
+  "number of continuous time states": "8",
+  "numerical Jacobians": "0"
 }
-senTemOutW.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.931499938964844e+02, 2.931499938964844e+02, 3.002175903320312e+02, 3.025613098144531e+02, 3.030317993164062e+02, 3.031262512207031e+02, 3.031452331542969e+02, 3.031490173339844e+02, 3.031498107910156e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031500244140625e+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, 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]
-Tin.y=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 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.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, 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]
-senTemOutA.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.931499938964844e+02, 2.931499938964844e+02, 2.999855041503906e+02, 3.024477844238281e+02, 3.02994140625e+02, 3.031154174804688e+02, 3.031423034667969e+02, 3.031482849121094e+02, 3.031495971679688e+02, 3.0314990234375e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031499938964844e+02, 3.031500244140625e+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, 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]
 time=[0e+00, 1e+03]
-duc.ports_b[1].Xi_outflow[1]=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.999982818961143e-02, 2.000000141561031e-02, 1.999999582767487e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02]
+Tin.y=[2.931499938964844e+02, 2.931499938964844e+02, 2.931499938964844e+02, 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.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, 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]
+senTemOutW.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.931499938964844e+02, 2.931499938964844e+02, 3.002175903320312e+02, 3.025613098144531e+02, 3.030317993164062e+02, 3.031262512207031e+02, 3.031452026367188e+02, 3.031489868164062e+02, 3.031497802734375e+02, 3.031499633789062e+02, 3.031499938964844e+02, 3.031500244140625e+02, 3.031500549316406e+02, 3.031500549316406e+02, 3.031500244140625e+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, 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]
+senTemOutA.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.931499938964844e+02, 2.931499938964844e+02, 2.999855041503906e+02, 3.024477844238281e+02, 3.029941711425781e+02, 3.031153869628906e+02, 3.031423034667969e+02, 3.031482238769531e+02, 3.031495971679688e+02, 3.0314990234375e+02, 3.031499938964844e+02, 3.031500244140625e+02, 3.031500549316406e+02, 3.031500549316406e+02, 3.031500244140625e+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, 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]
+duc.port_b.Xi_outflow[1]=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.999984867870808e-02, 2.000007778406143e-02, 2.0000034943223e-02, 2.000000514090061e-02, 2.000002004206181e-02, 1.999999210238457e-02, 1.999999769032001e-02, 1.999999955296516e-02, 2.000000327825546e-02, 2.000003308057785e-02, 2.00000386685133e-02, 2.000000886619091e-02, 1.999999769032001e-02, 2.000000141561031e-02, 2.000000141561031e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02]
 XiIn[1].y=[9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 9.999999776482582e-03, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02, 1.999999955296516e-02]
-duc.ports_b[1].C_outflow[1]=[0e+00, 0e+00, 9.998738532885909e-04, 9.999989997595549e-04, 9.999998146668077e-04, 9.999999310821295e-04, 9.999999310821295e-04, 1.000000047497451e-03, 1.000000047497451e-03, 9.999999310821295e-04, 9.999999310821295e-04, 1.000000047497451e-03, 1.099982764571905e-02, 1.10000018030405e-02, 1.099999621510506e-02, 1.100000087171793e-02, 1.099999900907278e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02]
+duc.port_b.C_outflow[1]=[0e+00, 0e+00, 1.000318792648613e-03, 9.999684989452362e-04, 9.999483590945601e-04, 9.999905014410615e-04, 9.999981848523021e-04, 9.999984176829457e-04, 9.999986505135894e-04, 9.99998883344233e-04, 9.999992325901985e-04, 1.000000047497451e-03, 1.099984813481569e-02, 1.100007817149162e-02, 1.100003533065319e-02, 1.100000459700823e-02, 1.100002136081457e-02, 1.099999155849218e-02, 1.099999714642763e-02, 1.099999994039536e-02, 1.100000273436308e-02, 1.100003346800804e-02, 1.100003812462091e-02, 1.100000832229853e-02, 1.099999807775021e-02, 1.100000087171793e-02, 1.100000087171793e-02, 1.099999994039536e-02, 1.099999900907278e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02]
 CIn[1].y=[1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02, 1.099999994039536e-02]
-duc.cor.res.v=[1.5e+00, 1.5e+00]
 pip.v_nominal=[1.5e+00, 1.5e+00]
-pip.cor.res.v=[1.5e+00, 1.5e+00]
-duc.cor.res.v_nominal=[1.5e+00, 1.5e+00]
+pip.v=[1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00]
+duc.v_nominal=[1.5e+00, 1.5e+00]
+duc.v=[1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00, 1.5e+00]
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Geothermal_BuriedPipes_Validation_GroundCouplingAIT.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Geothermal_BuriedPipes_Validation_GroundCouplingAIT.txt
index 421a4406419..ca509f92825 100644
--- a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Geothermal_BuriedPipes_Validation_GroundCouplingAIT.txt
+++ b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Fluid_Geothermal_BuriedPipes_Validation_GroundCouplingAIT.txt
@@ -1,17 +1,17 @@
-last-generated=2021-07-13
+last-generated=2021-09-14
 statistics-simulation=
 {
   "linear": " ",
   "nonlinear": "2, 2, 4, 2, 2",
-  "number of continuous time states": "23",
+  "number of continuous time states": "25",
   "numerical Jacobians": "0"
 }
 time=[0e+00, 6.039e+05]
-senTem_p1.T=[2.931499938964844e+02, 3.724576831054687e+02, 3.715304113769531e+02, 3.701370837402344e+02, 3.704129321289063e+02, 3.71649708238553e+02, 3.713180883789062e+02, 3.721558172607422e+02, 3.724392358398438e+02, 3.735650448608399e+02, 3.710009063720703e+02, 3.733089472666251e+02, 3.734435314941406e+02, 3.741316275024414e+02, 3.767000817871094e+02, 3.745355087280274e+02, 3.752001098632812e+02, 3.744768267822266e+02, 3.711113635253906e+02, 3.710271615600586e+02, 3.709187744140625e+02, 3.723265325927734e+02, 3.748760931396484e+02, 3.74729885559082e+02, 3.744712780761719e+02, 3.721494140625e+02, 3.72854116821289e+02, 3.739781008911133e+02, 3.751549255371093e+02, 3.760343469238281e+02, 3.754608856201172e+02, 3.758730041503906e+02, 3.72432607421875e+02, 3.710003131103516e+02, 3.715848315429687e+02, 3.737302947998047e+02, 3.735085180664062e+02, 3.747271270751953e+02, 3.754230670166016e+02, 3.718503387451172e+02, 3.716594604492187e+02, 3.720788192749023e+02, 3.750182196044922e+02, 3.740233505249024e+02, 3.73488271484375e+02, 3.733193588256836e+02, 3.708881597900391e+02, 3.709325521348398e+02, 3.712478959724261e+02, 3.694695156860352e+02, 3.72900146484375e+02, 3.740002169799805e+02, 3.715455322265625e+02, 3.727539312744141e+02, 3.727540124511719e+02, 3.731637939453125e+02, 3.727586035156251e+02, 3.74134758605957e+02, 3.740797235107422e+02, 3.739008471679688e+02, 3.735809326171875e+02, 3.71044577331543e+02, 3.709983026123047e+02, 3.717543362426758e+02, 3.719484399414063e+02, 3.727839675903321e+02, 3.718998059082031e+02, 3.709005712890625e+02, 3.723434899902344e+02, 3.718999984741211e+02, 3.730496704101562e+02, 3.7394404296875e+02, 3.76143818359375e+02, 3.74027600402832e+02, 3.73771640625e+02, 3.713260192871094e+02, 3.722556909179688e+02, 3.72302294921875e+02, 3.715293762207031e+02, 3.726909957885742e+02, 3.709795166015625e+02, 3.724478799438476e+02, 3.703362048339844e+02, 3.70135319519043e+02, 3.700802404785156e+02, 3.733530654907227e+02, 3.755232757568359e+02, 3.748535372924805e+02, 3.756512451171875e+02, 3.719865487670899e+02, 3.689706604003906e+02, 3.690682360839844e+02, 3.716090588378906e+02, 3.717424053955078e+02, 3.731385632324219e+02, 3.718660202026367e+02, 3.7034416015625e+02, 3.704816949462891e+02, 3.679154522705078e+02, 3.701631845092774e+02, 3.73e+02]
+senTem_p1.T=[2.931499938964844e+02, 3.724582275390625e+02, 3.715297570800781e+02, 3.701355139160156e+02, 3.704127502441406e+02, 3.716499644043502e+02, 3.713187738037109e+02, 3.721543536376953e+02, 3.72439326171875e+02, 3.735659399414063e+02, 3.71000357055664e+02, 3.733090004881484e+02, 3.734434020996094e+02, 3.741335314941406e+02, 3.767001440429688e+02, 3.745360473632812e+02, 3.752002856445313e+02, 3.744757556152344e+02, 3.711108184814453e+02, 3.710275119018555e+02, 3.709190551757812e+02, 3.723280624389648e+02, 3.74876234741211e+02, 3.74730043334961e+02, 3.744698864746094e+02, 3.721493148803711e+02, 3.728537915039062e+02, 3.739782214355469e+02, 3.751534924316405e+02, 3.760344143676758e+02, 3.754610626220703e+02, 3.758725311279297e+02, 3.724318273925781e+02, 3.710010958862305e+02, 3.715857989501953e+02, 3.737307342529297e+02, 3.735079553222656e+02, 3.747277731323242e+02, 3.754230041503906e+02, 3.718493954467774e+02, 3.716599792480469e+02, 3.720788848876953e+02, 3.750185034179688e+02, 3.740248168945312e+02, 3.734895947265625e+02, 3.733185470581055e+02, 3.708888397216797e+02, 3.709323974609375e+02, 3.712478438997973e+02, 3.694707275390625e+02, 3.728994140625e+02, 3.740007955932617e+02, 3.715445629882813e+02, 3.727545111083984e+02, 3.727545812988281e+02, 3.731643218994141e+02, 3.72758602294922e+02, 3.741343041992187e+02, 3.740777960205078e+02, 3.739006558227539e+02, 3.735807373046875e+02, 3.710448199462891e+02, 3.709966937255859e+02, 3.717542095947265e+02, 3.719484191894531e+02, 3.727842330932617e+02, 3.718999768066406e+02, 3.709000463867188e+02, 3.723437231445312e+02, 3.719000021362305e+02, 3.730499664306641e+02, 3.739446731567383e+02, 3.761430798339844e+02, 3.740278240966797e+02, 3.737721423339844e+02, 3.713256607055664e+02, 3.722543139648437e+02, 3.723026834106445e+02, 3.715303051757812e+02, 3.726901214599609e+02, 3.709790466308594e+02, 3.724474194335937e+02, 3.703363861083985e+02, 3.70135239868164e+02, 3.700809887695312e+02, 3.733543334960938e+02, 3.755237322998047e+02, 3.748539636230469e+02, 3.756520739746094e+02, 3.719863146972656e+02, 3.689701995849609e+02, 3.690689660644532e+02, 3.716092883300781e+02, 3.717437469482422e+02, 3.731375793457031e+02, 3.71866438293457e+02, 3.703448791503906e+02, 3.704819625854492e+02, 3.679153143310547e+02, 3.701646694946289e+02, 3.73e+02]
 pip0.port_a.m_flow=[2.666699981689453e+01, 2.702643013000488e+01, 2.619314010620117e+01, 2.5065e+01, 2.58597201538086e+01, 2.732485150310383e+01, 2.815e+01, 2.6485e+01, 2.620644012451172e+01, 3.106512992858887e+01, 3.323359985351563e+01, 3.634826709526906e+01, 3.926e+01, 4.074358985900879e+01, 4.019998001098627e+01, 4.193354988098145e+01, 3.70731201171875e+01, 3.384199981689457e+01, 3.163025985717773e+01, 3.606800018310547e+01, 3.016660003662109e+01, 2.789497001647949e+01, 2.957300018310547e+01, 2.966699981689453e+01, 2.933968017578125e+01, 3.216674995422363e+01, 2.714300018310547e+01, 2.994338996887207e+01, 2.869308013916019e+01, 2.857699981689453e+01, 3.066699981689453e+01, 3.065865982055664e+01, 3.307347991943359e+01, 2.833162002563477e+01, 2.885638015747071e+01, 2.651694984436035e+01, 2.808652008056641e+01, 2.695491004943848e+01, 2.702333999633789e+01, 2.412e+01, 2.00333999633789e+01, 1.803663002014159e+01, 1.745693984985352e+01, 1.893199981689453e+01, 1.849308013916016e+01, 1.979970016479492e+01, 1.945322006225586e+01, 2.044979029788247e+01, 2.123971710678603e+01, 2.135199981689453e+01, 2e+01, 2.2685e+01, 2.323363983154297e+01, 2.805699981689453e+01, 3.482e+01, 3.226635017395019e+01, 3.481300018310534e+01, 4.221000000000046e+01, 4.464306015014648e+01, 3.7e+01, 3.796679992675782e+01, 3.048800018310547e+01, 2.945e+01, 2.789699981689453e+01, 2.472e+01, 2.519189987182617e+01, 2.66463801574707e+01, 2.319162002563477e+01, 2.258699981689463e+01, 2.31619998168945e+01, 2.306679992675781e+01, 2.166699981689453e+01, 2.420695983886719e+01, 2.732699981689453e+01, 2.752982009887695e+01, 2.89997501373291e+01, 2.982667999267578e+01, 2.983300018310547e+01, 2.861699981689453e+01, 3.2365e+01, 2.730019989013672e+01, 2.701000000000007e+01, 2.842673995971682e+01, 2.341030982971191e+01, 2.078e+01, 1.987509994506836e+01, 1.900304016113281e+01, 1.917982009887695e+01, 2.005300018310547e+01, 2.083300018310547e+01, 2.013330001831055e+01, 2.01582600402832e+01, 1.992656005859375e+01, 2.003e+01, 2.133300018310547e+01, 2.531684989929199e+01, 3.111355987548828e+01, 3.028170997619629e+01, 2.68498600769043e+01, 2.940856986999512e+01, 3.083300018310547e+01]
-senTem_p2.T=[2.931499938964844e+02, 3.299635214233398e+02, 3.645163244628906e+02, 3.651136907958984e+02, 3.64194892578125e+02, 3.637658760993405e+02, 3.649641082763672e+02, 3.635447763061524e+02, 3.650140759277344e+02, 3.651714205932617e+02, 3.647101440429688e+02, 3.642166056009715e+02, 3.649208715820312e+02, 3.652767001342773e+02, 3.651318090820313e+02, 3.68182504272461e+02, 3.671611071777344e+02, 3.665031173706055e+02, 3.674636889648438e+02, 3.645445181274414e+02, 3.656538452148437e+02, 3.651840435791016e+02, 3.649560284423828e+02, 3.658313009643555e+02, 3.569919702148438e+02, 3.651902008056641e+02, 3.645620684814453e+02, 3.640977374267578e+02, 3.63638056640625e+02, 3.678604956054688e+02, 3.67777978515625e+02, 3.669209835815429e+02, 3.673726892089844e+02, 3.649098416137695e+02, 3.646223181152343e+02, 3.641486190795898e+02, 3.639457604980469e+02, 3.632976089477539e+02, 3.658496716308593e+02, 3.651374151611328e+02, 3.648781188964844e+02, 3.64886057434082e+02, 3.642903088378906e+02, 3.679411312866211e+02, 3.656749499511719e+02, 3.667015869140625e+02, 3.6538388671875e+02, 3.651612878727008e+02, 3.639899932068175e+02, 3.639438687133789e+02, 3.621380615234375e+02, 3.635194351196289e+02, 3.638021362304688e+02, 3.646134280395508e+02, 3.63931812133789e+02, 3.645372711181641e+02, 3.652810351562501e+02, 3.652769107055664e+02, 3.652407421875e+02, 3.669214920043945e+02, 3.66194677734375e+02, 3.655835568237305e+02, 3.651934216308593e+02, 3.649300408935547e+02, 3.6455650390625e+02, 3.64833610534668e+02, 3.660643310546875e+02, 3.645417346191406e+02, 3.63426865234375e+02, 3.641903558349609e+02, 3.645780242919922e+02, 3.648644607543945e+02, 3.657336926269531e+02, 3.672495846557617e+02, 3.650654388427735e+02, 3.668395538330078e+02, 3.644762609863281e+02, 3.648646459960938e+02, 3.647466717529297e+02, 3.63873639831543e+02, 3.657568298339844e+02, 3.64603360900879e+02, 3.648735614013672e+02, 3.625534982299804e+02, 3.635868664550781e+02, 3.628695205688476e+02, 3.636070471191406e+02, 3.674317468261719e+02, 3.660332360839844e+02, 3.649483709716797e+02, 3.659560943603516e+02, 3.614783331298828e+02, 3.6193576171875e+02, 3.651023681640625e+02, 3.651180554199219e+02, 3.65899560546875e+02, 3.644705993652344e+02, 3.626281799316406e+02, 3.623231958007813e+02, 3.612289108276367e+02, 3.606145629882812e+02]
+senTem_p2.T=[2.931499938964844e+02, 3.283123852539063e+02, 3.645067742919922e+02, 3.650702038574219e+02, 3.641917724609375e+02, 3.637700198302258e+02, 3.64955336303711e+02, 3.635622442626953e+02, 3.650309497070313e+02, 3.651687350463867e+02, 3.646914306640625e+02, 3.642625523994221e+02, 3.649061145019531e+02, 3.652525283813476e+02, 3.651080004882813e+02, 3.681832229614258e+02, 3.671601452636719e+02, 3.665072341918946e+02, 3.674296313476563e+02, 3.645474255371093e+02, 3.656647338867188e+02, 3.651808602905273e+02, 3.6498984375e+02, 3.658034957885742e+02, 3.570182177734375e+02, 3.651683654785156e+02, 3.645785925292969e+02, 3.640869146728515e+02, 3.636471936035156e+02, 3.678366955566406e+02, 3.677830993652344e+02, 3.668913464355469e+02, 3.673799926757812e+02, 3.649100042724609e+02, 3.646257946777343e+02, 3.641420989990235e+02, 3.639506787109375e+02, 3.633522735595703e+02, 3.658630035400391e+02, 3.650954483032227e+02, 3.649119934082031e+02, 3.648654818725586e+02, 3.643217211914063e+02, 3.679116662597656e+02, 3.656890393066406e+02, 3.666881729125977e+02, 3.654135827636719e+02, 3.651460371959059e+02, 3.640134195413249e+02, 3.639293096923828e+02, 3.621746368408203e+02, 3.635143402099609e+02, 3.637864123535156e+02, 3.646555145263672e+02, 3.639210491943359e+02, 3.645270935058594e+02, 3.652792895507813e+02, 3.652406228637695e+02, 3.652167504882813e+02, 3.66861994934082e+02, 3.662080017089844e+02, 3.656141284179687e+02, 3.651848803710938e+02, 3.64909663696289e+02, 3.645660949707031e+02, 3.648081039428711e+02, 3.660512255859375e+02, 3.645106597900391e+02, 3.634308203125e+02, 3.641905239868164e+02, 3.645828643798828e+02, 3.64864762878418e+02, 3.657516638183594e+02, 3.672066897583008e+02, 3.650974108886719e+02, 3.668195266723633e+02, 3.644671826171875e+02, 3.648700607299805e+02, 3.647486309814453e+02, 3.638720440673828e+02, 3.657360961914063e+02, 3.645859103393555e+02, 3.648847491455078e+02, 3.625740936279297e+02, 3.635787524414063e+02, 3.628848281860352e+02, 3.635538366699218e+02, 3.674189080810547e+02, 3.660196484375e+02, 3.64912421875e+02, 3.659688720703125e+02, 3.615160061645508e+02, 3.619334509277344e+02, 3.650979287719726e+02, 3.65117788696289e+02, 3.658795883178711e+02, 3.644893957519531e+02, 3.626611303710937e+02, 3.623399700927735e+02, 3.612527551269531e+02, 3.604952087402344e+02]
 pip2.port_a.m_flow=[1.679999977350235e-01, 9.177000068128109e-02, 9.448000088334084e-02, 1.549900056421757e-01, 1.092399999499321e-01, 9.229999552042481e-02, 1.07980001270771e-01, 8.33299968391656e-02, 1.281199997663498e-01, 1.245299975574017e-01, 7.699999958276749e-02, 7.900000363588333e-02, 1.204800027608871e-01, 8.776999905705452e-02, 8.24800023436545e-02, 1.251500051468611e-01, 8.595999866724015e-02, 8.990000091493243e-02, 9.781999826431274e-02, 8.549000188708306e-02, 1.64000004529953e-01, 1.550000011920929e-01, 9.457999899983406e-02, 8.449000079184771e-02, 8.936000138521194e-02, 6.724999938160181e-02, 1.238000030815601e-01, 8.299999684095383e-02, 8.351999878883375e-02, 1.135200006514788e-01, 8.209999725222587e-02, 1.509999930858612e-01, 8.799999952316284e-02, 8.071000285446644e-02, 1.440599988400913e-01, 8.284999765455722e-02, 7.555999889969825e-02, 3.122999988496303e-02, 1.556800051033497e-01, 8.267000038176775e-02, 8.500000238418579e-02, 7.900000363588333e-02, 8.500000089406967e-02, 1.225500025600195e-01, 8.128000259399414e-02, 1.410999942570925e-01, 9.081999748945237e-02, 1.139000046479551e-01, 8.843998563679761e-02, 8.799999952316284e-02, 7.950000092387199e-02, 3.038000037893653e-02, 8.604000061750412e-02, 8.370000019669532e-02, 8.798000201582909e-02, 9.345000311732292e-02, 1.266400063037897e-01, 9.000000357627869e-02, 8.900000154972076e-02, 1.509999930858612e-01, 1.163999974727631e-01, 8.838000029325485e-02, 1.517799971997738e-01, 1.118199966847897e-01, 9.032000094652176e-02, 9.200000017881393e-02, 1.030999964475632e-01, 8.699999749660492e-02, 8.828000009059912e-02, 9.001000352203853e-02, 1.120999984443188e-01, 9.212999910116196e-02, 1.408000016212463e-01, 1.023899997025728e-01, 8.75399985909462e-02, 1.560000032186508e-01, 8.699999749660492e-02, 8.934000223875045e-02, 8.976000025868416e-02, 8.918000124394894e-02, 9.29999977350235e-02, 1.232599979639006e-01, 9.033999845385571e-02, 8.713999778032303e-02, 1.415600004792213e-01, 9.029999934136868e-02, 9.481999889016152e-02, 1.456699999421835e-01, 7.992000192403793e-02, 8.924000345170498e-02, 1.525999970734119e-01, 8.943999789655209e-02, 9.600000083446503e-02, 9.399999678134918e-02, 8.829999819397927e-02, 1.249500006437302e-01, 8.832000017166138e-02, 8.887000128626824e-02, 1.348600018024445e-01, 1.110000014305115e-01, 9.49999988079071e-02]
-senTem_p3.T=[2.931499938964844e+02, 3.156207604980469e+02, 3.628175469970703e+02, 3.625123577880859e+02, 3.628641223144531e+02, 3.642398111376555e+02, 3.64280087890625e+02, 3.628798266601563e+02, 3.637672204589844e+02, 3.625901065063476e+02, 3.629649322509766e+02, 3.632565324113412e+02, 3.625904577636718e+02, 3.589476025390625e+02, 3.60173666381836e+02, 3.635025344848633e+02, 3.625666955566406e+02, 3.635985748291016e+02, 3.683295092773437e+02, 3.653288143920898e+02, 3.64509033203125e+02, 3.631863980102539e+02, 3.640923028564453e+02, 3.637238049316406e+02, 3.625212841796875e+02, 3.649179000854492e+02, 3.629968884277343e+02, 3.585009399414063e+02, 3.602105322265625e+02, 3.623848391723633e+02, 3.63573828125e+02, 3.618960028076172e+02, 3.660912084960938e+02, 3.646961730957031e+02, 3.63094613647461e+02, 3.62882258605957e+02, 3.632211120605469e+02, 3.624988259887695e+02, 3.63555542602539e+02, 3.661275918579101e+02, 3.640537414550781e+02, 3.597832400512695e+02, 3.620370275878906e+02, 3.6424126953125e+02, 3.6499076171875e+02, 3.651272613525391e+02, 3.648678509521484e+02, 3.665756706913815e+02, 3.647411481675222e+02, 3.628544589233398e+02, 3.619855804443359e+02, 3.638213613891601e+02, 3.629585571289062e+02, 3.643464352416992e+02, 3.642985595703125e+02, 3.641150665283203e+02, 3.614019982910156e+02, 3.61535366821289e+02, 3.621049432373047e+02, 3.619675134277344e+02, 3.627661987304688e+02, 3.661913458251953e+02, 3.642622875976563e+02, 3.637177423095703e+02, 3.6372390625e+02, 3.63768391418457e+02, 3.642631518554688e+02, 3.635350186157227e+02, 3.632099389648437e+02, 3.638546212768554e+02, 3.582821990966797e+02, 3.606424267578125e+02, 3.619729345703125e+02, 3.616425726318359e+02, 3.621500354003906e+02, 3.657222671508789e+02, 3.646083325195312e+02, 3.645097235107422e+02, 3.646369836425781e+02, 3.631840716552734e+02, 3.642792114257812e+02, 3.620342095947266e+02, 3.639098126220703e+02, 3.62050168762207e+02, 3.622087280273437e+02, 3.581290008544922e+02, 3.590689672851562e+02, 3.628117901611328e+02, 3.618252185058594e+02, 3.617217272949219e+02, 3.651491882324219e+02, 3.612526306152344e+02, 3.617162426757812e+02, 3.643890075683594e+02, 3.644465460205078e+02, 3.633686813354492e+02, 3.632439526367187e+02, 3.618456939697265e+02, 3.612657427978515e+02, 3.553331668090821e+02, 3.565668029785156e+02]
+senTem_p3.T=[2.931499938964844e+02, 3.14210283203125e+02, 3.627992010498047e+02, 3.625032183837891e+02, 3.628650817871094e+02, 3.642434926428165e+02, 3.64273525390625e+02, 3.628931127929687e+02, 3.637762561035156e+02, 3.625929629516602e+02, 3.6294140625e+02, 3.632816781841144e+02, 3.625516857910156e+02, 3.589453366088867e+02, 3.601523706054688e+02, 3.634892913818359e+02, 3.62569072265625e+02, 3.635868804931641e+02, 3.683159948730469e+02, 3.653329443359375e+02, 3.645241577148437e+02, 3.631824151611328e+02, 3.641225897216797e+02, 3.636951022338867e+02, 3.625089965820313e+02, 3.648963012695312e+02, 3.63021875e+02, 3.584933248901367e+02, 3.60212646484375e+02, 3.62340110168457e+02, 3.63550341796875e+02, 3.61883310546875e+02, 3.660893151855469e+02, 3.646968453979492e+02, 3.631117639160157e+02, 3.628784408569336e+02, 3.632251513671875e+02, 3.62553310546875e+02, 3.635374920654297e+02, 3.660772918701172e+02, 3.640806823730469e+02, 3.597601934814453e+02, 3.620560784912109e+02, 3.642026879882812e+02, 3.650090637207031e+02, 3.651380569458008e+02, 3.648881036376953e+02, 3.665738761032684e+02, 3.647684902655673e+02, 3.628332550048828e+02, 3.620230712890625e+02, 3.638196478271485e+02, 3.629602355957031e+02, 3.643849465942383e+02, 3.642870379638672e+02, 3.640776336669922e+02, 3.61397138671875e+02, 3.61513235168457e+02, 3.620944604492187e+02, 3.619302789306641e+02, 3.627668640136719e+02, 3.662214682006836e+02, 3.64255855102539e+02, 3.637126080322266e+02, 3.63728837890625e+02, 3.637396865844727e+02, 3.642518939208985e+02, 3.63509400024414e+02, 3.632150146484375e+02, 3.638536602783203e+02, 3.582797515869141e+02, 3.606348538208008e+02, 3.620200903320313e+02, 3.616066882324219e+02, 3.621717565917968e+02, 3.657211151123047e+02, 3.645993640136719e+02, 3.645125085449219e+02, 3.646388208007813e+02, 3.631892144775391e+02, 3.642626159667969e+02, 3.620244815063477e+02, 3.639174060058593e+02, 3.620734469604492e+02, 3.622078381347656e+02, 3.581350494384766e+02, 3.590357629394532e+02, 3.628074032592774e+02, 3.617991394042969e+02, 3.617156671142578e+02, 3.651432495117188e+02, 3.612903762817383e+02, 3.617174584960937e+02, 3.643779412841797e+02, 3.644421850585937e+02, 3.633488525390625e+02, 3.632641735839844e+02, 3.618725482177734e+02, 3.612677075195313e+02, 3.553292544555664e+02, 3.564902648925781e+02]
 pip3.port_a.m_flow=[2.899999916553497e-02, 3.183999963104725e-02, 3.158000066876412e-02, 3.949999943375587e-02, 5.447999909520149e-02, 5.449999352181279e-02, 4.043999917805195e-02, 3.602999851107597e-02, 3.323999926447868e-02, 2.899999916553497e-02, 2.909999918192625e-02, 3.018999815645823e-02, 1.635999993886799e-02, 1.715000052005053e-02, 2.005999956279991e-02, 2.00499995611608e-02, 2.227999992668629e-02, 2.593000052496789e-02, 9.022000297904015e-02, 5.499999970197678e-02, 4.460000023245812e-02, 3.653999853879213e-02, 3.413999930024147e-02, 2.799000024795532e-02, 4.855999872088432e-02, 3.950000088661909e-02, 3.52200011909008e-02, 1.816999925300479e-02, 2.187999986112121e-02, 2.099999971687794e-02, 2.099999971687794e-02, 2.298000004142523e-02, 3.6440000385046e-02, 3.814000066369772e-02, 3.86400002241143e-02, 3.014999935403466e-02, 2.932000026106834e-02, 2.93500005826354e-02, 3.109999947249889e-02, 4.261999953538179e-02, 3.90000008046627e-02, 1.9769999515265e-02, 2.664000064134598e-02, 3.253000061959029e-02, 3.5759998857975e-02, 3.890000078827142e-02, 5.352000072598458e-02, 5.89599985113556e-02, 5.683999345929337e-02, 3.299999982118607e-02, 3.949999995529652e-02, 3.400000184774399e-02, 3.339999973773956e-02, 4.078000109642744e-02, 4.895999997854233e-02, 3.000000026077032e-03, 2.400000020861626e-02, 2.687999980524156e-02, 2.482000034302473e-02, 2.877999933436513e-02, 2.760000079870224e-02, 5.437999960035086e-02, 4.492000177502632e-02, 4.537999913096428e-02, 3.500000014901161e-02, 3.599999845027924e-02, 3.799999877810478e-02, 3.700000047683716e-02, 4.055999919772161e-02, 4.198999945074313e-02, 1.859999932348728e-02, 2.04099996201694e-02, 2.1239999756217e-02, 2.133999977260828e-02, 2.400000020861626e-02, 4.849999863654375e-02, 4.415999978780746e-02, 4.30000014603138e-02, 4.224000133574009e-02, 3.700000047683716e-02, 3.299999982118607e-02, 3.299999982118607e-02, 4.052000023424522e-02, 3.799999877810478e-02, 3.97200009226799e-02, 2.0299999602139e-02, 2.294000003486872e-02, 2.277000000700355e-02, 2.243999995291233e-02, 2.400000020861626e-02, 4.869999885559082e-02, 4.30000014603138e-02, 4.460000112652779e-02, 3.799999877810478e-02, 3.75200005620718e-02, 3.290000166743993e-02, 3.464000135660172e-02, 3.612999871373176e-02, 3.90000008046627e-02, 1.999999955296516e-02, 2.400000020861626e-02]
-senTem_p4.T=[2.931499938964844e+02, 3.113072329711914e+02, 3.581328338623047e+02, 3.570181918334961e+02, 3.621562805175781e+02, 3.651295135134006e+02, 3.627724768066406e+02, 3.623432943725586e+02, 3.6083345703125e+02, 3.598834338378906e+02, 3.609563568115234e+02, 3.616370336268201e+02, 3.205864086914062e+02, 3.039772146606445e+02, 2.97421205444336e+02, 2.948395568847656e+02, 2.938172180175781e+02, 2.934130935668945e+02, 3.656230505371093e+02, 3.654441156005859e+02, 3.651303894042969e+02, 3.602259466552734e+02, 3.348425091552734e+02, 3.096120458984375e+02, 2.996400561523437e+02, 2.957168884277344e+02, 2.941642535400391e+02, 2.935501217651367e+02, 2.933079748535156e+02, 2.932124713134766e+02, 2.931746612548828e+02, 2.931597164916992e+02, 2.931538403320312e+02, 3.640030072021484e+02, 3.62025615234375e+02, 3.596996948242187e+02, 3.446780114746094e+02, 3.134891241455078e+02, 3.011690411376953e+02, 2.963228637695312e+02, 2.94403271484375e+02, 3.610079815673828e+02, 3.598968902587891e+02, 3.606523956298828e+02, 3.62089619140625e+02, 3.616229415893555e+02, 3.647341967773438e+02, 3.6643472305491e+02, 3.490410461049114e+02, 3.63909175415039e+02, 3.62488525390625e+02, 3.651266809082031e+02, 3.585027087402344e+02, 3.597520977783203e+02, 3.483770947265625e+02, 3.162738891601563e+02, 3.577855041503906e+02, 3.581882492065429e+02, 3.581327764892578e+02, 3.580720315551758e+02, 3.6102470703125e+02, 3.666205834960937e+02, 3.659819653320312e+02, 3.664579815673828e+02, 3.632996325683594e+02, 3.625611175537109e+02, 3.604865240478516e+02, 3.62467356262207e+02, 3.635449304199219e+02, 3.276044631958011e+02, 3.067833831787109e+02, 2.985354574584961e+02, 2.952740197753906e+02, 2.939891696166992e+02, 2.93481752319336e+02, 3.39969367980957e+02, 3.657805444335938e+02, 3.655814120483399e+02, 3.651059655761719e+02, 3.644253384399414e+02, 3.647254516601562e+02, 3.633390005493164e+02, 3.614900726318358e+02, 3.593873095703125e+02, 3.231189624023438e+02, 3.049843551635742e+02, 2.978160571289063e+02, 2.949949838256836e+02, 2.938790856933594e+02, 2.934376678466797e+02, 3.639289428710937e+02, 3.611750289916992e+02, 3.646859851074219e+02, 3.652282348632813e+02, 3.629805969238281e+02, 3.640113189697266e+02, 3.635743200683594e+02, 3.605766229248047e+02, 3.342539215087891e+02, 3.09376064453125e+02, 2.995455932617188e+02]
-pip4.port_a.m_flow=[1.30000002682209e-02, 1.27100002206862e-02, 1.200000010430813e-02, 1.112999996170402e-02, 3.260000005364418e-02, 3.06000404236197e-02, 1.099999994039536e-02, 2.500000037252903e-02, 1.499999966472387e-02, 1.400000043213367e-02, 1.340000033378601e-02, 2.089976832638146e-03, 4.800000227987766e-04, 0e+00, 0e+00, 6.500000308733433e-04, 3.600000170990825e-04, 1.000000047497451e-03, 2.400000020861626e-02, 3.700000047683716e-02, 3.159999996423721e-02, 1.30000002682209e-02, 6.200000294484198e-04, 0e+00, 0e+00, 7.500000356230885e-04, 0e+00, 0e+00, 0e+00, 0e+00, 3.000000142492354e-04, 9.900000470224768e-04, 7.20000034198165e-04, 2.343000011518597e-02, 2.057999964803447e-02, 1.155000003054738e-02, 4.400000208988786e-04, 7.300000346731394e-04, 1.000000047497451e-03, 0e+00, 0e+00, 1.21100001223385e-02, 1.400000043213367e-02, 1.353000035509467e-02, 1.499999966472387e-02, 1.400000043213367e-02, 3.299999982118607e-02, 2.959999938295046e-02, 5.200162105353977e-03, 2.54200004413724e-02, 3.749999962747097e-02, 3.179000109434128e-02, 1.099999994039536e-02, 1.425999988801777e-02, 0e+00, 1.650000066729263e-03, 1.22800001502039e-02, 1.30000002682209e-02, 1.035999983549118e-02, 1.200000010430813e-02, 1.999999955296516e-02, 6.100000068545341e-02, 4.707999840378761e-02, 5.099999904632568e-02, 2.703999906778336e-02, 1.760000018402934e-02, 1.314000029116869e-02, 1.600999996066093e-02, 2.651999954134122e-02, 1.000000047497451e-03, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 2.149999979883432e-02, 3.440000176429749e-02, 4.171000000089407e-02, 3.276000164449215e-02, 2.999999932944775e-02, 1.520000025629997e-02, 2.134999981149934e-02, 2.835999947041351e-02, 1.764999929815531e-02, 0e+00, 6.500000308733433e-04, 6.000000284984708e-05, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 2.400000020861626e-02, 3.609999919310212e-02, 5.299999937415123e-02, 3.599999845027924e-02, 2.31000005453825e-02, 1.674999985843897e-02, 1.200000010430813e-02, 1.30000002682209e-02, 1.000000047497451e-03, 0e+00, -0e+00]
+senTem_p4.T=[2.931499938964844e+02, 3.108425357055664e+02, 3.581245269775391e+02, 3.570155535888672e+02, 3.621645190429688e+02, 3.651313699853327e+02, 3.627659704589844e+02, 3.623446856689453e+02, 3.608450842285156e+02, 3.598850988769531e+02, 3.609494079589844e+02, 3.616538008605438e+02, 3.205934240722656e+02, 3.039799755859375e+02, 2.974223132324219e+02, 2.948400054931641e+02, 2.938173901367188e+02, 2.934131546020508e+02, 3.656098724365235e+02, 3.65445788269043e+02, 3.651308776855469e+02, 3.602265103149414e+02, 3.34836127319336e+02, 3.09609573059082e+02, 2.99638994140625e+02, 2.957164459228516e+02, 2.941640844726563e+02, 2.935500607299805e+02, 2.933079443359375e+02, 2.932124533081055e+02, 2.931746612548828e+02, 2.931597164916992e+02, 2.931538403320312e+02, 3.640019393920899e+02, 3.620272045898437e+02, 3.596963790893554e+02, 3.446786584472656e+02, 3.134891241455078e+02, 3.011690716552735e+02, 2.963228732299805e+02, 2.94403271484375e+02, 3.609962664794922e+02, 3.5990833984375e+02, 3.606344439697266e+02, 3.620938256835938e+02, 3.616230819702149e+02, 3.647298468017578e+02, 3.664330900940714e+02, 3.490332264697581e+02, 3.639118823242188e+02, 3.624925689697266e+02, 3.651184512329102e+02, 3.585039270019531e+02, 3.597708389282226e+02, 3.483942596435547e+02, 3.162812454223633e+02, 3.577832971191406e+02, 3.581783691406249e+02, 3.581279296875e+02, 3.58058424987793e+02, 3.610236022949219e+02, 3.666286679077148e+02, 3.659757250976563e+02, 3.664458383178711e+02, 3.633049157714844e+02, 3.625552917480469e+02, 3.60482896118164e+02, 3.624525741577148e+02, 3.635424389648437e+02, 3.276008575439457e+02, 3.067820068359375e+02, 2.985349081420898e+02, 2.952738061523438e+02, 2.939890780639648e+02, 2.934816912841797e+02, 3.399671630859375e+02, 3.657754614257813e+02, 3.655754962158203e+02, 3.65112611694336e+02, 3.644168844604492e+02, 3.647155944824219e+02, 3.633296371459961e+02, 3.614967987060546e+02, 3.593891427612305e+02, 3.231167492675781e+02, 3.049834518432617e+02, 2.978156622314453e+02, 2.94994831237793e+02, 2.938790246582032e+02, 2.934376373291016e+02, 3.639363372802734e+02, 3.611779028320312e+02, 3.64671806640625e+02, 3.652485113525391e+02, 3.629867144775391e+02, 3.640075042724609e+02, 3.6357587890625e+02, 3.605941659545899e+02, 3.342494006347656e+02, 3.093742431640625e+02, 2.99544921875e+02]
+pip4.port_a.m_flow=[1.30000002682209e-02, 1.27100002206862e-02, 1.200000010430813e-02, 1.112999996170402e-02, 3.260000005364418e-02, 3.06000404236197e-02, 1.099999994039536e-02, 2.500000037252903e-02, 1.499999966472387e-02, 1.400000043213367e-02, 1.340000033378601e-02, 2.089976832638146e-03, 4.800000227987766e-04, 0e+00, 0e+00, 6.500000308733433e-04, 3.600000170990825e-04, 1.000000047497451e-03, 2.400000020861626e-02, 3.700000047683716e-02, 3.159999996423721e-02, 1.30000002682209e-02, 6.200000294484198e-04, 0e+00, 0e+00, 7.500000356230885e-04, 0e+00, 0e+00, 0e+00, 0e+00, 3.000000142492354e-04, 9.900000470224768e-04, 7.20000034198165e-04, 2.343000011518597e-02, 2.057999964803447e-02, 1.155000003054738e-02, 4.400000208988786e-04, 7.300000346731394e-04, 1.000000047497451e-03, 0e+00, 0e+00, 1.21100001223385e-02, 1.400000043213367e-02, 1.353000035509467e-02, 1.499999966472387e-02, 1.400000043213367e-02, 3.299999982118607e-02, 2.959999938295046e-02, 5.200162105353977e-03, 2.54200004413724e-02, 3.749999962747097e-02, 3.179000109434128e-02, 1.099999994039536e-02, 1.425999988801777e-02, 0e+00, 1.650000066729263e-03, 1.22800001502039e-02, 1.30000002682209e-02, 1.035999983549118e-02, 1.200000010430813e-02, 1.999999955296516e-02, 6.100000068545341e-02, 4.707999840378761e-02, 5.099999904632568e-02, 2.703999906778336e-02, 1.760000018402934e-02, 1.314000029116869e-02, 1.600999996066093e-02, 2.651999954134122e-02, 1.000000047497451e-03, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 1.000000047497451e-03, 2.149999979883432e-02, 3.440000176429749e-02, 4.171000000089407e-02, 3.276000164449215e-02, 2.999999932944775e-02, 1.520000025629997e-02, 2.134999981149934e-02, 2.835999947041351e-02, 1.764999929815531e-02, 0e+00, 6.500000308733433e-04, 6.000000284984708e-05, 0e+00, 1.000000047497451e-03, 1.000000047497451e-03, 2.400000020861626e-02, 3.609999919310212e-02, 5.299999937415123e-02, 3.599999845027924e-02, 2.31000005453825e-02, 1.674999985843897e-02, 1.200000010430813e-02, 1.30000002682209e-02, 1.000000047497451e-03, 0e+00, 0e+00]
diff --git a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos
index f8d4a7e26b6..8aace6952e2 100644
--- a/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos
+++ b/Buildings/Resources/Scripts/Dymola/ConvertBuildings_from_8_to_9.0.0.mos
@@ -5,6 +5,12 @@ clear
 
 convertClear();
 
+// Refactoring for https://github.com/ibpsa/modelica-ibpsa/issues/1494
+convertClass("IBPSA.Fluid.FixedResistances.PlugFlowPipe",
+             "IBPSA.Obsolete.Fluid.FixedResistances.PlugFlowPipe");
+convertClass("IBPSA.Fluid.FixedResistances.BaseClasses.PlugFlowCore",
+             "IBPSA.Obsolete.Fluid.FixedResistances.BaseClasses.PlugFlowCore");
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/2544
 convertClass("Buildings.Controls.OBC.CDL.Routing.BooleanReplicator",
              "Buildings.Controls.OBC.CDL.Routing.BooleanScalarReplicator");
@@ -18,7 +24,7 @@ convertModifiers("Buildings.Fluid.Movers.FlowControlled_dp",
                 {"y_start"}, fill("",0), true);
 convertModifiers("Buildings.Fluid.Movers.FlowControlled_m_flow",
                 {"y_start"}, fill("",0), true);
-                
+
 // Conversion for https://github.com/lbl-srg/modelica-buildings/issues/2580
 convertElement(
     "Buildings.Controls.OBC.CDL.Logical.MultiAnd",
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
deleted file mode 100644
index d67d428f522..00000000000
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/BaseClasses/Validation/PlugFlowCore.mos
+++ /dev/null
@@ -1,13 +0,0 @@
-translateModel("Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore");
-simulateModel("Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore", stopTime=1000, method="CVode", tolerance=1e-006, resultFile="PlugFlowCore");
-createPlot(id=1, position={15, 10, 584, 397},
-	y={"senTemIn.T", "senTemOut.T"}, range={0.0, 1000.0, 48.0, 72.0},
-	grid=true, filename="PlugFlowCore.mat",
-	colors={{28,108,200}, {238,46,47}},
-	autoscale = true,
-	autoerase = true,
-	autoreplot = true,
-	color = true,
-	subPlot=1,
-	leftTitleType = 1,
-	bottomTitleType = 1);
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mos
index 2f6e0ba9613..8ed4841310e 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowDiscretized.mos
@@ -1,3 +1,6 @@
-translateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowDiscretized");
 simulateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowDiscretized", stopTime=1000, method="CVode", tolerance=1e-006, resultFile="PlugFlowDiscretized");
-createPlot(id=1, position={15, 10, 584, 397}, y={"senTemIn.T", "senTemOut.T"}, range={0.0, 1000.0, 48.0, 72.0}, grid=true, filename="PlugFlowDiscretized.mat", colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={15, 10, 1058, 1113}, y={"senTemIn.T", "senTemOut.T", "bou[1].T"}, range={0.0, 1000.0, 0.0, 80.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, timeUnit="s", displayUnits={"degC", "degC", "degC"});
+createPlot(id=1, position={15, 10, 1058, 1113}, y={"pip.QEnv_flow"}, range={0.0, 1000.0, -1500.0, 500.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
+createPlot(id=1, position={15, 10, 1058, 1113}, y={"pip.dp"}, range={0.0, 1000.0, -10000.0, 20000.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"Pa"});
+createPlot(id=1, position={15, 10, 1058, 1113}, y={"pip.v"}, range={0.0, 1000.0, -0.5, 1.5}, grid=true, subPlot=104, colors={{28,108,200}}, timeUnit="s", displayUnits={"m/s"});
+createPlot(id=2, position={198, 27, 592, 372}, y={"pip.m_flow_nominal", "pip.m_flow"}, range={0.0, 1000.0, 8.5, 11.5}, grid=true, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"kg/s", "kg/s"});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos
index f82aaed43ed..87a4293a463 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Examples/PlugFlowPipe.mos
@@ -1,3 +1,3 @@
-translateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe");
+translateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe");
 simulateModel("Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe", stopTime=1000, method="CVode", tolerance=1e-006, resultFile="PlugFlowPipe");
-createPlot(id=1, position={15, 10, 584, 397}, y={"senTemIn.T", "senTemOut.T"}, range={0.0, 1000.0, 48.0, 72.0}, grid=true, filename="PlugFlowPipe.mat", colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={15, 10, 584, 397}, y={"senTemIn.T", "senTemInNoMix.T", "senTemOutNoMix.T", "senTemOut.T"}, range={0.0, 1000.0, 45.0, 75.0}, grid=true, colors={{28,108,200}, {0,140,72}, {217,67,180}, {238,46,47}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC"});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos
index 9b4db5595d8..dca8a1d12e7 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/FlowReversal.mos
@@ -1,4 +1,4 @@
 simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal", stopTime=150, method="CVode", tolerance=1e-06, resultFile="FlowReversal");
 createPlot(id=2, position={35, 30, 1072, 772}, y={"m_flow.y"}, range={0.0, 150.0, -4.0, 4.0}, grid=true, colors={{28,108,200}});
 createPlot(id=2, position={35, 30, 1072, 254}, y={"senTemIn.T", "senTemOut.T"}, range={0.0, 150.0, 10.0, 50.0}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}}, displayUnits={"degC", "degC"});
-createPlot(id=2, position={35, 30, 1072, 255}, y={"pip.cor.v_nominal", "pip.cor.del.v", "pip.cor.res.v_nominal"}, range={0.0, 150.0, -4.0, 4.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}, {0,140,72}});
+createPlot(id=2, position={35, 30, 1072, 255}, y={"pip.v_nominal", "pip.v"}, range={0.0, 150.0, -4.0, 4.0}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
diff --git a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos
index 3b32102aeb9..3451e0398cb 100644
--- a/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos
+++ b/Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PlugFlowPipes/TransportWaterAir.mos
@@ -1,5 +1,5 @@
 simulateModel("Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir", stopTime=1000, method="CVode", tolerance=1e-06, resultFile="TransportWaterAir");
 createPlot(id=1, position={15, 10, 802, 881}, y={"Tin.y", "senTemOutW.T", "senTemOutA.T"}, range={0.0, 1000.0, 15.0, 35.0}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}}, displayUnits={"degC", "degC", "degC"});
-createPlot(id=1, position={15, 10, 802, 291}, y={"duc.ports_b[1].Xi_outflow[1]", "XiIn[1].y"}, range={0.0, 1000.0, 0.005, 0.025}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
-createPlot(id=1, position={15, 10, 802, 291}, y={"duc.ports_b[1].C_outflow[1]", "CIn[1].y"}, range={0.0, 1000.0, -0.005, 0.015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
-createPlot(id=2, position={851, 18, 592, 427}, y={"pip.v_nominal", "pip.cor.res.v", "duc.cor.res.v_nominal", "duc.cor.res.v"}, range={0.0, 0.012, 1.3, 1.7000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
+createPlot(id=1, position={15, 10, 802, 291}, y={"duc.port_b.Xi_outflow[1]", "XiIn[1].y"}, range={0.0, 1000.0, 0.005, 0.025}, grid=true, subPlot=2, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={15, 10, 802, 291}, y={"duc.port_b.C_outflow[1]", "CIn[1].y"}, range={0.0, 1000.0, -0.005, 0.015}, grid=true, subPlot=3, colors={{28,108,200}, {238,46,47}});
+createPlot(id=2, position={851, 18, 592, 427}, y={"pip.v_nominal", "pip.v", "duc.v_nominal", "duc.v"}, range={0.0, 0.012, 1.3, 1.7000000000000002}, grid=true, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore.mos
deleted file mode 100644
index 3a6f312a7cc..00000000000
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.BaseClasses.Validation.PlugFlowCore.mos
+++ /dev/null
@@ -1,5 +0,0 @@
-compareVars :=
-  {
-    "senTemIn.T",
-    "senTemOut.T"
-  };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowDiscretized.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowDiscretized.mos
index 3a6f312a7cc..b85af5a56ec 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowDiscretized.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowDiscretized.mos
@@ -1,5 +1,11 @@
 compareVars :=
   {
     "senTemIn.T",
-    "senTemOut.T"
+    "senTemOut.T",
+    "bou[1].T",
+    "pip.QEnv_flow",
+    "pip.dp",
+    "pip.v",
+    "pip.m_flow_nominal",
+    "pip.m_flow"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe.mos
index 3a6f312a7cc..5f3e032451c 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Examples.PlugFlowPipe.mos
@@ -1,5 +1,7 @@
 compareVars :=
   {
     "senTemIn.T",
+    "senTemInNoMix.T",
+    "senTemOutNoMix.T",
     "senTemOut.T"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal.mos
index cfd0312f553..9e7a649ad48 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.FlowReversal.mos
@@ -3,7 +3,6 @@ compareVars :=
     "m_flow.y",
     "senTemIn.T",
     "senTemOut.T",
-    "pip.cor.v_nominal",
-    "pip.cor.del.v",
-    "pip.cor.res.v_nominal"
+    "pip.v_nominal",
+    "pip.v"
   };
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir.mos
index c039bbbbfd7..06cf1abdaea 100644
--- a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir.mos
+++ b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Fluid.FixedResistances.Validation.PlugFlowPipes.TransportWaterAir.mos
@@ -3,12 +3,12 @@ compareVars :=
     "Tin.y",
     "senTemOutW.T",
     "senTemOutA.T",
-    "duc.ports_b[1].Xi_outflow[1]",
+    "duc.port_b.Xi_outflow[1]",
     "XiIn[1].y",
-    "duc.ports_b[1].C_outflow[1]",
+    "duc.port_b.C_outflow[1]",
     "CIn[1].y",
     "pip.v_nominal",
-    "pip.cor.res.v",
-    "duc.cor.res.v_nominal",
-    "duc.cor.res.v"
+    "pip.v",
+    "duc.v_nominal",
+    "duc.v"
   };
diff --git a/Buildings/package.mo b/Buildings/package.mo
index bb3f502a73c..e5b36364e5a 100644
--- a/Buildings/package.mo
+++ b/Buildings/package.mo
@@ -442,6 +442,23 @@ have been <b style=\"color:blue\">improved</b> in a
                        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.Movers</b>
     </td>
 </tr>