Console Output
+ diff --exclude=.git --exclude=version_clubb_core.txt --exclude=version_silhs.txt -r clubb clubb_release
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/adg1_adg2_3d_luhar_pdf.F90 clubb_release/src/CLUBB_core/adg1_adg2_3d_luhar_pdf.F90
150c150
< !$acc enter data create( w_1_n, w_2_n )
---
> !$acc declare create( w_1_n, w_2_n )
207,208d206
< !$acc exit data delete( w_1_n, w_2_n )
<
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_clubb_core_module.F90 clubb_release/src/CLUBB_core/advance_clubb_core_module.F90
1139c1139
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1146d1145
< !$acc end parallel loop
1149c1148
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1154d1152
< !$acc end parallel loop
1165d1162
< !$acc end parallel loop
1175d1171
< !$acc end parallel loop
1180c1176
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1187d1182
< !$acc end parallel loop
1197d1191
< !$acc end parallel loop
1207d1200
< !$acc end parallel loop
1213c1206
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1217d1209
< !$acc end parallel loop
1219c1211
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1223d1214
< !$acc end parallel loop
1316d1306
< !$acc end parallel loop
1349d1338
< !$acc end parallel loop
1357d1345
< !$acc end parallel loop
1376d1363
< !$acc end parallel loop
1397d1383
< !$acc end parallel loop
1408,1409d1393
< !$acc end parallel loop
<
1424d1407
< !$acc end parallel loop
1434d1416
< !$acc end parallel loop
1447d1428
< !$acc end parallel loop
1473d1453
< !$acc end parallel loop
1481d1460
< !$acc end parallel loop
1492d1470
< !$acc end parallel loop
1528d1505
< !$acc end parallel loop
1539d1515
< !$acc end parallel loop
1555d1530
< !$acc end parallel loop
1629d1603
< !$acc end parallel loop
1640d1613
< !$acc end parallel loop
1733d1705
< !$acc end parallel loop
1777d1748
< !$acc end parallel loop
1787d1757
< !$acc end parallel loop
1797d1766
< !$acc end parallel loop
1806d1774
< !$acc end parallel loop
1814d1781
< !$acc end parallel loop
1879d1845
< !$acc end parallel loop
2197d2162
< !$acc end parallel loop
2207d2171
< !$acc end parallel loop
2250d2213
< !$acc end parallel loop
2357d2319
< !$acc end parallel loop
2371d2332
< !$acc end parallel loop
2404d2364
< !$acc end parallel loop
2575d2534
< !$acc end parallel loop
3776c3735
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
3791c3750
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
3812c3771
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
3903c3862
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
3930c3889
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
3950c3909
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
3984c3943
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
4149c4108,4116
< clubb_config_flags, & ! intent(in)
---
> iiPDF_type, & ! intent(in)
> ipdf_call_placement, & ! intent(in)
> l_predict_upwp_vpwp, & ! intent(in)
> l_min_xp2_from_corr_wx, & ! intent(in)
> l_prescribed_avg_deltaz, & ! intent(in)
> l_damp_wp2_using_em, & ! intent(in)
> l_stability_correct_tau_zm, & ! intent(in)
> l_enable_relaxed_clipping, & ! intent(in)
> l_diag_Lscale_from_tau, & ! intent(in)
4210d4176
< lapack, &
4252,4254c4218,4246
< type(clubb_config_flags_type), intent(in) :: &
< clubb_config_flags
<
---
> integer, intent(in) :: &
> iiPDF_type, & ! Selected option for the two-component normal
> ! (double Gaussian) PDF type to use for the w,
> ! rt, and theta-l (or w, chi, and eta) portion of
> ! CLUBB's multivariate, two-component PDF.
> ipdf_call_placement ! Selected option for the placement of the call to
> ! CLUBB's PDF.
>
> logical, intent(in) :: &
> l_predict_upwp_vpwp, & ! Flag to predict <u'w'> and <v'w'> along with <u> and <v>
> ! alongside the advancement of <rt>, <w'rt'>, <thl>, <wpthlp>,
> ! <sclr>, and <w'sclr'> in subroutine advance_xm_wpxp.
> ! Otherwise, <u'w'> and <v'w'> are still approximated by eddy
> ! diffusivity when <u> and <v> are advanced in subroutine
> ! advance_windm_edsclrm.
> l_min_xp2_from_corr_wx, & ! Flag to base the threshold minimum value of xp2 (rtp2 and
> ! thlp2) on keeping the overall correlation of w and x within
> ! the limits of -max_mag_correlation_flux to
> ! max_mag_correlation_flux.
> l_prescribed_avg_deltaz, & ! used in adj_low_res_nu. If .true., avg_deltaz = deltaz
> l_stability_correct_tau_zm, & ! Use tau_N2_zm instead of tau_zm in wpxp_pr1 stability
> ! correction
> l_damp_wp2_using_em, & ! In wp2 equation, use a dissipation formula of
> ! -(2/3)*em/tau_zm, as in Bougeault (1981)
> l_enable_relaxed_clipping, & ! Flag to relax clipping on wpxp in
> ! xm_wpxp_clipping_and_stats
> l_diag_Lscale_from_tau ! First diagnose dissipation time tau, and
> ! then diagnose the mixing length scale as
> ! Lscale = tau * tke
4272,4283d4263
< #ifdef _OPENACC
< if ( clubb_config_flags%penta_solve_method == lapack ) then
< write(fstderr,*) "WARNING: The penta-diagonal lapack solver is not GPU accelerated"
< write(fstderr,*) " Set penta_solve_method = 2, to use an accelerated penta-diagonal solver"
< end if
<
< if ( clubb_config_flags%tridiag_solve_method == lapack ) then
< write(fstderr,*) "WARNING: The tri-diagonal lapack solver is not GPU accelerated"
< write(fstderr,*) " Set tridiag_solve_method = 2, to use an accelerated tri-diagonal solver"
< end if
< #endif
<
4287c4267
< if ( clubb_config_flags%l_damp_wp2_using_em .and. &
---
> if ( l_damp_wp2_using_em .and. &
4289c4269
< clubb_config_flags%l_stability_correct_tau_zm) ) then
---
> l_stability_correct_tau_zm) ) then
4294c4274
< write(fstderr,*) "l_stability_correct_tau_zm = ", clubb_config_flags%l_stability_correct_tau_zm
---
> write(fstderr,*) "l_stability_correct_tau_zm = ", l_stability_correct_tau_zm
4330,4333c4310,4312
< if ( clubb_config_flags%iiPDF_type < iiPDF_ADG1 &
< .or. clubb_config_flags%iiPDF_type > iiPDF_new_hybrid ) then
< write(fstderr,*) "Unknown type of double Gaussian PDF selected: ", clubb_config_flags%iiPDF_type
< write(fstderr,*) "iiPDF_type = ", clubb_config_flags%iiPDF_type
---
> if ( iiPDF_type < iiPDF_ADG1 .or. iiPDF_type > iiPDF_new_hybrid ) then
> write(fstderr,*) "Unknown type of double Gaussian PDF selected: ", iiPDF_type
> write(fstderr,*) "iiPDF_type = ", iiPDF_type
4341c4320
< if ( clubb_config_flags%iiPDF_type == iiPDF_ADG2 ) then
---
> if ( iiPDF_type == iiPDF_ADG2 ) then
4345c4324
< write(fstderr,*) "iiPDF_type = ", clubb_config_flags%iiPDF_type
---
> write(fstderr,*) "iiPDF_type = ", iiPDF_type
4354c4333
< if ( clubb_config_flags%iiPDF_type == iiPDF_3D_Luhar ) then
---
> if ( iiPDF_type == iiPDF_3D_Luhar ) then
4358c4337
< write(fstderr,*) "iiPDF_type = ", clubb_config_flags%iiPDF_type
---
> write(fstderr,*) "iiPDF_type = ", iiPDF_type
4369c4348
< if ( clubb_config_flags%iiPDF_type == iiPDF_new ) then
---
> if ( iiPDF_type == iiPDF_new ) then
4373c4352
< write(fstderr,*) "iiPDF_type = ", clubb_config_flags%iiPDF_type
---
> write(fstderr,*) "iiPDF_type = ", iiPDF_type
4384c4363
< if ( clubb_config_flags%iiPDF_type == iiPDF_TSDADG ) then
---
> if ( iiPDF_type == iiPDF_TSDADG ) then
4388c4367
< write(fstderr,*) "iiPDF_type = ", clubb_config_flags%iiPDF_type
---
> write(fstderr,*) "iiPDF_type = ", iiPDF_type
4398c4377
< if ( clubb_config_flags%iiPDF_type == iiPDF_LY93 ) then
---
> if ( iiPDF_type == iiPDF_LY93 ) then
4402c4381
< write(fstderr,*) "iiPDF_type = ", clubb_config_flags%iiPDF_type
---
> write(fstderr,*) "iiPDF_type = ", iiPDF_type
4412,4415c4391,4393
< if ( clubb_config_flags%ipdf_call_placement < ipdf_pre_advance_fields &
< .or. clubb_config_flags%ipdf_call_placement > ipdf_pre_post_advance_fields ) then
< write(fstderr,*) "Invalid option selected for ipdf_call_placement: ", &
< clubb_config_flags%ipdf_call_placement
---
> if ( ipdf_call_placement < ipdf_pre_advance_fields &
> .or. ipdf_call_placement > ipdf_pre_post_advance_fields ) then
> write(fstderr,*) "Invalid option selected for ipdf_call_placement: ", ipdf_call_placement
4424c4402
< if ( clubb_config_flags%l_predict_upwp_vpwp ) then
---
> if ( l_predict_upwp_vpwp ) then
4445,4446c4423,4424
< if ( ( clubb_config_flags%iiPDF_type /= iiPDF_ADG1 ) &
< .and. ( clubb_config_flags%iiPDF_type /= iiPDF_new_hybrid ) ) then
---
> if ( ( iiPDF_type /= iiPDF_ADG1 ) &
> .and. ( iiPDF_type /= iiPDF_new_hybrid ) ) then
4460,4461c4438,4439
< if ( ( clubb_config_flags%l_min_xp2_from_corr_wx ) &
< .and. ( clubb_config_flags%l_enable_relaxed_clipping ) ) then
---
> if ( ( l_min_xp2_from_corr_wx ) &
> .and. ( l_enable_relaxed_clipping ) ) then
4469,4470c4447,4448
< elseif ( ( .not. clubb_config_flags%l_min_xp2_from_corr_wx ) &
< .and. ( .not. clubb_config_flags%l_enable_relaxed_clipping ) ) then
---
> elseif ( ( .not. l_min_xp2_from_corr_wx ) &
> .and. ( .not. l_enable_relaxed_clipping ) ) then
4580c4558
< if ( clubb_config_flags%l_diag_Lscale_from_tau ) then
---
> if ( l_diag_Lscale_from_tau ) then
4889c4867
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
4906c4884
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5080c5058
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5143c5121
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5235,5236c5213
< !$acc enter data create( chi_mean, vert_cloud_frac_upper, &
< !$acc vert_cloud_frac_lower, vert_cloud_frac )
---
> !$acc declare create( chi_mean, vert_cloud_frac_upper, vert_cloud_frac_lower, vert_cloud_frac )
5333c5310
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5360,5362d5336
< !$acc exit data delete( chi_mean, vert_cloud_frac_upper, &
< !$acc vert_cloud_frac_lower, vert_cloud_frac )
<
5500c5474
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5506c5480
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_helper_module.F90 clubb_release/src/CLUBB_core/advance_helper_module.F90
296,298c296,298
< !$acc enter data create( brunt_vaisala_freq_sqd, brunt_vaisala_freq_sqd_mixed, &
< !$acc brunt_vaisala_freq_sqd_moist, brunt_vaisala_freq_sqd_dry, &
< !$acc brunt_vaisala_freq_sqd_plus, lambda0_stability, Lscale_zm )
---
> !$acc declare create( brunt_vaisala_freq_sqd, brunt_vaisala_freq_sqd_mixed, &
> !$acc brunt_vaisala_freq_sqd_moist, brunt_vaisala_freq_sqd_dry, &
> !$acc brunt_vaisala_freq_sqd_plus, lambda0_stability, Lscale_zm )
335,338d334
< !$acc exit data delete( brunt_vaisala_freq_sqd, brunt_vaisala_freq_sqd_mixed, &
< !$acc brunt_vaisala_freq_sqd_moist, brunt_vaisala_freq_sqd_dry, &
< !$acc brunt_vaisala_freq_sqd_plus, lambda0_stability, Lscale_zm )
<
731,736c727,731
< !$acc enter data create( brunt_vaisala_freq_sqd, brunt_vaisala_freq_sqd_mixed, &
< !$acc brunt_vaisala_freq_sqd_dry, brunt_vaisala_freq_sqd_moist, &
< !$acc brunt_vaisala_freq_sqd_plus, Richardson_num, Cx_fnc_interp, &
< !$acc Ri_zm, ddzt_um, ddzt_vm, shear_sqd, turb_freq_sqd, Lscale_zm, &
< !$acc Richardson_num_clipped, Cx_fnc_Richardson_avg, fnc_Richardson, &
< !$acc fnc_Richardson_clipped, fnc_Richardson_smooth )
---
> !$acc declare create( brunt_vaisala_freq_sqd, brunt_vaisala_freq_sqd_mixed, brunt_vaisala_freq_sqd_dry, &
> !$acc brunt_vaisala_freq_sqd_moist, brunt_vaisala_freq_sqd_plus, Richardson_num, &
> !$acc Ri_zm, ddzt_um, ddzt_vm, shear_sqd, turb_freq_sqd, Lscale_zm, Cx_fnc_interp, &
> !$acc Richardson_num_clipped, Cx_fnc_Richardson_avg, fnc_Richardson, &
> !$acc fnc_Richardson_clipped, fnc_Richardson_smooth )
918,924d912
< !$acc exit data delete( brunt_vaisala_freq_sqd, brunt_vaisala_freq_sqd_mixed, &
< !$acc brunt_vaisala_freq_sqd_dry, brunt_vaisala_freq_sqd_moist, &
< !$acc brunt_vaisala_freq_sqd_plus, Richardson_num, Cx_fnc_interp, &
< !$acc Ri_zm, ddzt_um, ddzt_vm, shear_sqd, turb_freq_sqd, Lscale_zm, &
< !$acc Richardson_num_clipped, Cx_fnc_Richardson_avg, fnc_Richardson, &
< !$acc fnc_Richardson_clipped, fnc_Richardson_smooth )
<
994c982
< !$acc enter data create( one_half_avg_width, numer_terms, denom_terms )
---
> !$acc declare create( one_half_avg_width, numer_terms, denom_terms )
1094,1095d1081
< !$acc exit data delete( one_half_avg_width, numer_terms, denom_terms )
<
1150c1136
< !$acc enter data create( brunt_vaisala_freq_splat_clipped, brunt_vaisala_freq_splat_smooth )
---
> !$acc declare create( brunt_vaisala_freq_splat_clipped, brunt_vaisala_freq_splat_smooth )
1172,1173d1157
< !$acc exit data delete( brunt_vaisala_freq_splat_clipped, brunt_vaisala_freq_splat_smooth )
<
1230c1214
< !$acc enter data create( brunt_vaisala_freq_splat_clipped, brunt_vaisala_freq_splat_smooth )
---
> !$acc declare create( brunt_vaisala_freq_splat_clipped, brunt_vaisala_freq_splat_smooth )
1252,1253d1235
<
< !$acc exit data delete( brunt_vaisala_freq_splat_clipped, brunt_vaisala_freq_splat_smooth )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_windm_edsclrm_module.F90 clubb_release/src/CLUBB_core/advance_windm_edsclrm_module.F90
2136c2136
< !$acc enter data create( xm_gf, xm_cf )
---
> !$acc declare create( xm_gf, xm_cf )
2243,2244d2242
<
< !$acc exit data delete( xm_gf, xm_cf )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_wp2_wp3_module.F90 clubb_release/src/CLUBB_core/advance_wp2_wp3_module.F90
416,426c416,426
< !$acc enter data create( wp2_old, wp3_old, C1_Skw_fnc, C11_Skw_fnc, C16_fnc, &
< !$acc wp3_term_ta_lhs_result, wp3_pr3_lhs, lhs_ta_wp2, &
< !$acc lhs_tp_wp3, lhs_adv_tp_wp3, lhs_pr_tp_wp3, &
< !$acc lhs_ta_wp3, lhs_dp1_wp2, rhs_dp1_wp2, lhs_pr1_wp2, &
< !$acc rhs_pr1_wp2, lhs_pr1_wp3, rhs_pr1_wp3, rhs_bp_pr2_wp2, &
< !$acc rhs_pr_dfsn_wp2, rhs_bp1_pr2_wp3, rhs_pr3_wp2, &
< !$acc rhs_pr3_wp3, rhs_ta_wp3, rhs_pr_turb_wp3, rhs_pr_dfsn_wp3, &
< !$acc lhs_diff_zm, lhs_diff_zt, lhs_diff_zm_crank, lhs_diff_zt_crank, &
< !$acc lhs_ma_zm, lhs_ma_zt, lhs_ac_pr2_wp2, lhs_ac_pr2_wp3, &
< !$acc coef_wp4_implicit_zt, coef_wp4_implicit, a1, a1_zt, &
< !$acc dum_dz, dvm_dz, lhs, rhs, Kw1, Kw8, Kw1_zm, Kw8_zt )
---
> !$acc declare create( wp2_old, wp3_old, C1_Skw_fnc, C11_Skw_fnc, C16_fnc, &
> !$acc wp3_term_ta_lhs_result, wp3_pr3_lhs, lhs_ta_wp2, &
> !$acc lhs_tp_wp3, lhs_adv_tp_wp3, lhs_pr_tp_wp3, &
> !$acc lhs_ta_wp3, lhs_dp1_wp2, rhs_dp1_wp2, lhs_pr1_wp2, &
> !$acc rhs_pr1_wp2, lhs_pr1_wp3, rhs_pr1_wp3, rhs_bp_pr2_wp2, &
> !$acc rhs_pr_dfsn_wp2, rhs_bp1_pr2_wp3, rhs_pr3_wp2, &
> !$acc rhs_pr3_wp3, rhs_ta_wp3, rhs_pr_turb_wp3, rhs_pr_dfsn_wp3, &
> !$acc lhs_diff_zm, lhs_diff_zt, lhs_diff_zm_crank, lhs_diff_zt_crank, &
> !$acc lhs_ma_zm, lhs_ma_zt, lhs_ac_pr2_wp2, lhs_ac_pr2_wp3, &
> !$acc coef_wp4_implicit_zt, coef_wp4_implicit, a1, a1_zt, &
> !$acc dum_dz, dvm_dz, lhs, rhs, Kw1, Kw8, Kw1_zm, Kw8_zt )
1163,1174d1162
< !$acc exit data delete( wp2_old, wp3_old, C1_Skw_fnc, C11_Skw_fnc, C16_fnc, &
< !$acc wp3_term_ta_lhs_result, wp3_pr3_lhs, lhs_ta_wp2, &
< !$acc lhs_tp_wp3, lhs_adv_tp_wp3, lhs_pr_tp_wp3, &
< !$acc lhs_ta_wp3, lhs_dp1_wp2, rhs_dp1_wp2, lhs_pr1_wp2, &
< !$acc rhs_pr1_wp2, lhs_pr1_wp3, rhs_pr1_wp3, rhs_bp_pr2_wp2, &
< !$acc rhs_pr_dfsn_wp2, rhs_bp1_pr2_wp3, rhs_pr3_wp2, &
< !$acc rhs_pr3_wp3, rhs_ta_wp3, rhs_pr_turb_wp3, rhs_pr_dfsn_wp3, &
< !$acc lhs_diff_zm, lhs_diff_zt, lhs_diff_zm_crank, lhs_diff_zt_crank, &
< !$acc lhs_ma_zm, lhs_ma_zt, lhs_ac_pr2_wp2, lhs_ac_pr2_wp3, &
< !$acc coef_wp4_implicit_zt, coef_wp4_implicit, a1, a1_zt, &
< !$acc dum_dz, dvm_dz, lhs, rhs, Kw1, Kw8, Kw1_zm, Kw8_zt )
<
1407c1395
< !$acc enter data create( rhs_save, solut, old_solut, rcond, threshold_array )
---
> !$acc declare create( rhs_save, solut, old_solut, rcond, threshold_array )
1829,1830d1816
<
< !$acc exit data delete( rhs_save, solut, old_solut, rcond, threshold_array )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/advance_xm_wpxp_module.F90 clubb_release/src/CLUBB_core/advance_xm_wpxp_module.F90
1114,1120c1114,1120
< !$acc low_lev_effect, high_lev_effect, rtm_old, wprtp_old, thlm_old, &
< !$acc wpthlp_old, um_old, upwp_old, vm_old, &
< !$acc vpwp_old, lhs_diff_zm, lhs_diff_zt, lhs_ma_zt, lhs_ma_zm, &
< !$acc lhs_ta_wprtp, lhs_ta_wpthlp, lhs_ta_wpup, lhs_ta_wpvp, &
< !$acc rhs_ta_wprtp, rhs_ta_wpthlp, rhs_ta_wpup, &
< !$acc rhs_ta_wpvp, lhs_tp, lhs_ta_xm, lhs_ac_pr2, &
< !$acc lhs_pr1_wprtp, lhs_pr1_wpthlp )
---
> !$acc low_lev_effect, high_lev_effect, rtm_old, wprtp_old, thlm_old, &
> !$acc wpthlp_old, um_old, upwp_old, vm_old, &
> !$acc vpwp_old, lhs_diff_zm, lhs_diff_zt, lhs_ma_zt, lhs_ma_zm, &
> !$acc lhs_ta_wprtp, lhs_ta_wpthlp, lhs_ta_wpup, lhs_ta_wpvp, &
> !$acc rhs_ta_wprtp, rhs_ta_wpthlp, rhs_ta_wpup, &
> !$acc rhs_ta_wpvp, lhs_tp, lhs_ta_xm, lhs_ac_pr2, &
> !$acc lhs_pr1_wprtp, lhs_pr1_wpthlp )
1123,1124c1123,1124
< !$acc delete( sclrm_old, wpsclrp_old, lhs_ta_wpsclrp, &
< !$acc rhs_ta_wpsclrp, lhs_pr1_wpsclrp )
---
> !$acc delete( sclrm_old, wpsclrp_old, lhs_ta_wpsclrp, &
> !$acc rhs_ta_wpsclrp, lhs_pr1_wpsclrp )
1294a1295,1297
>
> real( kind = core_rknd ), dimension(ngrdcol,nz) :: &
> zero_vector ! Vector of 0s
1298a1302,1303
>
> !$acc declare create( zero_vector )
1304c1309
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1315c1320
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1366c1371
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1560c1565
< !$acc enter data create( Kh_N2_zm, K_zm, K_zt, Kw6_zm, zeros_array )
---
> !$acc declare create( Kh_N2_zm, K_zm, K_zt, Kw6_zm, zeros_array )
1644c1649
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1664,1665d1668
< !$acc exit data delete( Kh_N2_zm, K_zm, K_zt, Kw6_zm, zeros_array )
<
1828c1831
< !$acc enter data create( rhs_bp_pr3 )
---
> !$acc declare create( rhs_bp_pr3 )
1837c1840
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1873c1876
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
2027,2028d2029
< !$acc exit data delete( rhs_bp_pr3 )
<
4567c4568
< !$acc enter data create( xm_old, wpxp_pd, xm_pd, wpxp_chnge, xp2_relaxed )
---
> !$acc declare create( xm_old, wpxp_pd, xm_pd, wpxp_chnge, xp2_relaxed )
4680c4681
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
4913c4914
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5046,5048c5047
< end if
<
< !$acc exit data delete( xm_old, wpxp_pd, xm_pd, wpxp_chnge, xp2_relaxed )
---
> end if
5139c5138
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5245c5244
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5268c5267
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5364c5363
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5382c5381
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5475c5474
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5506c5505
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5582c5581
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5596c5595
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
5779c5778
< !$acc enter data create( xm_tndcy_wpxp_cl, l_clipping_needed, l_any_clipping_needed )
---
> !$acc declare create( xm_tndcy_wpxp_cl, l_clipping_needed, l_any_clipping_needed )
5835,5836d5833
< !$acc exit data delete( xm_tndcy_wpxp_cl, l_clipping_needed, l_any_clipping_needed )
<
5959c5956
< !$acc enter data create( ddzt_xm, ddzt_ym )
---
> !$acc declare create( ddzt_xm, ddzt_ym )
5970,5974c5967,5969
< end do
< end do
< !$acc end parallel loop
<
< !$acc exit data delete( ddzt_xm, ddzt_ym )
---
> end do
> end do
> !$acc end parallel loop
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
3056c3056
< !$acc enter data create( rhs_pr2 )
---
> !$acc declare create( rhs_pr2 )
3231,3232d3230
<
< !$acc exit data delete( rhs_pr2 )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/clip_explicit.F90 clubb_release/src/CLUBB_core/clip_explicit.F90
622c622
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1183c1183
< !$acc enter data create( wp2_zt_cubed, wp3_lim_sqd, zagl_thresh, H_zagl )
---
> !$acc declare create( wp2_zt_cubed, wp3_lim_sqd, zagl_thresh, H_zagl )
1279,1280d1278
<
< !$acc exit data delete( wp2_zt_cubed, wp3_lim_sqd, zagl_thresh, H_zagl )
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
255,257d254
< use advance_clubb_core_module, only: &
< setup_clubb_core_api => setup_clubb_core
<
1701a1699,1835
>
> !================================================================================================
> ! setup_clubb_core - Sets up the model for execution.
> !================================================================================================
>
> subroutine setup_clubb_core_api( &
> nzmax, T0_in, ts_nudge_in, & ! intent(in)
> hydromet_dim_in, sclr_dim_in, & ! intent(in)
> sclr_tol_in, edsclr_dim_in, params, & ! intent(in)
> l_host_applies_sfc_fluxes, & ! intent(in)
> saturation_formula, & ! intent(in)
> l_input_fields, & ! intent(in)
> #ifdef GFDL
> I_sat_sphum, & ! intent(in) h1g, 2010-06-16
> #endif
> iiPDF_type, & ! intent(in)
> ipdf_call_placement, & ! intent(in)
> l_predict_upwp_vpwp, & ! intent(in)
> l_min_xp2_from_corr_wx, & ! intent(in)
> l_prescribed_avg_deltaz, & ! intent(in)
> l_damp_wp2_using_em, & ! intent(in)
> l_stability_correct_tau_zm, & ! intent(in)
> l_enable_relaxed_clipping, & ! intent(in)
> l_diag_Lscale_from_tau, & ! intent(in)
> #ifdef GFDL
> cloud_frac_min , & ! intent(in) h1g, 2010-06-16
> #endif
> err_code_api ) ! intent(out)
>
> use advance_clubb_core_module, only : setup_clubb_core
>
> use parameter_indices, only: &
> nparams ! Variable(s)
>
> use model_flags, only: &
> clubb_config_flags_type ! Type
>
> ! TODO: This should be called from the api, but all the host models appear to call
> ! it directly or not at all.
> ! use model_flags, only: &
> ! setup_model_flags ! Subroutine
>
> implicit none
>
> ! Input Variables
>
> integer, intent(in) :: nzmax ! Vertical grid levels [#]
>
> ! Model parameters
> real( kind = core_rknd ), intent(in) :: &
> T0_in, ts_nudge_in
>
> integer, intent(in) :: &
> hydromet_dim_in, & ! Number of hydrometeor species
> sclr_dim_in, & ! Number of passive scalars
> edsclr_dim_in ! Number of eddy-diff. passive scalars
>
> real( kind = core_rknd ), intent(in), dimension(sclr_dim_in) :: &
> sclr_tol_in ! Thresholds for passive scalars
>
> real( kind = core_rknd ), intent(in), dimension(nparams) :: &
> params ! Including C1, nu1, nu2, etc.
>
> ! Flags
> logical, intent(in) :: &
> l_host_applies_sfc_fluxes ! Whether to apply for the surface flux
>
> character(len=*), intent(in) :: &
> saturation_formula ! Approximation for saturation vapor pressure
>
> logical, intent(in) :: &
> l_input_fields ! Flag for whether LES input fields are used
>
> integer, intent(in) :: &
> iiPDF_type, & ! Selected option for the two-component normal
> ! (double Gaussian) PDF type to use for the w,
> ! rt, and theta-l (or w, chi, and eta) portion of
> ! CLUBB's multivariate, two-component PDF.
> ipdf_call_placement ! Selected option for the placement of the call to
> ! CLUBB's PDF.
>
> logical, intent(in) :: &
> l_predict_upwp_vpwp, & ! Flag to predict <u'w'> and <v'w'> along with <u> and <v>
> ! alongside the advancement of <rt>, <w'rt'>, <thl>, <wpthlp>,
> ! <sclr>, and <w'sclr'> in subroutine advance_xm_wpxp.
> ! Otherwise, <u'w'> and <v'w'> are still approximated by eddy
> ! diffusivity when <u> and <v> are advanced in subroutine
> ! advance_windm_edsclrm.
> l_min_xp2_from_corr_wx, & ! Flag to base the threshold minimum value of xp2 (rtp2 and
> ! thlp2) on keeping the overall correlation of w and x within
> ! the limits of -max_mag_correlation_flux to
> ! max_mag_correlation_flux.
> l_prescribed_avg_deltaz, & ! used in adj_low_res_nu. If .true., avg_deltaz = deltaz
> l_damp_wp2_using_em, &
> l_stability_correct_tau_zm, &
> l_enable_relaxed_clipping, & ! Flag to relax clipping on wpxp in
> ! xm_wpxp_clipping_and_stats
> l_diag_Lscale_from_tau ! First diagnose dissipation time tau, and
> ! then diagnose the mixing length scale as
> ! Lscale = tau * tke
>
> #ifdef GFDL
> logical, intent(in) :: & ! h1g, 2010-06-16 begin mod
> I_sat_sphum
>
> real( kind = core_rknd ), intent(in) :: &
> cloud_frac_min ! h1g, 2010-06-16 end mod
> #endif
>
> integer, intent(out) :: &
> err_code_api ! Diagnostic for a problem with the setup
>
> call setup_clubb_core( &
> nzmax, T0_in, ts_nudge_in, & ! intent(in)
> hydromet_dim_in, sclr_dim_in, & ! intent(in)
> sclr_tol_in, edsclr_dim_in, params, & ! intent(in)
> l_host_applies_sfc_fluxes, & ! intent(in)
> saturation_formula, & ! intent(in)
> l_input_fields, & ! intent(in)
> #ifdef GFDL
> I_sat_sphum, & ! intent(in) h1g, 2010-06-16
> #endif
> iiPDF_type, & ! intent(in)
> ipdf_call_placement, & ! intent(in)
> l_predict_upwp_vpwp, & ! intent(in)
> l_min_xp2_from_corr_wx, & ! intent(in)
> l_prescribed_avg_deltaz, & ! intent(in)
> l_damp_wp2_using_em, & ! intent(in)
> l_stability_correct_tau_zm, & ! intent(in)
> l_enable_relaxed_clipping, & ! intent(in)
> l_diag_Lscale_from_tau, & ! intent(in)
> #ifdef GFDL
> cloud_frac_min, & ! intent(in) h1g, 2010-06-16
> #endif
> err_code_api ) ! intent(out)
>
> end subroutine setup_clubb_core_api
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/diffusion.F90 clubb_release/src/CLUBB_core/diffusion.F90
343c343
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
372c372
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
390c390
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
407c407
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
480c480
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
499c499
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
993c993
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1018c1018
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1034c1034
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1051c1051
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1125c1125
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1144c1144
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/fill_holes.F90 clubb_release/src/CLUBB_core/fill_holes.F90
146c146
< !$acc parallel loop gang vector collapse(2) default(present)
---
> !$acc parallel loop collapse(2) default(present)
249c249
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
256c256
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
267c267
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
288c288
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
297c297
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/grid_class.F90 clubb_release/src/CLUBB_core/grid_class.F90
1508c1508
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1967c1967
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
2320c2320
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
2414c2414
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/interpolation.F90 clubb_release/src/CLUBB_core/interpolation.F90
544c544
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/matrix_solver_wrapper.F90 clubb_release/src/CLUBB_core/matrix_solver_wrapper.F90
110c110,116
< if ( present(rcond) ) then
---
> #ifdef _OPENACC
> if ( penta_solve_method /= penta_lu ) then
> write(fstderr,*) "Running on GPUs requires penta_solve_method = penta_lu = 2"
> err_code = clubb_no_error
> return
> end if
> #endif
112c118
< !$acc update host( lhs, rhs )
---
> if ( present(rcond) ) then
125,126d130
< !$acc update device( rcond )
<
132,133d135
< !$acc update host( lhs, rhs )
<
140,141d141
< !$acc update device( soln )
<
228c228,234
< if ( present(rcond) ) then
---
> #ifdef _OPENACC
> if ( penta_solve_method /= penta_lu ) then
> write(fstderr,*) "Running on GPUs requires penta_solve_method = penta_lu = 2"
> err_code = clubb_no_error
> return
> end if
> #endif
230c236
< !$acc update host( lhs, rhs )
---
> if ( present(rcond) ) then
243,244d248
< !$acc update device( rcond )
<
250,251d253
< !$acc update host( lhs, rhs )
<
258,259d259
< !$acc update device( soln )
<
341a342,349
> #ifdef _OPENACC
> if ( tridiag_solve_method /= tridiag_lu ) then
> write(fstderr,*) "Running on GPUs requires tridiag_solve_method = tridiag_lu = 2"
> err_code = clubb_no_error
> return
> end if
> #endif
>
351a360
>
442c451,457
< if ( present(rcond) ) then
---
> #ifdef _OPENACC
> if ( tridiag_solve_method /= tridiag_lu ) then
> write(fstderr,*) "Running on GPUs requires tridiag_solve_method = tridiag_lu = 2"
> err_code = clubb_no_error
> return
> end if
> #endif
444c459
< !$acc update host( lhs, rhs )
---
> if ( present(rcond) ) then
454,455d468
<
< !$acc update device( rcond )
462,463d474
< !$acc update host( lhs, rhs )
<
469,470d479
< !$acc update device( soln )
<
548a558,565
>
> #ifdef _OPENACC
> if ( tridiag_solve_method /= tridiag_lu ) then
> write(fstderr,*) "Running on GPUs requires tridiag_solve_method = tridiag_lu = 2"
> err_code = clubb_no_error
> return
> end if
> #endif
552,553d568
< !$acc update host( lhs, rhs )
<
562,563d576
<
< !$acc update device( rcond )
570,571d582
< !$acc update host( lhs, rhs )
<
576,577d586
<
< !$acc update device( soln )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/mean_adv.F90 clubb_release/src/CLUBB_core/mean_adv.F90
269c269
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
320c320
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
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
235,238c235,238
< !$acc enter data create( exp_mu_dzm, invrs_dzm_on_mu, grav_on_thvm, Lv_coef, &
< !$acc entrain_coef, thl_par_j_precalc, rt_par_j_precalc, &
< !$acc tl_par_1, rt_par_1, rsatl_par_1, thl_par_1, dCAPE_dz_1, &
< !$acc s_par_1, rc_par_1, CAPE_incr_1, thv_par_1, tke_i )
---
> !$acc declare create( exp_mu_dzm, invrs_dzm_on_mu, grav_on_thvm, Lv_coef, &
> !$acc entrain_coef, thl_par_j_precalc, rt_par_j_precalc, &
> !$acc tl_par_1, rt_par_1, rsatl_par_1, thl_par_1, dCAPE_dz_1, &
> !$acc s_par_1, rc_par_1, CAPE_incr_1, thv_par_1, tke_i )
240c240
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
858,862d857
< !$acc exit data delete( exp_mu_dzm, invrs_dzm_on_mu, grav_on_thvm, Lv_coef, &
< !$acc entrain_coef, thl_par_j_precalc, rt_par_j_precalc, &
< !$acc tl_par_1, rt_par_1, rsatl_par_1, thl_par_1, dCAPE_dz_1, &
< !$acc s_par_1, rc_par_1, CAPE_incr_1, thv_par_1, tke_i )
<
1003,1007c998,1001
< !$acc enter data create( sign_rtpthlp, Lscale_pert_1, Lscale_pert_2, &
< !$acc thlm_pert_1, thlm_pert_2, rtm_pert_1, rtm_pert_2, &
< !$acc thlm_pert_pos_rt, thlm_pert_neg_rt, rtm_pert_pos_rt, &
< !$acc rtm_pert_neg_rt, &
< !$acc mu_pert_1, mu_pert_2, mu_pert_pos_rt, mu_pert_neg_rt )
---
> !$acc declare create( sign_rtpthlp, Lscale_pert_1, Lscale_pert_2, &
> !$acc thlm_pert_1, thlm_pert_2, rtm_pert_1, rtm_pert_2, &
> !$acc thlm_pert_pos_rt, thlm_pert_neg_rt, rtm_pert_pos_rt, rtm_pert_neg_rt, &
> !$acc mu_pert_1, mu_pert_2, mu_pert_pos_rt, mu_pert_neg_rt )
1053c1047
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1082c1076
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1147c1141
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1228,1233d1221
< !$acc exit data delete( sign_rtpthlp, Lscale_pert_1, Lscale_pert_2, &
< !$acc thlm_pert_1, thlm_pert_2, rtm_pert_1, rtm_pert_2, &
< !$acc thlm_pert_pos_rt, thlm_pert_neg_rt, rtm_pert_pos_rt, &
< !$acc rtm_pert_neg_rt, &
< !$acc mu_pert_1, mu_pert_2, mu_pert_pos_rt, mu_pert_neg_rt )
<
1471c1459
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1515c1503
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1523c1511
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/mono_flux_limiter.F90 clubb_release/src/CLUBB_core/mono_flux_limiter.F90
467,470c467,470
< !$acc enter data create( xp2_zt, xm_enter_mfl, xm_without_ta, wpxp_net_adjust, &
< !$acc min_x_allowable_lev, max_x_allowable_lev, min_x_allowable, &
< !$acc max_x_allowable, wpxp_mfl_max, wpxp_mfl_min, lhs_mfl_xm, &
< !$acc rhs_mfl_xm, l_adjustment_needed, xm_mfl )
---
> !$acc declare create( xp2_zt, xm_enter_mfl, xm_without_ta, wpxp_net_adjust, &
> !$acc min_x_allowable_lev, max_x_allowable_lev, min_x_allowable, &
> !$acc max_x_allowable, wpxp_mfl_max, wpxp_mfl_min, lhs_mfl_xm, &
> !$acc rhs_mfl_xm, l_adjustment_needed, xm_mfl )
619c619
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
791c791
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
930c930
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
944c944
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1027,1031d1026
< !$acc exit data delete( xp2_zt, xm_enter_mfl, xm_without_ta, wpxp_net_adjust, &
< !$acc min_x_allowable_lev, max_x_allowable_lev, min_x_allowable, &
< !$acc max_x_allowable, wpxp_mfl_max, wpxp_mfl_min, lhs_mfl_xm, &
< !$acc rhs_mfl_xm, l_adjustment_needed, xm_mfl )
<
1243c1238
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1341c1336
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1443c1438
< !$acc enter data create( vert_vel_up, vert_vel_down, w_min )
---
> !$acc declare create( vert_vel_up, vert_vel_down, w_min )
1689c1684
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1702,1703d1696
< !$acc exit data delete( vert_vel_up, vert_vel_down, w_min )
<
1959c1952
< !$acc enter data create( mean_w_down_1st, mean_w_down_2nd, mean_w_up_1st, mean_w_up_2nd )
---
> !$acc declare create( mean_w_down_1st, mean_w_down_2nd, mean_w_up_1st, mean_w_up_2nd )
2002,2003d1994
< !$acc exit data delete( mean_w_down_1st, mean_w_down_2nd, mean_w_up_1st, mean_w_up_2nd )
<
2083c2074
< !$acc enter data create( erf_cache, exp_cache )
---
> !$acc declare create( erf_cache, exp_cache )
2136c2127
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
2145,2146d2135
<
< !$acc exit data delete( erf_cache, exp_cache )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/sfc_varnce_module.F90 clubb_release/src/CLUBB_core/sfc_varnce_module.F90
207,209c207,209
< !$acc enter data create( uf, depth_pos_wpthlp, min_wp2_sfc_val, &
< !$acc um_sfc_sqd, vm_sfc_sqd, usp2_sfc, vsp2_sfc, &
< !$acc ustar, zeta, wp2_splat_sfc_correction )
---
> !$acc declare create( uf, depth_pos_wpthlp, min_wp2_sfc_val, &
> !$acc um_sfc_sqd, vm_sfc_sqd, usp2_sfc, vsp2_sfc, &
> !$acc ustar, zeta, wp2_splat_sfc_correction )
245c245
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
273c273
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
281c281
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
287c287
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
320c320
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
356c356
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
368c368
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
402c402
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
411c411
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
427c427
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
439c439
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
451c451
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
519c519
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
546c546
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
560c560
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
569c569
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
578c578
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
590c590
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
599c599
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
677c677
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
683c683
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
792,795d791
<
< !$acc exit data delete( uf, depth_pos_wpthlp, min_wp2_sfc_val, &
< !$acc um_sfc_sqd, vm_sfc_sqd, usp2_sfc, vsp2_sfc, &
< !$acc ustar, zeta, wp2_splat_sfc_correction )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/sigma_sqd_w_module.F90 clubb_release/src/CLUBB_core/sigma_sqd_w_module.F90
97c97
< !$acc enter data create( max_corr_w_x_sqd )
---
> !$acc declare create( max_corr_w_x_sqd )
141,142d140
<
< !$acc exit data delete( max_corr_w_x_sqd )
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/CLUBB_core/turbulent_adv_pdf.F90 clubb_release/src/CLUBB_core/turbulent_adv_pdf.F90
895c895
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
950c950
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1021c1021
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
1045c1045
< !$acc parallel loop gang vector default(present)
---
> !$acc parallel loop default(present)
diff '--exclude=.git' '--exclude=version_clubb_core.txt' '--exclude=version_silhs.txt' -r clubb/src/clubb_driver.F90 clubb_release/src/clubb_driver.F90
1516c1516,1524
< clubb_config_flags, & ! intent(in)
---
> iiPDF_type, & ! intent(in)
> ipdf_call_placement, & ! intent(in)
> l_predict_upwp_vpwp, & ! intent(in)
> l_min_xp2_from_corr_wx, & ! intent(in)
> l_prescribed_avg_deltaz, & ! intent(in)
> l_damp_wp2_using_em, & ! intent(in)
> l_stability_correct_tau_zm, & ! intent(in)
> l_enable_relaxed_clipping, & ! intent(in)
> l_diag_Lscale_from_tau, & ! intent(in)