From dad75e50b4c4ee9a448d034f4bd11a91fad6718e Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 26 Jun 2026 10:53:23 -0600 Subject: [PATCH 1/8] Add BGC support for tx2_3v3 Also add flags to support initializing MARBL tracers from file using native vertical grid (e.g. restart file). Note that currently the MARBL tracers are split across multiple restarts, so users will need to combine them into a single file before using this feature. --- param_templates/MOM_input.yaml | 25 ++++++++++++++++++-- param_templates/input_data_list.yaml | 13 +++++++++-- param_templates/json/MOM_input.json | 28 ++++++++++++++++++++--- param_templates/json/input_data_list.json | 14 ++++++------ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index c646446..0a57a8f 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -340,8 +340,27 @@ Global: for the MARBL tracer package." datatype: string value: - $MARBL_CONFIG == "latest": ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc - $MARBL_CONFIG == "latest+4p2z": ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc + $RUN_TYPE == "hybrid": + = f'./{$RUN_REFCASE}.mom6{$INST_SUFFIX}.r.{$RUN_REFDATE}-{$RUN_REFTOD}.nc' + else: + $MARBL_CONFIG == "latest": ${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc + $MARBL_CONFIG == "latest+4p2z": ${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc + MARBL_TRACERS_IC_FILE_IS_Z: + description: | + "[Boolean] default = True + If true, MARBL_TRACERS_IC_FILE is in depth space, not layer space." + datatype: logical + units: Boolean + value: + $RUN_TYPE == "hybrid": False + MARBL_IC_MIN_VAL: + description: | + Minimum value of tracer initial conditions + datatype: real + units: conc units + value: + $TEST: 1e-50 + $RUN_TYPE == "hybrid": -1e30 MARBL_FESEDFLUX_FILE: description: | "Name of file containing iron sediment flux @@ -377,6 +396,8 @@ Global: value: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2" and $ROF_GRID == "JRA025"': riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2" and $ROF_GRID == "r05"': riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v3" and $ROF_GRID == "JRA025"': riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v3" and $ROF_GRID == "r05"': riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc MARBL_D14C_FILE_1: description: | "Name of file containing D14C forcing from 30 N to 90 N." diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index 8b848a2..9c48006 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -61,21 +61,30 @@ mom.input_data_list: DIAG_COORD_DEF_RHO2: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/ocean_rho2_190917.nc" MARBL_TRACERS_IC_FILE: - $MARBL_CONFIG == "latest": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" - $MARBL_CONFIG == "latest+4p2z": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" + $MARBL_CONFIG == "latest": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" + $MARBL_CONFIG == "latest+4p2z": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" MARBL_FESEDFLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" MARBL_FESEDFLUXRED_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" MARBL_FEVENTFLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" RIV_FLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': '$ROF_GRID == "JRA025" and $OCN_GRID == "tx2_3v2"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" '$ROF_GRID == "r05" and $OCN_GRID == "tx2_3v2"': "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': + '$ROF_GRID == "JRA025" and $OCN_GRID == "tx2_3v3"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + '$ROF_GRID == "r05" and $OCN_GRID == "tx2_3v3"': "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" MARBL_D14C_FILE_1: '"ABIO_DIC_ON=TRUE" in $MARBL_TRACER_OPTS': "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/atm_delta_C14_CMIP6_sector1_global_1850-2015_yearly_v2.0_c240202.nc" MARBL_D14C_FILE_2: diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index e1302b0..76bc37a 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -243,8 +243,28 @@ "description": "\"Name of file containing initial conditions\nfor the MARBL tracer package.\"\n", "datatype": "string", "value": { - "$MARBL_CONFIG == \"latest\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc", - "$MARBL_CONFIG == \"latest+4p2z\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" + "$RUN_TYPE == \"hybrid\"": "= f'./{$RUN_REFCASE}.mom6{$INST_SUFFIX}.r.{$RUN_REFDATE}-{$RUN_REFTOD}.nc'", + "else": { + "$MARBL_CONFIG == \"latest\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc", + "$MARBL_CONFIG == \"latest+4p2z\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" + } + } + }, + "MARBL_TRACERS_IC_FILE_IS_Z": { + "description": "\"[Boolean] default = True\nIf true, MARBL_TRACERS_IC_FILE is in depth space, not layer space.\"\n", + "datatype": "logical", + "units": "Boolean", + "value": { + "$RUN_TYPE == \"hybrid\"": false + } + }, + "MARBL_IC_MIN_VAL": { + "description": "Minimum value of tracer initial conditions\n", + "datatype": "real", + "units": "conc units", + "value": { + "$TEST": "1e-50", + "$RUN_TYPE == \"hybrid\"": "-1e30" } }, "MARBL_FESEDFLUX_FILE": { @@ -280,7 +300,9 @@ "datatype": "string", "value": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\" and $ROF_GRID == \"JRA025\"": "riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc", - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\" and $ROF_GRID == \"r05\"": "riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\" and $ROF_GRID == \"r05\"": "riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc", + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v3\" and $ROF_GRID == \"JRA025\"": "riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc", + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v3\" and $ROF_GRID == \"r05\"": "riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" } }, "MARBL_D14C_FILE_1": { diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index 1921193..7febd14 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -78,28 +78,28 @@ "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/ocean_rho2_190917.nc" }, "MARBL_TRACERS_IC_FILE": { - "$MARBL_CONFIG == \"latest\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc", - "$MARBL_CONFIG == \"latest+4p2z\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" + "$MARBL_CONFIG == \"latest\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc", + "$MARBL_CONFIG == \"latest+4p2z\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" }, "MARBL_FESEDFLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" } }, "MARBL_FESEDFLUXRED_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" } }, "MARBL_FEVENTFLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" } }, "RIV_FLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$ROF_GRID == \"JRA025\" and $OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc", - "$ROF_GRID == \"r05\" and $OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" + "$ROF_GRID == \"JRA025\" and $OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc", + "$ROF_GRID == \"r05\" and $OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" } }, "MARBL_D14C_FILE_1": { From a584bd1ee271194c853ce08f7661b47803793e22 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 26 Jun 2026 12:45:31 -0600 Subject: [PATCH 2/8] Update to newer iron forcing scheme MOM6 now reads a single file containing two iron sediment fluxes and a vent flux, rather than one file per field. --- param_templates/MOM_input.yaml | 21 ++++----------------- param_templates/input_data_list.yaml | 14 ++------------ param_templates/json/MOM_input.json | 21 ++++----------------- param_templates/json/input_data_list.json | 14 ++------------ 4 files changed, 12 insertions(+), 58 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 0a57a8f..8a5dba4 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -361,27 +361,14 @@ Global: value: $TEST: 1e-50 $RUN_TYPE == "hybrid": -1e30 - MARBL_FESEDFLUX_FILE: + MARBL_FEFLUX_FILE: description: | - "Name of file containing iron sediment flux - forcing field for the MARBL tracer package." + "Name of file containing iron sediment fluxes and vent + flux forcing fields for the MARBL tracer package." datatype: string value: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedflux_2024algo_tx2_3v2.c251229.nc - MARBL_FESEDFLUXRED_FILE: - description: | - "Name of file containing iron reducing sediment flux - forcing field for the MARBL tracer package." - datatype: string - value: - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedfluxRed_2024algo_tx2_3v2.c251229.nc - MARBL_FEVENTFLUX_FILE: - description: | - "Name of file containing iron sediment flux - forcing field for the MARBL tracer package." - datatype: string - value: - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': feventflux_5gmol_tx2_3v2.c231205.nc + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v3"': fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc READ_RIV_FLUXES: description: | "Use river fluxes provided by RIV_FLUX_FILE." diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index 9c48006..78a45e9 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -63,21 +63,11 @@ mom.input_data_list: MARBL_TRACERS_IC_FILE: $MARBL_CONFIG == "latest": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" $MARBL_CONFIG == "latest+4p2z": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" - MARBL_FESEDFLUX_FILE: + MARBL_FEFLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" - MARBL_FESEDFLUXRED_FILE: - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" - MARBL_FEVENTFLUX_FILE: - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v2": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v3": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" RIV_FLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': '$ROF_GRID == "JRA025" and $OCN_GRID == "tx2_3v2"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 76bc37a..3842fcd 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -267,25 +267,12 @@ "$RUN_TYPE == \"hybrid\"": "-1e30" } }, - "MARBL_FESEDFLUX_FILE": { - "description": "\"Name of file containing iron sediment flux\n forcing field for the MARBL tracer package.\"\n", + "MARBL_FEFLUX_FILE": { + "description": "\"Name of file containing iron sediment fluxes and vent\n flux forcing fields for the MARBL tracer package.\"\n", "datatype": "string", "value": { - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedflux_2024algo_tx2_3v2.c251229.nc" - } - }, - "MARBL_FESEDFLUXRED_FILE": { - "description": "\"Name of file containing iron reducing sediment flux\n forcing field for the MARBL tracer package.\"\n", - "datatype": "string", - "value": { - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedfluxRed_2024algo_tx2_3v2.c251229.nc" - } - }, - "MARBL_FEVENTFLUX_FILE": { - "description": "\"Name of file containing iron sediment flux\n forcing field for the MARBL tracer package.\"\n", - "datatype": "string", - "value": { - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "feventflux_5gmol_tx2_3v2.c231205.nc" + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedflux_2024algo_tx2_3v2.c251229.nc", + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v3\"": "fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" } }, "READ_RIV_FLUXES": { diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index 7febd14..82b7eb3 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -81,19 +81,9 @@ "$MARBL_CONFIG == \"latest\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc", "$MARBL_CONFIG == \"latest+4p2z\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" }, - "MARBL_FESEDFLUX_FILE": { + "MARBL_FEFLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" - } - }, - "MARBL_FESEDFLUXRED_FILE": { - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc" - } - }, - "MARBL_FEVENTFLUX_FILE": { - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc" + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" } }, "RIV_FLUX_FILE": { From b2c5c9944ebd128720c9fe8a8861c54077fc7a48 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 26 Jun 2026 13:58:48 -0600 Subject: [PATCH 3/8] Fix logic in input_data_list.yaml Was not nesting conditionals correctly --- param_templates/input_data_list.yaml | 12 ++++++------ param_templates/json/input_data_list.json | 11 +++++++++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index 78a45e9..3f1bd77 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -66,15 +66,15 @@ mom.input_data_list: MARBL_FEFLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" RIV_FLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - '$ROF_GRID == "JRA025" and $OCN_GRID == "tx2_3v2"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" - '$ROF_GRID == "r05" and $OCN_GRID == "tx2_3v2"': "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - '$ROF_GRID == "JRA025" and $OCN_GRID == "tx2_3v3"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" - '$ROF_GRID == "r05" and $OCN_GRID == "tx2_3v3"': "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + $OCN_GRID == "tx2_3v2": + $ROF_GRID == "JRA025": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" + $ROF_GRID == "r05": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" + $OCN_GRID == "tx2_3v3": + $ROF_GRID == "JRA025": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + $ROF_GRID == "r05": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" MARBL_D14C_FILE_1: '"ABIO_DIC_ON=TRUE" in $MARBL_TRACER_OPTS': "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/atm_delta_C14_CMIP6_sector1_global_1850-2015_yearly_v2.0_c240202.nc" MARBL_D14C_FILE_2: diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index 82b7eb3..9ce3338 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -83,13 +83,20 @@ }, "MARBL_FEFLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { + "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc", "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" } }, "RIV_FLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$ROF_GRID == \"JRA025\" and $OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc", - "$ROF_GRID == \"r05\" and $OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + "$OCN_GRID == \"tx2_3v2\"": { + "$ROF_GRID == \"JRA025\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc", + "$ROF_GRID == \"r05\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" + }, + "$OCN_GRID == \"tx2_3v3\"": { + "$ROF_GRID == \"JRA025\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc", + "$ROF_GRID == \"r05\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + } } }, "MARBL_D14C_FILE_1": { From 962395d7ac7028299bf0a19914cfa3f6c659522a Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Wed, 1 Jul 2026 14:32:07 -0600 Subject: [PATCH 4/8] Variable names have changed I updated names of variables relating to the iron sediment and vent fluxes, which changes some defaults in MOM_input (and the input data file checker) --- param_templates/MOM_input.yaml | 4 ++-- param_templates/input_data_list.yaml | 12 +++++------- param_templates/json/MOM_input.json | 4 ++-- param_templates/json/input_data_list.json | 14 +++++--------- 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 8a5dba4..3080324 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -361,14 +361,14 @@ Global: value: $TEST: 1e-50 $RUN_TYPE == "hybrid": -1e30 - MARBL_FEFLUX_FILE: + MARBL_FE_INTERIOR_SOURCE_FILE: description: | "Name of file containing iron sediment fluxes and vent flux forcing fields for the MARBL tracer package." datatype: string value: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedflux_2024algo_tx2_3v2.c251229.nc - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v3"': fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v3"': fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc READ_RIV_FLUXES: description: | "Use river fluxes provided by RIV_FLUX_FILE." diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index 3f1bd77..dcf99b5 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -63,18 +63,16 @@ mom.input_data_list: MARBL_TRACERS_IC_FILE: $MARBL_CONFIG == "latest": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" $MARBL_CONFIG == "latest+4p2z": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" - MARBL_FEFLUX_FILE: + MARBL_FE_INTERIOR_SOURCE_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" RIV_FLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v2": - $ROF_GRID == "JRA025": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" - $ROF_GRID == "r05": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" - $OCN_GRID == "tx2_3v3": - $ROF_GRID == "JRA025": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" - $ROF_GRID == "r05": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + '$OCN_GRID == "tx2_3v2" and $ROF_GRID == "JRA025"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" + '$OCN_GRID == "tx2_3v2" and $ROF_GRID == "r05"': "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" + '$OCN_GRID == "tx2_3v3" and $ROF_GRID == "JRA025"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" + '$OCN_GRID == "tx2_3v3" and $ROF_GRID == "r05"': "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" MARBL_D14C_FILE_1: '"ABIO_DIC_ON=TRUE" in $MARBL_TRACER_OPTS': "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/atm_delta_C14_CMIP6_sector1_global_1850-2015_yearly_v2.0_c240202.nc" MARBL_D14C_FILE_2: diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 3842fcd..c88ed57 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -267,12 +267,12 @@ "$RUN_TYPE == \"hybrid\"": "-1e30" } }, - "MARBL_FEFLUX_FILE": { + "MARBL_FE_INTERIOR_SOURCE_FILE": { "description": "\"Name of file containing iron sediment fluxes and vent\n flux forcing fields for the MARBL tracer package.\"\n", "datatype": "string", "value": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedflux_2024algo_tx2_3v2.c251229.nc", - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v3\"": "fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v3\"": "fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc" } }, "READ_RIV_FLUXES": { diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index 9ce3338..c600810 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -81,7 +81,7 @@ "$MARBL_CONFIG == \"latest\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc", "$MARBL_CONFIG == \"latest+4p2z\"": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" }, - "MARBL_FEFLUX_FILE": { + "MARBL_FE_INTERIOR_SOURCE_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc", "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" @@ -89,14 +89,10 @@ }, "RIV_FLUX_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v2\"": { - "$ROF_GRID == \"JRA025\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc", - "$ROF_GRID == \"r05\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc" - }, - "$OCN_GRID == \"tx2_3v3\"": { - "$ROF_GRID == \"JRA025\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc", - "$ROF_GRID == \"r05\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" - } + "$OCN_GRID == \"tx2_3v2\" and $ROF_GRID == \"JRA025\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc", + "$OCN_GRID == \"tx2_3v2\" and $ROF_GRID == \"r05\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v2_nnsm_e250r250_230914.20240202.nc", + "$OCN_GRID == \"tx2_3v3\" and $ROF_GRID == \"JRA025\"": "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc", + "$OCN_GRID == \"tx2_3v3\" and $ROF_GRID == \"r05\"": "${INPUTDIR}/riv_nut.gnews_gnm.r05_to_tx2_3v3_nnsm_e100r100_260306.20260424.nc" } }, "MARBL_D14C_FILE_1": { From 63ba1524a646446179224a12b3d12656910a36dd Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Mon, 6 Jul 2026 09:11:05 -0600 Subject: [PATCH 5/8] Updated name of iron sed / vent flux file --- param_templates/input_data_list.yaml | 2 +- param_templates/json/input_data_list.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index dcf99b5..a5a8b5f 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -66,7 +66,7 @@ mom.input_data_list: MARBL_FE_INTERIOR_SOURCE_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" - $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc" RIV_FLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': '$OCN_GRID == "tx2_3v2" and $ROF_GRID == "JRA025"': "${INPUTDIR}/riv_nut.gnews_gnm.rJRA025_to_tx2_3v2_nnsm_e333r100_230415.20240202.nc" diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index c600810..00aa716 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -84,7 +84,7 @@ "MARBL_FE_INTERIOR_SOURCE_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc", - "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fefluxes_sed2024algo_vent2026algo_tx2_3v3.c260625.nc" + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc" } }, "RIV_FLUX_FILE": { From 53236a087bc971ebd017997c3260f9248dd5ee23 Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Thu, 9 Jul 2026 14:47:05 -0600 Subject: [PATCH 6/8] Don't set MARBL_IC_MIN_VAL for hybrid Hybrid cases default to MARBL_TRACERS_IC_FILE_IS_Z=False, and MARBL_IC_MIN_VAL is only used when initializing from Z --- param_templates/MOM_input.yaml | 4 ++-- param_templates/json/MOM_input.json | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index d881ed0..745ede6 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -370,12 +370,12 @@ Global: $RUN_TYPE == "hybrid": False MARBL_IC_MIN_VAL: description: | - Minimum value of tracer initial conditions + "Minimum value of tracer initial conditions + (when initializing from Z)" datatype: real units: conc units value: $TEST: 1e-50 - $RUN_TYPE == "hybrid": -1e30 MARBL_FE_INTERIOR_SOURCE_FILE: description: | "Name of file containing iron sediment fluxes and vent diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 4a1f520..0e4a8e2 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -274,12 +274,11 @@ } }, "MARBL_IC_MIN_VAL": { - "description": "Minimum value of tracer initial conditions\n", + "description": "\"Minimum value of tracer initial conditions\n (when initializing from Z)\"\n", "datatype": "real", "units": "conc units", "value": { - "$TEST": "1e-50", - "$RUN_TYPE == \"hybrid\"": "-1e30" + "$TEST": "1e-50" } }, "MARBL_FE_INTERIOR_SOURCE_FILE": { From 1fa71966c6daf3ee80f9f79df68aadf65c7a6aab Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Mon, 13 Jul 2026 09:22:51 -0600 Subject: [PATCH 7/8] Update MARBL and MOM6 tags Also moved all aux_mom_MARBL tests to TL319_t233, made sure MARBL_IC_MIN_VAL is only set in tests that use MARBL, and created a new iron forcing file for tx2_3v2 with the old data presented in the new format (single file, different field names) --- .gitmodules | 4 ++-- MOM6 | 2 +- cime_config/testdefs/testlist_mom.xml | 19 +++++++++++++++---- externals/MARBL | 2 +- param_templates/MOM_input.yaml | 4 ++-- param_templates/json/MOM_input.json | 4 ++-- 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2a0a1f1..0cf3022 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = MOM6 url = https://github.com/NCAR/MOM6.git fxDONOTUSEurl = https://github.com/NCAR/MOM6.git - fxtag = dev/ncar_260624 + fxtag = dev/ncar_260710 fxrequired = AlwaysRequired [submodule "stochastic_physics"] @@ -16,6 +16,6 @@ path = externals/MARBL url = https://github.com/marbl-ecosys/MARBL.git fxDONOTUSEurl = https://github.com/marbl-ecosys/MARBL.git - fxtag = marbl0.49.0 + fxtag = marbl0.50.0 fxrequired = AlwaysRequired diff --git a/MOM6 b/MOM6 index c37361e..69fb0ab 160000 --- a/MOM6 +++ b/MOM6 @@ -1 +1 @@ -Subproject commit c37361ed68c2367c364db1e4d8238aca4e0c6349 +Subproject commit 69fb0abeb7c0b674bcd17a2680a23fbbe4f1cf89 diff --git a/cime_config/testdefs/testlist_mom.xml b/cime_config/testdefs/testlist_mom.xml index 22a7f80..ad1c2f9 100644 --- a/cime_config/testdefs/testlist_mom.xml +++ b/cime_config/testdefs/testlist_mom.xml @@ -102,7 +102,7 @@ - + @@ -122,23 +122,34 @@ - + + + + + - - + + + + + + + + + diff --git a/externals/MARBL b/externals/MARBL index b5cf6bd..403f6c5 160000 --- a/externals/MARBL +++ b/externals/MARBL @@ -1 +1 @@ -Subproject commit b5cf6bd48640b7d0e7e488da02b81b29e3aaaafa +Subproject commit 403f6c50bba305d59910031dae33ff0629fb8602 diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 745ede6..83335d6 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -375,14 +375,14 @@ Global: datatype: real units: conc units value: - $TEST: 1e-50 + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $TEST': 1e-50 MARBL_FE_INTERIOR_SOURCE_FILE: description: | "Name of file containing iron sediment fluxes and vent flux forcing fields for the MARBL tracer package." datatype: string value: - '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedflux_2024algo_tx2_3v2.c251229.nc + '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fe_sources_sed2024algo_tx2_3v2_20260711.nc '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v3"': fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc READ_RIV_FLUXES: description: | diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 0e4a8e2..dba1d1b 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -278,14 +278,14 @@ "datatype": "real", "units": "conc units", "value": { - "$TEST": "1e-50" + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $TEST": "1e-50" } }, "MARBL_FE_INTERIOR_SOURCE_FILE": { "description": "\"Name of file containing iron sediment fluxes and vent\n flux forcing fields for the MARBL tracer package.\"\n", "datatype": "string", "value": { - "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedflux_2024algo_tx2_3v2.c251229.nc", + "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fe_sources_sed2024algo_tx2_3v2_20260711.nc", "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v3\"": "fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc" } }, From a7ebb7832f15c37fa734cd4f77c2bc7f6ffcdcca Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Mon, 13 Jul 2026 09:35:35 -0600 Subject: [PATCH 8/8] Update iron source file for tx2_3v2 I had modified MOM_input.yaml but not input_data_list.yaml --- param_templates/input_data_list.yaml | 2 +- param_templates/json/input_data_list.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index 4f908cb..7213e16 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -78,7 +78,7 @@ mom.input_data_list: $MARBL_CONFIG == "latest+4p2z": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc" MARBL_FE_INTERIOR_SOURCE_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': - $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc" + $OCN_GRID == "tx2_3v2": "${INPUTDIR}/fe_sources_sed2024algo_tx2_3v2_20260711.nc" $OCN_GRID == "tx2_3v3": "${INPUTDIR}/fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc" RIV_FLUX_FILE: '"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS': diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index fc7e7ec..c18a818 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -96,7 +96,7 @@ }, "MARBL_FE_INTERIOR_SOURCE_FILE": { "\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": { - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc", + "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fe_sources_sed2024algo_tx2_3v2_20260711.nc", "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/fe_sources_sed2024algo_vent2026algo_tx2_3v3.c260701.nc" } },