Changeset 1804 for branches/dev_005_AWL/AGRIF/AGRIF_FILES/modutil.F

Timestamp:

2010-02-08T11:51:02+01:00 (14 years ago)

Author:

sga

Message:

merge of trunk changes from r1782 to r1802 into NEMO branch dev_005_AWL

File:

• branches/dev_005_AWL/AGRIF/AGRIF_FILES/modutil.F (modified) (1 diff)

branches/dev_005_AWL/AGRIF/AGRIF_FILES/modutil.F

@@ -63 +63 @@
 C
 #ifdef AGRIF_MPI
-      Integer      :: code
+      Logical      :: mpi_was_called
+      Integer      :: code, ierr
 #include "mpif.h"
 C
 C
+      Call Agrif_comm_def(mpi_comm_agrif)
+
+      CALL mpi_initialized ( mpi_was_called, code )
+      IF( code /= MPI_SUCCESS ) THEN
+         WRITE(*, *) ': Error in routine mpi_initialized'
+         CALL mpi_abort( mpi_comm_world, code, ierr )
+      ENDIF
+
+      IF( .NOT. mpi_was_called ) THEN 
+         CALL mpi_comm_dup( mpi_comm_world, mpi_comm_agrif, code)
+         IF( code /= MPI_SUCCESS ) THEN
+            WRITE(*, *) ' Agrif_Step: Error in routine mpi_comm_dup'
+            CALL mpi_abort( mpi_comm_world, code, ierr )
+         ENDIF
+      ENDIF
+
       If (Agrif_Mygrid % ngridstep == 0) Then
-          Call MPI_COMM_SIZE(MPI_COMM_WORLD,Agrif_Nbprocs,code)
-          Call MPI_COMM_RANK(MPI_COMM_WORLD,Agrif_ProcRank,code)
-          Call MPI_COMM_GROUP(MPI_COMM_WORLD,Agrif_Group,code)
+          Call MPI_COMM_SIZE(MPI_COMM_AGRIF,Agrif_Nbprocs,code)
+          Call MPI_COMM_RANK(MPI_COMM_AGRIF,Agrif_ProcRank,code)
+          Call MPI_COMM_GROUP(MPI_COMM_AGRIF,Agrif_Group,code)
       endif
 #endif