Skip to content

Commit

Permalink
Removes files module loading file no longer used by the GW (#2281)
Browse files Browse the repository at this point in the history
Removes `module-setup.csh.inc` and `module-setup.sh.inc`.

The module `ush/module-setup.sh` is updated such that it now sources
`ush/detect_machine.sh` to determine which supported platform the
global-workflow is being execute on.

Resolves #2130
  • Loading branch information
HenryRWinterbottom authored Feb 7, 2024
1 parent 1ccc989 commit b0325e0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 199 deletions.
87 changes: 0 additions & 87 deletions modulefiles/module-setup.csh.inc

This file was deleted.

110 changes: 0 additions & 110 deletions modulefiles/module-setup.sh.inc

This file was deleted.

2 changes: 1 addition & 1 deletion ush/load_fv3gfs_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi
ulimit_s=$( ulimit -S -s )

# Find module command and purge:
source "${HOMEgfs}/modulefiles/module-setup.sh.inc"
source "${HOMEgfs}/ush/module-setup.sh"

# Source versions file for runtime
source "${HOMEgfs}/versions/run.ver"
Expand Down
2 changes: 1 addition & 1 deletion ush/load_ufsda_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fi
ulimit_s=$( ulimit -S -s )

# Find module command and purge:
source "${HOMEgfs}/modulefiles/module-setup.sh.inc"
source "${HOMEgfs}/ush/module-setup.sh"

# Load our modules:
module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"
Expand Down
2 changes: 2 additions & 0 deletions ush/module-setup.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/bash
set -u

source "${HOMEgfs}/ush/detect_machine.sh"

if [[ ${MACHINE_ID} = jet* ]] ; then
# We are on NOAA Jet
if ( ! eval module help > /dev/null 2>&1 ) ; then
Expand Down

0 comments on commit b0325e0

Please sign in to comment.