Merge branch 'mosaic-group:master' into master

example/Numerics/2D_ActiveFluid/Makefile

@@ -12,7 +12,7 @@ Active2d: $(OBJ)
 all: Active2d
 
 run: all
-	mpirun -np 4 ./Active2d
+	mpirun -np 4 ./Active2d 41, 1e-2, 1e-3, 1
 
 .PHONY: clean all run
 

example/Numerics/Makefile

-# Surface_DCPSE and 2D_ActiveFluid are excluded due to missing command line arguments
-# OdeInt is excluded due to a pending issue with OdeInt
-SUBDIRS := $(shell find . -mindepth 1 -maxdepth 1 -type d ! \( -name "*Surface_DCPSE" -o -name "*2D_ActiveFluid" -o -name "*OdeInt" \) -name "*")
+SUBDIRS := $(shell find . -mindepth 1 -maxdepth 1 -type d -name "*")
 
 all clean run: $(SUBDIRS)
 

example/Numerics/OdeInt/Makefile

@@ -5,7 +5,7 @@ OBJ = main.o
 OBJ2 = main2.o
 
 %.o: %.cpp
-	$(CC) -O3 -c --std=c++14 -o $@ $< $(INCLUDE_PATH)
+	$(CC) -g -c --std=c++14 -o $@ $< $(INCLUDE_PATH)
 
 example_odeint: $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
@@ -16,7 +16,7 @@ example_odeint2: $(OBJ2)
 all: example_odeint example_odeint2
 
 run: all
-	mpirun  --oversubscribe -np 2 ./example_odeint && mpirun --oversubscribe -np 2 ./example_odeint2
+	mpirun  --oversubscribe -np 2 ./example_odeint && mpirun --oversubscribe -np 2 ./example_odeint2 1e-2 1.0 1.0
 
 .PHONY: clean all run
 

example/Numerics/Surface_DCPSE/Bump/Makefile

@@ -10,7 +10,7 @@ Bump: $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 all: Bump
 run: all
-	mpirun -np 4 ./Bump
+	mpirun -np 4 ./Bump ./alpha0.csv 2 1e-3 10 1e-4 0 1 0
 
 .PHONY: clean all run
 

example/Numerics/Surface_DCPSE/Bunny/Makefile

@@ -10,7 +10,7 @@ Bunny: $(OBJ)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
 all: Bunny
 run: all
-	mpirun -np 4 ./Bunny
+	mpirun -np 4 ./Bunny 0.005 1
 
 .PHONY: clean all run
 

example/Numerics/Surface_DCPSE/Circle/Makefile

@@ -15,7 +15,7 @@ CircPoisson: $(OBJ2)
 all: Circ CircPoisson
 
 run: all
-	mpirun -np 4 ./CircNoProj
+	mpirun -np 4 ./Circ 1 2 4.9 && mpirun -np 4 ./CircPoisson 256 2 2
 
 .PHONY: clean all run
 

example/Numerics/Surface_DCPSE/Ellipsoid/Makefile

@@ -11,7 +11,7 @@ Ellipsoid: $(OBJ)
 all: Ellipsoid
 
 run: all
-	mpirun -np 4 ./Ellipsoid
+	mpirun -np 4 ./Ellipsoid 31 4 1.5
 
 .PHONY: clean all run
 

example/Numerics/Surface_DCPSE/Makefile

-SUBDIRS := $(wildcard */.)
+SUBDIRS := $(shell find . -mindepth 1 -maxdepth 1 -type d ! -name "*Bump" -name "*")
 
 all clean run: $(SUBDIRS)
 

example/Numerics/Surface_DCPSE/Sphere/Makefile

@@ -17,9 +17,9 @@ SphereBench: $(OBJ2)
 all: SphereE SphereBench 
 
 run: all
-	mpirun -np 4 ./SphereE
+	mpirun -np 4 ./SphereE 3600 2
 
 .PHONY: clean all run
 
 clean: 
-	rm -f *.o *~ core SphereE SphereBench 
\ No newline at end of file
+	rm -f *.o *~ core SphereE SphereBench 

src/CMakeLists.txt

@@ -404,7 +404,8 @@ install(FILES Graph/ids.hpp Graph/dist_map_graph.hpp
 	      COMPONENT OpenFPM)
 
 install(FILES example.mk
-	      SubdomainGraphNodes.hpp
+	      ../example/common.mk
+              SubdomainGraphNodes.hpp
               DESTINATION openfpm_pdata/include/ )
 
 install(FILES DLB/DLB.hpp DLB/LB_Model.hpp