Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

BUG: movePoints: remove additional argument

  • Loading branch information...
commit 969dc72c1aad45b98224e74917984401bdc76b82 1 parent 415f025
mattijs authored
View
11 src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -1092,8 +1092,7 @@ const Foam::pointField& Foam::polyMesh::oldPoints() const
Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
(
- const pointField& newPoints,
- const bool deleteDemandDrivenData
+ const pointField& newPoints
)
{
if (debug)
@@ -1147,14 +1146,6 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
// Force recalculation of all geometric data with new points
- if (deleteDemandDrivenData)
- {
- // Remove the stored tet base points
- tetBasePtIsPtr_.clear();
- // Remove the cell tree
- cellTreePtr_.clear();
- }
-
bounds_ = boundBox(points_);
boundary_.movePoints(points_);
View
9 src/OpenFOAM/meshes/polyMesh/polyMesh.H
@@ -442,11 +442,7 @@ public:
}
//- Move points, returns volumes swept by faces in motion
- virtual tmp<scalarField> movePoints
- (
- const pointField&,
- const bool deleteDemandDrivenData = false
- );
+ virtual tmp<scalarField> movePoints(const pointField&);
//- Reset motion
void resetMotion() const;
@@ -526,6 +522,9 @@ public:
//- Clear primitive data (points, faces and cells)
void clearPrimitives();
+ //- Clear geometry not used for CFD (cellTree, tetBasePtIs)
+ void clearAdditionalGeom();
+
//- Clear cell tree data
void clearCellTree();
View
18 src/OpenFOAM/meshes/polyMesh/polyMeshClear.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -81,6 +81,22 @@ void Foam::polyMesh::clearGeom()
}
+void Foam::polyMesh::clearAdditionalGeom()
+{
+ if (debug)
+ {
+ Info<< "void polyMesh::clearAdditionalGeom() : "
+ << "clearing additional geometric data"
+ << endl;
+ }
+
+ // Remove the stored tet base points
+ tetBasePtIsPtr_.clear();
+ // Remove the cell tree
+ cellTreePtr_.clear();
+}
+
+
void Foam::polyMesh::clearAddressing()
{
if (debug)
View
3  src/dynamicMesh/motionSmoother/motionSmoother.C
@@ -844,7 +844,8 @@ Foam::tmp<Foam::scalarField> Foam::motionSmoother::movePoints
// Move actual mesh points. Make sure to delete tetBasePtIs so it
// gets rebuilt.
- tmp<scalarField> tsweptVol = mesh_.movePoints(newPoints, true);
+ mesh_.clearAdditionalGeom();
+ tmp<scalarField> tsweptVol = mesh_.movePoints(newPoints);
pp_.movePoints(mesh_.points());
Please sign in to comment.
Something went wrong with that request. Please try again.