Index: branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/lib_mpp.F90
===================================================================
--- branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/lib_mpp.F90	(revision 2287)
+++ branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/lib_mpp.F90	(revision 2304)
@@ -73,8 +73,4 @@
    PUBLIC   mppsize, mpprank
 
-# if defined key_mpp_rep1
-   PUBLIC mpp_allgatherv
-# endif
-
    !! * Interfaces
    !! define generic interface for these routine as they are called sometimes
@@ -88,5 +84,5 @@
    END INTERFACE
    INTERFACE mpp_sum
-# if defined key_mpp_rep2
+# if defined key_mpp_rep
       MODULE PROCEDURE mppsum_a_int, mppsum_int, mppsum_a_real, mppsum_real, &
                        mppsum_realdd, mppsum_a_realdd
@@ -105,10 +101,4 @@
    END INTERFACE
    
-# if defined key_mpp_rep1
-   INTERFACE mpp_allgatherv
-      MODULE PROCEDURE mpp_allgatherv_real, mpp_allgatherv_int
-   END INTERFACE
-# endif
-
    !! ========================= !!
    !!  MPI  variable definition !!
@@ -289,5 +279,5 @@
       mynode = mpprank
       !
-#if defined key_mpp_rep2
+#if defined key_mpp_rep
       CALL MPI_OP_CREATE(DDPDD_MPI, .TRUE., MPI_SUMDD, ierr)
 #endif
@@ -1430,5 +1420,5 @@
    END SUBROUTINE mppsum_real
 
-# if defined key_mpp_rep2
+# if defined key_mpp_rep
    SUBROUTINE mppsum_realdd( ytab, kcom )
       !!----------------------------------------------------------------------
@@ -2352,121 +2342,5 @@
    END SUBROUTINE mpi_init_opa
 
-#if defined key_mpp_rep1
-   SUBROUTINE mpp_allgatherv_real( pvalsin, knoin, pvalsout, ksizeout, &
-      &                            knoout, kstartout )
-      !!----------------------------------------------------------------------
-      !!               ***  ROUTINE mpp_allgatherv_real ***
-      !!          
-      !! ** Purpose : Gather a real array on all processors
-      !!
-      !! ** Method  : MPI all gatherv
-      !!
-      !! ** Action  : This does only work for MPI. 
-      !!              It does not work for SHMEM.
-      !!
-      !! References : http://www.mpi-forum.org
-      !!
-      !! History :
-      !!        !  08-08  (K. Mogensen)  Original code
-      !!----------------------------------------------------------------------
-
-      !! * Arguments
-      INTEGER, INTENT(IN) :: &
-         & knoin,     &
-         & ksizeout
-      REAL(wp), DIMENSION(knoin), INTENT(IN) :: &
-         & pvalsin
-      REAL(wp), DIMENSION(ksizeout), INTENT(OUT) :: &
-         & pvalsout
-      INTEGER, DIMENSION(jpnij), INTENT(OUT) :: &
-         & kstartout, &
-         & knoout
-      
-      !! * Local declarations
-      INTEGER :: &
-         & ierr
-      INTEGER :: &
-         & ji
-      !-----------------------------------------------------------------------
-      ! Call the MPI library to get number of data per processor
-      !-----------------------------------------------------------------------
-      CALL mpi_allgather( knoin,  1, mpi_integer, &
-         &                knoout, 1, mpi_integer, &
-         &                mpi_comm_opa, ierr )
-      !-----------------------------------------------------------------------
-      ! Compute starts of each processors contribution
-      !-----------------------------------------------------------------------
-      kstartout(1) = 0
-      DO ji = 2, jpnij
-         kstartout(ji) = kstartout(ji-1) + knoout(ji-1) 
-      ENDDO
-      !-----------------------------------------------------------------------
-      ! Call the MPI library to do the gathering of the data
-      !-----------------------------------------------------------------------
-      CALL mpi_allgatherv( pvalsin,  knoin,  MPI_DOUBLE_PRECISION,            &
-         &                 pvalsout, knoout, kstartout, MPI_DOUBLE_PRECISION, &
-         &                 mpi_comm_opa, ierr )
-     
-   END SUBROUTINE mpp_allgatherv_real
-
-   SUBROUTINE mpp_allgatherv_int( kvalsin, knoin, kvalsout, ksizeout, &
-      &                               knoout, kstartout )
-      !!----------------------------------------------------------------------
-      !!               ***  ROUTINE mpp_allgatherv ***
-      !!          
-      !! ** Purpose : Gather an integer array on all processors
-      !!
-      !! ** Method  : MPI all gatherv
-      !!
-      !! ** Action  : This does only work for MPI. 
-      !!              It does not work for SHMEM.
-      !!
-      !! References : http://www.mpi-forum.org
-      !!
-      !! History :
-      !!        !  06-07  (K. Mogensen)  Original code
-      !!----------------------------------------------------------------------
-
-      !! * Arguments
-      INTEGER, INTENT(IN) :: &
-         & knoin,     &
-         & ksizeout
-      INTEGER, DIMENSION(knoin), INTENT(IN) :: &
-         & kvalsin
-      INTEGER, DIMENSION(ksizeout), INTENT(OUT) :: &
-         & kvalsout
-      INTEGER, DIMENSION(jpnij), INTENT(OUT) :: &
-         & kstartout, &
-         & knoout
-      
-      !! * Local declarations
-      INTEGER :: &
-         & ierr
-      INTEGER :: &
-         & ji
-      !-----------------------------------------------------------------------
-      ! Call the MPI library to get number of data per processor
-      !-----------------------------------------------------------------------
-      CALL mpi_allgather( knoin,  1, mpi_integer, &
-         &                knoout, 1, mpi_integer, &
-         &                mpi_comm_opa, ierr )
-      !-----------------------------------------------------------------------
-      ! Compute starts of each processors contribution
-      !-----------------------------------------------------------------------
-      kstartout(1) = 0
-      DO ji = 2, jpnij
-         kstartout(ji) = kstartout(ji-1) + knoout(ji-1)
-      ENDDO
-      !-----------------------------------------------------------------------
-      ! Call the MPI library to do the gathering of the data
-      !-----------------------------------------------------------------------
-      CALL mpi_allgatherv( kvalsin,  knoin,  mpi_integer,            &
-         &                 kvalsout, knoout, kstartout, mpi_integer, &
-         &                 mpi_comm_opa, ierr )
-      
-   END SUBROUTINE mpp_allgatherv_int
-#endif
-
-#if defined key_mpp_rep2
+#if defined key_mpp_rep
    SUBROUTINE DDPDD_MPI (ydda, yddb, ilen, itype)
       !!---------------------------------------------------------------------
@@ -2503,10 +2377,4 @@
    !!   Default case:            Dummy module        share memory computing
    !!----------------------------------------------------------------------
-# if defined key_mpp_rep1
-   USE par_kind
-   USE par_oce
-
-   PUBLIC mpp_allgatherv
-# endif
 
    INTERFACE mpp_sum
@@ -2530,11 +2398,4 @@
    END INTERFACE
 
-# if defined key_mpp_rep1
-   INTERFACE mpp_allgatherv
-      MODULE PROCEDURE mpp_allgatherv_real, mpp_allgatherv_int
-   END INTERFACE
-# endif
-
-
    LOGICAL, PUBLIC, PARAMETER ::   lk_mpp = .FALSE.      !: mpp flag
    INTEGER :: ncomm_ice
@@ -2719,42 +2580,4 @@
       WRITE(*,*) 'mpp_comm_free: You should not have seen this print! error?', kcom
    END SUBROUTINE mpp_comm_free
-
-# if defined key_mpp_rep1 
-   SUBROUTINE mpp_allgatherv_real( pvalsin, knoin, pvalsout, ksizeout, &
-      &                            knoout, kstartout )
-      INTEGER, INTENT(IN) :: &
-         & knoin,     &
-         & ksizeout
-      REAL(wp), DIMENSION(knoin), INTENT(IN) :: &
-         & pvalsin
-      REAL(wp), DIMENSION(ksizeout), INTENT(OUT) :: &
-         & pvalsout
-      INTEGER, DIMENSION(jpnij), INTENT(OUT) :: &
-         & kstartout, &
-         & knoout
-      pvalsout(1:knoin) = pvalsin(1:knoin)
-      kstartout(1) = 0
-      knoout(1) = knoin          
-   END SUBROUTINE mpp_allgatherv_real
-
-   SUBROUTINE mpp_allgatherv_int( kvalsin, knoin, kvalsout, ksizeout, &
-      &                               knoout, kstartout )
-      INTEGER, INTENT(IN) :: &
-         & knoin,     &
-         & ksizeout
-      INTEGER, DIMENSION(knoin), INTENT(IN) :: &
-         & kvalsin
-      INTEGER, DIMENSION(ksizeout), INTENT(OUT) :: &
-         & kvalsout
-      INTEGER, DIMENSION(jpnij), INTENT(OUT) :: &
-         & kstartout, &
-         & knoout
-      
-      kvalsout(1:knoin) = kvalsin(1:knoin)
-      kstartout(1) = 0
-      knoout(1) = knoin            
-   END SUBROUTINE mpp_allgatherv_int
-# endif
-
 #endif
    !!----------------------------------------------------------------------
