Commit 2f144ba9 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Move SPH subroutine implementation to sph_subs.cpp

parent 693696c7

src/cluster/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ clu: clu.o 
edfb: edfb.o

	$(FC) $(FCFLAGS) -o $(BUILDDIR)/edfb $(BUILDDIR)/edfb.o $(LFLAGS)



np_cluster: $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sphere.o $(BUILDDIR)/cluster.o

np_cluster: $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/cluster.o

	$(CXX) $(CXXFLAGS) $(CXXLFLAGS) -o $(BUILDDIR)/np_cluster $(BUILDDIR)/np_cluster.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sphere.o $(BUILDDIR)/cluster.o



$(BUILDDIR)/np_cluster.o:
@@ -33,8 +33,8 @@ $(BUILDDIR)/Parsers.o: 
$(BUILDDIR)/cluster.o:

	$(CXX) $(CXXFLAGS) -c cluster.cpp -o $(BUILDDIR)/cluster.o



$(BUILDDIR)/sphere.o:

	$(CXX) $(CXXFLAGS) -c ../sphere/sphere.cpp -o $(BUILDDIR)/sphere.o

$(BUILDDIR)/sph_subs.o:

	$(CXX) $(CXXFLAGS) -c ../libnptm/sph_subs.cpp -o $(BUILDDIR)/sphere.o



clean:

	rm -f $(BUILDDIR)/*.o

src/include/sph_subs.h

+100 −1183

File changed.

Preview size limit exceeded, changes collapsed.

src/libnptm/sph_subs.cpp

0 → 100644
+1167 −0

File added.

Preview size limit exceeded, changes collapsed.

src/sphere/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ edfb: edfb.o 
sph: sph.o

	$(FC) $(FCFLAGS) -o $(BUILDDIR)/sph $(BUILDDIR)/sph.o $(LFLAGS)



np_sphere: $(BUILDDIR)/np_sphere.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sphere.o

	$(CXX) $(CXXFLAGS) $(CXXLFLAGS) -o $(BUILDDIR)/np_sphere $(BUILDDIR)/np_sphere.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sphere.o

np_sphere: $(BUILDDIR)/np_sphere.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/sphere.o

	$(CXX) $(CXXFLAGS) $(CXXLFLAGS) -o $(BUILDDIR)/np_sphere $(BUILDDIR)/np_sphere.o $(BUILDDIR)/Commons.o $(BUILDDIR)/Configuration.o $(BUILDDIR)/Parsers.o $(BUILDDIR)/sph_subs.o $(BUILDDIR)/sphere.o



$(BUILDDIR)/np_sphere.o:

	$(CXX) $(CXXFLAGS) -c np_sphere.cpp -o $(BUILDDIR)/np_sphere.o
@@ -29,6 +29,9 @@ $(BUILDDIR)/Configuration.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