@@ -3458,10 +3458,10 @@ subroutine clubb_tend_cam( state, ptend_all, pbuf, hdtime, &
34583458 dz_g = dz_g(:,nzt_clubb:1 :- 1 )
34593459 p_in_Pa = p_in_Pa(:,nzt_clubb:1 :- 1 )
34603460 invrs_exner_zt = invrs_exner_zt(:,nzt_clubb:1 :- 1 )
3461- um = um(:,nzt_clubb:1 :- 1 )
3462- vm = vm(:,nzt_clubb:1 :- 1 )
3463- thlm = thlm(:,nzt_clubb:1 :- 1 )
3464- rtm = rtm(:,nzt_clubb:1 :- 1 )
3461+ um = um(:,nzt_clubb:1 :- 1 )
3462+ vm = vm(:,nzt_clubb:1 :- 1 )
3463+ thlm = thlm(:,nzt_clubb:1 :- 1 )
3464+ rtm = rtm(:,nzt_clubb:1 :- 1 )
34653465
34663466 thv_ds_zt = thv_ds_zt(:,nzt_clubb:1 :- 1 )
34673467
@@ -3473,11 +3473,11 @@ subroutine clubb_tend_cam( state, ptend_all, pbuf, hdtime, &
34733473 rtm_zm_in = rtm_zm_in(:,nzm_clubb:1 :- 1 )
34743474
34753475 do i = 1 , ncol
3476- call integrate_mf( nzm_clubb, nzt_clubb, dz_g(i,:), zi_g(i,:), p_in_Pa_zm(i,:), invrs_exner_zm(i,:), & ! input
3477- p_in_Pa(i,:), invrs_exner_zt(i,:), & ! input
3478- um(i,:), vm(i,:), thlm(i,:), rtm(i,:), thv_ds_zt(i,:), & ! input
3479- thlm_zm_in(i,:), rtm_zm_in(i,:), & ! input
3480- wpthlp_sfc(i), wprtp_sfc(i), pblh_pbuf(i), & ! input
3476+ call integrate_mf( nzm_clubb, nzt_clubb, dz_g(i,:), zi_g(i,:), p_in_Pa_zm(i,:), invrs_exner_zm(i,:), & ! input
3477+ p_in_Pa(i,:), invrs_exner_zt(i,:), & ! input
3478+ um(i,:), vm(i,:), thlm(i,:), rtm(i,:), thv_ds_zt(i,:), & ! input
3479+ thlm_zm_in(i,:), rtm_zm_in(i,:), & ! input
3480+ wpthlp_sfc(i), wprtp_sfc(i), pblh_pbuf(i), & ! input
34813481 mf_dry_a(i,:), mf_moist_a(i,:), & ! output - plume diagnostics
34823482 mf_dry_w(i,:), mf_moist_w(i,:), & ! output - plume diagnostics
34833483 mf_dry_qt(i,:), mf_moist_qt(i,:), & ! output - plume diagnostics
@@ -4249,8 +4249,7 @@ subroutine clubb_tend_cam( state, ptend_all, pbuf, hdtime, &
42494249 do k = top_lev, pver
42504250 do i = 1 , ncol
42514251 k_clubb = k + 1 - top_lev
4252- cld_pbuf (i,k) = cloud_frac_inout(i,k_clubb)
4253- alst_pbuf(i,k) = cld_pbuf(i,k)
4252+ alst_pbuf(i,k) = cloud_frac_inout(i,k_clubb)
42544253 qlst_pbuf(i,k) = rcm(i,k_clubb) / max ( 0.01_r8 , alst_pbuf(i,k) ) ! Incloud stratus condensate mixing ratio
42554254 enddo
42564255 enddo
@@ -4330,9 +4329,9 @@ subroutine clubb_tend_cam( state, ptend_all, pbuf, hdtime, &
43304329 ptend_loc% u(i,k) = ( um(i,k_clubb) - state_loc% u(i,k)) * invrs_hdtime ! east-west wind
43314330 ptend_loc% v(i,k) = ( vm(i,k_clubb) - state_loc% v(i,k)) * invrs_hdtime ! north-south wind
43324331 ptend_loc% q(i,k,ixq) = ( rtm(i,k_clubb) - rcm(i,k_clubb) &
4333- - state_loc% q(i,k,ixq) ) * invrs_hdtime ! water vapor
4332+ - state_loc% q(i,k,ixq) ) * invrs_hdtime ! water vapor
43344333 ptend_loc% q(i,k,ixcldliq) = ( rcm(i,k_clubb) - state_loc% q(i,k,ixcldliq)) * invrs_hdtime ! Tendency of liquid water
4335- ptend_loc% s(i,k) = ( clubb_s(i,k) - state_loc% s(i,k)) * invrs_hdtime ! Tendency of static energy
4334+ ptend_loc% s(i,k) = ( clubb_s(i,k) - state_loc% s(i,k)) * invrs_hdtime ! Tendency of static energy
43364335 end do
43374336 end do
43384337!- -------------------------------- END TODO ---------------------------------
0 commit comments