Changeset 1949

Timestamp:

12/05/2008 06:48:56 AM (5 weeks ago)

Author:

rfranke

Message:

Pipes
- cleaning of DistributedPipe code
- bug fix for lumpedPressure option of DistributedPipe
- add init and dynamics parameters to PressureDrop models
- use new DistributedPipe in HeatExchangers

add clean.bat for removal of intermediate files
add Test/TestComponents/Pipes/StaticPipe.mo

Location:

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid

Files:

• Examples/AST_BatchPlant.mo (modified) (3 diffs)
• HeatExchangers.mo (modified) (3 diffs)
• Pipes.mo (modified) (16 diffs)
• Test/TestComponents/HeatExchangers/TestHeatExchanger.mo (modified) (2 diffs)
• Test/TestComponents/Pipes/StaticPipe.mo (added)
• Test/TestCriticalCases.mo (modified) (1 diff)
• Test/TestOverdeterminedSteadyStateInit.mo (modified) (3 diffs)
• Volumes.mo (modified) (1 diff)
• clean.bat (added)

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/Examples/AST_BatchPlant.mo

@@ -382 +382 @@
                          annotation (Placement(transformation(extent={{-100,
               -140},{-60,-100}}, rotation=0)));
-    Modelica_Fluid.Pipes.LumpedPipe_Old pipeB1B2(
+    Modelica_Fluid.Pipes.ToBeRemoved.LumpedPipe_Old pipeB1B2(
       redeclare package Medium = BatchMedium,
       length=1,
@@ -447 +447 @@
           extent={{-10,10},{10,-10}},
           rotation=90)));
-    Modelica_Fluid.Pipes.LumpedPipe_Old pipePump1B1(
+    Modelica_Fluid.Pipes.ToBeRemoved.LumpedPipe_Old pipePump1B1(
       redeclare package Medium = BatchMedium,
       length=1,
@@ -458 +458 @@
           extent={{-10,10},{10,-10}},
           rotation=90)));
-    Modelica_Fluid.Pipes.LumpedPipe_Old pipePump2B2(
+    Modelica_Fluid.Pipes.ToBeRemoved.LumpedPipe_Old pipePump2B2(
       redeclare package Medium = BatchMedium,
       length=1,

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/HeatExchangers.mo

@@ -323 +323 @@
 
     //Pressure drop and heat transfer
-    replaceable package WallFriction_1 = 
-        Modelica_Fluid.PressureLosses.BaseClasses.WallFriction.QuadraticTurbulent
+    replaceable model PressureDrop_1 = 
+        Modelica_Fluid.Pipes.BaseClasses.PressureDrop.QuadraticTurbulentFlow 
       constrainedby
-      Modelica_Fluid.PressureLosses.BaseClasses.WallFriction.PartialWallFriction
-      "Characteristic of wall friction"                                                            annotation(choicesAllMatching, Dialog(tab="General", group="Fluid 1"));
-    replaceable package WallFriction_2 = 
-        Modelica_Fluid.PressureLosses.BaseClasses.WallFriction.QuadraticTurbulent
+      Modelica_Fluid.Pipes.BaseClasses.PressureDrop.PartialPipePressureDrop
+      "Characteristic of wall friction"                                                                                                   annotation(choicesAllMatching, Dialog(tab="General", group="Fluid 1"));
+    replaceable model PressureDrop_2 = 
+        Modelica_Fluid.Pipes.BaseClasses.PressureDrop.QuadraticTurbulentFlow 
       constrainedby
-      Modelica_Fluid.PressureLosses.BaseClasses.WallFriction.PartialWallFriction
-      "Characteristic of wall friction"                                                            annotation(choicesAllMatching, Dialog(tab="General", group="Fluid 2"));
+      Modelica_Fluid.Pipes.BaseClasses.PressureDrop.PartialPipePressureDrop
+      "Characteristic of wall friction"                                                                                                   annotation(choicesAllMatching, Dialog(tab="General", group="Fluid 2"));
     parameter SI.Length roughness_1=2.5e-5
       "Absolute roughness of pipe (default = smooth steel pipe)" annotation(Dialog(tab="General", group="Fluid 1"));
     parameter SI.Length roughness_2=2.5e-5
       "Absolute roughness of pipe (default = smooth steel pipe)" annotation(Dialog(tab="General", group="Fluid 2"));
-    parameter SI.DynamicViscosity eta_nominal_1=Medium_1.dynamicViscosity(Medium_1.setState_pTX(Medium_1.p_default, Medium_1.T_default, Medium_1.X_default))
-      "Nominal dynamic viscosity (e.g. eta_liquidWater = 1e-3, eta_air = 1.8e-5)"
-                                                                                             annotation(Dialog(tab="Advanced", group="Fluid 1", enable=use_eta_nominal));
-    parameter SI.DynamicViscosity eta_nominal_2=Medium_2.dynamicViscosity(Medium_2.setState_pTX(Medium_2.p_default, Medium_2.T_default, Medium_2.X_default))
-      "Nominal dynamic viscosity (e.g. eta_liquidWater = 1e-3, eta_air = 1.8e-5)"
-                                                                                         annotation(Dialog(tab="Advanced", group="Fluid 2", enable=use_eta_nominal));
-    parameter SI.Density d_nominal_1 = Medium_1.density_pTX(Medium_1.p_default, Medium_1.T_default, Medium_1.X_default)
-      "Nominal density (e.g. d_liquidWater = 995, d_air = 1.2)" 
-       annotation(Dialog(tab="Advanced", group="Fluid 1", enable=use_eta_nominal));
-    parameter SI.Density d_nominal_2 = Medium_1.density_pTX(Medium_2.p_default, Medium_2.T_default, Medium_2.X_default)
-      "Nominal density (e.g. d_liquidWater = 995, d_air = 1.2)" 
-       annotation(Dialog(tab="Advanced", group="Fluid 2", enable=use_eta_nominal));
-    parameter Boolean use_eta_nominal=false
-      "= true, if eta_ and d_nominal are used, otherwise computed from media" annotation(Evaluate=true, Dialog(tab="Advanced", group="Pressure loss"));
+  /*
+  parameter Boolean use_nominal=false 
+    "= true, if eta_ and d_nominal are used, otherwise computed from media" annotation(Evaluate=true, Dialog(tab="Advanced", group="Pressure drop"));
+  parameter SI.DynamicViscosity eta_nominal_1=Medium_1.dynamicViscosity(Medium_1.setState_pTX(Medium_1.p_default, Medium_1.T_default, Medium_1.X_default)) 
+    "Nominal dynamic viscosity (e.g. eta_liquidWater = 1e-3, eta_air = 1.8e-5)"
+                                                                                           annotation(Dialog(tab="Advanced", group="Fluid 1", enable=use_nominal));
+  parameter SI.DynamicViscosity eta_nominal_2=Medium_2.dynamicViscosity(Medium_2.setState_pTX(Medium_2.p_default, Medium_2.T_default, Medium_2.X_default)) 
+    "Nominal dynamic viscosity (e.g. eta_liquidWater = 1e-3, eta_air = 1.8e-5)"
+                                                                                       annotation(Dialog(tab="Advanced", group="Fluid 2", enable=use_nominal));
+  parameter SI.Density d_nominal_1 = Medium_1.density_pTX(Medium_1.p_default, Medium_1.T_default, Medium_1.X_default) 
+    "Nominal density (e.g. d_liquidWater = 995, d_air = 1.2)" 
+     annotation(Dialog(tab="Advanced", group="Fluid 1", enable=use_nominal));
+  parameter SI.Density d_nominal_2 = Medium_1.density_pTX(Medium_2.p_default, Medium_2.T_default, Medium_2.X_default) 
+    "Nominal density (e.g. d_liquidWater = 995, d_air = 1.2)" 
+     annotation(Dialog(tab="Advanced", group="Fluid 2", enable=use_nominal));
+*/
     //Display variables
     SI.HeatFlowRate Q_flow_1 "Total heat flow rate of pipe 1";
     SI.HeatFlowRate Q_flow_2 "Total heat flow rate of pipe 2";
 
-    Modelica_Fluid.Pipes.DistributedPipe_Old pipe_1(
+    Modelica_Fluid.Pipes.DistributedPipe pipe_1(
       redeclare package Medium = Medium_1,
       isCircular=false,
@@ -372 +374 @@
       perimeter=perimeter_1,
       crossArea=crossArea_1,
-      redeclare package WallFriction = WallFriction_1,
       roughness=roughness_1,
-      use_eta_nominal=use_eta_nominal,
+      redeclare model PressureDrop = PressureDrop_1)   annotation (Placement(transformation(extent={{-40,-80},
+              {20,-20}},        rotation=0)));
+  /*
+      (use_nominal=use_nominal,
       eta_nominal=eta_nominal_1,
-      d_nominal=d_nominal_1)   annotation (Placement(transformation(extent={{-40,-80},
-              {20,-20}},        rotation=0)));
-
-    Modelica_Fluid.Pipes.DistributedPipe_Old pipe_2(
+      d_nominal=d_nominal_1)
+*/
+
+    Modelica_Fluid.Pipes.DistributedPipe pipe_2(
       redeclare package Medium = Medium_2,
       nNodes=nNodes,
@@ -398 +402 @@
       p_a_start=p_a_start1,
       p_b_start=p_b_start2,
-      redeclare package WallFriction = WallFriction_2,
       roughness=roughness_2,
-      use_eta_nominal=use_eta_nominal,
-      eta_nominal=eta_nominal_2,
-      d_nominal=d_nominal_2,
-      show_Re=false) 
+      redeclare model PressureDrop = PressureDrop_2) 
                 annotation (Placement(transformation(extent={{20,88},{-40,28}},
             rotation=0)));
+  /*
+      (use_nominal=use_nominal,
+      eta_nominal=eta_nominal_2,
+      d_nominal=d_nominal_2)
+*/
     annotation (Diagram(coordinateSystem(preserveAspectRatio=true,  extent={{-100,
               -100},{100,100}},

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/Pipes.mo

@@ -13 +13 @@
                    Medium.setState_phX(port_b.p, inStream(port_b.h_outflow), inStream(port_b.Xi_outflow))},
             final allowFlowReversal=allowFlowReversal,
+            final dynamicsType=Modelica_Fluid.Types.Dynamics.SteadyState,
+            final initType=Modelica_Fluid.Types.Init.SteadyState,
             final p_a_start=p_a_start,
             final p_b_start=p_b_start,
@@ -188 +190 @@
 
     // Discretization
-    parameter Integer nNodes(min=1)=1 "Number of discrete flow volumes";
+    parameter Integer nNodes(min=1)=1 "Number of discrete flow volumes" 
+      annotation(Dialog(tab="Advanced"),Evaluate=true);
 
     parameter Types.ModelStructure modelStructure=Types.ModelStructure.a_v_b
-      "Determines whether flow or volume models are present at the ports"                              annotation(Evaluate=true);
+      "Determines whether flow or volume models are present at the ports" 
+      annotation(Dialog(tab="Advanced"), Evaluate=true);
 
     parameter Boolean lumpedPressure=false
-      "=true to lump all pressure nodes into one" 
-      annotation(Dialog(tab="Advanced", group="Pressure drop"),Evaluate=true);
+      "=true to lump all pressure states into one" 
+      annotation(Dialog(tab="Advanced"),Evaluate=true);
+    final parameter Integer nFlows=if lumpedPressure then nFlowsLumped else nFlowsDistributed
+      "number of flow models in pressureDrop";
+    final parameter Integer nFlowsDistributed=if modelStructure==Types.ModelStructure.a_v_b then n+1 else if (modelStructure==Types.ModelStructure.a_vb or modelStructure==Types.ModelStructure.av_b) then n else n-1;
+    final parameter Integer nFlowsLumped=if modelStructure==Types.ModelStructure.a_v_b then 2 else if (modelStructure==Types.ModelStructure.a_vb or modelStructure==Types.ModelStructure.av_b) then 1 else 0;
     final parameter Integer iLumped=integer(n/2)+1
-      "Index of control volume that representative state"                   annotation(Evaluate=true);
-    final parameter Integer nFlowsLumped=if modelStructure==Types.ModelStructure.a_v_b then 2 else if (modelStructure==Types.ModelStructure.a_vb or modelStructure==Types.ModelStructure.av_b) then 1 else 0;
-    final parameter Integer nFlowsDistributed=if modelStructure==Types.ModelStructure.a_v_b then n+1 else if (modelStructure==Types.ModelStructure.a_vb or modelStructure==Types.ModelStructure.av_b) then n else n-1;
-    final parameter Integer nFlows=if lumpedPressure then nFlowsLumped else nFlowsDistributed;
+      "Index of control volume with representative state if lumpedPressure" 
+      annotation(Evaluate=true);
 
     // Advanced model options
     parameter Boolean use_approxPortProperties=false
-      "=true, port properties for pressure drop correlation are taken from neighboring control volume"
-      annotation(Dialog(tab="Advanced", group="Pressure drop"),Evaluate=true);
+      "=true to take port properties for pressure drops from internal control volumes"
+      annotation(Dialog(tab="Advanced"),Evaluate=true);
     Medium.ThermodynamicState state_a "state defined by volume outside port_a";
     Medium.ThermodynamicState state_b "state defined by volume outside port_b";
@@ -211 +217 @@
       "state vector for pressureDrop model";
 
+    // Pressure drop model
     replaceable PressureDrop pressureDrop(
             redeclare final package Medium = Medium,
@@ -216 +223 @@
             state=flowState,
             final allowFlowReversal=allowFlowReversal,
+            final dynamicsType=dynamicsType,
+            final initType=initType,
             final p_a_start=p_a_start,
             final p_b_start=p_b_start,
@@ -229 +238 @@
 
     // Flow quantities
-    Medium.MassFlowRate[n+1] m_flow(each min=if allowFlowReversal then -Modelica.Constants.inf else 
-                0, each start=m_flow_start)
+    Medium.MassFlowRate[n+1] m_flow(
+       each min=if allowFlowReversal then -Modelica.Constants.inf else 0,
+       each start=m_flow_start)
       "Mass flow rates of fluid across segment boundaries";
     Medium.MassFlowRate[n+1, Medium.nXi] mXi_flow
@@ -268 +278 @@
 
     // Source/sink terms for mass and energy balances
-    fluidVolume=fill(V/nNodes, n);
+    fluidVolume=fill(V/n, n);
     Ws_flow=zeros(n);
     for i in 1:n loop
       ms_flow[i] = m_flow[i] - m_flow[i + 1];
       msXi_flow[i, :] = mXi_flow[i, :] - mXi_flow[i + 1, :];
-    end for;
-    for i in 1:n loop
       Hs_flow[i] = H_flow[i] - H_flow[i + 1];
     end for;
@@ -289 +297 @@
 
     // Boundary conditions
-    port_a.h_outflow = medium[1].h;
-    port_b.h_outflow = medium[nNodes].h;
     port_a.m_flow    = m_flow[1];
     port_b.m_flow    = -m_flow[n + 1];
+    port_a.h_outflow = medium[1].h;
+    port_b.h_outflow = medium[n].h;
+    port_a.Xi_outflow = medium[1].Xi;
+    port_b.Xi_outflow = medium[n].Xi;
     port_a.C_outflow = inStream(port_b.C_outflow);
     port_b.C_outflow = inStream(port_a.C_outflow);
@@ -301 +311 @@
     else
       state_a = Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow));
-      state_b = Medium.setState_phX(port_a.p, inStream(port_b.h_outflow), inStream(port_b.Xi_outflow));
+      state_b = Medium.setState_phX(port_b.p, inStream(port_b.h_outflow), inStream(port_b.Xi_outflow));
     end if;
 
@@ -307 +317 @@
       fill(medium[1].p, n-1) = medium[2:n].p;
       if modelStructure == ModelStructure.a_v_b then
+        m_flow[1] = pressureDrop.m_flow[1];
         flowState[1] = state_a;
         flowState[2] = medium[iLumped].state;
         flowState[3] = state_b;
+        m_flow[n+1] = pressureDrop.m_flow[2];
       elseif modelStructure == ModelStructure.av_b then
+        port_a.p = medium[1].p;
         flowState[1] = medium[iLumped].state;
         flowState[2] = state_b;
+        m_flow[n+1] = pressureDrop.m_flow[1];
       elseif modelStructure == ModelStructure.a_vb then
+        m_flow[1] = pressureDrop.m_flow[1];
         flowState[1] = state_a;
         flowState[2] = medium[iLumped].state;
+        port_b.p = medium[n].p;
       else // avb
+        port_a.p = medium[1].p;
         flowState[1] = medium[iLumped].state;
+        port_b.p = medium[n].p;
       end if;
-      m_flow[1] = pressureDrop.m_flow[1];
-      m_flow[n+1] = pressureDrop.m_flow[nFlows];
     else
       if modelStructure == ModelStructure.a_v_b then
@@ -428 +444 @@
   end DistributedPipe;
 
-  model StaticPipe_Old
-    "Basic pipe flow model without storage of mass or energy"
-    extends Modelica_Fluid.Pipes.BaseClasses.PartialPipe_Old(
-       redeclare model HeatTransfer=BaseClasses.HeatTransfer.PipeHT_ideal);
-    PressureLosses.WallFrictionAndGravity wallFriction(
-      redeclare package Medium = Medium,
-      allowFlowReversal=allowFlowReversal,
-      redeclare package WallFriction = WallFriction,
-      roughness=roughness,
-      eta_nominal=eta_nominal,
-      d_nominal=d_nominal,
-      dp_small=dp_small,
-      m_flow_start=m_flow_start,
-      compute_T=false,
-      show_Re=show_Re,
-      from_dp=from_dp,
-      diameter=diameter_h,
-      reg_m_flow_small=m_flow_small,
-      m_flow_small=m_flow_small,
-      dp_start=(p_a_start - p_b_start),
-      length=length,
-      height_ab=height_ab,
-      use_nominal=use_eta_nominal or use_d_nominal) 
-      annotation (Placement(transformation(extent={{-10,-10},{10,10}},
-            rotation=0)));
-  equation
-    connect(port_a, wallFriction.port_a) annotation (Line(
-        points={{-100,0},{-10,0}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(wallFriction.port_b, port_b) annotation (Line(
-        points={{10,0},{100,0}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    annotation (defaultComponentName="pipe", Diagram(coordinateSystem(preserveAspectRatio=true, extent={{-100,
-              -100},{100,100}}),      graphics));
-  end StaticPipe_Old;
-
-  model LumpedPipe_Old
-    // Assumptions
-    parameter Modelica_Fluid.Types.Dynamics dynamicsType=system.dynamicsType
-      "Dynamics option" 
-      annotation(Evaluate=true, Dialog(tab = "Assumptions"));
-
-    // Initialization
-    parameter Types.Init initType=system.initType "Initialization option" 
-      annotation(Evaluate=true, Dialog(tab = "Initialization"));
-
-    // Extend here to get right ordering in parameter box
-    extends Modelica_Fluid.Pipes.BaseClasses.PartialPipe_Old;
-
-     //Initialization
-    parameter Boolean use_T_start=true "Use T_start if true, otherwise h_start"
-       annotation(Evaluate=true, Dialog(tab = "Initialization"));
-    parameter Medium.Temperature T_start=if use_T_start then system.T_start else 
-                Medium.temperature_phX(
-          (p_a_start + p_b_start)/2,
-          h_start,
-          X_start) "Start value of temperature" 
-      annotation(Evaluate=true, Dialog(tab = "Initialization", enable = use_T_start));
-    parameter Medium.SpecificEnthalpy h_start=if use_T_start then 
-          Medium.specificEnthalpy_pTX(
-          (p_a_start + p_b_start)/2,
-          T_start,
-          X_start) else Medium.h_default "Start value of specific enthalpy" 
-      annotation(Evaluate=true, Dialog(tab = "Initialization", enable = not use_T_start));
-    parameter Medium.MassFraction X_start[Medium.nX]=Medium.X_default
-      "Start value of mass fractions m_i/m" 
-      annotation (Dialog(tab="Initialization", enable=Medium.nXi > 0));
-
-    replaceable HeatTransfer heatTransfer(
-      redeclare final package Medium = Medium,
-      final n=1,
-      diameter=4*crossArea/perimeter,
-      area=perimeter*length,
-      final crossArea=crossArea,
-      final length=length,
-      state={volume.medium.state},
-      m_flow = {0.5*(port_a.m_flow - port_b.m_flow)},
-      final useFluidHeatPort=true) "Edit heat transfer parameters" 
-      annotation (editButton=true, Placement(transformation(extent={{-20,0},{20,40}},   rotation=0)));
-
-    Modelica_Fluid.PressureLosses.WallFrictionAndGravity wallFriction1(
-      redeclare package Medium = Medium,
-      allowFlowReversal=allowFlowReversal,
-      redeclare package WallFriction = WallFriction,
-      length=length/2,
-      height_ab=height_ab/2,
-      roughness=roughness,
-      eta_nominal=eta_nominal,
-      d_nominal=d_nominal,
-      dp_small=dp_small,
-      dp_start = (p_a_start - p_b_start)/2,
-      m_flow_start = m_flow_start,
-      compute_T=false,
-      show_Re=show_Re,
-      from_dp=from_dp,
-      diameter=diameter_h,
-      reg_m_flow_small=m_flow_small,
-      m_flow_small=m_flow_small,
-      use_nominal=use_eta_nominal or use_d_nominal) 
-      annotation (Placement(transformation(extent={{-60,-30},{-40,-10}},
-            rotation=0)));
-    Modelica_Fluid.Volumes.Volume volume(
-      redeclare package Medium = Medium,
-      initType=initType,
-      p_start=(p_a_start+p_b_start)/2,
-      use_T_start=use_T_start,
-      T_start=T_start,
-      h_start=h_start,
-      X_start=X_start,
-      dynamicsType=dynamicsType,
-      V=V,
-      nPorts=2,
-      portDiameters={0,0},
-      neglectPortDiameters=true) 
-      annotation (Placement(transformation(extent={{-10,-30},{10,-10}},rotation=
-             0)));
-    Modelica_Fluid.PressureLosses.WallFrictionAndGravity wallFriction2(
-      redeclare package Medium = Medium,
-      allowFlowReversal=allowFlowReversal,
-      redeclare package WallFriction = WallFriction,
-      length=length/2,
-      height_ab=height_ab/2,
-      roughness=roughness,
-      eta_nominal=eta_nominal,
-      d_nominal=d_nominal,
-      dp_small=dp_small,
-      dp_start = (p_a_start - p_b_start)/2,
-      m_flow_start = m_flow_start,
-      compute_T=false,
-      show_Re=show_Re,
-      from_dp=from_dp,
-      m_flow_small=m_flow_small,
-      diameter=diameter_h,
-      reg_m_flow_small=m_flow_small,
-      use_nominal=use_eta_nominal or use_d_nominal) 
-                                    annotation (Placement(transformation(extent={{40,-30},
-              {60,-10}},         rotation=0)));
-    Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a heatPort 
-      annotation (Placement(transformation(extent={{-10,44},{10,64}}, rotation=
-              0)));
-  equation
-    connect(wallFriction1.port_a, port_a) 
-      annotation (Line(points={{-60,-20},{-80,-20},{-80,0},{-100,0}},
-                                                  color={0,127,255}));
-    connect(wallFriction2.port_b, port_b) 
-      annotation (Line(points={{60,-20},{80,-20},{80,0},{100,0}},
-                                                color={0,127,255}));
-    connect(heatPort, heatTransfer.wallHeatPort[1]) annotation (Line(
-        points={{0,54},{0,34}},
-        color={191,0,0},
-        smooth=Smooth.None));
-    connect(heatTransfer.fluidHeatPort[1], volume.heatPort) annotation (Line(
-        points={{0,8},{0,-10.2}},
-        color={191,0,0},
-        smooth=Smooth.None));
-    annotation (defaultComponentName="pipe",Icon(coordinateSystem(
-          preserveAspectRatio=false,
-          extent={{-100,-100},{100,100}},
-          grid={1,1}), graphics={Ellipse(
-            extent={{-10,10},{10,-10}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid)}),Documentation(info="<html>
-<p>
-Simple pipe model consisting of one volume, 
-wall friction (with different friction correlations)
-and gravity effect. This model is mostly used to demonstrate how
-to build up more detailed models from the basic components.
-Note, if the \"heatPort\" is not connected, then the pipe
-is totally insulated (= no thermal flow from the fluid to the
-pipe wall/environment).
-</p>
-</html>"),
-      Diagram(coordinateSystem(
-          preserveAspectRatio=true,
-          extent={{-100,-100},{100,100}},
-          grid={1,1}), graphics));
-    connect(wallFriction1.port_b, volume.ports[1]) annotation (Line(
-        points={{-40,-20},{-25,-20},{-25,-40},{0,-40},{0,-28}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(wallFriction2.port_a, volume.ports[2]) annotation (Line(
-        points={{40,-20},{24,-20},{24,-40},{0,-40},{0,-32}},
-        color={0,127,255},
-        smooth=Smooth.None));
-  end LumpedPipe_Old;
-
- model DistributedPipeLumpedPressure_Old
-    "Distributed pipe model with lumped pressure state"
-    import Modelica_Fluid.Types.ModelStructure;
-   extends Modelica_Fluid.Pipes.BaseClasses.PartialDistributedFlow_Old(
-     Qs_flow=heatTransfer.Q_flow,
-     final port_a_exposesState = (modelStructure == ModelStructure.av_b) or (modelStructure == ModelStructure.avb),
-     final port_b_exposesState = (modelStructure == ModelStructure.a_vb) or (modelStructure == ModelStructure.avb));
-
-   parameter Types.ModelStructure modelStructure=Types.ModelStructure.a_v_b
-      "Determines whether flow or volume models are present at the ports"                             annotation(Evaluate=true);
-
-   final parameter Integer nl=integer(n/2)+1
-      "Number of control volume that contains single pressure state"                  annotation(Evaluate=true);
-
-   final parameter SI.Pressure[2] dp_start = {p_a_start - p_start[nl], p_start[nl] - p_b_start};
-   SI.Pressure[2] dp(start=dp_start)
-      "Pressure difference across staggered grid";
-
-   SI.ReynoldsNumber[n+1] Re=Modelica_Fluid.Utilities.ReynoldsNumber_m_flow(
-       m_flow,
-       (cat(1, {eta_a}, eta) + cat(1, eta, {eta_b}))*0.5,
-       diameter) if                                                                                              show_Re
-      "Reynolds number of pipe flow";
-   HeatTransfer heatTransfer(
-     redeclare final package Medium = Medium,
-     final n=nNodes,
-     diameter=4*crossArea/perimeter,
-     area=perimeter*length,
-     final crossArea=crossArea,
-     final length=length,
-     state=medium.state,
-     m_flow = 0.5*(m_flow[1:n]+m_flow[2:n+1])) "Edit heat transfer parameters" 
-             annotation (Placement(transformation(extent={{-20,-5},{20,35}},  rotation=0)));
-
-   SI.Length[2] dlength "discretized length for pressure drop";
-   SI.Length[2] dheight_ab "discretized height_ab for static head";
-
-  protected
-   SI.DynamicViscosity eta_a=if not WallFriction.use_eta then 1.e-10 else (if 
-       use_eta_nominal then eta_nominal else (if use_approxPortProperties then Medium.dynamicViscosity(medium[1].state) else Medium.dynamicViscosity(Medium.setState_phX(port_a.p, inStream(port_a.h_outflow), inStream(port_a.Xi_outflow)))));
-   SI.DynamicViscosity eta_b=if not WallFriction.use_eta then 1.e-10 else (if use_eta_nominal then eta_nominal else (if use_approxPortProperties then Medium.dynamicViscosity(medium[n].state) else Medium.dynamicViscosity(Medium.setState_phX(port_b.p, inStream(port_b.h_outflow), inStream(port_b.Xi_outflow)))));
-
- equation
-   // Only one connection allowed to a port to avoid unwanted ideal mixing
-   assert(cardinality(port_a) <= 1 or (modelStructure == ModelStructure.a_vb) or (modelStructure == ModelStructure.a_v_b),"
-port_a exposing volume with selected modelStructure shall at most be connected to one component.
-If two or more connections are present, ideal mixing takes
-place with these connections which is usually not the intention
-of the modeller. Use a Junctions.MultiPort.
-");
-   assert(cardinality(port_b) <= 1 or (modelStructure == ModelStructure.av_b) or (modelStructure == ModelStructure.a_v_b),"
-port_b exposing volume with selected modelStructure shall at most be connected to one component.
-If two or more connections are present, ideal mixing takes
-place with these connections which is usually not the intention
-of the modeller. Use a Junctions.MultiPort.
-");
-
-   Ws_flow=zeros(n);
-   fluidVolume=ones(n)*V/n;
-
-   //Momentum Balance, dp contains contributions from acceleration, gravitational and friction effects
-   //two momentum balances, one on each side of pressure state
-   dp = {port_a.p - p[nl], p[nl] - port_b.p};
-   //lumped pressure
-   p[1]*ones(n-1) = p[2:n];
-
-   if modelStructure == ModelStructure.a_v_b then
-     dlength[1] = ((integer(n/2) + 1)*2 - 1)/(2*n)*length;
-     dlength[2] = (2*n - (integer(n/2) + 1)*2 + 1)/(2*n)*length;
-   elseif modelStructure == ModelStructure.av_b then
-     dlength = {0, length};
-   elseif modelStructure == ModelStructure.a_vb then
-     dlength = {length, 0};
-   else // avb
-     dlength = {0, 0};
-   end if;
-   dheight_ab = dlength/length*height_ab;
-
-  if from_dp and not WallFriction.dp_is_zero then
-    if port_a_exposesState then
-      port_a.p = p[1];
-    else
-      m_flow[1] = WallFriction.massFlowRate_dp_staticHead(
-        dp[1],
-        d_a,
-        d_b,
-        eta_a,
-        eta_b,
-        dlength[1],
-        diameter_h,
-        dheight_ab[1]*system.g,
-        roughness,
-        dp_small);
-    end if;
-    if port_b_exposesState then
-      port_b.p = p[n];
-    else
-      m_flow[n + 1] = WallFriction.massFlowRate_dp_staticHead(
-        dp[2],
-        d_a,
-        d_b,
-        eta_a,
-        eta_b,
-        dlength[2],
-        diameter_h,
-        dheight_ab[2]*system.g,
-        roughness,
-        dp_small);
-     end if;
-  else
-    if port_a_exposesState then
-      port_a.p = p[1];
-    else
-      dp[1] = WallFriction.pressureLoss_m_flow_staticHead(
-        m_flow[1],
-        d_a,
-        d_b,
-        eta_a,
-        eta_b,
-        dlength[1],
-        diameter_h,
-        dheight_ab[1]*system.g,
-        roughness,
-        m_flow_small);
-    end if;
-    if port_b_exposesState then
-      port_b.p = p[n];
-    else
-      dp[2] = WallFriction.pressureLoss_m_flow_staticHead(
-        m_flow[n+1],
-        d_a,
-        d_b,
-        eta_a,
-        eta_b,
-        dlength[2],
-        diameter_h,
-        dheight_ab[2]*system.g,
-        roughness,
-        m_flow_small);
-    end if;
-  end if;
-
-   connect(heatPorts, heatTransfer.wallHeatPort) 
-     annotation (Line(points={{0,54},{0,29}}, color={191,0,0}));
-   annotation (defaultComponentName="pipe",
-     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,
-              100}},
-          grid={1,1}), graphics={
-          Ellipse(
-            extent={{-72,10},{-52,-10}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},