Merge branch 'bishtgautam/lnd/bc-compset' (PR #1448)

Updates the definition of land compset with BC Removes the specification snowoptics parameter via -fsnowoptics in the compset definition for active black carbon (BC). Fixes #702 [NML] [BFB]
E3SM-Project · May 4, 2017 · c414cfb · c414cfb
2 parents ef21b99 + 1d4b4df
commit c414cfb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/components/cam/bld/namelist_files/namelist_defaults_cam.xml b/components/cam/bld/namelist_files/namelist_defaults_cam.xml
@@ -1569,7 +1569,7 @@
 <fatmlndfrc hgrid="ne240np4"  >share/domains/domain.lnd.ne240np4_gx1v6.120125.nc</fatmlndfrc>
 
 <!-- SNICAR (SNow, ICe, and Aerosol Radiative model) datasets -->
-<fsnowoptics >lnd/clm2/snicardata/snicar_optics_5bnd_c090915.nc</fsnowoptics>
+<fsnowoptics >lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</fsnowoptics>
 <fsnowaging  >lnd/clm2/snicardata/snicar_drdt_bst_fit_60_c070416.nc</fsnowaging>
 
 <!-- River Transport Model 1/2 degree grid river routing file (relative to {csmdata}) -->

diff --git a/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml b/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -510,7 +510,7 @@ this mask will have smb calculated over the entire global land surface
 
 <!-- SNICAR (SNow, ICe, and Aerosol Radiative model) datasets -->
 <!--  ***********  Resolution independent:   ***********  -->
-<fsnowoptics >lnd/clm2/snicardata/snicar_optics_5bnd_c090915.nc</fsnowoptics>
+<fsnowoptics >lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</fsnowoptics>
 <fsnowaging  >lnd/clm2/snicardata/snicar_drdt_bst_fit_60_c070416.nc</fsnowaging>
 
 <!-- Nitrogen deposition streams namelist defaults -->

diff --git a/components/clm/cime_config/config_component.xml b/components/clm/cime_config/config_component.xml
@@ -86,7 +86,7 @@
     <values>
       <value compset="%CNCR"                 >-ignore_ic_year</value>  <!-- ERROR: Never matched, see bug 2025 -->
       <value compset="_CLM45%[^_]*SP"        >-bgc sp</value>
-      <value compset="_CLM45%[^_]*SPBC"      >-bgc sp -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</value>
+      <value compset="_CLM45%[^_]*SPBC"      >-bgc sp</value>
       <value compset="_CLM45%[^_]*CN"        >-bgc cn</value>
       <value compset="_CLM45%[^_]*BGC"       >-bgc bgc</value>
       <value compset="_CLM45%[^_]*CN-CROP"   >-bgc cn -crop</value>
@@ -97,16 +97,16 @@
       <value compset="_CLM45%[^_]*BGCDV-CROP">-bgc bgc -dynamic_vegetation -crop</value>
       <value compset="_CLM45%[^_]*CN-ED"     >-bgc cn -ed_mode</value>
       <value compset="_CLM45%[^_]*BGC-ED"    >-bgc bgc -ed_mode</value>
-      <value compset="_CLM45%[^_]*CRDCTCBC"   >-bgc cn -nutrient c   -nutrient_comp_pathway rd  -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</value>
-      <value compset="_CLM45%[^_]*CNRDCTCBC"  >-bgc cn -nutrient cn  -nutrient_comp_pathway rd  -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</value>
-      <value compset="_CLM45%[^_]*CNPRDCTCBC" >-bgc cn -nutrient cnp -nutrient_comp_pathway rd  -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</value>
-      <value compset="_CLM45%[^_]*CNECACTCBC" >-bgc cn -nutrient cn  -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</value>
-      <value compset="_CLM45%[^_]*CNPECACTCBC">-bgc cn -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</value>
-
-      <value compset="_CLM45%[^_]*CNECACNTBC" >-bgc bgc -nutrient cn  -nutrient_comp_pathway eca -soil_decomp century -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</value>
-      <value compset="_CLM45%[^_]*CNPECACNTBC">-bgc bgc -nutrient cnp -nutrient_comp_pathway eca -soil_decomp century -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</value>
-      <value compset="_CLM45%[^_]*CNECACTCBC" >-bgc bgc -nutrient cn  -nutrient_comp_pathway eca -soil_decomp ctc     -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</value>
-      <value compset="_CLM45%[^_]*CNPECACTCBC">-bgc bgc -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc     -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</value>
+      <value compset="_CLM45%[^_]*CRDCTCBC"   >-bgc cn -nutrient c   -nutrient_comp_pathway rd  -soil_decomp ctc -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNRDCTCBC"  >-bgc cn -nutrient cn  -nutrient_comp_pathway rd  -soil_decomp ctc -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNPRDCTCBC" >-bgc cn -nutrient cnp -nutrient_comp_pathway rd  -soil_decomp ctc -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNECACTCBC" >-bgc cn -nutrient cn  -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNPECACTCBC">-bgc cn -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif </value>
+
+      <value compset="_CLM45%[^_]*CNECACNTBC" >-bgc bgc -nutrient cn  -nutrient_comp_pathway eca -soil_decomp century -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNPECACNTBC">-bgc bgc -nutrient cnp -nutrient_comp_pathway eca -soil_decomp century -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNECACTCBC" >-bgc bgc -nutrient cn  -nutrient_comp_pathway eca -soil_decomp ctc     -methane -nitrif_denitrif </value>
+      <value compset="_CLM45%[^_]*CNPECACTCBC">-bgc bgc -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc     -methane -nitrif_denitrif </value>
 
       <value compset="_CLM50%[^_]*SP"        >-bgc sp</value>
       <value compset="_CLM50%[^_]*BGC"       >-bgc bgc</value>

diff --git a/components/clm/doc/UsersGuide/custom.xml b/components/clm/doc/UsersGuide/custom.xml
@@ -1019,7 +1019,7 @@ appear in your &clm; namelist.
  fsnowaging   =
 '$DIN_LOC_ROOT/lnd/clm2/snicardata/snicar_drdt_bst_fit_60_c070416.nc'
  fsnowoptics	=
-'$DIN_LOC_ROOT/lnd/clm2/snicardata/snicar_optics_5bnd_c090915.nc'
+'$DIN_LOC_ROOT/lnd/clm2/snicardata/snicar_optics_5bnd_c160322.nc'
  fsurdat    =
 '$DIN_LOC_ROOT/lnd/clm2/surfdata/surfdata_0.9x1.25_simyr1850_c091006.nc'
  ice_runoff   = .true.