From f8c012c04c166c2380b98fb8eb6118f819845f1d Mon Sep 17 00:00:00 2001 From: Keith Lindsay Date: Wed, 28 Aug 2024 16:11:53 -0600 Subject: [PATCH 1/2] MARBL: add STF_SALT_{tracer} diagnostics to diag_table --- cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py b/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py index 6d33671..d03a084 100644 --- a/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py +++ b/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py @@ -247,6 +247,9 @@ def write_MARBL_diagnostics_file( full_diag_dict["O2"]["properties"]["has surface flux"] = True # DIC if "DIC" in full_diag_dict.keys(): + # STF_SALT_DIC is special case + if valid_diag_modes.index(diag_mode) >= valid_diag_modes.index("minimal"): + full_diag_dict["DIC"]["diags"]["STF_SALT_DIC"] = "medium_average" full_diag_dict["DIC"]["diags"]["DIC_RIV_FLUX"] = freq_op full_diag_dict["DIC"]["diags"]["J_DIC"] = freq_op full_diag_dict["DIC"]["diags"]["Jint_100m_DIC"] = Jint_100m_freq_op["DIC"] @@ -265,6 +268,9 @@ def write_MARBL_diagnostics_file( full_diag_dict["DIC_ALT_CO2"]["properties"]["has surface flux"] = True # ALK if "ALK" in full_diag_dict.keys(): + # STF_SALT_ALK is special case + if valid_diag_modes.index(diag_mode) >= valid_diag_modes.index("minimal"): + full_diag_dict["ALK"]["diags"]["STF_SALT_ALK"] = "medium_average" full_diag_dict["ALK"]["diags"]["ALK_RIV_FLUX"] = freq_op full_diag_dict["ALK"]["diags"]["STF_ALK"] = freq_op full_diag_dict["ALK"]["diags"]["J_ALK"] = low_freq_op @@ -353,6 +359,11 @@ def write_MARBL_diagnostics_file( full_diag_dict["DO14Ctot"]["properties"]["has surface flux"] = True # ABIO_DIC if "ABIO_DIC" in full_diag_dict.keys(): + # STF_SALT_ABIO_DIC is special case + if valid_diag_modes.index(diag_mode) >= valid_diag_modes.index("minimal"): + full_diag_dict["ABIO_DIC"]["diags"]["STF_SALT_ABIO_DIC"] = "medium_average" + full_diag_dict["DIC"]["diags"]["DIC_RIV_FLUX"] = freq_op + full_diag_dict["DIC"]["diags"]["J_DIC"] = freq_op # full_diag_dict['ABIO_DIC']['diags']['J_ABIO_DIC'] = freq_op full_diag_dict["ABIO_DIC"]["diags"]["STF_ABIO_DIC"] = freq_op # full_diag_dict['ABIO_DIC']['diags']['FvPER_ABIO_DIC'] = freq_op From 51041f6919d3a2b09ba42acb83920ba94e132793 Mon Sep 17 00:00:00 2001 From: Keith Lindsay Date: Thu, 29 Aug 2024 11:00:46 -0600 Subject: [PATCH 2/2] remove lines accidentally added in previous commit --- cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py b/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py index d03a084..f634ade 100644 --- a/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py +++ b/cime_config/MARBL_scripts/MOM_MARBL_diagnostics.py @@ -362,8 +362,6 @@ def write_MARBL_diagnostics_file( # STF_SALT_ABIO_DIC is special case if valid_diag_modes.index(diag_mode) >= valid_diag_modes.index("minimal"): full_diag_dict["ABIO_DIC"]["diags"]["STF_SALT_ABIO_DIC"] = "medium_average" - full_diag_dict["DIC"]["diags"]["DIC_RIV_FLUX"] = freq_op - full_diag_dict["DIC"]["diags"]["J_DIC"] = freq_op # full_diag_dict['ABIO_DIC']['diags']['J_ABIO_DIC'] = freq_op full_diag_dict["ABIO_DIC"]["diags"]["STF_ABIO_DIC"] = freq_op # full_diag_dict['ABIO_DIC']['diags']['FvPER_ABIO_DIC'] = freq_op