Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -13,10 +13,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## 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 ## ## Revision 1.272 2000/10/06 16:20:00 peterg ## added ode_write rule @@ -1777,49 +1780,53 @@ $1_cr.tex: $1_cr.r txt2tex $1 cr r #SUMMARY sympar symbolic parameters (txt) #SUMMARY sympar* symbolic parameters (view) -# Lbl to sympar conversion -ifeq ($switches,0) -$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; \ - fi - - sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files - sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them - - if [ "$level" = "0" ]; then \ - sort_sympar $1_sympar.txt; \ - fi -endif -ifeq ($switches,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; \ - fi - - sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files - sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them - - if [ "$level" = "0" ]; then \ - sort_sympar $1_sympar.txt1; \ - struc2switch_txt $1; \ - echo "Appending switch declarations"; \ - cat $1_sympar.txt1 $1_switch.txt> $1_sympar.txt; \ - fi - -endif +$1_sympar.txt: $1_type.sh $1_abg.m $1_aliased.txt + mtt_make_sympar $1 + + +# Lbl to sympar conversion +# ifeq ($switches,0) +# $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; \ +# fi + +# sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files +# sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them + +# if [ "$level" = "0" ]; then \ +# sort_sympar $1_sympar.txt; \ +# fi +# endif +# ifeq ($switches,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; \ +# fi + +# sh $1_sub.sh "rm -f " '_sympar.txt' # Delete sympar files +# sh $1_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' sympar txt' # and recreate them + +# if [ "$level" = "0" ]; then \ +# sort_sympar $1_sympar.txt1; \ +# struc2switch_txt $1; \ +# echo "Appending switch declarations"; \ +# cat $1_sympar.txt1 $1_switch.txt> $1_sympar.txt; \ +# fi + +# endif # ## Old version -- just looks on top level # ## $1_sympar.r: $1_lbl.txt $1_params.r # ## lbl2sympar_txt2r $1 @@ -1934,16 +1941,18 @@ $1_simpar.m: $1_simpar.txt mtt_txt2m $1 simpar #SUMMARY numpar numerical parameter declaration -- default (txt) +$1_numpar.txt : FORCE + mtt -q $1 sympar txt ifeq ($target,$1_numpar.txt) -$1_numpar.txt: $1_sympar.txt mtt_update $1 numpar update else mtt_update $1 numpar endif +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) @@ -2123,10 +2132,12 @@ cbg2ese_m2r $partition $info_switch $Subsystem; #ese_tidy $1 $1_def.r: $1_ese.r touch $1_def.r $1_struc.txt: $1_ese.r touch $1_struc.txt +$1_aliased.txt: $1_ese.r + touch $1_aliased.txt $1_struc.tex: $1_struc.txt struc_txt2tex $1 $1_struc.m: $1_struc.txt struc_txt2m $1 $1_def.m: $1_def.r