From 871616311d12ea4e3c17d7dfec22454e36d9a752 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Sat, 11 Jan 2020 12:41:42 -0700
Subject: [PATCH] Selective updates for Gaea and Cheyenne from develop branch

---
 modulefiles/cheyenne.intel-impi/fv3         | 8 ++++++++
 modulefiles/gaea.intel/fv3                  | 5 ++---
 modulefiles/gaea.intel/fv3.intel-16.0.3.210 | 2 +-
 tests/rt.sh                                 | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/modulefiles/cheyenne.intel-impi/fv3 b/modulefiles/cheyenne.intel-impi/fv3
index ec97290589..e0160b61dc 100644
--- a/modulefiles/cheyenne.intel-impi/fv3
+++ b/modulefiles/cheyenne.intel-impi/fv3
@@ -37,3 +37,11 @@ module load NCEPlibs/9.9.9
 ## SIONlib library
 ##
 module load SIONlib/1.7.4
+
+##
+## set cmake compilers
+##
+setenv CMAKE_C_COMPILER mpicc
+setenv CMAKE_CXX_COMPILER mpicxx
+setenv CMAKE_Fortran_COMPILER mpif90
+setenv CMAKE_Platform cheyenne.intel-impi
diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3
index 828deb2856..5904910722 100644
--- a/modulefiles/gaea.intel/fv3
+++ b/modulefiles/gaea.intel/fv3
@@ -20,7 +20,7 @@ module rm intel
 module load intel/18.0.3.222
 module load cray-netcdf
 
-module use -a /lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/modules/modulefiles/intel-18.0.3.222
+module use -a /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-18.0.3.222
 
 ##
 ## Libxml2 - compiled manually because of issues with linking the code
@@ -46,5 +46,4 @@ module load alps
 setenv CMAKE_C_COMPILER cc
 setenv CMAKE_CXX_COMPILER CC
 setenv CMAKE_Fortran_COMPILER ftn
-setenv CMAKE_Platform gaea
-setenv NETCDF ${NETCDF_DIR}
+setenv CMAKE_Platform gaea.intel
diff --git a/modulefiles/gaea.intel/fv3.intel-16.0.3.210 b/modulefiles/gaea.intel/fv3.intel-16.0.3.210
index d52175aa0f..483054b687 100644
--- a/modulefiles/gaea.intel/fv3.intel-16.0.3.210
+++ b/modulefiles/gaea.intel/fv3.intel-16.0.3.210
@@ -22,7 +22,7 @@ module load cray-netcdf
 setenv NETCDF /opt/cray/pe/netcdf/4.4.0/INTEL/15.0
 setenv HDF5   /opt/cray/pe/hdf5/1.8.16/INTEL/15.0
 
-module use -a /lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/modules/modulefiles/intel-16.0.3.210
+module use -a /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-16.0.3.210
 
 ##
 ## Libxml2 - compiled manually because of issues with linking the code
diff --git a/tests/rt.sh b/tests/rt.sh
index ae627ab63a..0e0545dcfe 100755
--- a/tests/rt.sh
+++ b/tests/rt.sh
@@ -159,7 +159,7 @@ elif [[ $MACHINE_ID = gaea.* ]]; then
   ECFLOW_START=
   # DH* 20190717 temporary
   #DISKNM=/lustre/f2/pdata/ncep_shared/emc.nemspara/RT
-  DISKNM=/lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/RT
+  DISKNM=/lustre/f2/pdata/esrl/gsd/ufs/ufs-weather-model/RT
   # *DH 20190717
   QUEUE=debug
 #  DO NOT SET AN ACCOUNT EVERYONE IS NOT A MEMBER OF
@@ -242,7 +242,7 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then
 
   export PYTHONPATH=
   ECFLOW_START=
-  QUEUE=economy
+  QUEUE=premium
   PARTITION=
   dprefix=/glade/scratch
   DISKNM=/glade/p/ral/jntp/GMTB/NEMSfv3gfs/RT