Merge pull request NCAR#1 from climbfuji/hera_support

Add support for hera/juno (theia successor)

src/conf/module-setup.csh.inc

@@ -8,6 +8,13 @@ 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
+    # We are on NOAA Hera
+    if ( ! { module help >& /dev/null } ) then
+        source /apps/lmod/lmod/init/$__ms_shell
+    endif
+    module purge
 else if ( { test -d /scratch3 } ) then
     # We are on NOAA Theia
     if ( ! { module help >& /dev/null } ) then

src/conf/module-setup.sh.inc

@@ -22,6 +22,13 @@ if [[ -d /lfs3 ]] ; then
         source /apps/lmod/lmod/init/$__ms_shell
     fi
     module purge
+#elif [[ -d /scratch1 ]] ; then
+elif [[ -d /tds_scratch1 ]] ; then
+    # We are on NOAA Hera
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        source /apps/lmod/lmod/init/$__ms_shell
+    fi
+    module purge
 elif [[ -d /scratch3 ]] ; then
     # We are on NOAA Theia
     if ( ! eval module help > /dev/null 2>&1 ) ; then

src/incmake/env/rdhpcs/detect.mk

@@ -15,6 +15,14 @@ else
     ifneq (,$(shell hostname | grep -i gaea))
       NEMS_COMPILER?=intel
       $(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
+    else
+      # DH* 
+      #ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
+      ifneq (,$(wildcard /tds_scratch1))
+      # *DH juno test system
+        NEMS_COMPILER?=intel
+        $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
+      endif
     endif
   endif
 endif

src/incmake/env/rdhpcs/hera.intel.mk

@@ -0,0 +1,7 @@
+MACHINE_ID=hera
+FULL_MACHINE_ID=hera
+USE_MODULES=YES
+DEFAULT_MODULE=$(FULL_MACHINE_ID)/ESMF_NUOPC
+BUILD_TARGET=$(FULL_MACHINE_ID).$(NEMS_COMPILER)
+NEMS_COMPILER=intel
+MODULE_LOGIC=$(call ULIMIT_MODULE_LOGIC,200000)