Index: mttroot/mtt/bin/trans/make_ode2odes ================================================================== --- mttroot/mtt/bin/trans/make_ode2odes +++ mttroot/mtt/bin/trans/make_ode2odes @@ -7,12 +7,15 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.33 2000/05/11 19:33:18 peterg +## Uniform version for _sim.m +## ## Revision 1.32 2000/05/11 08:30:00 peterg -## Old version -- about to try new parameterised version + ## ## Revision 1.31 2000/05/10 18:33:25 peterg ## Use smxa and smxax in place of smx ## ## Revision 1.30 2000/04/18 11:24:19 peterg @@ -138,45 +141,45 @@ # Program $1_ode2odes #EOF # Do the globals #sympar2global_txt2m $1 >> $1_ode2odes.m -lang_header $1 ode2odes m 'x,U,par,simpar' '[Y,X,t]' > $1_ode2odes.m +lang_header $1 ode2odes m 'x,par,simpar' '[Y,X,t]' > $1_ode2odes.m cat >> $1_ode2odes.m <=simpar.first) mtt_write(t,x,y,$Nx,$Ny); # Write it out endif [dx] = $1_cse(x,u,t,par); # State derivative [AA] = $1_smxa(x,u,simpar.dt,par); # (I-Adt) and (I-Adt)x [AAx] = $1_smxax(x,u,simpar.dt,par); # (I-Adt) and (I-Adt)x - [open] = $1_switchopen(x); # Open switches - [x] = mtt_implicit(x,dx,AA,AAx,simpar.dt,$Nx,open); # Implicit update + [open_switches] = $1_switchopen(x); # Open switches + [x] = mtt_implicit(x,dx,AA,AAx,simpar.dt,$Nx,open_switches); # Implicit update t = t + simpar.dt; endfor; # Integration loop t = MTT_data(:,1); Y = MTT_data(:,2);