Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -12,10 +12,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.174 1998/07/27 07:10:10 peterg +## Removed dummy global stuff. +## ## Revision 1.173 1998/07/26 14:38:20 peterg ## *** empty log message *** ## ## Revision 1.172 1998/07/26 11:13:38 peterg ## Fixed name classes with globs - ide is that all @strong{MTT} variables @@ -783,11 +786,11 @@ fi if [ "$1" = "warranty" ] && [$2 = ""]; then cat << EOF Copyright (C) 1989, 1990, 1991, 1992, 1993, - 1994, 1995, 1996, 1997 Peter J. Gawthrop + 1994, 1995, 1996, 1997, 1998 Peter J. Gawthrop This is free software with ABSOLUTELY NO WARRANTY. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -1343,18 +1346,22 @@ #SUMMARY simpar simulation information (txt) $1_simpar.txt: echo Creating $1_simpar.txt ( \ + echo '# -*-octave-*- Put Emacs into octave-mode'; \ echo "# Simulation parameters for system $1 ($1_simpar.txt)"; \ echo "# Generated by MTT on" `date`.; \ cat $MTTPATH/trans/rcs_header.sh; \ echo ;\ - echo 'LAST=10.0;'; \ - echo 'DT=0.1;'; \ - echo 'STEPFACTOR=1;'; \ - echo 'METHOD="Implicit";'; \ + echo 'LAST = 10.0; # Last time in simulation'; \ + echo 'DT = 0.1; # Print interval'; \ + echo 'STEPFACTOR = 1; # Integration steps per print interval'; \ + echo 'METHOD = "Implicit;" # Integration method'; \ + echo 'WMIN = -1; # Minimum frequency = 10^WMIN'; \ + echo 'WMAX = 2; # Maximum frequency = 10^WMAX'; \ + echo 'WSTEPS = 100; # Number of frequency steps'; \ )> $1_simpar.txt #SUMMARY simpar simulation information (m) $1_simpar.m: $1_simpar.txt txt2m $1 simpar @@ -1610,14 +1617,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 - ode_r2lang $1 m; \ - matlab_tidy $1_ode.m; \ - matlab_tidy $1_odea.m; \ - matlab_tidy $1_odeo.m + mtt_r2m $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 @@ -1699,12 +1703,12 @@ #SUMMARY dm descriptor matrices (view) #SUMMARY dm descriptor matrices (ps) #Linearised system: descriptor matrices $1_dm.r: $1_dae.r $1_def.r $1_cr.r $1_ss.r $1_sympar.r dae2dm_r $1; tidy $1_dm.r -$1_dm.m: $1_def.m $1_dm.r $1_sympar.r $1_numpar.m - dm_r2m $1; matlab_tidy $1_dm.m +$1_dm.m: $1_def.r $1_dm.r $1_sympar.r $1_numpar.m + mtt_r2m $1 dm $1_dm.tex: $1_dm.r $1_sympar.r $1_simp.r dm_r2tex $1; latex_tidy $1_dm.tex @@ -1728,12 +1732,12 @@ #SUMMARY sm state matrices (view) #SUMMARY sm state matrices (ps) #Linearised system: state matrices $1_sm.r: $1_csm.r $1_def.r $1_cr.r $1_ss.r $1_sympar.r csm2sm_r $1; tidy $1_sm.r -$1_sm.m: $1_def.r $1_sm.r - sm_r2m $1; matlab_tidy $1_sm.m +$1_sm.m: $1_def.r $1_sm.r $1_sympars.txt + mtt_r2m $1 sm $1_sm.c: $1_def.r $1_sm.r $1_sympar.c sm_r2c $1 $1_sm.tex: $1_sm.r $1_sympar.r $1_simp.r sm_r2tex $1; latex_tidy $1_sm.tex @@ -1864,19 +1868,27 @@ #SUMMARY daeso dae solution - output (dat) #SUMMARY daeso dae solution - output (ps) #SUMMARY daeso dae solution - output (view) #Time responses -$1_ir.m: $1_sm.m $1_numpar.m $1_args.m $1_def.m +$1_ir.m: $1_sm.m $1_numpar.m $1_def.m $1_simpar.m sm2ir_m $1 '$ARGS' $1_iro.m: $1_ir.m touch $1_iro.m +$1_ir.dat: $1_ir.m + m2dat $1_ir +$1_iro.dat: $1_iro.m + m2dat $1_iro $1_sr.m: $1_sm.m $1_numpar.m $1_simpar.m $1_def.m sm2sr_m $1 +$1_sr.dat: $1_sr.m + m2dat $1_sr $1_sro.m: $1_sr.m - touch $1_sro.m -$1_odes.c: $1_ode.c $1_def.r $1_sympar.r + touch $1_sro.m$ +$1_sro.dat: $1_sro.m + m2dat $1_sro +1_odes.c: $1_ode.c $1_def.r $1_sympar.r ode2odes_r2c $1 $1_sms.c: $1_sm.c $1_def.r $1_sympar.r sm2sms_r2c $1 ifeq ($computation,octave) @@ -1963,20 +1975,22 @@ #SUMMARY nifr Nichols style frequency response (ps) #SUMMARY nifr Nichols style frequency response (view) #Frequency responses -$1_fr.m: $1_dm.m $1_numpar.m $1_args.m $1_def.m - dm2fr_m $1 '$ARGS' -$1_lmfr.m: $1_fr.m - touch $1_lmfr.m -$1_lpfr.m: $1_fr.m - touch $1_lpfr.m -$1_nyfr.m: $1_fr.m - touch $1_nyfr.m -$1_nifr.m: $1_fr.m - touch $1_nifr.m +$1_fr.m: $1_dm.m $1_numpar.m $1_def.m $1_simpar.m + dm2fr_m $1 +$1_fr.dat: $1_sr.m + m2dat $1_fr +$1_lmfr.dat: $1_fr.m + m2dat $1_lmfr +$1_lpfr.dat: $1_fr.m + m2dat $1_lpfr +$1_nyfr.dat: $1_fr.m + m2dat $1_nyfr +$1_nifr.dat: $1_fr.m + m2dat $1_nifr #Partially-known system indentification structure matrices $1_pkim.r: $1_tf.r $1_sympar.r tf2pkim_r $1; tidy $1_pki.r $1_pkim.tex: $1_def.r $1_pkim.r $1_sympar.r