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

Merge branch 'BUGFIX/cellLayering' into nextRelease

Browse source
This commit is contained in:
Hrvoje Jasak 2014-02-10 17:08:22 +00:00
commit 9a1d8a6672
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dynamicMesh/dynamicMesh/polyMeshModifiers/layerAdditionRemoval/setLayerPairing.C
View file

@ -129,8 +129,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
// Grab the opposite face for face collapse addressing // Grab the opposite face for face collapse addressing
ftc[faceI] = lidFace.oppositeIndex(); ftc[faceI] = lidFace.oppositeIndex();
// lidFace is only valid in simple cases // Taken out lidFace2: fails normal layering. HJ, 10/Feb/2014
const face& lidFace2 = faces[lidFace.oppositeIndex()];
// Using the local face insert the points into the lid list // Using the local face insert the points into the lid list
forAll (curLocalFace, pointI) forAll (curLocalFace, pointI)
@ -157,7 +156,7 @@ bool Foam::layerAdditionRemoval::setLayerPairing() const
const labelListList& ppAddr = mesh.pointPoints(); const labelListList& ppAddr = mesh.pointPoints();
const labelList& p1List = ppAddr[lidFace2[pointI]]; const labelList& p1List = ppAddr[lidFace[pointI]];
const labelList& p2List = ppAddr[ptc[clp]]; const labelList& p2List = ppAddr[ptc[clp]];
bool found = false; bool found = false;

3
src/foam/meshes/meshShapes/cell/oppositeCellFace.C
View file

@ -181,8 +181,7 @@ Foam::oppositeFace Foam::cell::opposingFace
} }
} }
// None of them matches, return a failure // Removed: fails normal layering. HJ, 10/Feb/2014
return oppositeFace(face(0), masterFaceLabel, oppFaceLabel);
} }
} }
} }