Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.in…

…c, 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.
climbfuji · Aug 27, 2019 · 028e1e8 · 028e1e8
1 parent 1c71222
commit 028e1e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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