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: mergeMeshes: preserve additional patch data

Browse Source
This commit is contained in:
mattijs
2013-05-08 09:47:00 +01:00
parent f42c6547f7
commit aea1fbff8b
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -54,7 +54,7 @@ Foam::label Foam::mergePolyMesh::patchIndex(const polyPatch& p)
{ {
if (patchNames_[patchI] == pName) if (patchNames_[patchI] == pName)
{ {
if (patchTypes_[patchI] == pType) if (word(patchDicts_[patchI]["type"]) == pType)
{ {
// Found name and types match // Found name and types match
return patchI; return patchI;
@ -68,7 +68,11 @@ Foam::label Foam::mergePolyMesh::patchIndex(const polyPatch& p)
} }
// Patch not found. Append to the list // Patch not found. Append to the list
patchTypes_.append(pType); {
OStringStream os;
p.write(os);
patchDicts_.append(dictionary(IStringStream(os.str())()));
}
if (nameFound) if (nameFound)
{ {
@ -121,20 +125,22 @@ Foam::mergePolyMesh::mergePolyMesh(const IOobject& io)
: :
polyMesh(io), polyMesh(io),
meshMod_(*this), meshMod_(*this),
patchTypes_(2*boundaryMesh().size()),
patchNames_(2*boundaryMesh().size()), patchNames_(2*boundaryMesh().size()),
patchDicts_(2*boundaryMesh().size()),
pointZoneNames_(), pointZoneNames_(),
faceZoneNames_(), faceZoneNames_(),
cellZoneNames_() cellZoneNames_()
{ {
// Insert the original patches into the list // Insert the original patches into the list
wordList curPatchTypes = boundaryMesh().types();
wordList curPatchNames = boundaryMesh().names(); wordList curPatchNames = boundaryMesh().names();
forAll(curPatchTypes, patchI) forAll(boundaryMesh(), patchI)
{ {
patchTypes_.append(curPatchTypes[patchI]); patchNames_.append(boundaryMesh()[patchI].name());
patchNames_.append(curPatchNames[patchI]);
OStringStream os;
boundaryMesh()[patchI].write(os);
patchDicts_.append(dictionary(IStringStream(os.str())()));
} }
// Insert point, face and cell zones into the list // Insert point, face and cell zones into the list
@ -379,7 +385,7 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
void Foam::mergePolyMesh::merge() void Foam::mergePolyMesh::merge()
{ {
Info<< "patch names: " << patchNames_ << nl Info<< "patch names: " << patchNames_ << nl
<< "patch types: " << patchTypes_ << nl << "patch dicts: " << patchDicts_ << nl
<< "point zone names: " << pointZoneNames_ << nl << "point zone names: " << pointZoneNames_ << nl
<< "face zone names: " << faceZoneNames_ << nl << "face zone names: " << faceZoneNames_ << nl
<< "cell zone names: " << cellZoneNames_ << endl; << "cell zone names: " << cellZoneNames_ << endl;
@ -409,14 +415,16 @@ void Foam::mergePolyMesh::merge()
for (; patchI < patchNames_.size(); patchI++) for (; patchI < patchNames_.size(); patchI++)
{ {
// Add a patch // Add a patch
dictionary dict(patchDicts_[patchI]);
dict.set("nFaces", 0);
dict.set("startFace", endOfLastPatch);
newPatches[patchI] = newPatches[patchI] =
( (
polyPatch::New polyPatch::New
( (
patchTypes_[patchI],
patchNames_[patchI], patchNames_[patchI],
0, dict,
endOfLastPatch,
patchI, patchI,
oldPatches oldPatches
).ptr() ).ptr()

8
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -58,12 +58,12 @@ class mergePolyMesh
//- Topological change to accumulated all mesh changes //- Topological change to accumulated all mesh changes
polyTopoChange meshMod_; polyTopoChange meshMod_;
//- Patch types
DynamicList<word> patchTypes_;
//- Patch names //- Patch names
DynamicList<word> patchNames_; DynamicList<word> patchNames_;
//- Patch dictionaries
DynamicList<dictionary> patchDicts_;
//- Point zone names //- Point zone names
DynamicList<word> pointZoneNames_; DynamicList<word> pointZoneNames_;