Update CMEPS for latest ESCOMP/master; Update PIO to 2.5.2; Refactor …

…modules (NOAA-EMC#492) * update ufs for CMEPS master with PIO changes * update pio to 2.5.2 across platforms * replace variable SUITE_NAME with CCPP_SUITE * Merge remote-tracking branch 'DusanJovic/module_common' into feature/updcmeps * switch to h-nems area on jet Co-authored-by: Bin Li <Bin.Li@gaea13.ncrc.gov> Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
SamuelTrahanNOAA · Apr 9, 2021 · ade15dd · ade15dd
1 parent b78797f
commit ade15dd
Show file tree

Hide file tree

Showing 65 changed files with 2,009 additions and 2,591 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMEPS-interface/CMakeLists.txt b/CMEPS-interface/CMakeLists.txt
@@ -18,7 +18,6 @@ endif()
 list(APPEND _nems_util_files
   CMEPS/util/shr_abort_mod.F90
   CMEPS/util/shr_log_mod.F90
-  CMEPS/util/shr_pio_mod.F90
   CMEPS/util/shr_sys_mod.F90
   CMEPS/util/shr_flux_mod.F90
   CMEPS/util/shr_mpi_mod.F90
@@ -66,8 +65,7 @@ list(APPEND _mediator_files
   CMEPS/mediator/med_phases_post_wav_mod.F90)
 
 list(APPEND _mediator_defs ESMF_VERSION_MAJOR=${ESMF_VERSION_MAJOR}
-                           ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR}
-                           INTERNAL_PIO_INIT)
+                           ESMF_VERSION_MINOR=${ESMF_VERSION_MINOR})
 
 ### Create target library and set PUBLIC interfaces on the library
 add_library(cmeps STATIC ${_nems_util_files} ${_mediator_files})

diff --git a/modulefiles/cheyenne.gnu/fv3 → modulefiles/ufs_cheyenne.gnu b/modulefiles/cheyenne.gnu/fv3 → modulefiles/ufs_cheyenne.gnu
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 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 hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-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.4
+module load ufs_common
diff --git a/modulefiles/cheyenne.gnu/fv3_debug → modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/cheyenne.gnu/fv3_debug → modulefiles/ufs_cheyenne.gnu_debug
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-gnu/9.1.0
 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 hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-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.4
+module load ufs_common_debug
diff --git a/modulefiles/cheyenne.intel/fv3 → modulefiles/ufs_cheyenne.intel b/modulefiles/cheyenne.intel/fv3 → modulefiles/ufs_cheyenne.intel
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-intel/19.1.1
 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 hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47
-
-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.4
+module load ufs_common
diff --git a/modulefiles/cheyenne.intel/fv3_debug → modulefiles/ufs_cheyenne.intel_debug b/modulefiles/cheyenne.intel/fv3_debug → modulefiles/ufs_cheyenne.intel_debug
@@ -24,22 +24,4 @@ module load hpc/1.1.0
 module load hpc-intel/19.1.1
 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 hdf5/1.10.6
-module load netcdf/4.7.4
-module load pio/2.5.1
-module load esmf/8_1_0_beta_snapshot_47-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.4
+module load ufs_common_debug
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -0,0 +1,21 @@
+#%Module
+
+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.2
+module load esmf/8_1_0_beta_snapshot_47
+
+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.4
diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -0,0 +1,21 @@
+#%Module
+
+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.2
+module load esmf/8_1_0_beta_snapshot_47-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.4
diff --git a/modulefiles/gaea.intel/fv3 → modulefiles/ufs_gaea.intel b/modulefiles/gaea.intel/fv3 → modulefiles/ufs_gaea.intel
@@ -13,6 +13,8 @@ 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
+# Needed at runtime:
+module load alps
 
 module load cmake/3.17.0
 setenv CMAKE_C_COMPILER cc
@@ -26,25 +28,4 @@ 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_47
-
-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.4
-
-# Needed at runtime:
-module load alps
+module load ufs_common
diff --git a/modulefiles/gaea.intel/fv3_debug → modulefiles/ufs_gaea.intel_debug b/modulefiles/gaea.intel/fv3_debug → modulefiles/ufs_gaea.intel_debug
@@ -13,6 +13,8 @@ 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
+# Needed at runtime:
+module load alps
 
 module load cmake/3.17.0
 setenv CMAKE_C_COMPILER cc
@@ -26,25 +28,4 @@ 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_47-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.4
-
-# Needed at runtime:
-module load alps
+module load ufs_common_debug
diff --git a/modulefiles/hera.gnu/fv3 → modulefiles/ufs_hera.gnu b/modulefiles/hera.gnu/fv3 → modulefiles/ufs_hera.gnu
@@ -19,24 +19,5 @@ 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
 
-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_47
-
-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.4
+module load ufs_common
diff --git a/modulefiles/hera.intel/fv3 → modulefiles/ufs_hera.intel b/modulefiles/hera.intel/fv3 → modulefiles/ufs_hera.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-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_47
-
-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.4
+module load ufs_common
diff --git a/modulefiles/hera.intel/fv3_debug → modulefiles/ufs_hera.intel_debug b/modulefiles/hera.intel/fv3_debug → modulefiles/ufs_hera.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.0.4
 
-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_47-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.4
+module load ufs_common_debug
diff --git a/modulefiles/jet.intel/fv3 → modulefiles/ufs_jet.intel b/modulefiles/jet.intel/fv3 → modulefiles/ufs_jet.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
-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_47
-
-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.4
+module load ufs_common
diff --git a/modulefiles/jet.intel/fv3_debug → modulefiles/ufs_jet.intel_debug b/modulefiles/jet.intel/fv3_debug → modulefiles/ufs_jet.intel_debug
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/18.0.5.274
 module load hpc-impi/2018.4.274
 
-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_47-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.4
+module load ufs_common_debug
diff --git a/modulefiles/linux.gnu/fv3 → modulefiles/ufs_linux.gnu b/modulefiles/linux.gnu/fv3 → modulefiles/ufs_linux.gnu
diff --git a/modulefiles/linux.gnu/fv3_debug → modulefiles/ufs_linux.gnu_debug b/modulefiles/linux.gnu/fv3_debug → modulefiles/ufs_linux.gnu_debug
diff --git a/modulefiles/macosx.gnu/fv3 → modulefiles/ufs_macosx.gnu b/modulefiles/macosx.gnu/fv3 → modulefiles/ufs_macosx.gnu
diff --git a/modulefiles/macosx.gnu/fv3_debug → modulefiles/ufs_macosx.gnu_debug b/modulefiles/macosx.gnu/fv3_debug → modulefiles/ufs_macosx.gnu_debug
diff --git a/modulefiles/odin/fv3 → modulefiles/ufs_odin b/modulefiles/odin/fv3 → modulefiles/ufs_odin
diff --git a/modulefiles/orion.intel/fv3 → modulefiles/ufs_orion.intel b/modulefiles/orion.intel/fv3 → modulefiles/ufs_orion.intel
@@ -21,22 +21,4 @@ module load hpc/1.1.0
 module load hpc-intel/2018.4
 module load hpc-impi/2018.4
 
-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_47
-
-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.4
+module load ufs_common