--- trunk/gadget/Makefile	2015/05/10 12:04:01	5
+++ trunk/gadget/Makefile	2016/05/25 16:36:33	19
@@ -4,16 +4,19 @@
 GCCWARNINGS = -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wformat \
               -Wparentheses -Wpointer-arith -Wcast-qual -Wconversion \
               -Wreorder -Wwrite-strings -Wsynth -Wchar-subscripts \
-              -Wuninitialized -W -pedantic 
+              -Wuninitialized -W -pedantic
 
-#DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O
-DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 
+#DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O3
+DEFINE_FLAGS = -D NDEBUG -O3#-D INTERRUPT_HANDLER -O3
+#DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 -pg
 #-s
 
 ##########################################################################
 # 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
 ##########################################################################
@@ -24,11 +27,25 @@
 #CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK
 #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)
 ##########################################################################
-# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler
+# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler - sequential
+#CXX = g++
+#LIBDIRS = -L. -L/usr/local/lib
+#LIBRARIES = -lm
+#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 
+#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
+#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
+##########################################################################
+# 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)
+CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -DSPECULATIVE
 OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
 # 3. Solaris, without pvm3, using CC compiler
@@ -81,6 +98,8 @@
     migrationareaptrvector.o rectangleptrvector.o otherfoodptrvector.o \
     tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \
     stockvariable.o modelvariable.o migrationproportion.o matrix.o
+    
+    GADGETCLASSES = agebandmatrixmemberfunctions.cc grow.cc growermemberfunctions.cc
 
 SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o
 
@@ -89,6 +108,9 @@
 
 LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)
 
+partial :	$(OBJECTS)
+		$(CXX) -c $(LDFLAGS) $(GADGETCLASSES)
+
 gadget	:	$(OBJECTS)
 		$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)