Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -12,10 +12,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.166 1998/07/22 08:37:30 peterg +## Implicit integration now the default - for octave anyway. +## ## Revision 1.165 1998/07/19 16:00:22 peterg ## Added smx representation ## ## Revision 1.164 1998/07/17 19:45:58 peterg ## Component aliases implemented. @@ -1282,11 +1285,11 @@ echo "%% Reduce substitution statements for system $1 ($1_subs.r)"; \ cat $MTTPATH/trans/m/rcs_header.txt; \ echo 'END;'; \ )> $1_subs.r -#SUMMARY obspar GPC observability function parameters +#SUMMARY obspar GPC observability function parameters (r) $1_obspar.r: echo Creating $1_obspar.r ( \ echo "%% Reduce GPC observability function parameters for system $1 ($1_obspar.r)"; \ cat $MTTPATH/trans/m/rcs_header.txt; \ @@ -1309,29 +1312,30 @@ #SUMMARY simpar simulation information (txt) $1_simpar.txt: echo Creating $1_simpar.txt ( \ - echo "%% Simulation parameters for system $1 ($1_simpar.txt)"; \ - cat $MTTPATH/trans/m/rcs_header.txt; \ + echo "# Simulation parameters for system $1 ($1_simpar.txt)"; \ + echo "# Generated by MTT on" `date`.; \ + cat $MTTPATH/trans/rcs_header.sh; \ echo 'LAST=10.0'; \ echo 'DT=0.1'; \ echo 'STEPFACTOR=1'; \ - echo 'METHOD=Implicit'; \ + echo 'METHOD="Implicit"'; \ )> $1_simpar.txt #SUMMARY simpar simulation information (m) $1_simpar.m: $1_simpar.txt echo Creating $1_simpar.m sed 's/txt/m/'<$1_simpar.txt >$1_simpar.m -#SUMMARY simpar simulation information (h) (c) header file +#SUMMARY simpar simulation information c header file (h) $1_simpar.h: $1_simpar.txt simpar_txt2h $1 -#SUMMARY numpar numerical parameter declaration (txt) -- default +#SUMMARY numpar numerical parameter declaration -- default (txt) $1_numpar.txt: mtt $mtt_switches -q -u $1 sympar txt; sympar2numpar_txt2txt $1 #SUMMARY numpar numerical parameter declaration (m) @@ -1340,11 +1344,11 @@ #SUMMARY numpar numerical parameter declaration (c) $1_numpar.c: $1_numpar.txt $1_sympar.c txt2c $1 numpar -#SUMMARY input numerical input declaration (txt) -- default +#SUMMARY input numerical input declaration -- default (txt) ifeq ($switches,0) $1_input.txt: mtt $mtt_switches $1 struc txt; mtt $mtt_switches $1 ss r; struc2input_txt2txt $1 @@ -1359,11 +1363,11 @@ #SUMMARY input numerical input declaration (m) $1_input.m: $1_input.txt $1_sympar.txt $1_ss.r input_txt2m $1 -#SUMMARY state state declaration (txt) -- default +#SUMMARY state state declaration -- default (txt) $1_state.txt: mtt $mtt_switches $1 struc txt; mtt $mtt_switches $1 ss r; struc2state_txt2txt $1 @@ -1446,16 +1450,11 @@ ifeq ($documenttype,book) $1_rep.txt: dir2rep $1 $dotdot; else $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 "mtt $1 abg tex"; \ - )> $1_rep.txt + makerep_txt $1; endif #SUMMARY rbg raw bond graph (m) #Raw bond graph: fig file to mfile $1_rbg.m: $1_abg.fig $1_lbl.txt @@ -1613,11 +1612,11 @@ #SUMMARY ss steady-state equations (m) #SUMMARY ss steady-state equations (tex) #SUMMARY ss steady-state equations (view) #SUMMARY ss steady-state equations (ps) #Steady-states -$1_ss.r: $1_def.r $1_sspar.r $1_cr.r $1_cse.r +$1_ss.r: $1_def.r $1_sspar.r $1_cr.r $1_ode.r sspar2ss_r $1; tidy $1_ss.r $1_ss.m: $1_def.r $1_ss.r $1_numpar.m ss_r2m $1; matlab_tidy $1_ss.m $1_ss.tex: $1_def.r $1_ss.r $1_simp.r ss_r2tex $1; latex_tidy $1_ss.tex @@ -1775,15 +1774,15 @@ #SUMMARY odes ode solution - state (m) #SUMMARY odes ode solution - state (dat) #SUMMARY odes ode solution - state (ps) #SUMMARY odes ode solution - state (view) -#SUMMARY sms ode (in state matrix form) solution - state & output(c) +#SUMMARY sms ode (in state matrix form) solution - state & output (c) #SUMMARY odeso ode solution - output (m) #SUMMARY odeso ode solution - output (dat) -#SUMMARY odeso ode solution - output for spreadsheet(sdat) +#SUMMARY odeso ode solution - output for spreadsheet (sdat) #SUMMARY odeso ode solution - output (ps) #SUMMARY odeso ode solution - output (view) #SUMMARY daes dae solution - state (m) #SUMMARY daes dae solution - state (dat) @@ -2016,18 +2015,19 @@ #Generate pdf $1_$2.pdf: $1_$2.ps echo Creating $1_$2.pdf ps2pdf $1_$2.ps $1_$2.pdf + #Report generation $1_rep.make: $1_rep.txt $1_args.m rep_txt2make $1 "$mtt_switches" -make_reps: - rep_txt2sh $1; # touch $1_rep.txt +reps_made: + rep_txt2sh $1; touch reps_made -$1_rep.tex: $1_rep.txt make_reps +$1_rep.tex: $1_rep.txt reps_made rep_txt2tex $1 "$documenttype" "$directory"; #SUMMARY abg Acausal bond graph report (tex) $1_abg.tex: $1_sub.sh abg2tex $1