Commit 7d3ec8b6 authored by incardon's avatar incardon

Latest modules

parent b4b97718
......@@ -13,10 +13,10 @@ OBJ_VIC_PETSC = main_vic_petsc.o
all: vic vic_petsc
vic: $(OBJ_VIC)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS_SE2)
vic_petsc: $(OBJ_VIC_PETSC)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS)
$(CC) -o $@ $^ $(CFLAGS) $(LIBS_PATH) $(LIBS_SE2)
run: all
mpirun -np 3 ./vic && mpirun -np 3 ./vic
......
......@@ -96,7 +96,7 @@
//! \cond [inclusion] \endcond
#include "../../../openfpm_numerics/src/interpolation/interpolation.hpp"
#include "interpolation/interpolation.hpp"
#include "Grid/grid_dist_id.hpp"
#include "Vector/vector_dist.hpp"
#include "Matrix/SparseMatrix.hpp"
......@@ -586,6 +586,7 @@ void remesh(particles_type & vd, grid_type & gr,Box<3,float> & domain)
//! \cond [remesh_part] \endcond
/*! \page Vortex_in_cell_petsc Vortex in Cell 3D
*
* # Step 5: Compute velocity from vorticity # {#vic_vel_from_vort}
......@@ -1002,6 +1003,8 @@ void rk_step2(particles_type & particles)
particles.map();
}
//! \cond [runge_kutta_2] \endcond
/*! \page Vortex_in_cell_petsc Vortex in Cell 3D
......@@ -1039,6 +1042,7 @@ template<typename grid, typename vector> void do_step(vector & particles,
set_zero<vorticity>(g_vort);
inte.template p2m<vorticity,vorticity>(particles,g_vort);
g_vort.template ghost_put<add_,vorticity>();
//! \cond [do_step_p2m] \endcond
......
openfpm_numerics @ 58741708
Subproject commit ce49653e1f5af00c5c88858c35031b0f366c5242
Subproject commit 5874170818d8c516fd4358abeae6b82eedf77224
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