Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -12,10 +12,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.176 1998/07/27 20:25:15 peterg +## Sorted out new mtt_r2m +## ## Revision 1.175 1998/07/27 18:49:09 peterg ## Fixed the frequency stuff ## ## Revision 1.174 1998/07/27 07:10:10 peterg ## Removed dummy global stuff. @@ -604,11 +607,11 @@ #Check $MTTPATH has been set mtt_check_var "$MTTPATH" "MTTPATH" #Version -version='3.0--' +version='3.0' # MTT recursion level is zero unless explicitly set level=0 #Computation mode is octave by default @@ -1411,11 +1414,11 @@ # struc2input_txt2txt -s $1 #endif #SUMMARY input numerical input declaration (m) -$1_input.m: $1_input.txt $1_sympars.txt $1_ss.r +$1_input.m: $1_input.txt $1_sympars.txt txt2m $1 input #SUMMARY state state declaration -- default (txt) #$1_state.txt: # mtt $mtt_switches $1 struc txt; @@ -1620,11 +1623,11 @@ $1_ode.r: $1_dae.r echo Copying $1_dae.r to $1_ode.r cp $1_dae.r $1_ode.r endif $1_ode.m: $1_def.m $1_ode.r $1_sympar.r - mtt_r2m $1 ode m + mtt_r2m $1 ode m; matlab_tidy $1_ode.m $1_odea.m: $1_ode.m touch $1_odea.m $1_odeo.m: $1_ode.m touch $1_odeo.m #$1_ode.c: $1_def.r $1_ode.r $1_sympar.r $1_sympar.c @@ -1650,18 +1653,21 @@ mtt_m2p $1_input.m $1_ode.p : $1_def.r $1_ode.m mtt_m2p $1_ode.m $1_odeo.p : $1_def.r $1_odeo.m mtt_m2p $1_odeo.m +$1_smx.p : $1_def.r $1_smx.m + mtt_m2p $1_smx.m $1_switch.p : $1_def.r $1_switch.m mtt_m2p $1_switch.m -$1_ode2odes.p : $1_def.r $1_simpar.p $1_numpar.p $1_state.p $1_input.p \ - $1_ode.p $1_odeo.p $1_switch.p $1_ode2odes.m \ - mtt_write.p mtt_update.p sign.p +$1_ode2odes.p : $1_ode2odes.m $1_def.r\ + $1_simpar.p $1_numpar.p $1_state.p $1_input.p \ + $1_ode.p $1_odeo.p $1_switch.p $1_smx.p\ + mtt_write.p mtt_update.p sign.p zeros.p mtt_m2p $1_ode2odes.m -$1_ode2odes.c: $1_ode2odes.p +$1_ode2odes.c: $1_ode2odes.p p2c.h mtt_p2c $info_switch $1 ode2odes #SUMMARY obs observer equations for CGPC (r) #SUMMARY obs observer equations for CGPC (m) #SUMMARY obs observer equations for CGPC (tex) @@ -2137,10 +2143,14 @@ echo Copying sign.p; cp $MTTPATH/trans/p/sign.p . mtt_write.p: echo Copying mtt_write.p; cp $MTTPATH/trans/p/mtt_write.p . mtt_update.p: echo Copying mtt_update.p; cp $MTTPATH/trans/p/mtt_update.p . +zeros.p: + echo Copying zeros.p; cp $MTTPATH/trans/p/zeros.p . +p2c.h: + echo Copying p2c.h; cp $MTTPATH/trans/c/p2c.h . # Copy c utilities dsvdcmp.c: dpythag.c nrutil.c nrutil.h echo Copying dsvdcmp.c; cp $MTTPATH/trans/c/dsvdcmp.c . dpythag.c: