modification in regress scripts for setup for fv3reg GSI

TingLei-daprediction · Feb 26, 2024 · 57f1839 · 57f1839
1 parent 6a184ac
commit 57f1839
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/regression/regression_driver.sh b/regression/regression_driver.sh
@@ -36,10 +36,12 @@ for jn in `seq ${RSTART} ${REND}`; do
       export scripts=${scripts_updat:-$scripts}
       export fixgsi=${fixgsi_updat:-$fixgsi}
       export modulefiles=${modulefiles_updat:-$modulefiles}
+      export ush=${ush_update:-$ush}
    else
       export scripts=${scripts_contrl:-$scripts}
       export fixgsi=${fixgsi_contrl:-$fixgsi}
       export modulefiles=${modulefiles_contrl:-$modulefiles}
+      export ush=${ush_cntrl:-$ush}
    fi
    rm -f ${job[$jn]}.out
 

diff --git a/regression/regression_param.sh b/regression/regression_param.sh
@@ -125,7 +125,7 @@ case $regtest in
            topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
         elif [[ "$machine" = "Hercules" ]]; then
            topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
-           topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/2"
+           topts[2]="0:15:00" ; popts[2]="10/4/" ; ropts[2]="/4"
         elif [[ "$machine" = "Jet" ]]; then
            topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
@@ -154,7 +154,7 @@ case $regtest in
            topts[2]="0:20:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
         elif [[ "$machine" = "Hercules" ]]; then
            topts[1]="0:20:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
-           topts[2]="0:20:00" ; popts[2]="20/2/"  ; ropts[2]="/1"
+           topts[2]="0:20:00" ; popts[2]="10/4/"  ; ropts[2]="/4"
         elif [[ "$machine" = "Jet" ]]; then
            topts[1]="0:15:00" ; popts[1]="20/1/"  ; ropts[1]="/1"
            topts[2]="0:15:00" ; popts[2]="20/2/"  ; ropts[2]="/1"

diff --git a/ush/sub_hercules b/ush/sub_hercules
@@ -129,9 +129,6 @@ echo ". /apps/other/lmod/lmod/init/sh"                     >> $cfile
 echo "module purge"                                        >> $cfile
 echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_hercules.intel" >> $cfile
-#TODO reenable I_MPI_EXTRA_FILESYSTEM once regional ctests can properly handle parallel I/O on Hercules
-echo "unset I_MPI_EXTRA_FILESYSTEM"         >> $cfile
-echo ""                                                    >> $cfile
 cat $exec >> $cfile
 
 if [[ $nosub = YES ]];then