exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert changes to regionCouplePolyPatch.C

Browse source
This commit is contained in:
Henrik Rusche 2013-07-10 23:24:29 +02:00
parent 1e32d23da1
commit d5326a7d27
1 changed files with 11 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.C
View file

@ -800,10 +800,7 @@ void Foam::regionCouplePolyPatch::attach() const
// Patch-to-patch interpolation does not need to be cleared,
// only face/cell centres and interpolation factors
// HJ, 6/Jun/2011
// Breaks simple parallel CHT cases
// HR, 8/Jun/2012
//clearGeom();
clearGeom();
}
}
@ -818,10 +815,7 @@ void Foam::regionCouplePolyPatch::detach() const
// Patch-to-patch interpolation does not need to be cleared,
// only face/cell centres and interpolation factors
// HJ, 6/Jun/2011
// Breaks simple parallel CHT cases
// HR, 8/Jun/2012
//clearGeom();
clearGeom();
}
}
@ -889,17 +883,15 @@ Foam::regionCouplePolyPatch::patchToPatch() const
const Foam::vectorField&
Foam::regionCouplePolyPatch::reconFaceCellCentres() const
{
// Breaks simple parallel CHT cases
// HR, 8/Jun/2012
// if (!attached_)
// {
// FatalErrorIn
// (
// "const vectorField& "
// "regionCouplePolyPatch::reconFaceCellCentres() const"
// ) << "Requesting reconFaceCellCentres in detached state"
// << abort(FatalError);
// }
if (!attached_)
{
FatalErrorIn
(
"const vectorField& "
"regionCouplePolyPatch::reconFaceCellCentres() const"
) << "Requesting reconFaceCellCentres in detached state"
<< abort(FatalError);
}
if (!reconFaceCellCentresPtr_)
{
@ -927,10 +919,6 @@ void Foam::regionCouplePolyPatch::initAddressing()
{
// Calculate send addressing
sendAddr();
// Deferred execution on startup
// HR, 8/Jun/2012
shadow().sendAddr();
}
}
@ -955,12 +943,6 @@ void Foam::regionCouplePolyPatch::initGeometry()
{
reconFaceCellCentres();
}
else
{
// Deferred execution on startup
// HR, 8/Jun/2012
shadow().reconFaceCellCentres();
}
}
polyPatch::initGeometry();
@ -1005,9 +987,6 @@ void Foam::regionCouplePolyPatch::initMovePoints(const pointField& p)
}
}
// Reconsider: Two communication in one function call may not work in parallel
// HR, 8/Jun/2012
if (active() && master())
{
reconFaceCellCentres();