Changeset 1856 for LMDZ5/trunk/libf/dyn3dmem

Timestamp:

Aug 30, 2013, 3:59:10 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Implémentation de XIOS dans dyn3dmem.
UG
................................
XIOS implementation in dyn3dmem.
UG

Location:

LMDZ5/trunk/libf/dyn3dmem

Files:

• mod_const_mpi.F90 (modified) (3 diffs)
• parallel_lmdz.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3dmem/mod_const_mpi.F90

@@ -22 +22 @@
     INCLUDE 'mpif.h'
 #endif
+
     INTEGER             :: ierr
     INTEGER             :: comp_id
@@ -51 +52 @@
   
   SUBROUTINE Init_mpi
+#ifdef CPP_XIOS
+    USE wxios
+#endif
   IMPLICIT NONE
 #ifdef CPP_MPI
@@ -70 +74 @@
       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
 

LMDZ5/trunk/libf/dyn3dmem/parallel_lmdz.F90

@@ -367 +367 @@
     
     subroutine Finalize_parallel
+#ifdef CPP_XIOS
+    ! ug Pour les sorties XIOS
+        USE wxios
+#endif
 #ifdef CPP_COUPLE
     use mod_prism_proto
@@ -400 +404 @@
 #endif 
       else
+#ifdef CPP_XIOS
+    !Fermeture propre de XIOS
+      CALL wxios_close()
+#endif
 #ifdef CPP_MPI
          IF (using_mpi) call MPI_FINALIZE(ierr)