Reinstated hacks for WCOSS2 in efcs, fcst, and post jobs. NOAA-EMC#1868

DavidHuber-NOAA · Nov 30, 2023 · 87fd614 · 87fd614
1 parent bb2fc24
commit 87fd614
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/jobs/rocoto/efcs.sh b/jobs/rocoto/efcs.sh
@@ -4,7 +4,13 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
-. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+# TODO clean this up once ncdiag/1.1.2 is installed on WCOSS2
+source "${HOMEgfs}/ush/detect_machine.sh"
+if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
+   . ${HOMEgfs}/ush/load_ufswm_modules.sh
+else
+   . ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+fi
 status=$?
 [[ ${status} -ne 0 ]] && exit ${status}
 

diff --git a/jobs/rocoto/fcst.sh b/jobs/rocoto/fcst.sh
@@ -4,7 +4,13 @@ source "${HOMEgfs}/ush/preamble.sh"
 
 ###############################################################
 # Source FV3GFS workflow modules
-. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+# TODO clean this up once ncdiag/1.1.2 is installed on WCOSS2
+source "${HOMEgfs}/ush/detect_machine.sh"
+if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
+   . ${HOMEgfs}/ush/load_ufswm_modules.sh
+else
+   . ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+fi
 status=$?
 [[ ${status} -ne 0 ]] && exit ${status}
 

diff --git a/jobs/rocoto/post.sh b/jobs/rocoto/post.sh
@@ -7,10 +7,26 @@ source "${HOMEgfs}/ush/preamble.sh"
 ## FHRLST : forecast hourlist to be post-process (e.g. anl, f000, f000_f001_f002, ...)
 ###############################################################
 
-# Source FV3GFS workflow modules
-. ${HOMEgfs}/ush/load_fv3gfs_modules.sh
-status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+# TODO clean this up once ncdiag/1.1.2 is installed on WCOSS2
+source "${HOMEgfs}/ush/detect_machine.sh"
+if [[ "${MACHINE_ID}" = "wcoss2" ]]; then
+   # Temporarily load modules from UPP
+   source "${HOMEgfs}/ush/module-setup.sh"
+   module use "${HOMEgfs}/sorc/ufs_model.fd/FV3/upp/modulefiles"
+   module load "${MACHINE_ID}"
+   module load prod_util
+   module load cray-pals
+   module load cfp
+   module load libjpeg
+   module load grib_util
+   module load wgrib2
+   export WGRIB2=wgrib2
+   # End hack
+else
+   . ${HOMEgfs}/ush/load_fv3gfs_modules.sh
+   status=$?
+   [[ ${status} -ne 0 ]] && exit ${status}
+fi
 
 export job="post"
 export jobid="${job}.$$"