From 1e15d22baf3708bbc660e987dc654a8036aeb82f Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Tue, 23 Aug 2022 18:15:33 +0000
Subject: [PATCH] Change WCOSS2 machine detection path

- Change the path used to check if on WCOSS2 from "lfs/h2" to "/lfs/f1"

Refs: #419
---
 modulefiles/module-setup.csh.inc | 2 +-
 modulefiles/module-setup.sh.inc  | 2 +-
 sorc/machine-setup.sh            | 2 +-
 ush/load_fv3gfs_modules.sh       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc
index 1f433db42c..b342cb9655 100644
--- a/modulefiles/module-setup.csh.inc
+++ b/modulefiles/module-setup.csh.inc
@@ -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
diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc
index b4d9681085..419b308985 100644
--- a/modulefiles/module-setup.sh.inc
+++ b/modulefiles/module-setup.sh.inc
@@ -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
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index c5b40b77f2..7982758d32 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -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
diff --git a/ush/load_fv3gfs_modules.sh b/ush/load_fv3gfs_modules.sh
index c0f51af974..73aa0fbd06 100755
--- a/ush/load_fv3gfs_modules.sh
+++ b/ush/load_fv3gfs_modules.sh
@@ -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