ENH: createBaffles: Create slave baffles on coupled patches

This commit is contained in:
Will Bainbridge
2017-11-29 15:30:35 +00:00
committed by Andrew Heather
parent 82fd731b82
commit d9afa508e1

View File

@ -368,9 +368,17 @@ void createFaces
{ {
const polyPatch& pp = pbm[patchi]; const polyPatch& pp = pbm[patchi];
label newPatchi = newMasterPatches[i]; const label newMasterPatchi = newMasterPatches[i];
const label newSlavePatchi = newSlavePatches[i];
if (pp.coupled() && pbm[newPatchi].coupled()) if
(
pp.coupled()
&& (
pbm[newMasterPatchi].coupled()
|| pbm[newSlavePatchi].coupled()
)
)
{ {
// Do not allow coupled faces to be moved to different // Do not allow coupled faces to be moved to different
// coupled patches. // coupled patches.
@ -391,8 +399,9 @@ void createFaces
<< "Found boundary face (in patch " << "Found boundary face (in patch "
<< pp.name() << pp.name()
<< ") in faceZone " << fZone.name() << ") in faceZone " << fZone.name()
<< " to convert to baffle patch " << " to convert to baffle patches "
<< pbm[newPatchi].name() << pbm[newMasterPatchi].name() << "/"
<< pbm[newSlavePatchi].name()
<< endl << endl
<< " Set internalFacesOnly to true in the" << " Set internalFacesOnly to true in the"
<< " createBaffles control dictionary if you" << " createBaffles control dictionary if you"
@ -407,11 +416,14 @@ void createFaces
facei, // label of face facei, // label of face
mesh.faceOwner()[facei], // owner mesh.faceOwner()[facei], // owner
false, // face flip false, // face flip
newPatchi, // patch for face fZone.flipMap()[zoneFacei]
? newSlavePatchi
: newMasterPatchi, // patch for face
fZone.index(), // zone for face fZone.index(), // zone for face
fZone.flipMap()[zoneFacei], // face flip in zone fZone.flipMap()[zoneFacei], // face flip in zone
modifiedFace // modify or add modifiedFace // modify or add
); );
nModified++; nModified++;
} }
} }