From 2a81aaaf9295b8d95848e00e75e88cd3c8ef48e3 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Mon, 13 Jun 2022 12:09:54 -0600
Subject: [PATCH 1/4] fixes for cheyenne

---
 modulefiles/build_cheyenne_gnu   |  2 +-
 modulefiles/build_cheyenne_intel | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modulefiles/build_cheyenne_gnu b/modulefiles/build_cheyenne_gnu
index f8be4be1ea..1f4d24abba 100644
--- a/modulefiles/build_cheyenne_gnu
+++ b/modulefiles/build_cheyenne_gnu
@@ -8,11 +8,11 @@ proc ModulesHelp { } {
 module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
 module load cmake/3.22.0
+module load python/3.7.9
 module load ncarenv/1.3
 module load gnu/11.2.0
 module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load python/3.7.9
 module unload netcdf
 
 module use /glade/work/epicufsrt/GMTB/tools/gnu/11.2.0/hpc-stack-v1.2.0/modulefiles/stack
diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel
index c1d868d458..997678744a 100644
--- a/modulefiles/build_cheyenne_intel
+++ b/modulefiles/build_cheyenne_intel
@@ -7,11 +7,13 @@ proc ModulesHelp { } {
 
 module-whatis "Loads libraries needed for building SRW on Cheyenne"
 
-module purge
 module load cmake/3.22.0
+module load python/3.7.9
+module load ncarenv/1.3
 module load intel/2022.1
 module load mpt/2.25
-module load python/3.7.9
+module load ncarcompilers/0.5.0
+module unload netcdf
 
 module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
 module load hpc/1.2.0
@@ -19,15 +21,16 @@ module load hpc-intel/2022.1
 module load hpc-mpt/2.25
 
 module load srw_common
+
 module load g2/3.4.5
 module load esmf/8.3.0b09
 module load mapl/2.11.0-esmf-8.3.0b09
 module load netcdf/4.7.4
 module load libpng/1.6.37
 module load pio/2.5.3
+module load fms/2022.01
 
 setenv CMAKE_C_COMPILER mpicc
-setenv CMAKE_CXX_COMPILER mpixx
+setenv CMAKE_CXX_COMPILER mpicxx
 setenv CMAKE_Fortran_COMPILER mpif90
 setenv CMAKE_Platform cheyenne.intel
-

From df715c784726524bf3cb96a76d030c8328dc14a9 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Wed, 15 Jun 2022 12:58:40 -0600
Subject: [PATCH 2/4] Cleaning up modules for cheyenne and others

---
 modulefiles/build_cheyenne_gnu |  1 +
 modulefiles/srw_common         | 20 +++++++++-----------
 src/CMakeLists.txt             |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/modulefiles/build_cheyenne_gnu b/modulefiles/build_cheyenne_gnu
index 1f4d24abba..b909676953 100644
--- a/modulefiles/build_cheyenne_gnu
+++ b/modulefiles/build_cheyenne_gnu
@@ -26,6 +26,7 @@ module load w3emc/2.9.2
 module load esmf/8.3.0b09 
 module load mapl/2.11.0-esmf-8.3.0b09
 module load netcdf/4.7.4
+module load libpng/1.6.35
 module load pio/2.5.2
 
 setenv CMAKE_C_COMPILER mpicc
diff --git a/modulefiles/srw_common b/modulefiles/srw_common
index 570a492468..eea39d7576 100644
--- a/modulefiles/srw_common
+++ b/modulefiles/srw_common
@@ -2,15 +2,12 @@
 
 module load jasper/2.0.25
 module load zlib/1.2.11
-module try-load png/1.6.35 
-module try-load libpng/1.6.35
 
 module load hdf5/1.10.6
-module load-any netcdf/4.7.4 netcdf-c/4.7.4
-module load-any netcdf/4.7.4 netcdf-fortran/4.5.4
-module load-any pio/2.5.2 parallelio/2.5.2
-module load-any esmf/8.3.0b09 
-module load fms
+module load netcdf/4.7.4 
+module load pio/2.5.2 
+module load esmf/8.3.0b09    
+module load fms/2022.01
 
 module load bacio/2.4.1
 module load crtm/2.3.0
@@ -21,9 +18,9 @@ module load sp/2.3.3
 module load w3nco/2.4.1
 module load upp/10.0.10
 
-module load-any gftl-shared/v1.3.3 gftl-shared/1.3.3
-module load-any yafyaml/v0.5.1 yafyaml/0.5.1
-module load-any mapl/2.11.0-esmf-8.3.0b09
+module load gftl-shared/v1.3.3 
+module load yafyaml/v0.5.1     
+module load mapl/2.11.0-esmf-8.3.0b09
 
 module load gfsio/1.4.1
 module load landsfcutil/2.4.1
@@ -31,5 +28,6 @@ module load nemsio/2.5.2
 module load nemsiogfs/2.5.3
 module load sfcio/1.4.1
 module load sigio/2.3.2
-module try-load w3emc/2.7.3
+module load w3emc/2.7.3
 module load wgrib2/2.0.8
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2f494f8a52..a6e495bbfd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,7 +9,7 @@ ExternalProject_Add(UFS_UTILS
   )
 
 if(NOT CCPP_SUITES)
-  set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km")
+  set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0")
 endif()
 
 if(NOT APP)

From 593807e0bcefcd8498c36a91249bfed22e97e886 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Wed, 15 Jun 2022 19:44:02 +0000
Subject: [PATCH 3/4] cleaning up cloud modules

---
 modulefiles/build_noaacloud_intel |  3 +--
 modulefiles/srw_common.spack      | 33 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 modulefiles/srw_common.spack

diff --git a/modulefiles/build_noaacloud_intel b/modulefiles/build_noaacloud_intel
index 171b3a72ff..8d511e2ae0 100644
--- a/modulefiles/build_noaacloud_intel
+++ b/modulefiles/build_noaacloud_intel
@@ -14,8 +14,7 @@ module load cmake/3.22.1
 module use /apps/modules/modulefiles 
 module load rocoto
 
-module load srw_common
-module load esmf/8.2.0
+module load srw_common.spack
 
 module use /contrib/GST/miniconda3/modulefiles
 module load miniconda3/4.10.3
diff --git a/modulefiles/srw_common.spack b/modulefiles/srw_common.spack
new file mode 100644
index 0000000000..f39d06aa89
--- /dev/null
+++ b/modulefiles/srw_common.spack
@@ -0,0 +1,33 @@
+#%Module
+
+module load jasper/2.0.25
+module load zlib/1.2.11
+
+module load hdf5/1.10.6
+module load netcdf-c/4.7.4
+module load netcdf-fortran/4.5.4
+module load parallelio/2.5.2 
+module load esmf/8.3.0b09
+module load fms/2021.03
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.3
+module load g2tmpl/1.10.0
+module load ip/3.3.3
+module load sp/2.3.3
+module load w3nco/2.4.1
+module load upp/10.0.10
+
+module load gftl-shared/1.3.3 
+module load yafyaml/0.5.1 
+
+module load gfsio/1.4.1
+module load landsfcutil/2.4.1
+module load nemsio/2.5.2
+module load nemsiogfs/2.5.3
+module load sfcio/1.4.1
+module load sigio/2.3.2
+module load w3emc/2.7.3
+module load wgrib2/2.0.8
+

From 0bdd05a8e9d69adf45ce580d25a10714be5cfba1 Mon Sep 17 00:00:00 2001
From: Mark Potts <mark.potts@noaa.gov>
Date: Wed, 15 Jun 2022 15:48:14 -0600
Subject: [PATCH 4/4] fix for cheyenne and ufs_utils

---
 modulefiles/build_cheyenne_intel | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel
index 997678744a..c796cd369b 100644
--- a/modulefiles/build_cheyenne_intel
+++ b/modulefiles/build_cheyenne_intel
@@ -22,6 +22,8 @@ module load hpc-mpt/2.25
 
 module load srw_common
 
+module unload w3emc/2.7.3
+module load w3emc/2.9.1
 module load g2/3.4.5
 module load esmf/8.3.0b09
 module load mapl/2.11.0-esmf-8.3.0b09