ENH: renumberMesh: ignore inconsistent *ProcAddressing

This commit is contained in:
mattijs
2012-06-13 10:25:48 +01:00
parent d3c6758319
commit 069c5ee218

View File

@ -1018,6 +1018,11 @@ int main(int argc, char *argv[])
// Update proc maps // Update proc maps
if (cellProcAddressing.headerOk()) if (cellProcAddressing.headerOk())
if
(
cellProcAddressing.headerOk()
&& cellProcAddressing.size() == mesh.nCells()
)
{ {
Info<< "Renumbering processor cell decomposition map " Info<< "Renumbering processor cell decomposition map "
<< cellProcAddressing.name() << endl; << cellProcAddressing.name() << endl;
@ -1028,6 +1033,11 @@ int main(int argc, char *argv[])
); );
} }
if (faceProcAddressing.headerOk()) if (faceProcAddressing.headerOk())
if
(
faceProcAddressing.headerOk()
&& faceProcAddressing.size() == mesh.nFaces()
)
{ {
Info<< "Renumbering processor face decomposition map " Info<< "Renumbering processor face decomposition map "
<< faceProcAddressing.name() << endl; << faceProcAddressing.name() << endl;
@ -1054,6 +1064,11 @@ int main(int argc, char *argv[])
} }
} }
if (pointProcAddressing.headerOk()) if (pointProcAddressing.headerOk())
if
(
pointProcAddressing.headerOk()
&& pointProcAddressing.size() == mesh.nPoints()
)
{ {
Info<< "Renumbering processor point decomposition map " Info<< "Renumbering processor point decomposition map "
<< pointProcAddressing.name() << endl; << pointProcAddressing.name() << endl;
@ -1173,21 +1188,41 @@ int main(int argc, char *argv[])
mesh.write(); mesh.write();
if (cellProcAddressing.headerOk()) if (cellProcAddressing.headerOk())
if
(
cellProcAddressing.headerOk()
&& cellProcAddressing.size() == mesh.nCells()
)
{ {
cellProcAddressing.instance() = mesh.facesInstance(); cellProcAddressing.instance() = mesh.facesInstance();
cellProcAddressing.write(); cellProcAddressing.write();
} }
if (faceProcAddressing.headerOk()) if (faceProcAddressing.headerOk())
if
(
faceProcAddressing.headerOk()
&& faceProcAddressing.size() == mesh.nFaces()
)
{ {
faceProcAddressing.instance() = mesh.facesInstance(); faceProcAddressing.instance() = mesh.facesInstance();
faceProcAddressing.write(); faceProcAddressing.write();
} }
if (pointProcAddressing.headerOk()) if (pointProcAddressing.headerOk())
if
(
pointProcAddressing.headerOk()
&& pointProcAddressing.size() == mesh.nPoints()
)
{ {
pointProcAddressing.instance() = mesh.facesInstance(); pointProcAddressing.instance() = mesh.facesInstance();
pointProcAddressing.write(); pointProcAddressing.write();
} }
if (boundaryProcAddressing.headerOk()) if (boundaryProcAddressing.headerOk())
if
(
boundaryProcAddressing.headerOk()
&& boundaryProcAddressing.size() == mesh.boundaryMesh().size()
)
{ {
boundaryProcAddressing.instance() = mesh.facesInstance(); boundaryProcAddressing.instance() = mesh.facesInstance();
boundaryProcAddressing.write(); boundaryProcAddressing.write();