Modification in streams and sphereInteraciton
1. processorOutput stream is modified to imporve visualization of output 2. some modifications for sphereInteraction after solving MPI memory leak.
This commit is contained in:
parent
e7215159af
commit
97049760c3
|
@ -130,9 +130,9 @@ public:
|
||||||
csPairContainerType& pwPairs,
|
csPairContainerType& pwPairs,
|
||||||
bool force = false) override
|
bool force = false) override
|
||||||
{
|
{
|
||||||
ppTimer().start();
|
|
||||||
|
|
||||||
Particles().boundingSphere().updateBoundaries(DataDirection::SlaveToMaster);
|
|
||||||
|
ppTimer().start();
|
||||||
|
|
||||||
const auto& position = Particles().pointPosition().deviceViewAll();
|
const auto& position = Particles().pointPosition().deviceViewAll();
|
||||||
const auto& flags = Particles().dynPointStruct().activePointsMaskDevice();
|
const auto& flags = Particles().dynPointStruct().activePointsMaskDevice();
|
||||||
|
@ -167,6 +167,7 @@ public:
|
||||||
csPairContainerType& pwPairs,
|
csPairContainerType& pwPairs,
|
||||||
bool force = false)override
|
bool force = false)override
|
||||||
{
|
{
|
||||||
|
Particles().boundingSphere().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
return csBoundaries_[i].broadSearch(
|
return csBoundaries_[i].broadSearch(
|
||||||
iter,
|
iter,
|
||||||
t,
|
t,
|
||||||
|
@ -176,7 +177,6 @@ public:
|
||||||
force);
|
force);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool enterBroadSearch(uint32 iter, real t, real dt)const override
|
bool enterBroadSearch(uint32 iter, real t, real dt)const override
|
||||||
{
|
{
|
||||||
if(ppwContactSearch_)
|
if(ppwContactSearch_)
|
||||||
|
|
|
@ -166,12 +166,12 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::iterate()
|
||||||
|
|
||||||
bool broadSearch = contactSearch_().enterBroadSearch(iter, t, dt);
|
bool broadSearch = contactSearch_().enterBroadSearch(iter, t, dt);
|
||||||
|
|
||||||
/*sphParticles_.diameter().updateBoundaries(DataDirection::SlaveToMaster);
|
sphParticles_.diameter().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
sphParticles_.velocity().updateBoundaries(DataDirection::SlaveToMaster);
|
sphParticles_.velocity().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
sphParticles_.rVelocity().updateBoundaries(DataDirection::SlaveToMaster);
|
sphParticles_.rVelocity().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
sphParticles_.mass().updateBoundaries(DataDirection::SlaveToMaster);
|
sphParticles_.mass().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
sphParticles_.I().updateBoundaries(DataDirection::SlaveToMaster);
|
sphParticles_.I().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
sphParticles_.propertyId().updateBoundaries(DataDirection::SlaveToMaster);*/
|
sphParticles_.propertyId().updateBoundaries(DataDirection::SlaveToMaster);
|
||||||
|
|
||||||
|
|
||||||
if(broadSearch)
|
if(broadSearch)
|
||||||
|
|
|
@ -156,3 +156,9 @@ void pFlow::processorOstream::indent()
|
||||||
checkForPrefix();
|
checkForPrefix();
|
||||||
Ostream::indent();
|
Ostream::indent();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pFlow::processorOstream &pFlow::processorOstream::setColor(const char *colorCode)
|
||||||
|
{
|
||||||
|
Ostream::write(colorCode);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
|
@ -139,6 +139,8 @@ public:
|
||||||
/// Add indentation characters
|
/// Add indentation characters
|
||||||
void indent() override;
|
void indent() override;
|
||||||
|
|
||||||
|
processorOstream& setColor(const char* colorCode);
|
||||||
|
|
||||||
|
|
||||||
}; // processorOstream
|
}; // processorOstream
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ namespace pFlow
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#define INFORMATION pFlow::pOutput<<boldChar<<magentaColor<<"> INFO: "<<defaultColor<<magentaColor
|
#define INFORMATION pFlow::pOutput.setColor(boldChar).setColor(magentaColor)<<"> INFO: "<<defaultColor<<magentaColor
|
||||||
#define END_INFO defaultColor<<pFlow::endl
|
#define END_INFO defaultColor<<pFlow::endl
|
||||||
|
|
||||||
#define REPORT(n) pFlow::mOutput.space(2*n)
|
#define REPORT(n) pFlow::mOutput.space(2*n)
|
||||||
|
|
Loading…
Reference in New Issue