From aae823c1e1b4598116e19522f4ab98bf72d8a026 Mon Sep 17 00:00:00 2001 From: Cristian C Lalescu <Cristian.Lalescu@ds.mpg.de> Date: Wed, 26 Sep 2018 14:15:00 +0200 Subject: [PATCH] injection rate should be read from file (it wasn't) --- bfps/cpp/full_code/NSVE.cpp | 1 + bfps/cpp/full_code/NSVEcomplex_particles.cpp | 2 +- bfps/cpp/full_code/code_base.cpp | 2 +- bfps/cpp/particles/particles_distr_mpi.hpp | 2 +- bfps/cpp/vorticity_equation.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bfps/cpp/full_code/NSVE.cpp b/bfps/cpp/full_code/NSVE.cpp index ecec7db3..da26ad22 100644 --- a/bfps/cpp/full_code/NSVE.cpp +++ b/bfps/cpp/full_code/NSVE.cpp @@ -156,6 +156,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"); diff --git a/bfps/cpp/full_code/NSVEcomplex_particles.cpp b/bfps/cpp/full_code/NSVEcomplex_particles.cpp index 02a19931..487fe4bb 100644 --- a/bfps/cpp/full_code/NSVEcomplex_particles.cpp +++ b/bfps/cpp/full_code/NSVEcomplex_particles.cpp @@ -24,7 +24,7 @@ -#define NDEBUG +//#define NDEBUG #include <string> #include <cmath> diff --git a/bfps/cpp/full_code/code_base.cpp b/bfps/cpp/full_code/code_base.cpp index a6487c72..210f2c96 100644 --- a/bfps/cpp/full_code/code_base.cpp +++ b/bfps/cpp/full_code/code_base.cpp @@ -24,7 +24,7 @@ -#define NDEBUG +//#define NDEBUG #include "code_base.hpp" #include "scope_timer.hpp" diff --git a/bfps/cpp/particles/particles_distr_mpi.hpp b/bfps/cpp/particles/particles_distr_mpi.hpp index 251119be..dbf15b6b 100644 --- a/bfps/cpp/particles/particles_distr_mpi.hpp +++ b/bfps/cpp/particles/particles_distr_mpi.hpp @@ -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){ diff --git a/bfps/cpp/vorticity_equation.cpp b/bfps/cpp/vorticity_equation.cpp index ead9345a..320c51d8 100644 --- a/bfps/cpp/vorticity_equation.cpp +++ b/bfps/cpp/vorticity_equation.cpp @@ -24,7 +24,7 @@ -#define NDEBUG +//#define NDEBUG #include <limits> #include <cassert> -- GitLab