diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index 5a745429b3..4da80f7f1b 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,6 @@ Description #include "cellToCell.H" #include "surfaceSets.H" #include "polyTopoChange.H" -#include "polyTopoChanger.H" #include "polyTopoChangeMap.H" #include "labelIOList.H" #include "emptyPolyPatch.H" diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C index 1ad616aa9d..00583991be 100644 --- a/applications/utilities/mesh/advanced/splitCells/splitCells.C +++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C @@ -44,7 +44,6 @@ Description #include "argList.H" #include "Time.H" #include "polyTopoChange.H" -#include "polyTopoChanger.H" #include "polyTopoChangeMap.H" #include "polyMesh.H" #include "cellCuts.H" diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C index d92ca4ba07..118ad67174 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "mergePolyMesh.H" #include "Time.H" -#include "polyTopoChanger.H" #include "polyTopoChangeMap.H" #include "polyAddPoint.H" #include "polyAddCell.H" diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.C b/src/dynamicMesh/perfectInterface/perfectInterface.C index 8ad3fcf531..4a9d23f36c 100644 --- a/src/dynamicMesh/perfectInterface/perfectInterface.C +++ b/src/dynamicMesh/perfectInterface/perfectInterface.C @@ -34,9 +34,6 @@ Description #include "addToRunTimeSelectionTable.H" #include "polyTopoChangeMap.H" #include "matchPoints.H" -#include "polyModifyFace.H" -#include "polyRemovePoint.H" -#include "polyRemoveFace.H" #include "indirectPrimitivePatch.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -53,7 +50,6 @@ namespace Foam } -// Tolerance used as fraction of minimum edge length. const Foam::scalar Foam::perfectInterface::tol_ = 1e-3; @@ -79,7 +75,6 @@ Foam::pointField Foam::perfectInterface::calcFaceCentres // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from components Foam::perfectInterface::perfectInterface ( const word& name, @@ -97,7 +92,6 @@ Foam::perfectInterface::perfectInterface {} -// Construct from dictionary Foam::perfectInterface::perfectInterface ( const word& name, @@ -329,20 +323,16 @@ void Foam::perfectInterface::setRefinement zoneFlip = fZone.flipMap()[fZone.whichFace(facei)]; } - ref.setAction + ref.modifyFace ( - polyModifyFace - ( - newFace, // modified face - facei, // label of face being modified - mesh.faceOwner()[facei], // owner - nbr, // neighbour - false, // face flip - patchi, // patch for face - false, // remove from zone - zoneID, // zone for face - zoneFlip // face flip in zone - ) + newFace, // modified face + facei, // label of face being modified + mesh.faceOwner()[facei], // owner + nbr, // neighbour + false, // face flip + patchi, // patch for face + zoneID, // zone for face + zoneFlip // face flip in zone ); } @@ -354,7 +344,7 @@ void Foam::perfectInterface::setRefinement if (meshPointi != renumberPoints[meshPointi]) { - ref.setAction(polyRemovePoint(meshPointi)); + ref.removePoint(meshPointi, -1); } } @@ -363,7 +353,7 @@ void Foam::perfectInterface::setRefinement forAll(pp1, i) { label facei = pp1.addressing()[i]; - ref.setAction(polyRemoveFace(facei)); + ref.removeFace(facei, -1); } @@ -394,38 +384,30 @@ void Foam::perfectInterface::setRefinement if (own < nbr) { - ref.setAction + ref.modifyFace ( - polyModifyFace - ( - newFace, // modified face - facei, // label of face being modified - own, // owner - nbr, // neighbour - false, // face flip - -1, // patch for face - false, // remove from zone - faceZoneID_.index(), // zone for face - mfFlip[i] // face flip in zone - ) + newFace, // modified face + facei, // label of face being modified + own, // owner + nbr, // neighbour + false, // face flip + -1, // patch for face + faceZoneID_.index(), // zone for face + mfFlip[i] // face flip in zone ); } else { - ref.setAction + ref.modifyFace ( - polyModifyFace - ( - newFace.reverseFace(), // modified face - facei, // label of face being modified - nbr, // owner - own, // neighbour - true, // face flip - -1, // patch for face - false, // remove from zone - faceZoneID_.index(), // zone for face - !mfFlip[i] // face flip in zone - ) + newFace.reverseFace(), // modified face + facei, // label of face being modified + nbr, // owner + own, // neighbour + true, // face flip + -1, // patch for face + faceZoneID_.index(), // zone for face + !mfFlip[i] // face flip in zone ); } } @@ -527,13 +509,4 @@ void Foam::perfectInterface::writeDict(Ostream& os) const } -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - - // ************************************************************************* // diff --git a/src/dynamicMesh/perfectInterface/perfectInterface.H b/src/dynamicMesh/perfectInterface/perfectInterface.H index aec10f8881..c596a16576 100644 --- a/src/dynamicMesh/perfectInterface/perfectInterface.H +++ b/src/dynamicMesh/perfectInterface/perfectInterface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,8 +68,8 @@ class perfectInterface //- Slave patch ID polyPatchID slavePatchID_; - //- Tolerance used for distance comparison (fraction of minimum edge - // length) + //- Tolerance used for distance comparison + // (fraction of minimum edge length) static const scalar tol_; // Private Member Functions