DEMSystem updated for version 1.0

This commit is contained in:
HRN
2024-12-25 18:26:53 +03:30
parent a6a2d120e7
commit bc22012ecd
5 changed files with 31 additions and 23 deletions

View File

@ -47,10 +47,10 @@ maxBoundingBoxSize_(maxBoundingBox)
}
bool pFlow::domainDistribute::locateParticles(
ViewType1D<realx3,HostSpace> points, includeMask mask)
ViewType1D<realx3,HostSpace> points, const pFlagTypeHost& mask)
{
range activeRange = mask.activeRange();
const rangeU32 activeRange = mask.activeRange();
for(int32 di=0; di<numDomains_; di++)
@ -59,7 +59,7 @@ bool pFlow::domainDistribute::locateParticles(
}
for(int32 i=activeRange.first; i<activeRange.second; i++)
for(int32 i=activeRange.start(); i<activeRange.end(); i++)
{
if(mask(i))
{

View File

@ -43,13 +43,10 @@ protected:
int32Vector_H numParInDomain_;
real maxBoundingBoxSize_;
real domainExtension_ = 1.0;
using includeMask = typename pointStructure::activePointsHost;
void clcDomains(const std::vector<box>& domains);
public:
@ -78,7 +75,7 @@ public:
{
return
span<const int32>(
particlesInDomains_[di].hostVectorAll().data(),
particlesInDomains_[di].hostViewAll().data(),
numParInDomain_[di]
);
}
@ -91,7 +88,7 @@ public:
//template<typename includeMask>
bool locateParticles(
ViewType1D<realx3,HostSpace> points, includeMask mask);
ViewType1D<realx3,HostSpace> points, const pFlagTypeHost& mask);
};