Merge remote-tracking branch 'upstream/develop' into lsm_upgrades_for…

…_p8c
ufs-community · Mar 20, 2022 · fa9b372 · fa9b372
2 parents fe714c2 + af1e026
commit fa9b372
Show file tree

Hide file tree

Showing 77 changed files with 9,852 additions and 4,938 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.19)
 
 project(ufs
         VERSION 1.0
@@ -155,27 +155,10 @@ endif()
 ### Wave components [WW3]
 ###############################################################################
 if(WW3)
-  if(CMAKE_Platform)
-    if(${CMAKE_Platform} MATCHES "linux*" OR ${CMAKE_Platform} MATCHES "macosx*")
-      if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
-        set(WW3_COMP "gnu")
-      elseif (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-        set(WW3_COMP "intel")
-      endif()
-    else()
-      set(WW3_COMP ${CMAKE_Platform})
-    endif()
-  endif()
-  message("Build WW3:")
-  message("   run: ${CMAKE_BUILD_TOOL} WW3_PARCOMPN=4 WW3_COMP=${WW3_COMP} ww3_nemslibonly")
-  message("   in:  ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/esmf")
-  message("")
-
-  add_custom_target(ww3_nems
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/esmf
-    COMMAND ${CMAKE_BUILD_TOOL} WW3_PARCOMPN=4 WW3_COMP=${WW3_COMP} ww3_nemslibonly > ${CMAKE_CURRENT_BINARY_DIR}/ww3_make.log 2>&1)
-
-  set(WW3_LIBS ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/obj/libww3_multi_esmf.a)
+  # Set options for WW3 build
+  set(SWITCH "multi_esmf" CACHE STRING "Default to switch_multi_esmf")
+  set(MULTI_ESMF ON CACHE BOOL "Enable ESMF for WW3")
+  add_subdirectory(WW3)
 endif()
 
 ###############################################################################
@@ -227,10 +210,8 @@ if(UFS_GOCART)
 endif()
 
 if(WW3)
-  add_dependencies(ufs ww3_nems)
   list(APPEND _ufs_defs_private FRONT_WW3=WMESMFMD)
-  target_include_directories(ufs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/WW3/model/mod)
-  list(APPEND _ufs_libs_public ${WW3_LIBS})
+  target_link_libraries(ufs PUBLIC WW3::WW3)
 endif()
 
 list(APPEND _ufs_libs_public esmf)

diff --git a/FV3 b/FV3
diff --git a/WW3 b/WW3
diff --git a/modulefiles/ufs_cheyenne.gnu b/modulefiles/ufs_cheyenne.gnu
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_cheyenne.gnu_debug b/modulefiles/ufs_cheyenne.gnu_debug
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_cheyenne.intel b/modulefiles/ufs_cheyenne.intel
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_cheyenne.intel_debug b/modulefiles/ufs_cheyenne.intel_debug
@@ -6,7 +6,7 @@ proc ModulesHelp {} {
 
 module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"
 
-module load cmake/3.18.2
+module load cmake/3.22.0
 module load python/3.7.9
 
 # load programming environment

diff --git a/modulefiles/ufs_gaea.intel b/modulefiles/ufs_gaea.intel
@@ -30,6 +30,8 @@ module load hpc-cray-mpich/7.7.11
 
 module load ufs_common
 
+setenv I_MPI_DAPL_UD 1
+
 setenv CC cc
 setenv CXX CC
 setenv FC ftn

diff --git a/modulefiles/ufs_gaea.intel_debug b/modulefiles/ufs_gaea.intel_debug
@@ -27,6 +27,8 @@ module load hpc-cray-mpich/7.7.11
 
 module load ufs_common_debug
 
+setenv I_MPI_DAPL_UD 1
+
 setenv CC cc
 setenv CXX CC
 setenv FC ftn

diff --git a/modulefiles/ufs_jet.intel b/modulefiles/ufs_jet.intel
@@ -19,6 +19,8 @@ module load hpc-impi/2018.4.274
 
 module load ufs_common
 
+setenv I_MPI_DAPL_UD 1
+
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/modulefiles/ufs_jet.intel_debug b/modulefiles/ufs_jet.intel_debug
@@ -19,6 +19,8 @@ module load hpc-impi/2018.4.274
 
 module load ufs_common_debug
 
+setenv I_MPI_DAPL_UD 1
+
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/modulefiles/ufs_orion.intel b/modulefiles/ufs_orion.intel
@@ -8,7 +8,7 @@ module-whatis "loads UFS Model prerequisites for Orion/Intel"
 
 module load contrib noaatools
 
-module load cmake/3.18.1
+module load cmake/3.22.1
 module load python/3.7.5
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack
@@ -23,3 +23,5 @@ setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort
 setenv CMAKE_Platform orion.intel
+
+setenv I_MPI_DAPL_UD 1
diff --git a/modulefiles/ufs_orion.intel_debug b/modulefiles/ufs_orion.intel_debug
@@ -8,7 +8,7 @@ module-whatis "loads UFS Model prerequisites for Orion/Intel"
 
 module load contrib noaatools
 
-module load cmake/3.18.1
+module load cmake/3.22.1
 module load python/3.7.5
 
 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack

diff --git a/modulefiles/ufs_wcoss_dell_p3 b/modulefiles/ufs_wcoss_dell_p3
@@ -20,6 +20,8 @@ module load hpc-impi/18.0.1
 
 module load ufs_common
 
+setenv I_MPI_DAPL_UD 1
+
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort

diff --git a/modulefiles/ufs_wcoss_dell_p3_debug b/modulefiles/ufs_wcoss_dell_p3_debug
@@ -20,6 +20,7 @@ module load hpc-impi/18.0.1
 
 module load ufs_common_debug
 
+setenv I_MPI_DAPL_UD 1
 setenv CC mpiicc
 setenv CXX mpiicpc
 setenv FC mpiifort
+2 −6		.gitmodules
+1 −2		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+91 −34		atmos_model.F90
+10 −7		ccpp/CMakeLists.txt
+80 −1		ccpp/config/ccpp_prebuild_config.py
+2 −2		ccpp/data/CCPP_typedefs.F90
+1 −1		ccpp/data/CCPP_typedefs.meta
+133 −582		ccpp/data/GFS_typedefs.F90
+172 −592		ccpp/data/GFS_typedefs.meta
+187 −398		ccpp/driver/GFS_diagnostics.F90
+5 −116		ccpp/driver/GFS_restart.F90
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+0 −105		ccpp/suites/suite_FV3_GFS_v16_coupled_p7_rrtmgp.xml
+0 −95		ccpp/suites/suite_FV3_GFS_v16_coupled_p8.xml
+0 −104		ccpp/suites/suite_FV3_GFS_v16_p7_rrtmgp.xml
+0 −94		ccpp/suites/suite_FV3_GFS_v16_p8.xml
+85 −0		ccpp/suites/suite_FV3_GSD_SAR.xml
+96 −0		ccpp/suites/suite_FV3_GSD_noah.xml
+2 −2		ccpp/suites/suite_FV3_GSD_noah_mynnsfc.xml
+8 −4		ccpp/suites/suite_FV3_GSD_v0.xml
+4 −3		ccpp/suites/suite_FV3_GSD_v0_RRTMGP.xml
+1 −1		ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+1 −1		ccpp/suites/suite_FV3_GSD_v0_mynnsfc.xml
+2 −2		ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite.xml
+4 −3		ccpp/suites/suite_FV3_GSD_v0_unified_ugwp_suite_noah.xml
+9 −11		ccpp/suites/suite_FV3_HAFS_v0_hwrf_thompson.xml
+2 −0		ccpp/suites/suite_FV3_HRRR.xml
+0 −80		ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+0 −13		cpl/module_block_data.F90
+336 −1		cpl/module_cap_cpl.F90
+3 −162		cpl/module_cplfields.F90
+343 −156		fv3_cap.F90
+38 −91		io/FV3GFS_io.F90
+14 −16		io/inline_post.F90
+12 −14		io/module_fv3_io_def.F90
+2 −2		io/module_write_internal_state.F90
+318 −701		io/module_write_netcdf.F90
+627 −0		io/module_write_netcdf_parallel.F90
+593 −585		io/module_wrt_grid_comp.F90
+5 −97		io/post_gfs.F90
+43 −44		io/post_regional.F90
+416 −548		module_fcst_grid_comp.F90
+8 −2		module_fv3_config.F90
+9 −58		stochastic_physics/stochastic_physics_wrapper.F90
+170 −0		time_utils.F90
+0 −1		upp