Ref NOAA-EMC#41

Clean up on wcoss2.
EdwardSafford-NOAA · Aug 16, 2024 · 035ffc7 · 035ffc7
1 parent cb524fa
commit 035ffc7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/driver/runObsMon.sh b/driver/runObsMon.sh
@@ -113,12 +113,6 @@ case ${MACHINE_ID} in
              -J ${jobname} --partition service -o ${logfile} ${jobfile}
       ;;
 
-#   orion|hercules)
-#      echo "on orion"
-#      ${SUB} --account ${ACCOUNT}  --ntasks=1 --mem=400M --time=0:05:00 \
-#             -J ${jobname} --partition service -o ${logfile} ${jobfile}
-#      ;;
-
    wcoss2)	
       $SUB -q ${JOB_QUEUE} -A ${ACCOUNT} -o ${logfile} -e ${logfile} \
 	   -v "PYTHONPATH=${PYTHONPATH}, PATH=${PATH}, HOMEobsmon=${HOMEobsmon}, COMOUT=${COMOUT}, \

diff --git a/jobs/JMON_PLOT_OBS b/jobs/JMON_PLOT_OBS
@@ -51,8 +51,6 @@ if [[ -e "${pgmout}" ]] ; then
 fi
 
 ####################
-# Remove workspace
+# Remove workspace -- this will have to be a separate job that runs
+# after the OM_plot job is complete.
 ####################
-#KEEPDATA=${KEEPDATA:-"NO"}
-#cd ${DATAROOT}
-#[[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}
diff --git a/parm/OM_config b/parm/OM_config
@@ -9,6 +9,8 @@ export JOBSobsmon=${om_dir_root}/jobs
 source ${om_dir_root}/ush/detect_machine.sh
 export MACHINE_ID=`echo "${MACHINE_ID%%.*}"`
 
+module use ${HOMEobsmon}/modulefiles
+
 case ${MACHINE_ID} in
 
    hera)
@@ -21,7 +23,6 @@ case ${MACHINE_ID} in
       project=""
       account="da-cpu"
       aprun_py="python"
-      module use ${HOMEobsmon}/modulefiles
       module load obs-monitor/hera
       ;;
 
@@ -33,7 +34,6 @@ case ${MACHINE_ID} in
       queue="dev"
       project="GDAS-DEV"
       account="GFS-DEV"
-      module use ${HOMEobsmon}/modulefiles
       module load obs-monitor/wcoss2
       aprun_py=`which python`
       ;;
@@ -48,7 +48,6 @@ case ${MACHINE_ID} in
       project=""
       account="da-cpu"
       aprun_py="python"
-      module use ${HOMEobsmon}/modulefiles
       module load obs-monitor/orion
       ;;
 esac

diff --git a/scripts/exobsmon_plot.sh b/scripts/exobsmon_plot.sh
@@ -60,7 +60,7 @@ if compgen -G "${DATA}/OM_PLOT*.yaml" > /dev/null; then
          ;;
 
 	 wcoss2)  
-            mem=$((4*${ctr})) 
+            mem=$((8*${ctr})) 
             echo "submitting ${jobname} on wcoss2, ctr = $ctr, mem = $mem, cmdfile = ${cmdfile}"
 
 	    ${SUB} -q $JOB_QUEUE -A $ACCOUNT -o ${logfile} -e ${logfile} \