Update to latest MOM6 using ACCESS-NRI fork

Co-authored-by: Christopher Bull <5499680+chrisb13@users.noreply.github.com>

Author: anton-seaice

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