Skip to content

Commit

Permalink
Merge pull request #378 from amartyads/rename_getHaloL
Browse files Browse the repository at this point in the history
renamed get_halo_L to getHaloWidthForDimension
  • Loading branch information
amartyads authored Jan 31, 2025
2 parents 2981975 + 6856e35 commit 9fd3228
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions src/parallel/boundaries/BoundaryHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ void BoundaryHandler::processGlobalWallLeavingParticles(ParticleContainer *molec

void BoundaryHandler::removeNonPeriodicHalos(ParticleContainer *moleculeContainer) const {
// get halo lengths in each dimension
const std::array<double, 3> haloWidths = {moleculeContainer->get_halo_L(0), moleculeContainer->get_halo_L(1),
moleculeContainer->get_halo_L(2)};
const std::array<double, 3> haloWidths = {moleculeContainer->getHaloWidthForDimension(0), moleculeContainer->getHaloWidthForDimension(1),
moleculeContainer->getHaloWidthForDimension(2)};
for (auto const [currentDim, currentWallIsGlobalWall] : _isGlobalWall) {
if (!currentWallIsGlobalWall)
continue;
Expand Down
2 changes: 1 addition & 1 deletion src/particleContainer/AutoPasContainer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
2 changes: 1 addition & 1 deletion src/particleContainer/AutoPasContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/particleContainer/LinkedCells.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ void LinkedCells::deleteOuterParticles() {
}
}

double LinkedCells::get_halo_L(int index) const {
double LinkedCells::getHaloWidthForDimension(int index) const {
return _haloLength[index];
}

Expand Down
2 changes: 1 addition & 1 deletion src/particleContainer/LinkedCells.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
2 changes: 1 addition & 1 deletion src/particleContainer/ParticleContainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/steereoCommands/sendCouplingMDCommand.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/utils/generator/ReplicaFiller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down

0 comments on commit 9fd3228

Please sign in to comment.