From 4ecfd8c6adaff3ab3eeb700f589bc73518ee7c54 Mon Sep 17 00:00:00 2001 From: apcraig Date: Thu, 15 Aug 2024 16:13:18 -0600 Subject: [PATCH] Update bgc namelist to remove some coupled settings. Update a few bgc test to increase diagnostics. --- configuration/scripts/ice_in | 17 +++++++++-------- configuration/scripts/options/set_nml.bgcz | 3 --- configuration/scripts/options/set_nml.bgczclim | 3 --- configuration/scripts/options/set_nml.bgczm | 3 --- configuration/scripts/options/set_nml.e3smbgc | 14 +++++++------- configuration/scripts/tests/base_suite.ts | 6 +++--- 6 files changed, 19 insertions(+), 27 deletions(-) diff --git a/configuration/scripts/ice_in b/configuration/scripts/ice_in index 0c7b2cb79..c84c7a251 100644 --- a/configuration/scripts/ice_in +++ b/configuration/scripts/ice_in @@ -348,6 +348,7 @@ tr_bgc_DON = .false. tr_bgc_Fe = .false. grid_o = 0.006 + grid_o_t = 0.006 l_sk = 20.0 grid_oS = 0.0 l_skS = 0.028 @@ -429,7 +430,7 @@ fr_graze_s = 0.5 fr_graze_e = 0.5 fr_mort2min = 0.9 - fr_dFe = 0.9 + fr_dFe = 1.0 k_nitrif = 0.046 t_iron_conv = 3065.0 max_loss = 0.9 @@ -440,7 +441,7 @@ t_sk_ox = 12.0 algaltype_diatoms = 0.0 algaltype_sp = 0.0 - algaltype_phaeo = 0.5 + algaltype_phaeo = 0.0 nitratetype = -1.0 ammoniumtype = 0.0 silicatetype = -1.0 @@ -452,12 +453,12 @@ dontype_protein = 0.0 fedtype_1 = 0.0 feptype_1 = 0.5 - zaerotype_bc1 = 0.0 - zaerotype_bc2 = 0.0 - zaerotype_dust1 = 0.0 - zaerotype_dust2 = 0.0 - zaerotype_dust3 = 0.0 - zaerotype_dust4 = 0.0 + zaerotype_bc1 = -1.0 + zaerotype_bc2 = -1.0 + zaerotype_dust1 = -1.0 + zaerotype_dust2 = -1.0 + zaerotype_dust3 = -1.0 + zaerotype_dust4 = -1.0 ratio_C2N_diatoms = 7.0 ratio_C2N_sp = 7.0 ratio_C2N_phaeo = 7.0 diff --git a/configuration/scripts/options/set_nml.bgcz b/configuration/scripts/options/set_nml.bgcz index aecfd656a..091ca6f6d 100644 --- a/configuration/scripts/options/set_nml.bgcz +++ b/configuration/scripts/options/set_nml.bgcz @@ -26,9 +26,6 @@ tr_bgc_Fe = .true. # modal_aero = .true. # dEdd_algae = .true. tfrz_option = 'mushy' -highfreq = .true. -natmiter = 10 -oceanmixed_ice = .false. # nslyr = 5 tr_snow = .true. diff --git a/configuration/scripts/options/set_nml.bgczclim b/configuration/scripts/options/set_nml.bgczclim index fcd3baaf6..8fa4abd36 100644 --- a/configuration/scripts/options/set_nml.bgczclim +++ b/configuration/scripts/options/set_nml.bgczclim @@ -30,9 +30,6 @@ tr_bgc_Fe = .true. # modal_aero = .true. # dEdd_algae = .true. tfrz_option = 'mushy' -highfreq = .true. -natmiter = 10 -oceanmixed_ice = .false. bgc_data_type = 'clim' # nslyr = 5 diff --git a/configuration/scripts/options/set_nml.bgczm b/configuration/scripts/options/set_nml.bgczm index fd42ac9c9..fb963f06c 100644 --- a/configuration/scripts/options/set_nml.bgczm +++ b/configuration/scripts/options/set_nml.bgczm @@ -26,9 +26,6 @@ tr_bgc_Fe = .true. modal_aero = .true. # dEdd_algae = .true. tfrz_option = 'mushy' -highfreq = .true. -natmiter = 10 -oceanmixed_ice = .false. # nslyr = 5 tr_snow = .true. diff --git a/configuration/scripts/options/set_nml.e3smbgc b/configuration/scripts/options/set_nml.e3smbgc index 1be753486..7b0520dab 100644 --- a/configuration/scripts/options/set_nml.e3smbgc +++ b/configuration/scripts/options/set_nml.e3smbgc @@ -50,7 +50,7 @@ f_don_Am_protein = 1.0 f_doc_s = 0.5 f_doc_l = 0.5 fr_mort2min = 0.9 -fr_dFe = 0.9 +fr_dFe = 1.0 k_nitrif = 0.046 fr_resp_s = 0.9 y_sk_DMS = 0.7 @@ -64,11 +64,11 @@ doctype_s = 0.0 doctype_l = 0.0 dontype_protein = 0.0 fedtype_1 = 0.0 -zaerotype_bc1 = 0.0 -zaerotype_bc2 = 0.0 -zaerotype_dust1 = 0.0 -zaerotype_dust2 = 0.0 -zaerotype_dust3 = 0.0 -zaerotype_dust4 = 0.0 +zaerotype_bc1 = -1.0 +zaerotype_bc2 = -1.0 +zaerotype_dust1 = -1.0 +zaerotype_dust2 = -1.0 +zaerotype_dust3 = -1.0 +zaerotype_dust4 = -1.0 ratio_C2N_proteins = 5.0 diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 3f34da8a2..784a9534f 100644 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -54,10 +54,10 @@ restart gbox80 1x1 box2001 smoke gbox80 1x1 boxslotcyl smoke gbox12 1x1x12x12x1 boxchan,diag1,debug restart gx3 8x2 modal -smoke gx3 8x2 bgcz +smoke gx3 8x2 bgcz,diag1,run5day smoke gx3 8x2 jra55do -smoke gx3 8x2 bgczm,debug -smoke gx3 8x1 bgcskl,debug +smoke gx3 8x2 bgczm,diag1,debug +smoke gx3 8x1 bgcskl,diag1,debug #smoke gx3 4x1 bgcz,thread smoke_gx3_8x2_bgcz restart gx1 4x2 bgcsklclim,medium restart gx1 8x1 bgczclim,medium