xfygogo/phasicFlow
1
0
Fork 0
mirror of https://github.com/PhasicFlow/phasicFlow.git synced 2025-07-08 03:07:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fix for empty domains in partitioning (tested)

Browse Source
This commit is contained in:
Hamidreza Norouzi
2024-01-21 13:23:45 -08:00
parent 41187b0e03
commit 656e03de36
4 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.cpp
View File

@ -60,16 +60,26 @@ bool pFlow::MPISimulationDomain::createBoundaryDicts()
"in dictionary "<< boundaries.globalName()<<endl; "in dictionary "<< boundaries.globalName()<<endl;
return false; return false;
} }
if( initialThisDomainActive() )
if( neighbors[i] == -1 )
{ {
bDict.add("mirrorProcessorNo", processors::globalRank()); if( neighbors[i] == -1 )
{
bDict.add("mirrorProcessorNo", processors::globalRank());
}
else
{
bDict.add("mirrorProcessorNo", neighbors[i]);
bDict.addOrReplace("type", "processor");
}
warningInFunction<<"replace the method initialThisDomainActive()"<<endl;
} }
else else
{ {
bDict.add("mirrorProcessorNo", neighbors[i]); bDict.add("mirrorProcessorNo", processors::globalRank());
bDict.addOrReplace("type", "processor"); bDict.addOrReplace("type", "none");
warningInFunction<<"None: replace the method initialThisDomainActive()"<<endl;
} }
} }
return true; return true;
@ -229,7 +239,12 @@ pFlow::uint32 pFlow::MPISimulationDomain::initialNumberInThis() const
{ {
uint32 numImport = domainPartition_->numberImportThisProc(); uint32 numImport = domainPartition_->numberImportThisProc();
uint32 numExport = domainPartition_->numberExportThisProc(); uint32 numExport = domainPartition_->numberExportThisProc();
return initialNumPoints_+ numImport - numExport;; return max(initialNumPoints_+ numImport - numExport, 0u);
}
bool pFlow::MPISimulationDomain::initialThisDomainActive() const
{
return initialNumberInThis()>0;
} }
bool pFlow::MPISimulationDomain::initialTransferBlockData bool pFlow::MPISimulationDomain::initialTransferBlockData

3
src/phasicFlow/MPIParallelization/domain/MPISimulationDomain.hpp
View File

@ -71,10 +71,13 @@ public:
/// @return /// @return
bool initialUpdateDomains(span<realx3> pointPos)override; bool initialUpdateDomains(span<realx3> pointPos)override;
/// @brief /// @brief
/// @return /// @return
uint32 initialNumberInThis()const override; uint32 initialNumberInThis()const override;
bool initialThisDomainActive()const override;
bool initialTransferBlockData( bool initialTransferBlockData(
span<char> src, span<char> src,
span<char> dst, span<char> dst,

6
src/phasicFlow/MPIParallelization/rcb1DPartitioning.cpp
View File

@ -97,6 +97,12 @@ bool pFlow::rcb1DPartitioning::partition(pointCollection &points)
localBox_ = globalBox_; localBox_ = globalBox_;
if(equal(x0, x1))
{
x0 = x0 - 0.00001;
x1 = x1 + 0.00001;
}
switch (direction_) switch (direction_)
{ {
case Direction::X : case Direction::X :

3
src/phasicFlow/MPIParallelization/rcb1DPartitioning.hpp
View File

@ -61,8 +61,7 @@ public:
const box& globalBox); const box& globalBox);
virtual ~rcb1DPartitioning() override=default;
~rcb1DPartitioning()=default;
span<int32> exportList(int procNo)const override span<int32> exportList(int procNo)const override
{ {