Commit 130d5809 authored by Cristian Lalescu's avatar Cristian Lalescu
Browse files

Merge branch 'develop' into feature/ellipsoids

parents bd28a9da b0fe4e2e
Pipeline #37219 failed with stage
......@@ -157,6 +157,7 @@ int NSVE<rnumber>::read_parameters(void)
this->fmode = hdf5_tools::read_value<int>(parameter_file, "parameters/fmode");
this->famplitude = hdf5_tools::read_value<double>(parameter_file, "parameters/famplitude");
this->friction_coefficient = hdf5_tools::read_value<double>(parameter_file, "parameters/friction_coefficient");
this->injection_rate = hdf5_tools::read_value<double>(parameter_file, "parameters/injection_rate");
this->fk0 = hdf5_tools::read_value<double>(parameter_file, "parameters/fk0");
this->fk1 = hdf5_tools::read_value<double>(parameter_file, "parameters/fk1");
this->energy = hdf5_tools::read_value<double>(parameter_file, "parameters/energy");
......
......@@ -141,7 +141,7 @@ public:
const real_number particles_positions[],
real_number particles_current_rhs[],
const int interpolation_size){
TIMEZONE("compute_distr");
TIMEZONE("particle_distr_mpi::compute_distr");
// Some processes might not be involved
if(nb_processes_involved <= my_rank){
......
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