Changeset 629 for trunk/NEMO/OPA_SRC/lib_mpp.F90

Timestamp:

2007-03-01T15:38:55+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_018 : CT : change variables name "size" & "rank" into "mppsize" & "mpprank" to avoid conflicts when they become PUBLIC when using key_oasis[3-4] cpp keys

File:

• trunk/NEMO/OPA_SRC/lib_mpp.F90 (modified) (3 diffs)

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -62 +62 @@
    PUBLIC  mpprecv, mppsend, mppscatter, mppgather, mppobc, mpp_ini_north, mppstop, mppsync
 #if defined key_oasis3 || defined key_oasis4
-   PUBLIC  size, rank
+   PUBLIC  mppsize, mpprank
 #endif
 
@@ -110 +110 @@
 
    INTEGER ::   &
-      size,     &  ! number of process
-      rank,     &  ! process number  [ 0 - size-1 ]
+      mppsize,  &  ! number of process
+      mpprank,  &  ! process number  [ 0 - size-1 ]
       mpi_comm_opa ! opa local communicator
 
@@ -380 +380 @@
       mpi_comm_opa = mpi_comm_world
 #endif
-        CALL mpi_comm_rank( mpi_comm_opa, rank, ierr )
-        CALL mpi_comm_size( mpi_comm_opa, size, ierr )
-      mynode = rank
+        CALL mpi_comm_rank( mpi_comm_opa, mpprank, ierr )
+        CALL mpi_comm_size( mpi_comm_opa, mppsize, ierr )
+      mynode = mpprank
 #else
       !! * Local variables   (SHMEM version)