Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -12,10 +12,15 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.231 2000/03/15 21:24:23 peterg +## Version 4.1: +## Fixed problems with -abg mode +## Old-style SS lbl no longer supported +## ## Revision 1.230 2000/03/15 20:31:06 peterg ## Replaced lbl2cr by abg2cr_m2txt ## ## Revision 1.229 2000/03/15 19:39:40 peterg ## Replaced sub creation cmp2sub_m2sh by abg2sub_m2sh @@ -1554,12 +1559,12 @@ #SUMMARY sympar symbolic parameters (txt) #SUMMARY sympar* symbolic parameters (view) # Lbl to sympar conversion ifeq ($switches,0) -$1_sympar.txt: $1_sub.sh $1_lbl.txt - lbl2sympar_txt2txt $1 +$1_sympar.txt: $1_sub.sh $1_abg.m + abg2sympar_m2txt $1 if [ "$level" = "0" ]; then \ mv $1_sympar.txt MTT_sympar.txt; \ else \ cat $1_sympar.txt >> MTT_sympar.txt; \ @@ -1571,12 +1576,12 @@ if [ "$level" = "0" ]; then \ sort_sympar $1_sympar.txt; \ fi endif ifeq ($switches,1) -$1_sympar.txt: $1_sub.sh $1_lbl.txt - lbl2sympar_txt2txt $1 +$1_sympar.txt: $1_sub.sh $1_abg.m + abg2sympar_m2txt $1 if [ "$level" = "0" ]; then \ mv $1_sympar.txt MTT_sympar.txt; \ else \ cat $1_sympar.txt >> MTT_sympar.txt; \ @@ -1707,25 +1712,25 @@ #SUMMARY input numerical input declaration -- default (txt) #SUMMARY state numerical state declaration -- default (txt) ifeq ($steadystate_computation,yes) $1_input.txt: - mtt -q $1 ss r - mtt -q $1 struc txt - mtt -q $1 switch 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 $1 ss r - mtt -q $1 struc 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 $1 struc txt - mtt -q $1 switch txt + mtt -q $mtt_switches $1 struc txt + mtt -q $mtt_switches $1 switch txt struc2input_txt2txt $1 $1_state.txt: - mtt -q $1 struc txt + mtt -q $mtt_switches $1 struc txt struc2state_txt2txt $1 endif #ifeq ($switches,0)