Commit fa394da4 authored by incardon's avatar incardon

Latest modules

parent 18597a09
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
7) interpolate velocity u to particles 7) interpolate velocity u to particles
8) move particles accordingly to the velocity and save the old position in x_old 8) move particles accordingly to the velocity and save the old position in x_old
9) Interpolate vorticity on mesh on the particles 9) Interpolate vorticity on mesh from the particles
10) calculate velocity u from the vorticity w 10) calculate velocity u from the vorticity w
11) calculate the right-hand-side on grid and interpolate on particles 11) calculate the right-hand-side on grid and interpolate on particles
12) interpolate velocity u to particles 12) interpolate velocity u to particles
......
...@@ -7,8 +7,9 @@ LDIR = ...@@ -7,8 +7,9 @@ LDIR =
OBJ = main.o OBJ = main.o
OBJ_EXPR = main_expr.o OBJ_EXPR = main_expr.o
OBJ_VL = main_vl.o OBJ_VL = main_vl.o
OBJ_EXPR_PAP = main_expr_paper.o
all: md_dyn md_dyn_expr md_dyn_vl all: md_dyn md_dyn_expr md_dyn_vl md_dyn_pap
%.o: %.cpp %.o: %.cpp
$(CC) -O3 -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH) $(CC) -O3 -g -c --std=c++11 -o $@ $< $(INCLUDE_PATH)
...@@ -22,6 +23,9 @@ md_dyn_expr: $(OBJ_EXPR) ...@@ -22,6 +23,9 @@ md_dyn_expr: $(OBJ_EXPR)
md_dyn_vl: $(OBJ_VL) md_dyn_vl: $(OBJ_VL)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS) $(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
md_dyn_pap: $(OBJ_EXPR_PAP)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
run: all run: all
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;
......
Markdown is supported
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