--- trunk/gadget/Makefile	2015/07/23 19:00:38	11
+++ trunk/gadget/Makefile	2016/05/25 16:36:33	19
@@ -7,7 +7,7 @@
               -Wuninitialized -W -pedantic
 
 #DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O3
-DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3
+DEFINE_FLAGS = -D NDEBUG -O3#-D INTERRUPT_HANDLER -O3
 #DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 -pg
 #-s
 
@@ -15,6 +15,8 @@
 # The name of the final executable (eg gadget-paramin or gadget.exe)
 #GADGET = gadget-paramin
 GADGET = gadget
+#GADGET = gadget-ompRepro
+#GADGET = gadget-ompSpec
 ##########################################################################
 # Pick the appropriate compiler from the following switches
 ##########################################################################
@@ -29,21 +31,21 @@
 #CXX = g++
 #LIBDIRS = -L. -L/usr/local/lib
 #LIBRARIES = -lm
-#CXXFLAGS = $(DEFINE_FLAGS) -D NO_OPENMP
+#CXXFLAGS = $(DEFINE_FLAGS)
 #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
 # 2,5. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Reproducible
 #CXX = g++
 #LIBDIRS = -L. -L/usr/local/lib
-#LIBRARIES = -lm
+#LIBRARIES = -lm 
 #CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
 #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
-# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative: launch gadget with -omp
+# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative
 CXX = g++
 LIBDIRS = -L. -L/usr/local/lib
 LIBRARIES = -lm
-CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -D GADGET_OPENMP
+CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -DSPECULATIVE
 OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
 # 3. Solaris, without pvm3, using CC compiler