Changeset 206

Timestamp:

Mar 14, 2007, 11:15:22 PM (15 years ago)

Author:

Argimiro Resende Secchi

Message:

Enhance valve model.

Location:

branches/newlanguage

Files:

• eml/pressure_changers/valve.mso (modified) (2 diffs)
• sample/pressure_changers/sample_valve.mso (modified) (3 diffs)

branches/newlanguage/eml/pressure_changers/valve.mso

@@ -41 +41 @@
         
         PARAMETERS
-        Valve_Type as Switcher (Valid = ["valve_linear", "valve_parabolic", "valve_equal", "valve_quick", "valve_hyperbolic"], Default = "valve_linear");
+        valve_type as Switcher (Valid = ["linear", "parabolic", "equal", "quick", "hyperbolic"], Default = "linear");
 outer PP                as Plugin       (Brief = "External Physical Properties", Type = "PP");
 outer NComp     as Integer      (Brief = "Number of chemical components", Lower = 1);
@@ -92 +92 @@
         vm = PP.LiquidVolume(Inlet.T,Inlet.P,Inlet.z);
         
-        switch Valve_Type
-        case "valve_linear":
+        switch valve_type
+        case "linear":
 
-                        
                 "Opening Equation"
                 fc = x;
 
-        case "valve_parabolic":
-        
-        
+        case "parabolic":
+
                 "Opening Equation"
                 fc = x^2;
 
+        case "equal":
 
-        case "valve_equal":
-
-                        
                 "Opening Equation"
                 fc = x^2/(2-x^4)^(1/2);
 
-
-        case "valve_quick":
+        case "quick":
         
-                        
                 "Opening Equation"
                 fc = 10*x/sqrt(1+99*x^2);
 
+        case "hyperbolic":
 
-        case "valve_hyperbolic":
-
-                        
                 "Opening Equation"
                 fc = 0.1*x/sqrt(1-0.99*x^2);

branches/newlanguage/sample/pressure_changers/sample_valve.mso

@@ -14 +14 @@
 *
 *--------------------------------------------------------------------
-* Sample file for model valve (simplified) and valve_linear
+* Sample file for models valve_simplified and valve
 *--------------------------------------------------------------------
 * 
@@ -20 +20 @@
 *
 *----------------------------------------------------------------------
-* Author: Paula B. Staudt, Estefane Horn
+* Author: Paula B. Staudt, Estefane Horn, Núbia do Carmo Ferreira
 * $Id$
 *--------------------------------------------------------------------*#
@@ -115 +115 @@
         PP.Derivatives = 0;
         NComp = PP.NumberOfComponents;
-        
+        V1.valve_type = "linear"; #"parabolic", "equal", "quick", "hyperbolic"
+
         SPECIFY
         S1.Outlet.P = 2169.78                   * 'kPa';