Index: mttroot/mtt/bin/trans/mtt_m2p
==================================================================
--- mttroot/mtt/bin/trans/mtt_m2p
+++ mttroot/mtt/bin/trans/mtt_m2p
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.7  1998/07/25 20:06:23  peterg
+## Does the mtt_update function
+##
 ## Revision 1.6  1998/07/25 16:59:40  peterg
 ## Give other procedures local i,j vars.
 ##
 ## Revision 1.5  1998/07/25 15:06:17  peterg
 ## Added DDT VAR
@@ -83,26 +86,26 @@
 	echo "    StateVector  =ARRAY[1..$Nx] OF REAL;"
 	echo "    InputVector  =ARRAY[1..$Nu] OF REAL;"
 	echo "    OutputVector =ARRAY[1..$Ny] OF REAL;"
 	echo "    IntegrationMethod = (Euler,ImplicitL,Implicit);"
 	echo "VAR"
-        echo "    t,LAST,DT,DDT   : REAL;"
-	echo "    mttx,mttdx      : StateVector;"
-	echo "    mttu            : InputVector;"
-	echo "    mtty            : OutputVector;"
-	echo "    i,j,it,iLast,STEPFACTOR : INTEGER;"
-	echo "    METHOD : STRING;"
+        echo "    MTTt,mttLAST,mttDT,mttDDT   : REAL;"
+	echo "    mttx,mttdx                  : StateVector;"
+	echo "    mttu                        : InputVector;"
+	echo "    mtty                        : OutputVector;"
+	echo "    MTTi,MTTj,MTTit,MTTiLast,mttSTEPFACTOR : INTEGER;"
+	echo "    mttMETHOD : STRING;"
         ;;
     switch)
 	echo "PROCEDURE $Sys_rep(VAR mttxs : StateVector;"
 	echo "                       mttx  : StateVector);"
 	echo "VAR"
-	echo "    i,j :  INTEGER;"
+	echo "    MTTi,MTTj :  INTEGER;"
 	;;
     *)	echo "PROCEDURE $Sys_rep;"
 	echo "VAR"
-	echo "    i,j :  INTEGER;"
+	echo "    MTTi,MTTj :  INTEGER;"
         ;;
 esac) > $Filename
 
 cat<<EOF >> $Filename
 
@@ -158,21 +161,22 @@
           printf("VAR ");
           for (k=1;k<i;k++) printf("%s,",global[k])
           printf("%s : REAL;\n", global[i])
           printf("VAR "); for (k=1;k<=Nx;k++) printf("mttx%i,", k)
           for (k=1;k<=Nu;k++) printf("mttu%i,", k)
-          for (k=0;k<Nt;k++) printf("t%i,", k)
+          for (k=0;k<Nt;k++) printf("mtt_temp%i,", k)
           printf("t%i : REAL;\n",Nt) 
+          printf("{%s sign.p}\n",inc,sys)
+          printf("{%s mtt_update.p}\n",inc,sys)
+          printf("{%s mtt_write.p}\n",inc,sys)
           printf("{%s %s_simpar.p}\n",inc,sys) 
           printf("{%s %s_numpar.p}\n",inc,sys)
           printf("{%s %s_state.p}\n",inc,sys)
           printf("{%s %s_input.p}\n",inc,sys)
           printf("{%s %s_ode.p}\n",inc,sys)
           printf("{%s %s_odeo.p}\n",inc,sys)
           printf("{%s %s_switch.p}\n",inc,sys)
-          printf("{%s mtt_update.p}\n",inc,sys)
-          printf("{%s mtt_write.p}\n",inc,sys)
         }
         for (k=1;k<=j;k++) printf("%s\n", comment[k])
         printf("\n")
         printf("\nBEGIN\n")
         doing_header = 0;
@@ -195,10 +199,12 @@
           printf("%s DO BEGIN\n", $0) 
           }
           else {
             sub(/=/,":=",$0)
             gsub(/\^/,"**",$0)
+            gsub(/&&/," AND ",$0)
+            gsub(/\|\|/," OR ",$0)
             printf("%s\n",$0)
           }
         }
       }
     }
@@ -206,23 +212,24 @@
 }
 END{
   if (rep=="def"){
     printf("EULER = 1,\n")
     printf("IMPLICITL = 2;\n")
-    printf("IMPLICIT3 = 3;\n")
+    printf("IMPLICIT = 3;\n")
     }
     else
       if (rep=="ode2odes")
         print "END."
       else
         print "END;"
 }' sys=$sys rep=$rep Nx=$Nx Nu=$Nu |\
-sed 's/(\([ijk0-9]*\))/\[\1\]/g' \
+sed 's/(\([ijk0-9]*\))/\[\1\]/g'  |\
+sed 's/(\(MTT[ijk0-9]*\))/\[\1\]/g' \
 >> $Filename
 
 # p2c doesn't like mixed case filenames!
 if [ "$Filename" != "$filename" ]; then
   echo Creating $filename
   cp -f $Filename $filename
 fi