Ref NOAA-EMC#14

Finished testing on orion.
EdwardSafford-NOAA · Aug 5, 2022 · 5723f64 · 5723f64
1 parent 095ab02
commit 5723f64
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 41 deletions.
diff --git a/parm/Mon_config b/parm/Mon_config
@@ -25,21 +25,22 @@ export MY_MACHINE=$machine_id
 #---------------------------------------------------
 #  Load modules from stack
 #
-source $DIR_ROOT/ush/module-setup.sh
-module use $DIR_ROOT/modulefiles
-module load ${MACHINE_ID}_run
-module list
-
+if [[ $MY_MACHINE = "wcoss2" || $MY_MACHINE = "hera" || $MY_MACHINE = "orion" ]]; then
+   source $DIR_ROOT/ush/module-setup.sh
+   module use $DIR_ROOT/modulefiles
+   module load ${MACHINE_ID}_run
+   module list
+fi
 
 case $MY_MACHINE in
    s4)
-#      module load license_intel
-#      module use /data/prod/hpc-stack/modulefiles/stack
-#      module load hpc/1.1.0 hpc-intel/18.0.4 hpc-impi/18.0.4
-#      module load wgrib2/2.0.8
-#      module load grads/2.2.1
-#      module load prod_util/1.2.2
-#      module load netcdf/4.7.4
+      module load license_intel
+      module use /data/prod/hpc-stack/modulefiles/stack
+      module load hpc/1.1.0 hpc-intel/18.0.4 hpc-impi/18.0.4
+      module load wgrib2/2.0.8
+      module load grads/2.2.1
+      module load prod_util/1.2.2
+      module load netcdf/4.7.4
 
       export SUB=/usr/bin/sbatch
       export SERVICE_PARTITION="serial"
@@ -49,21 +50,17 @@ case $MY_MACHINE in
       ;;
 
    jet)
-#      module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
-#      module load hpc/1.1.0 hpc-intel/18.0.5.274 hpc-impi/2018.4.274
-#      module load wgrib2/2.0.8
-#      module load grads/2.2.1
-#      module load prod_util/1.2.2
+      module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
+      module load hpc/1.1.0 hpc-intel/18.0.5.274 hpc-impi/2018.4.274
+      module load wgrib2/2.0.8
+      module load grads/2.2.1
+      module load prod_util/1.2.2
 
       export SUB=/apps/slurm/default/bin/sbatch
       export SERVICE_PARTITION="service"
       ;;
 
    hera)
-#      module use -a /apps/modules/modulefamilies/intel
-#      module load wgrib2/2.0.8
-#      module load grads/2.2.1
-
       export SUB=/apps/slurm/default/bin/sbatch
       export NDATE=/home/Edward.Safford/bin/ndate
       export SERVICE_PARTITION="service"
@@ -73,7 +70,6 @@ case $MY_MACHINE in
       stmp="/scratch2/NCEPDEV/stmp1/$USER"
       queue=""
       project=""
-#      account="fv3-cpu"
       account="da-cpu"
       ;;
 
@@ -90,7 +86,7 @@ case $MY_MACHINE in
 
    orion) 
       export SUB="sbatch" #/opt/slurm/bin/sbatch
-      export SERVICE_PARTITION="service"
+      export SERVICE_PARTITION="orion"
 
       tankdir="/work/noaa/da/$USER/nbns"
       ptmp="/work2/noaa/stmp/$USER"

diff --git a/src/Radiance_Monitor/image_gen/ush/mk_angle_plots.sh b/src/Radiance_Monitor/image_gen/ush/mk_angle_plots.sh
@@ -215,7 +215,8 @@ rm ${R_LOGDIR}/plot_angle_${suffix}.log
 ctr=0
 for type in ${satlist}; do
 
-   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ]]; then
+   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
+         ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
       echo "${ctr} ${IG_SCRIPTS}/plot_angle.sh ${type} ${suffix} '${list}'" >> ${cmdfile}
    else
       echo "${IG_SCRIPTS}/plot_angle.sh ${type} ${suffix} '${list}'" >> ${cmdfile}
@@ -225,15 +226,15 @@ done
 
 chmod 755 ${cmdfile}
 echo "CMDFILE:  ${cmdfile}"
+echo "ctr = $ctr"
 
-wall_tm="0:20"
-if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" ]]; then
+if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "s4" || ${MY_MACHINE} = "orion" ]]; 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}"
+        -p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
 
 elif [[ $MY_MACHINE = "wcoss2" ]]; then
    $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${R_LOGDIR}/plot_angle_${suffix}.err \
@@ -269,8 +270,6 @@ for sat in ${big_satlist}; do
          rm ${logfile}
       fi
 
-      wall_tm="0:30"
-
       errfile=${R_LOGDIR}/plot_angle_${sat}.err
       if [[ -e ${errfile} ]]; then
          rm ${errfile}
@@ -279,8 +278,9 @@ for sat in ${big_satlist}; do
            -V -l select=1:mem=1g -l walltime=30:00 -N ${jobname} ${cmdfile}
 
    #---------------------------------------------------
-   #  hera|jet|s4, submit 1 job for each sat/list item
-   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || $MY_MACHINE = "s4" ]]; then		
+   #  hera|jet|s4|orion, submit 1 job for each sat/list item
+   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "jet" || \
+           $MY_MACHINE = "s4"   || $MY_MACHINE = "orion" ]]; then		
 
       ii=0
       logfile=${R_LOGDIR}/plot_angle_${sat}.log
@@ -298,12 +298,18 @@ for sat in ${big_satlist}; do
       if [[ $MY_MACHINE = "hera" ]]; then
          $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
+         $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}"
+
       elif [[ $MY_MACHINE = "s4" ]]; 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}"
+              -p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
       fi
 
    fi

diff --git a/src/Radiance_Monitor/image_gen/ush/mk_bcoef_plots.sh b/src/Radiance_Monitor/image_gen/ush/mk_bcoef_plots.sh
@@ -81,6 +81,7 @@ for type in ${SATYPE}; do
          elif [[ -e ${ieee_src}/radmon_bcoef.tar || -e ${ieee_src}/radmon_bcoef.tar.${Z} ]]; then
             using_tar=1
             ctl_list=`tar -tf ${ieee_src}/radmon_bcoef.tar* | grep ${type} | grep ctl`
+            echo "ctl_list = $ctl_list"
             if [[ ${ctl_list} != "" ]]; then
                cwd=`pwd`
                cd ${ieee_src}
@@ -155,9 +156,13 @@ 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
+   $SUB --account $ACCOUNT --ntasks=1 --mem=5g --time=20 -J ${jobname} \
+        -p ${SERVICE_PARTITION} -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
+        -p ${SERVICE_PARTITION} -o ${logfile} -D . $IG_SCRIPTS/plot_bcoef.sh
 
 elif [[ $MY_MACHINE = "wcoss2" ]]; then
    $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e $R_LOGDIR/plot_bcoef.err -V \

diff --git a/src/Radiance_Monitor/image_gen/ush/mk_time_plots.sh b/src/Radiance_Monitor/image_gen/ush/mk_time_plots.sh
@@ -185,6 +185,10 @@ 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
+   ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=5g --time=20: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
@@ -238,7 +242,8 @@ fi
 ctr=0
 
 for sat in ${SATLIST}; do
-   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ]]; then
+   if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
+         ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
       echo "${ctr} $IG_SCRIPTS/plot_time.sh $sat $suffix '$list'" >> $cmdfile
    else
       echo "$IG_SCRIPTS/plot_time.sh $sat $suffix '$list'" >> $cmdfile
@@ -247,18 +252,18 @@ for sat in ${SATLIST}; do
 done
 chmod 755 $cmdfile
 
-wall_tm="0:45"
-if [[ $PLOT_ALL_REGIONS -eq 1 || $ndays -gt 30 ]]; then
-   wall_tm="2:30"
-fi
 
 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
+   $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
+        -p $SERVICE_PARTITION --wrap "srun -l --multi-prog ${cmdfile}"
+
 elif [[ $MY_MACHINE = "jet" ]]; then
    $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:00:00 \
-        -p ${RADMON_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
+        -p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
 
 elif [[ $MY_MACHINE = "wcoss2" ]]; then
    $SUB -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${R_LOGDIR}/plot_time_${suffix}.err -V \
@@ -289,7 +294,8 @@ for sat in ${bigSATLIST}; do
 
    ctr=0 
    for var in $list; do
-      if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || ${MY_MACHINE} = "s4" ]]; then
+      if [[ ${MY_MACHINE} = "hera" || ${MY_MACHINE} = "jet" || 
+            ${MY_MACHINE} = "s4"   || ${MY_MACHINE} = "orion" ]]; then
          echo "${ctr} $IG_SCRIPTS/plot_time.sh $sat $var $var" >> $cmdfile
       else
          echo "$IG_SCRIPTS/plot_time.sh $sat $var $var" >> $cmdfile
@@ -307,9 +313,13 @@ 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
+      $SUB --account ${ACCOUNT} -n ${ctr}  -o ${logfile} -D . -J ${jobname} --time=1:30:00 \
+           -p $SERVICE_PARTITION --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}"
+           -p ${SERVICE_PARTITION} --wrap "srun -l --multi-prog ${cmdfile}"
 
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
       logfile=${R_LOGDIR}/plot_time_${sat}.log