Port to Hercules (#107)

* Initial port to Hercules #101

* Update detect_machine.sh for Hercules. #107

* Rename Hercules modules.

* Upgrade Hercules to spack-stack v1.6.0; remove perl module

Use system perl instead.  New Perl modules were installed during the
last system maintainance period.

README.md

@@ -3,7 +3,7 @@ GSI Monitoring Tools
 
 These tools monitor the Gridpoint Statistical Interpolation (GSI) package's data assimiliation, detecting 
 and reporting missing data sources, low observational counts, and high penalty values.  These machines 
-are supported:  wcoss2, hera, orion, jet, s4.
+are supported:  wcoss2, hera, hercules, orion, jet, s4.
 
 Suite includes:
 ```

modulefiles/hercules.intel-run.lua

@@ -0,0 +1,21 @@
+help([[
+]])
+
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+local grads_ver=os.getenv("grads_ver") or "2.2.1"
+local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
+
+-- wgrib2 is a newer version on Hercules
+setenv("wgrib2_ver", "3.1.1")
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("grads", grads_ver))
+load(pathJoin("prod_util", prod_util_ver))
+
+load("common-run")
+
+whatis("Description: GSI Monitoring run-time environment on Hercules")

modulefiles/hercules.intel.lua

@@ -0,0 +1,16 @@
+help([[
+]])
+
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")
+
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
+local stack_impi_ver=os.getenv("stack_impi_ver") or "2021.9.0"
+local cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+
+load(pathJoin("stack-intel", stack_intel_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+load(pathJoin("cmake", cmake_ver))
+
+load("common")
+
+whatis("Description: GSI Monitoring environment on Hercules with Intel Compilers")

parm/Mon_config

@@ -30,7 +30,8 @@ export MY_MACHINE=$machine_id
 #         run-time modules.  If the run-time mod idea passes muster
 #         then I'll open an issue for the change to those machines.
 #
-if [[ $MY_MACHINE = "wcoss2" || $MY_MACHINE = "hera" || $MY_MACHINE = "orion" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
+if [[ $MY_MACHINE = "wcoss2" || $MY_MACHINE = "hera" || $MY_MACHINE = "orion" || \
+      $MY_MACHINE = "hercules" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
    source $DIR_ROOT/ush/module-setup.sh
    module use $DIR_ROOT/modulefiles
    module load ${MACHINE_ID}.${COMPILER}-run
@@ -96,6 +97,17 @@ case $MY_MACHINE in
       export SUB="sbatch" #/opt/slurm/bin/sbatch
       export SERVICE_PARTITION="orion"
 
+      tankdir="/work/noaa/da/$USER/nbns"
+      ptmp="/work2/noaa/stmp/$USER"
+      stmp="/work/noaa/stmp/$USER"
+      queue=""
+      project=""
+      account="da-cpu"
+
+   hercules) 
+      export SUB="sbatch" #/opt/slurm/bin/sbatch
+      export SERVICE_PARTITION="hercules"
+
       tankdir="/work/noaa/da/$USER/nbns"
       ptmp="/work2/noaa/stmp/$USER"
       stmp="/work/noaa/stmp/$USER"

src/Conventional_Monitor/data_extract/ush/ConMon_DE.sh

@@ -216,7 +216,8 @@ if [ -s $cnvstat  -a -s $pgrbf00 -a -s $pgrbf06 ]; then
          rm -f ${logfile}
       fi
 
-      if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "orion" ]]; then
+      if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ||
+            $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
          $SUB -A $ACCOUNT --ntasks=1 --time=00:30:00 \
 		-p ${SERVICE_PARTITION} -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
 		${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON

src/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh

@@ -56,8 +56,9 @@
       rm -f ${errfile}
    fi
 
-   if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || \
-         $MY_MACHINE == "jet" || $MY_MACHINE == "orion" ]]; then
+   if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || 
+         $MY_MACHINE == "jet" || $MY_MACHINE == "orion" || 
+         $MY_MACHINE == "hercules" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
 		-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_hist}
 
@@ -83,8 +84,9 @@
       rm -f ${errfile}
    fi
 
-   if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || \
-         $MY_MACHINE == "jet" || $MY_MACHINE == "orion" ]]; then
+   if [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" ||
+         $MY_MACHINE == "jet" || $MY_MACHINE == "orion" ||
+         $MY_MACHINE == "hercules" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
 		-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz}
 
@@ -111,7 +113,8 @@
    fi
 
    if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \
-         ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ]]; then
+         ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ||
+         ${MY_MACHINE} == "hercules" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=01:30:00 \
 	     -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz_uv}
 

src/Conventional_Monitor/image_gen/ush/mk_time_vert.sh

@@ -27,8 +27,9 @@ echo "--> mk_time_vert.sh"
       rm -f $errfile
    fi
 
-   if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \
-         ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ]]; then
+   if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" ||
+         ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ||
+         ${MY_MACHINE} == "hercules" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:15:00 \
                 -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
 
@@ -55,8 +56,9 @@ echo "--> mk_time_vert.sh"
          rm -f $errfile
       fi
 
-      if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \
-            ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ]]; then
+      if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" ||
+            ${MY_MACHINE} == "jet" || ${MY_MACHINE} == "orion" ||
+            ${MY_MACHINE} == "hercules" ]]; then
          if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
             walltime="02:30:00"
          else
@@ -99,8 +101,9 @@ echo "--> mk_time_vert.sh"
          rm -f $errfile
       fi
 
-      if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || \
-            ${MY_MACHINE} == "jet" || ${MY_MACHINE} = "orion" ]]; then
+      if [[ ${MY_MACHINE} == "hera" || ${MY_MACHINE} == "s4" || 
+            ${MY_MACHINE} == "jet" || ${MY_MACHINE} = "orion" ||
+            ${MY_MACHINE} == "hercules" ]]; then
          if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
             walltime="00:50:00"
          else

src/Minimization_Monitor/README

@@ -2,7 +2,7 @@ README MinMon package
 
 The Minimization Monitor (MinMon) provides a means to visualize and report 
 on the performance of the GSI minimization function.  The package 
-is supported on wcoss2, hera, orion, cheyenne, jet, and s4 machines.
+is supported on wcoss2, hera, orion, hercules, cheyenne, jet, and s4 machines.
 
 The package is organized in two main processes: data_extract and image_gen 
 (image generation).  The data extract piece is now located in the 

src/Ozone_Monitor/README

@@ -3,7 +3,7 @@ README OznMon package
 The OznMon (ozone monitoring) package can be used to extract information
 from ozone diagnostic files and generate image plots to visualize the results.
 The package also may optionally perform data validation and error checking.
-The package is supported on wcoss2, hera, orion, cheyenne, jet, and s4 
+The package is supported on wcoss2, hera, hercules, orion, cheyenne, jet, and s4 
 machines.
 
 The package is organized in two processes, the data_extract and image_gen 

src/Ozone_Monitor/data_xtrct/ush/OznMon_CP.sh

@@ -203,8 +203,8 @@ if compgen -G "${OZN_DATA_DIR}/time/*${PDATE}*.ieee_d*" > /dev/null; then
       $SUB --account=${ACCOUNT} --time=10 -J ${jobname} -D . \
         -o ${logfile} --ntasks=1 --mem=5g ${job}
 
-   elif [[ $MY_MACHINE = "orion" ]]; then
-      echo submit job on orion
+   elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
+      echo submit job on orion or hercules
       $SUB --account=${ACCOUNT} --time=10 -J ${jobname} -D . \
         -o ${logfile} --ntasks=1 --mem=5g ${job}
    fi

src/Ozone_Monitor/image_gen/ush/mk_horiz.sh

@@ -51,7 +51,7 @@ for dsrc in ${data_source}; do
       fi
 
       if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ||
-            ${MY_MACHINE} = "orion" ]]; then
+            ${MY_MACHINE} = "orion" || ${MY_MACHINE} = "hercules" ]]; then
          echo "$ctr ${OZN_IG_SCRIPTS}/plot_horiz.sh $type $suffix '$list' $dsrc" >> $cmdfile
       else
          echo "${OZN_IG_SCRIPTS}/plot_horiz.sh $type $suffix '$list' $dsrc" >> $cmdfile

src/Ozone_Monitor/image_gen/ush/mk_summary.sh

@@ -68,7 +68,8 @@ for ptype in ${data_source}; do
       if [[ $type != "omi_aura" && $type != "gome_metop-a" && \
 	    $type != "gome_metop-b" && $type != "ompstc8_npp" && $type != "ompstc8_n20" ]]; then
          if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" ||
-               ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
+               ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ||
+               ${MY_MACHINE} = "hercules" ]]; then
             echo "${ctr} ${OZN_IG_SCRIPTS}/plot_summary.sh $type $ptype" >> $cmdfile
          else
             echo "${OZN_IG_SCRIPTS}/plot_summary.sh $type $ptype" >> $cmdfile
@@ -95,7 +96,8 @@ for ptype in ${data_source}; do
    fi
 
 
-   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "orion" ]]; then
+   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "orion" || 
+         ${MY_MACHINE} = "hercules" ]]; then
 
       $SUB --account ${ACCOUNT} -n $ctr  -o ${logf} -D . -J ${job} --time=10 \
            --wrap "srun -l --multi-prog ${cmdfile}"

src/Ozone_Monitor/image_gen/ush/mk_time.sh

@@ -50,7 +50,8 @@ for dsrc in ${data_source}; do
 >$cmdfile
    for type in ${SATYPE}; do
       if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
-            ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
+            ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ||
+            ${MY_MACHINE} = "hercules" ]]; then
          echo "${ctr} ${OZN_IG_SCRIPTS}/plot_time.sh $type $suffix '$list' $dsrc" >> $cmdfile
          ((ctr=ctr+1))
       else
@@ -71,7 +72,8 @@ for dsrc in ${data_source}; do
       rm -f $errf
    fi
 
-   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "orion" ]]; then
+   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" ||
+         ${MY_MACHINE} = "orion" || ${MY_MACHINE} = "hercules" ]]; then
 
       $SUB --account ${ACCOUNT} -n $ctr  -o ${logf} -D . -J ${job} --time=10 \
            --wrap "srun -l --multi-prog ${cmdfile}"

src/Radiance_Monitor/README

@@ -4,7 +4,7 @@ The RadMon (radiance monitoring) package can be used to extract data from
 radiance diagnostic files and visualize the results by plotting the data using
 javascript or optionally GrADS.  The package also may optionally perform data 
 validation and error checking.  The package is supported on wcoss2, hera, 
-orion, cheyenne, jet, and s4 machines.
+orion, hercules, cheyenne, jet, and s4 machines.
 
 The package is organized in two main processes, data_extract and image_gen 
 (image generation).  There is also an nwprod directory, which contains the lower 

src/Radiance_Monitor/data_extract/ush/RadMon_DE_glb.sh

@@ -236,7 +236,8 @@ if [[ -e ${radstat} && -e ${biascr} ]]; then
    fi
 
 
-   if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "orion" ]]; then
+   if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "orion" ||
+         $MY_MACHINE = "hercules" ]]; then
       $SUB --account=${ACCOUNT} --time=10 -J ${jobname} -D . \
         -o ${logfile} --ntasks=1 --mem=5g ${job} 
 

src/Radiance_Monitor/image_gen/ush/mk_angle_plots.sh

@@ -232,7 +232,8 @@ while [[ $ctr -le ${satarr_len} ]]; do
    # to the cmdfile
    #
    if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
-         ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
+         ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ||
+         ${MY_MACHINE} = "hercules" ]]; then
       echo "${itemctr} ${IG_SCRIPTS}/plot_angle.sh ${type} ${suffix} '${list}'" >> ${cmdfile}
    else
       echo "${IG_SCRIPTS}/plot_angle.sh ${type} ${suffix} '${list}'" >> ${cmdfile}
@@ -252,7 +253,8 @@ while [[ $ctr -le ${satarr_len} ]]; do
       errfile=${R_LOGDIR}/plot_angle_${suffix}_${jobctr}.err
 
       echo "TASKS= $tasks"
-      if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "orion" ]]; then
+      if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "orion" ||
+            ${MY_MACHINE} = "hercules" ]]; then
          $SUB --account ${ACCOUNT} -n ${itemctr}  -o ${logfile} -D . -J ${jobname} --time=30:00 \
               --wrap "srun -l --multi-prog ${cmdfile}"
 
@@ -314,9 +316,10 @@ for sat in ${big_satlist}; do
            -V -l walltime=60:00 -N ${jobname} ${cmdfile}
 
    #---------------------------------------------------
-   #  hera|jet|s4|orion, submit 1 job for each sat/list item
+   #  hera|jet|s4|orion|hercules, submit 1 job for each sat/list item
    elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || \
-           $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ]]; then		
+           $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ||
+           $MY_MACHINE = "hercules" ]]; then		
 
       ii=0
       logfile=${R_LOGDIR}/plot_angle_${sat}.log
@@ -338,7 +341,7 @@ for sat in ${big_satlist}; do
          $SUB --account ${ACCOUNT} -n $ii  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
               --mem=0 --wrap "srun -l --multi-prog ${cmdfile}"
 
-      elif [[ $MY_MACHINE = "orion" ]]; then
+      elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
          $SUB --account ${ACCOUNT} -n $ii  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
               -p ${SERVICE_PARTITION} --mem=0 --wrap "srun -l --multi-prog ${cmdfile}"
 

src/Radiance_Monitor/image_gen/ush/mk_bcoef_plots.sh

@@ -164,7 +164,7 @@ if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
    $SUB --account $ACCOUNT --ntasks=1 --mem=5g --time=1:00:00 -J ${jobname} \
         -o ${logfile} -D . $IG_SCRIPTS/plot_bcoef.sh 
 
-elif [[ $MY_MACHINE = "orion" ]]; then
+elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
    $SUB --account $ACCOUNT --ntasks=1 --mem=5g --time=20 -J ${jobname} \
         -p ${SERVICE_PARTITION} -o ${logfile} -D . $IG_SCRIPTS/plot_bcoef.sh 
 

src/Radiance_Monitor/image_gen/ush/mk_bcor_plots.sh

@@ -187,7 +187,8 @@ rm -f ${logfile}
 ctr=0
 for sat in ${SATLIST}; do
    if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || 
-         $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ]]; then
+         $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ||
+         $MY_MACHINE = "hercules" ]]; then
       echo "${ctr} $IG_SCRIPTS/plot_bcor.sh $sat $suffix '$plot_list'" >> $cmdfile
    else   
       echo "$IG_SCRIPTS/plot_bcor.sh $sat $suffix '$plot_list'" >> $cmdfile
@@ -208,7 +209,7 @@ if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
    $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} \
         --time=2:00:00 --wrap "srun -l --multi-prog ${cmdfile}"
 
-elif [[ $MY_MACHINE = "orion" ]]; then
+elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
    $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} --time=2:00:00 \
         -p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
 
@@ -245,7 +246,8 @@ for sat in ${bigSATLIST}; do
    ctr=0
    for var in $plot_list; do
       if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || 
-            $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ]]; then
+            $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ||
+            $MY_MACHINE = "hercules" ]]; then
          echo "$ctr $IG_SCRIPTS/plot_bcor.sh $sat $var $var" >> $cmdfile
       else
          echo "$IG_SCRIPTS/plot_bcor.sh $sat $var $var" >> $cmdfile
@@ -265,7 +267,7 @@ for sat in ${bigSATLIST}; do
       $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} \
            --time=1:00:00 --wrap "srun -l --multi-prog ${cmdfile}"
 
-   elif [[ $MY_MACHINE = "orion" ]]; then
+   elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
       $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
            -p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
 

src/Radiance_Monitor/image_gen/ush/mk_time_plots.sh

@@ -189,7 +189,7 @@ if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" ]]; then
    ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=5g --time=1:00:00 -J ${jobname} \
           -o ${logfile} ${IG_SCRIPTS}/plot_summary.sh
 
-elif [[ ${MY_MACHINE} = "orion" ]]; then
+elif [[ ${MY_MACHINE} = "orion" || ${MY_MACHINE} = "hercules" ]]; then
    ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=5g --time=20:00 -J ${jobname} \
           -o ${logfile} ${IG_SCRIPTS}/plot_summary.sh
 
@@ -247,7 +247,8 @@ ctr=0
 
 for sat in ${SATLIST}; do
    if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
-         ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
+         ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ||
+         ${MY_MACHINE} = "hercules" ]]; then
       echo "${ctr} $IG_SCRIPTS/plot_time.sh $sat $suffix '$list'" >> $cmdfile
    else
       echo "$IG_SCRIPTS/plot_time.sh $sat $suffix '$list'" >> $cmdfile
@@ -261,7 +262,7 @@ if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
    $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
         --wrap "srun -l --multi-prog ${cmdfile}"
 
-elif [[ $MY_MACHINE = "orion" ]]; then
+elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
    $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
         -p $SERVICE_PARTITION --wrap "srun -l --multi-prog ${cmdfile}"
 
@@ -299,7 +300,8 @@ for sat in ${bigSATLIST}; do
    ctr=0 
    for var in $list; do
       if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
-            ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
+            ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ||
+            ${MY_MACHINE} = "hercules" ]]; then
          echo "${ctr} $IG_SCRIPTS/plot_time.sh $sat $var $var" >> $cmdfile
       else
          echo "$IG_SCRIPTS/plot_time.sh $sat $var $var" >> $cmdfile
@@ -317,7 +319,7 @@ for sat in ${bigSATLIST}; do
       $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
            --wrap "srun -l --multi-prog ${cmdfile}"
 
-   elif [[ $MY_MACHINE = "orion" ]]; then
+   elif [[ $MY_MACHINE = "orion" || $MY_MACHINE = "hercules" ]]; then
       $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:30:00 \
            -p $SERVICE_PARTITION --wrap "srun -l --multi-prog ${cmdfile}"
 

ush/detect_machine.sh

@@ -35,7 +35,7 @@ case $(hostname -f) in
 
   Orion-login-[1-4].HPC.MsState.Edu) MACHINE_ID=orion ;; ### orion1-4
 
-  [Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ee]du) MACHINE_ID=hercules ;; ### hercules1-4
+  [Hh]ercules-login-[1-4].[Hh][Pp][Cc].[Mm]s[Ss]tate.[Ed]du) MACHINE_ID=hercules ;; ### hercules1-4
 
   login[1-4].stampede2.tacc.utexas.edu) MACHINE_ID=stampede ;; ### stampede1-4