Skip to content

Commit

Permalink
Merge branch 'maltrud/updateStreamsEtc_Mar27_2018' into HEAD
Browse files Browse the repository at this point in the history 
Mods to CBGC compsets, mpas-o streams, abiotic altDIC, co2flx to cpl

This PR modifies CBGC compsets to include marine (ocean and sea ice)
BGC, includes CO2 flux to be passed from MPAS-O to the coupler, allows a
switch for making the alternate DIC field biotic or abiotic, and sets
the default ocean output streams when using BGC.

Tested with:
* SMS_D.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-knl_gnu
* PET_Ln9.T62_oQU240.GMPAS-IAF.cori-knl_gnu
* ERP_Ld3.ne30_oECv3_ICG.A_WCYCL1850S.anvil_intel

[NML]
[BFB]
  • Loading branch information
@jonbob
jonbob committed Apr 5, 2018
2 parents cdebdcd + 4d9bb7e commit fe2a3aa
Show file tree
Hide file tree
Showing 11 changed files with 502 additions and 113 deletions.
45 changes: 35 additions & 10 deletions cime/config/e3sm/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,52 +138,77 @@

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_1850</alias>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_1850S</alias>
<lname>1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPRDCTC_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPRDCTC_20TRS</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPECACNT_1850</alias>
<lname>1850_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>1850_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRC_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC</lname>
</compset>

<compset>
<alias>BGCEXP_BCRD_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD</lname>
</compset>

<compset>
<alias>BGCEXP_BDRC_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRC</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC</lname>
</compset>

<compset>
<alias>BGCEXP_BDRD_CNPECACNT_20TR</alias>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRD</lname>
<lname>20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>


Expand Down
19 changes: 12 additions & 7 deletions cime/src/drivers/mct/cime_config/config_component_e3sm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,22 +164,27 @@

<entry id="CCSM_BGC">
<type>char</type>
<valid_values>none,CO2A,CO2A_OI,CO2B,CO2C,CO2_DMSA</valid_values>
<valid_values>none,CO2A,CO2A_OI,CO2B,CO2C,CO2C_OI,CO2_DMSA</valid_values>
<default_value>none</default_value>
<values match="last">
<value compset="_CAM\d+" >CO2A</value>
<value compset="_DATM" >none</value>
<value compset="_BGC%BPRP">CO2C</value>
<value compset="_BGC%BDRD">CO2C</value>
<value compset="HIST.*_DATM%(QIA|CRU|GSW)">CO2A</value>
<value compset="20TR.*_DATM%(QIA|CRU|GSW)">CO2A</value>
<value compset="RCP.*_DATM%(QIA|CRU|GSW)" >CO2A</value>
<value compset="_DATM%IAF.*_MPASO%OECO" >CO2A</value>
<value compset="_MPASCICE%BGC.*_MPASO%OIECO" >CO2A_OI</value>
<value compset="_MPASCICE%BGC.*_MPASO%TOIECO_" >CO2A_OI</value>
<value compset="_BGC%BCRD">CO2C</value>
<value compset="_BGC%BDRC">CO2C</value>
<value compset="_BGC%BCRC">CO2C</value>
<value compset="_DATM%IAF_SLND_MPASCICE%BGC_MPASO%TOIECO_" >CO2A</value>
<value compset="_DATM.*_MPASCICE%BGC.*_MPASO%OIECO" >CO2A_OI</value>
<value compset="_DATM.*_MPASCICE%BGC.*_MPASO%TOIECO_" >CO2A_OI</value>
<value compset="_MPASCICE_MPASO_.*_BGC%BCRC" >CO2C</value>
<value compset="_MPASCICE_MPASO_.*_BGC%BCRD" >CO2C</value>
<value compset="_MPASCICE_MPASO_.*_BGC%BDRC" >CO2C</value>
<value compset="_MPASCICE_MPASO_.*_BGC%BDRD" >CO2C</value>
<value compset="_MPASCICE%BGC.*_MPASO%OIECO.*_BGC%BCRC" >CO2C_OI</value>
<value compset="_MPASCICE%BGC.*_MPASO%OIECO.*_BGC%BCRD" >CO2C_OI</value>
<value compset="_MPASCICE%BGC.*_MPASO%OIECO.*_BGC%BDRC" >CO2C_OI</value>
<value compset="_MPASCICE%BGC.*_MPASO%OIECO.*_BGC%BDRD" >CO2C_OI</value>
</values>
<group>run_coupling</group>
<file>env_run.xml</file>
Expand Down
180 changes: 111 additions & 69 deletions components/mpas-cice/bld/build-namelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,47 +605,15 @@ add_default($nl, 'config_use_aerosols');
add_default($nl, 'config_use_vertical_zsalinity');
add_default($nl, 'config_use_shortwave_bioabsorption');
add_default($nl, 'config_use_skeletal_biochemistry');
if ($ice_bgc eq 'ice_bgc') {
add_default($nl, 'config_use_column_biogeochemistry', 'val'=>".true.");
add_default($nl, 'config_use_vertical_biochemistry', 'val'=>".true.");
add_default($nl, 'config_use_vertical_tracers', 'val'=>".true.");
add_default($nl, 'config_use_brine', 'val'=>".true.");
add_default($nl, 'config_use_nitrate', 'val'=>".true.");
add_default($nl, 'config_use_carbon', 'val'=>".true.");
add_default($nl, 'config_use_ammonium', 'val'=>".true.");
add_default($nl, 'config_use_silicate', 'val'=>".true.");
add_default($nl, 'config_use_DMS', 'val'=>".true.");
add_default($nl, 'config_use_nonreactive', 'val'=>".true.");
add_default($nl, 'config_use_humics', 'val'=>".true.");
add_default($nl, 'config_use_DON', 'val'=>".true.");
add_default($nl, 'config_use_iron', 'val'=>".true.");
} else {
add_default($nl, 'config_use_column_biogeochemistry', 'val'=>".false.");
add_default($nl, 'config_use_vertical_biochemistry', 'val'=>".false.");
add_default($nl, 'config_use_vertical_tracers', 'val'=>".false.");
add_default($nl, 'config_use_brine', 'val'=>".false.");
add_default($nl, 'config_use_nitrate', 'val'=>".false.");
add_default($nl, 'config_use_carbon', 'val'=>".false.");
add_default($nl, 'config_use_ammonium', 'val'=>".false.");
add_default($nl, 'config_use_silicate', 'val'=>".false.");
add_default($nl, 'config_use_DMS', 'val'=>".false.");
add_default($nl, 'config_use_nonreactive', 'val'=>".false.");
add_default($nl, 'config_use_humics', 'val'=>".false.");
add_default($nl, 'config_use_DON', 'val'=>".false.");
add_default($nl, 'config_use_iron', 'val'=>".false.");
}
add_default($nl, 'config_use_chlorophyll');
add_default($nl, 'config_use_modal_aerosols');
add_default($nl, 'config_use_zaerosols');
add_default($nl, 'config_skeletal_bgc_flux_type');
add_default($nl, 'config_scale_initial_vertical_bgc');
add_default($nl, 'config_biogrid_bottom_molecular_sublayer');
add_default($nl, 'config_biogrid_top_molecular_sublayer');
add_default($nl, 'config_bio_gravity_drainage_length_scale');
add_default($nl, 'config_zsalinity_molecular_sublayer');
add_default($nl, 'config_zsalinity_gravity_drainage_scale');
add_default($nl, 'config_snow_porosity_at_ice_surface');
add_default($nl, 'config_new_ice_fraction_biotracer');
add_default($nl, 'config_fraction_biotracer_in_frazil');
add_default($nl, 'config_ratio_Si_to_N_diatoms');
add_default($nl, 'config_ratio_Si_to_N_small_plankton');
Expand All @@ -663,29 +631,16 @@ add_default($nl, 'config_ratio_Fe_to_DON');
add_default($nl, 'config_ratio_Fe_to_DOC_saccharids');
add_default($nl, 'config_ratio_Fe_to_DOC_lipids');
add_default($nl, 'config_respiration_fraction_of_growth');
add_default($nl, 'config_rapid_mobile_to_stationary_time');
add_default($nl, 'config_long_mobile_to_stationary_time');
add_default($nl, 'config_algal_maximum_velocity');
add_default($nl, 'config_ratio_Fe_to_dust');
add_default($nl, 'config_solubility_of_Fe_in_dust');
add_default($nl, 'config_chla_absorptivity_of_diatoms');
add_default($nl, 'config_chla_absorptivity_of_small_plankton');
add_default($nl, 'config_chla_absorptivity_of_phaeocystis');
add_default($nl, 'config_light_attenuation_diatoms');
add_default($nl, 'config_light_attenuation_small_plankton');
add_default($nl, 'config_light_attenuation_phaeocystis');
add_default($nl, 'config_light_inhibition_diatoms');
add_default($nl, 'config_light_inhibition_small_plankton');
add_default($nl, 'config_light_inhibition_phaeocystis');
add_default($nl, 'config_maximum_growth_rate_diatoms');
add_default($nl, 'config_maximum_growth_rate_small_plankton');
add_default($nl, 'config_maximum_growth_rate_phaeocystis');
add_default($nl, 'config_temperature_growth_diatoms');
add_default($nl, 'config_temperature_growth_small_plankton');
add_default($nl, 'config_temperature_growth_phaeocystis');
add_default($nl, 'config_grazed_fraction_diatoms');
add_default($nl, 'config_grazed_fraction_small_plankton');
add_default($nl, 'config_grazed_fraction_phaeocystis');
add_default($nl, 'config_mortality_diatoms');
add_default($nl, 'config_mortality_small_plankton');
add_default($nl, 'config_mortality_phaeocystis');
Expand Down Expand Up @@ -721,36 +676,15 @@ add_default($nl, 'config_salinity_dependence_of_growth');
add_default($nl, 'config_minimum_optical_depth');
add_default($nl, 'config_slopped_grazing_fraction');
add_default($nl, 'config_excreted_fraction');
add_default($nl, 'config_fraction_mortality_to_ammonium');
add_default($nl, 'config_fraction_iron_remineralized');
add_default($nl, 'config_nitrification_rate');
add_default($nl, 'config_desorption_loss_particulate_iron');
add_default($nl, 'config_maximum_loss_fraction');
add_default($nl, 'config_maximum_ratio_iron_to_saccharids');
add_default($nl, 'config_respiration_loss_to_DMSPd');
add_default($nl, 'config_DMSP_to_DMS_conversion_fraction');
add_default($nl, 'config_DMSP_to_DMS_conversion_time');
add_default($nl, 'config_DMS_oxidation_time');
add_default($nl, 'config_mobility_type_diatoms');
add_default($nl, 'config_mobility_type_small_plankton');
add_default($nl, 'config_mobility_type_phaeocystis');
add_default($nl, 'config_mobility_type_nitrate');
add_default($nl, 'config_mobility_type_ammonium');
add_default($nl, 'config_mobility_type_silicate');
add_default($nl, 'config_mobility_type_DMSPp');
add_default($nl, 'config_mobility_type_DMSPd');
add_default($nl, 'config_mobility_type_humics');
add_default($nl, 'config_mobility_type_saccharids');
add_default($nl, 'config_mobility_type_lipids');
add_default($nl, 'config_mobility_type_proteins');
add_default($nl, 'config_mobility_type_dissolved_iron');
add_default($nl, 'config_mobility_type_particulate_iron');
add_default($nl, 'config_mobility_type_black_carbon1');
add_default($nl, 'config_mobility_type_black_carbon2');
add_default($nl, 'config_mobility_type_dust1');
add_default($nl, 'config_mobility_type_dust2');
add_default($nl, 'config_mobility_type_dust3');
add_default($nl, 'config_mobility_type_dust4');
add_default($nl, 'config_ratio_C_to_N_diatoms');
add_default($nl, 'config_ratio_C_to_N_small_plankton');
add_default($nl, 'config_ratio_C_to_N_phaeocystis');
Expand All @@ -761,6 +695,108 @@ add_default($nl, 'config_scales_absorption_diatoms');
add_default($nl, 'config_scales_absorption_small_plankton');
add_default($nl, 'config_scales_absorption_phaeocystis');
add_default($nl, 'config_ratio_C_to_N_proteins');
add_default($nl, 'config_use_carbon');
if ($ice_bgc eq 'ice_bgc') {
add_default($nl, 'config_algal_maximum_velocity', 'val'=>"0.0000001");
add_default($nl, 'config_bio_gravity_drainage_length_scale', 'val'=>"20.0");
add_default($nl, 'config_dms_oxidation_time', 'val'=>"12.0");
add_default($nl, 'config_dmsp_to_dms_conversion_fraction', 'val'=>"0.7");
add_default($nl, 'config_dmsp_to_dms_conversion_time', 'val'=>"5.0");
add_default($nl, 'config_fraction_iron_remineralized', 'val'=>"1.0");
add_default($nl, 'config_fraction_mortality_to_ammonium', 'val'=>"0.9");
add_default($nl, 'config_grazed_fraction_phaeocystis', 'val'=>"0.7");
add_default($nl, 'config_grazed_fraction_small_plankton', 'val'=>"0.7");
add_default($nl, 'config_light_attenuation_diatoms', 'val'=>"0.3");
add_default($nl, 'config_light_attenuation_phaeocystis', 'val'=>"0.17");
add_default($nl, 'config_light_attenuation_small_plankton', 'val'=>"0.2");
add_default($nl, 'config_light_inhibition_diatoms', 'val'=>"0.001");
add_default($nl, 'config_light_inhibition_phaeocystis', 'val'=>"0.04");
add_default($nl, 'config_light_inhibition_small_plankton', 'val'=>"0.001");
add_default($nl, 'config_long_mobile_to_stationary_time', 'val'=>"7776000.0");
add_default($nl, 'config_maximum_growth_rate_phaeocystis', 'val'=>"0.63");
add_default($nl, 'config_maximum_growth_rate_small_plankton', 'val'=>"0.41");
add_default($nl, 'config_mobility_type_ammonium', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_black_carbon1', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_black_carbon2', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_dissolved_iron', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_dmspd', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_dust1', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_dust2', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_dust3', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_dust4', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_humics', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_lipids', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_phaeocystis', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_proteins', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_saccharids', 'val'=>"0.0");
add_default($nl, 'config_mobility_type_small_plankton', 'val'=>"0.0");
add_default($nl, 'config_new_ice_fraction_biotracer', 'val'=>"1.0");
add_default($nl, 'config_rapid_mobile_to_stationary_time', 'val'=>"3600.0");
add_default($nl, 'config_respiration_loss_to_dmspd', 'val'=>"0.9");
add_default($nl, 'config_use_ammonium', 'val'=>".true.");
add_default($nl, 'config_use_brine', 'val'=>".true.");
add_default($nl, 'config_use_carbon', 'val'=>".false.");
add_default($nl, 'config_use_dms', 'val'=>".true.");
add_default($nl, 'config_use_don', 'val'=>".true.");
add_default($nl, 'config_use_humics', 'val'=>".true.");
add_default($nl, 'config_use_iron', 'val'=>".true.");
add_default($nl, 'config_use_nitrate', 'val'=>".true.");
add_default($nl, 'config_use_nonreactive', 'val'=>".true.");
add_default($nl, 'config_use_silicate', 'val'=>".true.");
add_default($nl, 'config_use_vertical_biochemistry', 'val'=>".true.");
add_default($nl, 'config_use_vertical_tracers', 'val'=>".true.");
add_default($nl, 'config_zsalinity_molecular_sublayer', 'val'=>"0.0");
} else {
add_default($nl, 'config_algal_maximum_velocity');
add_default($nl, 'config_bio_gravity_drainage_length_scale');
add_default($nl, 'config_dms_oxidation_time');
add_default($nl, 'config_dmsp_to_dms_conversion_fraction');
add_default($nl, 'config_dmsp_to_dms_conversion_time');
add_default($nl, 'config_fraction_iron_remineralized');
add_default($nl, 'config_fraction_mortality_to_ammonium');
add_default($nl, 'config_grazed_fraction_phaeocystis');
add_default($nl, 'config_grazed_fraction_small_plankton');
add_default($nl, 'config_light_attenuation_diatoms');
add_default($nl, 'config_light_attenuation_phaeocystis');
add_default($nl, 'config_light_attenuation_small_plankton');
add_default($nl, 'config_light_inhibition_diatoms');
add_default($nl, 'config_light_inhibition_phaeocystis');
add_default($nl, 'config_light_inhibition_small_plankton');
add_default($nl, 'config_long_mobile_to_stationary_time');
add_default($nl, 'config_maximum_growth_rate_phaeocystis');
add_default($nl, 'config_maximum_growth_rate_small_plankton');
add_default($nl, 'config_mobility_type_ammonium');
add_default($nl, 'config_mobility_type_black_carbon1');
add_default($nl, 'config_mobility_type_black_carbon2');
add_default($nl, 'config_mobility_type_dissolved_iron');
add_default($nl, 'config_mobility_type_dmspd');
add_default($nl, 'config_mobility_type_dust1');
add_default($nl, 'config_mobility_type_dust2');
add_default($nl, 'config_mobility_type_dust3');
add_default($nl, 'config_mobility_type_dust4');
add_default($nl, 'config_mobility_type_humics');
add_default($nl, 'config_mobility_type_lipids');
add_default($nl, 'config_mobility_type_phaeocystis');
add_default($nl, 'config_mobility_type_proteins');
add_default($nl, 'config_mobility_type_saccharids');
add_default($nl, 'config_mobility_type_small_plankton');
add_default($nl, 'config_new_ice_fraction_biotracer');
add_default($nl, 'config_rapid_mobile_to_stationary_time');
add_default($nl, 'config_respiration_loss_to_dmspd');
add_default($nl, 'config_use_ammonium');
add_default($nl, 'config_use_brine');
add_default($nl, 'config_use_carbon');
add_default($nl, 'config_use_dms');
add_default($nl, 'config_use_don');
add_default($nl, 'config_use_humics');
add_default($nl, 'config_use_iron');
add_default($nl, 'config_use_nitrate');
add_default($nl, 'config_use_nonreactive');
add_default($nl, 'config_use_silicate');
add_default($nl, 'config_use_vertical_biochemistry');
add_default($nl, 'config_use_vertical_tracers');
add_default($nl, 'config_zsalinity_molecular_sublayer');
}

#############################
# Namelist group: shortwave #
Expand Down Expand Up @@ -983,11 +1019,17 @@ add_default($nl, 'config_AM_unitConversion_write_on_startup');
# Namelist group: AM_pointwiseStats #
#####################################

add_default($nl, 'config_AM_pointwiseStats_enable');
if ($ice_bgc eq 'ice_bgc') {
add_default($nl, 'config_AM_pointwiseStats_compute_on_startup', 'val'=>".false.");
add_default($nl, 'config_AM_pointwiseStats_write_on_startup', 'val'=>".false.");
add_default($nl, 'config_AM_pointwiseStats_enable', 'val'=>".true.");
} else {
add_default($nl, 'config_AM_pointwiseStats_compute_on_startup', 'val'=>".true.");
add_default($nl, 'config_AM_pointwiseStats_write_on_startup', 'val'=>".true.");
add_default($nl, 'config_AM_pointwiseStats_enable', 'val'=>".false.");
}
add_default($nl, 'config_AM_pointwiseStats_compute_interval');
add_default($nl, 'config_AM_pointwiseStats_output_stream');
add_default($nl, 'config_AM_pointwiseStats_compute_on_startup');
add_default($nl, 'config_AM_pointwiseStats_write_on_startup');

#################################
# Namelist group: AM_iceShelves #
Expand Down
Loading

0 comments on commit fe2a3aa

Please sign in to comment.