Changeset 1600 for LMDZ5

Timestamp:

Dec 6, 2011, 2:16:30 PM (13 years ago)

Author:

jghattas

Message:

ce0l - Changed finalize_parallel into mpi_finalize because the program ce0l did not finish correctly for case ocean_type=couple.

File:

• LMDZ5/trunk/libf/dyn3dpar/ce0l.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dyn3dpar/ce0l.F90

@@ -19 +19 @@
   USE dimphy
   USE comgeomphy
-  USE mod_phys_lmdz_para
+  USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root
   USE mod_const_mpi
   USE infotrac
@@ -42 +42 @@
 #include "temps.h"
 #include "logic.h"
+#ifdef CPP_MPI
+      include 'mpif.h'
+#endif
+
   INTEGER, PARAMETER            :: longcles=20
+  INTEGER                       :: ierr
   REAL,    DIMENSION(longcles)  :: clesphy0
   REAL,    DIMENSION(iip1,jjp1) :: masque
@@ -50 +55 @@
   CALL conf_gcm( 99, .TRUE. , clesphy0 )
 
+#ifdef CPP_MPI
   CALL init_mpi
+#endif
 
   CALL Init_Phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
@@ -115 +122 @@
   END IF
   
+#ifdef CPP_MPI
 !$OMP MASTER
-  CALL finalize_parallel
+  CALL MPI_FINALIZE(ierr)
+  IF (ierr /= 0) CALL abort_gcm('ce0l','Error in MPI_FINALIZE',1)
 !$OMP END MASTER
+#endif
 
 #endif