Update modules with hpc-stack v1.1.0 (#319)

* Update modules with hpc-stack v1.1.0 * Minor bug fixes to CCPP UGWP Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
ufs-community · Dec 18, 2020 · 27caecf · 27caecf
1 parent ffe417a
commit 27caecf
Show file tree

Hide file tree

Showing 24 changed files with 7,078 additions and 6,612 deletions.
diff --git a/FV3 b/FV3
diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3
@@ -19,8 +19,8 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-nco-20201113/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.1.0/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 module load hpc-mpt/2.22
 

diff --git a/modulefiles/cheyenne.gnu/fv3_debug b/modulefiles/cheyenne.gnu/fv3_debug
@@ -19,8 +19,8 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-nco-20201113/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.1.0/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 module load hpc-mpt/2.22
 

diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
@@ -19,8 +19,8 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-nco-20201113/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.1.0/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
 

diff --git a/modulefiles/cheyenne.intel/fv3_debug b/modulefiles/cheyenne.intel/fv3_debug
@@ -19,8 +19,8 @@ module load mpt/2.22
 module load ncarcompilers/0.5.0
 module unload netcdf
 
-module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-nco-20201113/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.1.0/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-intel/19.1.1
 module load hpc-mpt/2.22
 

diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3
@@ -20,13 +20,13 @@ setenv CMAKE_CXX_COMPILER CC
 setenv CMAKE_Fortran_COMPILER ftn
 setenv CMAKE_Platform gaea.intel
 
-module use /lustre/f2/pdata/esrl/gsd/ufs/hpc-stack-nco-20201116/modulefiles/stack
+module use /lustre/f2/pdata/esrl/gsd/ufs/hpc-stack-v1.1.0/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/18.0.6.288
 module load hpc-cray-mpich/7.7.11
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 

diff --git a/modulefiles/gaea.intel/fv3_debug b/modulefiles/gaea.intel/fv3_debug
@@ -0,0 +1,50 @@
+#%Module
+
+proc ModulesHelp {} {
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Gaea/Intel"
+}
+
+module-whatis "loads UFS Model prerequisites for Gaea/Intel"
+
+module load PrgEnv-intel/6.0.5
+module rm intel
+module rm cray-mpich
+module rm netcdf
+module load intel/18.0.6.288
+module load cray-mpich/7.7.11
+module load cray-python/3.7.3.2
+
+module load cmake/3.17.0
+setenv CMAKE_C_COMPILER cc
+setenv CMAKE_CXX_COMPILER CC
+setenv CMAKE_Fortran_COMPILER ftn
+setenv CMAKE_Platform gaea.intel
+
+module use /lustre/f2/pdata/esrl/gsd/ufs/hpc-stack-v1.1.0/modulefiles/stack
+
+module load hpc/1.1.0
+module load hpc-intel/18.0.6.288
+module load hpc-cray-mpich/7.7.11
+
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
+
+module load hdf5/1.10.6
+module load netcdf/4.7.4
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27-debug
+
+module load bacio/2.4.1
+module load crtm/2.3.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
+module load upp/10.0.0
+
+# Needed at runtime:
+module load alps
diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3
@@ -15,8 +15,8 @@ setenv CMAKE_CXX_COMPILER mpicxx
 setenv CMAKE_Fortran_COMPILER mpif90
 setenv CMAKE_Platform hera.gnu
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
-module load hpc/1.0.0-beta1
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
+module load hpc/1.1.0
 module load hpc-gnu/9.2.0
 module load hpc-mpich/3.3.2  
 module load mpich/3.3.2

diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -15,9 +15,9 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform hera.intel
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 

diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug
@@ -15,9 +15,9 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform hera.intel
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 

diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
@@ -17,7 +17,6 @@ setenv CMAKE_Platform jet.intel
 
 module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
 
-# At this time (2020/11/30), this is the pre-release version 1.0.0
 module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274

diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
@@ -14,9 +14,9 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
 
-module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
+module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 

diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/orion.intel/fv3_debug
@@ -14,9 +14,9 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
 
-module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
+module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 

diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -38,22 +38,21 @@ setenv PNG_ROOT /usrx/local/prod//png/1.2.49/intel/sandybridge
 ##
 ## NCEP libraries
 ##
-module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS_UFS/modules
-module load bacio/2.4.0
+module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules
+module load bacio/2.4.1
 module load crtm/2.3.0
-module load g2/3.4.0
-module load g2tmpl/1.9.0
-module load ip/3.3.0
-module load nemsio/2.5.1
-module load sp/2.3.0
-module load w3emc/2.7.0
-module load w3nco/2.4.0
+module load g2/3.4.1
+module load g2tmpl/1.9.1
+module load ip/3.3.3
+module load nemsio/2.5.2
+module load sp/2.3.3
+module load w3emc/2.7.3
+module load w3nco/2.4.1
 
-module load gfsio/1.4.0
-module load sfcio/1.4.0
-module load sigio/2.3.0
+module load gfsio/1.4.1
+module load sfcio/1.4.1
+module load sigio/2.3.2
 
-module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS_UFS/modules
 module load upp/10.0.0
 
 ## WCOSS Cray execution prereqs:

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -17,9 +17,9 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform wcoss_dell_p3
 
-module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
+module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 

diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/wcoss_dell_p3/fv3_debug
@@ -17,9 +17,9 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform wcoss_dell_p3
 
-module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
+module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/modulefiles/stack
 
-module load hpc/1.0.0-beta1
+module load hpc/1.1.0
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1