Changeset 123 for branches/newlanguage/eml/streams.mso

Timestamp:

Jan 19, 2007, 12:03:14 PM (16 years ago)

Author:

Rafael de Pelegrini Soares

Message:

More stream and flash updates

File:

• branches/newlanguage/eml/streams.mso (modified) (7 diffs)

branches/newlanguage/eml/streams.mso

@@ -26 +26 @@
         Pallete = false;
         Brief = "General Material Stream";
-        Documentation =
+        Info =
         "This is the basic building block for the EML models.
         Every model should have input and output streams derived
@@ -47 +47 @@
         Pallete = false;
         Brief = "Liquid Material Stream";
-        Documentation =
+        Info =
         "Model for liquid material streams.
         This model should be used only when the phase of the stream
@@ -66 +66 @@
         Pallete = false;
         Brief = "Vapour Material Stream";
-        Documentation =
+        Info =
         "Model for vapour material streams.
         This model should be used only when the phase of the stream
@@ -83 +83 @@
 Model source
         ATTRIBUTES
-        Documentation =
+        Info =
         "Material stream source.
         This model should be used for boundary streams.
@@ -97 +97 @@
         x(NComp) as fraction(Brief = "Liquid Molar Fraction");
         y(NComp) as fraction(Brief = "Vapour Molar Fraction");
+        hl as enth_mol;
+        hv as enth_mol;
         
         EQUATIONS
@@ -104 +106 @@
         Outlet.h = (1-Outlet.v)*PP.LiquidEnthalpy(Outlet.T, Outlet.P, x) +
                 Outlet.v*PP.VapourEnthalpy(Outlet.T, Outlet.P, y);
+        
+        hl = PP.LiquidEnthalpy(Outlet.T, Outlet.P, x);
+        hv = PP.VapourEnthalpy(Outlet.T, Outlet.P, y);
+end
+
+Model sink2
+        VARIABLES
+        in Inlet as stream;
 end
 
 Model sink
         ATTRIBUTES
-        Documentation =
+        Info =
         "Material stream sink.
         This model should be used for boundary streams.";
@@ -124 +134 @@
         EQUATIONS
         "Flash Calculation"
-        [v, x, y] = PP.PHFlash(Inlet.P, Inlet.h, Inlet.z);
+        [v, x, y] = PP.FlashPH(Inlet.P, Inlet.h, Inlet.z);
 end