From dc259ebf49e24ed2a75c84d6dcaa043b2c99ec89 Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Tue, 1 Nov 2016 02:20:17 +0100 Subject: [PATCH] Fixing examples --- example/Grid/0_simple/Makefile | 2 +- example/Grid/1_stencil/Makefile | 2 +- example/Grid/2_solve_eq/Makefile | 2 +- example/Grid/3_gray_scott/Makefile | 2 +- example/Numerics/PSE/0_Derivative_approx_1D/Makefile | 2 +- example/Numerics/PSE/1_Diffusion_1D/Makefile | 2 +- example/Numerics/Stoke_flow/0_2D_incompressible/Makefile | 2 +- example/Numerics/Stoke_flow/1_3D_incompressible/Makefile | 2 +- example/Plot/0_simple_graph/Makefile | 2 +- example/VCluster/0_simple/Makefile | 2 +- example/Vector/0_simple/Makefile | 2 +- example/Vector/1_celllist/Makefile | 2 +- example/Vector/1_ghost_get_put/Makefile | 2 +- example/Vector/2_expressions/Makefile | 2 +- example/Vector/3_molecular_dynamic/Makefile | 2 +- example/Vector/4_complex_prop/Makefile | 2 +- example/Vector/4_multiphase_celllist_verlet/Makefile | 2 +- example/Vector/4_reorder/Makefile | 2 +- example/Vector/5_molecular_dynamic_sym/Makefile | 2 +- example/Vector/6_complex_usage/Makefile | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/example/Grid/0_simple/Makefile b/example/Grid/0_simple/Makefile index 927a794d..26bd7de1 100644 --- 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 diff --git a/example/Grid/1_stencil/Makefile b/example/Grid/1_stencil/Makefile index 12399cc8..bb7b0ec2 100644 --- 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 diff --git a/example/Grid/2_solve_eq/Makefile b/example/Grid/2_solve_eq/Makefile index 9295477e..9f4b7160 100644 --- 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 diff --git a/example/Grid/3_gray_scott/Makefile b/example/Grid/3_gray_scott/Makefile index df84f0c1..170e4285 100644 --- 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 diff --git a/example/Numerics/PSE/0_Derivative_approx_1D/Makefile b/example/Numerics/PSE/0_Derivative_approx_1D/Makefile index 4399591a..da76a97b 100644 --- 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 diff --git a/example/Numerics/PSE/1_Diffusion_1D/Makefile b/example/Numerics/PSE/1_Diffusion_1D/Makefile index 80cc4ffe..502affc0 100644 --- 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 diff --git a/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile b/example/Numerics/Stoke_flow/0_2D_incompressible/Makefile index b6512e4c..1378bd05 100644 --- 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 diff --git a/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile b/example/Numerics/Stoke_flow/1_3D_incompressible/Makefile index 37f93648..5186ac56 100644 --- 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 diff --git a/example/Plot/0_simple_graph/Makefile b/example/Plot/0_simple_graph/Makefile index 8fde2040..e2885ae2 100644 --- 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 diff --git a/example/VCluster/0_simple/Makefile b/example/VCluster/0_simple/Makefile index b54f7e1f..721c8d9f 100644 --- 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 diff --git a/example/Vector/0_simple/Makefile b/example/Vector/0_simple/Makefile index 646357e9..741431e3 100644 --- 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 diff --git a/example/Vector/1_celllist/Makefile b/example/Vector/1_celllist/Makefile index 6e6e5296..c9a76a23 100644 --- 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 diff --git a/example/Vector/1_ghost_get_put/Makefile b/example/Vector/1_ghost_get_put/Makefile index ec17c36a..57bab07e 100644 --- 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 diff --git a/example/Vector/2_expressions/Makefile b/example/Vector/2_expressions/Makefile index a7705b97..7ab3093e 100644 --- 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 diff --git a/example/Vector/3_molecular_dynamic/Makefile b/example/Vector/3_molecular_dynamic/Makefile index 577249ed..98e3f7a4 100644 --- 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 diff --git a/example/Vector/4_complex_prop/Makefile b/example/Vector/4_complex_prop/Makefile index 0c96d0bd..2de12f95 100644 --- 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 diff --git a/example/Vector/4_multiphase_celllist_verlet/Makefile b/example/Vector/4_multiphase_celllist_verlet/Makefile index 5e1e4a6a..e14eedbb 100644 --- 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 diff --git a/example/Vector/4_reorder/Makefile b/example/Vector/4_reorder/Makefile index c5ada0a4..2569b0b6 100644 --- 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 diff --git a/example/Vector/5_molecular_dynamic_sym/Makefile b/example/Vector/5_molecular_dynamic_sym/Makefile index 56f83af9..cf0391fa 100644 --- 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 diff --git a/example/Vector/6_complex_usage/Makefile b/example/Vector/6_complex_usage/Makefile index cbd0c9e9..31385b0c 100644 --- 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 -- GitLab