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

BUG: removeFaces: do not remove if inbetween same cells. See #998.

Browse Source 
This is the additional fix to make dynamic unrefinement work again.
This commit is contained in:
mattijs
2018-10-17 09:13:35 +01:00
parent 8d590dd780
commit 01737e14e7
2 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
View File

@ -3,7 +3,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-2017 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -5572,9 +5572,27 @@ void Foam::hexRef8::setUnrefinement
if (facesToRemove.size() != splitFaces.size()) if (facesToRemove.size() != splitFaces.size())
{ {
// Dump current mesh
{
const_cast<polyMesh&>(mesh_).setInstance
(
mesh_.time().timeName()
);
mesh_.write();
pointSet pSet(mesh_, "splitPoints", splitPointLabels);
pSet.write();
faceSet fSet(mesh_, "splitFaces", splitFaces);
fSet.write();
faceSet removeSet(mesh_, "facesToRemove", facesToRemove);
removeSet.write();
}
FatalErrorInFunction FatalErrorInFunction
<< "Ininitial set of split points to unrefine does not" << "Ininitial set of split points to unrefine does not"
<< " seem to be consistent or not mid points of refined cells" << " seem to be consistent or not mid points of refined cells"
<< " splitPoints:" << splitPointLabels.size()
<< " splitFaces:" << splitFaces.size()
<< " facesToRemove:" << facesToRemove.size()
<< abort(FatalError); << abort(FatalError);
} }
} }

28
src/dynamicMesh/polyTopoChange/polyTopoChange/removeFaces.C
View File

@ -910,7 +910,7 @@ void Foam::removeFaces::setRefinement
{ {
if (nFacesPerEdge[edgeI] == 2) if (nFacesPerEdge[edgeI] == 2)
{ {
// See if they are two boundary faces // Get the two face labels
label f0 = -1; label f0 = -1;
label f1 = -1; label f1 = -1;
@ -920,7 +920,7 @@ void Foam::removeFaces::setRefinement
{ {
label facei = eFaces[i]; label facei = eFaces[i];
if (!removedFace[facei] && !mesh_.isInternalFace(facei)) if (!removedFace[facei])
{ {
if (f0 == -1) if (f0 == -1)
{ {
@ -934,7 +934,7 @@ void Foam::removeFaces::setRefinement
} }
} }
if (f0 != -1 && f1 != -1) if (!mesh_.isInternalFace(f0) && !mesh_.isInternalFace(f1))
{ {
// Edge has two boundary faces remaining. // Edge has two boundary faces remaining.
// See if should be merged. // See if should be merged.
@ -979,7 +979,7 @@ void Foam::removeFaces::setRefinement
} }
} }
} }
else if (f0 != -1 || f1 != -1) else if (mesh_.isInternalFace(f0) != mesh_.isInternalFace(f1))
{ {
const edge& e = mesh_.edges()[edgeI]; const edge& e = mesh_.edges()[edgeI];
@ -1000,10 +1000,30 @@ void Foam::removeFaces::setRefinement
else else
{ {
// Both kept faces are internal. Mark edge for preserving // Both kept faces are internal. Mark edge for preserving
// if inbetween different cells. If inbetween same cell
// pair we probably want to merge them to
// - avoid upper-triangular ordering problems
// - allow hex unrefinement (expects single face inbetween
// cells)
const edge ownEdge
(
cellRegion[mesh_.faceOwner()[f0]],
cellRegion[mesh_.faceNeighbour()[f0]]
);
const edge neiEdge
(
cellRegion[mesh_.faceOwner()[f1]],
cellRegion[mesh_.faceNeighbour()[f1]]
);
if (ownEdge != neiEdge)
{
nFacesPerEdge[edgeI] = 3; nFacesPerEdge[edgeI] = 3;
} }
} }
} }
}