Merge remote-tracking branch 'origin/wlin/atm/clubbe'

Merge branch 'origin/wlin/atm/clubbe' into master (PR #328)

This merge brings CLUBBe (a final version of CLUBB) including MG2, ZM_trigger_modification, lots of modifications in ICE nucleation.
By default CLUBB is turned off.

CLUBBe branch was a very old without CIME.  Based on suggestions by Doug Jacobsen, I did the following

> git config merge.renamelimit 6000
> git checkout master
> git merge origin/wlin/atm/clubbe

1. Resolve conflicts based on the intermediate branch 'origin/yjinho/atm/clubbe2next_int1'

2. Add many new files
   entire ./clubb/ directory
   cldfrc2m.F90
   hetfrz_classnuc.F90
   hetfrz_classnuc_cam.F90
   micro_mg2_0.F90
   micro_mg_data.F90
   nucleate_ice_cam.F90

3. remove ./models

4. INTEL compile with full debug option passed.
   ACEM_developer test passed on edison (Some failed but consistently without merge).

5. Energy fixer from Po-Lun/Andrew is added.

[BFB]
AG-379

Conflicts:
	cime/machines-acme/Depends.cetus
	cime/scripts/Tools/config_grid.xml
	components/cam/bld/configure
	components/cam/bld/namelist_files/namelist_defaults_cam.xml
	components/cam/bld/namelist_files/namelist_definition.xml
	components/cam/src/dynamics/se/share/namelist_mod.F90
	components/cam/src/dynamics/se/share/prim_driver_mod.F90
	components/cam/src/physics/cam/convect_deep.F90
	components/cam/src/physics/cam/convect_shallow.F90
	components/cam/src/physics/cam/macrop_driver.F90
	components/cam/src/physics/cam/micro_mg_cam.F90
	components/cam/src/physics/cam/microp_aero.F90
	components/cam/src/physics/cam/ndrop.F90
	components/cam/src/physics/cam/nucleate_ice.F90
	components/cam/src/physics/cam/phys_control.F90
	components/cam/src/physics/cam/physpkg.F90
	components/cam/src/physics/cam/zm_conv_intr.F90
	components/cam/src/physics/clubb/clubb_core.F90
	components/cam/src/physics/clubb/csr_matrix_class_3array.F90
	components/cam/src/physics/clubb/extrapolation.F90
	components/cam/src/physics/clubb/hydrostatic_module.F90
	components/cam/src/physics/clubb/hyper_diffusion_4th_ord.F90
	components/cam/src/physics/clubb/parameters_microphys.F90
	components/cam/src/physics/clubb/parameters_radiation.F90
	components/cam/src/physics/clubb/stats_rad_zm.F90
	components/cam/src/physics/clubb/stats_rad_zt.F90
	components/cam/src/physics/clubb/stats_sfc.F90
	components/cam/src/physics/clubb/stats_subs.F90
	components/cam/src/physics/clubb/stats_zm.F90
	components/cam/src/physics/clubb/stats_zt.F90
	components/cam/src/physics/clubb/variables_radiation_module.F90
	components/clm/bld/namelist_files/namelist_defaults_clm4_0.xml
	models/atm/cam/src/physics/clubb/csr_matrix_class_3array.F90
	models/atm/cam/src/physics/clubb/csr_matrix_module.F90

share/csm_share/shr/shr_log_mod.F90

@@ -14,6 +14,7 @@ module shr_log_mod
 ! !USES:
 
   use shr_kind_mod
+  use shr_strconvert_mod, only: toString
 
   use shr_strconvert_mod, only: toString