SNICAR snow albedo scheme updates

bld/namelist_files/namelist_definition_ctsm.xml

@@ -150,6 +150,56 @@ specify spatially variable soil thickness. If not present, use bottom
 of soil column (nlevsoi).
 </entry>
 
+<entry id="snicar_numrad_snw" type="integer" category="clm_physics"
+       group="clm_inparm" valid_values="5,480" >
+number of wavelength bands used in SNICAR snow albedo calculation
+</entry>
+
+<entry id="snicar_solarspec" type="integer" category="clm_physics"
+       group="clm_inparm" valid_values="1,2,3,4,5,6" >
+type of downward solar radiation spectrum for SNICAR snow albedo calculation
+</entry>
+
+<entry id="snicar_snw_optics" type="integer" category="clm_physics"
+       group="clm_inparm" valid_values="1,2,3" >
+snow optics type using different refractive index databases in SNICAR
+</entry>
+
+<entry id="snicar_dust_optics" type="integer" category="clm_physics"
+       group="clm_inparm" valid_values="1,2,3" >
+dust optics type for SNICAR snow albedo calculation
+</entry>
+
+<entry id="snicar_use_aerosol" type="logical" category="clm_physics"
+       group="clm_inparm" valid_values="" value=".true.">
+Toggle to turn on/off aerosol deposition flux in snow in SNICAR
+</entry>
+
+<entry id="snicar_rt_solver" type="integer" category="clm_physics"
+       group="clm_inparm" valid_values="1,2" >
+SNICAR radiative transfer solver type
+</entry>
+
+<entry id="snicar_snw_shape" type="integer" category="clm_physics"
+       group="clm_inparm" valid_values="1,2,3,4" >
+snow grain shape used in SNICAR snow albedo calculation
+</entry>
+
+<entry id="snicar_snobc_intmix" type="logical" category="clm_physics"
+       group="clm_inparm" valid_values="" value=".true." >
+option to activate BC-snow internal mixing in SNICAR snow albedo calculation
+</entry>
+
+<entry id="snicar_snodst_intmix" type="logical" category="clm_physics"
+       group="clm_inparm" valid_values="" value=".true." >
+option to activate dust-snow internal mixing in SNICAR snow albedo calculation
+</entry>
+
+<entry id="DO_SNO_OC" type="logical" category="clm_physics"
+       group="clm_inparm" valid_values="" value=".false." >
+option to activate organic carbon (OC) in SNICAR snow albedo calculation
+</entry>
+
 <entry id="rooting_profile_method_water" type="integer" category="clm_physics"
        group="rooting_profile_inparm" valid_values="0,1,2" >
 Index of rooting profile for water
@@ -759,6 +809,12 @@ Full pathname of surface data file.
 SNICAR (SNow, ICe, and Aerosol Radiative model) optical data file name
 </entry>
 
+<entry id="fsnowoptics480" type="char*256" category="datasets" 
+       input_pathname="abs" group="clm_inparm" valid_values="" >
+SNICAR (SNow, ICe, and Aerosol Radiative model) 480-band optical data file name
+</entry>
+
+
 <entry id="fsnowaging" type="char*256"  category="datasets" 
        input_pathname="abs" group="clm_inparm" valid_values="" >
 SNICAR (SNow, ICe, and Aerosol Radiative model) snow aging data file name

src/biogeophys/AerosolMod.F90

@@ -15,6 +15,7 @@ module AerosolMod
   use WaterDiagnosticBulkType   , only : waterdiagnosticbulk_type
   use ColumnType       , only : col               
   use abortutils       , only : endrun
+  use CLM_varctl       , only : snicar_use_aerosol  ! cenlin
   !
   ! !PUBLIC TYPES:
   implicit none
@@ -806,6 +807,33 @@ subroutine AerosolFluxes(bounds, num_snowc, filter_snowc, &
                                forc_aer(g,13) + forc_aer(g,14)
       end do
 
+      ! if turn off aerosol effect in snow, zero out deposition flux
+      if (.not. snicar_use_aerosol) then
+         do c = bounds%begc,bounds%endc
+            g = col%gridcell(c)
+
+            flx_bc_dep_dry(c)   = 0._r8
+            flx_bc_dep_wet(c)   = 0._r8
+            flx_bc_dep_phi(c)   = 0._r8
+            flx_bc_dep_pho(c)   = 0._r8
+            flx_bc_dep(c)       = 0._r8
+            flx_oc_dep_dry(c)   = 0._r8
+            flx_oc_dep_wet(c)   = 0._r8
+            flx_oc_dep_phi(c)   = 0._r8
+            flx_oc_dep_pho(c)   = 0._r8
+            flx_oc_dep(c)       = 0._r8
+            flx_dst_dep_wet1(c) = 0._r8
+            flx_dst_dep_dry1(c) = 0._r8
+            flx_dst_dep_wet2(c) = 0._r8
+            flx_dst_dep_dry2(c) = 0._r8
+            flx_dst_dep_wet3(c) = 0._r8
+            flx_dst_dep_dry3(c) = 0._r8
+            flx_dst_dep_wet4(c) = 0._r8
+            flx_dst_dep_dry4(c) = 0._r8
+            flx_dst_dep(c)      = 0._r8
+         end do
+      end if
+
       ! aerosol deposition fluxes into top layer
       ! This is done after the inter-layer fluxes so that some aerosol
       ! is in the top layer after deposition, and is not immediately