Changeset 1374 for palm/trunk
- Timestamp:
- Apr 25, 2014 12:55:07 PM (11 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 18 edited
-
Makefile (modified) (2 diffs)
-
advec_s_bc.f90 (modified) (2 diffs)
-
advec_s_pw.f90 (modified) (3 diffs)
-
advec_s_up.f90 (modified) (3 diffs)
-
advec_ws.f90 (modified) (6 diffs)
-
buoyancy.f90 (modified) (4 diffs)
-
cuda_fft_interfaces.f90 (modified) (2 diffs)
-
diffusion_e.f90 (modified) (6 diffs)
-
diffusion_s.f90 (modified) (4 diffs)
-
diffusion_w.f90 (modified) (2 diffs)
-
diffusivities.f90 (modified) (2 diffs)
-
fft_xy.f90 (modified) (4 diffs)
-
flow_statistics.f90 (modified) (4 diffs)
-
palm.f90 (modified) (3 diffs)
-
production_e.f90 (modified) (2 diffs)
-
prognostic_equations.f90 (modified) (4 diffs)
-
swap_timelevel.f90 (modified) (2 diffs)
-
wall_fluxes.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/Makefile
r1366 r1374 20 20 # Current revisions: 21 21 # ------------------ 22 # 22 # bugfix: missing dependency added for check_open 23 23 # 24 24 # Former revisions: … … 267 267 calc_spectra.o: modules.o cpulog.o fft_xy.o mod_kinds.o 268 268 check_for_restart.o: modules.o mod_kinds.o 269 check_open.o: modules.o mod_kinds.o 269 check_open.o: modules.o mod_kinds.o mod_particle_attributes.o 270 270 check_parameters.o: modules.o mod_kinds.o subsidence.o 271 271 close_file.o: modules.o mod_kinds.o -
palm/trunk/SOURCE/advec_s_bc.f90
r1362 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! missing variables added to ONLY list 23 23 ! 24 24 ! Former revisions: … … 91 91 92 92 USE indices, & 93 ONLY: nx, nxl, nx r, nyn, nys, nzb, nzt93 ONLY: nx, nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt 94 94 95 95 USE kinds -
palm/trunk/SOURCE/advec_s_pw.f90
r1354 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! missing variables added to ONLY list 23 23 ! 24 24 ! Former revisions: … … 83 83 84 84 USE indices, & 85 ONLY: nxl, nxr, nyn, nys, nzb_s_inner, nzt 85 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,& 86 nzt 86 87 87 88 USE kinds … … 136 137 137 138 USE indices, & 138 ONLY: n zb_s_inner, nzt139 ONLY: nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt 139 140 140 141 USE kinds -
palm/trunk/SOURCE/advec_s_up.f90
r1354 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! missing variables added to ONLY list 23 23 ! 24 24 ! Former revisions: … … 83 83 84 84 USE indices, & 85 ONLY: nxl, nxr, nyn, nys, nzb_s_inner, nzt 85 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,& 86 nzt 86 87 87 88 USE kinds … … 160 161 161 162 USE indices, & 162 ONLY: n zb_s_inner, nzt163 ONLY: nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt 163 164 164 165 USE kinds -
palm/trunk/SOURCE/advec_ws.f90
r1362 r1374 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! missing variables added to ONLY list 23 23 ! 24 24 ! Former revisions: … … 389 389 390 390 USE indices, & 391 ONLY: nxl, nxr, nyn, nys, nzb, nzb_max, nzt, wall_flags_0 391 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_max, & 392 nzt, wall_flags_0 392 393 393 394 USE kinds … … 2230 2231 2231 2232 USE indices, & 2232 ONLY: nxl, nxr, nyn, nys, nzb, nzb_max, nzt, wall_flags_0 2233 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_max, & 2234 nzt, wall_flags_0 2233 2235 2234 2236 USE kinds … … 2749 2751 ! 2750 2752 !-- Computation of fluxes and tendency terms 2751 !$acc kernels present( ddzw, sk, tend, u, v, w, wall_flags_0 , wall_flags_00)2753 !$acc kernels present( ddzw, sk, tend, u, v, w, wall_flags_0 ) 2752 2754 DO i = i_left, i_right 2753 2755 DO j = j_south, j_north … … 3545 3547 ! 3546 3548 !-- Computation of fluxes and tendency terms 3547 !$acc kernels present( ddzw, tend, u, v, w, wall_flags_0 , wall_flags_00)3549 !$acc kernels present( ddzw, tend, u, v, w, wall_flags_0 ) 3548 3550 DO i = i_left, i_right 3549 3551 DO j = j_south, j_north … … 4349 4351 ! 4350 4352 !-- Computation of fluxes and tendency terms 4351 !$acc kernels present( ddzw, tend, u, v, w, wall_flags_0 , wall_flags_00)4353 !$acc kernels present( ddzw, tend, u, v, w, wall_flags_0 ) 4352 4354 DO i = i_left, i_right 4353 4355 DO j = j_south, j_north -
palm/trunk/SOURCE/buoyancy.f90
r1366 r1374 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! missing variables added to ONLY list 23 23 ! 24 24 ! Former revisions: … … 110 110 111 111 USE indices, & 112 ONLY: nxl, nxlu, nxr, nyn, nys, nzb_s_inner, nzt 112 ONLY: nxl, nxlg, nxlu, nxr, nxrg, nyn, nyng, nys, nysg, nzb, & 113 nzb_s_inner, nzt 113 114 114 115 USE kinds … … 205 206 206 207 USE indices, & 207 ONLY: i_left, i_right, j_north, j_south, nxl, nxl u, nxr, nyn, nys,&208 n zb_s_inner, nzt208 ONLY: i_left, i_right, j_north, j_south, nxl, nxlg, nxlu, nxr, & 209 nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner, nzt 209 210 210 211 USE kinds … … 308 309 309 310 USE indices, & 310 ONLY: n zb_s_inner, nzt311 ONLY: nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt 311 312 312 313 USE kinds -
palm/trunk/SOURCE/cuda_fft_interfaces.f90
r1321 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! bugfix: missing module kinds added 23 23 ! 24 24 ! Former revisions: … … 57 57 58 58 #if defined ( __cuda_fft ) 59 60 USE kinds 59 61 60 62 INTEGER(iwp) :: CUFFT_FORWARD = -1 !: -
palm/trunk/SOURCE/diffusion_e.f90
r1341 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! missing variables added to ONLY list 23 ! rif removed from acc-present-list 23 24 ! 24 25 ! Former revisions: … … 113 114 114 115 USE indices, & 115 ONLY: nxl, nxr, nyn, nys, nzb, nzb_s_inner, nzt 116 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzb_s_inner,& 117 nzt 116 118 117 119 USE kinds … … 317 319 318 320 USE indices, & 319 ONLY: i_left, i_right, j_north, j_south, nzb_s_inner, nzt 321 ONLY: i_left, i_right, j_north, j_south, nxlg, nxrg, nyng, nysg, & 322 nzb, nzb_s_inner, nzt 320 323 321 324 USE kinds … … 349 352 350 353 !$acc kernels present( ddzu, ddzw, dd2zu, diss, e, km, l_grid ) & 351 !$acc present( nzb_s_inner, rif,tend, var, zu, zw )354 !$acc present( nzb_s_inner, tend, var, zu, zw ) 352 355 DO i = i_left, i_right 353 356 DO j = j_south, j_north … … 416 419 417 420 !$acc kernels present( ddzu, ddzw, dd2zu, diss, e, km, l_grid ) & 418 !$acc present( nzb_s_inner, rif,tend, var, zu, zw )421 !$acc present( nzb_s_inner, tend, var, zu, zw ) 419 422 DO i = i_left, i_right 420 423 DO j = j_south, j_north … … 513 516 514 517 USE indices, & 515 ONLY: n zb, nzb_s_inner, nzt518 ONLY: nxlg, nxrg, nyng, nysg, nzb, nzb_s_inner, nzt 516 519 517 520 USE kinds -
palm/trunk/SOURCE/diffusion_s.f90
r1341 r1374 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! missing variables added to ONLY list 23 23 ! 24 24 ! Former revisions: … … 98 98 99 99 USE indices, & 100 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, 100 ONLY: nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, & 101 101 nzb_diff_s_inner, nzb_s_inner, nzb_s_outer, nzt, nzt_diff 102 102 … … 224 224 USE indices, & 225 225 ONLY: i_left, i_right, j_north, j_south, nxlg, nxrg, nyng, nysg, & 226 nzb _diff_s_inner, nzb_s_inner, nzb_s_outer, nzt, nzt_diff226 nzb, nzb_diff_s_inner, nzb_s_inner, nzb_s_outer, nzt, nzt_diff 227 227 228 228 USE kinds … … 351 351 352 352 USE indices, & 353 ONLY: nxlg, nxrg, nyng, nysg, nzb _diff_s_inner, nzb_s_inner,&353 ONLY: nxlg, nxrg, nyng, nysg, nzb, nzb_diff_s_inner, nzb_s_inner, & 354 354 nzb_s_outer, nzt, nzt_diff 355 355 -
palm/trunk/SOURCE/diffusion_w.f90
r1354 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! vsws + vswst removed from acc-present-list 23 23 ! 24 24 ! Former revisions: … … 262 262 ENDIF 263 263 264 !$acc kernels present ( u, v, w, km, tend , vsws, vswst )&264 !$acc kernels present ( u, v, w, km, tend ) & 265 265 !$acc present ( ddzu, ddzw, fwxm, fwxp, fwym, fwyp, wall_w_x, wall_w_y ) & 266 266 !$acc present ( nzb_w_inner, nzb_w_outer ) -
palm/trunk/SOURCE/diffusivities.f90
r1354 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! rif removed from acc-present-list 23 23 ! 24 24 ! Former revisions: … … 114 114 ! 115 115 !-- Data declerations for accelerators 116 !$acc data present( dd2zu, e, km, kh, l_grid, l_wall, nzb_s_inner, rif,var )116 !$acc data present( dd2zu, e, km, kh, l_grid, l_wall, nzb_s_inner, var ) 117 117 !$acc kernels 118 118 -
palm/trunk/SOURCE/fft_xy.f90
r1373 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! bugfixes: missing variables added to ONLY list, dpk renamed dp 23 23 ! 24 24 ! Former revisions: … … 117 117 118 118 USE transpose_indices, & 119 ONLY: n yn_x, nys_x, nzb_x, nzb_y, nzt_x, nzt_y119 ONLY: nxl_y, nxr_y, nyn_x, nys_x, nzb_x, nzb_y, nzt_x, nzt_y 120 120 121 121 IMPLICIT NONE … … 390 390 REAL(wp), DIMENSION(6*(nx+1)) :: work2 !: 391 391 #elif defined( __cuda_fft ) 392 COMPLEX(dp k), DIMENSION(0:(nx+1)/2,nys_x:nyn_x,nzb_x:nzt_x) ::&392 COMPLEX(dp), DIMENSION(0:(nx+1)/2,nys_x:nyn_x,nzb_x:nzt_x) :: & 393 393 ar_tmp !: 394 394 !$acc declare create( ar_tmp ) … … 1033 1033 REAL(wp), DIMENSION(6*(ny+1)) :: work2 !: 1034 1034 #elif defined( __cuda_fft ) 1035 COMPLEX(dp k), DIMENSION(0:(ny+1)/2,nxl_y:nxr_y,nzb_y:nzt_y) ::&1035 COMPLEX(dp), DIMENSION(0:(ny+1)/2,nxl_y:nxr_y,nzb_y:nzt_y) :: & 1036 1036 ar_tmp !: 1037 1037 !$acc declare create( ar_tmp ) -
palm/trunk/SOURCE/flow_statistics.f90
r1366 r1374 21 21 ! Current revisions: 22 22 ! ----------------- 23 ! 23 ! bugfix: syntax errors removed from openacc-branch 24 ! missing variables added to ONLY-lists 24 25 ! 25 26 ! Former revisions: … … 1407 1408 USE indices, & 1408 1409 ONLY: ngp_2dh, ngp_2dh_s_inner, ngp_3d, ngp_3d_inner, ngp_sums, nxl, & 1409 nxr, nyn, nys, nzb, nzb_diff_s_inner, nzb_s_inner, nzt, nzt_diff 1410 nxr, nyn, nys, nzb, nzb_diff_s_inner, nzb_s_inner, nzt, & 1411 nzt_diff, rflags_invers 1410 1412 1411 1413 USE kinds … … 1442 1444 REAL(wp) :: ust !: 1443 1445 REAL(wp) :: ust2 !: 1444 REAL(wp) :: u2 ,!:1446 REAL(wp) :: u2 !: 1445 1447 REAL(wp) :: vst !: 1446 1448 REAL(wp) :: vst2 !: … … 2034 2036 s1 = s1 - 0.5_wp * ( kh(k,j,i) + kh(k+1,j,i) ) & 2035 2037 * ( vpt(k+1,j,i) - vpt(k,j,i) ) & 2036 * ddzu(k+1) * rmask(j,i,sr) 2038 * ddzu(k+1) * rmask(j,i,sr) & 2037 2039 * rflags_invers(j,i,k+1) 2038 2040 s2 = s2 - 0.5_wp * ( kh(k,j,i) + kh(k+1,j,i) ) & -
palm/trunk/SOURCE/palm.f90
r1321 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! bugfix: module arrays_3d added 23 23 ! 24 24 ! Former revisions: … … 83 83 !------------------------------------------------------------------------------! 84 84 85 USE arrays_3d 85 86 86 87 USE control_parameters, & 87 88 ONLY: coupling_char, coupling_mode, do2d_at_begin, do3d_at_begin, & 88 89 io_blocks, io_group, large_scale_forcing, nudging, & 89 simulated_time, simulated_time_chr, version, w rite_binary90 simulated_time, simulated_time_chr, version, wall_heatflux, write_binary 90 91 91 92 USE cpulog, & 92 93 ONLY: cpu_log, log_point, cpu_statistics 93 94 95 USE grid_variables, & 96 ONLY: fxm, fxp, fym, fyp, fwxm, fwxp, fwym, fwyp, wall_e_x, wall_e_y, & 97 wall_u, wall_v, wall_w_x, wall_w_y 98 99 USE indices, & 100 ONLY: ngp_2dh, ngp_2dh_s_inner, nzb_diff_s_inner, nzb_diff_s_outer, nzb_diff_u, nzb_diff_v, & 101 nzb_s_inner, nzb_s_outer, nzb_u_inner, nzb_u_outer, nzb_v_inner,& 102 nzb_v_outer, nzb_w_inner, nzb_w_outer, rflags_invers, & 103 rflags_s_inner, wall_flags_0, wall_flags_00 104 94 105 USE kinds 95 106 … … 104 115 105 116 USE pegrid 117 118 USE statistics, & 119 ONLY: hom, rmask, weight_pres, weight_substep 106 120 107 121 #if defined( __openacc ) -
palm/trunk/SOURCE/production_e.f90
r1354 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! nzb_s_outer removed from acc-present-list 23 23 ! 24 24 ! Former revisions: … … 780 780 !-- Calculate TKE production by shear 781 781 !$acc kernels present( ddzw, dd2zu, kh, km, nzb_diff_s_inner, nzb_diff_s_outer ) & 782 !$acc present( nzb_s_inner, nzb_s_outer, pt, q, ql, qsws, qswst, rho )&782 !$acc present( nzb_s_inner, pt, q, ql, qsws, qswst, rho ) & 783 783 !$acc present( shf, tend, tswst, u, v, vpt, w, wall_e_x, wall_e_y ) & 784 784 !$acc copyin( u_0, v_0 ) -
palm/trunk/SOURCE/prognostic_equations.f90
r1366 r1374 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! missing variables added to ONLY lists 23 23 ! 24 24 ! Former revisions: … … 139 139 flux_l_pt, flux_l_q, flux_l_qr, flux_l_sa, nr, nr_p, nrsws, & 140 140 nrswst, pt, ptdf_x, ptdf_y, pt_init, pt_p, prho, q, q_init, & 141 q_p, qsws, qswst, qr, qr_p, qrsws, qrswst, rdf, rdf_sc, rho,&142 sa, sa_init, sa_p, saswsb, saswst, shf, tend, te_m, tnr_m,&143 t pt_m, tq_m, tqr_m, tsa_m, tswst, tu_m, tv_m, tw_m, u, ug, u_p,&144 v, vg, vpt, v_p, w, w_p141 q_p, qsws, qswst, qr, qr_p, qrsws, qrswst, rdf, rdf_sc, & 142 ref_state, rho, sa, sa_init, sa_p, saswsb, saswst, shf, tend, & 143 te_m, tnr_m, tpt_m, tq_m, tqr_m, tsa_m, tswst, tu_m, tv_m, & 144 tw_m, u, ug, u_p, v, vg, vpt, v_p, w, w_p 145 145 146 146 USE control_parameters, & … … 245 245 ONLY: production_e, production_e_acc 246 246 247 USE statistics, & 248 ONLY: hom 249 247 250 USE subsidence_mod, & 248 251 ONLY: subsidence … … 1757 1760 ! 1758 1761 !-- u-velocity component 1759 !++ Statistics still not ported to accelerators1762 !++ Statistics still not completely ported to accelerators 1760 1763 !$acc update device( hom, ref_state ) 1761 1764 CALL cpu_log( log_point(5), 'u-equation', 'start' ) -
palm/trunk/SOURCE/swap_timelevel.f90
r1321 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! bugfix: use-statement for nopointer-case added 23 23 ! 24 24 ! Former revisions: … … 62 62 !------------------------------------------------------------------------------! 63 63 64 #if defined( __nopointer ) 65 USE arrays_3d, & 66 ONLY: e, e_p, nr, nr_p, pt, pt_p, q, q_p, qr, qr_p, sa, sa_p, u, u_p, & 67 v, v_p, w, w_p 68 #else 64 69 USE arrays_3d, & 65 70 ONLY: e, e_1, e_2, e_p, nr, nr_1, nr_2, nr_p, pt, pt_1, pt_2, pt_p, q,& 66 71 q_1, q_2, q_p, qr, qr_1, qr_2, qr_p, sa, sa_1, sa_2, sa_p, u, & 67 72 u_1, u_2, u_p, v, v_1, v_2, v_p, w, w_1, w_2, w_p 73 #endif 68 74 69 75 USE cpulog, & -
palm/trunk/SOURCE/wall_fluxes.f90
r1354 r1374 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! pt removed from acc-present-list 23 23 ! 24 24 ! Former revisions: … … 849 849 max_outer = MAXVAL( nzb_diff_s_outer(nys:nyn,nxl:nxr) ) - 2 850 850 851 !$acc kernels present( nzb_diff_s_inner, nzb_diff_s_outer, pt, rif_wall )&851 !$acc kernels present( nzb_diff_s_inner, nzb_diff_s_outer, rif_wall ) & 852 852 !$acc present( u, v, w, wall, wall_flux, z0 ) 853 853 DO i = i_left, i_right
Note: See TracChangeset
for help on using the changeset viewer.
