update MOM6 to GFDL 20210224 main branch commit (ufs-community#439)

* pointing MOM6 to feature/update-MOM6-20210224 branch modify mom6_files.cmake to reflect the files being added and removed in framework directory * add MOM6_Extra_FORTRAN_FLAGS in CMakeLists.txt which is defined in configure_gaea.intel.cmake * update RTPWD to 20210303 * remove datm_mx25_cfsr case on GAEA temporary
climbfuji · Mar 5, 2021 · 35d1897 · 35d1897
1 parent 0b8a889
commit 35d1897
Show file tree

Hide file tree

Showing 15 changed files with 1,507 additions and 1,504 deletions.
diff --git a/MOM6-interface/CMakeLists.txt b/MOM6-interface/CMakeLists.txt
@@ -16,6 +16,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
 else()
   message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
 endif()
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${MOM6_Extra_FORTRAN_FLAGS}")
 
 # User option to build MOM6 solo executable
 set(MOM6SOLO OFF CACHE BOOL "Build MOM6 solo")

diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -46,6 +46,7 @@ list(APPEND mom6_src_files
 
   MOM6/src/diagnostics/MOM_PointAccel.F90
   MOM6/src/diagnostics/MOM_debugging.F90
+  MOM6/src/diagnostics/MOM_spatial_means.F90
   MOM6/src/diagnostics/MOM_diagnostics.F90
   MOM6/src/diagnostics/MOM_obsolete_diagnostics.F90
   MOM6/src/diagnostics/MOM_obsolete_params.F90
@@ -96,33 +97,45 @@ list(APPEND mom6_src_files
   MOM6/src/framework/MOM_array_transform.F90
   MOM6/src/framework/MOM_checksums.F90
   MOM6/src/framework/MOM_coms.F90
+  MOM6/src/framework/MOM_coms_infra.F90
   MOM6/src/framework/MOM_constants.F90
+  MOM6/src/framework/MOM_coupler_types.F90
+  MOM6/src/framework/MOM_couplertype_infra.F90
   MOM6/src/framework/MOM_cpu_clock.F90
-  MOM6/src/framework/MOM_diag_manager_wrapper.F90
+  MOM6/src/framework/MOM_cpu_clock_infra.F90
+  MOM6/src/framework/MOM_data_override.F90
+  MOM6/src/framework/MOM_data_override_infra.F90
+  MOM6/src/framework/MOM_diag_manager_infra.F90
   MOM6/src/framework/MOM_diag_mediator.F90
   MOM6/src/framework/MOM_diag_remap.F90
   MOM6/src/framework/MOM_diag_vkernels.F90
   MOM6/src/framework/MOM_document.F90
+  MOM6/src/framework/MOM_domain_infra.F90
   MOM6/src/framework/MOM_domains.F90
   MOM6/src/framework/MOM_dyn_horgrid.F90
+  MOM6/src/framework/MOM_ensemble_manager.F90
+  MOM6/src/framework/MOM_ensemble_manager_infra.F90
   MOM6/src/framework/MOM_error_handler.F90
+  MOM6/src/framework/MOM_error_infra.F90
   MOM6/src/framework/MOM_file_parser.F90
   MOM6/src/framework/MOM_get_input.F90
   MOM6/src/framework/MOM_hor_index.F90
   MOM6/src/framework/MOM_horizontal_regridding.F90
+  MOM6/src/framework/MOM_interp_infra.F90
+  MOM6/src/framework/MOM_interpolate.F90
   MOM6/src/framework/MOM_intrinsic_functions.F90
   MOM6/src/framework/MOM_io.F90
+  MOM6/src/framework/MOM_io_infra.F90
   MOM6/src/framework/MOM_random.F90
   MOM6/src/framework/MOM_restart.F90
   MOM6/src/framework/MOM_safe_alloc.F90
-  MOM6/src/framework/MOM_spatial_means.F90
   MOM6/src/framework/MOM_string_functions.F90
   MOM6/src/framework/MOM_time_manager.F90
-  MOM6/src/framework/MOM_transform_FMS.F90
   MOM6/src/framework/MOM_unit_scaling.F90
   MOM6/src/framework/MOM_write_cputime.F90
 
   MOM6/src/ice_shelf/MOM_ice_shelf.F90
+  MOM6/src/ice_shelf/MOM_ice_shelf_diag_mediator.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_dynamics.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_initialize.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_state.F90

diff --git a/cmake/configure_gaea.intel.cmake b/cmake/configure_gaea.intel.cmake
@@ -1,3 +1,4 @@
 set(INLINE_POST     ON  CACHE BOOL "Enable inline post" FORCE)
 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")
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -186,7 +186,7 @@ RUN     | datm_control_gefs
 RUN     | datm_bulk_cfsr                                                                                                          | - wcoss_cray jet.intel       | fv3 |
 RUN     | datm_bulk_gefs                                                                                                          | - wcoss_cray jet.intel       | fv3 |
 
-RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray jet.intel       | fv3 |
+RUN     | datm_mx025_cfsr                                                                                                         | - wcoss_cray jet.intel gaea.intel      | fv3 |
 RUN     | datm_mx025_gefs                                                                                                         | - wcoss_cray jet.intel       | fv3 |
 
 COMPILE | DATM=Y S2S=Y DEBUG=Y                                                                                                    | - wcoss_cray jet.intel       | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -415,9 +415,9 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
 fi
 
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210301/${RT_COMPILER^^}}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210303/${RT_COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210301}
+  RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20210303}
 fi
 
 INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210212}