Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_mpp.F90

Timestamp:

2018-05-11T12:53:25+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Global renaming for core routines (./NEMO)

• Folders
  • LIM_SRC_3 -> ICE_SRC
  • OPA_SRC -> OCE_SRC
• CPP key: key_lim3 -> key_si3
• Modules, (sub)routines and variables names
  • MPI: mpi_comm_opa -> mpi_comm_oce, MPI_COMM_OPA -> MPI_COMM_OCE, mpi_init_opa -> mpi_init_oce
  • AGRIF: agrif_opa_* -> agrif_oce_*, agrif_lim3_* -> agrif_si3_* and few more
  • TOP-PISCES: p.zlim -> p.zice, namp.zlim -> namp.zice
• Comments
  • NEMO/OPA -> NEMO/OCE
  • ESIM|LIM3 -> SI3

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC

Files:

• . (moved) (moved from branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC)
• OBS/obs_mpp.F90 (modified) (12 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/obs_mpp.F90

@@ -22 +22 @@
    USE in_out_manager
 #if defined key_mpp_mpi
-   USE lib_mpp, ONLY :   mpi_comm_opa      ! MPP library
+   USE lib_mpp, ONLY :   mpi_comm_oce      ! MPP library
 #endif
    IMPLICIT NONE
@@ -38 +38 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! NEMO/OCE 3.3 , NEMO Consortium (2010)
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -53 +53 @@
       !!
       !! ** Action  : This does only work for MPI. 
-      !!              MPI_COMM_OPA needs to be replace for OASIS4.!
+      !!              MPI_COMM_OCE needs to be replace for OASIS4.!
       !!
       !! References : http://www.mpi-forum.org
@@ -70 +70 @@
       ! Call the MPI library to broadcast data
       CALL mpi_bcast( kvals, kno, mpi_integer,  &
-         &            kroot, mpi_comm_opa, ierr )
+         &            kroot, mpi_comm_oce, ierr )
 #else
       ! no MPI: empty routine
@@ -88 +88 @@
       !! ** Action  : This does only work for MPI. 
       !!              It does not work for SHMEM.
-      !!              MPI_COMM_OPA needs to be replace for OASIS4.!
+      !!              MPI_COMM_OCE needs to be replace for OASIS4.!
       !!
       !! References : http://www.mpi-forum.org
@@ -105 +105 @@
       ! Call the MPI library to find the maximum across processors
       CALL mpi_allreduce( kvals, ivals, kno, mpi_integer,   &
-         &                mpi_max, mpi_comm_opa, ierr )
+         &                mpi_max, mpi_comm_oce, ierr )
       kvals(:) = ivals(:)
 #else
@@ -203 +203 @@
       !-----------------------------------------------------------------------
       CALL mpi_allreduce( kvalsin, kvalsout, kno, mpi_integer, &
-         &                mpi_sum, mpi_comm_opa, ierr )
+         &                mpi_sum, mpi_comm_oce, ierr )
 #else
       !-----------------------------------------------------------------------
@@ -241 +241 @@
       !-----------------------------------------------------------------------
       CALL mpi_allreduce( kvalin, kvalout, 1, mpi_integer,   &
-         &                mpi_sum, mpi_comm_opa, ierr )
+         &                mpi_sum, mpi_comm_oce, ierr )
 #else
       !-----------------------------------------------------------------------
@@ -286 +286 @@
 
       CALL mpi_allreduce( zcp, pval, jpiglo*jpjglo, mpivar, &
-         &                mpi_max, mpi_comm_opa, ierr )
+         &                mpi_max, mpi_comm_oce, ierr )
 
       DEALLOCATE( &
@@ -326 +326 @@
       CALL mpi_alltoall( kvalsin,  kno, mpi_integer, &
          &               kvalsout, kno, mpi_integer, &
-         &               mpi_comm_opa, ierr )
+         &               mpi_comm_oce, ierr )
 #else
       !-----------------------------------------------------------------------
@@ -378 +378 @@
       CALL mpi_alltoallv( kvalsin,  kinv,  isdsp, mpi_integer, &
          &                kvalsout, koutv, irdsp, mpi_integer, &
-         &                mpi_comm_opa, ierr )
+         &                mpi_comm_oce, ierr )
 #else
       !-----------------------------------------------------------------------
@@ -432 +432 @@
       CALL mpi_alltoallv( pvalsin,  kinv,  isdsp, mpivar, &
          &                pvalsout, koutv, irdsp, mpivar, &
-         &                mpi_comm_opa, ierr )
+         &                mpi_comm_oce, ierr )
 #else
       !-----------------------------------------------------------------------