Skip to content

Commit b0325e0

Browse files
Removes files module loading file no longer used by the GW (NOAA-EMC#2281)
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 NOAA-EMC#2130
1 parent 1ccc989 commit b0325e0

5 files changed

+4
-199
lines changed

modulefiles/module-setup.csh.inc

-87
This file was deleted.

modulefiles/module-setup.sh.inc

-110
This file was deleted.

ush/load_fv3gfs_modules.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fi
1010
ulimit_s=$( ulimit -S -s )
1111

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

1515
# Source versions file for runtime
1616
source "${HOMEgfs}/versions/run.ver"

ush/load_ufsda_modules.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fi
2727
ulimit_s=$( ulimit -S -s )
2828

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

3232
# Load our modules:
3333
module use "${HOMEgfs}/sorc/gdas.cd/modulefiles"

ush/module-setup.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22
set -u
33

4+
source "${HOMEgfs}/ush/detect_machine.sh"
5+
46
if [[ ${MACHINE_ID} = jet* ]] ; then
57
# We are on NOAA Jet
68
if ( ! eval module help > /dev/null 2>&1 ) ; then

0 commit comments

Comments
 (0)