Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -12,10 +12,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +# Revision 1.82 1997/06/13 08:59:03 peterg +# Set to version 2.4 +# ## Revision 1.81 1997/05/22 10:11:04 peterg ## Fixed dat2gdat bug (with parameters) ## ## Revision 1.80 1997/05/22 07:38:27 peterg ## Added command line info to .doc files (makedoc) @@ -344,10 +347,11 @@ echo ' mtt ' echo ' mtt ' echo 'Options: -q quiet mode' echo ' -c c-code generation' echo ' -o ode and dae are the same' + echo ' -s use switch (ISW and CSW) components' exit fi if [ "$1" = "info" ] && [ "$3" = "" ]; then @@ -373,11 +377,12 @@ exit fi if [ "$1" = "warranty" ] && [$2 = ""]; then cat << EOF -Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995,1996 Peter J. Gawthrop +Copyright (C) 1989, 1990, 1991, 1992, 1993, + 1994, 1995, 1996, 1997 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 @@ -565,16 +570,16 @@ VC='ok' VCext='txt' ;; simp ) VC='ok' VCext='r' ;; - params ) + numpar ) VC='ok' - VCext='m' ;; + VCext='txt' ;; input ) VC='ok' - VCext='m' ;; + VCext='txt' ;; sspar ) VC='ok' VCext='r' ;; *) echo Version control is not appropriate for representation $2 @@ -792,13 +797,12 @@ $1_rep.txt: echo Creating $1_rep.txt ( \ echo "%% Outline report file for system $1 ($1_rep.txt)"; \ cat $MTTPATH/trans/m/rcs_header.txt; \ - echo "abg ps"; \ - echo "lbl txt"; \ - echo "cbg ps"; \ + echo "abg tex"; \ + echo "struc tex"; \ echo "dae tex"; \ )> $1_rep.txt #SUMMARY rbg raw bond graph (m) #Raw bond graph: fig file to mfile @@ -1047,24 +1051,24 @@ #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_params.m $1_args.m $1_def.m +$1_ir.m: $1_sm.m $1_numpar.m $1_args.m $1_def.m sm2ir_m $1 '$ARGS' $1_iro.m: $1_ir.m touch $1_iro.m -$1_sr.m: $1_sm.m $1_numpar.m $1_params.m $1_args.m $1_def.m +$1_sr.m: $1_sm.m $1_numpar.m $1_args.m $1_def.m sm2sr_m $1 '$ARGS' $1_sro.m: $1_sr.m touch $1_sro.m $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) -$1_odes.m: $1_ode.m $1_numpar.m $1_params.m $1_args.m $1_def.m $1_input.m +$1_odes.m: $1_ode.m $1_numpar.m $1_args.m $1_def.m $1_input.m ode2odes_m $1 '$ARGS' endif ifeq ($computation,c) $1_odes.m: $1_odes.c $1_ode.c $1_numpar.c $1_odes.h\ $1_sympar.c $1_sympar.h\ @@ -1088,11 +1092,11 @@ endif $1_odeso.m: $1_odes.m touch $1_odeso.m $1_smso.m: $1_sms.m touch $1_smso.m -$1_daes.m: $1_dae.m $1_numpar.m $1_params.m $1_args.m $1_def.m $1_input.m +$1_daes.m: $1_dae.m $1_numpar.m $1_args.m $1_def.m $1_input.m dae2daes_m $1 '$ARGS' $1_daeso.m: $1_daes.m touch $1_daeso.m #SUMMARY odess ode numerical steady-states - states (m) @@ -1104,11 +1108,11 @@ #SUMMARY odesso ode numerical steady-states - outputs (dat) #SUMMARY odesso ode numerical steady-states - outputs (ps) #SUMMARY odesso ode numerical steady-states - outputs (view) #Numerical steady states -$1_odess.m: $1_ode.m $1_numpar.m $1_params.m $1_args.m $1_def.m $1_input.m +$1_odess.m: $1_ode.m $1_numpar.m $1_args.m $1_def.m $1_input.m ode2odess_m $1 '$ARGS' $1_odesso.m: $1_odess.m touch $1_odesso.m @@ -1137,11 +1141,11 @@ #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_params.m $1_args.m $1_def.m +$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