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

Merge remote branch 'OpenCFD/master' into olesenm

Browse Source 
Conflicts:
	src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
This commit is contained in:
Mark Olesen
2010-05-31 11:50:56 +02:00
parent ff30e6b61a 9c69403419
commit f9f988d82f
1421 changed files with 21173 additions and 9427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
View File

@ -287,16 +287,25 @@ void Foam::decompositionMethod::calcCSR
forAll(pbm, patchI)
{
if (isA<cyclicPolyPatch>(pbm[patchI]))
if
(
isA<cyclicPolyPatch>(pbm[patchI])
&& refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
)
{
const unallocLabelList& faceCells = pbm[patchI].faceCells();
const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
(
pbm[patchI]
);
label sizeby2 = faceCells.size()/2;
const unallocLabelList& faceCells = cycPatch.faceCells();
const unallocLabelList& nbrCells =
cycPatch.neighbPatch().faceCells();
for (label faceI=0; faceI<sizeby2; faceI++)
forAll(faceCells, facei)
{
label own = faceCells[faceI];
label nei = faceCells[faceI + sizeby2];
label own = faceCells[facei];
label nei = nbrCells[facei];
if (cellPair.insert(edge(own, nei)))
{
@ -348,16 +357,25 @@ void Foam::decompositionMethod::calcCSR
cellPair.clear();
forAll(pbm, patchI)
{
if (isA<cyclicPolyPatch>(pbm[patchI]))
if
(
isA<cyclicPolyPatch>(pbm[patchI])
&& refCast<const cyclicPolyPatch>(pbm[patchI]).owner()
)
{
const unallocLabelList& faceCells = pbm[patchI].faceCells();
const cyclicPolyPatch& cycPatch = refCast<const cyclicPolyPatch>
(
pbm[patchI]
);
label sizeby2 = faceCells.size()/2;
const unallocLabelList& faceCells = cycPatch.faceCells();
const unallocLabelList& nbrCells =
cycPatch.neighbPatch().faceCells();
for (label faceI=0; faceI<sizeby2; faceI++)
forAll(faceCells, facei)
{
label own = faceCells[faceI];
label nei = faceCells[faceI + sizeby2];
label own = faceCells[facei];
label nei = nbrCells[facei];
if (cellPair.insert(edge(own, nei)))
{
@ -479,7 +497,7 @@ void Foam::decompositionMethod::calcDistributedCSR
}
// Get the cell on the other side of coupled patches
syncTools::swapBoundaryFaceList(mesh, globalNeighbour, false);
syncTools::swapBoundaryFaceList(mesh, globalNeighbour);
// Count number of faces (internal + coupled)