From 25ec99c6a68ce879652a1c0895004f6792705b63 Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Fri, 20 Dec 2024 11:52:48 +1100 Subject: [PATCH] Update to latest MOM6 using ACCESS-NRI fork Co-authored-by: Christopher Bull <5499680+chrisb13@users.noreply.github.com> --- MOM6/CMakeLists.txt | 35 ++++++++++++++++++++++++++--------- MOM6/MOM6 | 2 +- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/MOM6/CMakeLists.txt b/MOM6/CMakeLists.txt index ff501e6..5bba4d9 100644 --- a/MOM6/CMakeLists.txt +++ b/MOM6/CMakeLists.txt @@ -364,17 +364,34 @@ target_sources(OM3_mom6 PRIVATE MOM6/config_src/drivers/nuopc_cap/ocn_comp_NUOPC.F90 MOM6/config_src/drivers/nuopc_cap/time_utils.F90 + MOM6/config_src/drivers/nuopc_cap/mom_cap.F90 + MOM6/config_src/drivers/nuopc_cap/mom_cap_methods.F90 + MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90 + MOM6/config_src/infra/FMS2/MOM_couplertype_infra.F90 + MOM6/src/framework/MOM_coupler_types.F90 + MOM6/src/tracer/MOM_generic_tracer.F90 + MOM6/src/core/MOM_forcing_type.F90 + MOM6/config_src/infra/FMS2/MOM_io_infra.F90 + MOM6/src/diagnostics/MOM_PointAccel.F90 + + MOM6/src/core/MOM_dynamics_split_RK2b.F90 + MOM6/src/equation_of_state/MOM_EOS_base_type.F90 + MOM6/src/parameterizations/lateral/MOM_self_attr_load.F90 + extra_sources/mom_cap_gtracer_flux.F90 ) -add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_cap.F90) -add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_cap_methods.F90) -add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90) -add_patched_source(OM3_mom6 MOM6/config_src/infra/FMS2/MOM_couplertype_infra.F90) -add_patched_source(OM3_mom6 MOM6/src/framework/MOM_coupler_types.F90) -add_patched_source(OM3_mom6 MOM6/src/tracer/MOM_generic_tracer.F90) -add_patched_source(OM3_mom6 MOM6/src/core/MOM_forcing_type.F90) -add_patched_source(OM3_mom6 MOM6/config_src/infra/FMS2/MOM_io_infra.F90) -add_patched_source(OM3_mom6 MOM6/src/diagnostics/MOM_PointAccel.F90) + +#turning off patches - cb 17/12/24 +#add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_cap.F90) +#add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_cap_methods.F90) +#add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90) +#add_patched_source(OM3_mom6 MOM6/config_src/infra/FMS2/MOM_couplertype_infra.F90) +#add_patched_source(OM3_mom6 MOM6/src/framework/MOM_coupler_types.F90) +#add_patched_source(OM3_mom6 MOM6/src/tracer/MOM_generic_tracer.F90) +#add_patched_source(OM3_mom6 MOM6/src/core/MOM_forcing_type.F90) +#add_patched_source(OM3_mom6 MOM6/config_src/infra/FMS2/MOM_io_infra.F90) +#add_patched_source(OM3_mom6 MOM6/src/diagnostics/MOM_PointAccel.F90) + ### Install and Export ## Library diff --git a/MOM6/MOM6 b/MOM6/MOM6 index e92c971..8fd485b 160000 --- a/MOM6/MOM6 +++ b/MOM6/MOM6 @@ -1 +1 @@ -Subproject commit e92c971084e185cfd3902f18072320b45d583a54 +Subproject commit 8fd485bfa2f7ae2bbd735a1d3322fc9d1a741f28