Merge pull request #274 from DavidHuber-NOAA/port_conmon_2_jet_s4

GitHub Issue #268. Port the ConMon to S4 and Jet

util/Conventional_Monitor/build_ConMon_cmake.sh

@@ -39,6 +39,12 @@ elif [[ -d /scratch1 ]] ; then
 elif [[ -d /work ]]; then
     . $MODULESHOME/init/sh
     target=orion
+elif [[ -d /data/prod ]]; then
+    . $MODULESHOME/init/sh
+    target=s4
+elif [[ -d /jetmon ]]; then
+    . /apps/lmod/lmod/init/sh
+    target=jet
 elif [[ -d /lfs && -d /dfs ]]; then
     . $MODULESHOME/init/bash
     target=wcoss2
@@ -83,7 +89,7 @@ if [ $target = wcoss_d -o $target = wcoss2 ]; then
 elif [ $target = wcoss -o $target = gaea ]; then
    module purge
    module load $dir_modules/modulefile.ProdGSI.$target
-elif [ $target = hera -o $target = orion ]; then
+elif [ $target = hera -o $target = orion -o $target = s4 -o $target = jet ]; then
    module purge
    module use $dir_modules
    module load modulefile.ProdGSI.$target

util/Conventional_Monitor/data_extract/ush/ConMon_DE.sh

@@ -233,9 +233,14 @@ if [ -s $cnvstat  -a -s $pgrbf00 -a -s $pgrbf06 ]; then
 		-R affinity[core] -W 0:50 -J ${jobname} \
 		-cwd $PWD ${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
 
-      elif [[ $MY_MACHINE = "hera" ]]; then
+      elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" ]]; then
          $SUB -A $ACCOUNT --ntasks=1 --time=00:30:00 \
-		-p service -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
+		-p ${SERVICE_PARTITION} -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
+		${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
+
+      elif [[ $MY_MACHINE = "jet" ]]; then
+         $SUB -A $ACCOUNT -ntasks=1 --time=00:30:00 --mem=5000 \
+		-p ${SERVICE_PARTITION} -J ${jobname} -o $C_LOGDIR/DE.${PDY}.${CYC}.log \
 		${HOMEgdas_conmon}/jobs/JGDAS_ATMOS_CONMON
 
       elif [[ $MY_MACHINE = "wcoss2" ]]; then

util/Conventional_Monitor/image_gen/gscripts/plot_hist.gs

@@ -135,7 +135,7 @@ while( i<=2)
  endwhile
 
 
-    'printim 'plotfile'_hist.png 'xsize' 'ysize' white'
+    'printim 'plotfile'_hist.png x'xsize' y'ysize' white'
 
 
 return

util/Conventional_Monitor/image_gen/gscripts/plot_tallev_horz.gs

@@ -127,7 +127,7 @@ function plot_horz(plotfile,plotfile2,xsize,ysize,he,rdate,levx,levx1,hint)
    'set gxout contour'
    'set clevs'
    'set ccolor 98'
-   'set cint 0'
+*  'set cint 0'
    'd TMPprs.1-273.15'
    'colorbar.gs'
    'set ccolor 98'

util/Conventional_Monitor/image_gen/gscripts/plot_uvallev_horz.gs

@@ -27,7 +27,7 @@ function uvallev (args)
    'open guess.ctl'
    'open 'plotfile2'.grads.anl.ctl'
    'open 'plotfile2'.grads.ges.ctl'
-   say  'open the file:' plotfile2'_grads_anl.ctl'
+   say  'open the file:' plotfile2'.grads.anl.ctl'
 
    if(plotfile = uv220 | plotfile = uv223 | plotfile = uv224 | plotfile = uv228); hint=0;endif
 

util/Conventional_Monitor/image_gen/gscripts/plot_uvsatwind_horz.gs

@@ -28,7 +28,7 @@ function uvsatwind (args)
    'open guess.ctl'
    'open 'plotfile2'.grads.anl.ctl'
    'open 'plotfile2'.grads.ges.ctl'
-   say  'open the file:' plotfile2'_grads_anl.ctl'
+   say  'open the file:' plotfile2'.grads.anl.ctl'
 
    if(plotfile = uv242 | plotfile = uv252);nhe=3;endif
       if(plotfile = uv253);nhe=5;endif

util/Conventional_Monitor/image_gen/ush/mk_horz_hist.sh

@@ -54,9 +54,9 @@ set -ax
       ${SUB} -q ${JOB_QUEUE} -P ${PROJECT} -o ${logfile} -M 100 \
    	   -R affinity[core] -W 0:20 -J ${jobname} -cwd ${PWD} ${plot_hist}
 
-   elif [[ $MY_MACHINE = "hera" ]]; then
+   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
-		-p service -J ${jobname} -o ${logfile} ${plot_hist}
+		-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_hist}
 
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
         $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
@@ -79,9 +79,9 @@ set -ax
       $SUB -q $JOB_QUEUE -P $PROJECT -o ${logfile} -M 300 \
    	   -R affinity[core] -W 0:20 -J ${jobname} -cwd ${PWD} ${plot_horz}
 
-   elif [[ $MY_MACHINE = "hera" ]]; then
+   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
-		-p service -J ${jobname} -o ${logfile} ${plot_horz}
+		-p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz}
 
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
         $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \
@@ -102,11 +102,11 @@ set -ax
 
    if [[ $MY_MACHINE = "wcoss_d" || $MY_MACHINE = "wcoss_c" ]]; then
       $SUB -q $JOB_QUEUE -P $PROJECT -o ${logfile} -M 300 \
-	   -R affinity[core] -W 0:20 -J ${jobname} ${plot_horz_uv}
+	   -R affinity[core] -W 1:00 -J ${jobname} ${plot_horz_uv}
 
-   elif [[ $MY_MACHINE = "hera" ]]; then
-      ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:20:00 \
-	     -p service -J ${jobname} -o ${logfile} ${plot_horz_uv}
+   elif [[ $MY_MACHINE = "hera" || $MY_MACHINE = "s4" || $MY_MACHINE = "jet" ]]; then
+      ${SUB} -A ${ACCOUNT} --ntasks=1 --time=01:30:00 \
+	     -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${plot_horz_uv}
 
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
         $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=30:00 -N ${jobname} \

util/Conventional_Monitor/image_gen/ush/mk_time_vert.sh

@@ -34,9 +34,9 @@ echo "--> mk_time_vert.sh"
       $SUB -q ${JOB_QUEUE} -P ${PROJECT} -o ${logfile} -R affinity[core] \
 		-M 100 -W 0:50 -J ${jobname} -cwd ${PWD} ${pltfile}
 
-   elif [[ $MY_MACHINE == "hera" ]]; then
+   elif [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || $MY_MACHINE == "jet" ]]; then
       ${SUB} -A ${ACCOUNT} --ntasks=1 --time=00:15:00 \
-                -p service -J ${jobname} -o ${logfile} ${pltfile}
+                -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
 
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
         $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 -N ${jobname} \
@@ -66,15 +66,15 @@ echo "--> mk_time_vert.sh"
          $SUB -q ${JOB_QUEUE} -P ${PROJECT} -o ${logfile} -R affinity[core] \
 		-M 100 -W ${walltime} -J ${jobname} -cwd ${PWD} ${pltfile}
 
-      elif [[ $MY_MACHINE == "hera" ]]; then
+      elif [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || $MY_MACHINE == "jet" ]]; then
          if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
             walltime="02:30:00"
          else
             walltime="00:40:00"
          fi
 
          ${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \
-                -p service -J ${jobname} -o ${logfile} ${pltfile}
+                -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
 
       elif [[ $MY_MACHINE = "wcoss2" ]]; then
 
@@ -108,15 +108,15 @@ echo "--> mk_time_vert.sh"
          $SUB -q ${JOB_QUEUE} -P ${PROJECT} -o ${logfile} -R affinity[core] \
 	      -M 100 -W 1:30 -J ${jobname} -cwd ${PWD} ${pltfile}
 
-      elif [[ $MY_MACHINE == "hera" ]]; then
+      elif [[ $MY_MACHINE == "hera" || $MY_MACHINE == "s4" || $MY_MACHINE == "jet" ]]; then
          if [[ ${type} == "uv" || ${type} == "u" || ${type} == "v" ]]; then
             walltime="00:50:00"
          else
             walltime="00:30:00"
          fi
 
          ${SUB} -A ${ACCOUNT} --ntasks=1 --time=${walltime} \
-                -p service -J ${jobname} -o ${logfile} ${pltfile}
+                -p ${SERVICE_PARTITION} -J ${jobname} -o ${logfile} ${pltfile}
 
       elif [[ $MY_MACHINE == "wcoss2" ]]; then
         $SUB -V -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} -l walltime=50:00 \

util/Conventional_Monitor/image_gen/ush/plot_horz.sh

@@ -196,9 +196,6 @@
 
    done      ### type loop
 
-   ${COMPRESS} ${hh_tankdir}/ges/*
-   ${COMPRESS} ${hh_tankdir}/anl/*
-
 
    if [[ ${C_IG_SAVE_WORK} -eq 0 ]]; then
       cd $workdir

util/Conventional_Monitor/image_gen/ush/plot_horz_uv.sh

@@ -126,14 +126,14 @@ set -ax
             sdir=" dset ${dtype}.grads.${cycle}.${PDATE}"
             title="title  ${dtype}  ${cycle}"
             sed -e "s/^title.*/${title}/" ${dtype}.ctl >tmp.ctl
-            echo $sdir >${dtype}_grads_${cycle}.ctl
-            cat tmp.ctl >>${dtype}_grads_${cycle}.ctl
+            echo $sdir >${dtype}.grads.${cycle}.ctl
+            cat tmp.ctl >>${dtype}.grads.${cycle}.ctl
             rm -f tmp.ctl
             rm -f ${dtype}.ctl
 
 
             #--------------------------------------------------------------
-            #  link in the ${dtype}_grads.${PDATE} data file from TANKDIR
+            #  link in the ${dtype}.grads.${PDATE} data file from TANKDIR
             #--------------------------------------------------------------
             grads_file=${hh_tankdir}/${cycle}/${dtype}.grads.${cycle}.${PDATE}
 
@@ -149,7 +149,7 @@ set -ax
                continue
             fi
 
-            stnmap -1 -i ${dtype}_grads_${cycle}.ctl
+            stnmap -1 -i ${dtype}.grads.${cycle}.ctl
 
          done         ## done with cycle
 

util/Conventional_Monitor/parm/ConMon_config

@@ -105,6 +105,43 @@ if [[ $CONMON_CONFIG -ne 1 ]]; then
       export COMPRESS=/usr/bin/gzip
       export UNCOMPRESS="/usr/bin/gunzip -f"
 
+   elif [[ $MY_MACHINE = "s4" ]]; then
+      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
+
+      export WGRIB2=`which wgrib2`
+
+      export GRADS=`which grads`
+      export STNMAP=`which stnmap`
+
+      export SUB=/usr/bin/sbatch
+      export NDATE=/data/prod/hpc-stack/intel-18.0.4/prod_util/1.2.2/bin/ndate
+      export COMPRESS=${COMPRESS:-gzip}
+      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
+      export SERVICE_PARTITION="serial"
+
+   elif [[ $MY_MACHINE = "jet" ]]; then
+      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 WGRIB2=`which wgrib2`
+
+      export GRADS=`which grads`
+      export STNMAP=`which stnmap`
+
+      export SUB=/apps/slurm/default/bin/sbatch
+      export NDATE=/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/intel-18.0.5.274/prod_util/1.2.2/bin/ndate
+      export COMPRESS=${COMPRESS:-gzip}
+      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
+      export SERVICE_PARTITION="service"
+
    elif [[ $MY_MACHINE = "hera" ]]; then
       module use -a /apps/modules/modulefamilies/intel
       module load wgrib2/2.0.8
@@ -119,6 +156,7 @@ if [[ $CONMON_CONFIG -ne 1 ]]; then
       export NDATE=/home/Edward.Safford/bin/ndate
       export COMPRESS=${COMPRESS:-gzip}
       export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
+      export SERVICE_PARTITION="service"
 
    elif [[ $MY_MACHINE = "wcoss2" ]]; then
       export COMPRESS=/usr/bin/gzip