Skip to content

Update marbl iron forcing #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mnlevy1981 wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Update marbl iron forcing #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ea8013e
Update iron forcing files
mnlevy1981 Feb 20, 2025
ac5654f
Merge tag 'mi_250210' into update_MARBL_FeForcing
mnlevy1981 Feb 20, 2025
361f5d4
Update input_data_list
mnlevy1981 Feb 21, 2025
80b70a2
More updates to input_data_list
mnlevy1981 Feb 21, 2025
e8fd165
Merge tag 'mi_250428' into update_MARBL_FeForcing
mnlevy1981 Jun 12, 2025
06bbe7b
Add DEPTH_EDGES to fesedflux
mnlevy1981 Jun 16, 2025
2fc3694
Update IC files
mnlevy1981 Jun 27, 2025
e6156d5
Merge tag 'mi_251024b' into update_MARBL_FeForcing
mnlevy1981 Oct 30, 2025
bf8aa43
Merge tag 'mi_260121' into update_MARBL_FeForcing
mnlevy1981 Feb 12, 2026
f01d26d
files in input_data_list didn't match MOM_input
mnlevy1981 Feb 12, 2026
5e8625c
Run yaml_to_json
mnlevy1981 Feb 12, 2026
a05f239
Update MARBL external
mnlevy1981 Feb 18, 2026
38c23c4
Update iron sed forcing files
mnlevy1981 Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.48.3
fxtag = marbl0.49.0
fxrequired = AlwaysRequired

2 changes: 1 addition & 1 deletion externals/MARBL
Open in desktop
Submodule MARBL updated 43 files
+1 −3 MARBL_tools/netcdf_comparison.py
+5 −5 MARBL_tools/netcdf_metadata_check.py
+2 −1 MARBL_tools/pylintrc
+29 −19 MARBL_tools/run_test_suite.sh
+120 −0 MARBL_tools/settings_metadata_check.py
+71 −4 defaults/diagnostics_latest.yaml
+78 −0 defaults/json/diagnostics_latest.json
+249 −109 defaults/json/settings_cesm2.0.json
+254 −109 defaults/json/settings_cesm2.1+cocco.json
+249 −109 defaults/json/settings_cesm2.1.json
+291 −109 defaults/json/settings_latest+4p2z.json
+291 −109 defaults/json/settings_latest+cocco.json
+288 −114 defaults/json/settings_latest.json
+230 −110 defaults/settings_cesm2.0.yaml
+235 −110 defaults/settings_cesm2.1+cocco.yaml
+230 −110 defaults/settings_cesm2.1.yaml
+266 −121 defaults/settings_latest+4p2z.yaml
+266 −110 defaults/settings_latest+cocco.yaml
+262 −116 defaults/settings_latest.yaml
+9 −6 src/marbl_ciso_interior_tendency_mod.F90
+160 −50 src/marbl_diagnostics_mod.F90
+1 −2 src/marbl_glo_avg_mod.F90
+18 −1 src/marbl_init_mod.F90
+23 −7 src/marbl_init_tracer_metadata_mod.F90
+71 −0 src/marbl_interface.F90
+61 −2 src/marbl_interface_private_types.F90
+522 −262 src/marbl_interior_tendency_mod.F90
+42 −7 src/marbl_pft_mod.F90
+384 −191 src/marbl_settings_mod.F90
+1 −1 tests/driver_src/marbl.F90
+1 −1 tests/driver_src/marbl_call_compute_subroutines_drv.F90
+22 −3 tests/driver_src/marbl_init_drv.F90
+24 −0 tests/driver_src/marbl_io_mod.F90
+ − tests/input_files/baselines/call_compute_subroutines.history.nc
+ − tests/input_files/baselines/call_compute_subroutines.history_4p2z.nc
+ − tests/input_files/baselines/call_compute_subroutines.history_with_ciso.nc
+ − tests/input_files/initial_conditions/call_compute_subroutines.20250425.nc
+45 −4 tests/input_files/settings/marbl_with_4p2z_cgs.settings
+45 −4 tests/input_files/settings/marbl_with_4p2z_mks.settings
+1 −0 tests/input_files/settings/marbl_with_fixed_NtoC.settings
+36 −10 tests/input_files/settings/marbl_with_spectra.settings
+10 −3 tests/python_for_tests/machines.py
+1 −0 tests/regression_tests/init/.gitignore
13 changes: 10 additions & 3 deletions param_templates/MOM_input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,22 @@ Global:
for the MARBL tracer package."
datatype: string
value:
$MARBL_CONFIG == "latest": ecosys_jan_IC_omip_latlon_1x1_180W_c230331.nc
$MARBL_CONFIG == "latest+4p2z": ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc
$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
MARBL_FESEDFLUX_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"': fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc
'"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
Expand Down
9 changes: 6 additions & 3 deletions param_templates/input_data_list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@ 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_c230331.nc"
$MARBL_CONFIG == "latest+4p2z": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc"
$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_FESEDFLUX_FILE:
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS':
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc"
$OCN_GRID == "tx2_3v2": "${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"
MARBL_FEVENTFLUX_FILE:
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS':
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc"
Expand Down
13 changes: 10 additions & 3 deletions param_templates/json/MOM_input.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,22 @@
"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_c230331.nc",
"$MARBL_CONFIG == \"latest+4p2z\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc"
"$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"
}
},
"MARBL_FESEDFLUX_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\"": "fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc"
"\"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": {
Expand Down
11 changes: 8 additions & 3 deletions param_templates/json/input_data_list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,17 @@
"$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/ocean_rho2_190917.nc"
},
"MARBL_TRACERS_IC_FILE": {
"$MARBL_CONFIG == \"latest\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c230331.nc",
"$MARBL_CONFIG == \"latest+4p2z\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc"
"$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_FESEDFLUX_FILE": {
"\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": {
"$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc"
"$OCN_GRID == \"tx2_3v2\"": "${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"
}
},
"MARBL_FEVENTFLUX_FILE": {
Expand Down