From 774afd5f37b889c09e12045cfe33782af7e97e88 Mon Sep 17 00:00:00 2001
From: HRN <hamid.r.norouzi@gmail.com>
Date: Fri, 14 Feb 2025 22:50:28 +0330
Subject: [PATCH] bug correction for the time when empty is used
---
utilities/particlesPhasicFlow/empty/empty.cpp | 2 +-
.../positionOrdered/positionOrdered.cpp | 4 +-
.../positionParticles/positionParticles.cpp | 47 +------------------
.../positionParticles/positionParticles.hpp | 10 ----
.../positionRandom/positionRandom.cpp | 4 +-
5 files changed, 7 insertions(+), 60 deletions(-)
diff --git a/utilities/particlesPhasicFlow/empty/empty.cpp b/utilities/particlesPhasicFlow/empty/empty.cpp
index d0da9b3b..83cf2c89 100755
--- a/utilities/particlesPhasicFlow/empty/empty.cpp
+++ b/utilities/particlesPhasicFlow/empty/empty.cpp
@@ -30,7 +30,7 @@ pFlow::empty::empty(
positionParticles(control, dict),
position_
(
- "empty",maxNumberOfParticles(), 0, RESERVE()
+ "empty",1, 0, RESERVE()
)
{
}
\ No newline at end of file
diff --git a/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp b/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp
index 1fb60b87..eb1c94d4 100755
--- a/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp
+++ b/utilities/particlesPhasicFlow/positionOrdered/positionOrdered.cpp
@@ -146,8 +146,8 @@ pFlow::positionOrdered::positionOrdered
position_
(
"positionOrdered",
- max(maxNumberOfParticles(), numPoints_),
- numPoints_ ,
+ numPoints_,
+ numPoints_,
RESERVE()
)
{
diff --git a/utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp b/utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp
index d99cb217..cbee876a 100755
--- a/utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp
+++ b/utilities/particlesPhasicFlow/positionParticles/positionParticles.cpp
@@ -32,45 +32,10 @@ pFlow::realx3Vector pFlow::positionParticles::sortByMortonCode(
uint64 index;
};
- /*realx3 minP = min(position);
- realx3 maxP = max(position);
- real cellsize = maxDiameter();
- cells<uint64> allCells( box(minP, maxP), cellsize);
-
- Vector<indexMorton> indMor(position.size(),RESERVE());
-
- indMor.clear();
-
- uint64 ind=0;
- for(const auto& p:position)
- {
- auto cellInd = allCells.pointIndex(p);
- indMor.push_back(
- { xyzToMortonCode64(cellInd.x(), cellInd.y(), cellInd.z()),
- ind++});
- }
-
- INFORMATION<<"Performing morton sorting."<<END_INFO;
- std::sort(
- indMor.begin(),
- indMor.end(),
- []( const indexMorton &lhs, const indexMorton &rhs){
- return lhs.morton < rhs.morton; } );
-
- realx3Vector sortedPos(position.capacity(), RESERVE());
- sortedPos.clear();
-
-
- for(auto& ind:indMor)
- {
- sortedPos.push_back( position[ind.index] );
- }*/
-
WARNING<<"Morton sorting is inactive!"<<END_WARNING;
return position;
}
-
pFlow::positionParticles::positionParticles
(
systemControl& control,
@@ -78,12 +43,8 @@ pFlow::positionParticles::positionParticles
)
:
regionType_(dict.getValOrSet<word>("regionType", "domain")),
- maxNumberOfParticles_(dict.getValOrSet(
- "maxNumberOfParticles",
- static_cast<uint32>(10000))),
mortonSorting_(dict.getValOrSet("mortonSorting", Logical("Yes")))
{
-
if( regionType_ != "domain" )
{
pRegion_ = peakableRegion::create(
@@ -92,7 +53,7 @@ pFlow::positionParticles::positionParticles
}
else
{
- fileDictionary domainDict
+ fileDictionary domainDictionary
(
objectFile
{
@@ -103,12 +64,10 @@ pFlow::positionParticles::positionParticles
},
&control.settings()
);
- pRegion_ = peakableRegion::create(regionType_,domainDict.subDict("globalBox"));
+ pRegion_ = peakableRegion::create("box", domainDictionary.subDict("globalBox"));
}
-
}
-
pFlow::realx3Vector pFlow::positionParticles::getFinalPosition()
{
if(mortonSorting_)
@@ -130,10 +89,8 @@ pFlow::uniquePtr<pFlow::positionParticles>
const dictionary & dict
)
{
-
word method = dict.getVal<word>("method");
-
if( dictionaryvCtorSelector_.search(method) )
{
return dictionaryvCtorSelector_[method] (control, dict);
diff --git a/utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp b/utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp
index 85c34e54..749ba7c3 100755
--- a/utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp
+++ b/utilities/particlesPhasicFlow/positionParticles/positionParticles.hpp
@@ -40,12 +40,8 @@ private:
word regionType_;
- uint32 maxNumberOfParticles_ = 10000;
-
Logical mortonSorting_;
-
-
realx3Vector sortByMortonCode(const realx3Vector& position)const;
protected:
@@ -83,12 +79,6 @@ public:
return mortonSorting_();
}
- inline
- auto maxNumberOfParticles()const
- {
- return maxNumberOfParticles_;
- }
-
virtual uint32 numPoints()const = 0;
virtual uint32 size()const = 0;
diff --git a/utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp b/utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp
index adb387fe..d67f9df4 100755
--- a/utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp
+++ b/utilities/particlesPhasicFlow/positionRandom/positionRandom.cpp
@@ -122,14 +122,14 @@ pFlow::positionRandom::positionRandom
position_
(
"position",
- maxNumberOfParticles(),
+ 1,
0,
RESERVE()
),
diameters_
(
"diameters",
- maxNumberOfParticles(),
+ 1,
0,
RESERVE()
)