Changeset 1748 for LMDZ5/trunk

Timestamp:

Apr 24, 2013, 4:18:40 PM (12 years ago)

Author:

Ehouarn Millour

Message:

OMP CRITICAL name must be between brackets (ifort specific?) or else compilation fails in OpenMP mode. Moreover it is recommended to use different names for different OMP CRITICAL sections.
EM

Location:

LMDZ5/trunk/libf

Files:

• dyn3dmem/abort_gcm.F (modified) (2 diffs)
• dyn3dpar/abort_gcm.F (modified) (1 diff)

LMDZ5/trunk/libf/dyn3dmem/abort_gcm.F

@@ -1 +1 @@
 !
-! $Id: abort_gcm.F 1492 2011-03-08 08:10:25Z fairhead $
+! $Id: abort_gcm.F 1747 2013-04-23 14:06:30Z lguez $
 !
 c
@@ -48 +48 @@
         write(lunout,*) 'Houston, we have a problem ', ierr
 #ifdef CPP_MPI
-C$OMP CRITICAL MPI
+C$OMP CRITICAL (MPI_ABORT_GCM)
         call MPI_ABORT(COMM_LMDZ, 1, ierror_mpi)
-C$OMP END CRITICAL MPI
+C$OMP END CRITICAL (MPI_ABORT_GCM)
 #else
         stop 1

LMDZ5/trunk/libf/dyn3dpar/abort_gcm.F

@@ -48 +48 @@
         write(lunout,*) 'Houston, we have a problem ', ierr
 #ifdef CPP_MPI
-C$OMP CRITICAL MPI
+C$OMP CRITICAL (MPI_ABORT_GCM)
         call MPI_ABORT(COMM_LMDZ, 1, ierror_mpi)
-C$OMP END CRITICAL MPI
+C$OMP END CRITICAL (MPI_ABORT_GCM)
 #else
         stop 1