zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: Particle.C : allow non-constant transformations

Browse Source
This commit is contained in:
mattijs
2010-11-29 15:41:45 +00:00
parent 5cccf15b18
commit a5f056b162
1 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/lagrangian/basic/Particle/Particle.C
View File

@ -62,38 +62,30 @@ void Foam::Particle<ParticleType>::correctAfterParallelTransfer
if (!ppp.parallel()) if (!ppp.parallel())
{ {
if (ppp.forwardT().size() == 1) const tensor& T =
{ (
const tensor& T = ppp.forwardT()[0]; ppp.forwardT().size() == 1
? ppp.forwardT()[0]
: ppp.forwardT()[faceI_]
);
transformPosition(T); transformPosition(T);
static_cast<ParticleType&>(*this).transformProperties(T); static_cast<ParticleType&>(*this).transformProperties(T);
} }
else
{
const tensor& T = ppp.forwardT()[faceI_];
transformPosition(T);
static_cast<ParticleType&>(*this).transformProperties(T);
}
}
else if (ppp.separated()) else if (ppp.separated())
{ {
if (ppp.separation().size() == 1) const vector& s =
{ (
position_ -= ppp.separation()[0]; (ppp.separation().size() == 1)
? ppp.separation()[0]
: ppp.separation()[faceI_]
);
position_ -= s;
static_cast<ParticleType&>(*this).transformProperties static_cast<ParticleType&>(*this).transformProperties
( (
-ppp.separation()[0] -s
); );
} }
else
{
position_ -= ppp.separation()[faceI_];
static_cast<ParticleType&>(*this).transformProperties
(
-ppp.separation()[faceI_]
);
}
}
tetFaceI_ = faceI_ + ppp.start(); tetFaceI_ = faceI_ + ppp.start();
@ -773,21 +765,34 @@ void Foam::Particle<ParticleType>::hitCyclicPatch
// See note in correctAfterParallelTransfer for tetPtI_ addressing. // See note in correctAfterParallelTransfer for tetPtI_ addressing.
tetPtI_ = cloud_.polyMesh_.faces()[tetFaceI_].size() - 1 - tetPtI_; tetPtI_ = cloud_.polyMesh_.faces()[tetFaceI_].size() - 1 - tetPtI_;
const cyclicPolyPatch& receiveCpp = cpp.neighbPatch();
// Now the particle is on the receiving side // Now the particle is on the receiving side
if (!cpp.parallel()) if (!receiveCpp.parallel())
{ {
const tensor& T = cpp.reverseT()[0]; const tensor& T =
(
receiveCpp.forwardT().size() == 1
? receiveCpp.forwardT()[0]
: receiveCpp.forwardT()[receiveCpp.whichFace(faceI_)]
);
transformPosition(T); transformPosition(T);
static_cast<ParticleType&>(*this).transformProperties(T); static_cast<ParticleType&>(*this).transformProperties(T);
} }
else if (cpp.separated()) else if (receiveCpp.separated())
{ {
position_ += cpp.separation()[0]; const vector& s =
(
(receiveCpp.separation().size() == 1)
? receiveCpp.separation()[0]
: receiveCpp.separation()[receiveCpp.whichFace(faceI_)]
);
position_ -= s;
static_cast<ParticleType&>(*this).transformProperties static_cast<ParticleType&>(*this).transformProperties
( (
cpp.separation()[0] -s
); );
} }
} }