Changeset 1948

Timestamp:

12/05/2008 01:58:54 AM (5 weeks ago)

Author:

mwetter

Message:

Added trace substances C as a parameter and/or input signal.
Provided default values for enthalpy and pressure in existing source models.
Moved RealInput instances to make space for C_in input.
Added test model for C as a source.

Location:

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid

Files:

• Sources.mo (modified) (48 diffs)
• Test/TestComponents/Sources/TestSources.mo (added)

Modelica_Fluid/branches/StreamConnector/Modelica_Fluid/Sources.mo

@@ -30 +30 @@
       annotation (Dialog(group = "Only for multi-substance flow", enable=Medium.nXi > 0));
 
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Dialog(group = "Only for trace-substance flow", enable=Medium.nC > 0));
+
     annotation (defaultComponentName="boundary",
       Icon(coordinateSystem(
@@ -49 +54 @@
 <li> Boundary pressure or boundary density.</li>
 <li> Boundary temperature or boundary specific enthalpy.</li>
-<li> Boundary composition (only for multi-substance flow).</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
 </ul>
 <p>
-Note, that boundary temperature, density, specific enthalpy
-and mass fractions have only an effect if the mass flow
+Note, that boundary temperature, density, specific enthalpy,
+mass fractions and trace substances have only an effect if the mass flow
 is from the Boundary into the port. If mass is flowing from
 the port into the boundary, the boundary definitions,
@@ -76 +81 @@
 
     medium.Xi = X[1:Medium.nXi];
+
+    ports.C_outflow = fill(C, nPorts);
   end FixedBoundary;
 
   model FixedBoundary_pTX
-    "Boundary pressure, temperature and mass fraction source"
+    "Boundary pressure, temperature, mass fraction and trace substances source"
     extends Sources.BaseClasses.PartialSource;
-    parameter Medium.AbsolutePressure p "Boundary pressure";
-    parameter Medium.Temperature T "Boundary temperature";
+    parameter Medium.AbsolutePressure p=Medium.p_default "Boundary pressure";
+    parameter Medium.Temperature T=Medium.T_default "Boundary temperature";
     parameter Medium.MassFraction X[Medium.nX](
          quantity=Medium.substanceNames) = Medium.X_default
@@ -88 +95 @@
       annotation (Dialog(group = "Only for multi-substance flow",
                   enable=Medium.nXi > 0));
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Dialog(group = "Only for trace-substance flow", enable=Medium.nC > 0));
     annotation (defaultComponentName="boundary",
       Icon(coordinateSystem(
@@ -107 +118 @@
 <li> Boundary pressure.</li>
 <li> Boundary temperature.</li>
-<li> Boundary composition (only for multi-substance flow).</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
 </ul>
 <p>
-Note, that boundary temperature
-and mass fractions have only an effect if the mass flow
+Note, that boundary temperature,
+mass fractions and trace substances have only an effect if the mass flow
 is from the boundary into the port. If mass is flowing from
 the port into the boundary, the boundary definitions,
@@ -123 +134 @@
     medium.T   = T;
     medium.Xi = X[1:Medium.nXi];
+    ports.C_outflow = fill(C, nPorts);
   end FixedBoundary_pTX;
 
   model FixedBoundary_phX
-    "Boundary pressure, specific enthalpy and mass fraction source"
+    "Boundary pressure, specific enthalpy, mass fraction and trace substances source"
     extends Sources.BaseClasses.PartialSource;
-    parameter Medium.AbsolutePressure p "Boundary pressure";
-    parameter Medium.SpecificEnthalpy h "Boundary specific enthalpy";
+    parameter Medium.AbsolutePressure p=Medium.p_default "Boundary pressure";
+    parameter Medium.SpecificEnthalpy h=Medium.h_default
+      "Boundary specific enthalpy";
     parameter Medium.MassFraction X[
       Medium.nX](quantity=Medium.substanceNames) = Medium.X_default
       "Boundary mass fractions m_i/m"  annotation (Dialog(group=
             "Only for multi-substance flow", enable=Medium.nXi > 0));
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Dialog(group = "Only for trace-substance flow", enable=Medium.nC > 0));
     annotation (defaultComponentName="boundary",
       Icon(coordinateSystem(
@@ -153 +170 @@
 <li> Boundary pressure.</li>
 <li> Boundary specific enthalpy.</li>
-<li> Boundary composition (only for multi-substance flow).</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
 </ul>
 <p>
-Note, that boundary specific enthalpy
-and mass fractions have only an effect if the mass flow
+Note, that boundary specific enthalpy,
+mass fractions and trace substances have only an effect if the mass flow
 is from the boundary into the port. If mass is flowing from
 the port into the boundary, the boundary definitions,
@@ -169 +186 @@
     medium.h = h;
     medium.Xi = X[1:Medium.nXi];
+    ports.C_outflow = fill(C, nPorts);
   end FixedBoundary_phX;
 
@@ -178 +196 @@
 </html>"));
   model PrescribedBoundary_pTX
-    "Boundary with prescribed pressure, temperature and composition"
+    "Boundary with prescribed pressure, temperature, composition and trace substances"
     extends Sources.BaseClasses.PartialSource;
     parameter Boolean usePressureInput = false
@@ -189 +207 @@
       "Get the composition from the input connector" 
       annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
+    parameter Boolean useTraceInput = false
+      "Get the trace substances from the input connector" 
+      annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
     parameter Medium.AbsolutePressure p = Medium.p_default
       "Fixed value of pressure" 
@@ -201 +222 @@
       annotation (Evaluate = true,
                   Dialog(enable = (not useCompositionInput) and Medium.nXi > 0));
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Evaluate=true,
+                  Dialog(enable = (not useTraceInput) and Medium.nC > 0));
     Modelica.Blocks.Interfaces.RealInput p_in if              usePressureInput
       "Prescribed boundary pressure" 
-      annotation (Placement(transformation(extent={{-140,40},{-100,80}},
+      annotation (Placement(transformation(extent={{-140,60},{-100,100}},
             rotation=0)));
     Modelica.Blocks.Interfaces.RealInput T_in if         useTemperatureInput
       "Prescribed boundary temperature" 
-      annotation (Placement(transformation(extent={{-140,-20},{-100,20}},
+      annotation (Placement(transformation(extent={{-140,20},{-100,60}},
             rotation=0)));
     Modelica.Blocks.Interfaces.RealInput X_in[Medium.nX] if 
                                                           useCompositionInput
       "Prescribed boundary composition" 
-      annotation (Placement(transformation(extent={{-140,-80},{-100,-40}},
+      annotation (Placement(transformation(extent={{-140,-60},{-100,-20}},
+            rotation=0)));
+    Modelica.Blocks.Interfaces.RealInput C_in[Medium.nC] if 
+                                                          useTraceInput
+      "Prescribed boundary trace substances" 
+      annotation (Placement(transformation(extent={{-140,-100},{-100,-60}},
             rotation=0)));
   protected
@@ -220 +251 @@
       "Needed to connect to conditional connector";
     Modelica.Blocks.Interfaces.RealInput X_in_internal[Medium.nX]
+      "Needed to connect to conditional connector";
+    Modelica.Blocks.Interfaces.RealInput C_in_internal[Medium.nC]
       "Needed to connect to conditional connector";
     annotation (defaultComponentName="boundary",
@@ -237 +270 @@
           Line(
             visible=usePressureInput,
-            points={{-100,60},{-80,60}},
+            points={{-100,80},{-58,80}},
+            color={0,0,255}),
+          Line(
+            visible=useTemperatureInput,
+            points={{-100,40},{-92,40}},
             color={0,0,255}),
           Line(
             visible=useCompositionInput,
-            points={{-100,-60},{-80,-60}},
+            points={{-100,-40},{-92,-40}},
             color={0,0,255}),
+          Line(
+            visible=useTraceInput,
+            points={{-100,-80},{-60,-80}},
+            color={0,0,255}),
           Text(
             visible=usePressureInput,
-            extent={{-146,110},{-62,70}},
+            extent={{-152,134},{-68,94}},
             lineColor={0,0,0},
             fillColor={255,255,255},
@@ -252 +293 @@
           Text(
             visible=useCompositionInput,
-            extent={{-160,-22},{-58,-62}},
+            extent={{-164,4},{-62,-36}},
             lineColor={0,0,0},
             fillColor={255,255,255},
@@ -258 +299 @@
             textString="X"),
           Text(
+            visible=useTraceInput,
+            extent={{-164,-90},{-62,-130}},
+            lineColor={0,0,0},
+            fillColor={255,255,255},
+            fillPattern=FillPattern.Solid,
+            textString="C"),
+          Text(
             visible=useTemperatureInput,
-            extent={{-158,44},{-56,4}},
+            extent={{-162,34},{-60,-6}},
             lineColor={0,0,0},
             fillColor={255,255,255},
@@ -271 +319 @@
 <li> Prescribed boundary pressure.</li>
 <li> Prescribed boundary temperature.</li>
-<li> Prescribed boundary composition (only for multi-substance flow).</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
 </ul>
 <p>If <tt>usePressureInput</tt> is false (default option), the <tt>p</tt> parameter
 is used as boundary pressure, and the <tt>p_in</tt> input connector is disabled; if <tt>usePressureInput</tt> is true, then the <tt>p</tt> parameter is ignored, and the value provided by the input connector is used instead.</p> 
-<p>The same thing goes for the temperature and composition</p>
-<p>
-Note, that boundary temperature
-and mass fractions have only an effect if the mass flow
+<p>The same thing goes for the temperature, composition and trace substances.</p>
+<p>
+Note, that boundary temperature,
+mass fractions and trace substances have only an effect if the mass flow
 is from the boundary into the port. If mass is flowing from
 the port into the boundary, the boundary definitions,
@@ -294 +342 @@
     connect(T_in, T_in_internal);
     connect(X_in, X_in_internal);
+    connect(C_in, C_in_internal);
     if not usePressureInput then
       p_in_internal = p;
@@ -302 +351 @@
     if not useCompositionInput then
       X_in_internal = X;
+    end if;
+    if not useTraceInput then
+      C_in_internal = C;
     end if;
     medium.p = p_in_internal;
     medium.T = T_in_internal;
     medium.Xi = X_in_internal[1:Medium.nXi];
+    ports.C_outflow = fill(C_in_internal, nPorts);
   end PrescribedBoundary_pTX;
 
   model PrescribedBoundary_phX
-    "Boundary with prescribed pressure, specific enthalpy and composition"
+    "Boundary with prescribed pressure, specific enthalpy, composition and trace substances"
     extends Sources.BaseClasses.PartialSource;
     parameter Boolean usePressureInput = false
@@ -320 +373 @@
       "Get the composition from the input connector" 
       annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
+    parameter Boolean useTraceInput = false
+      "Get the trace substances from the input connector" 
+      annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
     parameter Medium.AbsolutePressure p = Medium.p_default
       "Fixed value of pressure" 
@@ -332 +388 @@
       annotation (Evaluate = true,
                   Dialog(enable = (not useCompositionInput) and Medium.nXi > 0));
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Evaluate=true,
+                  Dialog(enable = (not useTraceInput) and Medium.nC > 0));
     Modelica.Blocks.Interfaces.RealInput p_in if              usePressureInput
       "Prescribed boundary pressure" 
-      annotation (Placement(transformation(extent={{-140,40},{-100,80}},
+      annotation (Placement(transformation(extent={{-140,60},{-100,100}},
             rotation=0)));
     Modelica.Blocks.Interfaces.RealInput h_in if              useEnthalpyInput
       "Prescribed boundary specific enthalpy" 
-      annotation (Placement(transformation(extent={{-140,-20},{-100,20}},
+      annotation (Placement(transformation(extent={{-140,20},{-100,60}},
             rotation=0)));
     Modelica.Blocks.Interfaces.RealInput X_in[Medium.nX] if 
                                                           useCompositionInput
       "Prescribed boundary composition" 
-      annotation (Placement(transformation(extent={{-140,-80},{-100,-40}},
+      annotation (Placement(transformation(extent={{-140,-60},{-100,-20}},
+            rotation=0)));
+    Modelica.Blocks.Interfaces.RealInput C_in[Medium.nC] if 
+                                                          useTraceInput
+      "Prescribed boundary trace substances" 
+      annotation (Placement(transformation(extent={{-140,-100},{-100,-60}},
             rotation=0)));
     annotation (defaultComponentName="boundary",
@@ -361 +427 @@
           Line(
             visible=usePressureInput,
-            points={{-100,60},{-66,60}},
+            points={{-100,80},{-60,80}},
+            color={0,0,255}),
+          Line(
+            visible=useEnthalpyInput,
+            points={{-100,40},{-92,40}},
             color={0,0,255}),
           Line(
             visible=useCompositionInput,
-            points={{-100,-60},{-66,-60}},
+            points={{-100,-40},{-92,-40}},
             color={0,0,255}),
+          Line(
+            visible=useTraceInput,
+            points={{-100,-80},{-60,-80}},
+            color={0,0,255}),
           Text(
             visible=usePressureInput,
-            extent={{-148,120},{-70,80}},
+            extent={{-150,134},{-72,94}},
             lineColor={0,0,0},
             fillColor={255,255,255},
@@ -376 +450 @@
           Text(
             visible=useEnthalpyInput,
-            extent={{-100,20},{2,-20}},
-            lineColor={255,255,255},
+            extent={{-166,34},{-64,-6}},
+            lineColor={0,0,0},
             fillColor={255,255,255},
             fillPattern=FillPattern.Solid,
@@ -383 +457 @@
           Text(
             visible=useCompositionInput,
-            extent={{-140,-86},{-38,-126}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid,
-            textString="X")}),
+            extent={{-164,4},{-62,-36}},
+            lineColor={0,0,0},
+            fillColor={255,255,255},
+            fillPattern=FillPattern.Solid,
+            textString="X"),
+          Text(
+            visible=useTraceInput,
+            extent={{-164,-90},{-62,-130}},
+            lineColor={0,0,0},
+            fillColor={255,255,255},
+            fillPattern=FillPattern.Solid,
+            textString="C")}),
       Documentation(info="<html>
 <p>
@@ -395 +476 @@
 <li> Prescribed boundary pressure.</li>
 <li> Prescribed boundary temperature.</li>
-<li> Prescribed boundary composition (only for multi-substance flow).</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
 </ul>
 <p>If <tt>usePressureInput</tt> is false (default option), the <tt>p</tt> parameter
@@ -401 +482 @@
 <p>The same thing goes for the specific enthalpy and composition</p>
 <p>
-Note, that boundary temperature
-and mass fractions have only an effect if the mass flow
+Note, that boundary temperature,
+mass fractions and trace substances have only an effect if the mass flow
 is from the boundary into the port. If mass is flowing from
 the port into the boundary, the boundary definitions,
@@ -414 +495 @@
       "Needed to connect to conditional connector";
     Modelica.Blocks.Interfaces.RealInput X_in_internal[Medium.nX]
+      "Needed to connect to conditional connector";
+    Modelica.Blocks.Interfaces.RealInput C_in_internal[Medium.nC]
       "Needed to connect to conditional connector";
   equation
@@ -421 +504 @@
     connect(h_in, h_in_internal);
     connect(X_in, X_in_internal);
+    connect(C_in, C_in_internal);
     if not usePressureInput then
       p_in_internal = p;
@@ -429 +513 @@
     if not useCompositionInput then
       X_in_internal = X;
+    end if;
+    if not useTraceInput then
+      C_in_internal = C;
     end if;
     medium.p = p_in_internal;
     medium.h = h_in_internal;
     medium.Xi = X_in_internal[1:Medium.nXi];
+    ports.C_outflow = fill(C_in_internal, nPorts);
   end PrescribedBoundary_phX;
 
   model PrescribedMassFlowRate_TX
-    "Ideal flow source that produces a prescribed mass flow with prescribed temperature and mass fraction"
+    "Ideal flow source that produces a prescribed mass flow with prescribed temperature, mass fraction and trace substances"
     extends Sources.BaseClasses.PartialSource;
     parameter Boolean useFlowRateInput = false
@@ -447 +535 @@
       "Get the composition from the input connector" 
       annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
+    parameter Boolean useTraceInput = false
+      "Get the trace substances from the input connector" 
+      annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
     parameter Medium.MassFlowRate m_flow = 0
       "Fixed mass flow rate going out of the fluid port" 
@@ -459 +550 @@
       annotation (Evaluate = true,
                   Dialog(enable = (not useCompositionInput) and Medium.nXi > 0));
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Evaluate=true,
+                  Dialog(enable = (not useTraceInput) and Medium.nC > 0));
     Modelica.Blocks.Interfaces.RealInput m_flow_in if     useFlowRateInput
       "Prescribed mass flow rate" 
-      annotation (Placement(transformation(extent={{-113,40},{-73,80}},
-            rotation=0)));
+      annotation (Placement(transformation(extent={{-120,60},{-80,100}},
+            rotation=0), iconTransformation(extent={{-120,60},{-80,100}})));
     Modelica.Blocks.Interfaces.RealInput T_in if         useTemperatureInput
       "Prescribed fluid temperature" 
-      annotation (Placement(transformation(extent={{-140,-20},{-100,20}},
-            rotation=0)));
+      annotation (Placement(transformation(extent={{-140,20},{-100,60}},
+            rotation=0), iconTransformation(extent={{-140,20},{-100,60}})));
     Modelica.Blocks.Interfaces.RealInput X_in[Medium.nX] if 
                                                           useCompositionInput
       "Prescribed fluid composition" 
-      annotation (Placement(transformation(extent={{-112,-81},{-72,-41}},
+      annotation (Placement(transformation(extent={{-140,-60},{-100,-20}},
+            rotation=0)));
+    Modelica.Blocks.Interfaces.RealInput C_in[Medium.nC] if 
+                                                          useTraceInput
+      "Prescribed boundary trace substances" 
+      annotation (Placement(transformation(extent={{-120,-100},{-80,-60}},
             rotation=0)));
   protected
@@ -479 +580 @@
     Modelica.Blocks.Interfaces.RealInput X_in_internal[Medium.nX]
       "Needed to connect to conditional connector";
+    Modelica.Blocks.Interfaces.RealInput C_in_internal[Medium.nC]
+      "Needed to connect to conditional connector";
     annotation (defaultComponentName="boundary",
       Icon(coordinateSystem(
-          preserveAspectRatio=false,
+          preserveAspectRatio=true,
           extent={{-100,-100},{100,100}},
           grid={1,1}), graphics={
@@ -521 +624 @@
           Text(
             visible=useFlowRateInput,
-            extent={{-194,112},{-54,80}},
+            extent={{-185,132},{-45,100}},
             lineColor={0,0,0},
             fillColor={255,255,255},
@@ -528 +631 @@
           Text(
             visible=useTemperatureInput,
-            extent={{-100,14},{-60,-20}},
+            extent={{-111,71},{-71,37}},
             lineColor={0,0,0},
             fillColor={255,255,255},
@@ -535 +638 @@
           Text(
             visible=useCompositionInput,
-            extent={{-144,-90},{-24,-118}},
-            lineColor={0,0,0},
-            fillColor={255,255,255},
-            fillPattern=FillPattern.Solid,
-            textString="X")}),
+            extent={{-153,-44},{-33,-72}},
+            lineColor={0,0,0},
+            fillColor={255,255,255},
+            fillPattern=FillPattern.Solid,
+            textString="X"),
+          Text(
+            visible=useTraceInput,
+            extent={{-155,-98},{-35,-126}},
+            lineColor={0,0,0},
+            fillColor={255,255,255},
+            fillPattern=FillPattern.Solid,
+            textString="C")}),
       Window(
         x=0.45,
@@ -551 +661 @@
       Documentation(info="<html>
 <p>
-Models an ideal flow source, with prescribed values of flow rate, temperature and composition:
+Models an ideal flow source, with prescribed values of flow rate, temperature, composition and trace substances:
 </p>
 <ul>
 <li> Prescribed mass flow rate.</li>
 <li> Prescribed temperature.</li>
-<li> Prescribed composition (only for multi-substance flow) .</li>
+<li> Boundary composition (only for multi-substance or trace-substance flow).</li>
 </ul>
 <p>If <tt>useFlowRateInput</tt> is false (default option), the <tt>m_flow</tt> parameter
@@ -562 +672 @@
 <p>The same thing goes for the temperature and composition</p>
 <p>
-Note, that boundary temperature
-and mass fractions have only an effect if the mass flow
+Note, that boundary temperature,
+mass fractions and trace substances have only an effect if the mass flow
 is from the boundary into the port. If mass is flowing from
 the port into the boundary, the boundary definitions,
@@ -575 +685 @@
     connect(T_in, T_in_internal);
     connect(X_in, X_in_internal);
+    connect(C_in, C_in_internal);
     if not useFlowRateInput then
       m_flow_in_internal = m_flow;
@@ -583 +694 @@
     if not useCompositionInput then
       X_in_internal = X;
+    end if;
+    if not useTraceInput then
+      C_in_internal = C;
     end if;
     sum(ports.m_flow) = -m_flow_in_internal;
     medium.T = T_in_internal;
     medium.Xi = X_in_internal[1:Medium.nXi];
+    ports.C_outflow = fill(C_in_internal, nPorts);
   end PrescribedMassFlowRate_TX;
 
   model PrescribedMassFlowRate_hX
-    "Ideal flow source that produces a prescribed mass flow with prescribed specific enthalpy and mass fraction"
+    "Ideal flow source that produces a prescribed mass flow with prescribed specific enthalpy, mass fraction and trace substances"
     extends Sources.BaseClasses.PartialSource;
     parameter Boolean useFlowRateInput = false
@@ -601 +716 @@
       "Get the composition from the input connector" 
       annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
+    parameter Boolean useTraceInput = false
+      "Get the trace substances from the input connector" 
+      annotation(Evaluate=true, HideResult=true, choices(__Dymola_checkBox=true));
     parameter Medium.MassFlowRate m_flow = 0
       "Fixed mass flow rate going out of the fluid port" 
@@ -613 +731 @@
       annotation (Evaluate = true,
                   Dialog(enable = (not useCompositionInput) and Medium.nXi > 0));
+    parameter Medium.ExtraProperty C[Medium.nC](
+         quantity=Medium.extraPropertiesNames)=fill(0, Medium.nC)
+      "Boundary trace substances" 
+      annotation (Evaluate=true,
+                  Dialog(enable = (not useTraceInput) and Medium.nC > 0));
     Modelica.Blocks.Interfaces.RealInput m_flow_in if     useFlowRateInput
       "Prescribed mass flow rate"