Use only round brackets

cp2k · Feb 4, 2020 · cf7cce6 · cf7cce6
1 parent 40778af
commit cf7cce6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/arch/Linux-x86-64-intel-minimal.popt b/arch/Linux-x86-64-intel-minimal.popt
@@ -4,7 +4,7 @@
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.3.199 Build 20190206
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.4.243 Build 20190416
 #              Intel MPI, MKL
-# Author: Matthias Krack (matthias.krack@psi.ch, PSI, December 2019)
+# Author: Matthias Krack (matthias.krack@psi.ch, PSI, January 2020)
 
 CC        = mpiicc
 FC        = mpiifort
@@ -18,19 +18,19 @@ DFLAGS   += -D__parallel -D__SCALAPACK
 
 FCFLAGS   = $(CFLAGS) $(DFLAGS)
 FCFLAGS  += -fpp -fp-model precise -free -funroll-loops
-FCFLAGS  += -I${MKLROOT}/include -I${MKLROOT}/include/fftw
+FCFLAGS  += -I$(MKLROOT)/include -I$(MKLROOT)/include/fftw
 
 LDFLAGS   = $(FCFLAGS) -static-intel -static_mpi
 LDFLAGS_C = -nofor_main
 
-MKL_LIB   = ${MKLROOT}/lib/intel64
+MKL_LIB   = $(MKLROOT)/lib/intel64
 
 LIBS      = $(MKL_LIB)/libmkl_scalapack_lp64.a
 LIBS     += -Wl,--start-group
 LIBS     += $(MKL_LIB)/libmkl_intel_lp64.a
-LIBS     += ${MKL_LIB}/libmkl_sequential.a
+LIBS     += $(MKL_LIB)/libmkl_sequential.a
 LIBS     += $(MKL_LIB)/libmkl_core.a
-LIBS     += ${MKL_LIB}/libmkl_blacs_intelmpi_lp64.a
+LIBS     += $(MKL_LIB)/libmkl_blacs_intelmpi_lp64.a
 LIBS     += -Wl,--end-group
 
 # Required due to memory leak that occurs if high optimisations are used

diff --git a/arch/Linux-x86-64-intel-minimal.psmp b/arch/Linux-x86-64-intel-minimal.psmp
@@ -4,7 +4,7 @@
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.3.199 Build 20190206
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.4.243 Build 20190416
 #              Intel MPI, MKL
-# Author: Matthias Krack (matthias.krack@psi.ch, PSI, December 2019)
+# Author: Matthias Krack (matthias.krack@psi.ch, PSI, Januar 2020)
 
 CC        = mpiicc
 FC        = mpiifort
@@ -18,19 +18,19 @@ DFLAGS   += -D__parallel -D__SCALAPACK
 
 FCFLAGS   = $(CFLAGS) $(DFLAGS)
 FCFLAGS  += -fopenmp -fpp -fp-model precise -free -funroll-loops
-FCFLAGS  += -I${MKLROOT}/include -I${MKLROOT}/include/fftw
+FCFLAGS  += -I$(MKLROOT)/include -I$(MKLROOT)/include/fftw
 
 LDFLAGS   = $(FCFLAGS) -static-intel -static_mpi
 LDFLAGS_C = -nofor_main
 
-MKL_LIB   = ${MKLROOT}/lib/intel64
+MKL_LIB   = $(MKLROOT)/lib/intel64
 
 LIBS      = $(MKL_LIB)/libmkl_scalapack_lp64.a
 LIBS     += -Wl,--start-group
 LIBS     += $(MKL_LIB)/libmkl_intel_lp64.a
-LIBS     += ${MKL_LIB}/libmkl_sequential.a
+LIBS     += $(MKL_LIB)/libmkl_sequential.a
 LIBS     += $(MKL_LIB)/libmkl_core.a
-LIBS     += ${MKL_LIB}/libmkl_blacs_intelmpi_lp64.a
+LIBS     += $(MKL_LIB)/libmkl_blacs_intelmpi_lp64.a
 LIBS     += -Wl,--end-group
 
 # Required due to memory leak that occurs if high optimisations are used

diff --git a/arch/Linux-x86-64-intel-regtest.popt b/arch/Linux-x86-64-intel-regtest.popt
@@ -2,7 +2,7 @@
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.3.199 Build 20190206
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.4.243 Build 20190416
 #              Intel MPI, MKL, Libint 2.6.0, Libxc 4.3.4, libxsmm 1.14, ELPA 2019.05.001, PLUMED 2.5.2, SPGLIB 1.12.2
-# Author: Matthias Krack (matthias.krack@psi.ch, PSI, December 2019)
+# Author: Matthias Krack (matthias.krack@psi.ch, PSI, January 2020)
 
 CC          = mpiicc
 FC          = mpiifort
@@ -36,14 +36,14 @@ DFLAGS     += -D__CHECK_DIAG
 
 FCFLAGS     = $(CFLAGS) $(DFLAGS)
 FCFLAGS    += -fpp -fp-model precise -free -funroll-loops
-FCFLAGS    += -I${MKLROOT}/include -I${MKLROOT}/include/fftw
+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)
 
 LDFLAGS     = $(FCFLAGS) -static-intel -static_mpi
 LDFLAGS_C   = -nofor_main
 
-MKL_LIB     = ${MKLROOT}/lib/intel64
+MKL_LIB     = $(MKLROOT)/lib/intel64
 
 LIBS        = $(PLUMED_DEPENDENCIES) $(GSL_LIBRARY_DIR)/libgsl.a $(GSL_LIBRARY_DIR)/libgslcblas.a $(LIBPATH)/libz.a
 LIBS       += $(ELPA_LIB)/libelpa.a
@@ -54,9 +54,9 @@ LIBS       += $(SPGLIB_LIB)/libsymspg.a
 LIBS       += $(MKL_LIB)/libmkl_scalapack_lp64.a
 LIBS       += -Wl,--start-group
 LIBS       += $(MKL_LIB)/libmkl_intel_lp64.a
-LIBS       += ${MKL_LIB}/libmkl_sequential.a
+LIBS       += $(MKL_LIB)/libmkl_sequential.a
 LIBS       += $(MKL_LIB)/libmkl_core.a
-LIBS       += ${MKL_LIB}/libmkl_blacs_intelmpi_lp64.a
+LIBS       += $(MKL_LIB)/libmkl_blacs_intelmpi_lp64.a
 LIBS       += -Wl,--end-group
 LIBS       += $(GCC_LIBRARY_DIR)/libstdc++.a
 

diff --git a/arch/Linux-x86-64-intel-regtest.psmp b/arch/Linux-x86-64-intel-regtest.psmp
@@ -2,7 +2,7 @@
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.3.199 Build 20190206
 #              Intel(R) Fortran Intel(R) 64 Compiler for applications running on Intel(R) 64, Version 19.0.4.243 Build 20190416
 #              Intel MPI, MKL, Libint 2.6.0, Libxc 4.3.4, libxsmm 1.14, ELPA 2019.05.001, PLUMED 2.5.2, SPGLIB 1.12.2
-# Author: Matthias Krack (matthias.krack@psi.ch, PSI, December 2019)
+# Author: Matthias Krack (matthias.krack@psi.ch, PSI, January 2020)
 
 CC          = mpiicc
 FC          = mpiifort
@@ -36,14 +36,14 @@ DFLAGS     += -D__CHECK_DIAG
 
 FCFLAGS     = $(CFLAGS) $(DFLAGS)
 FCFLAGS    += -fopenmp -fpp -fp-model precise -free -funroll-loops
-FCFLAGS    += -I${MKLROOT}/include -I${MKLROOT}/include/fftw
+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)
 
 LDFLAGS     = $(FCFLAGS) -static-intel -static_mpi
 LDFLAGS_C   = -nofor_main
 
-MKL_LIB     = ${MKLROOT}/lib/intel64
+MKL_LIB     = $(MKLROOT)/lib/intel64
 
 LIBS        = $(PLUMED_DEPENDENCIES) $(GSL_LIBRARY_DIR)/libgsl.a $(GSL_LIBRARY_DIR)/libgslcblas.a $(LIBPATH)/libz.a
 LIBS       += $(ELPA_LIB)/libelpa_openmp.a
@@ -54,9 +54,9 @@ LIBS       += $(SPGLIB_LIB)/libsymspg.a
 LIBS       += $(MKL_LIB)/libmkl_scalapack_lp64.a
 LIBS       += -Wl,--start-group
 LIBS       += $(MKL_LIB)/libmkl_intel_lp64.a
-LIBS       += ${MKL_LIB}/libmkl_sequential.a
+LIBS       += $(MKL_LIB)/libmkl_sequential.a
 LIBS       += $(MKL_LIB)/libmkl_core.a
-LIBS       += ${MKL_LIB}/libmkl_blacs_intelmpi_lp64.a
+LIBS       += $(MKL_LIB)/libmkl_blacs_intelmpi_lp64.a
 LIBS       += -Wl,--end-group
 LIBS       += $(GCC_LIBRARY_DIR)/libstdc++.a