Commit c1ef233e authored by mattijs's avatar mattijs
Browse files

ENH: pointMesh: use MeshObject form

parent 603b05c5
......@@ -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
......@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
# include "createTime.H"
# include "createMesh.H"
pointMesh pMesh(mesh);
const pointMesh& pMesh = pointMesh::New(mesh);
pointVectorField U
(
......
......@@ -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
......@@ -60,8 +60,6 @@ int main(int argc, char *argv[])
# include "createMesh.H"
const word oldInstance = mesh.pointsInstance();
pointMesh pMesh(mesh);
word cellSetName(args.args()[1]);
const bool overwrite = args.optionFound("overwrite");
......@@ -114,11 +112,10 @@ int main(int argc, char *argv[])
// Read point fields
PtrList<pointScalarField> psFlds;
ReadFields(pMesh, objects, psFlds);
ReadFields(pointMesh::New(mesh), objects, psFlds);
PtrList<pointVectorField> pvFlds;
ReadFields(pMesh, objects, pvFlds);
ReadFields(pointMesh::New(mesh), objects, pvFlds);
// Construct refiner without unrefinement. Read existing point/cell level.
......@@ -164,7 +161,6 @@ int main(int argc, char *argv[])
// Update fields
mesh.updateMesh(map);
pMesh.updateMesh(map);
// Update numbering of cells/vertices.
meshCutter.updateMesh(map);
......@@ -173,7 +169,6 @@ int main(int argc, char *argv[])
if (map().hasMotionPoints())
{
mesh.movePoints(map().preMotionPoints());
pMesh.movePoints(map().preMotionPoints());
}
Pout<< "Refined from " << returnReduce(map().nOldCells(), sumOp<label>())
......
......@@ -395,7 +395,7 @@ int main(int argc, char *argv[])
// Construct the point fields
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
pointMesh pMesh(mesh);
const pointMesh& pMesh = pointMesh::New(mesh);
PtrList<pointScalarField> pointScalarFields;
readFields(pMesh, objects, pointScalarFields);
......
......@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
{
Info<< "Reconstructing point fields" << nl << endl;
pointMesh pMesh(mesh);
const pointMesh& pMesh = pointMesh::New(mesh);
PtrList<pointMesh> pMeshes(procMeshes.meshes().size());
forAll(pMeshes, procI)
......
......@@ -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
......@@ -195,7 +195,7 @@ void Foam::vtkPV3Foam::convertPointFields
}
// Construct interpolation on the raw mesh
pointMesh pMesh(mesh);
const pointMesh& pMesh = pointMesh::New(mesh);
convertPointFields<scalar>
......
......@@ -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
......@@ -1133,7 +1133,7 @@ void user_read_one_grid_function
// Set fieldvalues
//
pointMesh pMesh(mesh);
const pointMesh& pMesh = pointMesh::New(mesh);
volPointInterpolation pInterp(mesh, pMesh);
......
......@@ -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
......@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
# include "createNamedMesh.H"
pointMesh pMesh(mesh);
const pointMesh& pMesh = pointMesh::New(mesh);
forAll(timeDirs, timeI)
{
......
......@@ -42,7 +42,7 @@ namespace Foam
addToRunTimeSelectionTable
(
fvMotionSolver,
motionSolver,
displacementSBRStressFvMotionSolver,
dictionary
);
......@@ -54,22 +54,11 @@ namespace Foam
Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
(
const polyMesh& mesh,
Istream& is
const IOdictionary& dict
)
:
displacementFvMotionSolver(mesh, is),
pointDisplacement_
(
IOobject
(
"pointDisplacement",
fvMesh_.time().timeName(),
fvMesh_,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
pointMesh::New(fvMesh_)
),
displacementMotionSolver(mesh, dict, typeName),
fvMotionSolverCore(mesh),
cellDisplacement_
(
IOobject
......@@ -84,14 +73,14 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
dimensionedVector
(
"cellDisplacement",
pointDisplacement_.dimensions(),
pointDisplacement().dimensions(),
vector::zero
),
cellMotionBoundaryTypes<vector>(pointDisplacement_.boundaryField())
cellMotionBoundaryTypes<vector>(pointDisplacement().boundaryField())
),
diffusivityPtr_
(
motionDiffusivity::New(fvMesh_, lookup("diffusivity"))
motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
)
{}
......@@ -116,7 +105,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const
tmp<pointField> tcurPoints
(
points0() + pointDisplacement_.internalField()
points0() + pointDisplacement().internalField()
);
twoDCorrectPoints(tcurPoints());
......@@ -128,7 +117,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const
void Foam::displacementSBRStressFvMotionSolver::solve()
{
// The points have moved so before interpolation update
// the motionSolver accordingly
// the mtionSolver accordingly
movePoints(fvMesh_.points());
diffusivityPtr_->correct();
......@@ -192,12 +181,16 @@ void Foam::displacementSBRStressFvMotionSolver::updateMesh
const mapPolyMesh& mpm
)
{
displacementFvMotionSolver::updateMesh(mpm);
displacementMotionSolver::updateMesh(mpm);
// Update diffusivity. Note two stage to make sure old one is de-registered
// before creating/registering new one.
diffusivityPtr_.reset(NULL);
diffusivityPtr_ = motionDiffusivity::New(fvMesh_, lookup("diffusivity"));
diffusivityPtr_ = motionDiffusivity::New
(
fvMesh_,
coeffDict().lookup("diffusivity")
);
}
......
......@@ -40,7 +40,7 @@ namespace Foam
addToRunTimeSelectionTable
(
fvMotionSolver,
motionSolver,
displacementLaplacianFvMotionSolver,
dictionary
);
......@@ -52,22 +52,11 @@ namespace Foam
Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
(
const polyMesh& mesh,
Istream& is
const IOdictionary& dict
)
:
displacementFvMotionSolver(mesh, is),
pointDisplacement_
(
IOobject
(
"pointDisplacement",
fvMesh_.time().timeName(),
fvMesh_,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
pointMesh::New(fvMesh_)
),
displacementMotionSolver(mesh, dict, typeName),
fvMotionSolverCore(mesh),
cellDisplacement_
(
IOobject
......@@ -90,12 +79,12 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
pointLocation_(NULL),
diffusivityPtr_
(
motionDiffusivity::New(fvMesh_, lookup("diffusivity"))
motionDiffusivity::New(fvMesh_, coeffDict().lookup("diffusivity"))
),
frozenPointsZone_
(
found("frozenPointsZone")
? fvMesh_.pointZones().findZoneID(lookup("frozenPointsZone"))
coeffDict().found("frozenPointsZone")
? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
: -1
)
{
......@@ -131,7 +120,8 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
{
Info<< "displacementLaplacianFvMotionSolver :"
<< " Read pointVectorField "
<< io.name() << " to be used for boundary conditions on points."
<< io.name()
<< " to be used for boundary conditions on points."
<< nl
<< "Boundary conditions:"
<< pointLocation_().boundaryField().types() << endl;
......@@ -217,7 +207,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
void Foam::displacementLaplacianFvMotionSolver::solve()
{
// The points have moved so before interpolation update
// the fvMotionSolver accordingly
// the motionSolver accordingly
movePoints(fvMesh_.points());
diffusivityPtr_->correct();
......@@ -240,12 +230,16 @@ void Foam::displacementLaplacianFvMotionSolver::updateMesh
const mapPolyMesh& mpm
)
{
displacementFvMotionSolver::updateMesh(mpm);
displacementMotionSolver::updateMesh(mpm);
// Update diffusivity. Note two stage to make sure old one is de-registered
// before creating/registering new one.
diffusivityPtr_.reset(NULL);
diffusivityPtr_ = motionDiffusivity::New(fvMesh_, lookup("diffusivity"));
diffusivityPtr_ = motionDiffusivity::New
(
fvMesh_,
coeffDict().lookup("diffusivity")
);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment