Fixing examples

dc259ebf · incardon · d316ea67 · dc259ebf · dc259ebf · dc259ebf
Commit dc259ebf authored Nov 01, 2016 by incardon
20 changed files
--- a/example/Grid/0_simple/Makefile
+++ b/example/Grid/0_simple/Makefile
@@ -15,7 +15,7 @@ grid: $(OBJ)
 all: grid

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./grid
+	mpirun -np 2 ./grid

 .PHONY: clean all run


--- a/example/Grid/1_stencil/Makefile
+++ b/example/Grid/1_stencil/Makefile
@@ -15,7 +15,7 @@ stencil: $(OBJ)
 all: stencil

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./stencil
+	mpirun -np 3 ./stencil

 .PHONY: clean all run


--- a/example/Grid/2_solve_eq/Makefile
+++ b/example/Grid/2_solve_eq/Makefile
@@ -15,7 +15,7 @@ periodic: $(OBJ)
 all: periodic

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 4 ./periodic
+	mpirun -np 4 ./periodic

 .PHONY: clean all run


--- a/example/Grid/3_gray_scott/Makefile
+++ b/example/Grid/3_gray_scott/Makefile
@@ -15,7 +15,7 @@ gray_scott: $(OBJ)
 all: gray_scott

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 4 ./gray_scott
+	mpirun -np 4 ./gray_scott

 .PHONY: clean all run


--- a/example/Numerics/PSE/0_Derivative_approx_1D/Makefile
+++ b/example/Numerics/PSE/0_Derivative_approx_1D/Makefile
@@ -15,7 +15,7 @@ pse_1d: $(OBJ)
 all: pse_1d

 run: all
-	source $$HOME/openfpm_vars; ./pse_1d
+	./pse_1d

 .PHONY: clean all run


--- a/example/Numerics/PSE/1_Diffusion_1D/Makefile
+++ b/example/Numerics/PSE/1_Diffusion_1D/Makefile
@@ -15,7 +15,7 @@ diff_1d: $(OBJ)
 all: diff_1d

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 4 ./diff_1d
+	mpirun -np 4 ./diff_1d

 .PHONY: clean all


--- a/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile
+++ b/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile
@@ -19,7 +19,7 @@ stokes_2d_petsc: $(OBJ_PETSC)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./stokes_2d_eigen; mpirun -np 3 ./stokes_2d_petsc
+	mpirun -np 3 ./stokes_2d_eigen && mpirun -np 3 ./stokes_2d_petsc
 	
 .PHONY: clean all


--- a/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile
+++ b/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile
@@ -19,7 +19,7 @@ stokes_3d_petsc: $(OBJ_PETSC)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./stokes_3d_eigen; mpirun -np 3 ./stokes_3d_petsc
+	mpirun -np 3 ./stokes_3d_eigen && mpirun -np 3 ./stokes_3d_petsc
 	
 .PHONY: clean all run


--- a/example/Plot/0_simple_graph/Makefile
+++ b/example/Plot/0_simple_graph/Makefile
@@ -15,7 +15,7 @@ plot: $(OBJ)
 all: plot

 run: all
-	source $$HOME/openfpm_vars; ./plot
+	./plot

 .PHONY: clean all run


--- a/example/VCluster/0_simple/Makefile
+++ b/example/VCluster/0_simple/Makefile
@@ -15,7 +15,7 @@ vcluster: $(OBJ)
 all: vcluster

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./vcluster
+	mpirun -np 3 ./vcluster

 .PHONY: clean all run


--- a/example/Vector/0_simple/Makefile
+++ b/example/Vector/0_simple/Makefile
@@ -15,7 +15,7 @@ vect: $(OBJ)
 all: vect

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./vect
+	mpirun -np 2 ./vect

 .PHONY: clean all run


--- a/example/Vector/1_celllist/Makefile
+++ b/example/Vector/1_celllist/Makefile
@@ -15,7 +15,7 @@ cell: $(OBJ)
 all: cell

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./cell
+	mpirun -np 2 ./cell

 .PHONY: clean all run


--- a/example/Vector/1_ghost_get_put/Makefile
+++ b/example/Vector/1_ghost_get_put/Makefile
@@ -15,7 +15,7 @@ ghost: $(OBJ)
 all: ghost

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./ghost
+	mpirun -np 2 ./ghost

 .PHONY: clean all run


--- a/example/Vector/2_expressions/Makefile
+++ b/example/Vector/2_expressions/Makefile
@@ -15,7 +15,7 @@ expr: $(OBJ)
 all: expr

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./expr
+	mpirun -np 3 ./expr

 .PHONY: clean all run


--- a/example/Vector/3_molecular_dynamic/Makefile
+++ b/example/Vector/3_molecular_dynamic/Makefile
@@ -23,7 +23,7 @@ md_dyn_vl: $(OBJ_VL)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./md_dyn; mpirun -np 3 ./md_dyn_expr; mpirun -np 3 ./md_dyn_vl;
+	mpirun -np 3 ./md_dyn && mpirun -np 3 ./md_dyn_expr && mpirun -np 3 ./md_dyn_vl;

 .PHONY: clean all run


--- a/example/Vector/4_complex_prop/Makefile
+++ b/example/Vector/4_complex_prop/Makefile
@@ -19,7 +19,7 @@ vect_ser: $(OBJ_SER)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: all
-	source $$HOME/openfpm_vars && mpirun -np 2 ./vect_cp && mpirun -np 2 ./vect_ser
+	mpirun -np 2 ./vect_cp && mpirun -np 2 ./vect_ser

 .PHONY: clean all run


--- a/example/Vector/4_multiphase_celllist_verlet/Makefile
+++ b/example/Vector/4_multiphase_celllist_verlet/Makefile
@@ -15,7 +15,7 @@ multip: $(OBJ)
 all: multip

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 2 ./multip
+	mpirun -np 2 ./multip

 .PHONY: clean all run


--- a/example/Vector/4_reorder/Makefile
+++ b/example/Vector/4_reorder/Makefile
@@ -28,7 +28,7 @@ md_comp_ord_test: $(OBJ_CORD)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: all_test
-	source $$HOME/openfpm_vars; mpirun -np 4 ./md_data_ord_test; mpirun -np 4 ./md_comp_ord_test
+	mpirun -np 4 ./md_data_ord_test && mpirun -np 4 ./md_comp_ord_test

 .PHONY: clean all run all_test on_test


--- a/example/Vector/5_molecular_dynamic_sym/Makefile
+++ b/example/Vector/5_molecular_dynamic_sym/Makefile
@@ -15,7 +15,7 @@ md_sym: $(OBJ_DORD)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: md_sym
-	source $$HOME/openfpm_vars; mpirun -np 3 ./md_sym
+	mpirun -np 3 ./md_sym

 .PHONY: clean all run


--- a/example/Vector/6_complex_usage/Makefile
+++ b/example/Vector/6_complex_usage/Makefile
@@ -15,7 +15,7 @@ complex_use: $(OBJ_DORD)
 	$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)

 run: all
-	source $$HOME/openfpm_vars; mpirun -np 3 ./complex_use
+	mpirun -np 3 ./complex_use

 .PHONY: clean all run all_test on_test