mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-22 16:28:30 +00:00
bug remove for GPU run after CPU MPI parallelization
- specialization of VectorSingle for word - dummyFile creation to solve write to file in MPI mode
This commit is contained in:
@ -60,7 +60,7 @@ pFlow::collisionCheck::checkPoint(const realx3& p, const real d) const
|
||||
{
|
||||
uint32 n = head_(i, j, k);
|
||||
|
||||
while( n != -1)
|
||||
while( n != static_cast<uint32>(-1))
|
||||
{
|
||||
if( ((position_[n]-p).length() - 0.5*(diameters_[n]+d )) <= 0.0 )
|
||||
{
|
||||
@ -85,7 +85,7 @@ pFlow::collisionCheck::mapLastAddedParticle()
|
||||
"size mismatch of next and position"<<endl;
|
||||
return false;
|
||||
}
|
||||
next_.push_back(-1);
|
||||
next_.push_back(static_cast<uint32>(-1));
|
||||
const auto& p = position_[n];
|
||||
|
||||
if(!searchBox_.isInside(p))
|
||||
|
@ -74,9 +74,6 @@ pFlow::insertion::pStruct() const
|
||||
return particles_.pStruct();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
bool
|
||||
pFlow::insertion::readInsertionDict()
|
||||
{
|
||||
|
@ -32,7 +32,9 @@ class pointStructure;
|
||||
/**
|
||||
* Base class for particle insertion
|
||||
*/
|
||||
class insertion : public fileDictionary
|
||||
class insertion
|
||||
:
|
||||
public fileDictionary
|
||||
{
|
||||
private:
|
||||
|
||||
@ -118,6 +120,8 @@ public:
|
||||
/*/// read from iIstream
|
||||
virtual bool read(iIstream& is) = 0;*/
|
||||
|
||||
using fileDictionary::write;
|
||||
|
||||
/// write to iOstream
|
||||
bool write(iOstream& os, const IOPattern& iop)const override ;
|
||||
};
|
||||
|
@ -82,7 +82,7 @@ private:
|
||||
Timer fieldUpdateTimer_;
|
||||
|
||||
private:
|
||||
bool initializeParticles();
|
||||
|
||||
|
||||
bool getParticlesInfoFromShape(
|
||||
const wordVector& shapeNames,
|
||||
@ -119,11 +119,14 @@ public:
|
||||
*/
|
||||
/*bool insertParticles
|
||||
(
|
||||
const realx3Vector& position,
|
||||
const realx3Vector& position,
|
||||
const wordVector& shapes,
|
||||
const setFieldList& setField
|
||||
) override ;*/
|
||||
|
||||
// TODO: make this method private later
|
||||
bool initializeParticles();
|
||||
|
||||
/// const reference to shapes object
|
||||
const auto& spheres() const
|
||||
{
|
||||
|
@ -15,8 +15,11 @@ pFlow::regularParticleIdHandler::regularParticleIdHandler
|
||||
pFlow::Pair<pFlow::uint32, pFlow::uint32>
|
||||
pFlow::regularParticleIdHandler::getIdRange(uint32 nNewParticles)
|
||||
{
|
||||
|
||||
if(nNewParticles==0) return {0,0};
|
||||
|
||||
uint32 startId;
|
||||
if(maxId_==-1)
|
||||
if(maxId_== static_cast<uint32>(-1))
|
||||
{
|
||||
startId = 0;
|
||||
}
|
||||
@ -37,7 +40,7 @@ bool pFlow::regularParticleIdHandler::initialIdCheck()
|
||||
uint32 maxId = max( *this );
|
||||
|
||||
/// particles should get ids from 0 to size-1
|
||||
if(maxId == -1)
|
||||
if(maxId == static_cast<uint32>(-1))
|
||||
{
|
||||
fillSequence(*this,0u);
|
||||
maxId_ = size()-1;
|
||||
|
@ -31,7 +31,7 @@ class regularParticleIdHandler
|
||||
{
|
||||
private:
|
||||
|
||||
uint32 maxId_ = -1;
|
||||
uint32 maxId_ = static_cast<uint32>(-1);
|
||||
|
||||
bool initialIdCheck()override;
|
||||
public:
|
||||
|
@ -132,7 +132,7 @@ public:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
idx = -1;
|
||||
idx = static_cast<uint32>(-1);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -144,6 +144,8 @@ public:
|
||||
|
||||
// - IO
|
||||
|
||||
using fileDictionary::write;
|
||||
|
||||
bool write(iOstream& os)const override;
|
||||
|
||||
};
|
||||
|
Reference in New Issue
Block a user