merge top and snicar_nonspheric

Author: daleihao

components/elm/bld/namelist_files/namelist_defaults.xml

@@ -556,6 +556,10 @@ this mask will have smb calculated over the entire global land surface
 <fsnowoptics >lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</fsnowoptics>
 <fsnowaging  >lnd/clm2/snicardata/snicar_drdt_bst_fit_60_c070416.nc</fsnowaging>
 <use_snicar_ad>.true.</use_snicar_ad>
+<snow_shape_defined>1</snow_shape_defined>
+<is_dust_internal_mixing>.false.</is_dust_internal_mixing>
+<is_BC_internal_mixing>.false.</is_BC_internal_mixing>
+<snicar_atm_type>0</snicar_atm_type>
 
 <!-- Nitrogen deposition streams namelist defaults -->
 <stream_year_first_ndep use_cn=".true."   sim_year="2000" >2000</stream_year_first_ndep>

components/elm/bld/namelist_files/namelist_definition.xml

@@ -511,7 +511,7 @@ Per tape series history write frequency.
 </entry>
 
 <entry id="metdata_biases" type="char*400" category="datasets"
-       group="elm_inparm" valid_values="">
+group="elm_inparm" valid_values="">
 </entry>
 
 <entry id="co2_file" type="char*400" category="datasets"
@@ -645,6 +645,27 @@ The same snow shortwave algorithm can be turned on for sea-ice simulation
 with config_use_snicar_ad in mpas-seaice namelist
 </entry>
 
+<entry id="snow_shape_defined" type="integer" category="physics"
+       group="elm_inparm" valid_values="" value="1">
+snow shape: 1=sphere (original assumption in SNICAR)
+            2=spheroid; 3=hexagonal plate; 4=koch snowflake
+</entry>
+ 
+<entry id="is_dust_internal_mixing" type="logical" category="physics"
+       group="elm_inparm" valid_values="" value=".false.">
+is_dust_internal_mixing 
+</entry>
+
+<entry id="is_BC_internal_mixing" type="logical" category="physics"
+       group="elm_inparm" valid_values="" value=".false.">
+is_BC_internal_mixing
+</entry>
+
+<entry id="snicar_atm_type" type="integer" category="physics"
+       group="elm_inparm" valid_values="" value="0">
+atmospheric types for snicar
+</entry>
+
 <entry id="use_extrasnowlayers" type="logical" category="physics"
        group="elm_inparm" valid_values="" value=".false.">
 Toggle to use 16 snow layers instead of 5.  This option enables more realistic

components/elm/src/biogeophys/AerosolType.F90

@@ -231,6 +231,39 @@ subroutine InitHistory(this, bounds)
          avgflag='A', long_name='mass of dust in top snow layer', &
          ptr_col=this%mss_dst_top_col, set_urb=spval)
 
+    ! add ouput of mass of aerosols
+         this%mss_cnc_bcphi_col(begc:endc,:) = spval
+    call hist_addfld2d (fname='mss_cnc_bcphi_col', units='kg/kg', type2d='levsno', &
+         avgflag='A', long_name='mss_cnc_bcphi_col', &
+         ptr_col=this%mss_cnc_bcphi_col, no_snow_behavior=no_snow_normal, default='inactive')
+       
+        this%mss_cnc_bcpho_col(begc:endc,:) = spval
+    call hist_addfld2d (fname='mss_cnc_bcpho_col', units='kg/kg', type2d='levsno', &
+         avgflag='A', long_name='mss_cnc_bcpho_col', &
+         ptr_col=this%mss_cnc_bcpho_col, no_snow_behavior=no_snow_normal, default='inactive')
+         
+         this%mss_cnc_dst1_col(begc:endc,:) = spval
+    call hist_addfld2d (fname='mss_cnc_dst1_col', units='kg/kg', type2d='levsno', &
+         avgflag='A', long_name='mss_cnc_dst1_col', &
+         ptr_col=this%mss_cnc_dst1_col, no_snow_behavior=no_snow_normal, default='inactive')
+         
+         this%mss_cnc_dst2_col(begc:endc,:) = spval
+    call hist_addfld2d (fname='mss_cnc_dst2_col', units='kg/kg', type2d='levsno', &
+         avgflag='A', long_name='mss_cnc_dst2_col', &
+         ptr_col=this%mss_cnc_dst2_col, no_snow_behavior=no_snow_normal, default='inactive')
+         
+         this%mss_cnc_dst3_col(begc:endc,:) = spval
+    call hist_addfld2d (fname='mss_cnc_dst3_col', units='kg/kg', type2d='levsno', &
+         avgflag='A', long_name='mss_cnc_dst3_col', &
+         ptr_col=this%mss_cnc_dst3_col, no_snow_behavior=no_snow_normal, default='inactive')
+         
+         this%mss_cnc_dst4_col(begc:endc,:) = spval
+    call hist_addfld2d (fname='mss_cnc_dst4_col', units='kg/kg', type2d='levsno', &
+         avgflag='A', long_name='mss_cnc_dst4_col', &
+         ptr_col=this%mss_cnc_dst4_col, no_snow_behavior=no_snow_normal, default='inactive')
+     
+         
+         
   end subroutine InitHistory
 
   !-----------------------------------------------------------------------