Changeset 3818

Timestamp:

2013-02-21T11:30:14+01:00 (11 years ago)

Author:

acc

Message:

Branch dev_MERGE_2012. #1057. Correct mppini_2.h90 logic concerning the northern neighbour across the north-fold

File:

• branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90 (modified) (4 diffs)

branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90

@@ -44 +44 @@
       INTEGER :: ji, jj, jn, jproc, jarea     ! dummy loop indices
       INTEGER ::  inum                        ! temporary logical unit
+      INTEGER ::  idir                        ! temporary integers
       INTEGER ::   &
          ii, ij, ifreq, il1, il2,          &  ! temporary integers
@@ -267 +268 @@
             IF( jarea > ijm1 ) ipolj(ii,ij) = 3
             IF( MOD(jpni,2) == 1 .AND. jarea == imil ) ipolj(ii,ij) = 4
-            IF( ipolj(ii,ij) == 3 ) iono(ii,ij) = jpni*jpnj-jarea+ijm1
+            IF( ipolj(ii,ij) == 3 ) iono(ii,ij) = jpni*jpnj-jarea+ijm1 - 1   ! MPI rank of northern neighbour
          ENDIF
          IF( jperio == 5 .OR. jperio == 6 ) THEN
@@ -274 +275 @@
             IF( jarea > ijm1) ipolj(ii,ij) = 5
             IF( MOD(jpni,2) == 1 .AND. jarea == imil ) ipolj(ii,ij) = 6
-            IF( ipolj(ii,ij) == 5) iono(ii,ij) = jpni*jpnj-jarea+ijm1
+            IF( ipolj(ii,ij) == 5) iono(ii,ij) = jpni*jpnj-jarea+ijm1 - 1    ! MPI rank of northern neighbour
          ENDIF
 
@@ -338 +339 @@
             iino = 1 + MOD(iono(ii,ij),jpni)
             ijno = 1 +    (iono(ii,ij))/jpni
-            IF( ibondj(iino,ijno) == 1 ) ibondj(iino,ijno)=2
-            IF( ibondj(iino,ijno) == 0 ) ibondj(iino,ijno) = -1
+              ! Need to reverse the logical direction of communication 
+              ! for northern neighbours of northern row processors (north-fold)
+              ! i.e. need to check that the northern neighbour only communicates
+              ! to the SOUTH (or not at all) if this area is land-only (#1057)
+            idir = 1
+            IF( ij .eq. jpnj .AND. ijno .eq. jpnj ) idir = -1    
+            IF( ibondj(iino,ijno) == idir ) ibondj(iino,ijno)=2
+            IF( ibondj(iino,ijno) == 0 ) ibondj(iino,ijno) = -idir
          ENDIF
          IF( ipproc(ii,ij) == -1 .AND. ioso(ii,ij) >= 0   &