Complete CCPPization of CAM5 UW (diag_TKE) PBL scheme; cleanup to vertical_diffusion_tend

bld/configure

@@ -2150,6 +2150,7 @@ sub write_filepath
     print $fh "$camsrcdir/src/atmos_phys/schemes/cloud_fraction\n";
     print $fh "$camsrcdir/src/atmos_phys/schemes/vertical_diffusion\n";
     print $fh "$camsrcdir/src/atmos_phys/schemes/holtslag_boville\n";
+    print $fh "$camsrcdir/src/atmos_phys/schemes/bretherton_park\n";
 
     # Dynamics package and test utilities
     print $fh "$camsrcdir/src/dynamics/$dyn\n";

bld/namelist_files/namelist_definition.xml

@@ -3610,12 +3610,12 @@ Default: 100.e3 (hPa)
 <entry id="eddy_moist_entrain_a2l" type="real" category="pbl"
        group="eddy_diff_nl" valid_values="" >
 Moist entrainment enhancement parameter.
-Default: set by build-namelist
+Default: 30.D0
 </entry>
 
 <entry id="kv_top_pressure" type="real" category="pbl"
        group="eddy_diff_nl" valid_values="" >
-Pressure (Pa) that defined the upper atmosphere for adjustment of
+Pressure (Pa) that defines the upper atmosphere for adjustment of
 eddy diffusivities from diag_TKE using kv_top_scale.
 Default: 0.
 </entry>

src/control/cam_snapshot_common.F90

@@ -1442,7 +1442,7 @@ subroutine fill_pbuf_info(pbuf_info, pbuf, const_cname)
           'ipbl                   ','unset                  ',&
           'ISS_FRAC               ','unset                  ',&
           'kpblh                  ','unset                  ',&
-          'ksrftms                ','unset                  ',&
+          'ksrftms                ','kg/m2/s                ',&
           'kvh                    ','m2/s                   ',&
           'kvm                    ','m2/s                   ',&
           'kvt                    ','m2/s                   ',&
@@ -1606,7 +1606,7 @@ subroutine fill_pbuf_info(pbuf_info, pbuf, const_cname)
           'wpthlp_mc_zt           ','unset                  ',&
           'WPTHLP_nadv            ','unset                  ',&
           'WPTHVP                 ','unset                  ',&
-          'WSEDL                  ','unset                  ',&
+          'WSEDL                  ','m/s                    ',&
           'wstarPBL               ','unset                  ',&
           'ZM_DP                  ','unset                  '  /),                  (/2,100/))