Index: mttroot/mtt/lib/comp/simple/FP_eqn.m
==================================================================
--- mttroot/mtt/lib/comp/simple/FP_eqn.m
+++ mttroot/mtt/lib/comp/simple/FP_eqn.m
@@ -15,10 +15,14 @@
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % %% Version control history
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % %% $Id$
 % %% $Log$
+% %% Revision 1.3  1998/07/07 15:00:04  peterg
+% %% Replaced e_ by f_
+% %%          s_ by p_
+% %%
 % %% Revision 1.2  1998/06/29 09:54:16  peterg
 % %% Changed name from ES to FP
 % %%
 % %% Revision 1.1  1998/06/29 09:53:22  peterg
 % %% Initial revision
@@ -51,31 +55,28 @@
 
 % There are 2 ports; extract the information
 f_bond = bonds(1,:);
 p_bond = bonds(2,:);
 
-% The efforts are the same - but the enthalpy side has relative T
-if f_bond(1)==1 %effort imposed on the enthalpy bond 
-%  fprintf(eqnfile,'%s := %s + t_0;\n' , ...
-  fprintf(eqnfile,'%s := %s;\n' , ...
+% The efforts are the same
+if p_bond(1)==1 %effort imposed on the pseudo bond 
+    fprintf(eqnfile,'%s := %s;\n' , ...
+    varname(name,bond_number(1), 1), ...
+    varname(name,bond_number(2), 1) );
+else %effort imposed on the true bond 
+    fprintf(eqnfile,'%s := %s;\n' , ...
     varname(name,bond_number(2), 1), ...
     varname(name,bond_number(1), 1) );
-else %effort imposed on the entropy bond 
-%  fprintf(eqnfile,'%s := %s - t_0;\n' , ...
-  fprintf(eqnfile,'%s := %s;\n' , ...
-    varname(name,bond_number(1), 1), ...
-    varname(name,bond_number(2), 1) );
 end;
 
-% The flows need to be converted - use the absolute temp on the
-% entropy side
-if f_bond(2)==-1 %flow imposed on the enthalpy bond 
+% The flows need to be converted
+if p_bond(2)==-1 %flow imposed on the pseudo bond 
   fprintf(eqnfile,'%s := %s/%s;\n' , ...
+    varname(name,bond_number(1), -1), ...
+    varname(name,bond_number(2), -1), ...
+    varname(name,bond_number(1), 1) );
+else % flow imposed on the true bond 
+    fprintf(eqnfile,'%s := %s*%s;\n' , ...
     varname(name,bond_number(2), -1), ...
     varname(name,bond_number(1), -1), ...
     varname(name,bond_number(2), 1) );
-else % flow imposed on the entropy bond 
-    fprintf(eqnfile,'%s := %s*%s;\n' , ...
-    varname(name,bond_number(1), -1), ...
-    varname(name,bond_number(2), -1), ...
-    varname(name,bond_number(2), 1) );
 end;