Skip to content

Commit bf8fb73

Browse files
alperaltuntasalperaltuntas
committed
merge latest main
2 parents ed01978 + 42dc926 commit bf8fb73

6 files changed

Lines changed: 36 additions & 14 deletions

File tree

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
path = externals/MARBL
1717
url = https://github.com/marbl-ecosys/MARBL.git
1818
fxDONOTUSEurl = https://github.com/marbl-ecosys/MARBL.git
19-
fxtag = marbl0.48.3
19+
fxtag = marbl0.49.0
2020
fxrequired = AlwaysRequired
2121

‎externals/MARBL‎

Submodule MARBL updated 43 files

‎param_templates/MOM_input.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,15 +340,22 @@ Global:
340340
for the MARBL tracer package."
341341
datatype: string
342342
value:
343-
$MARBL_CONFIG == "latest": ecosys_jan_IC_omip_latlon_1x1_180W_c230331.nc
344-
$MARBL_CONFIG == "latest+4p2z": ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc
343+
$MARBL_CONFIG == "latest": ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc
344+
$MARBL_CONFIG == "latest+4p2z": ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc
345345
MARBL_FESEDFLUX_FILE:
346346
description: |
347347
"Name of file containing iron sediment flux
348348
forcing field for the MARBL tracer package."
349349
datatype: string
350350
value:
351-
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc
351+
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedflux_2024algo_tx2_3v2.c251229.nc
352+
MARBL_FESEDFLUXRED_FILE:
353+
description: |
354+
"Name of file containing iron reducing sediment flux
355+
forcing field for the MARBL tracer package."
356+
datatype: string
357+
value:
358+
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS and $OCN_GRID == "tx2_3v2"': fesedfluxRed_2024algo_tx2_3v2.c251229.nc
352359
MARBL_FEVENTFLUX_FILE:
353360
description: |
354361
"Name of file containing iron sediment flux

‎param_templates/input_data_list.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@ mom.input_data_list:
5050
DIAG_COORD_DEF_RHO2:
5151
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/ocean_rho2_190917.nc"
5252
MARBL_TRACERS_IC_FILE:
53-
$MARBL_CONFIG == "latest": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c230331.nc"
54-
$MARBL_CONFIG == "latest+4p2z": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc"
53+
$MARBL_CONFIG == "latest": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc"
54+
$MARBL_CONFIG == "latest+4p2z": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc"
5555
MARBL_FESEDFLUX_FILE:
5656
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS':
57-
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc"
57+
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc"
58+
MARBL_FESEDFLUXRED_FILE:
59+
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS':
60+
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc"
5861
MARBL_FEVENTFLUX_FILE:
5962
'"BASE_BIO_ON=TRUE" in $MARBL_TRACER_OPTS':
6063
$OCN_GRID == "tx2_3v2": "${INPUTDIR}/feventflux_5gmol_tx2_3v2.c231205.nc"

‎param_templates/json/MOM_input.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,22 @@
243243
"description": "\"Name of file containing initial conditions\nfor the MARBL tracer package.\"\n",
244244
"datatype": "string",
245245
"value": {
246-
"$MARBL_CONFIG == \"latest\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c230331.nc",
247-
"$MARBL_CONFIG == \"latest+4p2z\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc"
246+
"$MARBL_CONFIG == \"latest\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc",
247+
"$MARBL_CONFIG == \"latest+4p2z\"": "ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc"
248248
}
249249
},
250250
"MARBL_FESEDFLUX_FILE": {
251251
"description": "\"Name of file containing iron sediment flux\n forcing field for the MARBL tracer package.\"\n",
252252
"datatype": "string",
253253
"value": {
254-
"\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc"
254+
"\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedflux_2024algo_tx2_3v2.c251229.nc"
255+
}
256+
},
257+
"MARBL_FESEDFLUXRED_FILE": {
258+
"description": "\"Name of file containing iron reducing sediment flux\n forcing field for the MARBL tracer package.\"\n",
259+
"datatype": "string",
260+
"value": {
261+
"\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS and $OCN_GRID == \"tx2_3v2\"": "fesedfluxRed_2024algo_tx2_3v2.c251229.nc"
255262
}
256263
},
257264
"MARBL_FEVENTFLUX_FILE": {

‎param_templates/json/input_data_list.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,17 @@
6666
"$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/ocean_rho2_190917.nc"
6767
},
6868
"MARBL_TRACERS_IC_FILE": {
69-
"$MARBL_CONFIG == \"latest\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c230331.nc",
70-
"$MARBL_CONFIG == \"latest+4p2z\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc"
69+
"$MARBL_CONFIG == \"latest\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc",
70+
"$MARBL_CONFIG == \"latest+4p2z\"": "${INPUTDIR}/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc"
7171
},
7272
"MARBL_FESEDFLUX_FILE": {
7373
"\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": {
74-
"$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_total_reduce_oxic_tx2_3v2.c231205.nc"
74+
"$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedflux_2024algo_tx2_3v2.c251229.nc"
75+
}
76+
},
77+
"MARBL_FESEDFLUXRED_FILE": {
78+
"\"BASE_BIO_ON=TRUE\" in $MARBL_TRACER_OPTS": {
79+
"$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/fesedfluxRed_2024algo_tx2_3v2.c251229.nc"
7580
}
7681
},
7782
"MARBL_FEVENTFLUX_FILE": {

0 commit comments

Comments
 (0)