From 6caaa8d7d5735e8d9898523a459ef84122d1d23d Mon Sep 17 00:00:00 2001 From: David A Minton Date: Sun, 10 Oct 2021 16:24:29 -0400 Subject: [PATCH] Switched this branch to default to gfortran --- Makefile.Defines | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile.Defines b/Makefile.Defines index 6050b5790..4cbf3e055 100644 --- a/Makefile.Defines +++ b/Makefile.Defines @@ -66,23 +66,24 @@ GMEM = -fsanitize-address-use-after-scope -fstack-check -fsanitize=bounds-stri GWARNINGS = -Wall -Warray-bounds -Wimplicit-interface -Wextra -Warray-temporaries GPRODUCTION = -O3 -ffree-line-length-none $(GPAR) - -MKL_ROOT = /apps/spack/bell/apps/intel-parallel-studio/cluster.2019.5-intel-19.0.5-4brgqlf/mkl/lib -IMKL = -I$(MKLROOT)/include -LMKL = -L$(MKLROOT)/lib/intel64 -qopt-matmul +#MKL_ROOT = /apps/spack/bell/apps/intel-parallel-studio/cluster.2019.5-intel-19.0.5-4brgqlf/mkl/lib +#IMKL = -I$(MKLROOT)/include +#LMKL = -L$(MKLROOT)/lib/intel64 -qopt-matmul #FFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) #FFASTFLAGS = $(IDEBUG) $(SIMDVEC) $(PAR) -FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT) #$(ADVIXE_FLAGS) -FFLAGS = $(IPRODUCTION) -fp-model=fast $(OPTREPORT) #$(ADVIXE_FLAGS) -FORTRAN = ifort -AR = xiar +#FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT) #$(ADVIXE_FLAGS) +#FFLAGS = $(IPRODUCTION) -fp-model=fast $(OPTREPORT) #$(ADVIXE_FLAGS) +#FORTRAN = ifort +#AR = xiar -#FORTRAN = gfortran +FORTRAN = gfortran #FFLAGS = $(GDEBUG) $(GMEM) #$(GPAR) -#FFLAGS = $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall -#FSTRICTFLAGS= $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall -#AR = ar # DO NOT include in CFLAGS the "-c" option to compile object only +FFLAGS = $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall +FSTRICTFLAGS= $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall +AR = ar + +# DO NOT include in CFLAGS the "-c" option to compile object only # this is done explicitly as needed in the Makefile #CC = icc