Skip to content
Snippets Groups Projects
Commit c0c4c3ab authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Merge branch 'master' into binary_IO 

Realign binary_IO with cleaner building process

Conflicts:
src/cluster/Makefile
src/sphere/Makefile
parents 3eabce46 e6490bd4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 1
− 0
View file @ c0c4c3ab
...@@ -3,3 +3,4 @@ build/cluster/* ...@@ -3,3 +3,4 @@ build/cluster/*
build/sphere/* build/sphere/*
build/trapping/* build/trapping/*
doc/build/* doc/build/*
src/objects/*
\ No newline at end of file
src/Makefile
+ 3
− 3
View file @ c0c4c3ab
SUBDIRS := cluster sphere trapping SUBDIRS := cluster sphere trapping
SRCDIR=$(PWD) SRCDIR=$(PWD)
OBJDIR=$(SRCDIR)/objects
BUILDDIR=$(SRCDIR)/../build BUILDDIR=$(SRCDIR)/../build
DOCSDIR=$(SRCDIR)/../doc DOCSDIR=$(SRCDIR)/../doc
...@@ -12,14 +13,13 @@ $(SUBDIRS): ...@@ -12,14 +13,13 @@ $(SUBDIRS):
$(MAKE) -C $@ $(MAKE) -C $@
clean: clean:
rm -f $(BUILDDIR)/cluster/*.o rm -f $(OBJDIR)/*.o
rm -f $(BUILDDIR)/sphere/*.o
rm -f $(BUILDDIR)/trapping/*.o
wipe: wipe:
rm -f $(BUILDDIR)/cluster/* rm -f $(BUILDDIR)/cluster/*
rm -f $(BUILDDIR)/sphere/* rm -f $(BUILDDIR)/sphere/*
rm -f $(BUILDDIR)/trapping/* rm -f $(BUILDDIR)/trapping/*
rm -f $(OBJDIR)/*.o
if [ -d $(DOCSDIR)/build/html ]; then rm -r $(DOCSDIR)/build/html; fi if [ -d $(DOCSDIR)/build/html ]; then rm -r $(DOCSDIR)/build/html; fi
if [ -d $(DOCSDIR)/build/latex ]; then rm -r $(DOCSDIR)/build/latex; fi if [ -d $(DOCSDIR)/build/latex ]; then rm -r $(DOCSDIR)/build/latex; fi
......
src/cluster/Makefile
+ 17
− 31
View file @ c0c4c3ab
BUILDDIR=../../build/cluster ifndef BUILDDIR
override BUILDDIR=../../build/cluster
endif
ifndef OBJDIR
override OBJDIR=../objects
endif
include ../make.inc include ../make.inc
all: clu edfb_clu np_cluster F_CLU_OBJS=$(OBJDIR)/clu.o $(OBJDIR)/edfb_clu.o
clu: clu.o CXX_CLU_OBJS=$(OBJDIR)/np_cluster.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/sph_subs.o $(OBJDIR)/clu_subs.o $(OBJDIR)/cluster.o $(OBJDIR)/TransitionMatrix.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/clu $(BUILDDIR)/clu.o $(LDFLAGS)
edfb_clu: edfb_clu.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_clu $(BUILDDIR)/edfb_clu.o $(LDFLAGS)
np_cluster: $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/clu_subs.o $(BUILDDIR)/cluster.o $(BUILDDIR)/TransitionMatrix.o all: $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(BUILDDIR)/np_cluster
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_cluster $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/clu_subs.o $(BUILDDIR)/cluster.o $(BUILDDIR)/TransitionMatrix.o $(CXXLDFLAGS)
#$(BUILDDIR)/np_cluster.o: $(BUILDDIR)/clu: $(OBJDIR)/clu.o
# $(CXX) $(CXXFLAGS) -c np_cluster.cpp -o $(BUILDDIR)/np_cluster.o $(FC) $(FCFLAGS) -o $(BUILDDIR)/clu $(OBJDIR)/clu.o $(LDFLAGS)
#$(BUILDDIR)/Commons.o: $(BUILDDIR)/edfb_clu: $(OBJDIR)/edfb_clu.o
# $(CXX) $(CXXFLAGS) -c ../libnptm/Commons.cpp -o $(BUILDDIR)/Commons.o $(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_clu $(OBJDIR)/edfb_clu.o $(LDFLAGS)
#$(BUILDDIR)/Configuration.o: $(BUILDDIR)/np_cluster: $(CXX_CLU_OBJS)
# $(CXX) $(CXXFLAGS) -c ../libnptm/Configuration.cpp -o $(BUILDDIR)/Configuration.o $(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_cluster $(CXX_CLU_OBJS) $(CXXLDFLAGS)
#$(BUILDDIR)/file_io.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/file_io.cpp -o $(BUILDDIR)/file_io.o
#$(BUILDDIR)/Parsers.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/Parsers.cpp -o $(BUILDDIR)/Parsers.o
#$(BUILDDIR)/cluster.o:
# $(CXX) $(CXXFLAGS) -c cluster.cpp -o $(BUILDDIR)/cluster.o
#$(BUILDDIR)/clu_subs.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/clu_subs.cpp -o $(BUILDDIR)/clu_subs.o
#$(BUILDDIR)/sph_subs.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/sph_subs.cpp -o $(BUILDDIR)/sph_subs.o
clean: clean:
rm -f $(BUILDDIR)/*.o rm -f $(F_CLU_OBJS) $(CXX_CLU_OBJS)
wipe: wipe:
rm -f $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(BUILDDIR)/*.o rm -f $(BUILDDIR)/clu $(BUILDDIR)/edfb_clu $(F_CLU_OBJS) $(CXX_CLU_OBJS)
src/make.inc
+ 9
− 6
View file @ c0c4c3ab
...@@ -41,13 +41,16 @@ override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(LDFLAGS) ...@@ -41,13 +41,16 @@ override CXXLDFLAGS=-L/usr/lib64 -L$(HDF5_LIB) -lhdf5 $(LDFLAGS)
endif endif
%.o : %.f %.o : %.f
$(FC) $(FCFLAGS) -c -o $(BUILDDIR)/$@ $< $(FC) $(FCFLAGS) -c -o $@ $<
%.o : %.cpp %.o : %.cpp
$(CXX) $(CXXFLAGS) -c -o $(BUILDDIR)/$@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
$(BUILDDIR)/%.o : %.cpp $(OBJDIR)/%.o : %.f
$(CXX) $(CXXFLAGS) -c -o $(BUILDDIR)/$@ $< $(FC) $(FCFLAGS) -c -o $@ $<
$(BUILDDIR)/%.o : ../libnptm/%.cpp $(OBJDIR)/%.o : %.cpp
$(CXX) $(CXXFLAGS) -c -o $(BUILDDIR)/$@ ../libnptm/$< $(CXX) $(CXXFLAGS) -c -o $@ $<
$(OBJDIR)/%.o : ../libnptm/%.cpp
$(CXX) $(CXXFLAGS) -c -o $@ $<
src/objects/.gitkeep 0 → 100644
+ 0
− 0
View file @ c0c4c3ab
src/sphere/Makefile
+ 17
− 35
View file @ c0c4c3ab
BUILDDIR=../../build/sphere ifndef BUILDDIR
override BUILDDIR=../../build/sphere
endif
ifndef OBJDIR
override OBJDIR=../objects
endif
include ../make.inc include ../make.inc
#FC=gfortran
#FCFLAGS=-std=legacy -O3
#LFLAGS=
#CXX=g++
#CXXFLAGS=-O2 -ggdb -pg -coverage
#CXXLFLAGS=-L/usr/lib64 -lhdf5_hl -lhdf5
all: edfb_sph sph np_sphere F_SPH_OBJS=$(OBJDIR)/edfb_sph.o $(OBJDIR)/sph.o
edfb_sph: edfb_sph.o CXX_SPH_OBJS=$(OBJDIR)/np_sphere.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/Parsers.o $(OBJDIR)/sph_subs.o $(OBJDIR)/sphere.o $(OBJDIR)/TransitionMatrix.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_sph $(BUILDDIR)/edfb_sph.o $(LDFLAGS)
sph: sph.o all: $(BUILDDIR)/edfb_sph $(BUILDDIR)/sph $(BUILDDIR)/np_sphere
$(FC) $(FCFLAGS) -o $(BUILDDIR)/sph $(BUILDDIR)/sph.o $(LDFLAGS)
np_sphere: $(BUILDDIR)/np_sphere.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/sphere.o $(BUILDDIR)/TransitionMatrix.o $(BUILDDIR)/edfb_sph: $(OBJDIR)/edfb_sph.o
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_sphere $(BUILDDIR)/np_sphere.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/sphere.o $(BUILDDIR)/TransitionMatrix.o $(CXXLDFLAGS) $(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb_sph $(OBJDIR)/edfb_sph.o $(LDFLAGS)
#$(BUILDDIR)/np_sphere.o: $(BUILDDIR)/sph: $(OBJDIR)/sph.o
# $(CXX) $(CXXFLAGS) -c np_sphere.cpp -o $(BUILDDIR)/np_sphere.o $(FC) $(FCFLAGS) -o $(BUILDDIR)/sph $(OBJDIR)/sph.o $(LDFLAGS)
#$(BUILDDIR)/Commons.o: $(BUILDDIR)/np_sphere: $(CXX_SPH_OBJS)
# $(CXX) $(CXXFLAGS) -c ../libnptm/Commons.cpp -o $(BUILDDIR)/Commons.o $(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_sphere $(CXX_SPH_OBJS) $(CXXLDFLAGS)
#$(BUILDDIR)/Configuration.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/Configuration.cpp -o $(BUILDDIR)/Configuration.o
#$(BUILDDIR)/file_io.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/file_io.cpp -o $(BUILDDIR)/file_io.o
#$(BUILDDIR)/Parsers.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/Parsers.cpp -o $(BUILDDIR)/Parsers.o
#$(BUILDDIR)/sph_subs.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/sph_subs.cpp -o $(BUILDDIR)/sph_subs.o
#$(BUILDDIR)/sphere.o:
# $(CXX) $(CXXFLAGS) -c sphere.cpp -o $(BUILDDIR)/sphere.o
clean: clean:
rm -f $(BUILDDIR)/*.o rm -f $(F_SPH_OBJS) $(CXX_SPH_OBJS)
wipe: wipe:
rm -f $(BUILDDIR)/edfb_sph $(BUILDDIR)/sph $(BUILDDIR)/*.o rm -f $(BUILDDIR)/edfb_sph $(BUILDDIR)/sph $(F_SPH_OBJS) $(CXX_SPH_OBJS)
src/trapping/Makefile
+ 17
− 41
View file @ c0c4c3ab
BUILDDIR=../../build/trapping ifndef BUILDDIR
override BUILDDIR=../../build/trapping
endif
ifndef OBJDIR
override OBJDIR=../objects
endif
include ../make.inc include ../make.inc
#FC=gfortran
#FCFLAGS=-std=legacy -O3
#LFLAGS=
#CXX=g++
#CXXFLAGS=-O2 -ggdb -pg -coverage
#CXXLFLAGS=-L/usr/lib64 -lhdf5_hl -lhdf5
all: frfme lffft np_trapping F_TRAP_OBJS=$(OBJDIR)/frfme.o $(OBJDIR)/lffft.o
frfme: frfme.o CXX_TRAP_OBJS=$(OBJDIR)/np_trapping.o $(OBJDIR)/cfrfme.o $(OBJDIR)/clffft.o $(OBJDIR)/Parsers.o $(OBJDIR)/Commons.o $(OBJDIR)/Configuration.o $(OBJDIR)/file_io.o $(OBJDIR)/sph_subs.o $(OBJDIR)/tra_subs.o
$(FC) $(FCFLAGS) -o $(BUILDDIR)/frfme $(BUILDDIR)/frfme.o $(LDFLAGS)
lffft: lffft.o all: $(BUILDDIR)/frfme $(BUILDDIR)/lffft $(BUILDDIR)/np_trapping
$(FC) $(FCFLAGS) -o $(BUILDDIR)/lffft $(BUILDDIR)/lffft.o $(LDFLAGS)
np_trapping: $(BUILDDIR)/np_trapping.o $(BUILDDIR)/cfrfme.o $(BUILDDIR)/clffft.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/file_io.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/tra_subs.o $(BUILDDIR)/frfme: $(OBJDIR)/frfme.o
$(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_trapping $(BUILDDIR)/np_trapping.o $(BUILDDIR)/cfrfme.o $(BUILDDIR)/clffft.o $(BUILDDIR)/file_io.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/tra_subs.o $(CXXLDFLAGS) $(FC) $(FCFLAGS) -o $(BUILDDIR)/frfme $(OBJDIR)/frfme.o $(LDFLAGS)
#$(BUILDDIR)/np_trapping.o: $(BUILDDIR)/lffft: $(OBJDIR)/lffft.o
# $(CXX) $(CXXFLAGS) np_trapping.cpp -c -o $(BUILDDIR)/np_trapping.o $(FC) $(FCFLAGS) -o $(BUILDDIR)/lffft $(OBJDIR)/lffft.o $(LDFLAGS)
#$(BUILDDIR)/cfrfme.o: $(BUILDDIR)/np_trapping: $(CXX_TRAP_OBJS)
# $(CXX) $(CXXFLAGS) frfme.cpp -c -o $(BUILDDIR)/cfrfme.o $(CXX) $(CXXFLAGS) -o $(BUILDDIR)/np_trapping $(CXX_TRAP_OBJS) $(CXXLDFLAGS)
#$(BUILDDIR)/clffft.o:
# $(CXX) $(CXXFLAGS) lffft.cpp -c -o $(BUILDDIR)/clffft.o
#$(BUILDDIR)/Commons.o:
# $(CXX) $(CXXFLAGS) ../libnptm/Commons.cpp -c -o $(BUILDDIR)/Commons.o
#$(BUILDDIR)/Configuration.o:
# $(CXX) $(CXXFLAGS) ../libnptm/Configuration.cpp -c -o $(BUILDDIR)/Configuration.o
#$(BUILDDIR)/file_io.o:
# $(CXX) $(CXXFLAGS) -c ../libnptm/file_io.cpp -o $(BUILDDIR)/file_io.o
#$(BUILDDIR)/Parsers.o:
# $(CXX) $(CXXFLAGS) ../libnptm/Parsers.cpp -c -o $(BUILDDIR)/Parsers.o
#$(BUILDDIR)/sph_subs.o:
# $(CXX) $(CXXFLAGS) ../libnptm/sph_subs.cpp -c -o $(BUILDDIR)/sph_subs.o
#$(BUILDDIR)/tra_subs.o:
# $(CXX) $(CXXFLAGS) ../libnptm/tra_subs.cpp -c -o $(BUILDDIR)/tra_subs.o
clean: clean:
rm -f $(BUILDDIR)/*.o rm -f $(F_TRAP_OBJS) $(CXX_TRAP_OBJS)
wipe: wipe:
rm -f $(BUILDDIR)/frfme $(BUILDDIR)/lffft $(BUILDDIR)/*.o rm -f $(BUILDDIR)/frfme $(BUILDDIR)/lffft $(F_TRAP_OBJS) $(CXX_TRAP_OBJS)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment