update MOM6 to GFDL 20210308 main branch commit

.gitmodules

@@ -28,8 +28,8 @@
   branch = emc/develop
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
-  url = https://github.com/NOAA-EMC/MOM6
-  branch = dev/emc
+  url = https://github.com/jiandewang/MOM6
+  branch = feature/update-to-GFDL-20210308 
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE

MOM6-interface/CMakeLists.txt

@@ -28,7 +28,7 @@ include("mom6_files.cmake")
 add_library(mom6_obj OBJECT ${mom6_src_files})
 set_target_properties(mom6_obj PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
-target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
+target_include_directories(mom6_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
                                             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 target_link_libraries(mom6_obj PRIVATE fms
                                        NetCDF::NetCDF_Fortran)
@@ -40,7 +40,7 @@ target_link_libraries(mom6_obj PRIVATE fms
 add_library(mom6_nuopc_obj OBJECT ${mom6_nuopc_src_files})
 set_target_properties(mom6_nuopc_obj PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
-target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
+target_include_directories(mom6_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
                                                   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
                                              fms
@@ -55,7 +55,7 @@ add_library(mom6 STATIC $<TARGET_OBJECTS:mom6_obj>
                         $<TARGET_OBJECTS:mom6_nuopc_obj>)
 target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                        $<INSTALL_INTERFACE:mod>)
-target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
+target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 target_link_libraries(mom6 PUBLIC fms
                                   esmf
@@ -73,7 +73,7 @@ if(MOM6SOLO)
   set_target_properties(mom6solo PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod_solo)
   target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
   target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod_solo>)
-  target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/dynamic>
+  target_include_directories(mom6solo PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/config_src/memory/dynamic_nonsymmetric>
                                               $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
   target_link_libraries(mom6solo PRIVATE mom6_obj
                                          fms

MOM6-interface/mom6_files.cmake

@@ -97,40 +97,28 @@ 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_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_string_functions.F90
-  MOM6/src/framework/MOM_time_manager.F90
   MOM6/src/framework/MOM_unit_scaling.F90
   MOM6/src/framework/MOM_write_cputime.F90
 
@@ -265,21 +253,34 @@ list(APPEND mom6_src_files
   MOM6/config_src/external/ODA_hooks/ocean_da_types.F90
   MOM6/config_src/external/ODA_hooks/write_ocean_obs.F90
 
+  MOM6/config_src/infra/FMS1/MOM_coms_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_constants.F90
+  MOM6/config_src/infra/FMS1/MOM_couplertype_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_cpu_clock_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_data_override_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_diag_manager_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_domain_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_ensemble_manager_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_error_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_interp_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_io_infra.F90
+  MOM6/config_src/infra/FMS1/MOM_time_manager.F90
+
 )
 
 list(APPEND mom6_nuopc_src_files
-  MOM6/config_src/nuopc_driver/mom_cap.F90
-  MOM6/config_src/nuopc_driver/time_utils.F90
-  MOM6/config_src/nuopc_driver/mom_cap_methods.F90
-  MOM6/config_src/nuopc_driver/mom_cap_time.F90
-  MOM6/config_src/nuopc_driver/mom_ocean_model_nuopc.F90
-  MOM6/config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
+  MOM6/config_src/drivers/nuopc_cap/mom_cap.F90
+  MOM6/config_src/drivers/nuopc_cap/time_utils.F90
+  MOM6/config_src/drivers/nuopc_cap/mom_cap_methods.F90
+  MOM6/config_src/drivers/nuopc_cap/mom_cap_time.F90
+  MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+  MOM6/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
 )
 
 list(APPEND mom6_solo_src_files
-  MOM6/config_src/solo_driver/MESO_surface_forcing.F90
-  MOM6/config_src/solo_driver/MOM_driver.F90
-  MOM6/config_src/solo_driver/MOM_surface_forcing.F90
-  MOM6/config_src/solo_driver/atmos_ocean_fluxes.F90
-  MOM6/config_src/solo_driver/user_surface_forcing.F90
+  MOM6/config_src/drivers/solo_driver/MESO_surface_forcing.F90
+  MOM6/config_src/drivers/solo_driver/MOM_driver.F90
+  MOM6/config_src/drivers/solo_driver/MOM_surface_forcing.F90
+  MOM6/config_src/drivers/solo_driver/atmos_ocean_fluxes.F90
+  MOM6/config_src/drivers/solo_driver/user_surface_forcing.F90
 )