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

Timestamp:

Jul 25, 2008, 3:57:20 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

@@ -610 +610 @@
 
 "Stream Molar Composition"
-        Outlet.z = (Composition/sum(Composition)/M)*sum(M*Outlet.z);# do not converge fixme !!!!!
-
-end
-
+        Outlet.z*sum(zmass/M) = zmass/M;
+
+end
+
+"Average Molecular Weight"
+        Mw = sum(M*Outlet.z);
+        
         "Flash Calculation"
         [Outlet.v, x, y] = PP.Flash(Outlet.T, Outlet.P, Outlet.z);
@@ -634 +637 @@
         "Vapour Entropy"
         sv = PP.VapourEntropy(Outlet.T, Outlet.P, y);
-
-        "Average Molecular Weight"
-        Mw = sum(M*Outlet.z);
 
         switch rhoModel
@@ -645 +645 @@
                 case "correlation":
         "Mass Density"
-                rho*((1-Outlet.v)/PP.LiquidDensity(Outlet.T,Outlet.P,x) + Outlet.v/PP.VapourDensity(Outlet.T,Outlet.P,y)) = 1;
+                rho = (1-Outlet.v)*PP.LiquidDensity(Outlet.T,Outlet.P,x) + Outlet.v*PP.VapourDensity(Outlet.T,Outlet.P,y);
         end