--- trunk/gadget/Makefile	2016/05/25 16:36:33	19
+++ trunk/gadget/Makefile	2017/04/07 09:20:55	20
@@ -42,11 +42,17 @@
 #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) -fopenmp -DSPECULATIVE
+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 -DSPECULATIVE
+#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
 ##########################################################################
 # 3. Solaris, without pvm3, using CC compiler
 #CXX = CC
@@ -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 \