Skip to content

Eliminates all machine detection outside detech_machine.sh #2324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HenryRWinterbottom wants to merge 10 commits into from
Closed

Eliminates all machine detection outside detech_machine.sh #2324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
40f2cf6
Implemented ush/detect_machine.sh for host determination and removed …
henrywinterbottom-wxdev Feb 13, 2024
60d5ee6
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 14, 2024
eb8791c
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 15, 2024
9929277
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 15, 2024
eb2ed53
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 16, 2024
ed25bbd
Linter corrections.
henrywinterbottom-wxdev Feb 16, 2024
4624ce2
Updates requested by reviewer; testing -- DO NOT REVIEW.
henrywinterbottom-wxdev Feb 16, 2024
8e4f94d
Updates requested by reviewer Rahul Mahajan.
henrywinterbottom-wxdev Feb 16, 2024
4529e8c
Bug fix.
henrywinterbottom-wxdev Feb 16, 2024
bdb8355
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 22, 2024
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
39 changes: 9 additions & 30 deletions ush/load_fv3gfs_modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ fi
ulimit_s=$( ulimit -S -s )

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

# Source versions file for runtime
Expand All @@ -18,36 +19,14 @@ source "${HOMEgfs}/versions/run.ver"
# Load our modules:
module use "${HOMEgfs}/modulefiles"

if [[ -d /lfs/f1 ]]; then
# We are on WCOSS2 (Cactus or Dogwood)
module load module_base.wcoss2
elif [[ -d /mnt/lfs1 ]] ; then
# We are on NOAA Jet
module load module_base.jet
elif [[ -d /scratch1 ]] ; then
# We are on NOAA Hera
module load module_base.hera
elif [[ -d /work ]] ; then
# We are on MSU Orion or Hercules
if [[ -d /apps/other ]] ; then
# Hercules
module load module_base.hercules
else
# Orion
module load module_base.orion
fi
elif [[ -d /glade ]] ; then
# We are on NCAR Yellowstone
module load module_base.cheyenne
elif [[ -d /lustre && -d /ncrc ]] ; then
# We are on GAEA.
module load module_base.gaea
elif [[ -d /data/prod ]] ; then
# We are on SSEC S4
module load module_base.s4
else
echo WARNING: UNKNOWN PLATFORM
fi
case "${MACHINE_ID}" in
"wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4")
module load "module_base.${MACHINE_ID}"
;;
*)
echo "WARNING: UNKNOWN PLATFORM"
;;
esac

module list

Expand Down
52 changes: 15 additions & 37 deletions ush/load_ufsda_modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,48 +27,26 @@ fi
ulimit_s=$( ulimit -S -s )

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

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

if [[ -d /lfs/f1 ]]; then
# We are on WCOSS2 (Cactus or Dogwood)
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
elif [[ -d /lfs3 ]] ; then
# We are on NOAA Jet
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
elif [[ -d /scratch1 ]] ; then
# We are on NOAA Hera
module load "${MODS}/hera"
# set NETCDF variable based on ncdump location
NETCDF=$( which ncdump )
export NETCDF
elif [[ -d /work ]] ; then
# We are on MSU Orion or Hercules
if [[ -d /apps/other ]] ; then
# Hercules
module load "${MODS}/hercules"
else
# Orion
module load "${MODS}/orion"
fi
# set NETCDF variable based on ncdump location
ncdump=$( which ncdump )
NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
export NETCDF
elif [[ -d /glade ]] ; then
# We are on NCAR Yellowstone
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
elif [[ -d /lustre && -d /ncrc ]] ; then
# We are on GAEA.
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
elif [[ -d /data/prod ]] ; then
# We are on SSEC S4
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
else
echo WARNING: UNKNOWN PLATFORM
fi
case "${MACHINE_ID}" in
("hera" | "orion" | "hercules")
module load "${MODS}/${MACHINE_ID}"
ncdump=$( command -v ncdump )
NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
export NETCDF
;;
("wcoss2" | "acorn" | "jet" | "gaea" | "s4")
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
;;
*)
echo "WARNING: UNKNOWN PLATFORM"
;;
esac

module list
pip list
Expand Down