Skip to content

Commit 2445d44

Browse files
Simplify and extend load_ufsda_modules to Hercules (#2245)
GDASApp jobs do not run on Hercules because `ush/load_ufsda_modules.sh` does not include logic to load the appropriate GDASApp modules on Hercules. This PR extends `load_ufsda_modules.sh` functionality to Hercules, thereby enabling GDASApp jobs to run on Hercules. Resolves #2244
1 parent f4d187f commit 2445d44

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

ush/load_ufsda_modules.sh

+8-13
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,15 @@ elif [[ -d /scratch1 ]] ; then
4444
# set NETCDF variable based on ncdump location
4545
NETCDF=$( which ncdump )
4646
export NETCDF
47-
# prod_util stuff, find a better solution later...
48-
module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/compiler/intel/2022.1.2/
49-
module load prod_util
5047
elif [[ -d /work ]] ; then
51-
# We are on MSU Orion
52-
# prod_util stuff, find a better solution later...
53-
#module use /apps/contrib/NCEP/hpc-stack/libs/hpc-stack/modulefiles/compiler/intel/2022.1.2/
54-
#module load prod_util
55-
export UTILROOT=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2
56-
export MDATE=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/mdate
57-
export NDATE=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/ndate
58-
export NHOUR=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/nhour
59-
export FSYNC=/work2/noaa/da/python/opt/intel-2022.1.2/prod_util/1.2.2/bin/fsync_file
60-
module load "${MODS}/orion"
48+
# We are on MSU Orion or Hercules
49+
if [[ -d /apps/other ]] ; then
50+
# Hercules
51+
module load "${MODS}/hercules"
52+
else
53+
# Orion
54+
module load "${MODS}/orion"
55+
fi
6156
# set NETCDF variable based on ncdump location
6257
ncdump=$( which ncdump )
6358
NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )

0 commit comments

Comments
 (0)