zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 09:32:38 +00:00
parent 8400a1c19f c29d3f1baa
commit 8f1d043364
246 changed files with 4020 additions and 788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -877,6 +877,55 @@ int main(int argc, char *argv[])
ReadFields(pointMesh::New(mesh), objects, ptFlds);
// Read sets
PtrList<cellSet> cellSets;
PtrList<faceSet> faceSets;
PtrList<pointSet> pointSets;
if (renumberSets)
{
// Read sets
IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
{
IOobjectList cSets(objects.lookupClass(cellSet::typeName));
if (cSets.size())
{
Info<< "Reading cellSets:" << endl;
forAllConstIter(IOobjectList, cSets, iter)
{
cellSets.append(new cellSet(*iter()));
Info<< " " << cellSets.last().name() << endl;
}
}
}
{
IOobjectList fSets(objects.lookupClass(faceSet::typeName));
if (fSets.size())
{
Info<< "Reading faceSets:" << endl;
forAllConstIter(IOobjectList, fSets, iter)
{
faceSets.append(new faceSet(*iter()));
Info<< " " << faceSets.last().name() << endl;
}
}
}
{
IOobjectList pSets(objects.lookupClass(pointSet::typeName));
if (pSets.size())
{
Info<< "Reading pointSets:" << endl;
forAllConstIter(IOobjectList, pSets, iter)
{
pointSets.append(new pointSet(*iter()));
Info<< " " << pointSets.last().name() << endl;
}
}
}
}
>>>>>>> develop
Info<< endl;
// From renumbering:
@ -1387,61 +1436,25 @@ int main(int argc, char *argv[])
).write();
}
// Renumber sets if required
if (renumberSets)
{
Info<< endl;
// Read sets
IOobjectList objects(mesh, mesh.facesInstance(), "polyMesh/sets");
forAll(cellSets, i)
{
IOobjectList cSets(objects.lookupClass(cellSet::typeName));
if (cSets.size())
{
Info<< "Renumbering cellSets:" << endl;
forAllConstIter(IOobjectList, cSets, iter)
{
cellSet cs(*iter());
Info<< " " << cs.name() << endl;
cs.updateMesh(map());
cs.instance() = mesh.facesInstance();
cs.write();
}
}
cellSets[i].updateMesh(map());
cellSets[i].instance() = mesh.facesInstance();
cellSets[i].write();
}
forAll(faceSets, i)
{
IOobjectList fSets(objects.lookupClass(faceSet::typeName));
if (fSets.size())
{
Info<< "Renumbering faceSets:" << endl;
forAllConstIter(IOobjectList, fSets, iter)
{
faceSet fs(*iter());
Info<< " " << fs.name() << endl;
fs.updateMesh(map());
fs.instance() = mesh.facesInstance();
fs.write();
}
}
faceSets[i].updateMesh(map());
faceSets[i].instance() = mesh.facesInstance();
faceSets[i].write();
}
forAll(pointSets, i)
{
IOobjectList pSets(objects.lookupClass(pointSet::typeName));
if (pSets.size())
{
Info<< "Renumbering pointSets:" << endl;
forAllConstIter(IOobjectList, pSets, iter)
{
pointSet ps(*iter());
Info<< " " << ps.name() << endl;
ps.updateMesh(map());
ps.instance() = mesh.facesInstance();
ps.write();
}
}
pointSets[i].updateMesh(map());
pointSets[i].instance() = mesh.facesInstance();
pointSets[i].write();
}
}