Initial RT support for Gaea-C5.

regression/regression_var.sh

@@ -51,18 +51,15 @@ echo "Running Regression Tests on '$machine'";
 
 case $machine in
  Gaea)
- export queue="normal"
- export noscrub="/gpfs/f5/scratch/$LOGNAME/gsi_tmp/noscrub"
- export ptmp="/gpfs/f5/scratch/$LOGNAME/gsi_tmp/ptmp"
+ export accnt="gfdl_y"
+ export noscrub="/gpfs/f5/scratch/$LOGNAME/$accnt/gsi_tmp/noscrub"
+ export ptmp="/gpfs/f5/scratch/$LOGNAME/$accnt/gsi_tmp/ptmp"
  export casesdir="/gpfs/f5/epic/world-shared/GSI_data/CASES/regtest"
+ export queue="batch"
 
  export group="global"
- if [[ "$cmaketest" = "false" ]]; then
- export basedir="/gpfs/f5/dev/$LOGNAME/sandbox/GSI"
- fi
 
  export check_resource="no"
- export accnt="nggps_emc"
  ;;
  wcoss2)
  export local_or_default="${local_or_default:-/lfs/h2/emc/da/noscrub/$LOGNAME}"

ush/sub_gaea

@@ -88,8 +88,8 @@ output=${output:-$jobname.out}
 myuser=$LOGNAME
 myhost=$(hostname)
 
-if [ -d /gpfs/f5/scratch/$LOGNAME ]; then
- DATA=/gpfs/f5/scratch/$LOGNAME/tmp
+if [ -d /gpfs/f5/scratch/$LOGNAME/$accnt ]; then
+ DATA=/gpfs/f5/scratch/$LOGNAME/$accnt/tmp
 fi
 DATA=${DATA:-$ptmp/tmp}
 
@@ -109,14 +109,20 @@ echo "#!/bin/bash -l"
 echo "" >> $cfile
 echo "#SBATCH --output=$output" >> $cfile
 echo "#SBATCH --job-name=$jobname" >> $cfile
-echo "#SBATCH --qos=$queue" >> $cfile
 echo "#SBATCH --time=$timew" >> $cfile
 echo "#SBATCH --nodes=$nodes --ntasks-per-node=$procs --cpus-per-task=$threads" >> $cfile
 echo "#SBATCH --account=$accnt" >> $cfile
+echo "#SBATCH --clusters=c5" >> $cfile
 echo "#SBATCH --mem=0" >> $cfile
 
 echo "" >>$cfile
+echo "export ntasks=$(( $nodes * $procs ))" >> $cfile
+echo "export ppn=$procs" >> $cfile
+echo "export threads=$threads" >> $cfile
 echo "export OMP_NUM_THREADS=$threads" >> $cfile
+##echo "export OMP_STACKSIZE=2048M" >> $cfile
+echo "ulimit -s unlimited" >> $cfile
+
 echo "" >>$cfile
 echo ". "$(awk '{ print $1, $2, $3, $4, $5, $6, $7, $8, $9 }' $regdir/regression_var.out) >>$cfile
 echo "" >>$cfile
@@ -152,7 +158,7 @@ sbatch=${sbatch:-sbatch}
 ofile=$DATA/subout$$
 >$ofile
 chmod 777 $ofile
-$sbatch $cfile >$ofile
+$sbatch --export=ALL $cfile >$ofile
 rc=$?
 cat $ofile
 if [[ -w $SUBLOG ]];then