Skip to content

Commit

Permalink
Resolve bug with LMOD_TMOD_FIND_FIRST setting affecting build on WCOS…
Browse files Browse the repository at this point in the history
…S2 (NOAA-EMC#3229)

Temporarily comment out the `LMOD_TMOD_FIND_FIRST=yes` setting in `ush/module-setup.sh`.
Move it to `ush/load_ufsda_modules.sh` for runtime usage for now.
Left note to undo these changes when WCOSS2 is using spack-stack.

Also found and corrected a spelling mistake.

Refs NOAA-EMC#3225
  • Loading branch information
KateFriedman-NOAA authored Jan 15, 2025
1 parent e27f5df commit 827cf39
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions ush/load_ufsda_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"

case "${MACHINE_ID}" in
("hera" | "orion" | "hercules" | "wcoss2")
#TODO: Remove LMOD_TMOD_FIND_FIRST line when spack-stack on WCOSS2
if [[ "${MACHINE_ID}" == "wcoss2" ]]; then
export LMOD_TMOD_FIND_FIRST=yes
fi
module load "${MODS}/${MACHINE_ID}"
ncdump=$( command -v ncdump )
NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
Expand Down
2 changes: 1 addition & 1 deletion ush/module-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ elif [[ ${MACHINE_ID} = s4* ]] ; then
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
#export LMOD_TMOD_FIND_FIRST=yes #TODO: Uncomment this when using spack-stack
module reset

elif [[ ${MACHINE_ID} = cheyenne* ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion workflow/generate_workflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function _usage() {
cat << EOF
This script automates the experiment setup process for the global workflow.
Options are also available to update submodules, build the workflow (with
specific build flags), specicy which YAMLs and YAML directory to run, and
specific build flags), specify which YAMLs and YAML directory to run, and
whether to automatically update your crontab.
Usage: generate_workflows.sh [OPTIONS] /path/to/RUNTESTS
Expand Down

0 comments on commit 827cf39

Please sign in to comment.