From dad75e50b4c4ee9a448d034f4bd11a91fad6718e Mon Sep 17 00:00:00 2001 From: Michael Levy Date: Fri, 26 Jun 2026 10:53:23 -0600 Subject: [PATCH 1/3] 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/3] 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/3] 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": {