From b724de440c9ecf7cc659173bdb7ee6017e6a6f21 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 12 Dec 2020 11:02:46 -0700 Subject: [PATCH] Adjust tests. --- tests/particles/particle_03.cc | 4 ++-- tests/particles/particle_06.cc | 4 ++-- tests/particles/particle_07.cc | 4 ++-- tests/particles/particle_iterator_01.cc | 4 ++-- tests/particles/property_pool_01.cc | 7 +++++-- tests/particles/property_pool_02.cc | 9 ++++++--- tests/serialization/particle_01.cc | 10 +++++----- 7 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tests/particles/particle_03.cc b/tests/particles/particle_03.cc index 62b308f17d..26795fe626 100644 --- a/tests/particles/particle_03.cc +++ b/tests/particles/particle_03.cc @@ -29,8 +29,8 @@ void test() { { - const unsigned int n_properties_per_particle = 3; - Particles::PropertyPool pool(n_properties_per_particle); + const unsigned int n_properties_per_particle = 3; + Particles::PropertyPool pool(n_properties_per_particle); Point<2> position; position(0) = 0.3; diff --git a/tests/particles/particle_06.cc b/tests/particles/particle_06.cc index 772c52dac3..4fbe6149d2 100644 --- a/tests/particles/particle_06.cc +++ b/tests/particles/particle_06.cc @@ -29,8 +29,8 @@ void test() { { - const unsigned int n_properties_per_particle = 3; - Particles::PropertyPool pool(n_properties_per_particle); + const unsigned int n_properties_per_particle = 3; + Particles::PropertyPool pool(n_properties_per_particle); Point position; diff --git a/tests/particles/particle_07.cc b/tests/particles/particle_07.cc index 68091b8a11..273c16c2c5 100644 --- a/tests/particles/particle_07.cc +++ b/tests/particles/particle_07.cc @@ -29,8 +29,8 @@ void test() { { - const unsigned int n_properties_per_particle = 3; - Particles::PropertyPool pool(n_properties_per_particle); + const unsigned int n_properties_per_particle = 3; + Particles::PropertyPool pool(n_properties_per_particle); Point<2> position; position(0) = 0.3; diff --git a/tests/particles/particle_iterator_01.cc b/tests/particles/particle_iterator_01.cc index d22dcd69e9..7cd13fb060 100644 --- a/tests/particles/particle_iterator_01.cc +++ b/tests/particles/particle_iterator_01.cc @@ -31,8 +31,8 @@ void test() { { - const unsigned int n_properties_per_particle = 3; - Particles::PropertyPool pool(n_properties_per_particle); + const unsigned int n_properties_per_particle = 3; + Particles::PropertyPool pool(n_properties_per_particle); Point position; position(0) = 0.3; diff --git a/tests/particles/property_pool_01.cc b/tests/particles/property_pool_01.cc index 68f3accfd0..f34e8a3637 100644 --- a/tests/particles/property_pool_01.cc +++ b/tests/particles/property_pool_01.cc @@ -29,9 +29,12 @@ void test() { { - Particles::PropertyPool pool(1); + const int dim = 2; + const int spacedim = 2; - typename Particles::PropertyPool::Handle handle = + Particles::PropertyPool pool(1); + + typename Particles::PropertyPool::Handle handle = pool.allocate_properties_array(); pool.get_properties(handle)[0] = 2.5; diff --git a/tests/particles/property_pool_02.cc b/tests/particles/property_pool_02.cc index a4649de952..4cb2e9a9f7 100644 --- a/tests/particles/property_pool_02.cc +++ b/tests/particles/property_pool_02.cc @@ -29,10 +29,13 @@ void test() { { - const unsigned int n_properties = 3; - Particles::PropertyPool pool(n_properties); + const int dim = 2; + const int spacedim = 2; - typename Particles::PropertyPool::Handle handle = + const unsigned int n_properties = 3; + Particles::PropertyPool pool(n_properties); + + typename Particles::PropertyPool::Handle handle = pool.allocate_properties_array(); pool.get_properties(handle)[0] = 1.2; diff --git a/tests/serialization/particle_01.cc b/tests/serialization/particle_01.cc index 0ddcf88a96..a62d5523f3 100644 --- a/tests/serialization/particle_01.cc +++ b/tests/serialization/particle_01.cc @@ -34,10 +34,10 @@ test() Point location; Point reference_location; - location[spacedim - 1] = 0.3; - reference_location[dim - 1] = 0.5; - const unsigned int id = 6; - Particles::PropertyPool property_pool(2); + location[spacedim - 1] = 0.3; + reference_location[dim - 1] = 0.5; + const unsigned int id = 6; + Particles::PropertyPool property_pool(2); Particles::Particle particle(location, reference_location, @@ -65,7 +65,7 @@ test() std::istringstream iss(oss.str()); boost::archive::text_iarchive ia(iss, boost::archive::no_header); - Particles::PropertyPool property_pool(2); + Particles::PropertyPool property_pool(2); Particles::Particle particle; particle.set_property_pool(property_pool); -- 2.39.5