Changeset 353

Timestamp:

02/21/2006 11:38:31 AM (3 years ago)

Author:

CRichter

Message:

added alias functions for setState functions without the X to PartialMedium and PartialTwoPhaseMedium

Files:

• Modelica/trunk/Media/package.mo (modified) (11 diffs)

Modelica/trunk/Media/package.mo

@@ -3855 +3855 @@
       input AbsolutePressure p "Pressure";
       input Temperature T "Temperature";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output ThermodynamicState state;
     end setState_pTX;
@@ -3864 +3864 @@
       input AbsolutePressure p "Pressure";
       input SpecificEnthalpy h "Specific enthalpy";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output ThermodynamicState state;
     end setState_phX;
@@ -3873 +3873 @@
       input AbsolutePressure p "Pressure";
       input SpecificEntropy s "Specific entropy";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output ThermodynamicState state;
     end setState_psX;
@@ -3882 +3882 @@
       input Density d "density";
       input Temperature T "Temperature";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output ThermodynamicState state;
     end setState_dTX;
@@ -4065 +4065 @@
       input AbsolutePressure p "Pressure";
       input Temperature T "Temperature";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output SpecificEnthalpy h "Specific enthalpy at p, T, X";
     algorithm 
@@ -4076 +4076 @@
       input AbsolutePressure p "Pressure";
       input SpecificEnthalpy h "Specific enthalpy";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output Temperature T "Temperature";
     algorithm 
@@ -4087 +4087 @@
       input AbsolutePressure p "Pressure";
       input SpecificEnthalpy h "Specific enthalpy";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output Density d "density";
     algorithm 
@@ -4098 +4098 @@
       input AbsolutePressure p "Pressure";
       input SpecificEntropy s "Specific entropy";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output Temperature T "Temperature";
     algorithm 
@@ -4109 +4109 @@
       input AbsolutePressure p "Pressure";
       input SpecificEntropy s "Specific entropy";
-      input MassFraction X[nX] "Mass fractions";
+      input MassFraction X[:] "Mass fractions";
       output SpecificEnthalpy h "specific enthalpy";
     algorithm 
@@ -4430 +4430 @@
   end h_dT;
 */
+    replaceable partial function setState_pT 
+      "Return thermodynamic state as function of p and T" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input Temperature T "Temperature";
+      output ThermodynamicState state;
+    algorithm 
+      state := setState_pTX(p,T,fill(0,0));
+    end setState_pT;
+    
+    replaceable partial function setState_ph 
+      "Return thermodynamic state as function of p and h" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEnthalpy h "Specific enthalpy";
+      output ThermodynamicState state;
+    algorithm 
+      state := setState_phX(p,h,fill(0, 0));
+    end setState_ph;
+    
+    replaceable partial function setState_ps 
+      "Return thermodynamic state as function of p and s" 
+      extends Modelica.Icons.Function;
+      input AbsolutePressure p "Pressure";
+      input SpecificEntropy s "Specific entropy";
+      output ThermodynamicState state;
+    algorithm 
+      state := setState_psX(p,s,fill(0,0));
+    end setState_ps;
+    
+    replaceable partial function setState_dT 
+      "Return thermodynamic state as function of d and T" 
+      extends Modelica.Icons.Function;
+      input Density d "density";
+      input Temperature T "Temperature";
+      output ThermodynamicState state;
+    algorithm 
+      state := setState_dTX(d,T,fill(0,0));
+    end setState_dT;
+    
     replaceable function density_ph 
       "Computes density as a function of pressure and specific enthalpy" 
@@ -4959 +4999 @@
   // 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 partial function setState_pT 
+      "Return thermodynamic state as function of p and T" 
+      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 ThermodynamicState state;
+    algorithm 
+      state := setState_pTX(p,T,fill(0,0),phase);
+    end setState_pT;
+    
+    redeclare replaceable partial function setState_ph 
+      "Return thermodynamic state as function of p and h" 
+      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 ThermodynamicState state;
+    algorithm 
+      state := setState_phX(p,h,fill(0, 0),phase);
+    end setState_ph;
+    
+    redeclare replaceable partial function setState_ps 
+      "Return thermodynamic state as function of p and s" 
+      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 ThermodynamicState state;
+    algorithm 
+      state := setState_psX(p,s,fill(0,0),phase);
+    end setState_ps;
+    
+    redeclare replaceable partial function setState_dT 
+      "Return thermodynamic state as function of d and T" 
+      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 ThermodynamicState state;
+    algorithm 
+      state := setState_dTX(d,T,fill(0,0),phase);
+    end setState_dT;
     
     redeclare replaceable function density_ph