From e3c100607ead4ddc443f8387200adf1e2f0a838b Mon Sep 17 00:00:00 2001
From: Katetc <katec@ucar.edu>
Date: Fri, 12 Jan 2024 13:37:38 -0700
Subject: [PATCH] Few more small changes from larson-group

---
 bld/namelist_files/namelist_defaults_cam.xml             | 3 +++
 bld/namelist_files/namelist_definition.xml               | 2 +-
 cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam | 4 ++--
 cime_config/usermods_dirs/scam_mandatory/shell_commands  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
index 48903217cc..3c89487fbe 100644
--- a/bld/namelist_files/namelist_defaults_cam.xml
+++ b/bld/namelist_files/namelist_defaults_cam.xml
@@ -2178,6 +2178,9 @@
 <clubb_l_vert_avg_closure               silhs="1" > .false. </clubb_l_vert_avg_closure>
 <clubb_l_diag_Lscale_from_tau           silhs="1" > .false. </clubb_l_diag_Lscale_from_tau>
 <clubb_l_damp_wp2_using_em              silhs="1" > .false. </clubb_l_damp_wp2_using_em>
+<clubb_wpxp_Ri_exp                      silhs="1" > 0.5     </clubb_wpxp_Ri_exp>
+<clubb_z_displace                       silhs="1" > 25.0    </clubb_z_displace>
+
 
 <!-- CLUBB+MF options -->
 <do_clubb_mf                       > .false. </do_clubb_mf>
diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
index d1c23ae727..16ae7abbd3 100644
--- a/bld/namelist_files/namelist_definition.xml
+++ b/bld/namelist_files/namelist_definition.xml
@@ -4054,7 +4054,7 @@ This equation calculates an in-cloud Brunt-Vaisala frequency.
 
 <entry id="clubb_l_C2_cloud_frac" type="logical" category="pblrad"
        group="clubb_params_nl" valid_values="" >
-Flag to use cloud fraction to adjust the value of the    
+Flag to use cloud fraction to adjust the value of the
 turbulent dissipation coefficient, C2.
 </entry>
 
diff --git a/cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam
index d322c3706a..9e374a0e88 100644
--- a/cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam
+++ b/cime_config/testdefs/testmods_dirs/cam/silhs/user_nl_cam
@@ -46,7 +46,7 @@ fincl1 = 'U:A','PS:A','T:A','V:A','OMEGA:A','Z3:A','PRECT:A',
 'rtp2_dp2', 'rtp2_cl', 'rtp2_pd', 'rtp2_sf', 'rtp2_forcing', 'rtp2_mc', 'thlp2_bt', 'thlp2_ma', 'thlp2_ta', 'thlp2_tp', 'thlp2_dp1', 'thlp2_dp2', 'thlp2_cl', 
 'thlp2_pd', 'thlp2_sf', 'thlp2_forcing', 'thlp2_mc', 'rtpthlp_bt', 'rtpthlp_ma', 'rtpthlp_ta', 'rtpthlp_tp1', 'rtpthlp_tp2', 'rtpthlp_dp1', 'rtpthlp_dp2', 
 'rtpthlp_cl', 'rtpthlp_sf', 'rtpthlp_forcing', 'rtpthlp_mc', 'wpthlp_enter_mfl', 'wpthlp_exit_mfl', 'wprtp_enter_mfl', 'wprtp_exit_mfl', 'wpthlp_mfl_min', 
-'wpthlp_mfl_max', 'wprtp_mfl_min', 'wprtp_mfl_max', 'Richardson_num', 'shear_sqd',
+'wpthlp_mfl_max', 'wprtp_mfl_min', 'wprtp_mfl_max', 'shear_sqd',
 fincl2 = 'CLDTOT', 'CLDST','CDNUMC','CLDLIQ','CLDICE','FLUT',
 'LWCF','SWCF','PRECT'
 clubb_history = .true.
@@ -77,4 +77,4 @@ clubb_vars_zm= 'wp2', 'rtp2', 'thlp2', 'rtpthlp', 'wprtp', 'wpthlp', 'wp4', 'up2
 'rtp2_dp2', 'rtp2_cl', 'rtp2_pd', 'rtp2_sf', 'rtp2_forcing', 'rtp2_mc', 'thlp2_bt', 'thlp2_ma', 'thlp2_ta', 'thlp2_tp', 'thlp2_dp1', 'thlp2_dp2', 'thlp2_cl', 
 'thlp2_pd', 'thlp2_sf', 'thlp2_forcing', 'thlp2_mc', 'rtpthlp_bt', 'rtpthlp_ma', 'rtpthlp_ta', 'rtpthlp_tp1', 'rtpthlp_tp2', 'rtpthlp_dp1', 'rtpthlp_dp2', 
 'rtpthlp_cl', 'rtpthlp_sf', 'rtpthlp_forcing', 'rtpthlp_mc', 'wpthlp_enter_mfl', 'wpthlp_exit_mfl', 'wprtp_enter_mfl', 'wprtp_exit_mfl', 'wpthlp_mfl_min', 
-'wpthlp_mfl_max', 'wprtp_mfl_min', 'wprtp_mfl_max', 'Richardson_num', 'shear_sqd'
+'wpthlp_mfl_max', 'wprtp_mfl_min', 'wprtp_mfl_max', 'shear_sqd'
diff --git a/cime_config/usermods_dirs/scam_mandatory/shell_commands b/cime_config/usermods_dirs/scam_mandatory/shell_commands
index 5230507d8a..4fa8390aa5 100755
--- a/cime_config/usermods_dirs/scam_mandatory/shell_commands
+++ b/cime_config/usermods_dirs/scam_mandatory/shell_commands
@@ -10,6 +10,6 @@
 
 # Note that clm cannot use initial conditions with SCAM -so will only use specified phenology
 # Only change if CLM_FORCE_COLDSTART exists.
-if [ `./xmlquery --value CLM_FORCE_COLDSTART |& grep -c 'ERROR'` -eq 0  ]; then
+if [ `./xmlquery --value CLM_FORCE_COLDSTART 2>&1 | grep -c 'ERROR'` -eq 0  ]; then
 ./xmlchange CLM_FORCE_COLDSTART='on'
 fi