Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -13,10 +13,14 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.275 2000/10/12 18:38:47 peterg +## New method of sympar generation implemented - uses mtt_make_sympar +## Check/update of numpar.txt is forced. +## ## Revision 1.274 2000/10/12 15:11:54 peterg ## Added the update function for numpar only ## ## Revision 1.273 2000/10/10 21:00:27 peterg ## More changes for new code gneration @@ -1254,11 +1258,11 @@ rm -f *_odeso.dat *_odeso.gdat *_odeso.sdat *_odeso.m *_odeso.ps rm -f *_*.doc *_*.idx *_*.ind *_*.ilg *_*.dvi *_*.aux *_*.lof *_*.toc rm -f *_rep.tex rm -f *_unique_raw_list *_raw_list rm -f mtt_error.txt mtt_info.txt *_ode2odes.out - rm -f *_*_write.r + rm -f *_*_write.r *_simpar.m *_simpar.p rm -fR *_rep MTT_work exit fi # Clean up named system @@ -1279,11 +1283,11 @@ rm -f $1_odeso.dat $1_odeso.gdat $1_odeso.m $1_odeso.ps rm -f $1_*.doc $1_*.idx $1_*.ind $1_*.ilg $1_*.dvi $1_*.aux $1_*.lof $1_*.toc rm -f $1_rep.tex rm -f $1_unique_raw_list $1_raw_list rm -f mtt_error.txt mtt_info.txt $1_ode2odes.out - rm -f $1_*_write.r + rm -f $1_*_write.r $1_simpar.m $1_simpar.p rm -fR $1_rep MTT_work exit fi if [ "$2" = "rep" ]; then @@ -1432,11 +1436,13 @@ VC='' if [ "$3" = "vc" ]; then tidy=untidy; if [ -n "$4" ]; then - log_message=-m$4 + log_message=$4 + else + log_message="No Message" fi case $2 in abg ) VC='ok' VCext='fig' ;; @@ -1454,10 +1460,13 @@ VCext='txt' ;; numpar ) VC='ok' VCext='txt' ;; input ) + VC='ok' + VCext='txt' ;; + state ) VC='ok' VCext='txt' ;; odes ) VC='ok' VCext='h' ;; @@ -1948,11 +1957,23 @@ ifeq ($target,$1_numpar.txt) mtt_update $1 numpar update else mtt_update $1 numpar endif + +#SUMMARY state numerical state declaration -- default (txt) +$1_state.txt : FORCE + mtt -q $1 sympar txt +ifeq ($target,$1_state.txt) + mtt_update $1 state update +else + mtt_update $1 state +endif + +# Dummy target FORCE: + #SUMMARY numpar numerical parameter declaration (m) $1_numpar.m: $1_numpar.txt $1_sympars.txt mtt_txt2m $1 numpar #SUMMARY numpar numerical parameter declaration (c) @@ -1959,29 +1980,28 @@ #SUMMARY numpar numerical parameter declaration (view) $1_numpar.c: $1_numpar.txt $1_sympar.c txt2c $1 numpar #SUMMARY input numerical input declaration -- default (txt) -#SUMMARY state numerical state declaration -- default (txt) ifeq ($steadystate_computation,yes) $1_input.txt: mtt -q $mtt_switches $1 ss r mtt -q $mtt_switches $1 struc txt mtt -q $mtt_switches $1 switch txt struc2input_txt2txt -ss $1 -$1_state.txt: - mtt -q $mtt_switches $1 ss r - mtt -q $mtt_switches $1 struc txt - struc2state_txt2txt -ss $1 +#$1_state.txt: +# mtt -q $mtt_switches $1 ss r +# mtt -q $mtt_switches $1 struc txt +# struc2state_txt2txt -ss $1 else $1_input.txt: mtt -q $mtt_switches $1 struc txt mtt -q $mtt_switches $1 switch txt struc2input_txt2txt $1 -$1_state.txt: - mtt -q $mtt_switches $1 struc txt - struc2state_txt2txt $1 +#$1_state.txt: +# mtt -q $mtt_switches $1 struc txt +# struc2state_txt2txt $1 endif #ifeq ($switches,0) #$1_input.txt: @@ -2844,12 +2864,12 @@ # Version control system - uses RCS RCS: echo Creating RCS mkdir RCS $1_$2.vc: RCS - echo Version control on $1_$2.$VCext - ci $log_message -I $1_$2.$VCext