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

Timestamp:

2006-11-13T15:08:20+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_076:RB: do not use coupled interface changes in lib_mpp with Agrif (should be temporary...)

File:

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

trunk/NEMO/OPA_SRC/lib_mpp.F90

@@ -307 +307 @@
       IF( Agrif_Root() ) THEN
 #endif
+!!bug RB : should be clean to use Agrif in coupled mode
+#if ! defined key_agrif
          CALL mpi_initialized ( mpi_was_called, code )
          IF( code /= MPI_SUCCESS ) THEN
@@ -333 +335 @@
             WRITE(numout,*) '          without calling MPI_Init before ! '
          ELSE
+#endif
             SELECT CASE ( c_mpi_send )
             CASE ( 'S' )                ! Standard mpi send (blocking)
@@ -349 +352 @@
             END SELECT
 
+#if ! defined key_agrif
             CALL mpi_comm_dup( mpi_comm_world, mpi_comm_opa, code)
             IF( code /= MPI_SUCCESS ) THEN
@@ -356 +360 @@
             !
          ENDIF
+#endif
 #if defined key_agrif
       ELSE
@@ -372 +377 @@
          END SELECT
       ENDIF
-#endif
-
-      CALL mpi_comm_rank( mpi_comm_opa, rank, ierr )
-      CALL mpi_comm_size( mpi_comm_opa, size, ierr )
+
+      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
 #else