songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rationalize the autoMesh library: autoHexMesh -> snappyHexMesh

Browse Source 
autoRefine -> snappyRefine
autoLayer -> snappyLayer
autoSnap -> snappySnap
This commit is contained in:
Henry Weller 2016-03-01 16:21:31 +00:00
parent eb5d349242
commit 2bbc844ea0
27 changed files with 206 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/mesh/advanced/autoRefineMesh/Make/files
View File

@ -1,4 +1,4 @@
autoRefineMesh.C
snappyRefineMesh.C
EXE = $(FOAM_APPBIN)/autoRefineMesh
EXE = $(FOAM_APPBIN)/snappyRefineMesh

6
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C → applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Application
autoRefineMesh
snappyRefineMesh
Description
Utility to refine cells near to a surface.
@ -670,7 +670,7 @@ int main(int argc, char *argv[])
(
IOobject
(
"autoRefineMeshDict",
"snappyRefineMeshDict",
runTime.system(),
mesh,
IOobject::MUST_READ_IF_MODIFIED,

2
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMeshDict → applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMeshDict
View File

@ -10,7 +10,7 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
object autoRefineMeshDict;
object snappyRefineMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

18
applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
View File

@ -32,9 +32,9 @@ Description
#include "argList.H"
#include "Time.H"
#include "fvMesh.H"
#include "autoRefineDriver.H"
#include "autoSnapDriver.H"
#include "autoLayerDriver.H"
#include "snappyRefineDriver.H"
#include "snappySnapDriver.H"
#include "snappyLayerDriver.H"
#include "searchableSurfaces.H"
#include "refinementSurfaces.H"
#include "refinementFeatures.H"
@ -868,9 +868,9 @@ int main(int argc, char *argv[])
if (debugLevel > 0)
{
meshRefinement::debug = debugLevel;
autoRefineDriver::debug = debugLevel;
autoSnapDriver::debug = debugLevel;
autoLayerDriver::debug = debugLevel;
snappyRefineDriver::debug = debugLevel;
snappySnapDriver::debug = debugLevel;
snappyLayerDriver::debug = debugLevel;
}
// Set file writing level
@ -1326,7 +1326,7 @@ int main(int argc, char *argv[])
{
cpuTime timer;
autoRefineDriver refineDriver
snappyRefineDriver refineDriver
(
meshRefiner,
decomposer,
@ -1367,7 +1367,7 @@ int main(int argc, char *argv[])
{
cpuTime timer;
autoSnapDriver snapDriver
snappySnapDriver snapDriver
(
meshRefiner,
globalToMasterPatch,
@ -1408,7 +1408,7 @@ int main(int argc, char *argv[])
{
cpuTime timer;
autoLayerDriver layerDriver
snappyLayerDriver layerDriver
(
meshRefiner,
globalToMasterPatch,

8
etc/controlDict
View File

@ -313,10 +313,10 @@ DebugSwitches
atomizationModel 0;
attachDetach 0;
autoDensity 0;
autoHexMeshDriver 0;
autoLayerDriver 0;
autoRefineDriver 0;
autoSnapDriver 0;
snappyHexMeshDriver 0;
snappyLayerDriver 0;
snappyRefineDriver 0;
snappySnapDriver 0;
bC11H10 0;
backgroundMeshDecomposition 0;
backward 0;

18
src/mesh/snappyHexMesh/Make/files
View File

@ -1,13 +1,13 @@
autoHexMeshDriver/autoLayerDriver.C
/* autoHexMeshDriver/autoLayerDriverShrink.C */
autoHexMeshDriver/autoSnapDriver.C
autoHexMeshDriver/autoSnapDriverFeature.C
autoHexMeshDriver/autoRefineDriver.C
snappyHexMeshDriver/snappyLayerDriver.C
/* snappyHexMeshDriver/snappyLayerDriverShrink.C */
snappyHexMeshDriver/snappySnapDriver.C
snappyHexMeshDriver/snappySnapDriverFeature.C
snappyHexMeshDriver/snappyRefineDriver.C
autoHexMeshDriver/layerParameters/layerParameters.C
autoHexMeshDriver/refinementParameters/refinementParameters.C
autoHexMeshDriver/snapParameters/snapParameters.C
autoHexMeshDriver/pointData/pointData.C
snappyHexMeshDriver/layerParameters/layerParameters.C
snappyHexMeshDriver/refinementParameters/refinementParameters.C
snappyHexMeshDriver/snapParameters/snapParameters.C
snappyHexMeshDriver/pointData/pointData.C
meshRefinement/meshRefinementBaffles.C
meshRefinement/meshRefinement.C

48
src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
View File

@ -862,18 +862,18 @@ bool Foam::medialAxisMeshMover::unmarkExtrusion
(
const label patchPointI,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDE)
{
extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
patchDisp[patchPointI] = vector::zero;
return true;
}
else if (extrudeStatus[patchPointI] == autoLayerDriver::EXTRUDEREMOVE)
else if (extrudeStatus[patchPointI] == snappyLayerDriver::EXTRUDEREMOVE)
{
extrudeStatus[patchPointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[patchPointI] = snappyLayerDriver::NOEXTRUDE;
patchDisp[patchPointI] = vector::zero;
return true;
}
@ -888,7 +888,7 @@ void Foam::medialAxisMeshMover::syncPatchDisplacement
(
const scalarField& minThickness,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
) const
{
const indirectPrimitivePatch& pp = adaptPatchPtr_();
@ -1081,7 +1081,7 @@ handleFeatureAngleLayerTerminations
const scalar minCos,
const PackedBoolList& isPatchMasterPoint,
const labelList& meshEdges,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp,
label& nPointCounter
) const
@ -1099,7 +1099,7 @@ handleFeatureAngleLayerTerminations
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
extrudedFaces[faceI] = false;
break;
@ -1168,8 +1168,8 @@ handleFeatureAngleLayerTerminations
if
(
extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE
|| extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE
extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE
|| extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE
)
{
if (!eFaceExtrude[0] || !eFaceExtrude[1])
@ -1215,7 +1215,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
const PackedBoolList& isPatchMasterEdge,
const labelList& meshEdges,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
) const
{
@ -1288,7 +1288,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
forAll(f, fp)
{
if (extrudeStatus[f[fp]] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] != snappyLayerDriver::NOEXTRUDE)
{
if (islandPoint[faceI] == -1)
{
@ -1312,7 +1312,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
// Check all surrounding faces that I am the islandPoint
forAll(pointFaces, patchPointI)
{
if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
{
const labelList& pFaces = pointFaces[patchPointI];
@ -1340,7 +1340,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
const face& f = pp.localFaces()[faceI];
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
extrudedFaces[faceI] = false;
break;
@ -1419,11 +1419,11 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
label v0 = e[0];
label v1 = e[1];
if (extrudeStatus[v1] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[v1] != snappyLayerDriver::NOEXTRUDE)
{
isolatedPoint[v0] += 1;
}
if (extrudeStatus[v0] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[v0] != snappyLayerDriver::NOEXTRUDE)
{
isolatedPoint[v1] += 1;
}
@ -1458,7 +1458,7 @@ void Foam::medialAxisMeshMover::findIsolatedRegions
{
forAll(f, fp)
{
if (extrudeStatus[f[fp]] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[f[fp]] == snappyLayerDriver::NOEXTRUDE)
{
allPointsExtruded = false;
break;
@ -1700,7 +1700,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
(
const dictionary& coeffDict,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
)
{
@ -1794,7 +1794,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
forAll(thickness, patchPointI)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
{
thickness[patchPointI] = 0.0;
}
@ -1843,7 +1843,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
forAll(meshPoints, patchPointI)
{
if (extrudeStatus[patchPointI] != autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] != snappyLayerDriver::NOEXTRUDE)
{
label pointI = meshPoints[patchPointI];
@ -1937,7 +1937,7 @@ void Foam::medialAxisMeshMover::calculateDisplacement
// Update thickess for changed extrusion
forAll(thickness, patchPointI)
{
if (extrudeStatus[patchPointI] == autoLayerDriver::NOEXTRUDE)
if (extrudeStatus[patchPointI] == snappyLayerDriver::NOEXTRUDE)
{
thickness[patchPointI] = 0.0;
}
@ -2146,16 +2146,16 @@ bool Foam::medialAxisMeshMover::move
pp.meshPoints()
);
List<autoLayerDriver::extrudeMode> extrudeStatus
List<snappyLayerDriver::extrudeMode> extrudeStatus
(
pp.nPoints(),
autoLayerDriver::EXTRUDE
snappyLayerDriver::EXTRUDE
);
forAll(extrudeStatus, pointI)
{
if (mag(patchDisp[pointI]) <= minThickness[pointI]+SMALL)
{
extrudeStatus[pointI] = autoLayerDriver::NOEXTRUDE;
extrudeStatus[pointI] = snappyLayerDriver::NOEXTRUDE;
}
}

12
src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.H
View File

@ -43,7 +43,7 @@ SourceFiles
#include "externalDisplacementMeshMover.H"
#include "motionSmootherAlgo.H"
#include "autoLayerDriver.H"
#include "snappyLayerDriver.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -150,7 +150,7 @@ class medialAxisMeshMover
(
const label patchPointI,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
);
//- Synchronise extrusion
@ -158,7 +158,7 @@ class medialAxisMeshMover
(
const scalarField& minThickness,
pointField& patchDisp,
List<autoLayerDriver::extrudeMode>& extrudeStatus
List<snappyLayerDriver::extrudeMode>& extrudeStatus
) const;
void smoothLambdaMuDisplacement
@ -184,7 +184,7 @@ class medialAxisMeshMover
const scalar minCos,
const PackedBoolList& isMasterPoint,
const labelList& meshEdges,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp,
label& nPointCounter
) const;
@ -200,7 +200,7 @@ class medialAxisMeshMover
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
) const;
@ -212,7 +212,7 @@ class medialAxisMeshMover
(
const dictionary&,
const scalarField& minThickness,
List<autoLayerDriver::extrudeMode>& extrudeStatus,
List<snappyLayerDriver::extrudeMode>& extrudeStatus,
pointField& patchDisp
);

10
src/mesh/snappyHexMesh/meshRefinement/meshRefinementProblemCells.C
View File

@ -36,7 +36,7 @@ License
#include "polyMeshGeometry.H"
#include "IOmanip.H"
#include "unitConversion.H"
#include "autoSnapDriver.H"
#include "snappySnapDriver.H"
#include "snapParameters.H"
#include "motionSmoother.H"
@ -1090,7 +1090,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
{
pointField oldPoints(mesh_.points());
// Repeat (most of) autoSnapDriver::doSnap
// Repeat (most of) snappySnapDriver::doSnap
{
labelList adaptPatchIDs(meshedPatches());
@ -1108,7 +1108,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
// Distance to attract to nearest feature on surface
const scalarField snapDist
(
autoSnapDriver::calcSnapDistance(mesh_, snapParams, pp)
snappySnapDriver::calcSnapDistance(mesh_, snapParams, pp)
);
@ -1147,7 +1147,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
<< mesh_.time().cpuTimeIncrement() << " s\n" << nl << endl;
// Pre-smooth patch vertices (so before determining nearest)
autoSnapDriver::preSmoothPatch
snappySnapDriver::preSmoothPatch
(
*this,
snapParams,
@ -1160,7 +1160,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCellsGeometric
vectorField nearestNormal;
const vectorField disp
(
autoSnapDriver::calcNearestSurface
snappySnapDriver::calcNearestSurface
(
*this,
snapDist, // attraction

0
src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.C
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/layerParameters/layerParameters.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/layerParameters/layerParameters.H
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.C
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointData.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointData.H
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/pointData/pointDataI.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/pointData/pointDataI.H
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.C
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/refinementParameters/refinementParameters.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/refinementParameters/refinementParameters.H
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.C
View File

0
src/mesh/snappyHexMesh/autoHexMeshDriver/snapParameters/snapParameters.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/snapParameters/snapParameters.H
View File

68
src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
View File

@ -26,7 +26,7 @@ Description
\*----------------------------------------------------------------------------*/
#include "autoLayerDriver.H"
#include "snappyLayerDriver.H"
#include "fvMesh.H"
#include "Time.H"
#include "meshRefinement.H"
@ -65,7 +65,7 @@ Description
namespace Foam
{
defineTypeNameAndDebug(autoLayerDriver, 0);
defineTypeNameAndDebug(snappyLayerDriver, 0);
} // End namespace Foam
@ -73,7 +73,7 @@ defineTypeNameAndDebug(autoLayerDriver, 0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// For debugging: Dump displacement to .obj files
void Foam::autoLayerDriver::dumpDisplacement
void Foam::snappyLayerDriver::dumpDisplacement
(
const fileName& prefix,
const indirectPrimitivePatch& pp,
@ -105,7 +105,7 @@ void Foam::autoLayerDriver::dumpDisplacement
}
Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
Foam::tmp<Foam::scalarField> Foam::snappyLayerDriver::avgPointData
(
const indirectPrimitivePatch& pp,
const scalarField& pointFld
@ -132,7 +132,7 @@ Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
// Check that primitivePatch is not multiply connected. Collect non-manifold
// points in pointSet.
void Foam::autoLayerDriver::checkManifold
void Foam::snappyLayerDriver::checkManifold
(
const indirectPrimitivePatch& fp,
pointSet& nonManifoldPoints
@ -159,7 +159,7 @@ void Foam::autoLayerDriver::checkManifold
}
void Foam::autoLayerDriver::checkMeshManifold() const
void Foam::snappyLayerDriver::checkMeshManifold() const
{
const fvMesh& mesh = meshRefiner_.mesh();
@ -213,7 +213,7 @@ void Foam::autoLayerDriver::checkMeshManifold() const
// Unset extrusion on point. Returns true if anything unset.
bool Foam::autoLayerDriver::unmarkExtrusion
bool Foam::snappyLayerDriver::unmarkExtrusion
(
const label patchPointI,
pointField& patchDisp,
@ -243,7 +243,7 @@ bool Foam::autoLayerDriver::unmarkExtrusion
// Unset extrusion on face. Returns true if anything unset.
bool Foam::autoLayerDriver::unmarkExtrusion
bool Foam::snappyLayerDriver::unmarkExtrusion
(
const face& localFace,
pointField& patchDisp,
@ -274,7 +274,7 @@ bool Foam::autoLayerDriver::unmarkExtrusion
// No extrusion at non-manifold points.
void Foam::autoLayerDriver::handleNonManifolds
void Foam::snappyLayerDriver::handleNonManifolds
(
const indirectPrimitivePatch& pp,
const labelList& meshEdges,
@ -385,7 +385,7 @@ void Foam::autoLayerDriver::handleNonManifolds
// Parallel feature edge detection. Assumes non-manifold edges already handled.
void Foam::autoLayerDriver::handleFeatureAngle
void Foam::snappyLayerDriver::handleFeatureAngle
(
const indirectPrimitivePatch& pp,
const labelList& meshEdges,
@ -504,7 +504,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
// layer and compares it to the space the warped face takes up. Disables
// extrusion if layer thickness is more than faceRatio of the thickness of
// the face.
void Foam::autoLayerDriver::handleWarpedFaces
void Foam::snappyLayerDriver::handleWarpedFaces
(
const indirectPrimitivePatch& pp,
const scalar faceRatio,
@ -578,7 +578,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
//// No extrusion on cells with multiple patch faces. There ususally is a reason
//// why combinePatchFaces hasn't succeeded.
//void Foam::autoLayerDriver::handleMultiplePatchFaces
//void Foam::snappyLayerDriver::handleMultiplePatchFaces
//(
// const indirectPrimitivePatch& pp,
// pointField& patchDisp,
@ -679,7 +679,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
//}
void Foam::autoLayerDriver::setNumLayers
void Foam::snappyLayerDriver::setNumLayers
(
const labelList& patchToNLayers,
const labelList& patchIDs,
@ -803,7 +803,7 @@ void Foam::autoLayerDriver::setNumLayers
// Construct pointVectorField with correct boundary conditions for adding
// layers
Foam::tmp<Foam::pointVectorField>
Foam::autoLayerDriver::makeLayerDisplacementField
Foam::snappyLayerDriver::makeLayerDisplacementField
(
const pointMesh& pMesh,
const labelList& numLayers
@ -877,7 +877,7 @@ Foam::autoLayerDriver::makeLayerDisplacementField
}
void Foam::autoLayerDriver::growNoExtrusion
void Foam::snappyLayerDriver::growNoExtrusion
(
const indirectPrimitivePatch& pp,
pointField& patchDisp,
@ -967,7 +967,7 @@ void Foam::autoLayerDriver::growNoExtrusion
}
void Foam::autoLayerDriver::determineSidePatches
void Foam::snappyLayerDriver::determineSidePatches
(
const globalIndex& globalFaces,
const labelListList& edgeGlobalFaces,
@ -1057,7 +1057,7 @@ void Foam::autoLayerDriver::determineSidePatches
}
void Foam::autoLayerDriver::calculateLayerThickness
void Foam::snappyLayerDriver::calculateLayerThickness
(
const indirectPrimitivePatch& pp,
const labelList& patchIDs,
@ -1345,7 +1345,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
// Synchronize displacement among coupled patches.
void Foam::autoLayerDriver::syncPatchDisplacement
void Foam::snappyLayerDriver::syncPatchDisplacement
(
const indirectPrimitivePatch& pp,
const scalarField& minThickness,
@ -1476,7 +1476,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
// of the faces using it.
// extrudeStatus is both input and output and gives the status of each
// patch point.
void Foam::autoLayerDriver::getPatchDisplacement
void Foam::snappyLayerDriver::getPatchDisplacement
(
const indirectPrimitivePatch& pp,
const scalarField& thickness,
@ -1612,7 +1612,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
}
bool Foam::autoLayerDriver::sameEdgeNeighbour
bool Foam::snappyLayerDriver::sameEdgeNeighbour
(
const labelListList& globalEdgeFaces,
const label myGlobalFaceI,
@ -1632,7 +1632,7 @@ bool Foam::autoLayerDriver::sameEdgeNeighbour
}
void Foam::autoLayerDriver::getVertexString
void Foam::snappyLayerDriver::getVertexString
(
const indirectPrimitivePatch& pp,
const labelListList& globalEdgeFaces,
@ -1711,7 +1711,7 @@ void Foam::autoLayerDriver::getVertexString
// Truncates displacement
// - for all patchFaces in the faceset displacement gets set to zero
// - all displacement < minThickness gets set to zero
Foam::label Foam::autoLayerDriver::truncateDisplacement
Foam::label Foam::snappyLayerDriver::truncateDisplacement
(
const globalIndex& globalFaces,
const labelListList& edgeGlobalFaces,
@ -2026,7 +2026,7 @@ Foam::label Foam::autoLayerDriver::truncateDisplacement
// Setup layer information (at points and faces) to modify mesh topology in
// regions where layer mesh terminates.
void Foam::autoLayerDriver::setupLayerInfoTruncation
void Foam::snappyLayerDriver::setupLayerInfoTruncation
(
const indirectPrimitivePatch& pp,
const labelList& patchNLayers,
@ -2230,7 +2230,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
// Does any of the cells use a face from faces?
bool Foam::autoLayerDriver::cellsUseFace
bool Foam::snappyLayerDriver::cellsUseFace
(
const polyMesh& mesh,
const labelList& cellLabels,
@ -2256,7 +2256,7 @@ bool Foam::autoLayerDriver::cellsUseFace
// Checks the newly added cells and locally unmarks points so they
// will not get extruded next time round. Returns global number of unmarked
// points (0 if all was fine)
Foam::label Foam::autoLayerDriver::checkAndUnmark
Foam::label Foam::snappyLayerDriver::checkAndUnmark
(
const addPatchCellLayer& addLayer,
const dictionary& meshQualityDict,
@ -2390,7 +2390,7 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark
}
Foam::label Foam::autoLayerDriver::countExtrusion
Foam::label Foam::snappyLayerDriver::countExtrusion
(
const indirectPrimitivePatch& pp,
const List<extrudeMode>& extrudeStatus
@ -2421,7 +2421,7 @@ Foam::label Foam::autoLayerDriver::countExtrusion
// Collect layer faces and layer cells into mesh fields for ease of handling
void Foam::autoLayerDriver::getLayerCellsFaces
void Foam::snappyLayerDriver::getLayerCellsFaces
(
const polyMesh& mesh,
const addPatchCellLayer& addLayer,
@ -2475,7 +2475,7 @@ void Foam::autoLayerDriver::getLayerCellsFaces
}
void Foam::autoLayerDriver::printLayerData
void Foam::snappyLayerDriver::printLayerData
(
const fvMesh& mesh,
const labelList& patchIDs,
@ -2570,7 +2570,7 @@ void Foam::autoLayerDriver::printLayerData
}
bool Foam::autoLayerDriver::writeLayerData
bool Foam::snappyLayerDriver::writeLayerData
(
const fvMesh& mesh,
const labelList& patchIDs,
@ -2773,7 +2773,7 @@ bool Foam::autoLayerDriver::writeLayerData
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoLayerDriver::autoLayerDriver
Foam::snappyLayerDriver::snappyLayerDriver
(
meshRefinement& meshRefiner,
const labelList& globalToMasterPatch,
@ -2788,7 +2788,7 @@ Foam::autoLayerDriver::autoLayerDriver
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::autoLayerDriver::mergePatchFacesUndo
void Foam::snappyLayerDriver::mergePatchFacesUndo
(
const layerParameters& layerParams,
const dictionary& motionDict
@ -2840,7 +2840,7 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
}
void Foam::autoLayerDriver::addLayers
void Foam::snappyLayerDriver::addLayers
(
const layerParameters& layerParams,
const dictionary& motionDict,
@ -3238,7 +3238,7 @@ void Foam::autoLayerDriver::addLayers
Info<< "Writing shrunk mesh to time "
<< meshRefiner_.timeName() << endl;
// See comment in autoSnapDriver why we should not remove meshPhi
// See comment in snappySnapDriver why we should not remove meshPhi
// using mesh.clearOut().
meshRefiner_.write
@ -3582,7 +3582,7 @@ void Foam::autoLayerDriver::addLayers
}
void Foam::autoLayerDriver::doLayers
void Foam::snappyLayerDriver::doLayers
(
const dictionary& shrinkDict,
const dictionary& motionDict,

22
src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriver.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
View File

@ -22,18 +22,18 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::autoLayerDriver
Foam::snappyLayerDriver
Description
All to do with adding layers
SourceFiles
autoLayerDriver.C
snappyLayerDriver.C
\*---------------------------------------------------------------------------*/
#ifndef autoLayerDriver_H
#define autoLayerDriver_H
#ifndef snappyLayerDriver_H
#define snappyLayerDriver_H
#include "meshRefinement.H"
@ -52,10 +52,10 @@ class faceSet;
class layerParameters;
/*---------------------------------------------------------------------------*\
Class autoLayerDriver Declaration
Class snappyLayerDriver Declaration
\*---------------------------------------------------------------------------*/
class autoLayerDriver
class snappyLayerDriver
{
public:
@ -547,21 +547,21 @@ private:
//- Disallow default bitwise copy construct
autoLayerDriver(const autoLayerDriver&);
snappyLayerDriver(const snappyLayerDriver&);
//- Disallow default bitwise assignment
void operator=(const autoLayerDriver&);
void operator=(const snappyLayerDriver&);
public:
//- Runtime type information
ClassName("autoLayerDriver");
ClassName("snappyLayerDriver");
// Constructors
//- Construct from components
autoLayerDriver
snappyLayerDriver
(
meshRefinement& meshRefiner,
const labelList& globalToMasterPatch,
@ -610,7 +610,7 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "autoLayerDriverTemplates.C"
#include "snappyLayerDriverTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

24
src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverShrink.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverShrink.C
View File

@ -26,7 +26,7 @@ Description
\*----------------------------------------------------------------------------*/
#include "autoLayerDriver.H"
#include "snappyLayerDriver.H"
#include "fvMesh.H"
#include "Time.H"
#include "pointFields.H"
@ -41,7 +41,7 @@ Description
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// Calculate inverse sum of edge weights (currently always 1.0)
void Foam::autoLayerDriver::sumWeights
void Foam::snappyLayerDriver::sumWeights
(
const PackedBoolList& isMasterEdge,
const labelList& meshEdges,
@ -100,7 +100,7 @@ void Foam::autoLayerDriver::sumWeights
// Smooth field on moving patch
void Foam::autoLayerDriver::smoothField
void Foam::snappyLayerDriver::smoothField
(
const motionSmoother& meshMover,
const PackedBoolList& isMasterPoint,
@ -175,7 +175,7 @@ void Foam::autoLayerDriver::smoothField
}
}
//XXXXXXXXX
//void Foam::autoLayerDriver::smoothField
//void Foam::snappyLayerDriver::smoothField
//(
// const motionSmoother& meshMover,
// const PackedBoolList& isMasterEdge,
@ -267,7 +267,7 @@ void Foam::autoLayerDriver::smoothField
//XXXXXXXXX
// Smooth normals on moving patch.
void Foam::autoLayerDriver::smoothPatchNormals
void Foam::snappyLayerDriver::smoothPatchNormals
(
const motionSmoother& meshMover,
const PackedBoolList& isMasterPoint,
@ -337,7 +337,7 @@ void Foam::autoLayerDriver::smoothPatchNormals
// Smooth normals in interior.
void Foam::autoLayerDriver::smoothNormals
void Foam::snappyLayerDriver::smoothNormals
(
const label nSmoothDisp,
const PackedBoolList& isMasterPoint,
@ -428,7 +428,7 @@ void Foam::autoLayerDriver::smoothNormals
// Tries and find a medial axis point. Done by comparing vectors to nearest
// wall point for both vertices of edge.
bool Foam::autoLayerDriver::isMaxEdge
bool Foam::snappyLayerDriver::isMaxEdge
(
const List<pointData>& pointWallDist,
const label edgeI,
@ -489,7 +489,7 @@ bool Foam::autoLayerDriver::isMaxEdge
// Stop layer growth where mesh wraps around edge with a
// large feature angle
void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
void Foam::snappyLayerDriver::handleFeatureAngleLayerTerminations
(
const scalar minCos,
const PackedBoolList& isMasterPoint,
@ -641,7 +641,7 @@ void Foam::autoLayerDriver::handleFeatureAngleLayerTerminations
// Find isolated islands (points, edges and faces and layer terminations)
// in the layer mesh and stop any layer growth at these points.
void Foam::autoLayerDriver::findIsolatedRegions
void Foam::snappyLayerDriver::findIsolatedRegions
(
const scalar minCosLayerTermination,
const PackedBoolList& isMasterPoint,
@ -859,7 +859,7 @@ void Foam::autoLayerDriver::findIsolatedRegions
// medialDist : distance to medial axis
// medialRatio : ratio of medial distance to wall distance.
// (1 at wall, 0 at medial axis)
void Foam::autoLayerDriver::medialAxisSmoothingInfo
void Foam::snappyLayerDriver::medialAxisSmoothingInfo
(
const motionSmoother& meshMover,
const label nSmoothNormals,
@ -1346,7 +1346,7 @@ void Foam::autoLayerDriver::medialAxisSmoothingInfo
}
void Foam::autoLayerDriver::shrinkMeshMedialDistance
void Foam::snappyLayerDriver::shrinkMeshMedialDistance
(
motionSmoother& meshMover,
const dictionary& meshQualityDict,
@ -1764,7 +1764,7 @@ void Foam::autoLayerDriver::shrinkMeshMedialDistance
// Above move will have changed the instance only on the points (which
// is correct).
// However the previous mesh written will be the mesh with layers
// (see autoLayerDriver.C) so we now have to force writing all files
// (see snappyLayerDriver.C) so we now have to force writing all files
// so we can easily step through time steps. Note that if you
// don't write the mesh with layers this is not necessary.
meshRefiner_.mesh().setInstance(meshRefiner_.timeName());

4
src/mesh/snappyHexMesh/autoHexMeshDriver/autoLayerDriverTemplates.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C
View File

@ -23,13 +23,13 @@ License
\*---------------------------------------------------------------------------*/
#include "autoLayerDriver.H"
#include "snappyLayerDriver.H"
#include "syncTools.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class Type>
void Foam::autoLayerDriver::averageNeighbours
void Foam::snappyLayerDriver::averageNeighbours
(
const polyMesh& mesh,
const PackedBoolList& isMasterEdge,

28
src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "autoRefineDriver.H"
#include "snappyRefineDriver.H"
#include "meshRefinement.H"
#include "fvMesh.H"
#include "Time.H"
@ -43,7 +43,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(autoRefineDriver, 0);
defineTypeNameAndDebug(snappyRefineDriver, 0);
} // End namespace Foam
@ -51,7 +51,7 @@ defineTypeNameAndDebug(autoRefineDriver, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::autoRefineDriver::autoRefineDriver
Foam::snappyRefineDriver::snappyRefineDriver
(
meshRefinement& meshRefiner,
decompositionMethod& decomposer,
@ -70,7 +70,7 @@ Foam::autoRefineDriver::autoRefineDriver
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::autoRefineDriver::featureEdgeRefine
Foam::label Foam::snappyRefineDriver::featureEdgeRefine
(
const refinementParameters& refineParams,
const label maxIter,
@ -177,7 +177,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
}
Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
Foam::label Foam::snappyRefineDriver::surfaceOnlyRefine
(
const refinementParameters& refineParams,
const label maxIter
@ -297,7 +297,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
}
Foam::label Foam::autoRefineDriver::gapOnlyRefine
Foam::label Foam::snappyRefineDriver::gapOnlyRefine
(
const refinementParameters& refineParams,
const label maxIter
@ -525,7 +525,7 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine
}
Foam::label Foam::autoRefineDriver::danglingCellRefine
Foam::label Foam::snappyRefineDriver::danglingCellRefine
(
const refinementParameters& refineParams,
const label nFaces,
@ -669,7 +669,7 @@ Foam::label Foam::autoRefineDriver::danglingCellRefine
}
void Foam::autoRefineDriver::removeInsideCells
void Foam::snappyRefineDriver::removeInsideCells
(
const refinementParameters& refineParams,
const label nBufferLayers
@ -715,7 +715,7 @@ void Foam::autoRefineDriver::removeInsideCells
}
Foam::label Foam::autoRefineDriver::shellRefine
Foam::label Foam::snappyRefineDriver::shellRefine
(
const refinementParameters& refineParams,
const label maxIter
@ -885,7 +885,7 @@ Foam::label Foam::autoRefineDriver::shellRefine
}
void Foam::autoRefineDriver::baffleAndSplitMesh
void Foam::snappyRefineDriver::baffleAndSplitMesh
(
const refinementParameters& refineParams,
const snapParameters& snapParams,
@ -926,7 +926,7 @@ void Foam::autoRefineDriver::baffleAndSplitMesh
}
void Foam::autoRefineDriver::zonify
void Foam::snappyRefineDriver::zonify
(
const refinementParameters& refineParams
)
@ -982,7 +982,7 @@ void Foam::autoRefineDriver::zonify
}
void Foam::autoRefineDriver::splitAndMergeBaffles
void Foam::snappyRefineDriver::splitAndMergeBaffles
(
const refinementParameters& refineParams,
const snapParameters& snapParams,
@ -1092,7 +1092,7 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
}
void Foam::autoRefineDriver::mergePatchFaces
void Foam::snappyRefineDriver::mergePatchFaces
(
const refinementParameters& refineParams,
const dictionary& motionDict
@ -1128,7 +1128,7 @@ void Foam::autoRefineDriver::mergePatchFaces
}
void Foam::autoRefineDriver::doRefine
void Foam::snappyRefineDriver::doRefine
(
const dictionary& refineDict,
const refinementParameters& refineParams,

20
src/mesh/snappyHexMesh/autoHexMeshDriver/autoRefineDriver.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H
View File

@ -22,17 +22,17 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::autoRefineDriver
Foam::snappyRefineDriver
Description
SourceFiles
autoRefineDriver.C
snappyRefineDriver.C
\*---------------------------------------------------------------------------*/
#ifndef autoRefineDriver_H
#define autoRefineDriver_H
#ifndef snappyRefineDriver_H
#define snappyRefineDriver_H
#include "treeBoundBox.H"
@ -50,10 +50,10 @@ class decompositionMethod;
class fvMeshDistribute;
/*---------------------------------------------------------------------------*\
Class autoRefineDriver Declaration
Class snappyRefineDriver Declaration
\*---------------------------------------------------------------------------*/
class autoRefineDriver
class snappyRefineDriver
{
// Private data
@ -148,22 +148,22 @@ class autoRefineDriver
//- Disallow default bitwise copy construct
autoRefineDriver(const autoRefineDriver&);
snappyRefineDriver(const snappyRefineDriver&);
//- Disallow default bitwise assignment
void operator=(const autoRefineDriver&);
void operator=(const snappyRefineDriver&);
public:
//- Runtime type information
ClassName("autoRefineDriver");
ClassName("snappyRefineDriver");
// Constructors
//- Construct from components
autoRefineDriver
snappyRefineDriver
(
meshRefinement& meshRefiner,
decompositionMethod& decomposer,

52
src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C
View File

@ -26,7 +26,7 @@ Description
\*----------------------------------------------------------------------------*/
#include "autoSnapDriver.H"
#include "snappySnapDriver.H"
#include "motionSmoother.H"
#include "polyTopoChange.H"
#include "syncTools.H"
@ -49,7 +49,7 @@ Description
namespace Foam
{
defineTypeNameAndDebug(autoSnapDriver, 0);
defineTypeNameAndDebug(snappySnapDriver, 0);
} // End namespace Foam
@ -58,7 +58,7 @@ defineTypeNameAndDebug(autoSnapDriver, 0);
// Calculate geometrically collocated points, Requires PackedList to be
// sized and initalised!
Foam::label Foam::autoSnapDriver::getCollocatedPoints
Foam::label Foam::snappySnapDriver::getCollocatedPoints
(
const scalar tol,
const pointField& points,
@ -119,7 +119,7 @@ Foam::label Foam::autoSnapDriver::getCollocatedPoints
// Calculate displacement as average of patch points.
Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
Foam::pointField Foam::snappySnapDriver::smoothPatchDisplacement
(
const motionSmoother& meshMover,
const List<labelPair>& baffles
@ -417,7 +417,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
return patchDisp;
}
//XXXXXXX
//Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avg
//Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avg
//(
// const indirectPrimitivePatch& pp,
// const pointField& localPoints
@ -449,7 +449,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
// return tavg;
//}
//Foam::tmp<Foam::pointField>
//Foam::autoSnapDriver::smoothLambdaMuPatchDisplacement
//Foam::snappySnapDriver::smoothLambdaMuPatchDisplacement
//(
// const motionSmoother& meshMover,
// const List<labelPair>& baffles
@ -479,7 +479,7 @@ Foam::pointField Foam::autoSnapDriver::smoothPatchDisplacement
//XXXXXXX
Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
(
const pointMesh& pMesh,
const indirectPrimitivePatch& pp
@ -561,7 +561,7 @@ Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
}
void Foam::autoSnapDriver::dumpMove
void Foam::snappySnapDriver::dumpMove
(
const fileName& fName,
const pointField& meshPts,
@ -590,7 +590,7 @@ void Foam::autoSnapDriver::dumpMove
// Check whether all displacement vectors point outwards of patch. Return true
// if so.
bool Foam::autoSnapDriver::outwardsDisplacement
bool Foam::snappySnapDriver::outwardsDisplacement
(
const indirectPrimitivePatch& pp,
const vectorField& patchDisp
@ -633,7 +633,7 @@ bool Foam::autoSnapDriver::outwardsDisplacement
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::autoSnapDriver::autoSnapDriver
Foam::snappySnapDriver::snappySnapDriver
(
meshRefinement& meshRefiner,
const labelList& globalToMasterPatch,
@ -648,7 +648,7 @@ Foam::autoSnapDriver::autoSnapDriver
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::mergeZoneBaffles
(
const List<labelPair>& baffles
)
@ -677,7 +677,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::mergeZoneBaffles
}
Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
Foam::scalarField Foam::snappySnapDriver::calcSnapDistance
(
const fvMesh& mesh,
const snapParameters& snapParams,
@ -717,7 +717,7 @@ Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
}
void Foam::autoSnapDriver::preSmoothPatch
void Foam::snappySnapDriver::preSmoothPatch
(
const meshRefinement& meshRefiner,
const snapParameters& snapParams,
@ -814,7 +814,7 @@ void Foam::autoSnapDriver::preSmoothPatch
// Get (pp-local) indices of points that are both on zone and on patched surface
Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
Foam::labelList Foam::snappySnapDriver::getZoneSurfacePoints
(
const fvMesh& mesh,
const indirectPrimitivePatch& pp,
@ -861,7 +861,7 @@ Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
}
Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
(
const fvMesh& mesh,
const indirectPrimitivePatch& pp
@ -917,14 +917,14 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
}
//Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::calcEdgeLen
//Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::calcEdgeLen
//(
// const indirectPrimitivePatch& pp
//) const
//{
// // Get local edge length based on refinement level
// // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// // (Ripped from autoLayerDriver)
// // (Ripped from snappyLayerDriver)
//
// tmp<scalarField> tedgeLen(new scalarField(pp.nPoints()));
// scalarField& edgeLen = tedgeLen();
@ -965,7 +965,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
//}
void Foam::autoSnapDriver::detectNearSurfaces
void Foam::snappySnapDriver::detectNearSurfaces
(
const scalar planarCos,
const indirectPrimitivePatch& pp,
@ -1563,7 +1563,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
}
Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
(
const meshRefinement& meshRefiner,
const scalarField& snapDist,
@ -1817,7 +1817,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
////XXXXXXXXX
//// Get (pp-local) indices of points that are on both patches
//Foam::labelList Foam::autoSnapDriver::getPatchSurfacePoints
//Foam::labelList Foam::snappySnapDriver::getPatchSurfacePoints
//(
// const fvMesh& mesh,
// const indirectPrimitivePatch& allPp,
@ -1850,7 +1850,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
//
// return findIndices(pointOnZone, true);
//}
//Foam::vectorField Foam::autoSnapDriver::calcNearestLocalSurface
//Foam::vectorField Foam::snappySnapDriver::calcNearestLocalSurface
//(
// const meshRefinement& meshRefiner,
// const scalarField& snapDist,
@ -2063,7 +2063,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
//}
////XXXXXXXXX
void Foam::autoSnapDriver::smoothDisplacement
void Foam::snappySnapDriver::smoothDisplacement
(
const snapParameters& snapParams,
motionSmoother& meshMover
@ -2132,7 +2132,7 @@ void Foam::autoSnapDriver::smoothDisplacement
}
bool Foam::autoSnapDriver::scaleMesh
bool Foam::snappySnapDriver::scaleMesh
(
const snapParameters& snapParams,
const label nInitErrors,
@ -2198,7 +2198,7 @@ bool Foam::autoSnapDriver::scaleMesh
// - calculate face-wise snap distance as max of point-wise
// - calculate face-wise nearest surface point
// - repatch face according to patch for surface point.
Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
(
const snapParameters& snapParams,
const labelList& adaptPatchIDs,
@ -2368,7 +2368,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
}
void Foam::autoSnapDriver::detectWarpedFaces
void Foam::snappySnapDriver::detectWarpedFaces
(
const scalar featureCos,
const indirectPrimitivePatch& pp,
@ -2462,7 +2462,7 @@ void Foam::autoSnapDriver::detectWarpedFaces
}
void Foam::autoSnapDriver::doSnap
void Foam::snappySnapDriver::doSnap
(
const dictionary& snapDict,
const dictionary& motionDict,

22
src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriver.H → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H
View File

@ -22,19 +22,19 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::autoSnapDriver
Foam::snappySnapDriver
Description
All to do with snapping to surface
SourceFiles
autoSnapDriver.C
autoSnapDriverFeature.C
snappySnapDriver.C
snappySnapDriverFeature.C
\*---------------------------------------------------------------------------*/
#ifndef autoSnapDriver_H
#define autoSnapDriver_H
#ifndef snappySnapDriver_H
#define snappySnapDriver_H
#include "meshRefinement.H"
@ -49,10 +49,10 @@ class snapParameters;
class pointConstraint;
/*---------------------------------------------------------------------------*\
Class autoSnapDriver Declaration
Class snappySnapDriver Declaration
\*---------------------------------------------------------------------------*/
class autoSnapDriver
class snappySnapDriver
{
// Private data
@ -496,22 +496,22 @@ class autoSnapDriver
//- Disallow default bitwise copy construct
autoSnapDriver(const autoSnapDriver&);
snappySnapDriver(const snappySnapDriver&);
//- Disallow default bitwise assignment
void operator=(const autoSnapDriver&);
void operator=(const snappySnapDriver&);
public:
//- Runtime type information
ClassName("autoSnapDriver");
ClassName("snappySnapDriver");
// Constructors
//- Construct from components
autoSnapDriver
snappySnapDriver
(
meshRefinement& meshRefiner,
const labelList& globalToMasterPatch,

46
src/mesh/snappyHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C → src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
#include "autoSnapDriver.H"
#include "snappySnapDriver.H"
#include "polyTopoChange.H"
#include "syncTools.H"
#include "fvMesh.H"
@ -63,7 +63,7 @@ namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
bool Foam::autoSnapDriver::isFeaturePoint
bool Foam::snappySnapDriver::isFeaturePoint
(
const scalar featureCos,
const indirectPrimitivePatch& pp,
@ -124,7 +124,7 @@ bool Foam::autoSnapDriver::isFeaturePoint
}
void Foam::autoSnapDriver::smoothAndConstrain
void Foam::snappySnapDriver::smoothAndConstrain
(
const PackedBoolList& isPatchMasterEdge,
const indirectPrimitivePatch& pp,
@ -215,7 +215,7 @@ void Foam::autoSnapDriver::smoothAndConstrain
}
void Foam::autoSnapDriver::calcNearestFace
void Foam::snappySnapDriver::calcNearestFace
(
const label iter,
const indirectPrimitivePatch& pp,
@ -436,7 +436,7 @@ void Foam::autoSnapDriver::calcNearestFace
}
void Foam::autoSnapDriver::calcNearestFacePointProperties
void Foam::snappySnapDriver::calcNearestFacePointProperties
(
const label iter,
const indirectPrimitivePatch& pp,
@ -634,7 +634,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
}
void Foam::autoSnapDriver::correctAttraction
void Foam::snappySnapDriver::correctAttraction
(
const DynamicList<point>& surfacePoints,
const DynamicList<label>& surfaceCounts,
@ -672,7 +672,7 @@ void Foam::autoSnapDriver::correctAttraction
}
Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
(
const point& pt,
const labelList& patchIDs,
@ -696,7 +696,7 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
}
Foam::label Foam::autoSnapDriver::findNormal
Foam::label Foam::snappySnapDriver::findNormal
(
const scalar featureCos,
const vector& n,
@ -723,7 +723,7 @@ Foam::label Foam::autoSnapDriver::findNormal
}
Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
(
const point& pt,
const labelList& patchIDs,
@ -803,7 +803,7 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
}
void Foam::autoSnapDriver::featureAttractionUsingReconstruction
void Foam::snappySnapDriver::featureAttractionUsingReconstruction
(
const label iter,
const scalar featureCos,
@ -995,7 +995,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
}
void Foam::autoSnapDriver::featureAttractionUsingReconstruction
void Foam::snappySnapDriver::featureAttractionUsingReconstruction
(
const label iter,
const bool avoidSnapProblems,
@ -1102,7 +1102,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
}
void Foam::autoSnapDriver::stringFeatureEdges
void Foam::snappySnapDriver::stringFeatureEdges
(
const label iter,
const scalar featureCos,
@ -1291,7 +1291,7 @@ void Foam::autoSnapDriver::stringFeatureEdges
}
void Foam::autoSnapDriver::releasePointsNextToMultiPatch
void Foam::snappySnapDriver::releasePointsNextToMultiPatch
(
const label iter,
const scalar featureCos,
@ -1422,7 +1422,7 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
}
Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
(
const indirectPrimitivePatch& pp,
const vectorField& patchAttraction,
@ -1486,7 +1486,7 @@ Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
}
void Foam::autoSnapDriver::avoidDiagonalAttraction
void Foam::snappySnapDriver::avoidDiagonalAttraction
(
const label iter,
const scalar featureCos,
@ -1585,7 +1585,7 @@ void Foam::autoSnapDriver::avoidDiagonalAttraction
Foam::Tuple2<Foam::label, Foam::pointIndexHit>
Foam::autoSnapDriver::findNearFeatureEdge
Foam::snappySnapDriver::findNearFeatureEdge
(
const bool isRegionEdge,
@ -1653,7 +1653,7 @@ Foam::autoSnapDriver::findNearFeatureEdge
Foam::Tuple2<Foam::label, Foam::pointIndexHit>
Foam::autoSnapDriver::findNearFeaturePoint
Foam::snappySnapDriver::findNearFeaturePoint
(
const bool isRegionPoint,
@ -1756,7 +1756,7 @@ Foam::autoSnapDriver::findNearFeaturePoint
}
void Foam::autoSnapDriver::determineFeatures
void Foam::snappySnapDriver::determineFeatures
(
const label iter,
const scalar featureCos,
@ -2167,7 +2167,7 @@ void Foam::autoSnapDriver::determineFeatures
}
void Foam::autoSnapDriver::determineBaffleFeatures
void Foam::snappySnapDriver::determineBaffleFeatures
(
const label iter,
const scalar featureCos,
@ -2435,7 +2435,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures
}
void Foam::autoSnapDriver::reverseAttractMeshPoints
void Foam::snappySnapDriver::reverseAttractMeshPoints
(
const label iter,
@ -2694,7 +2694,7 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
}
void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
(
const label iter,
const bool avoidSnapProblems,
@ -2948,7 +2948,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
}
void Foam::autoSnapDriver::preventFaceSqueeze
void Foam::snappySnapDriver::preventFaceSqueeze
(
const label iter,
const scalar featureCos,
@ -3022,7 +3022,7 @@ void Foam::autoSnapDriver::preventFaceSqueeze
}
Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
(
const snapParameters& snapParams,
const bool avoidSnapProblems,