Log In | Get Help   
Home My Page Projects Code Snippets Project Openings Mareframe
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files
[mareframe] Diff of /trunk/gadget/Makefile
[mareframe] / trunk / gadget / Makefile Repository:
ViewVC logotype

Diff of /trunk/gadget/Makefile

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 11, Thu Jul 23 19:00:38 2015 UTC revision 20, Fri Apr 7 09:20:55 2017 UTC
# Line 7  Line 7 
7                -Wuninitialized -W -pedantic                -Wuninitialized -W -pedantic
8    
9  #DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O3  #DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O3
10  DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3  DEFINE_FLAGS = -D NDEBUG -O3#-D INTERRUPT_HANDLER -O3
11  #DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 -pg  #DEFINE_FLAGS = -D NDEBUG -D INTERRUPT_HANDLER -O3 -pg
12  #-s  #-s
13    
# Line 15  Line 15 
15  # The name of the final executable (eg gadget-paramin or gadget.exe)  # The name of the final executable (eg gadget-paramin or gadget.exe)
16  #GADGET = gadget-paramin  #GADGET = gadget-paramin
17  GADGET = gadget  GADGET = gadget
18    #GADGET = gadget-ompRepro
19    #GADGET = gadget-ompSpec
20  ##########################################################################  ##########################################################################
21  # Pick the appropriate compiler from the following switches  # Pick the appropriate compiler from the following switches
22  ##########################################################################  ##########################################################################
# Line 29  Line 31 
31  #CXX = g++  #CXX = g++
32  #LIBDIRS = -L. -L/usr/local/lib  #LIBDIRS = -L. -L/usr/local/lib
33  #LIBRARIES = -lm  #LIBRARIES = -lm
34  #CXXFLAGS = $(DEFINE_FLAGS) -D NO_OPENMP  #CXXFLAGS = $(DEFINE_FLAGS)
35  #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)  #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
36  ##########################################################################  ##########################################################################
37  # 2,5. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Reproducible  # 2,5. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Reproducible
# Line 39  Line 41 
41  #CXXFLAGS = $(DEFINE_FLAGS) -fopenmp  #CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
42  #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)  #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
43  ##########################################################################  ##########################################################################
44  # 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
45  CXX = g++  CXX = icpc
46  LIBDIRS = -L. -L/usr/local/lib  LIBDIRS = -L.
47  LIBRARIES = -lm  LIBRARIES =
48  CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -D GADGET_OPENMP  #CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic  -DSPECULATIVE
49    CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp
50  OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)  OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
51    #CXX = g++
52    #LIBDIRS = -L. -L/usr/local/lib
53    #LIBRARIES = -lm
54    #CXXFLAGS = $(DEFINE_FLAGS) -fopenmp -DSPECULATIVE
55    #OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
56  ##########################################################################  ##########################################################################
57  # 3. Solaris, without pvm3, using CC compiler  # 3. Solaris, without pvm3, using CC compiler
58  #CXX = CC  #CXX = CC
# Line 84  Line 92 
92      recapture.o recstatistics.o stockdistribution.o stomachcontent.o \      recapture.o recstatistics.o stockdistribution.o stomachcontent.o \
93      surveydistribution.o surveyindices.o sionstep.o sibyacousticonstep.o \      surveydistribution.o surveyindices.o sionstep.o sibyacousticonstep.o \
94      sibyageonstep.o sibyfleetonstep.o sibylengthonstep.o sibyeffortonstep.o \      sibyageonstep.o sibyfleetonstep.o sibylengthonstep.o sibyeffortonstep.o \
95      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\
96      addresskeepervector.o addresskeepermatrix.o intmatrix.o doublematrix.o \      addresskeepervector.o addresskeepermatrix.o intmatrix.o doublematrix.o \
97      agebandmatrixptrvector.o agebandmatrixptrmatrix.o agebandmatrixratioptrvector.o \      agebandmatrixptrvector.o agebandmatrixptrmatrix.o agebandmatrixratioptrvector.o \
98      doublematrixptrvector.o doublematrixptrmatrix.o timevariablevector.o \      doublematrixptrvector.o doublematrixptrmatrix.o timevariablevector.o \
Legend:
Removed from v.11  
changed lines
  Added in v.20
root@forge.cesga.es
 ViewVC Help
Powered by ViewVC 1.0.0  

Powered By FusionForge