Streamlined compiler arguments

Makefile.Defines

@@ -48,39 +48,20 @@ COLLRESOLVE_HOME = $(ROOT_DIR)/collresolve/
 ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vec -shared-intel -ldl -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -traceback 
 #Be sure to set the environment variable KMP_FORKJOIN_FRAMES=1 for OpenMP debuging in vtune
 
-IDEBUG = -O0 -init=snan,arrays  -nogen-interfaces -no-pie -no-ftz -fpe-all=0 -g -traceback -mp1 -fp-model strict -fpe0 -debug all -align all -pad -ip -prec-div -prec-sqrt -assume protect-parens -CB -no-wrap-margin
 STRICTREAL = -fp-model=precise -prec-div -prec-sqrt -assume protect-parens 
 SIMDVEC = -simd -xhost -align all -assume contiguous_assumed_shape -vecabi=cmdtarget -fp-model no-except -fma
 PAR = -qopenmp -parallel  
-HEAPARR = -heap-arrays 4194304 
-OPTREPORT = -qopt-report=5 
-IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -sox $(PAR) $(SIMDVEC) #$(HEAPARR)
-
-#gfortran flags
-GDEBUG = -g -Og -fbacktrace -fbounds-check -ffree-line-length-none
-GPAR = -fopenmp -ftree-parallelize-loops=4
-GMEM =  -fsanitize-address-use-after-scope -fstack-check  -fsanitize=bounds-strict -fsanitize=undefined -fsanitize=signed-integer-overflow -fsanitize=object-size -fstack-protector-all
-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 
-#FFLAGS  = $(IDEBUG)  #$(SIMDVEC) $(PAR)
-#FFASTFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR)
+
 FSTRICTFLAGS = $(ADVIXE_FLAGS) $(STRICTREAL) $(SIMDVEC) $(PAR)
 FFLAGS = $(ADVIXE_FLAGS) -fp-model=fast $(SIMDVEC) $(PAR)
 FORTRAN = ifort
 AR     = xiar
 
-#FORTRAN = gfortran
-#FFLAGS =  $(GDEBUG) # $(GMEM) $(GPAR)
-#FFLAGS =  $(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
-CC              = cc
+CC              = icc
 CFLAGS          = -O3 -w -m64 -std=c99
 
 64_BIT_REALS    = -r8