Changeset 1257 for palm/trunk/SOURCE/tridia_solver.f90

Timestamp:

Nov 8, 2013 3:18:40 PM (11 years ago)

Author:

raasch

Message:

New:
---

openACC porting of timestep calculation
(modules, timestep, time_integration)

Changed:

---

openACC loop directives and vector clauses removed (because they do not give any performance improvement with PGI
compiler versions > 13.6)
(advec_ws, buoyancy, coriolis, diffusion_e, diffusion_s, diffusion_u, diffusion_v, diffusion_w, diffusivities, exchange_horiz, fft_xy, pres, production_e, transpose, tridia_solver, wall_fluxes)

openACC loop independent clauses added
(boundary_conds, prandtl_fluxes, pres)

openACC declare create statements moved after FORTRAN declaration statement
(diffusion_u, diffusion_v, diffusion_w, fft_xy, poisfft, production_e, tridia_solver)

openACC end parallel replaced by end parallel loop
(flow_statistics, pres)

openACC "kernels do" replaced by "kernels loop"
(prandtl_fluxes)

output format for theta* changed to avoid output of *
(run_control)

Errors:

---

bugfix for calculation of advective timestep (old version may cause wrong timesteps in case of
vertixcally stretched grids)
Attention: standard run-control output has changed!
(timestep)

File:

• palm/trunk/SOURCE/tridia_solver.f90 (modified) (10 diffs)

palm/trunk/SOURCE/tridia_solver.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
+! openacc loop and loop vector clauses removed, declare create moved after
+! the FORTRAN declaration statement
 !
 ! Former revisions:
@@ -114 +115 @@
           INTEGER ::  i, j, k, nnxh, nnyh
 
+          REAL    ::  ll(nxl_z:nxr_z,nys_z:nyn_z)
           !$acc declare create( ll )
-          REAL    ::  ll(nxl_z:nxr_z,nys_z:nyn_z)
 
 
@@ -130 +131 @@
 
           !$acc kernels present( tric )
-          !$acc loop vector( 32 )
           DO  j = nys_z, nyn_z
              DO  i = nxl_z, nxr_z
@@ -161 +161 @@
           ENDDO
 
-          !$acc loop
           DO  k = 0, nz-1
              DO  j = nys_z, nyn_z
-                !$acc loop vector( 32 )
                 DO  i = nxl_z, nxr_z
                    tric(i,j,k) = ddzuw(k,3) - ll(i,j)
@@ -174 +172 @@
           IF ( ibc_p_b == 1 )  THEN
              !$acc kernels present( tric )
-             !$acc loop
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
@@ -184 +181 @@
           IF ( ibc_p_t == 1 )  THEN
              !$acc kernels present( tric )
-             !$acc loop
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
@@ -211 +207 @@
           REAL    ::  ar(nxl_z:nxr_z,nys_z:nyn_z,1:nz)
 
+          REAL, DIMENSION(nxl_z:nxr_z,nys_z:nyn_z,0:nz-1)   ::  ar1
           !$acc declare create( ar1 )
-          REAL, DIMENSION(nxl_z:nxr_z,nys_z:nyn_z,0:nz-1)   ::  ar1
 
 !
@@ -218 +214 @@
           DO  k = 0, nz - 1
              !$acc kernels present( ar, tri )
-             !$acc loop
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
@@ -240 +235 @@
           DO  k = nz-1, 0, -1
              !$acc kernels present( ar, tri )
-             !$acc loop
              DO  j = nys_z, nyn_z
                 DO  i = nxl_z, nxr_z
@@ -265 +259 @@
                    ar(nxl_z,nys_z,k) = 0.0
                 ENDDO
+                !$acc end kernels loop
              ENDIF
           ENDIF