diff --git a/cime/config/e3sm/allactive/config_compsets.xml b/cime/config/e3sm/allactive/config_compsets.xml
index 7dbbcc49b489..c2eaf659c9f3 100644
--- a/cime/config/e3sm/allactive/config_compsets.xml
+++ b/cime/config/e3sm/allactive/config_compsets.xml
@@ -138,77 +138,52 @@
BGCEXP_BCRC_CNPRDCTC_1850
- 1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC
-
-
-
- BGCEXP_BCRC_CNPRDCTC_1850S
- 1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC
+ 1850_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC
BGCEXP_BCRC_CNPRDCTC_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC
-
-
-
- BGCEXP_BCRC_CNPRDCTC_20TRS
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRC
+ 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC
BGCEXP_BCRD_CNPRDCTC_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD
-
-
-
- BGCEXP_BCRD_CNPRDCTC_20TRS
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BCRD
+ 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRD
BGCEXP_BDRC_CNPRDCTC_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC
-
-
-
- BGCEXP_BDRC_CNPRDCTC_20TRS
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRC
+ 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRC
BGCEXP_BDRD_CNPRDCTC_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD
-
-
-
- BGCEXP_BDRD_CNPRDCTC_20TRS
- 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE%SPUNUP_MPASO%SPUNUP_MOSART_SGLC_SWAV_BGC%BDRD
+ 20TR_CAM5%CMIP6_CLM45%CNPRDCTCBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRD
BGCEXP_BCRC_CNPECACNT_1850
- 1850_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC
+ 1850_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC
BGCEXP_BCRC_CNPECACNT_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRC
+ 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRC
BGCEXP_BCRD_CNPECACNT_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BCRD
+ 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BCRD
BGCEXP_BDRC_CNPECACNT_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRC
+ 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRC
BGCEXP_BDRD_CNPECACNT_20TR
- 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE%BGC_MPASO%OIECOOIDMS_MOSART_SGLC_SWAV_BGC%BDRD
+ 20TR_CAM5%CMIP6_CLM45%CNPECACNTBC_MPASCICE_MPASO_MOSART_SGLC_SWAV_BGC%BDRD
diff --git a/cime/src/drivers/mct/cime_config/config_component_e3sm.xml b/cime/src/drivers/mct/cime_config/config_component_e3sm.xml
index f3764ad9bcd2..f17256f239e2 100644
--- a/cime/src/drivers/mct/cime_config/config_component_e3sm.xml
+++ b/cime/src/drivers/mct/cime_config/config_component_e3sm.xml
@@ -164,27 +164,22 @@
char
- none,CO2A,CO2A_OI,CO2B,CO2C,CO2C_OI,CO2_DMSA
+ none,CO2A,CO2A_OI,CO2B,CO2C,CO2_DMSA
none
CO2A
none
CO2C
+ CO2C
CO2A
CO2A
CO2A
CO2A
- CO2A
- CO2A_OI
- CO2A_OI
- CO2C
- CO2C
- CO2C
- CO2C
- CO2C_OI
- CO2C_OI
- CO2C_OI
- CO2C_OI
+ CO2A_OI
+ CO2A_OI
+ CO2C
+ CO2C
+ CO2C
run_coupling
env_run.xml
diff --git a/components/mpas-cice/bld/build-namelist b/components/mpas-cice/bld/build-namelist
index 0b55940f8632..0c03893e75b9 100755
--- a/components/mpas-cice/bld/build-namelist
+++ b/components/mpas-cice/bld/build-namelist
@@ -605,6 +605,35 @@ 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');
@@ -612,8 +641,11 @@ 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');
@@ -631,16 +663,29 @@ 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');
@@ -676,15 +721,36 @@ 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');
@@ -695,108 +761,6 @@ 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 #
@@ -1019,17 +983,11 @@ add_default($nl, 'config_AM_unitConversion_write_on_startup');
# Namelist group: AM_pointwiseStats #
#####################################
-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_enable');
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 #
diff --git a/components/mpas-cice/cime_config/buildnml b/components/mpas-cice/cime_config/buildnml
index e56ddcc57b60..db909dd115e8 100755
--- a/components/mpas-cice/cime_config/buildnml
+++ b/components/mpas-cice/cime_config/buildnml
@@ -156,14 +156,6 @@ if ( $ICE_GRID eq 'oEC60to30' ) {
$decomp_prefix .= 'mpas-cice.graph.info.';
}
-#--------------------------------------------------------------------
-# modify initial condition file if ice BGC is turned on
-#--------------------------------------------------------------------
-if ( $ICE_GRID eq 'oEC60to30v3' && $ICE_BGC eq 'ice_bgc') {
- $grid_date = '180403';
- $grid_prefix = 'mpascice.rst.BCRC_CNPECACNT_1850_anvil02.0061-01-01.no-xtime';
-}
-
chdir "$CASEBUILD/mpas-ciceconf";
#--------------------------------------------------------------------
@@ -643,115 +635,11 @@ if ( -e "$CASEROOT/SourceMods/src.mpascice/$STREAM_NAME" ) {
if ( $ICE_BGC eq 'ice_bgc' ) {
print $stream_file ' ' . "\n";
print $stream_file ' ' . "\n";
+ print $stream_file ' ' . "\n";
print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
}
print $stream_file '' . "\n";
print $stream_file '' . "\n";
-
- if ( $ICE_BGC eq 'ice_bgc' ) {
- print $stream_file '' . "\n";
-
- print $stream_file '' . "\n";
-
- print $stream_file '' . "\n";
-
- print $stream_file '' . "\n";
-
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file ' ' . "\n";
- print $stream_file '' . "\n";
- }
-
- print $stream_file '' . "\n";
-
print $stream_file '
cold_start
spunup
- spunup
case_comp
env_case.xml
diff --git a/components/mpas-o/bld/build-namelist b/components/mpas-o/bld/build-namelist
index d4fcd52b9b4a..48963d17d8ec 100755
--- a/components/mpas-o/bld/build-namelist
+++ b/components/mpas-o/bld/build-namelist
@@ -930,48 +930,16 @@ add_default($nl, 'config_use_debugTracers_ttd_forcing');
if ($ocn_bgc eq 'eco_only' || $ocn_bgc eq 'eco_and_dms' || $ocn_bgc eq 'eco_and_macromolecules' || $ocn_bgc eq 'eco_and_dms_and_macromolecules' ) {
add_default($nl, 'config_use_ecosysTracers', 'val'=>".true.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level1', 'val'=>".true.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level2', 'val'=>".true.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level3', 'val'=>".true.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level4', 'val'=>".true.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level5', 'val'=>".false.");
} else {
add_default($nl, 'config_use_ecosysTracers', 'val'=>".false.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level1', 'val'=>".false.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level2', 'val'=>".false.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level3', 'val'=>".false.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level4', 'val'=>".false.");
- add_default($nl, 'config_ecosysTracers_diagnostic_fields_level5', 'val'=>".false.");
}
if ($ocn_co2_type eq 'constant' ) {
add_default($nl, 'config_ecosys_atm_co2_option', 'val'=>"constant");
add_default($nl, 'config_ecosys_atm_alt_co2_option', 'val'=>"constant");
- add_default($nl, 'config_ecosys_atm_alt_co2_use_eco', 'val'=>".false.");
- add_default($nl, 'config_ecosys_atm_co2_constant_value', 'val'=>$atm_co2_const_val);
-} elsif ($ocn_co2_type eq 'bcrc' ) {
- add_default($nl, 'config_ecosys_atm_co2_option', 'val'=>"constant");
- add_default($nl, 'config_ecosys_atm_alt_co2_option', 'val'=>"constant");
- add_default($nl, 'config_ecosys_atm_alt_co2_use_eco', 'val'=>".false.");
- add_default($nl, 'config_ecosys_atm_co2_constant_value', 'val'=>$atm_co2_const_val);
-} elsif ($ocn_co2_type eq 'bcrd' ) {
- add_default($nl, 'config_ecosys_atm_co2_option', 'val'=>"constant");
- add_default($nl, 'config_ecosys_atm_alt_co2_option', 'val'=>"constant");
- add_default($nl, 'config_ecosys_atm_alt_co2_use_eco', 'val'=>".false.");
- add_default($nl, 'config_ecosys_atm_co2_constant_value', 'val'=>$atm_co2_const_val);
-} elsif ($ocn_co2_type eq 'bdrc' ) {
- add_default($nl, 'config_ecosys_atm_co2_option', 'val'=>"diagnostic");
- add_default($nl, 'config_ecosys_atm_alt_co2_option', 'val'=>"constant");
- add_default($nl, 'config_ecosys_atm_alt_co2_use_eco', 'val'=>".false.");
- add_default($nl, 'config_ecosys_atm_co2_constant_value', 'val'=>$atm_co2_const_val);
-} elsif ($ocn_co2_type eq 'bdrd' ) {
- add_default($nl, 'config_ecosys_atm_co2_option', 'val'=>"diagnostic");
- add_default($nl, 'config_ecosys_atm_alt_co2_option', 'val'=>"diagnostic");
- add_default($nl, 'config_ecosys_atm_alt_co2_use_eco', 'val'=>".false.");
add_default($nl, 'config_ecosys_atm_co2_constant_value', 'val'=>$atm_co2_const_val);
} else {
add_default($nl, 'config_ecosys_atm_co2_option', 'val'=>"diagnostic");
add_default($nl, 'config_ecosys_atm_alt_co2_option', 'val'=>"diagnostic");
- add_default($nl, 'config_ecosys_atm_alt_co2_use_eco', 'val'=>".true.");
add_default($nl, 'config_ecosys_atm_co2_constant_value', 'val'=>$atm_co2_const_val);
}
add_default($nl, 'config_use_ecosysTracers_surface_bulk_forcing');
@@ -981,6 +949,11 @@ add_default($nl, 'config_use_ecosysTracers_exponential_decay');
add_default($nl, 'config_use_ecosysTracers_idealAge_forcing');
add_default($nl, 'config_use_ecosysTracers_ttd_forcing');
add_default($nl, 'config_use_ecosysTracers_surface_value');
+add_default($nl, 'config_ecosysTracers_diagnostic_fields_level1');
+add_default($nl, 'config_ecosysTracers_diagnostic_fields_level2');
+add_default($nl, 'config_ecosysTracers_diagnostic_fields_level3');
+add_default($nl, 'config_ecosysTracers_diagnostic_fields_level4');
+add_default($nl, 'config_ecosysTracers_diagnostic_fields_level5');
if ($ice_bgc eq 'ice_bgc' ) {
add_default($nl, 'config_use_ecosysTracers_sea_ice_coupling', 'val'=>".true.");
} else {
diff --git a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
index a42a7119ec18..367737a4f8f7 100644
--- a/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
+++ b/components/mpas-o/bld/namelist_files/namelist_defaults_mpas-o.xml
@@ -430,7 +430,6 @@
.false.
none
none
-.true.
379.000
.false.
.false.
diff --git a/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml b/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
index bbcffe638ba3..f3c7ca405da0 100644
--- a/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
+++ b/components/mpas-o/bld/namelist_files/namelist_definition_mpas-o.xml
@@ -2335,14 +2335,6 @@ Valid values: none,constant,prognostic,diagnostic
Default: Defined in namelist_defaults.xml
-
-sets whether alt DIC field uses ecosystem source-sink terms
-
-Valid values: .true. or .false.
-Default: Defined in namelist_defaults.xml
-
-
value of atm co2 when config_ecosys_atm_co2_option = constant
diff --git a/components/mpas-o/cime_config/buildnml b/components/mpas-o/cime_config/buildnml
index 5e7477e1e1f3..3deed74b5dd4 100755
--- a/components/mpas-o/cime_config/buildnml
+++ b/components/mpas-o/cime_config/buildnml
@@ -23,8 +23,7 @@ my $OCN_CO2_TYPE = `./xmlquery OCN_CO2_TYPE -value`;
my $ATM_CO2_CONST_VAL = `./xmlquery CCSM_CO2_PPMV -value`;
my $ICE_BGC = `./xmlquery MPASI_BGC -value`;
my $NTASKS_OCN = `./xmlquery NTASKS_OCN -value`;
-my $NTHRDS_OCN = `./xmlquery NTHRDS_OCN -value`;
-my $OCN_PIO_TYPENAME = `./xmlquery OCN_PIO_TYPENAME -value`;
+my $OCN_PIO_TYPENAME = `./xmlquery OCN_PIO_TYPENAME -value`;
#my $NINST_OCN = `./xmlquery NINST_OCN -value`;
my $NINST_OCN = 1; # Change if you want multiple instances... though this isn't coded yet.
my $RUNDIR = `./xmlquery RUNDIR -value`;
@@ -45,14 +44,6 @@ if (! -d "$CASEBUILD/mpas-oconf" ) {
system($sysmod) == 0 or die "ERROR mpas-o buildnml: $sysmod failed: $?\n";
}
-#--------------------------------------------------------------------
-# MPAS-O with active BGC fails bfb restart with more than 1 thread
-# DO NOT run with ocean bgc turned on with more than 1 thread
-#--------------------------------------------------------------------
-if ($NTHRDS_OCN ne 1 and $OCN_BGC ne 'no_bgc') {
- die " ERROR mpas-o buildnml: ocn bgc cannot be run with more than 1 thread\n";
-}
-
#--------------------------------------------------------------------
# Determine date stamp, from grid names
#--------------------------------------------------------------------
@@ -170,16 +161,6 @@ if ( $OCN_GRID eq 'oEC60to30' ) {
$decomp_prefix .= 'mpas-o.graph.info.';
}
-#--------------------------------------------------------------------
-# modify initial condition file if ocean BGC is turned on
-#--------------------------------------------------------------------
-if ( $OCN_GRID eq 'oEC60to30v3') {
- if ( $OCN_BGC eq 'eco_only' || $OCN_BGC eq 'eco_and_dms' || $OCN_BGC eq 'eco_and_macromolecules' || $OCN_BGC eq 'eco_and_dms_and_macromolecules') {
- $ic_date = '180403';
- $ic_prefix = 'mpaso.rst.BCRC_CNPECACNT_1850_anvil02.0061-01-01.no-xtime';
- }
-}
-
chdir "$CASEBUILD/mpas-oconf";
#--------------------------------------------------------------------
@@ -333,9 +314,15 @@ if ( -e "$CASEROOT/SourceMods/src.mpaso/$STREAM_NAME" ) {
print $stream_file ' io_type="' . "$OCN_PIO_TYPENAME" . '"' . "\n";
}
print $stream_file ' input_interval="initial_only"' . "\n";
+ if ( $OCN_BGC eq 'eco_only' || $OCN_BGC eq 'eco_and_dms' || $OCN_BGC eq 'eco_and_macromolecules' || $OCN_BGC eq 'eco_and_dms_and_macromolecules') {
+ print $stream_file " filename_template=" . '"'
+ . "$DIN_LOC_ROOT/ocn/mpas-o/$OCN_MASK/oEC60to30v3.161222+BGC_IC.nc"
+ . '"' . "\n";
+ } else {
print $stream_file " filename_template=" . '"'
. "$input_file"
. '"' . "\n";
+ }
print $stream_file '/>' . "\n";
print $stream_file '' . "\n";
print $stream_file '