Changeset 964 for trunk/sample/water_steam/sample_rankine.mso

Timestamp:

Apr 16, 2016, 1:57:07 PM (7 years ago)

Author:

Argimiro Resende Secchi

Message:

Update water_steam

File:

• trunk/sample/water_steam/sample_rankine.mso (modified) (6 diffs)

trunk/sample/water_steam/sample_rankine.mso

@@ -26 +26 @@
 
     PARAMETERS
-    propterm as Plugin(Brief="Steam tables", Type="water", File="propterm");
+    PP2 as Plugin(Brief="Steam tables", Type="water");
 
     DEVICES
@@ -33 +33 @@
         Bomba1  as Bomba;
         GV              as Gerador_Vapor_Simples;
-        GE              as Gerador_Eletrico;
+        GE              as Gerador_Eletrico_Simples;
 
         CONNECTIONS
@@ -52 +52 @@
 
         SET
-        Bomba1.v_esp = 1.01e-3* 'm^3/kg';
         GE.EF_GE = 0.97;
 
@@ -90 +89 @@
         TR_AP2  as Trocador;
         GV              as Gerador_Vapor;
-        GE              as Gerador_Eletrico;
+        GE              as Gerador_Eletrico_Simples;
         F_RA    as Corrente;
 
     PARAMETERS
-    propterm as Plugin(Brief="Steam tables", Type="water", File="propterm");
+    PP2 as Plugin(Brief="Steam tables", Type="water");
 
         CONNECTIONS
@@ -114 +113 @@
         F_RA.T = GV.Fout_ra.T-180*'K';
         F_RA.P = GV.Fout_ra.P+1*'MPa';
-        [F_RA.S,F_RA.H] = propterm.propPTv(F_RA.P,F_RA.T);
+        [F_RA.S,F_RA.H] = PP2.propPTv(F_RA.P,F_RA.T);
 
 #       GV.Fin_a.P = GV.Fout_sa.P;
@@ -134 +133 @@
 
         SET
-        BBP.v_esp = 1.01e-3*'m^3/kg';
         GE.EF_GE = 0.97;