Update FV3.

Merge remote-tracking branch 'upstream/develop' into upp_apr
ufs-community · Apr 7, 2023 · 0fd8c50 · 0fd8c50
2 parents 8e7737a + b6146cd
commit 0fd8c50
Show file tree

Hide file tree

Showing 49 changed files with 10,671 additions and 11,151 deletions.
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,7 +62,6 @@ set(AVX2            ON  CACHE BOOL "Enable AVX2 instruction set")
 set(AVX             OFF CACHE BOOL "Enable AVX-I instruction set")
 set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
 set(DEBUG           OFF CACHE BOOL "Enable DEBUG mode")
-set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
 set(DISABLE_FMA     OFF CACHE BOOL "Disable Fused Multiply-Add instructions (workaround needed for AMD EPYC)" FORCE)
 set(INLINE_POST     ON  CACHE BOOL "Enable inline post")
 set(MULTI_GASES     OFF CACHE BOOL "Enable MULTI_GASES")
@@ -111,7 +110,6 @@ message("CCPP_32BIT ....... ${CCPP_32BIT}")
 message("AVX2 ............. ${AVX2}")
 message("SIMDMULTIARCH .... ${SIMDMULTIARCH}")
 message("DEBUG ............ ${DEBUG}")
-message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
 message("INLINE_POST ...... ${INLINE_POST}")
 message("MULTI_GASES ...... ${MULTI_GASES}")
 message("MOVING_NEST ...... ${MOVING_NEST}")

diff --git a/FV3 b/FV3
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -8,13 +8,6 @@ endif()
 if(DEBUG)
     add_definitions(-DDEBUG)
     set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -init=snan,arrays")
-    if(DEBUG_LINKMPI)
-      if(OPENMP)
-        set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -link_mpi=dbg_mt")
-      else()
-        set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -link_mpi=dbg")
-      endif()
-    endif()
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
 else()
     if(FASTER)

diff --git a/cmake/configure_acorn.cmake b/cmake/configure_acorn.cmake
@@ -1,5 +1,4 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
 
 if(FASTER)

diff --git a/cmake/configure_cheyenne.intel.cmake b/cmake/configure_cheyenne.intel.cmake
@@ -1,2 +1 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/cmake/configure_gaea.intel.cmake b/cmake/configure_gaea.intel.cmake
@@ -1,5 +1,4 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
 set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
 set(HYCOM_Extra_C_FLAGS "-xSSE4.2")
diff --git a/cmake/configure_macosx.intel.cmake b/cmake/configure_macosx.intel.cmake
@@ -1,2 +1 @@
 set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI  OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
diff --git a/cmake/configure_wcoss2.cmake b/cmake/configure_wcoss2.cmake
@@ -1,5 +1,4 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
-set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(AVX2            OFF CACHE BOOL "Enable AVX2 instruction set" FORCE)
 
 if(FASTER)

diff --git a/doc/UsersGuide/source/ConfigParameters.rst b/doc/UsersGuide/source/ConfigParameters.rst
@@ -169,7 +169,6 @@ Other Build Options
       set(AVX2            ON  CACHE BOOL "Enable AVX2 instruction set")
       set(AVX             OFF CACHE BOOL "Enable AVX-I instruction set")
       set(SIMDMULTIARCH   OFF CACHE BOOL "Enable multi-target SIMD instruction sets")
-      set(DEBUG_LINKMPI   ON  CACHE BOOL "Enable linkmpi option when DEBUG mode is on")
       set(INLINE_POST     OFF CACHE BOOL "Enable inline post")
       set(OPENMP          ON  CACHE BOOL "Enable OpenMP threading")
       set(PARALLEL_NETCDF OFF CACHE BOOL "Enable parallel NetCDF")

diff --git a/modulefiles/ufs_acorn.intel_debug.lua b/modulefiles/ufs_acorn.intel_debug.lua
diff --git a/modulefiles/ufs_cheyenne.gnu_debug.lua b/modulefiles/ufs_cheyenne.gnu_debug.lua
diff --git a/modulefiles/ufs_cheyenne.intel_debug.lua b/modulefiles/ufs_cheyenne.intel_debug.lua
diff --git a/modulefiles/ufs_common_debug.lua b/modulefiles/ufs_common_debug.lua
diff --git a/modulefiles/ufs_expanse.intel_debug b/modulefiles/ufs_expanse.intel_debug
diff --git a/modulefiles/ufs_gaea.intel_debug.lua b/modulefiles/ufs_gaea.intel_debug.lua
diff --git a/modulefiles/ufs_hera.gnu_debug.lua b/modulefiles/ufs_hera.gnu_debug.lua
+2 −2		mediator/esmFldsExchange_nems_mod.F90
+15 −2		ufs/ccpp/data/MED_typedefs.F90
+47 −0		ufs/ccpp/data/MED_typedefs.meta
+0 −28		ccpp/data/CCPP_typedefs.meta
+111 −17		ccpp/data/GFS_typedefs.F90
+130 −19		ccpp/data/GFS_typedefs.meta
+166 −16		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
+114 −76		io/FV3GFS_io.F90
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
		set(DEBUG_LINKMPI OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)