Commit 57f2b7ea authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

moves more particle files to own subfolder

also add easier control of template double for if.
this way i can compile faster if i need to
parent 952482a3
......@@ -303,7 +303,7 @@ set(cpp_for_lib
${PROJECT_SOURCE_DIR}/cpp/full_code/NSVEcomplex_particles.cpp
${PROJECT_SOURCE_DIR}/cpp/full_code/NSVE_Stokes_particles.cpp
${PROJECT_SOURCE_DIR}/cpp/full_code/NSVEp_extra_sampling.cpp
${PROJECT_SOURCE_DIR}/cpp/particles/particles_inner_computer.cpp
${PROJECT_SOURCE_DIR}/cpp/particles/inner/particles_inner_computer.cpp
${PROJECT_SOURCE_DIR}/cpp/full_code/ornstein_uhlenbeck_process.cpp
${PROJECT_SOURCE_DIR}/cpp/full_code/ou_vorticity_equation.cpp)
......@@ -354,22 +354,22 @@ set(hpp_for_lib
${PROJECT_SOURCE_DIR}/cpp/full_code/NSVEcomplex_particles.hpp
${PROJECT_SOURCE_DIR}/cpp/full_code/NSVE_Stokes_particles.hpp
${PROJECT_SOURCE_DIR}/cpp/full_code/NSVEp_extra_sampling.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/particles_inner_computer.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/particles_inner_computer_2nd_order.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/particles_inner_computer_empty.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/inner/particles_inner_computer.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/inner/particles_inner_computer_2nd_order.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/inner/particles_inner_computer_empty.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_input.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_output.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_system.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/abstract_particles_system_with_p2p.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/alltoall_exchanger.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/lock_free_bool_array.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_computer_empty.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_computer.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_ghost_collision_base.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_ghost_collisions.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_cylinder_collisions.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_distr_mpi.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p_tree.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_computer_empty.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_computer.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_ghost_collision_base.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_ghost_collisions.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_cylinder_collisions.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_distr_mpi.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/p2p/p2p_tree.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/particles_adams_bashforth.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/particles_distr_mpi.hpp
${PROJECT_SOURCE_DIR}/cpp/particles/interpolation/particles_field_computer.hpp
......
......@@ -26,11 +26,11 @@
#include <string>
#include <cmath>
#include "NSVE_Stokes_particles.hpp"
#include "full_code/NSVE_Stokes_particles.hpp"
#include "scope_timer.hpp"
#include "particles/particles_sampling.hpp"
#include "particles/p2p_ghost_collisions.hpp"
#include "particles/particles_inner_computer_2nd_order.hpp"
#include "particles/p2p/p2p_ghost_collisions.hpp"
#include "particles/inner/particles_inner_computer_2nd_order.hpp"
template <typename rnumber>
int NSVE_Stokes_particles<rnumber>::initialize(void)
......
......@@ -26,11 +26,11 @@
#include <string>
#include <cmath>
#include "NSVEcomplex_particles.hpp"
#include "full_code/NSVEcomplex_particles.hpp"
#include "scope_timer.hpp"
#include "particles/particles_sampling.hpp"
#include "particles/p2p_computer.hpp"
#include "particles/particles_inner_computer.hpp"
#include "particles/p2p/p2p_computer.hpp"
#include "particles/inner/particles_inner_computer.hpp"
template <typename rnumber>
int NSVEcomplex_particles<rnumber>::initialize(void)
......
......@@ -24,8 +24,8 @@
#include "base.hpp"
#include "particles_utils.hpp"
#include "particles_inner_computer.hpp"
#include "particles/particles_utils.hpp"
#include "particles/inner/particles_inner_computer.hpp"
#include <cmath>
......
......@@ -37,9 +37,9 @@
#include <algorithm>
#include "scope_timer.hpp"
#include "particles_utils.hpp"
#include "p2p_tree.hpp"
#include "lock_free_bool_array.hpp"
#include "particles/particles_utils.hpp"
#include "particles/p2p/p2p_tree.hpp"
#include "particles/lock_free_bool_array.hpp"
template <class partsize_t, class real_number>
class p2p_distr_mpi {
......
......@@ -27,7 +27,7 @@
#include <set>
#include <utility>
#include <vector>
#include "particles/p2p_ghost_collision_base.hpp"
#include "particles/p2p/p2p_ghost_collision_base.hpp"
template <class real_number, class partsize_t>
......
......@@ -40,7 +40,7 @@
#include "particles/particles_adams_bashforth.hpp"
#include "scope_timer.hpp"
#include "particles/p2p_distr_mpi.hpp"
#include "particles/p2p/p2p_distr_mpi.hpp"
template <class partsize_t, class real_number, class field_rnumber, class field_class, class interpolator_class, int interp_neighbours,
int size_particle_positions, int size_particle_rhs, class p2p_computer_class, class particles_inner_computer_class>
......
......@@ -33,13 +33,14 @@
#include "particles/particles_system.hpp"
#include "particles/particles_input_hdf5.hpp"
#include "particles/interpolation/particles_generic_interp.hpp"
#include "particles/p2p_computer_empty.hpp"
#include "particles/particles_inner_computer_empty.hpp"
#include "particles/p2p/p2p_computer_empty.hpp"
#include "particles/inner/particles_inner_computer_empty.hpp"
#include "field.hpp"
#include "kspace.hpp"
const int MAX_INTERPOLATION_NEIGHBOURS=5;
const int MAX_INTERPOLATION_SMOOTHNESS=2;
//////////////////////////////////////////////////////////////////////////////
///
......@@ -297,8 +298,8 @@ inline std::unique_ptr<abstract_particles_system<partsize_t, particles_rnumber>>
MPI_Comm mpi_comm,
const int in_current_iteration){
return Template_double_for_if::evaluate<std::unique_ptr<abstract_particles_system<partsize_t, particles_rnumber>>,
int, 1, 11, 1, // interpolation_size
int, 0, 5, 1, // spline_mode
int, 1, MAX_INTERPOLATION_NEIGHBOURS, 1, // interpolation_size
int, 0, MAX_INTERPOLATION_SMOOTHNESS, 1, // spline_mode
particles_system_build_container<partsize_t, field_rnumber,be,fc,particles_rnumber,
p2p_computer_empty<particles_rnumber,partsize_t>,
particles_inner_computer_empty<particles_rnumber,partsize_t>,
......@@ -327,8 +328,8 @@ inline std::unique_ptr<abstract_particles_system_with_p2p<partsize_t, particles_
particles_inner_computer_class inner_computer,
const particles_rnumber cutoff){
return Template_double_for_if::evaluate<std::unique_ptr<abstract_particles_system_with_p2p<partsize_t, particles_rnumber, p2p_computer_class>>,
int, 1, 11, 1, // interpolation_size
int, 0, 5, 1, // spline_mode
int, 1, MAX_INTERPOLATION_NEIGHBOURS, 1, // interpolation_size
int, 0, MAX_INTERPOLATION_SMOOTHNESS, 1, // spline_mode
particles_system_build_container<partsize_t, field_rnumber,be,fc,particles_rnumber,
p2p_computer_class,
particles_inner_computer_class,
......
Supports Markdown
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