From f62cdff6932874ac0bee578b19b8519cf7b4b029 Mon Sep 17 00:00:00 2001
From: David Minton <daminton@purdue.edu>
Date: Wed, 8 Dec 2021 17:10:21 -0500
Subject: [PATCH] Put back production flags

---
 Makefile.Defines | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/Makefile.Defines b/Makefile.Defines
index 90a2ceb58..fcc43b14a 100644
--- a/Makefile.Defines
+++ b/Makefile.Defines
@@ -41,20 +41,14 @@ SWIFTEST_HOME    = $(ROOT_DIR)
 USER_MODULES    =
 COLLRESOLVE_HOME = $(ROOT_DIR)/collresolve/
 
-#NETCDF_FORTRAN_HOME = /home/daminton/local
-
-
 # Compiler definitions
 
 # DO NOT include in FFLAGS the "-c" option to compile object only
 # this is done explicitly as needed in the Makefile
-ADVIXE_FLAGS = -g -O2 -qopt-report=5 -vecabi=cmdtarget -simd -shared-intel -debug inline-debug-info -DTBB_DEBUG -DTBB_USE_THREADING_TOOLS -xhost -traceback -parallel-source-info=2 
-#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 -qopt-matmul -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 -parallel-source-info=2 
+PAR = -qopenmp -parallel 
 HEAPARR = -heap-arrays 4194304 
 OPTREPORT = -qopt-report=5 
 IPRODUCTION = -no-wrap-margin -O3 -qopt-prefetch=0 -qopt-matmul -sox $(PAR) $(SIMDVEC) #$(HEAPARR)
@@ -66,13 +60,11 @@ 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)
 
-INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include
-LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib -lswiftest -lnetcdf -lnetcdff -qopt-matmul #$(PAR)
+INCLUDES = -I$(SWIFTEST_HOME)/include -I$(NETCDF_FORTRAN_HOME)/include -I$(MKLROOT)/include 
+LINKS = -L$(MKLROOT)/lib/intel64 -L$(NETCDF_FORTRAN_HOME)/lib  -lswiftest -lnetcdf -lnetcdff -qopt-matmul $(PAR)
 
-FSTRICTFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR) $(HEAPARR)
-FFLAGS  = $(IDEBUG) #$(SIMDVEC) $(PAR) $(HEAPARR)
-#FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) -g -traceback
-#FFLAGS  = $(IPRODUCTION) -fp-model=fast -g -traceback
+FSTRICTFLAGS  = $(IPRODUCTION) $(STRICTREAL) 
+FFLAGS  = $(IPRODUCTION) -fp-model=fast
 
 FORTRAN = ifort
 AR     = xiar