GitHub Issue NOAA-EMC#215 Ported RadMon to S4 and Jet.

DavidHuber-NOAA · Oct 14, 2021 · 6c2a0d1 · 6c2a0d1
1 parent 9a32400
commit 6c2a0d1
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 19 deletions.
diff --git a/util/Radiance_Monitor/image_gen/ush/mk_angle_plots.sh b/util/Radiance_Monitor/image_gen/ush/mk_angle_plots.sh
@@ -169,7 +169,7 @@ rm ${LOGdir}/plot_angle_${suffix}.log
 ctr=0
 for type in ${satlist}; do
 
-   if [[ ${MY_MACHINE} = "hera" ]]; then
+   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ]]; then
       echo "${ctr} ${IG_SCRIPTS}/plot_angle.sh ${type} ${suffix} '${list}'" >> ${cmdfile}
    else
       echo "${IG_SCRIPTS}/plot_angle.sh ${type} ${suffix} '${list}'" >> ${cmdfile}
@@ -187,10 +187,14 @@ if [[ ${MY_MACHINE} = "wcoss_d" ]]; then
    $SUB -q $JOB_QUEUE -P $PROJECT -o ${logfile} -M 500 -W ${wall_tm} \
         -R "affinity[core]" -J ${jobname} -cwd ${PWD} $cmdfile
 
-elif [[ ${MY_MACHINE} = "hera" ]]; then
+elif [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" ]]; then
    $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} --time=30:00 \
         --wrap "srun -l --multi-prog ${cmdfile}"
 
+elif [[ ${MY_MACHINE} = "jet" ]]; then
+   $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} --time=30:00 \
+        -p ${RADMON_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
+
 elif [[ ${MY_MACHINE} = "wcoss_c" ]]; then
    $SUB -q $JOB_QUEUE -P $PROJECT -o ${logfile} -M 600 -W ${wall_tm} \
         -J ${jobname} -cwd ${PWD} $cmdfile
@@ -237,7 +241,7 @@ for sat in ${big_satlist}; do
       fi
 
 
-   elif [[ $MY_MACHINE = "hera" ]]; then		# hera, submit 1 job for each sat/list item
+   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || $MY_MACHINE = "s4" ]]; then		# hera|jet|s4, submit 1 job for each sat/list item
 
       ii=0
       logfile=${LOGdir}/plot_angle_${sat}.log
@@ -252,8 +256,13 @@ for sat in ${big_satlist}; do
          (( ii=ii+1 ))
       done
 
-      $SUB --account ${ACCOUNT} -n $ii  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
-           --wrap "srun -l --multi-prog ${cmdfile}"
+      if [[ ! $MY_MACHINE = "jet" ]]; then
+         $SUB --account ${ACCOUNT} -n $ii  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
+              --wrap "srun -l --multi-prog ${cmdfile}"
+      else
+         $SUB --account ${ACCOUNT} -n $ii  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
+              -p ${RADMON_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
+      fi
 
    fi
 

diff --git a/util/Radiance_Monitor/image_gen/ush/mk_bcoef_plots.sh b/util/Radiance_Monitor/image_gen/ush/mk_bcoef_plots.sh
@@ -126,9 +126,12 @@ elif [[ $MY_MACHINE = "wcoss_c" ]]; then
    $SUB -q $JOB_QUEUE -P $PROJECT -o ${logfile} -M 80 -W 1:15 \
         -J ${jobname} -cwd ${PWD} $IG_SCRIPTS/plot_bcoef.sh
 
-elif [[ $MY_MACHINE = "hera" ]]; then
+elif [[ $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 = "jet" ]]; then
+   $SUB --account $ACCOUNT --ntasks=1 --mem=5g --time=1:00:00 -J ${jobname} \
+        -p ${RADMON_PARTITION} -o ${logfile} -D . $IG_SCRIPTS/plot_bcoef.sh
 fi
 
 echo "end mk_bcoef_plots.sh"

diff --git a/util/Radiance_Monitor/image_gen/ush/mk_bcor_plots.sh b/util/Radiance_Monitor/image_gen/ush/mk_bcor_plots.sh
@@ -156,7 +156,7 @@ rm -f ${logfile}
 
 ctr=0
 for sat in ${SATLIST}; do
-   if [[ $MY_MACHINE = "hera" ]]; then
+   if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || $MY_MACHINE = "s4" ]]; 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
@@ -181,9 +181,14 @@ elif [[ $MY_MACHINE = "wcoss_c" ]]; then
    $SUB -q $JOB_QUEUE -P $PROJECT -M 80 -o ${logfile} -W ${wall_tm} \
         -J ${jobname} -cwd ${PWD} ./$cmdfile
 
-elif [[ $MY_MACHINE = "hera" ]]; then
+elif [[ $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 = "jer" ]]; then
+   $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} \
+        -p ${RADMON_PARTITION} --time=2:00:00 --wrap "srun -l --multi-prog ${cmdfile}"
+
 fi
 
 
@@ -208,7 +213,7 @@ for sat in ${bigSATLIST}; do
 
    ctr=0
    for var in $plot_list; do
-      if [[ $MY_MACHINE = "hera" ]]; then
+      if [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || $MY_MACHINE = "s4" ]]; then
          echo "$ctr $IG_SCRIPTS/plot_bcor.sh $sat $var $var" >> $cmdfile
       else
          echo "$IG_SCRIPTS/plot_bcor.sh $sat $var $var" >> $cmdfile
@@ -232,10 +237,14 @@ for sat in ${bigSATLIST}; do
       $SUB -q $JOB_QUEUE -P $PROJECT -M 80 -o ${logfile} -W ${wall_tm} \
            -J ${jobname} -cwd ${PWD} ./$cmdfile
 
-   elif [[ $MY_MACHINE = "hera" ]]; then
+   elif [[ $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 = "jet" ]]; then
+      $SUB --account ${ACCOUNT} -n $ctr  -o ${logfile} -D . -J ${jobname} \
+           -p ${RADMON_PARTITION} --time=1:00:00 --wrap "srun -l --multi-prog ${cmdfile}"
+
    fi
 
    echo "submitted $sat"

diff --git a/util/Radiance_Monitor/image_gen/ush/mk_horiz_plots.sh b/util/Radiance_Monitor/image_gen/ush/mk_horiz_plots.sh
@@ -126,7 +126,7 @@ fi
 
 for sat in ${SATYPE}; do
 
-   if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "hera" || $MY_MACHINE = "wcoss_c" ]]; then
+   if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "hera" || $MY_MACHINE = "wcoss_c" || $MY_MACHINE = "jet" ]]; then
       sed -e 's/cray_32bit_ieee/ /' ${sat}.ctl > tmp_${type}.ctl
       mv -f tmp_${type}.ctl ${sat}.ctl
    fi
@@ -182,7 +182,7 @@ if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "wcoss_c" ]]; then
            -J ${jobname} -cwd ${PWD} $cmdfile
    fi
 
-else							# hera
+else							# hera|jet|s4
    for sat in ${SATLIST}; do
       jobname=horiz_${sat}
       cmdfile="./cmdfile_horiz_${RADMON_SUFFIX}_${sat}"
@@ -193,8 +193,13 @@ else							# hera
 
       echo "$IG_SCRIPTS/plot_horiz.sh $sat" >> $cmdfile
 
-      $SUB -A $ACCOUNT -l procs=${ntasks},walltime=0:50:00 -N ${jobname} \
-           -V -j oe -o ${logfile} $cmdfile
+      if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" ]]; then
+         $SUB -A $ACCOUNT -l procs=${ntasks},walltime=0:50:00 -N ${jobname} \
+              -V -j oe -o ${logfile} $cmdfile
+      else
+         $SUB -A $ACCOUNT -l procs=${ntasks},walltime=0:50:00 -N ${jobname} \
+              -p ${RADMON_PARTITION} -V -j oe -o ${logfile} $cmdfile
+      fi
    done
 fi
 

diff --git a/util/Radiance_Monitor/image_gen/ush/mk_time_plots.sh b/util/Radiance_Monitor/image_gen/ush/mk_time_plots.sh
@@ -143,9 +143,13 @@ elif [[ ${MY_MACHINE} = "wcoss_c" ]]; then
    ${SUB} -q ${JOB_QUEUE} -P ${PROJECT} -M 100 -o ${logfile} -W 1:00 \
           -J ${jobname} -cwd ${PWD} ${IG_SCRIPTS}/plot_summary.sh
 
-elif [[ ${MY_MACHINE} = "hera" ]]; then
+elif [[ ${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} = "jet" ]]; then
+   ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=5g --time=1:00:00 -J ${jobname} \
+          --partition ${RADMON_PARTITION} -o ${logfile} ${IG_SCRIPTS}/plot_summary.sh
 fi
 
 
@@ -188,7 +192,7 @@ list="count penalty omgnbc total omgbc"
    ctr=0
 
    for sat in ${SATLIST}; do
-      if [[ ${MY_MACHINE} = "hera" ]]; then
+      if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ]]; then
          echo "${ctr} $IG_SCRIPTS/plot_time.sh $sat $suffix '$list'" >> $cmdfile
       else
          echo "$IG_SCRIPTS/plot_time.sh $sat $suffix '$list'" >> $cmdfile
@@ -208,11 +212,16 @@ list="count penalty omgnbc total omgbc"
       $SUB -q $JOB_QUEUE -P $PROJECT -M 500 -R affinity[core] -o ${logfile} \
            -W ${wall_tm} -J ${jobname} -cwd ${PWD} ${cmdfile}
 
-   elif [[ $MY_MACHINE = "hera" ]]; then
+   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
       echo "using ctr = ${ctr}"
       $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
            --wrap "srun -l --multi-prog ${cmdfile}"
 
+   elif [[ $MY_MACHINE = "jet" ]]; then
+      echo "using ctr = ${ctr}"
+      $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
+           -p ${RADMON_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
+
    elif [[ ${MY_MACHINE} = "wcoss_c" ]]; then
       $SUB -q $JOB_QUEUE -P $PROJECT -M 500 -o ${logfile} -W ${wall_tm} \
            -J ${jobname} -cwd ${PWD} ${cmdfile}
@@ -238,7 +247,7 @@ list="count penalty omgnbc total omgbc"
 
       ctr=0 
       for var in $list; do
-         if [[ ${MY_MACHINE} = "hera" ]]; then
+         if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ]]; then
             echo "${ctr} $IG_SCRIPTS/plot_time.sh $sat $var $var" >> $cmdfile
          else
             echo "$IG_SCRIPTS/plot_time.sh $sat $var $var" >> $cmdfile
@@ -259,9 +268,12 @@ list="count penalty omgnbc total omgbc"
       elif [[ ${MY_MACHINE} = "wcoss_c" ]]; then
          $SUB -q $JOB_QUEUE -P $PROJECT -M 500  -o ${logfile} -W ${wall_tm} \
               -J ${jobname} -cwd ${PWD} ${cmdfile}
-      elif [[ $MY_MACHINE = "hera" ]]; then	
+      elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
          $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
               --wrap "srun -l --multi-prog ${cmdfile}"
+      elif [[ $MY_MACHINE = "jet" ]]; then
+         $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=4:00:00 \
+              -p ${RADMON_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
       fi
 
    done

diff --git a/util/Radiance_Monitor/parm/RadMon_config b/util/Radiance_Monitor/parm/RadMon_config
@@ -178,6 +178,39 @@ elif [[ $MY_MACHINE = "hera" ]]; then
    prevday=`$NDATE -24 $PDATE`
    export PDYm1=`echo $prevday | cut -c1-8`
 
+elif [[ $MY_MACHINE = "s4" ]]; then
+
+   module load grads/2.2.1
+   module load license_intel/S4
+   module use /data/prod/hpc-stack/modulefiles/stack
+   module load hpc/1.1.0 hpc-intel/18.0.4 prod_util/1.2.2
+   export GRADS=`which grads`
+   export STNMAP=`which stnmap`
+
+   export SUB=/usr/bin/sbatch
+   export COMPRESS=${COMPRESS:-gzip}
+   export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
+
+   prevday=`$NDATE -24 $PDATE`
+   export PDYm1=`echo $prevday | cut -c1-8`
+
+elif [[ $MY_MACHINE = "jet" ]]; then
+
+   module load grads/2.2.1
+   module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
+   module load hpc/1.1.0 hpc-intel/18.0.5.274 prod_util/1.2.2
+   export GRADS=`which grads`
+   export STNMAP=`which stnmap`
+
+   export SUB=/apps/slurm/default/bin/sbatch
+   export COMPRESS=${COMPRESS:-gzip}
+   export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
+
+   prevday=`$NDATE -24 $PDATE`
+   export PDYm1=`echo $prevday | cut -c1-8`
+
+   export RADMON_PARTITION=${RADMON_PARTITION:-kjet}
+
 fi