Combine acorn/wcoss2 scripts as much as possible

regression/regression_driver.sh

@@ -45,7 +45,7 @@ for jn in `seq ${RSTART} ${REND}`; do
    fi
    rm -f ${job[$jn]}.out
 
-   /bin/sh $ush/$sub_cmd -q $queue -j ${job[$jn]} -t ${topts[$jn]} -p ${popts[$jn]} -r ${ropts[$jn]} $scripts/${regtest}.sh
+   /bin/sh $ush/$sub_cmd -m ${machine} -q $queue -j ${job[$jn]} -t ${topts[$jn]} -p ${popts[$jn]} -r ${ropts[$jn]} $scripts/${regtest}.sh
 
    if [ $debug == ".true." ]; then break; fi
    $scripts/regression_wait.sh ${job[$jn]} ${rcname} $check_resource

ush/module-setup.sh

@@ -36,12 +36,8 @@ elif [[ $MACHINE_ID = s4* ]] ; then
     fi
     module purge
 
-elif [[ $MACHINE_ID = wcoss2 ]]; then
-    # We are on WCOSS2
-    module reset
-
-elif [[ $MACHINE_ID = acorn ]]; then
-    # We are on WCOSS2-Acorn
+elif [[ $MACHINE_ID = wcoss2 || $MACHINE_ID = acorn ]]; then
+    # We are on WCOSS2 (cactus, dogwood, or acorn)
     module reset
 
 elif [[ $MACHINE_ID = stampede* ]] ; then

ush/sub_acorn

@@ -0,0 +1 @@
+sub_wcoss2

ush/sub_wcoss2

@@ -1,6 +1,6 @@
 #!/bin/sh --login
 set -x
-echo "starting sub_wcoss2"
+echo "starting sub_${machine}"  # wcoss2 or acorn
 usage="\
 Usage:  $0 [options] executable [args]
       where the options are:
@@ -125,7 +125,7 @@ echo "" >> $cfile
 
 echo "module reset"                         >> $cfile
 echo "module use $modulefiles"              >> $cfile
-echo "module load gsi_wcoss2.intel"               >> $cfile
+echo "module load gsi_${machine}.intel"     >> $cfile
 echo "module load envvar/1.0"               >> $cfile
 echo "module load cray-pals/1.2.2"          >> $cfile
 echo "module -t list 2>&1 | while read line;do module show $line 2>&1 | sed -n -e '2p';done | sort" >> $cfile
@@ -167,5 +167,5 @@ if [[ -w $SUBLOG ]];then
 fi
 ##rm $cfile $ofile
 ##[[ $MKDATA = YES ]] && rmdir $DATA
-echo "ending sub_wcoss2"
+echo "ending sub_${machine}"
 exit $rc