Merge branch 'debug'

Makefile

@@ -60,10 +60,6 @@ SWIFTEST_MODULES =   swiftest_globals.f90 \
 
 include Makefile.Defines
 
-#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 
-
 MODULES         = $(SWIFTEST_MODULES) $(USER_MODULES) 
 
 .PHONY : all mod fast strict drivers bin clean force 

Makefile.Defines

@@ -66,18 +66,23 @@ 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 
+
 #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