Merge branch 'my.cam6_3_134.newclubb' into my.cam6_3_136.newclubb

bstephens82 · Jan 11, 2024 · 37c0b6e · 37c0b6e
2 parents 7cf5966 + 7ea7f24
commit 37c0b6e
Show file tree

Hide file tree

Showing 9 changed files with 1,003 additions and 226 deletions.
diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
@@ -23,9 +23,9 @@ required = True
 [clubb]
 local_path = src/physics/clubb
 protocol = git
-repo_url = https://github.com/larson-group/clubb_release
+repo_url = https://github.com/bstephens82/clubb/
 sparse = ../.clubb_sparse_checkout
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
+tag = bstephens82.clubb.fb036d9
 required = True
 
 [pumas]

diff --git a/bld/build-namelist b/bld/build-namelist
@@ -3374,6 +3374,57 @@ if ($clubb_sgs  =~ /$TRUE/io) {
    add_default($nl, 'clubb_tridiag_solve_method');
    add_default($nl, 'clubb_up2_sfc_coef');
    add_default($nl, 'clubb_wpxp_L_thresh');
+   add_default($nl, 'clubb_c1c');
+   add_default($nl, 'clubb_c7c');
+   add_default($nl, 'clubb_c12');
+   add_default($nl, 'clubb_c_wp2_pr_dfsn');
+   add_default($nl, 'clubb_c_wp3_pr_tp');
+   add_default($nl, 'clubb_c_wp3_pr_dfsn');
+   add_default($nl, 'clubb_c6rt_Lscale0');
+   add_default($nl, 'clubb_c6thl_Lscale0');
+   add_default($nl, 'clubb_c7_Lscale0');
+   add_default($nl, 'clubb_c_K');
+   add_default($nl, 'clubb_nu1');
+   add_default($nl, 'clubb_c_K6');
+   add_default($nl, 'clubb_nu6');
+   add_default($nl, 'clubb_nu8');
+   add_default($nl, 'clubb_nu10');
+   add_default($nl, 'clubb_c_K_hm');
+   add_default($nl, 'clubb_c_K_hmb');
+   add_default($nl, 'clubb_K_hm_min_coef');
+   add_default($nl, 'clubb_nu_hm');
+   add_default($nl, 'clubb_slope_coef_spread_DG_means_w');
+   add_default($nl, 'clubb_pdf_component_stdev_factor_w');
+   add_default($nl, 'clubb_coef_spread_DG_means_rt');
+   add_default($nl, 'clubb_coef_spread_DG_means_thl');
+   add_default($nl, 'clubb_gamma_coefc');
+   add_default($nl, 'clubb_mu');
+   add_default($nl, 'clubb_omicron');
+   add_default($nl, 'clubb_zeta_vrnce_rat');
+   add_default($nl, 'clubb_upsilon_precip_frac_rat');
+   add_default($nl, 'clubb_taumin');
+   add_default($nl, 'clubb_taumax');
+   add_default($nl, 'clubb_Lscale_mu_coef');
+   add_default($nl, 'clubb_Lscale_pert_coef');
+   add_default($nl, 'clubb_alpha_corr');
+   add_default($nl, 'clubb_thlp2_rad_coef');
+   add_default($nl, 'clubb_thlp2_rad_cloud_frac_thresh');
+   add_default($nl, 'clubb_c_invrs_tau_wpxp_Ri');
+   add_default($nl, 'clubb_c_invrs_tau_wpxp_N2_thresh');
+   add_default($nl, 'clubb_xp3_coef_base');
+   add_default($nl, 'clubb_xp3_coef_slope');
+   add_default($nl, 'clubb_altitude_threshold');
+   add_default($nl, 'clubb_rtp2_clip_coef');
+   add_default($nl, 'clubb_cx_min');
+   add_default($nl, 'clubb_cx_max');
+   add_default($nl, 'clubb_richardson_num_min');
+   add_default($nl, 'clubb_richardson_num_max');
+   add_default($nl, 'clubb_a3_coef_min');
+   add_default($nl, 'clubb_a_const');
+   add_default($nl, 'clubb_c11c');
+   add_default($nl, 'clubb_bv_efold');
+   add_default($nl, 'clubb_wpxp_Ri_exp');
+   add_default($nl, 'clubb_z_displace');
 
    #CLUBB+MF options
    add_default($nl, 'do_clubb_mf');

diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -2121,9 +2121,64 @@
 <clubb_tridiag_solve_method                       > 1       </clubb_tridiag_solve_method>
 <clubb_up2_sfc_coef                               > 2.0     </clubb_up2_sfc_coef>
 <clubb_wpxp_L_thresh                              > 60.0    </clubb_wpxp_L_thresh>
+
 <do_hb_above_clubb                                >.false.  </do_hb_above_clubb>
 <do_hb_above_clubb phys="cam_dev"                 >.true.   </do_hb_above_clubb>
 <do_hb_above_clubb phys="cam6"                    >.true.   </do_hb_above_clubb>
+
+<clubb_c1c > 1.0 </clubb_c1c>
+<clubb_c7c> 0.5 </clubb_c7c>
+<clubb_c12> 1.0 </clubb_c12>
+<clubb_c_wp2_pr_dfsn> 0.0 </clubb_c_wp2_pr_dfsn>
+<clubb_c_wp3_pr_tp> 0.0 </clubb_c_wp3_pr_tp>
+<clubb_c_wp3_pr_dfsn> 0.0 </clubb_c_wp3_pr_dfsn>
+<clubb_c6rt_Lscale0> 14.0 </clubb_c6rt_Lscale0>
+<clubb_c6thl_Lscale0> 14.0 </clubb_c6thl_Lscale0>
+<clubb_c7_Lscale0> 0.85 </clubb_c7_Lscale0>
+<clubb_c_K> 0.2 </clubb_c_K>
+<clubb_nu1> 20.0 </clubb_nu1>
+<clubb_c_K6> 0.375 </clubb_c_K6>
+<clubb_nu6> 5.0 </clubb_nu6>
+<clubb_nu8> 20.0 </clubb_nu8>
+<clubb_nu10> 0.0 </clubb_nu10>
+<clubb_c_K_hm> 0.75 </clubb_c_K_hm>
+<clubb_c_K_hmb> 0.75 </clubb_c_K_hmb>
+<clubb_K_hm_min_coef> 0.1 </clubb_K_hm_min_coef>
+<clubb_nu_hm> 1.5 </clubb_nu_hm>
+<clubb_slope_coef_spread_DG_means_w> 21.0 </clubb_slope_coef_spread_DG_means_w>
+<clubb_pdf_component_stdev_factor_w> 1.0 </clubb_pdf_component_stdev_factor_w>
+<clubb_coef_spread_DG_means_rt> 0.8 </clubb_coef_spread_DG_means_rt>
+<clubb_coef_spread_DG_means_thl> 0.8 </clubb_coef_spread_DG_means_thl>
+<clubb_gamma_coefc> 5.0 </clubb_gamma_coefc>
+<clubb_mu> 0.001 </clubb_mu>
+<clubb_omicron> 0.5 </clubb_omicron>
+<clubb_zeta_vrnce_rat> 0.0 </clubb_zeta_vrnce_rat>
+<clubb_upsilon_precip_frac_rat> 0.55 </clubb_upsilon_precip_frac_rat>
+<clubb_taumin> 90.0 </clubb_taumin>
+<clubb_taumax> 3600.0 </clubb_taumax>
+<clubb_Lscale_mu_coef> 2.0 </clubb_Lscale_mu_coef>
+<clubb_Lscale_pert_coef> 0.1 </clubb_Lscale_pert_coef>
+<clubb_alpha_corr> 0.15 </clubb_alpha_corr>
+<clubb_thlp2_rad_coef> 1.0 </clubb_thlp2_rad_coef>
+<clubb_thlp2_rad_cloud_frac_thresh> 0.1 </clubb_thlp2_rad_cloud_frac_thresh>
+<clubb_c_invrs_tau_wpxp_Ri> 0.35 </clubb_c_invrs_tau_wpxp_Ri>
+<clubb_c_invrs_tau_wpxp_N2_thresh> 0.00033 </clubb_c_invrs_tau_wpxp_N2_thresh>
+<clubb_xp3_coef_base> 0.25 </clubb_xp3_coef_base>
+<clubb_xp3_coef_slope> 0.01 </clubb_xp3_coef_slope>
+<clubb_altitude_threshold> 100.0 </clubb_altitude_threshold>
+<clubb_rtp2_clip_coef> 0.5 </clubb_rtp2_clip_coef>
+<clubb_cx_min> 0.33 </clubb_cx_min>
+<clubb_cx_max> 0.95 </clubb_cx_max>
+<clubb_richardson_num_min> 0.25 </clubb_richardson_num_min>
+<clubb_richardson_num_max> 400.0 </clubb_richardson_num_max>
+<clubb_a3_coef_min> 1.0 </clubb_a3_coef_min>
+<clubb_a_const> 1.8 </clubb_a_const>
+<clubb_c11c> 0.5 </clubb_c11c>
+<clubb_bv_efold> 1.0 </clubb_bv_efold>
+<clubb_wpxp_Ri_exp> 1.0 </clubb_wpxp_Ri_exp>
+<clubb_z_displace> 25.0 </clubb_z_displace>
+
+
 <!-- SILHS options -->
 <clubb_do_icesuper                      silhs="1" > .true.  </clubb_do_icesuper>
 <clubb_C2rt                             silhs="1" > 0.2     </clubb_C2rt>

diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
@@ -4326,6 +4326,140 @@ Real: number of plumes in mass flux ensemble
 Default: 10
 </entry>
 
+<entry id="clubb_C1c" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C7c" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C11c" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C12" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C_wp2_pr_dfsn" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C_wp3_pr_tp" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C_wp3_pr_dfsn" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C6rt_Lscale0" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C6thl_Lscale0" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C7_Lscale0" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_c_K" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_nu1" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_c_K6" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_nu6" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_nu8" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_nu10" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_c_K_hm" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_c_K_hmb" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_K_hm_min_coef" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_nu_hm" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_slope_coef_spread_DG_means_w" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_pdf_component_stdev_factor_w" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_coef_spread_DG_means_rt" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_coef_spread_DG_means_thl" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_gamma_coefc" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_mu" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_omicron" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_zeta_vrnce_rat" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_upsilon_precip_frac_rat" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_taumin" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_taumax" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_Lscale_mu_coef" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_Lscale_pert_coef" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_alpha_corr" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_thlp2_rad_coef" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_thlp2_rad_cloud_frac_thresh" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C_invrs_tau_wpxp_Ri" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_C_invrs_tau_wpxp_N2_thresh" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_xp3_coef_base" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_xp3_coef_slope" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_altitude_threshold" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_rtp2_clip_coef" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_Cx_min" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_Cx_max" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_Richardson_num_min" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_Richardson_num_max" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_a3_coef_min" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_a_const" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_bv_efold" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_wpxp_Ri_exp" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_z_displace" type="real" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+
+<entry id="clubb_l_use_precip_frac" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_C2_cloud_frac" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_diffuse_rtm_and_thlm" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_stability_correct_Kh_N2_zm" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_calc_thlp2_rad" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_upwind_xm_ma" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_uv_nudge" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_rtm_nudge" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_tke_aniso" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_diagnose_correlations" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_calc_w_corr" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_const_Nc_in_cloud" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_fix_w_chi_eta_correlations" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_prescribed_avg_deltaz" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+<entry id="clubb_l_linearize_pbl_winds" type="logical" category="pblrad"
+       group="clubb_params_nl" valid_values="" > </entry>
+
 <!-- CARMA Sectional Microphysics -->
 
 <entry id="carma_model" type="char*32" category="carma"

diff --git a/clean_externals.bash b/clean_externals.bash
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+
+# intended to delete all externals so you can start with a
+# clean slate after checking out a new tag
+
+rm -rf ccs_config
+rm -rf chem_proc
+rm -rf cime
+rm -rf components
+rm -rf libraries
+rm -rf share
+rm -rf post
+rm -rf src/atmos_phys
+rm -rf src/hemco
+rm -rf src/physics/ali_arms
+rm -rf clubb
+rm -rf pumas
+rm -rf pumas-frozen
+rm -rf silhs
+
diff --git a/how_to_update_branch b/how_to_update_branch
@@ -0,0 +1,9 @@
+The first thing is to update the tags:
+
+git remote add ESCOMP https://github.com/ESCOMP/CAM
+git fetch --tags ESCOMP
+
+Then you can switch to whatever tag you want, say the latest cam_development tag.
+Then merge in your previous branch.
+
+git merge my_cam_117, etc.