Skip to content

Commit a019b23

Browse files
committed
Addressing some review comments
1 parent e3c1006 commit a019b23

File tree

2 files changed

+31
-4
lines changed

2 files changed

+31
-4
lines changed

bld/namelist_files/namelist_defaults_cam.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,6 @@
21592159
<clubb_skw_max_mag silhs="1" > 10.0 </clubb_skw_max_mag>
21602160
<clubb_up2_sfc_coef silhs="1" > 4.0 </clubb_up2_sfc_coef>
21612161
<clubb_C_wp2_splat silhs="1" > 0.0 </clubb_C_wp2_splat>
2162-
<clubb_bv_efold silhs="1" > 5.0 </clubb_bv_efold>
21632162

21642163
<clubb_l_brunt_vaisala_freq_moist silhs="1" > .true. </clubb_l_brunt_vaisala_freq_moist>
21652164
<clubb_l_call_pdf_closure_twice silhs="1" > .false. </clubb_l_call_pdf_closure_twice>
@@ -2178,8 +2177,6 @@
21782177
<clubb_l_vert_avg_closure silhs="1" > .false. </clubb_l_vert_avg_closure>
21792178
<clubb_l_diag_Lscale_from_tau silhs="1" > .false. </clubb_l_diag_Lscale_from_tau>
21802179
<clubb_l_damp_wp2_using_em silhs="1" > .false. </clubb_l_damp_wp2_using_em>
2181-
<clubb_wpxp_Ri_exp silhs="1" > 0.5 </clubb_wpxp_Ri_exp>
2182-
<clubb_z_displace silhs="1" > 25.0 </clubb_z_displace>
21832180

21842181

21852182
<!-- CLUBB+MF options -->

src/physics/cam/clubb_intr.F90

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,8 @@ subroutine clubb_readnl(nlfile)
10881088
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_detice_rad")
10891089
call mpi_bcast(clubb_detphase_lowtemp, 1, mpi_real8, mstrid, mpicom, ierr)
10901090
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_detphase_lowtemp")
1091+
call mpi_bcast(clubb_iiPDF_type, 1, mpi_integer, mstrid, mpicom, ierr)
1092+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_iiPDF_type")
10911093

10921094
call mpi_bcast(clubb_l_use_C7_Richardson, 1, mpi_logical, mstrid, mpicom, ierr)
10931095
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_use_C7_Richardson")
@@ -1170,7 +1172,35 @@ subroutine clubb_readnl(nlfile)
11701172
call mpi_bcast(clubb_l_standard_term_ta, 1, mpi_logical, mstrid, mpicom, ierr)
11711173
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_standard_term_ta")
11721174
call mpi_bcast(clubb_l_partial_upwind_wp3, 1, mpi_logical, mstrid, mpicom, ierr)
1173-
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_partial_upwind_wp3")
1175+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_partial_upwind_wp3"
1176+
call mpi_bcast(clubb_l_C2_cloud_frac, 1, mpi_logical, mstrid, mpicom, ierr)
1177+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_C2_cloud_frac")
1178+
call mpi_bcast(clubb_l_calc_thlp2_rad, 1, mpi_logical, mstrid, mpicom, ierr)
1179+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_calc_thlp2_rad")
1180+
call mpi_bcast(clubb_l_calc_w_corr, 1, mpi_logical, mstrid, mpicom, ierr)
1181+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_calc_w_corr")
1182+
call mpi_bcast(clubb_l_const_Nc_in_cloud, 1, mpi_logical, mstrid, mpicom, ierr)
1183+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_const_Nc_in_cloud")
1184+
call mpi_bcast(clubb_l_diagnose_correlations, 1, mpi_logical, mstrid, mpicom, ierr)
1185+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_diagnose_correlations")
1186+
call mpi_bcast(clubb_l_diffuse_rtm_and_thlm, 1, mpi_logical, mstrid, mpicom, ierr)
1187+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_diffuse_rtm_and_thlm")
1188+
call mpi_bcast(clubb_l_fix_w_chi_eta_correlations, 1, mpi_logical, mstrid, mpicom, ierr)
1189+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_fix_w_chi_eta_correlations")
1190+
call mpi_bcast(clubb_l_prescribed_avg_deltaz, 1, mpi_logical, mstrid, mpicom, ierr)
1191+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_prescribed_avg_deltaz")
1192+
call mpi_bcast(clubb_l_rtm_nudge, 1, mpi_logical, mstrid, mpicom, ierr)
1193+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_rtm_nudge")
1194+
call mpi_bcast(clubb_l_stability_correct_Kh_N2_zm, 1, mpi_logical, mstrid, mpicom, ierr)
1195+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_stability_correct_Kh_N2_zm")
1196+
call mpi_bcast(clubb_l_tke_aniso, 1, mpi_logical, mstrid, mpicom, ierr)
1197+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_tke_aniso")
1198+
call mpi_bcast(clubb_l_upwind_xm_ma, 1, mpi_logical, mstrid, mpicom, ierr)
1199+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_upwind_xm_ma")
1200+
call mpi_bcast(clubb_l_use_precip_frac, 1, mpi_logical, mstrid, mpicom, ierr)
1201+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_use_precip_frac")
1202+
call mpi_bcast(clubb_l_uv_nudge, 1, mpi_logical, mstrid, mpicom, ierr)
1203+
if (ierr /= 0) call endrun(sub//": FATAL: mpi_bcast: clubb_l_uv_nudge")
11741204

11751205
! Overwrite defaults if they are true
11761206
if (clubb_history) stats_metadata%l_stats = .true.

0 commit comments

Comments
 (0)