From cde9696e24d739b8497a9f17f576f4ea3ace495b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 23 Oct 2020 13:51:31 -0600 Subject: [PATCH 1/8] Update .gitmodules and submodule pointers for NEMS and fv3atm --- .gitmodules | 12 ++++++++---- FV3 | 2 +- NEMS | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 82a9329eea..573871ad86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,15 @@ [submodule "FV3"] path = FV3 - url = https://github.com/NOAA-EMC/fv3atm - branch = develop + #url = https://github.com/NOAA-EMC/fv3atm + #branch = develop + url = https://github.com/climbfuji/fv3atm + branch = revert-ccpp-prebuild-call [submodule "NEMS"] path = NEMS - url = https://github.com/NOAA-EMC/NEMS - branch = develop + #url = https://github.com/NOAA-EMC/NEMS + #branch = develop + url = https://github.com/climbfuji/NEMS + branch = revert-ccpp-prebuild-call [submodule "FMS"] path = FMS url = https://github.com/NOAA-GFDL/FMS diff --git a/FV3 b/FV3 index b955f81015..425d705ec7 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit b955f81015b2de589d886e7052feb68485f79466 +Subproject commit 425d705ec7bb95a8628752d34e177bd6b5a79b5b diff --git a/NEMS b/NEMS index 9d05172b71..58d3fe1c9c 160000 --- a/NEMS +++ b/NEMS @@ -1 +1 @@ -Subproject commit 9d05172b711f4ab5d6f978dbe575bd67a681b55a +Subproject commit 58d3fe1c9c22b7fe3cf76f5af1912d16885795e7 From 6d8a80d4aea149c3dca6dc2226d0c16d9a509c3c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 23 Oct 2020 13:52:16 -0600 Subject: [PATCH 2/8] Update modulefiles for cheyenne.intel and cheyenne.gnu to use hpc-stack --- modulefiles/cheyenne.gnu/fv3 | 77 ++++++++++++++-------------------- modulefiles/cheyenne.intel/fv3 | 77 ++++++++++++++-------------------- 2 files changed, 62 insertions(+), 92 deletions(-) diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3 index 588ceaefa9..c9888e6733 100644 --- 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 gnu/9.1.0 +#module load mpt/2.22 module load ncarcompilers/0.5.0 +module unload netcdf + +module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-20201022/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 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.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 nemsio/2.5.2 +module load sp/2.3.3 +module load w3emc/2.7.3 +module load w3nco/2.4.1 diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3 index 71b7ce44f1..5be1341083 100644 --- 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 intel/19.1.1 +#module load mpt/2.22 module load ncarcompilers/0.5.0 +module unload netcdf + +module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-20201022/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 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.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 nemsio/2.5.2 +module load sp/2.3.3 +module load w3emc/2.7.3 +module load w3nco/2.4.1 From de1054a444f4256906d1095de57969acfa160e36 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 25 Oct 2020 20:45:08 -0600 Subject: [PATCH 3/8] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 425d705ec7..cf04793253 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 425d705ec7bb95a8628752d34e177bd6b5a79b5b +Subproject commit cf04793253f73e394d7919c06fb9916904fd0fb7 From 07f6397dde79bc6c604bfb50fd30e32696f8a41c Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 25 Oct 2020 20:46:44 -0600 Subject: [PATCH 4/8] Update modulefiles for cheyenne.intel and cheyenne.gnu --- modulefiles/cheyenne.gnu/fv3 | 1 + modulefiles/cheyenne.intel/fv3 | 1 + 2 files changed, 2 insertions(+) diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3 index c9888e6733..9349b1dce0 100644 --- a/modulefiles/cheyenne.gnu/fv3 +++ b/modulefiles/cheyenne.gnu/fv3 @@ -27,6 +27,7 @@ module load hpc-mpt/2.22 module load jasper/2.0.22 module load zlib/1.2.11 module load png/1.6.35 +module load jpeg/9.1.0 module load hdf5/1.10.6 module load netcdf/4.7.4 diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3 index 5be1341083..b268e4791f 100644 --- a/modulefiles/cheyenne.intel/fv3 +++ b/modulefiles/cheyenne.intel/fv3 @@ -27,6 +27,7 @@ module load hpc-mpt/2.22 module load jasper/2.0.22 module load zlib/1.2.11 module load png/1.6.35 +module load jpeg/9.1.0 module load hdf5/1.10.6 module load netcdf/4.7.4 From e431723f78fcd40b3fbb45d1be4b4d3149668df1 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 26 Oct 2020 07:58:21 -0600 Subject: [PATCH 5/8] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index cf04793253..9d266e084a 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit cf04793253f73e394d7919c06fb9916904fd0fb7 +Subproject commit 9d266e084a364236f626880df1540a0fd309f655 From 9115d36161e4504932c4b483abd47afb15ad8416 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 26 Oct 2020 19:30:47 -0600 Subject: [PATCH 6/8] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 9d266e084a..3711b6fbfe 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 9d266e084a364236f626880df1540a0fd309f655 +Subproject commit 3711b6fbfef9cc3f6291db4e0f7cec7d80a705be From bbd3f31b6a340b0669b96e32eaf17d2c8db783bf Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 26 Oct 2020 20:01:26 -0600 Subject: [PATCH 7/8] modulefiles/cheyenne.*/fv3: need to load compilers despite being loaded again from hpc-stack, or ncarcompilers will fail --- modulefiles/cheyenne.gnu/fv3 | 5 +++-- modulefiles/cheyenne.intel/fv3 | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modulefiles/cheyenne.gnu/fv3 b/modulefiles/cheyenne.gnu/fv3 index 9349b1dce0..b70f70a561 100644 --- a/modulefiles/cheyenne.gnu/fv3 +++ b/modulefiles/cheyenne.gnu/fv3 @@ -14,8 +14,9 @@ setenv CMAKE_Platform cheyenne.gnu # load programming environment module load ncarenv/1.3 -#module load gnu/9.1.0 -#module load mpt/2.22 +# Need to load compilers despite being loaded again below or ncarcompilers will fail +module load gnu/9.1.0 +module load mpt/2.22 module load ncarcompilers/0.5.0 module unload netcdf diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3 index b268e4791f..31c8f90428 100644 --- a/modulefiles/cheyenne.intel/fv3 +++ b/modulefiles/cheyenne.intel/fv3 @@ -14,8 +14,9 @@ setenv CMAKE_Platform cheyenne.intel # load programming environment module load ncarenv/1.3 -#module load intel/19.1.1 -#module load mpt/2.22 +# Need to load compilers despite being loaded again below or ncarcompilers will fail +module load intel/19.1.1 +module load mpt/2.22 module load ncarcompilers/0.5.0 module unload netcdf From 6e157b59fa6c7762fdc1dfcca2332b190c42a651 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 27 Oct 2020 08:31:30 -0600 Subject: [PATCH 8/8] Update submodule pointer for fv3atm --- FV3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FV3 b/FV3 index 3711b6fbfe..187b43e7dc 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 3711b6fbfef9cc3f6291db4e0f7cec7d80a705be +Subproject commit 187b43e7dc326e5da5ec7c8aba62dcbf77898f66