Skipping 39 KB..
Full LogTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTestTest
3867c3867
< thl_1_zm = zt2zm( pdf_params%thl_1(1,:) )
---
> thl_1_zm = zt2zm( pdf_params%thl_1 )
3869c3869
< thl_2_zm = zt2zm( pdf_params%thl_2(1,:) )
---
> thl_2_zm = zt2zm( pdf_params%thl_2 )
3871c3871
< varnce_thl_1_zm = zt2zm( pdf_params%varnce_thl_1(1,:) )
---
> varnce_thl_1_zm = zt2zm( pdf_params%varnce_thl_1 )
3873c3873
< varnce_thl_2_zm = zt2zm( pdf_params%varnce_thl_2(1,:) )
---
> varnce_thl_2_zm = zt2zm( pdf_params%varnce_thl_2 )
3875c3875
< mixt_frac_zm = zt2zm( pdf_params%mixt_frac(1,:) )
---
> mixt_frac_zm = zt2zm( pdf_params%mixt_frac )
3877c3877
< rc_1_zm = zt2zm( pdf_params%rc_1(1,:) )
---
> rc_1_zm = zt2zm( pdf_params%rc_1 )
3879c3879
< rc_2_zm = zt2zm( pdf_params%rc_2(1,:) )
---
> rc_2_zm = zt2zm( pdf_params%rc_2 )
3881c3881
< rsatl_1_zm = zt2zm( pdf_params%rsatl_1(1,:) )
---
> rsatl_1_zm = zt2zm( pdf_params%rsatl_1 )
3883c3883
< rsatl_2_zm = zt2zm( pdf_params%rsatl_2(1,:) )
---
> rsatl_2_zm = zt2zm( pdf_params%rsatl_2 )
3885c3885
< cloud_frac_1_zm = zt2zm( pdf_params%cloud_frac_1(1,:) )
---
> cloud_frac_1_zm = zt2zm( pdf_params%cloud_frac_1 )
3887c3887
< cloud_frac_2_zm = zt2zm( pdf_params%cloud_frac_2(1,:) )
---
> cloud_frac_2_zm = zt2zm( pdf_params%cloud_frac_2 )
3889c3889
< chi_1_zm = zt2zm( pdf_params%chi_1(1,:) )
---
> chi_1_zm = zt2zm( pdf_params%chi_1 )
3891c3891
< chi_2_zm = zt2zm( pdf_params%chi_2(1,:) )
---
> chi_2_zm = zt2zm( pdf_params%chi_2 )
3893c3893
< stdev_chi_1_zm = zt2zm( pdf_params%stdev_chi_1(1,:) )
---
> stdev_chi_1_zm = zt2zm( pdf_params%stdev_chi_1 )
3895c3895
< stdev_chi_2_zm = zt2zm( pdf_params%stdev_chi_2(1,:) )
---
> stdev_chi_2_zm = zt2zm( pdf_params%stdev_chi_2 )
3897c3897
< stdev_eta_1_zm = zt2zm( pdf_params%stdev_eta_1(1,:) )
---
> stdev_eta_1_zm = zt2zm( pdf_params%stdev_eta_1 )
3899c3899
< stdev_eta_2_zm = zt2zm( pdf_params%stdev_eta_2(1,:) )
---
> stdev_eta_2_zm = zt2zm( pdf_params%stdev_eta_2 )
3901c3901
< corr_w_rt_1_zm = zt2zm( pdf_params%corr_w_rt_1(1,:) )
---
> corr_w_rt_1_zm = zt2zm( pdf_params%corr_w_rt_1 )
3903c3903
< corr_w_rt_2_zm = zt2zm( pdf_params%corr_w_rt_2(1,:) )
---
> corr_w_rt_2_zm = zt2zm( pdf_params%corr_w_rt_2 )
3905c3905
< corr_w_thl_1_zm = zt2zm( pdf_params%corr_w_thl_1(1,:) )
---
> corr_w_thl_1_zm = zt2zm( pdf_params%corr_w_thl_1 )
3907c3907
< corr_w_thl_2_zm = zt2zm( pdf_params%corr_w_thl_2(1,:) )
---
> corr_w_thl_2_zm = zt2zm( pdf_params%corr_w_thl_2 )
3909c3909
< corr_rt_thl_1_zm = zt2zm( pdf_params%corr_rt_thl_1(1,:) )
---
> corr_rt_thl_1_zm = zt2zm( pdf_params%corr_rt_thl_1 )
3911c3911
< corr_rt_thl_2_zm = zt2zm( pdf_params%corr_rt_thl_2(1,:) )
---
> corr_rt_thl_2_zm = zt2zm( pdf_params%corr_rt_thl_2 )
3913c3913
< alpha_thl_zm = zt2zm( pdf_params%alpha_thl(1,:) )
---
> alpha_thl_zm = zt2zm( pdf_params%alpha_thl )
3915c3915
< alpha_rt_zm = zt2zm( pdf_params%alpha_rt(1,:) )
---
> alpha_rt_zm = zt2zm( pdf_params%alpha_rt )
3963,3999c3963,3999
< pdf_params%w_1(1,:) = trapezoid_zt( w_1_zt, w_1_zm )
< pdf_params%w_2(1,:) = trapezoid_zt( w_2_zt, w_2_zm )
< pdf_params%varnce_w_1(1,:) = trapezoid_zt( varnce_w_1_zt, varnce_w_1_zm )
< pdf_params%varnce_w_2(1,:) = trapezoid_zt( varnce_w_2_zt, varnce_w_2_zm )
< pdf_params%rt_1(1,:) = trapezoid_zt( rt_1_zt, rt_1_zm )
< pdf_params%rt_2(1,:) = trapezoid_zt( rt_2_zt, rt_2_zm )
< pdf_params%varnce_rt_1(1,:) = trapezoid_zt( varnce_rt_1_zt, varnce_rt_1_zm )
< pdf_params%varnce_rt_2(1,:) = trapezoid_zt( varnce_rt_2_zt, varnce_rt_2_zm )
< pdf_params%crt_1(1,:) = trapezoid_zt( crt_1_zt, crt_1_zm )
< pdf_params%crt_2(1,:) = trapezoid_zt( crt_2_zt, crt_2_zm )
< pdf_params%cthl_1(1,:) = trapezoid_zt( cthl_1_zt, cthl_1_zm )
< pdf_params%cthl_2(1,:) = trapezoid_zt( cthl_2_zt, cthl_2_zm )
< pdf_params%thl_1(1,:) = trapezoid_zt( thl_1_zt, thl_1_zm )
< pdf_params%thl_2(1,:) = trapezoid_zt( thl_2_zt, thl_2_zm )
< pdf_params%varnce_thl_1(1,:) = trapezoid_zt( varnce_thl_1_zt, varnce_thl_1_zm )
< pdf_params%varnce_thl_2(1,:) = trapezoid_zt( varnce_thl_2_zt, varnce_thl_2_zm )
< pdf_params%mixt_frac(1,:) = trapezoid_zt( mixt_frac_zt, mixt_frac_zm )
< pdf_params%rc_1(1,:) = trapezoid_zt( rc_1_zt, rc_1_zm )
< pdf_params%rc_2(1,:) = trapezoid_zt( rc_2_zt, rc_2_zm )
< pdf_params%rsatl_1(1,:) = trapezoid_zt( rsatl_1_zt, rsatl_1_zm )
< pdf_params%rsatl_2(1,:) = trapezoid_zt( rsatl_2_zt, rsatl_2_zm )
< pdf_params%cloud_frac_1(1,:) = trapezoid_zt( cloud_frac_1_zt, cloud_frac_1_zm )
< pdf_params%cloud_frac_2(1,:) = trapezoid_zt( cloud_frac_2_zt, cloud_frac_2_zm )
< pdf_params%chi_1(1,:) = trapezoid_zt( chi_1_zt, chi_1_zm )
< pdf_params%chi_2(1,:) = trapezoid_zt( chi_2_zt, chi_2_zm )
< pdf_params%corr_w_rt_1(1,:) = trapezoid_zt( corr_w_rt_1_zt, corr_w_rt_1_zm )
< pdf_params%corr_w_rt_2(1,:) = trapezoid_zt( corr_w_rt_2_zt, corr_w_rt_2_zm )
< pdf_params%corr_w_thl_1(1,:) = trapezoid_zt( corr_w_thl_1_zt, corr_w_thl_1_zm )
< pdf_params%corr_w_thl_2(1,:) = trapezoid_zt( corr_w_thl_2_zt, corr_w_thl_2_zm )
< pdf_params%corr_rt_thl_1(1,:) = trapezoid_zt( corr_rt_thl_1_zt, corr_rt_thl_1_zm )
< pdf_params%corr_rt_thl_2(1,:) = trapezoid_zt( corr_rt_thl_2_zt, corr_rt_thl_2_zm )
< pdf_params%alpha_thl(1,:) = trapezoid_zt( alpha_thl_zt, alpha_thl_zm )
< pdf_params%alpha_rt(1,:) = trapezoid_zt( alpha_rt_zt, alpha_rt_zm )
< pdf_params%stdev_chi_1(1,:) = trapezoid_zt( stdev_chi_1_zt, stdev_chi_1_zm )
< pdf_params%stdev_chi_2(1,:) = trapezoid_zt( stdev_chi_2_zt, stdev_chi_2_zm )
< pdf_params%stdev_eta_1(1,:) = trapezoid_zt( stdev_eta_1_zt, stdev_eta_1_zm )
< pdf_params%stdev_eta_2(1,:) = trapezoid_zt( stdev_eta_2_zt, stdev_eta_2_zm )
---
> pdf_params%w_1 = trapezoid_zt( w_1_zt, w_1_zm )
> pdf_params%w_2 = trapezoid_zt( w_2_zt, w_2_zm )
> pdf_params%varnce_w_1 = trapezoid_zt( varnce_w_1_zt, varnce_w_1_zm )
> pdf_params%varnce_w_2 = trapezoid_zt( varnce_w_2_zt, varnce_w_2_zm )
> pdf_params%rt_1 = trapezoid_zt( rt_1_zt, rt_1_zm )
> pdf_params%rt_2 = trapezoid_zt( rt_2_zt, rt_2_zm )
> pdf_params%varnce_rt_1 = trapezoid_zt( varnce_rt_1_zt, varnce_rt_1_zm )
> pdf_params%varnce_rt_2 = trapezoid_zt( varnce_rt_2_zt, varnce_rt_2_zm )
> pdf_params%crt_1 = trapezoid_zt( crt_1_zt, crt_1_zm )
> pdf_params%crt_2 = trapezoid_zt( crt_2_zt, crt_2_zm )
> pdf_params%cthl_1 = trapezoid_zt( cthl_1_zt, cthl_1_zm )
> pdf_params%cthl_2 = trapezoid_zt( cthl_2_zt, cthl_2_zm )
> pdf_params%thl_1 = trapezoid_zt( thl_1_zt, thl_1_zm )
> pdf_params%thl_2 = trapezoid_zt( thl_2_zt, thl_2_zm )
> pdf_params%varnce_thl_1 = trapezoid_zt( varnce_thl_1_zt, varnce_thl_1_zm )
> pdf_params%varnce_thl_2 = trapezoid_zt( varnce_thl_2_zt, varnce_thl_2_zm )
> pdf_params%mixt_frac = trapezoid_zt( mixt_frac_zt, mixt_frac_zm )
> pdf_params%rc_1 = trapezoid_zt( rc_1_zt, rc_1_zm )
> pdf_params%rc_2 = trapezoid_zt( rc_2_zt, rc_2_zm )
> pdf_params%rsatl_1 = trapezoid_zt( rsatl_1_zt, rsatl_1_zm )
> pdf_params%rsatl_2 = trapezoid_zt( rsatl_2_zt, rsatl_2_zm )
> pdf_params%cloud_frac_1 = trapezoid_zt( cloud_frac_1_zt, cloud_frac_1_zm )
> pdf_params%cloud_frac_2 = trapezoid_zt( cloud_frac_2_zt, cloud_frac_2_zm )
> pdf_params%chi_1 = trapezoid_zt( chi_1_zt, chi_1_zm )
> pdf_params%chi_2 = trapezoid_zt( chi_2_zt, chi_2_zm )
> pdf_params%corr_w_rt_1 = trapezoid_zt( corr_w_rt_1_zt, corr_w_rt_1_zm )
> pdf_params%corr_w_rt_2 = trapezoid_zt( corr_w_rt_2_zt, corr_w_rt_2_zm )
> pdf_params%corr_w_thl_1 = trapezoid_zt( corr_w_thl_1_zt, corr_w_thl_1_zm )
> pdf_params%corr_w_thl_2 = trapezoid_zt( corr_w_thl_2_zt, corr_w_thl_2_zm )
> pdf_params%corr_rt_thl_1 = trapezoid_zt( corr_rt_thl_1_zt, corr_rt_thl_1_zm )
> pdf_params%corr_rt_thl_2 = trapezoid_zt( corr_rt_thl_2_zt, corr_rt_thl_2_zm )
> pdf_params%alpha_thl = trapezoid_zt( alpha_thl_zt, alpha_thl_zm )
> pdf_params%alpha_rt = trapezoid_zt( alpha_rt_zt, alpha_rt_zm )
> pdf_params%stdev_chi_1 = trapezoid_zt( stdev_chi_1_zt, stdev_chi_1_zm )
> pdf_params%stdev_chi_2 = trapezoid_zt( stdev_chi_2_zt, stdev_chi_2_zm )
> pdf_params%stdev_eta_1 = trapezoid_zt( stdev_eta_1_zt, stdev_eta_1_zm )
> pdf_params%stdev_eta_2 = trapezoid_zt( stdev_eta_2_zt, stdev_eta_2_zm )
4218,4219c4218,4219
< chi_mean(k) = pdf_params%mixt_frac(1,k) * pdf_params%chi_1(1,k) + &
< (1.0_core_rknd-pdf_params%mixt_frac(1,k)) * pdf_params%chi_2(1,k)
---
> chi_mean(k) = pdf_params%mixt_frac(k) * pdf_params%chi_1(k) + &
> (1.0_core_rknd-pdf_params%mixt_frac(k)) * pdf_params%chi_2(k)
4301,4303c4301,4303
< write(fstderr,*) "pdf_params(k)%mixt_frac = ", pdf_params%mixt_frac(1,k)
< write(fstderr,*) "pdf_params(k)%chi_1 = ", pdf_params%chi_1(1,k)
< write(fstderr,*) "pdf_params(k)%chi_2 = ", pdf_params%chi_2(1,k)
---
> write(fstderr,*) "pdf_params(k)%mixt_frac = ", pdf_params%mixt_frac(k)
> write(fstderr,*) "pdf_params(k)%chi_1 = ", pdf_params%chi_1(k)
> write(fstderr,*) "pdf_params(k)%chi_2 = ", pdf_params%chi_2(k)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_xp2_xpyp_module.F90 clubb_release/src/CLUBB_core/advance_xp2_xpyp_module.F90
5050,5053c5050,5053
< temp_rtp2 = pdf_params%mixt_frac(1,:) &
< * ( ( pdf_params%rt_1(1,:) - ( rcm + rvm ) )**2 + pdf_params%varnce_rt_1(1,:) ) &
< + ( 1.0_core_rknd - pdf_params%mixt_frac(1,:) ) &
< * ( ( pdf_params%rt_2(1,:) - ( rcm + rvm ) )**2 + pdf_params%varnce_rt_2(1,:) )
---
> temp_rtp2 = pdf_params%mixt_frac &
> * ( ( pdf_params%rt_1 - ( rcm + rvm ) )**2 + pdf_params%varnce_rt_1 ) &
> + ( 1.0_core_rknd - pdf_params%mixt_frac ) &
> * ( ( pdf_params%rt_2 - ( rcm + rvm ) )**2 + pdf_params%varnce_rt_2 )
5062,5065c5062,5065
< temp_thlp2 = pdf_params%mixt_frac(1,:) &
< * ( ( pdf_params%thl_1(1,:) - thlm )**2 + pdf_params%varnce_thl_1(1,:) ) &
< + ( 1.0_core_rknd - pdf_params%mixt_frac(1,:) ) &
< * ( ( pdf_params%thl_2(1,:) - thlm )**2 + pdf_params%varnce_thl_2(1,:) )
---
> temp_thlp2 = pdf_params%mixt_frac &
> * ( ( pdf_params%thl_1 - thlm )**2 + pdf_params%varnce_thl_1 ) &
> + ( 1.0_core_rknd - pdf_params%mixt_frac ) &
> * ( ( pdf_params%thl_2 - thlm )**2 + pdf_params%varnce_thl_2 )
5077,5080c5077,5080
< temp_wp2 = pdf_params%mixt_frac(1,:) &
< * ( ( pdf_params%w_1(1,:) - wm )**2 + pdf_params%varnce_w_1(1,:) ) &
< + ( 1.0_core_rknd - pdf_params%mixt_frac(1,:) ) &
< * ( ( pdf_params%w_2(1,:) - wm )**2 + pdf_params%varnce_w_2(1,:) )
---
> temp_wp2 = pdf_params%mixt_frac &
> * ( ( pdf_params%w_1 - wm )**2 + pdf_params%varnce_w_1 ) &
> + ( 1.0_core_rknd - pdf_params%mixt_frac ) &
> * ( ( pdf_params%w_2 - wm )**2 + pdf_params%varnce_w_2 )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/clubb_api_module.F90 clubb_release/src/CLUBB_core/clubb_api_module.F90
505,508d504
<
< public &
< copy_single_pdf_params_to_multi, &
< copy_multi_pdf_params_to_single
1644c1640
< subroutine init_pdf_params_api( nz, ngrdcol, pdf_params )
---
> subroutine init_pdf_params_api( nz, pdf_params )
1652,1653c1648
< nz, & ! Number of vertical grid levels [-]
< ngrdcol ! Number of grid columns [-]
---
> nz ! Number of vertical grid levels [-]
1659c1654
< call init_pdf_params( nz, ngrdcol, pdf_params )
---
> call init_pdf_params( nz, pdf_params )
1664,1816d1658
< ! copy_single_pdf_params_to_multi - copies values of a single column version of pdf_params
< ! to a multiple column version for a specified column.
< !
< ! NOTE: THIS SUBROUTINE IS INTENDED TO BE TEMPORARY AND SHOULD BECOME UNNECESSARY ONCE
< ! CLUBB IS ABLE TO OPERATE OVER MULTIPLE COLUMNS.
< ! See https://github.com/larson-group/cam/issues/129#issuecomment-827944454
< !================================================================================================
< subroutine copy_single_pdf_params_to_multi( pdf_params_single, icol, &
< pdf_params_multi )
<
< use pdf_parameter_module, only : init_pdf_params
<
< implicit none
<
< ! Input Variable(s)
< integer, intent(in) :: &
< icol ! Column number to copy to
<
< type(pdf_parameter), intent(in) :: &
< pdf_params_single ! PDF parameters [units vary]
<
< ! Output Variable(s)
< type(pdf_parameter), intent(inout) :: &
< pdf_params_multi ! PDF parameters [units vary]
<
< pdf_params_multi%w_1(icol,:) = pdf_params_single%w_1(1,:)
< pdf_params_multi%w_2(icol,:) = pdf_params_single%w_2(1,:)
< pdf_params_multi%varnce_w_1(icol,:) = pdf_params_single%varnce_w_1(1,:)
< pdf_params_multi%varnce_w_2(icol,:) = pdf_params_single%varnce_w_2(1,:)
< pdf_params_multi%rt_1(icol,:) = pdf_params_single%rt_1(1,:)
< pdf_params_multi%rt_2(icol,:) = pdf_params_single%rt_2(1,:)
< pdf_params_multi%varnce_rt_1(icol,:) = pdf_params_single%varnce_rt_1(1,:)
< pdf_params_multi%varnce_rt_2(icol,:) = pdf_params_single%varnce_rt_2(1,:)
< pdf_params_multi%thl_1(icol,:) = pdf_params_single%thl_1(1,:)
< pdf_params_multi%thl_2(icol,:) = pdf_params_single%thl_2(1,:)
< pdf_params_multi%varnce_thl_1(icol,:) = pdf_params_single%varnce_thl_1(1,:)
< pdf_params_multi%varnce_thl_2(icol,:) = pdf_params_single%varnce_thl_2(1,:)
< pdf_params_multi%corr_w_rt_1(icol,:) = pdf_params_single%corr_w_rt_1(1,:)
< pdf_params_multi%corr_w_rt_2(icol,:) = pdf_params_single%corr_w_rt_2(1,:)
< pdf_params_multi%corr_w_thl_1(icol,:) = pdf_params_single%corr_w_thl_1(1,:)
< pdf_params_multi%corr_w_thl_2(icol,:) = pdf_params_single%corr_w_thl_2(1,:)
< pdf_params_multi%corr_rt_thl_1(icol,:) = pdf_params_single%corr_rt_thl_1(1,:)
< pdf_params_multi%corr_rt_thl_2(icol,:) = pdf_params_single%corr_rt_thl_2(1,:)
< pdf_params_multi%alpha_thl(icol,:) = pdf_params_single%alpha_thl(1,:)
< pdf_params_multi%alpha_rt(icol,:) = pdf_params_single%alpha_rt(1,:)
< pdf_params_multi%crt_1(icol,:) = pdf_params_single%crt_1(1,:)
< pdf_params_multi%crt_2(icol,:) = pdf_params_single%crt_2(1,:)
< pdf_params_multi%cthl_1(icol,:) = pdf_params_single%cthl_1(1,:)
< pdf_params_multi%cthl_2(icol,:) = pdf_params_single%cthl_2(1,:)
< pdf_params_multi%chi_1(icol,:) = pdf_params_single%chi_1(1,:)
< pdf_params_multi%chi_2(icol,:) = pdf_params_single%chi_2(1,:)
< pdf_params_multi%stdev_chi_1(icol,:) = pdf_params_single%stdev_chi_1(1,:)
< pdf_params_multi%stdev_chi_2(icol,:) = pdf_params_single%stdev_chi_2(1,:)
< pdf_params_multi%stdev_eta_1(icol,:) = pdf_params_single%stdev_eta_1(1,:)
< pdf_params_multi%stdev_eta_2(icol,:) = pdf_params_single%stdev_eta_2(1,:)
< pdf_params_multi%covar_chi_eta_1(icol,:) = pdf_params_single%covar_chi_eta_1(1,:)
< pdf_params_multi%covar_chi_eta_2(icol,:) = pdf_params_single%covar_chi_eta_2(1,:)
< pdf_params_multi%corr_w_chi_1(icol,:) = pdf_params_single%corr_w_chi_1(1,:)
< pdf_params_multi%corr_w_chi_2(icol,:) = pdf_params_single%corr_w_chi_2(1,:)
< pdf_params_multi%corr_w_eta_1(icol,:) = pdf_params_single%corr_w_eta_1(1,:)
< pdf_params_multi%corr_w_eta_2(icol,:) = pdf_params_single%corr_w_eta_2(1,:)
< pdf_params_multi%corr_chi_eta_1(icol,:) = pdf_params_single%corr_chi_eta_1(1,:)
< pdf_params_multi%corr_chi_eta_2(icol,:) = pdf_params_single%corr_chi_eta_2(1,:)
< pdf_params_multi%rsatl_1(icol,:) = pdf_params_single%rsatl_1(1,:)
< pdf_params_multi%rsatl_2(icol,:) = pdf_params_single%rsatl_2(1,:)
< pdf_params_multi%rc_1(icol,:) = pdf_params_single%rc_1(1,:)
< pdf_params_multi%rc_2(icol,:) = pdf_params_single%rc_2(1,:)
< pdf_params_multi%cloud_frac_1(icol,:) = pdf_params_single%cloud_frac_1(1,:)
< pdf_params_multi%cloud_frac_2(icol,:) = pdf_params_single%cloud_frac_2(1,:)
< pdf_params_multi%mixt_frac(icol,:) = pdf_params_single%mixt_frac(1,:)
< pdf_params_multi%ice_supersat_frac_1(icol,:) = pdf_params_single%ice_supersat_frac_1(1,:)
< pdf_params_multi%ice_supersat_frac_2(icol,:) = pdf_params_single%ice_supersat_frac_2(1,:)
<
< end subroutine copy_single_pdf_params_to_multi
<
< !================================================================================================
< ! copy_multi_pdf_params_to_single - copies values of a multiple column version of pdf_params
< ! at a specified column to a single column version.
< !
< ! NOTE: THIS SUBROUTINE IS INTENDED TO BE TEMPORARY AND SHOULD BECOME UNNECESSARY ONCE
< ! CLUBB IS ABLE TO OPERATE OVER MULTIPLE COLUMNS.
< ! See https://github.com/larson-group/cam/issues/129#issuecomment-827944454
< !================================================================================================
< subroutine copy_multi_pdf_params_to_single( pdf_params_multi, icol, &
< pdf_params_single )
<
< use pdf_parameter_module, only : init_pdf_params
<
< implicit none
<
< ! Input Variable(s)
< integer, intent(in) :: &
< icol ! Column number to copy to
<
< type(pdf_parameter), intent(in) :: &
< pdf_params_multi ! PDF parameters [units vary]
<
< ! Output Variable(s)
< type(pdf_parameter), intent(inout) :: &
< pdf_params_single ! PDF parameters [units vary]
<
< pdf_params_single%w_1(1,:) = pdf_params_multi%w_1(icol,:)
< pdf_params_single%w_2(1,:) = pdf_params_multi%w_2(icol,:)
< pdf_params_single%varnce_w_1(1,:) = pdf_params_multi%varnce_w_1(icol,:)
< pdf_params_single%varnce_w_2(1,:) = pdf_params_multi%varnce_w_2(icol,:)
< pdf_params_single%rt_1(1,:) = pdf_params_multi%rt_1(icol,:)
< pdf_params_single%rt_2(1,:) = pdf_params_multi%rt_2(icol,:)
< pdf_params_single%varnce_rt_1(1,:) = pdf_params_multi%varnce_rt_1(icol,:)
< pdf_params_single%varnce_rt_2(1,:) = pdf_params_multi%varnce_rt_2(icol,:)
< pdf_params_single%thl_1(1,:) = pdf_params_multi%thl_1(icol,:)
< pdf_params_single%thl_2(1,:) = pdf_params_multi%thl_2(icol,:)
< pdf_params_single%varnce_thl_1(1,:) = pdf_params_multi%varnce_thl_1(icol,:)
< pdf_params_single%varnce_thl_2(1,:) = pdf_params_multi%varnce_thl_2(icol,:)
< pdf_params_single%corr_w_rt_1(1,:) = pdf_params_multi%corr_w_rt_1(icol,:)
< pdf_params_single%corr_w_rt_2(1,:) = pdf_params_multi%corr_w_rt_2(icol,:)
< pdf_params_single%corr_w_thl_1(1,:) = pdf_params_multi%corr_w_thl_1(icol,:)
< pdf_params_single%corr_w_thl_2(1,:) = pdf_params_multi%corr_w_thl_2(icol,:)
< pdf_params_single%corr_rt_thl_1(1,:) = pdf_params_multi%corr_rt_thl_1(icol,:)
< pdf_params_single%corr_rt_thl_2(1,:) = pdf_params_multi%corr_rt_thl_2(icol,:)
< pdf_params_single%alpha_thl(1,:) = pdf_params_multi%alpha_thl(icol,:)
< pdf_params_single%alpha_rt(1,:) = pdf_params_multi%alpha_rt(icol,:)
< pdf_params_single%crt_1(1,:) = pdf_params_multi%crt_1(icol,:)
< pdf_params_single%crt_2(1,:) = pdf_params_multi%crt_2(icol,:)
< pdf_params_single%cthl_1(1,:) = pdf_params_multi%cthl_1(icol,:)
< pdf_params_single%cthl_2(1,:) = pdf_params_multi%cthl_2(icol,:)
< pdf_params_single%chi_1(1,:) = pdf_params_multi%chi_1(icol,:)
< pdf_params_single%chi_2(1,:) = pdf_params_multi%chi_2(icol,:)
< pdf_params_single%stdev_chi_1(1,:) = pdf_params_multi%stdev_chi_1(icol,:)
< pdf_params_single%stdev_chi_2(1,:) = pdf_params_multi%stdev_chi_2(icol,:)
< pdf_params_single%stdev_eta_1(1,:) = pdf_params_multi%stdev_eta_1(icol,:)
< pdf_params_single%stdev_eta_2(1,:) = pdf_params_multi%stdev_eta_2(icol,:)
< pdf_params_single%covar_chi_eta_1(1,:) = pdf_params_multi%covar_chi_eta_1(icol,:)
< pdf_params_single%covar_chi_eta_2(1,:) = pdf_params_multi%covar_chi_eta_2(icol,:)
< pdf_params_single%corr_w_chi_1(1,:) = pdf_params_multi%corr_w_chi_1(icol,:)
< pdf_params_single%corr_w_chi_2(1,:) = pdf_params_multi%corr_w_chi_2(icol,:)
< pdf_params_single%corr_w_eta_1(1,:) = pdf_params_multi%corr_w_eta_1(icol,:)
< pdf_params_single%corr_w_eta_2(1,:) = pdf_params_multi%corr_w_eta_2(icol,:)
< pdf_params_single%corr_chi_eta_1(1,:) = pdf_params_multi%corr_chi_eta_1(icol,:)
< pdf_params_single%corr_chi_eta_2(1,:) = pdf_params_multi%corr_chi_eta_2(icol,:)
< pdf_params_single%rsatl_1(1,:) = pdf_params_multi%rsatl_1(icol,:)
< pdf_params_single%rsatl_2(1,:) = pdf_params_multi%rsatl_2(icol,:)
< pdf_params_single%rc_1(1,:) = pdf_params_multi%rc_1(icol,:)
< pdf_params_single%rc_2(1,:) = pdf_params_multi%rc_2(icol,:)
< pdf_params_single%cloud_frac_1(1,:) = pdf_params_multi%cloud_frac_1(icol,:)
< pdf_params_single%cloud_frac_2(1,:) = pdf_params_multi%cloud_frac_2(icol,:)
< pdf_params_single%mixt_frac(1,:) = pdf_params_multi%mixt_frac(icol,:)
< pdf_params_single%ice_supersat_frac_1(1,:) = pdf_params_multi%ice_supersat_frac_1(icol,:)
< pdf_params_single%ice_supersat_frac_2(1,:) = pdf_params_multi%ice_supersat_frac_2(icol,:)
<
< end subroutine copy_multi_pdf_params_to_single
<
<
< !================================================================================================
1994a1837,1839
>
> type(pdf_parameter), dimension(1) :: &
> pdf_params_col ! PDF parameters [units vary]
2026a1872,1873
>
> pdf_params_col(1) = pdf_params
2033c1880
< pdf_params, l_stats_samp, & ! Intent(in)
---
> pdf_params_col, l_stats_samp, & ! Intent(in)
2123c1970
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/mixing_length.F90 clubb_release/src/CLUBB_core/mixing_length.F90
1040,1049c1040,1049
< where ( pdf_params%rt_1(1,:) > pdf_params%rt_2(1,:) )
< rtm_pert_pos_rt = pdf_params%rt_1(1,:) &
< + Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_1(1,:), rt_tol**2 ) )
< thlm_pert_pos_rt = pdf_params%thl_1(1,:) + ( sign_rtpthlp * Lscale_pert_coef &
< * sqrt( max( pdf_params%varnce_thl_1(1,:), thl_tol**2 ) ) )
< thlm_pert_neg_rt = pdf_params%thl_2(1,:) - ( sign_rtpthlp * Lscale_pert_coef &
< * sqrt( max( pdf_params%varnce_thl_2(1,:), thl_tol**2 ) ) )
< rtm_pert_neg_rt = pdf_params%rt_2(1,:) &
< - Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_2(1,:), rt_tol**2 ) )
< !Lscale_weight = pdf_params%mixt_frac(1,:)
---
> where ( pdf_params%rt_1 > pdf_params%rt_2 )
> rtm_pert_pos_rt = pdf_params%rt_1 &
> + Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_1, rt_tol**2 ) )
> thlm_pert_pos_rt = pdf_params%thl_1 + ( sign_rtpthlp * Lscale_pert_coef &
> * sqrt( max( pdf_params%varnce_thl_1, thl_tol**2 ) ) )
> thlm_pert_neg_rt = pdf_params%thl_2 - ( sign_rtpthlp * Lscale_pert_coef &
> * sqrt( max( pdf_params%varnce_thl_2, thl_tol**2 ) ) )
> rtm_pert_neg_rt = pdf_params%rt_2 &
> - Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_2, rt_tol**2 ) )
> !Lscale_weight = pdf_params%mixt_frac
1051,1059c1051,1059
< rtm_pert_pos_rt = pdf_params%rt_2(1,:) &
< + Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_2(1,:), rt_tol**2 ) )
< thlm_pert_pos_rt = pdf_params%thl_2(1,:) + ( sign_rtpthlp * Lscale_pert_coef &
< * sqrt( max( pdf_params%varnce_thl_2(1,:), thl_tol**2 ) ) )
< thlm_pert_neg_rt = pdf_params%thl_1(1,:) - ( sign_rtpthlp * Lscale_pert_coef &
< * sqrt( max( pdf_params%varnce_thl_1(1,:), thl_tol**2 ) ) )
< rtm_pert_neg_rt = pdf_params%rt_1(1,:) &
< - Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_1(1,:), rt_tol**2 ) )
< !Lscale_weight = 1.0_core_rknd - pdf_params%mixt_frac(1,:)
---
> rtm_pert_pos_rt = pdf_params%rt_2 &
> + Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_2, rt_tol**2 ) )
> thlm_pert_pos_rt = pdf_params%thl_2 + ( sign_rtpthlp * Lscale_pert_coef &
> * sqrt( max( pdf_params%varnce_thl_2, thl_tol**2 ) ) )
> thlm_pert_neg_rt = pdf_params%thl_1 - ( sign_rtpthlp * Lscale_pert_coef &
> * sqrt( max( pdf_params%varnce_thl_1, thl_tol**2 ) ) )
> rtm_pert_neg_rt = pdf_params%rt_1 &
> - Lscale_pert_coef * sqrt( max( pdf_params%varnce_rt_1, rt_tol**2 ) )
> !Lscale_weight = 1.0_core_rknd - pdf_params%mixt_frac
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/numerical_check.F90 clubb_release/src/CLUBB_core/numerical_check.F90
180,182c180,182
< call check_nan( pdf_params%w_1(1,:), "pdf_params%w_1(1,:)", proc_name )
< call check_nan( pdf_params%w_2(1,:), "pdf_params%w_2(1,:)", proc_name )
< call check_nan( pdf_params%varnce_w_1(1,:), "pdf_params%varnce_w_1(1,:)", &
---
> call check_nan( pdf_params%w_1, "pdf_params%w_1", proc_name )
> call check_nan( pdf_params%w_2, "pdf_params%w_2", proc_name )
> call check_nan( pdf_params%varnce_w_1, "pdf_params%varnce_w_1", &
184c184
< call check_nan( pdf_params%varnce_w_2(1,:), "pdf_params%varnce_w_2(1,:)", &
---
> call check_nan( pdf_params%varnce_w_2, "pdf_params%varnce_w_2", &
186,188c186,188
< call check_nan( pdf_params%rt_1(1,:), "pdf_params%rt_1(1,:)", proc_name )
< call check_nan( pdf_params%rt_2(1,:), "pdf_params%rt_2(1,:)", proc_name )
< call check_nan( pdf_params%varnce_rt_1(1,:), "pdf_params%varnce_rt_1(1,:)", &
---
> call check_nan( pdf_params%rt_1, "pdf_params%rt_1", proc_name )
> call check_nan( pdf_params%rt_2, "pdf_params%rt_2", proc_name )
> call check_nan( pdf_params%varnce_rt_1, "pdf_params%varnce_rt_1", &
190c190
< call check_nan( pdf_params%varnce_rt_2(1,:), "pdf_params%varnce_rt_2(1,:)", &
---
> call check_nan( pdf_params%varnce_rt_2, "pdf_params%varnce_rt_2", &
192,194c192,194
< call check_nan( pdf_params%thl_1(1,:), "pdf_params%thl_1(1,:)", proc_name )
< call check_nan( pdf_params%thl_2(1,:), "pdf_params%thl_2(1,:)", proc_name )
< call check_nan( pdf_params%varnce_thl_1(1,:), "pdf_params%varnce_thl_1(1,:)", &
---
> call check_nan( pdf_params%thl_1, "pdf_params%thl_1", proc_name )
> call check_nan( pdf_params%thl_2, "pdf_params%thl_2", proc_name )
> call check_nan( pdf_params%varnce_thl_1, "pdf_params%varnce_thl_1", &
196c196
< call check_nan( pdf_params%varnce_thl_2(1,:), "pdf_params%varnce_thl_2(1,:)", &
---
> call check_nan( pdf_params%varnce_thl_2, "pdf_params%varnce_thl_2", &
198c198
< call check_nan( pdf_params%mixt_frac(1,:), "pdf_params%mixt_frac(1,:)", &
---
> call check_nan( pdf_params%mixt_frac, "pdf_params%mixt_frac", &
200c200
< call check_nan( pdf_params%corr_w_rt_1(1,:), "pdf_params%corr_w_rt_1(1,:)", &
---
> call check_nan( pdf_params%corr_w_rt_1, "pdf_params%corr_w_rt_1", &
202c202
< call check_nan( pdf_params%corr_w_rt_2(1,:), "pdf_params%corr_w_rt_2(1,:)", &
---
> call check_nan( pdf_params%corr_w_rt_2, "pdf_params%corr_w_rt_2", &
204c204
< call check_nan( pdf_params%corr_w_thl_1(1,:), "pdf_params%corr_w_thl_1(1,:)", &
---
> call check_nan( pdf_params%corr_w_thl_1, "pdf_params%corr_w_thl_1", &
206c206
< call check_nan( pdf_params%corr_w_thl_2(1,:), "pdf_params%corr_w_thl_2(1,:)", &
---
> call check_nan( pdf_params%corr_w_thl_2, "pdf_params%corr_w_thl_2", &
208c208
< call check_nan( pdf_params%corr_rt_thl_1(1,:), "pdf_params%corr_rt_thl_1(1,:)", &
---
> call check_nan( pdf_params%corr_rt_thl_1, "pdf_params%corr_rt_thl_1", &
210c210
< call check_nan( pdf_params%corr_rt_thl_2(1,:), "pdf_params%corr_rt_thl_2(1,:)", &
---
> call check_nan( pdf_params%corr_rt_thl_2, "pdf_params%corr_rt_thl_2", &
212,214c212,214
< call check_nan( pdf_params%rc_1(1,:), "pdf_params%rc_1(1,:)", proc_name )
< call check_nan( pdf_params%rc_2(1,:), "pdf_params%rc_2(1,:)", proc_name )
< call check_nan( pdf_params%rsatl_1(1,:), "pdf_params%rsatl_1(1,:)", &
---
> call check_nan( pdf_params%rc_1, "pdf_params%rc_1", proc_name )
> call check_nan( pdf_params%rc_2, "pdf_params%rc_2", proc_name )
> call check_nan( pdf_params%rsatl_1, "pdf_params%rsatl_1", &
216c216
< call check_nan( pdf_params%rsatl_2(1,:), "pdf_params%rsatl_2(1,:)", &
---
> call check_nan( pdf_params%rsatl_2, "pdf_params%rsatl_2", &
218c218
< call check_nan( pdf_params%cloud_frac_1(1,:), "pdf_params%cloud_frac_1(1,:)", &
---
> call check_nan( pdf_params%cloud_frac_1, "pdf_params%cloud_frac_1", &
220c220
< call check_nan( pdf_params%cloud_frac_2(1,:), "pdf_params%cloud_frac_2(1,:)", &
---
> call check_nan( pdf_params%cloud_frac_2, "pdf_params%cloud_frac_2", &
222,224c222,224
< call check_nan( pdf_params%chi_1(1,:), "pdf_params%chi_1(1,:)", proc_name )
< call check_nan( pdf_params%chi_2(1,:), "pdf_params%chi_2(1,:)", proc_name )
< call check_nan( pdf_params%stdev_chi_1(1,:), "pdf_params%stdev_chi_1(1,:)", &
---
> call check_nan( pdf_params%chi_1, "pdf_params%chi_1", proc_name )
> call check_nan( pdf_params%chi_2, "pdf_params%chi_2", proc_name )
> call check_nan( pdf_params%stdev_chi_1, "pdf_params%stdev_chi_1", &
226c226
< call check_nan( pdf_params%stdev_chi_2(1,:), "pdf_params%stdev_chi_2(1,:)", &
---
> call check_nan( pdf_params%stdev_chi_2, "pdf_params%stdev_chi_2", &
228c228
< call check_nan( pdf_params%stdev_eta_1(1,:), "pdf_params%stdev_eta_1(1,:)", &
---
> call check_nan( pdf_params%stdev_eta_1, "pdf_params%stdev_eta_1", &
230c230
< call check_nan( pdf_params%stdev_eta_2(1,:), "pdf_params%stdev_eta_2(1,:)", &
---
> call check_nan( pdf_params%stdev_eta_2, "pdf_params%stdev_eta_2", &
232c232
< call check_nan( pdf_params%covar_chi_eta_1(1,:), "pdf_params%covar_chi_eta_1(1,:)", &
---
> call check_nan( pdf_params%covar_chi_eta_1, "pdf_params%covar_chi_eta_1", &
234c234
< call check_nan( pdf_params%covar_chi_eta_2(1,:), "pdf_params%covar_chi_eta_2(1,:)", &
---
> call check_nan( pdf_params%covar_chi_eta_2, "pdf_params%covar_chi_eta_2", &
236c236
< call check_nan( pdf_params%corr_w_chi_1(1,:), "pdf_params%corr_w_chi_1(1,:)", &
---
> call check_nan( pdf_params%corr_w_chi_1, "pdf_params%corr_w_chi_1", &
238c238
< call check_nan( pdf_params%corr_w_chi_2(1,:), "pdf_params%corr_w_chi_2(1,:)", &
---
> call check_nan( pdf_params%corr_w_chi_2, "pdf_params%corr_w_chi_2", &
240c240
< call check_nan( pdf_params%corr_w_eta_1(1,:), "pdf_params%corr_w_eta_1(1,:)", &
---
> call check_nan( pdf_params%corr_w_eta_1, "pdf_params%corr_w_eta_1", &
242c242
< call check_nan( pdf_params%corr_w_eta_2(1,:), "pdf_params%corr_w_eta_2(1,:)", &
---
> call check_nan( pdf_params%corr_w_eta_2, "pdf_params%corr_w_eta_2", &
244c244
< call check_nan( pdf_params%corr_chi_eta_1(1,:), "pdf_params%corr_chi_eta_1(1,:)", &
---
> call check_nan( pdf_params%corr_chi_eta_1, "pdf_params%corr_chi_eta_1", &
246c246
< call check_nan( pdf_params%corr_chi_eta_2(1,:), "pdf_params%corr_chi_eta_2(1,:)", &
---
> call check_nan( pdf_params%corr_chi_eta_2, "pdf_params%corr_chi_eta_2", &
248c248
< call check_nan( pdf_params%alpha_thl(1,:), "pdf_params%alpha_thl(1,:)", &
---
> call check_nan( pdf_params%alpha_thl, "pdf_params%alpha_thl", &
250c250
< call check_nan( pdf_params%alpha_rt(1,:), "pdf_params%alpha_rt(1,:)", &
---
> call check_nan( pdf_params%alpha_rt, "pdf_params%alpha_rt", &
252,255c252,255
< call check_nan( pdf_params%ice_supersat_frac_1(1,:), &
< "pdf_params%ice_supersat_frac_1(1,:)", proc_name )
< call check_nan( pdf_params%ice_supersat_frac_2(1,:), &
< "pdf_params%ice_supersat_frac_2(1,:)", proc_name )
---
> call check_nan( pdf_params%ice_supersat_frac_1, &
> "pdf_params%ice_supersat_frac_1", proc_name )
> call check_nan( pdf_params%ice_supersat_frac_2, &
> "pdf_params%ice_supersat_frac_2", proc_name )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/pdf_closure_module.F90 clubb_release/src/CLUBB_core/pdf_closure_module.F90
423,424c423,424
< pdf_params%alpha_thl(1,:) = one_half
< pdf_params%alpha_rt(1,:) = one_half
---
> pdf_params%alpha_thl = one_half
> pdf_params%alpha_rt = one_half
507,509c507,509
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
511,513c511,513
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! Out
---
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! Out
516,517c516,517
< pdf_params%mixt_frac(1,:), & ! Out
< pdf_params%alpha_rt(1,:), pdf_params%alpha_thl(1,:), & ! Out
---
> pdf_params%mixt_frac, & ! Out
> pdf_params%alpha_rt, pdf_params%alpha_thl, & ! Out
527,534c527,534
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! Out
< pdf_params%mixt_frac(1,:), & ! Out
< pdf_params%alpha_rt(1,:), pdf_params%alpha_thl(1,:), & ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! Out
> pdf_params%mixt_frac, & ! Out
> pdf_params%alpha_rt, pdf_params%alpha_thl, & ! Out
542,548c542,548
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! Out
< pdf_params%mixt_frac(1,:) ) ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! Out
> pdf_params%mixt_frac ) ! Out
555,561c555,561
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! Out
< pdf_params%mixt_frac(1,:), & ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! Out
> pdf_params%mixt_frac, & ! Out
570,576c570,576
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! Out
< pdf_params%mixt_frac(1,:) ) ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! Out
> pdf_params%mixt_frac ) ! Out
582,588c582,588
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! Out
< pdf_params%mixt_frac(1,:) ) ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! Out
> pdf_params%mixt_frac ) ! Out
597,599c597,599
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! Out
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! Out
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! Out
> pdf_params%rt_1, pdf_params%rt_2, & ! Out
> pdf_params%thl_1, pdf_params%thl_2, & ! Out
601,606c601,606
< pdf_params%varnce_w_1(1,:), & ! Out
< pdf_params%varnce_w_2(1,:), & ! Out
< pdf_params%varnce_rt_1(1,:), & ! Out
< pdf_params%varnce_rt_2(1,:), & ! Out
< pdf_params%varnce_thl_1(1,:), & ! Out
< pdf_params%varnce_thl_2(1,:), & ! Out
---
> pdf_params%varnce_w_1, & ! Out
> pdf_params%varnce_w_2, & ! Out
> pdf_params%varnce_rt_1, & ! Out
> pdf_params%varnce_rt_2, & ! Out
> pdf_params%varnce_thl_1, & ! Out
> pdf_params%varnce_thl_2, & ! Out
611c611
< pdf_params%mixt_frac(1,:), & ! Out
---
> pdf_params%mixt_frac, & ! Out
627,632c627,632
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! In
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! In
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! In
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! In
< pdf_params%mixt_frac(1,:), & ! In
< pdf_params%corr_rt_thl_1(1,:), pdf_params%corr_rt_thl_2(1,:) ) ! Out
---
> pdf_params%rt_1, pdf_params%rt_2, & ! In
> pdf_params%thl_1, pdf_params%thl_2, & ! In
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! In
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! In
> pdf_params%mixt_frac, & ! In
> pdf_params%corr_rt_thl_1, pdf_params%corr_rt_thl_2 ) ! Out
641,644c641,644
< pdf_params%corr_w_rt_1(1,:) = zero
< pdf_params%corr_w_rt_2(1,:) = zero
< pdf_params%corr_w_thl_1(1,:) = zero
< pdf_params%corr_w_thl_2(1,:) = zero
---
> pdf_params%corr_w_rt_1 = zero
> pdf_params%corr_w_rt_2 = zero
> pdf_params%corr_w_thl_1 = zero
> pdf_params%corr_w_thl_2 = zero
654,659c654,659
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! In
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! In
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! In
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! In
< pdf_params%mixt_frac(1,:), & ! In
< pdf_params%corr_w_rt_1(1,:), pdf_params%corr_w_rt_2(1,:) ) ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! In
> pdf_params%rt_1, pdf_params%rt_2, & ! In
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! In
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! In
> pdf_params%mixt_frac, & ! In
> pdf_params%corr_w_rt_1, pdf_params%corr_w_rt_2 ) ! Out
663,668c663,668
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! In
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! In
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! In
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! In
< pdf_params%mixt_frac(1,:), & ! In
< pdf_params%corr_w_thl_1(1,:), pdf_params%corr_w_thl_2(1,:) ) ! Out
---
> pdf_params%w_1, pdf_params%w_2, & ! In
> pdf_params%thl_1, pdf_params%thl_2, & ! In
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! In
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! In
> pdf_params%mixt_frac, & ! In
> pdf_params%corr_w_thl_1, pdf_params%corr_w_thl_2 ) ! Out
679c679
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), & ! In
---
> pdf_params%thl_1, pdf_params%thl_2, & ! In
681,682c681,682
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), & ! In
< pdf_params%mixt_frac(1,:), & ! In
---
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, & ! In
> pdf_params%mixt_frac, & ! In
688c688
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), & ! In
---
> pdf_params%rt_1, pdf_params%rt_2, & ! In
690,691c690,691
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), & ! In
< pdf_params%mixt_frac(1,:), & ! In
---
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, & ! In
> pdf_params%mixt_frac, & ! In
707c707
< pdf_params%w_1(1,:), pdf_params%w_2(1,:), & ! In
---
> pdf_params%w_1, pdf_params%w_2, & ! In
709c709
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), & ! In
---
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, & ! In
711c711
< pdf_params%mixt_frac(1,:), & ! In
---
> pdf_params%mixt_frac, & ! In
721,733c721,733
< wp2rtp = calc_wp2xp_pdf( wm, rtm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), &
< pdf_params%corr_w_rt_1(1,:), pdf_params%corr_w_rt_2(1,:), &
< pdf_params%mixt_frac(1,:) )
<
< wp2thlp = calc_wp2xp_pdf( wm, thlm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), &
< pdf_params%corr_w_thl_1(1,:), pdf_params%corr_w_thl_2(1,:), &
< pdf_params%mixt_frac(1,:) )
---
> wp2rtp = calc_wp2xp_pdf( wm, rtm, pdf_params%w_1, pdf_params%w_2, &
> pdf_params%rt_1, pdf_params%rt_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, &
> pdf_params%corr_w_rt_1, pdf_params%corr_w_rt_2, &
> pdf_params%mixt_frac )
>
> wp2thlp = calc_wp2xp_pdf( wm, thlm, pdf_params%w_1, pdf_params%w_2, &
> pdf_params%thl_1, pdf_params%thl_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, &
> pdf_params%corr_w_thl_1, pdf_params%corr_w_thl_2, &
> pdf_params%mixt_frac )
738,740c738,740
< wp4 = calc_wp4_pdf( wm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
< pdf_params%mixt_frac(1,:) )
---
> wp4 = calc_wp4_pdf( wm, pdf_params%w_1, pdf_params%w_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
> pdf_params%mixt_frac )
744,749c744,749
< wprtp2 = calc_wpxp2_pdf( wm, rtm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), &
< pdf_params%corr_w_rt_1(1,:), pdf_params%corr_w_rt_2(1,:), &
< pdf_params%mixt_frac(1,:) )
---
> wprtp2 = calc_wpxp2_pdf( wm, rtm, pdf_params%w_1, pdf_params%w_2, &
> pdf_params%rt_1, pdf_params%rt_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, &
> pdf_params%corr_w_rt_1, pdf_params%corr_w_rt_2, &
> pdf_params%mixt_frac )
753,758c753,758
< wpthlp2 = calc_wpxp2_pdf( wm, thlm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), &
< pdf_params%corr_w_thl_1(1,:), pdf_params%corr_w_thl_2(1,:), &
< pdf_params%mixt_frac(1,:) )
---
> wpthlp2 = calc_wpxp2_pdf( wm, thlm, pdf_params%w_1, pdf_params%w_2, &
> pdf_params%thl_1, pdf_params%thl_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, &
> pdf_params%corr_w_thl_1, pdf_params%corr_w_thl_2, &
> pdf_params%mixt_frac )
762,771c762,771
< wprtpthlp = calc_wpxpyp_pdf( wm, rtm, thlm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), &
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), &
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), &
< pdf_params%corr_w_rt_1(1,:), pdf_params%corr_w_rt_2(1,:), &
< pdf_params%corr_w_thl_1(1,:), pdf_params%corr_w_thl_2(1,:), &
< pdf_params%corr_rt_thl_1(1,:), pdf_params%corr_rt_thl_2(1,:), &
< pdf_params%mixt_frac(1,:) )
---
> wprtpthlp = calc_wpxpyp_pdf( wm, rtm, thlm, pdf_params%w_1, pdf_params%w_2, &
> pdf_params%rt_1, pdf_params%rt_2, &
> pdf_params%thl_1, pdf_params%thl_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, &
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, &
> pdf_params%corr_w_rt_1, pdf_params%corr_w_rt_2, &
> pdf_params%corr_w_thl_1, pdf_params%corr_w_thl_2, &
> pdf_params%corr_rt_thl_1, pdf_params%corr_rt_thl_2, &
> pdf_params%mixt_frac )
781c781
< = calc_wp2xp_pdf( wm, sclrm(:,i), pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
---
> = calc_wp2xp_pdf( wm, sclrm(:,i), pdf_params%w_1, pdf_params%w_2, &
783c783
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
---
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
786c786
< pdf_params%mixt_frac(1,:) )
---
> pdf_params%mixt_frac )
789c789
< = calc_wpxp2_pdf( wm, sclrm(:,i), pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
---
> = calc_wpxp2_pdf( wm, sclrm(:,i), pdf_params%w_1, pdf_params%w_2, &
791c791
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
---
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
794c794
< pdf_params%mixt_frac(1,:) )
---
> pdf_params%mixt_frac )
797c797
< = calc_wpxpyp_pdf( wm, sclrm(:,i), rtm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
---
> = calc_wpxpyp_pdf( wm, sclrm(:,i), rtm, pdf_params%w_1, pdf_params%w_2, &
799,800c799,800
< pdf_params%rt_1(1,:), pdf_params%rt_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
---
> pdf_params%rt_1, pdf_params%rt_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
802c802
< pdf_params%varnce_rt_1(1,:), pdf_params%varnce_rt_2(1,:), &
---
> pdf_params%varnce_rt_1, pdf_params%varnce_rt_2, &
804c804
< pdf_params%corr_w_rt_1(1,:), pdf_params%corr_w_rt_2(1,:), &
---
> pdf_params%corr_w_rt_1, pdf_params%corr_w_rt_2, &
806c806
< pdf_params%mixt_frac(1,:) )
---
> pdf_params%mixt_frac )
809c809
< = calc_wpxpyp_pdf( wm, sclrm(:,i), thlm, pdf_params%w_1(1,:), pdf_params%w_2(1,:), &
---
> = calc_wpxpyp_pdf( wm, sclrm(:,i), thlm, pdf_params%w_1, pdf_params%w_2, &
811,812c811,812
< pdf_params%thl_1(1,:), pdf_params%thl_2(1,:), &
< pdf_params%varnce_w_1(1,:), pdf_params%varnce_w_2(1,:), &
---
> pdf_params%thl_1, pdf_params%thl_2, &
> pdf_params%varnce_w_1, pdf_params%varnce_w_2, &
814c814
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_thl_2(1,:), &
---
> pdf_params%varnce_thl_1, pdf_params%varnce_thl_2, &
816c816
< pdf_params%corr_w_thl_1(1,:), pdf_params%corr_w_thl_2(1,:), &
---
> pdf_params%corr_w_thl_1, pdf_params%corr_w_thl_2, &
818c818
< pdf_params%mixt_frac(1,:) )
---
> pdf_params%mixt_frac )
831,832c831,832
< tl1 = pdf_params%thl_1(1,:)*exner
< tl2 = pdf_params%thl_2(1,:)*exner
---
> tl1 = pdf_params%thl_1*exner
> tl2 = pdf_params%thl_2*exner
838c838
< pdf_params%rsatl_1(1,:) = sat_mixrat_liq( p_in_Pa, tl1 )
---
> pdf_params%rsatl_1 = sat_mixrat_liq( p_in_Pa, tl1 )
840c840
< pdf_params%rsatl_1(1,:) = sat_mixrat_liq( p_in_Pa, tl1 ) &
---
> pdf_params%rsatl_1 = sat_mixrat_liq( p_in_Pa, tl1 ) &
845c845
< pdf_params%rsatl_1(1,:) = sat_mixrat_ice( p_in_Pa, tl1 ) &
---
> pdf_params%rsatl_1 = sat_mixrat_ice( p_in_Pa, tl1 ) &
849c849
< pdf_params%rsatl_1(1,:) = sat_mixrat_ice( p_in_Pa, tl1 ) * RH_crit(1, 1)
---
> pdf_params%rsatl_1 = sat_mixrat_ice( p_in_Pa, tl1 ) * RH_crit(1, 1)
853c853
< pdf_params%rsatl_2(1,:) = sat_mixrat_liq( p_in_Pa, tl2 )
---
> pdf_params%rsatl_2 = sat_mixrat_liq( p_in_Pa, tl2 )
855c855
< pdf_params%rsatl_2(1,:) = sat_mixrat_liq( p_in_Pa, tl2 ) &
---
> pdf_params%rsatl_2 = sat_mixrat_liq( p_in_Pa, tl2 ) &
860c860
< pdf_params%rsatl_2(1,:) = sat_mixrat_ice( p_in_Pa, tl2 ) &
---
> pdf_params%rsatl_2 = sat_mixrat_ice( p_in_Pa, tl2 ) &
864c864
< pdf_params%rsatl_2(1,:) = sat_mixrat_ice( p_in_Pa, tl2 ) * RH_crit(1, 2)
---
> pdf_params%rsatl_2 = sat_mixrat_ice( p_in_Pa, tl2 ) * RH_crit(1, 2)
869,870c869,870
< pdf_params%rsatl_1(1,:) = sat_mixrat_liq( p_in_Pa, tl1 )
< pdf_params%rsatl_2(1,:) = sat_mixrat_liq( p_in_Pa, tl2 )
---
> pdf_params%rsatl_1 = sat_mixrat_liq( p_in_Pa, tl1 )
> pdf_params%rsatl_2 = sat_mixrat_liq( p_in_Pa, tl2 )
884,885c884,885
< pdf_params%rsatl_1(1,:) = sat_mixrat_liq( p_in_Pa, tl1 )
< pdf_params%rsatl_2(1,:) = sat_mixrat_liq( p_in_Pa, tl2 ) ! h1g, 2010-06-16 end mod
---
> pdf_params%rsatl_1 = sat_mixrat_liq( p_in_Pa, tl1 )
> pdf_params%rsatl_2 = sat_mixrat_liq( p_in_Pa, tl2 ) ! h1g, 2010-06-16 end mod
891,897c891,897
< call transform_pdf_chi_eta_component( tl1, pdf_params%rsatl_1(1,:), pdf_params%rt_1(1,:), exner, & ! In
< pdf_params%varnce_thl_1(1,:), pdf_params%varnce_rt_1(1,:), & ! In
< pdf_params%corr_rt_thl_1(1,:), pdf_params%chi_1(1,:), & ! In
< pdf_params%crt_1(1,:), pdf_params%cthl_1(1,:), & ! Out
< pdf_params%stdev_chi_1(1,:), pdf_params%stdev_eta_1(1,:), & ! Out
< pdf_params%covar_chi_eta_1(1,:), & ! Out
< pdf_params%corr_chi_eta_1(1,:) ) ! Out
---
> call transform_pdf_chi_eta_component( tl1, pdf_params%rsatl_1, pdf_params%rt_1, exner, & ! In
> pdf_params%varnce_thl_1, pdf_params%varnce_rt_1, & ! In
> pdf_params%corr_rt_thl_1, pdf_params%chi_1, & ! In
> pdf_params%crt_1, pdf_params%cthl_1, & ! Out
> pdf_params%stdev_chi_1, pdf_params%stdev_eta_1, & ! Out
> pdf_params%covar_chi_eta_1, & ! Out
> pdf_params%corr_chi_eta_1 ) ! Out
900,901c900,901
< call calc_liquid_cloud_frac_component( pdf_params%chi_1(1,:), pdf_params%stdev_chi_1(1,:), & ! In
< pdf_params%cloud_frac_1(1,:), pdf_params%rc_1(1,:) ) ! Out
---
> call calc_liquid_cloud_frac_component( pdf_params%chi_1, pdf_params%stdev_chi_1, & ! In
> pdf_params%cloud_frac_1, pdf_params%rc_1 ) ! Out
912,913c912,913
< chi_at_ice_sat1 = ( sat_mixrat_ice( p_in_Pa(i), tl1(i) ) - pdf_params%rsatl_1(1,i) ) &
< * pdf_params%crt_1(1,i)
---
> chi_at_ice_sat1 = ( sat_mixrat_ice( p_in_Pa(i), tl1(i) ) - pdf_params%rsatl_1(i) ) &
> * pdf_params%crt_1(i)
915c915
< call calc_cloud_frac_component( pdf_params%chi_1(1,i), pdf_params%stdev_chi_1(1,i), &
---
> call calc_cloud_frac_component( pdf_params%chi_1(i), pdf_params%stdev_chi_1(i), &
917c917
< pdf_params%ice_supersat_frac_1(1,i), rc_1_ice(i) )
---
> pdf_params%ice_supersat_frac_1(i), rc_1_ice(i) )
922,923c922,923
< pdf_params%ice_supersat_frac_1(1,i) = pdf_params%cloud_frac_1(1,i)
< rc_1_ice(i) = pdf_params%rc_1(1,i)
---
> pdf_params%ice_supersat_frac_1(i) = pdf_params%cloud_frac_1(i)
> rc_1_ice(i) = pdf_params%rc_1(i)
932,938c932,938
< call transform_pdf_chi_eta_component( tl2, pdf_params%rsatl_2(1,:), pdf_params%rt_2(1,:), exner, & ! In
< pdf_params%varnce_thl_2(1,:), pdf_params%varnce_rt_2(1,:), & ! In
< pdf_params%corr_rt_thl_2(1,:), pdf_params%chi_2(1,:), & ! In
< pdf_params%crt_2(1,:), pdf_params%cthl_2(1,:), & ! Out
< pdf_params%stdev_chi_2(1,:), pdf_params%stdev_eta_2(1,:), & ! Out
< pdf_params%covar_chi_eta_2(1,:), & ! Out
< pdf_params%corr_chi_eta_2(1,:) ) ! Out
---
> call transform_pdf_chi_eta_component( tl2, pdf_params%rsatl_2, pdf_params%rt_2, exner, & ! In
> pdf_params%varnce_thl_2, pdf_params%varnce_rt_2, & ! In
> pdf_params%corr_rt_thl_2, pdf_params%chi_2, & ! In
> pdf_params%crt_2, pdf_params%cthl_2, & ! Out
> pdf_params%stdev_chi_2, pdf_params%stdev_eta_2, & ! Out
> pdf_params%covar_chi_eta_2, & ! Out
> pdf_params%corr_chi_eta_2 ) ! Out
942,943c942,943
< call calc_liquid_cloud_frac_component( pdf_params%chi_2(1,:), pdf_params%stdev_chi_2(1,:), & ! In
< pdf_params%cloud_frac_2(1,:), pdf_params%rc_2(1,:) ) ! Out
---
> call calc_liquid_cloud_frac_component( pdf_params%chi_2, pdf_params%stdev_chi_2, & ! In
> pdf_params%cloud_frac_2, pdf_params%rc_2 ) ! Out
954,955c954,955
< chi_at_ice_sat2 = ( sat_mixrat_ice( p_in_Pa(i), tl2(i) ) - pdf_params%rsatl_2(1,i) ) &
< * pdf_params%crt_2(1,i)
---
> chi_at_ice_sat2 = ( sat_mixrat_ice( p_in_Pa(i), tl2(i) ) - pdf_params%rsatl_2(i) ) &
> * pdf_params%crt_2(i)
957c957
< call calc_cloud_frac_component( pdf_params%chi_2(1,i), pdf_params%stdev_chi_2(1,i), &
---
> call calc_cloud_frac_component( pdf_params%chi_2(i), pdf_params%stdev_chi_2(i), &
959c959
< pdf_params%ice_supersat_frac_2(1,i), rc_2_ice(i) )
---
> pdf_params%ice_supersat_frac_2(i), rc_2_ice(i) )
964,965c964,965
< pdf_params%ice_supersat_frac_2(1,i) = pdf_params%cloud_frac_2(1,i)
< rc_2_ice(i) = pdf_params%rc_2(1,i)
---
> pdf_params%ice_supersat_frac_2(i) = pdf_params%cloud_frac_2(i)
> rc_2_ice(i) = pdf_params%rc_2(i)
972,973c972,973
< ice_supersat_frac = pdf_params%mixt_frac(1,:) * pdf_params%ice_supersat_frac_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%ice_supersat_frac_2(1,:)
---
> ice_supersat_frac = pdf_params%mixt_frac * pdf_params%ice_supersat_frac_1 &
> + ( one - pdf_params%mixt_frac ) * pdf_params%ice_supersat_frac_2
991,993c991,993
< cloud_frac = pdf_params%mixt_frac(1,:) * pdf_params%cloud_frac_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%cloud_frac_2(1,:)
< rcm = pdf_params%mixt_frac(1,:) * pdf_params%rc_1(1,:) + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%rc_2(1,:)
---
> cloud_frac = pdf_params%mixt_frac * pdf_params%cloud_frac_1 &
> + ( one - pdf_params%mixt_frac ) * pdf_params%cloud_frac_2
> rcm = pdf_params%mixt_frac * pdf_params%rc_1 + ( one - pdf_params%mixt_frac ) * pdf_params%rc_2
1001,1004c1001,1004
< pdf_params%corr_w_chi_1(1,:) = zero
< pdf_params%corr_w_chi_2(1,:) = zero
< pdf_params%corr_w_eta_1(1,:) = zero
< pdf_params%corr_w_eta_2(1,:) = zero
---
> pdf_params%corr_w_chi_1 = zero
> pdf_params%corr_w_chi_2 = zero
> pdf_params%corr_w_eta_1 = zero
> pdf_params%corr_w_eta_2 = zero
1009,1019c1009,1019
< pdf_params%corr_w_chi_1(1,:) &
< = calc_corr_chi_x( pdf_params%crt_1(1,:), pdf_params%cthl_1(1,:), &
< sqrt(pdf_params%varnce_rt_1(1,:)), sqrt(pdf_params%varnce_thl_1(1,:)), &
< pdf_params%stdev_chi_1(1,:), &
< pdf_params%corr_w_rt_1(1,:), pdf_params%corr_w_thl_1(1,:) )
<
< pdf_params%corr_w_chi_2(1,:) &
< = calc_corr_chi_x( pdf_params%crt_2(1,:), pdf_params%cthl_2(1,:), &
< sqrt(pdf_params%varnce_rt_2(1,:)), sqrt(pdf_params%varnce_thl_2(1,:)), &
< pdf_params%stdev_chi_2(1,:), pdf_params%corr_w_rt_2(1,:), &
< pdf_params%corr_w_thl_2(1,:) )
---
> pdf_params%corr_w_chi_1 &
> = calc_corr_chi_x( pdf_params%crt_1, pdf_params%cthl_1, &
> sqrt(pdf_params%varnce_rt_1), sqrt(pdf_params%varnce_thl_1), &
> pdf_params%stdev_chi_1, &
> pdf_params%corr_w_rt_1, pdf_params%corr_w_thl_1 )
>
> pdf_params%corr_w_chi_2 &
> = calc_corr_chi_x( pdf_params%crt_2, pdf_params%cthl_2, &
> sqrt(pdf_params%varnce_rt_2), sqrt(pdf_params%varnce_thl_2), &
> pdf_params%stdev_chi_2, pdf_params%corr_w_rt_2, &
> pdf_params%corr_w_thl_2 )
1022,1032c1022,1032
< pdf_params%corr_w_eta_1(1,:) &
< = calc_corr_eta_x( pdf_params%crt_1(1,:), pdf_params%cthl_1(1,:), &
< sqrt(pdf_params%varnce_rt_1(1,:)), sqrt(pdf_params%varnce_thl_1(1,:)), &
< pdf_params%stdev_eta_1(1,:), pdf_params%corr_w_rt_1(1,:), &
< pdf_params%corr_w_thl_1(1,:) )
<
< pdf_params%corr_w_eta_2(1,:) &
< = calc_corr_eta_x( pdf_params%crt_2(1,:), pdf_params%cthl_2(1,:), &
< sqrt(pdf_params%varnce_rt_2(1,:)), sqrt(pdf_params%varnce_thl_2(1,:)), &
< pdf_params%stdev_eta_2(1,:), pdf_params%corr_w_rt_2(1,:), &
< pdf_params%corr_w_thl_2(1,:) )
---
> pdf_params%corr_w_eta_1 &
> = calc_corr_eta_x( pdf_params%crt_1, pdf_params%cthl_1, &
> sqrt(pdf_params%varnce_rt_1), sqrt(pdf_params%varnce_thl_1), &
> pdf_params%stdev_eta_1, pdf_params%corr_w_rt_1, &
> pdf_params%corr_w_thl_1 )
>
> pdf_params%corr_w_eta_2 &
> = calc_corr_eta_x( pdf_params%crt_2, pdf_params%cthl_2, &
> sqrt(pdf_params%varnce_rt_2), sqrt(pdf_params%varnce_thl_2), &
> pdf_params%stdev_eta_2, pdf_params%corr_w_rt_2, &
> pdf_params%corr_w_thl_2 )
1058,1062c1058,1062
< pdf_params%w_1(1,:), pdf_params%rt_1(1,:), & ! In
< pdf_params%thl_1(1,:), u_1, v_1, & ! In
< pdf_params%varnce_w_1(1,:), pdf_params%chi_1(1,:), & ! In
< pdf_params%stdev_chi_1(1,:), pdf_params%stdev_eta_1(1,:), & ! In
< pdf_params%corr_w_chi_1(1,:), pdf_params%corr_chi_eta_1(1,:), & ! In
---
> pdf_params%w_1, pdf_params%rt_1, & ! In
> pdf_params%thl_1, u_1, v_1, & ! In
> pdf_params%varnce_w_1, pdf_params%chi_1, & ! In
> pdf_params%stdev_chi_1, pdf_params%stdev_eta_1, & ! In
> pdf_params%corr_w_chi_1, pdf_params%corr_chi_eta_1, & ! In
1064,1065c1064,1065
< pdf_params%crt_1(1,:), pdf_params%cthl_1(1,:), & ! In
< pdf_params%rc_1(1,:), pdf_params%cloud_frac_1(1,:), iiPDF_type,& ! In
---
> pdf_params%crt_1, pdf_params%cthl_1, & ! In
> pdf_params%rc_1, pdf_params%cloud_frac_1, iiPDF_type,& ! In
1071,1075c1071,1075
< pdf_params%w_2(1,:), pdf_params%rt_2(1,:), & ! In
< pdf_params%thl_2(1,:), u_2, v_2, & ! In
< pdf_params%varnce_w_2(1,:), pdf_params%chi_2(1,:), & ! In
< pdf_params%stdev_chi_2(1,:), pdf_params%stdev_eta_2(1,:), & ! In
< pdf_params%corr_w_chi_2(1,:), pdf_params%corr_chi_eta_2(1,:), & ! In
---
> pdf_params%w_2, pdf_params%rt_2, & ! In
> pdf_params%thl_2, u_2, v_2, & ! In
> pdf_params%varnce_w_2, pdf_params%chi_2, & ! In
> pdf_params%stdev_chi_2, pdf_params%stdev_eta_2, & ! In
> pdf_params%corr_w_chi_2, pdf_params%corr_chi_eta_2, & ! In
1077,1078c1077,1078
< pdf_params%crt_2(1,:), pdf_params%cthl_2(1,:), & ! In
< pdf_params%rc_2(1,:), pdf_params%cloud_frac_2(1,:), iiPDF_type,& ! In
---
> pdf_params%crt_2, pdf_params%cthl_2, & ! In
> pdf_params%rc_2, pdf_params%cloud_frac_2, iiPDF_type,& ! In
1089,1090c1089,1090
< wprcp = pdf_params%mixt_frac(1,:) * wprcp_contrib_comp_1 &
< + ( one - pdf_params%mixt_frac(1,:) ) * wprcp_contrib_comp_2
---
> wprcp = pdf_params%mixt_frac * wprcp_contrib_comp_1 &
> + ( one - pdf_params%mixt_frac ) * wprcp_contrib_comp_2
1092,1093c1092,1093
< wp2rcp = pdf_params%mixt_frac(1,:) * wp2rcp_contrib_comp_1 &
< + ( one - pdf_params%mixt_frac(1,:) ) * wp2rcp_contrib_comp_2
---
> wp2rcp = pdf_params%mixt_frac * wp2rcp_contrib_comp_1 &
> + ( one - pdf_params%mixt_frac ) * wp2rcp_contrib_comp_2
1095,1096c1095,1096
< rtprcp = pdf_params%mixt_frac(1,:) * rtprcp_contrib_comp_1 &
< + ( one - pdf_params%mixt_frac(1,:) ) * rtprcp_contrib_comp_2
---
> rtprcp = pdf_params%mixt_frac * rtprcp_contrib_comp_1 &
> + ( one - pdf_params%mixt_frac ) * rtprcp_contrib_comp_2
1098,1099c1098,1099
< thlprcp = pdf_params%mixt_frac(1,:) * thlprcp_contrib_comp_1 &
< + ( one - pdf_params%mixt_frac(1,:) ) * thlprcp_contrib_comp_2
---
> thlprcp = pdf_params%mixt_frac * thlprcp_contrib_comp_1 &
> + ( one - pdf_params%mixt_frac ) * thlprcp_contrib_comp_2
1101,1102c1101,1102
< uprcp = pdf_params%mixt_frac(1,:) * uprcp_contrib_comp_1 &
< + ( one - pdf_params%mixt_frac(1,:) ) * uprcp_contrib_comp_2
---
> uprcp = pdf_params%mixt_frac * uprcp_contrib_comp_1 &
> + ( one - pdf_params%mixt_frac ) * uprcp_contrib_comp_2
1104,1105c1104,1105
< vprcp = pdf_params%mixt_frac(1,:) * vprcp_contrib_comp_1 &
< + ( one - pdf_params%mixt_frac(1,:) ) * vprcp_contrib_comp_2
---
> vprcp = pdf_params%mixt_frac * vprcp_contrib_comp_1 &
> + ( one - pdf_params%mixt_frac ) * vprcp_contrib_comp_2
1142,1151c1142,1151
< = pdf_params%mixt_frac(1,:) * ( ( sclr1(:,i) - sclrm(:,i) ) * pdf_params%rc_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) * ( ( sclr2(:,i) - sclrm(:,i) ) * pdf_params%rc_2(1,:) ) &
< + pdf_params%mixt_frac(1,:) * corr_sclr_rt_1(:,i) * pdf_params%crt_1(1,:) &
< * sqrt( varnce_sclr1(:,i) * pdf_params%varnce_rt_1(1,:) ) * pdf_params%cloud_frac_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * corr_sclr_rt_2(:,i) * pdf_params%crt_2(1,:) &
< * sqrt( varnce_sclr2(:,i) * pdf_params%varnce_rt_2(1,:) ) * pdf_params%cloud_frac_2(1,:) &
< - pdf_params%mixt_frac(1,:) * corr_sclr_thl_1(:,i) * pdf_params%cthl_1(1,:) &
< * sqrt( varnce_sclr1(:,i) * pdf_params%varnce_thl_1(1,:) ) * pdf_params%cloud_frac_1(1,:) &
< - ( one - pdf_params%mixt_frac(1,:) ) * corr_sclr_thl_2(:,i) * pdf_params%cthl_2(1,:) &
< * sqrt( varnce_sclr2(:,i) * pdf_params%varnce_thl_2(1,:) ) * pdf_params%cloud_frac_2(1,:)
---
> = pdf_params%mixt_frac * ( ( sclr1(:,i) - sclrm(:,i) ) * pdf_params%rc_1 ) &
> + ( one - pdf_params%mixt_frac ) * ( ( sclr2(:,i) - sclrm(:,i) ) * pdf_params%rc_2 ) &
> + pdf_params%mixt_frac * corr_sclr_rt_1(:,i) * pdf_params%crt_1 &
> * sqrt( varnce_sclr1(:,i) * pdf_params%varnce_rt_1 ) * pdf_params%cloud_frac_1 &
> + ( one - pdf_params%mixt_frac ) * corr_sclr_rt_2(:,i) * pdf_params%crt_2 &
> * sqrt( varnce_sclr2(:,i) * pdf_params%varnce_rt_2 ) * pdf_params%cloud_frac_2 &
> - pdf_params%mixt_frac * corr_sclr_thl_1(:,i) * pdf_params%cthl_1 &
> * sqrt( varnce_sclr1(:,i) * pdf_params%varnce_thl_1 ) * pdf_params%cloud_frac_1 &
> - ( one - pdf_params%mixt_frac ) * corr_sclr_thl_2(:,i) * pdf_params%cthl_2 &
> * sqrt( varnce_sclr2(:,i) * pdf_params%varnce_thl_2 ) * pdf_params%cloud_frac_2
1167,1172c1167,1172
< rcp2 = pdf_params%mixt_frac(1,:) &
< * ( pdf_params%chi_1(1,:)*pdf_params%rc_1(1,:) &
< + pdf_params%cloud_frac_1(1,:)*pdf_params%stdev_chi_1(1,:)**2 ) &
< + ( one-pdf_params%mixt_frac(1,:) ) &
< * ( pdf_params%chi_2(1,:)*pdf_params%rc_2(1,:) &
< + pdf_params%cloud_frac_2(1,:)*pdf_params%stdev_chi_2(1,:)**2 ) - rcm**2
---
> rcp2 = pdf_params%mixt_frac &
> * ( pdf_params%chi_1*pdf_params%rc_1 &
> + pdf_params%cloud_frac_1*pdf_params%stdev_chi_1**2 ) &
> + ( one-pdf_params%mixt_frac ) &
> * ( pdf_params%chi_2*pdf_params%rc_2 &
> + pdf_params%cloud_frac_2*pdf_params%stdev_chi_2**2 ) - rcm**2
1187,1188c1187,1188
< pdf_params%crt_1(1,:), pdf_params%crt_2(1,:), &
< pdf_params%cthl_1(1,:), pdf_params%cthl_2(1,:), &
---
> pdf_params%crt_1, pdf_params%crt_2, &
> pdf_params%cthl_1, pdf_params%cthl_2, &
1244,1296c1244,1296
< write(fstderr,*) "pdf_params%w_1(1,:) = ", pdf_params%w_1(1,:)
< write(fstderr,*) "pdf_params%w_2(1,:) = ", pdf_params%w_2(1,:)
< write(fstderr,*) "pdf_params%varnce_w_1(1,:) = ", pdf_params%varnce_w_1(1,:)
< write(fstderr,*) "pdf_params%varnce_w_2(1,:) = ", pdf_params%varnce_w_2(1,:)
< write(fstderr,*) "pdf_params%rt_1(1,:) = ", pdf_params%rt_1(1,:)
< write(fstderr,*) "pdf_params%rt_2(1,:) = ", pdf_params%rt_2(1,:)
< write(fstderr,*) "pdf_params%varnce_rt_1(1,:) = ", pdf_params%varnce_rt_1(1,:)
< write(fstderr,*) "pdf_params%varnce_rt_2(1,:) = ", pdf_params%varnce_rt_2(1,:)
< write(fstderr,*) "pdf_params%thl_1(1,:) = ", pdf_params%thl_1(1,:)
< write(fstderr,*) "pdf_params%thl_2(1,:) = ", pdf_params%thl_2(1,:)
< write(fstderr,*) "pdf_params%varnce_thl_1(1,:) = ", pdf_params%varnce_thl_1(1,:)
< write(fstderr,*) "pdf_params%varnce_thl_2(1,:) = ", pdf_params%varnce_thl_2(1,:)
< write(fstderr,*) "pdf_params%corr_w_rt_1(1,:) = ", pdf_params%corr_w_rt_1(1,:)
< write(fstderr,*) "pdf_params%corr_w_rt_2(1,:) = ", pdf_params%corr_w_rt_2(1,:)
< write(fstderr,*) "pdf_params%corr_w_thl_1(1,:) = ", pdf_params%corr_w_thl_1(1,:)
< write(fstderr,*) "pdf_params%corr_w_thl_2(1,:) = ", pdf_params%corr_w_thl_2(1,:)
< write(fstderr,*) "pdf_params%corr_rt_thl_1(1,:) = ", pdf_params%corr_rt_thl_1(1,:)
< write(fstderr,*) "pdf_params%corr_rt_thl_2(1,:) = ", pdf_params%corr_rt_thl_2(1,:)
< write(fstderr,*) "pdf_params%alpha_thl(1,:) = ", pdf_params%alpha_thl(1,:)
< write(fstderr,*) "pdf_params%alpha_rt(1,:) = ", pdf_params%alpha_rt(1,:)
< write(fstderr,*) "pdf_params%crt_1(1,:) = ", pdf_params%crt_1(1,:)
< write(fstderr,*) "pdf_params%crt_2(1,:) = ", pdf_params%crt_2(1,:)
< write(fstderr,*) "pdf_params%cthl_1(1,:) = ", pdf_params%cthl_1(1,:)
< write(fstderr,*) "pdf_params%cthl_2(1,:) = ", pdf_params%cthl_2(1,:)
< write(fstderr,*) "pdf_params%chi_1(1,:) = ", pdf_params%chi_1(1,:)
< write(fstderr,*) "pdf_params%chi_2(1,:) = ", pdf_params%chi_2(1,:)
< write(fstderr,*) "pdf_params%stdev_chi_1(1,:) = ", pdf_params%stdev_chi_1(1,:)
< write(fstderr,*) "pdf_params%stdev_chi_2(1,:) = ", pdf_params%stdev_chi_2(1,:)
< write(fstderr,*) "pdf_params%stdev_eta_1(1,:) = ", pdf_params%stdev_eta_1(1,:)
< write(fstderr,*) "pdf_params%stdev_eta_2(1,:) = ", pdf_params%stdev_eta_2(1,:)
< write(fstderr,*) "pdf_params%covar_chi_eta_1(1,:) = ", &
< pdf_params%covar_chi_eta_1(1,:)
< write(fstderr,*) "pdf_params%covar_chi_eta_2(1,:) = ", &
< pdf_params%covar_chi_eta_2(1,:)
< write(fstderr,*) "pdf_params%corr_w_chi_1(1,:) = ", pdf_params%corr_w_chi_1(1,:)
< write(fstderr,*) "pdf_params%corr_w_chi_2(1,:) = ", pdf_params%corr_w_chi_2(1,:)
< write(fstderr,*) "pdf_params%corr_w_eta_1(1,:) = ", pdf_params%corr_w_eta_1(1,:)
< write(fstderr,*) "pdf_params%corr_w_eta_2(1,:) = ", pdf_params%corr_w_eta_2(1,:)
< write(fstderr,*) "pdf_params%corr_chi_eta_1(1,:) = ", &
< pdf_params%corr_chi_eta_1(1,:)
< write(fstderr,*) "pdf_params%corr_chi_eta_2(1,:) = ", &
< pdf_params%corr_chi_eta_2(1,:)
< write(fstderr,*) "pdf_params%rsatl_1(1,:) = ", pdf_params%rsatl_1(1,:)
< write(fstderr,*) "pdf_params%rsatl_2(1,:) = ", pdf_params%rsatl_2(1,:)
< write(fstderr,*) "pdf_params%rc_1(1,:) = ", pdf_params%rc_1(1,:)
< write(fstderr,*) "pdf_params%rc_2(1,:) = ", pdf_params%rc_2(1,:)
< write(fstderr,*) "pdf_params%cloud_frac_1(1,:) = ", pdf_params%cloud_frac_1(1,:)
< write(fstderr,*) "pdf_params%cloud_frac_2(1,:) = ", pdf_params%cloud_frac_2(1,:)
< write(fstderr,*) "pdf_params%mixt_frac(1,:) = ", pdf_params%mixt_frac(1,:)
< write(fstderr,*) "pdf_params%ice_supersat_frac_1(1,:) = ", &
< pdf_params%ice_supersat_frac_1(1,:)
< write(fstderr,*) "pdf_params%ice_supersat_frac_2(1,:) = ", &
< pdf_params%ice_supersat_frac_2(1,:)
---
> write(fstderr,*) "pdf_params%w_1 = ", pdf_params%w_1
> write(fstderr,*) "pdf_params%w_2 = ", pdf_params%w_2
> write(fstderr,*) "pdf_params%varnce_w_1 = ", pdf_params%varnce_w_1
> write(fstderr,*) "pdf_params%varnce_w_2 = ", pdf_params%varnce_w_2
> write(fstderr,*) "pdf_params%rt_1 = ", pdf_params%rt_1
> write(fstderr,*) "pdf_params%rt_2 = ", pdf_params%rt_2
> write(fstderr,*) "pdf_params%varnce_rt_1 = ", pdf_params%varnce_rt_1
> write(fstderr,*) "pdf_params%varnce_rt_2 = ", pdf_params%varnce_rt_2
> write(fstderr,*) "pdf_params%thl_1 = ", pdf_params%thl_1
> write(fstderr,*) "pdf_params%thl_2 = ", pdf_params%thl_2
> write(fstderr,*) "pdf_params%varnce_thl_1 = ", pdf_params%varnce_thl_1
> write(fstderr,*) "pdf_params%varnce_thl_2 = ", pdf_params%varnce_thl_2
> write(fstderr,*) "pdf_params%corr_w_rt_1 = ", pdf_params%corr_w_rt_1
> write(fstderr,*) "pdf_params%corr_w_rt_2 = ", pdf_params%corr_w_rt_2
> write(fstderr,*) "pdf_params%corr_w_thl_1 = ", pdf_params%corr_w_thl_1
> write(fstderr,*) "pdf_params%corr_w_thl_2 = ", pdf_params%corr_w_thl_2
> write(fstderr,*) "pdf_params%corr_rt_thl_1 = ", pdf_params%corr_rt_thl_1
> write(fstderr,*) "pdf_params%corr_rt_thl_2 = ", pdf_params%corr_rt_thl_2
> write(fstderr,*) "pdf_params%alpha_thl = ", pdf_params%alpha_thl
> write(fstderr,*) "pdf_params%alpha_rt = ", pdf_params%alpha_rt
> write(fstderr,*) "pdf_params%crt_1 = ", pdf_params%crt_1
> write(fstderr,*) "pdf_params%crt_2 = ", pdf_params%crt_2
> write(fstderr,*) "pdf_params%cthl_1 = ", pdf_params%cthl_1
> write(fstderr,*) "pdf_params%cthl_2 = ", pdf_params%cthl_2
> write(fstderr,*) "pdf_params%chi_1 = ", pdf_params%chi_1
> write(fstderr,*) "pdf_params%chi_2 = ", pdf_params%chi_2
> write(fstderr,*) "pdf_params%stdev_chi_1 = ", pdf_params%stdev_chi_1
> write(fstderr,*) "pdf_params%stdev_chi_2 = ", pdf_params%stdev_chi_2
> write(fstderr,*) "pdf_params%stdev_eta_1 = ", pdf_params%stdev_eta_1
> write(fstderr,*) "pdf_params%stdev_eta_2 = ", pdf_params%stdev_eta_2
> write(fstderr,*) "pdf_params%covar_chi_eta_1 = ", &
> pdf_params%covar_chi_eta_1
> write(fstderr,*) "pdf_params%covar_chi_eta_2 = ", &
> pdf_params%covar_chi_eta_2
> write(fstderr,*) "pdf_params%corr_w_chi_1 = ", pdf_params%corr_w_chi_1
> write(fstderr,*) "pdf_params%corr_w_chi_2 = ", pdf_params%corr_w_chi_2
> write(fstderr,*) "pdf_params%corr_w_eta_1 = ", pdf_params%corr_w_eta_1
> write(fstderr,*) "pdf_params%corr_w_eta_2 = ", pdf_params%corr_w_eta_2
> write(fstderr,*) "pdf_params%corr_chi_eta_1 = ", &
> pdf_params%corr_chi_eta_1
> write(fstderr,*) "pdf_params%corr_chi_eta_2 = ", &
> pdf_params%corr_chi_eta_2
> write(fstderr,*) "pdf_params%rsatl_1 = ", pdf_params%rsatl_1
> write(fstderr,*) "pdf_params%rsatl_2 = ", pdf_params%rsatl_2
> write(fstderr,*) "pdf_params%rc_1 = ", pdf_params%rc_1
> write(fstderr,*) "pdf_params%rc_2 = ", pdf_params%rc_2
> write(fstderr,*) "pdf_params%cloud_frac_1 = ", pdf_params%cloud_frac_1
> write(fstderr,*) "pdf_params%cloud_frac_2 = ", pdf_params%cloud_frac_2
> write(fstderr,*) "pdf_params%mixt_frac = ", pdf_params%mixt_frac
> write(fstderr,*) "pdf_params%ice_supersat_frac_1 = ", &
> pdf_params%ice_supersat_frac_1
> write(fstderr,*) "pdf_params%ice_supersat_frac_2 = ", &
> pdf_params%ice_supersat_frac_2
1313,1314c1313,1314
< wm_clubb_pdf = pdf_params%mixt_frac(1,:) * pdf_params%w_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%w_2(1,:)
---
> wm_clubb_pdf = pdf_params%mixt_frac * pdf_params%w_1 &
> + ( one - pdf_params%mixt_frac ) * pdf_params%w_2
1325,1326c1325,1326
< rtm_clubb_pdf = pdf_params%mixt_frac(1,:) * pdf_params%rt_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%rt_2(1,:)
---
> rtm_clubb_pdf = pdf_params%mixt_frac * pdf_params%rt_1 &
> + ( one - pdf_params%mixt_frac ) * pdf_params%rt_2
1337,1338c1337,1338
< thlm_clubb_pdf = pdf_params%mixt_frac(1,:) * pdf_params%thl_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%thl_2(1,:)
---
> thlm_clubb_pdf = pdf_params%mixt_frac * pdf_params%thl_1 &
> + ( one - pdf_params%mixt_frac ) * pdf_params%thl_2
1349,1352c1349,1352
< wp2_clubb_pdf = pdf_params%mixt_frac(1,:) &
< * ( ( pdf_params%w_1(1,:) - wm )**2 + pdf_params%varnce_w_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) &
< * ( ( pdf_params%w_2(1,:) - wm )**2 + pdf_params%varnce_w_2(1,:) )
---
> wp2_clubb_pdf = pdf_params%mixt_frac &
> * ( ( pdf_params%w_1 - wm )**2 + pdf_params%varnce_w_1 ) &
> + ( one - pdf_params%mixt_frac ) &
> * ( ( pdf_params%w_2 - wm )**2 + pdf_params%varnce_w_2 )
1365,1368c1365,1368
< = pdf_params%mixt_frac(1,:) &
< * ( ( pdf_params%rt_1(1,:) - rtm )**2 + pdf_params%varnce_rt_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) &
< * ( ( pdf_params%rt_2(1,:) - rtm )**2 + pdf_params%varnce_rt_2(1,:) )
---
> = pdf_params%mixt_frac &
> * ( ( pdf_params%rt_1 - rtm )**2 + pdf_params%varnce_rt_1 ) &
> + ( one - pdf_params%mixt_frac ) &
> * ( ( pdf_params%rt_2 - rtm )**2 + pdf_params%varnce_rt_2 )
1381,1384c1381,1384
< = pdf_params%mixt_frac(1,:) &
< * ( ( pdf_params%thl_1(1,:) - thlm )**2 + pdf_params%varnce_thl_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) &
< * ( ( pdf_params%thl_2(1,:) - thlm )**2 + pdf_params%varnce_thl_2(1,:) )
---
> = pdf_params%mixt_frac &
> * ( ( pdf_params%thl_1 - thlm )**2 + pdf_params%varnce_thl_1 ) &
> + ( one - pdf_params%mixt_frac ) &
> * ( ( pdf_params%thl_2 - thlm )**2 + pdf_params%varnce_thl_2 )
1398,1401c1398,1401
< = pdf_params%mixt_frac(1,:) * ( pdf_params%w_1(1,:) - wm ) &
< * ( ( pdf_params%w_1(1,:) - wm )**2 + three * pdf_params%varnce_w_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) * ( pdf_params%w_2(1,:) - wm ) &
< * ( ( pdf_params%w_2(1,:) - wm )**2 + three * pdf_params%varnce_w_2(1,:) )
---
> = pdf_params%mixt_frac * ( pdf_params%w_1 - wm ) &
> * ( ( pdf_params%w_1 - wm )**2 + three * pdf_params%varnce_w_1 ) &
> + ( one - pdf_params%mixt_frac ) * ( pdf_params%w_2 - wm ) &
> * ( ( pdf_params%w_2 - wm )**2 + three * pdf_params%varnce_w_2 )
1404,1407c1404,1407
< = pdf_params%mixt_frac(1,:) * ( pdf_params%rt_1(1,:) - rtm ) &
< * ( ( pdf_params%rt_1(1,:) - rtm )**2 + three * pdf_params%varnce_rt_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) * ( pdf_params%rt_2(1,:) - rtm ) &
< * ( ( pdf_params%rt_2(1,:) - rtm )**2 + three * pdf_params%varnce_rt_2(1,:) )
---
> = pdf_params%mixt_frac * ( pdf_params%rt_1 - rtm ) &
> * ( ( pdf_params%rt_1 - rtm )**2 + three * pdf_params%varnce_rt_1 ) &
> + ( one - pdf_params%mixt_frac ) * ( pdf_params%rt_2 - rtm ) &
> * ( ( pdf_params%rt_2 - rtm )**2 + three * pdf_params%varnce_rt_2 )
1410,1413c1410,1413
< = pdf_params%mixt_frac(1,:) * ( pdf_params%thl_1(1,:) - thlm ) &
< * ( ( pdf_params%thl_1(1,:) - thlm )**2 + three * pdf_params%varnce_thl_1(1,:) ) &
< + ( one - pdf_params%mixt_frac(1,:) ) * ( pdf_params%thl_2(1,:) - thlm ) &
< * ( ( pdf_params%thl_2(1,:) - thlm )**2 + three * pdf_params%varnce_thl_2(1,:) )
---
> = pdf_params%mixt_frac * ( pdf_params%thl_1 - thlm ) &
> * ( ( pdf_params%thl_1 - thlm )**2 + three * pdf_params%varnce_thl_1 ) &
> + ( one - pdf_params%mixt_frac ) * ( pdf_params%thl_2 - thlm ) &
> * ( ( pdf_params%thl_2 - thlm )**2 + three * pdf_params%varnce_thl_2 )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/pdf_parameter_module.F90 clubb_release/src/CLUBB_core/pdf_parameter_module.F90
28c28
< real( kind = core_rknd ), dimension(:,:), allocatable :: &
---
> real( kind = core_rknd ), dimension(:), allocatable :: &
169c169
< subroutine init_pdf_params( nz, ngrdcol, pdf_params )
---
> subroutine init_pdf_params( nz, pdf_params )
184,185c184
< nz, & ! Number of vertical grid levels [-]
< ngrdcol ! Number of grid columns [-]
---
> nz ! Number of vertical grid levels [-]
191,285c190,284
< allocate( pdf_params%w_1(ngrdcol,nz), &
< pdf_params%w_2(ngrdcol,nz), &
< pdf_params%varnce_w_1(ngrdcol,nz), &
< pdf_params%varnce_w_2(ngrdcol,nz), &
< pdf_params%rt_1(ngrdcol,nz), &
< pdf_params%rt_2(ngrdcol,nz), &
< pdf_params%varnce_rt_1(ngrdcol,nz), &
< pdf_params%varnce_rt_2(ngrdcol,nz), &
< pdf_params%thl_1(ngrdcol,nz), &
< pdf_params%thl_2(ngrdcol,nz), &
< pdf_params%varnce_thl_1(ngrdcol,nz), &
< pdf_params%varnce_thl_2(ngrdcol,nz), &
< pdf_params%corr_w_rt_1(ngrdcol,nz), &
< pdf_params%corr_w_rt_2(ngrdcol,nz), &
< pdf_params%corr_w_thl_1(ngrdcol,nz), &
< pdf_params%corr_w_thl_2(ngrdcol,nz), &
< pdf_params%corr_rt_thl_1(ngrdcol,nz), &
< pdf_params%corr_rt_thl_2(ngrdcol,nz), &
< pdf_params%alpha_thl(ngrdcol,nz), &
< pdf_params%alpha_rt(ngrdcol,nz), &
< pdf_params%crt_1(ngrdcol,nz), &
< pdf_params%crt_2(ngrdcol,nz), &
< pdf_params%cthl_1(ngrdcol,nz), &
< pdf_params%cthl_2(ngrdcol,nz), &
< pdf_params%chi_1(ngrdcol,nz), &
< pdf_params%chi_2(ngrdcol,nz), &
< pdf_params%stdev_chi_1(ngrdcol,nz), &
< pdf_params%stdev_chi_2(ngrdcol,nz), &
< pdf_params%stdev_eta_1(ngrdcol,nz), &
< pdf_params%stdev_eta_2(ngrdcol,nz), &
< pdf_params%covar_chi_eta_1(ngrdcol,nz), &
< pdf_params%covar_chi_eta_2(ngrdcol,nz), &
< pdf_params%corr_w_chi_1(ngrdcol,nz), &
< pdf_params%corr_w_chi_2(ngrdcol,nz), &
< pdf_params%corr_w_eta_1(ngrdcol,nz), &
< pdf_params%corr_w_eta_2(ngrdcol,nz), &
< pdf_params%corr_chi_eta_1(ngrdcol,nz), &
< pdf_params%corr_chi_eta_2(ngrdcol,nz), &
< pdf_params%rsatl_1(ngrdcol,nz), &
< pdf_params%rsatl_2(ngrdcol,nz), &
< pdf_params%rc_1(ngrdcol,nz), &
< pdf_params%rc_2(ngrdcol,nz), &
< pdf_params%cloud_frac_1(ngrdcol,nz), &
< pdf_params%cloud_frac_2(ngrdcol,nz), &
< pdf_params%mixt_frac(ngrdcol,nz), &
< pdf_params%ice_supersat_frac_1(ngrdcol,nz), &
< pdf_params%ice_supersat_frac_2(ngrdcol,nz) )
<
< pdf_params%w_1(1,:) = zero
< pdf_params%w_2(1,:) = zero
< pdf_params%varnce_w_1(1,:) = zero
< pdf_params%varnce_w_2(1,:) = zero
< pdf_params%rt_1(1,:) = zero
< pdf_params%rt_2(1,:) = zero
< pdf_params%varnce_rt_1(1,:) = zero
< pdf_params%varnce_rt_2(1,:) = zero
< pdf_params%thl_1(1,:) = zero
< pdf_params%thl_2(1,:) = zero
< pdf_params%varnce_thl_1(1,:) = zero
< pdf_params%varnce_thl_2(1,:) = zero
< pdf_params%corr_w_rt_1(1,:) = zero
< pdf_params%corr_w_rt_2(1,:) = zero
< pdf_params%corr_w_thl_1(1,:) = zero
< pdf_params%corr_w_thl_2(1,:) = zero
< pdf_params%corr_rt_thl_1(1,:) = zero
< pdf_params%corr_rt_thl_2(1,:) = zero
< pdf_params%alpha_thl(1,:) = zero
< pdf_params%alpha_rt(1,:) = zero
< pdf_params%crt_1(1,:) = zero
< pdf_params%crt_2(1,:) = zero
< pdf_params%cthl_1(1,:) = zero
< pdf_params%cthl_2(1,:) = zero
< pdf_params%chi_1(1,:) = zero
< pdf_params%chi_2(1,:) = zero
< pdf_params%stdev_chi_1(1,:) = zero
< pdf_params%stdev_chi_2(1,:) = zero
< pdf_params%stdev_eta_1(1,:) = zero
< pdf_params%stdev_eta_2(1,:) = zero
< pdf_params%covar_chi_eta_1(1,:) = zero
< pdf_params%covar_chi_eta_2(1,:) = zero
< pdf_params%corr_w_chi_1(1,:) = zero
< pdf_params%corr_w_chi_2(1,:) = zero
< pdf_params%corr_w_eta_1(1,:) = zero
< pdf_params%corr_w_eta_2(1,:) = zero
< pdf_params%corr_chi_eta_1(1,:) = zero
< pdf_params%corr_chi_eta_2(1,:) = zero
< pdf_params%rsatl_1(1,:) = zero
< pdf_params%rsatl_2(1,:) = zero
< pdf_params%rc_1(1,:) = zero
< pdf_params%rc_2(1,:) = zero
< pdf_params%cloud_frac_1(1,:) = zero
< pdf_params%cloud_frac_2(1,:) = zero
< pdf_params%mixt_frac(1,:) = zero
< pdf_params%ice_supersat_frac_1(1,:) = zero
< pdf_params%ice_supersat_frac_2(1,:) = zero
---
> allocate( pdf_params%w_1(nz), &
> pdf_params%w_2(nz), &
> pdf_params%varnce_w_1(nz), &
> pdf_params%varnce_w_2(nz), &
> pdf_params%rt_1(nz), &
> pdf_params%rt_2(nz), &
> pdf_params%varnce_rt_1(nz), &
> pdf_params%varnce_rt_2(nz), &
> pdf_params%thl_1(nz), &
> pdf_params%thl_2(nz), &
> pdf_params%varnce_thl_1(nz), &
> pdf_params%varnce_thl_2(nz), &
> pdf_params%corr_w_rt_1(nz), &
> pdf_params%corr_w_rt_2(nz), &
> pdf_params%corr_w_thl_1(nz), &
> pdf_params%corr_w_thl_2(nz), &
> pdf_params%corr_rt_thl_1(nz), &
> pdf_params%corr_rt_thl_2(nz), &
> pdf_params%alpha_thl(nz), &
> pdf_params%alpha_rt(nz), &
> pdf_params%crt_1(nz), &
> pdf_params%crt_2(nz), &
> pdf_params%cthl_1(nz), &
> pdf_params%cthl_2(nz), &
> pdf_params%chi_1(nz), &
> pdf_params%chi_2(nz), &
> pdf_params%stdev_chi_1(nz), &
> pdf_params%stdev_chi_2(nz), &
> pdf_params%stdev_eta_1(nz), &
> pdf_params%stdev_eta_2(nz), &
> pdf_params%covar_chi_eta_1(nz), &
> pdf_params%covar_chi_eta_2(nz), &
> pdf_params%corr_w_chi_1(nz), &
> pdf_params%corr_w_chi_2(nz), &
> pdf_params%corr_w_eta_1(nz), &
> pdf_params%corr_w_eta_2(nz), &
> pdf_params%corr_chi_eta_1(nz), &
> pdf_params%corr_chi_eta_2(nz), &
> pdf_params%rsatl_1(nz), &
> pdf_params%rsatl_2(nz), &
> pdf_params%rc_1(nz), &
> pdf_params%rc_2(nz), &
> pdf_params%cloud_frac_1(nz), &
> pdf_params%cloud_frac_2(nz), &
> pdf_params%mixt_frac(nz), &
> pdf_params%ice_supersat_frac_1(nz), &
> pdf_params%ice_supersat_frac_2(nz) )
>
> pdf_params%w_1 = zero
> pdf_params%w_2 = zero
> pdf_params%varnce_w_1 = zero
> pdf_params%varnce_w_2 = zero
> pdf_params%rt_1 = zero
> pdf_params%rt_2 = zero
> pdf_params%varnce_rt_1 = zero
> pdf_params%varnce_rt_2 = zero
> pdf_params%thl_1 = zero
> pdf_params%thl_2 = zero
> pdf_params%varnce_thl_1 = zero
> pdf_params%varnce_thl_2 = zero
> pdf_params%corr_w_rt_1 = zero
> pdf_params%corr_w_rt_2 = zero
> pdf_params%corr_w_thl_1 = zero
> pdf_params%corr_w_thl_2 = zero
> pdf_params%corr_rt_thl_1 = zero
> pdf_params%corr_rt_thl_2 = zero
> pdf_params%alpha_thl = zero
> pdf_params%alpha_rt = zero
> pdf_params%crt_1 = zero
> pdf_params%crt_2 = zero
> pdf_params%cthl_1 = zero
> pdf_params%cthl_2 = zero
> pdf_params%chi_1 = zero
> pdf_params%chi_2 = zero
> pdf_params%stdev_chi_1 = zero
> pdf_params%stdev_chi_2 = zero
> pdf_params%stdev_eta_1 = zero
> pdf_params%stdev_eta_2 = zero
> pdf_params%covar_chi_eta_1 = zero
> pdf_params%covar_chi_eta_2 = zero
> pdf_params%corr_w_chi_1 = zero
> pdf_params%corr_w_chi_2 = zero
> pdf_params%corr_w_eta_1 = zero
> pdf_params%corr_w_eta_2 = zero
> pdf_params%corr_chi_eta_1 = zero
> pdf_params%corr_chi_eta_2 = zero
> pdf_params%rsatl_1 = zero
> pdf_params%rsatl_2 = zero
> pdf_params%rc_1 = zero
> pdf_params%rc_2 = zero
> pdf_params%cloud_frac_1 = zero
> pdf_params%cloud_frac_2 = zero
> pdf_params%mixt_frac = zero
> pdf_params%ice_supersat_frac_1 = zero
> pdf_params%ice_supersat_frac_2 = zero
418,464c417,463
< r_param_array(:,1) = pdf_params%w_1(1,k_start:k_end)
< r_param_array(:,2) = pdf_params%w_2(1,k_start:k_end)
< r_param_array(:,3) = pdf_params%varnce_w_1(1,k_start:k_end)
< r_param_array(:,4) = pdf_params%varnce_w_2(1,k_start:k_end)
< r_param_array(:,5) = pdf_params%rt_1(1,k_start:k_end)
< r_param_array(:,6) = pdf_params%rt_2(1,k_start:k_end)
< r_param_array(:,7) = pdf_params%varnce_rt_1(1,k_start:k_end)
< r_param_array(:,8) = pdf_params%varnce_rt_2(1,k_start:k_end)
< r_param_array(:,9) = pdf_params%thl_1(1,k_start:k_end)
< r_param_array(:,10) = pdf_params%thl_2(1,k_start:k_end)
< r_param_array(:,11) = pdf_params%varnce_thl_1(1,k_start:k_end)
< r_param_array(:,12) = pdf_params%varnce_thl_2(1,k_start:k_end)
< r_param_array(:,13) = pdf_params%corr_w_rt_1(1,k_start:k_end)
< r_param_array(:,14) = pdf_params%corr_w_rt_2(1,k_start:k_end)
< r_param_array(:,15) = pdf_params%corr_w_thl_1(1,k_start:k_end)
< r_param_array(:,16) = pdf_params%corr_w_thl_2(1,k_start:k_end)
< r_param_array(:,17) = pdf_params%corr_rt_thl_1(1,k_start:k_end)
< r_param_array(:,18) = pdf_params%corr_rt_thl_2(1,k_start:k_end)
< r_param_array(:,19) = pdf_params%alpha_thl(1,k_start:k_end)
< r_param_array(:,20) = pdf_params%alpha_rt(1,k_start:k_end)
< r_param_array(:,21) = pdf_params%crt_1(1,k_start:k_end)
< r_param_array(:,22) = pdf_params%crt_2(1,k_start:k_end)
< r_param_array(:,23) = pdf_params%cthl_1(1,k_start:k_end)
< r_param_array(:,24) = pdf_params%cthl_2(1,k_start:k_end)
< r_param_array(:,25) = pdf_params%chi_1(1,k_start:k_end)
< r_param_array(:,26) = pdf_params%chi_2(1,k_start:k_end)
< r_param_array(:,27) = pdf_params%stdev_chi_1(1,k_start:k_end)
< r_param_array(:,28) = pdf_params%stdev_chi_2(1,k_start:k_end)
< r_param_array(:,29) = pdf_params%stdev_eta_1(1,k_start:k_end)
< r_param_array(:,30) = pdf_params%stdev_eta_2(1,k_start:k_end)
< r_param_array(:,31) = pdf_params%covar_chi_eta_1(1,k_start:k_end)
< r_param_array(:,32) = pdf_params%covar_chi_eta_2(1,k_start:k_end)
< r_param_array(:,33) = pdf_params%corr_w_chi_1(1,k_start:k_end)
< r_param_array(:,34) = pdf_params%corr_w_chi_2(1,k_start:k_end)
< r_param_array(:,35) = pdf_params%corr_w_eta_1(1,k_start:k_end)
< r_param_array(:,36) = pdf_params%corr_w_eta_2(1,k_start:k_end)
< r_param_array(:,37) = pdf_params%corr_chi_eta_1(1,k_start:k_end)
< r_param_array(:,38) = pdf_params%corr_chi_eta_2(1,k_start:k_end)
< r_param_array(:,39) = pdf_params%rsatl_1(1,k_start:k_end)
< r_param_array(:,40) = pdf_params%rsatl_2(1,k_start:k_end)
< r_param_array(:,41) = pdf_params%rc_1(1,k_start:k_end)
< r_param_array(:,42) = pdf_params%rc_2(1,k_start:k_end)
< r_param_array(:,43) = pdf_params%cloud_frac_1(1,k_start:k_end)
< r_param_array(:,44) = pdf_params%cloud_frac_2(1,k_start:k_end)
< r_param_array(:,45) = pdf_params%mixt_frac(1,k_start:k_end)
< r_param_array(:,46) = pdf_params%ice_supersat_frac_1(1,k_start:k_end)
< r_param_array(:,47) = pdf_params%ice_supersat_frac_2(1,k_start:k_end)
---
> r_param_array(:,1) = pdf_params%w_1(k_start:k_end)
> r_param_array(:,2) = pdf_params%w_2(k_start:k_end)
> r_param_array(:,3) = pdf_params%varnce_w_1(k_start:k_end)
> r_param_array(:,4) = pdf_params%varnce_w_2(k_start:k_end)
> r_param_array(:,5) = pdf_params%rt_1(k_start:k_end)
> r_param_array(:,6) = pdf_params%rt_2(k_start:k_end)
> r_param_array(:,7) = pdf_params%varnce_rt_1(k_start:k_end)
> r_param_array(:,8) = pdf_params%varnce_rt_2(k_start:k_end)
> r_param_array(:,9) = pdf_params%thl_1(k_start:k_end)
> r_param_array(:,10) = pdf_params%thl_2(k_start:k_end)
> r_param_array(:,11) = pdf_params%varnce_thl_1(k_start:k_end)
> r_param_array(:,12) = pdf_params%varnce_thl_2(k_start:k_end)
> r_param_array(:,13) = pdf_params%corr_w_rt_1(k_start:k_end)
> r_param_array(:,14) = pdf_params%corr_w_rt_2(k_start:k_end)
> r_param_array(:,15) = pdf_params%corr_w_thl_1(k_start:k_end)
> r_param_array(:,16) = pdf_params%corr_w_thl_2(k_start:k_end)
> r_param_array(:,17) = pdf_params%corr_rt_thl_1(k_start:k_end)
> r_param_array(:,18) = pdf_params%corr_rt_thl_2(k_start:k_end)
> r_param_array(:,19) = pdf_params%alpha_thl(k_start:k_end)
> r_param_array(:,20) = pdf_params%alpha_rt(k_start:k_end)
> r_param_array(:,21) = pdf_params%crt_1(k_start:k_end)
> r_param_array(:,22) = pdf_params%crt_2(k_start:k_end)
> r_param_array(:,23) = pdf_params%cthl_1(k_start:k_end)
> r_param_array(:,24) = pdf_params%cthl_2(k_start:k_end)
> r_param_array(:,25) = pdf_params%chi_1(k_start:k_end)
> r_param_array(:,26) = pdf_params%chi_2(k_start:k_end)
> r_param_array(:,27) = pdf_params%stdev_chi_1(k_start:k_end)
> r_param_array(:,28) = pdf_params%stdev_chi_2(k_start:k_end)
> r_param_array(:,29) = pdf_params%stdev_eta_1(k_start:k_end)
> r_param_array(:,30) = pdf_params%stdev_eta_2(k_start:k_end)
> r_param_array(:,31) = pdf_params%covar_chi_eta_1(k_start:k_end)
> r_param_array(:,32) = pdf_params%covar_chi_eta_2(k_start:k_end)
> r_param_array(:,33) = pdf_params%corr_w_chi_1(k_start:k_end)
> r_param_array(:,34) = pdf_params%corr_w_chi_2(k_start:k_end)
> r_param_array(:,35) = pdf_params%corr_w_eta_1(k_start:k_end)
> r_param_array(:,36) = pdf_params%corr_w_eta_2(k_start:k_end)
> r_param_array(:,37) = pdf_params%corr_chi_eta_1(k_start:k_end)
> r_param_array(:,38) = pdf_params%corr_chi_eta_2(k_start:k_end)
> r_param_array(:,39) = pdf_params%rsatl_1(k_start:k_end)
> r_param_array(:,40) = pdf_params%rsatl_2(k_start:k_end)
> r_param_array(:,41) = pdf_params%rc_1(k_start:k_end)
> r_param_array(:,42) = pdf_params%rc_2(k_start:k_end)
> r_param_array(:,43) = pdf_params%cloud_frac_1(k_start:k_end)
> r_param_array(:,44) = pdf_params%cloud_frac_2(k_start:k_end)
> r_param_array(:,45) = pdf_params%mixt_frac(k_start:k_end)
> r_param_array(:,46) = pdf_params%ice_supersat_frac_1(k_start:k_end)
> r_param_array(:,47) = pdf_params%ice_supersat_frac_2(k_start:k_end)
493,539c492,538
< pdf_params%w_1(1,k_start:k_end) = r_param_array(:,1)
< pdf_params%w_2(1,k_start:k_end) = r_param_array(:,2)
< pdf_params%varnce_w_1(1,k_start:k_end) = r_param_array(:,3)
< pdf_params%varnce_w_2(1,k_start:k_end) = r_param_array(:,4)
< pdf_params%rt_1(1,k_start:k_end) = r_param_array(:,5)
< pdf_params%rt_2(1,k_start:k_end) = r_param_array(:,6)
< pdf_params%varnce_rt_1(1,k_start:k_end) = r_param_array(:,7)
< pdf_params%varnce_rt_2(1,k_start:k_end)= r_param_array(:,8)
< pdf_params%thl_1(1,k_start:k_end) = r_param_array(:,9)
< pdf_params%thl_2(1,k_start:k_end) = r_param_array(:,10)
< pdf_params%varnce_thl_1(1,k_start:k_end) = r_param_array(:,11)
< pdf_params%varnce_thl_2(1,k_start:k_end) = r_param_array(:,12)
< pdf_params%corr_w_rt_1(1,k_start:k_end) = r_param_array(:,13)
< pdf_params%corr_w_rt_2(1,k_start:k_end) = r_param_array(:,14)
< pdf_params%corr_w_thl_1(1,k_start:k_end) = r_param_array(:,15)
< pdf_params%corr_w_thl_2(1,k_start:k_end) = r_param_array(:,16)
< pdf_params%corr_rt_thl_1(1,k_start:k_end) = r_param_array(:,17)
< pdf_params%corr_rt_thl_2(1,k_start:k_end) = r_param_array(:,18)
< pdf_params%alpha_thl(1,k_start:k_end) = r_param_array(:,19)
< pdf_params%alpha_rt(1,k_start:k_end) = r_param_array(:,20)
< pdf_params%crt_1(1,k_start:k_end) = r_param_array(:,21)
< pdf_params%crt_2(1,k_start:k_end) = r_param_array(:,22)
< pdf_params%cthl_1(1,k_start:k_end) = r_param_array(:,23)
< pdf_params%cthl_2(1,k_start:k_end) = r_param_array(:,24)
< pdf_params%chi_1(1,k_start:k_end) = r_param_array(:,25)
< pdf_params%chi_2(1,k_start:k_end) = r_param_array(:,26)
< pdf_params%stdev_chi_1(1,k_start:k_end) = r_param_array(:,27)
< pdf_params%stdev_chi_2(1,k_start:k_end) = r_param_array(:,28)
< pdf_params%stdev_eta_1(1,k_start:k_end) = r_param_array(:,29)
< pdf_params%stdev_eta_2(1,k_start:k_end) = r_param_array(:,30)
< pdf_params%covar_chi_eta_1(1,k_start:k_end) = r_param_array(:,31)
< pdf_params%covar_chi_eta_2(1,k_start:k_end) = r_param_array(:,32)
< pdf_params%corr_w_chi_1(1,k_start:k_end) = r_param_array(:,33)
< pdf_params%corr_w_chi_2(1,k_start:k_end) = r_param_array(:,34)
< pdf_params%corr_w_eta_1(1,k_start:k_end) = r_param_array(:,35)
< pdf_params%corr_w_eta_2(1,k_start:k_end) = r_param_array(:,36)
< pdf_params%corr_chi_eta_1(1,k_start:k_end) = r_param_array(:,37)
< pdf_params%corr_chi_eta_2(1,k_start:k_end) = r_param_array(:,38)
< pdf_params%rsatl_1(1,k_start:k_end) = r_param_array(:,39)
< pdf_params%rsatl_2(1,k_start:k_end) = r_param_array(:,40)
< pdf_params%rc_1(1,k_start:k_end) = r_param_array(:,41)
< pdf_params%rc_2(1,k_start:k_end) = r_param_array(:,42)
< pdf_params%cloud_frac_1(1,k_start:k_end) = r_param_array(:,43)
< pdf_params%cloud_frac_2(1,k_start:k_end) = r_param_array(:,44)
< pdf_params%mixt_frac(1,k_start:k_end) = r_param_array(:,45)
< pdf_params%ice_supersat_frac_1(1,k_start:k_end) = r_param_array(:,46)
< pdf_params%ice_supersat_frac_2(1,k_start:k_end) = r_param_array(:,47)
---
> pdf_params%w_1(k_start:k_end) = r_param_array(:,1)
> pdf_params%w_2(k_start:k_end) = r_param_array(:,2)
> pdf_params%varnce_w_1(k_start:k_end) = r_param_array(:,3)
> pdf_params%varnce_w_2(k_start:k_end) = r_param_array(:,4)
> pdf_params%rt_1(k_start:k_end) = r_param_array(:,5)
> pdf_params%rt_2(k_start:k_end) = r_param_array(:,6)
> pdf_params%varnce_rt_1(k_start:k_end) = r_param_array(:,7)
> pdf_params%varnce_rt_2(k_start:k_end)= r_param_array(:,8)
> pdf_params%thl_1(k_start:k_end) = r_param_array(:,9)
> pdf_params%thl_2(k_start:k_end) = r_param_array(:,10)
> pdf_params%varnce_thl_1(k_start:k_end) = r_param_array(:,11)
> pdf_params%varnce_thl_2(k_start:k_end) = r_param_array(:,12)
> pdf_params%corr_w_rt_1(k_start:k_end) = r_param_array(:,13)
> pdf_params%corr_w_rt_2(k_start:k_end) = r_param_array(:,14)
> pdf_params%corr_w_thl_1(k_start:k_end) = r_param_array(:,15)
> pdf_params%corr_w_thl_2(k_start:k_end) = r_param_array(:,16)
> pdf_params%corr_rt_thl_1(k_start:k_end) = r_param_array(:,17)
> pdf_params%corr_rt_thl_2(k_start:k_end) = r_param_array(:,18)
> pdf_params%alpha_thl(k_start:k_end) = r_param_array(:,19)
> pdf_params%alpha_rt(k_start:k_end) = r_param_array(:,20)
> pdf_params%crt_1(k_start:k_end) = r_param_array(:,21)
> pdf_params%crt_2(k_start:k_end) = r_param_array(:,22)
> pdf_params%cthl_1(k_start:k_end) = r_param_array(:,23)
> pdf_params%cthl_2(k_start:k_end) = r_param_array(:,24)
> pdf_params%chi_1(k_start:k_end) = r_param_array(:,25)
> pdf_params%chi_2(k_start:k_end) = r_param_array(:,26)
> pdf_params%stdev_chi_1(k_start:k_end) = r_param_array(:,27)
> pdf_params%stdev_chi_2(k_start:k_end) = r_param_array(:,28)
> pdf_params%stdev_eta_1(k_start:k_end) = r_param_array(:,29)
> pdf_params%stdev_eta_2(k_start:k_end) = r_param_array(:,30)
> pdf_params%covar_chi_eta_1(k_start:k_end) = r_param_array(:,31)
> pdf_params%covar_chi_eta_2(k_start:k_end) = r_param_array(:,32)
> pdf_params%corr_w_chi_1(k_start:k_end) = r_param_array(:,33)
> pdf_params%corr_w_chi_2(k_start:k_end) = r_param_array(:,34)
> pdf_params%corr_w_eta_1(k_start:k_end) = r_param_array(:,35)
> pdf_params%corr_w_eta_2(k_start:k_end) = r_param_array(:,36)
> pdf_params%corr_chi_eta_1(k_start:k_end) = r_param_array(:,37)
> pdf_params%corr_chi_eta_2(k_start:k_end) = r_param_array(:,38)
> pdf_params%rsatl_1(k_start:k_end) = r_param_array(:,39)
> pdf_params%rsatl_2(k_start:k_end) = r_param_array(:,40)
> pdf_params%rc_1(k_start:k_end) = r_param_array(:,41)
> pdf_params%rc_2(k_start:k_end) = r_param_array(:,42)
> pdf_params%cloud_frac_1(k_start:k_end) = r_param_array(:,43)
> pdf_params%cloud_frac_2(k_start:k_end) = r_param_array(:,44)
> pdf_params%mixt_frac(k_start:k_end) = r_param_array(:,45)
> pdf_params%ice_supersat_frac_1(k_start:k_end) = r_param_array(:,46)
> pdf_params%ice_supersat_frac_2(k_start:k_end) = r_param_array(:,47)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/setup_clubb_pdf_params.F90 clubb_release/src/CLUBB_core/setup_clubb_pdf_params.F90
206c206
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
381,397c381,397
< mu_w_1(j,:) = pdf_params%w_1(j,:)
< mu_w_2(j,:) = pdf_params%w_2(j,:)
< mu_chi_1(j,:) = pdf_params%chi_1(j,:)
< mu_chi_2(j,:) = pdf_params%chi_2(j,:)
< sigma_w_1(j,:) = sqrt( pdf_params%varnce_w_1(j,:) )
< sigma_w_2(j,:) = sqrt( pdf_params%varnce_w_2(j,:) )
< sigma_chi_1(j,:) = pdf_params%stdev_chi_1(j,:)
< sigma_chi_2(j,:) = pdf_params%stdev_chi_2(j,:)
< sigma_eta_1(j,:) = pdf_params%stdev_eta_1(j,:)
< sigma_eta_2(j,:) = pdf_params%stdev_eta_2(j,:)
< rc_1(j,:) = pdf_params%rc_1(j,:)
< rc_2(j,:) = pdf_params%rc_2(j,:)
< thl_1(j,:) = pdf_params%thl_1(j,:)
< thl_2(j,:) = pdf_params%thl_2(j,:)
< cloud_frac_1(j,:) = pdf_params%cloud_frac_1(j,:)
< cloud_frac_2(j,:) = pdf_params%cloud_frac_2(j,:)
< mixt_frac(j,:) = pdf_params%mixt_frac(j,:)
---
> mu_w_1(j,:) = pdf_params(j)%w_1
> mu_w_2(j,:) = pdf_params(j)%w_2
> mu_chi_1(j,:) = pdf_params(j)%chi_1
> mu_chi_2(j,:) = pdf_params(j)%chi_2
> sigma_w_1(j,:) = sqrt( pdf_params(j)%varnce_w_1 )
> sigma_w_2(j,:) = sqrt( pdf_params(j)%varnce_w_2 )
> sigma_chi_1(j,:) = pdf_params(j)%stdev_chi_1
> sigma_chi_2(j,:) = pdf_params(j)%stdev_chi_2
> sigma_eta_1(j,:) = pdf_params(j)%stdev_eta_1
> sigma_eta_2(j,:) = pdf_params(j)%stdev_eta_2
> rc_1(j,:) = pdf_params(j)%rc_1
> rc_2(j,:) = pdf_params(j)%rc_2
> thl_1(j,:) = pdf_params(j)%thl_1
> thl_2(j,:) = pdf_params(j)%thl_2
> cloud_frac_1(j,:) = pdf_params(j)%cloud_frac_1
> cloud_frac_2(j,:) = pdf_params(j)%cloud_frac_2
> mixt_frac(j,:) = pdf_params(j)%mixt_frac
415,416c415,416
< ice_supersat_frac_1(j,:) = pdf_params%ice_supersat_frac_1(j,:)
< ice_supersat_frac_2(j,:) = pdf_params%ice_supersat_frac_2(j,:)
---
> ice_supersat_frac_1(j,:) = pdf_params(j)%ice_supersat_frac_1
> ice_supersat_frac_2(j,:) = pdf_params(j)%ice_supersat_frac_2
817,821c817,821
< = compute_rtp2_from_chi( pdf_params%stdev_chi_1(j,:), pdf_params%stdev_chi_2(j,:), &
< pdf_params%stdev_eta_1(j,:), pdf_params%stdev_eta_2(j,:), &
< pdf_params%rt_1(j,:), pdf_params%rt_2(j,:), &
< pdf_params%crt_1(j,:), pdf_params%crt_2(j,:), &
< pdf_params%mixt_frac(j,:), &
---
> = compute_rtp2_from_chi( pdf_params(j)%stdev_chi_1(:), pdf_params(j)%stdev_chi_2(:), &
> pdf_params(j)%stdev_eta_1(:), pdf_params(j)%stdev_eta_2(:), &
> pdf_params(j)%rt_1(:), pdf_params(j)%rt_2(:), &
> pdf_params(j)%crt_1(:), pdf_params(j)%crt_2(:), &
> pdf_params(j)%mixt_frac, &
1448c1448
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
1585,1586c1585,1586
< corr_array_1_n(j,:,iiPDF_eta,iiPDF_chi) = pdf_params%corr_chi_eta_1(j,:)
< corr_array_2_n(j,:,iiPDF_eta,iiPDF_chi) = pdf_params%corr_chi_eta_2(j,:)
---
> corr_array_1_n(j,:,iiPDF_eta,iiPDF_chi) = pdf_params(j)%corr_chi_eta_1(:)
> corr_array_2_n(j,:,iiPDF_eta,iiPDF_chi) = pdf_params(j)%corr_chi_eta_2(:)
1605,1606c1605,1606
< corr_array_1_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params%corr_w_chi_1(j,:)
< corr_array_2_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params%corr_w_chi_2(j,:)
---
> corr_array_1_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params(j)%corr_w_chi_1(:)
> corr_array_2_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params(j)%corr_w_chi_2(:)
1648,1649c1648,1649
< corr_array_1_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params%corr_w_chi_1(j,:)
< corr_array_2_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params%corr_w_chi_2(j,:)
---
> corr_array_1_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params(j)%corr_w_chi_1(:)
> corr_array_2_n(j,:,iiPDF_w,iiPDF_chi) = pdf_params(j)%corr_w_chi_2(:)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/stats_clubb_utilities.F90 clubb_release/src/CLUBB_core/stats_clubb_utilities.F90
2270,2312c2270,2312
< call stat_update_var( imixt_frac, pdf_params%mixt_frac(1,:), stats_zt )
< call stat_update_var( iw_1, pdf_params%w_1(1,:), stats_zt )
< call stat_update_var( iw_2, pdf_params%w_2(1,:), stats_zt )
< call stat_update_var( ivarnce_w_1, pdf_params%varnce_w_1(1,:), stats_zt )
< call stat_update_var( ivarnce_w_2, pdf_params%varnce_w_2(1,:), stats_zt )
< call stat_update_var( ithl_1, pdf_params%thl_1(1,:), stats_zt )
< call stat_update_var( ithl_2, pdf_params%thl_2(1,:), stats_zt )
< call stat_update_var( ivarnce_thl_1, pdf_params%varnce_thl_1(1,:), stats_zt )
< call stat_update_var( ivarnce_thl_2, pdf_params%varnce_thl_2(1,:), stats_zt )
< call stat_update_var( irt_1, pdf_params%rt_1(1,:), stats_zt )
< call stat_update_var( irt_2, pdf_params%rt_2(1,:), stats_zt )
< call stat_update_var( ivarnce_rt_1, pdf_params%varnce_rt_1(1,:), stats_zt )
< call stat_update_var( ivarnce_rt_2, pdf_params%varnce_rt_2(1,:), stats_zt )
< call stat_update_var( irc_1, pdf_params%rc_1(1,:), stats_zt )
< call stat_update_var( irc_2, pdf_params%rc_2(1,:), stats_zt )
< call stat_update_var( irsatl_1, pdf_params%rsatl_1(1,:), stats_zt )
< call stat_update_var( irsatl_2, pdf_params%rsatl_2(1,:), stats_zt )
< call stat_update_var( icloud_frac_1, pdf_params%cloud_frac_1(1,:), stats_zt )
< call stat_update_var( icloud_frac_2, pdf_params%cloud_frac_2(1,:), stats_zt )
< call stat_update_var( ichi_1, pdf_params%chi_1(1,:), stats_zt )
< call stat_update_var( ichi_2, pdf_params%chi_2(1,:), stats_zt )
< call stat_update_var( istdev_chi_1, pdf_params%stdev_chi_1(1,:), stats_zt )
< call stat_update_var( istdev_chi_2, pdf_params%stdev_chi_2(1,:), stats_zt )
< call stat_update_var( istdev_eta_1, pdf_params%stdev_eta_1(1,:), stats_zt )
< call stat_update_var( istdev_eta_2, pdf_params%stdev_eta_2(1,:), stats_zt )
< call stat_update_var( icovar_chi_eta_1, pdf_params%covar_chi_eta_1(1,:), stats_zt )
< call stat_update_var( icovar_chi_eta_2, pdf_params%covar_chi_eta_2(1,:), stats_zt )
< call stat_update_var( icorr_w_chi_1, pdf_params%corr_w_chi_1(1,:), stats_zt )
< call stat_update_var( icorr_w_chi_2, pdf_params%corr_w_chi_2(1,:), stats_zt )
< call stat_update_var( icorr_w_eta_1, pdf_params%corr_w_eta_1(1,:), stats_zt )
< call stat_update_var( icorr_w_eta_2, pdf_params%corr_w_eta_2(1,:), stats_zt )
< call stat_update_var( icorr_chi_eta_1, pdf_params%corr_chi_eta_1(1,:), stats_zt )
< call stat_update_var( icorr_chi_eta_2, pdf_params%corr_chi_eta_2(1,:), stats_zt )
< call stat_update_var( icorr_w_rt_1, pdf_params%corr_w_rt_1(1,:), stats_zt )
< call stat_update_var( icorr_w_rt_2, pdf_params%corr_w_rt_2(1,:), stats_zt )
< call stat_update_var( icorr_w_thl_1, pdf_params%corr_w_thl_1(1,:), stats_zt )
< call stat_update_var( icorr_w_thl_2, pdf_params%corr_w_thl_2(1,:), stats_zt )
< call stat_update_var( icorr_rt_thl_1, pdf_params%corr_rt_thl_1(1,:), stats_zt )
< call stat_update_var( icorr_rt_thl_2, pdf_params%corr_rt_thl_2(1,:), stats_zt )
< call stat_update_var( icrt_1, pdf_params%crt_1(1,:), stats_zt )
< call stat_update_var( icrt_2, pdf_params%crt_2(1,:), stats_zt )
< call stat_update_var( icthl_1, pdf_params%cthl_1(1,:), stats_zt )
< call stat_update_var( icthl_2, pdf_params%cthl_2(1,:), stats_zt )
---
> call stat_update_var( imixt_frac, pdf_params%mixt_frac, stats_zt )
> call stat_update_var( iw_1, pdf_params%w_1, stats_zt )
> call stat_update_var( iw_2, pdf_params%w_2, stats_zt )
> call stat_update_var( ivarnce_w_1, pdf_params%varnce_w_1, stats_zt )
> call stat_update_var( ivarnce_w_2, pdf_params%varnce_w_2, stats_zt )
> call stat_update_var( ithl_1, pdf_params%thl_1, stats_zt )
> call stat_update_var( ithl_2, pdf_params%thl_2, stats_zt )
> call stat_update_var( ivarnce_thl_1, pdf_params%varnce_thl_1, stats_zt )
> call stat_update_var( ivarnce_thl_2, pdf_params%varnce_thl_2, stats_zt )
> call stat_update_var( irt_1, pdf_params%rt_1, stats_zt )
> call stat_update_var( irt_2, pdf_params%rt_2, stats_zt )
> call stat_update_var( ivarnce_rt_1, pdf_params%varnce_rt_1, stats_zt )
> call stat_update_var( ivarnce_rt_2, pdf_params%varnce_rt_2, stats_zt )
> call stat_update_var( irc_1, pdf_params%rc_1, stats_zt )
> call stat_update_var( irc_2, pdf_params%rc_2, stats_zt )
> call stat_update_var( irsatl_1, pdf_params%rsatl_1, stats_zt )
> call stat_update_var( irsatl_2, pdf_params%rsatl_2, stats_zt )
> call stat_update_var( icloud_frac_1, pdf_params%cloud_frac_1, stats_zt )
> call stat_update_var( icloud_frac_2, pdf_params%cloud_frac_2, stats_zt )
> call stat_update_var( ichi_1, pdf_params%chi_1, stats_zt )
> call stat_update_var( ichi_2, pdf_params%chi_2, stats_zt )
> call stat_update_var( istdev_chi_1, pdf_params%stdev_chi_1, stats_zt )
> call stat_update_var( istdev_chi_2, pdf_params%stdev_chi_2, stats_zt )
> call stat_update_var( istdev_eta_1, pdf_params%stdev_eta_1, stats_zt )
> call stat_update_var( istdev_eta_2, pdf_params%stdev_eta_2, stats_zt )
> call stat_update_var( icovar_chi_eta_1, pdf_params%covar_chi_eta_1, stats_zt )
> call stat_update_var( icovar_chi_eta_2, pdf_params%covar_chi_eta_2, stats_zt )
> call stat_update_var( icorr_w_chi_1, pdf_params%corr_w_chi_1, stats_zt )
> call stat_update_var( icorr_w_chi_2, pdf_params%corr_w_chi_2, stats_zt )
> call stat_update_var( icorr_w_eta_1, pdf_params%corr_w_eta_1, stats_zt )
> call stat_update_var( icorr_w_eta_2, pdf_params%corr_w_eta_2, stats_zt )
> call stat_update_var( icorr_chi_eta_1, pdf_params%corr_chi_eta_1, stats_zt )
> call stat_update_var( icorr_chi_eta_2, pdf_params%corr_chi_eta_2, stats_zt )
> call stat_update_var( icorr_w_rt_1, pdf_params%corr_w_rt_1, stats_zt )
> call stat_update_var( icorr_w_rt_2, pdf_params%corr_w_rt_2, stats_zt )
> call stat_update_var( icorr_w_thl_1, pdf_params%corr_w_thl_1, stats_zt )
> call stat_update_var( icorr_w_thl_2, pdf_params%corr_w_thl_2, stats_zt )
> call stat_update_var( icorr_rt_thl_1, pdf_params%corr_rt_thl_1, stats_zt )
> call stat_update_var( icorr_rt_thl_2, pdf_params%corr_rt_thl_2, stats_zt )
> call stat_update_var( icrt_1, pdf_params%crt_1, stats_zt )
> call stat_update_var( icrt_2, pdf_params%crt_2, stats_zt )
> call stat_update_var( icthl_1, pdf_params%cthl_1, stats_zt )
> call stat_update_var( icthl_2, pdf_params%cthl_2, stats_zt )
2330,2331c2330,2331
< chi(:) = pdf_params%mixt_frac(1,:) * pdf_params%chi_1(1,:) &
< + (1.0_core_rknd-pdf_params%mixt_frac(1,:)) * pdf_params%chi_2(1,:)
---
> chi(:) = pdf_params%mixt_frac * pdf_params%chi_1 &
> + (1.0_core_rknd-pdf_params%mixt_frac) * pdf_params%chi_2
2337,2339c2337,2339
< chip2 = compute_variance_binormal( chi, pdf_params%chi_1(1,:), pdf_params%chi_2(1,:), &
< pdf_params%stdev_chi_1(1,:), pdf_params%stdev_chi_2(1,:), &
< pdf_params%mixt_frac(1,:) )
---
> chip2 = compute_variance_binormal( chi, pdf_params%chi_1, pdf_params%chi_2, &
> pdf_params%stdev_chi_1, pdf_params%stdev_chi_2, &
> pdf_params%mixt_frac )
2407,2411c2407,2411
< call stat_update_var( iw_1_zm, pdf_params_zm%w_1(1,:), stats_zm )
< call stat_update_var( iw_2_zm, pdf_params_zm%w_2(1,:), stats_zm )
< call stat_update_var( ivarnce_w_1_zm, pdf_params_zm%varnce_w_1(1,:), stats_zm )
< call stat_update_var( ivarnce_w_2_zm, pdf_params_zm%varnce_w_2(1,:), stats_zm )
< call stat_update_var( imixt_frac_zm, pdf_params_zm%mixt_frac(1,:), stats_zm )
---
> call stat_update_var( iw_1_zm, pdf_params_zm%w_1, stats_zm )
> call stat_update_var( iw_2_zm, pdf_params_zm%w_2, stats_zm )
> call stat_update_var( ivarnce_w_1_zm, pdf_params_zm%varnce_w_1, stats_zm )
> call stat_update_var( ivarnce_w_2_zm, pdf_params_zm%varnce_w_2, stats_zm )
> call stat_update_var( imixt_frac_zm, pdf_params_zm%mixt_frac, stats_zm )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_driver.F90 clubb_release/src/clubb_driver.F90
442c442
< type(pdf_parameter), allocatable :: &
---
> type(pdf_parameter), dimension(:), allocatable :: &
1507,1508c1507,1508
< allocate( pdf_params )
< call init_pdf_params( gr%nz, 1, pdf_params )
---
> allocate( pdf_params(1) )
> call init_pdf_params( gr%nz, pdf_params(1) )
1510c1510
< call init_pdf_params( gr%nz, 1, pdf_params_zm )
---
> call init_pdf_params( gr%nz, pdf_params_zm )
1898c1898
< pdf_params, pdf_params_zm, & ! Intent(inout)
---
> pdf_params(1), pdf_params_zm, & ! Intent(inout)
2071c2071
< pdf_params, pdf_params_zm ) ! Inout
---
> pdf_params(1), pdf_params_zm ) ! Inout
2188c2188
< pdf_params, pdf_params_zm, & ! Intent(inout)
---
> pdf_params(1), pdf_params_zm, & ! Intent(inout)
2216c2216
< pdf_params, l_stats_samp, & ! Intent(in)
---
> pdf_params(1), l_stats_samp, & ! Intent(in)
2239c2239
< pdf_params, hydromet_pdf_params(1,:), & ! Intent(in)
---
> pdf_params(1), hydromet_pdf_params(1,:), & ! Intent(in)
2363c2363
< pdf_params, hydromet_pdf_params(1,:), & ! In
---
> pdf_params(1), hydromet_pdf_params(1,:), & ! In
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/gfdl_activation.F90 clubb_release/src/gfdl_activation.F90
102c102
< if( pdf_params%varnce_w_1(1,iz_clubb) > wp2_eps) then
---
> if( pdf_params%varnce_w_1(iz_clubb) > wp2_eps) then
104,109c104,109
< * erff( pdf_params%w_1(1,iz_clubb) &
< / sqrt( 2.0_core_rknd*pdf_params%varnce_w_1(1,iz_clubb)) )
< P1_updraft = P1_updraft * pdf_params%mixt_frac(1,iz_clubb) &
< * pdf_params%cloud_frac_1(1,iz_clubb)
< else if( pdf_params%w_1(1,iz_clubb) > 0.0_core_rknd) then
< P1_updraft = pdf_params%mixt_frac(1,iz_clubb) * pdf_params%cloud_frac_1(1,iz_clubb)
---
> * erff( pdf_params%w_1(iz_clubb) &
> / sqrt( 2.0_core_rknd*pdf_params%varnce_w_1(iz_clubb)) )
> P1_updraft = P1_updraft * pdf_params%mixt_frac(iz_clubb) &
> * pdf_params%cloud_frac_1(iz_clubb)
> else if( pdf_params%w_1(iz_clubb) > 0.0_core_rknd) then
> P1_updraft = pdf_params%mixt_frac(iz_clubb) * pdf_params%cloud_frac_1(iz_clubb)
116c116
< if( pdf_params%varnce_w_2(1,iz_clubb) > wp2_eps) then
---
> if( pdf_params%varnce_w_2(iz_clubb) > wp2_eps) then
118,124c118,124
< 0.5_core_rknd*erff( pdf_params%w_2(1,iz_clubb) &
< / sqrt( 2.0_core_rknd*pdf_params%varnce_w_2(1,iz_clubb)) )
< P2_updraft = P2_updraft * ( 1.0_core_rknd-pdf_params%mixt_frac(1,iz_clubb) ) &
< * pdf_params%cloud_frac_2(1,iz_clubb)
< else if( pdf_params%w_2(1,iz_clubb) > 0.0_core_rknd) then
< P2_updraft = ( 1.0_core_rknd-pdf_params%mixt_frac(1,iz_clubb) ) &
< * pdf_params%cloud_frac_2(1,iz_clubb)
---
> 0.5_core_rknd*erff( pdf_params%w_2(iz_clubb) &
> / sqrt( 2.0_core_rknd*pdf_params%varnce_w_2(iz_clubb)) )
> P2_updraft = P2_updraft * ( 1.0_core_rknd-pdf_params%mixt_frac(iz_clubb ) ) &
> * pdf_params%cloud_frac_2(iz_clubb)
> else if( pdf_params%w_2(iz_clubb) > 0.0_core_rknd) then
> P2_updraft = ( 1.0_core_rknd-pdf_params%mixt_frac(iz_clubb) ) &
> * pdf_params%cloud_frac_2(iz_clubb)
144,145c144,145
< real(pdf_params%w_1(1,iz_clubb)), &! intent(in)
< real(pdf_params%varnce_w_1(1,iz_clubb)), &! intent(in)
---
> real(pdf_params%w_1(iz_clubb)), &! intent(in)
> real(pdf_params%varnce_w_1(iz_clubb)), &! intent(in)
152,153c152,153
< real(pdf_params%w_2(1,iz_clubb)), &! intent(in)
< real(pdf_params%varnce_w_2(1,iz_clubb)), &! intent(in)
---
> real(pdf_params%w_2(iz_clubb)), &! intent(in)
> real(pdf_params%varnce_w_2(iz_clubb)), &! intent(in)
165,167c165,167
< ( pdf_params%mixt_frac(1,iz_clubb) * pdf_params%cloud_frac_1(1,iz_clubb) + &
< (1._core_rknd- pdf_params%mixt_frac(1,iz_clubb)) * &
< pdf_params%cloud_frac_2(1,iz_clubb) )
---
> ( pdf_params%mixt_frac(iz_clubb) * pdf_params%cloud_frac_1(iz_clubb) + &
> (1._core_rknd- pdf_params%mixt_frac(iz_clubb)) * &
> pdf_params%cloud_frac_2(iz_clubb) )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/input_fields.F90 clubb_release/src/input_fields.F90
628c628
< gr%zt, pdf_params%w_1(1,:), l_read_error )
---
> gr%zt, pdf_params%w_1, l_read_error )
634c634
< gr%zt, pdf_params%w_2(1,:), l_read_error )
---
> gr%zt, pdf_params%w_2, l_read_error )
640c640
< timestep, gr%zt, pdf_params%varnce_w_1(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%varnce_w_1, l_read_error )
646c646
< timestep, gr%zt, pdf_params%varnce_w_2(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%varnce_w_2, l_read_error )
652c652
< gr%zt, pdf_params%rt_1(1,:), l_read_error )
---
> gr%zt, pdf_params%rt_1, l_read_error )
658c658
< gr%zt, pdf_params%rt_2(1,:), l_read_error )
---
> gr%zt, pdf_params%rt_2, l_read_error )
664c664
< timestep, gr%zt, pdf_params%varnce_rt_1(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%varnce_rt_1, l_read_error )
670c670
< timestep, gr%zt, pdf_params%varnce_rt_2(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%varnce_rt_2, l_read_error )
676c676
< gr%zt, pdf_params%thl_1(1,:), l_read_error )
---
> gr%zt, pdf_params%thl_1, l_read_error )
682c682
< gr%zt, pdf_params%thl_2(1,:), l_read_error )
---
> gr%zt, pdf_params%thl_2, l_read_error )
688c688
< gr%nz, timestep, gr%zt, pdf_params%varnce_thl_1(1,:), l_read_error )
---
> gr%nz, timestep, gr%zt, pdf_params%varnce_thl_1, l_read_error )
694c694
< gr%nz, timestep, gr%zt, pdf_params%varnce_thl_2(1,:), l_read_error )
---
> gr%nz, timestep, gr%zt, pdf_params%varnce_thl_2, l_read_error )
700c700
< timestep, gr%zt, pdf_params%mixt_frac(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%mixt_frac, l_read_error )
706c706
< gr%zt, pdf_params%chi_1(1,:), l_read_error )
---
> gr%zt, pdf_params%chi_1, l_read_error )
712c712
< gr%zt, pdf_params%chi_2(1,:), l_read_error )
---
> gr%zt, pdf_params%chi_2, l_read_error )
718c718
< timestep, gr%zt, pdf_params%stdev_chi_1(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%stdev_chi_1, l_read_error )
724c724
< timestep, gr%zt, pdf_params%stdev_chi_2(1,:), l_read_error )
---
> timestep, gr%zt, pdf_params%stdev_chi_2, l_read_error )
730c730
< gr%zt, pdf_params%rc_1(1,:), l_read_error )
---
> gr%zt, pdf_params%rc_1, l_read_error )
736c736
< gr%zt, pdf_params%rc_2(1,:), l_read_error )
---
> gr%zt, pdf_params%rc_2, l_read_error )
911c911
< gr%zm, pdf_params_zm%w_1(1,:), l_read_error )
---
> gr%zm, pdf_params_zm%w_1, l_read_error )
917c917
< gr%zm, pdf_params_zm%w_2(1,:), l_read_error )
---
> gr%zm, pdf_params_zm%w_2, l_read_error )
923c923
< gr%nz, timestep, gr%zm, pdf_params_zm%varnce_w_1(1,:), l_read_error )
---
> gr%nz, timestep, gr%zm, pdf_params_zm%varnce_w_1, l_read_error )
929c929
< gr%nz, timestep, gr%zm, pdf_params_zm%varnce_w_2(1,:), l_read_error )
---
> gr%nz, timestep, gr%zm, pdf_params_zm%varnce_w_2, l_read_error )
935c935
< gr%nz, timestep, gr%zm, pdf_params_zm%mixt_frac(1,:), l_read_error )
---
> gr%nz, timestep, gr%zm, pdf_params_zm%mixt_frac, l_read_error )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/KK_microphys_module.F90 clubb_release/src/KK_microphys_module.F90
722c722
< mixt_frac = pdf_params%mixt_frac(1,:)
---
> mixt_frac = pdf_params%mixt_frac
840,843c840,843
< pdf_params%rt_1(1,k), pdf_params%rt_2(1,k), &
< pdf_params%thl_1(1,k), pdf_params%thl_2(1,k), &
< pdf_params%crt_1(1,k), pdf_params%crt_2(1,k), &
< pdf_params%cthl_1(1,k), pdf_params%cthl_2(1,k), &
---
> pdf_params%rt_1(k), pdf_params%rt_2(k), &
> pdf_params%thl_1(k), pdf_params%thl_2(k), &
> pdf_params%crt_1(k), pdf_params%crt_2(k), &
> pdf_params%cthl_1(k), pdf_params%cthl_2(k), &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/microphys_driver.F90 clubb_release/src/microphys_driver.F90
396,397c396,397
< chi(:) = pdf_params%mixt_frac(1,:) * pdf_params%chi_1(1,:) &
< + ( one - pdf_params%mixt_frac(1,:) ) * pdf_params%chi_2(1,:)
---
> chi(:) = pdf_params%mixt_frac * pdf_params%chi_1 &
> + ( one - pdf_params%mixt_frac ) * pdf_params%chi_2
504,505c504,505
< where ( pdf_params%rt_1(1,:) > pdf_params%rt_2(1,:) )
< rvm = pdf_params%rt_1(1,:) - pdf_params%rc_1(1,:)
---
> where ( pdf_params%rt_1 > pdf_params%rt_2 )
> rvm = pdf_params%rt_1 - pdf_params%rc_1
507c507
< rvm = pdf_params%rt_2(1,:) - pdf_params%rc_2(1,:)
---
> rvm = pdf_params%rt_2 - pdf_params%rc_2
510,511c510,511
< where ( pdf_params%thl_1(1,:) < pdf_params%thl_2(1,:) )
< thlm_morr = pdf_params%thl_1(1,:)
---
> where ( pdf_params%thl_1 < pdf_params%thl_2 )
> thlm_morr = pdf_params%thl_1
513c513
< thlm_morr = pdf_params%thl_2(1,:)
---
> thlm_morr = pdf_params%thl_2
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/mixed_moment_PDF_integrals.F90 clubb_release/src/mixed_moment_PDF_integrals.F90
204,207c204,207
< mu_rt_1 = pdf_params%rt_1(1,k)
< mu_rt_2 = pdf_params%rt_2(1,k)
< mu_thl_1 = pdf_params%thl_1(1,k)
< mu_thl_2 = pdf_params%thl_2(1,k)
---
> mu_rt_1 = pdf_params%rt_1(k)
> mu_rt_2 = pdf_params%rt_2(k)
> mu_thl_1 = pdf_params%thl_1(k)
> mu_thl_2 = pdf_params%thl_2(k)
212,215c212,215
< sigma_rt_1 = sqrt( pdf_params%varnce_rt_1(1,k) )
< sigma_rt_2 = sqrt( pdf_params%varnce_rt_2(1,k) )
< sigma_thl_1 = sqrt( pdf_params%varnce_thl_1(1,k) )
< sigma_thl_2 = sqrt( pdf_params%varnce_thl_2(1,k) )
---
> sigma_rt_1 = sqrt( pdf_params%varnce_rt_1(k) )
> sigma_rt_2 = sqrt( pdf_params%varnce_rt_2(k) )
> sigma_thl_1 = sqrt( pdf_params%varnce_thl_1(k) )
> sigma_thl_2 = sqrt( pdf_params%varnce_thl_2(k) )
224c224
< mixt_frac = pdf_params%mixt_frac(1,k)
---
> mixt_frac = pdf_params%mixt_frac(k)
232,235c232,235
< crt_1 = pdf_params%crt_1(1,k)
< crt_2 = pdf_params%crt_2(1,k)
< cthl_1 = pdf_params%cthl_1(1,k)
< cthl_2 = pdf_params%cthl_2(1,k)
---
> crt_1 = pdf_params%crt_1(k)
> crt_2 = pdf_params%crt_2(k)
> cthl_1 = pdf_params%cthl_1(k)
> cthl_2 = pdf_params%cthl_2(k)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/est_kessler_microphys_module.F90 clubb_release/src/SILHS/est_kessler_microphys_module.F90
153c153
< mixt_frac = pdf_params%mixt_frac(1,level)
---
> mixt_frac = pdf_params%mixt_frac(level)
160,163c160,163
< chi_1 = pdf_params%chi_1(1,level)
< chi_2 = pdf_params%chi_2(1,level)
< stdev_chi_1 = pdf_params%stdev_chi_1(1,level)
< stdev_chi_2 = pdf_params%stdev_chi_2(1,level)
---
> chi_1 = pdf_params%chi_1(level)
> chi_2 = pdf_params%chi_2(level)
> stdev_chi_1 = pdf_params%stdev_chi_1(level)
> stdev_chi_2 = pdf_params%stdev_chi_2(level)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/latin_hypercube_driver_module.F90 clubb_release/src/SILHS/latin_hypercube_driver_module.F90
117c117
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
237,239c237,239
< cloud_frac_1(i,:) = pdf_params%cloud_frac_1(i,:)
< cloud_frac_2(i,:) = pdf_params%cloud_frac_2(i,:)
< mixt_frac(i,:) = pdf_params%mixt_frac(i,:)
---
> cloud_frac_1(i,:) = pdf_params(i)%cloud_frac_1(:)
> cloud_frac_2(i,:) = pdf_params(i)%cloud_frac_2(:)
> mixt_frac(i,:) = pdf_params(i)%mixt_frac(:)
245,246c245,246
< k_lh_start(i) = compute_k_lh_start( nz, rcm(i,:), pdf_params, &
< silhs_config_flags%l_rcm_in_cloud_k_lh_start, i, &
---
> k_lh_start(i) = compute_k_lh_start( nz, rcm(i,:), pdf_params(i), &
> silhs_config_flags%l_rcm_in_cloud_k_lh_start, &
395c395
< X_u_all_levs(i,:,:,iiPDF_chi), pdf_params, &
---
> X_u_all_levs(i,:,:,iiPDF_chi), pdf_params(i), &
446,448c446,448
< call assert_consistent_cloud_frac( pdf_params%chi_1(i,k), pdf_params%chi_2(i,k), &
< pdf_params%cloud_frac_1(i,k), pdf_params%cloud_frac_2(i,k), &
< pdf_params%stdev_chi_1(i,k), pdf_params%stdev_chi_2(i,k), &
---
> call assert_consistent_cloud_frac( pdf_params(i)%chi_1(k), pdf_params(i)%chi_2(k), &
> pdf_params(i)%cloud_frac_1(k), pdf_params(i)%cloud_frac_2(k), &
> pdf_params(i)%stdev_chi_1(k), pdf_params(i)%stdev_chi_2(k), &
456,457c456,457
< pdf_params%cloud_frac_1(i,k), & ! In
< pdf_params%cloud_frac_2(i,k), & ! In
---
> pdf_params(i)%cloud_frac_1(k), & ! In
> pdf_params(i)%cloud_frac_2(k), & ! In
900c900
< l_rcm_in_cloud_k_lh_start, i, &
---
> l_rcm_in_cloud_k_lh_start, &
941,942d940
<
< integer, intent(in) :: i
960,962c958,960
< rcm_pdf = compute_mean_binormal( pdf_params%rc_1(i,:), pdf_params%rc_2(i,:), pdf_params%mixt_frac(i,:) )
< cloud_frac_pdf = compute_mean_binormal( pdf_params%cloud_frac_1(i,:), pdf_params%cloud_frac_2(i,:), &
< pdf_params%mixt_frac(i,:) )
---
> rcm_pdf = compute_mean_binormal( pdf_params%rc_1, pdf_params%rc_2, pdf_params%mixt_frac )
> cloud_frac_pdf = compute_mean_binormal( pdf_params%cloud_frac_1, pdf_params%cloud_frac_2, &
> pdf_params%mixt_frac )
1061c1059
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
1103,1112c1101,1110
< rt_1(i,:) = pdf_params%rt_1(i,:)
< rt_2(i,:) = pdf_params%rt_2(i,:)
< thl_1(i,:) = pdf_params%thl_1(i,:)
< thl_2(i,:) = pdf_params%thl_2(i,:)
< crt_1(i,:) = pdf_params%crt_1(i,:)
< crt_2(i,:) = pdf_params%crt_2(i,:)
< cthl_1(i,:) = pdf_params%cthl_1(i,:)
< cthl_2(i,:) = pdf_params%cthl_2(i,:)
< mu_chi_1(i,:) = pdf_params%chi_1(i,:)
< mu_chi_2(i,:) = pdf_params%chi_2(i,:)
---
> rt_1(i,:) = pdf_params(i)%rt_1(:)
> rt_2(i,:) = pdf_params(i)%rt_2(:)
> thl_1(i,:) = pdf_params(i)%thl_1(:)
> thl_2(i,:) = pdf_params(i)%thl_2(:)
> crt_1(i,:) = pdf_params(i)%crt_1(:)
> crt_2(i,:) = pdf_params(i)%crt_2(:)
> cthl_1(i,:) = pdf_params(i)%cthl_1(:)
> cthl_2(i,:) = pdf_params(i)%cthl_2(:)
> mu_chi_1(i,:) = pdf_params(i)%chi_1(:)
> mu_chi_2(i,:) = pdf_params(i)%chi_2(:)
2620c2618
< cloud_frac_i = pdf_params%cloud_frac_1(1,k)
---
> cloud_frac_i = pdf_params%cloud_frac_1(k)
2623c2621
< cloud_frac_i = pdf_params%cloud_frac_2(1,k)
---
> cloud_frac_i = pdf_params%cloud_frac_2(k)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/lh_microphys_var_covar_module.F90 clubb_release/src/SILHS/lh_microphys_var_covar_module.F90
127,128c127,128
< mean_rt = pdf_params%mixt_frac(1,:) * pdf_params%rt_1(1,:) &
< + (one - pdf_params%mixt_frac(1,:)) * pdf_params%rt_2(1,:)
---
> mean_rt = pdf_params%mixt_frac * pdf_params%rt_1 &
> + (one - pdf_params%mixt_frac) * pdf_params%rt_2
131,132c131,132
< mean_thl = pdf_params%mixt_frac(1,:) * pdf_params%thl_1(1,:) &
< + (one - pdf_params%mixt_frac(1,:)) * pdf_params%thl_2(1,:)
---
> mean_thl = pdf_params%mixt_frac * pdf_params%thl_1 &
> + (one - pdf_params%mixt_frac) * pdf_params%thl_2
135,136c135,136
< mean_w = pdf_params%mixt_frac(1,:) * pdf_params%w_1(1,:) &
< + (one - pdf_params%mixt_frac(1,:)) * pdf_params%w_2(1,:)
---
> mean_w = pdf_params%mixt_frac * pdf_params%w_1 &
> + (one - pdf_params%mixt_frac) * pdf_params%w_2
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/SILHS/silhs_api_module.F90 clubb_release/src/SILHS/silhs_api_module.F90
235a236,238
>
> type(pdf_parameter), dimension(1) :: &
> pdf_params_col ! PDF parameters, with column dimension 1 [units vary]
269a273
> pdf_params_col(1) = pdf_params
284c288
< pdf_params, delta_zm_col, rcm_col, Lscale_col, & ! In
---
> pdf_params_col, delta_zm_col, rcm_col, Lscale_col, & ! In
349c353
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
605a610,612
> type(pdf_parameter), dimension(1) :: &
> pdf_params_col ! **The** PDF parameters!
>
615a623
> pdf_params_col(1) = pdf_params
624c632
< pdf_params, l_use_Ncn_to_Nc, & ! In
---
> pdf_params_col, l_use_Ncn_to_Nc, & ! In
673c681
< type(pdf_parameter), intent(in) :: &
---
> type(pdf_parameter), dimension(ngrdcol), intent(in) :: &
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/silhs_category_variance_module.F90 clubb_release/src/silhs_category_variance_module.F90
237,238c237,238
< pdf_params%cloud_frac_1(1,k), pdf_params%cloud_frac_2(1,k), &
< pdf_params%mixt_frac(1,k), &
---
> pdf_params%cloud_frac_1(k), pdf_params%cloud_frac_2(k), &
> pdf_params%mixt_frac(k), &
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Declarative: Post Actions)
[Pipeline] cleanWs
[WS-CLEANUP] Deleting project workspace...
[WS-CLEANUP] Deferred wipeout is used...
[WS-CLEANUP] done
[Pipeline] emailext
Sending email to: messnermet@uwm.edu
[Pipeline] }
[Pipeline] // stage
[Pipeline] }
[Pipeline] // withEnv
[Pipeline] }
[Pipeline] // node
[Pipeline] End of Pipeline
ERROR: script returned exit code 1
Finished: FAILURE
![[Jenkins]](/jenkins/static/57c8a776/images/svgs/logo.svg){kind=logo}
