Merge branch 'nextRelease' of ssh://git.code.sf.net/p/foam-extend/foam-extend-4.0 into nextRelease
This commit is contained in:
commit
884667e262
1 changed files with 9 additions and 9 deletions
|
@ -674,7 +674,7 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
|
||||||
{
|
{
|
||||||
// Direct face cut, coupled on live side
|
// Direct face cut, coupled on live side
|
||||||
|
|
||||||
// Get face index. Noye the difference between faceI
|
// Get face index. Note the difference between faceI
|
||||||
// and patchFaceI
|
// and patchFaceI
|
||||||
const label faceI = bMesh[patchI].start() + patchFaceI;
|
const label faceI = bMesh[patchI].start() + patchFaceI;
|
||||||
|
|
||||||
|
@ -945,8 +945,8 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
|
||||||
// Wet on wet
|
// Wet on wet
|
||||||
if
|
if
|
||||||
(
|
(
|
||||||
intersectedCell[patchFaceI] == immersedPoly::WET
|
curOwnCut[patchFaceI] == immersedPoly::WET
|
||||||
&& intersectedCell[patchFaceI] == immersedPoly::WET
|
&& curNbrCut[patchFaceI] == immersedPoly::WET
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
intersectedFace[patchStart + patchFaceI] =
|
intersectedFace[patchStart + patchFaceI] =
|
||||||
|
@ -956,8 +956,8 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
|
||||||
// Dry on dry
|
// Dry on dry
|
||||||
if
|
if
|
||||||
(
|
(
|
||||||
intersectedCell[patchFaceI] == immersedPoly::DRY
|
curOwnCut[patchFaceI] == immersedPoly::DRY
|
||||||
&& intersectedCell[patchFaceI] == immersedPoly::DRY
|
&& curNbrCut[patchFaceI] == immersedPoly::DRY
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
intersectedFace[patchStart + patchFaceI] =
|
intersectedFace[patchStart + patchFaceI] =
|
||||||
|
@ -969,12 +969,12 @@ void Foam::immersedBoundaryPolyPatch::calcImmersedBoundary() const
|
||||||
if
|
if
|
||||||
(
|
(
|
||||||
(
|
(
|
||||||
intersectedCell[patchFaceI] == immersedPoly::WET
|
curOwnCut[patchFaceI] == immersedPoly::WET
|
||||||
&& intersectedCell[patchFaceI] == immersedPoly::CUT
|
&& curNbrCut[patchFaceI] == immersedPoly::CUT
|
||||||
)
|
)
|
||||||
|| (
|
|| (
|
||||||
intersectedCell[patchFaceI] == immersedPoly::CUT
|
curOwnCut[patchFaceI] == immersedPoly::CUT
|
||||||
&& intersectedCell[patchFaceI] == immersedPoly::WET
|
&& curNbrCut[patchFaceI] == immersedPoly::WET
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
Reference in a new issue