mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
volPointInterpolation, pointMesh now MeshObject
This commit is contained in:
@ -642,8 +642,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
//Info<< "Writing variables data ..." << endl;
|
||||
|
||||
pointMesh pMesh(mesh);
|
||||
volPointInterpolation pInterp(mesh, pMesh);
|
||||
volPointInterpolation pInterp(mesh);
|
||||
|
||||
writeInt(fvFile, FV_VARIABLES);
|
||||
|
||||
|
||||
@ -489,7 +489,7 @@ int main(int argc, char *argv[])
|
||||
readFields
|
||||
(
|
||||
vMesh,
|
||||
vMesh.basePointMesh(),
|
||||
pointMesh::New(vMesh.baseMesh()),
|
||||
objects,
|
||||
selectedFields,
|
||||
psf
|
||||
@ -499,7 +499,7 @@ int main(int argc, char *argv[])
|
||||
readFields
|
||||
(
|
||||
vMesh,
|
||||
vMesh.basePointMesh(),
|
||||
pointMesh::New(vMesh.baseMesh()),
|
||||
objects,
|
||||
selectedFields,
|
||||
pvf
|
||||
@ -509,7 +509,7 @@ int main(int argc, char *argv[])
|
||||
readFields
|
||||
(
|
||||
vMesh,
|
||||
vMesh.basePointMesh(),
|
||||
pointMesh::New(vMesh.baseMesh()),
|
||||
objects,
|
||||
selectedFields,
|
||||
pSpheretf
|
||||
@ -519,7 +519,7 @@ int main(int argc, char *argv[])
|
||||
readFields
|
||||
(
|
||||
vMesh,
|
||||
vMesh.basePointMesh(),
|
||||
pointMesh::New(vMesh.baseMesh()),
|
||||
objects,
|
||||
selectedFields,
|
||||
pSymmtf
|
||||
@ -529,7 +529,7 @@ int main(int argc, char *argv[])
|
||||
readFields
|
||||
(
|
||||
vMesh,
|
||||
vMesh.basePointMesh(),
|
||||
pointMesh::New(vMesh.baseMesh()),
|
||||
objects,
|
||||
selectedFields,
|
||||
ptf
|
||||
@ -598,7 +598,7 @@ int main(int argc, char *argv[])
|
||||
writer.write(ptf);
|
||||
|
||||
// Interpolated volFields
|
||||
volPointInterpolation pInterp(mesh, vMesh.pMesh());
|
||||
volPointInterpolation pInterp(mesh);
|
||||
writer.write(pInterp, vsf);
|
||||
writer.write(pInterp, vvf);
|
||||
writer.write(pInterp, vSpheretf);
|
||||
|
||||
@ -70,7 +70,6 @@ Foam::polyMesh::readUpdateState Foam::vtkMesh::readUpdate()
|
||||
// the subset even if only movement.
|
||||
|
||||
topoPtr_.clear();
|
||||
pointMeshPtr_.clear();
|
||||
|
||||
if (setName_.size() > 0)
|
||||
{
|
||||
|
||||
@ -39,7 +39,6 @@ SourceFiles
|
||||
|
||||
#include "vtkTopo.H"
|
||||
#include "fvMeshSubset.H"
|
||||
#include "pointMesh.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
@ -60,9 +59,6 @@ class vtkMesh
|
||||
//- Reference to mesh
|
||||
fvMesh& baseMesh_;
|
||||
|
||||
//- Demand driven pointMesh
|
||||
mutable autoPtr<pointMesh> pointMeshPtr_;
|
||||
|
||||
//- Subsetting engine + sub-fvMesh
|
||||
fvMeshSubset subsetter_;
|
||||
|
||||
@ -101,15 +97,6 @@ public:
|
||||
return baseMesh_;
|
||||
}
|
||||
|
||||
const pointMesh& basePointMesh() const
|
||||
{
|
||||
if (!pointMeshPtr_.valid())
|
||||
{
|
||||
pointMeshPtr_.reset(new pointMesh(baseMesh_));
|
||||
}
|
||||
return pointMeshPtr_();
|
||||
}
|
||||
|
||||
const fvMeshSubset& subsetter() const
|
||||
{
|
||||
return subsetter_;
|
||||
@ -144,19 +131,6 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
//- Access either pointMesh of base or pointMesh of subset
|
||||
const pointMesh& pMesh() const
|
||||
{
|
||||
if (useSubMesh())
|
||||
{
|
||||
return subsetter_.subPointMesh();
|
||||
}
|
||||
else
|
||||
{
|
||||
return basePointMesh();
|
||||
}
|
||||
}
|
||||
|
||||
//- Number of field cells
|
||||
label nFieldCells() const
|
||||
{
|
||||
@ -166,7 +140,7 @@ public:
|
||||
//- Number of field points
|
||||
label nFieldPoints() const
|
||||
{
|
||||
return pMesh().size() + topo().addPointCellLabels().size();
|
||||
return mesh().nPoints() + topo().addPointCellLabels().size();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -107,8 +107,7 @@ void Foam::vtkPV3Foam::convertVolFields
|
||||
}
|
||||
|
||||
// Construct interpolation on the raw mesh
|
||||
pointMesh pMesh(mesh);
|
||||
volPointInterpolation pInterp(mesh, pMesh);
|
||||
volPointInterpolation pInterp(mesh);
|
||||
|
||||
PtrList<PrimitivePatchInterpolation<primitivePatch> >
|
||||
ppInterpList(mesh.boundaryMesh().size());
|
||||
|
||||
Reference in New Issue
Block a user