Changeset 4027

Timestamp:

2013-09-17T13:19:04+02:00 (11 years ago)

Author:

epico

Message:

bug fix to support also decompositions without land-only processes

Location:

branches/2013/dev_r3948_CMCC_NorthFold_Opt/NEMOGCM/NEMO/OPA_SRC

Files:

• LBC/lib_mpp.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (4 diffs)

branches/2013/dev_r3948_CMCC_NorthFold_Opt/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -180 +180 @@
    REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, SAVE    ::   xnorthgloio_e
 
-   ! North fold arrays used to minimise the use of allgather operations. Set in nemo_northcomms (nemogcm) so need to be public
-!   INTEGER, PUBLIC,  PARAMETER :: jpmaxngh = 8                 ! Assumed maximum number of active neighbours
-!   INTEGER, PUBLIC,  PARAMETER :: jptyps   = 5                 ! Number of different neighbour lists to be used for northfold exchanges
-!   INTEGER, PUBLIC,  DIMENSION (jpmaxngh,jptyps)    ::   isendto
-!   INTEGER, PUBLIC,  DIMENSION (jptyps)             ::   nsndto
    LOGICAL, PUBLIC                                  ::   ln_nnogather     = .FALSE.  ! namelist control of northfold comms
    LOGICAL, PUBLIC                                  ::   l_north_nogather = .FALSE.  ! internal control of northfold comms
@@ -2624 +2619 @@
          ! (in nemo_northcomms) as being  involved in this process' northern boundary exchange
          !
+
+         ztabr_3d(:,:,:) = 0
+
          DO jk = 1, jpk
             DO jj = nlcj-ijpj+1, nlcj          ! First put local values into the global array
@@ -2755 +2753 @@
          ! (in nemo_northcomms) as being  involved in this process' northern boundary exchange
          !
+
+         ztabr_2d(:,:) = 0
+
          DO jj = nlcj-ijpj+1, nlcj          ! First put local values into the global array
             ij = jj - nlcj + ijpj

branches/2013/dev_r3948_CMCC_NorthFold_Opt/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -696 +696 @@
 
       INTEGER  ::   sxM, dxM, sxT, dxT, jn
-
+      INTEGER  ::   njmppmax
+
+      njmppmax = MAXVAL( njmppt )
+    
       !initializes the north-fold communication variables
       isendto(:) = 0
@@ -702 +705 @@
 
       !if I am a process in the north
-      IF (narea .ge. jpnij - jpni +1) THEN
+      IF ( njmpp == njmppmax ) THEN
           !sxM is the first point (in the global domain) needed to compute the
           !north-fold for the current process
@@ -713 +716 @@
           !managing the points belonging to the sxT-dxT range
           DO jn = jpnij - jpni +1, jpnij
+             IF ( njmppt(jn) == njmppmax ) THEN
                 !sxT is the first point (in the global domain) of the jn
                 !process
@@ -729 +733 @@
                    isendto(nsndto) = jn
                 END IF
+             END IF
           END DO
       ENDIF