Changeset 4474 for palm

Timestamp:

Mar 26, 2020 9:32:18 AM (5 years ago)

Author:

raasch

Message:

bugfix for correct usage of alternative communicators in case of 1d-decompositions and in non-parallel mode

File:

• palm/trunk/SOURCE/exchange_horiz_mod.f90 (modified) (5 diffs)

palm/trunk/SOURCE/exchange_horiz_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for correct usage of alternative communicators in case of 1d-decompositions and in
+! non-parallel mode
+! 
+! 4461 2020-03-12 16:51:59Z raasch
 ! optional communicator added to exchange_horiz
 ! 
@@ -182 +186 @@
 !--    One-dimensional decomposition along y, boundary values can be exchanged
 !--    within the PE memory
-       IF ( bc_lr_cyc )  THEN
-          ar(:,:,nxl-nbgp_local:nxl-1) = ar(:,:,nxr-nbgp_local+1:nxr)
-          ar(:,:,nxr+1:nxr+nbgp_local) = ar(:,:,nxl:nxl+nbgp_local-1)
+       IF ( PRESENT( alternative_communicator ) )  THEN
+          IF ( alternative_communicator <= 2 )  THEN
+             ar(:,:,nxl-nbgp_local:nxl-1) = ar(:,:,nxr-nbgp_local+1:nxr)
+             ar(:,:,nxr+1:nxr+nbgp_local) = ar(:,:,nxl:nxl+nbgp_local-1)
+          ENDIF
+       ELSE
+          IF ( bc_lr_cyc )  THEN
+             ar(:,:,nxl-nbgp_local:nxl-1) = ar(:,:,nxr-nbgp_local+1:nxr)
+             ar(:,:,nxr+1:nxr+nbgp_local) = ar(:,:,nxl:nxl+nbgp_local-1)
+          ENDIF
        ENDIF
 
@@ -244 +255 @@
 !--    One-dimensional decomposition along x, boundary values can be exchanged
 !--    within the PE memory
-       IF ( bc_ns_cyc )  THEN
-          ar(:,nys-nbgp_local:nys-1,:) = ar(:,nyn-nbgp_local+1:nyn,:)
-          ar(:,nyn+1:nyn+nbgp_local,:) = ar(:,nys:nys+nbgp_local-1,:)
+       IF ( PRESENT( alternative_communicator ) )  THEN
+          IF ( alternative_communicator == 1  .OR.  alternative_communicator == 3 )  THEN
+             ar(:,nys-nbgp_local:nys-1,:) = ar(:,nyn-nbgp_local+1:nyn,:)
+             ar(:,nyn+1:nyn+nbgp_local,:) = ar(:,nys:nys+nbgp_local-1,:)
+          ENDIF
+       ELSE
+          IF ( bc_ns_cyc )  THEN
+             ar(:,nys-nbgp_local:nys-1,:) = ar(:,nyn-nbgp_local+1:nyn,:)
+             ar(:,nyn+1:nyn+nbgp_local,:) = ar(:,nys:nys+nbgp_local-1,:)
+          ENDIF
        ENDIF
 
@@ -302 +320 @@
 !-- workaround has to be removed later. Also, since PGI compiler 12.5 has problems
 !-- with array syntax, explicit loops are used.
-    IF ( bc_lr_cyc )  THEN
-       ar(:,:,nxl-nbgp_local:nxl-1) = ar(:,:,nxr-nbgp_local+1:nxr)
-       ar(:,:,nxr+1:nxr+nbgp_local) = ar(:,:,nxl:nxl+nbgp_local-1)
+    IF ( PRESENT( alternative_communicator ) )  THEN
+       IF ( alternative_communicator <= 2 )  THEN
+          ar(:,:,nxl-nbgp_local:nxl-1) = ar(:,:,nxr-nbgp_local+1:nxr)
+          ar(:,:,nxr+1:nxr+nbgp_local) = ar(:,:,nxl:nxl+nbgp_local-1)
+       ENDIF
+    ELSE
+       IF ( bc_lr_cyc )  THEN
+          ar(:,:,nxl-nbgp_local:nxl-1) = ar(:,:,nxr-nbgp_local+1:nxr)
+          ar(:,:,nxr+1:nxr+nbgp_local) = ar(:,:,nxl:nxl+nbgp_local-1)
+       ENDIF
     ENDIF
 
@@ -315 +340 @@
     !$ACC WAIT(2)
 
-    IF ( bc_ns_cyc )  THEN
-       ar(:,nys-nbgp_local:nys-1,:) = ar(:,nyn-nbgp_local+1:nyn,:)
-       ar(:,nyn+1:nyn+nbgp_local,:) = ar(:,nys:nys+nbgp_local-1,:)
+    IF ( PRESENT( alternative_communicator ) )  THEN
+       IF ( alternative_communicator == 1  .OR.  alternative_communicator == 3 )  THEN
+          ar(:,nys-nbgp_local:nys-1,:) = ar(:,nyn-nbgp_local+1:nyn,:)
+          ar(:,nyn+1:nyn+nbgp_local,:) = ar(:,nys:nys+nbgp_local-1,:)
+       ENDIF
+    ELSE
+       IF ( bc_ns_cyc )  THEN
+          ar(:,nys-nbgp_local:nys-1,:) = ar(:,nyn-nbgp_local+1:nyn,:)
+          ar(:,nyn+1:nyn+nbgp_local,:) = ar(:,nys:nys+nbgp_local-1,:)
+       ENDIF
     ENDIF