diff --git a/CMakeLists.txt b/CMakeLists.txt index d78027557..281d65aee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,8 +137,6 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") include (Compiler-Intel) elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") include (Compiler-GNU) -elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "PGI") - include (Compiler-PGI) else () message (FATAL_ERROR "Compiler type (CMAKE_Fortran_COMPILER_ID) not recognized") endif () diff --git a/cmake/Compiler-PGI.cmake b/cmake/Compiler-PGI.cmake deleted file mode 100644 index 8ca8cfc5c..000000000 --- a/cmake/Compiler-PGI.cmake +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################################### -# PGI Compiler -################################################################################################### - -if (OPENMP) - set (OPENMP_FLAGS "-mp") -else () - set (OPENMP_FLAGS "-nomp") -endif () - - -if (OPTIMIZATION STREQUAL "OFF") - set (OPTIMIZATION_FLAGS "-O0" ) -elseif (OPTIMIZATION STREQUAL "DEFENSIVE") - set (OPTIMIZATION_FLAGS "-O2 -fast") -elseif (OPTIMIZATION STREQUAL "AGGRESSIVE") - set (OPTIMIZATION_FLAGS "-O4 -fast -Mvect=sse") -endif () - -set (STANDARD_CHECK "-Mallocatable=03 -Mstandard") - -#------------------------------------------------------------------------------------------------ -# Fine tuning compilation options -set (COMPILE_FLAGS "${COMPILE_FLAGS} -Mpreprocess") -# preprocessor - -set (COMPILE_FLAGS "${COMPILE_FLAGS} -Minfo=all") -# instructs the compiler to produce information on standard error - -set (COMPILE_FLAGS "${COMPILE_FLAGS} -Minform=warn") -# instructs the compiler to display error messages at the specified and higher levels - -set (COMPILE_FLAGS "${COMPILE_FLAGS} -Mdclchk") -# instructs the compiler to require that all program variables be declared - -#------------------------------------------------------------------------------------------------O -# Runtime debugging -set (DEBUG_FLAGS "${DEBUG_FLAGS} -g") -# Includes debugging information in the object module; sets the optimization level to zero unless a -⁠O option is present on the command line -set (DEBUG_FLAGS "${DEBUG_FLAGS} -C") -# Generates code to check array bounds -set (DEBUG_FLAGS "${DEBUG_FLAGS} -Mchkptr") -# Check for NULL pointers (pgf95, pgfortran only) -set (DEBUG_FLAGS "${DEBUG_FLAGS} -Mchkstk") -# Check the stack for available space upon entry to and before the start of a parallel region. Useful when many private variables are declared -set (DEBUG_FLAGS "${DEBUG_FLAGS} -Mbounds") -# Specifies whether array bounds checking is enabled or disabled - -#------------------------------------------------------------------------------------------------ -# precision settings -set (PRECISION_FLAGS "${PRECISION_FLAGS} -r8") -# Determines whether the compiler promotes REAL variables and constants to DOUBLE PRECISION diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index e01c050fa..43398d0ad 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -96,15 +96,10 @@ subroutine DAMASK_interface_init print'(/,a)', ' Version: '//DAMASKVERSION - ! https://github.com/jeffhammond/HPCInfo/blob/master/docs/Preprocessor-Macros.md -#if defined(__PGI) - print'(/,a,i4.4,a,i8.8)', ' Compiled with PGI fortran version :', __PGIC__,& - '.', __PGIC_MINOR__ -#else print'(/,a)', ' Compiled with: '//compiler_version() print'(a)', ' Compiler options: '//compiler_options() -#endif + ! https://github.com/jeffhammond/HPCInfo/blob/master/docs/Preprocessor-Macros.md print'(/,a)', ' Compiled on: '//__DATE__//' at '//__TIME__ print'(/,a,i0,a,i0,a,i0)', & diff --git a/src/rotations.f90 b/src/rotations.f90 index 531b08d14..8d7b842fc 100644 --- a/src/rotations.f90 +++ b/src/rotations.f90 @@ -638,7 +638,7 @@ function om2ax(om) result(ax) else call dgeev('N','V',3,om_,3,Wr,Wi,devNull,3,VR,3,work,size(work,1),ierr) if (ierr /= 0) error stop 'LAPACK error' -#if defined(__GFORTRAN__) && __GNUC__<9 || defined(__INTEL_COMPILER) && INTEL_COMPILER<1800 || defined(__PGI) +#if defined(__GFORTRAN__) && __GNUC__<9 i = maxloc(merge(1,0,cEq(cmplx(Wr,Wi,pReal),cmplx(1.0_pReal,0.0_pReal,pReal),tol=1.0e-14_pReal)),dim=1) #else i = findloc(cEq(cmplx(Wr,Wi,pReal),cmplx(1.0_pReal,0.0_pReal,pReal),tol=1.0e-14_pReal),.true.,dim=1) !find eigenvalue (1,0)