Changeset 266 for codes/icosagcm/trunk/src/mpipara.F90

Timestamp:

08/05/14 15:56:49 (10 years ago)

Author:

ymipsl

Message:

Synchronize trunk and Saturn branch.
Merge modification from Saturn branch to trunk

YM

File:

• codes/icosagcm/trunk/src/mpipara.F90 (modified) (3 diffs)

codes/icosagcm/trunk/src/mpipara.F90

@@ -9 +9 @@
   LOGICAL,SAVE :: using_mpi
   LOGICAL,SAVE :: is_mpi_root
+  LOGICAL,SAVE :: is_mpi_master
+  LOGICAL,SAVE :: mpi_master
+  
   
   INTERFACE allocate_mpi_buffer
@@ -108 +111 @@
     ENDIF
     
+    mpi_master=0
     IF (mpi_rank==0) THEN 
       is_mpi_root=.TRUE.
+      is_mpi_master=.TRUE.
     ELSE
       is_mpi_root=.FALSE.
+      is_mpi_master=.FALSE.
     ENDIF
     
@@ -118 +124 @@
   SUBROUTINE finalize_mpipara
   USE mpi_mod
-  IMPLICIT NONE
-    
+#ifdef CPP_USING_XIOS
+  USE xios
+#endif
+  IMPLICIT NONE
+    
+#ifdef CPP_USING_XIOS
+      CALL xios_finalize
+#endif
     IF (using_mpi) CALL MPI_FINALIZE(ierr)