Changeset 1940

Timestamp:

12/03/2008 08:52:48 AM (5 weeks ago)

Author:

rfranke

Message:

Junctions

• new BaseClasses.PartialTJunction
• rename JunctionVolume TJunctionVolume
• rename JunctionIdeal to IdealTJunction

Volumes

• rename ClosedVolume to Volume
• new BaseClasses.PartialDistributedVolume

Pipes

• remove BaseClasses.PartialDynamicFlow
• rename PartialTwoPortFlow to PartialPipe

TestOverdeterminedSteadyStateInit

• add simple example using DistributedPipeLumpedPressure

Location:

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid

Files:

• Examples/AST_BatchPlant.mo (modified) (7 diffs)
• Interfaces.mo (modified) (6 diffs)
• Junctions.mo (modified) (5 diffs)
• Pipes.mo (modified) (10 diffs)
• PressureLosses.mo (modified) (2 diffs)
• Pumps.mo (modified) (1 diff)
• Test/TestComponents/Junctions/TestJunctionIdeal.mo (modified) (1 diff)
• Test/TestComponents/Junctions/TestJunctionVolume.mo (modified) (1 diff)
• Test/TestComponents/Pipes/TestDistributedPipe01.mo (modified) (15 diffs)
• Test/TestComponents/Sensors/TestOnePortSensors1.mo (modified) (2 diffs)
• Test/TestComponents/Sensors/TestOnePortSensors2.mo (modified) (4 diffs)
• Test/TestComponents/Sensors/TestTemperatureSensor.mo (modified) (1 diff)
• Test/TestComponents/Volumes/TestClosedVolume.mo (modified) (1 diff)
• Test/TestComponents/Volumes/TestMixingVolumes.mo (modified) (2 diffs)
• Test/TestComponents/Volumes/TestMixingVolumesPressureStates.mo (modified) (2 diffs)
• Test/TestCriticalCases.mo (modified) (10 diffs)
• Test/TestOverdeterminedSteadyStateInit.mo (modified) (2 diffs)
• Volumes.mo (modified) (11 diffs)

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

@@ -149 +149 @@
       annotation (Placement(transformation(extent={{-114,210},{-134,230}},
             rotation=0)));
-    Junctions.JunctionIdeal volume2(
+    Modelica_Fluid.Junctions.IdealTJunction volume2(
       redeclare package Medium = BatchMedium) 
                annotation (Placement(transformation(
@@ -161 +161 @@
       annotation (Placement(transformation(extent={{112,210},{132,230}},
             rotation=0)));
-    Junctions.JunctionIdeal volume8(
+    Modelica_Fluid.Junctions.IdealTJunction volume8(
       redeclare package Medium = BatchMedium) 
                annotation (Placement(transformation(
@@ -191 +191 @@
           extent={{-10,10},{10,-10}},
           rotation=90)));
-    Modelica_Fluid.Volumes.ClosedVolume volume1(
+    Modelica_Fluid.Volumes.Volume volume1(
       redeclare package Medium = BatchMedium,
       initType=Modelica_Fluid.Types.Init.InitialValues,
@@ -226 +226 @@
           extent={{10,-10},{-10,10}},
           rotation=270)));
-    Modelica_Fluid.Volumes.ClosedVolume volume7(
+    Modelica_Fluid.Volumes.Volume volume7(
       redeclare package Medium = BatchMedium,
       initType=Modelica_Fluid.Types.Init.InitialValues,
@@ -279 +279 @@
           extent={{10,10},{-10,-10}},
           rotation=180)));
-    Modelica_Fluid.Examples.AST_BatchPlant.BaseClasses.JunctionVolume volume5(
+    BaseClasses.JunctionVolume volume5(
       redeclare package Medium = BatchMedium,
       initType=Modelica_Fluid.Types.Init.InitialValues,
@@ -2357 +2357 @@
       SI.Mass[Medium.nXi] mXi "Independent masses";
 
-      Interfaces.FluidStatePorts_a[nPorts_a] ports_a(
+      Interfaces.FluidPorts_a[nPorts_a] ports_a(
         redeclare each package Medium=Medium,
         m_flow(each min=if allowFlowReversal then -Constants.inf else 0))
@@ -2363 +2363 @@
         annotation (Placement(
             transformation(extent={{-110,40},{-90,-40}}, rotation=0)));
-      Interfaces.FluidStatePorts_b[nPorts_b] ports_b(
+      Interfaces.FluidPorts_b[nPorts_b] ports_b(
         redeclare each package Medium=Medium,
         m_flow(each max=if allowFlowReversal then +Constants.inf else 0))

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/Interfaces.mo

@@ -116 +116 @@
   end FluidPort_b;
 
-  connector FluidStatePort_a
-    "Fluid connector at design inlet with potential pressure state"
-    extends FluidPort;
-    annotation (defaultComponentName="port_a",
-                Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-              -100},{100,100}}), graphics={Ellipse(
-            extent={{-40,40},{40,-40}},
-            lineColor={0,0,255},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid), Text(extent={{-150,110},{150,50}},
-              textString="%name")}),
-         Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
-              100,100}}), graphics={
-          Ellipse(
-            extent={{-100,100},{100,-100}},
-            lineColor={0,127,255},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-100,100},{100,-100}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-18,20},{22,-20}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid)}));
-  end FluidStatePort_a;
-
-  connector FluidStatePort_b
-    "Fluid connector at design outlet with potential pressure state"
-   extends FluidPort;
-    annotation (defaultComponentName="port_b",
-                Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-              -100},{100,100}}), graphics={
-          Ellipse(
-            extent={{-40,40},{40,-40}},
-            lineColor={0,0,255},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-30,30},{30,-30}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Text(extent={{-150,110},{150,50}}, textString="%name")}),
-         Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
-              100,100}}), graphics={
-          Ellipse(
-            extent={{-100,100},{100,-100}},
-            lineColor={0,127,255},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-100,100},{100,-100}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-80,80},{80,-80}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-18,20},{22,-20}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid)}));
-  end FluidStatePort_b;
-
   connector FluidPorts_a
     "Fluid connector with filled, large icon to be used for vectors of FluidPorts (vector dimensions must be added after dragging)"
@@ -331 +260 @@
   end FluidPorts_b;
 
-  connector FluidStatePorts_a
-    "Fluid connector with filled, large icon to be used for vectors of FluidPorts (vector dimensions must be added after dragging)"
-    extends FluidPort;
-    annotation (defaultComponentName="ports_a",
-                Diagram(coordinateSystem(
-          preserveAspectRatio=false,
-          extent={{-50,-200},{50,200}},
-          grid={1,1},
-          initialScale=0.2), graphics={
-          Text(extent={{-75,130},{75,100}}, textString="%name"),
-          Rectangle(
-            extent={{-25,100},{25,-100}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-25,90},{25,40}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-25,25},{25,-25}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-25,-40},{25,-90}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid)}),
-         Icon(coordinateSystem(
-          preserveAspectRatio=false,
-          extent={{-50,-200},{50,200}},
-          grid={1,1},
-          initialScale=0.2), graphics={
-          Rectangle(
-            extent={{-50,200},{50,-200}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,180},{50,80}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,50},{50,-50}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,-80},{50,-180}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-20,150},{20,110}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-20,20},{20,-20}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-19,-111},{21,-151}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid)}));
-  end FluidStatePorts_a;
-
-  connector FluidStatePorts_b
-    "Fluid connector with outlined, large icon to be used for vectors of FluidPorts (vector dimensions must be added after dragging)"
-    extends FluidPort;
-    annotation (defaultComponentName="ports_b",
-                Diagram(coordinateSystem(
-          preserveAspectRatio=false,
-          extent={{-50,-200},{50,200}},
-          grid={1,1},
-          initialScale=0.2), graphics={
-          Text(extent={{-75,130},{75,100}}, textString="%name"),
-          Rectangle(
-            extent={{-25,100},{25,-100}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-25,90},{25,40}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-25,25},{25,-25}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-25,-40},{25,-90}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-15,-50},{15,-80}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-15,15},{15,-15}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-15,50},{15,80}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid)}),
-         Icon(coordinateSystem(
-          preserveAspectRatio=false,
-          extent={{-50,-200},{50,200}},
-          grid={1,1},
-          initialScale=0.2), graphics={
-          Rectangle(
-            extent={{-50,200},{50,-200}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,180},{50,80}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,50},{50,-50}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-50,-80},{50,-180}},
-            lineColor={0,0,0},
-            fillColor={0,127,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-45,44},{45,-44}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-43,88},{43,172}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-43,-84},{45,-175}},
-            lineColor={0,127,255},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-20,151},{20,111}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-20,21},{20,-19}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid),
-          Ellipse(
-            extent={{-19,-110},{21,-150}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid)}));
-  end FluidStatePorts_b;
-
   connector HeatPorts_a
     "HeatPort connector with filled, large icon to be used for vectors of HeatPorts (vector dimensions must be added after dragging)"
@@ -570 +325 @@
     import Modelica.Constants;
     outer Modelica_Fluid.System system "System wide properties";
+
     replaceable package Medium = 
         Modelica.Media.Interfaces.PartialMedium "Medium in the component" 
         annotation (choicesAllMatching = true);
 
-    // Assumptions
     parameter Boolean allowFlowReversal = system.allowFlowReversal
       "= true to allow flow reversal, false restricts to design direction (port_a -> port_b)"
@@ -591 +346 @@
       annotation (Placement(transformation(extent={{110,-10},{90,10}}, rotation=
                0), iconTransformation(extent={{110,-10},{90,10}})));
-
     // Model structure, e.g. used for visualization
   protected
@@ -598 +352 @@
     parameter Boolean port_b_exposesState = false
       "= true if port_b.p exposes the state of a fluid volume";
+
     annotation (
       Diagram(coordinateSystem(
@@ -607 +362 @@
 This partial model defines an interface for components with two ports. 
 The components may transport fluid and have internal storage. 
-The treatment of design flow direction and flow reversal are predefined.
+The treatment of design flow direction and flow reversal are predefined. The variable
 </p>
+<ul>
+<li><tt>m_flow</tt> defines the mass flow rate in design direction, which is port_a.m_flow.</li> 
+</ul>
 <p>
 A derived component providing direct access to internal storage of mass or energy through port_a or port_b 

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/Junctions.mo

@@ -3 +3 @@
   extends Modelica_Fluid.Icons.VariantLibrary;
 
-  model JunctionIdeal
+  model IdealTJunction
     "Splitting/joining component with static balances for an infinitesimal control volume"
-    import Modelica_Fluid.Types;
-    import Modelica_Fluid.Types.PortFlowDirection;
-
-    replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
-      "Fluid medium model" 
-      annotation (choicesAllMatching=true);
-
-    Modelica_Fluid.Interfaces.FluidPort_a port_1(redeclare package Medium = 
-          Medium, m_flow(min=if (portFlowDirection_1 == PortFlowDirection.Entering) then 
-                  0.0 else -Modelica.Constants.inf, max=if (portFlowDirection_1
-             == PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
-      annotation (Placement(transformation(extent={{-110,-10},{-90,10}},
-            rotation=0)));
-    Modelica_Fluid.Interfaces.FluidPort_b port_2(redeclare package Medium = 
-          Medium, m_flow(min=if (portFlowDirection_2 == PortFlowDirection.Entering) then 
-                  0.0 else -Modelica.Constants.inf, max=if (portFlowDirection_2
-             == PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
-      annotation (Placement(transformation(extent={{90,-10},{110,10}}, rotation=
-             0)));
-    Modelica_Fluid.Interfaces.FluidPort_a port_3(
-      redeclare package Medium=Medium,
-      m_flow(min=if (portFlowDirection_3==PortFlowDirection.Entering) then 0.0 else -Modelica.Constants.inf,
-      max=if (portFlowDirection_3==PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
-      annotation (Placement(transformation(extent={{-10,90},{10,110}}, rotation=
-             0)));
+    extends BaseClasses.PartialTJunction;
+
+  equation
+    connect(port_1, port_2) annotation (Line(
+        points={{-100,0},{100,0}},
+        color={0,127,255},
+        smooth=Smooth.None));
+    connect(port_1, port_3) annotation (Line(
+        points={{-100,0},{0,0},{0,100}},
+        color={0,127,255},
+        smooth=Smooth.None));
 
     annotation(Documentation(info="<html>
@@ -44 +30 @@
           preserveAspectRatio=false,
           extent={{-100,-100},{100,100}},
-          grid={1,1}), graphics={
-          Rectangle(
-            extent={{-100,41},{100,-47}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.HorizontalCylinder,
-            fillColor={192,192,192}),
-          Rectangle(
-            extent={{-100,37},{100,-43}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.HorizontalCylinder,
-            fillColor={0,127,255}),
-          Rectangle(
-            extent={{-34,100},{34,37}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.VerticalCylinder,
-            fillColor={192,192,192}),
-          Rectangle(
-            extent={{-30,100},{30,35}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.VerticalCylinder,
-            fillColor={0,127,255}),
-          Text(
-            extent={{-150,-60},{150,-100}},
-            lineColor={0,0,255},
-            textString="%name")}),
+          grid={1,1}), graphics),
       Diagram(coordinateSystem(
           preserveAspectRatio=false,
           extent={{-100,-100},{100,100}},
           grid={1,1}), graphics));
-
-  protected
-    parameter PortFlowDirection portFlowDirection_1=PortFlowDirection.Bidirectional
-      "Flow direction for port_1" 
-     annotation(Dialog(tab="Advanced"));
-    parameter PortFlowDirection portFlowDirection_2=PortFlowDirection.Bidirectional
-      "Flow direction for port_2" 
-     annotation(Dialog(tab="Advanced"));
-    parameter PortFlowDirection portFlowDirection_3=PortFlowDirection.Bidirectional
-      "Flow direction for port_3" 
-     annotation(Dialog(tab="Advanced"));
-
-  equation
-    connect(port_1, port_2) annotation (Line(
-        points={{-100,0},{100,0}},
-        color={0,127,255},
-        smooth=Smooth.None));
-    connect(port_1, port_3) annotation (Line(
-        points={{-100,0},{0,0},{0,100}},
-        color={0,127,255},
-        smooth=Smooth.None));
-  end JunctionIdeal;
+  end IdealTJunction;
 
   annotation (Documentation(info="<html>
  
 </html>"));
-  model JunctionVolume
+  model TJunctionVolume
     "Splitting/joining component with static balances for a dynamic control volume"
+    extends BaseClasses.PartialTJunction;
     extends Volumes.BaseClasses.PartialLumpedVolume;
-    import Modelica_Fluid.Types;
-    import Modelica_Fluid.Types.PortFlowDirection;
-
-    parameter SI.Volume V "Volume";
-
-    Modelica_Fluid.Interfaces.FluidPort_a port_1(
-      redeclare package Medium=Medium,
-      m_flow(min=if (portFlowDirection_1==PortFlowDirection.Entering) then 0.0 else -Modelica.Constants.inf,
-      max=if (portFlowDirection_1==PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
-      annotation (Placement(transformation(extent={{-110,-10},{-90,10}},
-            rotation=0)));
-    Modelica_Fluid.Interfaces.FluidPort_b port_2(
-      redeclare package Medium=Medium,
-      m_flow(min=if (portFlowDirection_2==PortFlowDirection.Entering) then 0.0 else -Modelica.Constants.inf,
-      max=if (portFlowDirection_2==PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
-      annotation (Placement(transformation(extent={{90,-10},{110,10}}, rotation=
-             0)));
-    Modelica_Fluid.Interfaces.FluidPort_a port_3(
-      redeclare package Medium=Medium,
-      m_flow(min=if (portFlowDirection_3==PortFlowDirection.Entering) then 0.0 else -Modelica.Constants.inf,
-      max=if (portFlowDirection_3==PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
-      annotation (Placement(transformation(extent={{-10,90},{10,110}}, rotation=
-             0)));
-
-  protected
-    parameter PortFlowDirection portFlowDirection_1=PortFlowDirection.Bidirectional
-      "Flow direction for port_1" 
-     annotation(Dialog(tab="Advanced"));
-    parameter PortFlowDirection portFlowDirection_2=PortFlowDirection.Bidirectional
-      "Flow direction for port_2" 
-     annotation(Dialog(tab="Advanced"));
-    parameter PortFlowDirection portFlowDirection_3=PortFlowDirection.Bidirectional
-      "Flow direction for port_3" 
-     annotation(Dialog(tab="Advanced"));
-
-    annotation (Icon(coordinateSystem(
-          preserveAspectRatio=true,
-          extent={{-100,-100},{100,100}},
-          grid={1,1}), graphics={
-          Rectangle(
-            extent={{-100,41},{100,-47}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.HorizontalCylinder,
-            fillColor={192,192,192}),
-          Rectangle(
-            extent={{-100,37},{100,-43}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.HorizontalCylinder,
-            fillColor={0,127,255}),
-          Rectangle(
-            extent={{-34,100},{34,37}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.VerticalCylinder,
-            fillColor={192,192,192}),
-          Rectangle(
-            extent={{-30,100},{30,35}},
-            lineColor={0,0,0},
-            fillPattern=FillPattern.VerticalCylinder,
-            fillColor={0,127,255}),
-          Ellipse(
-            extent={{-9,10},{11,-10}},
-            lineColor={0,0,0},
-            fillColor={0,0,0},
-            fillPattern=FillPattern.Solid),
-          Text(
-            extent={{-150,-60},{150,-100}},
-            lineColor={0,0,255},
-            textString="%name")}),
-      Diagram(coordinateSystem(
-          preserveAspectRatio=false,
-          extent={{-100,-100},{100,100}},
-          grid={1,1}), graphics));
+
+    parameter SI.Volume V "Mixing volume inside junction";
 
   equation
@@ -208 +80 @@
     fluidVolume = V;
     ms_flow = port_1.m_flow + port_2.m_flow + port_3.m_flow "Mass balance";
-    mXis_flow = port_1.m_flow*actualStream(port_1.Xi_outflow)
+    msXi_flow = port_1.m_flow*actualStream(port_1.Xi_outflow)
                 + port_2.m_flow*actualStream(port_2.Xi_outflow)
                 + port_3.m_flow*actualStream(port_3.Xi_outflow)
@@ -229 +101 @@
     Ws_flow = 0;
     Qs_flow = 0;
-  end JunctionVolume;
+
+    annotation (Documentation(info="<html>
+  This model introduces a mixing volume into a junction. 
+  This might be useful to examine the non-ideal mixing taking place in a real junction.</html>"),
+  Icon(coordinateSystem(
+          preserveAspectRatio=true,
+          extent={{-100,-100},{100,100}},
+          grid={1,1}), graphics={Ellipse(
+            extent={{-9,10},{11,-10}},
+            lineColor={0,0,0},
+            fillColor={0,0,0},
+            fillPattern=FillPattern.Solid)}),
+      Diagram(coordinateSystem(
+          preserveAspectRatio=false,
+          extent={{-100,-100},{100,100}},
+          grid={1,1}), graphics));
+  end TJunctionVolume;
 
   model MultiPort
@@ -323 +211 @@
   end MultiPort;
 
+  package BaseClasses "Base classes for junctions"
+    extends Modelica_Fluid.Icons.BaseClassLibrary;
+
+    partial model PartialTJunction
+      "Base class for a splitting/joining component with three ports"
+      import Modelica_Fluid.Types;
+      import Modelica_Fluid.Types.PortFlowDirection;
+
+      replaceable package Medium=Modelica.Media.Interfaces.PartialMedium
+        "Fluid medium model" 
+        annotation (choicesAllMatching=true);
+
+      Modelica_Fluid.Interfaces.FluidPort_a port_1(redeclare package Medium = 
+            Medium, m_flow(min=if (portFlowDirection_1 == PortFlowDirection.Entering) then 
+                    0.0 else -Modelica.Constants.inf, max=if (portFlowDirection_1
+               == PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
+        annotation (Placement(transformation(extent={{-110,-10},{-90,10}},
+              rotation=0)));
+      Modelica_Fluid.Interfaces.FluidPort_b port_2(redeclare package Medium = 
+            Medium, m_flow(min=if (portFlowDirection_2 == PortFlowDirection.Entering) then 
+                    0.0 else -Modelica.Constants.inf, max=if (portFlowDirection_2
+               == PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
+        annotation (Placement(transformation(extent={{90,-10},{110,10}}, rotation=
+               0)));
+      Modelica_Fluid.Interfaces.FluidPort_a port_3(
+        redeclare package Medium=Medium,
+        m_flow(min=if (portFlowDirection_3==PortFlowDirection.Entering) then 0.0 else -Modelica.Constants.inf,
+        max=if (portFlowDirection_3==PortFlowDirection.Leaving) then 0.0 else Modelica.Constants.inf)) 
+        annotation (Placement(transformation(extent={{-10,90},{10,110}}, rotation=
+               0)));
+
+      annotation(Icon(coordinateSystem(
+            preserveAspectRatio=false,
+            extent={{-100,-100},{100,100}},