Skip to content

Commit 0b48be3

Browse files
committed
Make bld files consistent with Registry
1 parent 784ec43 commit 0b48be3

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

components/mpas-ocean/bld/build-namelist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1200,8 +1200,8 @@ if ($ice_bgc eq 'ice_bgc' ) {
12001200
add_default($nl, 'config_use_ecosysTracers_sea_ice_coupling', 'val'=>".false.");
12011201
}
12021202
add_default($nl, 'config_use_ecosysTracers_river_inputs_from_coupler');
1203-
add_default($nl, 'config_use_ecosysTracers_iron_solubility_file');
12041203
add_default($nl, 'config_use_ecosysTracers_atm_dust_from_coupler');
1204+
add_default($nl, 'config_use_ecosysTracers_iron_solubility_file');
12051205

12061206
####################################################
12071207
# Namelist group: tracer_forcing_freshwaterTracers #

components/mpas-ocean/bld/build-namelist-section

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,13 +599,13 @@ add_default($nl, 'config_use_ecosysTracers_ttd_forcing');
599599
add_default($nl, 'config_use_ecosysTracers_surface_value');
600600
add_default($nl, 'config_use_ecosysTracers_river_inputs_from_coupler');
601601
add_default($nl, 'config_use_ecosysTracers_sea_ice_coupling');
602-
add_default($nl, 'config_use_ecosysTracers_iron_solubility_file');
603602
add_default($nl, 'config_use_ecosysTracers_atm_dust_from_coupler');
604603
add_default($nl, 'config_ecosysTracers_diagnostic_fields_level1');
605604
add_default($nl, 'config_ecosysTracers_diagnostic_fields_level2');
606605
add_default($nl, 'config_ecosysTracers_diagnostic_fields_level3');
607606
add_default($nl, 'config_ecosysTracers_diagnostic_fields_level4');
608607
add_default($nl, 'config_ecosysTracers_diagnostic_fields_level5');
608+
add_default($nl, 'config_use_ecosysTracers_iron_solubility_file');
609609

610610
####################################################
611611
# Namelist group: tracer_forcing_freshwaterTracers #

components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -760,13 +760,13 @@
760760
<config_use_ecosysTracers_surface_value>.false.</config_use_ecosysTracers_surface_value>
761761
<config_use_ecosysTracers_river_inputs_from_coupler>.false.</config_use_ecosysTracers_river_inputs_from_coupler>
762762
<config_use_ecosysTracers_sea_ice_coupling>.false.</config_use_ecosysTracers_sea_ice_coupling>
763-
<config_use_ecosysTracers_iron_solubility_file>.false.</config_use_ecosysTracers_iron_solubility_file>
764763
<config_use_ecosysTracers_atm_dust_from_coupler>.false.</config_use_ecosysTracers_atm_dust_from_coupler>
765764
<config_ecosysTracers_diagnostic_fields_level1>.false.</config_ecosysTracers_diagnostic_fields_level1>
766765
<config_ecosysTracers_diagnostic_fields_level2>.false.</config_ecosysTracers_diagnostic_fields_level2>
767766
<config_ecosysTracers_diagnostic_fields_level3>.false.</config_ecosysTracers_diagnostic_fields_level3>
768767
<config_ecosysTracers_diagnostic_fields_level4>.false.</config_ecosysTracers_diagnostic_fields_level4>
769768
<config_ecosysTracers_diagnostic_fields_level5>.false.</config_ecosysTracers_diagnostic_fields_level5>
769+
<config_use_ecosysTracers_iron_solubility_file>.false.</config_use_ecosysTracers_iron_solubility_file>
770770

771771
<!-- tracer_forcing_freshwaterTracers -->
772772
<config_use_freshwaterTracers>.false.</config_use_freshwaterTracers>

components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3115,17 +3115,9 @@ Valid values: .true. or .false.
31153115
Default: Defined in namelist_defaults.xml
31163116
</entry>
31173117

3118-
<entry id="config_use_ecosysTracers_iron_solubility_file" type="logical"
3119-
category="tracer_forcing_ecosysTracers" group="tracer_forcing_ecosysTracers">
3120-
if true, use iron solubility field read in from a file
3121-
3122-
Valid values: .true. or .false.
3123-
Default: Defined in namelist_defaults.xml
3124-
</entry>
3125-
31263118
<entry id="config_use_ecosysTracers_atm_dust_from_coupler" type="logical"
31273119
category="tracer_forcing_ecosysTracers" group="tracer_forcing_ecosysTracers">
3128-
if true, get wet and dry atm dust deposition from the coupler instead of file
3120+
if true, get atmospheric dust inputs from the coupler, else from ecosys monthly forcing file
31293121

31303122
Valid values: .true. or .false.
31313123
Default: Defined in namelist_defaults.xml
@@ -3171,6 +3163,14 @@ Valid values: .true. or .false.
31713163
Default: Defined in namelist_defaults.xml
31723164
</entry>
31733165

3166+
<entry id="config_use_ecosysTracers_iron_solubility_file" type="logical"
3167+
category="tracer_forcing_ecosysTracers" group="tracer_forcing_ecosysTracers">
3168+
if true, read in Fe solubility from the ecosys forcing file
3169+
3170+
Valid values: .true. or .false.
3171+
Default: Defined in namelist_defaults.xml
3172+
</entry>
3173+
31743174

31753175
<!-- tracer_forcing_freshwaterTracers -->
31763176

0 commit comments

Comments
 (0)