--- trunk/gadget/Makefile	2015/07/30 12:36:46	14
+++ trunk/gadget/Makefile	2017/04/07 09:20:55	20
@@ -7,15 +7,15 @@
               -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
 
 ##########################################################################
 # The name of the final executable (eg gadget-paramin or gadget.exe)
 #GADGET = gadget-paramin
-#GADGET = gadget
-GADGET = gadget-ompRep
+GADGET = gadget
+#GADGET = gadget-ompRepro
 #GADGET = gadget-ompSpec
 ##########################################################################
 # Pick the appropriate compiler from the following switches
@@ -31,21 +31,27 @@
 #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
-CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
-OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
+#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 = icpc 
+LIBDIRS = -L. 
+LIBRARIES = 
+#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic  -DSPECULATIVE
+CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp
+OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 #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
@@ -86,7 +92,7 @@
     recapture.o recstatistics.o stockdistribution.o stomachcontent.o \
     surveydistribution.o surveyindices.o sionstep.o sibyacousticonstep.o \
     sibyageonstep.o sibyfleetonstep.o sibylengthonstep.o sibyeffortonstep.o \
-    optinfobfgs.o optinfohooke.o optinfosimann.o bfgs.o hooke.o simann.o \
+    optinfobfgs.o optinfohooke.o optinfosimann.o optinfopso.o bfgs.o hooke.o simann.o pso.o\
     addresskeepervector.o addresskeepermatrix.o intmatrix.o doublematrix.o \
     agebandmatrixptrvector.o agebandmatrixptrmatrix.o agebandmatrixratioptrvector.o \
     doublematrixptrvector.o doublematrixptrmatrix.o timevariablevector.o \