Changeset 577 for branches/gui/eml/streams.mso

Timestamp:

Jul 25, 2008, 5:48:22 PM (15 years ago)

Author:

gerson bicca

Message:

updated source_testing

File:

• branches/gui/eml/streams.mso (modified) (3 diffs)

branches/gui/eml/streams.mso

@@ -564 +564 @@
         outer NComp                             as Integer                      (Brief = "Number of chemical components", Lower = 1); 
                   M(NComp)                              as molweight    (Brief = "Component Mol Weight");
-                  rhoModel                              as Switcher             (Brief = "Density model", Valid = ["volume", "correlation"], Default="volume");
                   CompostionBasis               as Switcher             (Brief = "Molar or Mass Compostion", Valid = ["Molar", "Mass"], Default="Molar");
+                  ValidPhases                           as Switcher             (Brief = "Valid Phases for Flash Calculation", Valid = ["Vapour-Only", "Liquid-Only","Vapour-Liquid"], Default="Vapour-Liquid");
         
 
@@ -614 +614 @@
 end
 
+switch ValidPhases
+        
+        case "Liquid-Only":
+
+"Vapour Fraction"
+        Outlet.v = 0;
+
+"Liquid Composition"
+        x = Outlet.z;
+
+"Vapour Composition"
+        y = Outlet.z;
+
+"Overall Enthalpy"
+        Outlet.h = PP.LiquidEnthalpy(Outlet.T, Outlet.P, x);
+
+"Molar Volume"
+        vm = PP.LiquidVolume(Outlet.T, Outlet.P, x);
+
+        case "Vapour-Only":
+
+"Vapor Fraction"
+        Outlet.v = 1;
+
+"Liquid Composition"
+        x = Outlet.z;
+
+"Vapour Composition"
+        y = Outlet.z;
+
+"Overall Enthalpy"
+        Outlet.h = PP.VapourEnthalpy(Outlet.T, Outlet.P, y);
+
+"Molar Volume"
+        vm = PP.VapourVolume(Outlet.T, Outlet.P, y);
+
+
+        case "Vapour-Liquid":
+
+"Flash Calculation"
+        [Outlet.v, x, y] = PP.Flash(Outlet.T, Outlet.P, Outlet.z);
+
+"Overall Enthalpy"
+        Outlet.h = (1-Outlet.v)*PP.LiquidEnthalpy(Outlet.T, Outlet.P, x) + Outlet.v*PP.VapourEnthalpy(Outlet.T, Outlet.P, y);
+
+"Molar Volume"
+        vm = (1-Outlet.v)*PP.LiquidVolume(Outlet.T, Outlet.P, x) + Outlet.v*PP.VapourVolume(Outlet.T,Outlet.P,y);
+
+end
+
+"Molar Density"
+        rhom * vm = 1;
+
 "Average Molecular Weight"
         Mw = sum(M*Outlet.z);
-        
-"Flash Calculation"
-        [Outlet.v, x, y] = PP.Flash(Outlet.T, Outlet.P, Outlet.z);
-
-"Overall Enthalpy"
-        Outlet.h = (1-Outlet.v)*PP.LiquidEnthalpy(Outlet.T, Outlet.P, x) + Outlet.v*PP.VapourEnthalpy(Outlet.T, Outlet.P, y);
-
-switch rhoModel
-
-        case "volume":
-"Molar Density"
-                rhom * vm = 1;
-                
-case "correlation":
-        "Mass Density"
-                rho = (1-Outlet.v)*PP.LiquidDensity(Outlet.T,Outlet.P,x) + Outlet.v*PP.VapourDensity(Outlet.T,Outlet.P,y);
-end
-        
+
 "Mass or Molar Density"
         rhom * Mw = rho;
@@ -640 +676 @@
         Fw      =  Mw*Outlet.F;
 
-"Molar Volume"
-        vm = (1-Outlet.v)*PP.LiquidVolume(Outlet.T, Outlet.P, x) + Outlet.v*PP.VapourVolume(Outlet.T,Outlet.P,y);
-        
 "Volumetric Flow"
         Fvol = Outlet.F*vm ;