Changeset 1734

Timestamp:

Mar 28, 2013, 12:41:27 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Added test to stop if in OpenMP mode and trying to use adjust=y (which is not cleanly implemented); adjust=y should only be used in MPI mode (or in mixed MPI/OpenMP mode with only 1 thread).
EM

Location:

LMDZ5/trunk/libf

Files:

• dyn3dmem/conf_gcm.F (modified) (3 diffs)
• dyn3dpar/conf_gcm.F (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3dmem/conf_gcm.F

@@ -62 +62 @@
       LOGICAL  fxyhypbb, ysinuss
       INTEGER i
-      
+      character(len=*),parameter :: modname="conf_gcm"
+      character (len=80) :: abort_message
+#ifdef CPP_OMP
+      integer,external :: OMP_GET_NUM_THREADS
+#endif
 c
 c  -------------------------------------------------------------------
@@ -91 +95 @@
 c   initialisations:
 c   ----------------
-      adjust=.false.
-      call getin('adjust',adjust)
-      
-      itaumax=0
-      call getin('itaumax',itaumax);
-      if (itaumax<=0) itaumax=HUGE(itaumax)
       
 !Config  Key  = lunout
@@ -109 +107 @@
      &          STATUS='unknown',FORM='formatted')
       ENDIF
+
+      adjust=.false.
+      call getin('adjust',adjust)
+
+#ifdef CPP_OMP
+      ! adjust=y not implemented in case of OpenMP threads...
+!$OMP PARALLEL
+      if ((OMP_GET_NUM_THREADS()>1).and.adjust) then
+        write(lunout,*)'conf_gcm: Error, adjust should be set to n'
+     &,' when running with OpenMP threads'
+        abort_message = 'Wrong value for adjust'
+        call abort_gcm(modname,abort_message,1)
+      endif
+!$OMP END PARALLEL         
+#endif
+
+      itaumax=0
+      call getin('itaumax',itaumax);
+      if (itaumax<=0) itaumax=HUGE(itaumax)
 
 !Config  Key  = prt_level

LMDZ5/trunk/libf/dyn3dpar/conf_gcm.F

@@ -61 +61 @@
       LOGICAL  fxyhypbb, ysinuss
       INTEGER i
-      
+      character(len=*),parameter :: modname="conf_gcm"
+      character (len=80) :: abort_message
+#ifdef CPP_OMP
+      integer,external :: OMP_GET_NUM_THREADS
+#endif
 c
 c  -------------------------------------------------------------------
@@ -90 +94 @@
 c   initialisations:
 c   ----------------
-      adjust=.false.
-      call getin('adjust',adjust)
-      
-      itaumax=0
-      call getin('itaumax',itaumax);
-      if (itaumax<=0) itaumax=HUGE(itaumax)
       
 !Config  Key  = lunout
@@ -108 +106 @@
      &          STATUS='unknown',FORM='formatted')
       ENDIF
+
+      adjust=.false.
+      call getin('adjust',adjust)
+
+#ifdef CPP_OMP
+      ! adjust=y not implemented in case of OpenMP threads...
+!$OMP PARALLEL
+      if ((OMP_GET_NUM_THREADS()>1).and.adjust) then
+        write(lunout,*)'conf_gcm: Error, adjust should be set to n'
+     &,' when running with OpenMP threads'
+        abort_message = 'Wrong value for adjust'
+        call abort_gcm(modname,abort_message,1)
+      endif
+!$OMP END PARALLEL         
+#endif
+
+      itaumax=0
+      call getin('itaumax',itaumax);
+      if (itaumax<=0) itaumax=HUGE(itaumax)
 
 !Config  Key  = prt_level