From 028e1e8c662c52ef999831b0129c7663b7216a19 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date: Tue, 27 Aug 2019 13:45:29 -0600
Subject: [PATCH 1/2] Update src/incmake/env/rdhpcs/detect.mk,
 src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from
 Juno test system to Hera. Since /scratch4 from theia is also mounted on hera,
 need to switch the order of detection.

---
 src/conf/module-setup.csh.inc    |  3 +--
 src/conf/module-setup.sh.inc     |  3 +--
 src/incmake/env/rdhpcs/detect.mk | 19 ++++++++-----------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/conf/module-setup.csh.inc b/src/conf/module-setup.csh.inc
index dd0eeec9..37f304fd 100644
--- a/src/conf/module-setup.csh.inc
+++ b/src/conf/module-setup.csh.inc
@@ -8,8 +8,7 @@ if ( { test -d /lfs3 } ) then
             source /apps/lmod/lmod/init/$__ms_shell
     endif
     module purge
-#else if ( { test -d /scratch1 } ) then
-else if ( { test -d /tds_scratch1 } ) then
+else if ( { test -d /scratch1 } ) then
     # We are on NOAA Hera
     if ( ! { module help >& /dev/null } ) then
         source /apps/lmod/lmod/init/$__ms_shell
diff --git a/src/conf/module-setup.sh.inc b/src/conf/module-setup.sh.inc
index cd471a82..2b330b47 100644
--- a/src/conf/module-setup.sh.inc
+++ b/src/conf/module-setup.sh.inc
@@ -22,8 +22,7 @@ if [[ -d /lfs3 ]] ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi
     module purge
-#elif [[ -d /scratch1 ]] ; then
-elif [[ -d /tds_scratch1 ]] ; then
+elif [[ -d /scratch1 ]] ; then
     # We are on NOAA Hera
     if ( ! eval module help > /dev/null 2>&1 ) ; then
         source /apps/lmod/lmod/init/$__ms_shell
diff --git a/src/incmake/env/rdhpcs/detect.mk b/src/incmake/env/rdhpcs/detect.mk
index 1b926dcd..c7d96b04 100644
--- a/src/incmake/env/rdhpcs/detect.mk
+++ b/src/incmake/env/rdhpcs/detect.mk
@@ -4,24 +4,21 @@
 #
 ########################################################################
 
-ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3)))
+ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
   NEMS_COMPILER?=intel
-  $(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
+  $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
 else
-  ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
+  ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3)))
     NEMS_COMPILER?=intel
-    $(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
+    $(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
   else
-    ifneq (,$(shell hostname | grep -i gaea))
+    ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
       NEMS_COMPILER?=intel
-      $(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
+      $(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
     else
-      # DH* 
-      #ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
-      ifneq (,$(wildcard /tds_scratch1))
-      # *DH juno test system
+      ifneq (,$(shell hostname | grep -i gaea))
         NEMS_COMPILER?=intel
-        $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
+        $(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
       endif
     endif
   endif

From e142f4ef8cf9ed3104425a1c4f92ff6a14436c43 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <dom.heinzeller@noaa.gov>
Date: Tue, 27 Aug 2019 15:04:16 -0600
Subject: [PATCH 2/2] src/incmake/env/rdhpcs/detect.mk: test for hostname
 prefix, since hera and theia both have /scratch1 through /scratch4 mounted

---
 src/incmake/env/rdhpcs/detect.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/incmake/env/rdhpcs/detect.mk b/src/incmake/env/rdhpcs/detect.mk
index c7d96b04..ce9a501a 100644
--- a/src/incmake/env/rdhpcs/detect.mk
+++ b/src/incmake/env/rdhpcs/detect.mk
@@ -4,11 +4,11 @@
 #
 ########################################################################
 
-ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
+ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2),$(shell hostname | grep -i hfe)))
   NEMS_COMPILER?=intel
   $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
 else
-  ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3)))
+  ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3),$(shell hostname | grep -i tfe)))
     NEMS_COMPILER?=intel
     $(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
   else