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

@@ -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 ."

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

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>

Buildings/Fluid/FixedResistances/BaseClasses/package.order

@@ -1,6 +1,4 @@
 Pipe
 PlugFlow
-PlugFlowCore
 PlugFlowHeatLoss
 PlugFlowTransportDelay
-Validation

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(