From 2a5c774d32edc902b545e63b75563e396406a92b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 8 Aug 2025 11:04:43 -0400 Subject: [PATCH 1/2] v2: Updates for MOM6 PR 1668 This PR has updates for building MOM6 with changes from https://github.com/mom-ocean/MOM6/pull/1668 My tests show zero-diff. --- MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt b/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt index d6eb265..0ed3370 100644 --- a/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt +++ b/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt @@ -524,9 +524,6 @@ list( APPEND MOM6_SRCS config_src/external/ODA_hooks/ocean_da_types.F90 config_src/external/ODA_hooks/write_ocean_obs.F90 # tracer - config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90 - config_src/external/GFDL_ocean_BGC/generic_tracer.F90 - config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90 config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90 # drifters-particles config_src/external/drifters/MOM_particles.F90 From 9cb325686a54f2e695a0c3953ffc75abeee51999 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 25 Aug 2025 15:25:39 -0400 Subject: [PATCH 2/2] Remove unneeded MOM_override lines --- MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override | 7 ------- MOM6_GEOSPlug/mom6_app/540x458/MOM_override | 7 ------- MOM6_GEOSPlug/mom6_app/72x36/MOM_override | 7 ------- 3 files changed, 21 deletions(-) diff --git a/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override b/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override index 6322704..dd28cee 100644 --- a/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/1440x1080/MOM_override @@ -52,10 +52,3 @@ RESTART_CHECKSUMS_REQUIRED = False ! ! update answers ! - -! Overrides to match results from previous MOM6 version -! See https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv3.2 -! and https://github.com/mom-ocean/MOM6/pull/1631#issuecomment-2252914251 - -#override USE_HUYNH_STENCIL_BUG = True -#override EPBL_ANSWER_DATE = 20231231 diff --git a/MOM6_GEOSPlug/mom6_app/540x458/MOM_override b/MOM6_GEOSPlug/mom6_app/540x458/MOM_override index 74cc06e..2ade3e3 100755 --- a/MOM6_GEOSPlug/mom6_app/540x458/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/540x458/MOM_override @@ -67,10 +67,3 @@ TOPO_FILE = "ocean_topog.nc" #override BAD_VAL_SSS_MAX = 75.0 #override BAD_VAL_SST_MAX = 55.0 #override BAD_VAL_SST_MIN = -3.0 - -! Overrides to match results from previous MOM6 version -! See https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv3.2 -! and https://github.com/mom-ocean/MOM6/pull/1631#issuecomment-2252914251 - -#override USE_HUYNH_STENCIL_BUG = True -#override EPBL_ANSWER_DATE = 20231231 diff --git a/MOM6_GEOSPlug/mom6_app/72x36/MOM_override b/MOM6_GEOSPlug/mom6_app/72x36/MOM_override index 68d3aa0..143ec4a 100755 --- a/MOM6_GEOSPlug/mom6_app/72x36/MOM_override +++ b/MOM6_GEOSPlug/mom6_app/72x36/MOM_override @@ -31,10 +31,3 @@ #override HFREEZE = 10.0 #override BAD_VAL_SST_MIN = -3.0 #override BAD_VAL_SSS_MAX = 55.0 - -! Overrides to match results from previous MOM6 version -! See https://github.com/GEOS-ESM/MOM6/releases/tag/geos%2Fv3.2 -! and https://github.com/mom-ocean/MOM6/pull/1631#issuecomment-2252914251 - -#override USE_HUYNH_STENCIL_BUG = True -#override EPBL_ANSWER_DATE = 20231231