Merge branch 'develop' into feature/wcoss2

Fixes ufs-community#559.
GeorgeGayno-NOAA · May 20, 2022 · 9f82f4d · 9f82f4d
2 parents 4339a58 + b6efa86
commit 9f82f4d
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/modulefiles/build.cheyenne.intel b/modulefiles/build.cheyenne.intel
@@ -4,15 +4,19 @@
 
 module purge
 module load ncarenv/1.3
-module load intel/19.1.1
-module load mpt/2.19
+module load intel/2022.1
+module load mpt/2.25
 module load ncarcompilers/0.5.0
-module load cmake/3.16.4
+module load cmake/3.22.0
+
+module use -a /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack
+module load hpc/1.2.0
+module load hpc-intel/2022.1
+module load hpc-mpt/2.25
 
-module use -a /glade/p/ral/jntp/GMTB/tools/NCEPLIBS-ufs-v2.0.0/intel-19.1.1/mpt-2.19/modules
 
 module load bacio/2.4.1
-module load g2/3.4.1
+module load g2/3.4.3
 module load ip/3.3.3
 module load nemsio/2.5.2
 module load sp/2.3.3
@@ -21,8 +25,7 @@ module load sigio/2.3.2
 
 module load sfcio/1.4.1
 module load netcdf/4.7.4
-
-setenv ESMFMKFILE /glade/p/ral/jntp/GMTB/tools/NCEPLIBS-ufs-v2.0.0/intel-19.1.1/mpt-2.19/lib64/esmf.mk
+module load esmf/8.3.0b09
 
 setenv CMAKE_C_COMPILER icc
 setenv CMAKE_Fortran_COMPILER ifort