Skip to content

Commit

Permalink
Change WCOSS2 machine detection path
Browse files Browse the repository at this point in the history
- Change the path used to check if on WCOSS2 from "lfs/h2" to "/lfs/f1"

Refs: #419
  • Loading branch information
KateFriedman-NOAA committed Aug 23, 2022
1 parent a2c9f8f commit 1e15d22
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion modulefiles/module-setup.csh.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set __ms_shell=csh

eval "if ( -d / ) set __ms_shell=tcsh"

if ( { test -d /lfs/h2 } ) then
if ( { test -d /lfs/f1 } ) then
# We are on NOAA Cactus or Dogwood
if ( ! { module help >& /dev/null } ) then
source /usr/share/lmod/lmod/init/$__ms_shell
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module-setup.sh.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else
__ms_shell=sh
fi

if [[ -d /lfs/h2 ]] ; then
if [[ -d /lfs/f1 ]] ; then
# We are on NOAA Cactus or Dogwood
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /usr/share/lmod/lmod/init/$__ms_shell
Expand Down
2 changes: 1 addition & 1 deletion sorc/machine-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target=""
USERNAME=$(echo $LOGNAME | awk '{ print tolower($0)'})
##---------------------------------------------------------------------------
export hname=$(hostname | cut -c 1,1)
if [[ -d /lfs/h1 ]] ; then
if [[ -d /lfs/f1 ]] ; then
# We are on NOAA Cactus or Dogwood
if ( ! eval module help > /dev/null 2>&1 ) ; then
echo load the module command 1>&2
Expand Down
2 changes: 1 addition & 1 deletion ush/load_fv3gfs_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source "$HOMEgfs/modulefiles/module-setup.sh.inc"
# Load our modules:
module use "$HOMEgfs/modulefiles"

if [[ -d /lfs/h2 ]]; then
if [[ -d /lfs/f1 ]]; then
# We are on WCOSS2 (Cactus or Dogwood)
module load module_base.wcoss2
elif [[ -d /lfs3 ]] ; then
Expand Down

0 comments on commit 1e15d22

Please sign in to comment.