Skip to content
GitLab
Commit 7d3bb095 authored by Berenger Bramas's avatar Berenger Bramas
Browse files

Update the kernels and make it possible to update parameters at runtime

parent 359ef9ab
Pipeline #19548 failed with stage
in 2 minutes and 25 seconds
Hide whitespace changes
Inline Side-by-side
bfps/cpp/field.hpp
View file @ 7d3bb095
......@@ -58,6 +58,10 @@ class field
private:
rnumber *__restrict__ data; /**< data array */
public:
constexpr int nb_components() {
return ncomp(fc);
}
hsize_t npoints; /**< total number of grid points. Useful for normalization. */
bool real_space_representation; /**< `true` if field is in real space representation. */
......
bfps/cpp/full_code/NSVEparticlesP2P.cpp
View file @ 7d3bb095
......@@ -4,13 +4,20 @@
#include "scope_timer.hpp"
#include "particles/particles_sampling.hpp"
#include "particles/p2p_computer.hpp"
#include "particles/particles_inner_computer.hpp"
template <typename rnumber>
int NSVEparticlesP2P<rnumber>::initialize(void)
{
this->NSVE<rnumber>::initialize();
this->ps = particles_system_builder(
p2p_computer<rnumber, long long int> current_p2p_computer;
current_p2p_computer.setEnable(enable_p2p);
particles_inner_computer<rnumber, long long int> current_particles_inner_computer(inner_v0);
current_particles_inner_computer.setEnable(enable_inner);
this->ps = particles_system_builder_with_p2p(
this->fs->cvelocity, // (field object)
this->fs->kk, // (kspace object, contains dkx, dky, dkz)
tracers0_integration_steps, // to check coherency between parameters and hdf input file (nb rhs)
......@@ -21,10 +28,13 @@ int NSVEparticlesP2P<rnumber>::initialize(void)
tracers0_neighbours, // parameter (interpolation no neighbours)
tracers0_smoothness, // parameter
this->comm,
this->fs->iteration+1);
// TODO P2P write particle data too
this->fs->iteration+1,
std::move(current_p2p_computer),
std::move(current_particles_inner_computer),
cutoff);
this->particles_output_writer_mpi = new particles_output_hdf5<
long long int, double, 3, 3>(
long long int, double, 6, 6>(
MPI_COMM_WORLD,
"tracers0",
nparticles,
......@@ -37,7 +47,12 @@ int NSVEparticlesP2P<rnumber>::step(void)
{
this->fs->compute_velocity(this->fs->cvorticity);
this->fs->cvelocity->ift();
this->ps->completeLoop(this->dt);
if(enable_vorticity_omega){
this->ps->completeLoopWithVorticity(this->dt, *this->fs->cvorticity);
}
else{
this->ps->completeLoop(this->dt);
}
this->NSVE<rnumber>::step();
return EXIT_SUCCESS;
}
......
bfps/cpp/full_code/NSVEparticlesP2P.hpp
View file @ 7d3bb095
......@@ -55,10 +55,15 @@ class NSVEparticlesP2P: public NSVE<rnumber>
int tracers0_neighbours;
int tracers0_smoothness;
double cutoff;
bool enable_p2p;
bool enable_inner;
bool enable_vorticity_omega;
/* other stuff */
std::unique_ptr<abstract_particles_system<long long int, double>> ps;
// TODO P2P use a reader with particle data
particles_output_hdf5<long long int, double,3,3> *particles_output_writer_mpi;
particles_output_hdf5<long long int, double,6,6> *particles_output_writer_mpi;
NSVEparticlesP2P(
......@@ -66,7 +71,8 @@ class NSVEparticlesP2P: public NSVE<rnumber>
const std::string &simulation_name):
NSVE<rnumber>(
COMMUNICATOR,
simulation_name){}
simulation_name),
cutoff(std::numeric_limits<double>::max()){}
~NSVEparticlesP2P(){}
int initialize(void);
......
bfps/cpp/particles/abstract_particles_system.hpp
View file @ 7d3bb095
......@@ -16,6 +16,10 @@ public:
virtual void compute_p2p() = 0;
virtual void compute_particles_inner() = 0;
virtual void compute_particles_inner(const real_number particle_extra_rhs[]) = 0;
virtual void move(const real_number dt) = 0;
virtual void redistribute() = 0;
......@@ -26,6 +30,9 @@ public:
virtual void completeLoop(const real_number dt) = 0;
virtual void completeLoopWithVorticity(const real_number dt,
const real_number particle_extra_rhs[]) = 0;
virtual const real_number* getParticlesPositions() const = 0;
virtual const std::unique_ptr<real_number[]>* getParticlesRhs() const = 0;
......@@ -54,6 +61,15 @@ public:
virtual void sample_compute_field(const field<double, FFTW, THREExTHREE>& sample_field,
real_number sample_rhs[]) = 0;
//- Not generic to enable sampling end
template <typename rnumber, field_backend be, field_components fc>
void completeLoopWithVorticity(const real_number dt,
const field<rnumber, be, fc>& in_field) {
static_assert(fc == THREE, "only THREE is supported for now");
std::unique_ptr<real_number[]> extra_rhs(new real_number[getLocalNbParticles()*3]());
sample_compute_field(in_field, extra_rhs.get());
completeLoopWithVorticity(dt, extra_rhs.get());
}
};
#endif
bfps/cpp/particles/p2p_computer.hpp
View file @ 7d3bb095
......@@ -2,27 +2,31 @@
#define P2P_COMPUTER_HPP
#include <cstring>
/** \brief A simple distance weighting function.
*
* This function returns 1 if a distance is smaller than a cut-off length,
* i.e. particle 1 interacts with particle 2 if particle 2 is inside a
* sphere of radius `cutoff' centered on particle 1.
*/
double dumb_distance_weight(
double distance,
double cutoff)
{
// this function should only be called for interacting particles,
// and particles interact if they are closer than cutoff.
assert(distance < cutoff);
return 1.0;
}
#include <cassert>
template <class real_number, class partsize_t>
class p2p_computer{
bool isActive;
/** \brief A simple distance weighting function.
*
* This function returns 1 if a distance is smaller than a cut-off length,
* i.e. particle 1 interacts with particle 2 if particle 2 is inside a
* sphere of radius `cutoff' centered on particle 1.
*/
static double dumb_distance_weight(
const double dist_pow2,
const double cutoff){
// this function should only be called for interacting particles,
// and particles interact if they are closer than cutoff.
assert(dist_pow2 < cutoff*cutoff);
return 1.0;
}
public:
constexpr static int size_data = 3;
p2p_computer() : isActive(true){}
template <int size_particle_rhs>
void init_result_array(real_number rhs[], const partsize_t nbParticles) const{
......@@ -31,25 +35,26 @@ public:
template <int size_particle_rhs>
void reduce_particles_rhs(real_number rhs_dst[], const real_number rhs_src[], const partsize_t nbParticles) const{
static_assert(size_particle_rhs == 6, "This kernel works only with 6 values per particle's rhs");
for(int idx_part = 0 ; idx_part < nbParticles ; ++idx_part){
for(int idx_rhs = 0 ; idx_rhs < size_particle_rhs ; ++idx_rhs){
// We merge only the values modified by the current kernel (3-5)
for(int idx_rhs = 3 ; idx_rhs < size_particle_rhs ; ++idx_rhs){
rhs_dst[idx_part*size_particle_rhs+idx_rhs] += rhs_src[idx_part*size_particle_rhs+idx_rhs];
}
}
}
template <int size_particle_positions, int size_particle_data, int size_particle_rhs>
void compute_interaction(const real_number pos_part1[], const real_number data_part1[], real_number rhs_part1[],
const real_number pos_part2[], const real_number data_part2[], real_number rhs_part2[],
const real_number dist_pow2,
const real_number xshift_coef, const real_number yshift_coef, const real_number zshift_coef) const{
static_assert(size_particle_positions == 3, "This kernel works only with 3 values for one particle's position");
static_assert(size_particle_rhs >= 6, "This kernel works only with more than 6 values per particle's rhs");
static_assert(size_particle_data == 3, "This kernel works only with 3 values per particle's' data");
template <int size_particle_positions, int size_particle_rhs>
void compute_interaction(const real_number pos_part1[], real_number rhs_part1[],
const real_number pos_part2[], real_number rhs_part2[],
const real_number dist_pow2, const real_number cutoff,
const real_number /*xshift_coef*/, const real_number /*yshift_coef*/, const real_number /*zshift_coef*/) const{
static_assert(size_particle_positions == 6, "This kernel works only with 6 values for one particle's position+orientation");
static_assert(size_particle_rhs == 6, "This kernel works only with 6 values per particle's rhs");
// TODO: a reasonable way of choosing between different distance_weight functions should be thought of.
// We need to ask Michael about how flexible this distance_weight needs to be.
const double ww = dumb_distance_weight(distance, max_distance);
const double ww = dumb_distance_weight(dist_pow2, cutoff);
///
/// term in equation is:
///
......@@ -57,20 +62,23 @@ public:
/// (4 / \tau) \sum_j W_\ell ( | x^i - x^j | ) (p^i \cdot p^j)p^j
/// \f]
///
const double dot_product = (data_part1[0]*data_part2[0] +
data_part1[1]*data_part2[1] +
data_part1[2]*data_part2[2]);
rhs_part1[3] += data_part2[0] * 4 * ww * dot_product;
rhs_part1[4] += data_part2[1] * 4 * ww * dot_product;
rhs_part1[5] += data_part2[2] * 4 * ww * dot_product;
rhs_part2[3] += data_part1[0] * 4 * ww * dot_product;
rhs_part2[4] += data_part1[1] * 4 * ww * dot_product;
rhs_part2[5] += data_part1[2] * 4 * ww * dot_product;
const double dot_product = (pos_part1[3+IDX_X]*pos_part2[3+IDX_X] +
pos_part1[3+IDX_Y]*pos_part2[3+IDX_Y] +
pos_part1[3+IDX_Z]*pos_part2[3+IDX_Z]);
rhs_part1[3+IDX_X] += pos_part2[3+IDX_X] * 4 * ww * dot_product;
rhs_part1[3+IDX_Y] += pos_part2[3+IDX_Y] * 4 * ww * dot_product;
rhs_part1[3+IDX_Z] += pos_part2[3+IDX_Z] * 4 * ww * dot_product;
rhs_part2[3+IDX_X] += pos_part1[3+IDX_X] * 4 * ww * dot_product;
rhs_part2[3+IDX_Y] += pos_part1[3+IDX_Y] * 4 * ww * dot_product;
rhs_part2[3+IDX_Z] += pos_part1[3+IDX_Z] * 4 * ww * dot_product;
}
bool isEnable() const {
return isActive;
}
constexpr static bool isEmpty() {
return false;
void setEnable(const bool inIsActive) {
isActive = inIsActive;
}
};
......
bfps/cpp/particles/p2p_computer_empty.hpp
View file @ 7d3bb095
......@@ -6,8 +6,6 @@
template <class real_number, class partsize_t>
class p2p_computer_empty{
public:
constexpr int static size_data = 0;
template <int size_particle_rhs>
void init_result_array(real_number /*rhs*/[], const partsize_t /*nbParticles*/) const{
}
......@@ -16,15 +14,15 @@ public:
void reduce_particles_rhs(real_number /*rhs_dst*/[], const real_number /*rhs_src*/[], const partsize_t /*nbParticles*/) const{
}
template <int size_particle_positions, int size_particle_data, int size_particle_rhs>
void compute_interaction(const real_number /*pos_part1*/[], const real_number /*data_part1*/[], real_number /*rhs_part1*/[],
const real_number /*pos_part2*/[], const real_number /*data_part2*/[], real_number /*rhs_part2*/[],
const real_number /*dist_pow2*/,
template <int size_particle_positions, int size_particle_rhs>
void compute_interaction(const real_number /*pos_part1*/[], real_number /*rhs_part1*/[],
const real_number /*pos_part2*/[], real_number /*rhs_part2*/[],
const real_number /*dist_pow2*/, const real_number /*cutoff*/,
const real_number /*xshift_coef*/, const real_number /*yshift_coef*/, const real_number /*zshift_coef*/) const{
}
constexpr static bool isEmpty() {
return true;
constexpr static bool isEnable() {
return false;
}
};
......
bfps/cpp/particles/p2p_distr_mpi.hpp
View file @ 7d3bb095
......@@ -36,7 +36,6 @@ protected:
std::unique_ptr<real_number[]> toRecvAndMerge;
std::unique_ptr<real_number[]> toCompute;
std::unique_ptr<real_number[]> toData;
std::unique_ptr<real_number[]> results;
};
......@@ -248,11 +247,10 @@ public:
return (diff_x*diff_x) + (diff_y*diff_y) + (diff_z*diff_z);
}
template <class computer_class, int size_particle_positions, int size_particle_data, int size_particle_rhs>
template <class computer_class, int size_particle_positions, int size_particle_rhs>
void compute_distr(computer_class& in_computer,
const partsize_t current_my_nb_particles_per_partition[],
real_number particles_positions[],
real_number particles_data[],
real_number particles_current_rhs[],
partsize_t inout_index_particles[]){
TIMEZONE("compute_distr");
......@@ -313,9 +311,6 @@ public:
permute_copy<real_number, size_particle_positions>(current_offset_particles_for_partition[idxPartition],
current_my_nb_particles_per_partition[idxPartition],
part_to_sort.data(), particles_positions, &buffer);
permute_copy<real_number, size_particle_data>(current_offset_particles_for_partition[idxPartition],
current_my_nb_particles_per_partition[idxPartition],
part_to_sort.data(), particles_data, &buffer);
permute_copy<real_number, size_particle_rhs>(current_offset_particles_for_partition[idxPartition],
current_my_nb_particles_per_partition[idxPartition],
part_to_sort.data(), particles_current_rhs, &buffer);
......@@ -457,14 +452,6 @@ public:
descriptor.destProc, TAG_POSITION_PARTICLES,
current_com, &mpiRequests.back()));
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
assert(descriptor.nbParticlesToExchange*size_particle_data < std::numeric_limits<int>::max());
AssertMpi(MPI_Isend(const_cast<real_number*>(&particles_data[particles_offset_layers[my_nb_cell_levels-descriptor.nbLevelsToExchange]*size_particle_data]),
int(descriptor.nbParticlesToExchange*size_particle_data), particles_utils::GetMpiType(real_number()),
descriptor.destProc, TAG_POSITION_PARTICLES,
current_com, &mpiRequests.back()));
assert(descriptor.toRecvAndMerge == nullptr);
descriptor.toRecvAndMerge.reset(new real_number[descriptor.nbParticlesToExchange*size_particle_rhs]);
whatNext.emplace_back(std::pair<Action,int>{MERGE_PARTICLES, idxDescr});
......@@ -526,15 +513,6 @@ public:
AssertMpi(MPI_Irecv(descriptor.toCompute.get(), int(NbParticlesToReceive*size_particle_positions),
particles_utils::GetMpiType(real_number()), destProc, TAG_POSITION_PARTICLES,
current_com, &mpiRequests.back()));
descriptor.toData.reset(new real_number[NbParticlesToReceive*size_particle_data]);
whatNext.emplace_back(std::pair<Action,int>{COMPUTE_PARTICLES, releasedAction.second});
mpiRequests.emplace_back();
assert(NbParticlesToReceive*size_particle_data < std::numeric_limits<int>::max());
AssertMpi(MPI_Irecv(descriptor.toData.get(), int(NbParticlesToReceive*size_particle_data),
particles_utils::GetMpiType(real_number()), destProc, TAG_POSITION_PARTICLES,
current_com, &mpiRequests.back()));
}
}
......@@ -548,7 +526,6 @@ public:
const partsize_t NbParticlesToReceive = descriptor.nbParticlesToExchange;
assert(descriptor.toCompute != nullptr);
assert(descriptor.toData != nullptr);
assert(descriptor.positionsReceived == true);
descriptor.results.reset(new real_number[NbParticlesToReceive*size_particle_rhs]);
in_computer.template init_result_array<size_particle_rhs>(descriptor.results.get(), NbParticlesToReceive);
......@@ -589,14 +566,12 @@ public:
particles_positions[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_positions + IDX_Z],
shift[idx_neighbor][IDX_X], shift[idx_neighbor][IDX_Y], shift[idx_neighbor][IDX_Z]);
if(dist_r2 < cutoff_radius_compute*cutoff_radius_compute){
in_computer.template compute_interaction<size_particle_positions,size_particle_data, size_particle_rhs>(
in_computer.template compute_interaction<size_particle_positions, size_particle_rhs>(
&descriptor.toCompute[(idxPart+idx_p1)*size_particle_positions],
&descriptor.toData[(idxPart+idx_p1)*size_particle_data],
&descriptor.results[(idxPart+idx_p1)*size_particle_rhs],
&particles_positions[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_positions],
&particles_data[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_data],
&particles_current_rhs[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_rhs],
dist_r2, shift[idx_neighbor][IDX_X], shift[idx_neighbor][IDX_Y], shift[idx_neighbor][IDX_Z]);
dist_r2, cutoff_radius_compute, shift[idx_neighbor][IDX_X], shift[idx_neighbor][IDX_Y], shift[idx_neighbor][IDX_Z]);
}
}
}
......@@ -681,14 +656,12 @@ public:
particles_positions[(intervals[idx_1].first+idx_p2)*size_particle_positions + IDX_Z],
0, 0, 0);
if(dist_r2 < cutoff_radius_compute*cutoff_radius_compute){
in_computer.template compute_interaction<size_particle_positions,size_particle_data,size_particle_rhs>(
in_computer.template compute_interaction<size_particle_positions,size_particle_rhs>(
&particles_positions[(intervals[idx_1].first+idx_p1)*size_particle_positions],
&particles_data[(intervals[idx_1].first+idx_p1)*size_particle_data],
&particles_current_rhs[(intervals[idx_1].first+idx_p1)*size_particle_rhs],
&particles_positions[(intervals[idx_1].first+idx_p2)*size_particle_positions],
&particles_data[(intervals[idx_1].first+idx_p2)*size_particle_data],
&particles_current_rhs[(intervals[idx_1].first+idx_p2)*size_particle_rhs],
dist_r2, 0, 0, 0);
dist_r2, cutoff_radius_compute, 0, 0, 0);
}
}
}
......@@ -705,14 +678,12 @@ public:
particles_positions[(intervals[idx_2].first+idx_p2)*size_particle_positions + IDX_Z],
0, 0, 0);
if(dist_r2 < cutoff_radius_compute*cutoff_radius_compute){
in_computer.template compute_interaction<size_particle_positions,size_particle_data,size_particle_rhs>(
in_computer.template compute_interaction<size_particle_positions,size_particle_rhs>(
&particles_positions[(intervals[idx_1].first+idx_p1)*size_particle_positions],
&particles_data[(intervals[idx_1].first+idx_p1)*size_particle_data],
&particles_current_rhs[(intervals[idx_1].first+idx_p1)*size_particle_rhs],
&particles_positions[(intervals[idx_2].first+idx_p2)*size_particle_positions],
&particles_data[(intervals[idx_2].first+idx_p2)*size_particle_data],
&particles_current_rhs[(intervals[idx_2].first+idx_p2)*size_particle_rhs],
dist_r2, 0, 0, 0);
dist_r2, cutoff_radius_compute, 0, 0, 0);
}
}
}
......@@ -741,14 +712,12 @@ public:
particles_positions[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_positions + IDX_Z],
shift[idx_neighbor][IDX_X], shift[idx_neighbor][IDX_Y], shift[idx_neighbor][IDX_Z]);
if(dist_r2 < cutoff_radius_compute*cutoff_radius_compute){
in_computer.template compute_interaction<size_particle_positions,size_particle_data,size_particle_rhs>(
in_computer.template compute_interaction<size_particle_positions,size_particle_rhs>(
&particles_positions[(intervals[idx_1].first+idx_p1)*size_particle_positions],
&particles_data[(intervals[idx_1].first+idx_p1)*size_particle_data],
&particles_current_rhs[(intervals[idx_1].first+idx_p1)*size_particle_rhs],
&particles_positions[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_positions],
&particles_data[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_data],
&particles_current_rhs[((*neighbors[idx_neighbor])[idx_2].first+idx_p2)*size_particle_rhs],
dist_r2, shift[idx_neighbor][IDX_X], shift[idx_neighbor][IDX_Y], shift[idx_neighbor][IDX_Z]);
dist_r2, cutoff_radius_compute, shift[idx_neighbor][IDX_X], shift[idx_neighbor][IDX_Y], shift[idx_neighbor][IDX_Z]);
}
}
}
......
bfps/cpp/particles/particles_adams_bashforth.hpp
View file @ 7d3bb095
......@@ -7,11 +7,30 @@
#include "scope_timer.hpp"
#include "particles_utils.hpp"
template <class partsize_t, class real_number, int size_particle_positions = 3, int size_particle_rhs = 3>
class particles_adams_bashforth {
static_assert(size_particle_positions == size_particle_rhs,
"Not having the same dimension for positions and rhs looks like a bug,"
"otherwise comment this assertion.");
template <class partsize_t, class real_number, int size_particle_positions, int size_particle_rhs>
class particles_adams_bashforth;
template <class partsize_t, class real_number>
class particles_adams_bashforth<partsize_t,real_number,6,6>{
static const int size_particle_positions = 6;
static const int size_particle_rhs = 6;
public:
static const int Max_steps = 6;
void move_particles(real_number*__restrict__ particles_positions,
const partsize_t nb_particles,
const std::unique_ptr<real_number[]> particles_rhs[],
const int nb_rhs, const real_number dt) const{
// TODO
}
};
template <class partsize_t, class real_number>
class particles_adams_bashforth<partsize_t,real_number,3,3>{
static const int size_particle_positions = 3;
static const int size_particle_rhs = 3;
public:
static const int Max_steps = 6;
......
bfps/cpp/particles/particles_distr_mpi.hpp
View file @ 7d3bb095
......@@ -35,9 +35,6 @@ protected:
TAG_LOW_UP_MOVED_PARTICLES_INDEXES,
TAG_UP_LOW_MOVED_PARTICLES_INDEXES,
TAG_LOW_UP_MOVED_PARTICLES_DATA,
TAG_UP_LOW_MOVED_PARTICLES_DATA,
TAG_LOW_UP_MOVED_PARTICLES_RHS,
TAG_LOW_UP_MOVED_PARTICLES_RHS_MAX = TAG_LOW_UP_MOVED_PARTICLES_RHS+MaxNbRhs,
......@@ -506,14 +503,13 @@ public:
////////////////////////////////////////////////////////////////////////////
template <class computer_class, int size_particle_positions, int size_particle_data, int size_particle_rhs, int size_particle_index>
template <class computer_class, int size_particle_positions, int size_particle_rhs, int size_particle_index>
void redistribute(computer_class& in_computer,
partsize_t current_my_nb_particles_per_partition[],
partsize_t* nb_particles,
std::unique_ptr<real_number[]>* inout_positions_particles,
std::unique_ptr<real_number[]> inout_rhs_particles[], const int in_nb_rhs,
std::unique_ptr<partsize_t[]>* inout_index_particles,
std::unique_ptr<real_number[]>* inout_data_particles){
std::unique_ptr<partsize_t[]>* inout_index_particles){
TIMEZONE("redistribute");
// Some latest processes might not be involved
......@@ -545,11 +541,6 @@ public:
(*inout_index_particles)[size_particle_index*idx2+idx_val]);
}
for(int idx_val = 0 ; idx_val < size_particle_data ; ++idx_val){
std::swap((*inout_data_particles)[size_particle_data*idx1+idx_val],
(*inout_data_particles)[size_particle_data*idx2+idx_val]);
}
for(int idx_rhs = 0 ; idx_rhs < in_nb_rhs ; ++idx_rhs){
for(int idx_val = 0 ; idx_val < size_particle_rhs ; ++idx_val){
std::swap(inout_rhs_particles[idx_rhs][idx1*size_particle_rhs + idx_val],
......@@ -576,11 +567,6 @@ public:
(*inout_index_particles)[size_particle_index*idx2+idx_val]);
}
for(int idx_val = 0 ; idx_val < size_particle_data ; ++idx_val){
std::swap((*inout_data_particles)[size_particle_data*idx1+idx_val],
(*inout_data_particles)[size_particle_data*idx2+idx_val]);
}
for(int idx_rhs = 0 ; idx_rhs < in_nb_rhs ; ++idx_rhs){
for(int idx_val = 0 ; idx_val < size_particle_rhs ; ++idx_val){
std::swap(inout_rhs_particles[idx_rhs][idx1*size_particle_rhs + idx_val],
......@@ -597,8 +583,6 @@ public:
std::unique_ptr<real_number[]> newParticlesUp;
std::unique_ptr<partsize_t[]> newParticlesLowIndexes;
std::unique_ptr<partsize_t[]> newParticlesUpIndexes;
std::unique_ptr<real_number[]> newParticlesLowData;
std::unique_ptr<real_number[]> newParticlesUpData;
std::vector<std::unique_ptr<real_number[]>> newParticlesLowRhs(in_nb_rhs);
std::vector<std::unique_ptr<real_number[]>> newParticlesUpRhs(in_nb_rhs);
......@@ -633,16 +617,6 @@ public:
(my_rank-1+nb_processes_involved)%nb_processes_involved, TAG_LOW_UP_MOVED_PARTICLES_INDEXES,
MPI_COMM_WORLD, &mpiRequests.back()));
if(size_particle_data){
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
assert(nbOutLower*size_particle_data < std::numeric_limits<int>::max());
AssertMpi(MPI_Isend(&(*inout_data_particles)[0], int(nbOutLower*size_particle_data),
particles_utils::GetMpiType(partsize_t()),
(my_rank-1+nb_processes_involved)%nb_processes_involved, TAG_LOW_UP_MOVED_PARTICLES_DATA,
MPI_COMM_WORLD, &mpiRequests.back()));
}
for(int idx_rhs = 0 ; idx_rhs < in_nb_rhs ; ++idx_rhs){
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
......@@ -680,16 +654,6 @@ public:
particles_utils::GetMpiType(partsize_t()), (my_rank+1)%nb_processes_involved, TAG_UP_LOW_MOVED_PARTICLES_INDEXES,
MPI_COMM_WORLD, &mpiRequests.back()));
if(size_particle_data){
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
assert(nbOutUpper*size_particle_data < std::numeric_limits<int>::max());
AssertMpi(MPI_Isend(&(*inout_data_particles)[(myTotalNbParticles-nbOutUpper)*size_particle_data],
int(nbOutUpper*size_particle_data),
particles_utils::GetMpiType(partsize_t()), (my_rank+1)%nb_processes_involved, TAG_UP_LOW_MOVED_PARTICLES_DATA,
MPI_COMM_WORLD, &mpiRequests.back()));
}
for(int idx_rhs = 0 ; idx_rhs < in_nb_rhs ; ++idx_rhs){
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
......@@ -732,17 +696,6 @@ public:
(my_rank-1+nb_processes_involved)%nb_processes_involved, TAG_UP_LOW_MOVED_PARTICLES_INDEXES,
MPI_COMM_WORLD, &mpiRequests.back()));
if(size_particle_data){
newParticlesLowData.reset(new real_number[nbNewFromLow*size_particle_data]);
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
assert(nbNewFromLow*size_particle_data < std::numeric_limits<int>::max());
AssertMpi(MPI_Irecv(&newParticlesLowData[0], int(nbNewFromLow*size_particle_data),
particles_utils::GetMpiType(real_number()),
(my_rank-1+nb_processes_involved)%nb_processes_involved, TAG_UP_LOW_MOVED_PARTICLES_DATA,
MPI_COMM_WORLD, &mpiRequests.back()));
}
for(int idx_rhs = 0 ; idx_rhs < in_nb_rhs ; ++idx_rhs){
newParticlesLowRhs[idx_rhs].reset(new real_number[nbNewFromLow*size_particle_rhs]);
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
......@@ -773,17 +726,6 @@ public:
(my_rank+1)%nb_processes_involved, TAG_LOW_UP_MOVED_PARTICLES_INDEXES,
MPI_COMM_WORLD, &mpiRequests.back()));
if(size_particle_data){
newParticlesUpData.reset(new real_number[nbNewFromUp*size_particle_data]);
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
mpiRequests.emplace_back();
assert(nbNewFromUp*size_particle_data < std::numeric_limits<int>::max());
AssertMpi(MPI_Irecv(&newParticlesUpData[0], int(nbNewFromUp*size_particle_data),
particles_utils::GetMpiType(real_number()),
(my_rank+1)%nb_processes_involved, TAG_LOW_UP_MOVED_PARTICLES_DATA,
MPI_COMM_WORLD, &mpiRequests.back()));
}
for(int idx_rhs = 0 ; idx_rhs < in_nb_rhs ; ++idx_rhs){
newParticlesUpRhs[idx_rhs].reset(new real_number[nbNewFromUp*size_particle_rhs]);
whatNext.emplace_back(std::pair<Action,int>{NOTHING_TODO, -1});
......@@ -814,7 +756,6 @@ public: