Index: mttroot/mtt/bin/trans/ode2odes_r2c
==================================================================
--- mttroot/mtt/bin/trans/ode2odes_r2c
+++ mttroot/mtt/bin/trans/ode2odes_r2c
@@ -18,10 +18,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.6  1997/05/06 13:53:32  peterg
+## Now uses the preprocessor to declare sizes -- MTTNX etc
+##
 # Revision 1.5  1997/05/01  13:50:11  peterg
 # Replaced float by double.
 #
 # Revision 1.4  1997/05/01  13:43:44  peterg
 # Changed double to float.
@@ -113,10 +116,11 @@
 
 
 
 write "/* Counters etc*/ "$
 write "  double time;"$
+write "  int itime;"$
 write "  double dt;"$
 write "  int i;"$
 write "  int k;"$
 
 write "/*functions */ "$
@@ -131,11 +135,12 @@
 write "/* Set up user-defined constants */"$
 write "  $1_numpar();"$
 
 %Initialise main (Euler) integration loop
 write "/* Initialise main (Euler) integration loop */"$
-write "  time = 0;"$
+write "  time = 0.0;"$
+write "  itime = 0;"$
 write "  dt = DT/STEPFACTOR;"$
 write "  for (i=1; i<=MTTNX; i++)"$
 write "      x[i] = 0.0;"$
 
 %Set up system inputs
@@ -172,24 +177,23 @@
 write "    fprintf(fps, ""%5.4f "",time);"$
 write "    for (i=1; i<=MTTNX; i++)"$
 write "      fprintf(fps, ""%5.4f "", x[i]);"$
 write "    fprintf(fps, ""\n"");"$
 
-% Inner integration loop
+write "    /* Set up system inputs */"$
+write "    $1_input(time);"$
+
 write "/* Inner integration loop */"$
 write "    for (k=1; k<=STEPFACTOR; k++)"$
 write "    {"$
-%Set up system inputs
-write "      /* Set up system inputs */"$
-write "      $1_input(time);"$
 write "      for (i=1; i<=MTTNX; i++)"$
 write "        x[i] = x[i] + dx[i]*dt;"$
 write "      $1_ode();"$
-write "      time = time + dt;"$
-
 write "    }"$
 
+write "      time = time + DT;"$
+write "      itime = itime + 1;"$
 write "  }"$
 
 %Write to files
 %Write to output to file
 write "/* Write to output file */"$
@@ -207,13 +211,16 @@
 
 
 write "  fprintf(fps, ""];\n"");"$
 write "  fprintf(fpso, ""];\n"");"$
 
+write "  return 0;"$
 write "}"$
 
 
 SHUT "$1_odes.c";
 
 
 EOF
+
+