Changeset 312 for trunk/sample

Timestamp:

Jul 13, 2007, 9:34:39 PM (16 years ago)

Author:

Argimiro Resende Secchi

Message:

Update models to new energy_stream.

Location:

trunk/sample

Files:

• controllers/Sample_flash_pid.mso (modified) (2 diffs)
• optimization/ammonia.mso (modified) (3 diffs)
• optimization/ammonia_opt.mso (modified) (1 diff)
• optimization/flash_opt.mso (modified) (3 diffs)

trunk/sample/controllers/Sample_flash_pid.mso

@@ -52 +52 @@
         L_ad as Real;
         P_ad as Real;
-        Q       as heat_rate (Brief="Heat supplied");
+        Q       as energy_source (Brief="Heat supplied");
         
         DEVICES
@@ -86 +86 @@
         CONNECTIONS
         s1.Outlet to fl.Inlet;
-        Q to fl.Q;
+        Q.Outlet to fl.InletQ;
         
         SPECIFY
 
-        Q = 1026.32 * 'kJ/s';
+        Q.Outlet.Q = 1026.32 * 'kJ/s';
 
         #Parâmetros do controlador de nível

trunk/sample/optimization/ammonia.mso

@@ -132 +132 @@
         production as flow_mol(DisplayUnit = 'lbmol/h', Brief="Ammonia in the product");
         loose as flow_mol(DisplayUnit = 'lbmol/h', Brief="Ammonia in the purge");
-        Q1 as heat_rate;
-        Q2 as heat_rate;
+        Q1 as energy_source;
+        Q2 as energy_source;
 
         CONNECTIONS
@@ -147 +147 @@
         C102.Outlet    to   M102.Inlet2;
         
-        Q1             to   F101.Q;
-        Q2             to   F102.Q;     
+        Q1.Outlet      to   F101.InletQ;
+        Q2.Outlet      to   F102.InletQ;        
         
         SET
@@ -169 +169 @@
         
         F102.OutletV.P = 10 * 'atm';
-        F102.Q = 0 * 'kJ/h';
+        F102.InletQ.Q = 0 * 'kJ/h';
         
         # We can choose between one of the following specs

trunk/sample/optimization/ammonia_opt.mso

@@ -26 +26 @@
         MINIMIZE
         
-        abs(Q1) + abs(Q2)
+        abs(Q1.Outlet.Q) + abs(Q2.Outlet.Q)
         #loose / 'lbmol/h'
         # C102.Pot/'kW'*180

trunk/sample/optimization/flash_opt.mso

@@ -35 +35 @@
 
         VARIABLES
-        Q       as heat_rate (Brief="Heat supplied");
+        Q       as energy_source (Brief="Heat supplied");
         leves as fraction;
         
@@ -48 +48 @@
         CONNECTIONS
         s1.Outlet to fl.Inlet;
-        Q to fl.Q;
+        Q.Outlet to fl.InletQ;
         
         EQUATIONS
@@ -62 +62 @@
         fl.OutletL.P = 2.5 * 'atm';
 
-        #Q = 0 * 'kJ/h';
+        #Q.Outlet.Q = 0 * 'kJ/h';
         fl.OutletL.T = 315.06 * 'K';