Changeset 351

Timestamp:

02/21/06 10:47:41 (3 years ago)

Author:

CRichter

Message:

changed Water to fit the new interface definition from the 47th Design Meeting, provided some alias functions in PartialPureSubstance and PartialTwoPhaseMedium

Location:

Modelica/trunk/Media

Files:

• Water/package.mo (modified) (28 diffs)
• package.mo (modified) (3 diffs)

Modelica/trunk/Media/Water/package.mo

@@ -209 +209 @@
 </html>"));
 
+
 extends Modelica.Icons.Library;
   constant Interfaces.PartialMedium.FluidConstants[1] waterConstants(
@@ -227 +228 @@
      each hasCriticalData=true);
 
+
 package ConstantPropertyLiquidWater 
   "Water: Simple liquid water medium (incompressible, constant data)" 
@@ -263 +265 @@
 end ConstantPropertyLiquidWater;
 
+
 package IdealSteam "Water: Steam as ideal gas from NASA source" 
   extends IdealGases.SingleGases.H2O(
@@ -271 +274 @@
 end IdealSteam;
 
+
 package StandardWater = WaterIF97_ph 
   "Water using the IF97 standard, explicit in p and h. Recommended for most applications";
 
+
 package StandardWaterOnePhase = WaterIF97_pT 
   "Water using the IF97 standard, explicit in p and T. Recommended for one-phase applications";
+
 
 package WaterIF97OnePhase_ph 
@@ -290 +296 @@
 end WaterIF97OnePhase_ph;
 
+
 package WaterIF97_pT "Water using the IF97 standard, explicit in p and T" 
   extends WaterIF97_base(
@@ -299 +306 @@
 end WaterIF97_pT;
 
+
 package WaterIF97_ph "Water using the IF97 standard, explicit in p and h" 
   extends WaterIF97_base(
@@ -310 +318 @@
 </html>"));
 end WaterIF97_ph;
+
 
 partial package WaterIF97_base 
@@ -441 +450 @@
     end if;
     if dT_explicit then
-      p = p_dT(d, T, phase);
-      h = h_dT(d, T, phase);
+      p = pressure_dT(d, T, phase);
+      h = specificEnthalpy_dT(d, T, phase);
       sat.Tsat = T;
       sat.psat = saturationPressure(T);
     elseif ph_explicit then
-      d = rho_ph(p, h, phase);
-      T = T_ph(p, h, phase);
+      d = density_ph(p, h, phase);
+      T = temperature_ph(p, h, phase);
       sat.Tsat = saturationTemperature(p);
       sat.psat = p;
     else
-      h = h_pT(p, T);
-      d = rho_pT(p, T);
+      h = specificEnthalpy_pT(p, T);
+      d = density_pT(p, T);
       sat.psat = p;
       sat.Tsat = saturationTemperature(p);
@@ -465 +474 @@
   end BaseProperties;
   
-  redeclare function extends rho_ph 
-    "compute density as a function of pressure and specific enthalpy" 
+  redeclare function density_ph 
+    "Computes density as a function of pressure and specific enthalpy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input SpecificEnthalpy h "Specific enthalpy";
+    input FixedPhase phase "2 for two-phase, 1 for one-phase, 0 if not known";
+    output Density d "Density";
   algorithm 
     d := IF97_Utilities.rho_ph(p, h, phase);
-  end rho_ph;
-  
-  redeclare function extends T_ph 
-    "compute temperature as a function of pressure and specific enthalpy" 
+  end density_ph;
+  
+  redeclare function temperature_ph 
+    "Computes temperature as a function of pressure and specific enthalpy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input SpecificEnthalpy h "Specific enthalpy";
+    input FixedPhase phase "2 for two-phase, 1 for one-phase, 0 if not known";
+    output Temperature T "Temperature";
   algorithm 
     T := IF97_Utilities.T_ph(p, h, phase);
-  end T_ph;
-  
+  end temperature_ph;
+/*  
   redeclare function extends temperature_phX 
     "Compute temperature from pressure and specific enthalpy" 
@@ -482 +501 @@
     T := T_ph(p, h);
   end temperature_phX;
-  
+ 
   redeclare function extends temperature_psX 
     "Compute temperature from pressure and specific enthalpy" 
   algorithm 
   assert(false,"not yet implemented");
-//  T := IF97_Utilities.T_ps(p, s);
+    //  T := IF97_Utilities.T_ps(p, s);
   end temperature_psX;
-  
+*/
+  redeclare function temperature_ps 
+    "Computes temperature as a function of pressure and specific entropy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input SpecificEntropy s "Specific entropy";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
+    output Temperature T "Temperature";
+  algorithm 
+    assert(false,"not yet implemented");
+  end temperature_ps;
+/*  
   redeclare function extends density_phX 
     "Compute density from pressure and specific enthalpy" 
@@ -495 +525 @@
     d := IF97_Utilities.rho_ph(p, h);
   end density_phX;
-  
-  redeclare function extends p_dT 
-    "compute pressure as a function of density and temperature" 
+*/
+  redeclare function pressure_dT 
+    "Computes pressure as a function of density and temperature" 
+    extends Modelica.Icons.Function;
+    input Density d "Density";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
+    output AbsolutePressure p "Pressure";
   algorithm 
     p := IF97_Utilities.p_dT(d, T, phase);
-  end p_dT;
-  
-  redeclare function extends h_dT 
-    "compute specific enthalpy as a function of density and temperature" 
+  end pressure_dT;
+  
+  redeclare function specificEnthalpy_dT 
+    "Computes specific enthalpy as a function of density and temperature" 
+    extends Modelica.Icons.Function;
+    input Density d "Density";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
+    output SpecificEnthalpy h "specific enthalpy";
   algorithm 
     h := IF97_Utilities.h_dT(d, T, phase);
-  end h_dT;
-  
-  redeclare function extends h_pT 
-    "compute specific enthalpy as a function of pressure and temperature" 
+  end specificEnthalpy_dT;
+  
+  redeclare function specificEnthalpy_pT 
+    "Computes specific enthalpy as a function of pressure and temperature" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
+    output SpecificEnthalpy h "specific enthalpy";
   algorithm 
     h := IF97_Utilities.h_pT(p, T);
-  end h_pT;
-  
+  end specificEnthalpy_pT;
+/*  
   redeclare function extends specificEnthalpy_pTX 
     "Compute specific enthalpy from pressure, temperature and mass fraction" 
@@ -519 +564 @@
     h := h_pT(p, T);
   end specificEnthalpy_pTX;
-  
-  redeclare function extends rho_pT 
-    "compute density as a function of pressure and temperature" 
+*/
+  redeclare function density_pT 
+    "Computes density as a function of pressure and temperature" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
+    output Density d "Density";
   algorithm 
     d := IF97_Utilities.rho_pT(p, T);
-  end rho_pT;
+  end density_pT;
   
   redeclare function extends setDewState 
@@ -578 +628 @@
   end specificEntropy;
   
-  redeclare function extends heatCapacity_cp 
+  redeclare function extends specificHeatCapacityCp 
     "specific heat capacity at constant pressure of water" 
     
@@ -593 +643 @@
       cp := IF97_Utilities.cp_ph(state.p, state.h, state.phase);
     end if;
-  end heatCapacity_cp;
-  
-  redeclare function extends heatCapacity_cv 
+  end specificHeatCapacityCp;
+  
+  redeclare function extends specificHeatCapacityCv 
     "specific heat capacity at constant volume of water" 
   algorithm 
@@ -605 +655 @@
       cv := IF97_Utilities.cv_ph(state.p, state.h, state.phase);
     end if;
-  end heatCapacity_cv;
+  end specificHeatCapacityCv;
   
   redeclare function extends isentropicExponent "Return isentropic exponent" 
@@ -660 +710 @@
       refState), 0);
   end isentropicEnthalpy;
-  
+/*  
   redeclare function extends specificEnthalpy_psX "compute h(p,s)" 
   algorithm 
     h := IF97_Utilities.isentropicEnthalpy(p, s, 0);
   end specificEnthalpy_psX;
+*/
+  redeclare function specificEnthalpy_ps 
+    "Computes specific enthalpy as a function of pressure and specific entropy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input SpecificEntropy s "Specific entropy";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
+    output SpecificEnthalpy h "specific enthalpy";
+  algorithm 
+    h := IF97_Utilities.isentropicEnthalpy(p, s, 0);
+  end specificEnthalpy_ps;
   
   redeclare function extends density_derh_p 
@@ -760 +821 @@
   
 end WaterIF97_base;
+
 
 partial package WaterIF97_fixedregion 
@@ -911 +973 @@
   end BaseProperties;
   
-  redeclare function extends rho_ph 
-    "compute density as a function of pressure and specific enthalpy" 
+  redeclare function density_ph 
+    "Computes density as a function of pressure and specific enthalpy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input SpecificEnthalpy h "Specific enthalpy";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
     input Integer region=0 
       "if 0, region is unknown, otherwise known and this input";
+    output Density d "Density";
   algorithm 
     d := IF97_Utilities.rho_ph(p, h, phase, region);
-  end rho_ph;
-  
-  redeclare function extends T_ph 
-    "compute temperature as a function of pressure and specific enthalpy" 
+  end density_ph;
+  
+  redeclare function temperature_ph 
+    "Computes temperature as a function of pressure and specific enthalpy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input SpecificEnthalpy h "Specific enthalpy";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
     input Integer region=0 
       "if 0, region is unknown, otherwise known and this input";
+    output Temperature T "Temperature";
   algorithm 
     T := IF97_Utilities.T_ph(p, h, phase, region);
-  end T_ph;
-  
-  redeclare function extends p_dT 
-    "compute pressure as a function of density and temperature" 
+  end temperature_ph;
+  
+  redeclare function pressure_dT 
+    "Computes pressure as a function of density and temperature" 
+    extends Modelica.Icons.Function;
+    input Density d "Density";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
     input Integer region=0 
       "if 0, region is unknown, otherwise known and this input";
+    output AbsolutePressure p "Pressure";
   algorithm 
     p := IF97_Utilities.p_dT(d, T, phase, region);
-  end p_dT;
-  
-  redeclare function extends h_dT 
-    "compute specific enthalpy as a function of density and temperature" 
+  end pressure_dT;
+  
+  redeclare function specificEnthalpy_dT 
+    "Computes specific enthalpy as a function of density and temperature" 
+    extends Modelica.Icons.Function;
+    input Density d "Density";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
     input Integer region=0 
       "if 0, region is unknown, otherwise known and this input";
+    output SpecificEnthalpy h "specific enthalpy";
   algorithm 
     h := IF97_Utilities.h_dT(d, T, phase, region);
-  end h_dT;
-  
-  redeclare function extends h_pT 
-    "compute specific enthalpy as a function of pressure and temperature" 
+  end specificEnthalpy_dT;
+  
+  redeclare function specificEnthalpy_pT 
+    "Computes specific enthalpy as a function of pressure and temperature" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
     input Integer region=0 
       "if 0, region is unknown, otherwise known and this input";
+    output SpecificEnthalpy h "specific enthalpy";
   algorithm 
     h := IF97_Utilities.h_pT(p, T, region);
-  end h_pT;
-  
-  redeclare function extends rho_pT 
-    "compute density as a function of pressure and temperature" 
+  end specificEnthalpy_pT;
+  
+  redeclare function density_pT 
+    "Computes density as a function of pressure and temperature" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "Pressure";
+    input Temperature T "Temperature";
+    input FixedPhase phase=0 "2 for two-phase, 1 for one-phase, 0 if not known";
     input Integer region=0 
       "if 0, region is unknown, otherwise known and this input";
+    output Density d "Density";
   algorithm 
     d := IF97_Utilities.rho_pT(p, T, region);
-  end rho_pT;
+  end density_pT;
   
   redeclare function extends setDewState 
@@ -1009 +1101 @@
   end specificEntropy;
   
-  redeclare function extends heatCapacity_cp 
+  redeclare function extends specificHeatCapacityCp 
     "specific heat capacity at constant pressure of water" 
   algorithm 
@@ -1019 +1111 @@
       cp := IF97_Utilities.cp_ph(state.p, state.h, Region);
     end if;
-  end heatCapacity_cp;
-  
-  redeclare function extends heatCapacity_cv 
+  end specificHeatCapacityCp;
+  
+  redeclare function extends specificHeatCapacityCv 
     "specific heat capacity at constant volume of water" 
   algorithm 
@@ -1031 +1123 @@
       cv := IF97_Utilities.cv_ph(state.p, state.h, state.phase, Region);
     end if;
-  end heatCapacity_cv;
+  end specificHeatCapacityCv;
   
   redeclare function extends isentropicExponent "Return isentropic exponent" 
@@ -1185 +1277 @@
   
 end WaterIF97_fixedregion;
+
 
 package WaterIF97_R1ph "region 1 (liquid) water according to IF97 standard" 
@@ -1199 +1292 @@
 end WaterIF97_R1ph;
 
+
 package WaterIF97_R2ph "region 2 (steam) water according to IF97 standard" 
   extends WaterIF97_fixedregion(
@@ -1212 +1306 @@
 end WaterIF97_R2ph;
 
+
 package WaterIF97_R3ph "region 3 water according to IF97 standard" 
   extends WaterIF97_fixedregion(
@@ -1225 +1320 @@
 end WaterIF97_R3ph;
 
+
 package WaterIF97_R4ph "region 4 water according to IF97 standard" 
   extends WaterIF97_fixedregion(
@@ -1238 +1334 @@
 end WaterIF97_R4ph;
 
+
 package WaterIF97_R5ph "region 5 water according to IF97 standard" 
   extends WaterIF97_fixedregion(
@@ -1251 +1348 @@
 end WaterIF97_R5ph;
 
+
 package WaterIF97_R1pT "region 1 (liquid) water according to IF97 standard" 
   extends WaterIF97_fixedregion(
@@ -1264 +1362 @@
 end WaterIF97_R1pT;
 
+
 package WaterIF97_R2pT "region 2 (steam) water according to IF97 standard" 
   extends WaterIF97_fixedregion(

Modelica/trunk/Media/package.mo

@@ -4373 +4373 @@
     extends PartialMedium;
     // the following are parallel to the cape-open names
-    
-    replaceable partial function rho_ph 
-      "compute density as a function of pressure and specific enthalpy" 
-      extends Modelica.Icons.Function;
-      input AbsolutePressure p "pressure";
-      input SpecificEnthalpy h "specific enthalpy";
-      input Integer phase =  0 
-        "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
-      output Density d "density";
-    end rho_ph;
-    
-    replaceable partial function T_ph 
-      "compute temperature as a function of pressure and specific enthalpy" 
-      extends Modelica.Icons.Function;
-      input AbsolutePressure p "pressure";
-      input SpecificEnthalpy h "specific enthalpy";
-      input Integer phase =  0 
-        "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
-      output Temperature T "temperature";
-    end T_ph;
-    
-    replaceable partial function rho_pT 
-      "compute density as a function of pressure and temperature" 
-      extends Modelica.Icons.Function;
-      input AbsolutePressure p "pressure";
-      input Temperature T "temperature";
-      output Density d "density";
-    end rho_pT;
-    
-    replaceable partial function h_pT 
-      "compute specific enthalpy as a function of pressure and temperature" 
-      extends Modelica.Icons.Function;
-      input AbsolutePressure p "pressure";
-      input Temperature T "temperature";
+  /*
+  replaceable partial function rho_ph 
+    "compute density as a function of pressure and specific enthalpy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "pressure";
+    input SpecificEnthalpy h "specific enthalpy";
+    input Integer phase =  0 
+      "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
+    output Density d "density";
+  end rho_ph;
+  
+  replaceable partial function T_ph 
+    "compute temperature as a function of pressure and specific enthalpy" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "pressure";
+    input SpecificEnthalpy h "specific enthalpy";
+    input Integer phase =  0 
+      "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
+    output Temperature T "temperature";
+  end T_ph;
+  
+  replaceable partial function rho_pT 
+    "compute density as a function of pressure and temperature" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "pressure";
+    input Temperature T "temperature";
+    output Density d "density";
+  end rho_pT;
+  
+  replaceable partial function h_pT 
+    "compute specific enthalpy as a function of pressure and temperature" 
+    extends Modelica.Icons.Function;
+    input AbsolutePressure p "pressure";
+    input Temperature T "temperature";
+    output SpecificEnthalpy h "specific enthalpy";
+  end h_pT;
+  
+  replaceable partial function p_dT 
+    "compute pressure as a function of density and temperature" 
+    extends Modelica.Icons.Function;
+    input Density d "density";
+    input Temperature T "temperature";
+    input Integer phase =  0 
+      "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
+    output AbsolutePressure p "pressure";
+  end p_dT;
+  
+  replaceable partial function h_dT 
+    "compute specific enthalpy as a function of density and temperature" 
+    extends Modelica.Icons.Function;
+    input Density d "density";
+    input Temperature T "temperature";
+    input Integer phase =  0 
+      "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
+    output SpecificEnthalpy h "specific enthalpy";
+  end h_dT;
+*/
+    replaceable function density_ph 
+      "Computes density as a function of pressure and specific enthalpy" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEnthalpy h "Specific enthalpy";
+      output Density d "Density";
+    algorithm 
+      d := density_phX(p, h, fill(0,0));
+    end density_ph;
+    
+    replaceable function temperature_ph 
+      "Computes temperature as a function of pressure and specific enthalpy" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEnthalpy h "Specific enthalpy";
+      output Temperature T "Temperature";
+    algorithm 
+      T := temperature_phX(p, h, fill(0,0));
+    end temperature_ph;
+    
+    replaceable function pressure_dT 
+      "Computes pressure as a function of density and temperature" 
+      extends Modelica.Icons.Function;
+      input Density d "Density";
+      input Temperature T "Temperature";
+      output AbsolutePressure p "Pressure";
+    algorithm 
+      p := pressure(setState_pTX(d, T, fill(0,0)));
+    end pressure_dT;
+    
+    replaceable function specificEnthalpy_dT 
+      "Computes specific enthalpy as a function of density and temperature" 
+      extends Modelica.Icons.Function;
+      input Density d "Density";
+      input Temperature T "Temperature";
       output SpecificEnthalpy h "specific enthalpy";
-    end h_pT;
-    
-    replaceable partial function p_dT 
-      "compute pressure as a function of density and temperature" 
-      extends Modelica.Icons.Function;
-      input Density d "density";
-      input Temperature T "temperature";
-      input Integer phase =  0 
-        "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
-      output AbsolutePressure p "pressure";
-    end p_dT;
-    
-    replaceable partial function h_dT 
-      "compute specific enthalpy as a function of density and temperature" 
-      extends Modelica.Icons.Function;
-      input Density d "density";
-      input Temperature T "temperature";
-      input Integer phase =  0 
-        "phase of the fluid: 1 for 1-phase, 2 for two-phase, 0 for not known, e.g. interactive use";
+    algorithm 
+      h := specificEnthalpy(setState_pTX(d, T, fill(0,0)));
+    end specificEnthalpy_dT;
+    
+    replaceable function specificEnthalpy_ps 
+      "Computes specific enthalpy as a function of pressure and specific entropy" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEntropy s "Specific entropy";
       output SpecificEnthalpy h "specific enthalpy";
-    end h_dT;
-    
+    algorithm 
+      h := specificEnthalpy_psX(p,s,fill(0,0));
+    end specificEnthalpy_ps;
+    
+    replaceable function temperature_ps 
+      "Computes temperature as a function of pressure and specific entropy" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEntropy s "Specific entropy";
+      output Temperature T "Temperature";
+    algorithm 
+      T := temperature_psX(p,s,fill(0,0));
+    end temperature_ps;
+    
+    replaceable function specificEnthalpy_pT 
+      "Computes specific enthalpy as a function of pressure and temperature" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input Temperature T "Temperature";
+      output SpecificEnthalpy h "specific enthalpy";
+    algorithm 
+      h := specificEnthalpy_pTX(p, T, fill(0,0));
+    end specificEnthalpy_pT;
+    
+    replaceable function density_pT 
+      "Computes density as a function of pressure and temperature" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input Temperature T "Temperature";
+      output Density d "Density";
+    algorithm 
+      d := density(setState_pTX(p, T, fill(0,0)));
+    end density_pT;
   end PartialPureSubstance;
   
@@ -4876 +4955 @@
         h := specificEnthalpy(setState_psX(p,s,X,phase));
       end specificEnthalpy_psX;
+    
+  // alias functions for simplified access
+  // note that there is a Dymola error which does not allow writing
+  // replaceable function density_ph = density_phX(p,h,fill(0,0))
+    
+    redeclare replaceable function density_ph 
+      "Computes density as a function of pressure and specific enthalpy" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEnthalpy h "Specific enthalpy";
+      input FixedPhase phase=0 
+        "2 for two-phase, 1 for one-phase, 0 if not known";
+      output Density d "Density";
+    algorithm 
+      d := density_phX(p, h, fill(0,0), phase);
+    end density_ph;
+    
+    redeclare replaceable function temperature_ph 
+      "Computes temperature as a function of pressure and specific enthalpy" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEnthalpy h "Specific enthalpy";
+      input FixedPhase phase=0