Restored debug version of the Makefile.Defines

Makefile.Defines

@@ -45,6 +45,11 @@ COLLRESOLVE_HOME = $(ROOT_DIR)/collresolve/
 
 # DO NOT include in FFLAGS the "-c" option to compile object only
 # this is done explicitly as needed in the Makefile
+ADVIXE_DIR = /apps/cent7/intel/advisor_2019
+ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vecabi=cmdtarget -simd -shared-intel -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -xhost -traceback 
+
+VTUNE_FLAGS = -g -O2 -qopt-report=5 -simd -shared-intel -qopenmp -debug inline-debug-info -parallel-source-info=2 -parallel -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -qopenmp -fp-model no-except -mp1 -xhost -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 
@@ -61,27 +66,26 @@ 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 
 
-FSTRICTFLAGS = $(IPRODUCTION) $(STRICTREAL) $(OPTREPORT) 
-FFLAGS = $(IPRODUCTION) -fp-model=fast $(OPTREPORT) 
+FSTRICTFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR)
+FFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR)
 FORTRAN = ifort
 AR     = xiar
 CC    = icc
 
 #FORTRAN = gfortran
 #FFLAGS =  $(GDEBUG)  $(GMEM) #$(GPAR)
-#FFLAGS =  $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall 
-#FSTRICTFLAGS=  $(GPRODUCTION) #-g -fbacktrace -fcheck=all #-Wall 
+#FSTRICTFLAGS =  $(GDEBUG)  $(GMEM) #$(GPAR)
 #AR     = ar 
+#CC     = cc
 
 # 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
 CFLAGS          = -O3 -w -m64 -std=c99
 
 64_BIT_REALS    = -r8