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

Timestamp:

Sep 10, 2013 8:59:13 AM (12 years ago)

Author:

raasch

Message:

New:

---

openACC porting of reduction operations
additional 3D-flag arrays for replacing the 2D-index arrays nzb_s_inner and nzb_diff_s_inner
(flow_statistics, init_grid, init_3d_model, modules, palm, pres, time_integration)

Changed:

---

for PGI/openACC performance reasons set default compile options for openACC to "-ta=nocache",
and set environment variable PGI_ACC_SYNCHRONOUS=1
(MAKE.inc.pgi.openacc, palm_simple_run)

wall_flags_0 changed to 32bit INTEGER, additional array wall_flags_00 introduced to hold
bits 32-63
(advec_ws, init_grid, modules, palm)

Errors:

---

dummy argument tri in 1d-routines replaced by tri_for_1d because of name
conflict with arry tri in module arrays_3d
(tridia_solver)

File:

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

palm/trunk/SOURCE/tridia_solver.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
+! dummy argument tri in 1d-routines replaced by tri_for_1d because of name
+! conflict with arry tri in module arrays_3d
 !
 ! Former revisions:
@@ -382 +383 @@
 
 
-    SUBROUTINE tridia_1dd( ddx2, ddy2, nx, ny, j, ar, tri )
+    SUBROUTINE tridia_1dd( ddx2, ddy2, nx, ny, j, ar, tri_for_1d )
 
 !------------------------------------------------------------------------------!
@@ -408 +409 @@
 
        REAL, DIMENSION(0:nx,1:nz)     ::  ar
-       REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri
+       REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri_for_1d
 
 
@@ -424 +425 @@
        DO  k = 0, nz-1
           DO  i = 0,nx
-             tri(2,i,k) = ddzu_pres(k+1) * ddzw(k+1)
-             tri(3,i,k) = ddzu_pres(k+2) * ddzw(k+1)
+             tri_for_1d(2,i,k) = ddzu_pres(k+1) * ddzw(k+1)
+             tri_for_1d(3,i,k) = ddzu_pres(k+2) * ddzw(k+1)
           ENDDO
        ENDDO
@@ -433 +434 @@
        IF ( j <= nnyh )  THEN
 #if defined( __intel11 )
-          CALL maketri_1dd( j, tri )
+          CALL maketri_1dd( j, tri_for_1d )
 #else
           CALL maketri_1dd( j )
@@ -439 +440 @@
        ELSE
 #if defined( __intel11 )
-          CALL maketri_1dd( ny+1-j, tri )
+          CALL maketri_1dd( ny+1-j, tri_for_1d )
 #else
           CALL maketri_1dd( ny+1-j )
@@ -445 +446 @@
        ENDIF
 #if defined( __intel11 )
-       CALL split_1dd( tri )
+       CALL split_1dd( tri_for_1d )
 #else
        CALL split_1dd
 #endif
-       CALL substi_1dd( ar, tri )
+       CALL substi_1dd( ar, tri_for_1d )
 
     CONTAINS
 
 #if defined( __intel11 )
-       SUBROUTINE maketri_1dd( j, tri )
+       SUBROUTINE maketri_1dd( j, tri_for_1d )
 #else
        SUBROUTINE maketri_1dd( j )
@@ -473 +474 @@
 
 #if defined( __intel11 )
-          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri
+          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri_for_1d
 #endif
 
@@ -502 +503 @@
                 a = -1.0 * ddzu_pres(k+2) * ddzw(k+1)
                 c = -1.0 * ddzu_pres(k+1) * ddzw(k+1)
-                tri(1,i,k) = a + c - l(i)
+                tri_for_1d(1,i,k) = a + c - l(i)
              ENDDO
           ENDDO
           IF ( ibc_p_b == 1 )  THEN
              DO  i = 0, nx
-                tri(1,i,0) = tri(1,i,0) + tri(2,i,0)
+                tri_for_1d(1,i,0) = tri_for_1d(1,i,0) + tri_for_1d(2,i,0)
              ENDDO
           ENDIF
           IF ( ibc_p_t == 1 )  THEN
              DO  i = 0, nx
-                tri(1,i,nz-1) = tri(1,i,nz-1) + tri(3,i,nz-1)
+                tri_for_1d(1,i,nz-1) = tri_for_1d(1,i,nz-1) + tri_for_1d(3,i,nz-1)
              ENDDO
           ENDIF
@@ -520 +521 @@
 
 #if defined( __intel11 )
-       SUBROUTINE split_1dd( tri )
+       SUBROUTINE split_1dd( tri_for_1d )
 #else
        SUBROUTINE split_1dd
@@ -534 +535 @@
 
 #if defined( __intel11 )
-          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri
+          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri_for_1d
 #endif
 
@@ -541 +542 @@
 !--       Splitting
           DO  i = 0, nx
-             tri(4,i,0) = tri(1,i,0)
+             tri_for_1d(4,i,0) = tri_for_1d(1,i,0)
           ENDDO
           DO  k = 1, nz-1
              DO  i = 0, nx
-                tri(5,i,k) = tri(2,i,k) / tri(4,i,k-1)
-                tri(4,i,k) = tri(1,i,k) - tri(3,i,k-1) * tri(5,i,k)
+                tri_for_1d(5,i,k) = tri_for_1d(2,i,k) / tri_for_1d(4,i,k-1)
+                tri_for_1d(4,i,k) = tri_for_1d(1,i,k) - tri_for_1d(3,i,k-1) * tri_for_1d(5,i,k)
              ENDDO
           ENDDO
@@ -553 +554 @@
 
 
-       SUBROUTINE substi_1dd( ar, tri )
+       SUBROUTINE substi_1dd( ar, tri_for_1d )
 
 !------------------------------------------------------------------------------!
@@ -565 +566 @@
           REAL, DIMENSION(0:nx,nz)       ::  ar
           REAL, DIMENSION(0:nx,0:nz-1)   ::  ar1
-          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri
+          REAL, DIMENSION(5,0:nx,0:nz-1) ::  tri_for_1d
 
 !
@@ -574 +575 @@
           DO  k = 1, nz-1
              DO  i = 0, nx
-                ar1(i,k) = ar(i,k+1) - tri(5,i,k) * ar1(i,k-1)
+                ar1(i,k) = ar(i,k+1) - tri_for_1d(5,i,k) * ar1(i,k-1)
              ENDDO
           ENDDO
@@ -584 +585 @@
 !--       the model domain.
           DO  i = 0, nx
-             ar(i,nz) = ar1(i,nz-1) / ( tri(4,i,nz-1) + 1.0E-20 )
+             ar(i,nz) = ar1(i,nz-1) / ( tri_for_1d(4,i,nz-1) + 1.0E-20 )
           ENDDO
           DO  k = nz-2, 0, -1
              DO  i = 0, nx
-                ar(i,k+1) = ( ar1(i,k) - tri(3,i,k) * ar(i,k+2) ) &
-                            / tri(4,i,k)
+                ar(i,k+1) = ( ar1(i,k) - tri_for_1d(3,i,k) * ar(i,k+2) ) &
+                            / tri_for_1d(4,i,k)
              ENDDO
           ENDDO