Preprocessing option __INTEL replaced by __INTEL_COMPILER that the compiler

automatically recognizes. Please verify if clib/stack.c always compile or not.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@11761 c92efa57-630b-4861-b058-cf58834340f0

Modules/environment.f90

@@ -46,11 +46,14 @@ CONTAINS
     INTEGER :: ios, crashunit
     INTEGER, EXTERNAL :: find_free_unit
 
-    ! ... Intel compilers v .ge.8 allocate a lot of stack space
+    ! ... The Intel compiler allocates a lot of stack space
     ! ... Stack limit is often small, thus causing SIGSEGV and crash
-  
+    ! ... One may use "ulimit -s unlimited" but it doesn't always work
+    ! ... The following call does the same and always works
+    !
+#ifdef __INTEL_COMPILER
     CALL remove_stack_limit ( )
-
+#endif
     ! ... use ".FALSE." to disable all clocks except the total cpu time clock
     ! ... use ".TRUE."  to enable clocks
 

Modules/error_handler.f90

@@ -28,7 +28,7 @@ SUBROUTINE errore( calling_routine, message, ierr )
   USE mp_world,  ONLY : mpime, world_comm
   USE io_global, ONLY : stdout
   USE io_files,  ONLY : crash_file
-#if defined(__PTRACE) && defined(__INTEL)
+#if defined(__PTRACE) && defined(__INTEL_COMPILER)
   USE ifcore,    ONLY : tracebackqq
 #endif
  !
@@ -73,7 +73,7 @@ SUBROUTINE errore( calling_routine, message, ierr )
   FLUSH( stdout )
   !
 #ifdef __PTRACE
-#ifdef __INTEL
+#ifdef __INTEL_COMPILER
   call tracebackqq(user_exit_code=-1)
 #elif __GFORTRAN
 #if (__GNUC__>4) || ((__GNUC__==4) && (__GNUC_MINOR__>=8))

clib/stack.c

@@ -9,11 +9,10 @@
 #include "c_defs.h"
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef __INTEL
 
 #include <sys/resource.h>
 
-void F77_FUNC_(remove_stack_limit,REMOVE_STACK_LIMIT) (void) {
+void remove_stack_limit_(void) {
  
   struct rlimit rlim = { RLIM_INFINITY, RLIM_INFINITY };
 
@@ -29,8 +28,3 @@ void F77_FUNC_(remove_stack_limit,REMOVE_STACK_LIMIT) (void) {
     }
   }
 }
-
-#else
-void F77_FUNC_(remove_stack_limit,REMOVE_STACK_LIMIT) (void) {
-}
-#endif

include/defs.h.README

@@ -68,8 +68,6 @@ Hardware/Compiler:
       __SX6       Nec sx-6 vector machines (Nec compiler)
       __PGI       Portland Group compiler (workarounds for compiler bugs)
       __GFORTRAN  gnu gfortran (workarounds for compiler bugs)
-      __INTEL     Intel ifc and ifort compilers (workaround for compiler 
-                  bugs and for insufficient stack size)
 OS:
 Parallel execution:
       __PARA      Parallel execution - should be replaced by: