ENH: polyTopoChange: handle meshes without patches

This commit is contained in:
mattijs
2013-09-03 14:40:49 +01:00
parent 72f8324383
commit cadaee82b7
2 changed files with 36 additions and 36 deletions

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
@ -26,11 +26,8 @@ License
#include "mapPolyMesh.H" #include "mapPolyMesh.H"
#include "polyMesh.H" #include "polyMesh.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::mapPolyMesh::mapPolyMesh Foam::mapPolyMesh::mapPolyMesh
( (
const polyMesh& mesh, const polyMesh& mesh,
@ -115,7 +112,6 @@ Foam::mapPolyMesh::mapPolyMesh
} }
// Construct from components and optionally reuse storage
Foam::mapPolyMesh::mapPolyMesh Foam::mapPolyMesh::mapPolyMesh
( (
const polyMesh& mesh, const polyMesh& mesh,
@ -177,6 +173,8 @@ Foam::mapPolyMesh::mapPolyMesh
oldPatchStarts_(oldPatchStarts, reUse), oldPatchStarts_(oldPatchStarts, reUse),
oldPatchNMeshPoints_(oldPatchNMeshPoints, reUse) oldPatchNMeshPoints_(oldPatchNMeshPoints, reUse)
{ {
if (oldPatchStarts_.size() > 0)
{
// Calculate old patch sizes // Calculate old patch sizes
for (label patchI = 0; patchI < oldPatchStarts_.size() - 1; patchI++) for (label patchI = 0; patchI < oldPatchStarts_.size() - 1; patchI++)
{ {
@ -194,14 +192,13 @@ Foam::mapPolyMesh::mapPolyMesh
if (min(oldPatchSizes_) < 0) if (min(oldPatchSizes_) < 0)
{ {
FatalErrorIn("mapPolyMesh::mapPolyMesh(...)") FatalErrorIn("mapPolyMesh::mapPolyMesh(...)")
<< "Calculated negative old patch size. Error in mapping data" << "Calculated negative old patch size."
<< " Error in mapping data"
<< abort(FatalError); << abort(FatalError);
} }
} }
}
} }
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// ************************************************************************* // // ************************************************************************* //

View File

@ -818,6 +818,8 @@ void Foam::polyTopoChange::getFaceOrder
patchSizes.setSize(nPatches_); patchSizes.setSize(nPatches_);
patchSizes = 0; patchSizes = 0;
if (nPatches_ > 0)
{
patchStarts[0] = newFaceI; patchStarts[0] = newFaceI;
for (label faceI = 0; faceI < nActiveFaces; faceI++) for (label faceI = 0; faceI < nActiveFaces; faceI++)
@ -835,6 +837,7 @@ void Foam::polyTopoChange::getFaceOrder
patchStarts[patchI] = faceI; patchStarts[patchI] = faceI;
faceI += patchSizes[patchI]; faceI += patchSizes[patchI];
} }
}
//if (debug) //if (debug)
//{ //{