Index: mttroot/mtt/bin/trans/make_ode2odes
==================================================================
--- mttroot/mtt/bin/trans/make_ode2odes
+++ mttroot/mtt/bin/trans/make_ode2odes
@@ -7,10 +7,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.59  2001/07/13 04:54:04  geraint
+## Branch merge: numerical-algebraic-solution back to main.
+##
 ## Revision 1.58  2001/07/13 00:51:39  geraint
 ## Fixed generation of odes.sg from .m and .oct simulations.
 ## .cc, .m and .oct simulations now all write mtt_data (lower case).
 ##
 ## Revision 1.57.2.5  2001/07/13 04:02:31  geraint
@@ -416,11 +419,11 @@
 
 extern Octave_map F${sys}_simpar (
      	void);
 
 extern ColumnVector F${sys}_state (
-	ColumnVector &x);
+	ColumnVector &par);
 
 extern ColumnVector F${sys}_${ode} (
 	ColumnVector &x,
 	ColumnVector &u,
 	const double &t,
@@ -573,17 +576,17 @@
   return (f);
 #endif
 }
 
 inline ColumnVector
-mtt_state (ColumnVector &x)
+mtt_state (ColumnVector &par)
 {
 #ifdef STANDALONE
-  return F${sys}_state (x);
+  return F${sys}_state (par);
 #else
   static octave_value_list args, f;
-  args (0) = octave_value (x);
+  args (0) = octave_value (par);
   f = feval ("${sys}_state", args, 1);
   return f(0).${vector_value} ();
 #endif
 }