Changeset 1864 for LMDZ5/branches/testing/libf/dyn3dpar/mod_const_mpi.F90

Timestamp:

Sep 11, 2013, 11:45:01 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Création d'une nouvelle testing:

merge des modifications du trunk entre r1796 et r1860

---

New testing version

merged modifications between r1796 and r1860 from the trunk

i.e.
svn merge -r1796:1860 ​http://svn.lmd.jussieu.fr/LMDZ/LMDZ5/trunk

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/mod_const_mpi.F90 (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3dpar/mod_const_mpi.F90

@@ -51 +51 @@
   
   SUBROUTINE Init_mpi
+#ifdef CPP_XIOS
+    USE wxios
+#endif
   IMPLICIT NONE
 #ifdef CPP_MPI
@@ -70 +73 @@
       COMM_LMDZ=MPI_COMM_WORLD
       MPI_REAL_LMDZ=MPI_REAL8
+
+    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+    ! Initialisation de XIOS
+    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#ifdef CPP_XIOS
+      CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
+#endif
+!$OMP END MASTER
+#else
+#ifdef CPP_XIOS
+!$OMP MASTER
+      CALL wxios_init("LMDZ")
 !$OMP END MASTER
 #endif
-
+#endif
    END SUBROUTINE Init_mpi