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
E3SM-Project · Oct 27, 2015 · 59865f2 · 59865f2
2 parents 368a5c5 + 519a939
commit 59865f2
Show file tree

Hide file tree

Showing 122 changed files with 50,693 additions and 23,984 deletions.
diff --git a/cime/driver_cpl/driver/seq_domain_mct.F90 b/cime/driver_cpl/driver/seq_domain_mct.F90
@@ -32,7 +32,7 @@ module seq_domain_mct
 
   real(R8), parameter :: eps_tiny   = 1.0e-16_R8 ! roundoff eps
   real(R8), parameter :: eps_big    = 1.0e+02_R8 ! big eps
-  real(R8), parameter :: eps_frac_samegrid = 1.0e-14_R8 ! epsilon for fractions for samegrid
+  real(R8), parameter :: eps_frac_samegrid = 1.0e-9_R8 ! epsilon for fractions for samegrid
 
 !--------------------------------------------------------------------------
 ! Private interfaces

diff --git a/cime/machines-acme/Depends.cetus b/cime/machines-acme/Depends.cetus
@@ -10,5 +10,6 @@ mo_sethet.o: mo_sethet.F90
 mo_drydep.o: mo_drydep.F90
 	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(QSMPFLAGS) $<
 time_management.o: time_management.F90
-	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(QSMPFLAGS) $<
-
+	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS)  -qsmp=noauto:noomp $<
+advance_clubb_core_module.o: advance_clubb_core_module.F90
+	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS)  -qsmp=omp:noopt -qinitauto=7FF7FFFF $<
diff --git a/cime/machines-acme/Depends.mira b/cime/machines-acme/Depends.mira
@@ -49,4 +49,8 @@ clmtypeInitMod.o: clmtypeInitMod.F90
 # this takes 2 mins to compile with -qsmp=omp
 clmtype.o: clmtype.F90
 	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -qsmp=noopt $<
+
+# this allows CLUBBe, an updated CLUBB, to run on mira
+advance_clubb_core_module.o: advance_clubb_core_module.F90
+	$(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS)  -qsmp=omp:noopt -qinitauto=7FF7FFFF $<
 ### end
diff --git a/cime/share/csm_share/shr/shr_log_mod.F90 b/cime/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
 

diff --git a/components/cam/bld/build-namelist b/components/cam/bld/build-namelist
@@ -2612,10 +2612,16 @@ add_default($nl, 'demott_ice_nuc');
 # Microphysics scheme
 add_default($nl, 'use_subcol_microp');
 add_default($nl, 'microp_scheme');
+add_default($nl, 'micro_do_icesupersat');
 add_default($nl, 'macrop_scheme');
 if ($cfg->get('microphys') =~ /^mg/) {
     add_default($nl, 'micro_mg_version');
     add_default($nl, 'micro_mg_sub_version');
+    add_default($nl, 'micro_mg_num_steps');
+    add_default($nl, 'nucleate_ice_subgrid');
+    add_default($nl, 'cld_macmic_num_steps');
+    add_default($nl, 'micro_mg_precip_frac_method');
+    add_default($nl, 'micro_mg_berg_eff_factor');
 }
 add_default($nl, 'micro_mg_dcs');
 
@@ -2662,11 +2668,34 @@ else {
 
 # CLUBB_SGS
 add_default($nl, 'do_clubb_sgs');
-add_default($nl, 'clubb_history');
-add_default($nl, 'clubb_rad_history');
+my $clubb_sgs = $nl->get_value('do_clubb_sgs');
+if ($clubb_sgs  =~ /$TRUE/io) {
+   my $clubb_do_adv = $cfg->get('clubb_do_adv');
+   if($clubb_do_adv == '1') {
+       add_default($nl, 'clubb_do_adv', 'val'=>'.true.');
+   }
+   my $clubb_do_deep = $cfg->get('clubb_do_deep');
+   if($clubb_do_deep == '1') {
+       add_default($nl, 'clubb_do_deep', 'val'=>'.true.');
+   }
+   add_default($nl, 'clubb_history');
+   add_default($nl, 'clubb_rad_history');
+
+   # Check compatibility of clubb_do_deep (if set) with deep_scheme
+   my $clubb_do_deep = $nl->get_value('clubb_do_deep');
+   if (defined $clubb_do_deep) {
+      my $deep_scheme = $nl->get_value('deep_scheme');
+      if ($deep_scheme ne "'CLUBB_SGS'" &&  $clubb_do_deep == /$TRUE/io) {
+        die "$ProgName - ERROR: clubb_do_deep = .true. but incompatible deep_scheme=$deep_scheme and needs to be 'CLUBB_SGS'\n";
+      }
+   }
 
-if ($nl->get_value('clubb_history') =~ "true" &&  $nl->get_value('atm_nthreads') != 1) {
-  die "$ProgName - ERROR: clubb_history = .true. with multiple threads is not supported. \n";
+   add_default($nl, 'clubb_expldiff');
+   add_default($nl, 'clubb_rainevap_turb');
+   add_default($nl, 'clubb_cloudtop_cooling');
+   add_default($nl, 'clubb_timestep');
+   add_default($nl, 'clubb_rnevap_effic');
+   add_default($nl, 'clubb_stabcorrect');
 }
 
 #in-cloud scav tuning for cloud-borne aerosol
@@ -2714,6 +2743,13 @@ add_default($nl, 'cldfrc_premit');
 add_default($nl, 'cldfrc_premib');
 add_default($nl, 'cldfrc_iceopt');
 add_default($nl, 'cldfrc_icecrit');
+add_default($nl, 'cldfrc2m_rhmini');
+add_default($nl, 'cldfrc2m_rhmaxi');
+
+my $cldfrc_rhminp = $nl->get_value('cldfrc_rhminp');
+if ($cldfrc_rhminp and !($cfg->get('microphys') eq 'rk')) {
+    die "$ProgName - ERROR: cldfrc_rhminp is valid only for RK microphysics scheme\n";
+}
 
 # condensate to rain autoconversion coefficients
 add_default($nl, 'zmconv_c0_lnd');
@@ -3167,6 +3203,7 @@ add_default($nl, 'history_aero_optics');
 add_default($nl, 'history_budget');
 add_default($nl, 'history_eddy');
 add_default($nl, 'history_waccm');
+add_default($nl, 'history_clubb');
 
 # The history output for the AMWG variability diagnostics assumes that auxilliary history
 # files h1, h2, and h3 contain daily, 6-hrly, and 3-hrly output respectively.  If this output

diff --git a/components/cam/bld/config_files/definition.xml b/components/cam/bld/config_files/definition.xml
@@ -38,15 +38,24 @@ Option to turn on waccmx thermosphere/ionosphere extension: 0 => no, 1 => yes
 <entry id="phys" valid_values="cam3,cam3_5_1,cam4,cam5,ideal,adiabatic" value="">
 Physics package: cam3, cam4, cam5, ideal (Held-Suarez forcings), adiabatic.
 </entry>
-<entry id="microphys" valid_values="rk,mg1,mg1.5" value="">
-Microphysics package: rk (Rasch and Kristjansson), mg1 (Morrison and Gettelman two moment scheme CAM5.1), mg1.5 (Morrison and Gettelman second version development).
+<entry id="microphys" valid_values="rk,mg1,mg1.5,mg2" value="">
+Microphysics package: rk (Rasch and Kristjansson), mg1 (Morrison and Gettelman two moment scheme CAM5.1), mg1.5 (Morrison and Gettelman second version development), mg2 ((Morrison and Gettelman second version).
 </entry>
 <entry id="macrophys" valid_values="rk,park,clubb_sgs,none" value="">
 Macrophysics package: RK, Park, CLUBB_SGS.
 </entry>
 <entry id="clubb_sgs" valid_values="0,1" value="0">
 Switch to turn on/off CLUBB_SGS package: 0 => no, 1 => yes
 </entry>
+<entry id="unicon" valid_values="0,1" value="0">
+Switch to turn on UNICON package: 0 => off, 1 => on
+</entry>
+<entry id="clubb_do_deep" valid_values="0,1" value="0">
+Switch to turn on/off CLUBB_SGS using clubb to calculate deep: 0 => no, 1 => yes
+</entry>
+<entry id="clubb_do_adv" valid_values="0,1" value="0">
+Switch to turn on/off advecting CLUBB moments: 0 => no, 1 => yes
+</entry>
 <entry id="pbl" valid_values="uw,hb,hbr,clubb_sgs" value="">
 PBL package: uw (University of Washington), hb (Holtslag and Boville), hbr
  (Holtslag, Boville, and Rasch), clubb_sgs.

diff --git a/components/cam/bld/configure b/components/cam/bld/configure
@@ -124,6 +124,8 @@ OPTIONS
                           trop_mam3 | trop_mam4 | trop_mam7 | super_fast_llnl | super_fast_llnl_mam3 |
                           trop_strat_soa | trop_strat_mam3 | trop_strat_mam7 | none ].  Default: trop_mam3.
      -clubb_sgs         Turns on CLUBB_SGS
+     -clubb_opts <list> Comma separated list of CLUBB options to turn on/off.  By default they are all off.  Current
+                        options are: clubb_do_adv(Advect CLUBB moments), clubb_do_deep(CLUBB does the deep convection) 
      -co2_cycle         This option is meant to be used with the -ccsm_seq option.  It modifies the
                         CAM configuration by increasing the number of advected constituents by 4.
      -comp_intf         Specify the component interfaces [mct | esmf] (default: mct).
@@ -859,8 +861,15 @@ if ($co2_cycle and $print>=2) { print "co2_cycle option: ON$eol"; }
 #-----------------------------------------------------------------------------------------------
 # Micro-physics package
 
-# Set default
-my $microphys_pkg = 'mg2';
+# The default for the current physics package is:
+my $microphys_pkg = 'mg1';
+
+#Set the default microphysics package for CLUBB to mg2
+if (defined $opts{'clubb_sgs'}) {
+    $microphys_pkg = 'mg2';
+}
+
+# But if the physics package is adiabatic, ideal, cam3, cam4, change the default
 if ($phys_pkg =~ m/^ideal$|^adiabatic$|^cam[34]$/) {
     $microphys_pkg = 'rk';
 }
@@ -923,6 +932,20 @@ if ($clubb_sgs and $microphys_pkg !~ m/^mg/) {
 EOF
 }
 
+#-----------------------------------------------------------------------------------------------
+# Break apart CLUBB options into separate fields
+
+if (defined $opts{'clubb_opts'}) {
+     my @clubb_temp_opts = split /,/, $opts{'clubb_opts'};
+     foreach (@clubb_temp_opts) {     
+        $cfg_ref->set("$_", '1');
+     }
+}
+my $clubb_do_deep = $cfg_ref->get('clubb_do_deep');
+my $clubb_do_adv = $cfg_ref->get('clubb_do_adv');
+if ($print>=2) { print "clubb_do_deep=',$clubb_do_deep,$eol"; }
+if ($print>=2) { print "clubb_do_adv=',$clubb_do_adv,$eol"; }
+
 #-----------------------------------------------------------------------------------------------
 # Macro-physics package
 
@@ -1403,8 +1426,12 @@ else {
             $nadv += 8;
             if ($print>=2) { print "Advected constituents added by $microphys_pkg microphysics: 8$eol"; }
         }
-
-
+
+	if ($clubb_do_adv) {
+	    $nadv += 9;
+            if ($print>=2) { print "Advected constituents added by $microphys_pkg microphysics: 8$eol"; }
+	}
+
         # co2_cycle
         if ($co2_cycle) {
             $nadv += 4;
@@ -1937,6 +1964,10 @@ $cfg_cppdefs .= ' -DHAVE_VPRINTF -DHAVE_TIMES -DHAVE_GETTIMEOFDAY -DHAVE_COMM_F2
 unless ($target_os eq 'aix' or $target_os =~ 'bg' or $target_os eq 'darwin') { 
     $cfg_cppdefs .= ' -DHAVE_NANOTIME -DBIT64 -DHAVE_SLASHPROC';
 }
+if ($clubb_do_deep == 1) {
+  $cfg_cppdefs .= ' -DCLUBBND_CAM';
+}
+
 #-----------------------------------------------------------------------------------------------
 # External libraries ###########################################################################
 #-----------------------------------------------------------------------------------------------

diff --git a/components/cam/bld/namelist_files/namelist_defaults_cam.xml b/components/cam/bld/namelist_files/namelist_defaults_cam.xml
@@ -727,31 +727,67 @@
 <do_clubb_sgs                > .false. </do_clubb_sgs>
 <do_clubb_sgs  clubb_sgs="1" > .true.  </do_clubb_sgs>
 
+<!-- CLUBB options -->
+<clubb_rainevap_turb                              > .false. </clubb_rainevap_turb>
+<clubb_rainevap_turb microphys="mg2" clubb_sgs="1"> .true.  </clubb_rainevap_turb>
+<clubb_cloudtop_cooling                           > .false. </clubb_cloudtop_cooling>
+<clubb_expldiff                                   > .false. </clubb_expldiff>
+<clubb_expldiff     clubb_sgs="1"                 > .true.  </clubb_expldiff>
+<clubb_stabcorrect                                > .false. </clubb_stabcorrect>
+<clubb_timestep                                   > 300.0D0 </clubb_timestep>
+<clubb_rnevap_effic                               > 1.2D0   </clubb_rnevap_effic>
 
 <!-- CLUBB_history -->
 <clubb_history               > .false. </clubb_history>
 <clubb_rad_history           > .false. </clubb_rad_history>
 
 
 <!-- Microphysics scheme -->
-<microp_scheme microphys="rk">RK</microp_scheme>
-<microp_scheme microphys="mg1">MG</microp_scheme>
+<microp_scheme microphys="rk">   RK</microp_scheme>
+<microp_scheme microphys="mg1">  MG</microp_scheme>
 <microp_scheme microphys="mg1.5">MG</microp_scheme>
+<microp_scheme microphys="mg2">  MG</microp_scheme>
 
-<micro_mg_version microphys="mg1">1</micro_mg_version>
-<micro_mg_sub_version microphys="mg1">0</micro_mg_sub_version>
+<micro_mg_version     microphys="mg1">    1          </micro_mg_version>
+<micro_mg_sub_version microphys="mg1">    0          </micro_mg_sub_version>
+<micro_mg_num_steps   microphys="mg1">    1          </micro_mg_num_steps>
+<micro_mg_dcs         microphys="mg1">    400.D-6    </micro_mg_dcs>
 
-<micro_mg_version microphys="mg1.5">1</micro_mg_version>
-<micro_mg_sub_version microphys="mg1.5">5</micro_mg_sub_version>
+<micro_mg_version     microphys="mg1.5">  1          </micro_mg_version>
+<micro_mg_sub_version microphys="mg1.5">  5          </micro_mg_sub_version>
+<micro_mg_num_steps   microphys="mg1.5">  2          </micro_mg_num_steps>
+<micro_mg_dcs         microphys="mg1.5">  250.D-6    </micro_mg_dcs>
+
+<micro_mg_version     microphys="mg2">                                 2          </micro_mg_version>
+<micro_mg_sub_version microphys="mg2">                                 0          </micro_mg_sub_version>
+<micro_mg_num_steps   microphys="mg2">                                 2          </micro_mg_num_steps>
+<micro_mg_num_steps   microphys="mg2" clubb_sgs="1">                   1          </micro_mg_num_steps>
+<micro_mg_dcs         microphys="mg2">                                 150.D-6    </micro_mg_dcs>
+<micro_mg_dcs         microphys="mg2" clubb_sgs="1">                   195.D-6    </micro_mg_dcs>
+<micro_mg_dcs         microphys="mg2" clubb_sgs="1" clubb_do_deep="1"> 195.D-6    </micro_mg_dcs>
+
+<micro_mg_precip_frac_method                  >  max_overlap </micro_mg_precip_frac_method>
+<micro_mg_precip_frac_method   clubb_sgs="1"  >  in_cloud    </micro_mg_precip_frac_method>
+
+<micro_mg_berg_eff_factor                  >  1.0D0    </micro_mg_berg_eff_factor>
+<micro_mg_berg_eff_factor   clubb_sgs="1"  >  0.1D0    </micro_mg_berg_eff_factor>
+
+<micro_do_icesupersat> .false. </micro_do_icesupersat>
+
+<cld_macmic_num_steps>                               1 </cld_macmic_num_steps>
+<cld_macmic_num_steps microphys="mg2" clubb_sgs="1"> 6 </cld_macmic_num_steps>
 
 <microp_uniform>.false.</microp_uniform>
 <!-- Added flags for regenration and liq cld frac bug fixes    -->
 <regen_fix             >.false.</regen_fix>
 <liqcf_fix             >.false.</liqcf_fix>
 
-<micro_mg_dcs                                     > 400.0D-6 </micro_mg_dcs>
-<micro_mg_dcs     phys="cam5" microphys="mg1"     > 400.0D-6 </micro_mg_dcs>
-<micro_mg_dcs     phys="cam5" microphys="mg1.5"   > 250.0D-6 </micro_mg_dcs>
+<!-- Ice nucleation -->
+<nucleate_ice_subgrid                  >1.0D0</nucleate_ice_subgrid>
+<nucleate_ice_subgrid microphys="mg1"  >1.2D0</nucleate_ice_subgrid>
+<nucleate_ice_subgrid microphys="mg1.5">1.2D0</nucleate_ice_subgrid>
+<nucleate_ice_subgrid clubb_sgs="1"     microphys="mg2" >1.2D0</nucleate_ice_subgrid>
+<nucleate_ice_subgrid clubb_do_deep="1" microphys="mg2" >1.0D0</nucleate_ice_subgrid>
 
 <!-- Macrophysics scheme -->
 <macrop_scheme                       >none</macrop_scheme>
@@ -824,6 +860,8 @@
 <!-- ice nucleation option by PNNL -->
 <demott_ice_nuc>.false.</demott_ice_nuc>
 
+<sol_facti_cloud_borne clubb_sgs="1" microphys="mg2"                  >1.0D0</sol_facti_cloud_borne>
+<sol_facti_cloud_borne clubb_sgs="1" clubb_do_deep="1" microphys="mg2">3.0D0</sol_facti_cloud_borne>
 
 <!-- sub-column switches for physics packages -->
 <use_subcol_microp>.false.</use_subcol_microp>
@@ -846,6 +884,8 @@
 
 <!-- Deep convection scheme -->
 <deep_scheme>ZM</deep_scheme>
+<deep_scheme clubb_do_deep="1" >CLUBB_SGS</deep_scheme>
+<deep_scheme unicon="1"        >UNICON   </deep_scheme>
 
 <!-- PBL scheme -->
 <eddy_scheme pbl="uw"             >diag_TKE </eddy_scheme>
@@ -854,6 +894,7 @@
 <eddy_scheme pbl="clubb_sgs"      >CLUBB_SGS</eddy_scheme>
 
 <shallow_scheme pbl="uw"          >UW       </shallow_scheme>
+<shallow_scheme pbl="uw" unicon="1">UNICON   </shallow_scheme>
 <shallow_scheme pbl="hb"          >Hack     </shallow_scheme>
 <shallow_scheme pbl="hbr"         >Hack     </shallow_scheme>
 <shallow_scheme pbl="clubb_sgs"   >CLUBB_SGS</shallow_scheme>
@@ -872,6 +913,7 @@
 
 <cldfrc_rhminl                                                        > 0.900D0 </cldfrc_rhminl>
 <cldfrc_rhminl                   phys="cam5" carma="cirrus"           > 0.910D0 </cldfrc_rhminl>
+<cldfrc_rhminl                   phys="cam5" microphys="mg2"          > 0.950D0 </cldfrc_rhminl>
 <cldfrc_rhminl                   phys="cam5"                          > 0.8975D0 </cldfrc_rhminl>
 <cldfrc_rhminl hgrid="1.9x2.5"   phys="cam5" microphys="mg1.5"        > 0.9125D0 </cldfrc_rhminl>
 <cldfrc_rhminl hgrid="1.9x2.5"   phys="cam5"                          > 0.8875D0 </cldfrc_rhminl>
@@ -949,9 +991,15 @@
 <cldfrc_icecrit             carma="cirrus" > 0.70D0 </cldfrc_icecrit>
 <cldfrc_icecrit phys="cam5" carma="cirrus" > 0.70D0 </cldfrc_icecrit>
 
+<cldfrc2m_rhmini               >  0.80D0  </cldfrc2m_rhmini>
+<cldfrc2m_rhmini   unicon="1"  >  0.85D0  </cldfrc2m_rhmini>
+
+<cldfrc2m_rhmaxi                                     >  1.1D0  </cldfrc2m_rhmaxi>
+<cldfrc2m_rhmaxi    clubb_sgs="1" clubb_do_deep="0"  >  1.0D0  </cldfrc2m_rhmaxi>
+
 <!-- Cldwat -->
 <cldwat_icritc                                                        >  5.0e-6  </cldwat_icritc>
-<cldwat_icritc  dyn="fv"                                              >  9.5e-6  </cldwat_icritc>
+<cldwat_icritc  dyn="fv"           unicon="1"                         >  9.5e-6  </cldwat_icritc>
 <cldwat_icritc  dyn="fv"  hgrid="0.23x0.31"                           > 45.0e-6  </cldwat_icritc>
 <cldwat_icritc  dyn="fv"  hgrid="0.47x0.63"                           > 45.0e-6  </cldwat_icritc>
 <cldwat_icritc  dyn="fv"  hgrid="0.5x0.625"                           > 45.0e-6  </cldwat_icritc>
@@ -1006,6 +1054,7 @@
 <zmconv_c0_lnd                                                        > 0.0030D0 </zmconv_c0_lnd>
 <zmconv_c0_lnd                                    phys="cam5"         > 0.0059D0 </zmconv_c0_lnd>
 <zmconv_c0_lnd                   hgrid="ne120np4" phys="cam5"         > 0.0035D0 </zmconv_c0_lnd>
+<zmconv_c0_lnd  microphys="mg2"  clubb_sgs="1"    phys="cam5"         > 0.0075D0 </zmconv_c0_lnd>
 <zmconv_c0_lnd  dyn="fv"                          phys="cam4"         > 0.0035D0 </zmconv_c0_lnd>
 <zmconv_c0_lnd  dyn="se"                       phys="cam4"         > 0.0035D0 </zmconv_c0_lnd>
 <zmconv_c0_lnd                   hgrid="48x96"    phys="cam4"         > 0.0020D0 </zmconv_c0_lnd>
@@ -1032,6 +1081,7 @@
 <zmconv_ke                       hgrid="256x512"                      > 1.0E-6 </zmconv_ke>
 <zmconv_ke                       hgrid="512x1024"                     > 1.0E-6 </zmconv_ke>
 
+<zmconv_trigmem>                 .false.   </zmconv_trigmem>
 
 <!-- Cloud sedimentation -->
 
@@ -1088,6 +1138,7 @@
 <history_budget>               .false.  </history_budget>
 <history_waccm>                .false.  </history_waccm>
 <history_waccm waccm_phys="1"> .true.   </history_waccm>
+<history_clubb>      .true.   </history_clubb>
 
 <!-- BSINGH - ndrop.F90 "repeated g1 equation" bug fix flag -->
 <fix_g1_err_ndrop>             .false.  </fix_g1_err_ndrop>
@@ -1130,6 +1181,11 @@
 
 
 
+<nu hgrid="ne0np4_arm_x8v3_lowcon"  > 8.0e-8</nu>
+<nu hgrid="ne0np4_conus_x4v1_lowcon"  > 8.0e-8</nu>
+<nu hgrid="ne0np4_svalbard_x8v1_lowcon"  > 8.0e-8</nu>
+<nu hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 8.0e-8</nu>
+
 <!-- This will set nu_q to nu internally. -->
 <nu_q> -1.0 </nu_q>
 
@@ -1217,6 +1273,7 @@
 <se_ne hgrid="ne0np4_svalbard_x8v1_lowcon"  > 0 </se_ne>
 <se_ne hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 0 </se_ne>
 
+
 <se_ftype> 0 </se_ftype>
 
 <se_phys_tscale> 0 </se_phys_tscale>