Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion dev/ush/load_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ case "${MODULE_TYPE}" in
echo "FATAL ERROR: Failed to load ufs_${MACHINE_ID}.intel"
exit 1
fi
module load prod_util
# Do not load prod_util on an ecflow system
if [[ -z "${ECF_JOB:-}" ]]; then
module load prod_util
fi
if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
module load cray-pals
module load cfp
Expand Down
6 changes: 5 additions & 1 deletion modulefiles/gw_gsi.wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ load(pathJoin("netcdf-D", (os.getenv("netcdf_ver") or "None")))

load(pathJoin("libjpeg", (os.getenv("libjpeg_ver") or "None")))
load(pathJoin("grib_util", (os.getenv("grib_util_ver") or "None")))
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
-- Do not load prod_util when running ecflow
local is_ecf = os.getenv("ECF_JOB") ~= nil
if not is_ecf then
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
end
load(pathJoin("ncdiag-A", (os.getenv("ncdiag_ver") or "None")))
load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))

Expand Down
6 changes: 5 additions & 1 deletion modulefiles/gw_run.wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ load(pathJoin("netcdf-D", (os.getenv("netcdf_ver") or "None")))
load(pathJoin("esmf-D", (os.getenv("esmf_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
-- Do not load prod_util when running ecflow
local is_ecf = os.getenv("ECF_JOB") ~= nil
if not is_ecf then
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
end
load(pathJoin("grib_util", (os.getenv("grib_util_ver") or "None")))
load(pathJoin("bufr_dump", (os.getenv("bufr_dump_ver") or "None")))
load(pathJoin("util_shared", (os.getenv("util_shared_ver") or "None")))
Expand Down
6 changes: 5 additions & 1 deletion modulefiles/gw_upp.wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ load("wcoss2_intel")
load(pathJoin("cray-pals", "1.0.17"))

-- Load workflow modules
load(pathJoin("prod_util", "2.0.9"))
-- Do not load prod_util when running ecflow
local is_ecf = os.getenv("ECF_JOB") ~= nil
if not is_ecf then
load(pathJoin("prod_util", "2.0.9"))
end
load(pathJoin("python", "3.12.0"))
load(pathJoin("libjpeg", "9c"))
load(pathJoin("wgrib2", "2.0.8"))
Expand Down
6 changes: 5 additions & 1 deletion modulefiles/gw_verif.wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ load(pathJoin("netcdf", '4.7.4'))
local cray_lib_path=os.getenv("CRAY_LD_LIBRARY_PATH") or ""
prepend_path("LD_LIBRARY_PATH", cray_lib_path)

load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
-- Do not load prod_util when running ecflow
local is_ecf = os.getenv("ECF_JOB") ~= nil
if not is_ecf then
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
end
load(pathJoin("grib_util", (os.getenv("grib_util_ver") or "None")))
load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))

Expand Down
2 changes: 1 addition & 1 deletion sorc/gdas.cd
5 changes: 4 additions & 1 deletion ush/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,10 @@ elif [[ ${MACHINE_ID} = wcoss2 ]]; then
# We are on WCOSS2
# Ignore default modules of the same version lower in the search path (req'd by spack-stack)
#export LMOD_TMOD_FIND_FIRST=yes #TODO: Uncomment this when using spack-stack for the entire workflow
module reset
# Do not reset on an ecflow system
if [[ -z "${ECF_JOB:-}" ]]; then
module reset
fi

elif [[ ${MACHINE_ID} = cheyenne* ]]; then
# We are on NCAR Cheyenne
Expand Down
Loading