zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PrimitivePatch: Added Istream constructor and iNew

Browse Source
This commit is contained in:
Henry Weller
2019-03-12 17:28:03 +00:00
parent 23d7371592
commit d6f6747d63
3 changed files with 116 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -216,6 +216,9 @@ public:
//- Construct as copy
polyPatch(const polyPatch&);
// To avoid irritating warnings from clang
using primitivePatch::clone;
//- Construct and return a clone, resetting the boundary mesh
virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
{

29
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.C
View File

@ -144,6 +144,35 @@ Foam::PrimitivePatch<FaceList, PointField>::PrimitivePatch
{}
template<class FaceList, class PointField>
Foam::PrimitivePatch<FaceList, PointField>::PrimitivePatch
(
Istream& is,
const Field<PointType>& points
)
:
FaceList(is),
points_(points),
edgesPtr_(nullptr),
nInternalEdges_(-1),
boundaryPointsPtr_(nullptr),
faceFacesPtr_(nullptr),
edgeFacesPtr_(nullptr),
faceEdgesPtr_(nullptr),
pointEdgesPtr_(nullptr),
pointFacesPtr_(nullptr),
localFacesPtr_(nullptr),
meshPointsPtr_(nullptr),
meshPointMapPtr_(nullptr),
edgeLoopsPtr_(nullptr),
localPointsPtr_(nullptr),
localPointOrderPtr_(nullptr),
faceCentresPtr_(nullptr),
faceNormalsPtr_(nullptr),
pointNormalsPtr_(nullptr)
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
template<class FaceList, class PointField>

129
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H
View File

@ -264,33 +264,62 @@ public:
const PrimitivePatch<FaceList, PointField>&
);
//- Construct and return a clone
virtual autoPtr<PrimitivePatch<FaceList, PointField>> clone() const
{
return autoPtr<PrimitivePatch<FaceList, PointField>>
(
new PrimitivePatch<FaceList, PointField>(*this)
);
}
//- Construct from Istream
PrimitivePatch
(
Istream&,
const Field<PointType>& points
);
class iNew
{
const Field<PointType>& points_;
public:
iNew(const Field<PointType>& points)
:
points_(points)
{}
autoPtr<PrimitivePatch<FaceList, PointField>> operator()
(
Istream& is
) const
{
return autoPtr<PrimitivePatch<FaceList, PointField>>
(
new PrimitivePatch<FaceList, PointField>(is, points_)
);
}
};
//- Destructor
virtual ~PrimitivePatch();
void clearOut();
void clearGeom();
void clearTopology();
void clearPatchMeshAddr();
// Member Functions
// Access
// Access
//- Return reference to global points
const Field<PointType>& points() const
{
return points_;
}
//- Return reference to global points
const Field<PointType>& points() const
{
return points_;
}
// Access functions for demand driven data
// Topological data; no mesh required.
// Access functions for Topological data; no mesh required.
//- Return number of points supporting patch faces
label nPoints() const
@ -423,41 +452,49 @@ public:
const labelListList& edgeLoops() const;
// Check
// Check
//- Calculate surface type formed by patch.
// Types:
// - all edges have two neighbours (manifold)
// - some edges have more than two neighbours (illegal)
// - other (open)
surfaceTopo surfaceType() const;
//- Calculate surface type formed by patch.
// Types:
// - all edges have two neighbours (manifold)
// - some edges have more than two neighbours (illegal)
// - other (open)
surfaceTopo surfaceType() const;
//- Check surface formed by patch for manifoldness (see above).
// Return true if any incorrect edges are found.
// Insert vertices of incorrect edges into set.
bool checkTopology
(
const bool report = false,
labelHashSet* setPtr = nullptr
) const;
//- Check surface formed by patch for manifoldness (see above).
// Return true if any incorrect edges are found.
// Insert vertices of incorrect edges into set.
bool checkTopology
(
const bool report = false,
labelHashSet* setPtr = nullptr
) const;
//- Checks primitivePatch for faces sharing point but not edge.
// This denotes a surface that is pinched at a single point
// (test for pinched at single edge is already in PrimitivePatch)
// Returns true if this situation found and puts conflicting
// (mesh)point in set. Based on all the checking routines in
// primitiveMesh.
bool checkPointManifold
(
const bool report = false,
labelHashSet* setPtr = nullptr
) const;
//- Checks primitivePatch for faces sharing point but not edge.
// This denotes a surface that is pinched at a single point
// (test for pinched at single edge is already in PrimitivePatch)
// Returns true if this situation found and puts conflicting
// (mesh)point in set. Based on all the checking routines in
// primitiveMesh.
bool checkPointManifold
(
const bool report = false,
labelHashSet* setPtr = nullptr
) const;
// Edit
// Edit
//- Correct patch after moving points
virtual void movePoints(const Field<PointType>&);
void clearOut();
void clearGeom();
void clearTopology();
void clearPatchMeshAddr();
//- Correct patch after moving points
virtual void movePoints(const Field<PointType>&);
// Member operators