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.14  1998/10/01 16:02:01  peterg
+## Integration with switches handled separately fro Euler and Implicit.
+##
 ## Revision 1.13  1998/09/30 17:41:24  peterg
 ## Implicit method now allows for switches via _switchA
 ##
 ## Revision 1.12  1998/08/27 08:55:18  peterg
 ## Mods to integration methods
@@ -73,11 +76,11 @@
 MTTilast = round(mttlast/mttdt); # Total number of steps
 
 #Initialise
 MTTt = 0.0;
 [MTTx] = $1_state;	        # Read in initial state
-[MTTu] = $1_input(MTTx,MTTt);	# Evaluate initial input
+[MTTu] = $1_input(MTTt,MTTx,mtty);	# Evaluate initial input
 [MTTy] = $1_odeo(MTTx,MTTu,MTTt); # Evaluate initial output
 mtt_write(MTTt,MTTx,MTTy,$Nx,$Ny); # And write them
 
 [mttAA]  = zero_matrix($Nx);	# Zero the A matrix
 [mttAAx] = zero_vector($Nx);	# Zero the AAx vector
@@ -88,11 +91,11 @@
     MTTddt = mttdt/mttstepfactor; # The small sample interval
   endif;
 
 #Integration loop
 for MTTit = 1:MTTilast
-  [MTTu] = $1_input(MTTx,MTTt);	# Input
+  [MTTu] = $1_input(MTTt,MTTx,MTTy);	# Input
 
   if mttmethod==1		# Euler
     for MTTjt = 1:mttstepfactor
       [MTTdx] = $1_ode(MTTx,MTTu,MTTt); # State derivative
       [MTTx] = mtt_euler(MTTx,MTTdx,MTTddt,$Nx); # Euler update
@@ -103,10 +106,11 @@
   if mttmethod==2		# Implicit 
     [MTTdx] = $1_ode(MTTx,MTTu,MTTt); # State derivative
     [mttAA,mttAAx] = $1_smx(MTTx,MTTu,mttdt);	# (I-Adt) and (I-Adt)x
     [mttAA] = $1_switcha(mttAA,MTTx);	# Switches
     [MTTx] = mtt_implicit(MTTx,MTTdx,mttAA,mttAAx,mttdt,$Nx); # Implicit update
+    [MTTx] = $1_switch(MTTx);	# Switches
     MTTt = MTTt + mttdt;
   endif;
 
 
   [MTTy] = $1_odeo(MTTx,MTTu,MTTt);