From 6856e35afb154ae12c056a8ae2d2059eba79b70a Mon Sep 17 00:00:00 2001 From: amartyads Date: Thu, 30 Jan 2025 19:07:06 +0100 Subject: [PATCH] renamed get_halo_L to getHaloWidthForDimension --- src/parallel/boundaries/BoundaryHandler.cpp | 4 ++-- src/particleContainer/AutoPasContainer.cpp | 2 +- src/particleContainer/AutoPasContainer.h | 2 +- src/particleContainer/LinkedCells.cpp | 2 +- src/particleContainer/LinkedCells.h | 2 +- src/particleContainer/ParticleContainer.h | 2 +- src/steereoCommands/sendCouplingMDCommand.cpp | 2 +- src/utils/generator/ReplicaFiller.cpp | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/parallel/boundaries/BoundaryHandler.cpp b/src/parallel/boundaries/BoundaryHandler.cpp index 0760f64292..e052769643 100644 --- a/src/parallel/boundaries/BoundaryHandler.cpp +++ b/src/parallel/boundaries/BoundaryHandler.cpp @@ -138,8 +138,8 @@ void BoundaryHandler::processGlobalWallLeavingParticles(ParticleContainer *molec void BoundaryHandler::removeNonPeriodicHalos(ParticleContainer *moleculeContainer) const { // get halo lengths in each dimension - const std::array haloWidths = {moleculeContainer->get_halo_L(0), moleculeContainer->get_halo_L(1), - moleculeContainer->get_halo_L(2)}; + const std::array haloWidths = {moleculeContainer->getHaloWidthForDimension(0), moleculeContainer->getHaloWidthForDimension(1), + moleculeContainer->getHaloWidthForDimension(2)}; for (auto const [currentDim, currentWallIsGlobalWall] : _isGlobalWall) { if (!currentWallIsGlobalWall) continue; diff --git a/src/particleContainer/AutoPasContainer.cpp b/src/particleContainer/AutoPasContainer.cpp index d445392748..b28bf3a668 100644 --- a/src/particleContainer/AutoPasContainer.cpp +++ b/src/particleContainer/AutoPasContainer.cpp @@ -633,7 +633,7 @@ void AutoPasContainer::deleteOuterParticles() { } } -double AutoPasContainer::get_halo_L(int /*index*/) const { return _cutoff; } +double AutoPasContainer::getHaloWidthForDimension(int /*index*/) const { return _cutoff; } double AutoPasContainer::getCutoff() const { return _cutoff; } diff --git a/src/particleContainer/AutoPasContainer.h b/src/particleContainer/AutoPasContainer.h index 5167ba5818..ebdddf686c 100644 --- a/src/particleContainer/AutoPasContainer.h +++ b/src/particleContainer/AutoPasContainer.h @@ -89,7 +89,7 @@ class AutoPasContainer : public ParticleContainer { void deleteOuterParticles() override; - double get_halo_L(int index) const override; + double getHaloWidthForDimension(int index) const override; double getCutoff() const override; diff --git a/src/particleContainer/LinkedCells.cpp b/src/particleContainer/LinkedCells.cpp index 9087b21d74..eab3591bea 100644 --- a/src/particleContainer/LinkedCells.cpp +++ b/src/particleContainer/LinkedCells.cpp @@ -629,7 +629,7 @@ void LinkedCells::deleteOuterParticles() { } } -double LinkedCells::get_halo_L(int index) const { +double LinkedCells::getHaloWidthForDimension(int index) const { return _haloLength[index]; } diff --git a/src/particleContainer/LinkedCells.h b/src/particleContainer/LinkedCells.h index a444fea3ae..add747275e 100644 --- a/src/particleContainer/LinkedCells.h +++ b/src/particleContainer/LinkedCells.h @@ -190,7 +190,7 @@ class LinkedCells : public ParticleContainer { //! @brief gets the width of the halo region in dimension index //! @todo remove this method, because a halo_L shouldn't be necessary for every ParticleContainer //! e.g. replace it by the cutoff-radius - double get_halo_L(int index) const override; + double getHaloWidthForDimension(int index) const override; double getCutoff() const override { return _cutoffRadius; } void setCutoff(double rc) override { _cutoffRadius = rc; } diff --git a/src/particleContainer/ParticleContainer.h b/src/particleContainer/ParticleContainer.h index eea8af21cc..012b68f2b3 100644 --- a/src/particleContainer/ParticleContainer.h +++ b/src/particleContainer/ParticleContainer.h @@ -192,7 +192,7 @@ class ParticleContainer: public MemoryProfilable { //! @brief returns the width of the halo stripe (for the given dimension index) //! @todo remove this method, because a halo_L shouldn't be necessary for every ParticleContainer //! e.g. replace it by the cutoff-radius - virtual double get_halo_L(int index) const = 0; + virtual double getHaloWidthForDimension(int index) const = 0; virtual double getCutoff() const = 0; diff --git a/src/steereoCommands/sendCouplingMDCommand.cpp b/src/steereoCommands/sendCouplingMDCommand.cpp index 1ee3ca5753..60966e40c7 100644 --- a/src/steereoCommands/sendCouplingMDCommand.cpp +++ b/src/steereoCommands/sendCouplingMDCommand.cpp @@ -97,7 +97,7 @@ ReturnType SendCouplingMDCommand::executeProcessing() double rmax = moleculeContainer->getBoundingBoxMax(dim); logger->debug() << "dim is " << dim << ", dir is " << dir << std::endl; - logger->debug() << "halo is " << moleculeContainer->get_halo_L(dim) << std::endl; + logger->debug() << "halo is " << moleculeContainer->getHaloWidthForDimension(dim) << std::endl; Molecule* currentMolecule; double low_limit = rmin; // particles below this limit have to be copied or moved to the lower process diff --git a/src/utils/generator/ReplicaFiller.cpp b/src/utils/generator/ReplicaFiller.cpp index f2fc5d0fe6..eb7d054943 100644 --- a/src/utils/generator/ReplicaFiller.cpp +++ b/src/utils/generator/ReplicaFiller.cpp @@ -95,7 +95,7 @@ class ParticleContainerToBasisWrapper : public ParticleContainer { void deleteOuterParticles() override {} - double get_halo_L(int index) const override { return 0.0; } + double getHaloWidthForDimension(int index) const override { return 0.0; } double getCutoff() const override { return 0.0; }