Remove MOM6 patches, Allow overriding coupled fields in MOM6

Author: dougiesquire

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "MOM6/MOM6"]
 	path = MOM6/MOM6
-	url = https://github.com/ACCESS-NRI/MOM6
+	url = https://github.com/dougiesquire/MOM6
 [submodule "CICE6/CICE6"]
 	path = CICE/CICE
 	url = https://github.com/ACCESS-NRI/CICE

MOM6/CMakeLists.txt

@@ -7,10 +7,10 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(fortran_compile_flags -r8)
 endif()
 
-add_compile_definitions(
-  _USE_GENERIC_TRACER
-  _USE_MOM6_DIAG
-)
+# add_compile_definitions(
+#   _USE_GENERIC_TRACER
+#   _USE_MOM6_DIAG
+# )
 
 ### Targets
 
@@ -306,45 +306,49 @@ target_sources(OM3_mom6 PRIVATE
   MOM6/config_src/external/drifters/MOM_particles.F90
   MOM6/config_src/external/drifters/MOM_particles_types.F90
 
-  GFDL_generic_tracers/generic_tracers/FMS_coupler_util.F90
-  GFDL_generic_tracers/generic_tracers/generic_tracer.F90
-  GFDL_generic_tracers/generic_tracers/generic_tracer_utils.F90
-  GFDL_generic_tracers/generic_tracers/FMS_ocmip2_co2calc.F90
-  GFDL_generic_tracers/generic_tracers/generic_abiotic.F90
-  GFDL_generic_tracers/generic_tracers/generic_age.F90
-  GFDL_generic_tracers/generic_tracers/generic_argon.F90
-  GFDL_generic_tracers/generic_tracers/generic_BLING.F90
-  GFDL_generic_tracers/generic_tracers/generic_blres.F90
-  GFDL_generic_tracers/generic_tracers/generic_CFC.F90
-  GFDL_generic_tracers/generic_tracers/generic_COBALT.F90
-  GFDL_generic_tracers/generic_tracers/generic_ERGOM.F90
-  GFDL_generic_tracers/generic_tracers/generic_miniBLING.F90
-  GFDL_generic_tracers/generic_tracers/generic_SF6.F90
-  GFDL_generic_tracers/generic_tracers/generic_TOPAZ.F90
-  GFDL_generic_tracers/generic_tracers/generic_WOMBATlite.F90
+  # GFDL_generic_tracers/generic_tracers/FMS_coupler_util.F90
+  # GFDL_generic_tracers/generic_tracers/generic_tracer.F90
+  # GFDL_generic_tracers/generic_tracers/generic_tracer_utils.F90
+  # GFDL_generic_tracers/generic_tracers/FMS_ocmip2_co2calc.F90
+  # GFDL_generic_tracers/generic_tracers/generic_abiotic.F90
+  # GFDL_generic_tracers/generic_tracers/generic_age.F90
+  # GFDL_generic_tracers/generic_tracers/generic_argon.F90
+  # GFDL_generic_tracers/generic_tracers/generic_BLING.F90
+  # GFDL_generic_tracers/generic_tracers/generic_blres.F90
+  # GFDL_generic_tracers/generic_tracers/generic_CFC.F90
+  # GFDL_generic_tracers/generic_tracers/generic_COBALT.F90
+  # GFDL_generic_tracers/generic_tracers/generic_ERGOM.F90
+  # GFDL_generic_tracers/generic_tracers/generic_miniBLING.F90
+  # GFDL_generic_tracers/generic_tracers/generic_SF6.F90
+  # GFDL_generic_tracers/generic_tracers/generic_TOPAZ.F90
+  # GFDL_generic_tracers/generic_tracers/generic_WOMBATlite.F90
+
+  # GFDL_generic_tracers/mocsy/src/mocsy_buffesm.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_constants.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_depth2press.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_derivauto.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_derivnum.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_DNAD.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_errors.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_f2pCO2.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_gasx.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_p2fCO2.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_p80.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_phsolvers.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_rho.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_rhoinsitu.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_singledouble.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_sw_adtg.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_sw_ptmp.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_sw_temp.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_tis.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_tpot.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_vars.F90
+  # GFDL_generic_tracers/mocsy/src/mocsy_varsolver.F90
 
-  GFDL_generic_tracers/mocsy/src/mocsy_buffesm.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_constants.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_depth2press.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_derivauto.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_derivnum.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_DNAD.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_errors.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_f2pCO2.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_gasx.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_p2fCO2.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_p80.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_phsolvers.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_rho.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_rhoinsitu.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_singledouble.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_sw_adtg.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_sw_ptmp.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_sw_temp.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_tis.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_tpot.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_vars.F90
-  GFDL_generic_tracers/mocsy/src/mocsy_varsolver.F90
+  MOM6/config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
+  MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer.F90
+  MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
 
   MOM6/config_src/external/ODA_hooks/kdtree.f90
   MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
@@ -370,17 +374,28 @@ target_sources(OM3_mom6 PRIVATE
   MOM6/config_src/drivers/nuopc_cap/ocn_comp_NUOPC.F90
   MOM6/config_src/drivers/nuopc_cap/time_utils.F90
 
-  extra_sources/mom_cap_gtracer_flux.F90
+  # extra_sources/mom_cap_gtracer_flux.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
 )
-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)
+# 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