Index: mttroot/mtt/bin/trans/cr_txt2r ================================================================== --- mttroot/mtt/bin/trans/cr_txt2r +++ mttroot/mtt/bin/trans/cr_txt2r @@ -14,10 +14,16 @@ ############################################################### ## Version control history ############################################################### ## $Id$ ## $Log$ +## Revision 1.7 1998/04/14 17:46:28 peterg +## To avoid clashes when creating for more thsan one top level file, adds +## _lower attribute to lower lecel constitutive relationship files. +## .constitutive relationship files only in top level _constitutive +## relationship files. +## ## Revision 1.6 1998/04/14 13:54:15 peterg ## Uses the _sub.sh rep to recursively generate and include sub systems. ## ## Revision 1.5 1998/03/09 13:36:00 peterg ## Cosmetic change @@ -52,11 +58,12 @@ ############################################################### # The level of the recursion null at top level; _lower at lower levels. level=$2 -crfile=$1_cr$level.r +crfile=$1_cr.r +CRFILE=$1_cr.r if [ -f "$crfile" ]; then echo "Using $crfile" else # Inform user @@ -63,22 +70,22 @@ echo "Creating $crfile" echo "% Constitutive relation file for $1 ($crfile)" > $crfile echo "% Generated by MTT at `date`" >> $crfile -echo >> $crfile + echo >> $crfile # Recursively create subsystem CR files -- at lower level sh $1_sub.sh 'cr_txt2r ' ' _lower' # Include subsystem CR files - sh $1_sub.sh 'echo ' '_cr_lower.r' |\ + sh $1_sub.sh 'echo ' "_cr.r" |\ awk '{ print "in \"" $1 "\";" }' >> $crfile -if [ -z "$level" ]; then + if [ -z "$level" ]; then # Copy .cr files awk '{ if (NF>0) { print "mtt -q -u crcopy " $1; @@ -90,13 +97,13 @@ if (NF>0) { print "in \"" $1 ".cr\";" } }' $1_cr.txt >> $crfile - echo 'END;' >> $crfile -fi + fi +echo 'END;' >> $crfile fi # Now invoke the standard error handling. #mtt_error mtt_error.txt