CLUBB diagnostics test update plus addressing Adams review

Katetc · Mar 28, 2024 · ad1c08e · ad1c08e
1 parent a988a14
commit ad1c08e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
@@ -4109,7 +4109,8 @@ Diagnose correlations instead of using fixed ones
 
 <entry id="clubb_l_diffuse_rtm_and_thlm" type="logical" category="pblrad"
        group="clubb_params_nl" valid_values="" >
-Diffuses rtm and thlm
+Implicit diffusion on moisture and temperature, implemented within CLUBB's
+matrix equations for wprtp/rtm and wpthlp/thlm.
 </entry>
 
 <entry id="clubb_l_do_expldiff_rtm_thlm" type="logical"  category="pblrad"

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_mg3/user_nl_cam
@@ -4,7 +4,7 @@ nhtfrq=9,9,9,9,9,9
 inithist='ENDOFRUN'
 clubb_history = .true.
 clubb_rad_history = .false.
-fincl1 = 'Q', 'RHW', 'QRS', 'QRL', 'HR', 'FDL', 'SILHS_CLUBB_PRECIP_FRAC', 'SILHS_CLUBB_ICE_SS_FRAC',
+fincl1 = 'Q', 'RHW', 'QRS', 'QRL', 'HR', 'FDL',
 'thlm', 'thvm', 'rtm', 'rcm', 'rvm', 'um', 'vm', 'um_ref','vm_ref','ug', 'vg', 'cloud_frac', 'cloud_cover',
 'rcm_in_layer', 'rcm_in_cloud', 'p_in_Pa', 'exner', 'rho_ds_zt', 'thv_ds_zt', 'Lscale', 'Lscale_pert_1',
 'Lscale_pert_2', 'T_in_K', 'rel_humidity', 'wp3', 'wpthlp2', 'wp2thlp', 'wprtp2', 'wp2rtp', 'Lscale_up',