CLUBB update and clubb_intr improvements

bld/build-namelist

@@ -3503,6 +3503,7 @@ if ($clubb_sgs  =~ /$TRUE/io) {
      die "$ProgName - ERROR: clubb_history = .true. with multiple threads is not supported. \n";
    }
 
+   add_default($nl, 'clubb_l_ascending_grid');
    add_default($nl, 'clubb_do_icesuper');
    add_default($nl, 'clubb_do_energyfix');
    add_default($nl, 'clubb_cloudtop_cooling');
@@ -3594,9 +3595,13 @@ if ($clubb_sgs  =~ /$TRUE/io) {
    add_default($nl, 'clubb_detphase_lowtemp');
    add_default($nl, 'clubb_do_energyfix');
    add_default($nl, 'clubb_do_liqsupersat');
+   add_default($nl, 'clubb_grid_adapt_in_time_method');
+   add_default($nl, 'clubb_fill_holes_type');
+   add_default($nl, 'clubb_grid_remap_method');
    add_default($nl, 'clubb_ipdf_call_placement');
    add_default($nl, 'clubb_lambda0_stability_coef');
    add_default($nl, 'clubb_lmin_coef');
+   add_default($nl, 'clubb_l_add_dycore_grid');
    add_default($nl, 'clubb_l_brunt_vaisala_freq_moist');
    add_default($nl, 'clubb_l_call_pdf_closure_twice');
    add_default($nl, 'clubb_l_damp_wp2_using_em');

bld/namelist_files/namelist_defaults_cam.xml

@@ -2120,6 +2120,7 @@
 <clubb_timestep                                   > 300.0D0 </clubb_timestep>
 <clubb_rnevap_effic                               > 1.0D0   </clubb_rnevap_effic>
 <clubb_do_icesuper                                > .false. </clubb_do_icesuper>
+<clubb_l_ascending_grid                           > .false. </clubb_l_ascending_grid>
 
 
 <!-- Lscale_from_tau set by clubb_opts config option -->
@@ -2180,9 +2181,13 @@
 <clubb_gamma_coef hgrid="1.9x2.5" phys="cam6"     > 0.280   </clubb_gamma_coef>
 <clubb_gamma_coefb                                > 0.32    </clubb_gamma_coefb>
 <clubb_gamma_coefb phys="cam7"                    > 0.3     </clubb_gamma_coefb>
+<clubb_grid_adapt_in_time_method                  > 0       </clubb_grid_adapt_in_time_method>
+<clubb_fill_holes_type                            > 2       </clubb_fill_holes_type>
+<clubb_grid_remap_method                          > 1       </clubb_grid_remap_method>
 <clubb_ipdf_call_placement                        > 2       </clubb_ipdf_call_placement>
 <clubb_lambda0_stability_coef                     > 0.04    </clubb_lambda0_stability_coef>
 <clubb_lmin_coef                                  > 0.1     </clubb_lmin_coef>
+<clubb_l_add_dycore_grid                          > .false. </clubb_l_add_dycore_grid>
 <clubb_l_brunt_vaisala_freq_moist                 > .false. </clubb_l_brunt_vaisala_freq_moist>
 <clubb_l_C2_cloud_frac                            > .false. </clubb_l_C2_cloud_frac>
 <clubb_l_calc_thlp2_rad                           > .true.  </clubb_l_calc_thlp2_rad>

bld/namelist_files/namelist_definition.xml

@@ -3672,6 +3672,13 @@ Switch for CLUBB_ADV parameter that turns on advection of CLUBB pdf moments by
 the dynamics core. Very experimental.
 </entry>
 
+<entry id="clubb_l_ascending_grid" type="logical" category="pblrad"
+       group="clubbpbl_diff_nl" valid_values="" >
+Causes advance_clubb_core to run in ascending mode, where the surface is at k=1, which is opposite
+of the descending cam grid. This is mainly a testing/debugging option - it requires an expensive 
+data flipping step and should not change answers significantly.
+</entry>
+
 <!-- Clubb timestep -->
 <entry id="clubb_timestep" type="real" category="pblrad"
        group="clubbpbl_diff_nl" valid_values="" >
@@ -3940,6 +3947,32 @@ Gaussian PDF, and also decreases the difference between the means of w from
 each Gaussian.
 </entry>
 
+<entry id="clubb_grid_adapt_in_time_method" type="integer" category="pblrad"
+       group="clubb_params_nl" valid_values="0,1" >
+Specifier for method to construct a grid density function to adapt grid to.
+Valid values: 0 (no grid adaptation), 1 (use Lscale and wp2)
+</entry>
+
+<entry id="clubb_fill_holes_type" type="integer" category="pblrad"
+       group="clubb_params_nl" valid_values="0,1,2,3,4,5,6" >
+Selects which algorithm the fill_holes routine uses to correct 
+below threshold values in field solutions.
+0: off - Skip the mass conservative hole filling step, rely on blunt clipping
+1: global - Fast but minimally local, most methods use this as a fallback step
+2: sliding_window - Expensive but highly local when possible, falls back to global fill if needed
+3: widening_windows - Slightly parallelizable, local when possible, falls back to global if needed
+4: smart_window - Uses hueristics to determine ranges to fill, fast and highly local when possible, falls back to global if needed
+5: smart_window_smooth - Same as smart_window, but with experimental smoothing features that slightly increases cost, NO GLOBAL FALLBACK
+6: parallel_fill - Highly local when possible, completely parallelizable but computationally wasteful, falls back to global if needed
+See CLUBB_core/model_flags.F90 or CLUBB_core/fill_holes.F90 for more detail.
+</entry>
+
+<entry id="clubb_grid_remap_method" type="integer" category="pblrad"
+       group="clubb_params_nl" valid_values="1" >
+Specifier for method to remap values from one grid to another.
+Valid values: 1 (ullrich remapping)
+</entry>
+
 <entry id="clubb_iiPDF_type" type="integer" category="pblrad"
        group="clubb_params_nl" valid_values="1,2,3,4,5,6,7" >
 Selected option for the two-component normal (double Gaussian) PDF type to use for the w, rt,
@@ -3966,6 +3999,11 @@ scale (Lscale) in a grid-spacing dependent formula.  Increasing the value of
 clubb_lmin_coef increases the minimum allowable value for length scale.
 </entry>
 
+<entry id="clubb_l_add_dycore_grid" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" >
+Flag to remap values from the dycore grid.
+</entry>
+
 <entry id="clubb_l_brunt_vaisala_freq_moist" type="logical" category="pblrad"
        group="clubb_params_nl" valid_values="" >
 Flag to uses an alternate equation to calculate the Brunt-Vaisala frequency.