From 7143456eec291f660d000992e3f0bb60df6497bc Mon Sep 17 00:00:00 2001
From: MinsukJi-NOAA <minsuk.ji@noaa.gov>
Date: Thu, 22 Jul 2021 14:06:54 -0700
Subject: [PATCH 1/2] First commit to bring Expanse even with develop

---
 model/bin/cmplr.env | 5 +++--
 model/bin/w3_setup  | 6 ++++--
 model/esmf/Makefile | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/model/bin/cmplr.env b/model/bin/cmplr.env
index c9fdafa87..2da31a673 100644
--- a/model/bin/cmplr.env
+++ b/model/bin/cmplr.env
@@ -112,6 +112,7 @@ if [ "$cmplr" == "intel" ]          || [ "$cmplr" == "intel_debug" ]    || [ "$c
    [ "$cmplr" == "wcoss_cray" ]     || [ "$cmplr" == "wcoss_dell_p3" ]  || [ "$cmplr" == "cheyenne.intel" ]      || \
    [ "$cmplr" == "gaea.intel" ]     || [ "$cmplr" == "jet.intel" ]      || \
    [ "$cmplr" == "wcoss2" ]         || \
+   [ "$cmplr" == "expanse.intel" ]  || \
    [ "$cmplr" == "hera.intel" ]     || [ "$cmplr" == "orion.intel" ]    || [ "$cmplr" == "stampede.intel" ] ; then
 
 
@@ -161,10 +162,10 @@ if [ "$cmplr" == "intel" ]          || [ "$cmplr" == "intel_debug" ]    || [ "$c
   if [ ! -z "$(echo $cmplr | grep datarmor)" ] || [ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ] || \
      [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "cheyenne.intel" ] || \
      [ "$cmplr" == "gaea.intel" ] || [ "$cmplr" == "jet.intel" ] || [ "$cmplr" == "wcoss2" ] \
-     [ "$cmplr" == "stampede.intel" ]; then
+     [ "$cmplr" == "expanse.intel" ]  || [ "$cmplr" == "stampede.intel" ]; then
      optomp="-qopenmp"
   else
-     optomp="-openmp"
+     optomp="-qopenmp"
   fi
 
   # optimized options
diff --git a/model/bin/w3_setup b/model/bin/w3_setup
index 1b0521880..84ddc3aac 100755
--- a/model/bin/w3_setup
+++ b/model/bin/w3_setup
@@ -417,7 +417,8 @@ then
        [ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ]                || \
        [ "$cmplr" == "hera.gnu" ]   || [ "$cmplr" == "jet.intel" ]                  || \
        [ "$cmplr" == "stampede.intel" ] || [ "$cmplr" == "gaea.intel" ]             || \
-       [ "$cmplr" == "wcoss2" ] || \
+       [ "$cmplr" == "wcoss2" ]                                                     || \
+       [ "$cmplr" == "expanse.intel" ]                                              || \
        [ "$cmplr" == "cheyenne.intel" ] || [ "$cmplr" == "cheyenne.gnu" ]           || \
        [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ]              || \
        [ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ]       || \
@@ -446,7 +447,8 @@ then
        [ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ]                || \
        [ "$cmplr" == "hera.gnu" ]   || [ "$cmplr" == "jet.intel" ]                  || \
        [ "$cmplr" == "stampede.intel" ] || [ "$cmplr" == "gaea.intel" ]             || \
-       [ "$cmplr" == "wcoss2" ] || \
+       [ "$cmplr" == "wcoss2" ]                                                     || \
+       [ "$cmplr" == "expanse.intel" ]                                              || \
        [ "$cmplr" == "cheyenne.intel" ] || [ "$cmplr" == "cheyenne.gnu" ]           || \
        [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ]              || \
        [ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ]       || \
diff --git a/model/esmf/Makefile b/model/esmf/Makefile
index 5deab2842..618ab6711 100644
--- a/model/esmf/Makefile
+++ b/model/esmf/Makefile
@@ -37,7 +37,7 @@ else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","pgi" "datarmor_pgi" "datarmor_p
 # intel
 else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","Intel" "hera.intel" "orion.intel" "jet.intel")) 
  ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
-else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)", "cheyenne.intel" "stampede.intel"))
+else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)", "cheyenne.intel" "stampede.intel" "expanse.intel"))
  ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
 else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","wcoss_cray" "wcoss_dell_p3" "gaea.intel" "wcoss2"))
  ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian

From 7cf3c473018cbf00e69f9836c2f6c8fe3611ec76 Mon Sep 17 00:00:00 2001
From: MinsukJi-NOAA <minsuk.ji@noaa.gov>
Date: Thu, 29 Jul 2021 18:23:32 -0400
Subject: [PATCH 2/2] Fix error

---
 model/bin/cmplr.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/model/bin/cmplr.env b/model/bin/cmplr.env
index 2da31a673..83f5fab04 100644
--- a/model/bin/cmplr.env
+++ b/model/bin/cmplr.env
@@ -161,11 +161,11 @@ if [ "$cmplr" == "intel" ]          || [ "$cmplr" == "intel_debug" ]    || [ "$c
   # omp options
   if [ ! -z "$(echo $cmplr | grep datarmor)" ] || [ "$cmplr" == "hera.intel" ] || [ "$cmplr" == "orion.intel" ] || \
      [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ] || [ "$cmplr" == "cheyenne.intel" ] || \
-     [ "$cmplr" == "gaea.intel" ] || [ "$cmplr" == "jet.intel" ] || [ "$cmplr" == "wcoss2" ] \
+     [ "$cmplr" == "gaea.intel" ] || [ "$cmplr" == "jet.intel" ] || [ "$cmplr" == "wcoss2" ] || \
      [ "$cmplr" == "expanse.intel" ]  || [ "$cmplr" == "stampede.intel" ]; then
      optomp="-qopenmp"
   else
-     optomp="-qopenmp"
+     optomp="-openmp"
   fi
 
   # optimized options