From 44d73914385e5336c813bfb37830dfd5b4901f81 Mon Sep 17 00:00:00 2001
From: Ratko Vasic <ratko.vasic@noaa.gov>
Date: Fri, 30 Aug 2019 19:16:52 +0000
Subject: [PATCH] Posrt 2 hera

---
 src/incmake/env/rdhpcs/detect.mk     | 15 ++++++++++-----
 src/incmake/env/rdhpcs/hera.intel.mk |  7 +++++++
 tests/commit.def                     | 26 +++++++++++++-------------
 tests/multi-app-test.sh              |  2 +-
 tests/nightly/run-from-wcoss.sh      |  6 ++++++
 5 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 src/incmake/env/rdhpcs/hera.intel.mk

diff --git a/src/incmake/env/rdhpcs/detect.mk b/src/incmake/env/rdhpcs/detect.mk
index 3a93d6a4..d7e6e7cc 100644
--- a/src/incmake/env/rdhpcs/detect.mk
+++ b/src/incmake/env/rdhpcs/detect.mk
@@ -4,17 +4,22 @@
 #
 ########################################################################
 
-ifneq (,$(and $(wildcard /scratch4),$(wildcard /scratch3)))
+ifneq (,$(and $(wildcard /scratch),$(wildcard /scratch3)))
   NEMS_COMPILER?=intel
   $(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
 else
-  ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
+  ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
     NEMS_COMPILER?=intel
-    $(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
+    $(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(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
+      ifneq (,$(shell hostname | grep -i gaea))
+        NEMS_COMPILER?=intel
+        $(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
+      endif
     endif
   endif
 endif
diff --git a/src/incmake/env/rdhpcs/hera.intel.mk b/src/incmake/env/rdhpcs/hera.intel.mk
new file mode 100644
index 00000000..5eb5cebe
--- /dev/null
+++ b/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)
diff --git a/tests/commit.def b/tests/commit.def
index 95fd58af..9f663d9f 100644
--- a/tests/commit.def
+++ b/tests/commit.def
@@ -1,28 +1,28 @@
 # Directory to receive the webpage with regression test results
-#ON tujet          WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-#ON ujet.slurm     WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON theia          WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-#ON theia.intel    WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON theia.slurm.intel  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss1         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss2         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss_cray     WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-ON wcoss_dell_p3  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
-#ON gaea           WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/combo/
+#ON tujet          WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+#ON ujet.slurm     WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON theia          WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+#ON theia.intel    WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON theia.slurm.intel  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss1         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss2         WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss_cray     WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+ON wcoss_dell_p3  WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
+#ON gaea           WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
 
 USER ACCOUNT IS Ratko.Vasic
 ROLE ACCOUNT IS emc.nemspara
 
 # nems branch - branch of NEMS that is being tested.  Set to "default"
 # to test the app's own NEMS
-NEMS   BRANCH IS combogsdww3nems
+NEMS   BRANCH IS commit_tmp
 
 # app branch - branch to use for committing logs to each 
-APP    BRANCH IS combo-commit
+#APP    BRANCH IS NUOPC-commit
 
 # If relevant, the starting branch that we copy to make the app
 # branch.  Default is the master branch.
-#APP NEMSfv3gfs       CHECKOUT combo
+#APP NEMSfv3gfs       CHECKOUT NUOPC
 
 # master branch - name of the git "master" branch.  Do not change.
 MASTER BRANCH IS master
diff --git a/tests/multi-app-test.sh b/tests/multi-app-test.sh
index 480b68b5..e0078f99 100755
--- a/tests/multi-app-test.sh
+++ b/tests/multi-app-test.sh
@@ -1560,7 +1560,7 @@ push_to_master() {
     done
 
     # Check out $master_branch of NEMS:
-    git clone gerrit:NEMS NEMS
+    git clone github:NEMS NEMS
     cd NEMS
     git checkout "$master_branch"
 
diff --git a/tests/nightly/run-from-wcoss.sh b/tests/nightly/run-from-wcoss.sh
index 44eb2b77..c44bf2a9 100755
--- a/tests/nightly/run-from-wcoss.sh
+++ b/tests/nightly/run-from-wcoss.sh
@@ -13,6 +13,12 @@ if [[ "$hostchar" == "$prodchar" ]] ; then
     exit 1
 fi
 
+#WCOSS_Cray need to load newer git version
+if [[ `hostname | cut -c2-6` == "login" ]] ; then
+    source /opt/modules/default/init/sh
+    module use /usrx/local/dev/modulefiles
+    module load git/2.18.0
+fi
 
 cd $( dirname "$0" )
 cd ..