Skip to content

Commit

Permalink
Addressing review comments
Browse files Browse the repository at this point in the history
Katetc committed Mar 8, 2024
1 parent 918ae1d commit e1f6bf0
Showing 2 changed files with 29 additions and 15 deletions.
17 changes: 15 additions & 2 deletions bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
@@ -2082,12 +2082,19 @@
<clubb_lambda0_stability_coef > 0.04 </clubb_lambda0_stability_coef>
<clubb_lmin_coef > 0.1 </clubb_lmin_coef>
<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>
<clubb_l_calc_w_corr > .false. </clubb_l_calc_w_corr>
<clubb_l_call_pdf_closure_twice > .true. </clubb_l_call_pdf_closure_twice>
<clubb_l_const_Nc_in_cloud > .false. </clubb_l_const_Nc_in_cloud>
<clubb_l_damp_wp2_using_em > .false. </clubb_l_damp_wp2_using_em>
<clubb_l_damp_wp3_Skw_squared > .false. </clubb_l_damp_wp3_Skw_squared>
<clubb_l_diagnose_correlations > .false. </clubb_l_diagnose_correlations>
<clubb_l_diffuse_rtm_and_thlm > .false. </clubb_l_diffuse_rtm_and_thlm>
<clubb_l_do_expldiff_rtm_thlm > .false. </clubb_l_do_expldiff_rtm_thlm>
<clubb_l_e3sm_config > .false. </clubb_l_e3sm_config>
<clubb_l_enable_relaxed_clipping > .false. </clubb_l_enable_relaxed_clipping>
<clubb_l_fix_w_chi_eta_correlations > .true. </clubb_l_fix_w_chi_eta_correlations>
<clubb_l_godunov_upwind_wpxp_ta > .false. </clubb_l_godunov_upwind_wpxp_ta>
<clubb_l_godunov_upwind_xpyp_ta > .false. </clubb_l_godunov_upwind_xpyp_ta>
<clubb_l_intr_sfc_flux_smooth > .false. </clubb_l_intr_sfc_flux_smooth>
@@ -2104,16 +2111,22 @@
<clubb_l_partial_upwind_wp3 > .false. </clubb_l_partial_upwind_wp3>
<clubb_l_predict_upwp_vpwp > .false. </clubb_l_predict_upwp_vpwp>
<clubb_l_predict_upwp_vpwp phys="cam_dev" > .true. </clubb_l_predict_upwp_vpwp>
<clubb_l_prescribed_avg_deltaz > .false. </clubb_l_prescribed_avg_deltaz>
<clubb_l_rcm_supersat_adj > .false. </clubb_l_rcm_supersat_adj>
<clubb_l_rtm_nudge > .false. </clubb_l_rtm_nudge>
<clubb_l_smooth_Heaviside_tau_wpxp > .false. </clubb_l_smooth_Heaviside_tau_wpxp>
<clubb_l_standard_term_ta > .false. </clubb_l_standard_term_ta>
<clubb_l_stability_correct_tau_zm > .true. </clubb_l_stability_correct_tau_zm>
<clubb_l_trapezoidal_rule_zm > .true. </clubb_l_trapezoidal_rule_zm>
<clubb_l_trapezoidal_rule_zt > .true. </clubb_l_trapezoidal_rule_zt>
<clubb_l_stability_correct_Kh_N2_zm > .false. </clubb_l_stability_correct_Kh_N2_zm>
<clubb_l_tke_aniso > .true. </clubb_l_tke_aniso>
<clubb_l_trapezoidal_rule_zm > .true. </clubb_l_trapezoidal_rule_zm>
<clubb_l_trapezoidal_rule_zt > .true. </clubb_l_trapezoidal_rule_zt>
<clubb_l_upwind_xm_ma > .true. </clubb_l_upwind_xm_ma>
<clubb_l_upwind_xpyp_ta > .true. </clubb_l_upwind_xpyp_ta>
<clubb_l_use_C11_Richardson > .false. </clubb_l_use_C11_Richardson>
<clubb_l_use_C7_Richardson > .false. </clubb_l_use_C7_Richardson>
<clubb_l_use_cloud_cover > .true. </clubb_l_use_cloud_cover>
<clubb_l_use_precip_frac > .true. </clubb_l_use_precip_frac>
<clubb_l_use_shear_Richardson > .false. </clubb_l_use_shear_Richardson>
<clubb_l_use_thvm_in_bv_freq > .false. </clubb_l_use_thvm_in_bv_freq>
<clubb_l_use_tke_in_wp2_wp3_K_dfsn > .false. </clubb_l_use_tke_in_wp2_wp3_K_dfsn>
27 changes: 14 additions & 13 deletions bld/namelist_files/namelist_definition.xml
Original file line number Diff line number Diff line change
@@ -4022,11 +4022,12 @@ each Gaussian.
</entry>

<entry id="clubb_iiPDF_type" type="integer" category="pblrad"
group="clubb_params_nl" valid_values="" >
Selected option for the two-component normal
(double Gaussian) PDF type to use for the w, rt,
and theta-l (or w, chi, and eta) portion of
CLUBB's multivariate, two-component PDF.
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,
and theta-l (or w, chi, and eta) portion of CLUBB's multivariate, two-component PDF.
iiPDF_ADG1 = 1 (ADG1 PDF), iiPDF_ADG2 = 2 (ADG2 PDF), iiPDF_3D_Luhar = 3 (3D Luhar PDF),
iiPDF_new = 4 (new PDF), iiPDF_TSDADG = 5 (TSDADG PDF), iiPDF_LY93 = 6 (Lewellen and Yoh (1993)),
iiPDF_new_hybrid = 7 (new hybrid PDF)
</entry>

<entry id="clubb_ipdf_call_placement" type="integer" category="pblrad"
@@ -4242,7 +4243,7 @@ two grid level types.

<entry id="clubb_l_rtm_nudge" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
For rtm nudging
Turn on (true) and off (false) rtm nudging.
</entry>

<entry id="clubb_l_smooth_Heaviside_tau_wpxp" type="logical" category="pblrad"
@@ -4259,7 +4260,7 @@ advance_wp2_wp3_module.F90 and in advance_xp2_xpyp_module.F90.

<entry id="clubb_l_stability_correct_Kh_N2_zm" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
Divides Kh_N2_zm by a stability factor
Whether or not we want CLUBB to apply a stability correction Kh_N2_zm.
</entry>

<entry id="clubb_l_stability_correct_tau_zm" type="logical" category="pblrad"
@@ -4271,8 +4272,9 @@ Brunt-Vaisala frequency is large.

<entry id="clubb_l_tke_aniso" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
For anisotropic turbulent kinetic energy, i.e.
TKE = 1/2 (u'^2 + v'^2 + w'^2)
Use anisotropic turbulent kinetic energy in the CLUBB higher order closure, i.e.
calculate TKE = 1/2 (u'^2 + v'^2 + w'^2). This improves the simulation of complex
turbulence but at a greater cost than running without.
</entry>

<entry id="clubb_l_trapezoidal_rule_zm" type="logical" category="pblrad"
@@ -4293,9 +4295,8 @@ adjustment to PDF fields calculated on thermodynamic vertical grid levels.

<entry id="clubb_l_upwind_xm_ma" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
This flag determines whether we want to use an upwind
differencing approximation rather than a centered
differencing for turbulent or mean advection terms. It
This flag determines whether we want to use an upwind differencing approximation
rather than a centered differencing for turbulent or mean advection terms. It
affects rtm, thlm, sclrm, um and vm.
</entry>

@@ -4310,7 +4311,7 @@ is used.

<entry id="clubb_l_uv_nudge" type="logical" category="pblrad"
group="clubb_params_nl" valid_values="" >
For wind speed nudging.
Turn on (true) or off (false) uv wind speed nudging.
</entry>

<entry id="clubb_l_use_C11_Richardson" type="logical" category="pblrad"

0 comments on commit e1f6bf0

Please sign in to comment.