Changeset 1476 for LMDZ4/branches/LMDZ4_AR5

Timestamp:

Jan 25, 2011, 12:12:55 PM (14 years ago)

Author:

jghattas

Message:

Bug correction for ce0l in dyn3dpar :

• added missing MPI_FINALIZE
• removed STOP before end of program

Location:

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar

Files:

• ce0l.F90 (modified) (3 diffs)
• limit_netcdf.F90 (modified) (1 diff)
• parallel.F90 (modified) (2 diffs)

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/ce0l.F90

@@ -22 +22 @@
   USE mod_const_mpi
   USE infotrac
+  USE parallel, ONLY: finalize_parallel
 
 #ifdef CPP_IOIPSL
@@ -56 +57 @@
        CALL abort_gcm('ce0l','In parallel mode,                         &
  &                 ce0l must be called only                             &
- &                 for 1 process and 1 task')
+ &                 for 1 process and 1 task',1)
   ENDIF
 
@@ -102 +103 @@
   END IF
 
+!$OMP MASTER
+  CALL finalize_parallel
+!$OMP END MASTER
+
 #endif
 ! of #ifndef CPP_EARTH #else
-  STOP
 
 END PROGRAM ce0l

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/limit_netcdf.F90

@@ -267 +267 @@
 #endif
 ! of #ifdef CPP_EARTH
-  STOP
 
 

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/parallel.F90

@@ -5 +5 @@
   USE mod_const_mpi
     
-    LOGICAL,SAVE :: using_mpi
+    LOGICAL,SAVE :: using_mpi=.TRUE.
     LOGICAL,SAVE :: using_omp
     
@@ -208 +208 @@
       integer :: ierr
       integer :: i
-      deallocate(jj_begin_para)
-      deallocate(jj_end_para)
-      deallocate(jj_nb_para)
+
+      if (allocated(jj_begin_para)) deallocate(jj_begin_para)
+      if (allocated(jj_end_para))   deallocate(jj_end_para)
+      if (allocated(jj_nb_para))    deallocate(jj_nb_para)
 
       if (type_ocean == 'couple') then