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

ENH: Have different master and slave patch to handle cyclic baffles.

Browse Source
This commit is contained in:
mattijs
2010-05-17 17:08:40 +01:00
parent 6291df9d48
commit e1e4098600
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View File

@ -128,8 +128,12 @@ int main(int argc, char *argv[])
# include "addRegionOption.H" # include "addRegionOption.H"
argList::validArgs.append("faceZone"); argList::validArgs.append("faceZone");
argList::validArgs.append("patch"); argList::validArgs.append("(masterPatch slavePatch)");
argList::addOption("additionalPatches", "(patch2 .. patchN)"); argList::addOption
(
"additionalPatches",
"((master2 slave2) .. (masterN slaveN))"
);
argList::addBoolOption("internalFacesOnly"); argList::addBoolOption("internalFacesOnly");
# include "setRootCase.H" # include "setRootCase.H"
@ -142,7 +146,7 @@ int main(int argc, char *argv[])
const faceZoneMesh& faceZones = mesh.faceZones(); const faceZoneMesh& faceZones = mesh.faceZones();
// Faces to baffle // Faces to baffle
faceZoneID zoneID(args[1], faceZones); faceZoneID zoneID(args.additionalArgs()[0], faceZones);
Info<< "Converting faces on zone " << zoneID.name() Info<< "Converting faces on zone " << zoneID.name()
<< " into baffles." << nl << endl; << " into baffles." << nl << endl;
@ -165,28 +169,36 @@ int main(int argc, char *argv[])
fZone.checkParallelSync(true); fZone.checkParallelSync(true);
// Patches to put baffles into // Patches to put baffles into
DynamicList<label> newPatches(1); DynamicList<label> newMasterPatches(1);
DynamicList<label> newSlavePatches(1);
const word patchName = args[2]; const Pair<word> patchNames(IStringStream(args.additionalArgs()[1])());
newPatches.append(findPatchID(mesh, patchName)); newMasterPatches.append(findPatchID(mesh, patchNames[0]));
Info<< "Using patch " << patchName newSlavePatches.append(findPatchID(mesh, patchNames[1]));
<< " at index " << newPatches[0] << endl; Info<< "Using master patch " << patchNames[0]
<< " at index " << newMasterPatches[0] << endl;
Info<< "Using slave patch " << patchNames[1]
<< " at index " << newSlavePatches[0] << endl;
// Additional patches // Additional patches
if (args.optionFound("additionalPatches")) if (args.optionFound("additionalPatches"))
{ {
const wordList patchNames const List<Pair<word> > patchNames
( (
args.optionLookup("additionalPatches")() args.optionLookup("additionalPatches")()
); );
newPatches.reserve(patchNames.size() + 1); newMasterPatches.reserve(patchNames.size() + 1);
newSlavePatches.reserve(patchNames.size() + 1);
forAll(patchNames, i) forAll(patchNames, i)
{ {
newPatches.append(findPatchID(mesh, patchNames[i])); newMasterPatches.append(findPatchID(mesh, patchNames[i][0]));
Info<< "Using additional patch " << patchNames[i] newSlavePatches.append(findPatchID(mesh, patchNames[i][1]));
<< " at index " << newPatches.last() << endl; Info<< "Using additional patches " << patchNames[i]
<< " at indices " << newMasterPatches.last()
<< " and " << newSlavePatches.last()
<< endl;
} }
} }
@ -265,10 +277,8 @@ int main(int argc, char *argv[])
} }
label nModified = 0; label nModified = 0;
forAll(newPatches, i) forAll(newMasterPatches, i)
{ {
label newPatchI = newPatches[i];
// Pass 1. Do selected side of zone // Pass 1. Do selected side of zone
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -288,7 +298,7 @@ int main(int argc, char *argv[])
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 newMasterPatches[i], // patch for face
zoneID.index(), // zone for face zoneID.index(), // zone for face
false, // face flip in zone false, // face flip in zone
modifiedFace // modify or add status modifiedFace // modify or add status
@ -304,7 +314,7 @@ int main(int argc, char *argv[])
faceI, // label of face faceI, // label of face
mesh.faceNeighbour()[faceI],// owner mesh.faceNeighbour()[faceI],// owner
true, // face flip true, // face flip
newPatchI, // patch for face newMasterPatches[i], // patch for face
zoneID.index(), // zone for face zoneID.index(), // zone for face
true, // face flip in zone true, // face flip in zone
modifiedFace // modify or add status modifiedFace // modify or add status
@ -335,7 +345,7 @@ int main(int argc, char *argv[])
faceI, // label of face faceI, // label of face
mesh.faceNeighbour()[faceI], // owner mesh.faceNeighbour()[faceI], // owner
true, // face flip true, // face flip
newPatchI, // patch for face newSlavePatches[i], // patch for face
zoneID.index(), // zone for face zoneID.index(), // zone for face
true, // face flip in zone true, // face flip in zone
modifiedFace // modify or add modifiedFace // modify or add
@ -351,7 +361,7 @@ int main(int argc, char *argv[])
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 newSlavePatches[i], // patch for face
zoneID.index(), // zone for face zoneID.index(), // zone for face
false, // face flip in zone false, // face flip in zone
modifiedFace // modify or add status modifiedFace // modify or add status
@ -379,6 +389,8 @@ int main(int argc, char *argv[])
{ {
const polyPatch& pp = patches[patchI]; const polyPatch& pp = patches[patchI];
label newPatchI = newMasterPatches[i];
if (pp.coupled() && patches[newPatchI].coupled()) if (pp.coupled() && patches[newPatchI].coupled())
{ {
// Do not allow coupled faces to be moved to different coupled // Do not allow coupled faces to be moved to different coupled
@ -428,7 +440,7 @@ int main(int argc, char *argv[])
Info<< "Converted " << returnReduce(nModified, sumOp<label>()) Info<< "Converted " << returnReduce(nModified, sumOp<label>())
<< " faces into boundary faces on patch " << patchName << nl << endl; << " faces into boundary faces on patches " << patchNames << nl << endl;
if (!overwrite) if (!overwrite)
{ {