From 5ed6a90e83fd266d99c59b5bc87d2261276ff811 Mon Sep 17 00:00:00 2001 From: roch smets Date: Tue, 13 Aug 2024 12:05:56 +0200 Subject: [PATCH] start to clean the density usage in ions --- src/core/data/ions/ions.hpp | 3 +++ tests/core/numerics/ion_updater/test_updater.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/core/data/ions/ions.hpp b/src/core/data/ions/ions.hpp index 602c4f4f4..9f0133059 100644 --- a/src/core/data/ions/ions.hpp +++ b/src/core/data/ions/ions.hpp @@ -63,6 +63,9 @@ namespace core NO_DISCARD field_type const& density() const { return particleDensity_; } // TODO ouam : to remove NO_DISCARD field_type& density() { return particleDensity_; } // TODO ouam : to remove + NO_DISCARD field_type const& particleDensity() const { return particleDensity_; } + NO_DISCARD field_type& particleDensity() { return particleDensity_; } + NO_DISCARD field_type const& massDensity() const { return sameMasses_ ? particleDensity_ : massDensity_; diff --git a/tests/core/numerics/ion_updater/test_updater.cpp b/tests/core/numerics/ion_updater/test_updater.cpp index 11334f907..622a83c7f 100644 --- a/tests/core/numerics/ion_updater/test_updater.cpp +++ b/tests/core/numerics/ion_updater/test_updater.cpp @@ -633,7 +633,7 @@ struct IonUpdaterTest : public ::testing::Test check(alphaFy, ionsBufferCpy.alphaF(Component::Y)); check(alphaFz, ionsBufferCpy.alphaF(Component::Z)); - check(ions.density(), ionsBufferCpy.ionParticleDensity); + check(ions.particleDensity(), ionsBufferCpy.ionParticleDensity); check(ions.velocity().getComponent(Component::X), ionsBufferCpy.Vi(Component::X)); check(ions.velocity().getComponent(Component::Y), ionsBufferCpy.Vi(Component::Y)); check(ions.velocity().getComponent(Component::Z), ionsBufferCpy.Vi(Component::Z));