Suppress format warnings; add openmp flag to CFLAGS

cp2k · Aug 6, 2020 · 484564f · 484564f
1 parent 903ff39
commit 484564f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/arch/Linux-x86-64-intel-minimal.psmp b/arch/Linux-x86-64-intel-minimal.psmp
@@ -5,20 +5,27 @@
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.4.243 Build 20190416
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.1.1.217 Build 20200306
 #              Intel MPI, MKL
-# Author: Matthias Krack (matthias.krack@psi.ch, PSI, May 2020)
+# Author: Matthias Krack (matthias.krack@psi.ch, PSI, August 2020)
 
 CC        = mpiicc
 FC        = mpiifort
 LD        = mpiifort
 AR        = ar -r
 
-CFLAGS    = -O2 -g -traceback -xHost
+CFLAGS    = -O2 -g -qopenmp -traceback -xHost
 
-DFLAGS    = -D__FFTW3 -D__MKL -D__MPI_VERSION=3
-DFLAGS   += -D__parallel -D__SCALAPACK
+DFLAGS    = -D__FFTW3
+DFLAGS   += -D__MKL
+DFLAGS   += -D__MPI_VERSION=3
+DFLAGS   += -D__parallel
+DFLAGS   += -D__SCALAPACK
 
 FCFLAGS   = $(CFLAGS) $(DFLAGS)
-FCFLAGS  += -fopenmp -fpp -free -funroll-loops
+FCFLAGS  += -diag-disable=8291
+FCFLAGS  += -diag-disable=8293
+FCFLAGS  += -fpp
+FCFLAGS  += -free
+FCFLAGS  += -funroll-loops
 FCFLAGS  += -I$(MKLROOT)/include -I$(MKLROOT)/include/fftw
 
 LDFLAGS   = $(FCFLAGS) -static-intel -static_mpi

diff --git a/arch/Linux-x86-64-intel-regtest.psmp b/arch/Linux-x86-64-intel-regtest.psmp
@@ -3,7 +3,7 @@
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.4.243 Build 20190416
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.1.1.217 Build 20200306
 #              Intel MPI, MKL, Libint 2.6.0, Libxc 4.3.4, libxsmm 1.15, ELPA 2019.05.001, PLUMED 2.5.2, SPGLIB 1.12.2
-# Author: Matthias Krack (matthias.krack@psi.ch, PSI, May 2020)
+# Author: Matthias Krack (matthias.krack@psi.ch, PSI, August 2020)
 
 CC          = mpiicc
 FC          = mpiifort
@@ -28,15 +28,27 @@ LIBXSMM_LIB = $(INTEL_PATH)/libxsmm/1.15/lib
 SPGLIB_INC  = $(INTEL_PATH)/spglib/1.12.2/include
 SPGLIB_LIB  = $(INTEL_PATH)/spglib/1.12.2/lib
 
-CFLAGS      = -O2 -g -traceback -xHost
+CFLAGS      = -O2 -g -qopenmp -traceback -xHost
 
-DFLAGS      = -D__ELPA -D__FFTW3 -D__LIBINT -D__LIBXC -D__LIBXSMM
-DFLAGS     += -D__MKL -D__MPI_VERSION=3 -D__PLUMED2 -D__SPGLIB
-DFLAGS     += -D__parallel -D__SCALAPACK
+DFLAGS      = -D__ELPA
+DFLAGS     += -D__FFTW3
+DFLAGS     += -D__LIBINT
+DFLAGS     += -D__LIBXC
+DFLAGS     += -D__LIBXSMM
+DFLAGS     += -D__MKL
+DFLAGS     += -D__MPI_VERSION=3
+DFLAGS     += -D__PLUMED2
+DFLAGS     += -D__SPGLIB
+DFLAGS     += -D__parallel
+DFLAGS     += -D__SCALAPACK
 DFLAGS     += -D__CHECK_DIAG
 
 FCFLAGS     = $(CFLAGS) $(DFLAGS)
-FCFLAGS    += -fopenmp -fpp -free -funroll-loops
+FCFLAGS    += -diag-disable=8291
+FCFLAGS    += -diag-disable=8293
+FCFLAGS    += -fpp
+FCFLAGS    += -free
+FCFLAGS    += -funroll-loops
 FCFLAGS    += -I$(MKLROOT)/include -I$(MKLROOT)/include/fftw
 FCFLAGS    += -I$(ELPA_INC)/elpa -I$(ELPA_INC)/modules
 FCFLAGS    += -I$(LIBINT_INC) -I$(LIBXC_INC) -I$(LIBXSMM_INC)