Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -15,10 +15,13 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.315 2001/07/13 04:54:04 geraint +## Branch merge: numerical-algebraic-solution back to main. +## ## Revision 1.314 2001/07/13 04:19:03 gawthrop ## Now loads _subs.r with _cr.r file when using -cr option ## ## Revision 1.313 2001/06/13 14:53:59 gawthrop ## MTT now gas the double-colon option in the abg.fig file @@ -1118,10 +1121,11 @@ # By default, make it tidy tidy=tidy; # Default not verbose verbose=' -s' +verbosity=0 # Default integration method integration_method=implicit; # Default algebraic equation solver @@ -1237,11 +1241,15 @@ debug=debug ;; -v ) mtt_switches="$mtt_switches $1"; info_switch='-I'; Verbose='verbose'; - verbose=' -w ' ;; + verbosity=`expr $verbosity + 1`; + if [ $verbosity -ge 1 ]; then verbose=' -w '; fi; + if [ $verbosity -ge 2 ]; then set -x; fi; + if [ $verbosity -ge 3 ]; then verbose_make=' -d '; fi; + ;; -I ) mtt_switches="$mtt_switches $1"; info_switch='-I' ;; -t ) tidy=tidy ;; @@ -1368,11 +1376,11 @@ echo ' -ss use steady-state info to initialise simulations' echo ' -stdin read input data from standard input for simulations' echo ' -sub operate on this subsystem' echo ' -t tidy mode (default)' echo ' -u untidy mode (leaves files in current dir)' - echo ' -v verbose mode' + echo ' -v verbose mode (multiple uses of -v increase the verbosity level)' echo ' -viewlevel View N levels of hierachy' echo ' --version print version and exit' echo ' --versions print version of mtt and components and exit' exit fi @@ -1969,11 +1977,11 @@ # This is the main mtt programme ################################ #echo Target is $target, Subsystem is $Subsystem, options are $mtt_switches -$MAKE -S $verbose -f - $target << EOF +$MAKE -S $verbose $verbose_make -f - $target << EOF # Cancel implicit rules I don't want %.dvi: %.tex # MTT implicit rules