Changeset 1897 for LMDZ5/trunk/libf/dyn3dpar

Timestamp:

Oct 25, 2013, 10:12:38 AM (11 years ago)

Author:

Ehouarn Millour

Message:

Getting XIOS to work in MPI, OpenMP and mixed MPI/OpenMP modes. Use "-io xios" option with makelmdz or makelmdz_fcm to enable XIOS (this doesn't deactivate IOIPSL outputs; to suppress IOIPSL outputs, add cpp flag CPP_NO_IOIPSL).
EM

File:

• LMDZ5/trunk/libf/dyn3dpar/mod_const_mpi.F90 (modified) (6 diffs)

LMDZ5/trunk/libf/dyn3dpar/mod_const_mpi.F90

@@ -3 +3 @@
 !
 MODULE mod_const_mpi
-
+  IMPLICIT NONE
   INTEGER,SAVE :: COMM_LMDZ
   INTEGER,SAVE :: MPI_REAL_LMDZ
@@ -12 +12 @@
   SUBROUTINE Init_const_mpi
 #ifdef CPP_IOIPSL
-    USE IOIPSL
+    USE IOIPSL, ONLY: getin
 #else
 ! if not using IOIPSL, we still need to use (a local version of) getin
-    USE ioipsl_getincom
+    USE ioipsl_getincom, only: getin
 #endif
 
@@ -22 +22 @@
     INCLUDE 'mpif.h'
 #endif
+
     INTEGER             :: ierr
     INTEGER             :: comp_id
@@ -52 +53 @@
   SUBROUTINE Init_mpi
 #ifdef CPP_XIOS
-    USE wxios
+    USE wxios, only: wxios_init
 #endif
   IMPLICIT NONE
@@ -73 +74 @@
       COMM_LMDZ=MPI_COMM_WORLD
       MPI_REAL_LMDZ=MPI_REAL8
-
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    ! Initialisation de XIOS
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Initialisation de XIOS
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 #ifdef CPP_XIOS
       CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
@@ -88 +88 @@
 #endif
 #endif
+
    END SUBROUTINE Init_mpi