Bring GFS.v16 features back to develop branch (#274)

* bring GFS.v16 code changes back to develop branch * update upp lib in hera module * use test hpc stack lib * update upp lib in fv3 for cmake * update post control files * update upp lib in hpcstack on hera, orion and dell and in nceplibs on cray * add change in fv3 dycore #35 * remove duplicate read_data in fms_mod in external_ic.F90 Co-authored-by: Jun Wang <[email protected]> Co-authored-by: Dom Heinzeller <[email protected]>
ufs-community · Nov 17, 2020 · b771e5b · b771e5b
1 parent 2e25df5
commit b771e5b
Show file tree

Hide file tree

Showing 23 changed files with 1,806 additions and 1,237 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -103,7 +103,7 @@ find_package(sp REQUIRED)
 find_package(w3emc REQUIRED)
 find_package(w3nco REQUIRED)
 if(INLINE_POST)
-  find_package(nceppost REQUIRED)
+  find_package(upp REQUIRED)
 endif()
 
 # See https://github.com/NOAA-EMC/NCEPLIBS-nemsio/pull/22

diff --git a/FV3 b/FV3
diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3
@@ -1,60 +1,45 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Cheyenne/GNU
+#%Module
 
 proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on Cheyenne/GNU"
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/GNU"
 }
 
-module-whatis "loads NEMS FV3 prerequisites for Cheyenne/GNU"
+module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
+module load cmake/3.16.4
+setenv CMAKE_C_COMPILER mpicc
+setenv CMAKE_CXX_COMPILER mpicxx
+setenv CMAKE_Fortran_COMPILER mpif90
+setenv CMAKE_Platform cheyenne.gnu
 
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
+# load programming environment
 module load ncarenv/1.3
 module load gnu/9.1.0
-module load mpt/2.19
+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 load hpc-gnu/9.1.0
+module load hpc-mpt/2.22
 
-##
-## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200909/gnu-9.1.0/mpt-2.19/modules
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
 
-module load libpng/1.6.35
+module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load esmf/8.1.0bs27
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27
 
-module load bacio/2.4.0
+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 nceppost/dceca26
-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 gfsio/1.4.0
-module load sfcio/1.4.0
-module load sigio/2.3.0
-
-##
-## SIONlib library
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/gnu-9.1.0/mpt-2.19
-module load SIONlib/1.7.4
-
-##
-## load cmake
-##
-module load cmake/3.16.4
-setenv CMAKE_C_COMPILER mpicc
-setenv CMAKE_CXX_COMPILER mpicxx
-setenv CMAKE_Fortran_COMPILER mpif90
-setenv CMAKE_Platform cheyenne.gnu
+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
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
@@ -1,60 +1,45 @@
-#%Module######################################################################
-##
-##    NEMS FV3 Prerequisites: Cheyenne/Intel
+#%Module
 
 proc ModulesHelp {} {
-  puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on Cheyenne/Intel"
+  puts stderr "\tcit - loads modules required for building and running UFS Model on Cheyenne/Intel"
 }
 
-module-whatis "loads NEMS FV3 prerequisites for Cheyenne/Intel"
+module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
-# NOTE: the "module purge" and loading of the module command are
-# handled by the module-setup.sh (or .csh) script.
+module load cmake/3.16.4
+setenv CMAKE_C_COMPILER mpicc
+setenv CMAKE_CXX_COMPILER mpicxx
+setenv CMAKE_Fortran_COMPILER mpif90
+setenv CMAKE_Platform cheyenne.intel
 
-##
-## load programming environment
-## this typically includes compiler, MPI and job scheduler
-##
+# load programming environment
 module load ncarenv/1.3
 module load intel/19.1.1
-module load mpt/2.19
+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 load hpc-intel/19.1.1
+module load hpc-mpt/2.22
 
-##
-## use pre-compiled PNG, NetCDF, ESMF and NCEP libraries for above compiler / MPI combination
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/ufs-stack-20200909/intel-19.1.1/mpt-2.19/modules
+module load jasper/2.0.22
+module load zlib/1.2.11
+module load png/1.6.35
 
-module load libpng/1.6.35
+module load hdf5/1.10.6
 module load netcdf/4.7.4
-module load esmf/8.1.0bs27
+module load pio/2.5.1
+module load esmf/8_1_0_beta_snapshot_27
 
-module load bacio/2.4.0
+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 nceppost/dceca26
-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 gfsio/1.4.0
-module load sfcio/1.4.0
-module load sigio/2.3.0
-
-##
-## SIONlib library
-##
-module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/intel-19.1.1/mpt-2.19
-module load SIONlib/1.7.4
-
-##
-## load cmake
-##
-module load cmake/3.16.4
-setenv CMAKE_C_COMPILER mpicc
-setenv CMAKE_CXX_COMPILER mpicxx
-setenv CMAKE_Fortran_COMPILER mpif90
-setenv CMAKE_Platform cheyenne.intel
+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
diff --git a/modulefiles/hera.gnu/fv3 b/modulefiles/hera.gnu/fv3
@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpicxx
 setenv CMAKE_Fortran_COMPILER mpif90
 setenv CMAKE_Platform hera.gnu
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
-
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
 module load hpc/1.0.0-beta1
 module load hpc-gnu/9.2.0
-module load hpc-mpich/3.3.2
+module load hpc-mpich/3.3.2  
+module load mpich/3.3.2
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -35,8 +35,8 @@ 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 nceppost/dceca26
 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
diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform hera.intel
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
 
 module load hpc/1.0.0-beta1
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -35,8 +35,8 @@ 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 nceppost/dceca26
 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
diff --git a/modulefiles/hera.intel/fv3_debug b/modulefiles/hera.intel/fv3_debug
@@ -15,13 +15,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform hera.intel
 
-module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /scratch2/NCEPDEV/nwprod/hpc-stack/test/modulefiles/stack
 
 module load hpc/1.0.0-beta1
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -35,8 +35,8 @@ 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 nceppost/dceca26
 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
diff --git a/modulefiles/orion.intel/fv3 b/modulefiles/orion.intel/fv3
@@ -14,13 +14,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
 
-module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
 
 module load hpc/1.0.0-beta1
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -34,8 +34,8 @@ 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 nceppost/dceca26
 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
diff --git a/modulefiles/orion.intel/fv3_debug b/modulefiles/orion.intel/fv3_debug
@@ -14,13 +14,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform orion.intel
 
-module use /apps/contrib/NCEP/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /apps/contrib/NCEP/test/hpc-stack-nco/modulefiles/stack
 
 module load hpc/1.0.0-beta1
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -34,8 +34,8 @@ 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 nceppost/dceca26
 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
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -44,7 +44,6 @@ 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 nceppost/dceca26
 module load nemsio/2.5.1
 module load sp/2.3.0
 module load w3emc/2.7.0
@@ -54,6 +53,8 @@ module load gfsio/1.4.0
 module load sfcio/1.4.0
 module load sigio/2.3.0
 
+module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS_UFS/modules
+module load upp/10.0.0
 
 ## WCOSS Cray execution prereqs:
 module load rca

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -18,13 +18,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform wcoss_dell_p3
 
-module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
 
 module load hpc/1.0.0-beta1
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -38,8 +38,8 @@ 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 nceppost/dceca26
 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
diff --git a/modulefiles/wcoss_dell_p3/fv3_debug b/modulefiles/wcoss_dell_p3/fv3_debug
@@ -18,13 +18,13 @@ setenv CMAKE_CXX_COMPILER mpiicpc
 setenv CMAKE_Fortran_COMPILER mpiifort
 setenv CMAKE_Platform wcoss_dell_p3
 
-module use /usrx/local/nceplibs/dev/hpc-stack/libs/hpc-stack/v1.0.0-beta1/modulefiles/stack
+module use /usrx/local/nceplibs/dev/hpc-stack/test/hpc-stack/modulefiles/stack
 
 module load hpc/1.0.0-beta1
 module load hpc-ips/18.0.1.163
 module load hpc-impi/18.0.1
 
-module load jasper/2.0.15
+module load jasper/2.0.22
 module load zlib/1.2.11
 module load png/1.6.35
 
@@ -38,8 +38,8 @@ 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 nceppost/dceca26
 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
+1 −1		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+1 −1		io/CMakeLists.txt
+2 −2		io/makefile