Changeset 15023 for NEMO/trunk/src/OCE/LBC

Timestamp:

2021-06-18T16:35:25+02:00 (3 years ago)

Author:

gsamson

Message:

merge ticket2680_C1D_PAPA branch back into the trunk; see ticket #2680 for details

Location:

NEMO/trunk/src/OCE/LBC

Files:

• lib_mpp.F90 (modified) (3 diffs)
• mppini.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/LBC/lib_mpp.F90

@@ -76 +76 @@
    PUBLIC   mpp_bcast_nml
    PUBLIC   tic_tac
-#if defined key_mpp_off
-   PUBLIC MPI_wait
-   PUBLIC MPI_Wtime
+#if defined key_mpi_off
+   PUBLIC   MPI_wait
+   PUBLIC   MPI_waitall
+   PUBLIC   MPI_Wtime
 #endif
 
@@ -127 +128 @@
    INTEGER, PUBLIC, PARAMETER ::   MPI_REAL = 4
    INTEGER, PUBLIC, PARAMETER ::   MPI_DOUBLE_PRECISION = 8
+   INTEGER, PUBLIC, PARAMETER ::   MPI_REQUEST_NULL = 1
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .FALSE.    !: mpp flag
+   INTEGER, PUBLIC, DIMENSION(MPI_STATUS_SIZE) ::   MPI_STATUS_IGNORE = 1     ! out from mpi_wait
+   INTEGER, PUBLIC, DIMENSION(MPI_STATUS_SIZE) ::   MPI_STATUSES_IGNORE = 1   ! out from mpi_waitall
 #endif
 
@@ -1401 +1405 @@
       INTEGER, DIMENSION(MPI_STATUS_SIZE), INTENT(  out) ::   status
       INTEGER                            , INTENT(  out) ::   ierror
+      IF (.FALSE.) THEN   ! to avoid compilation warning
+         status(:) = -1
+         ierror = -1
+      ENDIF
    END SUBROUTINE mpi_wait
 
+   SUBROUTINE mpi_waitall(count, request, status, ierror)
+      INTEGER                            , INTENT(in   ) :: count
+      INTEGER, DIMENSION(count)          , INTENT(in   ) :: request
+      INTEGER, DIMENSION(MPI_STATUS_SIZE), INTENT(  out) :: status
+      INTEGER                            , INTENT(  out) :: ierror
+      IF (.FALSE.) THEN   ! to avoid compilation warning
+         status(:) = -1
+         ierror = -1
+      ENDIF
+   END SUBROUTINE mpi_waitall
 
    FUNCTION MPI_Wtime()

NEMO/trunk/src/OCE/LBC/mppini.F90

@@ -62 +62 @@
       !!----------------------------------------------------------------------
       !
-      nn_hls = 1
-      jpiglo = Ni0glo + 2 * nn_hls
-      jpjglo = Nj0glo + 2 * nn_hls
-      jpimax = jpiglo
-      jpjmax = jpjglo
-      jpi    = jpiglo
-      jpj    = jpjglo
-      jpk    = MAX( 2, jpkglo )
-      jpij   = jpi*jpj
-      jpni   = 1
-      jpnj   = 1
-      jpnij  = jpni*jpnj
-      nimpp  = 1
-      njmpp  = 1
-      nidom  = FLIO_DOM_NONE
+      nn_comm = 1
+      nn_hls  = 1
+      jpiglo  = Ni0glo + 2 * nn_hls
+      jpjglo  = Nj0glo + 2 * nn_hls
+      jpimax  = jpiglo
+      jpjmax  = jpjglo
+      jpi     = jpiglo
+      jpj     = jpjglo
+      jpk     = MAX( 2, jpkglo )
+      jpij    = jpi*jpj
+      jpni    = 1
+      jpnj    = 1
+      jpnij   = jpni*jpnj
+      nimpp   = 1
+      njmpp   = 1
+      nidom   = FLIO_DOM_NONE
+      !
+      mpiSnei(:,:) = -1
+      mpiRnei(:,:) = -1
+      l_SelfPerio(1:2) = l_Iperio                  !  west,  east periodicity by itself
+      l_SelfPerio(3:4) = l_Jperio                  ! south, north periodicity by itself
+      l_SelfPerio(5:8) = l_Iperio .AND. l_Jperio   ! corners bi-periodicity by itself
+      l_IdoNFold = l_NFold                         ! is this process doing North fold?
       !
       CALL init_doloop                       ! set start/end indices or do-loop depending on the halo width value (nn_hls)
@@ -532 +540 @@
       END DO
       !
-      CALL init_excl_landpt      ! exclude exchanges which contain only land points
+      IF( jpnij > 1) CALL init_excl_landpt      ! exclude exchanges which contain only land points
       !
       ! Save processor layout changes in ascii file