Skip to content

update MOM6 to GFDL 20210308 main branch commit #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junwang-noaa merged 16 commits into from
Mar 14, 2021
Merged

update MOM6 to GFDL 20210308 main branch commit #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
35c7063
pointing MOM6 to update-to-GFDL-20210308 branch
jiandewang Mar 8, 2021
73f5956
(1) modify mom6_files.cmake to reflect the 12 files being moved out f…
jiandewang Mar 8, 2021
8b8606e
Merge remote-tracking branch 'upstream/develop' into feature/update-M…
jiandewang Mar 10, 2021
9d8586b
Merge remote-tracking branch 'upstream/develop' into feature/update-M…
jiandewang Mar 12, 2021
e984ea7
upload RegressionTests_wcoss_dell_p3.log
jiandewang Mar 12, 2021
46bbdd7
PASSED: gaea.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 12, 2021
aee9fb8
PASSED: hera.gnu. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 12, 2021
a712c4c
PASSED: hera.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 12, 2021
ea51417
PASSED: jet.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 12, 2021
fafda11
upload RegressionTests_cheyenne.gnu.log
jiandewang Mar 12, 2021
b58daf9
upload RegressionTests_wcoss_cray.log
jiandewang Mar 12, 2021
a21dcd0
PASSED: jet.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 13, 2021
1fd83ef
PASSED: orion.intel. Log file uploaded. skip-ci
BrianCurtis-NOAA Mar 13, 2021
53d0a0c
upload RegressionTests_cheyenne.intel.log
jiandewang Mar 13, 2021
3ea245c
switch MOM6 to NOAA-EMC dev/emc repository
jiandewang Mar 13, 2021
691beff
remove whitespace in MOM6 submodule module
jiandewang Mar 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions MOM6-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 53 files
+3 −3 .gitlab-ci.yml
+9 −11 .testing/Makefile
+5 −4 ac/configure.ac
+0 −0 config_src/drivers/FMS_cap/MOM_surface_forcing_gfdl.F90
+0 −0 config_src/drivers/FMS_cap/ocean_model_MOM.F90
+0 −0 config_src/drivers/ice_solo_driver/atmos_ocean_fluxes.F90
+0 −0 config_src/drivers/ice_solo_driver/ice_shelf_driver.F90
+0 −0 config_src/drivers/mct_cap/mom_ocean_model_mct.F90
+0 −0 config_src/drivers/mct_cap/mom_surface_forcing_mct.F90
+0 −0 config_src/drivers/mct_cap/ocn_cap_methods.F90
+0 −0 config_src/drivers/mct_cap/ocn_comp_mct.F90
+0 −0 config_src/drivers/mct_cap/ocn_cpl_indices.F90
+0 −0 config_src/drivers/nuopc_cap/mom_cap.F90
+0 −0 config_src/drivers/nuopc_cap/mom_cap_methods.F90
+0 −0 config_src/drivers/nuopc_cap/mom_cap_time.F90
+0 −0 config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+0 −0 config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+0 −0 config_src/drivers/nuopc_cap/ocn_comp_NUOPC.F90
+0 −0 config_src/drivers/nuopc_cap/time_utils.F90
+0 −0 config_src/drivers/solo_driver/MESO_surface_forcing.F90
+0 −0 config_src/drivers/solo_driver/MOM_driver.F90
+0 −0 config_src/drivers/solo_driver/MOM_surface_forcing.F90
+0 −0 config_src/drivers/solo_driver/atmos_ocean_fluxes.F90
+0 −0 config_src/drivers/solo_driver/user_surface_forcing.F90
+0 −0 config_src/drivers/unit_drivers/MOM_sum_driver.F90
+0 −0 config_src/infra/FMS1/MOM_coms_infra.F90
+0 −0 config_src/infra/FMS1/MOM_constants.F90
+0 −0 config_src/infra/FMS1/MOM_couplertype_infra.F90
+0 −0 config_src/infra/FMS1/MOM_cpu_clock_infra.F90
+0 −0 config_src/infra/FMS1/MOM_data_override_infra.F90
+0 −0 config_src/infra/FMS1/MOM_diag_manager_infra.F90
+0 −0 config_src/infra/FMS1/MOM_domain_infra.F90
+0 −0 config_src/infra/FMS1/MOM_ensemble_manager_infra.F90
+0 −0 config_src/infra/FMS1/MOM_error_infra.F90
+0 −0 config_src/infra/FMS1/MOM_interp_infra.F90
+0 −0 config_src/infra/FMS1/MOM_io_infra.F90
+0 −0 config_src/infra/FMS1/MOM_time_manager.F90
+0 −0 config_src/memory/dynamic_nonsymmetric/MOM_memory.h
+0 −0 config_src/memory/dynamic_symmetric/MOM_memory.h
+4 −4 docs/Doxyfile_nortd
+4 −4 docs/Doxyfile_nortd_latex
+4 −4 docs/Doxyfile_rtd
+7 −7 docs/Doxyfile_rtd_dox
+12 −8 docs/README.md
+22 −15 docs/code_organization.rst
+86 −15 src/core/MOM_CoriolisAdv.F90
+75 −21 src/core/MOM_barotropic.F90
+90 −6 src/core/MOM_dynamics_split_RK2.F90
+3 −0 src/core/MOM_variables.F90
+2 −2 src/diagnostics/MOM_diagnostics.F90
+33 −2 src/parameterizations/lateral/MOM_hor_visc.F90
+1 −1 src/parameterizations/vertical/MOM_diabatic_driver.F90
+2 −2 src/parameterizations/vertical/MOM_vert_friction.F90
47 changes: 24 additions & 23 deletions MOM6-interface/mom6_files.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
)
Loading