Diff of /trunk/gadget/Makefile

Parent Directory | Revision Log | Patch

	revision 2, Wed Apr 29 12:55:30 2015 UTC	revision 23, Mon Apr 17 11:28:42 2017 UTC
#	Line 6	Line 6
6	-Wreorder -Wwrite-strings -Wsynth -Wchar-subscripts \	-Wreorder -Wwrite-strings -Wsynth -Wchar-subscripts \
7	-Wuninitialized -W -pedantic	-Wuninitialized -W -pedantic
8
9	#DEFINE_FLAGS = -D DEBUG -D INTERRUPT_HANDLER -g -O	#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
12	#-s	#-s
13
14	##########################################################################	##########################################################################
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 24	Line 27
27	#CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK	#CXXFLAGS = $(GCCWARNINGS) $(DEFINE_FLAGS) -D GADGET_NETWORK
28	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)	#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS) $(SLAVEOBJECTS)
29	##########################################################################	##########################################################################
30	# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler	# 2. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler - sequential
31	CXX = g++	#CXX = g++
32		#LIBDIRS = -L. -L/usr/local/lib
33		#LIBRARIES = -lm
34		#CXXFLAGS = $(DEFINE_FLAGS)
35		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
36		##########################################################################
37		# 2,5. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Reproducible
38		#CXX = g++
39		#LIBDIRS = -L. -L/usr/local/lib
40		#LIBRARIES = -lm
41		#CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
42		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
43		##########################################################################
44		# 2,6. Linux, Mac, Cgwin or Solaris, without MPI, using g++ compiler and OpenMP Speculative
45		#CXX = icpc
46		#LIBDIRS = -L.
47		#LIBRARIES =
48		#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp -mmic  -DSPECULATIVE
49		#CXXFLAGS = $(DEFINE_FLAGS) -cxxlib -qopenmp
50		#OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
51		CXX = g++-6
52	LIBDIRS = -L. -L/usr/local/lib	LIBDIRS = -L. -L/usr/local/lib
53	LIBRARIES = -lm	LIBRARIES = -lm
54	CXXFLAGS = $(DEFINE_FLAGS)	CXXFLAGS = $(DEFINE_FLAGS) -fopenmp
55	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)	OBJECTS = $(GADGETINPUT) $(GADGETOBJECTS)
56	##########################################################################	##########################################################################
57	# 3. Solaris, without pvm3, using CC compiler	# 3. Solaris, without pvm3, using CC compiler
#	Line 50	Line 73
73	area.o time.o keeper.o maininfo.o printinfo.o runid.o global.o stochasticdata.o \	area.o time.o keeper.o maininfo.o printinfo.o runid.o global.o stochasticdata.o \
74	timevariable.o formula.o readaggregation.o readfunc.o readmain.o readword.o \	timevariable.o formula.o readaggregation.o readfunc.o readmain.o readword.o \
75	actionattimes.o livesonareas.o lengthgroup.o conversionindex.o selectfunc.o \	actionattimes.o livesonareas.o lengthgroup.o conversionindex.o selectfunc.o \
76	suitfunc.o suits.o popinfo.o popinfomemberfunctions.o popratio.o popstatistics.o \	suitfunc.o suits.o popinfomemberfunctions.o popratio.o popstatistics.o \
77	interruptinterface.o agebandmatrix.o agebandmatrixmemberfunctions.o tags.o \	interruptinterface.o agebandmatrix.o agebandmatrixmemberfunctions.o tags.o \
78	interrupthandler.o agebandmatrixratio.o agebandmatrixratiomemberfunctions.o \	interrupthandler.o agebandmatrixratio.o agebandmatrixratiomemberfunctions.o \
79	migrationarea.o rectangle.o ludecomposition.o multinomial.o regressionline.o \	migrationarea.o rectangle.o ludecomposition.o multinomial.o regressionline.o \
#	Line 69	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 \
#	Line 82	Line 105
105	tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \	tagptrvector.o optinfoptrvector.o errorhandler.o modelvariablevector.o \
106	stockvariable.o modelvariable.o migrationproportion.o matrix.o	stockvariable.o modelvariable.o migrationproportion.o matrix.o
107
108		GADGETCLASSES = agebandmatrixmemberfunctions.cc grow.cc growermemberfunctions.cc
109
110	SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o	SLAVEOBJECTS = netdata.o slavecommunication.o pvmconstants.o
111
112	GADGETINPUT = intvector.o doublevector.o charptrvector.o initialinputfile.o \	GADGETINPUT = intvector.o doublevector.o charptrvector.o initialinputfile.o \
#	Line 89	Line 114
114
115	LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)	LDFLAGS = $(CXXFLAGS) $(LIBDIRS) $(LIBRARIES)
116
117		partial :       $(OBJECTS)
118		$(CXX) -c $(LDFLAGS) $(GADGETCLASSES)
119
120	gadget  :       $(OBJECTS)	gadget  :       $(OBJECTS)
121	$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)	$(CXX) -o $(GADGET) $(OBJECTS) $(LDFLAGS)
122

---

Colored Diff Long Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2   changed lines   Added in v.23

---

root@forge.cesga.es	ViewVC Help
Powered by ViewVC 1.0.0