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

distanceSurface, sampledCuttingPlane, foamyHexMeshBackgroundMesh: Updated for new isoSurface implementation

Browse Source
This commit is contained in:
Henry Weller
2018-11-13 14:50:08 +00:00
parent c4dc7f0f8e
commit 11eaf751d3
7 changed files with 45 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/sampling/sampledSurface/distanceSurface/distanceSurface.C
View File

@ -49,13 +49,12 @@ void Foam::distanceSurface::createGeometry()
}
// Clear any stored topologies
facesPtr_.clear();
isoSurfPtr_.clear();
// Clear derived data
clearGeom();
const fvMesh& fvm = static_cast<const fvMesh&>(mesh());
const fvMesh& mesh = static_cast<const fvMesh&>(this->mesh());
// Distance to cell centres
// ~~~~~~~~~~~~~~~~~~~~~~~~
@ -67,13 +66,13 @@ void Foam::distanceSurface::createGeometry()
IOobject
(
"cellDistance",
fvm.time().timeName(),
fvm.time(),
mesh.time().timeName(),
mesh.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
fvm,
mesh,
dimensionedScalar("zero", dimLength, 0)
)
);
@ -81,7 +80,7 @@ void Foam::distanceSurface::createGeometry()
// Internal field
{
const pointField& cc = fvm.C();
const pointField& cc = mesh.C();
scalarField& fld = cellDistance.primitiveFieldRef();
List<pointIndexHit> nearest;
@ -132,9 +131,9 @@ void Foam::distanceSurface::createGeometry()
// Patch fields
{
forAll(fvm.C().boundaryField(), patchi)
forAll(mesh.C().boundaryField(), patchi)
{
const pointField& cc = fvm.C().boundaryField()[patchi];
const pointField& cc = mesh.C().boundaryField()[patchi];
fvPatchScalarField& fld = cellDistanceBf[patchi];
List<pointIndexHit> nearest;
@ -188,9 +187,9 @@ void Foam::distanceSurface::createGeometry()
// Distance to points
pointDistance_.setSize(fvm.nPoints());
pointDistance_.setSize(mesh.nPoints());
{
const pointField& pts = fvm.points();
const pointField& pts = mesh.points();
List<pointIndexHit> nearest;
surfPtr_().findNearest
@ -247,13 +246,13 @@ void Foam::distanceSurface::createGeometry()
IOobject
(
"pointDistance",
fvm.time().timeName(),
fvm.time(),
mesh.time().timeName(),
mesh.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
pointMesh::New(fvm),
pointMesh::New(mesh),
dimensionedScalar("zero", dimLength, 0)
);
pDist.primitiveFieldRef() = pointDistance_;
@ -268,10 +267,11 @@ void Foam::distanceSurface::createGeometry()
(
new isoSurface
(
mesh,
cellDistance,
pointDistance_,
distance_,
regularise_
regularise_ ? isoSurface::DIAGCELL : isoSurface::NONE
)
);
@ -316,8 +316,7 @@ Foam::distanceSurface::distanceSurface
average_(dict.lookupOrDefault("average", false)),
zoneKey_(keyType::null),
needsUpdate_(true),
isoSurfPtr_(nullptr),
facesPtr_(nullptr)
isoSurfPtr_(nullptr)
{}
@ -330,7 +329,6 @@ Foam::distanceSurface::distanceSurface
const word& surfaceName,
const scalar distance,
const bool signedDistance,
const bool cell,
const Switch regularise,
const Switch average
)
@ -359,8 +357,7 @@ Foam::distanceSurface::distanceSurface
average_(average),
zoneKey_(keyType::null),
needsUpdate_(true),
isoSurfPtr_(nullptr),
facesPtr_(nullptr)
isoSurfPtr_(nullptr)
{}
@ -383,13 +380,9 @@ bool Foam::distanceSurface::expire()
if (debug)
{
Pout<< "distanceSurface::expire :"
<< " have-facesPtr_:" << facesPtr_.valid()
<< " needsUpdate_:" << needsUpdate_ << endl;
}
// Clear any stored topologies
facesPtr_.clear();
// Clear derived data
clearGeom();
@ -409,7 +402,6 @@ bool Foam::distanceSurface::update()
if (debug)
{
Pout<< "distanceSurface::update :"
<< " have-facesPtr_:" << facesPtr_.valid()
<< " needsUpdate_:" << needsUpdate_ << endl;
}

19
src/sampling/sampledSurface/distanceSurface/distanceSurface.H
View File

@ -85,9 +85,6 @@ class distanceSurface
//- Constructed iso surface
autoPtr<isoSurface> isoSurfPtr_;
//- Triangles converted to faceList
mutable autoPtr<faceList> facesPtr_;
// Private Member Functions
@ -133,7 +130,6 @@ public:
const word& surfaceName,
const scalar distance,
const bool signedDistance,
const bool cell,
const Switch regularise,
const Switch average
);
@ -166,21 +162,10 @@ public:
//- Faces of surface
virtual const faceList& faces() const
{
if (facesPtr_.empty())
{
const triSurface& s = surface();
facesPtr_.reset(new faceList(s.size()));
forAll(s, i)
{
facesPtr_()[i] = s[i].triFaceFace();
}
}
return facesPtr_;
return surface().faces();
}
const triSurface& surface() const
const isoSurface& surface() const
{
return isoSurfPtr_();
}

15
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -227,11 +227,11 @@ void Foam::sampledCuttingPlane::createGeometry()
(
new isoSurface
(
mesh,
cellDistance,
pointDistance_,
0.0,
regularise_,
mergeTol_
0,
regularise_ ? isoSurface::DIAGCELL : isoSurface::NONE
)
);
@ -254,7 +254,6 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
:
sampledSurface(name, mesh, dict),
plane_(dict),
mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", false)),
zoneID_(dict.lookupOrDefault("zone", word::null), mesh.cellZones()),
@ -262,8 +261,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
needsUpdate_(true),
subMeshPtr_(nullptr),
cellDistancePtr_(nullptr),
isoSurfPtr_(nullptr),
facesPtr_(nullptr)
isoSurfPtr_(nullptr)
{
if (zoneID_.index() != -1)
{
@ -307,13 +305,9 @@ bool Foam::sampledCuttingPlane::expire()
if (debug)
{
Pout<< "sampledCuttingPlane::expire :"
<< " have-facesPtr_:" << facesPtr_.valid()
<< " needsUpdate_:" << needsUpdate_ << endl;
}
// Clear any stored topologies
facesPtr_.clear();
// Clear derived data
clearGeom();
@ -333,7 +327,6 @@ bool Foam::sampledCuttingPlane::update()
if (debug)
{
Pout<< "sampledCuttingPlane::update :"
<< " have-facesPtr_:" << facesPtr_.valid()
<< " needsUpdate_:" << needsUpdate_ << endl;
}

16
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.H
View File

@ -60,9 +60,6 @@ class sampledCuttingPlane
//- Plane
const plane plane_;
//- Merge tolerance
const scalar mergeTol_;
//- Whether to coarsen
const Switch regularise_;
@ -157,18 +154,7 @@ public:
//- Faces of surface
virtual const faceList& faces() const
{
if (facesPtr_.empty())
{
const triSurface& s = surface();
facesPtr_.reset(new faceList(s.size()));
forAll(s, i)
{
facesPtr_()[i] = s[i].triFaceFace();
}
}
return facesPtr_;
return surface().faces();
}
const isoSurface& surface() const